summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/emu/cpuexec.h9
-rw-r--r--src/emu/machine/ldpr8210.c4
-rw-r--r--src/emu/machine/ldv1000.c4
-rw-r--r--src/emu/machine/ldvp931.c2
-rw-r--r--src/emu/memory.h10
-rw-r--r--src/mame/audio/atarijsa.c10
-rw-r--r--src/mame/audio/cage.c4
-rw-r--r--src/mame/audio/carnival.c4
-rw-r--r--src/mame/audio/cinemat.c4
-rw-r--r--src/mame/audio/dcs.c30
-rw-r--r--src/mame/audio/dkong.c14
-rw-r--r--src/mame/audio/exidy.c8
-rw-r--r--src/mame/audio/exidy440.c2
-rw-r--r--src/mame/audio/gottlieb.c6
-rw-r--r--src/mame/audio/irem.c10
-rw-r--r--src/mame/audio/jedi.c2
-rw-r--r--src/mame/audio/mario.c6
-rw-r--r--src/mame/audio/mcr.c12
-rw-r--r--src/mame/audio/n8080.c12
-rw-r--r--src/mame/audio/namcoc7x.h8
-rw-r--r--src/mame/audio/qix.c2
-rw-r--r--src/mame/audio/redalert.c6
-rw-r--r--src/mame/audio/scramble.c4
-rw-r--r--src/mame/audio/segag80r.c2
-rw-r--r--src/mame/audio/segasnd.c10
-rw-r--r--src/mame/audio/seibu.h10
-rw-r--r--src/mame/audio/taito_en.h2
-rw-r--r--src/mame/audio/timeplt.c4
-rw-r--r--src/mame/audio/williams.c8
-rw-r--r--src/mame/drivers/1942.c4
-rw-r--r--src/mame/drivers/1943.c4
-rw-r--r--src/mame/drivers/1945kiii.c2
-rw-r--r--src/mame/drivers/20pacgal.c4
-rw-r--r--src/mame/drivers/2mindril.c2
-rw-r--r--src/mame/drivers/39in1.c2
-rw-r--r--src/mame/drivers/3super8.c2
-rw-r--r--src/mame/drivers/40love.c12
-rw-r--r--src/mame/drivers/4enraya.c4
-rw-r--r--src/mame/drivers/4roses.c2
-rw-r--r--src/mame/drivers/8080bw.c52
-rw-r--r--src/mame/drivers/86lions.c2
-rw-r--r--src/mame/drivers/88games.c4
-rw-r--r--src/mame/drivers/ace.c2
-rw-r--r--src/mame/drivers/acefruit.c4
-rw-r--r--src/mame/drivers/acommand.c2
-rw-r--r--src/mame/drivers/actfancr.c8
-rw-r--r--src/mame/drivers/adp.c8
-rw-r--r--src/mame/drivers/aeroboto.c4
-rw-r--r--src/mame/drivers/aerofgt.c52
-rw-r--r--src/mame/drivers/airbustr.c12
-rw-r--r--src/mame/drivers/ajax.c6
-rw-r--r--src/mame/drivers/albazc.c2
-rw-r--r--src/mame/drivers/albazg.c4
-rw-r--r--src/mame/drivers/aleck64.c4
-rw-r--r--src/mame/drivers/alg.c6
-rw-r--r--src/mame/drivers/aliens.c4
-rw-r--r--src/mame/drivers/alpha68k.c52
-rw-r--r--src/mame/drivers/ambush.c4
-rw-r--r--src/mame/drivers/ampoker2.c4
-rw-r--r--src/mame/drivers/amspdwy.c6
-rw-r--r--src/mame/drivers/angelkds.c8
-rw-r--r--src/mame/drivers/appoooh.c8
-rw-r--r--src/mame/drivers/aquarium.c6
-rw-r--r--src/mame/drivers/arabian.c4
-rw-r--r--src/mame/drivers/arcadecl.c2
-rw-r--r--src/mame/drivers/arcadia.c2
-rw-r--r--src/mame/drivers/argus.c20
-rw-r--r--src/mame/drivers/aristmk5.c2
-rw-r--r--src/mame/drivers/arkanoid.c6
-rw-r--r--src/mame/drivers/armedf.c46
-rw-r--r--src/mame/drivers/artmagic.c8
-rw-r--r--src/mame/drivers/ashnojoe.c6
-rw-r--r--src/mame/drivers/asterix.c4
-rw-r--r--src/mame/drivers/asteroid.c6
-rw-r--r--src/mame/drivers/astinvad.c8
-rw-r--r--src/mame/drivers/astrocde.c40
-rw-r--r--src/mame/drivers/astrocorp.c4
-rw-r--r--src/mame/drivers/astrof.c6
-rw-r--r--src/mame/drivers/asuka.c24
-rw-r--r--src/mame/drivers/atarifb.c8
-rw-r--r--src/mame/drivers/atarig1.c2
-rw-r--r--src/mame/drivers/atarig42.c2
-rw-r--r--src/mame/drivers/atarigt.c2
-rw-r--r--src/mame/drivers/atarigx2.c2
-rw-r--r--src/mame/drivers/atarisy1.c4
-rw-r--r--src/mame/drivers/atarisy2.c4
-rw-r--r--src/mame/drivers/ataxx.c12
-rw-r--r--src/mame/drivers/atetris.c4
-rw-r--r--src/mame/drivers/attckufo.c2
-rw-r--r--src/mame/drivers/avalnche.c2
-rw-r--r--src/mame/drivers/aztarac.c4
-rw-r--r--src/mame/drivers/backfire.c2
-rw-r--r--src/mame/drivers/badlands.c8
-rw-r--r--src/mame/drivers/bagman.c12
-rw-r--r--src/mame/drivers/balsente.c8
-rw-r--r--src/mame/drivers/bankp.c4
-rw-r--r--src/mame/drivers/baraduke.c6
-rw-r--r--src/mame/drivers/batman.c2
-rw-r--r--src/mame/drivers/battlane.c4
-rw-r--r--src/mame/drivers/battlera.c6
-rw-r--r--src/mame/drivers/battlex.c4
-rw-r--r--src/mame/drivers/battlnts.c4
-rw-r--r--src/mame/drivers/bbusters.c12
-rw-r--r--src/mame/drivers/beaminv.c4
-rw-r--r--src/mame/drivers/beathead.c2
-rw-r--r--src/mame/drivers/beezer.c4
-rw-r--r--src/mame/drivers/berzerk.c6
-rw-r--r--src/mame/drivers/bestleag.c2
-rw-r--r--src/mame/drivers/bfcobra.c6
-rw-r--r--src/mame/drivers/bfm_sc1.c8
-rw-r--r--src/mame/drivers/bfm_sc2.c12
-rw-r--r--src/mame/drivers/bfmsys85.c2
-rw-r--r--src/mame/drivers/big10.c4
-rw-r--r--src/mame/drivers/bigevglf.c12
-rw-r--r--src/mame/drivers/bigfghtr.c6
-rw-r--r--src/mame/drivers/bigstrkb.c2
-rw-r--r--src/mame/drivers/bingoc.c6
-rw-r--r--src/mame/drivers/bionicc.c4
-rw-r--r--src/mame/drivers/bishi.c2
-rw-r--r--src/mame/drivers/bishjan.c6
-rw-r--r--src/mame/drivers/bking.c10
-rw-r--r--src/mame/drivers/blackt96.c4
-rw-r--r--src/mame/drivers/bladestl.c4
-rw-r--r--src/mame/drivers/blktiger.c12
-rw-r--r--src/mame/drivers/blmbycar.c4
-rw-r--r--src/mame/drivers/blockade.c4
-rw-r--r--src/mame/drivers/blockhl.c4
-rw-r--r--src/mame/drivers/blockout.c4
-rw-r--r--src/mame/drivers/bloodbro.c4
-rw-r--r--src/mame/drivers/blstroid.c2
-rw-r--r--src/mame/drivers/blueprnt.c4
-rw-r--r--src/mame/drivers/bmcbowl.c2
-rw-r--r--src/mame/drivers/bnstars.c4
-rw-r--r--src/mame/drivers/bogeyman.c2
-rw-r--r--src/mame/drivers/bombjack.c6
-rw-r--r--src/mame/drivers/boogwing.c4
-rw-r--r--src/mame/drivers/bottom9.c4
-rw-r--r--src/mame/drivers/boxer.c2
-rw-r--r--src/mame/drivers/brkthru.c8
-rw-r--r--src/mame/drivers/bsktball.c2
-rw-r--r--src/mame/drivers/btime.c22
-rw-r--r--src/mame/drivers/btoads.c6
-rw-r--r--src/mame/drivers/bublbobl.c18
-rw-r--r--src/mame/drivers/buggychl.c6
-rw-r--r--src/mame/drivers/buster.c2
-rw-r--r--src/mame/drivers/bwidow.c6
-rw-r--r--src/mame/drivers/bwing.c8
-rw-r--r--src/mame/drivers/bzone.c4
-rw-r--r--src/mame/drivers/cabal.c16
-rw-r--r--src/mame/drivers/cabaret.c4
-rw-r--r--src/mame/drivers/calchase.c4
-rw-r--r--src/mame/drivers/calomega.c6
-rw-r--r--src/mame/drivers/calorie.c6
-rw-r--r--src/mame/drivers/canyon.c2
-rw-r--r--src/mame/drivers/capbowl.c6
-rw-r--r--src/mame/drivers/cardline.c4
-rw-r--r--src/mame/drivers/carjmbre.c6
-rw-r--r--src/mame/drivers/carpolo.c2
-rw-r--r--src/mame/drivers/carrera.c4
-rw-r--r--src/mame/drivers/caswin.c4
-rw-r--r--src/mame/drivers/cave.c46
-rw-r--r--src/mame/drivers/cb2001.c4
-rw-r--r--src/mame/drivers/cball.c2
-rw-r--r--src/mame/drivers/cbasebal.c4
-rw-r--r--src/mame/drivers/cbuster.c4
-rw-r--r--src/mame/drivers/ccastles.c2
-rw-r--r--src/mame/drivers/cchance.c2
-rw-r--r--src/mame/drivers/cchasm.c6
-rw-r--r--src/mame/drivers/cclimber.c22
-rw-r--r--src/mame/drivers/centiped.c14
-rw-r--r--src/mame/drivers/chaknpop.c2
-rw-r--r--src/mame/drivers/cham24.c2
-rw-r--r--src/mame/drivers/champbas.c22
-rw-r--r--src/mame/drivers/champbwl.c2
-rw-r--r--src/mame/drivers/chanbara.c2
-rw-r--r--src/mame/drivers/changela.c4
-rw-r--r--src/mame/drivers/cheekyms.c4
-rw-r--r--src/mame/drivers/chihiro.c2
-rw-r--r--src/mame/drivers/chinagat.c22
-rw-r--r--src/mame/drivers/chinsan.c4
-rw-r--r--src/mame/drivers/chqflag.c4
-rw-r--r--src/mame/drivers/chsuper.c4
-rw-r--r--src/mame/drivers/cidelsa.c20
-rw-r--r--src/mame/drivers/cinemat.c16
-rw-r--r--src/mame/drivers/circus.c8
-rw-r--r--src/mame/drivers/circusc.c4
-rw-r--r--src/mame/drivers/cischeat.c34
-rw-r--r--src/mame/drivers/citycon.c4
-rw-r--r--src/mame/drivers/clayshoo.c4
-rw-r--r--src/mame/drivers/cliffhgr.c4
-rw-r--r--src/mame/drivers/cloak.c4
-rw-r--r--src/mame/drivers/cloud9.c2
-rw-r--r--src/mame/drivers/clshroad.c8
-rw-r--r--src/mame/drivers/cninja.c20
-rw-r--r--src/mame/drivers/cntsteer.c12
-rw-r--r--src/mame/drivers/coinmstr.c10
-rw-r--r--src/mame/drivers/cojag.c8
-rw-r--r--src/mame/drivers/combatsc.c8
-rw-r--r--src/mame/drivers/comebaby.c2
-rw-r--r--src/mame/drivers/commando.c4
-rw-r--r--src/mame/drivers/compgolf.c2
-rw-r--r--src/mame/drivers/contra.c4
-rw-r--r--src/mame/drivers/coolpool.c12
-rw-r--r--src/mame/drivers/coolridr.c6
-rw-r--r--src/mame/drivers/cop01.c16
-rw-r--r--src/mame/drivers/copsnrob.c2
-rw-r--r--src/mame/drivers/cosmic.c12
-rw-r--r--src/mame/drivers/cowrace.c8
-rw-r--r--src/mame/drivers/cps1.c14
-rw-r--r--src/mame/drivers/cps2.c6
-rw-r--r--src/mame/drivers/cps3.c2
-rw-r--r--src/mame/drivers/crbaloon.c4
-rw-r--r--src/mame/drivers/crgolf.c4
-rw-r--r--src/mame/drivers/crimfght.c4
-rw-r--r--src/mame/drivers/crospang.c12
-rw-r--r--src/mame/drivers/crshrace.c6
-rw-r--r--src/mame/drivers/crystal.c2
-rw-r--r--src/mame/drivers/cshooter.c8
-rw-r--r--src/mame/drivers/cubeqst.c8
-rw-r--r--src/mame/drivers/cubocd32.c2
-rw-r--r--src/mame/drivers/cultures.c4
-rw-r--r--src/mame/drivers/cvs.c12
-rw-r--r--src/mame/drivers/cyberbal.c10
-rw-r--r--src/mame/drivers/cybertnk.c6
-rw-r--r--src/mame/drivers/dacholer.c8
-rw-r--r--src/mame/drivers/dambustr.c2
-rw-r--r--src/mame/drivers/darius.c10
-rw-r--r--src/mame/drivers/darkhors.c2
-rw-r--r--src/mame/drivers/darkmist.c6
-rw-r--r--src/mame/drivers/darkseal.c4
-rw-r--r--src/mame/drivers/dassault.c6
-rw-r--r--src/mame/drivers/dblewing.c6
-rw-r--r--src/mame/drivers/dbz.c6
-rw-r--r--src/mame/drivers/dcheese.c4
-rw-r--r--src/mame/drivers/dcon.c4
-rw-r--r--src/mame/drivers/dday.c2
-rw-r--r--src/mame/drivers/ddayjlc.c4
-rw-r--r--src/mame/drivers/ddealer.c2
-rw-r--r--src/mame/drivers/ddenlovr.c78
-rw-r--r--src/mame/drivers/ddragon.c26
-rw-r--r--src/mame/drivers/ddragon3.c10
-rw-r--r--src/mame/drivers/ddrible.c6
-rw-r--r--src/mame/drivers/ddz.c2
-rw-r--r--src/mame/drivers/deadang.c4
-rw-r--r--src/mame/drivers/dec0.c44
-rw-r--r--src/mame/drivers/dec8.c48
-rw-r--r--src/mame/drivers/deco156.c4
-rw-r--r--src/mame/drivers/deco32.c30
-rw-r--r--src/mame/drivers/deco_mlc.c4
-rw-r--r--src/mame/drivers/decocass.c6
-rw-r--r--src/mame/drivers/deniam.c8
-rw-r--r--src/mame/drivers/deshoros.c2
-rw-r--r--src/mame/drivers/destroyr.c2
-rw-r--r--src/mame/drivers/dgpix.c4
-rw-r--r--src/mame/drivers/dietgo.c4
-rw-r--r--src/mame/drivers/discoboy.c8
-rw-r--r--src/mame/drivers/diverboy.c4
-rw-r--r--src/mame/drivers/djboy.c12
-rw-r--r--src/mame/drivers/djmain.c2
-rw-r--r--src/mame/drivers/dkong.c18
-rw-r--r--src/mame/drivers/dlair.c6
-rw-r--r--src/mame/drivers/dmndrby.c4
-rw-r--r--src/mame/drivers/docastle.c16
-rw-r--r--src/mame/drivers/dogfgt.c4
-rw-r--r--src/mame/drivers/dominob.c4
-rw-r--r--src/mame/drivers/dooyong.c36
-rw-r--r--src/mame/drivers/dorachan.c4
-rw-r--r--src/mame/drivers/dotrikun.c4
-rw-r--r--src/mame/drivers/dragrace.c2
-rw-r--r--src/mame/drivers/dreamwld.c2
-rw-r--r--src/mame/drivers/drgnmst.c4
-rw-r--r--src/mame/drivers/dribling.c4
-rw-r--r--src/mame/drivers/drmicro.c4
-rw-r--r--src/mame/drivers/drtomy.c2
-rw-r--r--src/mame/drivers/drw80pkr.c4
-rw-r--r--src/mame/drivers/dunhuang.c4
-rw-r--r--src/mame/drivers/dwarfd.c4
-rw-r--r--src/mame/drivers/dynadice.c8
-rw-r--r--src/mame/drivers/dynax.c50
-rw-r--r--src/mame/drivers/dynduke.c6
-rw-r--r--src/mame/drivers/egghunt.c6
-rw-r--r--src/mame/drivers/embargo.c4
-rw-r--r--src/mame/drivers/enigma2.c10
-rw-r--r--src/mame/drivers/eolith.c2
-rw-r--r--src/mame/drivers/eolith16.c2
-rw-r--r--src/mame/drivers/epos.c8
-rw-r--r--src/mame/drivers/eprom.c8
-rw-r--r--src/mame/drivers/equites.c12
-rw-r--r--src/mame/drivers/ertictac.c2
-rw-r--r--src/mame/drivers/esd16.c12
-rw-r--r--src/mame/drivers/esh.c4
-rw-r--r--src/mame/drivers/espial.c8
-rw-r--r--src/mame/drivers/esripsys.c8
-rw-r--r--src/mame/drivers/ettrivia.c4
-rw-r--r--src/mame/drivers/exedexes.c4
-rw-r--r--src/mame/drivers/exerion.c4
-rw-r--r--src/mame/drivers/exidy.c20
-rw-r--r--src/mame/drivers/exidy440.c2
-rw-r--r--src/mame/drivers/expro02.c4
-rw-r--r--src/mame/drivers/exprraid.c4
-rw-r--r--src/mame/drivers/exterm.c8
-rw-r--r--src/mame/drivers/exzisus.c8
-rw-r--r--src/mame/drivers/f-32.c4
-rw-r--r--src/mame/drivers/f1gp.c14
-rw-r--r--src/mame/drivers/fantland.c20
-rw-r--r--src/mame/drivers/fastfred.c8
-rw-r--r--src/mame/drivers/fastlane.c2
-rw-r--r--src/mame/drivers/fcombat.c4
-rw-r--r--src/mame/drivers/fcrash.c8
-rw-r--r--src/mame/drivers/feversoc.c2
-rw-r--r--src/mame/drivers/fgoal.c2
-rw-r--r--src/mame/drivers/finalizr.c6
-rw-r--r--src/mame/drivers/findout.c2
-rw-r--r--src/mame/drivers/firebeat.c6
-rw-r--r--src/mame/drivers/firefox.c4
-rw-r--r--src/mame/drivers/firetrap.c8
-rw-r--r--src/mame/drivers/firetrk.c6
-rw-r--r--src/mame/drivers/fitfight.c8
-rw-r--r--src/mame/drivers/flkatck.c4
-rw-r--r--src/mame/drivers/flower.c6
-rw-r--r--src/mame/drivers/flstory.c18
-rw-r--r--src/mame/drivers/flyball.c2
-rw-r--r--src/mame/drivers/foodf.c2
-rw-r--r--src/mame/drivers/forte2.c4
-rw-r--r--src/mame/drivers/fortecar.c4
-rw-r--r--src/mame/drivers/freekick.c12
-rw-r--r--src/mame/drivers/fromanc2.c26
-rw-r--r--src/mame/drivers/fromance.c18
-rw-r--r--src/mame/drivers/funkybee.c4
-rw-r--r--src/mame/drivers/funkyjet.c4
-rw-r--r--src/mame/drivers/funworld.c12
-rw-r--r--src/mame/drivers/funybubl.c6
-rw-r--r--src/mame/drivers/fuukifg2.c6
-rw-r--r--src/mame/drivers/fuukifg3.c6
-rw-r--r--src/mame/drivers/gaelco.c10
-rw-r--r--src/mame/drivers/gaelco2.c12
-rw-r--r--src/mame/drivers/gaelco3d.c10
-rw-r--r--src/mame/drivers/gaiden.c10
-rw-r--r--src/mame/drivers/gal3.c14
-rw-r--r--src/mame/drivers/galaga.c66
-rw-r--r--src/mame/drivers/galastrm.c2
-rw-r--r--src/mame/drivers/galaxi.c2
-rw-r--r--src/mame/drivers/galaxia.c8
-rw-r--r--src/mame/drivers/galaxian.c56
-rw-r--r--src/mame/drivers/galaxold.c52
-rw-r--r--src/mame/drivers/galivan.c16
-rw-r--r--src/mame/drivers/galpani2.c4
-rw-r--r--src/mame/drivers/galpani3.c2
-rw-r--r--src/mame/drivers/galpanic.c12
-rw-r--r--src/mame/drivers/galspnbl.c4
-rw-r--r--src/mame/drivers/gamecstl.c4
-rw-r--r--src/mame/drivers/gameplan.c6
-rw-r--r--src/mame/drivers/gaplus.c6
-rw-r--r--src/mame/drivers/gatron.c4
-rw-r--r--src/mame/drivers/gauntlet.c4
-rw-r--r--src/mame/drivers/gberet.c6
-rw-r--r--src/mame/drivers/gbusters.c4
-rw-r--r--src/mame/drivers/gcpinbal.c2
-rw-r--r--src/mame/drivers/genesis.c4
-rw-r--r--src/mame/drivers/getrivia.c8
-rw-r--r--src/mame/drivers/ghosteo.c2
-rw-r--r--src/mame/drivers/gijoe.c4
-rw-r--r--src/mame/drivers/ginganin.c4
-rw-r--r--src/mame/drivers/gladiatr.c20
-rw-r--r--src/mame/drivers/glass.c2
-rw-r--r--src/mame/drivers/gng.c4
-rw-r--r--src/mame/drivers/go2000.c6
-rw-r--r--src/mame/drivers/goal92.c4
-rw-r--r--src/mame/drivers/goindol.c4
-rw-r--r--src/mame/drivers/goldnpkr.c6
-rw-r--r--src/mame/drivers/goldstar.c60
-rw-r--r--src/mame/drivers/gomoku.c2
-rw-r--r--src/mame/drivers/good.c2
-rw-r--r--src/mame/drivers/goodejan.c8
-rw-r--r--src/mame/drivers/gotcha.c4
-rw-r--r--src/mame/drivers/gottlieb.c4
-rw-r--r--src/mame/drivers/gotya.c2
-rw-r--r--src/mame/drivers/gpworld.c4
-rw-r--r--src/mame/drivers/gradius3.c6
-rw-r--r--src/mame/drivers/grchamp.c10
-rw-r--r--src/mame/drivers/gridlee.c2
-rw-r--r--src/mame/drivers/groundfx.c2
-rw-r--r--src/mame/drivers/gstream.c4
-rw-r--r--src/mame/drivers/gstriker.c12
-rw-r--r--src/mame/drivers/gsword.c18
-rw-r--r--src/mame/drivers/gticlub.c14
-rw-r--r--src/mame/drivers/guab.c2
-rw-r--r--src/mame/drivers/gumbo.c6
-rw-r--r--src/mame/drivers/gunbustr.c2
-rw-r--r--src/mame/drivers/gundealr.c4
-rw-r--r--src/mame/drivers/gunpey.c4
-rw-r--r--src/mame/drivers/gunsmoke.c4
-rw-r--r--src/mame/drivers/gyruss.c12
-rw-r--r--src/mame/drivers/halleys.c4
-rw-r--r--src/mame/drivers/hanaawas.c4
-rw-r--r--src/mame/drivers/harddriv.c42
-rw-r--r--src/mame/drivers/hcastle.c4
-rw-r--r--src/mame/drivers/hexa.c2
-rw-r--r--src/mame/drivers/hexion.c2
-rw-r--r--src/mame/drivers/higemaru.c2
-rw-r--r--src/mame/drivers/highvdeo.c24
-rw-r--r--src/mame/drivers/hikaru.c6
-rw-r--r--src/mame/drivers/himesiki.c8
-rw-r--r--src/mame/drivers/hitme.c4
-rw-r--r--src/mame/drivers/hnayayoi.c10
-rw-r--r--src/mame/drivers/hng64.c8
-rw-r--r--src/mame/drivers/holeland.c8
-rw-r--r--src/mame/drivers/homedata.c18
-rw-r--r--src/mame/drivers/homerun.c4
-rw-r--r--src/mame/drivers/hornet.c8
-rw-r--r--src/mame/drivers/hotblock.c4
-rw-r--r--src/mame/drivers/hshavoc.c4
-rw-r--r--src/mame/drivers/hvyunit.c12
-rw-r--r--src/mame/drivers/hyhoo.c4
-rw-r--r--src/mame/drivers/hyperspt.c6
-rw-r--r--src/mame/drivers/hyprduel.c8
-rw-r--r--src/mame/drivers/igs009.c4
-rw-r--r--src/mame/drivers/igs017.c6
-rw-r--r--src/mame/drivers/igs_blit.c12
-rw-r--r--src/mame/drivers/igs_m027.c2
-rw-r--r--src/mame/drivers/igs_m68.c2
-rw-r--r--src/mame/drivers/igspoker.c8
-rw-r--r--src/mame/drivers/ikki.c4
-rw-r--r--src/mame/drivers/ilpag.c4
-rw-r--r--src/mame/drivers/imolagp.c8
-rw-r--r--src/mame/drivers/intrscti.c4
-rw-r--r--src/mame/drivers/inufuku.c6
-rw-r--r--src/mame/drivers/iqblock.c4
-rw-r--r--src/mame/drivers/irobot.c2
-rw-r--r--src/mame/drivers/ironhors.c12
-rw-r--r--src/mame/drivers/istellar.c12
-rw-r--r--src/mame/drivers/itech32.c16
-rw-r--r--src/mame/drivers/itech8.c24
-rw-r--r--src/mame/drivers/itgambl2.c2
-rw-r--r--src/mame/drivers/itgambl3.c2
-rw-r--r--src/mame/drivers/itgamble.c2
-rw-r--r--src/mame/drivers/jack.c10
-rw-r--r--src/mame/drivers/jackal.c4
-rw-r--r--src/mame/drivers/jackie.c4
-rw-r--r--src/mame/drivers/jackpool.c2
-rw-r--r--src/mame/drivers/jailbrek.c2
-rw-r--r--src/mame/drivers/jalmah.c4
-rw-r--r--src/mame/drivers/jangou.c20
-rw-r--r--src/mame/drivers/janshi.c2
-rw-r--r--src/mame/drivers/jantotsu.c4
-rw-r--r--src/mame/drivers/jchan.c4
-rw-r--r--src/mame/drivers/jedi.c2
-rw-r--r--src/mame/drivers/jokrwild.c2
-rw-r--r--src/mame/drivers/jollyjgr.c2
-rw-r--r--src/mame/drivers/jongkyo.c4
-rw-r--r--src/mame/drivers/jpmimpct.c6
-rw-r--r--src/mame/drivers/jpmsys5.c2
-rw-r--r--src/mame/drivers/jrpacman.c4
-rw-r--r--src/mame/drivers/junofrst.c8
-rw-r--r--src/mame/drivers/kaneko16.c22
-rw-r--r--src/mame/drivers/kangaroo.c8
-rw-r--r--src/mame/drivers/karnov.c8
-rw-r--r--src/mame/drivers/kchamp.c16
-rw-r--r--src/mame/drivers/kickgoal.c8
-rw-r--r--src/mame/drivers/kingdrby.c12
-rw-r--r--src/mame/drivers/kingobox.c20
-rw-r--r--src/mame/drivers/kingpin.c8
-rw-r--r--src/mame/drivers/kinst.c2
-rw-r--r--src/mame/drivers/klax.c2
-rw-r--r--src/mame/drivers/kncljoe.c6
-rw-r--r--src/mame/drivers/koftball.c2
-rw-r--r--src/mame/drivers/koikoi.c4
-rw-r--r--src/mame/drivers/konamigq.c4
-rw-r--r--src/mame/drivers/konamigv.c2
-rw-r--r--src/mame/drivers/konamigx.c18
-rw-r--r--src/mame/drivers/konamim2.c4
-rw-r--r--src/mame/drivers/kopunch.c4
-rw-r--r--src/mame/drivers/ksayakyu.c4
-rw-r--r--src/mame/drivers/ksys573.c2
-rw-r--r--src/mame/drivers/kungfur.c2
-rw-r--r--src/mame/drivers/kyugo.c30
-rw-r--r--src/mame/drivers/labyrunr.c2
-rw-r--r--src/mame/drivers/ladybug.c8
-rw-r--r--src/mame/drivers/ladyfrog.c4
-rw-r--r--src/mame/drivers/laserbas.c4
-rw-r--r--src/mame/drivers/laserbat.c10
-rw-r--r--src/mame/drivers/lasso.c20
-rw-r--r--src/mame/drivers/lastduel.c8
-rw-r--r--src/mame/drivers/lastfght.c2
-rw-r--r--src/mame/drivers/lazercmd.c12
-rw-r--r--src/mame/drivers/legionna.c16
-rw-r--r--src/mame/drivers/leland.c16
-rw-r--r--src/mame/drivers/lemmings.c4
-rw-r--r--src/mame/drivers/lethal.c4
-rw-r--r--src/mame/drivers/lethalj.c2
-rw-r--r--src/mame/drivers/lgp.c8
-rw-r--r--src/mame/drivers/liberate.c20
-rw-r--r--src/mame/drivers/liberatr.c4
-rw-r--r--src/mame/drivers/limenko.c10
-rw-r--r--src/mame/drivers/littlerb.c2
-rw-r--r--src/mame/drivers/lkage.c14
-rw-r--r--src/mame/drivers/lockon.c10
-rw-r--r--src/mame/drivers/looping.c12
-rw-r--r--src/mame/drivers/lordgun.c10
-rw-r--r--src/mame/drivers/lsasquad.c10
-rw-r--r--src/mame/drivers/ltcasino.c2
-rw-r--r--src/mame/drivers/luckgrln.c4
-rw-r--r--src/mame/drivers/lucky74.c4
-rw-r--r--src/mame/drivers/lvcards.c8
-rw-r--r--src/mame/drivers/lwings.c14
-rw-r--r--src/mame/drivers/m10.c6
-rw-r--r--src/mame/drivers/m107.c6
-rw-r--r--src/mame/drivers/m14.c4
-rw-r--r--src/mame/drivers/m52.c6
-rw-r--r--src/mame/drivers/m57.c2
-rw-r--r--src/mame/drivers/m58.c2
-rw-r--r--src/mame/drivers/m62.c40
-rw-r--r--src/mame/drivers/m63.c12
-rw-r--r--src/mame/drivers/m72.c98
-rw-r--r--src/mame/drivers/m79amb.c2
-rw-r--r--src/mame/drivers/m90.c40
-rw-r--r--src/mame/drivers/m92.c8
-rw-r--r--src/mame/drivers/macrossp.c4
-rw-r--r--src/mame/drivers/macs.c4
-rw-r--r--src/mame/drivers/madalien.c4
-rw-r--r--src/mame/drivers/madmotor.c4
-rw-r--r--src/mame/drivers/magic10.c10
-rw-r--r--src/mame/drivers/magicard.c2
-rw-r--r--src/mame/drivers/magicfly.c2
-rw-r--r--src/mame/drivers/magictg.c2
-rw-r--r--src/mame/drivers/magmax.c6
-rw-r--r--src/mame/drivers/mainevt.c8
-rw-r--r--src/mame/drivers/mainsnk.c6
-rw-r--r--src/mame/drivers/malzak.c6
-rw-r--r--src/mame/drivers/mappy.c14
-rw-r--r--src/mame/drivers/marineb.c6
-rw-r--r--src/mame/drivers/marinedt.c4
-rw-r--r--src/mame/drivers/mario.c8
-rw-r--r--src/mame/drivers/markham.c4
-rw-r--r--src/mame/drivers/mastboy.c4
-rw-r--r--src/mame/drivers/matmania.c10
-rw-r--r--src/mame/drivers/maxaflex.c4
-rw-r--r--src/mame/drivers/maygay1b.c2
-rw-r--r--src/mame/drivers/maygayv1.c8
-rw-r--r--src/mame/drivers/mayumi.c4
-rw-r--r--src/mame/drivers/mazerbla.c22
-rw-r--r--src/mame/drivers/mcatadv.c10
-rw-r--r--src/mame/drivers/mcr.c16
-rw-r--r--src/mame/drivers/mcr3.c8
-rw-r--r--src/mame/drivers/mcr68.c8
-rw-r--r--src/mame/drivers/meadows.c8
-rw-r--r--src/mame/drivers/mediagx.c4
-rw-r--r--src/mame/drivers/megadriv.c32
-rw-r--r--src/mame/drivers/megaplay.c4
-rw-r--r--src/mame/drivers/megasys1.c20
-rw-r--r--src/mame/drivers/megatech.c4
-rw-r--r--src/mame/drivers/megazone.c10
-rw-r--r--src/mame/drivers/meijinsn.c6
-rw-r--r--src/mame/drivers/merit.c32
-rw-r--r--src/mame/drivers/meritm.c12
-rw-r--r--src/mame/drivers/mermaid.c2
-rw-r--r--src/mame/drivers/metlclsh.c4
-rw-r--r--src/mame/drivers/metro.c100
-rw-r--r--src/mame/drivers/mexico86.c8
-rw-r--r--src/mame/drivers/mgolf.c2
-rw-r--r--src/mame/drivers/mhavoc.c6
-rw-r--r--src/mame/drivers/micro3d.c8
-rw-r--r--src/mame/drivers/midas.c2
-rw-r--r--src/mame/drivers/midtunit.c2
-rw-r--r--src/mame/drivers/midvunit.c4
-rw-r--r--src/mame/drivers/midwunit.c2
-rw-r--r--src/mame/drivers/midxunit.c2
-rw-r--r--src/mame/drivers/midyunit.c6
-rw-r--r--src/mame/drivers/midzeus.c4
-rw-r--r--src/mame/drivers/mikie.c4
-rw-r--r--src/mame/drivers/mil4000.c2
-rw-r--r--src/mame/drivers/miniboy7.c2
-rw-r--r--src/mame/drivers/minivadr.c2
-rw-r--r--src/mame/drivers/mirage.c2
-rw-r--r--src/mame/drivers/mirax.c4
-rw-r--r--src/mame/drivers/missb2.c6
-rw-r--r--src/mame/drivers/missile.c2
-rw-r--r--src/mame/drivers/mitchell.c26
-rw-r--r--src/mame/drivers/mjkjidai.c4
-rw-r--r--src/mame/drivers/mjsister.c4
-rw-r--r--src/mame/drivers/mlanding.c8
-rw-r--r--src/mame/drivers/model1.c14
-rw-r--r--src/mame/drivers/model2.c32
-rw-r--r--src/mame/drivers/model3.c16
-rw-r--r--src/mame/drivers/mogura.c4
-rw-r--r--src/mame/drivers/mole.c2
-rw-r--r--src/mame/drivers/momoko.c4
-rw-r--r--src/mame/drivers/moo.c8
-rw-r--r--src/mame/drivers/mosaic.c8
-rw-r--r--src/mame/drivers/mouser.c6
-rw-r--r--src/mame/drivers/mpoker.c2
-rw-r--r--src/mame/drivers/mpu4.c8
-rw-r--r--src/mame/drivers/mpu4drvr.c8
-rw-r--r--src/mame/drivers/mpu5.c2
-rw-r--r--src/mame/drivers/mquake.c2
-rw-r--r--src/mame/drivers/mrdo.c2
-rw-r--r--src/mame/drivers/mrflea.c8
-rw-r--r--src/mame/drivers/mrjong.c4
-rw-r--r--src/mame/drivers/ms32.c4
-rw-r--r--src/mame/drivers/msisaac.c6
-rw-r--r--src/mame/drivers/mugsmash.c4
-rw-r--r--src/mame/drivers/multfish.c4
-rw-r--r--src/mame/drivers/multigam.c4
-rw-r--r--src/mame/drivers/munchmo.c4
-rw-r--r--src/mame/drivers/murogem.c2
-rw-r--r--src/mame/drivers/murogmbl.c2
-rw-r--r--src/mame/drivers/mustache.c6
-rw-r--r--src/mame/drivers/mw8080bw.c42
-rw-r--r--src/mame/drivers/mwarr.c2
-rw-r--r--src/mame/drivers/mystston.c2
-rw-r--r--src/mame/drivers/mystwarr.c14
-rw-r--r--src/mame/drivers/n8080.c12
-rw-r--r--src/mame/drivers/namcofl.c6
-rw-r--r--src/mame/drivers/namcona1.c8
-rw-r--r--src/mame/drivers/namconb1.c12
-rw-r--r--src/mame/drivers/namcond1.c6
-rw-r--r--src/mame/drivers/namcos1.c10
-rw-r--r--src/mame/drivers/namcos10.c2
-rw-r--r--src/mame/drivers/namcos11.c2
-rw-r--r--src/mame/drivers/namcos12.c6
-rw-r--r--src/mame/drivers/namcos2.c48
-rw-r--r--src/mame/drivers/namcos21.c50
-rw-r--r--src/mame/drivers/namcos22.c36
-rw-r--r--src/mame/drivers/namcos23.c22
-rw-r--r--src/mame/drivers/namcos86.c28
-rw-r--r--src/mame/drivers/naomi.c8
-rw-r--r--src/mame/drivers/naughtyb.c4
-rw-r--r--src/mame/drivers/nbmj8688.c54
-rw-r--r--src/mame/drivers/nbmj8891.c62
-rw-r--r--src/mame/drivers/nbmj8991.c36
-rw-r--r--src/mame/drivers/nbmj9195.c86
-rw-r--r--src/mame/drivers/nemesis.c36
-rw-r--r--src/mame/drivers/neogeo.c6
-rw-r--r--src/mame/drivers/news.c2
-rw-r--r--src/mame/drivers/nightgal.c12
-rw-r--r--src/mame/drivers/ninjakd2.c14
-rw-r--r--src/mame/drivers/ninjaw.c12
-rw-r--r--src/mame/drivers/nitedrvr.c2
-rw-r--r--src/mame/drivers/niyanpai.c10
-rw-r--r--src/mame/drivers/nmg5.c16
-rw-r--r--src/mame/drivers/nmk16.c70
-rw-r--r--src/mame/drivers/norautp.c8
-rw-r--r--src/mame/drivers/nova2001.c16
-rw-r--r--src/mame/drivers/nss.c4
-rw-r--r--src/mame/drivers/nwk-tr.c6
-rw-r--r--src/mame/drivers/nycaptor.c24
-rw-r--r--src/mame/drivers/nyny.c6
-rw-r--r--src/mame/drivers/offtwall.c2
-rw-r--r--src/mame/drivers/ohmygod.c2
-rw-r--r--src/mame/drivers/ojankohs.c16
-rw-r--r--src/mame/drivers/olibochu.c4
-rw-r--r--src/mame/drivers/omegrace.c8
-rw-r--r--src/mame/drivers/oneshot.c4
-rw-r--r--src/mame/drivers/onetwo.c8
-rw-r--r--src/mame/drivers/opwolf.c10
-rw-r--r--src/mame/drivers/orbit.c2
-rw-r--r--src/mame/drivers/othldrby.c2
-rw-r--r--src/mame/drivers/othunder.c4
-rw-r--r--src/mame/drivers/overdriv.c6
-rw-r--r--src/mame/drivers/pachifev.c4
-rw-r--r--src/mame/drivers/pacland.c6
-rw-r--r--src/mame/drivers/pacman.c99
-rw-r--r--src/mame/drivers/pandoras.c10
-rw-r--r--src/mame/drivers/pangofun.c2
-rw-r--r--src/mame/drivers/panicr.c6
-rw-r--r--src/mame/drivers/paradise.c14
-rw-r--r--src/mame/drivers/paranoia.c12
-rw-r--r--src/mame/drivers/parodius.c4
-rw-r--r--src/mame/drivers/pasha2.c4
-rw-r--r--src/mame/drivers/pass.c6
-rw-r--r--src/mame/drivers/pastelg.c8
-rw-r--r--src/mame/drivers/pbaction.c6
-rw-r--r--src/mame/drivers/pcat_nit.c4
-rw-r--r--src/mame/drivers/pcktgal.c4
-rw-r--r--src/mame/drivers/pcxt.c8
-rw-r--r--src/mame/drivers/pengo.c4
-rw-r--r--src/mame/drivers/peplus.c4
-rw-r--r--src/mame/drivers/pgm.c26
-rw-r--r--src/mame/drivers/phoenix.c6
-rw-r--r--src/mame/drivers/pingpong.c4
-rw-r--r--src/mame/drivers/pipedrm.c16
-rw-r--r--src/mame/drivers/pipeline.c8
-rw-r--r--src/mame/drivers/pirates.c2
-rw-r--r--src/mame/drivers/pitnrun.c8
-rw-r--r--src/mame/drivers/pkscram.c2
-rw-r--r--src/mame/drivers/pktgaldx.c4
-rw-r--r--src/mame/drivers/playch10.c6
-rw-r--r--src/mame/drivers/playmark.c20
-rw-r--r--src/mame/drivers/plygonet.c8
-rw-r--r--src/mame/drivers/pntnpuzl.c2
-rw-r--r--src/mame/drivers/pokechmp.c4
-rw-r--r--src/mame/drivers/polepos.c14
-rw-r--r--src/mame/drivers/policetr.c4
-rw-r--r--src/mame/drivers/polyplay.c4
-rw-r--r--src/mame/drivers/poolshrk.c2
-rw-r--r--src/mame/drivers/pooyan.c2
-rw-r--r--src/mame/drivers/popeye.c8
-rw-r--r--src/mame/drivers/popper.c4
-rw-r--r--src/mame/drivers/portrait.c4
-rw-r--r--src/mame/drivers/powerbal.c4
-rw-r--r--src/mame/drivers/powerins.c10
-rw-r--r--src/mame/drivers/ppmast93.c8
-rw-r--r--src/mame/drivers/prehisle.c6
-rw-r--r--src/mame/drivers/progolf.c4
-rw-r--r--src/mame/drivers/psattack.c2
-rw-r--r--src/mame/drivers/psikyo.c18
-rw-r--r--src/mame/drivers/psikyo4.c2
-rw-r--r--src/mame/drivers/psikyosh.c6
-rw-r--r--src/mame/drivers/psychic5.c12
-rw-r--r--src/mame/drivers/pturn.c4
-rw-r--r--src/mame/drivers/puckpkmn.c2
-rw-r--r--src/mame/drivers/punchout.c8
-rw-r--r--src/mame/drivers/pushman.c14
-rw-r--r--src/mame/drivers/pzletime.c2
-rw-r--r--src/mame/drivers/qdrmfgp.c4
-rw-r--r--src/mame/drivers/qix.c6
-rw-r--r--src/mame/drivers/quantum.c2
-rw-r--r--src/mame/drivers/quasar.c8
-rw-r--r--src/mame/drivers/queen.c4
-rw-r--r--src/mame/drivers/quizdna.c10
-rw-r--r--src/mame/drivers/quizo.c4
-rw-r--r--src/mame/drivers/quizpani.c2
-rw-r--r--src/mame/drivers/quizpun2.c8
-rw-r--r--src/mame/drivers/r2dtank.c4
-rw-r--r--src/mame/drivers/rabbit.c4
-rw-r--r--src/mame/drivers/raiden.c8
-rw-r--r--src/mame/drivers/raiden2.c4
-rw-r--r--src/mame/drivers/rainbow.c8
-rw-r--r--src/mame/drivers/rallyx.c6
-rw-r--r--src/mame/drivers/rampart.c2
-rw-r--r--src/mame/drivers/rastan.c4
-rw-r--r--src/mame/drivers/rbmk.c2
-rw-r--r--src/mame/drivers/rcorsair.c2
-rw-r--r--src/mame/drivers/re900.c4
-rw-r--r--src/mame/drivers/realbrk.c12
-rw-r--r--src/mame/drivers/redalert.c6
-rw-r--r--src/mame/drivers/redclash.c4
-rw-r--r--src/mame/drivers/relief.c2
-rw-r--r--src/mame/drivers/renegade.c4
-rw-r--r--src/mame/drivers/retofinv.c8
-rw-r--r--src/mame/drivers/rmhaihai.c8
-rw-r--r--src/mame/drivers/rockola.c10
-rw-r--r--src/mame/drivers/rockrage.c4
-rw-r--r--src/mame/drivers/rocnrope.c2
-rw-r--r--src/mame/drivers/rohga.c16
-rw-r--r--src/mame/drivers/rollerg.c4
-rw-r--r--src/mame/drivers/rollrace.c4
-rw-r--r--src/mame/drivers/rotaryf.c4
-rw-r--r--src/mame/drivers/roul.c8
-rw-r--r--src/mame/drivers/route16.c18
-rw-r--r--src/mame/drivers/royalmah.c64
-rw-r--r--src/mame/drivers/rpunch.c4
-rw-r--r--src/mame/drivers/runaway.c2
-rw-r--r--src/mame/drivers/rungun.c4
-rw-r--r--src/mame/drivers/safarir.c2
-rw-r--r--src/mame/drivers/sandscrp.c6
-rw-r--r--src/mame/drivers/sangho.c8
-rw-r--r--src/mame/drivers/sauro.c8
-rw-r--r--src/mame/drivers/sbasketb.c4
-rw-r--r--src/mame/drivers/sbowling.c4
-rw-r--r--src/mame/drivers/sbrkout.c2
-rw-r--r--src/mame/drivers/sbugger.c4
-rw-r--r--src/mame/drivers/scobra.c26
-rw-r--r--src/mame/drivers/scotrsht.c6
-rw-r--r--src/mame/drivers/scramble.c34
-rw-r--r--src/mame/drivers/scregg.c4
-rw-r--r--src/mame/drivers/sderby.c6
-rw-r--r--src/mame/drivers/seattle.c2
-rw-r--r--src/mame/drivers/segac2.c2
-rw-r--r--src/mame/drivers/segae.c4
-rw-r--r--src/mame/drivers/segag80r.c12
-rw-r--r--src/mame/drivers/segag80v.c4
-rw-r--r--src/mame/drivers/segahang.c20
-rw-r--r--src/mame/drivers/segald.c4
-rw-r--r--src/mame/drivers/segaorun.c8
-rw-r--r--src/mame/drivers/segas16a.c10
-rw-r--r--src/mame/drivers/segas16b.c8
-rw-r--r--src/mame/drivers/segas18.c8
-rw-r--r--src/mame/drivers/segas24.c4
-rw-r--r--src/mame/drivers/segas32.c14
-rw-r--r--src/mame/drivers/segaxbd.c12
-rw-r--r--src/mame/drivers/segaybd.c10
-rw-r--r--src/mame/drivers/seibuspi.c8
-rw-r--r--src/mame/drivers/seicross.c8
-rw-r--r--src/mame/drivers/sengokmj.c4
-rw-r--r--src/mame/drivers/senjyo.c10
-rw-r--r--src/mame/drivers/seta.c92
-rw-r--r--src/mame/drivers/seta2.c22
-rw-r--r--src/mame/drivers/sf.c12
-rw-r--r--src/mame/drivers/sfbonus.c4
-rw-r--r--src/mame/drivers/sfkick.c8
-rw-r--r--src/mame/drivers/sg1000a.c4
-rw-r--r--src/mame/drivers/shadfrce.c4
-rw-r--r--src/mame/drivers/shangha3.c14
-rw-r--r--src/mame/drivers/shanghai.c10
-rw-r--r--src/mame/drivers/shangkid.c22
-rw-r--r--src/mame/drivers/shaolins.c2
-rw-r--r--src/mame/drivers/shisen.c8
-rw-r--r--src/mame/drivers/shootout.c6
-rw-r--r--src/mame/drivers/shougi.c8
-rw-r--r--src/mame/drivers/shuuz.c2
-rw-r--r--src/mame/drivers/sidearms.c14
-rw-r--r--src/mame/drivers/sidepckt.c4
-rw-r--r--src/mame/drivers/silkroad.c2
-rw-r--r--src/mame/drivers/simpl156.c10
-rw-r--r--src/mame/drivers/simpsons.c4
-rw-r--r--src/mame/drivers/skimaxx.c6
-rw-r--r--src/mame/drivers/skullxbo.c2
-rw-r--r--src/mame/drivers/skyarmy.c4
-rw-r--r--src/mame/drivers/skydiver.c2
-rw-r--r--src/mame/drivers/skyfox.c4
-rw-r--r--src/mame/drivers/skykid.c6
-rw-r--r--src/mame/drivers/skylncr.c4
-rw-r--r--src/mame/drivers/skyraid.c2
-rw-r--r--src/mame/drivers/slapfght.c28
-rw-r--r--src/mame/drivers/slapshot.c8
-rw-r--r--src/mame/drivers/sliver.c6
-rw-r--r--src/mame/drivers/slotcarn.c4
-rw-r--r--src/mame/drivers/sms.c6
-rw-r--r--src/mame/drivers/snesb.c4
-rw-r--r--src/mame/drivers/snk.c84
-rw-r--r--src/mame/drivers/snk68.c8
-rw-r--r--src/mame/drivers/snookr10.c4
-rw-r--r--src/mame/drivers/snowbros.c32
-rw-r--r--src/mame/drivers/solomon.c6
-rw-r--r--src/mame/drivers/sonson.c4
-rw-r--r--src/mame/drivers/sothello.c10
-rw-r--r--src/mame/drivers/spacefb.c8
-rw-r--r--src/mame/drivers/spaceg.c2
-rw-r--r--src/mame/drivers/spbactn.c4
-rw-r--r--src/mame/drivers/spcforce.c6
-rw-r--r--src/mame/drivers/spdodgeb.c4
-rw-r--r--src/mame/drivers/speedatk.c4
-rw-r--r--src/mame/drivers/speedbal.c8
-rw-r--r--src/mame/drivers/speedspn.c6
-rw-r--r--src/mame/drivers/speglsht.c6
-rw-r--r--src/mame/drivers/spiders.c4
-rw-r--r--src/mame/drivers/splash.c14
-rw-r--r--src/mame/drivers/spoker.c4
-rw-r--r--src/mame/drivers/spool99.c2
-rw-r--r--src/mame/drivers/sprcros2.c8
-rw-r--r--src/mame/drivers/sprint2.c2
-rw-r--r--src/mame/drivers/sprint4.c2
-rw-r--r--src/mame/drivers/sprint8.c2
-rw-r--r--src/mame/drivers/spy.c4
-rw-r--r--src/mame/drivers/srmp2.c8
-rw-r--r--src/mame/drivers/srmp5.c6
-rw-r--r--src/mame/drivers/srmp6.c2
-rw-r--r--src/mame/drivers/srumbler.c4
-rw-r--r--src/mame/drivers/ssfindo.c4
-rw-r--r--src/mame/drivers/sshangha.c4
-rw-r--r--src/mame/drivers/ssingles.c4
-rw-r--r--src/mame/drivers/sslam.c6
-rw-r--r--src/mame/drivers/ssozumo.c4
-rw-r--r--src/mame/drivers/sspeedr.c4
-rw-r--r--src/mame/drivers/ssrj.c2
-rw-r--r--src/mame/drivers/sstrangr.c4
-rw-r--r--src/mame/drivers/ssv.c38
-rw-r--r--src/mame/drivers/st0016.c8
-rw-r--r--src/mame/drivers/stactics.c2
-rw-r--r--src/mame/drivers/stadhero.c4
-rw-r--r--src/mame/drivers/starcrus.c4
-rw-r--r--src/mame/drivers/starfire.c2
-rw-r--r--src/mame/drivers/starshp1.c2
-rw-r--r--src/mame/drivers/starwars.c4
-rw-r--r--src/mame/drivers/statriv2.c4
-rw-r--r--src/mame/drivers/stepstag.c4
-rw-r--r--src/mame/drivers/stfight.c4
-rw-r--r--src/mame/drivers/stlforce.c2
-rw-r--r--src/mame/drivers/strnskil.c4
-rw-r--r--src/mame/drivers/stv.c6
-rw-r--r--src/mame/drivers/subs.c2
-rw-r--r--src/mame/drivers/subsino.c12
-rw-r--r--src/mame/drivers/suna16.c36
-rw-r--r--src/mame/drivers/suna8.c36
-rw-r--r--src/mame/drivers/supbtime.c8
-rw-r--r--src/mame/drivers/supdrapo.c2
-rw-r--r--src/mame/drivers/superchs.c4
-rw-r--r--src/mame/drivers/superdq.c4
-rw-r--r--src/mame/drivers/superqix.c20
-rw-r--r--src/mame/drivers/supertnk.c4
-rw-r--r--src/mame/drivers/suprgolf.c4
-rw-r--r--src/mame/drivers/suprloco.c4
-rw-r--r--src/mame/drivers/suprnova.c2
-rw-r--r--src/mame/drivers/suprridr.c8
-rw-r--r--src/mame/drivers/suprslam.c6
-rw-r--r--src/mame/drivers/surpratk.c2
-rw-r--r--src/mame/drivers/system1.c16
-rw-r--r--src/mame/drivers/system16.c38
-rw-r--r--src/mame/drivers/system18.c14
-rw-r--r--src/mame/drivers/tagteam.c4
-rw-r--r--src/mame/drivers/tail2nos.c6
-rw-r--r--src/mame/drivers/taito_b.c72
-rw-r--r--src/mame/drivers/taito_f2.c70
-rw-r--r--src/mame/drivers/taito_f3.c4
-rw-r--r--src/mame/drivers/taito_h.c12
-rw-r--r--src/mame/drivers/taito_l.c38
-rw-r--r--src/mame/drivers/taito_o.c2
-rw-r--r--src/mame/drivers/taito_x.c16
-rw-r--r--src/mame/drivers/taito_z.c56
-rw-r--r--src/mame/drivers/taitoair.c10
-rw-r--r--src/mame/drivers/taitogn.c2
-rw-r--r--src/mame/drivers/taitojc.c10
-rw-r--r--src/mame/drivers/taitopjc.c2
-rw-r--r--src/mame/drivers/taitosj.c10
-rw-r--r--src/mame/drivers/taitotz.c2
-rw-r--r--src/mame/drivers/taitowlf.c4
-rw-r--r--src/mame/drivers/tank8.c2
-rw-r--r--src/mame/drivers/tankbatt.c2
-rw-r--r--src/mame/drivers/tankbust.c6
-rw-r--r--src/mame/drivers/taotaido.c6
-rw-r--r--src/mame/drivers/targeth.c2
-rw-r--r--src/mame/drivers/tarzan.c2
-rw-r--r--src/mame/drivers/tatsumi.c26
-rw-r--r--src/mame/drivers/tattack.c2
-rw-r--r--src/mame/drivers/taxidrvr.c8
-rw-r--r--src/mame/drivers/tbowl.c6
-rw-r--r--src/mame/drivers/tceptor.c12
-rw-r--r--src/mame/drivers/tcl.c2
-rw-r--r--src/mame/drivers/tecmo.c10
-rw-r--r--src/mame/drivers/tecmo16.c6
-rw-r--r--src/mame/drivers/tecmosys.c6
-rw-r--r--src/mame/drivers/tehkanwc.c8
-rw-r--r--src/mame/drivers/tempest.c2
-rw-r--r--src/mame/drivers/terracre.c18
-rw-r--r--src/mame/drivers/tetrisp2.c12
-rw-r--r--src/mame/drivers/thayers.c6
-rw-r--r--src/mame/drivers/thedeep.c4
-rw-r--r--src/mame/drivers/thepit.c8
-rw-r--r--src/mame/drivers/thief.c12
-rw-r--r--src/mame/drivers/thoop2.c2
-rw-r--r--src/mame/drivers/thunderj.c4
-rw-r--r--src/mame/drivers/thunderx.c8
-rw-r--r--src/mame/drivers/tiamc1.c4
-rw-r--r--src/mame/drivers/tickee.c4
-rw-r--r--src/mame/drivers/tigeroad.c10
-rw-r--r--src/mame/drivers/timelimt.c8
-rw-r--r--src/mame/drivers/timeplt.c4
-rw-r--r--src/mame/drivers/tmaster.c4
-rw-r--r--src/mame/drivers/tmnt.c44
-rw-r--r--src/mame/drivers/tnzs.c38
-rw-r--r--src/mame/drivers/toaplan1.c44
-rw-r--r--src/mame/drivers/toaplan2.c82
-rw-r--r--src/mame/drivers/toki.c6
-rw-r--r--src/mame/drivers/tokyocop.c2
-rw-r--r--src/mame/drivers/tomcat.c8
-rw-r--r--src/mame/drivers/toobin.c2
-rw-r--r--src/mame/drivers/topshoot.c4
-rw-r--r--src/mame/drivers/topspeed.c6
-rw-r--r--src/mame/drivers/toratora.c2
-rw-r--r--src/mame/drivers/tourtabl.c2
-rw-r--r--src/mame/drivers/toypop.c8
-rw-r--r--src/mame/drivers/tp84.c8
-rw-r--r--src/mame/drivers/trackfld.c16
-rw-r--r--src/mame/drivers/travrusa.c2
-rw-r--r--src/mame/drivers/triforce.c2
-rw-r--r--src/mame/drivers/triplhnt.c2
-rw-r--r--src/mame/drivers/truco.c2
-rw-r--r--src/mame/drivers/trucocl.c2
-rw-r--r--src/mame/drivers/trvmadns.c4
-rw-r--r--src/mame/drivers/trvquest.c2
-rw-r--r--src/mame/drivers/tryout.c4
-rw-r--r--src/mame/drivers/tsamurai.c26
-rw-r--r--src/mame/drivers/ttchamp.c4
-rw-r--r--src/mame/drivers/tubep.c30
-rw-r--r--src/mame/drivers/tugboat.c2
-rw-r--r--src/mame/drivers/tumbleb.c26
-rw-r--r--src/mame/drivers/tumblep.c4
-rw-r--r--src/mame/drivers/tunhunt.c2
-rw-r--r--src/mame/drivers/turbo.c10
-rw-r--r--src/mame/drivers/tutankhm.c2
-rw-r--r--src/mame/drivers/twin16.c10
-rw-r--r--src/mame/drivers/twincobr.c10
-rw-r--r--src/mame/drivers/twins.c8
-rw-r--r--src/mame/drivers/tx1.c24
-rw-r--r--src/mame/drivers/uapce.c6
-rw-r--r--src/mame/drivers/ultraman.c6
-rw-r--r--src/mame/drivers/ultratnk.c2
-rw-r--r--src/mame/drivers/ultrsprt.c4
-rw-r--r--src/mame/drivers/undrfire.c6
-rw-r--r--src/mame/drivers/unico.c6
-rw-r--r--src/mame/drivers/upscope.c2
-rw-r--r--src/mame/drivers/usgames.c4
-rw-r--r--src/mame/drivers/vamphalf.c28
-rw-r--r--src/mame/drivers/vaportra.c4
-rw-r--r--src/mame/drivers/vastar.c8
-rw-r--r--src/mame/drivers/vball.c4
-rw-r--r--src/mame/drivers/vcombat.c14
-rw-r--r--src/mame/drivers/vegaeo.c2
-rw-r--r--src/mame/drivers/vegas.c8
-rw-r--r--src/mame/drivers/vendetta.c6
-rw-r--r--src/mame/drivers/vertigo.c4
-rw-r--r--src/mame/drivers/vicdual.c62
-rw-r--r--src/mame/drivers/victory.c4
-rw-r--r--src/mame/drivers/videopin.c2
-rw-r--r--src/mame/drivers/videopkr.c12
-rw-r--r--src/mame/drivers/vigilant.c24
-rw-r--r--src/mame/drivers/vindictr.c2
-rw-r--r--src/mame/drivers/viper.c2
-rw-r--r--src/mame/drivers/vmetal.c2
-rw-r--r--src/mame/drivers/volfied.c4
-rw-r--r--src/mame/drivers/vroulet.c4
-rw-r--r--src/mame/drivers/vsnes.c6
-rw-r--r--src/mame/drivers/vulgus.c4
-rw-r--r--src/mame/drivers/wallc.c2
-rw-r--r--src/mame/drivers/wardner.c12
-rw-r--r--src/mame/drivers/warpwarp.c8
-rw-r--r--src/mame/drivers/warriorb.c8
-rw-r--r--src/mame/drivers/wc90.c6
-rw-r--r--src/mame/drivers/wc90b.c6
-rw-r--r--src/mame/drivers/wecleman.c12
-rw-r--r--src/mame/drivers/welltris.c6
-rw-r--r--src/mame/drivers/wgp.c6
-rw-r--r--src/mame/drivers/wheelfir.c4
-rw-r--r--src/mame/drivers/williams.c20
-rw-r--r--src/mame/drivers/wink.c8
-rw-r--r--src/mame/drivers/wiping.c4
-rw-r--r--src/mame/drivers/witch.c4
-rw-r--r--src/mame/drivers/wiz.c6
-rw-r--r--src/mame/drivers/wldarrow.c2
-rw-r--r--src/mame/drivers/wolfpack.c2
-rw-r--r--src/mame/drivers/wrally.c6
-rw-r--r--src/mame/drivers/wwfsstar.c4
-rw-r--r--src/mame/drivers/wwfwfest.c4
-rw-r--r--src/mame/drivers/xain.c8
-rw-r--r--src/mame/drivers/xexex.c4
-rw-r--r--src/mame/drivers/xmen.c8
-rw-r--r--src/mame/drivers/xorworld.c2
-rw-r--r--src/mame/drivers/xtheball.c2
-rw-r--r--src/mame/drivers/xxmissio.c4
-rw-r--r--src/mame/drivers/xybots.c2
-rw-r--r--src/mame/drivers/xyonix.c4
-rw-r--r--src/mame/drivers/yiear.c2
-rw-r--r--src/mame/drivers/yunsun16.c8
-rw-r--r--src/mame/drivers/yunsung8.c6
-rw-r--r--src/mame/drivers/zac2650.c4
-rw-r--r--src/mame/drivers/zaccaria.c6
-rw-r--r--src/mame/drivers/zaxxon.c6
-rw-r--r--src/mame/drivers/zerozone.c4
-rw-r--r--src/mame/drivers/zn.c28
-rw-r--r--src/mame/drivers/zodiack.c6
-rw-r--r--src/mame/drivers/zr107.c12
-rw-r--r--src/mame/machine/asic65.c4
-rw-r--r--src/mame/video/qix.c6
1044 files changed, 4639 insertions, 4619 deletions
diff --git a/src/emu/cpuexec.h b/src/emu/cpuexec.h
index 551c9a4f1cb..f4ce2534d06 100644
--- a/src/emu/cpuexec.h
+++ b/src/emu/cpuexec.h
@@ -115,17 +115,14 @@ struct _cpu_class_header
#define MDRV_CPU_CONFIG(_config) \
MDRV_DEVICE_CONFIG(_config)
-#define MDRV_CPU_PROGRAM_MAP(_map1, _map2) \
+#define MDRV_CPU_PROGRAM_MAP(_map1) \
MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(cpu_config, address_map, ADDRESS_SPACE_PROGRAM, ADDRESS_MAP_NAME(_map1)) \
- MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(cpu_config, address_map2, ADDRESS_SPACE_PROGRAM, ADDRESS_MAP_NAME(_map2))
-#define MDRV_CPU_DATA_MAP(_map1, _map2) \
+#define MDRV_CPU_DATA_MAP(_map1) \
MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(cpu_config, address_map, ADDRESS_SPACE_DATA, ADDRESS_MAP_NAME(_map1)) \
- MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(cpu_config, address_map2, ADDRESS_SPACE_DATA, ADDRESS_MAP_NAME(_map2))
-#define MDRV_CPU_IO_MAP(_map1, _map2) \
+#define MDRV_CPU_IO_MAP(_map1) \
MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(cpu_config, address_map, ADDRESS_SPACE_IO, ADDRESS_MAP_NAME(_map1)) \
- MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(cpu_config, address_map2, ADDRESS_SPACE_IO, ADDRESS_MAP_NAME(_map2))
#define MDRV_CPU_VBLANK_INT(_tag, _func) \
MDRV_DEVICE_CONFIG_DATAPTR(cpu_config, vblank_interrupt, _func) \
diff --git a/src/emu/machine/ldpr8210.c b/src/emu/machine/ldpr8210.c
index 83d9d9478c0..8c6ed7c9f82 100644
--- a/src/emu/machine/ldpr8210.c
+++ b/src/emu/machine/ldpr8210.c
@@ -285,7 +285,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( pr8210 )
MDRV_CPU_ADD("pr8210", I8049, XTAL_4_41MHz)
- MDRV_CPU_IO_MAP(pr8210_portmap,0)
+ MDRV_CPU_IO_MAP(pr8210_portmap)
MACHINE_DRIVER_END
@@ -1000,7 +1000,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( simutrek )
MDRV_CPU_ADD("simutrek", I8748, XTAL_6MHz)
- MDRV_CPU_IO_MAP(simutrek_portmap,0)
+ MDRV_CPU_IO_MAP(simutrek_portmap)
MDRV_IMPORT_FROM(pr8210)
MACHINE_DRIVER_END
diff --git a/src/emu/machine/ldv1000.c b/src/emu/machine/ldv1000.c
index e8f69cceac2..b995c227b0a 100644
--- a/src/emu/machine/ldv1000.c
+++ b/src/emu/machine/ldv1000.c
@@ -165,8 +165,8 @@ static const z80_daisy_chain daisy_chain[] =
static MACHINE_DRIVER_START( ldv1000 )
MDRV_CPU_ADD("ldv1000", Z80, XTAL_5MHz/2)
MDRV_CPU_CONFIG(daisy_chain)
- MDRV_CPU_PROGRAM_MAP(ldv1000_map,0)
- MDRV_CPU_IO_MAP(ldv1000_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(ldv1000_map)
+ MDRV_CPU_IO_MAP(ldv1000_portmap)
MDRV_Z80CTC_ADD("ldvctc", XTAL_5MHz/2 /* same as "ldv1000" */, ctcintf)
MDRV_PPI8255_ADD("ldvppi0", ppi0intf)
diff --git a/src/emu/machine/ldvp931.c b/src/emu/machine/ldvp931.c
index fe62af11fdd..9d4fdd260b9 100644
--- a/src/emu/machine/ldvp931.c
+++ b/src/emu/machine/ldvp931.c
@@ -134,7 +134,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( vp931 )
MDRV_CPU_ADD("vp931", I8049, XTAL_11MHz)
- MDRV_CPU_IO_MAP(vp931_portmap,0)
+ MDRV_CPU_IO_MAP(vp931_portmap)
MDRV_TIMER_ADD("tracktimer", track_timer)
MACHINE_DRIVER_END
diff --git a/src/emu/memory.h b/src/emu/memory.h
index 6015ff6061b..f633b0d33b0 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -319,7 +319,7 @@ typedef union _addrmap8_token addrmap8_token;
union _addrmap8_token
{
TOKEN_COMMON_FIELDS
- const addrmap_token * tokenptr;
+ const addrmap8_token * tokenptr;
read8_space_func sread; /* pointer to native space read handler */
write8_space_func swrite; /* pointer to native space write handler */
read8_device_func dread; /* pointer to native device read handler */
@@ -336,7 +336,7 @@ typedef union _addrmap16_token addrmap16_token;
union _addrmap16_token
{
TOKEN_COMMON_FIELDS
- const addrmap_token * tokenptr;
+ const addrmap16_token * tokenptr;
read16_space_func sread; /* pointer to native read handler */
write16_space_func swrite; /* pointer to native write handler */
read16_device_func dread; /* pointer to native device read handler */
@@ -357,7 +357,7 @@ typedef union _addrmap32_token addrmap32_token;
union _addrmap32_token
{
TOKEN_COMMON_FIELDS
- const addrmap_token * tokenptr;
+ const addrmap32_token * tokenptr;
read32_space_func sread; /* pointer to native read handler */
write32_space_func swrite; /* pointer to native write handler */
read32_device_func dread; /* pointer to native device read handler */
@@ -382,7 +382,7 @@ typedef union _addrmap64_token addrmap64_token;
union _addrmap64_token
{
TOKEN_COMMON_FIELDS
- const addrmap_token * tokenptr;
+ const addrmap64_token * tokenptr;
read64_space_func sread; /* pointer to native read handler */
write64_space_func swrite; /* pointer to native write handler */
read64_device_func dread; /* pointer to native device read handler */
@@ -631,7 +631,7 @@ union _addrmap64_token
/* importing data from other address maps */
#define AM_IMPORT_FROM(_name) \
TOKEN_UINT32_PACK1(ADDRMAP_TOKEN_INCLUDE, 8), \
- TOKEN_PTR(tokenptr, address_map_##_name),
+ TOKEN_PTR(tokenptr, ADDRESS_MAP_NAME(_name)),
/* address ranges */
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index b0ad22e693a..a77f96f1156 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -772,7 +772,7 @@ MACHINE_DRIVER_START( jsa_i_stereo )
/* basic machine hardware */
MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(atarijsa1_map,0)
+ MDRV_CPU_PROGRAM_MAP(atarijsa1_map)
MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
/* sound hardware */
@@ -817,7 +817,7 @@ MACHINE_DRIVER_START( jsa_i_mono_speech )
/* basic machine hardware */
MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(atarijsa1_map,0)
+ MDRV_CPU_PROGRAM_MAP(atarijsa1_map)
MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
/* sound hardware */
@@ -838,7 +838,7 @@ MACHINE_DRIVER_START( jsa_ii_mono )
/* basic machine hardware */
MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(atarijsa2_map,0)
+ MDRV_CPU_PROGRAM_MAP(atarijsa2_map)
MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
/* sound hardware */
@@ -861,7 +861,7 @@ MACHINE_DRIVER_START( jsa_iii_mono )
/* basic machine hardware */
MDRV_IMPORT_FROM(jsa_ii_mono)
MDRV_CPU_MODIFY("jsa")
- MDRV_CPU_PROGRAM_MAP(atarijsa3_map,0)
+ MDRV_CPU_PROGRAM_MAP(atarijsa3_map)
MACHINE_DRIVER_END
@@ -881,7 +881,7 @@ MACHINE_DRIVER_START( jsa_iiis_stereo )
/* basic machine hardware */
MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(atarijsa3s_map,0)
+ MDRV_CPU_PROGRAM_MAP(atarijsa3s_map)
MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
/* sound hardware */
diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c
index b040cab588f..38e072efe60 100644
--- a/src/mame/audio/cage.c
+++ b/src/mame/audio/cage.c
@@ -652,7 +652,7 @@ MACHINE_DRIVER_START( cage )
/* basic machine hardware */
MDRV_CPU_ADD("cage", TMS32031, 33868800)
MDRV_CPU_CONFIG(cage_config)
- MDRV_CPU_PROGRAM_MAP(cage_map,0)
+ MDRV_CPU_PROGRAM_MAP(cage_map)
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -683,5 +683,5 @@ MACHINE_DRIVER_START( cage_seattle )
MDRV_IMPORT_FROM(cage)
MDRV_CPU_MODIFY("cage")
- MDRV_CPU_PROGRAM_MAP(cage_map_seattle,0)
+ MDRV_CPU_PROGRAM_MAP(cage_map_seattle)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c
index 978c9f8e7fd..de52230aba3 100644
--- a/src/mame/audio/carnival.c
+++ b/src/mame/audio/carnival.c
@@ -298,8 +298,8 @@ ADDRESS_MAP_END
MACHINE_DRIVER_START( carnival_audio )
MDRV_CPU_ADD("audiocpu", I8039, 3579545)
- MDRV_CPU_PROGRAM_MAP(carnival_audio_map,0)
- MDRV_CPU_IO_MAP(carnival_audio_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(carnival_audio_map)
+ MDRV_CPU_IO_MAP(carnival_audio_io_map)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index ad5d92ada0d..d74512d3973 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -1578,8 +1578,8 @@ MACHINE_DRIVER_START( demon_sound )
/* basic machine hardware */
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
MDRV_CPU_CONFIG(daisy_chain)
- MDRV_CPU_PROGRAM_MAP(demon_sound_map,0)
- MDRV_CPU_IO_MAP(demon_sound_ports,0)
+ MDRV_CPU_PROGRAM_MAP(demon_sound_map)
+ MDRV_CPU_IO_MAP(demon_sound_ports)
MDRV_Z80CTC_ADD("ctc", 3579545 /* same as "audiocpu" */, demon_z80ctc_interface)
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index a6fbca64890..5668e96096d 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -611,8 +611,8 @@ static const adsp21xx_config adsp_config =
MACHINE_DRIVER_START( dcs_audio_2k )
MDRV_CPU_ADD("dcs", ADSP2105, XTAL_10MHz)
MDRV_CPU_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(dcs_2k_program_map,0)
- MDRV_CPU_DATA_MAP(dcs_2k_data_map,0)
+ MDRV_CPU_PROGRAM_MAP(dcs_2k_program_map)
+ MDRV_CPU_DATA_MAP(dcs_2k_data_map)
MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -626,7 +626,7 @@ MACHINE_DRIVER_START( dcs_audio_2k_uart )
MDRV_IMPORT_FROM(dcs_audio_2k)
MDRV_CPU_MODIFY("dcs")
- MDRV_CPU_DATA_MAP(dcs_2k_uart_data_map,0)
+ MDRV_CPU_DATA_MAP(dcs_2k_uart_data_map)
MACHINE_DRIVER_END
@@ -635,8 +635,8 @@ MACHINE_DRIVER_START( dcs_audio_8k )
MDRV_IMPORT_FROM(dcs_audio_2k)
MDRV_CPU_MODIFY("dcs")
- MDRV_CPU_PROGRAM_MAP(dcs_8k_program_map,0)
- MDRV_CPU_DATA_MAP(dcs_8k_data_map,0)
+ MDRV_CPU_PROGRAM_MAP(dcs_8k_program_map)
+ MDRV_CPU_DATA_MAP(dcs_8k_data_map)
MACHINE_DRIVER_END
@@ -650,8 +650,8 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START( dcs2_audio_2115 )
MDRV_CPU_ADD("dcs2", ADSP2115, XTAL_16MHz)
MDRV_CPU_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(dcs2_2115_program_map,0)
- MDRV_CPU_DATA_MAP(dcs2_2115_data_map,0)
+ MDRV_CPU_PROGRAM_MAP(dcs2_2115_program_map)
+ MDRV_CPU_DATA_MAP(dcs2_2115_data_map)
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -666,8 +666,8 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START( dcs2_audio_2104 )
MDRV_IMPORT_FROM(dcs2_audio_2115)
MDRV_CPU_REPLACE("dcs2", ADSP2104, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(dcs2_2104_program_map,0)
- MDRV_CPU_DATA_MAP(dcs2_2104_data_map,0)
+ MDRV_CPU_PROGRAM_MAP(dcs2_2104_program_map)
+ MDRV_CPU_DATA_MAP(dcs2_2104_data_map)
MACHINE_DRIVER_END
@@ -681,9 +681,9 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START( dcs2_audio_dsio )
MDRV_CPU_ADD("dsio", ADSP2181, XTAL_32MHz)
MDRV_CPU_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(dsio_program_map,0)
- MDRV_CPU_DATA_MAP(dsio_data_map,0)
- MDRV_CPU_IO_MAP(dsio_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(dsio_program_map)
+ MDRV_CPU_DATA_MAP(dsio_data_map)
+ MDRV_CPU_IO_MAP(dsio_io_map)
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -705,9 +705,9 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START( dcs2_audio_denver )
MDRV_CPU_ADD("denver", ADSP2181, XTAL_33_333MHz)
MDRV_CPU_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(denver_program_map,0)
- MDRV_CPU_DATA_MAP(denver_data_map,0)
- MDRV_CPU_IO_MAP(denver_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(denver_program_map)
+ MDRV_CPU_DATA_MAP(denver_data_map)
+ MDRV_CPU_IO_MAP(denver_io_map)
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index 27f71ec7f8d..ae3dfb7c6b1 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -1243,8 +1243,8 @@ MACHINE_DRIVER_START( dkong2b_audio )
MDRV_LATCH8_DISCRETE_NODE("discrete", 7, DS_DISCHARGE_INV)
MDRV_CPU_ADD("soundcpu", MB8884, I8035_CLOCK)
- MDRV_CPU_PROGRAM_MAP(dkong_sound_map,0)
- MDRV_CPU_IO_MAP(dkong_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dkong_sound_map)
+ MDRV_CPU_IO_MAP(dkong_sound_io_map)
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
@@ -1267,7 +1267,7 @@ MACHINE_DRIVER_START( radarsc1_audio )
MDRV_IMPORT_FROM( radarscp_audio )
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_IO_MAP(radarsc1_sound_io_map, 0)
+ MDRV_CPU_IO_MAP(radarsc1_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 */
@@ -1306,8 +1306,8 @@ MACHINE_DRIVER_START( dkongjr_audio )
MDRV_LATCH8_DISCRETE_NODE("discrete", 7, DS_DISCHARGE_INV)
MDRV_CPU_ADD("soundcpu", MB8884, I8035_CLOCK)
- MDRV_CPU_PROGRAM_MAP(dkong_sound_map,0)
- MDRV_CPU_IO_MAP(dkongjr_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dkong_sound_map)
+ MDRV_CPU_IO_MAP(dkongjr_sound_io_map)
MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -1320,11 +1320,11 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START( dkong3_audio )
MDRV_CPU_ADD("n2a03a", N2A03,N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(dkong3_sound1_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dkong3_sound1_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("n2a03b", N2A03,N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(dkong3_sound2_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dkong3_sound2_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* sound latches */
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index 20746027d03..1c9ddb4ffcb 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -811,7 +811,7 @@ ADDRESS_MAP_END
MACHINE_DRIVER_START( venture_audio )
MDRV_CPU_ADD("audiocpu", M6502, 3579545/4)
- MDRV_CPU_PROGRAM_MAP(venture_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(venture_audio_map)
MDRV_RIOT6532_ADD("riot", SH6532_CLOCK, r6532_interface)
@@ -875,8 +875,8 @@ ADDRESS_MAP_END
MACHINE_DRIVER_START( mtrap_cvsd_audio )
MDRV_CPU_ADD("cvsdcpu", Z80, CVSD_Z80_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cvsd_map,0)
- MDRV_CPU_IO_MAP(cvsd_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(cvsd_map)
+ MDRV_CPU_IO_MAP(cvsd_iomap)
/* audio hardware */
MDRV_SOUND_ADD("cvsd", MC3417, CVSD_CLOCK)
@@ -1037,7 +1037,7 @@ ADDRESS_MAP_END
MACHINE_DRIVER_START( victory_audio )
MDRV_CPU_ADD("audiocpu", M6502, VICTORY_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(victory_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(victory_audio_map)
MDRV_RIOT6532_ADD("riot", SH6532_CLOCK, r6532_interface)
MDRV_PIA6821_ADD("pia1", victory_pia1_intf)
diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c
index c2555e76784..93596678f77 100644
--- a/src/mame/audio/exidy440.c
+++ b/src/mame/audio/exidy440.c
@@ -941,7 +941,7 @@ static DEVICE_GET_INFO( exidy440_sound )
MACHINE_DRIVER_START( exidy440_audio )
MDRV_CPU_ADD("audiocpu", M6809, EXIDY440_AUDIO_CLOCK)
- MDRV_CPU_PROGRAM_MAP(exidy440_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(exidy440_audio_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index 65f13b476a6..0a107b03d30 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -338,7 +338,7 @@ MACHINE_DRIVER_START( gottlieb_soundrev1 )
MDRV_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,0)
+ MDRV_CPU_PROGRAM_MAP(gottlieb_sound1_map)
/* sound hardware */
MDRV_SOUND_ADD("dac", DAC, 0)
@@ -585,10 +585,10 @@ ADDRESS_MAP_END
MACHINE_DRIVER_START( gottlieb_soundrev2 )
/* audio CPUs */
MDRV_CPU_ADD("audiocpu", M6502, SOUND2_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(gottlieb_audio2_map,0)
+ MDRV_CPU_PROGRAM_MAP(gottlieb_audio2_map)
MDRV_CPU_ADD("speech", M6502, SOUND2_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(gottlieb_speech2_map,0)
+ MDRV_CPU_PROGRAM_MAP(gottlieb_speech2_map)
/* sound hardware */
MDRV_SOUND_START( gottlieb2 )
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index ae792d9de26..1baeed35e06 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -382,7 +382,7 @@ static MACHINE_DRIVER_START( irem_audio_base )
/* basic machine hardware */
MDRV_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_IO_MAP(irem_sound_portmap,0)
+ MDRV_CPU_IO_MAP(irem_sound_portmap)
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -410,8 +410,8 @@ MACHINE_DRIVER_START( 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,0)
- MDRV_CPU_PROGRAM_MAP(m52_small_sound_map,0)
+ MDRV_CPU_IO_MAP(irem_sound_portmap)
+ MDRV_CPU_PROGRAM_MAP(m52_small_sound_map)
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -439,7 +439,7 @@ MACHINE_DRIVER_START( m52_large_audio ) /* 10 yard fight */
/* basic machine hardware */
MDRV_CPU_MODIFY("iremsound")
- MDRV_CPU_PROGRAM_MAP(m52_large_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(m52_large_sound_map)
MACHINE_DRIVER_END
@@ -448,5 +448,5 @@ MACHINE_DRIVER_START( m62_audio )
/* basic machine hardware */
MDRV_CPU_MODIFY("iremsound")
- MDRV_CPU_PROGRAM_MAP(m62_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(m62_sound_map)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c
index bc1d04db8e1..730618dd618 100644
--- a/src/mame/audio/jedi.c
+++ b/src/mame/audio/jedi.c
@@ -203,7 +203,7 @@ ADDRESS_MAP_END
MACHINE_DRIVER_START( jedi_audio )
MDRV_CPU_ADD("audiocpu", M6502, JEDI_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
MDRV_SOUND_START(jedi)
MDRV_SOUND_RESET(jedi)
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index 34bda5ac751..d80f0ed6a88 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -603,8 +603,8 @@ MACHINE_DRIVER_START( mario_audio )
#else
MDRV_CPU_ADD("audiocpu", M58715, I8035_CLOCK) /* 730 kHz */
#endif
- MDRV_CPU_PROGRAM_MAP(mario_sound_map, 0)
- MDRV_CPU_IO_MAP(mario_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mario_sound_map)
+ MDRV_CPU_IO_MAP(mario_sound_io_map)
MDRV_SOUND_START(mario)
MDRV_SOUND_RESET(mario)
@@ -619,7 +619,7 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START( masao_audio )
MDRV_CPU_ADD("audiocpu", Z80,24576000/16) /* ???? */
- MDRV_CPU_PROGRAM_MAP(masao_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(masao_sound_map)
MDRV_SOUND_START(mario)
MDRV_SOUND_RESET(mario)
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c
index c76d19a5e30..ec5cf3f0ba2 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -469,7 +469,7 @@ ADDRESS_MAP_END
/********* machine driver ***********/
MACHINE_DRIVER_START(mcr_ssio)
MDRV_CPU_ADD("ssiocpu", Z80, SSIO_CLOCK/2/4)
- MDRV_CPU_PROGRAM_MAP(ssio_map,0)
+ MDRV_CPU_PROGRAM_MAP(ssio_map)
MDRV_CPU_PERIODIC_INT(ssio_14024_clock, SSIO_CLOCK/2/16/10)
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -600,7 +600,7 @@ static const pia6821_interface csdeluxe_pia_intf =
/********* machine driver ***********/
MACHINE_DRIVER_START(chip_squeak_deluxe)
MDRV_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(csdeluxe_map,0)
+ MDRV_CPU_PROGRAM_MAP(csdeluxe_map)
MDRV_PIA6821_ADD("csdpia", csdeluxe_pia_intf)
@@ -611,7 +611,7 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START(chip_squeak_deluxe_stereo)
MDRV_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(csdeluxe_map,0)
+ MDRV_CPU_PROGRAM_MAP(csdeluxe_map)
MDRV_PIA6821_ADD("csdpia", csdeluxe_pia_intf)
@@ -719,7 +719,7 @@ static const pia6821_interface soundsgood_pia_intf =
/********* machine driver ***********/
MACHINE_DRIVER_START(sounds_good)
MDRV_CPU_ADD("sgcpu", M68000, SOUNDSGOOD_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(soundsgood_map,0)
+ MDRV_CPU_PROGRAM_MAP(soundsgood_map)
MDRV_PIA6821_ADD("sgpia", soundsgood_pia_intf)
@@ -821,7 +821,7 @@ static const pia6821_interface turbocs_pia_intf =
/********* machine driver ***********/
MACHINE_DRIVER_START(turbo_chip_squeak)
MDRV_CPU_ADD("tcscpu", M6809E, TURBOCS_CLOCK)
- MDRV_CPU_PROGRAM_MAP(turbocs_map,0)
+ MDRV_CPU_PROGRAM_MAP(turbocs_map)
MDRV_PIA6821_ADD("tcspia", turbocs_pia_intf)
@@ -982,7 +982,7 @@ static const pia6821_interface squawkntalk_pia1_intf =
/********* machine driver ***********/
MACHINE_DRIVER_START(squawk_n_talk)
MDRV_CPU_ADD("sntcpu", M6802, SQUAWKTALK_CLOCK)
- MDRV_CPU_PROGRAM_MAP(squawkntalk_map,0)
+ MDRV_CPU_PROGRAM_MAP(squawkntalk_map)
MDRV_PIA6821_ADD("sntpia0", squawkntalk_pia0_intf)
MDRV_PIA6821_ADD("sntpia1", squawkntalk_pia1_intf)
diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c
index 6fa7f40f945..347e12ee274 100644
--- a/src/mame/audio/n8080.c
+++ b/src/mame/audio/n8080.c
@@ -550,8 +550,8 @@ MACHINE_DRIVER_START( spacefev_sound )
/* basic machine hardware */
MDRV_CPU_ADD("audiocpu", I8035, 6000000)
- MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map, 0)
- MDRV_CPU_IO_MAP(n8080_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
+ MDRV_CPU_IO_MAP(n8080_sound_io_map)
MDRV_MACHINE_RESET(spacefev_sound)
@@ -571,8 +571,8 @@ MACHINE_DRIVER_START( sheriff_sound )
/* basic machine hardware */
MDRV_CPU_ADD("audiocpu", I8035, 6000000)
- MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map, 0)
- MDRV_CPU_IO_MAP(n8080_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
+ MDRV_CPU_IO_MAP(n8080_sound_io_map)
MDRV_MACHINE_RESET(sheriff_sound)
@@ -592,8 +592,8 @@ MACHINE_DRIVER_START( helifire_sound )
/* basic machine hardware */
MDRV_CPU_ADD("audiocpu", I8035, 6000000)
- MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map, 0)
- MDRV_CPU_IO_MAP(helifire_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
+ MDRV_CPU_IO_MAP(helifire_sound_io_map)
MDRV_MACHINE_RESET(helifire_sound)
diff --git a/src/mame/audio/namcoc7x.h b/src/mame/audio/namcoc7x.h
index 6cdb9ff1061..c352d94527d 100644
--- a/src/mame/audio/namcoc7x.h
+++ b/src/mame/audio/namcoc7x.h
@@ -34,14 +34,14 @@ void namcoc7x_set_host_ram(UINT32 *hostram);
#define NAMCO_C7X_MCU(clock) \
MDRV_CPU_ADD("mcu", M37702, clock) \
- MDRV_CPU_PROGRAM_MAP(namcoc7x_mcu_map, 0) \
- MDRV_CPU_IO_MAP(namcoc7x_mcu_io, 0) \
+ MDRV_CPU_PROGRAM_MAP(namcoc7x_mcu_map) \
+ MDRV_CPU_IO_MAP(namcoc7x_mcu_io) \
MDRV_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, 0) \
- MDRV_CPU_IO_MAP(namcoc7x_mcu_io, 0) \
+ MDRV_CPU_PROGRAM_MAP(namcoc7x_mcu_share_map) \
+ MDRV_CPU_IO_MAP(namcoc7x_mcu_io) \
MDRV_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2)
#define NAMCO_C7X_SOUND(clock) \
diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c
index ad4e12e1fea..5739c1651a1 100644
--- a/src/mame/audio/qix.c
+++ b/src/mame/audio/qix.c
@@ -241,7 +241,7 @@ static const pia6821_interface slithersnd_pia_0_intf =
MACHINE_DRIVER_START( qix_audio )
MDRV_CPU_ADD("audiocpu", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
MDRV_PIA6821_ADD("sndpia0", qixsnd_pia_0_intf)
MDRV_PIA6821_ADD("sndpia1", qixsnd_pia_1_intf)
diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c
index 6193fd1de47..a64dff445b5 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -220,7 +220,7 @@ static SOUND_START( redalert )
static MACHINE_DRIVER_START( redalert_audio_m37b )
MDRV_CPU_ADD("audiocpu", M6502, REDALERT_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(redalert_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(redalert_audio_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ)
MDRV_SOUND_ADD("ay", AY8910, REDALERT_AY8910_CLOCK)
@@ -241,7 +241,7 @@ static MACHINE_DRIVER_START( redalert_audio_voice )
MDRV_CPU_ADD("voice", 8085A, REDALERT_VOICE_CPU_CLOCK)
MDRV_CPU_CONFIG(redalert_voice_i8085_config)
- MDRV_CPU_PROGRAM_MAP(redalert_voice_map,0)
+ MDRV_CPU_PROGRAM_MAP(redalert_voice_map)
MDRV_SOUND_ADD("cvsd", HC55516, REDALERT_HC55516_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -408,7 +408,7 @@ static SOUND_START( demoneye )
MACHINE_DRIVER_START( demoneye_audio )
MDRV_CPU_ADD("audiocpu", M6802, DEMONEYE_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(demoneye_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(demoneye_audio_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) /* guess */
MDRV_PIA6821_ADD("sndpia", demoneye_pia_intf)
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index cc9975e19e6..9519957b99f 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -429,8 +429,8 @@ static SOUND_START( ad2083 )
MACHINE_DRIVER_START( ad2083_audio )
MDRV_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */
- MDRV_CPU_PROGRAM_MAP(ad2083_sound_map,0)
- MDRV_CPU_IO_MAP(ad2083_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(ad2083_sound_map)
+ MDRV_CPU_IO_MAP(ad2083_sound_io_map)
MDRV_SOUND_START(ad2083)
diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c
index 7a0936ecd0b..068ccb7a5b8 100644
--- a/src/mame/audio/segag80r.c
+++ b/src/mame/audio/segag80r.c
@@ -844,7 +844,7 @@ MACHINE_DRIVER_START( monsterb_sound_board )
/* basic machine hardware */
MDRV_CPU_ADD("audiocpu", N7751, 6000000)
- MDRV_CPU_IO_MAP(monsterb_7751_portmap,0)
+ MDRV_CPU_IO_MAP(monsterb_7751_portmap)
MDRV_I8243_ADD("audio_8243", NULL, n7751_rom_control_w)
diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c
index aa975d44316..a20ce33e805 100644
--- a/src/mame/audio/segasnd.c
+++ b/src/mame/audio/segasnd.c
@@ -280,8 +280,8 @@ MACHINE_DRIVER_START( 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, 0)
- MDRV_CPU_IO_MAP(speech_portmap, 0)
+ MDRV_CPU_PROGRAM_MAP(speech_map)
+ MDRV_CPU_IO_MAP(speech_portmap)
/* sound hardware */
MDRV_SOUND_ADD("speech", SP0250, SPEECH_MASTER_CLOCK)
@@ -920,8 +920,8 @@ MACHINE_DRIVER_START( 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, 0)
- MDRV_CPU_IO_MAP(usb_portmap, 0)
+ MDRV_CPU_PROGRAM_MAP(usb_map)
+ MDRV_CPU_IO_MAP(usb_portmap)
/* sound hardware */
MDRV_SOUND_ADD("usbsnd", USB, 0)
@@ -934,5 +934,5 @@ MACHINE_DRIVER_START( sega_universal_sound_board_rom )
/* CPU for the usb board */
MDRV_CPU_MODIFY("usbcpu")
- MDRV_CPU_PROGRAM_MAP(usb_map_rom, 0)
+ MDRV_CPU_PROGRAM_MAP(usb_map_rom)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h
index ad700206019..c8eaa18acaa 100644
--- a/src/mame/audio/seibu.h
+++ b/src/mame/audio/seibu.h
@@ -77,23 +77,23 @@ 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,0) \
+ MDRV_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,0) \
+ MDRV_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,0) \
+ MDRV_CPU_PROGRAM_MAP(seibu2_raiden2_sound_map) \
#define SEIBU3_SOUND_SYSTEM_CPU(freq) \
MDRV_CPU_ADD("audiocpu", Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu3_sound_map,0) \
+ MDRV_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,0) \
+ MDRV_CPU_PROGRAM_MAP(seibu3_adpcm_sound_map) \
#define SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(freq1,freq2) \
MDRV_SPEAKER_STANDARD_MONO("mono") \
diff --git a/src/mame/audio/taito_en.h b/src/mame/audio/taito_en.h
index c33b360e813..44f896b09a7 100644
--- a/src/mame/audio/taito_en.h
+++ b/src/mame/audio/taito_en.h
@@ -15,7 +15,7 @@ void taito_f3_soundsystem_reset(running_machine *machine);
#define TAITO_F3_SOUND_SYSTEM_CPU(freq) \
MDRV_CPU_ADD("audiocpu", M68000, freq) \
- MDRV_CPU_PROGRAM_MAP(f3_sound_map,0) \
+ MDRV_CPU_PROGRAM_MAP(f3_sound_map) \
#define TAITO_F3_SOUND_SYSTEM_ES5505(freq) \
diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c
index c0c23c163b8..96da464bb31 100644
--- a/src/mame/audio/timeplt.c
+++ b/src/mame/audio/timeplt.c
@@ -175,7 +175,7 @@ MACHINE_DRIVER_START( timeplt_sound )
/* basic machine hardware */
MDRV_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(timeplt_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(timeplt_sound_map)
MDRV_SOUND_START(timeplt)
@@ -214,5 +214,5 @@ MACHINE_DRIVER_START( locomotn_sound )
/* basic machine hardware */
MDRV_CPU_MODIFY("tpsound")
- MDRV_CPU_PROGRAM_MAP(locomotn_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(locomotn_sound_map)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index 69b078ffcb8..b4301cd6a2c 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -195,7 +195,7 @@ static const ym2151_interface adpcm_ym2151_interface =
MACHINE_DRIVER_START( williams_cvsd_sound )
MDRV_CPU_ADD("cvsdcpu", M6809E, CVSD_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(williams_cvsd_map,0)
+ MDRV_CPU_PROGRAM_MAP(williams_cvsd_map)
MDRV_PIA6821_ADD("cvsdpia", cvsd_pia_intf)
@@ -215,10 +215,10 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START( williams_narc_sound )
MDRV_CPU_ADD("narc1cpu", M6809E, NARC_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(williams_narc_master_map,0)
+ MDRV_CPU_PROGRAM_MAP(williams_narc_master_map)
MDRV_CPU_ADD("narc2cpu", M6809E, NARC_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(williams_narc_slave_map,0)
+ MDRV_CPU_PROGRAM_MAP(williams_narc_slave_map)
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -243,7 +243,7 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START( williams_adpcm_sound )
MDRV_CPU_ADD("adpcm", M6809E, ADPCM_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(williams_adpcm_map,0)
+ MDRV_CPU_PROGRAM_MAP(williams_adpcm_map)
MDRV_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c
index 4bc8ac6f477..0cf6a5f5904 100644
--- a/src/mame/drivers/1942.c
+++ b/src/mame/drivers/1942.c
@@ -270,11 +270,11 @@ static MACHINE_DRIVER_START( 1942 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(c1942_map, 0)
+ MDRV_CPU_PROGRAM_MAP(c1942_map)
MDRV_CPU_VBLANK_INT_HACK(c1942_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 3 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
/* video hardware */
diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c
index 57f25524031..3f465b66f47 100644
--- a/src/mame/drivers/1943.c
+++ b/src/mame/drivers/1943.c
@@ -249,11 +249,11 @@ GFXDECODE_END
static MACHINE_DRIVER_START( 1943 )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(c1943_map, 0)
+ MDRV_CPU_PROGRAM_MAP(c1943_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_24MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
// video hardware
diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c
index d43a234026f..5fdd706e521 100644
--- a/src/mame/drivers/1945kiii.c
+++ b/src/mame/drivers/1945kiii.c
@@ -236,7 +236,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( k3 )
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(k3_map,0)
+ MDRV_CPU_PROGRAM_MAP(k3_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_GFXDECODE(1945kiii)
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index 9f28b22a6f1..8fc3e479cde 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -291,8 +291,8 @@ static MACHINE_DRIVER_START( 20pacgal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z180, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(20pacgal_map,0)
- MDRV_CPU_IO_MAP(20pacgal_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(20pacgal_map)
+ MDRV_CPU_IO_MAP(20pacgal_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_NVRAM_HANDLER(eeprom)
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index 518f3487cd8..b74b05efdb4 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -403,7 +403,7 @@ static const ym2610_interface ym2610_config =
static MACHINE_DRIVER_START( drill )
MDRV_CPU_ADD("maincpu", M68000, 16000000 )
- MDRV_CPU_PROGRAM_MAP(drill_map,0)
+ MDRV_CPU_PROGRAM_MAP(drill_map)
MDRV_CPU_VBLANK_INT("screen", drill_interrupt)
MDRV_GFXDECODE(2mindril)
diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c
index 259999b2282..b042e8e645b 100644
--- a/src/mame/drivers/39in1.c
+++ b/src/mame/drivers/39in1.c
@@ -66,7 +66,7 @@ static MACHINE_START(39in1)
static MACHINE_DRIVER_START( 39in1 )
MDRV_CPU_ADD("maincpu", ARM7, 200000000) // actually Xscale PXA255, but ARM7 is a compatible subset
- MDRV_CPU_PROGRAM_MAP(39in1_map,0)
+ MDRV_CPU_PROGRAM_MAP(39in1_map)
MDRV_PALETTE_LENGTH(32768)
diff --git a/src/mame/drivers/3super8.c b/src/mame/drivers/3super8.c
index 80d7a6564f5..309fb2e2eaa 100644
--- a/src/mame/drivers/3super8.c
+++ b/src/mame/drivers/3super8.c
@@ -67,7 +67,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( 3super8 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,24000000/4) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(0,map)
+ MDRV_CPU_PROGRAM_MAP(map)
//MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index 86651cabe98..63c174671ce 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -1042,15 +1042,15 @@ static MACHINE_DRIVER_START( 40love )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,8000000/2) /* OK */
- MDRV_CPU_PROGRAM_MAP(40love_map,0)
+ MDRV_CPU_PROGRAM_MAP(40love_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* OK */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* source/number of IRQs is unknown */
MDRV_CPU_ADD("mcu",M68705,18432000/6) /* OK */
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* high interleave to ensure proper synchronization of CPUs */
MDRV_MACHINE_RESET(ta7630) /* init machine */
@@ -1100,15 +1100,15 @@ static MACHINE_DRIVER_START( undoukai )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(undoukai_map,0)
+ MDRV_CPU_PROGRAM_MAP(undoukai_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu",Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* source/number of IRQs is unknown */
// MDRV_CPU_ADD("mcu",M68705,18432000/6)
-// MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+// MDRV_CPU_PROGRAM_MAP(mcu_map)
MDRV_MACHINE_RESET(ta7630) /* init machine */
diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c
index aa2d2973875..f1a921004f5 100644
--- a/src/mame/drivers/4enraya.c
+++ b/src/mame/drivers/4enraya.c
@@ -159,8 +159,8 @@ static MACHINE_DRIVER_START( 4enraya )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
/* video hardware */
diff --git a/src/mame/drivers/4roses.c b/src/mame/drivers/4roses.c
index 626b8da8ff1..8737c815054 100644
--- a/src/mame/drivers/4roses.c
+++ b/src/mame/drivers/4roses.c
@@ -377,7 +377,7 @@ static const mc6845_interface mc6845_intf =
static MACHINE_DRIVER_START( 4roses )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz, guess */
- MDRV_CPU_PROGRAM_MAP(4roses_map, 0)
+ MDRV_CPU_PROGRAM_MAP(4roses_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
// MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index 6644320334e..9bafa9bbcd1 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -243,7 +243,7 @@ static MACHINE_DRIVER_START( invadpt2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invadpt2_io_map,0)
+ MDRV_CPU_IO_MAP(invadpt2_io_map)
MDRV_MACHINE_START(extra_8080bw)
/* 60 Hz signal clocks two LS161. Ripple carry will */
@@ -299,7 +299,7 @@ static MACHINE_DRIVER_START( spcewars )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(spcewars_io_map,0)
+ MDRV_CPU_IO_MAP(spcewars_io_map)
MDRV_MACHINE_START(extra_8080bw)
/* sound hardware */
@@ -371,7 +371,7 @@ static MACHINE_DRIVER_START( astropal )
/* basic machine hardware */
MDRV_IMPORT_FROM(invaders)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(astropal_io_map, 0)
+ MDRV_CPU_IO_MAP(astropal_io_map)
MACHINE_DRIVER_END
@@ -421,8 +421,8 @@ static MACHINE_DRIVER_START( cosmo )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cosmo_map, 0)
- MDRV_CPU_IO_MAP(cosmo_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(cosmo_map)
+ MDRV_CPU_IO_MAP(cosmo_io_map)
MDRV_MACHINE_START(extra_8080bw)
/* video hardware */
@@ -544,7 +544,7 @@ static MACHINE_DRIVER_START( invrvnge )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invrvnge_io_map,0)
+ MDRV_CPU_IO_MAP(invrvnge_io_map)
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
@@ -647,7 +647,7 @@ static MACHINE_DRIVER_START( lrescue )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(lrescue_io_map,0)
+ MDRV_CPU_IO_MAP(lrescue_io_map)
MDRV_MACHINE_START(extra_8080bw)
/* video hardware */
@@ -792,8 +792,8 @@ static MACHINE_DRIVER_START( rollingc )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rollingc_map,0)
- MDRV_CPU_IO_MAP(rollingc_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(rollingc_map)
+ MDRV_CPU_IO_MAP(rollingc_io_map)
/* video hardware */
MDRV_VIDEO_UPDATE(rollingc)
@@ -891,8 +891,8 @@ static MACHINE_DRIVER_START( schaser )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_REPLACE("maincpu",8080,1996800) /* 19.968MHz / 10 */
- MDRV_CPU_PROGRAM_MAP(schaser_map,0)
- MDRV_CPU_IO_MAP(schaser_io_map,0)
+ 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)
@@ -959,8 +959,8 @@ static MACHINE_DRIVER_START( schasrcv )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(schaser_map,0)
- MDRV_CPU_IO_MAP(schasrcv_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(schaser_map)
+ MDRV_CPU_IO_MAP(schasrcv_io_map)
MDRV_MACHINE_START(extra_8080bw)
/* video hardware */
@@ -1018,7 +1018,7 @@ static MACHINE_DRIVER_START( sflush )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_REPLACE("maincpu",M6800,2000000) /* ?? */
- MDRV_CPU_PROGRAM_MAP(sflush_map,0)
+ MDRV_CPU_PROGRAM_MAP(sflush_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_pulse,2)
MDRV_MACHINE_START(sflush)
@@ -1120,8 +1120,8 @@ static MACHINE_DRIVER_START( lupin3 )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(schaser_map,0)
- MDRV_CPU_IO_MAP(lupin3_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(schaser_map)
+ MDRV_CPU_IO_MAP(lupin3_io_map)
MDRV_MACHINE_START(extra_8080bw)
/* video hardware */
@@ -1245,8 +1245,8 @@ static MACHINE_DRIVER_START( polaris )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_REPLACE("maincpu",8080,1996800) /* 19.968MHz / 10 */
- MDRV_CPU_PROGRAM_MAP(schaser_map,0)
- MDRV_CPU_IO_MAP(polaris_io_map,0)
+ 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)
@@ -1371,7 +1371,7 @@ static MACHINE_DRIVER_START( ballbomb )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(ballbomb_io_map,0)
+ MDRV_CPU_IO_MAP(ballbomb_io_map)
MDRV_MACHINE_START(extra_8080bw)
/* video hardware */
@@ -1445,8 +1445,8 @@ static MACHINE_DRIVER_START( yosakdon )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(yosakdon_map,0)
- MDRV_CPU_IO_MAP(yosakdon_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(yosakdon_map)
+ MDRV_CPU_IO_MAP(yosakdon_io_map)
MDRV_MACHINE_START(extra_8080bw)
/* sound hardware */
@@ -1543,7 +1543,7 @@ static MACHINE_DRIVER_START( indianbt )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(indianbt_io_map,0)
+ MDRV_CPU_IO_MAP(indianbt_io_map)
MDRV_MACHINE_START(extra_8080bw)
/* video hardware */
@@ -1640,8 +1640,8 @@ static MACHINE_DRIVER_START( shuttlei )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(shuttlei_map,0)
- MDRV_CPU_IO_MAP(shuttlei_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(shuttlei_map)
+ MDRV_CPU_IO_MAP(shuttlei_io_map)
MDRV_MACHINE_START(extra_8080bw)
/* video hardware */
@@ -1750,8 +1750,8 @@ static MACHINE_DRIVER_START( darthvdr )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(darthvdr_map,0)
- MDRV_CPU_IO_MAP(darthvdr_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(darthvdr_map)
+ MDRV_CPU_IO_MAP(darthvdr_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_START(darthvdr)
diff --git a/src/mame/drivers/86lions.c b/src/mame/drivers/86lions.c
index 0fe017463ae..90f4ec06f72 100644
--- a/src/mame/drivers/86lions.c
+++ b/src/mame/drivers/86lions.c
@@ -323,7 +323,7 @@ static const mc6845_interface mc6845_intf =
static MACHINE_DRIVER_START( lions )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK/4) /* 3 MHz.(guess) */
- MDRV_CPU_PROGRAM_MAP(lions_map,0)
+ MDRV_CPU_PROGRAM_MAP(lions_map)
MDRV_CPU_VBLANK_INT("screen", lions_irq )
/* video hardware */
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index fd5ecae5a74..3150528383d 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -224,11 +224,11 @@ static MACHINE_DRIVER_START( 88games )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", k88games_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(88games)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c
index 1f3e08b6b5d..d5be913e772 100644
--- a/src/mame/drivers/ace.c
+++ b/src/mame/drivers/ace.c
@@ -314,7 +314,7 @@ static MACHINE_DRIVER_START( ace )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080, MASTER_CLOCK/9) /* 2 MHz ? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_START(ace)
/* video hardware */
diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c
index d7e092bb7d4..f7e01ba9ccf 100644
--- a/src/mame/drivers/acefruit.c
+++ b/src/mame/drivers/acefruit.c
@@ -548,8 +548,8 @@ static MACHINE_DRIVER_START( acefruit )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 2500000) /* 2.5MHz */
- MDRV_CPU_PROGRAM_MAP(acefruit_map,0)
- MDRV_CPU_IO_MAP(acefruit_io,0)
+ MDRV_CPU_PROGRAM_MAP(acefruit_map)
+ MDRV_CPU_IO_MAP(acefruit_io)
MDRV_GFXDECODE(acefruit)
MDRV_CPU_VBLANK_INT("screen", acefruit_vblank)
diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c
index aa589c1d8d8..3927e278fd3 100644
--- a/src/mame/drivers/acommand.c
+++ b/src/mame/drivers/acommand.c
@@ -560,7 +560,7 @@ static MACHINE_DRIVER_START( acommand )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,12000000)
- MDRV_CPU_PROGRAM_MAP(acommand_map,0)
+ MDRV_CPU_PROGRAM_MAP(acommand_map)
MDRV_CPU_VBLANK_INT_HACK(acommand_irq,2)
/* video hardware */
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index ec9670299f8..fa5300b4fa2 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -297,11 +297,11 @@ static MACHINE_DRIVER_START( actfancr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",H6280,21477200/3) /* Should be accurate */
- MDRV_CPU_PROGRAM_MAP(actfan_map,0)
+ MDRV_CPU_PROGRAM_MAP(actfan_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* VBL */
MDRV_CPU_ADD("audiocpu",M6502, 1500000) /* Should be accurate */
- MDRV_CPU_PROGRAM_MAP(dec0_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_s_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
@@ -340,11 +340,11 @@ static MACHINE_DRIVER_START( triothep )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(triothep_map,0)
+ MDRV_CPU_PROGRAM_MAP(triothep_map)
MDRV_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,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_s_map)
MDRV_MACHINE_START(triothep)
diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c
index 7c8327d9f91..60a22f0fc7e 100644
--- a/src/mame/drivers/adp.c
+++ b/src/mame/drivers/adp.c
@@ -514,7 +514,7 @@ static INTERRUPT_GEN( adp_int )
*/
static MACHINE_DRIVER_START( quickjac )
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(quickjac_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(quickjac_mem)
// MDRV_CPU_VBLANK_INT("screen", adp_int)
MDRV_MACHINE_START(skattv)
@@ -542,7 +542,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( skattv )
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(skattv_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(skattv_mem)
// MDRV_CPU_VBLANK_INT("screen", adp_int)
MDRV_MACHINE_START(skattv)
@@ -570,7 +570,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( backgamn )
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(backgamn_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(backgamn_mem)
MDRV_SCREEN_ADD("screen", RASTER)
MDRV_SCREEN_REFRESH_RATE(60)
@@ -593,7 +593,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( funland )
MDRV_IMPORT_FROM( skattv )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(funland_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(funland_mem)
MACHINE_DRIVER_END
ROM_START( quickjac )
diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c
index eb41e00ec3c..792aaa3ecfd 100644
--- a/src/mame/drivers/aeroboto.c
+++ b/src/mame/drivers/aeroboto.c
@@ -236,11 +236,11 @@ static MACHINE_DRIVER_START( formatz )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, XTAL_10MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", aeroboto_interrupt)
MDRV_CPU_ADD("audiocpu", M6809, XTAL_10MHz/16) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_START(formatz)
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index a79803c1aca..be62566620e 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -1308,12 +1308,12 @@ static MACHINE_DRIVER_START( pspikes )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(pspikes_map,0)
+ MDRV_CPU_PROGRAM_MAP(pspikes_map)
MDRV_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,0)
- MDRV_CPU_IO_MAP(turbofrc_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
MDRV_MACHINE_START(aerofgt)
@@ -1348,7 +1348,7 @@ static MACHINE_DRIVER_START( spikes91 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(spikes91_map,0)
+ MDRV_CPU_PROGRAM_MAP(spikes91_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
/* + Z80 for sound */
@@ -1379,7 +1379,7 @@ static MACHINE_DRIVER_START( pspikesb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(pspikesb_map,0)
+ MDRV_CPU_PROGRAM_MAP(pspikesb_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
/* video hardware */
@@ -1407,7 +1407,7 @@ static MACHINE_DRIVER_START( pspikesc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(pspikesc_map,0)
+ MDRV_CPU_PROGRAM_MAP(pspikesc_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
/* video hardware */
@@ -1435,12 +1435,12 @@ static MACHINE_DRIVER_START( karatblz )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(karatblz_map,0)
+ MDRV_CPU_PROGRAM_MAP(karatblz_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(turbofrc_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
MDRV_MACHINE_START(aerofgt)
@@ -1474,12 +1474,12 @@ static MACHINE_DRIVER_START( spinlbrk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(spinlbrk_map,0)
+ MDRV_CPU_PROGRAM_MAP(spinlbrk_map)
MDRV_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,0)
- MDRV_CPU_IO_MAP(turbofrc_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
MDRV_MACHINE_START(aerofgt)
@@ -1513,12 +1513,12 @@ static MACHINE_DRIVER_START( turbofrc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(turbofrc_map,0)
+ MDRV_CPU_PROGRAM_MAP(turbofrc_map)
MDRV_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,0)
- MDRV_CPU_IO_MAP(turbofrc_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
MDRV_MACHINE_START(aerofgt)
@@ -1552,12 +1552,12 @@ static MACHINE_DRIVER_START( aerofgtb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(aerofgtb_map,0)
+ MDRV_CPU_PROGRAM_MAP(aerofgtb_map)
MDRV_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,0)
- MDRV_CPU_IO_MAP(aerofgt_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(aerofgt_sound_portmap)
/* IRQs are triggered by the YM2610 */
MDRV_MACHINE_START(aerofgt)
@@ -1592,12 +1592,12 @@ static MACHINE_DRIVER_START( aerofgt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(aerofgt_map,0)
+ MDRV_CPU_PROGRAM_MAP(aerofgt_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
MDRV_CPU_ADD("audiocpu",Z80,5000000) /* 5 MHz (verified on pcb) */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(aerofgt_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(aerofgt_sound_portmap)
/* IRQs are triggered by the YM2610 */
MDRV_MACHINE_START(aerofgt)
@@ -1632,11 +1632,11 @@ static MACHINE_DRIVER_START( aerfboot )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(aerfboot_map,0)
+ MDRV_CPU_PROGRAM_MAP(aerfboot_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(aerfboot_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(aerfboot_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1664,7 +1664,7 @@ static MACHINE_DRIVER_START( aerfboo2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(aerfboo2_map,0)
+ MDRV_CPU_PROGRAM_MAP(aerfboo2_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
/* video hardware */
@@ -1693,11 +1693,11 @@ static MACHINE_DRIVER_START( wbbc97 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(wbbc97_map,0)
+ MDRV_CPU_PROGRAM_MAP(wbbc97_map)
MDRV_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,0)
+ MDRV_CPU_PROGRAM_MAP(wbbc97_sound_map)
/* IRQs are triggered by the YM3812 */
MDRV_MACHINE_START(aerofgt)
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 76e82004830..5d4116b8356 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -612,18 +612,18 @@ static MACHINE_RESET( airbustr )
static MACHINE_DRIVER_START( airbustr )
// basic machine hardware
MDRV_CPU_ADD("master", Z80, 6000000) // ???
- MDRV_CPU_PROGRAM_MAP(master_map, 0)
- MDRV_CPU_IO_MAP(master_io_map, 0)
+ 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, 0)
- MDRV_CPU_IO_MAP(slave_io_map, 0)
+ 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, 0)
- MDRV_CPU_IO_MAP(sound_io_map, 0)
+ 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
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index 6fea4fb8827..681618d5a26 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -184,14 +184,14 @@ static MACHINE_DRIVER_START( ajax )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* 12/4 MHz*/
- MDRV_CPU_PROGRAM_MAP(ajax_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(ajax_main_map)
MDRV_CPU_VBLANK_INT("screen", ajax_interrupt) /* IRQs triggered by the 051960 */
MDRV_CPU_ADD("sub", M6809, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(ajax_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(ajax_sub_map)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.58 MHz */
- MDRV_CPU_PROGRAM_MAP(ajax_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(ajax_sound_map)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c
index 49bc3f31cb0..0285d43e441 100644
--- a/src/mame/drivers/albazc.c
+++ b/src/mame/drivers/albazc.c
@@ -228,7 +228,7 @@ static const ay8910_interface ay8910_config =
static MACHINE_DRIVER_START( hanaroku )
MDRV_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(hanaroku_map,0)
+ MDRV_CPU_PROGRAM_MAP(hanaroku_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c
index b42cef7562a..8ff794f884a 100644
--- a/src/mame/drivers/albazg.c
+++ b/src/mame/drivers/albazg.c
@@ -257,8 +257,8 @@ static MACHINE_DRIVER_START( yumefuda )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80 , 6000000) /*???*/
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(port_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(port_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(yumefuda)
diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c
index 2dfa0df746d..4baf5eb800d 100644
--- a/src/mame/drivers/aleck64.c
+++ b/src/mame/drivers/aleck64.c
@@ -425,12 +425,12 @@ static MACHINE_DRIVER_START( aleck64 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", VR4300BE, 93750000)
MDRV_CPU_CONFIG(config)
- MDRV_CPU_PROGRAM_MAP(n64_map, 0)
+ 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, 0)
+ MDRV_CPU_PROGRAM_MAP(rsp_map)
MDRV_MACHINE_START( n64 )
MDRV_MACHINE_RESET( n64 )
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index c7cdb18abf9..83e391d28d8 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -403,7 +403,7 @@ static MACHINE_DRIVER_START( alg_r1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map_r1,0)
+ MDRV_CPU_PROGRAM_MAP(main_map_r1)
MDRV_MACHINE_START(alg)
MDRV_MACHINE_RESET(alg)
@@ -447,7 +447,7 @@ static MACHINE_DRIVER_START( alg_r2 )
MDRV_IMPORT_FROM(alg_r1)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(main_map_r2,0)
+ MDRV_CPU_PROGRAM_MAP(main_map_r2)
MACHINE_DRIVER_END
@@ -456,7 +456,7 @@ static MACHINE_DRIVER_START( picmatic )
/* adjust for PAL specs */
MDRV_CPU_REPLACE("maincpu", M68000, AMIGA_68000_PAL_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map_picmatic,0)
+ MDRV_CPU_PROGRAM_MAP(main_map_picmatic)
MDRV_SCREEN_MODIFY("screen")
MDRV_SCREEN_REFRESH_RATE(50)
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index 10b4090a50e..ca32b55d543 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -193,11 +193,11 @@ static MACHINE_DRIVER_START( aliens )
/* 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,0)
+ MDRV_CPU_PROGRAM_MAP(aliens_map)
MDRV_CPU_VBLANK_INT("screen", aliens_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(aliens_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(aliens_sound_map)
MDRV_MACHINE_RESET(aliens)
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index d5f001ebd2c..974aa1084b7 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -1912,12 +1912,12 @@ static MACHINE_DRIVER_START( sstingry )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
- MDRV_CPU_PROGRAM_MAP(kyros_map,0)
+ MDRV_CPU_PROGRAM_MAP(kyros_map)
MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(sstingry_sound_map,0)
- MDRV_CPU_IO_MAP(kyros_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sstingry_sound_map)
+ MDRV_CPU_IO_MAP(kyros_sound_portmap)
//AT
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 4000)
@@ -1963,12 +1963,12 @@ static MACHINE_DRIVER_START( kyros )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
- MDRV_CPU_PROGRAM_MAP(kyros_map,0)
+ MDRV_CPU_PROGRAM_MAP(kyros_map)
MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(kyros_sound_map,0)
- MDRV_CPU_IO_MAP(kyros_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(kyros_sound_map)
+ MDRV_CPU_IO_MAP(kyros_sound_portmap)
//AT
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 4000)
@@ -2013,12 +2013,12 @@ static MACHINE_DRIVER_START( jongbou )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(kyros_map,0)
+ 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
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(jongbou_sound_map,0)
- MDRV_CPU_IO_MAP(jongbou_sound_portmap,0)
+ 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
MDRV_MACHINE_START(kyros)
@@ -2050,11 +2050,11 @@ static MACHINE_DRIVER_START( alpha68k_I )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
- MDRV_CPU_PROGRAM_MAP(alpha68k_I_map,0)
+ MDRV_CPU_PROGRAM_MAP(alpha68k_I_map)
MDRV_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,0)
+ MDRV_CPU_PROGRAM_MAP(alpha68k_I_s_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -2083,12 +2083,12 @@ static MACHINE_DRIVER_START( alpha68k_II )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* Correct */
- MDRV_CPU_PROGRAM_MAP(alpha68k_II_map,0)
+ MDRV_CPU_PROGRAM_MAP(alpha68k_II_map)
MDRV_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,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 7500) //AT
MDRV_MACHINE_RESET(common)
@@ -2131,12 +2131,12 @@ static MACHINE_DRIVER_START( alpha68k_II_gm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(alpha68k_II_map, 0)
+ MDRV_CPU_PROGRAM_MAP(alpha68k_II_map)
MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt, 4)
MDRV_CPU_ADD("audiocpu", Z80, 4000000*2)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 7500)
MDRV_MACHINE_RESET(common)
@@ -2173,12 +2173,12 @@ static MACHINE_DRIVER_START( alpha68k_V )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(alpha68k_V_map,0)
+ MDRV_CPU_PROGRAM_MAP(alpha68k_V_map)
MDRV_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,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 8500) //AT
MDRV_MACHINE_RESET(common)
@@ -2214,12 +2214,12 @@ static MACHINE_DRIVER_START( alpha68k_V_sb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(alpha68k_V_map,0)
+ MDRV_CPU_PROGRAM_MAP(alpha68k_V_map)
MDRV_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,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 8500) //AT
MDRV_MACHINE_RESET(common)
@@ -2255,12 +2255,12 @@ static MACHINE_DRIVER_START( tnexspce )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 9000000) /* Confirmed 18 MHz/2 */
- MDRV_CPU_PROGRAM_MAP(tnexspce_map,0)
+ MDRV_CPU_PROGRAM_MAP(tnexspce_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* VBL */
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(tnexspce_sound_map,0)
- MDRV_CPU_IO_MAP(tnexspce_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(tnexspce_sound_map)
+ MDRV_CPU_IO_MAP(tnexspce_sound_portmap)
MDRV_MACHINE_RESET(tnexspce)
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index 7d8e5efc118..7f8fa839e07 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -200,8 +200,8 @@ static MACHINE_DRIVER_START( ambush )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4.00 MHz??? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index eda52761ad1..74d4e31c17f 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -1022,8 +1022,8 @@ static MACHINE_DRIVER_START( ampoker2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/2) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(ampoker2_map, 0)
- MDRV_CPU_IO_MAP(ampoker2_io_map, 0)
+ 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 */
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index 36fadd43b05..18766992339 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -270,12 +270,12 @@ static MACHINE_DRIVER_START( amspdwy )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,3000000)
- MDRV_CPU_PROGRAM_MAP(amspdwy_map,0)
- MDRV_CPU_IO_MAP(amspdwy_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(amspdwy_map)
+ MDRV_CPU_IO_MAP(amspdwy_portmap)
MDRV_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,0)
+ MDRV_CPU_PROGRAM_MAP(amspdwy_sound_map)
MDRV_MACHINE_START(amspdwy)
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index a7835d13967..85672c80786 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -604,13 +604,13 @@ static MACHINE_START( angelkds )
static MACHINE_DRIVER_START( angelkds )
MDRV_CPU_ADD("maincpu", Z80, 8000000) /* 8MHz? 6 seems too slow? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, 4000000) /* 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
- MDRV_CPU_IO_MAP(sub_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
+ MDRV_CPU_IO_MAP(sub_portmap)
MDRV_MACHINE_START(angelkds)
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index 31a01224863..00a90579eb3 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -226,8 +226,8 @@ static MACHINE_DRIVER_START( appoooh )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_START(appoooh)
@@ -430,8 +430,8 @@ static MACHINE_DRIVER_START( robowres )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_START(appoooh)
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index 78bf39707e1..2254ca71efa 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -349,12 +349,12 @@ static MACHINE_DRIVER_START( aquarium )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 32000000/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(snd_map,0)
- MDRV_CPU_IO_MAP(snd_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(snd_map)
+ MDRV_CPU_IO_MAP(snd_portmap)
MDRV_MACHINE_START(aquarium)
#if AQUARIUS_HACK
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index 2bd31acac45..95dfd46ac19 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -371,8 +371,8 @@ static MACHINE_DRIVER_START( arabian )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MAIN_OSC/4)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_START(arabian)
diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c
index d556911c971..925fe828be1 100644
--- a/src/mame/drivers/arcadecl.c
+++ b/src/mame/drivers/arcadecl.c
@@ -318,7 +318,7 @@ static MACHINE_DRIVER_START( arcadecl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_MACHINE_RESET(arcadecl)
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index 68f845f317a..9c26e2dad7d 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -283,7 +283,7 @@ static MACHINE_DRIVER_START( arcadia )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
- MDRV_CPU_PROGRAM_MAP(amiga_map,0)
+ MDRV_CPU_PROGRAM_MAP(amiga_map)
MDRV_MACHINE_RESET(amiga)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index dfee1f93609..f0aa45bc23c 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -511,15 +511,15 @@ static MACHINE_DRIVER_START( argus )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(argus_map,0)
+ MDRV_CPU_PROGRAM_MAP(argus_map)
MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(sound_map_a,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map_a)
#if 0
- MDRV_CPU_IO_MAP(sound_portmap_1,0)
+ MDRV_CPU_IO_MAP(sound_portmap_1)
#else
- MDRV_CPU_IO_MAP(sound_portmap_2,0)
+ MDRV_CPU_IO_MAP(sound_portmap_2)
#endif
MDRV_QUANTUM_TIME(HZ(600))
@@ -569,12 +569,12 @@ static MACHINE_DRIVER_START( valtric )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
- MDRV_CPU_PROGRAM_MAP(valtric_map,0)
+ MDRV_CPU_PROGRAM_MAP(valtric_map)
MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(sound_map_a,0)
- MDRV_CPU_IO_MAP(sound_portmap_2,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map_a)
+ MDRV_CPU_IO_MAP(sound_portmap_2)
MDRV_QUANTUM_TIME(HZ(600))
@@ -614,12 +614,12 @@ static MACHINE_DRIVER_START( butasan )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
- MDRV_CPU_PROGRAM_MAP(butasan_map,0)
+ MDRV_CPU_PROGRAM_MAP(butasan_map)
MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(sound_map_b,0)
- MDRV_CPU_IO_MAP(sound_portmap_2,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map_b)
+ MDRV_CPU_IO_MAP(sound_portmap_2)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c
index 2cb3f374e4d..be615306afb 100644
--- a/src/mame/drivers/aristmk5.c
+++ b/src/mame/drivers/aristmk5.c
@@ -55,7 +55,7 @@ static MACHINE_RESET( aristmk5 )
static MACHINE_DRIVER_START( aristmk5 )
MDRV_CPU_ADD("maincpu", ARM, 10000000) // ?
- MDRV_CPU_PROGRAM_MAP(aristmk5_map,0)
+ MDRV_CPU_PROGRAM_MAP(aristmk5_map)
MDRV_MACHINE_RESET( aristmk5 )
MDRV_MACHINE_START( aristmk5 )
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index 2dcf17c02a0..54adf007813 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -763,11 +763,11 @@ static const ay8910_interface ay8910_config =
static MACHINE_DRIVER_START( arkanoid )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(arkanoid_map, 0)
+ MDRV_CPU_PROGRAM_MAP(arkanoid_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("mcu", M68705, XTAL_12MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mcu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
MDRV_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per second to synchronize between the MCU and the main CPU
@@ -802,7 +802,7 @@ static MACHINE_DRIVER_START( bootleg )
// basic machine hardware
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bootleg_map, 0)
+ MDRV_CPU_PROGRAM_MAP(bootleg_map)
MDRV_CPU_REMOVE("mcu")
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index f5fe19f7927..b49893001f3 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -731,12 +731,12 @@ static MACHINE_DRIVER_START( terraf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(terraf_map,0)
+ MDRV_CPU_PROGRAM_MAP(terraf_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
/* video hardware */
@@ -772,17 +772,17 @@ static MACHINE_DRIVER_START( terrafb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(terrafb_map,0)
+ MDRV_CPU_PROGRAM_MAP(terrafb_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
MDRV_CPU_ADD("extra", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(terrafb_extraz80_map,0)
- MDRV_CPU_IO_MAP(terrafb_extraz80_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(terrafb_extraz80_map)
+ MDRV_CPU_IO_MAP(terrafb_extraz80_portmap)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
@@ -819,12 +819,12 @@ static MACHINE_DRIVER_START( kodure )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(kodure_map,0)
+ MDRV_CPU_PROGRAM_MAP(kodure_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
/* video hardware */
@@ -860,12 +860,12 @@ static MACHINE_DRIVER_START( armedf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(armedf_map,0)
+ MDRV_CPU_PROGRAM_MAP(armedf_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
/* video hardware */
@@ -901,12 +901,12 @@ static MACHINE_DRIVER_START( cclimbr2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(cclimbr2_map,0)
+ MDRV_CPU_PROGRAM_MAP(cclimbr2_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
/* video hardware */
@@ -942,12 +942,12 @@ static MACHINE_DRIVER_START( legion )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(legion_map,0)
+ MDRV_CPU_PROGRAM_MAP(legion_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
/* video hardware */
@@ -983,12 +983,12 @@ static MACHINE_DRIVER_START( legiono )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(legiono_map,0)
+ MDRV_CPU_PROGRAM_MAP(legiono_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
/* video hardware */
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index f04d931313f..3909b3594b8 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -693,11 +693,11 @@ static MACHINE_DRIVER_START( artmagic )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_ADD("tms", TMS34010, MASTER_CLOCK_40MHz)
MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(tms_map,0)
+ MDRV_CPU_PROGRAM_MAP(tms_map)
MDRV_MACHINE_RESET(artmagic)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -732,10 +732,10 @@ static MACHINE_DRIVER_START( stonebal )
MDRV_IMPORT_FROM(artmagic)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(stonebal_map,0)
+ MDRV_CPU_PROGRAM_MAP(stonebal_map)
MDRV_CPU_MODIFY("tms")
- MDRV_CPU_PROGRAM_MAP(stonebal_tms_map,0)
+ MDRV_CPU_PROGRAM_MAP(stonebal_tms_map)
MDRV_SOUND_MODIFY("oki")
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index 99c1bd00510..e1e901d89ea 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -354,12 +354,12 @@ static MACHINE_DRIVER_START( ashnojoe )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(ashnojoe_map,0)
+ MDRV_CPU_PROGRAM_MAP(ashnojoe_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 6e2bd7e8a9e..11e57b095ba 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -230,11 +230,11 @@ static MACHINE_DRIVER_START( asterix )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", asterix_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_NVRAM_HANDLER(asterix)
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index 8d886810286..4e1c9555a96 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -595,7 +595,7 @@ static MACHINE_DRIVER_START( asteroid )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(asteroid_map,0)
+ MDRV_CPU_PROGRAM_MAP(asteroid_map)
MDRV_CPU_PERIODIC_INT(asteroid_interrupt, (double)MASTER_CLOCK/4096/12)
MDRV_MACHINE_RESET(asteroid)
@@ -631,7 +631,7 @@ static MACHINE_DRIVER_START( astdelux )
/* basic machine hardware */
MDRV_IMPORT_FROM(asteroid)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(astdelux_map,0)
+ MDRV_CPU_PROGRAM_MAP(astdelux_map)
MDRV_ATARIVGEAROM_ADD("earom")
@@ -651,7 +651,7 @@ static MACHINE_DRIVER_START( llander )
/* basic machine hardware */
MDRV_IMPORT_FROM(asteroid)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(llander_map,0)
+ MDRV_CPU_PROGRAM_MAP(llander_map)
MDRV_CPU_PERIODIC_INT(llander_interrupt, (double)MASTER_CLOCK/4096/12)
MDRV_MACHINE_RESET(avgdvg)
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index 047bd2f50ce..b2f7b585e09 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -522,8 +522,8 @@ static MACHINE_DRIVER_START( kamikaze )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(kamikaze_map,0)
- MDRV_CPU_IO_MAP(kamikaze_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(kamikaze_map)
+ MDRV_CPU_IO_MAP(kamikaze_portmap)
MDRV_MACHINE_START(kamikaze)
@@ -559,8 +559,8 @@ static MACHINE_DRIVER_START( spaceint )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* a guess */
- MDRV_CPU_PROGRAM_MAP(spaceint_map,0)
- MDRV_CPU_IO_MAP(spaceint_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(spaceint_map)
+ MDRV_CPU_IO_MAP(spaceint_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index 28166e4b564..5adcd83a92c 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -1327,8 +1327,8 @@ static MACHINE_DRIVER_START( seawolf2 )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(seawolf2_map,0)
- MDRV_CPU_IO_MAP(port_map,0)
+ MDRV_CPU_PROGRAM_MAP(seawolf2_map)
+ MDRV_CPU_IO_MAP(port_map)
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -1354,8 +1354,8 @@ static MACHINE_DRIVER_START( ebases )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ebases_map,0)
- MDRV_CPU_IO_MAP(port_map,0)
+ MDRV_CPU_PROGRAM_MAP(ebases_map)
+ MDRV_CPU_IO_MAP(port_map)
MACHINE_DRIVER_END
@@ -1365,8 +1365,8 @@ static MACHINE_DRIVER_START( spacezap )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spacezap_map,0)
- MDRV_CPU_IO_MAP(port_map_mono_pattern,0)
+ MDRV_CPU_PROGRAM_MAP(spacezap_map)
+ MDRV_CPU_IO_MAP(port_map_mono_pattern)
MACHINE_DRIVER_END
@@ -1376,8 +1376,8 @@ static MACHINE_DRIVER_START( wow )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(wow_map,0)
- MDRV_CPU_IO_MAP(port_map_stereo_pattern,0)
+ MDRV_CPU_PROGRAM_MAP(wow_map)
+ MDRV_CPU_IO_MAP(port_map_stereo_pattern)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -1398,8 +1398,8 @@ static MACHINE_DRIVER_START( gorf )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(wow_map,0)
- MDRV_CPU_IO_MAP(port_map_stereo_pattern,0)
+ MDRV_CPU_PROGRAM_MAP(wow_map)
+ MDRV_CPU_IO_MAP(port_map_stereo_pattern)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -1427,8 +1427,8 @@ static MACHINE_DRIVER_START( robby )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(robby_map,0)
- MDRV_CPU_IO_MAP(port_map_stereo_pattern,0)
+ MDRV_CPU_PROGRAM_MAP(robby_map)
+ MDRV_CPU_IO_MAP(port_map_stereo_pattern)
MDRV_NVRAM_HANDLER(generic_0fill)
MACHINE_DRIVER_END
@@ -1440,8 +1440,8 @@ static MACHINE_DRIVER_START( profpac )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(profpac_map,0)
- MDRV_CPU_IO_MAP(port_map_16col_pattern,0)
+ MDRV_CPU_PROGRAM_MAP(profpac_map)
+ MDRV_CPU_IO_MAP(port_map_16col_pattern)
MACHINE_DRIVER_END
@@ -1450,8 +1450,8 @@ static MACHINE_DRIVER_START( demndrgn )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(demndrgn_map,0)
- MDRV_CPU_IO_MAP(port_map_16col_pattern_nosound,0)
+ MDRV_CPU_PROGRAM_MAP(demndrgn_map)
+ MDRV_CPU_IO_MAP(port_map_16col_pattern_nosound)
MACHINE_DRIVER_END
@@ -1460,13 +1460,13 @@ static MACHINE_DRIVER_START( tenpindx )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(profpac_map,0)
- MDRV_CPU_IO_MAP(port_map_16col_pattern_nosound,0)
+ MDRV_CPU_PROGRAM_MAP(profpac_map)
+ MDRV_CPU_IO_MAP(port_map_16col_pattern_nosound)
MDRV_CPU_ADD("sub", Z80, ASTROCADE_CLOCK/4) /* real clock unknown */
MDRV_CPU_CONFIG(tenpin_daisy_chain)
- MDRV_CPU_PROGRAM_MAP(tenpin_sub_map,0)
- MDRV_CPU_IO_MAP(tenpin_sub_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(tenpin_sub_map)
+ MDRV_CPU_IO_MAP(tenpin_sub_io_map)
MDRV_Z80CTC_ADD("ctc", ASTROCADE_CLOCK/4 /* same as "sub" */, ctc_intf)
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index a7baf8808c7..c088cbe0bb1 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -287,7 +287,7 @@ static NVRAM_HANDLER( showhand )
static MACHINE_DRIVER_START( showhand )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
- MDRV_CPU_PROGRAM_MAP(showhand_map,0)
+ MDRV_CPU_PROGRAM_MAP(showhand_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_NVRAM_HANDLER(showhand)
@@ -317,7 +317,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( showhanc )
MDRV_IMPORT_FROM( showhand )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(showhanc_map,0)
+ MDRV_CPU_PROGRAM_MAP(showhanc_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c
index 49746b408e7..ba0be28cbe9 100644
--- a/src/mame/drivers/astrof.c
+++ b/src/mame/drivers/astrof.c
@@ -862,7 +862,7 @@ static MACHINE_DRIVER_START( astrof )
/* basic machine hardware */
MDRV_IMPORT_FROM(base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(astrof_map,0)
+ MDRV_CPU_PROGRAM_MAP(astrof_map)
MDRV_MACHINE_START(astrof)
@@ -889,7 +889,7 @@ static MACHINE_DRIVER_START( spfghmk2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spfghmk2_map,0)
+ MDRV_CPU_PROGRAM_MAP(spfghmk2_map)
MDRV_MACHINE_START(spfghmk2)
@@ -906,7 +906,7 @@ static MACHINE_DRIVER_START( tomahawk )
/* basic machine hardware */
MDRV_IMPORT_FROM(base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tomahawk_map,0)
+ MDRV_CPU_PROGRAM_MAP(tomahawk_map)
MDRV_MACHINE_START(tomahawk)
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index 4407df00626..bbe73cdf902 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -791,11 +791,11 @@ static MACHINE_DRIVER_START( bonzeadv )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* checked on PCB */
- MDRV_CPU_PROGRAM_MAP(bonzeadv_map,0)
+ MDRV_CPU_PROGRAM_MAP(bonzeadv_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,4000000) /* sound CPU, also required for test mode */
- MDRV_CPU_PROGRAM_MAP(bonzeadv_z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(bonzeadv_z80_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -830,11 +830,11 @@ static MACHINE_DRIVER_START( asuka )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(asuka_map,0)
+ MDRV_CPU_PROGRAM_MAP(asuka_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -872,11 +872,11 @@ static MACHINE_DRIVER_START( cadash )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 68000p12 running at 16Mhz, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cadash_map,0)
+ MDRV_CPU_PROGRAM_MAP(cadash_map)
MDRV_CPU_VBLANK_INT("screen", cadash_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cadash_z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(cadash_z80_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -910,11 +910,11 @@ static MACHINE_DRIVER_START( mofflott )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(asuka_map,0)
+ MDRV_CPU_PROGRAM_MAP(asuka_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -952,11 +952,11 @@ static MACHINE_DRIVER_START( galmedes )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(asuka_map,0)
+ MDRV_CPU_PROGRAM_MAP(asuka_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cadash_z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(cadash_z80_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -990,11 +990,11 @@ static MACHINE_DRIVER_START( eto )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(eto_map,0)
+ MDRV_CPU_PROGRAM_MAP(eto_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cadash_z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(cadash_z80_map)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c
index 85fcce5bf15..d716af3663e 100644
--- a/src/mame/drivers/atarifb.c
+++ b/src/mame/drivers/atarifb.c
@@ -514,7 +514,7 @@ static MACHINE_DRIVER_START( atarifb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 750000)
- MDRV_CPU_PROGRAM_MAP(atarifb_map,0)
+ MDRV_CPU_PROGRAM_MAP(atarifb_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
/* video hardware */
@@ -545,7 +545,7 @@ static MACHINE_DRIVER_START( atarifb4 )
/* basic machine hardware */
MDRV_IMPORT_FROM(atarifb)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(atarifb4_map,0)
+ MDRV_CPU_PROGRAM_MAP(atarifb4_map)
MACHINE_DRIVER_END
@@ -554,7 +554,7 @@ static MACHINE_DRIVER_START( abaseb )
/* basic machine hardware */
MDRV_IMPORT_FROM(atarifb)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(abaseb_map,0)
+ MDRV_CPU_PROGRAM_MAP(abaseb_map)
/* video hardware */
MDRV_VIDEO_UPDATE(abaseb)
@@ -571,7 +571,7 @@ static MACHINE_DRIVER_START( soccer )
/* basic machine hardware */
MDRV_IMPORT_FROM(atarifb)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(soccer_map,0)
+ MDRV_CPU_PROGRAM_MAP(soccer_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index 1432674bdc6..17929b23aba 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -415,7 +415,7 @@ static MACHINE_DRIVER_START( atarig1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_MACHINE_START(atarig1)
diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c
index ce0e7467509..183637334ee 100644
--- a/src/mame/drivers/atarig42.c
+++ b/src/mame/drivers/atarig42.c
@@ -510,7 +510,7 @@ static MACHINE_DRIVER_START( atarig42 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
/* ASIC65 */
diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c
index f50aa9f05fa..6d56e1ed2bc 100644
--- a/src/mame/drivers/atarigt.c
+++ b/src/mame/drivers/atarigt.c
@@ -788,7 +788,7 @@ static MACHINE_DRIVER_START( atarigt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_50MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_CPU_PERIODIC_INT(atarigen_scanline_int_gen, 250)
diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c
index 68cefa83245..64e90fe3ef2 100644
--- a/src/mame/drivers/atarigx2.c
+++ b/src/mame/drivers/atarigx2.c
@@ -1404,7 +1404,7 @@ static MACHINE_DRIVER_START( atarigx2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_14MHz)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_MACHINE_RESET(atarigx2)
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index d0983a532a1..0cb6d3b6bc3 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -753,11 +753,11 @@ static MACHINE_DRIVER_START( atarisy1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(atarisy1)
MDRV_NVRAM_HANDLER(atarigen)
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index 8f90a0cf9ec..31e015698c3 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -1145,11 +1145,11 @@ static MACHINE_DRIVER_START( atarisy2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", T11, MASTER_CLOCK/2)
MDRV_CPU_CONFIG(t11_data)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", vblank_int)
MDRV_CPU_ADD("soundcpu", M6502, SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)MASTER_CLOCK/2/16/16/16/10)
MDRV_MACHINE_START(atarisy2)
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index 5a006eba675..d3829323370 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -295,16 +295,16 @@ static MACHINE_DRIVER_START( ataxx )
/* basic machine hardware */
MDRV_CPU_ADD("master", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(master_map_program,0)
- MDRV_CPU_IO_MAP(master_map_io,0)
+ MDRV_CPU_PROGRAM_MAP(master_map_program)
+ MDRV_CPU_IO_MAP(master_map_io)
MDRV_CPU_ADD("slave", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(slave_map_program,0)
- MDRV_CPU_IO_MAP(slave_map_io,0)
+ MDRV_CPU_PROGRAM_MAP(slave_map_program)
+ MDRV_CPU_IO_MAP(slave_map_io)
MDRV_CPU_ADD("audiocpu", I80186, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(leland_80186_map_program,0)
- MDRV_CPU_IO_MAP(ataxx_80186_map_io,0)
+ MDRV_CPU_PROGRAM_MAP(leland_80186_map_program)
+ MDRV_CPU_IO_MAP(ataxx_80186_map_io)
MDRV_MACHINE_START(ataxx)
MDRV_MACHINE_RESET(ataxx)
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index bc0449197c6..3ad74d856c1 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -343,7 +343,7 @@ static MACHINE_DRIVER_START( atetris )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502,MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_START(atetris)
MDRV_MACHINE_RESET(atetris)
@@ -379,7 +379,7 @@ static MACHINE_DRIVER_START( atetrsb2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502,BOOTLEG_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(atetrsb2_map,0)
+ MDRV_CPU_PROGRAM_MAP(atetrsb2_map)
MDRV_MACHINE_START(atetris)
MDRV_MACHINE_RESET(atetris)
diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c
index f9c94fc4365..e855439e12d 100644
--- a/src/mame/drivers/attckufo.c
+++ b/src/mame/drivers/attckufo.c
@@ -125,7 +125,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( attckufo )
MDRV_CPU_ADD("maincpu", M6502, 14318181/14)
- MDRV_CPU_PROGRAM_MAP(cpu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(cpu_map)
MDRV_CPU_PERIODIC_INT(attckufo_raster_interrupt, 15625)
/* video hardware */
diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c
index eeb19d9d584..119572adc54 100644
--- a/src/mame/drivers/avalnche.c
+++ b/src/mame/drivers/avalnche.c
@@ -221,7 +221,7 @@ static MACHINE_DRIVER_START( avalnche )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502,MASTER_CLOCK/16) /* clock input is the "2H" signal divided by two */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(avalnche_interrupt,8)
/* video hardware */
diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c
index 5ba61423328..053cf05107b 100644
--- a/src/mame/drivers/aztarac.c
+++ b/src/mame/drivers/aztarac.c
@@ -147,11 +147,11 @@ static MACHINE_DRIVER_START( aztarac )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_PERIODIC_INT(aztarac_snd_timed_irq, 100)
MDRV_MACHINE_RESET(aztarac)
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 5dc9d6abeb2..d8f08a7063c 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -466,7 +466,7 @@ static MACHINE_DRIVER_START( backfire )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM, 28000000/4) /* Unconfirmed */
- MDRV_CPU_PROGRAM_MAP(backfire_map,0)
+ MDRV_CPU_PROGRAM_MAP(backfire_map)
MDRV_CPU_VBLANK_INT("lscreen", deco32_vbl_interrupt) /* or is it "rscreen?" */
MDRV_NVRAM_HANDLER(93C46)
diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c
index a2aa10c414d..161823c0c80 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -501,11 +501,11 @@ static MACHINE_DRIVER_START( badlands )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", vblank_int)
MDRV_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
MDRV_MACHINE_RESET(badlands)
MDRV_NVRAM_HANDLER(atarigen)
@@ -707,11 +707,11 @@ static MACHINE_DRIVER_START( badlandb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 2800000/2)
- MDRV_CPU_PROGRAM_MAP(bootleg_map,0)
+ MDRV_CPU_PROGRAM_MAP(bootleg_map)
MDRV_CPU_VBLANK_INT("screen", vblank_int)
// MDRV_CPU_ADD("audiocpu", Z80, 2800000/8)
-// MDRV_CPU_PROGRAM_MAP(bootleg_soundmap,0)
+// MDRV_CPU_PROGRAM_MAP(bootleg_soundmap)
MDRV_MACHINE_RESET(badlandb)
MDRV_NVRAM_HANDLER(atarigen)
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index c92c98d4402..28176f75313 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -506,8 +506,8 @@ static MACHINE_DRIVER_START( bagman )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(bagman)
@@ -542,8 +542,8 @@ static MACHINE_DRIVER_START( pickin )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(pickin_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(pickin_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(bagman)
@@ -597,8 +597,8 @@ static MACHINE_DRIVER_START( botanic )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(pickin_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(pickin_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(bagman)
diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c
index fda28710f4f..28dc0486fc3 100644
--- a/src/mame/drivers/balsente.c
+++ b/src/mame/drivers/balsente.c
@@ -1194,12 +1194,12 @@ static MACHINE_DRIVER_START( balsente )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 5000000/4)
- MDRV_CPU_PROGRAM_MAP(cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu1_map)
MDRV_CPU_VBLANK_INT("screen", balsente_update_analog_inputs)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(cpu2_map,0)
- MDRV_CPU_IO_MAP(cpu2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu2_map)
+ MDRV_CPU_IO_MAP(cpu2_io_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -1252,7 +1252,7 @@ static MACHINE_DRIVER_START( shrike )
MDRV_IMPORT_FROM(balsente)
MDRV_CPU_ADD("68k", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(shrike68k_map,0)
+ MDRV_CPU_PROGRAM_MAP(shrike68k_map)
MDRV_QUANTUM_TIME(HZ(6000))
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c
index 817623708bf..7fe7029aa41 100644
--- a/src/mame/drivers/bankp.c
+++ b/src/mame/drivers/bankp.c
@@ -259,8 +259,8 @@ static MACHINE_DRIVER_START( bankp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, BANKP_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(bankp_map, 0)
- MDRV_CPU_IO_MAP(bankp_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(bankp_map)
+ MDRV_CPU_IO_MAP(bankp_io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index fe7a05ec644..94a362af081 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -394,12 +394,12 @@ static MACHINE_DRIVER_START( baraduke )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809,49152000/32)
- MDRV_CPU_PROGRAM_MAP(baraduke_map,0)
+ MDRV_CPU_PROGRAM_MAP(baraduke_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("mcu", HD63701,49152000/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
- MDRV_CPU_IO_MAP(mcu_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MDRV_CPU_IO_MAP(mcu_port_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000)) /* we need heavy synch */
diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c
index 9a962a04a97..679125aeae5 100644
--- a/src/mame/drivers/batman.c
+++ b/src/mame/drivers/batman.c
@@ -235,7 +235,7 @@ static MACHINE_DRIVER_START( batman )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(batman)
MDRV_NVRAM_HANDLER(atarigen)
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index f8f10842155..36b2343e4c0 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -255,11 +255,11 @@ static MACHINE_DRIVER_START( battlane )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 1250000) /* 1.25 MHz ? */
- MDRV_CPU_PROGRAM_MAP(battlane_map, 0)
+ MDRV_CPU_PROGRAM_MAP(battlane_map)
MDRV_CPU_VBLANK_INT("screen", battlane_cpu1_interrupt)
MDRV_CPU_ADD("sub", M6809, 1250000) /* 1.25 MHz ? */
- MDRV_CPU_PROGRAM_MAP(battlane_map, 0)
+ MDRV_CPU_PROGRAM_MAP(battlane_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c
index 94ed9c19057..5a69b21494f 100644
--- a/src/mame/drivers/battlera.c
+++ b/src/mame/drivers/battlera.c
@@ -245,12 +245,12 @@ static MACHINE_DRIVER_START( battlera )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", H6280,21477200/3)
- MDRV_CPU_PROGRAM_MAP(battlera_map,0)
- MDRV_CPU_IO_MAP(battlera_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(battlera_map)
+ MDRV_CPU_IO_MAP(battlera_portmap)
MDRV_CPU_VBLANK_INT_HACK(battlera_interrupt,256) /* 8 prelines, 232 lines, 16 vblank? */
MDRV_CPU_ADD("audiocpu", H6280,21477200/3)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c
index a7215ecaee8..7ab1a8d2e36 100644
--- a/src/mame/drivers/battlex.c
+++ b/src/mame/drivers/battlex.c
@@ -198,8 +198,8 @@ static MACHINE_DRIVER_START( battlex )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,10000000/2 ) /* 10 MHz, divided ? (Z80A CPU) */
- MDRV_CPU_PROGRAM_MAP(battlex_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(battlex_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8) /* controls game speed? */
/* video hardware */
diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c
index 546507ce546..0b8d6f2df48 100644
--- a/src/mame/drivers/battlnts.c
+++ b/src/mame/drivers/battlnts.c
@@ -196,11 +196,11 @@ static MACHINE_DRIVER_START( battlnts )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* ? */
- MDRV_CPU_PROGRAM_MAP(battlnts_map,0)
+ MDRV_CPU_PROGRAM_MAP(battlnts_map)
MDRV_CPU_VBLANK_INT("screen", battlnts_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(battlnts_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(battlnts_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index 1845d431689..a6715d03976 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -708,12 +708,12 @@ static MACHINE_DRIVER_START( bbusters )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(bbuster_map,0)
+ MDRV_CPU_PROGRAM_MAP(bbuster_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,4000000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_NVRAM_HANDLER(bbusters)
@@ -747,12 +747,12 @@ static MACHINE_DRIVER_START( mechatt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(mechatt_map,0)
+ MDRV_CPU_PROGRAM_MAP(mechatt_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,4000000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sounda_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sounda_portmap)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c
index 49f9e85987c..cc86464beb9 100644
--- a/src/mame/drivers/beaminv.c
+++ b/src/mame/drivers/beaminv.c
@@ -299,8 +299,8 @@ static MACHINE_DRIVER_START( beaminv )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_io_map)
MDRV_MACHINE_START(beaminv)
MDRV_MACHINE_RESET(beaminv)
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index a7e8a53fedc..01c358d2e32 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -410,7 +410,7 @@ static MACHINE_DRIVER_START( beathead )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ASAP, ATARI_CLOCK_14MHz)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(beathead)
MDRV_NVRAM_HANDLER(generic_1fill)
diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c
index 05a0f4bbec3..a774d9e9aba 100644
--- a/src/mame/drivers/beezer.c
+++ b/src/mame/drivers/beezer.c
@@ -76,11 +76,11 @@ static MACHINE_DRIVER_START( beezer )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 1000000) /* 1 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(beezer_interrupt,128)
MDRV_CPU_ADD("audiocpu", M6809, 1000000) /* 1 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index 9aa6c01d189..5a1dde4fa81 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -833,8 +833,8 @@ static MACHINE_DRIVER_START( berzerk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(berzerk_map,0)
- MDRV_CPU_IO_MAP(berzerk_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(berzerk_map)
+ MDRV_CPU_IO_MAP(berzerk_io_map)
MDRV_MACHINE_START(berzerk)
MDRV_MACHINE_RESET(berzerk)
@@ -867,7 +867,7 @@ static MACHINE_DRIVER_START( frenzy )
/* basic machine hardware */
MDRV_IMPORT_FROM(berzerk)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(frenzy_map,0)
+ MDRV_CPU_PROGRAM_MAP(frenzy_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c
index f2484898d80..3832d854684 100644
--- a/src/mame/drivers/bestleag.c
+++ b/src/mame/drivers/bestleag.c
@@ -317,7 +317,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( bestleag )
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(bestleag_map,0)
+ MDRV_CPU_PROGRAM_MAP(bestleag_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index a7c5747750e..1643579a010 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -1736,12 +1736,12 @@ static INTERRUPT_GEN( vblank_gen )
static MACHINE_DRIVER_START( bfcobra )
MDRV_CPU_ADD("maincpu", Z80, Z80_XTAL)
- MDRV_CPU_PROGRAM_MAP(z80_prog_map, 0)
- MDRV_CPU_IO_MAP(z80_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(z80_prog_map)
+ MDRV_CPU_IO_MAP(z80_io_map)
MDRV_CPU_VBLANK_INT("screen", vblank_gen)
MDRV_CPU_ADD("audiocpu", M6809, M6809_XTAL)
- MDRV_CPU_PROGRAM_MAP(m6809_prog_map, 0)
+ MDRV_CPU_PROGRAM_MAP(m6809_prog_map)
MDRV_CPU_PERIODIC_INT(timer_irq, 1000)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c
index cd1e2434455..da03d924c8c 100644
--- a/src/mame/drivers/bfm_sc1.c
+++ b/src/mame/drivers/bfm_sc1.c
@@ -1243,7 +1243,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( scorpion1 )
MDRV_MACHINE_RESET(bfm_sc1) // main scorpion1 board initialisation
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
- MDRV_CPU_PROGRAM_MAP(memmap,0) // setup read and write memorymap
+ MDRV_CPU_PROGRAM_MAP(memmap) // setup read and write memorymap
MDRV_CPU_PERIODIC_INT(timer_irq, 1000 ) // generate 1000 IRQ's per second
MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -1262,7 +1262,7 @@ static MACHINE_DRIVER_START( scorpion1_adder2 )
MDRV_IMPORT_FROM( scorpion1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(memmap_adder2,0) // setup read and write memorymap
+ MDRV_CPU_PROGRAM_MAP(memmap_adder2) // setup read and write memorymap
MDRV_DEFAULT_LAYOUT(layout_bfm_sc1)
MDRV_SCREEN_ADD("adder", RASTER)
@@ -1281,7 +1281,7 @@ static MACHINE_DRIVER_START( scorpion1_adder2 )
MDRV_GFXDECODE(adder2)
MDRV_CPU_ADD("adder2", M6809, ADDER_CLOCK/4 ) // adder2 board 6809 CPU at 2 Mhz
- MDRV_CPU_PROGRAM_MAP(adder2_memmap,0) // setup adder2 board memorymap
+ MDRV_CPU_PROGRAM_MAP(adder2_memmap) // setup adder2 board memorymap
MDRV_CPU_VBLANK_INT("adder",adder2_vbl) // board has a VBL IRQ
MACHINE_DRIVER_END
@@ -1292,7 +1292,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( scorpion1_nec_uk )
MDRV_IMPORT_FROM( scorpion1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sc1_nec_uk,0) // setup read and write memorymap
+ MDRV_CPU_PROGRAM_MAP(sc1_nec_uk) // setup read and write memorymap
MDRV_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index 04269ab15cd..015ae7bd8cd 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -2220,7 +2220,7 @@ static MACHINE_DRIVER_START( scorpion2_vid )
MDRV_MACHINE_RESET( init ) // main scorpion2 board initialisation
MDRV_QUANTUM_TIME(HZ(960)) // needed for serial communication !!
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 ) // 6809 CPU at 2 Mhz
- MDRV_CPU_PROGRAM_MAP(memmap_vid,0) // setup scorpion2 board memorymap
+ MDRV_CPU_PROGRAM_MAP(memmap_vid) // setup scorpion2 board memorymap
MDRV_CPU_PERIODIC_INT(timer_irq, 1000) // generate 1000 IRQ's per second
MDRV_NVRAM_HANDLER(bfm_sc2)
@@ -2241,7 +2241,7 @@ static MACHINE_DRIVER_START( scorpion2_vid )
MDRV_GFXDECODE(adder2)
MDRV_CPU_ADD("adder2", M6809, MASTER_CLOCK/4 ) // adder2 board 6809 CPU at 2 Mhz
- MDRV_CPU_PROGRAM_MAP(adder2_memmap,0) // setup adder2 board memorymap
+ MDRV_CPU_PROGRAM_MAP(adder2_memmap) // setup adder2 board memorymap
MDRV_CPU_VBLANK_INT("adder", adder2_vbl) // board has a VBL IRQ
MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -3827,7 +3827,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( scorpion2 )
MDRV_MACHINE_RESET(awp_init)
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 )
- MDRV_CPU_PROGRAM_MAP(sc2_memmap,0)
+ MDRV_CPU_PROGRAM_MAP(sc2_memmap)
MDRV_CPU_PERIODIC_INT(timer_irq, 1000 )
MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -3848,7 +3848,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( scorpion3 )
MDRV_IMPORT_FROM( scorpion2 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sc3_memmap,0)
+ MDRV_CPU_PROGRAM_MAP(sc3_memmap)
MACHINE_DRIVER_END
@@ -3857,7 +3857,7 @@ static MACHINE_DRIVER_START( scorpion2_dm01 )
MDRV_MACHINE_RESET(dm01_init)
MDRV_QUANTUM_TIME(HZ(960)) // needed for serial communication !!
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 )
- MDRV_CPU_PROGRAM_MAP(memmap_sc2_dm01,0)
+ MDRV_CPU_PROGRAM_MAP(memmap_sc2_dm01)
MDRV_CPU_PERIODIC_INT(timer_irq, 1000 )
MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -3883,7 +3883,7 @@ static MACHINE_DRIVER_START( scorpion2_dm01 )
MDRV_PALETTE_INIT(bfm_dm01)
MDRV_CPU_ADD("matrix", M6809, 2000000 ) /* matrix board 6809 CPU at 2 Mhz ?? I don't know the exact freq.*/
- MDRV_CPU_PROGRAM_MAP(bfm_dm01_memmap,0)
+ MDRV_CPU_PROGRAM_MAP(bfm_dm01_memmap)
MDRV_CPU_PERIODIC_INT(bfm_dm01_vbl, 1500 ) /* generate 1500 NMI's per second ?? what is the exact freq?? */
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c
index dbf3ccbc32b..569e17323b6 100644
--- a/src/mame/drivers/bfmsys85.c
+++ b/src/mame/drivers/bfmsys85.c
@@ -437,7 +437,7 @@ static MACHINE_DRIVER_START( bfmsys85 )
MDRV_MACHINE_START(bfm_sys85) // main system85 board initialisation
MDRV_MACHINE_RESET(bfm_sys85)
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
- MDRV_CPU_PROGRAM_MAP(memmap,0) // setup read and write memorymap
+ MDRV_CPU_PROGRAM_MAP(memmap) // setup read and write memorymap
MDRV_CPU_PERIODIC_INT(timer_irq, 1000 ) // generate 1000 IRQ's per second
MDRV_ACIA6850_ADD("acia6850_0", m6809_acia_if)
diff --git a/src/mame/drivers/big10.c b/src/mame/drivers/big10.c
index 4ba8c751c60..5c9cb0ceac6 100644
--- a/src/mame/drivers/big10.c
+++ b/src/mame/drivers/big10.c
@@ -241,8 +241,8 @@ static MACHINE_DRIVER_START( big10 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* guess */
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
- MDRV_CPU_IO_MAP(main_io, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_io)
MDRV_CPU_VBLANK_INT_HACK(big10_interrupt, 262)
MDRV_MACHINE_RESET(big10)
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index deeee36338f..f6132e44695 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -427,23 +427,23 @@ static MACHINE_DRIVER_START( bigevglf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,10000000/2) /* 5 MHz ? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(bigevglf_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(bigevglf_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* vblank */
MDRV_CPU_ADD("sub", Z80,10000000/2) /* 5 MHz ? */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
- MDRV_CPU_IO_MAP(bigevglf_sub_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
+ MDRV_CPU_IO_MAP(bigevglf_sub_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* vblank */
MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ???;
2 irqs/frame give good music tempo but also SOUND ERROR in test mode,
4 irqs/frame give SOUND OK in test mode but music seems to be running too fast */
MDRV_CPU_ADD("mcu", M68705,2000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(m68705_map,0)
+ MDRV_CPU_PROGRAM_MAP(m68705_map)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - interleaving is forced on the fly */
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index 0b69bdbfb95..17622f59461 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -421,13 +421,13 @@ GFXDECODE_END
static MACHINE_DRIVER_START( bigfghtr )
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(mainmem,0)
+ MDRV_CPU_PROGRAM_MAP(mainmem)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(soundmem,0)
- MDRV_CPU_IO_MAP(soundport,0)
+ MDRV_CPU_PROGRAM_MAP(soundmem)
+ MDRV_CPU_IO_MAP(soundport)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
/* video hardware */
diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c
index b713d36644f..5195a5eef60 100644
--- a/src/mame/drivers/bigstrkb.c
+++ b/src/mame/drivers/bigstrkb.c
@@ -206,7 +206,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( bigstrkb )
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(bigstrkb_map,0)
+ MDRV_CPU_PROGRAM_MAP(bigstrkb_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_GFXDECODE(bigstrkb)
diff --git a/src/mame/drivers/bingoc.c b/src/mame/drivers/bingoc.c
index bd75ca08d87..e7573d46c1d 100644
--- a/src/mame/drivers/bingoc.c
+++ b/src/mame/drivers/bingoc.c
@@ -128,12 +128,12 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( bingoc )
MDRV_CPU_ADD("maincpu", M68000,8000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("soundcpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io)
#if SOUND_TEST
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
#endif
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index 03c313bc330..4f7df7191e8 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -328,11 +328,11 @@ static MACHINE_DRIVER_START( bionicc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2) /* 12 MHz - verified in schematics */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(bionicc_interrupt,8)
MDRV_CPU_ADD("audiocpu", Z80, EXO3_F0_CLK / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* FIXME: interrupt timing
* schematics indicate that nmi_line is set on M680000 access with AB1=1
* and IOCS=0 (active low), see pages A-1/10, A-4/10 in schematics
diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c
index c6c51d56369..771c71c9e5c 100644
--- a/src/mame/drivers/bishi.c
+++ b/src/mame/drivers/bishi.c
@@ -401,7 +401,7 @@ static MACHINE_DRIVER_START( bishi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 12MHz (24MHz OSC / 2 ) */
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(bishi_interrupt, 2)
MDRV_MACHINE_START(bishi)
diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c
index b6486cb9d97..5b54ba846e8 100644
--- a/src/mame/drivers/bishjan.c
+++ b/src/mame/drivers/bishjan.c
@@ -825,7 +825,7 @@ static INTERRUPT_GEN( bishjan_interrupt )
static MACHINE_DRIVER_START( bishjan )
MDRV_CPU_ADD("maincpu", H83044, XTAL_44_1MHz / 3)
- MDRV_CPU_PROGRAM_MAP( bishjan_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( bishjan_map)
MDRV_CPU_VBLANK_INT_HACK(bishjan_interrupt,2)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -856,8 +856,8 @@ static INTERRUPT_GEN( saklove_interrupt )
static MACHINE_DRIVER_START( saklove )
MDRV_CPU_ADD("maincpu", I80188, XTAL_20MHz ) // !! AMD AM188-EM !!
- MDRV_CPU_PROGRAM_MAP( saklove_map, 0 )
- MDRV_CPU_IO_MAP( saklove_io, 0 )
+ MDRV_CPU_PROGRAM_MAP( saklove_map)
+ MDRV_CPU_IO_MAP( saklove_io)
MDRV_CPU_VBLANK_INT( "screen", saklove_interrupt )
MDRV_MACHINE_RESET(saklove)
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index 6a7b23ad827..1f149ad8dab 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -432,12 +432,12 @@ static MACHINE_DRIVER_START( bking )
/* basic machine hardware */
MDRV_CPU_ADD("main_cpu", Z80, XTAL_12MHz/4) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(bking_map,0)
- MDRV_CPU_IO_MAP(bking_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(bking_map)
+ MDRV_CPU_IO_MAP(bking_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_6MHz/2) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(bking_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(bking_audio_map)
/* interrupts (from Jungle King hardware, might be wrong): */
/* - no interrupts synced with vblank */
/* - NMI triggered by the main CPU */
@@ -477,10 +477,10 @@ static MACHINE_DRIVER_START( bking3 )
MDRV_IMPORT_FROM(bking)
MDRV_CPU_MODIFY("main_cpu")
- MDRV_CPU_IO_MAP(bking3_io_map,0)
+ MDRV_CPU_IO_MAP(bking3_io_map)
MDRV_CPU_ADD("mcu", M68705, XTAL_3MHz) /* xtal is 3MHz, divided by 4 internally */
- MDRV_CPU_PROGRAM_MAP(m68705_map,0)
+ MDRV_CPU_PROGRAM_MAP(m68705_map)
MDRV_MACHINE_RESET(buggychl)
diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c
index 8f1ea5d4b33..e3f25161a7a 100644
--- a/src/mame/drivers/blackt96.c
+++ b/src/mame/drivers/blackt96.c
@@ -473,12 +473,12 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( blackt96 )
MDRV_CPU_ADD("maincpu", M68000, 18000000 /2)
- MDRV_CPU_PROGRAM_MAP(blackt96_map,0)
+ MDRV_CPU_PROGRAM_MAP(blackt96_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", PIC16C57, 8000000) /* ? */
MDRV_CPU_FLAGS(CPU_DISABLE)
- MDRV_CPU_IO_MAP(sound_io_map, 0)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_GFXDECODE(blackt96)
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index 9741e68837b..449ff09f1b8 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -274,11 +274,11 @@ static MACHINE_DRIVER_START( bladestl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, 24000000/2) /* 24MHz/2 (?) */
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(bladestl_interrupt,2) /* (1 IRQ + 1 NMI) */
MDRV_CPU_ADD("audiocpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index 007b8124b9b..1a087e6b407 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -303,16 +303,16 @@ static MACHINE_DRIVER_START( blktiger )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(blktiger_map, 0)
- MDRV_CPU_IO_MAP(blktiger_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(blktiger_map)
+ MDRV_CPU_IO_MAP(blktiger_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(blktiger_sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(blktiger_sound_map)
MDRV_CPU_ADD("mcu", I8751, XTAL_24MHz/4) /* ??? */
- MDRV_CPU_PROGRAM_MAP(blktiger_mcu_map,0)
- MDRV_CPU_IO_MAP(blktiger_mcu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(blktiger_mcu_map)
+ MDRV_CPU_IO_MAP(blktiger_mcu_io_map)
//MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_START(blktiger)
@@ -348,7 +348,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( blktigerbl )
MDRV_IMPORT_FROM(blktiger)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(blktigerbl_io_map, 0)
+ MDRV_CPU_IO_MAP(blktigerbl_io_map)
MDRV_CPU_REMOVE("mcu")
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c
index b2ec9bc1007..ae843c0d516 100644
--- a/src/mame/drivers/blmbycar.c
+++ b/src/mame/drivers/blmbycar.c
@@ -357,7 +357,7 @@ static MACHINE_DRIVER_START( blmbycar )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(blmbycar_map,0)
+ MDRV_CPU_PROGRAM_MAP(blmbycar_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
/* video hardware */
@@ -387,7 +387,7 @@ static MACHINE_DRIVER_START( watrball )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(watrball_map,0)
+ MDRV_CPU_PROGRAM_MAP(watrball_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c
index 44090eb0cdd..62999fcdc10 100644
--- a/src/mame/drivers/blockade.c
+++ b/src/mame/drivers/blockade.c
@@ -442,8 +442,8 @@ static MACHINE_DRIVER_START( blockade )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080, MASTER_CLOCK/10)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_io_map)
MDRV_CPU_VBLANK_INT("screen", blockade_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index 49239b62ac9..5d964568b5d 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -150,11 +150,11 @@ static MACHINE_DRIVER_START( blockhl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI,3000000) /* Konami custom 052526 */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", blockhl_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
MDRV_MACHINE_RESET(blockhl)
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index ecd1bec4534..7a857084421 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -184,11 +184,11 @@ static MACHINE_DRIVER_START( blockout )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* MRH - 8.76 makes gfx/adpcm samples sync better -- but 10 is correct speed*/
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(blockout_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c
index ac6e9f17a94..e2032d822df 100644
--- a/src/mame/drivers/bloodbro.c
+++ b/src/mame/drivers/bloodbro.c
@@ -464,7 +464,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( bloodbro )
// basic machine hardware
MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(bloodbro_map, 0)
+ MDRV_CPU_PROGRAM_MAP(bloodbro_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
SEIBU_SOUND_SYSTEM_CPU(XTAL_7_15909MHz/2) /* verified on pcb */
@@ -494,7 +494,7 @@ static MACHINE_DRIVER_START( weststry )
MDRV_IMPORT_FROM(bloodbro)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(weststry_map, 0)
+ MDRV_CPU_PROGRAM_MAP(weststry_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_GFXDECODE(weststry)
diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c
index 9308e7ff429..ea4cf75097f 100644
--- a/src/mame/drivers/blstroid.c
+++ b/src/mame/drivers/blstroid.c
@@ -194,7 +194,7 @@ static MACHINE_DRIVER_START( blstroid )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_MACHINE_RESET(blstroid)
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index dbece04615d..d14171b2df1 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -271,11 +271,11 @@ static const ay8910_interface ay8910_interface_2 =
static MACHINE_DRIVER_START( blueprnt )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, 7000000/2) // 3.5 MHz
- MDRV_CPU_PROGRAM_MAP(blueprnt_map, 0)
+ MDRV_CPU_PROGRAM_MAP(blueprnt_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 10000000/2/2/2) // 1.25 MHz (2H)
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) // IRQs connected to 32V
// NMIs are caused by the main CPU
// video hardware
diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c
index d0fdcb98f17..3a9ddf4e816 100644
--- a/src/mame/drivers/bmcbowl.c
+++ b/src/mame/drivers/bmcbowl.c
@@ -496,7 +496,7 @@ static INTERRUPT_GEN( bmc_interrupt )
static MACHINE_DRIVER_START( bmcbowl )
MDRV_CPU_ADD("maincpu", M68000, 21477270/2 )
- MDRV_CPU_PROGRAM_MAP(bmcbowl_mem,0)
+ MDRV_CPU_PROGRAM_MAP(bmcbowl_mem)
MDRV_CPU_VBLANK_INT_HACK(bmc_interrupt,2)
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index 440d16dca5d..61841537110 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -1326,11 +1326,11 @@ static MACHINE_DRIVER_START( bnstars )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V70, 20000000) // 20MHz
- MDRV_CPU_PROGRAM_MAP(bnstars_map,0)
+ MDRV_CPU_PROGRAM_MAP(bnstars_map)
MDRV_CPU_VBLANK_INT_HACK(ms32_interrupt,32)
// MDRV_CPU_ADD("audiocpu", Z80, 4000000)
-// MDRV_CPU_PROGRAM_MAP(bnstars_z80_map, 0)
+// MDRV_CPU_PROGRAM_MAP(bnstars_z80_map)
MDRV_QUANTUM_TIME(HZ(60000))
diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c
index 60f51833a4e..e1d1dc3d51a 100644
--- a/src/mame/drivers/bogeyman.c
+++ b/src/mame/drivers/bogeyman.c
@@ -218,7 +218,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( bogeyman )
// basic machine hardware
MDRV_CPU_ADD("maincpu", M6502, 2000000) // 12 MHz clock on board
- MDRV_CPU_PROGRAM_MAP(bogeyman_map, 0)
+ MDRV_CPU_PROGRAM_MAP(bogeyman_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 16) // Controls sound
// video hardware
diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c
index 1c1ddcca704..96e2616c801 100644
--- a/src/mame/drivers/bombjack.c
+++ b/src/mame/drivers/bombjack.c
@@ -321,12 +321,12 @@ static MACHINE_DRIVER_START( bombjack )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz????? */
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
- MDRV_CPU_IO_MAP(audio_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
+ MDRV_CPU_IO_MAP(audio_io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_START(bombjack)
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index b157b6c595a..008238de932 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -298,11 +298,11 @@ static const ym2151_interface ym2151_config =
static MACHINE_DRIVER_START( boogwing )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000) /* DE102 */
- MDRV_CPU_PROGRAM_MAP(boogwing_map,0)
+ MDRV_CPU_PROGRAM_MAP(boogwing_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", H6280,32220000/4)
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index 893e246b0d2..0704c4b4afc 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -260,11 +260,11 @@ static MACHINE_DRIVER_START( bottom9 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 2000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", bottom9_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
MDRV_CPU_VBLANK_INT_HACK(bottom9_sound_interrupt,8) /* irq is triggered by the main CPU */
/* video hardware */
diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c
index 2bac74c9dba..96ff109d241 100644
--- a/src/mame/drivers/boxer.c
+++ b/src/mame/drivers/boxer.c
@@ -293,7 +293,7 @@ static MACHINE_DRIVER_START(boxer)
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16)
- MDRV_CPU_PROGRAM_MAP(boxer_map, 0)
+ MDRV_CPU_PROGRAM_MAP(boxer_map)
/* video hardware */
MDRV_MACHINE_RESET(boxer)
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index af454a91676..bec6a74ca8c 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -338,11 +338,11 @@ static MACHINE_DRIVER_START( brkthru )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
- MDRV_CPU_PROGRAM_MAP(brkthru_map,0)
+ MDRV_CPU_PROGRAM_MAP(brkthru_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_GFXDECODE(brkthru)
@@ -376,11 +376,11 @@ static MACHINE_DRIVER_START( darwin )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
- MDRV_CPU_PROGRAM_MAP(darwin_map,0)
+ MDRV_CPU_PROGRAM_MAP(darwin_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_GFXDECODE(brkthru)
diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c
index 2412fa7e6fe..9e4ac43eb12 100644
--- a/src/mame/drivers/bsktball.c
+++ b/src/mame/drivers/bsktball.c
@@ -214,7 +214,7 @@ static MACHINE_DRIVER_START( bsktball )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502,750000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(bsktball_interrupt,8)
/* video hardware */
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index b298aba18d8..d04070f31f7 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -1416,10 +1416,10 @@ static MACHINE_DRIVER_START( btime )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, HCLK2) /* seletable between H2/H4 via jumper */
- MDRV_CPU_PROGRAM_MAP(btime_map,0)
+ MDRV_CPU_PROGRAM_MAP(btime_map)
MDRV_CPU_ADD("audiocpu", M6502, HCLK1/3/2)
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
MDRV_TIMER_ADD_SCANLINE("audionmi", audio_nmi_gen, "screen", 0, 8)
/* video hardware */
@@ -1462,10 +1462,10 @@ static MACHINE_DRIVER_START( cookrace )
/* basic machine hardware */
MDRV_IMPORT_FROM(btime)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cookrace_map,0)
+ MDRV_CPU_PROGRAM_MAP(cookrace_map)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
/* video hardware */
MDRV_GFXDECODE(cookrace)
@@ -1480,7 +1480,7 @@ static MACHINE_DRIVER_START( lnc )
/* basic machine hardware */
MDRV_IMPORT_FROM(btime)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(lnc_map,0)
+ MDRV_CPU_PROGRAM_MAP(lnc_map)
MDRV_MACHINE_RESET(lnc)
@@ -1508,7 +1508,7 @@ static MACHINE_DRIVER_START( mmonkey )
/* basic machine hardware */
MDRV_IMPORT_FROM(wtennis)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mmonkey_map,0)
+ MDRV_CPU_PROGRAM_MAP(mmonkey_map)
MACHINE_DRIVER_END
@@ -1517,7 +1517,7 @@ static MACHINE_DRIVER_START( bnj )
/* basic machine hardware */
MDRV_IMPORT_FROM(btime)
MDRV_CPU_REPLACE("maincpu", M6502, HCLK4)
- MDRV_CPU_PROGRAM_MAP(bnj_map,0)
+ MDRV_CPU_PROGRAM_MAP(bnj_map)
/* video hardware */
MDRV_GFXDECODE(bnj)
@@ -1533,7 +1533,7 @@ static MACHINE_DRIVER_START( zoar )
/* basic machine hardware */
MDRV_IMPORT_FROM(btime)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(zoar_map,0)
+ MDRV_CPU_PROGRAM_MAP(zoar_map)
/* video hardware */
MDRV_GFXDECODE(zoar)
@@ -1555,10 +1555,10 @@ static MACHINE_DRIVER_START( disco )
/* basic machine hardware */
MDRV_IMPORT_FROM(btime)
MDRV_CPU_REPLACE("maincpu", M6502, HCLK4)
- MDRV_CPU_PROGRAM_MAP(disco_map,0)
+ MDRV_CPU_PROGRAM_MAP(disco_map)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(disco_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(disco_audio_map)
/* video hardware */
MDRV_GFXDECODE(disco)
@@ -1573,7 +1573,7 @@ static MACHINE_DRIVER_START( tisland )
/* basic machine hardware */
MDRV_IMPORT_FROM(btime)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tisland_map,0)
+ MDRV_CPU_PROGRAM_MAP(tisland_map)
/* video hardware */
MDRV_GFXDECODE(zoar)
diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c
index d303271a242..bdd951ddf4b 100644
--- a/src/mame/drivers/btoads.c
+++ b/src/mame/drivers/btoads.c
@@ -341,11 +341,11 @@ static MACHINE_DRIVER_START( btoads )
MDRV_CPU_ADD("maincpu", TMS34020, CPU_CLOCK/2)
MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_CPU_PERIODIC_INT(irq0_line_assert, 183)
MDRV_MACHINE_START(btoads)
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index da20fc5c3b7..a8eca2649c4 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -676,15 +676,15 @@ static const ym2203_interface ym2203_config =
static MACHINE_DRIVER_START( tokio )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(tokio_map, 0)
+ MDRV_CPU_PROGRAM_MAP(tokio_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("slave", Z80, MAIN_XTAL/4) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(tokio_slave_map, 0)
+ MDRV_CPU_PROGRAM_MAP(tokio_slave_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(tokio_sound_map, 0) // NMIs are triggered by the main CPU, IRQs are triggered by the YM2203
+ MDRV_CPU_PROGRAM_MAP(tokio_sound_map) // NMIs are triggered by the main CPU, IRQs are triggered by the YM2203
MDRV_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
@@ -713,18 +713,18 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bublbobl )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(master_map, 0)
+ MDRV_CPU_PROGRAM_MAP(master_map)
// IRQs are triggered by the MCU
MDRV_CPU_ADD("slave", Z80, MAIN_XTAL/4) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(slave_map, 0)
+ MDRV_CPU_PROGRAM_MAP(slave_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(sound_map, 0) // IRQs are triggered by the YM2203
+ MDRV_CPU_PROGRAM_MAP(sound_map) // IRQs are triggered by the YM2203
MDRV_CPU_ADD("mcu", M6801, 4000000) // actually 6801U4 // xtal is 4MHz, divided by 4 internally
- MDRV_CPU_PROGRAM_MAP(mcu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_pulse) // comes from the same clock that latches the INT pin on the second Z80
MDRV_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
@@ -757,7 +757,7 @@ static MACHINE_DRIVER_START( boblbobl )
// basic machine hardware
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bootleg_map, 0)
+ MDRV_CPU_PROGRAM_MAP(bootleg_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) // interrupt mode 1, unlike Bubble Bobble
MDRV_CPU_REMOVE("mcu")
@@ -769,7 +769,7 @@ static MACHINE_DRIVER_START( bub68705 )
MDRV_CPU_REMOVE("mcu")
MDRV_CPU_ADD("mcu", M68705, 4000000) // xtal is 4MHz, divided by 4 internally
- MDRV_CPU_PROGRAM_MAP(bootlegmcu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(bootlegmcu_map)
MDRV_CPU_VBLANK_INT_HACK(bublbobl_m68705_interrupt, 2) // ??? should come from the same clock which latches the INT pin on the second Z80
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index 9fcd7441628..46b979bd809 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -375,16 +375,16 @@ static MACHINE_DRIVER_START( buggychl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz??? */
- MDRV_CPU_PROGRAM_MAP(buggychl_map,0)
+ MDRV_CPU_PROGRAM_MAP(buggychl_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,60) /* irq is timed, tied to the cpu clock and not to vblank */
/* nmi is caused by the main cpu */
MDRV_CPU_ADD("mcu", M68705,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/buster.c b/src/mame/drivers/buster.c
index 1eea50d0e71..c2d16bf9c32 100644
--- a/src/mame/drivers/buster.c
+++ b/src/mame/drivers/buster.c
@@ -72,7 +72,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( buster )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(mainmap,0)
+ MDRV_CPU_PROGRAM_MAP(mainmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c
index 60d64c26eae..cb119fd7c04 100644
--- a/src/mame/drivers/bwidow.c
+++ b/src/mame/drivers/bwidow.c
@@ -713,7 +713,7 @@ static MACHINE_DRIVER_START( bwidow )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(bwidow_map,0)
+ MDRV_CPU_PROGRAM_MAP(bwidow_map)
MDRV_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12)
MDRV_ATARIVGEAROM_ADD("earom")
@@ -756,7 +756,7 @@ static MACHINE_DRIVER_START( lunarbat )
/* basic machine hardware */
MDRV_IMPORT_FROM(gravitar)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spacduel_map,0)
+ MDRV_CPU_PROGRAM_MAP(spacduel_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -770,7 +770,7 @@ static MACHINE_DRIVER_START( spacduel )
/* basic machine hardware */
MDRV_IMPORT_FROM(gravitar)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spacduel_map,0)
+ MDRV_CPU_PROGRAM_MAP(spacduel_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index a81342d6cae..7300d7e0760 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -371,16 +371,16 @@ static MACHINE_DRIVER_START( bwing )
// basic machine hardware
MDRV_CPU_ADD("maincpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(bwp1_map, 0)
+ MDRV_CPU_PROGRAM_MAP(bwp1_map)
MDRV_CPU_VBLANK_INT_HACK(bwp1_interrupt, 3)
MDRV_CPU_ADD("sub", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(bwp2_map, 0)
+ MDRV_CPU_PROGRAM_MAP(bwp2_map)
// MDRV_CPU_VBLANK_INT("screen", irq1_line_assert) // vblank triggers FIRQ on CPU2 by design (unused)
MDRV_CPU_ADD("audiocpu", DECO16, 2000000)
- MDRV_CPU_PROGRAM_MAP(bwp3_map, 0)
- MDRV_CPU_IO_MAP(bwp3_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(bwp3_map)
+ MDRV_CPU_IO_MAP(bwp3_io_map)
MDRV_CPU_PERIODIC_INT(bwp3_interrupt, 1000)
MDRV_QUANTUM_TIME(HZ(18000)) // high enough?
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index 106c4dfadc2..7a825ffee93 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -547,7 +547,7 @@ static MACHINE_DRIVER_START( bzone )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(bzone_map,0)
+ MDRV_CPU_PROGRAM_MAP(bzone_map)
MDRV_CPU_PERIODIC_INT(bzone_interrupt, (double)MASTER_CLOCK / 4096 / 12)
MDRV_MACHINE_START(bzone)
@@ -593,7 +593,7 @@ static MACHINE_DRIVER_START( redbaron )
/* basic machine hardware */
MDRV_IMPORT_FROM(bzone)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(redbaron_map,0)
+ MDRV_CPU_PROGRAM_MAP(redbaron_map)
MDRV_CPU_PERIODIC_INT(bzone_interrupt, (double)MASTER_CLOCK / 4096 / 12)
MDRV_MACHINE_START(redbaron)
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index 8abf47b7a2c..7dca16ba7b1 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -488,11 +488,11 @@ static MACHINE_DRIVER_START( cabal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(seibu_sound)
@@ -530,21 +530,21 @@ static MACHINE_DRIVER_START( cabalbl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cabalbl_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(cabalbl_main_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cabalbl_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(cabalbl_sound_map)
/* there are 2x z80s for the ADPCM */
MDRV_CPU_ADD("adpcm1", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cabalbl_talk1_map,0)
- MDRV_CPU_IO_MAP(cabalbl_talk1_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cabalbl_talk1_map)
+ MDRV_CPU_IO_MAP(cabalbl_talk1_portmap)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,8000)
MDRV_CPU_ADD("adpcm2", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cabalbl_talk2_map,0)
- MDRV_CPU_IO_MAP(cabalbl_talk2_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cabalbl_talk2_map)
+ MDRV_CPU_IO_MAP(cabalbl_talk2_portmap)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,8000)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c
index 4ab9a44f489..e0605aae8eb 100644
--- a/src/mame/drivers/cabaret.c
+++ b/src/mame/drivers/cabaret.c
@@ -306,8 +306,8 @@ static INTERRUPT_GEN( cabaret_interrupt )
static MACHINE_DRIVER_START( cabaret )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2)
- MDRV_CPU_PROGRAM_MAP(cabaret_map,0)
- MDRV_CPU_IO_MAP(cabaret_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cabaret_map)
+ MDRV_CPU_IO_MAP(cabaret_portmap)
MDRV_CPU_VBLANK_INT("screen",cabaret_interrupt)
MDRV_MACHINE_RESET(cabaret)
diff --git a/src/mame/drivers/calchase.c b/src/mame/drivers/calchase.c
index d9a9083a759..977596bdc5c 100644
--- a/src/mame/drivers/calchase.c
+++ b/src/mame/drivers/calchase.c
@@ -644,8 +644,8 @@ static void calchase_set_keyb_int(running_machine *machine, int state) {
static MACHINE_DRIVER_START( calchase )
MDRV_CPU_ADD("maincpu", PENTIUM, 200000000) // Cyrix 686MX-PR200 CPU
- MDRV_CPU_PROGRAM_MAP(calchase_map, 0)
- MDRV_CPU_IO_MAP(calchase_io, 0)
+ MDRV_CPU_PROGRAM_MAP(calchase_map)
+ MDRV_CPU_IO_MAP(calchase_io)
MDRV_MACHINE_START(calchase)
MDRV_MACHINE_RESET(calchase)
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index 1dc46241f2d..f8eef898b68 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -1919,7 +1919,7 @@ static const mc6845_interface mc6845_intf =
static MACHINE_DRIVER_START( sys903 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */
- MDRV_CPU_PROGRAM_MAP(sys903_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sys903_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -1959,7 +1959,7 @@ static MACHINE_DRIVER_START( sys905 )
MDRV_IMPORT_FROM( sys903 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sys905_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sys905_map)
MDRV_PIA6821_MODIFY("pia0", sys905_pia0_intf)
MDRV_PIA6821_MODIFY("pia1", sys905_pia1_intf)
@@ -1977,7 +1977,7 @@ static MACHINE_DRIVER_START( s903mod )
MDRV_IMPORT_FROM( sys903 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(s903mod_map, 0)
+ MDRV_CPU_PROGRAM_MAP(s903mod_map)
/* sound hardware */
MDRV_SOUND_MODIFY("ay8912")
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index 82504095dc8..229076fcc37 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -362,12 +362,12 @@ GFXDECODE_END
static MACHINE_DRIVER_START( calorie )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(calorie_map,0)
+ MDRV_CPU_PROGRAM_MAP(calorie_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,3000000) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(calorie_sound_map,0)
- MDRV_CPU_IO_MAP(calorie_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(calorie_sound_map)
+ MDRV_CPU_IO_MAP(calorie_sound_io_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, 64)
/* video hardware */
diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c
index 94654168bbf..a94606cd8cd 100644
--- a/src/mame/drivers/canyon.c
+++ b/src/mame/drivers/canyon.c
@@ -243,7 +243,7 @@ static MACHINE_DRIVER_START( canyon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 12096000 / 16)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_WATCHDOG_VBLANK_INIT(8)
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index f37f0110876..a57e4b7a43a 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -353,11 +353,11 @@ static MACHINE_DRIVER_START( capbowl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809E, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(capbowl_map,0)
+ MDRV_CPU_PROGRAM_MAP(capbowl_map)
MDRV_CPU_VBLANK_INT("screen", capbowl_interrupt)
MDRV_CPU_ADD("audiocpu", M6809E, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(capbowl)
MDRV_NVRAM_HANDLER(capbowl)
@@ -393,7 +393,7 @@ static MACHINE_DRIVER_START( bowlrama )
MDRV_IMPORT_FROM(capbowl)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bowlrama_map,0)
+ MDRV_CPU_PROGRAM_MAP(bowlrama_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c
index 98ebae5b17d..a38106b638a 100644
--- a/src/mame/drivers/cardline.c
+++ b/src/mame/drivers/cardline.c
@@ -195,8 +195,8 @@ static MACHINE_DRIVER_START( cardline )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", I80C32,12000000)
- MDRV_CPU_PROGRAM_MAP(mem_prg,0)
- MDRV_CPU_IO_MAP(mem_io,0)
+ MDRV_CPU_PROGRAM_MAP(mem_prg)
+ MDRV_CPU_IO_MAP(mem_io)
//MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c
index 2c87152b4cd..161d16461ad 100644
--- a/src/mame/drivers/carjmbre.c
+++ b/src/mame/drivers/carjmbre.c
@@ -169,12 +169,12 @@ static MACHINE_DRIVER_START( carjmbre )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,18432000/6)
- MDRV_CPU_PROGRAM_MAP(carjmbre_map,0)
+ MDRV_CPU_PROGRAM_MAP(carjmbre_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80, 1500000)
- MDRV_CPU_PROGRAM_MAP(carjmbre_sound_map,0)
- MDRV_CPU_IO_MAP(carjmbre_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(carjmbre_sound_map)
+ MDRV_CPU_IO_MAP(carjmbre_sound_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c
index 8424493ddfd..66fc17bbd7f 100644
--- a/src/mame/drivers/carpolo.c
+++ b/src/mame/drivers/carpolo.c
@@ -231,7 +231,7 @@ static MACHINE_DRIVER_START( carpolo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502,11289000/12) /* 940.75 kHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", carpolo_timer_interrupt) /* this not strictly VBLANK,
but it's supposed to happen 60
times a sec, so it's a good place */
diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c
index 2ec14f15be4..6bfeab15ae9 100644
--- a/src/mame/drivers/carrera.c
+++ b/src/mame/drivers/carrera.c
@@ -313,8 +313,8 @@ static const mc6845_interface mc6845_intf =
static MACHINE_DRIVER_START( carrera )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 6)
- MDRV_CPU_PROGRAM_MAP(carrera_map, 0)
- MDRV_CPU_IO_MAP(io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(carrera_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c
index 5d96c3fb77e..df7565cb059 100644
--- a/src/mame/drivers/caswin.c
+++ b/src/mame/drivers/caswin.c
@@ -276,8 +276,8 @@ static PALETTE_INIT( caswin )
static MACHINE_DRIVER_START( vvillage )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(vvillage_mem,0)
- MDRV_CPU_IO_MAP(vvillage_io,0)
+ MDRV_CPU_PROGRAM_MAP(vvillage_mem)
+ MDRV_CPU_IO_MAP(vvillage_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold )
/* video hardware */
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index 1383b66ec75..57790442cca 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -1708,7 +1708,7 @@ static MACHINE_DRIVER_START( dfeveron )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(dfeveron_map,0)
+ MDRV_CPU_PROGRAM_MAP(dfeveron_map)
MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
MDRV_MACHINE_RESET(cave)
@@ -1747,7 +1747,7 @@ static MACHINE_DRIVER_START( ddonpach )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(ddonpach_map,0)
+ MDRV_CPU_PROGRAM_MAP(ddonpach_map)
MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
MDRV_MACHINE_RESET(cave)
@@ -1786,7 +1786,7 @@ static MACHINE_DRIVER_START( donpachi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(donpachi_map,0)
+ MDRV_CPU_PROGRAM_MAP(donpachi_map)
MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
MDRV_MACHINE_RESET(cave)
@@ -1830,7 +1830,7 @@ static MACHINE_DRIVER_START( esprade )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(esprade_map,0)
+ MDRV_CPU_PROGRAM_MAP(esprade_map)
MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
MDRV_MACHINE_RESET(cave)
@@ -1869,7 +1869,7 @@ static MACHINE_DRIVER_START( gaia )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(gaia_map,0)
+ MDRV_CPU_PROGRAM_MAP(gaia_map)
MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
MDRV_MACHINE_RESET(cave)
@@ -1907,7 +1907,7 @@ static MACHINE_DRIVER_START( guwange )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(guwange_map,0)
+ MDRV_CPU_PROGRAM_MAP(guwange_map)
MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
MDRV_MACHINE_RESET(cave)
@@ -1945,12 +1945,12 @@ static MACHINE_DRIVER_START( hotdogst )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(hotdogst_map,0)
+ MDRV_CPU_PROGRAM_MAP(hotdogst_map)
MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_4MHz)
- MDRV_CPU_PROGRAM_MAP(hotdogst_sound_map,0)
- MDRV_CPU_IO_MAP(hotdogst_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(hotdogst_sound_map)
+ MDRV_CPU_IO_MAP(hotdogst_sound_portmap)
MDRV_MACHINE_RESET(cave)
MDRV_NVRAM_HANDLER(cave)
@@ -1999,7 +1999,7 @@ static MACHINE_DRIVER_START( korokoro )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(korokoro_map,0)
+ MDRV_CPU_PROGRAM_MAP(korokoro_map)
MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
MDRV_MACHINE_RESET(cave)
@@ -2038,12 +2038,12 @@ static MACHINE_DRIVER_START( mazinger )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(mazinger_map,0)
+ MDRV_CPU_PROGRAM_MAP(mazinger_map)
MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_4MHz) // Bidirectional communication
- MDRV_CPU_PROGRAM_MAP(mazinger_sound_map,0)
- MDRV_CPU_IO_MAP(mazinger_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(mazinger_sound_map)
+ MDRV_CPU_IO_MAP(mazinger_sound_portmap)
MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
@@ -2094,12 +2094,12 @@ static MACHINE_DRIVER_START( metmqstr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2)
- MDRV_CPU_PROGRAM_MAP(metmqstr_map,0)
+ MDRV_CPU_PROGRAM_MAP(metmqstr_map)
MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_32MHz / 4)
- MDRV_CPU_PROGRAM_MAP(metmqstr_sound_map,0)
- MDRV_CPU_IO_MAP(metmqstr_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(metmqstr_sound_map)
+ MDRV_CPU_IO_MAP(metmqstr_sound_portmap)
MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
@@ -2151,12 +2151,12 @@ static MACHINE_DRIVER_START( pwrinst2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(pwrinst2_map,0)
+ MDRV_CPU_PROGRAM_MAP(pwrinst2_map)
MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,XTAL_16MHz / 2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(pwrinst2_sound_map,0)
- MDRV_CPU_IO_MAP(pwrinst2_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(pwrinst2_sound_map)
+ MDRV_CPU_IO_MAP(pwrinst2_sound_portmap)
MDRV_MACHINE_RESET(cave)
MDRV_NVRAM_HANDLER(cave)
@@ -2210,12 +2210,12 @@ static MACHINE_DRIVER_START( sailormn )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(sailormn_map,0)
+ MDRV_CPU_PROGRAM_MAP(sailormn_map)
MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_8MHz) // Bidirectional Communication
- MDRV_CPU_PROGRAM_MAP(sailormn_sound_map,0)
- MDRV_CPU_IO_MAP(sailormn_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sailormn_sound_map)
+ MDRV_CPU_IO_MAP(sailormn_sound_portmap)
// MDRV_QUANTUM_TIME(HZ(600))
@@ -2264,7 +2264,7 @@ static MACHINE_DRIVER_START( uopoko )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(uopoko_map,0)
+ MDRV_CPU_PROGRAM_MAP(uopoko_map)
MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
MDRV_NVRAM_HANDLER(cave)
diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c
index 51718482f92..e8c896a5e18 100644
--- a/src/mame/drivers/cb2001.c
+++ b/src/mame/drivers/cb2001.c
@@ -183,8 +183,8 @@ static const nec_config cb2001_config = { cb2001_decryption_table, };
static MACHINE_DRIVER_START( cb2001 )
MDRV_CPU_ADD("maincpu", V30, 20000000) // CPU91A-011-0016JK004; encrypted cpu like nec v25/35 used in some irem game
MDRV_CPU_CONFIG(cb2001_config)
- MDRV_CPU_PROGRAM_MAP(cb2001_map,0)
- MDRV_CPU_IO_MAP(cb2001_io,0)
+ MDRV_CPU_PROGRAM_MAP(cb2001_map)
+ MDRV_CPU_IO_MAP(cb2001_io)
MDRV_CPU_VBLANK_INT("screen", vblank_irq)
MDRV_GFXDECODE(cb2001)
diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c
index c15ab3c35f9..0fc1b78cdff 100644
--- a/src/mame/drivers/cball.c
+++ b/src/mame/drivers/cball.c
@@ -200,7 +200,7 @@ static MACHINE_DRIVER_START( cball )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6800, 12096000 / 16) /* ? */
- MDRV_CPU_PROGRAM_MAP(cpu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(cpu_map)
MDRV_MACHINE_RESET(cball)
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index 47a6c8b0bd0..c88cafc61af 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -241,8 +241,8 @@ static MACHINE_DRIVER_START( cbasebal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(cbasebal_map,0)
- MDRV_CPU_IO_MAP(cbasebal_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cbasebal_map)
+ MDRV_CPU_IO_MAP(cbasebal_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* ??? */
MDRV_NVRAM_HANDLER(cbasebal)
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index 0944a275439..f214227d9f4 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -285,11 +285,11 @@ static MACHINE_DRIVER_START( twocrude )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* Custom chip 59 */
- MDRV_CPU_PROGRAM_MAP(twocrude_map,0)
+ MDRV_CPU_PROGRAM_MAP(twocrude_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
MDRV_CPU_ADD("audiocpu", H6280,32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c
index 0dc06041b62..cb04f1ed8f8 100644
--- a/src/mame/drivers/ccastles.c
+++ b/src/mame/drivers/ccastles.c
@@ -490,7 +490,7 @@ static MACHINE_DRIVER_START( ccastles )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_START(ccastles)
MDRV_MACHINE_RESET(ccastles)
diff --git a/src/mame/drivers/cchance.c b/src/mame/drivers/cchance.c
index 7cde886dcee..4319a8d0b65 100644
--- a/src/mame/drivers/cchance.c
+++ b/src/mame/drivers/cchance.c
@@ -181,7 +181,7 @@ static const ay8910_interface ay8910_config =
static MACHINE_DRIVER_START( cchance )
MDRV_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_GFXDECODE(cchance)
diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c
index 996c5d24523..d261327fc4d 100644
--- a/src/mame/drivers/cchasm.c
+++ b/src/mame/drivers/cchasm.c
@@ -161,12 +161,12 @@ static MACHINE_DRIVER_START( cchasm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,CCHASM_68K_CLOCK) /* 8 MHz (from schematics) */
- MDRV_CPU_PROGRAM_MAP(memmap,0)
+ MDRV_CPU_PROGRAM_MAP(memmap)
MDRV_CPU_ADD("audiocpu", Z80,3584229) /* 3.58 MHz (from schematics) */
MDRV_CPU_CONFIG(daisy_chain)
- MDRV_CPU_PROGRAM_MAP(sound_memmap,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_memmap)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_Z80CTC_ADD("ctc", 3584229 /* same as "audiocpu" */, cchasm_ctc_intf)
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c
index 4bb742f1a76..81bc1164fec 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -976,8 +976,8 @@ static MACHINE_DRIVER_START( root )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(cclimber_map,0)
- MDRV_CPU_IO_MAP(cclimber_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cclimber_map)
+ MDRV_CPU_IO_MAP(cclimber_portmap)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_RESET(cclimber)
@@ -1022,7 +1022,7 @@ static MACHINE_DRIVER_START( cannonb )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cannonb_map,0)
+ MDRV_CPU_PROGRAM_MAP(cannonb_map)
/* video hardware */
MDRV_GFXDECODE(cannonb)
@@ -1035,12 +1035,12 @@ static MACHINE_DRIVER_START( yamato )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(yamato_map,0)
- MDRV_CPU_IO_MAP(yamato_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(yamato_map)
+ MDRV_CPU_IO_MAP(yamato_portmap)
MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz ? */
- MDRV_CPU_PROGRAM_MAP(yamato_audio_map,0)
- MDRV_CPU_IO_MAP(yamato_audio_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(yamato_audio_map)
+ MDRV_CPU_IO_MAP(yamato_audio_portmap)
/* video hardware */
MDRV_PALETTE_LENGTH(16*4+8*4+256)
@@ -1064,7 +1064,7 @@ static MACHINE_DRIVER_START( toprollr )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(toprollr_map,0)
+ MDRV_CPU_PROGRAM_MAP(toprollr_map)
/* video hardware */
MDRV_GFXDECODE(toprollr)
@@ -1080,12 +1080,12 @@ static MACHINE_DRIVER_START( swimmer )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(swimmer_map,0)
+ MDRV_CPU_PROGRAM_MAP(swimmer_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80,4000000/2)
- MDRV_CPU_PROGRAM_MAP(swimmer_audio_map,0)
- MDRV_CPU_IO_MAP(swimmer_audio_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(swimmer_audio_map)
+ MDRV_CPU_IO_MAP(swimmer_audio_portmap)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, (double)4000000/16384) /* IRQs are triggered by the main CPU */
/* video hardware */
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index ad30a81d57f..d09903916ea 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -1590,7 +1590,7 @@ static MACHINE_DRIVER_START( centiped )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 12096000/8) /* 1.512 MHz (slows down to 0.75MHz while accessing playfield RAM) */
- MDRV_CPU_PROGRAM_MAP(centiped_map,0)
+ MDRV_CPU_PROGRAM_MAP(centiped_map)
MDRV_MACHINE_START(centiped)
MDRV_MACHINE_RESET(centiped)
@@ -1637,7 +1637,7 @@ static MACHINE_DRIVER_START( centipdb )
/* basic machine hardware */
MDRV_IMPORT_FROM(centiped)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(centipdb_map,0)
+ MDRV_CPU_PROGRAM_MAP(centipdb_map)
/* sound hardware */
MDRV_SOUND_REPLACE("pokey", AY8910, 12096000/8)
@@ -1664,7 +1664,7 @@ static MACHINE_DRIVER_START( milliped )
/* basic machine hardware */
MDRV_IMPORT_FROM(centiped)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(milliped_map,0)
+ MDRV_CPU_PROGRAM_MAP(milliped_map)
/* video hardware */
MDRV_GFXDECODE(milliped)
@@ -1689,7 +1689,7 @@ static MACHINE_DRIVER_START( warlords )
/* basic machine hardware */
MDRV_IMPORT_FROM(centiped)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(warlords_map,0)
+ MDRV_CPU_PROGRAM_MAP(warlords_map)
/* video hardware */
MDRV_GFXDECODE(warlords)
@@ -1711,7 +1711,7 @@ static MACHINE_DRIVER_START( mazeinv )
/* basic machine hardware */
MDRV_IMPORT_FROM(milliped)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mazeinv_map,0)
+ MDRV_CPU_PROGRAM_MAP(mazeinv_map)
MDRV_VIDEO_UPDATE(centiped)
MACHINE_DRIVER_END
@@ -1720,8 +1720,8 @@ static MACHINE_DRIVER_START( bullsdrt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", S2650, 12096000/8)
- MDRV_CPU_PROGRAM_MAP(bullsdrt_map,0)
- MDRV_CPU_IO_MAP(bullsdrt_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(bullsdrt_map)
+ MDRV_CPU_IO_MAP(bullsdrt_port_map)
MDRV_ATARIVGEAROM_ADD("earom")
diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c
index 2532316e448..61c614a363e 100644
--- a/src/mame/drivers/chaknpop.c
+++ b/src/mame/drivers/chaknpop.c
@@ -248,7 +248,7 @@ static MACHINE_DRIVER_START( chaknpop )
//MDRV_CPU_ADD("maincpu", Z80, 18432000 / 6) /* 3.072 MHz */
MDRV_CPU_ADD("maincpu", Z80, 2350000)
//MDRV_CPU_ADD("maincpu", Z80, 2760000)
- MDRV_CPU_PROGRAM_MAP(chaknpop_map,0)
+ MDRV_CPU_PROGRAM_MAP(chaknpop_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(chaknpop)
diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c
index e0a5a2cc839..18985b16a89 100644
--- a/src/mame/drivers/cham24.c
+++ b/src/mame/drivers/cham24.c
@@ -248,7 +248,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( cham24 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", N2A03, N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(cham24_map, 0)
+ MDRV_CPU_PROGRAM_MAP(cham24_map)
MDRV_MACHINE_RESET( cham24 )
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index 89bd8468620..cec6307ff01 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -552,12 +552,12 @@ static MACHINE_DRIVER_START( talbot )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
- MDRV_CPU_PROGRAM_MAP(talbot_map, 0)
+ MDRV_CPU_PROGRAM_MAP(talbot_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
/* MCU */
MDRV_CPU_ADD(CPUTAG_MCU, ALPHA8201, XTAL_18_432MHz/6/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -586,11 +586,11 @@ static MACHINE_DRIVER_START( champbas )
/* main cpu */
MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
- MDRV_CPU_PROGRAM_MAP(champbas_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(champbas_main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub", Z80, XTAL_18_432MHz/6)
- MDRV_CPU_PROGRAM_MAP(champbas_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(champbas_sub_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -624,7 +624,7 @@ static MACHINE_DRIVER_START( champmcu )
/* MCU */
MDRV_CPU_ADD(CPUTAG_MCU, ALPHA8201, XTAL_18_432MHz/6/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
/* to MCU timeout champbbj */
MDRV_QUANTUM_TIME(HZ(3000))
@@ -635,17 +635,17 @@ static MACHINE_DRIVER_START( exctsccr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6 )
- MDRV_CPU_PROGRAM_MAP(exctsccr_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(exctsccr_main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4 )
- MDRV_CPU_PROGRAM_MAP(exctsccr_sub_map,0)
- MDRV_CPU_IO_MAP(exctsccr_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(exctsccr_sub_map)
+ MDRV_CPU_IO_MAP(exctsccr_sound_io_map)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 4000) /* 4 kHz, updates the dac */
/* MCU */
MDRV_CPU_ADD(CPUTAG_MCU, ALPHA8301, XTAL_18_432MHz/6/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
MDRV_MACHINE_START(exctsccr)
@@ -692,11 +692,11 @@ static MACHINE_DRIVER_START( exctsccb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
- MDRV_CPU_PROGRAM_MAP(exctsccb_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(exctsccb_main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub", Z80, XTAL_18_432MHz/6)
- MDRV_CPU_PROGRAM_MAP(champbas_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(champbas_sub_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c
index 4ce2349d0d2..4b93c1c5eb4 100644
--- a/src/mame/drivers/champbwl.c
+++ b/src/mame/drivers/champbwl.c
@@ -333,7 +333,7 @@ static MACHINE_DRIVER_START( champbwl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 16000000/4) /* 4MHz */
- MDRV_CPU_PROGRAM_MAP(champbwl_map,0)
+ MDRV_CPU_PROGRAM_MAP(champbwl_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c
index ec1d53b6091..514ab8ba2f1 100644
--- a/src/mame/drivers/chanbara.c
+++ b/src/mame/drivers/chanbara.c
@@ -331,7 +331,7 @@ static const ym2203_interface ym2203_config =
static MACHINE_DRIVER_START( chanbara )
MDRV_CPU_ADD("maincpu", M6809, 12000000/8)
- MDRV_CPU_PROGRAM_MAP(memmap,0)
+ MDRV_CPU_PROGRAM_MAP(memmap)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c
index f836b2d6561..fb733cb9589 100644
--- a/src/mame/drivers/changela.c
+++ b/src/mame/drivers/changela.c
@@ -461,11 +461,11 @@ static INTERRUPT_GEN( chl_interrupt )
static MACHINE_DRIVER_START( changela )
MDRV_CPU_ADD("maincpu", Z80,5000000)
- MDRV_CPU_PROGRAM_MAP(changela_map,0)
+ MDRV_CPU_PROGRAM_MAP(changela_map)
MDRV_CPU_VBLANK_INT_HACK(chl_interrupt,4)
MDRV_CPU_ADD("mcu", M68705,2500000)
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
MDRV_MACHINE_RESET(changela)
diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c
index 147614cd276..1c30aa5141b 100644
--- a/src/mame/drivers/cheekyms.c
+++ b/src/mame/drivers/cheekyms.c
@@ -122,8 +122,8 @@ static MACHINE_DRIVER_START( cheekyms )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,5000000/2) /* 2.5 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c
index 6fa5a3012c6..e2c10ca2149 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -34,7 +34,7 @@ static MACHINE_DRIVER_START( chihiro_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PENTIUM, 733333333) /* Wrong! */
- MDRV_CPU_PROGRAM_MAP(xbox_map, 0)
+ MDRV_CPU_PROGRAM_MAP(xbox_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index 196f50aa9e8..923cb3f9871 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -550,14 +550,14 @@ static MACHINE_DRIVER_START( chinagat )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, MAIN_CLOCK / 2) /* 1.5 MHz (12MHz oscillator / 4 internally) */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_TIMER_ADD_SCANLINE("scantimer", chinagat_scanline, "screen", 0, 1)
MDRV_CPU_ADD("sub", HD6309, MAIN_CLOCK / 2) /* 1.5 MHz (12MHz oscillator / 4 internally) */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
@@ -589,18 +589,18 @@ static MACHINE_DRIVER_START( saiyugb1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK / 8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_TIMER_ADD_SCANLINE("scantimer", chinagat_scanline, "screen", 0, 1)
MDRV_CPU_ADD("sub", M6809, MAIN_CLOCK / 8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz oscillator */
- MDRV_CPU_PROGRAM_MAP(saiyugb1_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(saiyugb1_sound_map)
MDRV_CPU_ADD("mcu", I8748, 9263750) /* 9.263750 MHz oscillator, divided by 3*5 internally */
- MDRV_CPU_PROGRAM_MAP(i8748_map,0)
- MDRV_CPU_IO_MAP(i8748_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(i8748_map)
+ MDRV_CPU_IO_MAP(i8748_portmap)
MDRV_QUANTUM_TIME(HZ(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
@@ -632,14 +632,14 @@ static MACHINE_DRIVER_START( saiyugb2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz (12MHz oscillator) */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_TIMER_ADD_SCANLINE("scantimer", chinagat_scanline, "screen", 0, 1)
MDRV_CPU_ADD("sub", M6809, MAIN_CLOCK / 8) /* 1.5 MHz (12MHz oscillator) */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz oscillator */
- MDRV_CPU_PROGRAM_MAP(ym2203c_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(ym2203c_sound_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c
index f46cab96f8f..d14d224c617 100644
--- a/src/mame/drivers/chinsan.c
+++ b/src/mame/drivers/chinsan.c
@@ -462,8 +462,8 @@ GFXDECODE_END
static MACHINE_DRIVER_START( chinsan )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,10000000/2) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(chinsan_map,0)
- MDRV_CPU_IO_MAP(chinsan_io,0)
+ MDRV_CPU_PROGRAM_MAP(chinsan_map)
+ MDRV_CPU_IO_MAP(chinsan_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET( chinsan )
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index a8a71eb1608..9cdb3e3ef91 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -329,11 +329,11 @@ static MACHINE_DRIVER_START( chqflag )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI,XTAL_24MHz/8) /* 052001 (verified on pcb) */
- MDRV_CPU_PROGRAM_MAP(chqflag_map,0)
+ MDRV_CPU_PROGRAM_MAP(chqflag_map)
MDRV_CPU_VBLANK_INT_HACK(chqflag_interrupt,16) /* ? */
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(chqflag_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(chqflag_sound_map)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/chsuper.c b/src/mame/drivers/chsuper.c
index f3434c803db..f3293caaef7 100644
--- a/src/mame/drivers/chsuper.c
+++ b/src/mame/drivers/chsuper.c
@@ -195,8 +195,8 @@ static MACHINE_DRIVER_START( chsuper )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(chsuper_prg_map,0)
- MDRV_CPU_IO_MAP(chsuper_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(chsuper_prg_map)
+ MDRV_CPU_IO_MAP(chsuper_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c
index 39f01d18616..bb2369ca6b2 100644
--- a/src/mame/drivers/cidelsa.c
+++ b/src/mame/drivers/cidelsa.c
@@ -512,8 +512,8 @@ static MACHINE_DRIVER_START( destryer )
/* basic system hardware */
MDRV_CPU_ADD(CDP1802_TAG, CDP1802, DESTRYER_CHR1)
- MDRV_CPU_PROGRAM_MAP(destryer_map, 0)
- MDRV_CPU_IO_MAP(destryer_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(destryer_map)
+ MDRV_CPU_IO_MAP(destryer_io_map)
MDRV_CPU_CONFIG(cidelsa_cdp1802_config)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -529,8 +529,8 @@ static MACHINE_DRIVER_START( destryea )
/* basic system hardware */
MDRV_CPU_ADD(CDP1802_TAG, CDP1802, DESTRYER_CHR1)
- MDRV_CPU_PROGRAM_MAP(destryea_map, 0)
- MDRV_CPU_IO_MAP(destryer_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(destryea_map)
+ MDRV_CPU_IO_MAP(destryer_io_map)
MDRV_CPU_CONFIG(cidelsa_cdp1802_config)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -547,8 +547,8 @@ static MACHINE_DRIVER_START( altair )
/* basic system hardware */
MDRV_CPU_ADD(CDP1802_TAG, CDP1802, ALTAIR_CHR1)
- MDRV_CPU_PROGRAM_MAP(altair_map, 0)
- MDRV_CPU_IO_MAP(altair_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(altair_map)
+ MDRV_CPU_IO_MAP(altair_io_map)
MDRV_CPU_CONFIG(cidelsa_cdp1802_config)
MDRV_MACHINE_START(cidelsa)
@@ -569,8 +569,8 @@ static MACHINE_DRIVER_START( draco )
/* basic system hardware */
MDRV_CPU_ADD(CDP1802_TAG, CDP1802, DRACO_CHR1)
- MDRV_CPU_PROGRAM_MAP(draco_map, 0)
- MDRV_CPU_IO_MAP(draco_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(draco_map)
+ MDRV_CPU_IO_MAP(draco_io_map)
MDRV_CPU_CONFIG(cidelsa_cdp1802_config)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -578,8 +578,8 @@ static MACHINE_DRIVER_START( draco )
MDRV_MACHINE_RESET(cidelsa)
MDRV_CPU_ADD("audiocpu", COP402, DRACO_SND_CHR1) // COP402N
- MDRV_CPU_PROGRAM_MAP(draco_sound_map, 0)
- MDRV_CPU_IO_MAP(draco_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(draco_sound_map)
+ MDRV_CPU_IO_MAP(draco_sound_io_map)
MDRV_CPU_CONFIG(draco_cop_intf)
/* input/output hardware */
diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c
index e2213714e01..9bcabe40dae 100644
--- a/src/mame/drivers/cinemat.c
+++ b/src/mame/drivers/cinemat.c
@@ -981,9 +981,9 @@ static MACHINE_DRIVER_START( cinemat_nojmi_4k )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", CCPU, MASTER_CLOCK/4)
MDRV_CPU_CONFIG(config_nojmi)
- MDRV_CPU_PROGRAM_MAP(program_map_4k,0)
- MDRV_CPU_DATA_MAP(data_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(program_map_4k)
+ MDRV_CPU_DATA_MAP(data_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_MACHINE_START(cinemat)
MDRV_MACHINE_RESET(cinemat)
@@ -1011,28 +1011,28 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cinemat_nojmi_8k )
MDRV_IMPORT_FROM(cinemat_nojmi_4k)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(program_map_8k,0)
+ MDRV_CPU_PROGRAM_MAP(program_map_8k)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cinemat_jmi_8k )
MDRV_IMPORT_FROM(cinemat_jmi_4k)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(program_map_8k,0)
+ MDRV_CPU_PROGRAM_MAP(program_map_8k)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cinemat_jmi_16k )
MDRV_IMPORT_FROM(cinemat_jmi_4k)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(program_map_16k,0)
+ MDRV_CPU_PROGRAM_MAP(program_map_16k)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cinemat_jmi_32k )
MDRV_IMPORT_FROM(cinemat_jmi_4k)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(program_map_32k,0)
+ MDRV_CPU_PROGRAM_MAP(program_map_32k)
MACHINE_DRIVER_END
@@ -1149,7 +1149,7 @@ static MACHINE_DRIVER_START( qb3 )
MDRV_IMPORT_FROM(cinemat_jmi_32k)
MDRV_IMPORT_FROM(qb3_sound)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_DATA_MAP(data_map_qb3,0)
+ MDRV_CPU_DATA_MAP(data_map_qb3)
MDRV_SCREEN_MODIFY("screen")
MDRV_SCREEN_VISIBLE_AREA(0, 1120, 0, 780)
MDRV_VIDEO_START(cinemat_qb3color)
diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c
index 6b6c8934633..39717f0ffdc 100644
--- a/src/mame/drivers/circus.c
+++ b/src/mame/drivers/circus.c
@@ -269,7 +269,7 @@ static MACHINE_DRIVER_START( circus )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
- MDRV_CPU_PROGRAM_MAP(circus_map,0)
+ MDRV_CPU_PROGRAM_MAP(circus_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -304,7 +304,7 @@ static MACHINE_DRIVER_START( robotbwl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
- MDRV_CPU_PROGRAM_MAP(circus_map,0)
+ MDRV_CPU_PROGRAM_MAP(circus_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -338,7 +338,7 @@ static MACHINE_DRIVER_START( crash )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
- MDRV_CPU_PROGRAM_MAP(circus_map,0)
+ MDRV_CPU_PROGRAM_MAP(circus_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
/* video hardware */
@@ -372,7 +372,7 @@ static MACHINE_DRIVER_START( ripcord )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
- MDRV_CPU_PROGRAM_MAP(circus_map,0)
+ MDRV_CPU_PROGRAM_MAP(circus_map)
//MDRV_CPU_VBLANK_INT("screen", ripcord_interrupt) //AT
/* video hardware */
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index bbeb1aefc31..a10008e16ce 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -344,12 +344,12 @@ static MACHINE_DRIVER_START( circusc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 2048000) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(circusc_map,0)
+ MDRV_CPU_PROGRAM_MAP(circusc_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_WATCHDOG_VBLANK_INIT(8)
MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* Z80 Clock is derived from a 14.31818 MHz crystal */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_START(circusc)
MDRV_MACHINE_RESET(circusc)
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index 197e6350299..3dcc8174161 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -1578,19 +1578,19 @@ static MACHINE_DRIVER_START( bigrun )
/* basic machine hardware */
MDRV_CPU_ADD("cpu1", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(bigrun_map,0)
+ MDRV_CPU_PROGRAM_MAP(bigrun_map)
MDRV_CPU_VBLANK_INT_HACK(cischeat_interrupt,CISCHEAT_INTERRUPT_NUM)
MDRV_CPU_ADD("cpu2", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(bigrun_map2,0)
+ MDRV_CPU_PROGRAM_MAP(bigrun_map2)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("cpu3", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(bigrun_map3,0)
+ MDRV_CPU_PROGRAM_MAP(bigrun_map3)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("soundcpu", M68000, 6000000)
- MDRV_CPU_PROGRAM_MAP(bigrun_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(bigrun_sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq4_line_hold,CISCHEAT_SOUND_INTERRUPT_NUM)
MDRV_QUANTUM_TIME(HZ(1200))
@@ -1633,16 +1633,16 @@ static MACHINE_DRIVER_START( cischeat )
/* basic machine hardware */
MDRV_IMPORT_FROM(bigrun)
MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(cischeat_map,0)
+ MDRV_CPU_PROGRAM_MAP(cischeat_map)
MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(cischeat_map2,0)
+ MDRV_CPU_PROGRAM_MAP(cischeat_map2)
MDRV_CPU_MODIFY("cpu3")
- MDRV_CPU_PROGRAM_MAP(cischeat_map3,0)
+ MDRV_CPU_PROGRAM_MAP(cischeat_map3)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(cischeat_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(cischeat_sound_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -1661,16 +1661,16 @@ static MACHINE_DRIVER_START( f1gpstar )
/* basic machine hardware */
MDRV_IMPORT_FROM(bigrun)
MDRV_CPU_REPLACE("cpu1", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(f1gpstar_map,0)
+ MDRV_CPU_PROGRAM_MAP(f1gpstar_map)
MDRV_CPU_REPLACE("cpu2", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(f1gpstar_map2,0)
+ MDRV_CPU_PROGRAM_MAP(f1gpstar_map2)
MDRV_CPU_REPLACE("cpu3", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(f1gpstar_map3,0)
+ MDRV_CPU_PROGRAM_MAP(f1gpstar_map3)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(f1gpstar_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(f1gpstar_sound_map)
/* video hardware */
MDRV_GFXDECODE(f1gpstar)
@@ -1687,13 +1687,13 @@ static MACHINE_DRIVER_START( f1gpstr2 )
MDRV_IMPORT_FROM(f1gpstar)
MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(f1gpstr2_map,0)
+ MDRV_CPU_PROGRAM_MAP(f1gpstr2_map)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(f1gpstr2_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(f1gpstr2_sound_map)
MDRV_CPU_ADD("cpu5", M68000, 12000000/* was 10000000 */)
- MDRV_CPU_PROGRAM_MAP(f1gpstr2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(f1gpstr2_io_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MACHINE_DRIVER_END
@@ -1724,7 +1724,7 @@ static MACHINE_DRIVER_START( scudhamm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(scudhamm_map,0)
+ MDRV_CPU_PROGRAM_MAP(scudhamm_map)
MDRV_CPU_VBLANK_INT_HACK(interrupt_scudhamm,INTERRUPT_NUM_SCUDHAMM)
/* video hardware */
@@ -1776,7 +1776,7 @@ static MACHINE_DRIVER_START( armchmp2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(scudhamm)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(armchmp2_map,0)
+ MDRV_CPU_PROGRAM_MAP(armchmp2_map)
MDRV_CPU_VBLANK_INT_HACK(interrupt_armchmp2,INTERRUPT_NUM_SCUDHAMM)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index a4f06358d41..15f1c738f4a 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -193,11 +193,11 @@ static MACHINE_DRIVER_START( citycon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 2048000) /* 2.048 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(citycon_map,0)
+ MDRV_CPU_PROGRAM_MAP(citycon_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", M6809, 640000) /* 0.640 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c
index af654a9b5de..58e4bdafec4 100644
--- a/src/mame/drivers/clayshoo.c
+++ b/src/mame/drivers/clayshoo.c
@@ -305,8 +305,8 @@ static MACHINE_DRIVER_START( clayshoo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,5068000/4) /* 5.068/4 Mhz (divider is a guess) */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_START(clayshoo)
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index 6a67b334bd2..d601dec22a2 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -683,8 +683,8 @@ DISCRETE_SOUND_EXTERN( cliffhgr );
static MACHINE_DRIVER_START( cliffhgr )
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4MHz */
- MDRV_CPU_PROGRAM_MAP(mainmem,0)
- MDRV_CPU_IO_MAP(mainport,0)
+ MDRV_CPU_PROGRAM_MAP(mainmem)
+ MDRV_CPU_IO_MAP(mainport)
MDRV_CPU_VBLANK_INT("screen", cliff_vsync)
MDRV_MACHINE_START(cliffhgr)
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index 72aa5dba060..d3130561613 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -334,11 +334,11 @@ static MACHINE_DRIVER_START( cloak )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(master_map, 0)
+ MDRV_CPU_PROGRAM_MAP(master_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
MDRV_CPU_ADD("slave", M6502, 1250000) /* 1.25 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(slave_map, 0)
+ MDRV_CPU_PROGRAM_MAP(slave_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
MDRV_QUANTUM_TIME(HZ(1000))
diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c
index a9e998ae943..b0c09bd9280 100644
--- a/src/mame/drivers/cloud9.c
+++ b/src/mame/drivers/cloud9.c
@@ -459,7 +459,7 @@ static MACHINE_DRIVER_START( cloud9 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(cloud9_map,0)
+ MDRV_CPU_PROGRAM_MAP(cloud9_map)
MDRV_MACHINE_START(cloud9)
MDRV_MACHINE_RESET(cloud9)
diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c
index de57e3d59c8..f2f45cb2f96 100644
--- a/src/mame/drivers/clshroad.c
+++ b/src/mame/drivers/clshroad.c
@@ -252,11 +252,11 @@ static MACHINE_DRIVER_START( firebatl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(clshroad_map,0)
+ MDRV_CPU_PROGRAM_MAP(clshroad_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ, no NMI */
MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(clshroad_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(clshroad_sound_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ, no NMI */
MDRV_MACHINE_RESET(clshroad)
@@ -287,11 +287,11 @@ static MACHINE_DRIVER_START( clshroad )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18432000/4) /* ? real speed unknown. 3MHz is too low and causes problems */
- MDRV_CPU_PROGRAM_MAP(clshroad_map,0)
+ MDRV_CPU_PROGRAM_MAP(clshroad_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ, no NMI */
MDRV_CPU_ADD("audiocpu", Z80, 18432000/6) /* ? */
- MDRV_CPU_PROGRAM_MAP(clshroad_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(clshroad_sound_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ, no NMI */
MDRV_MACHINE_RESET(clshroad)
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index 088345b0629..ec03498503e 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -692,11 +692,11 @@ static MACHINE_DRIVER_START( cninja )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(cninja_map,0)
+ MDRV_CPU_PROGRAM_MAP(cninja_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", H6280,32220000/8) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(cninja)
@@ -740,11 +740,11 @@ static MACHINE_DRIVER_START( stoneage )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(cninja_map,0)
+ MDRV_CPU_PROGRAM_MAP(cninja_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(stoneage_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(stoneage_s_map)
MDRV_MACHINE_RESET(cninja)
@@ -785,11 +785,11 @@ static MACHINE_DRIVER_START( edrandy )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(edrandy_map,0)
+ MDRV_CPU_PROGRAM_MAP(edrandy_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", H6280,32220000/8) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(cninja)
@@ -833,11 +833,11 @@ static MACHINE_DRIVER_START( robocop2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(robocop2_map,0)
+ MDRV_CPU_PROGRAM_MAP(robocop2_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", H6280,32220000/8) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(cninja)
@@ -884,11 +884,11 @@ static MACHINE_DRIVER_START( mutantf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(mutantf_map,0)
+ MDRV_CPU_PROGRAM_MAP(mutantf_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", H6280,32220000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map_mutantf,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map_mutantf)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index 58d94e20834..8b9c0f0fabc 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -735,15 +735,15 @@ static const ay8910_interface ay8910_config =
static MACHINE_DRIVER_START( cntsteer )
MDRV_CPU_ADD("maincpu", M6809, 2000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(cntsteer_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(cntsteer_cpu1_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* ? */
MDRV_CPU_ADD("subcpu", M6809, 2000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(cntsteer_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(cntsteer_cpu2_map)
// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* ? */
MDRV_CPU_ADD("audiocpu", M6502, 1500000) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_PERIODIC_INT(sound_interrupt, 480)
/* video hardware */
@@ -778,15 +778,15 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( zerotrgt )
MDRV_CPU_ADD("maincpu", M6809, 2000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(gekitsui_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(gekitsui_cpu1_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* ? */
MDRV_CPU_ADD("subcpu", M6809, 2000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(gekitsui_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(gekitsui_cpu2_map)
// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* ? */
MDRV_CPU_ADD("audiocpu", M6502, 1500000) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_PERIODIC_INT(sound_interrupt, 480)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index b66afa25c4f..4c52681cd27 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -980,7 +980,7 @@ static const mc6845_interface h46505_intf =
static MACHINE_DRIVER_START( coinmstr )
MDRV_CPU_ADD("cpu",Z80,8000000) // ?
- MDRV_CPU_PROGRAM_MAP(coinmstr_map,0)
+ MDRV_CPU_PROGRAM_MAP(coinmstr_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_PIA6821_ADD("pia0", pia_0_intf)
@@ -1014,25 +1014,25 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( quizmstr )
MDRV_IMPORT_FROM(coinmstr)
MDRV_CPU_MODIFY("cpu")
- MDRV_CPU_IO_MAP(quizmstr_io_map,0)
+ MDRV_CPU_IO_MAP(quizmstr_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( trailblz )
MDRV_IMPORT_FROM(coinmstr)
MDRV_CPU_MODIFY("cpu")
- MDRV_CPU_IO_MAP(trailblz_io_map,0)
+ MDRV_CPU_IO_MAP(trailblz_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( supnudg2 )
MDRV_IMPORT_FROM(coinmstr)
MDRV_CPU_MODIFY("cpu")
- MDRV_CPU_IO_MAP(supnudg2_io_map,0)
+ MDRV_CPU_IO_MAP(supnudg2_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pokeroul )
MDRV_IMPORT_FROM(coinmstr)
MDRV_CPU_MODIFY("cpu")
- MDRV_CPU_IO_MAP(pokeroul_io_map,0)
+ MDRV_CPU_IO_MAP(pokeroul_io_map)
MACHINE_DRIVER_END
/*
diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c
index 7496ae8afc2..bc522bdcfe6 100644
--- a/src/mame/drivers/cojag.c
+++ b/src/mame/drivers/cojag.c
@@ -1108,15 +1108,15 @@ static MACHINE_DRIVER_START( cojagr3k )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", R3041BE, R3000_CLOCK)
MDRV_CPU_CONFIG(config)
- MDRV_CPU_PROGRAM_MAP(r3000_map,0)
+ MDRV_CPU_PROGRAM_MAP(r3000_map)
MDRV_CPU_ADD("gpu", JAGUARGPU, JAGUAR_CLOCK/2)
MDRV_CPU_CONFIG(gpu_config)
- MDRV_CPU_PROGRAM_MAP(gpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(gpu_map)
MDRV_CPU_ADD("audiocpu", JAGUARDSP, JAGUAR_CLOCK/2)
MDRV_CPU_CONFIG(dsp_config)
- MDRV_CPU_PROGRAM_MAP(dsp_map,0)
+ MDRV_CPU_PROGRAM_MAP(dsp_map)
MDRV_MACHINE_RESET(cojag)
MDRV_NVRAM_HANDLER(generic_1fill)
@@ -1149,7 +1149,7 @@ static MACHINE_DRIVER_START( cojag68k )
/* basic machine hardware */
MDRV_CPU_REPLACE("maincpu", M68EC020, M68K_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(m68020_map,0)
+ MDRV_CPU_PROGRAM_MAP(m68020_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index 40230deb2db..2023d8566bd 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -550,11 +550,11 @@ static MACHINE_DRIVER_START( combasc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */
- MDRV_CPU_PROGRAM_MAP(combasc_map,0)
+ MDRV_CPU_PROGRAM_MAP(combasc_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(combasc_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(combasc_sound_map)
MDRV_QUANTUM_TIME(HZ(1200))
@@ -591,11 +591,11 @@ static MACHINE_DRIVER_START( combascb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */
- MDRV_CPU_PROGRAM_MAP(combascb_map,0)
+ MDRV_CPU_PROGRAM_MAP(combascb_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(combasc_sound_map,0) /* FAKE */
+ MDRV_CPU_PROGRAM_MAP(combasc_sound_map) /* FAKE */
MDRV_QUANTUM_TIME(HZ(1200))
diff --git a/src/mame/drivers/comebaby.c b/src/mame/drivers/comebaby.c
index 15451355c12..9c2f668bb85 100644
--- a/src/mame/drivers/comebaby.c
+++ b/src/mame/drivers/comebaby.c
@@ -79,7 +79,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( comebaby )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PENTIUM, 2000000000) /* Probably a Pentium .. ?? Mhz*/
- MDRV_CPU_PROGRAM_MAP(comebaby_map, 0)
+ MDRV_CPU_PROGRAM_MAP(comebaby_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index 132d16a317a..2b263190bce 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -239,11 +239,11 @@ static INTERRUPT_GEN( commando_interrupt )
static MACHINE_DRIVER_START( commando )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, PHI_MAIN) // ???
- MDRV_CPU_PROGRAM_MAP(commando_map, 0)
+ MDRV_CPU_PROGRAM_MAP(commando_map)
MDRV_CPU_VBLANK_INT("screen", commando_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, PHI_B) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
// video hardware
diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c
index c07e1f08e2e..cb0663e29ac 100644
--- a/src/mame/drivers/compgolf.c
+++ b/src/mame/drivers/compgolf.c
@@ -199,7 +199,7 @@ static const ym2203_interface ym2203_config =
static MACHINE_DRIVER_START( compgolf )
MDRV_CPU_ADD("maincpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(compgolf_map,0)
+ MDRV_CPU_PROGRAM_MAP(compgolf_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index 427d2d40333..d75ca2831f6 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -190,11 +190,11 @@ static MACHINE_DRIVER_START( contra )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 1500000)
- MDRV_CPU_PROGRAM_MAP(contra_map,0)
+ MDRV_CPU_PROGRAM_MAP(contra_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index afdb096f3e5..03c95ed04df 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -686,11 +686,11 @@ static MACHINE_DRIVER_START( amerdart )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS34010, 40000000)
MDRV_CPU_CONFIG(tms_config_amerdart)
- MDRV_CPU_PROGRAM_MAP(amerdart_map,0)
+ MDRV_CPU_PROGRAM_MAP(amerdart_map)
MDRV_CPU_ADD("dsp", TMS32010, 15000000/2)
MDRV_CPU_FLAGS(CPU_DISABLE)
- MDRV_CPU_PROGRAM_MAP(amerdart_dsp_map,0)
+ MDRV_CPU_PROGRAM_MAP(amerdart_dsp_map)
MDRV_MACHINE_RESET(amerdart)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -715,11 +715,11 @@ static MACHINE_DRIVER_START( coolpool )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS34010, 40000000)
MDRV_CPU_CONFIG(tms_config_coolpool)
- MDRV_CPU_PROGRAM_MAP(coolpool_map,0)
+ MDRV_CPU_PROGRAM_MAP(coolpool_map)
MDRV_CPU_ADD("dsp", TMS32026,40000000)
- MDRV_CPU_PROGRAM_MAP(dsp_program_map,0)
- MDRV_CPU_IO_MAP(dsp_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(dsp_program_map)
+ MDRV_CPU_IO_MAP(dsp_io_map)
MDRV_MACHINE_RESET(coolpool)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -743,7 +743,7 @@ static MACHINE_DRIVER_START( 9ballsht )
MDRV_IMPORT_FROM(coolpool)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(nballsht_map,0)
+ MDRV_CPU_PROGRAM_MAP(nballsht_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c
index 7408106c5c3..119ef0878e6 100644
--- a/src/mame/drivers/coolridr.c
+++ b/src/mame/drivers/coolridr.c
@@ -246,14 +246,14 @@ static MACHINE_RESET ( coolridr )
static MACHINE_DRIVER_START( coolridr )
MDRV_CPU_ADD("maincpu", SH2, 28000000) // ?? mhz
- MDRV_CPU_PROGRAM_MAP(system_h1_map,0)
+ MDRV_CPU_PROGRAM_MAP(system_h1_map)
MDRV_CPU_VBLANK_INT_HACK(system_h1, 2)
MDRV_CPU_ADD("soundcpu", M68000, 12000000) // ?? mhz
- MDRV_CPU_PROGRAM_MAP(system_h1_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(system_h1_sound_map)
MDRV_CPU_ADD("sub", SH1, 8000000) // SH7032 HD6417032F20!! ?? mhz
- MDRV_CPU_PROGRAM_MAP(coolridr_submap,0)
+ MDRV_CPU_PROGRAM_MAP(coolridr_submap)
MDRV_CPU_VBLANK_INT_HACK(system_h1_sub, 3)
MDRV_GFXDECODE(coolridr)
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index b0fdbe66665..397c465054e 100644
--- a/src/mame/drivers/cop01.c
+++ b/src/mame/drivers/cop01.c
@@ -390,13 +390,13 @@ static MACHINE_DRIVER_START( cop01 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* ???? */
- MDRV_CPU_PROGRAM_MAP(cop01_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cop01_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* ???? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(audio_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(audio_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -430,13 +430,13 @@ static MACHINE_DRIVER_START( mightguy )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* ???? */
- MDRV_CPU_PROGRAM_MAP(cop01_map,0)
- MDRV_CPU_IO_MAP(mightguy_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cop01_map)
+ MDRV_CPU_IO_MAP(mightguy_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* ???? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(mightguy_audio_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(mightguy_audio_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c
index be45787ccb0..1e2e5d5187f 100644
--- a/src/mame/drivers/copsnrob.c
+++ b/src/mame/drivers/copsnrob.c
@@ -262,7 +262,7 @@ static MACHINE_DRIVER_START( copsnrob )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502,14318180/16) /* 894886.25 kHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index e573df82441..0f528e8f46b 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -1082,7 +1082,7 @@ static MACHINE_DRIVER_START( panic )
MDRV_IMPORT_FROM(cosmic)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(panic_map,0)
+ MDRV_CPU_PROGRAM_MAP(panic_map)
MDRV_CPU_VBLANK_INT_HACK(panic_interrupt,2)
/* video hardware */
@@ -1110,7 +1110,7 @@ static MACHINE_DRIVER_START( cosmica )
MDRV_IMPORT_FROM(cosmic)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cosmica_map,0)
+ MDRV_CPU_PROGRAM_MAP(cosmica_map)
MDRV_CPU_VBLANK_INT_HACK(cosmica_interrupt,32)
/* video hardware */
@@ -1141,8 +1141,8 @@ static MACHINE_DRIVER_START( cosmicg )
/* R Nabet : huh ? This would imply the crystal frequency is somehow divided by 2 before being
fed to the tms9904 or tms9980. Also, I have never heard of a tms9900/9980 operating under
1.5MHz. So, if someone can check this... */
- MDRV_CPU_PROGRAM_MAP(cosmicg_map,0)
- MDRV_CPU_IO_MAP(cosmicg_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cosmicg_map)
+ MDRV_CPU_IO_MAP(cosmicg_io_map)
MDRV_CPU_VBLANK_INT("screen", cosmicg_interrupt)
/* video hardware */
@@ -1175,7 +1175,7 @@ static MACHINE_DRIVER_START( magspot )
MDRV_IMPORT_FROM(cosmic)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(magspot_map,0)
+ MDRV_CPU_PROGRAM_MAP(magspot_map)
MDRV_CPU_VBLANK_INT("screen", magspot_interrupt)
/* video hardware */
@@ -1209,7 +1209,7 @@ static MACHINE_DRIVER_START( nomnlnd )
MDRV_IMPORT_FROM(cosmic)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(magspot_map,0)
+ MDRV_CPU_PROGRAM_MAP(magspot_map)
MDRV_CPU_VBLANK_INT("screen", nomnlnd_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c
index cc41c12a3e9..6b2f2d04a1b 100644
--- a/src/mame/drivers/cowrace.c
+++ b/src/mame/drivers/cowrace.c
@@ -192,15 +192,15 @@ static MACHINE_DRIVER_START( cowrace )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(mem_map_cowrace,0)
- MDRV_CPU_IO_MAP(io_map_cowrace,0)
+ MDRV_CPU_PROGRAM_MAP(mem_map_cowrace)
+ MDRV_CPU_IO_MAP(io_map_cowrace)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* missing slave z80? (like in King Derby)*/
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(mem_map_sound_cowrace,0)
- MDRV_CPU_IO_MAP(io_map_sound_cowrace,0)
+ MDRV_CPU_PROGRAM_MAP(mem_map_sound_cowrace)
+ MDRV_CPU_IO_MAP(io_map_sound_cowrace)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) // NMI by main CPU
/* video hardware */
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 6958818e078..748fc150c16 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -2759,11 +2759,11 @@ static MACHINE_DRIVER_START( cps1_10MHz )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", cps1_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -2816,11 +2816,11 @@ static MACHINE_DRIVER_START( qsound )
MDRV_IMPORT_FROM(cps1_12MHz)
MDRV_CPU_REPLACE("maincpu", M68000, 12000000) // 12MHz verified
- MDRV_CPU_PROGRAM_MAP(qsound_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(qsound_main_map)
MDRV_CPU_VBLANK_INT("screen", cps1_qsound_interrupt) /* ??? interrupts per frame */
MDRV_CPU_REPLACE("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(qsound_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(qsound_sub_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, 250) /* ?? */
MDRV_NVRAM_HANDLER(qsound)
@@ -2843,7 +2843,7 @@ static MACHINE_DRIVER_START( cpspicb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", cps1_qsound_interrupt)
MDRV_CPU_ADD("audiocpu", PIC16C57, 12000000)
@@ -2918,11 +2918,11 @@ static MACHINE_DRIVER_START( sf2mdt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", cps1_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(sf2mdt_z80map,0)
+ MDRV_CPU_PROGRAM_MAP(sf2mdt_z80map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 7ad5c202c2d..95f6f325b68 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -1212,11 +1212,11 @@ static MACHINE_DRIVER_START( cps2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(cps2_map,0)
+ MDRV_CPU_PROGRAM_MAP(cps2_map)
MDRV_CPU_VBLANK_INT_HACK(cps2_interrupt,259) // 262 /* ??? interrupts per frame */
MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(qsound_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(qsound_sub_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, 251) /* 251 is good (see 'mercy mercy mercy'section of sgemf attract mode for accurate sound sync */
MDRV_NVRAM_HANDLER(cps2)
@@ -1258,7 +1258,7 @@ static MACHINE_DRIVER_START( dead_cps2 )
MDRV_IMPORT_FROM(cps2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dead_cps2_map,0)
+ MDRV_CPU_PROGRAM_MAP(dead_cps2_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gigamn2 )
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index 2d6124a5e9a..c6713034270 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -2541,7 +2541,7 @@ static const sh2_cpu_core sh2_conf_cps3 = {
static MACHINE_DRIVER_START( cps3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", SH2, 6250000*4) // external clock is 6.25 Mhz, it sets the intenral multiplier to 4x (this should probably be handled in the core..)
- MDRV_CPU_PROGRAM_MAP(cps3_map,0)
+ MDRV_CPU_PROGRAM_MAP(cps3_map)
MDRV_CPU_VBLANK_INT("screen", cps3_vbl_interrupt)
MDRV_CPU_PERIODIC_INT(cps3_other_interrupt,80) /* ?source? */
MDRV_CPU_CONFIG(sh2_conf_cps3)
diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c
index 9345fb5175b..e893c2ff0d9 100644
--- a/src/mame/drivers/crbaloon.c
+++ b/src/mame/drivers/crbaloon.c
@@ -362,8 +362,8 @@ static MACHINE_DRIVER_START( crbaloon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CRBALOON_MASTER_XTAL / 3)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(crballoon)
diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c
index 7f3a9b88833..44e850c31fd 100644
--- a/src/mame/drivers/crgolf.c
+++ b/src/mame/drivers/crgolf.c
@@ -367,11 +367,11 @@ static MACHINE_DRIVER_START( crgolf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,MASTER_CLOCK/3/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,MASTER_CLOCK/3/2)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_START(crgolf)
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index fd55e8e5b9c..bfb64db0ee7 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -216,11 +216,11 @@ static MACHINE_DRIVER_START( crimfght )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(crimfght_map,0)
+ MDRV_CPU_PROGRAM_MAP(crimfght_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* verified with PCB */
- MDRV_CPU_PROGRAM_MAP(crimfght_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(crimfght_sound_map)
MDRV_MACHINE_RESET(crimfght)
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index b7e3d10b37a..6cee104ccbc 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -304,12 +304,12 @@ static MACHINE_DRIVER_START( crospang )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14318180/2)
- MDRV_CPU_PROGRAM_MAP(crospang_map,0)
+ MDRV_CPU_PROGRAM_MAP(crospang_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 14318180/4)
- MDRV_CPU_PROGRAM_MAP(crospang_sound_map,0)
- MDRV_CPU_IO_MAP(crospang_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(crospang_sound_map)
+ MDRV_CPU_IO_MAP(crospang_sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -341,12 +341,12 @@ static MACHINE_DRIVER_START( bestri )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14318180/2)
- MDRV_CPU_PROGRAM_MAP(bestri_map,0)
+ MDRV_CPU_PROGRAM_MAP(bestri_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 14318180/4)
- MDRV_CPU_PROGRAM_MAP(crospang_sound_map,0)
- MDRV_CPU_IO_MAP(crospang_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(crospang_sound_map)
+ MDRV_CPU_IO_MAP(crospang_sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index 8b87663a690..d3a9300f766 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -442,12 +442,12 @@ static MACHINE_DRIVER_START( crshrace )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(crshrace_map,0)
+ MDRV_CPU_PROGRAM_MAP(crshrace_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index cf2bb59501a..d1ef7ebf9b8 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -735,7 +735,7 @@ static const vr0_interface vr0_config =
static MACHINE_DRIVER_START( crystal )
MDRV_CPU_ADD("maincpu", SE3208, 43000000)
- MDRV_CPU_PROGRAM_MAP(crystal_mem,0)
+ MDRV_CPU_PROGRAM_MAP(crystal_mem)
MDRV_CPU_VBLANK_INT("screen", crystal_interrupt)
MDRV_MACHINE_START(crystal)
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index 092418b3d9e..74954baa485 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -421,11 +421,11 @@ GFXDECODE_END
static MACHINE_DRIVER_START( cshooter )
MDRV_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cshooter_map,0)
+ MDRV_CPU_PROGRAM_MAP(cshooter_map)
MDRV_CPU_VBLANK_INT_HACK(cshooter_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(cshooter)
@@ -450,11 +450,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( airraid )
MDRV_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(airraid_map,0)
+ MDRV_CPU_PROGRAM_MAP(airraid_map)
MDRV_CPU_VBLANK_INT_HACK(cshooter_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map2,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map2)
MDRV_MACHINE_RESET(cshooter)
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index 2b9cf55712c..09078c0f6ea 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -495,19 +495,19 @@ static const cubeqst_lin_config lin_config =
static MACHINE_DRIVER_START( cubeqst )
MDRV_CPU_ADD("main_cpu", M68000, XTAL_16MHz / 2)
- MDRV_CPU_PROGRAM_MAP(m68k_program_map, 0)
+ MDRV_CPU_PROGRAM_MAP(m68k_program_map)
MDRV_CPU_VBLANK_INT("screen", vblank)
MDRV_CPU_ADD("rotate_cpu", CQUESTROT, XTAL_10MHz / 2)
- MDRV_CPU_PROGRAM_MAP(rotate_map, 0)
+ MDRV_CPU_PROGRAM_MAP(rotate_map)
MDRV_CPU_CONFIG(rot_config)
MDRV_CPU_ADD("line_cpu", CQUESTLIN, XTAL_10MHz / 2)
- MDRV_CPU_PROGRAM_MAP(line_sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(line_sound_map)
MDRV_CPU_CONFIG(lin_config)
MDRV_CPU_ADD("sound_cpu", CQUESTSND, XTAL_10MHz / 2)
- MDRV_CPU_PROGRAM_MAP(line_sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(line_sound_map)
MDRV_CPU_CONFIG(snd_config)
MDRV_QUANTUM_TIME(HZ(48000))
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c
index 235959b372a..92739e5e07a 100644
--- a/src/mame/drivers/cubocd32.c
+++ b/src/mame/drivers/cubocd32.c
@@ -338,7 +338,7 @@ static MACHINE_DRIVER_START( cd32 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, AMIGA_68EC020_PAL_CLOCK) /* 14.3 Mhz */
- MDRV_CPU_PROGRAM_MAP(cd32_map,0)
+ MDRV_CPU_PROGRAM_MAP(cd32_map)
MDRV_MACHINE_RESET(amiga)
MDRV_NVRAM_HANDLER(cd32)
diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c
index 0c6141a778d..b4204a035ec 100644
--- a/src/mame/drivers/cultures.c
+++ b/src/mame/drivers/cultures.c
@@ -342,8 +342,8 @@ static MACHINE_DRIVER_START( cultures )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */
- MDRV_CPU_PROGRAM_MAP(cultures_map,0)
- MDRV_CPU_IO_MAP(cultures_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cultures_map)
+ MDRV_CPU_IO_MAP(cultures_io_map)
MDRV_CPU_VBLANK_INT("screen", cultures_interrupt)
MDRV_MACHINE_RESET(cultures)
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index af15c870d14..e8b48735d7e 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -1016,17 +1016,17 @@ static MACHINE_DRIVER_START( cvs )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", S2650, 894886.25)
- MDRV_CPU_PROGRAM_MAP(cvs_main_cpu_map,0)
- MDRV_CPU_IO_MAP(cvs_main_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cvs_main_cpu_map)
+ MDRV_CPU_IO_MAP(cvs_main_cpu_io_map)
MDRV_CPU_VBLANK_INT("screen", cvs_main_cpu_interrupt)
MDRV_CPU_ADD("audiocpu", S2650, 894886.25)
- MDRV_CPU_PROGRAM_MAP(cvs_dac_cpu_map,0)
- MDRV_CPU_IO_MAP(cvs_dac_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cvs_dac_cpu_map)
+ MDRV_CPU_IO_MAP(cvs_dac_cpu_io_map)
MDRV_CPU_ADD("speech", S2650, 894886.25)
- MDRV_CPU_PROGRAM_MAP(cvs_speech_cpu_map,0)
- MDRV_CPU_IO_MAP(cvs_speech_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cvs_speech_cpu_map)
+ MDRV_CPU_IO_MAP(cvs_speech_cpu_io_map)
MDRV_MACHINE_START(cvs)
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index 7c0f22036b5..0ebf98f3689 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -411,18 +411,18 @@ static MACHINE_DRIVER_START( cyberbal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)ATARI_CLOCK_14MHz/4/4/16/16/14)
MDRV_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(extra_map,0)
+ MDRV_CPU_PROGRAM_MAP(extra_map)
MDRV_CPU_VBLANK_INT("lscreen", atarigen_video_int_gen) /* or is it "right?" */
MDRV_CPU_ADD("dac", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(sound_68k_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_68k_map)
MDRV_CPU_PERIODIC_INT(cyberbal_sound_68k_irq_gen, 10000)
MDRV_QUANTUM_TIME(HZ(600))
@@ -470,7 +470,7 @@ static MACHINE_DRIVER_START( cyberb2p )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(cyberb2p_map,0)
+ MDRV_CPU_PROGRAM_MAP(cyberb2p_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_MACHINE_RESET(cyberb2p)
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index e8e690c6b41..001e17f6ac5 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -563,15 +563,15 @@ static const y8950_interface y8950_config = {
static MACHINE_DRIVER_START( cybertnk )
MDRV_CPU_ADD("maincpu", M68000,20000000/2)
- MDRV_CPU_PROGRAM_MAP(master_mem,0)
+ MDRV_CPU_PROGRAM_MAP(master_mem)
MDRV_CPU_VBLANK_INT_HACK(master_irq,2)
MDRV_CPU_ADD("slave", M68000,20000000/2)
- MDRV_CPU_PROGRAM_MAP(slave_mem,0)
+ MDRV_CPU_PROGRAM_MAP(slave_mem)
MDRV_CPU_VBLANK_INT_HACK(slave_irq,2)
MDRV_CPU_ADD("audiocpu", Z80,3579500)
- MDRV_CPU_PROGRAM_MAP(sound_mem,0)
+ MDRV_CPU_PROGRAM_MAP(sound_mem)
MDRV_QUANTUM_TIME(HZ(6000))//arbitrary value,needed to get the communication to work
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index 7c5fa81be8b..b85ac3bce33 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -401,13 +401,13 @@ static MACHINE_DRIVER_START( dacholer )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
- MDRV_CPU_IO_MAP(main_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(snd_map, 0)
- MDRV_CPU_IO_MAP(snd_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(snd_map)
+ MDRV_CPU_IO_MAP(snd_io_map)
MDRV_CPU_VBLANK_INT("screen",sound_irq)
/* video hardware */
diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c
index d480c9ff93c..57d85572645 100644
--- a/src/mame/drivers/dambustr.c
+++ b/src/mame/drivers/dambustr.c
@@ -185,7 +185,7 @@ static DRIVER_INIT(dambustr)
static MACHINE_DRIVER_START( dambustr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(dambustr_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dambustr_map)
MDRV_MACHINE_RESET(galaxold)
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 1d5254b140e..1774db62990 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -812,19 +812,19 @@ static MACHINE_DRIVER_START( darius )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(darius_map,0)
+ MDRV_CPU_PROGRAM_MAP(darius_map)
MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(darius_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(darius_sound_map)
MDRV_CPU_ADD("cpub", M68000,16000000/2) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(darius_cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(darius_cpub_map)
MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
MDRV_CPU_ADD("adpcm", Z80,8000000/2) /* 4 MHz ? */ /* ADPCM player using MSM5205 */
- MDRV_CPU_PROGRAM_MAP(darius_sound2_map,0)
- MDRV_CPU_IO_MAP(darius_sound2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(darius_sound2_map)
+ MDRV_CPU_IO_MAP(darius_sound2_io_map)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame ? */
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 9a7afab60c9..a5545c94496 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -579,7 +579,7 @@ static INTERRUPT_GEN( darkhors )
static MACHINE_DRIVER_START( darkhors )
MDRV_CPU_ADD("maincpu", M68EC020, 12000000) // 36MHz/3 ??
- MDRV_CPU_PROGRAM_MAP(darkhors_map,0)
+ MDRV_CPU_PROGRAM_MAP(darkhors_map)
MDRV_CPU_VBLANK_INT_HACK(darkhors,3)
MDRV_NVRAM_HANDLER(darkhors)
diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c
index 82b8eaa8fb9..8bc002f4442 100644
--- a/src/mame/drivers/darkmist.c
+++ b/src/mame/drivers/darkmist.c
@@ -249,12 +249,12 @@ static INTERRUPT_GEN( darkmist_interrupt )
static MACHINE_DRIVER_START( darkmist )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(memmap, 0)
+ MDRV_CPU_PROGRAM_MAP(memmap)
MDRV_CPU_VBLANK_INT_HACK(darkmist_interrupt,2)
MDRV_CPU_ADD(CPUTAG_T5182,Z80,14318180/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(t5182_map, 0)
- MDRV_CPU_IO_MAP(t5182_io, 0)
+ MDRV_CPU_PROGRAM_MAP(t5182_map)
+ MDRV_CPU_IO_MAP(t5182_io)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index a670e18700c..e7749700171 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -243,11 +243,11 @@ static MACHINE_DRIVER_START( darkseal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,12000000) /* Custom chip 59 */
- MDRV_CPU_PROGRAM_MAP(darkseal_map,0)
+ MDRV_CPU_PROGRAM_MAP(darkseal_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
MDRV_CPU_ADD("audiocpu", H6280, 32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index 57b1fc82cbd..01da5492670 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -531,15 +531,15 @@ static MACHINE_DRIVER_START( dassault )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(dassault_map,0)
+ MDRV_CPU_PROGRAM_MAP(dassault_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("sub", M68000, 14000000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(dassault_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(dassault_sub_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", H6280,32220000/8) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(8400)) /* 140 CPU slices per frame */
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index 8547cfdda22..d9cac7cf917 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -665,12 +665,12 @@ static const ym2151_interface ym2151_config =
static MACHINE_DRIVER_START( dblewing )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000) /* DE102 */
- MDRV_CPU_PROGRAM_MAP(dblewing_map,0)
+ MDRV_CPU_PROGRAM_MAP(dblewing_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 24e227b52e3..649f261a9f3 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -322,12 +322,12 @@ static MACHINE_DRIVER_START( dbz )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(dbz_map,0)
+ MDRV_CPU_PROGRAM_MAP(dbz_map)
MDRV_CPU_VBLANK_INT_HACK(dbz_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(dbz_sound_map, 0)
- MDRV_CPU_IO_MAP(dbz_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dbz_sound_map)
+ MDRV_CPU_IO_MAP(dbz_sound_io_map)
MDRV_GFXDECODE(dbz)
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index 38430ea1a67..23c9fb4dd99 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -390,11 +390,11 @@ static MACHINE_DRIVER_START( dcheese )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MAIN_OSC)
- MDRV_CPU_PROGRAM_MAP(main_cpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_cpu_map)
MDRV_CPU_VBLANK_INT("screen", dcheese_vblank)
MDRV_CPU_ADD("audiocpu", M6809, SOUND_OSC/16)
- MDRV_CPU_PROGRAM_MAP(sound_cpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_cpu_map)
MDRV_CPU_PERIODIC_INT(irq1_line_hold, 480) /* accurate for fredmem */
MDRV_MACHINE_START(dcheese)
diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c
index a1bf45c30db..116f7a5e773 100644
--- a/src/mame/drivers/dcon.c
+++ b/src/mame/drivers/dcon.c
@@ -260,7 +260,7 @@ static MACHINE_DRIVER_START( dcon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(dcon_map,0)
+ MDRV_CPU_PROGRAM_MAP(dcon_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
SEIBU_SOUND_SYSTEM_CPU(4000000) /* Perhaps 14318180/4? */
@@ -289,7 +289,7 @@ static MACHINE_DRIVER_START( sdgndmps )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(dcon_map,0)
+ MDRV_CPU_PROGRAM_MAP(dcon_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
SEIBU2_SOUND_SYSTEM_CPU(14318180/4)
diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c
index 71ceea2289d..3d7324dc7d7 100644
--- a/src/mame/drivers/dday.c
+++ b/src/mame/drivers/dday.c
@@ -236,7 +236,7 @@ static MACHINE_DRIVER_START( dday )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */
- MDRV_CPU_PROGRAM_MAP(dday_map,0)
+ MDRV_CPU_PROGRAM_MAP(dday_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index 81164a7c457..1394ad7682a 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -402,11 +402,11 @@ static INTERRUPT_GEN( ddayjlc_snd_interrupt )
static MACHINE_DRIVER_START( ddayjlc )
MDRV_CPU_ADD("maincpu", Z80,12000000/3)
- MDRV_CPU_PROGRAM_MAP(main_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(main_cpu)
MDRV_CPU_VBLANK_INT("screen", ddayjlc_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 12000000/4)
- MDRV_CPU_PROGRAM_MAP(sound_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(sound_cpu)
MDRV_CPU_VBLANK_INT("screen", ddayjlc_snd_interrupt)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c
index 45e2e0744ca..49e43de30a7 100644
--- a/src/mame/drivers/ddealer.c
+++ b/src/mame/drivers/ddealer.c
@@ -575,7 +575,7 @@ static INTERRUPT_GEN( ddealer_interrupt )
static MACHINE_DRIVER_START( ddealer )
MDRV_CPU_ADD("maincpu" , M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(ddealer,0)
+ MDRV_CPU_PROGRAM_MAP(ddealer)
MDRV_CPU_VBLANK_INT("screen", ddealer_interrupt)
MDRV_CPU_PERIODIC_INT(irq1_line_hold, 90)//guess,controls music tempo,112 is way too fast
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index d76acbba8d9..1d65044ab3b 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -6673,7 +6673,7 @@ static MACHINE_DRIVER_START( ddenlovr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000, XTAL_24MHz / 2)
- MDRV_CPU_PROGRAM_MAP(ddenlovr_map,0)
+ MDRV_CPU_PROGRAM_MAP(ddenlovr_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
/* video hardware */
@@ -6712,13 +6712,13 @@ static MACHINE_DRIVER_START( ddenlvrj )
/* basic machine hardware */
MDRV_IMPORT_FROM(ddenlovr)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ddenlvrj_map,0)
+ MDRV_CPU_PROGRAM_MAP(ddenlvrj_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ddenlvrk )
MDRV_IMPORT_FROM(ddenlovr)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ddenlvrk_map,0)
+ MDRV_CPU_PROGRAM_MAP(ddenlvrk_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( akamaru )
@@ -6726,7 +6726,7 @@ static MACHINE_DRIVER_START( akamaru )
/* basic machine hardware */
MDRV_IMPORT_FROM(ddenlovr)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(akamaru_map,0)
+ MDRV_CPU_PROGRAM_MAP(akamaru_map)
MACHINE_DRIVER_END
@@ -6745,7 +6745,7 @@ static MACHINE_DRIVER_START( quiz365 )
/* basic machine hardware */
MDRV_IMPORT_FROM(ddenlovr)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(quiz365_map,0)
+ MDRV_CPU_PROGRAM_MAP(quiz365_map)
MDRV_SOUND_MODIFY("ay")
MDRV_SOUND_CONFIG(quiz365_ay8910_interface)
@@ -6757,7 +6757,7 @@ static MACHINE_DRIVER_START( nettoqc )
/* basic machine hardware */
MDRV_IMPORT_FROM(ddenlovr)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(nettoqc_map,0)
+ MDRV_CPU_PROGRAM_MAP(nettoqc_map)
MACHINE_DRIVER_END
/***************************************************************************
@@ -6798,8 +6798,8 @@ static MACHINE_DRIVER_START( quizchq )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(quizchq_map,0)
- MDRV_CPU_IO_MAP(quizchq_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(quizchq_map)
+ MDRV_CPU_IO_MAP(quizchq_portmap)
MDRV_CPU_VBLANK_INT("screen", quizchq_irq)
/* video hardware */
@@ -6835,8 +6835,8 @@ static MACHINE_DRIVER_START( rongrong )
/* basic machine hardware */
MDRV_IMPORT_FROM(quizchq)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rongrong_map,0)
- MDRV_CPU_IO_MAP(rongrong_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(rongrong_map)
+ MDRV_CPU_IO_MAP(rongrong_portmap)
MACHINE_DRIVER_END
/***************************************************************************
@@ -6871,13 +6871,13 @@ static MACHINE_DRIVER_START( mmpanic )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(mmpanic_map,0)
- MDRV_CPU_IO_MAP(mmpanic_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(mmpanic_map)
+ MDRV_CPU_IO_MAP(mmpanic_portmap)
MDRV_CPU_VBLANK_INT("screen", mmpanic_irq)
MDRV_CPU_ADD("soundcpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(mmpanic_sound_map,0)
- MDRV_CPU_IO_MAP(mmpanic_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(mmpanic_sound_map)
+ MDRV_CPU_IO_MAP(mmpanic_sound_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) // NMI by main cpu
/* video hardware */
@@ -6943,8 +6943,8 @@ static MACHINE_DRIVER_START( hanakanz )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,8000000) // TMPZ84C015BF-8
- MDRV_CPU_PROGRAM_MAP(hanakanz_map,0)
- MDRV_CPU_IO_MAP(hanakanz_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(hanakanz_map)
+ MDRV_CPU_IO_MAP(hanakanz_portmap)
MDRV_CPU_VBLANK_INT("screen", hanakanz_irq)
/* video hardware */
@@ -6979,14 +6979,14 @@ static MACHINE_DRIVER_START( hkagerou )
/* basic machine hardware */
MDRV_IMPORT_FROM( hanakanz )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(hkagerou_portmap,0)
+ MDRV_CPU_IO_MAP(hkagerou_portmap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mjreach1 )
/* basic machine hardware */
MDRV_IMPORT_FROM( hanakanz )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mjreach1_portmap,0)
+ MDRV_CPU_IO_MAP(mjreach1_portmap)
MACHINE_DRIVER_END
@@ -7020,7 +7020,7 @@ static MACHINE_DRIVER_START( mjchuuka )
/* basic machine hardware */
MDRV_IMPORT_FROM( hanakanz )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mjchuuka_portmap,0)
+ MDRV_CPU_IO_MAP(mjchuuka_portmap)
MDRV_CPU_VBLANK_INT("screen", mjchuuka_irq)
MDRV_SOUND_ADD("ay", AY8910, 1789772)
@@ -7032,12 +7032,12 @@ static MACHINE_DRIVER_START( funkyfig )
MDRV_IMPORT_FROM(mmpanic)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(funkyfig_map,0)
- MDRV_CPU_IO_MAP(funkyfig_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(funkyfig_map)
+ MDRV_CPU_IO_MAP(funkyfig_portmap)
MDRV_CPU_VBLANK_INT("screen", mjchuuka_irq)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_IO_MAP(funkyfig_sound_portmap,0)
+ MDRV_CPU_IO_MAP(funkyfig_sound_portmap)
MDRV_VIDEO_START(ddenlovr) // no extra layers?
MACHINE_DRIVER_END
@@ -7093,8 +7093,8 @@ static MACHINE_DRIVER_START( mjmyster )
/* basic machine hardware */
MDRV_IMPORT_FROM( quizchq )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjmyster_map,0)
- MDRV_CPU_IO_MAP(mjmyster_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(mjmyster_map)
+ MDRV_CPU_IO_MAP(mjmyster_portmap)
MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2)
MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1)
@@ -7142,8 +7142,8 @@ static MACHINE_DRIVER_START( hginga )
/* basic machine hardware */
MDRV_IMPORT_FROM( quizchq )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hginga_map,0)
- MDRV_CPU_IO_MAP(hginga_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(hginga_map)
+ MDRV_CPU_IO_MAP(hginga_portmap)
MDRV_CPU_VBLANK_INT("screen", hginga_irq)
MDRV_SOUND_ADD("ay", AY8910, 3579545)
@@ -7155,8 +7155,8 @@ static MACHINE_DRIVER_START( hgokou )
/* basic machine hardware */
MDRV_IMPORT_FROM( quizchq )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hgokou_map,0)
- MDRV_CPU_IO_MAP(hgokou_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(hgokou_map)
+ MDRV_CPU_IO_MAP(hgokou_portmap)
MDRV_CPU_VBLANK_INT("screen", hginga_irq)
MDRV_SOUND_ADD("ay", AY8910, 3579545)
@@ -7168,16 +7168,16 @@ static MACHINE_DRIVER_START( mjmywrld )
/* basic machine hardware */
MDRV_IMPORT_FROM( mjmyster )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hginga_map,0)
- MDRV_CPU_IO_MAP(mjmywrld_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(hginga_map)
+ MDRV_CPU_IO_MAP(mjmywrld_portmap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mjmyuniv )
/* basic machine hardware */
MDRV_IMPORT_FROM( quizchq )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjmyster_map,0)
- MDRV_CPU_IO_MAP(mjmyster_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(mjmyster_map)
+ MDRV_CPU_IO_MAP(mjmyster_portmap)
MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2)
MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1)
@@ -7190,7 +7190,7 @@ static MACHINE_DRIVER_START( mjmyornt )
/* basic machine hardware */
MDRV_IMPORT_FROM( quizchq )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mjmyster_portmap,0)
+ MDRV_CPU_IO_MAP(mjmyster_portmap)
MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2)
MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1)
@@ -7220,8 +7220,8 @@ static MACHINE_DRIVER_START( mjflove )
/* basic machine hardware */
MDRV_IMPORT_FROM( quizchq )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rongrong_map,0)
- MDRV_CPU_IO_MAP(mjflove_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(rongrong_map)
+ MDRV_CPU_IO_MAP(mjflove_portmap)
MDRV_CPU_VBLANK_INT_HACK(mjflove_irq, 2)
MDRV_VIDEO_START(mjflove) // blitter commands in the roms are shuffled around
@@ -7241,8 +7241,8 @@ static MACHINE_DRIVER_START( hparadis )
/* basic machine hardware */
MDRV_IMPORT_FROM( quizchq )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hparadis_map,0)
- MDRV_CPU_IO_MAP(hparadis_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(hparadis_map)
+ MDRV_CPU_IO_MAP(hparadis_portmap)
MDRV_CPU_VBLANK_INT("screen", hparadis_irq)
MACHINE_DRIVER_END
@@ -7250,8 +7250,8 @@ static MACHINE_DRIVER_START( jongtei )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2) // ?
- MDRV_CPU_PROGRAM_MAP(hanakanz_map,0)
- MDRV_CPU_IO_MAP(jongtei_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(hanakanz_map)
+ MDRV_CPU_IO_MAP(jongtei_portmap)
MDRV_CPU_VBLANK_INT("screen", hanakanz_irq)
/* video hardware */
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 483b266071a..57417573bae 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -967,14 +967,14 @@ static MACHINE_DRIVER_START( ddragon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, MAIN_CLOCK) /* 12 MHz / 4 internally */
- MDRV_CPU_PROGRAM_MAP(ddragon_map,0)
+ MDRV_CPU_PROGRAM_MAP(ddragon_map)
MDRV_TIMER_ADD_SCANLINE("scantimer", ddragon_scanline, "screen", 0, 1)
MDRV_CPU_ADD("sub", HD63701, MAIN_CLOCK / 2) /* 6 MHz / 4 internally */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_ADD("soundcpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(60000)) /* heavy interleaving to sync up sprite<->main cpu's */
@@ -1015,7 +1015,7 @@ static MACHINE_DRIVER_START( ddragonb )
/* basic machine hardware */
MDRV_CPU_REPLACE("sub", M6809, MAIN_CLOCK / 8) /* 1.5Mhz */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MACHINE_DRIVER_END
@@ -1024,8 +1024,8 @@ static MACHINE_DRIVER_START( ddragnba )
/* basic machine hardware */
MDRV_CPU_REPLACE("sub", M6803, MAIN_CLOCK / 2) /* 6Mhz / 4 internally */
- MDRV_CPU_PROGRAM_MAP(ddragnba_sub_map,0)
- MDRV_CPU_IO_MAP(ddragnba_sub_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(ddragnba_sub_map)
+ MDRV_CPU_IO_MAP(ddragnba_sub_portmap)
MACHINE_DRIVER_END
@@ -1033,14 +1033,14 @@ static MACHINE_DRIVER_START( ddgn6809 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz */
- MDRV_CPU_PROGRAM_MAP(ddragon_map,0)
+ MDRV_CPU_PROGRAM_MAP(ddragon_map)
MDRV_TIMER_ADD_SCANLINE("scantimer", ddragon_scanline, "screen", 0, 1)
MDRV_CPU_ADD("sub", M6809, MAIN_CLOCK / 8) /* 1.5 Mhz */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_ADD("soundcpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(60000)) /* heavy interleaving to sync up sprite<->main cpu's */
@@ -1080,14 +1080,14 @@ static MACHINE_DRIVER_START( ddragon2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, MAIN_CLOCK) /* 12 MHz / 4 internally */
- MDRV_CPU_PROGRAM_MAP(dd2_map,0)
+ MDRV_CPU_PROGRAM_MAP(dd2_map)
MDRV_TIMER_ADD_SCANLINE("scantimer", ddragon_scanline, "screen", 0, 1)
MDRV_CPU_ADD("sub", Z80, MAIN_CLOCK / 3) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(dd2_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(dd2_sub_map)
MDRV_CPU_ADD("soundcpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(dd2_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(dd2_sound_map)
MDRV_QUANTUM_TIME(HZ(60000)) /* heavy interleaving to sync up sprite<->main cpu's */
@@ -1124,7 +1124,7 @@ static MACHINE_DRIVER_START( darktowr )
/* basic machine hardware */
MDRV_CPU_ADD("mcu", M68705,XTAL_4MHz)
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
/* video hardware */
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index cb755c8d699..0472e744432 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -569,11 +569,11 @@ static TIMER_DEVICE_CALLBACK( ddragon3_scanline )
static MACHINE_DRIVER_START( ddragon3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
- MDRV_CPU_PROGRAM_MAP(ddragon3_map,0)
+ MDRV_CPU_PROGRAM_MAP(ddragon3_map)
MDRV_TIMER_ADD_SCANLINE("scantimer", ddragon3_scanline, "screen", 0, 1)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -604,17 +604,17 @@ static MACHINE_DRIVER_START( ddrago3b )
MDRV_IMPORT_FROM(ddragon3)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dd3b_map,0)
+ MDRV_CPU_PROGRAM_MAP(dd3b_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ctribe )
MDRV_IMPORT_FROM(ddragon3)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ctribe_map,0)
+ MDRV_CPU_PROGRAM_MAP(ctribe_map)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(ctribe_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(ctribe_sound_map)
MDRV_VIDEO_UPDATE(ctribe)
diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c
index ec16800f33b..ddb93df6b6b 100644
--- a/src/mame/drivers/ddrible.c
+++ b/src/mame/drivers/ddrible.c
@@ -263,15 +263,15 @@ static MACHINE_DRIVER_START( ddribble )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu0_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu0_map)
MDRV_CPU_VBLANK_INT("screen", ddrible_interrupt_0)
MDRV_CPU_ADD("cpu1", M6809, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu1_map)
MDRV_CPU_VBLANK_INT("screen", ddrible_interrupt_1)
MDRV_CPU_ADD("cpu2", M6809, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu2_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* we need heavy synch */
diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c
index 7160afb6ecb..91a88e5b52e 100644
--- a/src/mame/drivers/ddz.c
+++ b/src/mame/drivers/ddz.c
@@ -53,7 +53,7 @@ static const vr0_interface vr0_config =
static MACHINE_DRIVER_START( ddz )
MDRV_CPU_ADD("maincpu", SE3208, 43000000)
- MDRV_CPU_PROGRAM_MAP(ddz_mem,0)
+ MDRV_CPU_PROGRAM_MAP(ddz_mem)
MDRV_CPU_VBLANK_INT("screen", ddz_interrupt)
//MDRV_MACHINE_RESET(ddz)
diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c
index e4bacd02059..67f33dad77f 100644
--- a/src/mame/drivers/deadang.c
+++ b/src/mame/drivers/deadang.c
@@ -229,11 +229,11 @@ static MACHINE_DRIVER_START( deadang )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(deadang_interrupt,2)
MDRV_CPU_ADD("sub", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_VBLANK_INT_HACK(deadang_interrupt,2)
SEIBU3A_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4)
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 75c0a81c4c3..a61151d937f 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -992,11 +992,11 @@ static MACHINE_DRIVER_START( automat )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(automat_map,0)
+ MDRV_CPU_PROGRAM_MAP(automat_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
MDRV_CPU_ADD("audiocpu", Z80, 3000000)// ?
- MDRV_CPU_PROGRAM_MAP(automat_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(automat_s_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1036,11 +1036,11 @@ static MACHINE_DRIVER_START( hbarrel )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(dec0_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dec0_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_s_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1078,11 +1078,11 @@ static MACHINE_DRIVER_START( baddudes )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(dec0_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dec0_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_s_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1120,11 +1120,11 @@ static MACHINE_DRIVER_START( birdtry )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(dec0_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dec0_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_s_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1162,14 +1162,14 @@ static MACHINE_DRIVER_START( robocop )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(dec0_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dec0_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_s_map)
MDRV_CPU_ADD("sub", H6280,21477200/16) /* 21.4772MHz clock */
- MDRV_CPU_PROGRAM_MAP(robocop_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(robocop_sub_map)
MDRV_QUANTUM_TIME(HZ(3000)) /* Interleave between HuC6280 & 68000 */
@@ -1209,11 +1209,11 @@ static MACHINE_DRIVER_START( robocopb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(dec0_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dec0_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_s_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1251,14 +1251,14 @@ static MACHINE_DRIVER_START( hippodrm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(dec0_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dec0_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec0_s_map)
MDRV_CPU_ADD("sub", H6280,21477200/16) /* 21.4772MHz clock */
- MDRV_CPU_PROGRAM_MAP(hippodrm_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(hippodrm_sub_map)
MDRV_QUANTUM_TIME(HZ(300)) /* Interleave between H6280 & 68000 */
@@ -1298,11 +1298,11 @@ static MACHINE_DRIVER_START( slyspy )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
- MDRV_CPU_PROGRAM_MAP(slyspy_map,0)
+ MDRV_CPU_PROGRAM_MAP(slyspy_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
MDRV_CPU_ADD("audiocpu", H6280, XTAL_12MHz/2/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(slyspy_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(slyspy_s_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1340,12 +1340,12 @@ static MACHINE_DRIVER_START( secretab )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
- MDRV_CPU_PROGRAM_MAP(secretab_map,0)
+ MDRV_CPU_PROGRAM_MAP(secretab_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
/* z80 */
// MDRV_CPU_ADD("audiocpu", H6280, XTAL_12MHz/2/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
-// MDRV_CPU_PROGRAM_MAP(slyspy_s_map,0)
+// MDRV_CPU_PROGRAM_MAP(slyspy_s_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1383,11 +1383,11 @@ static MACHINE_DRIVER_START( midres )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
- MDRV_CPU_PROGRAM_MAP(midres_map,0)
+ MDRV_CPU_PROGRAM_MAP(midres_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
MDRV_CPU_ADD("audiocpu", H6280, XTAL_24MHz/4/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(midres_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(midres_s_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 791df2a3e98..fff06d1963f 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -2002,11 +2002,11 @@ static MACHINE_DRIVER_START( cobracom )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(cobra_map,0)
+ MDRV_CPU_PROGRAM_MAP(cobra_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dec8_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec8_s_map)
/* NMIs are caused by the main CPU */
/* video hardware */
@@ -2043,11 +2043,11 @@ static MACHINE_DRIVER_START( ghostb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, 3000000*4)
- MDRV_CPU_PROGRAM_MAP(ghostb_map,0)
+ MDRV_CPU_PROGRAM_MAP(ghostb_map)
MDRV_CPU_VBLANK_INT("screen", ghostb_interrupt)
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dec8_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec8_s_map)
/* NMIs are caused by the main CPU */
/* video hardware */
@@ -2086,11 +2086,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( meikyuh )
MDRV_IMPORT_FROM( ghostb )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(meikyuh_map,0)
+ MDRV_CPU_PROGRAM_MAP(meikyuh_map)
MDRV_CPU_VBLANK_INT("screen", gondo_interrupt)
MDRV_CPU_ADD("mcu", I8751, 3000000*4)
- MDRV_CPU_IO_MAP(dec8_mcu_io_map,0)
+ MDRV_CPU_IO_MAP(dec8_mcu_io_map)
MACHINE_DRIVER_END
@@ -2098,11 +2098,11 @@ static MACHINE_DRIVER_START( srdarwin )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809,2000000) /* MC68A09EP */
- MDRV_CPU_PROGRAM_MAP(srdarwin_map,0)
+ MDRV_CPU_PROGRAM_MAP(srdarwin_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dec8_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(dec8_s_map)
/* NMIs are caused by the main CPU */
/* video hardware */
@@ -2139,11 +2139,11 @@ static MACHINE_DRIVER_START( gondo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP */
- MDRV_CPU_PROGRAM_MAP(gondo_map,0)
+ MDRV_CPU_PROGRAM_MAP(gondo_map)
MDRV_CPU_VBLANK_INT("screen", gondo_interrupt)
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(oscar_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(oscar_s_map)
/* NMIs are caused by the main CPU */
/* video hardware */
@@ -2181,14 +2181,14 @@ static MACHINE_DRIVER_START( oscar )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(oscar_map,0)
+ MDRV_CPU_PROGRAM_MAP(oscar_map)
MDRV_CPU_VBLANK_INT("screen", oscar_interrupt)
MDRV_CPU_ADD("sub", HD6309, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(oscar_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(oscar_sub_map)
MDRV_CPU_ADD("audiocpu", M6502, XTAL_12MHz/8)
- MDRV_CPU_PROGRAM_MAP(oscar_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(oscar_s_map)
/* NMIs are caused by the main CPU */
MDRV_QUANTUM_TIME(HZ(2400)) /* 40 CPU slices per frame */
@@ -2226,13 +2226,13 @@ static MACHINE_DRIVER_START( lastmiss )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(lastmiss_map,0)
+ MDRV_CPU_PROGRAM_MAP(lastmiss_map)
MDRV_CPU_ADD("sub", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(lastmiss_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(lastmiss_sub_map)
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(ym3526_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(ym3526_s_map)
/* NMIs are caused by the main CPU */
MDRV_QUANTUM_TIME(HZ(12000))
@@ -2270,13 +2270,13 @@ static MACHINE_DRIVER_START( shackled )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(shackled_map,0)
+ MDRV_CPU_PROGRAM_MAP(shackled_map)
MDRV_CPU_ADD("sub", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(shackled_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(shackled_sub_map)
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(ym3526_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(ym3526_s_map)
/* NMIs are caused by the main CPU */
MDRV_QUANTUM_TIME(HZ(4800))
@@ -2314,14 +2314,14 @@ static MACHINE_DRIVER_START( csilver )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, XTAL_12MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(csilver_map,0)
+ MDRV_CPU_PROGRAM_MAP(csilver_map)
MDRV_CPU_ADD("sub", M6809, XTAL_12MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(csilver_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(csilver_sub_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", M6502, XTAL_12MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(csilver_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(csilver_s_map)
/* NMIs are caused by the main CPU */
MDRV_QUANTUM_TIME(HZ(6000))
@@ -2363,11 +2363,11 @@ static MACHINE_DRIVER_START( garyoret )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP */
- MDRV_CPU_PROGRAM_MAP(garyoret_map,0)
+ MDRV_CPU_PROGRAM_MAP(garyoret_map)
MDRV_CPU_VBLANK_INT("screen", gondo_interrupt)
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(oscar_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(oscar_s_map)
/* NMIs are caused by the main CPU */
/* video hardware */
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index 25273bb58db..3d96ee5edaa 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -374,7 +374,7 @@ static MACHINE_DRIVER_START( hvysmsh )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM, 28000000) /* Unconfirmed */
- MDRV_CPU_PROGRAM_MAP(hvysmsh_map,0)
+ MDRV_CPU_PROGRAM_MAP(hvysmsh_map)
MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
MDRV_NVRAM_HANDLER(93C46)
@@ -413,7 +413,7 @@ static MACHINE_DRIVER_START( wcvol95 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM, 28000000) /* Unconfirmed */
- MDRV_CPU_PROGRAM_MAP(wcvol95_map,0)
+ MDRV_CPU_PROGRAM_MAP(wcvol95_map)
MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
MDRV_NVRAM_HANDLER(93C46)
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 69b10e8941d..a790836f8e2 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -1669,11 +1669,11 @@ static MACHINE_DRIVER_START( captaven )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM, 28000000/4)
- MDRV_CPU_PROGRAM_MAP(captaven_map,0)
+ MDRV_CPU_PROGRAM_MAP(captaven_map)
MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
MDRV_CPU_ADD("audiocpu", H6280, 32220000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(deco32)
@@ -1716,11 +1716,11 @@ static MACHINE_DRIVER_START( fghthist )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM, 28000000/4)
- MDRV_CPU_PROGRAM_MAP(fghthist_map,0)
+ MDRV_CPU_PROGRAM_MAP(fghthist_map)
MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
MDRV_CPU_ADD("audiocpu", H6280, 32220000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_NVRAM_HANDLER(93C46)
@@ -1762,11 +1762,11 @@ static MACHINE_DRIVER_START( fghthsta )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM, 28000000/4)
- MDRV_CPU_PROGRAM_MAP(fghthsta_memmap,0)
+ MDRV_CPU_PROGRAM_MAP(fghthsta_memmap)
MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
MDRV_CPU_ADD("audiocpu", H6280, 32220000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_NVRAM_HANDLER(93C46)
@@ -1808,11 +1808,11 @@ static MACHINE_DRIVER_START( dragngun )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM, 28000000/4)
- MDRV_CPU_PROGRAM_MAP(dragngun_map,0)
+ MDRV_CPU_PROGRAM_MAP(dragngun_map)
MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
MDRV_CPU_ADD("audiocpu", H6280, 32220000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(deco32)
MDRV_NVRAM_HANDLER(93C46)
@@ -1861,11 +1861,11 @@ static MACHINE_DRIVER_START( lockload )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM, 28000000/4)
- MDRV_CPU_PROGRAM_MAP(lockload_map,0)
+ MDRV_CPU_PROGRAM_MAP(lockload_map)
MDRV_CPU_VBLANK_INT_HACK(deco32_vbl_interrupt,2) // From 2
MDRV_CPU_ADD("audiocpu", H6280, 32220000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(deco32)
MDRV_NVRAM_HANDLER(93C46)
@@ -1914,11 +1914,11 @@ static MACHINE_DRIVER_START( tattass )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM, 28000000/4) /* Unconfirmed */
- MDRV_CPU_PROGRAM_MAP(tattass_map,0)
+ MDRV_CPU_PROGRAM_MAP(tattass_map)
MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
MDRV_CPU_ADD("audiocpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(tattass_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(tattass_sound_map)
MDRV_CPU_PERIODIC_INT(tattass_snd_interrupt, 489) /* Fixed FIRQ of 489Hz as measured on real (pinball) machine */
MDRV_NVRAM_HANDLER(tattass)
@@ -1950,12 +1950,12 @@ static MACHINE_DRIVER_START( nslasher )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM, 28322000/4)
- MDRV_CPU_PROGRAM_MAP(nslasher_map,0)
+ MDRV_CPU_PROGRAM_MAP(nslasher_map)
MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 32220000/9)
- MDRV_CPU_PROGRAM_MAP(nslasher_sound,0)
- MDRV_CPU_IO_MAP(nslasher_io_sound,0)
+ MDRV_CPU_PROGRAM_MAP(nslasher_sound)
+ MDRV_CPU_IO_MAP(nslasher_io_sound)
MDRV_QUANTUM_TIME(HZ(6000)) /* to improve main<->audio comms */
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index 75c814763e3..1e0a676cd3e 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -404,7 +404,7 @@ static MACHINE_DRIVER_START( avengrgs )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", SH2,42000000/2) /* 21 MHz clock confirmed on real board */
- MDRV_CPU_PROGRAM_MAP(decomlc_map,0)
+ MDRV_CPU_PROGRAM_MAP(decomlc_map)
MDRV_MACHINE_RESET(mlc)
MDRV_NVRAM_HANDLER(mlc) /* Actually 93c45 */
@@ -435,7 +435,7 @@ static MACHINE_DRIVER_START( mlc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM,42000000/6) /* 42 MHz -> 7MHz clock confirmed on real board */
- MDRV_CPU_PROGRAM_MAP(decomlc_map,0)
+ MDRV_CPU_PROGRAM_MAP(decomlc_map)
MDRV_MACHINE_RESET(mlc)
MDRV_NVRAM_HANDLER(mlc) /* Actually 93c45 */
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index bf3c0d3cb9e..498dbd30a2b 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -323,14 +323,14 @@ static MACHINE_DRIVER_START( decocass )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, HCLK4)
- MDRV_CPU_PROGRAM_MAP(decocass_map,0)
+ MDRV_CPU_PROGRAM_MAP(decocass_map)
MDRV_CPU_ADD("audiocpu", M6502, HCLK1/3/2)
- MDRV_CPU_PROGRAM_MAP(decocass_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(decocass_sound_map)
MDRV_TIMER_ADD_SCANLINE("audionmi", decocass_audio_nmi_gen, "screen", 0, 8)
MDRV_CPU_ADD("mcu", I8041, HCLK)
- MDRV_CPU_IO_MAP(decocass_mcu_portmap,0)
+ MDRV_CPU_IO_MAP(decocass_mcu_portmap)
MDRV_QUANTUM_TIME(HZ(4200)) /* interleave CPUs */
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index c39dd401cf3..877d3714b70 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -238,12 +238,12 @@ static MACHINE_DRIVER_START( deniam16b )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,25000000/2) /* ??? */
- MDRV_CPU_PROGRAM_MAP(deniam16b_map,0)
+ MDRV_CPU_PROGRAM_MAP(deniam16b_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,25000000/4) /* (makes logicpro music tempo correct) */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_MACHINE_RESET(deniam)
@@ -277,7 +277,7 @@ static MACHINE_DRIVER_START( deniam16c )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,25000000/2) /* ??? */
- MDRV_CPU_PROGRAM_MAP(deniam16c_map,0)
+ MDRV_CPU_PROGRAM_MAP(deniam16c_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_MACHINE_RESET(deniam)
diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c
index c8f1fb76a18..3cf973b06e0 100644
--- a/src/mame/drivers/deshoros.c
+++ b/src/mame/drivers/deshoros.c
@@ -158,7 +158,7 @@ static MACHINE_DRIVER_START( deshoros )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M6809,2000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen",deshoros_irq)
MDRV_MACHINE_RESET(deshoros)
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index ca2142a8c25..d5c734a5ca0 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -341,7 +341,7 @@ static MACHINE_DRIVER_START( destroyr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6800, 12096000 / 16)
- MDRV_CPU_PROGRAM_MAP(destroyr_map, 0)
+ MDRV_CPU_PROGRAM_MAP(destroyr_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_assert, 4)
MDRV_MACHINE_RESET(destroyr)
diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c
index 44fe1edc0e6..6fec9ffd030 100644
--- a/src/mame/drivers/dgpix.c
+++ b/src/mame/drivers/dgpix.c
@@ -305,8 +305,8 @@ static MACHINE_RESET( dgpix )
static MACHINE_DRIVER_START( dgpix )
MDRV_CPU_ADD("maincpu", E132XT, 20000000*4) /* 4x internal multiplier */
- MDRV_CPU_PROGRAM_MAP(cpu_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu_map)
+ MDRV_CPU_IO_MAP(io_map)
/*
unknown 16bit sound cpu, embedded inside the KS0164 sound chip
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index a7920589489..32cffbbe1f9 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -175,11 +175,11 @@ static const ym2151_interface ym2151_config =
static MACHINE_DRIVER_START( dietgo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* DE102 (verified on pcb) */
- MDRV_CPU_PROGRAM_MAP(dietgo_map,0)
+ MDRV_CPU_PROGRAM_MAP(dietgo_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz/4/3) /* Custom chip 45; XIN is 32.220MHZ/4, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index 1e88868cd17..6b0a9acf1b3 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -446,13 +446,13 @@ static MACHINE_RESET( discoboy )
static MACHINE_DRIVER_START( discoboy )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(discoboy_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(discoboy_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,10000000/2) /* 5 MHz? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
-// MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+// MDRV_CPU_IO_MAP(sound_io_map)
// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,32)
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index 0bfe41aa523..51be2ce5cd3 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -183,11 +183,11 @@ GFXDECODE_END
static MACHINE_DRIVER_START( diverboy )
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* guess */
- MDRV_CPU_PROGRAM_MAP(diverboy_map,0)
+ MDRV_CPU_PROGRAM_MAP(diverboy_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(snd_map,0)
+ MDRV_CPU_PROGRAM_MAP(snd_map)
MDRV_GFXDECODE(diverboy)
diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c
index b3c403b6dc8..1a099ffd329 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -906,18 +906,18 @@ static INTERRUPT_GEN( djboy_interrupt )
static MACHINE_DRIVER_START( djboy )
MDRV_CPU_ADD("maincpu", Z80,6000000)
- MDRV_CPU_PROGRAM_MAP(cpu0_am,0)
- MDRV_CPU_IO_MAP(cpu0_port_am,0)
+ MDRV_CPU_PROGRAM_MAP(cpu0_am)
+ MDRV_CPU_IO_MAP(cpu0_port_am)
MDRV_CPU_VBLANK_INT_HACK(djboy_interrupt,2)
MDRV_CPU_ADD("cpu1", Z80,6000000)
- MDRV_CPU_PROGRAM_MAP(cpu1_am,0)
- MDRV_CPU_IO_MAP(cpu1_port_am,0)
+ MDRV_CPU_PROGRAM_MAP(cpu1_am)
+ MDRV_CPU_IO_MAP(cpu1_port_am)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("cpu2", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(cpu2_am,0)
- MDRV_CPU_IO_MAP(cpu2_port_am,0)
+ MDRV_CPU_PROGRAM_MAP(cpu2_am)
+ MDRV_CPU_IO_MAP(cpu2_port_am)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index f8f4c3cd127..027590a4605 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -1485,7 +1485,7 @@ static MACHINE_DRIVER_START( djmain )
// popn3 works 9.6 MHz or slower in some songs */
//MDRV_CPU_ADD("maincpu", M68EC020, 18432000/2) /* 9.216 MHz!? */
MDRV_CPU_ADD("maincpu", M68EC020, 32000000/4) /* 8.000 MHz!? */
- MDRV_CPU_PROGRAM_MAP(memory_map, 0)
+ MDRV_CPU_PROGRAM_MAP(memory_map)
MDRV_CPU_VBLANK_INT("screen", vb_interrupt)
MDRV_MACHINE_START(djmain)
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index 836283ddf25..c1562cf1622 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -1575,7 +1575,7 @@ static MACHINE_DRIVER_START( dkong_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CLOCK_1H)
- MDRV_CPU_PROGRAM_MAP(dkong_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dkong_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_START(dkong2b)
@@ -1643,8 +1643,8 @@ static MACHINE_DRIVER_START( dkong3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) /* verified in schematics */
- MDRV_CPU_PROGRAM_MAP(dkong3_map, 0)
- MDRV_CPU_IO_MAP(dkong3_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dkong3_map)
+ MDRV_CPU_IO_MAP(dkong3_io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_START(dkong3)
@@ -1672,7 +1672,7 @@ static MACHINE_DRIVER_START( dkongjr )
MDRV_IMPORT_FROM(dkong_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dkongjr_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dkongjr_map)
/* sound hardware */
MDRV_IMPORT_FROM(dkongjr_audio)
@@ -1709,8 +1709,8 @@ static MACHINE_DRIVER_START( s2650 )
/* basic machine hardware */
MDRV_CPU_REPLACE("maincpu", S2650, CLOCK_1H / 2) /* ??? */
- MDRV_CPU_PROGRAM_MAP(s2650_map, 0)
- MDRV_CPU_IO_MAP(s2650_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(s2650_map)
+ MDRV_CPU_IO_MAP(s2650_io_map)
MDRV_CPU_VBLANK_INT("screen", s2650_interrupt)
MDRV_DEVICE_MODIFY("dma8257")
@@ -1742,7 +1742,7 @@ static MACHINE_DRIVER_START( strtheat )
MDRV_IMPORT_FROM(dkong2b)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(epos_readport,0)
+ MDRV_CPU_IO_MAP(epos_readport)
MDRV_MACHINE_RESET(strtheat)
MACHINE_DRIVER_END
@@ -1752,7 +1752,7 @@ static MACHINE_DRIVER_START( drakton )
MDRV_IMPORT_FROM(dkong2b)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(epos_readport,0)
+ MDRV_CPU_IO_MAP(epos_readport)
MDRV_MACHINE_RESET(drakton)
MACHINE_DRIVER_END
@@ -1762,7 +1762,7 @@ static MACHINE_DRIVER_START( drktnjr )
MDRV_IMPORT_FROM(dkongjr)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(epos_readport,0)
+ MDRV_CPU_IO_MAP(epos_readport)
MDRV_MACHINE_RESET(drakton)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index 4274e2ac1f1..b6120dcf5ee 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -695,7 +695,7 @@ static MACHINE_DRIVER_START( dlair_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK_US/4)
- MDRV_CPU_PROGRAM_MAP(dlus_map,0)
+ MDRV_CPU_PROGRAM_MAP(dlus_map)
MDRV_CPU_VBLANK_INT("screen", vblank_callback)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)MASTER_CLOCK_US/8/16/16/16/16)
@@ -735,8 +735,8 @@ static MACHINE_DRIVER_START( dleuro )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK_EURO/4)
MDRV_CPU_CONFIG(dleuro_daisy_chain)
- MDRV_CPU_PROGRAM_MAP(dleuro_map,0)
- MDRV_CPU_IO_MAP(dleuro_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(dleuro_map)
+ MDRV_CPU_IO_MAP(dleuro_io_map)
MDRV_CPU_VBLANK_INT("screen", vblank_callback)
MDRV_Z80CTC_ADD("ctc", MASTER_CLOCK_EURO/4 /* same as "maincpu" */, ctc_intf)
diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c
index c915dcd2948..41d7f441be6 100644
--- a/src/mame/drivers/dmndrby.c
+++ b/src/mame/drivers/dmndrby.c
@@ -500,12 +500,12 @@ static INTERRUPT_GEN( dderby_timer_irq )
static MACHINE_DRIVER_START( dderby )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(memmap,0)
+ MDRV_CPU_PROGRAM_MAP(memmap)
MDRV_CPU_VBLANK_INT("screen", dderby_irq)
MDRV_CPU_PERIODIC_INT(dderby_timer_irq, 244/2)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* verified on schematics */
- MDRV_CPU_PROGRAM_MAP(dderby_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(dderby_sound_map)
MDRV_QUANTUM_TIME(HZ(6000))
MDRV_NVRAM_HANDLER(dderby)
diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c
index cb68b7588f7..9b4a2503158 100644
--- a/src/mame/drivers/docastle.c
+++ b/src/mame/drivers/docastle.c
@@ -593,16 +593,16 @@ static MACHINE_DRIVER_START( docastle )
// basic machine hardware
// MDRV_CPU_ADD("maincpu", Z80, 4000000) // 4 MHz
MDRV_CPU_ADD("maincpu", Z80, 3980000) // make dip switches work in docastle and dorunrun and fix dorunru2 attract sequence
- MDRV_CPU_PROGRAM_MAP(docastle_map, 0)
- MDRV_CPU_IO_MAP(docastle_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(docastle_map)
+ MDRV_CPU_IO_MAP(docastle_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("slave", Z80, 4000000) // 4 MHz
- MDRV_CPU_PROGRAM_MAP(docastle_map2, 0)
+ MDRV_CPU_PROGRAM_MAP(docastle_map2)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 8)
MDRV_CPU_ADD("cpu3", Z80, 4000000) // 4 MHz
- MDRV_CPU_PROGRAM_MAP(docastle_map3, 0)
+ MDRV_CPU_PROGRAM_MAP(docastle_map3)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
// video hardware
@@ -645,10 +645,10 @@ static MACHINE_DRIVER_START( dorunrun )
MDRV_IMPORT_FROM(docastle)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dorunrun_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dorunrun_map)
MDRV_CPU_MODIFY("slave")
- MDRV_CPU_PROGRAM_MAP(dorunrun_map2, 0)
+ MDRV_CPU_PROGRAM_MAP(dorunrun_map2)
// video hardware
MDRV_VIDEO_START(dorunrun)
@@ -659,10 +659,10 @@ static MACHINE_DRIVER_START( idsoccer )
MDRV_IMPORT_FROM(docastle)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(idsoccer_map, 0)
+ MDRV_CPU_PROGRAM_MAP(idsoccer_map)
MDRV_CPU_MODIFY("slave")
- MDRV_CPU_PROGRAM_MAP(idsoccer_map2, 0)
+ MDRV_CPU_PROGRAM_MAP(idsoccer_map2)
// video hardware
MDRV_VIDEO_START(dorunrun)
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index 77efdce109f..34b29e70f8d 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -220,11 +220,11 @@ static MACHINE_DRIVER_START( dogfgt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,16) /* ? controls music tempo */
MDRV_CPU_ADD("sub", M6502, 1500000) /* 1.5 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index f4fd9386d7b..f98eff36faa 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -250,8 +250,8 @@ static MACHINE_DRIVER_START( dominob )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(memmap, 0)
- MDRV_CPU_IO_MAP(portmap,0)
+ MDRV_CPU_PROGRAM_MAP(memmap)
+ MDRV_CPU_IO_MAP(portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index 2cc0642b296..ef15019a942 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -816,11 +816,11 @@ static MACHINE_DRIVER_START( lastday )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(lastday_map,0)
+ MDRV_CPU_PROGRAM_MAP(lastday_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(lastday_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(lastday_sound_map)
MDRV_MACHINE_START(lastday)
@@ -849,11 +849,11 @@ static MACHINE_DRIVER_START( gulfstrm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(gulfstrm_map,0)
+ MDRV_CPU_PROGRAM_MAP(gulfstrm_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(lastday_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(lastday_sound_map)
MDRV_MACHINE_START(lastday)
@@ -882,11 +882,11 @@ static MACHINE_DRIVER_START( pollux )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(pollux_map,0)
+ MDRV_CPU_PROGRAM_MAP(pollux_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(pollux_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(pollux_sound_map)
MDRV_MACHINE_START(lastday)
@@ -915,11 +915,11 @@ static MACHINE_DRIVER_START( bluehawk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(bluehawk_map,0)
+ MDRV_CPU_PROGRAM_MAP(bluehawk_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map)
MDRV_MACHINE_START(lastday)
@@ -948,11 +948,11 @@ static MACHINE_DRIVER_START( flytiger )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(flytiger_map,0)
+ MDRV_CPU_PROGRAM_MAP(flytiger_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map)
MDRV_MACHINE_START(lastday)
@@ -981,11 +981,11 @@ static MACHINE_DRIVER_START( primella )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(primella_map,0)
+ MDRV_CPU_PROGRAM_MAP(primella_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map)
MDRV_MACHINE_START(lastday)
@@ -1020,11 +1020,11 @@ static MACHINE_DRIVER_START( rshark )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* measured on super-x */
- MDRV_CPU_PROGRAM_MAP(rshark_map,0)
+ MDRV_CPU_PROGRAM_MAP(rshark_map)
MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* measured on super-x */
- MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
@@ -1051,11 +1051,11 @@ static MACHINE_DRIVER_START( superx ) // dif mem map
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* measured on super-x */
- MDRV_CPU_PROGRAM_MAP(superx_map,0)
+ MDRV_CPU_PROGRAM_MAP(superx_map)
MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* measured on super-x */
- MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
@@ -1082,11 +1082,11 @@ static MACHINE_DRIVER_START( popbingo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(popbingo_map,0)
+ MDRV_CPU_PROGRAM_MAP(popbingo_map)
MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* measured on super-x */
- MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c
index 6c71735c4ad..8516da6f630 100644
--- a/src/mame/drivers/dorachan.c
+++ b/src/mame/drivers/dorachan.c
@@ -210,8 +210,8 @@ static MACHINE_DRIVER_START( dorachan )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(dorachan_map,0)
- MDRV_CPU_IO_MAP(dorachan_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(dorachan_map)
+ MDRV_CPU_IO_MAP(dorachan_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
/* video hardware */
diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c
index 6f56329824d..affe6ea23a0 100644
--- a/src/mame/drivers/dotrikun.c
+++ b/src/mame/drivers/dotrikun.c
@@ -61,8 +61,8 @@ static MACHINE_DRIVER_START( dotrikun )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(dotrikun_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(dotrikun_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c
index edc6d662bd2..9f0176dbd43 100644
--- a/src/mame/drivers/dragrace.c
+++ b/src/mame/drivers/dragrace.c
@@ -326,7 +326,7 @@ static MACHINE_DRIVER_START( dragrace )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6800, 12096000 / 12)
- MDRV_CPU_PROGRAM_MAP(dragrace_map,0)
+ MDRV_CPU_PROGRAM_MAP(dragrace_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
MDRV_WATCHDOG_VBLANK_INIT(8)
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index 593ab8ac9cb..f8d0cdd1adf 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -386,7 +386,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( dreamwld )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(dreamwld_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dreamwld_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold) // 4, 5, or 6, all point to the same place
/* video hardware */
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index a2362962db2..e8484fed586 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -380,12 +380,12 @@ GFXDECODE_END
static MACHINE_DRIVER_START( drgnmst )
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* Confirmed */
- MDRV_CPU_PROGRAM_MAP(drgnmst_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(drgnmst_main_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", PIC16C55, 32000000/8) /* Confirmed */
/* Program and Data Maps are internal to the MCU */
- MDRV_CPU_IO_MAP(drgnmst_sound_io_map, 0)
+ MDRV_CPU_IO_MAP(drgnmst_sound_io_map)
MDRV_GFXDECODE(drgnmst)
diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c
index 925df1d5ddf..a5eee8b7356 100644
--- a/src/mame/drivers/dribling.c
+++ b/src/mame/drivers/dribling.c
@@ -289,8 +289,8 @@ static MACHINE_DRIVER_START( dribling )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(dribling_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(dribling_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", dribling_irq_gen)
MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c
index e70706e1a58..15763dd8792 100644
--- a/src/mame/drivers/drmicro.c
+++ b/src/mame/drivers/drmicro.c
@@ -214,8 +214,8 @@ static MACHINE_DRIVER_START( drmicro )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,MCLK/6) /* 3.072MHz? */
- MDRV_CPU_PROGRAM_MAP(drmicro_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(drmicro_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", drmicro_interrupt)
MDRV_QUANTUM_TIME(HZ(60))
diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c
index 71c532b7c24..771fb9ddb85 100644
--- a/src/mame/drivers/drtomy.c
+++ b/src/mame/drivers/drtomy.c
@@ -252,7 +252,7 @@ static MACHINE_DRIVER_START( drtomy )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(drtomy_map,0)
+ MDRV_CPU_PROGRAM_MAP(drtomy_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c
index e9532d8bacf..fcfd5347010 100644
--- a/src/mame/drivers/drw80pkr.c
+++ b/src/mame/drivers/drw80pkr.c
@@ -308,8 +308,8 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( drw80pkr )
// basic machine hardware
MDRV_CPU_ADD("maincpu", I8039, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(drw80pkr_map, 0)
- MDRV_CPU_IO_MAP(drw80pkr_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(drw80pkr_map)
+ MDRV_CPU_IO_MAP(drw80pkr_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
// video hardware
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index 31915d42ea4..c8b82463ae2 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -676,8 +676,8 @@ static const ay8910_interface dunhuang_ay8910_interface =
static MACHINE_DRIVER_START( dunhuang )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2)
- MDRV_CPU_PROGRAM_MAP(dunhuang_map,0)
- MDRV_CPU_IO_MAP(dunhuang_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(dunhuang_map)
+ MDRV_CPU_IO_MAP(dunhuang_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_WATCHDOG_TIME_INIT(SEC(5))
diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c
index 3bf580292da..5e81f78a887 100644
--- a/src/mame/drivers/dwarfd.c
+++ b/src/mame/drivers/dwarfd.c
@@ -698,8 +698,8 @@ static MACHINE_DRIVER_START( dwarfd )
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
MDRV_CPU_ADD("maincpu", 8085A, 10595000/3*2) /* ? MHz */
MDRV_CPU_CONFIG(dwarfd_i8085_config)
- MDRV_CPU_PROGRAM_MAP(mem_map, 0)
- MDRV_CPU_IO_MAP(io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mem_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT_HACK(dwarfd_interrupt,NUM_LINES+4) //16 +vblank + 1 unused
diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c
index 8ac3ab32fc8..d800d4905f0 100644
--- a/src/mame/drivers/dynadice.c
+++ b/src/mame/drivers/dynadice.c
@@ -196,12 +196,12 @@ static PALETTE_INIT( dynadice )
static MACHINE_DRIVER_START( dynadice )
MDRV_CPU_ADD("maincpu", 8080,18432000/8)
- MDRV_CPU_PROGRAM_MAP(dynadice_map,0)
- MDRV_CPU_IO_MAP(dynadice_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(dynadice_map)
+ MDRV_CPU_IO_MAP(dynadice_io_map)
MDRV_CPU_ADD("audiocpu", Z80,18432000/6)
- MDRV_CPU_PROGRAM_MAP(dynadice_sound_map,0)
- MDRV_CPU_IO_MAP(dynadice_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(dynadice_sound_map)
+ MDRV_CPU_IO_MAP(dynadice_sound_io_map)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index fa68b447484..7b1d1c2beb2 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -3618,8 +3618,8 @@ static MACHINE_DRIVER_START( hanamai )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
- MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map,0)
- MDRV_CPU_IO_MAP(hanamai_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map)
+ MDRV_CPU_IO_MAP(hanamai_io_map)
MDRV_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MDRV_MACHINE_RESET(adpcm)
@@ -3675,8 +3675,8 @@ static MACHINE_DRIVER_START( hnoridur )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
- MDRV_CPU_PROGRAM_MAP(hnoridur_mem_map,0)
- MDRV_CPU_IO_MAP(hnoridur_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(hnoridur_mem_map)
+ MDRV_CPU_IO_MAP(hnoridur_io_map)
MDRV_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MDRV_MACHINE_RESET(adpcm)
@@ -3733,8 +3733,8 @@ static MACHINE_DRIVER_START( sprtmtch )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,22000000 / 4) /* 5.5MHz */
- MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map,0)
- MDRV_CPU_IO_MAP(sprtmtch_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map)
+ MDRV_CPU_IO_MAP(sprtmtch_io_map)
MDRV_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -3773,8 +3773,8 @@ static MACHINE_DRIVER_START( mjfriday )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,24000000/4) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map,0)
- MDRV_CPU_IO_MAP(mjfriday_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map)
+ MDRV_CPU_IO_MAP(mjfriday_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -3810,7 +3810,7 @@ static MACHINE_DRIVER_START( mjdialq2 )
/* basic machine hardware */
MDRV_IMPORT_FROM( mjfriday )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjdialq2_mem_map,0)
+ MDRV_CPU_PROGRAM_MAP(mjdialq2_mem_map)
MACHINE_DRIVER_END
@@ -3844,8 +3844,8 @@ static MACHINE_DRIVER_START( yarunara )
/* basic machine hardware */
MDRV_IMPORT_FROM( hnoridur )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(yarunara_mem_map,0)
- MDRV_CPU_IO_MAP(yarunara_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(yarunara_mem_map)
+ MDRV_CPU_IO_MAP(yarunara_io_map)
MDRV_CPU_PERIODIC_INT(yarunara_clock_interrupt, 60) // RTC
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -3867,8 +3867,8 @@ static MACHINE_DRIVER_START( mcnpshnt )
MDRV_IMPORT_FROM( hnoridur )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mcnpshnt_mem_map,0)
- MDRV_CPU_IO_MAP(mcnpshnt_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcnpshnt_mem_map)
+ MDRV_CPU_IO_MAP(mcnpshnt_io_map)
MDRV_VIDEO_START(mcnpshnt) // different priorities
MACHINE_DRIVER_END
@@ -3882,8 +3882,8 @@ static MACHINE_DRIVER_START( nanajign )
MDRV_IMPORT_FROM( hnoridur )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(nanajign_mem_map,0)
- MDRV_CPU_IO_MAP(nanajign_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(nanajign_mem_map)
+ MDRV_CPU_IO_MAP(nanajign_io_map)
MACHINE_DRIVER_END
@@ -3913,13 +3913,13 @@ static MACHINE_DRIVER_START( jantouki )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
- MDRV_CPU_PROGRAM_MAP(jantouki_mem_map,0)
- MDRV_CPU_IO_MAP(jantouki_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(jantouki_mem_map)
+ MDRV_CPU_IO_MAP(jantouki_io_map)
MDRV_CPU_VBLANK_INT("top", jantouki_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MDRV_CPU_ADD("soundcpu",Z80,22000000 / 4) /* 5.5MHz */
- MDRV_CPU_PROGRAM_MAP(jantouki_sound_mem_map,0)
- MDRV_CPU_IO_MAP(jantouki_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(jantouki_sound_mem_map)
+ MDRV_CPU_IO_MAP(jantouki_sound_io_map)
MDRV_CPU_VBLANK_INT("top", jantouki_sound_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MDRV_MACHINE_RESET(adpcm)
@@ -3995,8 +3995,8 @@ static MACHINE_DRIVER_START( mjelctrn )
MDRV_IMPORT_FROM( hnoridur )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(nanajign_mem_map,0)
- MDRV_CPU_IO_MAP(mjelctrn_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(nanajign_mem_map)
+ MDRV_CPU_IO_MAP(mjelctrn_io_map)
MDRV_CPU_VBLANK_INT("screen", mjelctrn_vblank_interrupt) /* IM 2 needs a vector on the data bus */
MDRV_VIDEO_START(mjelctrn)
@@ -4081,8 +4081,8 @@ static MACHINE_DRIVER_START( htengoku )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,20000000 / 4)
- MDRV_CPU_PROGRAM_MAP(yarunara_mem_map,0)
- MDRV_CPU_IO_MAP(htengoku_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(yarunara_mem_map)
+ MDRV_CPU_IO_MAP(htengoku_io_map)
MDRV_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MDRV_CPU_PERIODIC_INT(yarunara_clock_interrupt, 60) // RTC
@@ -4144,8 +4144,8 @@ static MACHINE_DRIVER_START( tenkai )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",TMP91640, 21472700 / 2)
- MDRV_CPU_PROGRAM_MAP(tenkai_map,0)
- MDRV_CPU_IO_MAP(tenkai_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(tenkai_map)
+ MDRV_CPU_IO_MAP(tenkai_io_map)
MDRV_CPU_VBLANK_INT_HACK(tenkai_interrupt,3)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c
index 028edf79ea2..f922dba2003 100644
--- a/src/mame/drivers/dynduke.c
+++ b/src/mame/drivers/dynduke.c
@@ -284,11 +284,11 @@ static INTERRUPT_GEN( dynduke_interrupt )
static MACHINE_DRIVER_START( dynduke )
// basic machine hardware
MDRV_CPU_ADD("maincpu", V30, 16000000/2) // NEC V30-8 CPU
- MDRV_CPU_PROGRAM_MAP(master_map, 0)
+ MDRV_CPU_PROGRAM_MAP(master_map)
MDRV_CPU_VBLANK_INT("screen", dynduke_interrupt)
MDRV_CPU_ADD("slave", V30, 16000000/2) // NEC V30-8 CPU
- MDRV_CPU_PROGRAM_MAP(slave_map, 0)
+ MDRV_CPU_PROGRAM_MAP(slave_map)
MDRV_CPU_VBLANK_INT("screen", dynduke_interrupt)
SEIBU_SOUND_SYSTEM_CPU(14318180/4)
@@ -322,7 +322,7 @@ static MACHINE_DRIVER_START( dbldyn )
MDRV_IMPORT_FROM(dynduke)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(masterj_map,0)
+ MDRV_CPU_PROGRAM_MAP(masterj_map)
MACHINE_DRIVER_END
/* ROMs */
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index ba9db9acdb5..94f40626f6a 100644
--- a/src/mame/drivers/egghunt.c
+++ b/src/mame/drivers/egghunt.c
@@ -366,12 +366,12 @@ static MACHINE_RESET( egghunt )
static MACHINE_DRIVER_START( egghunt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz ?*/
- MDRV_CPU_PROGRAM_MAP(egghunt_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(egghunt_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) // or 2 like mitchell.c?
MDRV_CPU_ADD("audiocpu", Z80,12000000/2) /* 6 MHz ?*/
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(egghunt)
diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c
index cc317a7ba7c..b3f90f97b9f 100644
--- a/src/mame/drivers/embargo.c
+++ b/src/mame/drivers/embargo.c
@@ -231,8 +231,8 @@ static MACHINE_DRIVER_START( embargo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", S2650, 625000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_io_map)
MDRV_MACHINE_START(embargo)
diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c
index 1fd9f7ced48..319e103d43f 100644
--- a/src/mame/drivers/enigma2.c
+++ b/src/mame/drivers/enigma2.c
@@ -565,11 +565,11 @@ static MACHINE_DRIVER_START( enigma2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(engima2_main_cpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(engima2_main_cpu_map)
MDRV_CPU_ADD("audiocpu", Z80, 2500000)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8)
- MDRV_CPU_PROGRAM_MAP(engima2_audio_cpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(engima2_audio_cpu_map)
MDRV_MACHINE_START(enigma2)
MDRV_MACHINE_RESET(enigma2)
@@ -594,12 +594,12 @@ static MACHINE_DRIVER_START( enigma2a )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(engima2a_main_cpu_map,0)
- MDRV_CPU_IO_MAP(engima2a_main_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(engima2a_main_cpu_map)
+ MDRV_CPU_IO_MAP(engima2a_main_cpu_io_map)
MDRV_CPU_ADD("audiocpu", Z80, 2500000)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8)
- MDRV_CPU_PROGRAM_MAP(engima2_audio_cpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(engima2_audio_cpu_map)
MDRV_MACHINE_START(enigma2)
MDRV_MACHINE_RESET(enigma2)
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index 68ecc81c1f7..06178650833 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -329,7 +329,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( eolith45 )
MDRV_CPU_ADD("cpu", E132N, 45000000) /* 45 MHz */
- MDRV_CPU_PROGRAM_MAP(eolith_map,0)
+ MDRV_CPU_PROGRAM_MAP(eolith_map)
MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262)
/* sound cpu */
diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c
index ec8fbc35f0f..fa26c539c90 100644
--- a/src/mame/drivers/eolith16.c
+++ b/src/mame/drivers/eolith16.c
@@ -166,7 +166,7 @@ static PALETTE_INIT( eolith16 )
static MACHINE_DRIVER_START( eolith16 )
MDRV_CPU_ADD("maincpu", E116T, 60000000) /* no internal multiplier */
- MDRV_CPU_PROGRAM_MAP(eolith16_map,0)
+ MDRV_CPU_PROGRAM_MAP(eolith16_map)
MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262)
MDRV_NVRAM_HANDLER(eolith16_eeprom)
diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c
index 85b3f04a60f..da668c3e7a7 100644
--- a/src/mame/drivers/epos.c
+++ b/src/mame/drivers/epos.c
@@ -371,8 +371,8 @@ static MACHINE_DRIVER_START( epos )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 11000000/4) /* 2.75 MHz (see notes) */
- MDRV_CPU_PROGRAM_MAP(epos_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(epos_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -395,8 +395,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( dealer )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 11000000/4) /* 2.75 MHz (see notes) */
- MDRV_CPU_PROGRAM_MAP(dealer_map,0)
- MDRV_CPU_IO_MAP(dealer_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(dealer_map)
+ MDRV_CPU_IO_MAP(dealer_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_PPI8255_ADD( "ppi8255", ppi8255_intf )
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index ba26ed5b1bc..983a853489c 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -411,11 +411,11 @@ static MACHINE_DRIVER_START( eprom )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(extra_map,0)
+ MDRV_CPU_PROGRAM_MAP(extra_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -445,7 +445,7 @@ static MACHINE_DRIVER_START( klaxp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_QUANTUM_TIME(HZ(600))
@@ -475,7 +475,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( guts )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(guts_map,0)
+ MDRV_CPU_PROGRAM_MAP(guts_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index ed198ed1cf4..01bc7dfed5e 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -1158,8 +1158,8 @@ static const samples_interface alphamc07_samples_interface =
static MACHINE_DRIVER_START( common_sound )
MDRV_CPU_ADD("audiocpu", 8085A, XTAL_6_144MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_SOUND_START(equites)
@@ -1201,13 +1201,13 @@ static MACHINE_DRIVER_START( equites )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz/4) /* 68000P8 running at 3mhz! verified on pcb */
- MDRV_CPU_PROGRAM_MAP(equites_map,0)
+ MDRV_CPU_PROGRAM_MAP(equites_map)
MDRV_CPU_VBLANK_INT_HACK(equites_interrupt, 2)
MDRV_IMPORT_FROM(common_sound)
MDRV_CPU_ADD("mcu", ALPHA8301, 4000000/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1239,13 +1239,13 @@ static MACHINE_DRIVER_START( splndrbt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 68000P8 running at 6mhz, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(splndrbt_map, 0)
+ MDRV_CPU_PROGRAM_MAP(splndrbt_map)
MDRV_CPU_VBLANK_INT_HACK(equites_interrupt, 2)
MDRV_IMPORT_FROM(common_sound)
MDRV_CPU_ADD("mcu", ALPHA8301, 4000000/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ertictac.c b/src/mame/drivers/ertictac.c
index 546566fd121..3908ce994bc 100644
--- a/src/mame/drivers/ertictac.c
+++ b/src/mame/drivers/ertictac.c
@@ -382,7 +382,7 @@ static VIDEO_UPDATE( ertictac )
static MACHINE_DRIVER_START( ertictac )
MDRV_CPU_ADD("maincpu", ARM, 16000000) /* guess */
- MDRV_CPU_PROGRAM_MAP(ertictac_map,0)
+ MDRV_CPU_PROGRAM_MAP(ertictac_map)
MDRV_CPU_VBLANK_INT("screen", ertictac_interrupt)
MDRV_MACHINE_RESET(ertictac)
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index d4b8552a600..b4250a99ea4 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -529,12 +529,12 @@ static MACHINE_DRIVER_START( multchmp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(multchmp_map,0)
+ MDRV_CPU_PROGRAM_MAP(multchmp_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(multchmp_sound_map,0)
- MDRV_CPU_IO_MAP(multchmp_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(multchmp_sound_map)
+ MDRV_CPU_IO_MAP(multchmp_sound_io_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,32) /* IRQ By Main CPU */
/* video hardware */
@@ -568,7 +568,7 @@ static MACHINE_DRIVER_START( hedpanic )
MDRV_IMPORT_FROM(multchmp)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hedpanic_map,0)
+ MDRV_CPU_PROGRAM_MAP(hedpanic_map)
MDRV_NVRAM_HANDLER(93C46)
@@ -585,7 +585,7 @@ static MACHINE_DRIVER_START( mchampdx )
MDRV_IMPORT_FROM(hedpanic)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mchampdx_map,0)
+ MDRV_CPU_PROGRAM_MAP(mchampdx_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tangtang )
@@ -594,7 +594,7 @@ static MACHINE_DRIVER_START( tangtang )
MDRV_IMPORT_FROM(hedpanic)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tangtang_map,0)
+ MDRV_CPU_PROGRAM_MAP(tangtang_map)
MDRV_GFXDECODE(tangtang)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c
index 73703b94aef..37160ab4ae7 100644
--- a/src/mame/drivers/esh.c
+++ b/src/mame/drivers/esh.c
@@ -281,8 +281,8 @@ static MACHINE_DRIVER_START( esh )
/* main cpu */
MDRV_CPU_ADD("maincpu", Z80, PCB_CLOCK/6) /* The denominator is a Daphne guess based on PacMan's hardware */
- MDRV_CPU_PROGRAM_MAP(z80_0_mem,0)
- MDRV_CPU_IO_MAP(z80_0_io,0)
+ MDRV_CPU_PROGRAM_MAP(z80_0_mem)
+ MDRV_CPU_IO_MAP(z80_0_io)
MDRV_CPU_VBLANK_INT("screen", vblank_callback_esh)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c
index 40680cada2b..cc1b6f93ec3 100644
--- a/src/mame/drivers/espial.c
+++ b/src/mame/drivers/espial.c
@@ -293,12 +293,12 @@ static MACHINE_DRIVER_START( espial )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(espial_map,0)
+ MDRV_CPU_PROGRAM_MAP(espial_map)
MDRV_CPU_VBLANK_INT_HACK(zodiac_master_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 2 MHz?????? */
- MDRV_CPU_PROGRAM_MAP(espial_sound_map,0)
- MDRV_CPU_IO_MAP(espial_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(espial_sound_map)
+ MDRV_CPU_IO_MAP(espial_sound_io_map)
MDRV_CPU_VBLANK_INT_HACK(espial_sound_nmi_gen,4)
MDRV_MACHINE_RESET(espial)
@@ -331,7 +331,7 @@ static MACHINE_DRIVER_START( netwars )
MDRV_IMPORT_FROM(espial)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(netwars_map,0)
+ MDRV_CPU_PROGRAM_MAP(netwars_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/esripsys.c b/src/mame/drivers/esripsys.c
index d7ee2522142..e3fdd080bbe 100644
--- a/src/mame/drivers/esripsys.c
+++ b/src/mame/drivers/esripsys.c
@@ -736,18 +736,18 @@ static const esrip_config rip_config =
static MACHINE_DRIVER_START( esripsys )
MDRV_CPU_ADD("game_cpu", M6809E, XTAL_8MHz)
- MDRV_CPU_PROGRAM_MAP(game_cpu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(game_cpu_map)
MDRV_CPU_VBLANK_INT("screen", esripsys_vblank_irq)
MDRV_CPU_ADD("frame_cpu", M6809E, XTAL_8MHz)
- MDRV_CPU_PROGRAM_MAP(frame_cpu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(frame_cpu_map)
MDRV_CPU_ADD("video_cpu", ESRIP, XTAL_40MHz / 4)
- MDRV_CPU_PROGRAM_MAP(video_cpu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(video_cpu_map)
MDRV_CPU_CONFIG(rip_config)
MDRV_CPU_ADD("sound_cpu", M6809E, XTAL_8MHz)
- MDRV_CPU_PROGRAM_MAP(sound_cpu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_cpu_map)
MDRV_NVRAM_HANDLER(esripsys)
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index 77ced045ad4..619bcf258c1 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -239,8 +239,8 @@ static INTERRUPT_GEN( ettrivia_interrupt )
static MACHINE_DRIVER_START( ettrivia )
MDRV_CPU_ADD("maincpu", Z80,12000000/4-48000) //should be ok, it gives the 300 interrupts expected
- MDRV_CPU_PROGRAM_MAP(cpu_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", ettrivia_interrupt)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c
index 1185441bbc9..a674ac8d47a 100644
--- a/src/mame/drivers/exedexes.c
+++ b/src/mame/drivers/exedexes.c
@@ -212,11 +212,11 @@ static MACHINE_DRIVER_START( exedexes )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(exedexes_map,0)
+ MDRV_CPU_PROGRAM_MAP(exedexes_map)
MDRV_CPU_VBLANK_INT_HACK(exedexes_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
/* video hardware */
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index e9d7f70fc3b..de987bd0636 100644
--- a/src/mame/drivers/exerion.c
+++ b/src/mame/drivers/exerion.c
@@ -278,10 +278,10 @@ static const ay8910_interface ay8910_config =
static MACHINE_DRIVER_START( exerion )
MDRV_CPU_ADD("maincpu", Z80, EXERION_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_ADD("sub", Z80, EXERION_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c
index a6eb8189797..a7778cb4508 100644
--- a/src/mame/drivers/exidy.c
+++ b/src/mame/drivers/exidy.c
@@ -211,6 +211,7 @@ static ADDRESS_MAP_START( sidetrac_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5200, 0x5200) AM_WRITE(targ_audio_1_w)
AM_RANGE(0x5201, 0x5201) AM_WRITE(spectar_audio_2_w)
AM_RANGE(0xff00, 0xffff) AM_ROM AM_REGION("maincpu", 0x3f00)
+ AM_IMPORT_FROM(exidy_map)
ADDRESS_MAP_END
@@ -220,6 +221,7 @@ static ADDRESS_MAP_START( targ_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5200, 0x5200) AM_WRITE(targ_audio_1_w)
AM_RANGE(0x5201, 0x5201) AM_WRITE(targ_audio_2_w)
AM_RANGE(0xff00, 0xffff) AM_ROM AM_REGION("maincpu", 0x3f00)
+ AM_IMPORT_FROM(exidy_map)
ADDRESS_MAP_END
@@ -229,6 +231,7 @@ static ADDRESS_MAP_START( spectar_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5200, 0x5200) AM_WRITE(targ_audio_1_w)
AM_RANGE(0x5201, 0x5201) AM_WRITE(spectar_audio_2_w)
AM_RANGE(0xff00, 0xffff) AM_ROM AM_REGION("maincpu", 0x3f00)
+ AM_IMPORT_FROM(exidy_map)
ADDRESS_MAP_END
@@ -258,6 +261,7 @@ static ADDRESS_MAP_START( venture_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4800, 0x4fff) AM_RAM AM_BASE(&exidy_characterram)
AM_RANGE(0x5200, 0x520f) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x8000, 0xffff) AM_ROM
+ AM_IMPORT_FROM(exidy_map)
ADDRESS_MAP_END
@@ -266,6 +270,7 @@ static ADDRESS_MAP_START( pepper2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5200, 0x520f) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x6000, 0x6fff) AM_RAM AM_BASE(&exidy_characterram)
AM_RANGE(0x8000, 0xffff) AM_ROM
+ AM_IMPORT_FROM(exidy_map)
ADDRESS_MAP_END
@@ -279,6 +284,7 @@ static ADDRESS_MAP_START( fax_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5213, 0x5217) AM_WRITENOP /* empty control lines on color/sound board */
AM_RANGE(0x6000, 0x6fff) AM_RAM AM_BASE(&exidy_characterram)
AM_RANGE(0x8000, 0xffff) AM_ROM
+ AM_IMPORT_FROM(exidy_map)
ADDRESS_MAP_END
@@ -808,7 +814,7 @@ static MACHINE_DRIVER_START( sidetrac )
/* basic machine hardware */
MDRV_IMPORT_FROM(base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(exidy_map,sidetrac_map)
+ MDRV_CPU_PROGRAM_MAP(sidetrac_map)
/* audio hardware */
MDRV_IMPORT_FROM(spectar_audio)
@@ -820,7 +826,7 @@ static MACHINE_DRIVER_START( targ )
/* basic machine hardware */
MDRV_IMPORT_FROM(base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(exidy_map,targ_map)
+ MDRV_CPU_PROGRAM_MAP(targ_map)
/* audio hardware */
MDRV_IMPORT_FROM(targ_audio)
@@ -832,7 +838,7 @@ static MACHINE_DRIVER_START( spectar )
/* basic machine hardware */
MDRV_IMPORT_FROM(base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(exidy_map,spectar_map)
+ MDRV_CPU_PROGRAM_MAP(spectar_map)
/* audio hardware */
MDRV_IMPORT_FROM(spectar_audio)
@@ -844,7 +850,7 @@ static MACHINE_DRIVER_START( rallys )
/* basic machine hardware */
MDRV_IMPORT_FROM(spectar)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rallys_map,0)
+ MDRV_CPU_PROGRAM_MAP(rallys_map)
MACHINE_DRIVER_END
@@ -853,7 +859,7 @@ static MACHINE_DRIVER_START( venture )
/* basic machine hardware */
MDRV_IMPORT_FROM(base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(exidy_map,venture_map)
+ MDRV_CPU_PROGRAM_MAP(venture_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -891,7 +897,7 @@ static MACHINE_DRIVER_START( pepper2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(venture)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(exidy_map,pepper2_map)
+ MDRV_CPU_PROGRAM_MAP(pepper2_map)
MACHINE_DRIVER_END
@@ -900,7 +906,7 @@ static MACHINE_DRIVER_START( fax )
/* basic machine hardware */
MDRV_IMPORT_FROM(pepper2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(exidy_map,fax_map)
+ MDRV_CPU_PROGRAM_MAP(fax_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c
index 2e6ce55e365..d9999c97f3b 100644
--- a/src/mame/drivers/exidy440.c
+++ b/src/mame/drivers/exidy440.c
@@ -1001,7 +1001,7 @@ static MACHINE_DRIVER_START( exidy440 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(exidy440_map,0)
+ MDRV_CPU_PROGRAM_MAP(exidy440_map)
MDRV_CPU_VBLANK_INT("screen", exidy440_vblank_interrupt)
MDRV_MACHINE_RESET(exidy440)
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index ac1d166bb26..5d72b2dd03b 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -479,7 +479,7 @@ static MACHINE_DRIVER_START( galsnew )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(galsnew_map,0)
+ MDRV_CPU_PROGRAM_MAP(galsnew_map)
MDRV_CPU_VBLANK_INT_HACK(galsnew_interrupt,3)
/* CALC01 MCU @ 16Mhz (unknown type, simulated) */
@@ -518,7 +518,7 @@ static MACHINE_DRIVER_START( fantasia )
/* basic machine hardware */
MDRV_IMPORT_FROM( galsnew )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(fantasia_map,0)
+ MDRV_CPU_PROGRAM_MAP(fantasia_map)
MDRV_WATCHDOG_TIME_INIT(SEC(0)) /* a guess, and certainly wrong */
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index 08c474b585d..ce1801f6594 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -463,11 +463,11 @@ static MACHINE_DRIVER_START( exprraid )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(master_map, 0)
+ MDRV_CPU_PROGRAM_MAP(master_map)
MDRV_CPU_VBLANK_INT("screen", exprraid_interrupt)
MDRV_CPU_ADD("slave", M6809, 2000000) /* 2 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(slave_map, 0)
+ MDRV_CPU_PROGRAM_MAP(slave_map)
/* IRQs are caused by the YM3526 */
/* video hardware */
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index 220790fec72..69fd9b9333a 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -474,17 +474,17 @@ static MACHINE_DRIVER_START( exterm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS34010, 40000000)
MDRV_CPU_CONFIG(master_config)
- MDRV_CPU_PROGRAM_MAP(master_map,0)
+ MDRV_CPU_PROGRAM_MAP(master_map)
MDRV_CPU_ADD("slave", TMS34010, 40000000)
MDRV_CPU_CONFIG(slave_config)
- MDRV_CPU_PROGRAM_MAP(slave_map,0)
+ MDRV_CPU_PROGRAM_MAP(slave_map)
MDRV_CPU_ADD("audiocpu", M6502, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound_master_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_master_map)
MDRV_CPU_ADD("audioslave", M6502, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound_slave_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_slave_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index 2e5e3cf9704..57ad7e8dadf 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -292,18 +292,18 @@ static MACHINE_DRIVER_START( exzisus )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000) /* 6 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cpua_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpua_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_ADD("cpub", Z80, 6000000) /* 6 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpub_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("cpuc", Z80, 6000000) /* 6 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cpuc_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpuc_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c
index adde197922e..bd81ad460ec 100644
--- a/src/mame/drivers/f-32.c
+++ b/src/mame/drivers/f-32.c
@@ -126,8 +126,8 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( mosaicf2 )
MDRV_CPU_ADD("maincpu", E132XN, 20000000*4) /* 4x internal multiplier */
- MDRV_CPU_PROGRAM_MAP(common_map,0)
- MDRV_CPU_IO_MAP(mosaicf2_io,0)
+ MDRV_CPU_PROGRAM_MAP(common_map)
+ MDRV_CPU_IO_MAP(mosaicf2_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_NVRAM_HANDLER(93C46)
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index 6dd4fc936a4..6197a20d57a 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -429,16 +429,16 @@ static MACHINE_DRIVER_START( f1gp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(f1gp_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(f1gp_cpu1_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("sub", M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(f1gp_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(f1gp_cpu2_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,XTAL_20MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
@@ -471,11 +471,11 @@ static MACHINE_DRIVER_START( f1gpb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,10000000) /* 10 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(f1gpb_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(f1gpb_cpu1_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("sub", M68000,10000000) /* 10 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(f1gpb_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(f1gpb_cpu2_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
/* NO sound CPU */
@@ -509,7 +509,7 @@ static MACHINE_DRIVER_START( f1gp2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(f1gp)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(f1gp2_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(f1gp2_cpu1_map)
/* video hardware */
MDRV_GFXDECODE(f1gp2)
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index 7e8d0251c10..b12db185f86 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -824,12 +824,12 @@ static INTERRUPT_GEN( fantland_sound_irq )
static MACHINE_DRIVER_START( fantland )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", I8086, 8000000) // ?
- MDRV_CPU_PROGRAM_MAP(fantland_map, 0)
+ MDRV_CPU_PROGRAM_MAP(fantland_map)
MDRV_CPU_VBLANK_INT("screen", fantland_irq)
MDRV_CPU_ADD("audiocpu", I8088, 8000000) // ?
- MDRV_CPU_PROGRAM_MAP(fantland_sound_map, 0)
- MDRV_CPU_IO_MAP(fantland_sound_iomap, 0)
+ MDRV_CPU_PROGRAM_MAP(fantland_sound_map)
+ MDRV_CPU_IO_MAP(fantland_sound_iomap)
MDRV_CPU_PERIODIC_INT(fantland_sound_irq, 8000)
// NMI when soundlatch is written
@@ -875,12 +875,12 @@ static const ym2151_interface galaxygn_ym2151_interface =
static MACHINE_DRIVER_START( galaxygn )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", I8088, 8000000) // ?
- MDRV_CPU_PROGRAM_MAP(galaxygn_map, 0)
+ MDRV_CPU_PROGRAM_MAP(galaxygn_map)
MDRV_CPU_VBLANK_INT("screen", fantland_irq)
MDRV_CPU_ADD("audiocpu", I8088, 8000000) // ?
- MDRV_CPU_PROGRAM_MAP(fantland_sound_map, 0)
- MDRV_CPU_IO_MAP(galaxygn_sound_iomap, 0)
+ MDRV_CPU_PROGRAM_MAP(fantland_sound_map)
+ MDRV_CPU_IO_MAP(galaxygn_sound_iomap)
// IRQ by YM2151, NMI when soundlatch is written
MDRV_MACHINE_RESET(fantland)
@@ -943,11 +943,11 @@ static MACHINE_RESET( borntofi )
static MACHINE_DRIVER_START( borntofi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2]
- MDRV_CPU_PROGRAM_MAP(borntofi_map, 0)
+ MDRV_CPU_PROGRAM_MAP(borntofi_map)
MDRV_CPU_VBLANK_INT("screen", fantland_irq)
MDRV_CPU_ADD("audiocpu", I8088, 18432000/3) // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3]
- MDRV_CPU_PROGRAM_MAP(borntofi_sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(borntofi_sound_map)
MDRV_MACHINE_RESET(borntofi)
@@ -988,11 +988,11 @@ static const ym3526_interface wheelrun_ym3526_interface =
static MACHINE_DRIVER_START( wheelrun )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V20, XTAL_18MHz/2) // D701080C-8 (V20)
- MDRV_CPU_PROGRAM_MAP(wheelrun_map, 0)
+ MDRV_CPU_PROGRAM_MAP(wheelrun_map)
MDRV_CPU_VBLANK_INT("screen", fantland_irq)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_18MHz/2) // Z8400BB1 (Z80B)
- MDRV_CPU_PROGRAM_MAP(wheelrun_sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(wheelrun_sound_map)
// IRQ by YM3526, NMI when soundlatch is written
MDRV_MACHINE_RESET(fantland)
diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c
index 54c19e54cd3..08bef4ff7e4 100644
--- a/src/mame/drivers/fastfred.c
+++ b/src/mame/drivers/fastfred.c
@@ -613,11 +613,11 @@ static MACHINE_DRIVER_START( fastfred )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(fastfred_map,0)
+ MDRV_CPU_PROGRAM_MAP(fastfred_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80, CLOCK/12) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4)
/* video hardware */
@@ -650,7 +650,7 @@ static MACHINE_DRIVER_START( jumpcoas )
/* basic machine hardware */
MDRV_IMPORT_FROM(fastfred)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(jumpcoas_map,0)
+ MDRV_CPU_PROGRAM_MAP(jumpcoas_map)
MDRV_CPU_REMOVE("audiocpu")
@@ -666,7 +666,7 @@ static MACHINE_DRIVER_START( imago )
/* basic machine hardware */
MDRV_IMPORT_FROM(fastfred)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(imago_map,0)
+ MDRV_CPU_PROGRAM_MAP(imago_map)
MDRV_MACHINE_START(imago)
diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c
index 740ec7a061d..b85b3a55e8c 100644
--- a/src/mame/drivers/fastlane.c
+++ b/src/mame/drivers/fastlane.c
@@ -207,7 +207,7 @@ static MACHINE_DRIVER_START( fastlane )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8? */
- MDRV_CPU_PROGRAM_MAP(fastlane_map,0)
+ MDRV_CPU_PROGRAM_MAP(fastlane_map)
MDRV_CPU_VBLANK_INT_HACK(fastlane_interrupt,16) /* 1 IRQ + ??? NMI (generated by the 007121) */
/* video hardware */
diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c
index 6fc89e0b32b..78fc53ac16e 100644
--- a/src/mame/drivers/fcombat.c
+++ b/src/mame/drivers/fcombat.c
@@ -280,10 +280,10 @@ GFXDECODE_END
static MACHINE_DRIVER_START( fcombat )
MDRV_CPU_ADD("maincpu", Z80, 10000000/3)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_ADD("audiocpu", Z80, 10000000/3)
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index 70d251e4f26..76231694c64 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -662,11 +662,11 @@ static MACHINE_DRIVER_START( fcrash )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(fcrash_map,0)
+ MDRV_CPU_PROGRAM_MAP(fcrash_map)
MDRV_CPU_VBLANK_INT("screen", cps1_interrupt)
MDRV_CPU_ADD("soundcpu", Z80, 24000000/6) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -711,11 +711,11 @@ static MACHINE_DRIVER_START( kodb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(kodb_map,0)
+ MDRV_CPU_PROGRAM_MAP(kodb_map)
MDRV_CPU_VBLANK_INT("screen", cps1_interrupt)
// MDRV_CPU_ADD("audiocpu", Z80, 3579545)
-// MDRV_CPU_PROGRAM_MAP(sub_map,0)
+// MDRV_CPU_PROGRAM_MAP(sub_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c
index 8410ef24f4a..2c471db3365 100644
--- a/src/mame/drivers/feversoc.c
+++ b/src/mame/drivers/feversoc.c
@@ -236,7 +236,7 @@ static MACHINE_DRIVER_START( feversoc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",SH2,MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(feversoc_map,0)
+ MDRV_CPU_PROGRAM_MAP(feversoc_map)
MDRV_CPU_VBLANK_INT("screen",feversoc_irq)
/* video hardware */
diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c
index 61e4e03e3e5..9d879b1e58b 100644
--- a/src/mame/drivers/fgoal.c
+++ b/src/mame/drivers/fgoal.c
@@ -351,7 +351,7 @@ static MACHINE_DRIVER_START( fgoal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6800, 10065000 / 10) /* ? */
- MDRV_CPU_PROGRAM_MAP(cpu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(cpu_map)
MDRV_MACHINE_RESET(fgoal)
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index 74d838f94f9..cbbf70c8cea 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -251,12 +251,12 @@ static MACHINE_DRIVER_START( finalizr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809,XTAL_18_432MHz/6) /* ??? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(finalizr_interrupt,16) /* 1 IRQ + 8 NMI (generated by a custom IC) */
MDRV_CPU_ADD("audiocpu", I8039,XTAL_18_432MHz/2) /* 9.216MHz clkin ?? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c
index dc0f34b4099..4a1be1d876b 100644
--- a/src/mame/drivers/findout.c
+++ b/src/mame/drivers/findout.c
@@ -446,7 +446,7 @@ static MACHINE_DRIVER_START( findout )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(findout_map,0)
+ MDRV_CPU_PROGRAM_MAP(findout_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_RESET(findout)
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index e4f8f542695..0665e07bdb9 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -1979,7 +1979,7 @@ static MACHINE_DRIVER_START(firebeat)
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PPC403GCX, 66000000)
- MDRV_CPU_PROGRAM_MAP(firebeat_map, 0)
+ MDRV_CPU_PROGRAM_MAP(firebeat_map)
MDRV_CPU_VBLANK_INT("screen", firebeat_interrupt)
MDRV_MACHINE_START(firebeat)
@@ -2018,7 +2018,7 @@ static MACHINE_DRIVER_START(firebeat2)
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PPC403GCX, 66000000)
- MDRV_CPU_PROGRAM_MAP(firebeat_map, 0)
+ MDRV_CPU_PROGRAM_MAP(firebeat_map)
MDRV_CPU_VBLANK_INT("lscreen", firebeat_interrupt)
MDRV_MACHINE_RESET(firebeat)
@@ -2063,7 +2063,7 @@ static MACHINE_DRIVER_START(firebeat_spu)
MDRV_IMPORT_FROM(firebeat)
MDRV_CPU_ADD("audiocpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(spu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(spu_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c
index c75c273a531..92a31bc24ea 100644
--- a/src/mame/drivers/firefox.c
+++ b/src/mame/drivers/firefox.c
@@ -652,12 +652,12 @@ static MACHINE_DRIVER_START( firefox )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809E, MASTER_XTAL/2)
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
/* interrupts count starting at end of VBLANK, which is 44, so add 44 */
MDRV_TIMER_ADD_SCANLINE("32v", video_timer_callback, "screen", 96+44, 128)
MDRV_CPU_ADD("audiocpu", M6502, MASTER_XTAL/8)
- MDRV_CPU_PROGRAM_MAP(audio_map, 0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
MDRV_QUANTUM_TIME(HZ(60000))
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index a0d0474cebb..9614b5c7ba1 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -561,11 +561,11 @@ static MACHINE_DRIVER_START( firetrap )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(firetrap_map,0)
+ MDRV_CPU_PROGRAM_MAP(firetrap_map)
MDRV_CPU_VBLANK_INT_HACK(firetrap,2)
MDRV_CPU_ADD("audiocpu", M6502,3072000/2) /* 1.536 MHz? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* IRQs are caused by the ADPCM chip */
/* NMIs are caused by the main CPU */
MDRV_MACHINE_RESET(firetrap)
@@ -600,11 +600,11 @@ static MACHINE_DRIVER_START( firetpbl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(firetrap_bootleg_map,0)
+ MDRV_CPU_PROGRAM_MAP(firetrap_bootleg_map)
MDRV_CPU_VBLANK_INT("screen", bootleg)
MDRV_CPU_ADD("audiocpu", M6502,3072000/2) /* 1.536 MHz? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* IRQs are caused by the ADPCM chip */
/* NMIs are caused by the main CPU */
diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c
index 4e771f32b03..af476e5c4bd 100644
--- a/src/mame/drivers/firetrk.c
+++ b/src/mame/drivers/firetrk.c
@@ -880,7 +880,7 @@ static MACHINE_DRIVER_START( firetrk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6800, MASTER_CLOCK/12) /* 750Khz during service mode */
- MDRV_CPU_PROGRAM_MAP(firetrk_map, 0)
+ MDRV_CPU_PROGRAM_MAP(firetrk_map)
MDRV_CPU_VBLANK_INT("screen", firetrk_interrupt)
MDRV_WATCHDOG_VBLANK_INIT(5)
@@ -915,7 +915,7 @@ static MACHINE_DRIVER_START( superbug )
/* basic machine hardware */
MDRV_IMPORT_FROM(firetrk)
MDRV_CPU_REPLACE("maincpu", M6800, MASTER_CLOCK/12)
- MDRV_CPU_PROGRAM_MAP(superbug_map, 0)
+ MDRV_CPU_PROGRAM_MAP(superbug_map)
/* video hardware */
MDRV_VIDEO_START(superbug)
@@ -935,7 +935,7 @@ static MACHINE_DRIVER_START( montecar )
/* basic machine hardware */
MDRV_IMPORT_FROM(firetrk)
MDRV_CPU_REPLACE("maincpu", M6800, MASTER_CLOCK/12) /* 750Khz during service mode */
- MDRV_CPU_PROGRAM_MAP(montecar_map, 0)
+ MDRV_CPU_PROGRAM_MAP(montecar_map)
/* video hardware */
MDRV_VIDEO_START(montecar)
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index 74d0f630318..5f0109ceee2 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -729,13 +729,13 @@ GFXDECODE_END
static MACHINE_DRIVER_START( fitfight )
MDRV_CPU_ADD("maincpu",M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(fitfight_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(fitfight_main_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
MDRV_CPU_CONFIG(sound_cpu_config)
- MDRV_CPU_PROGRAM_MAP(snd_mem, 0)
- MDRV_CPU_IO_MAP(snd_io, 0)
+ MDRV_CPU_PROGRAM_MAP(snd_mem)
+ MDRV_CPU_IO_MAP(snd_io)
MDRV_CPU_VBLANK_INT("screen", snd_irq)
MDRV_GFXDECODE(fitfight)
@@ -762,7 +762,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bbprot )
MDRV_CPU_ADD("maincpu",M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(bbprot_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(bbprot_main_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_GFXDECODE(prot)
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 40f68b08b40..9760f873a4e 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -212,11 +212,11 @@ static MACHINE_DRIVER_START( flkatck )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP, 24/8 MHz */
- MDRV_CPU_PROGRAM_MAP(flkatck_map,0)
+ MDRV_CPU_PROGRAM_MAP(flkatck_map)
MDRV_CPU_VBLANK_INT("screen", flkatck_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,3579545) /* NEC D780C-1, 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(flkatck_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(flkatck_sound_map)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c
index 57e860d6c05..efb3e332c58 100644
--- a/src/mame/drivers/flower.c
+++ b/src/mame/drivers/flower.c
@@ -241,17 +241,17 @@ static MACHINE_DRIVER_START( flower )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,8000000)
- MDRV_CPU_PROGRAM_MAP(flower_cpu1_2,0)
+ MDRV_CPU_PROGRAM_MAP(flower_cpu1_2)
// MDRV_CPU_VBLANK_INT_HACK(flower_cpu0_interrupt,10)
MDRV_CPU_VBLANK_INT("screen", flower_cpu0_interrupt) //nmis stuff up the writes to shared ram
MDRV_CPU_ADD("sub", Z80,8000000)
- MDRV_CPU_PROGRAM_MAP(flower_cpu1_2,0)
+ MDRV_CPU_PROGRAM_MAP(flower_cpu1_2)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80,8000000)
- MDRV_CPU_PROGRAM_MAP(flower_sound_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(flower_sound_cpu)
MDRV_CPU_PERIODIC_INT(sn_irq, 90) /* periodic interrupt, don't know about the frequency */
/* video hardware */
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index b97d3b0c2f8..6dc4dd86b2c 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -657,16 +657,16 @@ static MACHINE_DRIVER_START( flstory )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,XTAL_10_733MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(flstory_map,0)
+ MDRV_CPU_PROGRAM_MAP(flstory_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
MDRV_CPU_ADD("mcu", M68705,XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(flstory_m68705_map,0)
+ MDRV_CPU_PROGRAM_MAP(flstory_m68705_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -715,15 +715,15 @@ static MACHINE_DRIVER_START( onna34ro )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,10733000/2) /* ??? */
- MDRV_CPU_PROGRAM_MAP(onna34ro_map,0)
+ MDRV_CPU_PROGRAM_MAP(onna34ro_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
// MDRV_CPU_ADD("mcu", M68705,4000000) /* ??? */
-// MDRV_CPU_PROGRAM_MAP(m68705_map,0)
+// MDRV_CPU_PROGRAM_MAP(m68705_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -772,15 +772,15 @@ static MACHINE_DRIVER_START( victnine )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(victnine_map,0)
+ MDRV_CPU_PROGRAM_MAP(victnine_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
// MDRV_CPU_ADD("mcu", M68705,4000000) /* ??? */
-// MDRV_CPU_PROGRAM_MAP(m68705_map,0)
+// MDRV_CPU_PROGRAM_MAP(m68705_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c
index 50dc9a31110..e23726e8ffc 100644
--- a/src/mame/drivers/flyball.c
+++ b/src/mame/drivers/flyball.c
@@ -258,7 +258,7 @@ static MACHINE_DRIVER_START( flyball )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16)
- MDRV_CPU_PROGRAM_MAP(flyball_map, 0)
+ MDRV_CPU_PROGRAM_MAP(flyball_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_RESET(flyball)
diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c
index 72e6df2c2a2..255eeae2c37 100644
--- a/src/mame/drivers/foodf.c
+++ b/src/mame/drivers/foodf.c
@@ -361,7 +361,7 @@ static MACHINE_DRIVER_START( foodf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_MACHINE_START(foodf)
diff --git a/src/mame/drivers/forte2.c b/src/mame/drivers/forte2.c
index 92e6707ef87..797a51967aa 100644
--- a/src/mame/drivers/forte2.c
+++ b/src/mame/drivers/forte2.c
@@ -119,8 +119,8 @@ static INTERRUPT_GEN( pesadelo_interrupt )
static MACHINE_DRIVER_START( pesadelo )
MDRV_CPU_ADD("maincpu", Z80, 3579545) /* 3.579545 Mhz */
- MDRV_CPU_PROGRAM_MAP(program_mem, 0)
- MDRV_CPU_IO_MAP(io_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(program_mem)
+ MDRV_CPU_IO_MAP(io_mem)
MDRV_CPU_VBLANK_INT("screen",pesadelo_interrupt)
MDRV_MACHINE_START( forte2 )
diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c
index a6d904d7c72..b3c8d4fb859 100644
--- a/src/mame/drivers/fortecar.c
+++ b/src/mame/drivers/fortecar.c
@@ -273,8 +273,8 @@ static MACHINE_RESET(fortecar)
static MACHINE_DRIVER_START( fortecar )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(fortecar_map,0)
- MDRV_CPU_IO_MAP(fortecar_ports,0)
+ MDRV_CPU_PROGRAM_MAP(fortecar_map)
+ MDRV_CPU_IO_MAP(fortecar_ports)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index 89317091865..b009c79611b 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -614,7 +614,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( base )
MDRV_CPU_ADD("maincpu",Z80, 18432000/6) //confirmed
- MDRV_CPU_PROGRAM_MAP(pbillrd_map,0)
+ MDRV_CPU_PROGRAM_MAP(pbillrd_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, 50*3) //??
MDRV_CPU_VBLANK_INT("screen", freekick_irqgen)
@@ -660,8 +660,8 @@ static MACHINE_DRIVER_START( freekckb )
MDRV_IMPORT_FROM(base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(freekckb_map,0)
- MDRV_CPU_IO_MAP(freekckb_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(freekckb_map)
+ MDRV_CPU_IO_MAP(freekckb_io_map)
MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
@@ -673,8 +673,8 @@ static MACHINE_DRIVER_START( gigas )
MDRV_IMPORT_FROM(base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gigas_map,0)
- MDRV_CPU_IO_MAP(gigas_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(gigas_map)
+ MDRV_CPU_IO_MAP(gigas_io_map)
MDRV_VIDEO_UPDATE(gigas)
MACHINE_DRIVER_END
@@ -682,7 +682,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( oigas )
MDRV_IMPORT_FROM(gigas)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(oigas_io_map,0)
+ MDRV_CPU_IO_MAP(oigas_io_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index 13f48140ad8..6f22b7f95c5 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -569,16 +569,16 @@ static MACHINE_DRIVER_START( fromanc2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc2_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(fromanc2_main_map)
MDRV_CPU_VBLANK_INT("lscreen", fromanc2_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc2_sound_map,0)
- MDRV_CPU_IO_MAP(fromanc2_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(fromanc2_sound_map)
+ MDRV_CPU_IO_MAP(fromanc2_sound_io_map)
MDRV_CPU_ADD("sub", Z80,32000000/4) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc2_sub_map,0)
- MDRV_CPU_IO_MAP(fromanc2_sub_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(fromanc2_sub_map)
+ MDRV_CPU_IO_MAP(fromanc2_sub_io_map)
MDRV_MACHINE_RESET(fromanc2)
@@ -621,16 +621,16 @@ static MACHINE_DRIVER_START( fromancr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromancr_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(fromancr_main_map)
MDRV_CPU_VBLANK_INT("lscreen", fromanc2_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc2_sound_map,0)
- MDRV_CPU_IO_MAP(fromanc2_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(fromanc2_sound_map)
+ MDRV_CPU_IO_MAP(fromanc2_sound_io_map)
MDRV_CPU_ADD("sub", Z80,32000000/4) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc2_sub_map,0)
- MDRV_CPU_IO_MAP(fromanc2_sub_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(fromanc2_sub_map)
+ MDRV_CPU_IO_MAP(fromanc2_sub_io_map)
MDRV_MACHINE_RESET(fromancr)
MDRV_NVRAM_HANDLER(93C46)
@@ -672,12 +672,12 @@ static MACHINE_DRIVER_START( fromanc4 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc4_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(fromanc4_main_map)
MDRV_CPU_VBLANK_INT("lscreen", fromanc2_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc2_sound_map,0)
- MDRV_CPU_IO_MAP(fromanc2_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(fromanc2_sound_map)
+ MDRV_CPU_IO_MAP(fromanc2_sound_io_map)
MDRV_MACHINE_RESET(fromanc4)
MDRV_NVRAM_HANDLER(93C46)
diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c
index c39479a04b2..c8bf9901ee8 100644
--- a/src/mame/drivers/fromance.c
+++ b/src/mame/drivers/fromance.c
@@ -977,12 +977,12 @@ static MACHINE_DRIVER_START( nekkyoku )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
- MDRV_CPU_PROGRAM_MAP(nekkyoku_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(nekkyoku_main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */
- MDRV_CPU_PROGRAM_MAP(nekkyoku_sub_map,0)
- MDRV_CPU_IO_MAP(nekkyoku_sub_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(nekkyoku_sub_map)
+ MDRV_CPU_IO_MAP(nekkyoku_sub_io_map)
MDRV_MACHINE_RESET(fromance)
@@ -1015,12 +1015,12 @@ static MACHINE_DRIVER_START( idolmj )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
- MDRV_CPU_PROGRAM_MAP(fromance_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(fromance_main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */
- MDRV_CPU_PROGRAM_MAP(fromance_sub_map,0)
- MDRV_CPU_IO_MAP(idolmj_sub_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(fromance_sub_map)
+ MDRV_CPU_IO_MAP(idolmj_sub_io_map)
MDRV_MACHINE_RESET(fromance)
@@ -1053,12 +1053,12 @@ static MACHINE_DRIVER_START( fromance )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
- MDRV_CPU_PROGRAM_MAP(fromance_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(fromance_main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */
- MDRV_CPU_PROGRAM_MAP(fromance_sub_map,0)
- MDRV_CPU_IO_MAP(fromance_sub_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(fromance_sub_map)
+ MDRV_CPU_IO_MAP(fromance_sub_io_map)
MDRV_MACHINE_RESET(fromance)
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index 2a621000beb..7a031aeca81 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -292,8 +292,8 @@ static MACHINE_DRIVER_START( funkybee )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(funkybee_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(funkybee_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index ca5e8b077b5..511445c1c8a 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -291,11 +291,11 @@ static MACHINE_DRIVER_START( funkyjet )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000) /* 28 MHz crystal */
- MDRV_CPU_PROGRAM_MAP(funkyjet_map,0)
+ MDRV_CPU_PROGRAM_MAP(funkyjet_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", H6280,32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index efef1a8fc89..dc3ffafe7e6 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -2013,7 +2013,7 @@ static const mc6845_interface mc6845_intf =
static MACHINE_DRIVER_START( funworld )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M65SC02, MASTER_CLOCK/8) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(funworld_map, 0)
+ MDRV_CPU_PROGRAM_MAP(funworld_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -2053,7 +2053,7 @@ static MACHINE_DRIVER_START( magicrd2 )
MDRV_IMPORT_FROM(funworld)
MDRV_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(magicrd2_map, 0)
+ MDRV_CPU_PROGRAM_MAP(magicrd2_map)
MDRV_GFXDECODE(funworld)
MDRV_VIDEO_START(magicrd2)
@@ -2067,28 +2067,28 @@ static MACHINE_DRIVER_START( royalcrd )
MDRV_IMPORT_FROM(funworld)
MDRV_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(magicrd2_map, 0)
+ MDRV_CPU_PROGRAM_MAP(magicrd2_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cuoreuno )
MDRV_IMPORT_FROM(funworld)
MDRV_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(cuoreuno_map, 0)
+ MDRV_CPU_PROGRAM_MAP(cuoreuno_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( royalmcu )
MDRV_IMPORT_FROM(funworld)
MDRV_CPU_REPLACE("maincpu", M65SC02, MASTER_CLOCK/8) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(royalmcu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(royalmcu_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( saloon )
MDRV_IMPORT_FROM(funworld)
MDRV_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(saloon_map, 0)
+ MDRV_CPU_PROGRAM_MAP(saloon_map)
MACHINE_DRIVER_END
static const UINT8 jolyc980_default_eeprom[0x800] = {
diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c
index 15d118373f0..57d7ac87fd2 100644
--- a/src/mame/drivers/funybubl.c
+++ b/src/mame/drivers/funybubl.c
@@ -223,12 +223,12 @@ static DRIVER_INIT( funybubl )
static MACHINE_DRIVER_START( funybubl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz?? */
- MDRV_CPU_PROGRAM_MAP(funybubl_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(funybubl_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz?? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index 5da1fc89857..634b8539638 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -451,11 +451,11 @@ static MACHINE_DRIVER_START( fuuki16 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(fuuki16_map,0)
+ MDRV_CPU_PROGRAM_MAP(fuuki16_map)
MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(fuuki16_sound_map,0)
- MDRV_CPU_IO_MAP(fuuki16_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(fuuki16_sound_map)
+ MDRV_CPU_IO_MAP(fuuki16_sound_io_map)
MDRV_MACHINE_START(fuuki16)
MDRV_MACHINE_RESET(fuuki16)
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index 884bac78ff0..95803a3c630 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -562,11 +562,11 @@ static MACHINE_DRIVER_START( fuuki32 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, CPU_CLOCK) /* 20MHz verified */
- MDRV_CPU_PROGRAM_MAP(fuuki32_map,0)
+ MDRV_CPU_PROGRAM_MAP(fuuki32_map)
MDRV_CPU_ADD("soundcpu", Z80, SOUND_CPU_CLOCK) /* 6MHz verified */
- MDRV_CPU_PROGRAM_MAP(fuuki32_sound_map,0)
- MDRV_CPU_IO_MAP(fuuki32_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(fuuki32_sound_map)
+ MDRV_CPU_IO_MAP(fuuki32_sound_io_map)
MDRV_MACHINE_START(fuuki32)
MDRV_MACHINE_RESET(fuuki32)
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 2bd8ff8906f..aeb0e32c1ad 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -211,11 +211,11 @@ static MACHINE_DRIVER_START( bigkarnk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* MC68000P10, 10 MHz */
- MDRV_CPU_PROGRAM_MAP(bigkarnk_map,0)
+ MDRV_CPU_PROGRAM_MAP(bigkarnk_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", M6809, 8867000/4) /* 68B09, 2.21675 MHz? */
- MDRV_CPU_PROGRAM_MAP(bigkarnk_snd_map,0)
+ MDRV_CPU_PROGRAM_MAP(bigkarnk_snd_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -363,7 +363,7 @@ static MACHINE_DRIVER_START( maniacsq )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(maniacsq_map,0)
+ MDRV_CPU_PROGRAM_MAP(maniacsq_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
/* video hardware */
@@ -588,7 +588,7 @@ static MACHINE_DRIVER_START( squash )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12, 12 MHz */
- MDRV_CPU_PROGRAM_MAP(squash_map,0)
+ MDRV_CPU_PROGRAM_MAP(squash_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_QUANTUM_TIME(HZ(600))
@@ -743,7 +743,7 @@ static MACHINE_DRIVER_START( thoop )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12, 12 MHz */
- MDRV_CPU_PROGRAM_MAP(thoop_map,0)
+ MDRV_CPU_PROGRAM_MAP(thoop_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c
index ab058d3acdc..9ddfa8e3cd8 100644
--- a/src/mame/drivers/gaelco2.c
+++ b/src/mame/drivers/gaelco2.c
@@ -158,7 +158,7 @@ static const gaelcosnd_interface maniacsq_snd_interface =
static MACHINE_DRIVER_START( maniacsq )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 26000000/2) /* 13 MHz? */
- MDRV_CPU_PROGRAM_MAP(maniacsq_map,0)
+ MDRV_CPU_PROGRAM_MAP(maniacsq_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
/* video hardware */
@@ -277,7 +277,7 @@ static const gaelcosnd_interface bang_snd_interface =
static MACHINE_DRIVER_START( bang )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 30000000/2) /* 15 MHz */
- MDRV_CPU_PROGRAM_MAP(bang_map,0)
+ MDRV_CPU_PROGRAM_MAP(bang_map)
MDRV_CPU_VBLANK_INT_HACK(bang_interrupt, 6)
MDRV_NVRAM_HANDLER(gaelco2)
@@ -472,7 +472,7 @@ static const gaelcosnd_interface alighunt_snd_interface =
static MACHINE_DRIVER_START( alighunt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(alighunt_map,0)
+ MDRV_CPU_PROGRAM_MAP(alighunt_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
/* video hardware */
@@ -715,7 +715,7 @@ static const gaelcosnd_interface touchgo_snd_interface =
static MACHINE_DRIVER_START( touchgo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 32000000/2) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(touchgo_map,0)
+ MDRV_CPU_PROGRAM_MAP(touchgo_map)
MDRV_CPU_VBLANK_INT("lscreen", irq6_line_hold)
/* video hardware */
@@ -908,7 +908,7 @@ static const gaelcosnd_interface snowboar_snd_interface =
static MACHINE_DRIVER_START( snowboar )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 30000000/2) /* 15 MHz */
- MDRV_CPU_PROGRAM_MAP(snowboar_map,0)
+ MDRV_CPU_PROGRAM_MAP(snowboar_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_NVRAM_HANDLER(gaelco2)
@@ -1150,7 +1150,7 @@ static const gaelcosnd_interface wrally2_snd_interface =
static MACHINE_DRIVER_START( wrally2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 26000000/2) /* 13 MHz */
- MDRV_CPU_PROGRAM_MAP(wrally2_map,0)
+ MDRV_CPU_PROGRAM_MAP(wrally2_map)
MDRV_CPU_VBLANK_INT("lscreen", irq6_line_hold)
MDRV_NVRAM_HANDLER(gaelco2)
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index 2fbffff7297..b9eaf29f188 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -933,17 +933,17 @@ static MACHINE_DRIVER_START( gaelco3d )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 15000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", vblank_gen)
MDRV_CPU_ADD("tms", TMS32031, 60000000)
MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(tms_map,0)
+ MDRV_CPU_PROGRAM_MAP(tms_map)
MDRV_CPU_ADD("adsp", ADSP2115, 16000000)
MDRV_CPU_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(adsp_program_map,0)
- MDRV_CPU_DATA_MAP(adsp_data_map, 0)
+ MDRV_CPU_PROGRAM_MAP(adsp_program_map)
+ MDRV_CPU_DATA_MAP(adsp_data_map)
MDRV_MACHINE_RESET(gaelco3d)
MDRV_NVRAM_HANDLER(93C66B)
@@ -986,7 +986,7 @@ static MACHINE_DRIVER_START( gaelco3d2 )
/* basic machine hardware */
MDRV_CPU_REPLACE("maincpu", M68EC020, 25000000)
- MDRV_CPU_PROGRAM_MAP(main020_map,0)
+ MDRV_CPU_PROGRAM_MAP(main020_map)
MDRV_CPU_REPLACE("tms", TMS32031, 50000000)
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 94b8ba377c1..4fff6eb5cd1 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -823,11 +823,11 @@ static MACHINE_DRIVER_START( shadoww )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 18432000/2) /* 9.216 MHz */
- MDRV_CPU_PROGRAM_MAP(gaiden_map,0)
+ MDRV_CPU_PROGRAM_MAP(gaiden_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* IRQs are triggered by the YM2203 */
MDRV_MACHINE_RESET(raiga)
@@ -882,12 +882,12 @@ static MACHINE_DRIVER_START( drgnbowl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 20000000/2) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(drgnbowl_map,0)
+ MDRV_CPU_PROGRAM_MAP(drgnbowl_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 12000000/2) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(drgnbowl_sound_map,0)
- MDRV_CPU_IO_MAP(drgnbowl_sound_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(drgnbowl_sound_map)
+ MDRV_CPU_IO_MAP(drgnbowl_sound_port_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/gal3.c b/src/mame/drivers/gal3.c
index 0afa4502806..0339f21fded 100644
--- a/src/mame/drivers/gal3.c
+++ b/src/mame/drivers/gal3.c
@@ -106,25 +106,25 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( gal3 )
MDRV_CPU_ADD("cpumst", M68020, 24000000) // ??
- MDRV_CPU_PROGRAM_MAP(cpu_mst_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu_mst_map)
MDRV_CPU_ADD("cpuslv", M68020, 24000000) // ??
- MDRV_CPU_PROGRAM_MAP(cpu_slv_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu_slv_map)
MDRV_CPU_ADD("psn_b1_cpu", M68000, 12000000) // ??
- MDRV_CPU_PROGRAM_MAP(psn_b1_cpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(psn_b1_cpu_map)
MDRV_CPU_ADD("psn_b2_cpu", M68000, 12000000) // ??
- MDRV_CPU_PROGRAM_MAP(psn_b1_cpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(psn_b1_cpu_map)
MDRV_CPU_ADD("psn_b3_cpu", M68000, 12000000) // ??
- MDRV_CPU_PROGRAM_MAP(psn_b1_cpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(psn_b1_cpu_map)
MDRV_CPU_ADD("rs_cpu", M68000, 12000000) // ??
- MDRV_CPU_PROGRAM_MAP(rs_cpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(rs_cpu_map)
MDRV_CPU_ADD("sound_cpu", M68000, 12000000) // ??
- MDRV_CPU_PROGRAM_MAP(sound_cpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_cpu_map)
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index 354930a4fd2..09ca8d4e7c8 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -1623,30 +1623,30 @@ static MACHINE_DRIVER_START( bosco )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(bosco_map,0)
+ MDRV_CPU_PROGRAM_MAP(bosco_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(bosco_map,0)
+ MDRV_CPU_PROGRAM_MAP(bosco_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(bosco_map,0)
+ MDRV_CPU_PROGRAM_MAP(bosco_map)
MDRV_CPU_ADD(CPUTAG_50XX, MB8842, MASTER_CLOCK/12/6) /* 1.536 MHz, internally divided by 6 */
- MDRV_CPU_PROGRAM_MAP(namco_50xx_map_program,0)
- MDRV_CPU_DATA_MAP(namco_50xx_map_data,0)
- MDRV_CPU_IO_MAP(namco_50xx_map_io,0)
+ MDRV_CPU_PROGRAM_MAP(namco_50xx_map_program)
+ MDRV_CPU_DATA_MAP(namco_50xx_map_data)
+ MDRV_CPU_IO_MAP(namco_50xx_map_io)
MDRV_CPU_ADD(CPUTAG_50XX_2, MB8842, MASTER_CLOCK/12/6) /* 1.536 MHz, internally divided by 6 */
- MDRV_CPU_PROGRAM_MAP(namco_50xx_2_map_program,0)
- MDRV_CPU_DATA_MAP(namco_50xx_2_map_data,0)
- MDRV_CPU_IO_MAP(namco_50xx_2_map_io,0)
+ MDRV_CPU_PROGRAM_MAP(namco_50xx_2_map_program)
+ MDRV_CPU_DATA_MAP(namco_50xx_2_map_data)
+ MDRV_CPU_IO_MAP(namco_50xx_2_map_io)
MDRV_CPU_ADD(CPUTAG_54XX, MB8844, MASTER_CLOCK/12/6) /* 1.536 MHz, internally divided by 6 */
- MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program,0)
- MDRV_CPU_DATA_MAP(namco_54xx_map_data,0)
- MDRV_CPU_IO_MAP(namco_54xx_map_io,0)
+ MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program)
+ MDRV_CPU_DATA_MAP(namco_54xx_map_data)
+ MDRV_CPU_IO_MAP(namco_54xx_map_io)
MDRV_WATCHDOG_VBLANK_INIT(8)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
@@ -1692,20 +1692,20 @@ static MACHINE_DRIVER_START( galaga )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(galaga_map,0)
+ MDRV_CPU_PROGRAM_MAP(galaga_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(galaga_map,0)
+ MDRV_CPU_PROGRAM_MAP(galaga_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(galaga_map,0)
+ MDRV_CPU_PROGRAM_MAP(galaga_map)
MDRV_CPU_ADD(CPUTAG_54XX, MB8844, MASTER_CLOCK/12/6) /* 1.536 MHz, internally divided by 6 */
- MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program,0)
- MDRV_CPU_DATA_MAP(namco_54xx_map_data,0)
- MDRV_CPU_IO_MAP(namco_54xx_map_io,0)
+ MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program)
+ MDRV_CPU_DATA_MAP(namco_54xx_map_data)
+ MDRV_CPU_IO_MAP(namco_54xx_map_io)
MDRV_WATCHDOG_VBLANK_INIT(8)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
@@ -1750,7 +1750,7 @@ static MACHINE_DRIVER_START( galagab )
MDRV_CPU_REMOVE(CPUTAG_54XX)
MDRV_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(galaga_mem4,0)
+ MDRV_CPU_PROGRAM_MAP(galaga_mem4)
/* sound hardware */
MDRV_SOUND_REMOVE("discrete")
@@ -1761,25 +1761,25 @@ static MACHINE_DRIVER_START( xevious )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(xevious_map,0)
+ MDRV_CPU_PROGRAM_MAP(xevious_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub", Z80,MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(xevious_map,0)
+ MDRV_CPU_PROGRAM_MAP(xevious_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(xevious_map,0)
+ MDRV_CPU_PROGRAM_MAP(xevious_map)
MDRV_CPU_ADD(CPUTAG_50XX, MB8842, MASTER_CLOCK/12/6) /* 1.536 MHz, internally divided by 6 */
- MDRV_CPU_PROGRAM_MAP(namco_50xx_map_program,0)
- MDRV_CPU_DATA_MAP(namco_50xx_map_data,0)
- MDRV_CPU_IO_MAP(namco_50xx_map_io,0)
+ MDRV_CPU_PROGRAM_MAP(namco_50xx_map_program)
+ MDRV_CPU_DATA_MAP(namco_50xx_map_data)
+ MDRV_CPU_IO_MAP(namco_50xx_map_io)
MDRV_CPU_ADD(CPUTAG_54XX, MB8844, MASTER_CLOCK/12/6) /* 1.536 MHz, internally divided by 6 */
- MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program,0)
- MDRV_CPU_DATA_MAP(namco_54xx_map_data,0)
- MDRV_CPU_IO_MAP(namco_54xx_map_io,0)
+ MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program)
+ MDRV_CPU_DATA_MAP(namco_54xx_map_data)
+ MDRV_CPU_IO_MAP(namco_54xx_map_io)
MDRV_WATCHDOG_VBLANK_INIT(8)
MDRV_QUANTUM_TIME(HZ(60000)) /* 1000 CPU slices per frame - an high value to ensure proper */
@@ -1824,7 +1824,7 @@ static MACHINE_DRIVER_START( battles )
MDRV_CPU_REMOVE(CPUTAG_54XX)
MDRV_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(battles_mem4,0)
+ MDRV_CPU_PROGRAM_MAP(battles_mem4)
MDRV_CPU_VBLANK_INT("screen", battles_interrupt_4)
MDRV_MACHINE_RESET(battles)
@@ -1845,15 +1845,15 @@ static MACHINE_DRIVER_START( digdug )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(digdug_map,0)
+ MDRV_CPU_PROGRAM_MAP(digdug_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(digdug_map,0)
+ MDRV_CPU_PROGRAM_MAP(digdug_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(digdug_map,0)
+ MDRV_CPU_PROGRAM_MAP(digdug_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -1891,7 +1891,7 @@ static MACHINE_DRIVER_START( dzigzag )
MDRV_IMPORT_FROM(digdug)
MDRV_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(dzigzag_mem4,0)
+ MDRV_CPU_PROGRAM_MAP(dzigzag_mem4)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c
index 697ceaea1c1..5554ab0de08 100644
--- a/src/mame/drivers/galastrm.c
+++ b/src/mame/drivers/galastrm.c
@@ -330,7 +330,7 @@ static NVRAM_HANDLER( galastrm )
static MACHINE_DRIVER_START( galastrm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(galastrm_map,0)
+ MDRV_CPU_PROGRAM_MAP(galastrm_map)
MDRV_CPU_VBLANK_INT("screen", galastrm_interrupt) /* VBL */
TAITO_F3_SOUND_SYSTEM_CPU(16000000)
diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c
index 3706694cb5f..12e18efca63 100644
--- a/src/mame/drivers/galaxi.c
+++ b/src/mame/drivers/galaxi.c
@@ -335,7 +335,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( galaxi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) // ?
- MDRV_CPU_PROGRAM_MAP(galaxi_map,0)
+ MDRV_CPU_PROGRAM_MAP(galaxi_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c
index 4ac1e9fe077..b8cbbb7959d 100644
--- a/src/mame/drivers/galaxia.c
+++ b/src/mame/drivers/galaxia.c
@@ -245,8 +245,8 @@ static INTERRUPT_GEN( galaxia_interrupt )
static MACHINE_DRIVER_START( galaxia )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", S2650,2000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(mem_map, 0)
- MDRV_CPU_IO_MAP(io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mem_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", galaxia_interrupt)
/* video hardware */
@@ -267,8 +267,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( astrowar )
MDRV_IMPORT_FROM( galaxia )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(astrowar_mem, 0)
- MDRV_CPU_IO_MAP(astrowar_io, 0)
+ MDRV_CPU_PROGRAM_MAP(astrowar_mem)
+ MDRV_CPU_IO_MAP(astrowar_io)
MDRV_GFXDECODE(astrowar)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 8a9af9ba340..afa7627396a 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -1701,7 +1701,7 @@ static MACHINE_DRIVER_START( galaxian_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, GALAXIAN_PIXEL_CLOCK/3/2)
- MDRV_CPU_PROGRAM_MAP(galaxian_map,0)
+ MDRV_CPU_PROGRAM_MAP(galaxian_map)
MDRV_CPU_VBLANK_INT("screen", interrupt_gen)
MDRV_WATCHDOG_VBLANK_INIT(8)
@@ -1747,8 +1747,8 @@ static MACHINE_DRIVER_START( konami_sound_1x_ay8910 )
/* 2nd CPU to drive sound */
MDRV_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(frogger_sound_map,0)
- MDRV_CPU_IO_MAP(frogger_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(frogger_sound_map)
+ MDRV_CPU_IO_MAP(frogger_sound_portmap)
/* sound hardware */
MDRV_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
@@ -1767,8 +1767,8 @@ static MACHINE_DRIVER_START( konami_sound_2x_ay8910 )
/* 2nd CPU to drive sound */
MDRV_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(konami_sound_map,0)
- MDRV_CPU_IO_MAP(konami_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(konami_sound_map)
+ MDRV_CPU_IO_MAP(konami_sound_portmap)
/* sound hardware */
MDRV_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
@@ -1836,7 +1836,7 @@ static MACHINE_DRIVER_START( mooncrst )
/* alternate memory map */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mooncrst_map,0)
+ MDRV_CPU_PROGRAM_MAP(mooncrst_map)
MACHINE_DRIVER_END
@@ -1847,7 +1847,7 @@ static MACHINE_DRIVER_START( jumpbug )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(jumpbug_map,0)
+ MDRV_CPU_PROGRAM_MAP(jumpbug_map)
/* sound hardware */
MDRV_SOUND_ADD("ay", AY8910, 1789750)
@@ -1860,8 +1860,8 @@ static MACHINE_DRIVER_START( checkman )
/* basic machine hardware */
MDRV_CPU_ADD("audiocpu", Z80, 1620000) /* 1.62 MHz */
- MDRV_CPU_PROGRAM_MAP(checkman_sound_map,0)
- MDRV_CPU_IO_MAP(checkman_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(checkman_sound_map)
+ MDRV_CPU_IO_MAP(checkman_sound_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* NMIs are triggered by the main CPU */
/* sound hardware */
@@ -1875,7 +1875,7 @@ static MACHINE_DRIVER_START( checkmaj )
/* basic machine hardware */
MDRV_CPU_ADD("audiocpu", Z80, 1620000)
- MDRV_CPU_PROGRAM_MAP(checkmaj_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(checkmaj_sound_map)
MDRV_TIMER_ADD_SCANLINE("irq0", checkmaj_irq0_gen, "screen", 0, 8)
@@ -1891,8 +1891,8 @@ static MACHINE_DRIVER_START( mshuttle )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mshuttle_map,0)
- MDRV_CPU_IO_MAP(mshuttle_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(mshuttle_map)
+ MDRV_CPU_IO_MAP(mshuttle_portmap)
/* sound hardware */
MDRV_SOUND_ADD("ay", AY8910, GALAXIAN_PIXEL_CLOCK/3/4)
@@ -1910,8 +1910,8 @@ static MACHINE_DRIVER_START( kingball )
/* basic machine hardware */
MDRV_CPU_ADD("audiocpu", Z80,5000000/2)
- MDRV_CPU_PROGRAM_MAP(kingball_sound_map,0)
- MDRV_CPU_IO_MAP(kingball_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(kingball_sound_map)
+ MDRV_CPU_IO_MAP(kingball_sound_portmap)
/* sound hardware */
MDRV_SOUND_ADD("dac", DAC, 0)
@@ -1925,7 +1925,7 @@ static MACHINE_DRIVER_START( frogger )
/* alternate memory map */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(frogger_map,0)
+ MDRV_CPU_PROGRAM_MAP(frogger_map)
MACHINE_DRIVER_END
@@ -1935,7 +1935,7 @@ static MACHINE_DRIVER_START( froggrmc )
/* alternate memory map */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mooncrst_map,0)
+ MDRV_CPU_PROGRAM_MAP(mooncrst_map)
MACHINE_DRIVER_END
@@ -1945,7 +1945,7 @@ static MACHINE_DRIVER_START( froggers )
/* alternate memory map */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(theend_map,0)
+ MDRV_CPU_PROGRAM_MAP(theend_map)
MACHINE_DRIVER_END
@@ -1955,7 +1955,7 @@ static MACHINE_DRIVER_START( frogf )
/* alternate memory map */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(frogf_map,0)
+ MDRV_CPU_PROGRAM_MAP(frogf_map)
MACHINE_DRIVER_END
@@ -1965,7 +1965,7 @@ static MACHINE_DRIVER_START( turtles )
/* alternate memory map */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(turtles_map,0)
+ MDRV_CPU_PROGRAM_MAP(turtles_map)
MACHINE_DRIVER_END
@@ -1975,7 +1975,7 @@ static MACHINE_DRIVER_START( theend )
/* alternate memory map */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(theend_map,0)
+ MDRV_CPU_PROGRAM_MAP(theend_map)
MDRV_PPI8255_ADD( "ppi8255_0", theend_ppi8255_0_intf )
MDRV_PPI8255_ADD( "ppi8255_1", konami_ppi8255_1_intf )
@@ -1988,7 +1988,7 @@ static MACHINE_DRIVER_START( scramble )
/* alternate memory map */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(theend_map,0)
+ MDRV_CPU_PROGRAM_MAP(theend_map)
MDRV_PPI8255_ADD( "ppi8255_0", konami_ppi8255_0_intf )
MDRV_PPI8255_ADD( "ppi8255_1", scramble_ppi8255_1_intf )
@@ -2000,12 +2000,12 @@ static MACHINE_DRIVER_START( explorer )
/* alternate memory map */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(theend_map,0)
+ MDRV_CPU_PROGRAM_MAP(theend_map)
/* 2nd CPU to drive sound */
MDRV_CPU_ADD("audiocpu", Z80,KONAMI_SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(konami_sound_map,0)
- MDRV_CPU_IO_MAP(konami_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(konami_sound_map)
+ MDRV_CPU_IO_MAP(konami_sound_portmap)
/* sound hardware */
MDRV_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
@@ -2042,12 +2042,12 @@ static MACHINE_DRIVER_START( sfx )
/* alternate memory map */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sfx_map,0)
+ MDRV_CPU_PROGRAM_MAP(sfx_map)
/* 3rd CPU for the sample player */
MDRV_CPU_ADD("audio2", Z80, KONAMI_SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(sfx_sample_map,0)
- MDRV_CPU_IO_MAP(sfx_sample_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sfx_sample_map)
+ MDRV_CPU_IO_MAP(sfx_sample_portmap)
MDRV_PPI8255_ADD( "ppi8255_0", konami_ppi8255_0_intf )
MDRV_PPI8255_ADD( "ppi8255_1", konami_ppi8255_1_intf )
@@ -2069,7 +2069,7 @@ static MACHINE_DRIVER_START( scobra )
/* alternate memory map */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(scobra_map,0)
+ MDRV_CPU_PROGRAM_MAP(scobra_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index 89b208889d0..ca2c30cc335 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -2103,7 +2103,7 @@ static MACHINE_DRIVER_START( galaxold_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(galaxold_map,0)
+ MDRV_CPU_PROGRAM_MAP(galaxold_map)
MDRV_MACHINE_RESET(galaxold)
@@ -2151,7 +2151,7 @@ static MACHINE_DRIVER_START( mooncrst )
/* basic machine hardware */
MDRV_IMPORT_FROM(galaxian)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mooncrst_map,0)
+ MDRV_CPU_PROGRAM_MAP(mooncrst_map)
/* video hardware */
MDRV_VIDEO_START(mooncrst)
@@ -2163,7 +2163,7 @@ static MACHINE_DRIVER_START( scramblb )
/* basic machine hardware */
MDRV_IMPORT_FROM(galaxian)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(scramblb_map,0)
+ MDRV_CPU_PROGRAM_MAP(scramblb_map)
/* video hardware */
MDRV_PALETTE_LENGTH(32+2+64+1) /* 32 for the characters, 2 for the bullets, 64 for the stars, 1 for background */
@@ -2177,7 +2177,7 @@ static MACHINE_DRIVER_START( scramb2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(galaxian)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(scramb2_map,0)
+ MDRV_CPU_PROGRAM_MAP(scramb2_map)
/* video hardware */
MDRV_PALETTE_LENGTH(32+2+64+1) /* 32 for the characters, 2 for the bullets, 64 for the stars, 1 for background */
@@ -2193,7 +2193,7 @@ static MACHINE_DRIVER_START( 4in1 )
/* basic machine hardware */
MDRV_IMPORT_FROM(galaxian)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(_4in1_map,0)
+ MDRV_CPU_PROGRAM_MAP(_4in1_map)
/* video hardware */
MDRV_GFXDECODE(_4in1)
@@ -2207,7 +2207,7 @@ static MACHINE_DRIVER_START( bagmanmc )
/* basic machine hardware */
MDRV_IMPORT_FROM(galaxian)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bagmanmc_map,0)
+ MDRV_CPU_PROGRAM_MAP(bagmanmc_map)
MDRV_MACHINE_RESET( devilfsg )
@@ -2223,7 +2223,7 @@ static MACHINE_DRIVER_START( dkongjrm )
/* basic machine hardware */
MDRV_IMPORT_FROM(galaxian)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dkongjrm_map,0)
+ MDRV_CPU_PROGRAM_MAP(dkongjrm_map)
/* video hardware */
MDRV_VIDEO_START(dkongjrm)
@@ -2233,7 +2233,7 @@ static MACHINE_DRIVER_START( rockclim )
/* basic machine hardware */
MDRV_IMPORT_FROM(galaxian)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rockclim_map,0)
+ MDRV_CPU_PROGRAM_MAP(rockclim_map)
MDRV_GFXDECODE(rockclim)
/* video hardware */
MDRV_VIDEO_START(rockclim)
@@ -2249,8 +2249,8 @@ static MACHINE_DRIVER_START( ozon1 )
/* basic machine hardware */
MDRV_IMPORT_FROM(galaxold_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ozon1_map,0)
- MDRV_CPU_IO_MAP(ozon1_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(ozon1_map)
+ MDRV_CPU_IO_MAP(ozon1_io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_RESET(NULL)
@@ -2267,8 +2267,8 @@ static MACHINE_DRIVER_START( drivfrcg )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", S2650, 18432000/6)
- MDRV_CPU_PROGRAM_MAP(drivfrcg,0)
- MDRV_CPU_IO_MAP(drivfrcg_io,0)
+ MDRV_CPU_PROGRAM_MAP(drivfrcg)
+ MDRV_CPU_IO_MAP(drivfrcg_io)
MDRV_CPU_VBLANK_INT("screen", hunchbks_vh_interrupt)
@@ -2298,8 +2298,8 @@ static MACHINE_DRIVER_START( bongo )
/* basic machine hardware */
MDRV_IMPORT_FROM(galaxold_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bongo,0)
- MDRV_CPU_IO_MAP(bongo_io,0)
+ MDRV_CPU_PROGRAM_MAP(bongo)
+ MDRV_CPU_IO_MAP(bongo_io)
MDRV_VIDEO_START(bongo)
MDRV_VIDEO_UPDATE(galaxold)
@@ -2313,8 +2313,8 @@ static MACHINE_DRIVER_START( hunchbkg )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", S2650, PIXEL_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(hunchbkg,0)
- MDRV_CPU_IO_MAP(hunchbkg_io,0)
+ MDRV_CPU_PROGRAM_MAP(hunchbkg)
+ MDRV_CPU_IO_MAP(hunchbkg_io)
MDRV_CPU_VBLANK_INT("screen", hunchbks_vh_interrupt)
MDRV_GFXDECODE(galaxian)
@@ -2340,12 +2340,12 @@ static MACHINE_DRIVER_START( harem )
/* basic machine hardware */
MDRV_IMPORT_FROM(galaxold_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(harem_cpu1,0)
+ MDRV_CPU_PROGRAM_MAP(harem_cpu1)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80, 1620000)
- MDRV_CPU_PROGRAM_MAP(harem_cpu2,0)
- MDRV_CPU_IO_MAP(harem_cpu2_io,0)
+ MDRV_CPU_PROGRAM_MAP(harem_cpu2)
+ MDRV_CPU_IO_MAP(harem_cpu2_io)
MDRV_MACHINE_RESET(NULL)
@@ -2368,15 +2368,15 @@ static MACHINE_DRIVER_START( tazzmang )
/* basic machine hardware */
MDRV_IMPORT_FROM(galaxian)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tazzmang,0)
+ MDRV_CPU_PROGRAM_MAP(tazzmang)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( racknrol )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", S2650, PIXEL_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(racknrol,0)
- MDRV_CPU_IO_MAP(racknrol_io,0)
+ MDRV_CPU_PROGRAM_MAP(racknrol)
+ MDRV_CPU_IO_MAP(racknrol_io)
MDRV_CPU_VBLANK_INT("screen", hunchbks_vh_interrupt)
MDRV_GFXDECODE(galaxian)
@@ -2407,7 +2407,7 @@ static MACHINE_DRIVER_START( ckongg )
/* basic machine hardware */
MDRV_IMPORT_FROM(galaxian)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ckongg_map,0)
+ MDRV_CPU_PROGRAM_MAP(ckongg_map)
MDRV_GFXDECODE(gmgalax)
@@ -2420,7 +2420,7 @@ static MACHINE_DRIVER_START( kkgalax )
/* basic machine hardware */
MDRV_IMPORT_FROM(galaxian)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(kkgalax_map,0)
+ MDRV_CPU_PROGRAM_MAP(kkgalax_map)
MDRV_GFXDECODE(gmgalax)
@@ -2433,8 +2433,8 @@ static MACHINE_DRIVER_START( hexpoola )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", S2650, PIXEL_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(racknrol,0)
- MDRV_CPU_IO_MAP(hexpoola_io,0)
+ MDRV_CPU_PROGRAM_MAP(racknrol)
+ MDRV_CPU_IO_MAP(hexpoola_io)
MDRV_CPU_VBLANK_INT("screen", hunchbks_vh_interrupt)
MDRV_GFXDECODE(galaxian)
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index 8923bdb1368..f20c3fec446 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -438,13 +438,13 @@ static MACHINE_DRIVER_START( galivan )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(galivan_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(galivan_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, 7250) /* timed interrupt, ?? Hz */
MDRV_MACHINE_RESET(galivan)
@@ -481,13 +481,13 @@ static MACHINE_DRIVER_START( ninjemak )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(ninjemak_map,0)
- MDRV_CPU_IO_MAP(ninjemak_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(ninjemak_map)
+ MDRV_CPU_IO_MAP(ninjemak_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, 7250) /* timed interrupt, ?? Hz */
MDRV_MACHINE_RESET(galivan)
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index 571f65a0c1f..8c7c4a3be76 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -577,12 +577,12 @@ static MACHINE_DRIVER_START( galpani2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(galpani2_mem1, 0)
+ MDRV_CPU_PROGRAM_MAP(galpani2_mem1)
MDRV_CPU_VBLANK_INT_HACK(galpani2_interrupt1,GALPANI2_INTERRUPTS_NUM)
//MDRV_QUANTUM_PERFECT_CPU("maincpu")
MDRV_CPU_ADD("sub", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(galpani2_mem2, 0)
+ MDRV_CPU_PROGRAM_MAP(galpani2_mem2)
MDRV_CPU_VBLANK_INT_HACK(galpani2_interrupt2,GALPANI2_INTERRUPTS_NUM2)
MDRV_MACHINE_RESET(galpani2)
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index 85ff54c5072..6223b317ce7 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -902,7 +902,7 @@ static const ymz280b_interface ymz280b_intf =
static MACHINE_DRIVER_START( galpani3 )
MDRV_CPU_ADD("maincpu", M68000, 16000000) // ? (from which clock?)
- MDRV_CPU_PROGRAM_MAP(galpani3_map,0)
+ MDRV_CPU_PROGRAM_MAP(galpani3_map)
MDRV_CPU_VBLANK_INT_HACK(galpani3_vblank, 3)
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index 06871d1f981..5c3ca1574ac 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -873,7 +873,7 @@ static MACHINE_DRIVER_START( galpanic )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(galpanic_map,0)
+ MDRV_CPU_PROGRAM_MAP(galpanic_map)
MDRV_CPU_VBLANK_INT_HACK(galpanic_interrupt,2)
/* video hardware */
@@ -915,7 +915,7 @@ static MACHINE_DRIVER_START( comad )
/* basic machine hardware */
MDRV_IMPORT_FROM(galpanic)
MDRV_CPU_REPLACE("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(comad_map,0)
+ MDRV_CPU_PROGRAM_MAP(comad_map)
/* video hardware */
MDRV_VIDEO_UPDATE(comad)
@@ -927,7 +927,7 @@ static MACHINE_DRIVER_START( supmodel )
/* basic machine hardware */
MDRV_IMPORT_FROM(comad)
MDRV_CPU_REPLACE("maincpu", M68000, 12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(supmodel_map,0)
+ MDRV_CPU_PROGRAM_MAP(supmodel_map)
MDRV_CPU_VBLANK_INT_HACK(galpanic_interrupt,2)
/* video hardware */
@@ -946,7 +946,7 @@ static MACHINE_DRIVER_START( fantsia2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(comad)
MDRV_CPU_REPLACE("maincpu", M68000, 12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(fantsia2_map,0)
+ MDRV_CPU_PROGRAM_MAP(fantsia2_map)
/* video hardware */
MDRV_VIDEO_UPDATE(comad)
@@ -958,7 +958,7 @@ static MACHINE_DRIVER_START( galhustl )
/* basic machine hardware */
MDRV_IMPORT_FROM(comad)
MDRV_CPU_REPLACE("maincpu", M68000, 12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(galhustl_map,0)
+ MDRV_CPU_PROGRAM_MAP(galhustl_map)
MDRV_CPU_VBLANK_INT_HACK(galhustl_interrupt,3)
/* video hardware */
@@ -976,7 +976,7 @@ static MACHINE_DRIVER_START( zipzap )
/* basic machine hardware */
MDRV_IMPORT_FROM(comad)
MDRV_CPU_REPLACE("maincpu", M68000, 12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(zipzap_map,0)
+ MDRV_CPU_PROGRAM_MAP(zipzap_map)
MDRV_CPU_VBLANK_INT_HACK(galhustl_interrupt,3)
/* video hardware */
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index a9cbf896145..2cc4a60d0a3 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -210,11 +210,11 @@ static MACHINE_DRIVER_START( galspnbl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)/* also has vector for 6, but it does nothing */
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
/* NMI is caused by the main CPU */
/* video hardware */
diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c
index facd6d94e42..bfa3de0ef25 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -656,8 +656,8 @@ static MACHINE_DRIVER_START(gamecstl)
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PENTIUM, 200000000)
- MDRV_CPU_PROGRAM_MAP(gamecstl_map, 0)
- MDRV_CPU_IO_MAP(gamecstl_io, 0)
+ MDRV_CPU_PROGRAM_MAP(gamecstl_map)
+ MDRV_CPU_IO_MAP(gamecstl_io)
MDRV_MACHINE_START(gamecstl)
MDRV_MACHINE_RESET(gamecstl)
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index c21cab5848f..2653fa20702 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -1012,10 +1012,10 @@ static MACHINE_DRIVER_START( gameplan )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, GAMEPLAN_MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(gameplan_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(gameplan_main_map)
MDRV_CPU_ADD("audiocpu", M6502, GAMEPLAN_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(gameplan_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(gameplan_audio_map)
MDRV_RIOT6532_ADD("riot", GAMEPLAN_AUDIO_CPU_CLOCK, r6532_interface)
@@ -1046,7 +1046,7 @@ static MACHINE_DRIVER_START( leprechn )
/* basic machine hardware */
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(leprechn_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(leprechn_audio_map)
/* video hardware */
MDRV_IMPORT_FROM(leprechn_video)
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index 8825210777a..4afeae20d5b 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -522,15 +522,15 @@ static MACHINE_DRIVER_START( gaplus )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 24576000/16) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu1_map)
MDRV_CPU_VBLANK_INT("screen", gaplus_interrupt_1)
MDRV_CPU_ADD("sub", M6809, 24576000/16) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu2_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub2", M6809, 24576000/16) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(cpu3_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu3_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_QUANTUM_TIME(HZ(6000)) /* a high value to ensure proper synchronization of the CPUs */
diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c
index bd92e107142..9b51174bee4 100644
--- a/src/mame/drivers/gatron.c
+++ b/src/mame/drivers/gatron.c
@@ -441,8 +441,8 @@ static MACHINE_DRIVER_START( gat )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/24) /* 666.66 kHz, guess */
- MDRV_CPU_PROGRAM_MAP(gat_map, 0)
- MDRV_CPU_IO_MAP(gat_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(gat_map)
+ MDRV_CPU_IO_MAP(gat_portmap)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index 90d03620b7d..a932825e321 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -523,11 +523,11 @@ static MACHINE_DRIVER_START( gauntlet )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(gauntlet)
MDRV_NVRAM_HANDLER(atarigen)
diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c
index f3a77edc004..ab2f607265a 100644
--- a/src/mame/drivers/gberet.c
+++ b/src/mame/drivers/gberet.c
@@ -415,7 +415,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( gberet )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, 18432000/6) // X1S (generated by a custom IC)
- MDRV_CPU_PROGRAM_MAP(gberet_map, 0)
+ MDRV_CPU_PROGRAM_MAP(gberet_map)
MDRV_CPU_VBLANK_INT_HACK(gberet_interrupt, 32) // 1 IRQ + 16 NMI (generated by a custom IC)
// video hardware
@@ -446,7 +446,7 @@ static MACHINE_DRIVER_START( gberetb )
// basic machine hardware
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gberetb_map, 0)
+ MDRV_CPU_PROGRAM_MAP(gberetb_map)
MDRV_CPU_VBLANK_INT_HACK(gberet_interrupt, 16) // 1 IRQ + 8 NMI
MDRV_SCREEN_MODIFY("screen")
@@ -464,7 +464,7 @@ static MACHINE_DRIVER_START( mrgoemon )
// basic machine hardware
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mrgoemon_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mrgoemon_map)
MDRV_CPU_VBLANK_INT_HACK(gberet_interrupt, 16) // 1 IRQ + 8 NMI
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index 0a3322387de..09e5c5bebd6 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -231,11 +231,11 @@ static MACHINE_DRIVER_START( gbusters )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* Konami custom 052526 */
- MDRV_CPU_PROGRAM_MAP(gbusters_map,0)
+ MDRV_CPU_PROGRAM_MAP(gbusters_map)
MDRV_CPU_VBLANK_INT("screen", gbusters_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* ? */
- MDRV_CPU_PROGRAM_MAP(gbusters_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(gbusters_sound_map)
MDRV_MACHINE_RESET(gbusters)
diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c
index 9d30cefe0e0..ee9bd876a4c 100644
--- a/src/mame/drivers/gcpinbal.c
+++ b/src/mame/drivers/gcpinbal.c
@@ -370,7 +370,7 @@ static MACHINE_DRIVER_START( gcpinbal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 32000000/2) /* 16 MHz ? */
- MDRV_CPU_PROGRAM_MAP(gcpinbal_map,0)
+ MDRV_CPU_PROGRAM_MAP(gcpinbal_map)
MDRV_CPU_VBLANK_INT("screen", gcpinbal_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c
index f312a04dbf8..3543c133848 100644
--- a/src/mame/drivers/genesis.c
+++ b/src/mame/drivers/genesis.c
@@ -589,11 +589,11 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( genesis_base )
/*basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 7)
- MDRV_CPU_PROGRAM_MAP(genesis_map,0)
+ MDRV_CPU_PROGRAM_MAP(genesis_map)
MDRV_CPU_VBLANK_INT("screen", genesis_vblank_interrupt)
MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK / 15)
- MDRV_CPU_PROGRAM_MAP(genesis_z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(genesis_z80_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* from vdp at scanline 0xe0 */
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/getrivia.c b/src/mame/drivers/getrivia.c
index 44efcea31b3..b1148e42717 100644
--- a/src/mame/drivers/getrivia.c
+++ b/src/mame/drivers/getrivia.c
@@ -468,7 +468,7 @@ static MACHINE_RESET( gselect )
static MACHINE_DRIVER_START( getrivia )
MDRV_CPU_ADD("cpu",Z80,4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(getrivia_map,0)
+ MDRV_CPU_PROGRAM_MAP(getrivia_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
@@ -503,7 +503,7 @@ static MACHINE_DRIVER_START( gselect )
MDRV_IMPORT_FROM(getrivia)
MDRV_CPU_MODIFY("cpu")
- MDRV_CPU_PROGRAM_MAP(gselect_map,0)
+ MDRV_CPU_PROGRAM_MAP(gselect_map)
MDRV_MACHINE_RESET(gselect)
@@ -517,7 +517,7 @@ static MACHINE_DRIVER_START( amuse )
MDRV_IMPORT_FROM(getrivia)
MDRV_CPU_MODIFY("cpu")
- MDRV_CPU_PROGRAM_MAP(amuse_map,0)
+ MDRV_CPU_PROGRAM_MAP(amuse_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gepoker )
@@ -526,7 +526,7 @@ static MACHINE_DRIVER_START( gepoker )
MDRV_IMPORT_FROM(getrivia)
MDRV_CPU_MODIFY("cpu")
- MDRV_CPU_PROGRAM_MAP(gepoker_map,0)
+ MDRV_CPU_PROGRAM_MAP(gepoker_map)
MACHINE_DRIVER_END
/***************************************************
diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c
index 95d77f8f7d2..b43c4702ea0 100644
--- a/src/mame/drivers/ghosteo.c
+++ b/src/mame/drivers/ghosteo.c
@@ -491,7 +491,7 @@ static MACHINE_DRIVER_START( bballoon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM7, 24000000)
- MDRV_CPU_PROGRAM_MAP(bballoon_map,0)
+ MDRV_CPU_PROGRAM_MAP(bballoon_map)
MDRV_CPU_VBLANK_INT("screen", bballoon_interrupt)
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index d094fea8898..29d9b12f09a 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -292,11 +292,11 @@ static MACHINE_DRIVER_START( gijoe )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* Confirmed */
- MDRV_CPU_PROGRAM_MAP(gijoe_map,0)
+ MDRV_CPU_PROGRAM_MAP(gijoe_map)
MDRV_CPU_VBLANK_INT("screen", gijoe_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 8000000) /* Amuse & confirmed. z80e */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_START(gijoe)
MDRV_NVRAM_HANDLER(gijoe)
diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c
index 7a4c491a043..1cf97a1aa32 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -327,11 +327,11 @@ static MACHINE_DRIVER_START( ginganin )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 6000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(ginganin_map,0)
+ MDRV_CPU_PROGRAM_MAP(ginganin_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold) /* ? (vectors 1-7 cointain the same address) */
MDRV_CPU_ADD("audiocpu", M6809, 1000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(ginganin_sound_interrupt,60) /* Takahiro Nogi. 1999/09/27 (1 -> 60) */
/* video hardware */
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index 1f3b646bf94..dff57e249e7 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -686,17 +686,17 @@ static MACHINE_DRIVER_START( ppking )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(ppking_cpu1_map,0)
- MDRV_CPU_IO_MAP(ppking_cpu1_io,0)
+ MDRV_CPU_PROGRAM_MAP(ppking_cpu1_map)
+ MDRV_CPU_IO_MAP(ppking_cpu1_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu2_map,0)
- MDRV_CPU_IO_MAP(ppking_cpu2_io,0)
+ MDRV_CPU_PROGRAM_MAP(cpu2_map)
+ MDRV_CPU_IO_MAP(ppking_cpu2_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", M6809, XTAL_12MHz/16) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(ppking_cpu3_map,0)
+ MDRV_CPU_PROGRAM_MAP(ppking_cpu3_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -736,16 +736,16 @@ static MACHINE_DRIVER_START( gladiatr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(gladiatr_cpu1_map,0)
- MDRV_CPU_IO_MAP(gladiatr_cpu1_io,0)
+ MDRV_CPU_PROGRAM_MAP(gladiatr_cpu1_map)
+ MDRV_CPU_IO_MAP(gladiatr_cpu1_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu2_map,0)
- MDRV_CPU_IO_MAP(gladiatr_cpu2_io,0)
+ MDRV_CPU_PROGRAM_MAP(cpu2_map)
+ MDRV_CPU_IO_MAP(gladiatr_cpu2_io)
MDRV_CPU_ADD("audiocpu", M6809, XTAL_12MHz/16) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(gladiatr_cpu3_map,0)
+ MDRV_CPU_PROGRAM_MAP(gladiatr_cpu3_map)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 5f8a0ca280c..42553953650 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -191,7 +191,7 @@ static MACHINE_DRIVER_START( glass )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz (M680000 P12) */
- MDRV_CPU_PROGRAM_MAP(glass_map,0)
+ MDRV_CPU_PROGRAM_MAP(glass_map)
MDRV_CPU_VBLANK_INT("screen", glass_interrupt)
MDRV_MACHINE_RESET(glass)
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index 3e3124f6dba..716f6f41a18 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -332,11 +332,11 @@ static MACHINE_DRIVER_START( gng )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 1500000) /* 1.5 MHz ? */
- MDRV_CPU_PROGRAM_MAP(gng_map,0)
+ MDRV_CPU_PROGRAM_MAP(gng_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
MDRV_MACHINE_START(gng)
diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c
index 32c0824008b..4d7c7a889be 100644
--- a/src/mame/drivers/go2000.c
+++ b/src/mame/drivers/go2000.c
@@ -289,12 +289,12 @@ static MACHINE_RESET(go2000)
static MACHINE_DRIVER_START( go2000 )
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(go2000_map,0)
+ MDRV_CPU_PROGRAM_MAP(go2000_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(go2000_sound_map,0)
- MDRV_CPU_IO_MAP(go2000_sound_io,0)
+ MDRV_CPU_PROGRAM_MAP(go2000_sound_map)
+ MDRV_CPU_IO_MAP(go2000_sound_io)
MDRV_GFXDECODE(go2000)
MDRV_MACHINE_RESET(go2000)
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index f7260518109..65b129c368c 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -309,11 +309,11 @@ static MACHINE_DRIVER_START( goal92 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,12000000)
- MDRV_CPU_PROGRAM_MAP(goal92_map,0)
+ MDRV_CPU_PROGRAM_MAP(goal92_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold) /* VBL */
MDRV_CPU_ADD("audiocpu", Z80, 2500000)
- MDRV_CPU_PROGRAM_MAP(sound_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(sound_cpu)
/* IRQs are triggered by the main CPU */
/* video hardware */
diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c
index 05b7291f2e2..927aaf63fb0 100644
--- a/src/mame/drivers/goindol.c
+++ b/src/mame/drivers/goindol.c
@@ -232,11 +232,11 @@ static MACHINE_DRIVER_START( goindol )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000) /* 6 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(goindol_map,0)
+ MDRV_CPU_PROGRAM_MAP(goindol_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
/* video hardware */
diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c
index b8414f0a26e..fc479dd1f12 100644
--- a/src/mame/drivers/goldnpkr.c
+++ b/src/mame/drivers/goldnpkr.c
@@ -2304,7 +2304,7 @@ static MACHINE_DRIVER_START( goldnpkr_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(goldnpkr_map, 0)
+ MDRV_CPU_PROGRAM_MAP(goldnpkr_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -2348,7 +2348,7 @@ static MACHINE_DRIVER_START( pottnpkr )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pottnpkr_map, 0)
+ MDRV_CPU_PROGRAM_MAP(pottnpkr_map)
MDRV_PIA6821_MODIFY("pia0", pottnpkr_pia0_intf)
@@ -2365,7 +2365,7 @@ static MACHINE_DRIVER_START( witchcrd )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(witchcrd_map, 0)
+ MDRV_CPU_PROGRAM_MAP(witchcrd_map)
MDRV_PIA6821_MODIFY("pia0", pottnpkr_pia0_intf)
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index ff5939cf06f..7d7c54e718b 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -4366,8 +4366,8 @@ static MACHINE_DRIVER_START( goldstar )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(goldstar_map,0)
- MDRV_CPU_IO_MAP(goldstar_readport,0)
+ MDRV_CPU_PROGRAM_MAP(goldstar_map)
+ MDRV_CPU_IO_MAP(goldstar_readport)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -4402,8 +4402,8 @@ static MACHINE_DRIVER_START( goldstbl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(goldstar_map,0)
- MDRV_CPU_IO_MAP(goldstar_readport,0)
+ MDRV_CPU_PROGRAM_MAP(goldstar_map)
+ MDRV_CPU_IO_MAP(goldstar_readport)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -4437,8 +4437,8 @@ static MACHINE_DRIVER_START( moonlght )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(goldstar_map,0)
- MDRV_CPU_IO_MAP(goldstar_readport,0)
+ MDRV_CPU_PROGRAM_MAP(goldstar_map)
+ MDRV_CPU_IO_MAP(goldstar_readport)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -4533,8 +4533,8 @@ static MACHINE_DRIVER_START( chrygld )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(ncb3_map,0)
- MDRV_CPU_IO_MAP(ncb3_readwriteport,0)
+ MDRV_CPU_PROGRAM_MAP(ncb3_map)
+ MDRV_CPU_IO_MAP(ncb3_readwriteport)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 3x 8255 */
@@ -4575,8 +4575,8 @@ static MACHINE_DRIVER_START( ncb3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(ncb3_map,0)
- MDRV_CPU_IO_MAP(ncb3_readwriteport,0)
+ MDRV_CPU_PROGRAM_MAP(ncb3_map)
+ MDRV_CPU_IO_MAP(ncb3_readwriteport)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 3x 8255 */
@@ -4617,8 +4617,8 @@ static MACHINE_DRIVER_START( cm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cm_map,0)
- MDRV_CPU_IO_MAP(cm_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cm_map)
+ MDRV_CPU_IO_MAP(cm_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
@@ -4659,8 +4659,8 @@ static MACHINE_DRIVER_START( cmnobmp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cm_map,0)
- MDRV_CPU_IO_MAP(cm_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cm_map)
+ MDRV_CPU_IO_MAP(cm_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
@@ -4694,8 +4694,8 @@ static MACHINE_DRIVER_START( cmast91 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cm_map,0)
- MDRV_CPU_IO_MAP(cmast91_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cm_map)
+ MDRV_CPU_IO_MAP(cmast91_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
@@ -4729,8 +4729,8 @@ static MACHINE_DRIVER_START( lucky8 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(lucky8_map,0)
- //MDRV_CPU_IO_MAP(goldstar_readport,0)
+ MDRV_CPU_PROGRAM_MAP(lucky8_map)
+ //MDRV_CPU_IO_MAP(goldstar_readport)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* 3x 8255 */
@@ -4771,8 +4771,8 @@ static MACHINE_DRIVER_START( kkojnoli )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(kkojnoli_map,0)
- //MDRV_CPU_IO_MAP(goldstar_readport,0)
+ MDRV_CPU_PROGRAM_MAP(kkojnoli_map)
+ //MDRV_CPU_IO_MAP(goldstar_readport)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
@@ -4809,8 +4809,8 @@ static MACHINE_DRIVER_START( ladylinr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(ladylinr_map,0)
- //MDRV_CPU_IO_MAP(goldstar_readport,0)
+ MDRV_CPU_PROGRAM_MAP(ladylinr_map)
+ //MDRV_CPU_IO_MAP(goldstar_readport)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* 2x 8255 */
@@ -4850,8 +4850,8 @@ static MACHINE_DRIVER_START( amcoe1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cm_map, 0)
- MDRV_CPU_IO_MAP(amcoe1_portmap, 0)
+ MDRV_CPU_PROGRAM_MAP(cm_map)
+ MDRV_CPU_IO_MAP(amcoe1_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
@@ -4891,8 +4891,8 @@ static MACHINE_DRIVER_START( amcoe1a )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cm_map, 0)
- MDRV_CPU_IO_MAP(amcoe1_portmap, 0)
+ MDRV_CPU_PROGRAM_MAP(cm_map)
+ MDRV_CPU_IO_MAP(amcoe1_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
@@ -4932,8 +4932,8 @@ static MACHINE_DRIVER_START( amcoe2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cm_map, 0)
- MDRV_CPU_IO_MAP(amcoe2_portmap, 0)
+ MDRV_CPU_PROGRAM_MAP(cm_map)
+ MDRV_CPU_IO_MAP(amcoe2_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
@@ -4967,8 +4967,8 @@ static MACHINE_DRIVER_START( nfm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(nfm_map, 0)
- MDRV_CPU_IO_MAP(amcoe2_portmap, 0)
+ MDRV_CPU_PROGRAM_MAP(nfm_map)
+ MDRV_CPU_IO_MAP(amcoe2_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c
index b41fac980f6..3f452d71a01 100644
--- a/src/mame/drivers/gomoku.c
+++ b/src/mame/drivers/gomoku.c
@@ -120,7 +120,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( gomoku )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18432000/12) /* 1.536 MHz ? */
- MDRV_CPU_PROGRAM_MAP(gomoku_map,0)
+ MDRV_CPU_PROGRAM_MAP(gomoku_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c
index d01c0fc24d0..9643002fd31 100644
--- a/src/mame/drivers/good.c
+++ b/src/mame/drivers/good.c
@@ -257,7 +257,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( good )
MDRV_CPU_ADD("maincpu", M68000, 16000000 /2)
- MDRV_CPU_PROGRAM_MAP(good_map,0)
+ MDRV_CPU_PROGRAM_MAP(good_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_GFXDECODE(good)
diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c
index 3f136fb5fca..9c1873f9452 100644
--- a/src/mame/drivers/goodejan.c
+++ b/src/mame/drivers/goodejan.c
@@ -119,10 +119,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( totmejan_io_map, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x8000, 0x804f) AM_RAM_WRITE(seibucrtc_vregs_w) AM_BASE(&seibucrtc_vregs)
+ AM_IMPORT_FROM(common_io_map)
ADDRESS_MAP_END
static ADDRESS_MAP_START( goodejan_io_map, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x8040, 0x807f) AM_RAM_WRITE(seibucrtc_vregs_w) AM_BASE(&seibucrtc_vregs)
+ AM_IMPORT_FROM(common_io_map)
ADDRESS_MAP_END
static INPUT_PORTS_START( goodejan )
@@ -327,8 +329,8 @@ static MACHINE_DRIVER_START( goodejan )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30, GOODEJAN_MHZ2/2)
- MDRV_CPU_PROGRAM_MAP(goodejan_map,0)
- MDRV_CPU_IO_MAP(common_io_map,goodejan_io_map)
+ MDRV_CPU_PROGRAM_MAP(goodejan_map)
+ MDRV_CPU_IO_MAP(goodejan_io_map)
MDRV_CPU_VBLANK_INT("screen",goodejan_irq)
SEIBU_SOUND_SYSTEM_CPU(GOODEJAN_MHZ1/2)
@@ -356,7 +358,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( totmejan )
MDRV_IMPORT_FROM( goodejan )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(common_io_map,totmejan_io_map)
+ MDRV_CPU_IO_MAP(totmejan_io_map)
MACHINE_DRIVER_END
ROM_START( totmejan )
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index df706912445..7943d6d1564 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -263,11 +263,11 @@ static MACHINE_DRIVER_START( gotcha )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,14318180) /* 14.31818 MHz */
- MDRV_CPU_PROGRAM_MAP(gotcha_map,0)
+ MDRV_CPU_PROGRAM_MAP(gotcha_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,6000000) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index 974d6eda045..b3d8a90951e 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -1847,7 +1847,7 @@ static MACHINE_DRIVER_START( gottlieb_core )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", I8088, CPU_CLOCK/3)
- MDRV_CPU_PROGRAM_MAP(gottlieb_map,0)
+ MDRV_CPU_PROGRAM_MAP(gottlieb_map)
MDRV_CPU_VBLANK_INT("screen", gottlieb_interrupt)
MDRV_MACHINE_START(gottlieb)
@@ -1913,7 +1913,7 @@ static MACHINE_DRIVER_START( reactor )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(reactor_map,0)
+ MDRV_CPU_PROGRAM_MAP(reactor_map)
MDRV_NVRAM_HANDLER(NULL)
diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c
index cf6649183f4..e366243468c 100644
--- a/src/mame/drivers/gotya.c
+++ b/src/mame/drivers/gotya.c
@@ -178,7 +178,7 @@ static MACHINE_DRIVER_START( gotya )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(gotya_map,0)
+ MDRV_CPU_PROGRAM_MAP(gotya_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index e830bd47b7c..b181edaf63b 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -445,8 +445,8 @@ static MACHINE_DRIVER_START( gpworld )
/* main cpu */
MDRV_CPU_ADD("maincpu", Z80, GUESSED_CLOCK)
- MDRV_CPU_PROGRAM_MAP(mainmem,0)
- MDRV_CPU_IO_MAP(mainport,0)
+ MDRV_CPU_PROGRAM_MAP(mainmem)
+ MDRV_CPU_IO_MAP(mainport)
MDRV_CPU_VBLANK_INT("screen", vblank_callback_gpworld)
MDRV_MACHINE_START(gpworld)
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index ca816a63026..7b46a86d9f6 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -292,16 +292,16 @@ static MACHINE_DRIVER_START( gradius3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(gradius3_map,0)
+ MDRV_CPU_PROGRAM_MAP(gradius3_map)
MDRV_CPU_VBLANK_INT("screen", cpuA_interrupt)
MDRV_CPU_ADD("sub", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(gradius3_map2,0)
+ MDRV_CPU_PROGRAM_MAP(gradius3_map2)
MDRV_CPU_VBLANK_INT_HACK(cpuB_interrupt,2) /* has three interrupt vectors, 1 2 and 4 */
/* 4 is triggered by cpu A, the others are unknown but */
/* required for the game to run. */
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(gradius3_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(gradius3_s_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index 597ed2e5f0b..b72f7eaeab9 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -677,19 +677,19 @@ static MACHINE_DRIVER_START( grchamp )
/* basic machine hardware */
/* CPU BOARD */
MDRV_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", grchamp_cpu0_interrupt)
/* GAME BOARD */
MDRV_CPU_ADD("sub", Z80, PIXEL_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
- MDRV_CPU_IO_MAP(sub_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
+ MDRV_CPU_IO_MAP(sub_portmap)
MDRV_CPU_VBLANK_INT("screen", grchamp_cpu1_interrupt)
/* SOUND BOARD */
MDRV_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)SOUND_CLOCK/4/16/16/10/16)
MDRV_MACHINE_RESET(grchamp)
diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c
index ef5b0600ab7..215779b7537 100644
--- a/src/mame/drivers/gridlee.c
+++ b/src/mame/drivers/gridlee.c
@@ -434,7 +434,7 @@ static MACHINE_DRIVER_START( gridlee )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, BALSENTE_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu1_map)
MDRV_MACHINE_START(gridlee)
MDRV_MACHINE_RESET(gridlee)
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index b6b5a6b8e5c..4b16846dd2d 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -383,7 +383,7 @@ static MACHINE_DRIVER_START( groundfx )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(groundfx_map,0)
+ MDRV_CPU_PROGRAM_MAP(groundfx_map)
MDRV_CPU_VBLANK_INT("screen", groundfx_interrupt)
TAITO_F3_SOUND_SYSTEM_CPU(16000000)
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c
index f43bccf40cb..6fd17357f6b 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -441,8 +441,8 @@ static VIDEO_UPDATE(gstream)
static MACHINE_DRIVER_START( gstream )
MDRV_CPU_ADD("maincpu", E132XT, 16000000*4) /* 4x internal multiplier */
- MDRV_CPU_PROGRAM_MAP(gstream_32bit_map,0)
- MDRV_CPU_IO_MAP(gstream_io,0)
+ MDRV_CPU_PROGRAM_MAP(gstream_32bit_map)
+ MDRV_CPU_IO_MAP(gstream_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index ee8583100bb..a1bd4271aaf 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -551,12 +551,12 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( gstriker )
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(gstriker_map,0)
+ MDRV_CPU_PROGRAM_MAP(gstriker_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
@@ -591,12 +591,12 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( vgoal )
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(vgoal_map,0)
+ MDRV_CPU_PROGRAM_MAP(vgoal_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index 86dc5673f95..cacdf83e3b2 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -696,17 +696,17 @@ static MACHINE_DRIVER_START( gsword )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_18MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu1_map,0)
- MDRV_CPU_IO_MAP(cpu1_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu1_map)
+ MDRV_CPU_IO_MAP(cpu1_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, XTAL_18MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu2_map,0)
- MDRV_CPU_IO_MAP(cpu2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu2_map)
+ MDRV_CPU_IO_MAP(cpu2_io_map)
MDRV_CPU_VBLANK_INT_HACK(gsword_snd_interrupt,4)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_18MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu3_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu3_map)
MDRV_QUANTUM_TIME(HZ(12000)) /* Allow time for 2nd cpu to interleave*/
@@ -751,13 +751,13 @@ static MACHINE_DRIVER_START( josvolly )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18000000/6) /* ? */
- MDRV_CPU_PROGRAM_MAP(cpu1_map,0)
- MDRV_CPU_IO_MAP(josvolly_cpu1_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu1_map)
+ MDRV_CPU_IO_MAP(josvolly_cpu1_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_CPU_ADD("audiocpu", Z80, 12000000/4) /* ? */
- MDRV_CPU_PROGRAM_MAP(josvolly_cpu2_map,0)
- MDRV_CPU_IO_MAP(josvolly_cpu2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(josvolly_cpu2_map)
+ MDRV_CPU_IO_MAP(josvolly_cpu2_io_map)
// MDRV_CPU_VBLANK_INT("screen", gsword_snd_interrupt)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index d3338e7b985..8d898bae501 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -907,15 +907,15 @@ static MACHINE_DRIVER_START( gticlub )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
- MDRV_CPU_PROGRAM_MAP(gticlub_map, 0)
+ MDRV_CPU_PROGRAM_MAP(gticlub_map)
MDRV_CPU_VBLANK_INT("screen", gticlub_vblank)
MDRV_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */
- MDRV_CPU_PROGRAM_MAP(sound_memmap, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_memmap)
MDRV_CPU_ADD("dsp", ADSP21062, 36000000)
MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(sharc_map, 0)
+ MDRV_CPU_DATA_MAP(sharc_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -952,18 +952,18 @@ static MACHINE_DRIVER_START( hangplt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
- MDRV_CPU_PROGRAM_MAP(gticlub_map, 0)
+ MDRV_CPU_PROGRAM_MAP(gticlub_map)
MDRV_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */
- MDRV_CPU_PROGRAM_MAP(sound_memmap, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_memmap)
MDRV_CPU_ADD("dsp1", ADSP21062, 36000000)
MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(hangplt_sharc0_map, 0)
+ MDRV_CPU_DATA_MAP(hangplt_sharc0_map)
MDRV_CPU_ADD("dsp2", ADSP21062, 36000000)
MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(hangplt_sharc1_map, 0)
+ MDRV_CPU_DATA_MAP(hangplt_sharc1_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 98150608b0a..71aa8f14434 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -763,7 +763,7 @@ static MACHINE_RESET( guab )
static MACHINE_DRIVER_START( guab )
/* TODO: Verify clock */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(guab_map, 0)
+ MDRV_CPU_PROGRAM_MAP(guab_map)
MDRV_MACHINE_START(guab)
MDRV_MACHINE_RESET(guab)
diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c
index d1f79a60f6d..a2c016ec014 100644
--- a/src/mame/drivers/gumbo.c
+++ b/src/mame/drivers/gumbo.c
@@ -236,7 +236,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( gumbo )
MDRV_CPU_ADD("maincpu", M68000, 14318180 /2) // or 10mhz? ?
- MDRV_CPU_PROGRAM_MAP(gumbo_map,0)
+ MDRV_CPU_PROGRAM_MAP(gumbo_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold) // all the same
MDRV_GFXDECODE(gumbo)
@@ -265,13 +265,13 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mspuzzle )
MDRV_IMPORT_FROM(gumbo)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mspuzzle_map,0)
+ MDRV_CPU_PROGRAM_MAP(mspuzzle_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( dblpoint )
MDRV_IMPORT_FROM(gumbo)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dblpoint_map,0)
+ MDRV_CPU_PROGRAM_MAP(dblpoint_map)
MACHINE_DRIVER_END
ROM_START( gumbo )
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index 55de621caa4..353031868b7 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -349,7 +349,7 @@ static MACHINE_DRIVER_START( gunbustr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(gunbustr_map,0)
+ MDRV_CPU_PROGRAM_MAP(gunbustr_map)
MDRV_CPU_VBLANK_INT("screen", gunbustr_interrupt) /* VBL */
TAITO_F3_SOUND_SYSTEM_CPU(16000000)
diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c
index 3f2960c8f64..dc25a6e0446 100644
--- a/src/mame/drivers/gundealr.c
+++ b/src/mame/drivers/gundealr.c
@@ -463,8 +463,8 @@ static MACHINE_DRIVER_START( gundealr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 8000000) /* 8 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT_HACK(yamyam_interrupt,4) /* ? */
/* video hardware */
diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c
index d57ac915cd8..91894eed7d6 100644
--- a/src/mame/drivers/gunpey.c
+++ b/src/mame/drivers/gunpey.c
@@ -122,8 +122,8 @@ static MACHINE_DRIVER_START( gunpey )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30, 57242400 / 4)
- MDRV_CPU_PROGRAM_MAP(mem_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mem_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", gunpey_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c
index 48a3c3729a2..181f45a0e4e 100644
--- a/src/mame/drivers/gunsmoke.c
+++ b/src/mame/drivers/gunsmoke.c
@@ -286,11 +286,11 @@ GFXDECODE_END
static MACHINE_DRIVER_START( gunsmoke )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, 4000000) // 4 MHz
- MDRV_CPU_PROGRAM_MAP(gunsmoke_map, 0)
+ MDRV_CPU_PROGRAM_MAP(gunsmoke_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3000000) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
// video hardware
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index ab3417cfb63..2f59cb5b6ef 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -506,20 +506,20 @@ static MACHINE_DRIVER_START( gyruss )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(main_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_cpu1_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("sub", M6809, 2000000) /* 2 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_cpu2_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(audio_cpu1_map,0)
- MDRV_CPU_IO_MAP(audio_cpu1_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_cpu1_map)
+ MDRV_CPU_IO_MAP(audio_cpu1_io_map)
MDRV_CPU_ADD("audio2", I8039,8000000) /* 8MHz crystal */
- MDRV_CPU_PROGRAM_MAP(audio_cpu2_map,0)
- MDRV_CPU_IO_MAP(audio_cpu2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_cpu2_map)
+ MDRV_CPU_IO_MAP(audio_cpu2_io_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index bab347e4553..1a4e747e457 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -1924,11 +1924,11 @@ static const ay8910_interface ay8910_config =
static MACHINE_DRIVER_START( halleys )
MDRV_CPU_ADD("maincpu", M6809, XTAL_19_968MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(halleys_map,0)
+ MDRV_CPU_PROGRAM_MAP(halleys_map)
MDRV_CPU_VBLANK_INT_HACK(halleys_interrupt, 4)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_6MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)6000000/(4*16*16*10*16))
MDRV_MACHINE_RESET(halleys)
diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c
index 19156f1efa1..55869618708 100644
--- a/src/mame/drivers/hanaawas.c
+++ b/src/mame/drivers/hanaawas.c
@@ -195,8 +195,8 @@ static MACHINE_DRIVER_START( hanaawas )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(hanaawas_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(hanaawas_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index c18d0264cc7..410cb029426 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -1007,12 +1007,12 @@ static MACHINE_DRIVER_START( driver_nomsp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68010, 32000000/4)
- MDRV_CPU_PROGRAM_MAP(driver_68k_map,0)
+ MDRV_CPU_PROGRAM_MAP(driver_68k_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_CPU_PERIODIC_INT(hd68k_irq_gen, (double)32000000/16/16/16/16/2)
MDRV_CPU_ADD("gsp", TMS34010, 48000000)
- MDRV_CPU_PROGRAM_MAP(driver_gsp_map,0)
+ MDRV_CPU_PROGRAM_MAP(driver_gsp_map)
MDRV_CPU_CONFIG(gsp_config_driver)
MDRV_QUANTUM_TIME(HZ(30000))
@@ -1040,7 +1040,7 @@ static MACHINE_DRIVER_START( driver_msp )
/* basic machine hardware */
MDRV_CPU_ADD("msp", TMS34010, 50000000)
- MDRV_CPU_PROGRAM_MAP(driver_msp_map,0)
+ MDRV_CPU_PROGRAM_MAP(driver_msp_map)
MDRV_CPU_CONFIG(msp_config)
MACHINE_DRIVER_END
@@ -1051,11 +1051,11 @@ static MACHINE_DRIVER_START( multisync_nomsp )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(multisync_68k_map,0)
+ MDRV_CPU_PROGRAM_MAP(multisync_68k_map)
MDRV_CPU_MODIFY("gsp")
MDRV_CPU_CONFIG(gsp_config_multisync)
- MDRV_CPU_PROGRAM_MAP(multisync_gsp_map,0)
+ MDRV_CPU_PROGRAM_MAP(multisync_gsp_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -1069,7 +1069,7 @@ static MACHINE_DRIVER_START( multisync_msp )
/* basic machine hardware */
MDRV_CPU_ADD("msp", TMS34010, 50000000)
- MDRV_CPU_PROGRAM_MAP(driver_msp_map,0)
+ MDRV_CPU_PROGRAM_MAP(driver_msp_map)
MDRV_CPU_CONFIG(msp_config)
MACHINE_DRIVER_END
@@ -1080,10 +1080,10 @@ static MACHINE_DRIVER_START( multisync2 )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(multisync2_68k_map,0)
+ MDRV_CPU_PROGRAM_MAP(multisync2_68k_map)
MDRV_CPU_MODIFY("gsp")
- MDRV_CPU_PROGRAM_MAP(multisync2_gsp_map,0)
+ MDRV_CPU_PROGRAM_MAP(multisync2_gsp_map)
MACHINE_DRIVER_END
@@ -1099,8 +1099,8 @@ static MACHINE_DRIVER_START( adsp )
/* basic machine hardware */
MDRV_CPU_ADD("adsp", ADSP2100, 8000000)
- MDRV_CPU_PROGRAM_MAP(adsp_program_map,0)
- MDRV_CPU_DATA_MAP(adsp_data_map,0)
+ MDRV_CPU_PROGRAM_MAP(adsp_program_map)
+ MDRV_CPU_DATA_MAP(adsp_data_map)
MACHINE_DRIVER_END
@@ -1109,8 +1109,8 @@ static MACHINE_DRIVER_START( ds3 )
/* basic machine hardware */
MDRV_CPU_ADD("adsp", ADSP2101, 12000000)
- MDRV_CPU_PROGRAM_MAP(ds3_program_map,0)
- MDRV_CPU_DATA_MAP(ds3_data_map,0)
+ MDRV_CPU_PROGRAM_MAP(ds3_program_map)
+ MDRV_CPU_DATA_MAP(ds3_data_map)
MDRV_QUANTUM_TIME(HZ(60000))
MACHINE_DRIVER_END
@@ -1121,14 +1121,14 @@ static MACHINE_DRIVER_START( ds4 )
/* basic machine hardware */
MDRV_CPU_ADD("adsp", ADSP2101, 12000000)
- MDRV_CPU_PROGRAM_MAP(ds3_program_map,0)
- MDRV_CPU_DATA_MAP(ds3_data_map,0)
+ MDRV_CPU_PROGRAM_MAP(ds3_program_map)
+ MDRV_CPU_DATA_MAP(ds3_data_map)
// MDRV_CPU_ADD("soundcpu", ADSP2105, 10000000)
-// MDRV_CPU_PROGRAM_MAP(ds3snd_program_map,0)
+// MDRV_CPU_PROGRAM_MAP(ds3snd_program_map)
// MDRV_CPU_ADD("sounddsp", ADSP2105, 10000000)
-// MDRV_CPU_PROGRAM_MAP(ds3snd_program_map,0)
+// MDRV_CPU_PROGRAM_MAP(ds3snd_program_map)
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -1153,7 +1153,7 @@ static MACHINE_DRIVER_START( dsk )
/* basic machine hardware */
MDRV_CPU_ADD("dsp32", DSP32C, 40000000)
MDRV_CPU_CONFIG(dsp32c_config)
- MDRV_CPU_PROGRAM_MAP(dsk_dsp32_map,0)
+ MDRV_CPU_PROGRAM_MAP(dsk_dsp32_map)
/* ASIC65 */
MDRV_IMPORT_FROM( asic65 )
@@ -1166,7 +1166,7 @@ static MACHINE_DRIVER_START( dsk2 )
/* basic machine hardware */
MDRV_CPU_ADD("dsp32", DSP32C, 40000000)
MDRV_CPU_CONFIG(dsp32c_config)
- MDRV_CPU_PROGRAM_MAP(dsk2_dsp32_map,0)
+ MDRV_CPU_PROGRAM_MAP(dsk2_dsp32_map)
/* ASIC65 */
MDRV_IMPORT_FROM( asic65 )
@@ -1184,12 +1184,12 @@ static MACHINE_DRIVER_START( driversnd )
/* basic machine hardware */
MDRV_CPU_ADD("soundcpu", M68000, 16000000/2)
- MDRV_CPU_PROGRAM_MAP(driversnd_68k_map,0)
+ MDRV_CPU_PROGRAM_MAP(driversnd_68k_map)
MDRV_CPU_ADD("sounddsp", TMS32010, 20000000)
- MDRV_CPU_PROGRAM_MAP(driversnd_dsp_program_map,0)
+ MDRV_CPU_PROGRAM_MAP(driversnd_dsp_program_map)
/* Data Map is internal to the CPU */
- MDRV_CPU_IO_MAP(driversnd_dsp_io_map,0)
+ MDRV_CPU_IO_MAP(driversnd_dsp_io_map)
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index 5ed736f9d72..86cd95fd6d8 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -196,11 +196,11 @@ static MACHINE_DRIVER_START( hcastle )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* Derived from 24 MHz clock */
- MDRV_CPU_PROGRAM_MAP(hcastle_map,0)
+ MDRV_CPU_PROGRAM_MAP(hcastle_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c
index 97b0a6ffda6..4fb3319f03d 100644
--- a/src/mame/drivers/hexa.c
+++ b/src/mame/drivers/hexa.c
@@ -145,7 +145,7 @@ static MACHINE_DRIVER_START( hexa )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ??????? */
- MDRV_CPU_PROGRAM_MAP(hexa_map,0)
+ MDRV_CPU_PROGRAM_MAP(hexa_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index da152745b9b..96ab3ce7052 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -231,7 +231,7 @@ static MACHINE_DRIVER_START( hexion )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,24000000/4) /* Z80B 6 MHz */
- MDRV_CPU_PROGRAM_MAP(hexion_map,0)
+ MDRV_CPU_PROGRAM_MAP(hexion_map)
MDRV_CPU_VBLANK_INT_HACK(hexion_interrupt,3) /* both IRQ and NMI are used */
/* video hardware */
diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c
index c9400034e43..4e48f3aa957 100644
--- a/src/mame/drivers/higemaru.c
+++ b/src/mame/drivers/higemaru.c
@@ -167,7 +167,7 @@ static MACHINE_DRIVER_START( higemaru )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/3) /* 4 MHz? Sharp LH0080A Z80A-CPU-D */
- MDRV_CPU_PROGRAM_MAP(higemaru_map,0)
+ MDRV_CPU_PROGRAM_MAP(higemaru_map)
MDRV_CPU_VBLANK_INT_HACK(higemaru_interrupt,2)
/* video hardware */
diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c
index f217202eb3e..6e83b8a60a6 100644
--- a/src/mame/drivers/highvdeo.c
+++ b/src/mame/drivers/highvdeo.c
@@ -863,8 +863,8 @@ static INTERRUPT_GEN( vblank_irq )
static MACHINE_DRIVER_START( tv_vcf )
MDRV_CPU_ADD("maincpu", V30, XTAL_12MHz/2 ) // ?
- MDRV_CPU_PROGRAM_MAP(tv_vcf_map,0)
- MDRV_CPU_IO_MAP(tv_vcf_io,0)
+ MDRV_CPU_PROGRAM_MAP(tv_vcf_map)
+ MDRV_CPU_IO_MAP(tv_vcf_io)
MDRV_CPU_VBLANK_INT("screen", vblank_irq)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -894,8 +894,8 @@ static MACHINE_DRIVER_START( tv_ncf )
MDRV_IMPORT_FROM(tv_vcf)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tv_ncf_map,0)
- MDRV_CPU_IO_MAP(tv_ncf_io,0)
+ MDRV_CPU_PROGRAM_MAP(tv_ncf_map)
+ MDRV_CPU_IO_MAP(tv_ncf_io)
MACHINE_DRIVER_END
@@ -903,8 +903,8 @@ static MACHINE_DRIVER_START( tv_tcf )
MDRV_IMPORT_FROM(tv_vcf)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tv_tcf_map,0)
- MDRV_CPU_IO_MAP(tv_tcf_io,0)
+ MDRV_CPU_PROGRAM_MAP(tv_tcf_map)
+ MDRV_CPU_IO_MAP(tv_tcf_io)
MDRV_SCREEN_MODIFY("screen")
MDRV_SCREEN_VISIBLE_AREA(0, 400-1, 0, 300-1)
@@ -914,8 +914,8 @@ static MACHINE_DRIVER_START( newmcard )
MDRV_IMPORT_FROM(tv_tcf)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(newmcard_map,0)
- MDRV_CPU_IO_MAP(newmcard_io,0)
+ MDRV_CPU_PROGRAM_MAP(newmcard_map)
+ MDRV_CPU_IO_MAP(newmcard_io)
MDRV_SCREEN_MODIFY("screen")
MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
@@ -927,15 +927,15 @@ static MACHINE_DRIVER_START( ciclone )
MDRV_CPU_REMOVE("maincpu")
MDRV_CPU_ADD("maincpu", I80186, 20000000/2 ) // ?
- MDRV_CPU_PROGRAM_MAP(tv_tcf_map,0)
- MDRV_CPU_IO_MAP(tv_tcf_io,0)
+ MDRV_CPU_PROGRAM_MAP(tv_tcf_map)
+ MDRV_CPU_IO_MAP(tv_tcf_io)
MDRV_CPU_VBLANK_INT("screen", vblank_irq)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( brasil )
MDRV_CPU_ADD("maincpu", I80186, 20000000 ) // fashion doesn't like 20/2 Mhz
- MDRV_CPU_PROGRAM_MAP(brasil_map,0)
- MDRV_CPU_IO_MAP(brasil_io,0)
+ MDRV_CPU_PROGRAM_MAP(brasil_map)
+ MDRV_CPU_IO_MAP(brasil_io)
MDRV_CPU_VBLANK_INT("screen", vblank_irq)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c
index 82c7f8869cd..f10ee9d4890 100644
--- a/src/mame/drivers/hikaru.c
+++ b/src/mame/drivers/hikaru.c
@@ -310,11 +310,11 @@ static MACHINE_DRIVER_START( hikaru )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", SH4, CPU_CLOCK)
// MDRV_CPU_CONFIG(sh4cpu_config)
- MDRV_CPU_PROGRAM_MAP(hikaru_map,0)
-// MDRV_CPU_IO_MAP(hikaru_port,0)
+ MDRV_CPU_PROGRAM_MAP(hikaru_map)
+// MDRV_CPU_IO_MAP(hikaru_port)
// MDRV_CPU_VBLANK_INT("screen", hikaru,vblank)
MDRV_CPU_ADD("slave", SH4, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(hikaru_map_slave,0)
+ MDRV_CPU_PROGRAM_MAP(hikaru_map_slave)
// MDRV_MACHINE_START( hikaru )
// MDRV_MACHINE_RESET( hikaru )
diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c
index a4ca58170c3..6cd3cd9665c 100644
--- a/src/mame/drivers/himesiki.c
+++ b/src/mame/drivers/himesiki.c
@@ -280,13 +280,13 @@ static MACHINE_DRIVER_START( himesiki )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MCLK/2) /* 6.000 MHz */
- MDRV_CPU_PROGRAM_MAP(himesiki_prm0,0)
- MDRV_CPU_IO_MAP(himesiki_iom0,0)
+ MDRV_CPU_PROGRAM_MAP(himesiki_prm0)
+ MDRV_CPU_IO_MAP(himesiki_iom0)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, MCLK/3) /* 4.000 MHz */
- MDRV_CPU_PROGRAM_MAP(himesiki_prm1,0)
- MDRV_CPU_IO_MAP(himesiki_iom1,0)
+ MDRV_CPU_PROGRAM_MAP(himesiki_prm1)
+ MDRV_CPU_IO_MAP(himesiki_iom1)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c
index 73c2d15cb8b..5e1af48b53e 100644
--- a/src/mame/drivers/hitme.c
+++ b/src/mame/drivers/hitme.c
@@ -304,8 +304,8 @@ static MACHINE_DRIVER_START( hitme )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080, MASTER_CLOCK/16)
- MDRV_CPU_PROGRAM_MAP(hitme_map,0)
- MDRV_CPU_IO_MAP(hitme_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(hitme_map)
+ MDRV_CPU_IO_MAP(hitme_portmap)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c
index b865050474a..04a9d42dde5 100644
--- a/src/mame/drivers/hnayayoi.c
+++ b/src/mame/drivers/hnayayoi.c
@@ -544,8 +544,8 @@ static const msm5205_interface msm5205_config =
static MACHINE_DRIVER_START( hnayayoi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 20000000/4 ) /* 5 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(hnayayoi_map,0)
- MDRV_CPU_IO_MAP(hnayayoi_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(hnayayoi_map)
+ MDRV_CPU_IO_MAP(hnayayoi_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 8000)
@@ -585,14 +585,14 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hnfubuki )
MDRV_IMPORT_FROM(hnayayoi)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hnfubuki_map,0)
+ MDRV_CPU_PROGRAM_MAP(hnfubuki_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( untoucha )
MDRV_IMPORT_FROM(hnayayoi)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(untoucha_map,0)
- MDRV_CPU_IO_MAP(untoucha_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(untoucha_map)
+ MDRV_CPU_IO_MAP(untoucha_io_map)
MDRV_VIDEO_START(untoucha)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index 9c2cb8d8c33..b3389fdfe35 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -1608,15 +1608,15 @@ static MACHINE_DRIVER_START( hng64 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", VR4300BE, MASTER_CLOCK) // actually R4300
MDRV_CPU_CONFIG(config)
- MDRV_CPU_PROGRAM_MAP(hng_map, 0)
+ MDRV_CPU_PROGRAM_MAP(hng_map)
MDRV_CPU_VBLANK_INT_HACK(irq_start,3)
MDRV_CPU_ADD("audiocpu", V30,8000000) // v53, 16? mhz!
- MDRV_CPU_PROGRAM_MAP(hng_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(hng_sound_map)
MDRV_CPU_ADD("comm", Z80,MASTER_CLOCK/4) /* KL5C80A12CFP - binary compatible with Z80. */
- MDRV_CPU_PROGRAM_MAP(hng_comm_map,0)
- MDRV_CPU_IO_MAP(hng_comm_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(hng_comm_map)
+ MDRV_CPU_IO_MAP(hng_comm_io_map)
MDRV_GFXDECODE(hng64)
MDRV_MACHINE_START(hyperneo)
diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c
index 4b1cd088b9d..cd8f3cd34d3 100644
--- a/src/mame/drivers/holeland.c
+++ b/src/mame/drivers/holeland.c
@@ -287,8 +287,8 @@ static MACHINE_DRIVER_START( holeland )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(holeland_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(holeland_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -356,8 +356,8 @@ static MACHINE_DRIVER_START( crzrally )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 20000000/4) /* 5 MHz */
- MDRV_CPU_PROGRAM_MAP(crzrally_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(crzrally_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index 860d36fc490..16998b599a5 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -1172,12 +1172,12 @@ static MACHINE_DRIVER_START( mrokumei )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */
- MDRV_CPU_PROGRAM_MAP(mrokumei_map,0)
+ MDRV_CPU_PROGRAM_MAP(mrokumei_map)
MDRV_CPU_VBLANK_INT("screen", homedata_irq) /* also triggered by the blitter */
MDRV_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4MHz ? */
- MDRV_CPU_PROGRAM_MAP(mrokumei_sound_map,0)
- MDRV_CPU_IO_MAP(mrokumei_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mrokumei_sound_map)
+ MDRV_CPU_IO_MAP(mrokumei_sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1235,13 +1235,13 @@ static MACHINE_DRIVER_START( reikaids )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */
- MDRV_CPU_PROGRAM_MAP(reikaids_map,0)
+ MDRV_CPU_PROGRAM_MAP(reikaids_map)
MDRV_CPU_VBLANK_INT("screen", homedata_irq) /* also triggered by the blitter */
MDRV_CPU_ADD("audiocpu", UPD7807, 8000000) /* ??? MHz (max speed for the 7807 is 12MHz) */
MDRV_CPU_CONFIG(upd_config)
- MDRV_CPU_PROGRAM_MAP(reikaids_upd7807_map,0)
- MDRV_CPU_IO_MAP(reikaids_upd7807_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(reikaids_upd7807_map)
+ MDRV_CPU_IO_MAP(reikaids_upd7807_io_map)
MDRV_CPU_VBLANK_INT("screen", upd7807_irq)
MDRV_QUANTUM_TIME(HZ(30000)) // very high interleave required to sync for startup tests
@@ -1285,13 +1285,13 @@ static MACHINE_DRIVER_START( pteacher )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */
- MDRV_CPU_PROGRAM_MAP(pteacher_map,0)
+ MDRV_CPU_PROGRAM_MAP(pteacher_map)
MDRV_CPU_VBLANK_INT("screen", homedata_irq) /* also triggered by the blitter */
MDRV_CPU_ADD("audiocpu", UPD7807, 9000000) /* 9MHz ? */
MDRV_CPU_CONFIG(upd_config)
- MDRV_CPU_PROGRAM_MAP(pteacher_upd7807_map,0)
- MDRV_CPU_IO_MAP(pteacher_upd7807_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(pteacher_upd7807_map)
+ MDRV_CPU_IO_MAP(pteacher_upd7807_io_map)
MDRV_CPU_VBLANK_INT("screen", upd7807_irq)
MDRV_QUANTUM_TIME(HZ(6000)) // should be enough
diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c
index 2058515501e..0cd91111ba2 100644
--- a/src/mame/drivers/homerun.c
+++ b/src/mame/drivers/homerun.c
@@ -188,8 +188,8 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( homerun )
MDRV_CPU_ADD("maincpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(homerun_memmap, 0)
- MDRV_CPU_IO_MAP(homerun_iomap, 0)
+ MDRV_CPU_PROGRAM_MAP(homerun_memmap)
+ MDRV_CPU_IO_MAP(homerun_iomap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(homerun)
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index 803491a9159..89670b582ae 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -1004,14 +1004,14 @@ static MACHINE_DRIVER_START( hornet )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
- MDRV_CPU_PROGRAM_MAP(hornet_map, 0)
+ MDRV_CPU_PROGRAM_MAP(hornet_map)
MDRV_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */
- MDRV_CPU_PROGRAM_MAP(sound_memmap, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_memmap)
MDRV_CPU_ADD("dsp", ADSP21062, 36000000)
MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(sharc0_map, 0)
+ MDRV_CPU_DATA_MAP(sharc0_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -1069,7 +1069,7 @@ static MACHINE_DRIVER_START( hornet_2board )
MDRV_CPU_ADD("dsp2", ADSP21062, 36000000)
MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(sharc1_map, 0)
+ MDRV_CPU_DATA_MAP(sharc1_map)
MDRV_MACHINE_RESET(hornet_2board)
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index 994db191eba..a4016c8b153 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -191,8 +191,8 @@ static const ay8910_interface ay8910_config =
static MACHINE_DRIVER_START( hotblock )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", I8088, 10000000)
- MDRV_CPU_PROGRAM_MAP(hotblock_map, 0)
- MDRV_CPU_IO_MAP(hotblock_io,0)
+ MDRV_CPU_PROGRAM_MAP(hotblock_map)
+ MDRV_CPU_IO_MAP(hotblock_io)
MDRV_CPU_VBLANK_INT("screen", hotblocks_irq)
/* video hardware */
diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c
index 2392e64f5ff..dfa48ad421a 100644
--- a/src/mame/drivers/hshavoc.c
+++ b/src/mame/drivers/hshavoc.c
@@ -126,7 +126,7 @@ static MACHINE_DRIVER_START( genesis_base )
MDRV_CPU_VBLANK_INT("screen", genesis_vblank_interrupt)
MDRV_CPU_ADD("genesis_snd_z80", Z80, MASTER_CLOCK / 15)
- MDRV_CPU_PROGRAM_MAP(genesis_z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(genesis_z80_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* from vdp at scanline 0xe0 */
MDRV_QUANTUM_TIME(HZ(6000))
@@ -161,7 +161,7 @@ static MACHINE_DRIVER_START( hshavoc )
/* basic machine hardware */
MDRV_IMPORT_FROM( genesis_base )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(topshoot_map,0)
+ MDRV_CPU_PROGRAM_MAP(topshoot_map)
/* sound hardware */
MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/15)
diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c
index 88092e11c20..264e126471f 100644
--- a/src/mame/drivers/hvyunit.c
+++ b/src/mame/drivers/hvyunit.c
@@ -569,18 +569,18 @@ static INTERRUPT_GEN( hvyunit_interrupt )
static MACHINE_DRIVER_START( hvyunit )
MDRV_CPU_ADD("maincpu", Z80,6000000)
- MDRV_CPU_PROGRAM_MAP(main_memory,0)
- MDRV_CPU_IO_MAP(main_io,0)
+ MDRV_CPU_PROGRAM_MAP(main_memory)
+ MDRV_CPU_IO_MAP(main_io)
MDRV_CPU_VBLANK_INT_HACK(hvyunit_interrupt,2)
MDRV_CPU_ADD("sub", Z80,6000000)
- MDRV_CPU_PROGRAM_MAP(sub_memory,0)
- MDRV_CPU_IO_MAP(sub_io,0)
+ MDRV_CPU_PROGRAM_MAP(sub_memory)
+ MDRV_CPU_IO_MAP(sub_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(sound_memory,0)
- MDRV_CPU_IO_MAP(sound_io,0)
+ MDRV_CPU_PROGRAM_MAP(sound_memory)
+ MDRV_CPU_IO_MAP(sound_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index 38995ac8cb0..16a3a792c75 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -256,8 +256,8 @@ static MACHINE_DRIVER_START( hyhoo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 5000000/1) /* 5.00 MHz ?? */
- MDRV_CPU_PROGRAM_MAP(hyhoo_map,0)
- MDRV_CPU_IO_MAP(hyhoo_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(hyhoo_map)
+ MDRV_CPU_IO_MAP(hyhoo_io_map)
MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
MDRV_MACHINE_RESET(nb1413m3)
diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c
index 4791ec2314c..ab6d55c63d5 100644
--- a/src/mame/drivers/hyperspt.c
+++ b/src/mame/drivers/hyperspt.c
@@ -308,11 +308,11 @@ static MACHINE_DRIVER_START( hyperspt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(hyperspt_map,0)
+ MDRV_CPU_PROGRAM_MAP(hyperspt_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_NVRAM_HANDLER(hyperspt)
@@ -348,7 +348,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( roadf )
MDRV_IMPORT_FROM(hyperspt)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(roadf_map,0)
+ MDRV_CPU_PROGRAM_MAP(roadf_map)
MDRV_GFXDECODE(roadf)
MDRV_VIDEO_START(roadf)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index c1e6004e46a..e4e79869bc1 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -702,11 +702,11 @@ static MACHINE_DRIVER_START( hyprduel )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,20000000/2) /* 10MHz */
- MDRV_CPU_PROGRAM_MAP(hyprduel_map,0)
+ MDRV_CPU_PROGRAM_MAP(hyprduel_map)
MDRV_CPU_VBLANK_INT_HACK(hyprduel_interrupt,RASTER_LINES)
MDRV_CPU_ADD("sub", M68000,20000000/2) /* 10MHz */
- MDRV_CPU_PROGRAM_MAP(hyprduel_map2,0)
+ MDRV_CPU_PROGRAM_MAP(hyprduel_map2)
MDRV_MACHINE_RESET(hyprduel)
@@ -745,11 +745,11 @@ static MACHINE_DRIVER_START( magerror )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,20000000/2) /* 10MHz */
- MDRV_CPU_PROGRAM_MAP(magerror_map,0)
+ MDRV_CPU_PROGRAM_MAP(magerror_map)
MDRV_CPU_VBLANK_INT_HACK(hyprduel_interrupt,RASTER_LINES)
MDRV_CPU_ADD("sub", M68000,20000000/2) /* 10MHz */
- MDRV_CPU_PROGRAM_MAP(magerror_map2,0)
+ MDRV_CPU_PROGRAM_MAP(magerror_map2)
MDRV_MACHINE_START(magerror)
MDRV_MACHINE_RESET(hyprduel)
diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c
index 5eb03e82371..c52d1e7de08 100644
--- a/src/mame/drivers/igs009.c
+++ b/src/mame/drivers/igs009.c
@@ -633,8 +633,8 @@ static INTERRUPT_GEN( jingbell_interrupt )
static MACHINE_DRIVER_START( jingbell )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(jingbell_map,0)
- MDRV_CPU_IO_MAP(jingbell_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(jingbell_map)
+ MDRV_CPU_IO_MAP(jingbell_portmap)
MDRV_CPU_VBLANK_INT("screen",jingbell_interrupt)
MDRV_MACHINE_RESET(jingbell)
diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c
index aa22e1fe959..c7aab151c0d 100644
--- a/src/mame/drivers/igs017.c
+++ b/src/mame/drivers/igs017.c
@@ -1084,8 +1084,8 @@ static MACHINE_DRIVER_START( iqblocka )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z180, XTAL_16MHz / 2)
- MDRV_CPU_PROGRAM_MAP(iqblocka_map,0)
- MDRV_CPU_IO_MAP(iqblocka_io,0)
+ MDRV_CPU_PROGRAM_MAP(iqblocka_map)
+ MDRV_CPU_IO_MAP(iqblocka_io)
MDRV_CPU_VBLANK_INT_HACK(iqblocka_interrupt,2)
MDRV_PPI8255_ADD( "ppi8255", iqblocka_ppi8255_intf )
@@ -1153,7 +1153,7 @@ static const ppi8255_interface mgcs_ppi8255_intf =
static MACHINE_DRIVER_START( mgcs )
MDRV_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2)
- MDRV_CPU_PROGRAM_MAP(mgcs,0)
+ MDRV_CPU_PROGRAM_MAP(mgcs)
MDRV_CPU_VBLANK_INT_HACK(mgcs_interrupt,2)
MDRV_MACHINE_RESET(mgcs)
diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c
index 1e1925db0e3..e1c72f22787 100644
--- a/src/mame/drivers/igs_blit.c
+++ b/src/mame/drivers/igs_blit.c
@@ -2430,7 +2430,7 @@ static INTERRUPT_GEN( chmplst2_interrupt )
static MACHINE_DRIVER_START( chmplst2 )
MDRV_IMPORT_FROM(igs_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(chmplst2,0)
+ MDRV_CPU_PROGRAM_MAP(chmplst2)
MDRV_CPU_VBLANK_INT_HACK(chmplst2_interrupt,1+4) // lev5 frequency drives the music tempo
// MDRV_GFXDECODE(chmplst2)
@@ -2443,7 +2443,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( chindrag )
MDRV_IMPORT_FROM(igs_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(chindrag,0)
+ MDRV_CPU_PROGRAM_MAP(chindrag)
MDRV_CPU_VBLANK_INT_HACK(chmplst2_interrupt,1+4) // lev5 frequency drives the music tempo
MDRV_SOUND_ADD("ym", YM3812, 3579545)
@@ -2463,7 +2463,7 @@ static INTERRUPT_GEN( grtwall_interrupt )
static MACHINE_DRIVER_START( grtwall )
MDRV_IMPORT_FROM(igs_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(grtwall,0)
+ MDRV_CPU_PROGRAM_MAP(grtwall)
MDRV_CPU_VBLANK_INT_HACK(grtwall_interrupt,2)
MACHINE_DRIVER_END
@@ -2487,7 +2487,7 @@ static INTERRUPT_GEN( lhb_interrupt )
static MACHINE_DRIVER_START( lhb )
MDRV_IMPORT_FROM(igs_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(lhb,0)
+ MDRV_CPU_PROGRAM_MAP(lhb)
MDRV_CPU_VBLANK_INT_HACK(lhb_interrupt,3+1)
MACHINE_DRIVER_END
@@ -2517,7 +2517,7 @@ static INTERRUPT_GEN( vbowl_interrupt )
static MACHINE_DRIVER_START( vbowl )
MDRV_IMPORT_FROM(igs_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(vbowl,0)
+ MDRV_CPU_PROGRAM_MAP(vbowl)
MDRV_CPU_VBLANK_INT_HACK(vbowl_interrupt,3+4)
MDRV_VIDEO_EOF(vbowl) // trackball
@@ -2534,7 +2534,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( xymg )
MDRV_IMPORT_FROM(igs_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(xymg,0)
+ MDRV_CPU_PROGRAM_MAP(xymg)
MDRV_CPU_VBLANK_INT_HACK(grtwall_interrupt,2)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c
index d03267fd5c7..42deb655e92 100644
--- a/src/mame/drivers/igs_m027.c
+++ b/src/mame/drivers/igs_m027.c
@@ -367,7 +367,7 @@ static INTERRUPT_GEN( igs_majhong_interrupt )
static MACHINE_DRIVER_START( igs_majhong )
MDRV_CPU_ADD("maincpu",ARM7, 20000000)
- MDRV_CPU_PROGRAM_MAP(igs_majhong_map,0)
+ MDRV_CPU_PROGRAM_MAP(igs_majhong_map)
MDRV_CPU_VBLANK_INT("screen", igs_majhong_interrupt)
//MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/igs_m68.c b/src/mame/drivers/igs_m68.c
index f8160a32c42..126ae55a516 100644
--- a/src/mame/drivers/igs_m68.c
+++ b/src/mame/drivers/igs_m68.c
@@ -42,7 +42,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( igs_m68 )
MDRV_CPU_ADD("maincpu", M68000, 22000000 /2) // 11mhz
- MDRV_CPU_PROGRAM_MAP(igs_m68_map,0)
+ MDRV_CPU_PROGRAM_MAP(igs_m68_map)
//MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
//MDRV_GFXDECODE(igs_m68)
diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c
index fdccb37fff8..fe02bb5df0a 100644
--- a/src/mame/drivers/igspoker.c
+++ b/src/mame/drivers/igspoker.c
@@ -1576,8 +1576,8 @@ static MACHINE_DRIVER_START( igspoker )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(igspoker_prg_map,0)
- MDRV_CPU_IO_MAP(igspoker_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(igspoker_prg_map)
+ MDRV_CPU_IO_MAP(igspoker_io_map)
MDRV_CPU_VBLANK_INT_HACK(igs_interrupt,8)
MDRV_MACHINE_RESET(igs)
@@ -1625,7 +1625,7 @@ static MACHINE_DRIVER_START( number10 )
MDRV_IMPORT_FROM(igspoker)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(number10_io_map,0)
+ MDRV_CPU_IO_MAP(number10_io_map)
MDRV_SCREEN_MODIFY("screen")
MDRV_VIDEO_START(cpokerpk)
@@ -1640,7 +1640,7 @@ static MACHINE_DRIVER_START( cpokerpk )
MDRV_IMPORT_FROM(number10)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(cpokerpk_io_map,0)
+ MDRV_CPU_IO_MAP(cpokerpk_io_map)
MDRV_GFXDECODE(cpokerpk)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c
index a0695fc6dc6..a64039b4f4f 100644
--- a/src/mame/drivers/ikki.c
+++ b/src/mame/drivers/ikki.c
@@ -195,11 +195,11 @@ static MACHINE_DRIVER_START( ikki )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
- MDRV_CPU_PROGRAM_MAP(ikki_cpu1,0)
+ MDRV_CPU_PROGRAM_MAP(ikki_cpu1)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */
- MDRV_CPU_PROGRAM_MAP(ikki_cpu2,0)
+ MDRV_CPU_PROGRAM_MAP(ikki_cpu2)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/ilpag.c b/src/mame/drivers/ilpag.c
index b00e3d39ed9..212a39aa381 100644
--- a/src/mame/drivers/ilpag.c
+++ b/src/mame/drivers/ilpag.c
@@ -444,7 +444,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( ilpag )
MDRV_CPU_ADD("maincpu", M68000, 11059200 ) // ?
- MDRV_CPU_PROGRAM_MAP(ilpag_map,0)
+ MDRV_CPU_PROGRAM_MAP(ilpag_map)
MDRV_CPU_VBLANK_INT("screen",irq4_line_hold) //3 & 6 used, mcu comms?
MDRV_SCREEN_ADD("screen", RASTER)
@@ -513,7 +513,7 @@ static INTERRUPT_GEN( steaser_irq )
static MACHINE_DRIVER_START( steaser )
MDRV_IMPORT_FROM( ilpag )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(steaser_map,0)
+ MDRV_CPU_PROGRAM_MAP(steaser_map)
MDRV_CPU_VBLANK_INT_HACK(steaser_irq,4)
MDRV_TIMER_ADD_PERIODIC("coinsim", steaser_mcu_sim, HZ(10000)) // not real, but for simulating the MCU
diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c
index d79faeb21e8..c14aac76974 100644
--- a/src/mame/drivers/imolagp.c
+++ b/src/mame/drivers/imolagp.c
@@ -406,13 +406,13 @@ static const ppi8255_interface ppi8255_intf =
static MACHINE_DRIVER_START( imolagp )
MDRV_CPU_ADD("maincpu", Z80,8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(imolagp_master,0)
- MDRV_CPU_IO_MAP(readport_master,0)
+ MDRV_CPU_PROGRAM_MAP(imolagp_master)
+ MDRV_CPU_IO_MAP(readport_master)
MDRV_CPU_VBLANK_INT_HACK(master_interrupt,4)
MDRV_CPU_ADD("slave", Z80,8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(imolagp_slave,0)
- MDRV_CPU_IO_MAP(readport_slave,0)
+ MDRV_CPU_PROGRAM_MAP(imolagp_slave)
+ MDRV_CPU_IO_MAP(readport_slave)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c
index f0754ec9848..4d7407528e4 100644
--- a/src/mame/drivers/intrscti.c
+++ b/src/mame/drivers/intrscti.c
@@ -83,8 +83,8 @@ static VIDEO_UPDATE(intrscti)
static MACHINE_DRIVER_START( intrscti )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(intrscti_map,0)
- MDRV_CPU_IO_MAP(readport,0)
+ MDRV_CPU_PROGRAM_MAP(intrscti_map)
+ MDRV_CPU_IO_MAP(readport)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index e99cf71c6df..594593183f4 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -352,12 +352,12 @@ static MACHINE_DRIVER_START( inufuku )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 32000000/2) /* 16.00 MHz */
- MDRV_CPU_PROGRAM_MAP(inufuku_map, 0)
+ MDRV_CPU_PROGRAM_MAP(inufuku_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 32000000/4) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(inufuku_sound_map, 0)
- MDRV_CPU_IO_MAP(inufuku_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(inufuku_sound_map)
+ MDRV_CPU_IO_MAP(inufuku_sound_io_map)
/* IRQs are triggered by the YM2610 */
MDRV_MACHINE_RESET(inufuku)
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index dea1ddf09d1..e6f86f33158 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -269,8 +269,8 @@ static MACHINE_DRIVER_START( iqblock )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT_HACK(iqblock_interrupt,16)
MDRV_PPI8255_ADD( "ppi8255", ppi8255_intf )
diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c
index a0c45b1dccb..bd080d7e73c 100644
--- a/src/mame/drivers/irobot.c
+++ b/src/mame/drivers/irobot.c
@@ -286,7 +286,7 @@ static MACHINE_DRIVER_START( irobot )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809,1500000)
- MDRV_CPU_PROGRAM_MAP(irobot_map,0)
+ MDRV_CPU_PROGRAM_MAP(irobot_map)
MDRV_MACHINE_RESET(irobot)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index 05a9c8a4d87..58dee3891ec 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -335,12 +335,12 @@ static MACHINE_DRIVER_START( ironhors )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809,18432000/6) /* 3.072 MHz??? mod by Shingo Suzuki 1999/10/15 */
- MDRV_CPU_PROGRAM_MAP(master_map, 0)
+ MDRV_CPU_PROGRAM_MAP(master_map)
MDRV_CPU_VBLANK_INT_HACK(ironhors_interrupt,8)
MDRV_CPU_ADD("soundcpu",Z80,18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(slave_map, 0)
- MDRV_CPU_IO_MAP(slave_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(slave_map)
+ MDRV_CPU_IO_MAP(slave_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -412,12 +412,12 @@ static MACHINE_DRIVER_START( farwest )
MDRV_IMPORT_FROM(ironhors)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(farwest_master_map, 0)
+ MDRV_CPU_PROGRAM_MAP(farwest_master_map)
MDRV_CPU_VBLANK_INT_HACK(farwest_interrupt,255)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(farwest_slave_map, 0)
- MDRV_CPU_IO_MAP(0, 0)
+ MDRV_CPU_PROGRAM_MAP(farwest_slave_map)
+ MDRV_CPU_IO_MAP(0)
MDRV_GFXDECODE(farwest)
MDRV_VIDEO_START(farwest)
diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c
index 0476aaaad74..c8081813db8 100644
--- a/src/mame/drivers/istellar.c
+++ b/src/mame/drivers/istellar.c
@@ -324,19 +324,19 @@ static INTERRUPT_GEN( vblank_callback_istellar )
static MACHINE_DRIVER_START( istellar )
/* main cpu */
MDRV_CPU_ADD("maincpu", Z80, GUESSED_CLOCK)
- MDRV_CPU_PROGRAM_MAP(z80_0_mem,0)
- MDRV_CPU_IO_MAP(z80_0_io,0)
+ MDRV_CPU_PROGRAM_MAP(z80_0_mem)
+ MDRV_CPU_IO_MAP(z80_0_io)
MDRV_CPU_VBLANK_INT("screen", vblank_callback_istellar)
/* sound cpu */
MDRV_CPU_ADD("audiocpu", Z80, GUESSED_CLOCK)
- MDRV_CPU_PROGRAM_MAP(z80_1_mem,0)
- MDRV_CPU_IO_MAP(z80_1_io,0)
+ MDRV_CPU_PROGRAM_MAP(z80_1_mem)
+ MDRV_CPU_IO_MAP(z80_1_io)
/* ldp comm cpu */
MDRV_CPU_ADD("sub", Z80, GUESSED_CLOCK)
- MDRV_CPU_PROGRAM_MAP(z80_2_mem,0)
- MDRV_CPU_IO_MAP(z80_2_io,0)
+ MDRV_CPU_PROGRAM_MAP(z80_2_mem)
+ MDRV_CPU_IO_MAP(z80_2_io)
MDRV_MACHINE_START(istellar)
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index d02636454f5..dd4460fa5fd 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -1729,11 +1729,11 @@ static MACHINE_DRIVER_START( timekill )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(timekill_map,0)
+ MDRV_CPU_PROGRAM_MAP(timekill_map)
MDRV_CPU_VBLANK_INT("screen", generate_int1)
MDRV_CPU_ADD("soundcpu", M6809, SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(itech32)
MDRV_NVRAM_HANDLER(itech32)
@@ -1767,7 +1767,7 @@ static MACHINE_DRIVER_START( bloodstm )
MDRV_IMPORT_FROM(timekill)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bloodstm_map,0)
+ MDRV_CPU_PROGRAM_MAP(bloodstm_map)
/* video hardware */
MDRV_PALETTE_LENGTH(32768)
@@ -1780,14 +1780,14 @@ static MACHINE_DRIVER_START( drivedge )
MDRV_IMPORT_FROM(bloodstm)
MDRV_CPU_REPLACE("maincpu", M68EC020, CPU020_CLOCK)
- MDRV_CPU_PROGRAM_MAP(drivedge_map,0)
+ MDRV_CPU_PROGRAM_MAP(drivedge_map)
MDRV_CPU_VBLANK_INT_HACK(NULL,0)
MDRV_CPU_ADD("dsp1", TMS32031, TMS_CLOCK)
- MDRV_CPU_PROGRAM_MAP(drivedge_tms1_map,0)
+ MDRV_CPU_PROGRAM_MAP(drivedge_tms1_map)
MDRV_CPU_ADD("dsp2", TMS32031, TMS_CLOCK)
- MDRV_CPU_PROGRAM_MAP(drivedge_tms2_map,0)
+ MDRV_CPU_PROGRAM_MAP(drivedge_tms2_map)
// MDRV_CPU_ADD("comm", M6803, 8000000/4) -- network CPU
@@ -1802,10 +1802,10 @@ static MACHINE_DRIVER_START( sftm )
MDRV_IMPORT_FROM(bloodstm)
MDRV_CPU_REPLACE("maincpu", M68EC020, CPU020_CLOCK)
- MDRV_CPU_PROGRAM_MAP(itech020_map,0)
+ MDRV_CPU_PROGRAM_MAP(itech020_map)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(sound_020_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_020_map)
MDRV_CPU_VBLANK_INT_HACK(irq1_line_assert,4)
MDRV_NVRAM_HANDLER(itech020)
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index 7dd2619ba8c..5f20651a265 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -1724,7 +1724,7 @@ static MACHINE_DRIVER_START( itech8_core_lo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, CLOCK_8MHz/4)
- MDRV_CPU_PROGRAM_MAP(tmslo_map,0)
+ MDRV_CPU_PROGRAM_MAP(tmslo_map)
MDRV_CPU_VBLANK_INT("screen", generate_nmi)
MDRV_MACHINE_RESET(itech8)
@@ -1752,7 +1752,7 @@ static MACHINE_DRIVER_START( itech8_core_hi )
/* basic machine hardware */
MDRV_IMPORT_FROM(itech8_core_lo)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tmshi_map,0)
+ MDRV_CPU_PROGRAM_MAP(tmshi_map)
MACHINE_DRIVER_END
@@ -1760,7 +1760,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym2203 )
/* basic machine hardware */
MDRV_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4)
- MDRV_CPU_PROGRAM_MAP(sound2203_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound2203_map)
/* sound hardware */
MDRV_SOUND_ADD("ym", YM2203, CLOCK_8MHz/2)
@@ -1780,7 +1780,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym2608b )
/* basic machine hardware */
MDRV_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4)
- MDRV_CPU_PROGRAM_MAP(sound2608b_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound2608b_map)
/* sound hardware */
MDRV_SOUND_ADD("ym", YM2608, CLOCK_8MHz)
@@ -1793,7 +1793,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym3812 )
/* basic machine hardware */
MDRV_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4)
- MDRV_CPU_PROGRAM_MAP(sound3812_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound3812_map)
MDRV_PIA6821_ADD("pia", pia_interface)
@@ -1812,7 +1812,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym3812_external )
/* basic machine hardware */
MDRV_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4)
- MDRV_CPU_PROGRAM_MAP(sound3812_external_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound3812_external_map)
/* sound hardware */
MDRV_SOUND_ADD("ym", YM3812, CLOCK_8MHz/2)
@@ -1889,8 +1889,8 @@ static MACHINE_DRIVER_START( slikshot_hi )
MDRV_IMPORT_FROM(itech8_sound_ym2203)
MDRV_CPU_ADD("sub", Z80, CLOCK_8MHz/2)
- MDRV_CPU_PROGRAM_MAP(slikz80_mem_map,0)
- MDRV_CPU_IO_MAP(slikz80_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(slikz80_mem_map)
+ MDRV_CPU_IO_MAP(slikz80_io_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -1906,8 +1906,8 @@ static MACHINE_DRIVER_START( slikshot_lo )
MDRV_IMPORT_FROM(itech8_sound_ym2203)
MDRV_CPU_ADD("sub", Z80, CLOCK_8MHz/2)
- MDRV_CPU_PROGRAM_MAP(slikz80_mem_map,0)
- MDRV_CPU_IO_MAP(slikz80_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(slikz80_mem_map)
+ MDRV_CPU_IO_MAP(slikz80_io_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -1986,7 +1986,7 @@ static MACHINE_DRIVER_START( ninclown )
MDRV_IMPORT_FROM(itech8_sound_ym3812_external)
MDRV_CPU_REPLACE("maincpu", M68000, CLOCK_12MHz)
- MDRV_CPU_PROGRAM_MAP(ninclown_map,0)
+ MDRV_CPU_PROGRAM_MAP(ninclown_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2002,7 +2002,7 @@ static MACHINE_DRIVER_START( gtg2 )
MDRV_IMPORT_FROM(itech8_sound_ym3812_external)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gtg2_map,0)
+ MDRV_CPU_PROGRAM_MAP(gtg2_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c
index 81e28ed53a2..4978de95700 100644
--- a/src/mame/drivers/itgambl2.c
+++ b/src/mame/drivers/itgambl2.c
@@ -247,7 +247,7 @@ static MACHINE_DRIVER_START( itgambl2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a H8/3337 core ATM */
- MDRV_CPU_PROGRAM_MAP(itgambl2_map,0)
+ MDRV_CPU_PROGRAM_MAP(itgambl2_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c
index 6974df818b1..bb69ad32211 100644
--- a/src/mame/drivers/itgambl3.c
+++ b/src/mame/drivers/itgambl3.c
@@ -236,7 +236,7 @@ static MACHINE_DRIVER_START( itgambl3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a M16C core ATM */
- MDRV_CPU_PROGRAM_MAP(itgambl3_map,0)
+ MDRV_CPU_PROGRAM_MAP(itgambl3_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c
index fba9551a370..4b7350a8ba2 100644
--- a/src/mame/drivers/itgamble.c
+++ b/src/mame/drivers/itgamble.c
@@ -183,7 +183,7 @@ static MACHINE_DRIVER_START( itgamble )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", H83044, MAIN_CLOCK/2) /* probably the wrong CPU */
- MDRV_CPU_PROGRAM_MAP(itgamble_map,0)
+ MDRV_CPU_PROGRAM_MAP(itgamble_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index 3cf73f9fddd..7535f3fedac 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -841,12 +841,12 @@ static MACHINE_DRIVER_START( jack )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18000000/6) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(jack_map,0)
+ MDRV_CPU_PROGRAM_MAP(jack_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* jack needs 1 or its too fast */
MDRV_CPU_ADD("audiocpu", Z80,18000000/12) /* 1.5 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -894,7 +894,7 @@ static MACHINE_DRIVER_START( joinem )
/* basic machine hardware */
MDRV_IMPORT_FROM(jack)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(joinem_map,0)
+ MDRV_CPU_PROGRAM_MAP(joinem_map)
MDRV_CPU_VBLANK_INT_HACK(joinem_interrupts,3)
MDRV_GFXDECODE(joinem)
@@ -914,7 +914,7 @@ static MACHINE_DRIVER_START( loverboy )
/* basic machine hardware */
MDRV_IMPORT_FROM(jack)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(joinem_map,0)
+ MDRV_CPU_PROGRAM_MAP(joinem_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_GFXDECODE(joinem)
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index ce151138e72..6736d04c875 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -252,11 +252,11 @@ static INTERRUPT_GEN( jackal_interrupt )
static MACHINE_DRIVER_START( jackal )
// basic machine hardware
MDRV_CPU_ADD("master", M6809, MASTER_CLOCK/12) // verified on pcb
- MDRV_CPU_PROGRAM_MAP(master_map, 0)
+ MDRV_CPU_PROGRAM_MAP(master_map)
MDRV_CPU_VBLANK_INT("screen", jackal_interrupt)
MDRV_CPU_ADD("slave", M6809, MASTER_CLOCK/12) // verified on pcb
- MDRV_CPU_PROGRAM_MAP(slave_map, 0)
+ MDRV_CPU_PROGRAM_MAP(slave_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c
index 85a88655c7c..5d0fec42a3a 100644
--- a/src/mame/drivers/jackie.c
+++ b/src/mame/drivers/jackie.c
@@ -462,8 +462,8 @@ static MACHINE_DRIVER_START( jackie )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2)
- MDRV_CPU_PROGRAM_MAP(jackie_prg_map,0)
- MDRV_CPU_IO_MAP(jackie_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(jackie_prg_map)
+ MDRV_CPU_IO_MAP(jackie_io_map)
MDRV_CPU_VBLANK_INT_HACK(jackie_interrupt,8)
MDRV_MACHINE_RESET(jackie)
diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c
index 1f1cf973615..e1ea068741b 100644
--- a/src/mame/drivers/jackpool.c
+++ b/src/mame/drivers/jackpool.c
@@ -253,7 +253,7 @@ static INTERRUPT_GEN( jackpool_interrupt )
static MACHINE_DRIVER_START( jackpool )
MDRV_CPU_ADD("maincpu", M68000, 12000000) // ?
- MDRV_CPU_PROGRAM_MAP(jackpool_mem,0)
+ MDRV_CPU_PROGRAM_MAP(jackpool_mem)
MDRV_CPU_VBLANK_INT("lscreen",jackpool_interrupt) // ?
MDRV_GFXDECODE(jackpool)
diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c
index d8329456b93..98c85d077d5 100644
--- a/src/mame/drivers/jailbrek.c
+++ b/src/mame/drivers/jailbrek.c
@@ -203,7 +203,7 @@ static MACHINE_DRIVER_START( jailbrek )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/12)
- MDRV_CPU_PROGRAM_MAP(jailbrek_map, 0)
+ MDRV_CPU_PROGRAM_MAP(jailbrek_map)
MDRV_CPU_VBLANK_INT("screen", jb_interrupt)
MDRV_CPU_PERIODIC_INT(jb_interrupt_nmi, 500) /* ? */
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index c3d98e6d697..6a70ba5e742 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -1296,7 +1296,7 @@ static MACHINE_RESET ( jalmah )
static MACHINE_DRIVER_START( jalmah )
MDRV_CPU_ADD("maincpu" , M68000, 8000000) /* 68000-8 */
- MDRV_CPU_PROGRAM_MAP(jalmah,0)
+ MDRV_CPU_PROGRAM_MAP(jalmah)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
//M50747 MCU
@@ -1328,7 +1328,7 @@ static MACHINE_DRIVER_START( urashima )
MDRV_IMPORT_FROM(jalmah)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(urashima,0)
+ MDRV_CPU_PROGRAM_MAP(urashima)
MDRV_GFXDECODE(urashima)
diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c
index 9e26ede78ab..50a38662d29 100644
--- a/src/mame/drivers/jangou.c
+++ b/src/mame/drivers/jangou.c
@@ -760,13 +760,13 @@ static SOUND_START( jangou )
static MACHINE_DRIVER_START( jangou )
/* basic machine hardware */
MDRV_CPU_ADD("cpu0", Z80, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(0, cpu0_map)
- MDRV_CPU_IO_MAP(0, cpu0_io)
+ MDRV_CPU_PROGRAM_MAP(cpu0_map)
+ MDRV_CPU_IO_MAP(cpu0_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("cpu1", Z80, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(0, cpu1_map)
- MDRV_CPU_IO_MAP(0, cpu1_io)
+ MDRV_CPU_PROGRAM_MAP(cpu1_map)
+ MDRV_CPU_IO_MAP(cpu1_io)
/* video hardware */
MDRV_PALETTE_INIT(jangou)
@@ -801,14 +801,14 @@ static MACHINE_DRIVER_START( jngolady )
MDRV_IMPORT_FROM(jangou)
MDRV_CPU_MODIFY("cpu0")
- MDRV_CPU_PROGRAM_MAP(0, jngolady_cpu0_map)
+ MDRV_CPU_PROGRAM_MAP(jngolady_cpu0_map)
MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(0, jngolady_cpu1_map)
- MDRV_CPU_IO_MAP(0, jngolady_cpu1_io)
+ MDRV_CPU_PROGRAM_MAP(jngolady_cpu1_map)
+ MDRV_CPU_IO_MAP(jngolady_cpu1_io)
MDRV_CPU_ADD("nsc", NSC8105, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(nsc_map, 0)
+ MDRV_CPU_PROGRAM_MAP(nsc_map)
/* sound hardware */
MDRV_SOUND_START(NULL)
@@ -824,8 +824,8 @@ static MACHINE_DRIVER_START( cntrygrl )
MDRV_IMPORT_FROM(jangou)
MDRV_CPU_MODIFY("cpu0")
- MDRV_CPU_PROGRAM_MAP(0, cntrygrl_cpu0_map )
- MDRV_CPU_IO_MAP(0,cntrygrl_cpu0_io )
+ MDRV_CPU_PROGRAM_MAP(cntrygrl_cpu0_map )
+ MDRV_CPU_IO_MAP(cntrygrl_cpu0_io )
MDRV_CPU_REMOVE("cpu1")
diff --git a/src/mame/drivers/janshi.c b/src/mame/drivers/janshi.c
index 79a2e9415c9..8dff6cca56e 100644
--- a/src/mame/drivers/janshi.c
+++ b/src/mame/drivers/janshi.c
@@ -72,7 +72,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( janshi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,6000000) /* Z180 */ /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(0,mainmap)
+ MDRV_CPU_PROGRAM_MAP(mainmap)
// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c
index f29867c9874..8100ea00463 100644
--- a/src/mame/drivers/jantotsu.c
+++ b/src/mame/drivers/jantotsu.c
@@ -401,8 +401,8 @@ static const msm5205_interface msm5205_config =
static MACHINE_DRIVER_START( jantotsu )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,18432000/4)
- MDRV_CPU_PROGRAM_MAP(0,jantotsu_map)
- MDRV_CPU_IO_MAP(0,jantotsu_io)
+ MDRV_CPU_PROGRAM_MAP(jantotsu_map)
+ MDRV_CPU_IO_MAP(jantotsu_io)
MDRV_CPU_VBLANK_INT("screen", jantotsu_irq)
MDRV_MACHINE_RESET(jantotsu)
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index e63e5ad6140..5c1c78be375 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -658,11 +658,11 @@ static const ymz280b_interface ymz280b_intf =
static MACHINE_DRIVER_START( jchan )
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(jchan_main,0)
+ MDRV_CPU_PROGRAM_MAP(jchan_main)
MDRV_CPU_VBLANK_INT_HACK(jchan_vblank, 224)
MDRV_CPU_ADD("sub", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(jchan_sub,0)
+ MDRV_CPU_PROGRAM_MAP(jchan_sub)
MDRV_GFXDECODE(jchan)
diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c
index bad77132e69..423a1c14cb8 100644
--- a/src/mame/drivers/jedi.c
+++ b/src/mame/drivers/jedi.c
@@ -347,7 +347,7 @@ static MACHINE_DRIVER_START( jedi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, JEDI_MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_QUANTUM_TIME(HZ(240))
diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c
index 80e95aecc24..98681cc4802 100644
--- a/src/mame/drivers/jokrwild.c
+++ b/src/mame/drivers/jokrwild.c
@@ -365,7 +365,7 @@ static MACHINE_DRIVER_START( jokrwild )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/8) /* guess */
- MDRV_CPU_PROGRAM_MAP(jokrwild_map, 0)
+ MDRV_CPU_PROGRAM_MAP(jokrwild_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
// MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c
index 686e4af68e5..0e0bb3b827d 100644
--- a/src/mame/drivers/jollyjgr.c
+++ b/src/mame/drivers/jollyjgr.c
@@ -400,7 +400,7 @@ static INTERRUPT_GEN( jollyjgr_interrupt )
static MACHINE_DRIVER_START( jollyjgr )
MDRV_CPU_ADD("maincpu", Z80, 3579545) /* 3,579545 MHz */
- MDRV_CPU_PROGRAM_MAP(jollyjgr_map,0)
+ MDRV_CPU_PROGRAM_MAP(jollyjgr_map)
MDRV_CPU_VBLANK_INT("screen", jollyjgr_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c
index 83d4bebd937..6111feab2bd 100644
--- a/src/mame/drivers/jongkyo.c
+++ b/src/mame/drivers/jongkyo.c
@@ -418,8 +418,8 @@ static const ay8910_interface ay8910_config =
static MACHINE_DRIVER_START( jongkyo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,JONGKYO_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(jongkyo_memmap,0)
- MDRV_CPU_IO_MAP(jongkyo_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(jongkyo_memmap)
+ MDRV_CPU_IO_MAP(jongkyo_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index efc6fab4e46..568bc75472f 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -845,11 +845,11 @@ static const tms34010_config tms_config =
static MACHINE_DRIVER_START( jpmimpct )
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(m68k_program_map, 0)
+ MDRV_CPU_PROGRAM_MAP(m68k_program_map)
MDRV_CPU_ADD("dsp", TMS34010, 40000000)
MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(tms_program_map, 0)
+ MDRV_CPU_PROGRAM_MAP(tms_program_map)
MDRV_QUANTUM_TIME(HZ(30000))
MDRV_MACHINE_RESET(jpmimpct)
@@ -1316,7 +1316,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( impctawp )
MDRV_CPU_ADD("maincpu",M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(awp68k_program_map, 0)
+ MDRV_CPU_PROGRAM_MAP(awp68k_program_map)
MDRV_QUANTUM_TIME(HZ(30000))
diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c
index 0487ce6a8a9..a8547c0553b 100644
--- a/src/mame/drivers/jpmsys5.c
+++ b/src/mame/drivers/jpmsys5.c
@@ -597,7 +597,7 @@ static MACHINE_RESET( jpmsys5v )
static MACHINE_DRIVER_START( jpmsys5v )
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(68000_map, 0)
+ MDRV_CPU_PROGRAM_MAP(68000_map)
MDRV_ACIA6850_ADD("acia6850_0", acia0_if)
MDRV_ACIA6850_ADD("acia6850_1", acia1_if)
diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c
index 386e2e820af..89ad7bd2424 100644
--- a/src/mame/drivers/jrpacman.c
+++ b/src/mame/drivers/jrpacman.c
@@ -267,8 +267,8 @@ static MACHINE_DRIVER_START( jrpacman )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(port_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(port_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index d6981aab828..8a59e1f7696 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -280,15 +280,15 @@ static MACHINE_DRIVER_START( junofrst )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 1500000) /* 1.5 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,14318000/8) /* 1.78975 MHz */
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
MDRV_CPU_ADD("mcu", I8039,8000000) /* 8MHz crystal */
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
- MDRV_CPU_IO_MAP(mcu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MDRV_CPU_IO_MAP(mcu_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 2e8fabb8db0..5a1676260e8 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -1661,7 +1661,7 @@ static MACHINE_DRIVER_START( berlwall )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12 */
- MDRV_CPU_PROGRAM_MAP(berlwall,0)
+ MDRV_CPU_PROGRAM_MAP(berlwall)
MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
MDRV_MACHINE_RESET(berlwall)
@@ -1708,7 +1708,7 @@ static MACHINE_DRIVER_START( bakubrkr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(bakubrkr,0)
+ MDRV_CPU_PROGRAM_MAP(bakubrkr)
MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
MDRV_MACHINE_RESET(bakubrkr)
@@ -1764,12 +1764,12 @@ static MACHINE_DRIVER_START( blazeon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,12000000) /* TMP68HC000-12 */
- MDRV_CPU_PROGRAM_MAP(blazeon,0)
+ MDRV_CPU_PROGRAM_MAP(blazeon)
MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
MDRV_CPU_ADD("audiocpu", Z80,4000000) /* D780C-2 */
- MDRV_CPU_PROGRAM_MAP(blazeon_soundmem,0)
- MDRV_CPU_IO_MAP(blazeon_soundport,0)
+ MDRV_CPU_PROGRAM_MAP(blazeon_soundmem)
+ MDRV_CPU_IO_MAP(blazeon_soundport)
MDRV_MACHINE_RESET(blazeon)
@@ -1817,7 +1817,7 @@ static MACHINE_DRIVER_START( gtmr )
/* basic machine hardware */
MDRV_CPU_ADD("gtmr", M68000, XTAL_16MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(gtmr_map,0)
+ MDRV_CPU_PROGRAM_MAP(gtmr_map)
MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
MDRV_MACHINE_RESET(gtmr)
@@ -1859,7 +1859,7 @@ static MACHINE_DRIVER_START( bloodwar )
/* basic machine hardware */
MDRV_IMPORT_FROM(gtmr)
MDRV_CPU_MODIFY("gtmr")
- MDRV_CPU_PROGRAM_MAP(bloodwar,0)
+ MDRV_CPU_PROGRAM_MAP(bloodwar)
MDRV_MACHINE_RESET( bloodwar )
MACHINE_DRIVER_END
@@ -1873,7 +1873,7 @@ static MACHINE_DRIVER_START( gtmr2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(gtmr)
MDRV_CPU_MODIFY("gtmr")
- MDRV_CPU_PROGRAM_MAP(gtmr2_map,0)
+ MDRV_CPU_PROGRAM_MAP(gtmr2_map)
MACHINE_DRIVER_END
/***************************************************************************
@@ -1895,7 +1895,7 @@ static MACHINE_DRIVER_START( bonkadv )
/* basic machine hardware */
MDRV_IMPORT_FROM(gtmr)
MDRV_CPU_MODIFY("gtmr")
- MDRV_CPU_PROGRAM_MAP(bonkadv,0)
+ MDRV_CPU_PROGRAM_MAP(bonkadv)
MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM + 1 ) // comment above
MDRV_MACHINE_RESET( bonkadv )
@@ -1909,7 +1909,7 @@ static MACHINE_DRIVER_START( mgcrystl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mgcrystl,0)
+ MDRV_CPU_PROGRAM_MAP(mgcrystl)
MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
MDRV_MACHINE_RESET(mgcrystl)
@@ -1979,7 +1979,7 @@ static MACHINE_DRIVER_START( shogwarr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(shogwarr,0)
+ MDRV_CPU_PROGRAM_MAP(shogwarr)
MDRV_CPU_VBLANK_INT_HACK(shogwarr_interrupt,SHOGWARR_INTERRUPTS_NUM)
MDRV_MACHINE_RESET(shogwarr)
diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c
index b28f04f5826..700855940d2 100644
--- a/src/mame/drivers/kangaroo.c
+++ b/src/mame/drivers/kangaroo.c
@@ -442,12 +442,12 @@ static MACHINE_DRIVER_START( nomcu )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_START(kangaroo)
@@ -477,7 +477,7 @@ static MACHINE_DRIVER_START( mcu )
MDRV_CPU_ADD("mcu", MB8841, MASTER_CLOCK/4/12)
MDRV_CPU_FLAGS(CPU_DISABLE)
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index 8b5ca7c4eef..4b26a986d6b 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -720,11 +720,11 @@ static MACHINE_DRIVER_START( karnov )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(karnov_map,0)
+ MDRV_CPU_PROGRAM_MAP(karnov_map)
MDRV_CPU_VBLANK_INT("screen", karnov_interrupt)
MDRV_CPU_ADD("audiocpu", M6502, 1500000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(karnov_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(karnov_sound_map)
MDRV_MACHINE_RESET(karnov)
@@ -761,11 +761,11 @@ static MACHINE_DRIVER_START( wndrplnt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(karnov_map,0)
+ MDRV_CPU_PROGRAM_MAP(karnov_map)
MDRV_CPU_VBLANK_INT("screen", karnov_interrupt)
MDRV_CPU_ADD("audiocpu", M6502, 1500000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(karnov_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(karnov_sound_map)
MDRV_MACHINE_RESET(karnov)
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index 34ca283de4c..f7fb97eb016 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -402,13 +402,13 @@ static MACHINE_DRIVER_START( kchampvs )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kchampvs_map,0)
- MDRV_CPU_IO_MAP(kchampvs_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(kchampvs_map)
+ MDRV_CPU_IO_MAP(kchampvs_io_map)
MDRV_CPU_VBLANK_INT("screen", kc_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kchampvs_sound_map,0)
- MDRV_CPU_IO_MAP(kchampvs_sound_io_map,0) /* irq's triggered from main cpu */
+ MDRV_CPU_PROGRAM_MAP(kchampvs_sound_map)
+ MDRV_CPU_IO_MAP(kchampvs_sound_io_map) /* irq's triggered from main cpu */
/* nmi's from msm5205 */
/* video hardware */
@@ -448,13 +448,13 @@ static MACHINE_DRIVER_START( kchamp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kchamp_map,0)
- MDRV_CPU_IO_MAP(kchamp_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(kchamp_map)
+ MDRV_CPU_IO_MAP(kchamp_io_map)
MDRV_CPU_VBLANK_INT("screen", kc_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kchamp_sound_map,0)
- MDRV_CPU_IO_MAP(kchamp_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(kchamp_sound_map)
+ MDRV_CPU_IO_MAP(kchamp_sound_io_map)
MDRV_CPU_PERIODIC_INT(sound_int, 125) /* Hz */
/* irq's triggered from main cpu */
/* nmi's from 125 Hz clock */
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index 0629b439197..2075bbdb014 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -669,14 +669,14 @@ static MACHINE_DRIVER_START( kickgoal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(kickgoal_program_map, 0)
+ MDRV_CPU_PROGRAM_MAP(kickgoal_program_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_PERIODIC_INT(kickgoal_interrupt, 240)
MDRV_CPU_ADD("audiocpu", PIC16C57, 12000000/4) /* 3MHz ? */
MDRV_CPU_FLAGS(CPU_DISABLE) /* Disables since the internal rom isn't dumped */
/* Program and Data Maps are internal to the MCU */
- MDRV_CPU_IO_MAP(kickgoal_sound_io_map, 0)
+ MDRV_CPU_IO_MAP(kickgoal_sound_io_map)
MDRV_NVRAM_HANDLER(kickgoal)
@@ -705,13 +705,13 @@ static MACHINE_DRIVER_START( actionhw )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(kickgoal_program_map, 0)
+ MDRV_CPU_PROGRAM_MAP(kickgoal_program_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", PIC16C57, XTAL_12MHz/3) /* verified on pcb */
MDRV_CPU_FLAGS(CPU_DISABLE) /* Disables since the internal rom isn't dumped */
/* Program and Data Maps are internal to the MCU */
- MDRV_CPU_IO_MAP(actionhw_io_map, 0)
+ MDRV_CPU_IO_MAP(actionhw_io_map)
MDRV_NVRAM_HANDLER(kickgoal) // 93C46 really
diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c
index cfea59f265e..308641641a9 100644
--- a/src/mame/drivers/kingdrby.c
+++ b/src/mame/drivers/kingdrby.c
@@ -682,18 +682,18 @@ static PALETTE_INIT(kingdrby)
static MACHINE_DRIVER_START( kingdrby )
MDRV_CPU_ADD("master", Z80, CLK_2)
- MDRV_CPU_PROGRAM_MAP(master_map,0)
- MDRV_CPU_IO_MAP(master_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(master_map)
+ MDRV_CPU_IO_MAP(master_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("slave", Z80, CLK_2)
- MDRV_CPU_PROGRAM_MAP(slave_map,0)
- MDRV_CPU_IO_MAP(slave_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(slave_map)
+ MDRV_CPU_IO_MAP(slave_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, CLK_2)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,1000) /* guess, controls ay8910 tempo.*/
MDRV_QUANTUM_PERFECT_CPU("master")
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index cb1bdc8b341..3655f99b6b0 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -474,20 +474,20 @@ static MACHINE_DRIVER_START( kingofb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kingobox_map,0)
+ MDRV_CPU_PROGRAM_MAP(kingobox_map)
MDRV_CPU_VBLANK_INT("screen", kingofb_interrupt)
MDRV_CPU_ADD("video", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kingobox_video_map,0)
+ MDRV_CPU_PROGRAM_MAP(kingobox_video_map)
MDRV_CPU_VBLANK_INT("screen", kingofb_interrupt)
MDRV_CPU_ADD("sprite", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kingobox_sprite_map,0)
+ MDRV_CPU_PROGRAM_MAP(kingobox_sprite_map)
MDRV_CPU_VBLANK_INT("screen", kingofb_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kingobox_sound_map,0)
- MDRV_CPU_IO_MAP(ringking_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(kingobox_sound_map)
+ MDRV_CPU_IO_MAP(ringking_sound_io_map)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 6000) /* Hz */
MDRV_QUANTUM_TIME(HZ(6000)) /* We really need heavy synching among the processors */
@@ -524,20 +524,20 @@ static MACHINE_DRIVER_START( ringking )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(ringking_map,0)
+ MDRV_CPU_PROGRAM_MAP(ringking_map)
MDRV_CPU_VBLANK_INT("screen", kingofb_interrupt)
MDRV_CPU_ADD("video", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(ringking_video_map,0)
+ MDRV_CPU_PROGRAM_MAP(ringking_video_map)
MDRV_CPU_VBLANK_INT("screen", kingofb_interrupt)
MDRV_CPU_ADD("sprite", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(ringking_sprite_map,0)
+ MDRV_CPU_PROGRAM_MAP(ringking_sprite_map)
MDRV_CPU_VBLANK_INT("screen", kingofb_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kingobox_sound_map,0)
- MDRV_CPU_IO_MAP(ringking_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(kingobox_sound_map)
+ MDRV_CPU_IO_MAP(ringking_sound_io_map)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 6000) /* Hz */
MDRV_QUANTUM_TIME(HZ(6000)) /* We really need heavy synching among the processors */
diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c
index da7682817f3..9b2ed37d440 100644
--- a/src/mame/drivers/kingpin.c
+++ b/src/mame/drivers/kingpin.c
@@ -141,14 +141,14 @@ static const TMS9928a_interface tms9928a_interface =
static MACHINE_DRIVER_START( kingpin )
/* MAIN CPU */
MDRV_CPU_ADD("maincpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(kingpin_program_map,0)
- MDRV_CPU_IO_MAP(kingpin_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(kingpin_program_map)
+ MDRV_CPU_IO_MAP(kingpin_io_map)
MDRV_CPU_VBLANK_INT("screen", kingpin_video_interrupt)
/* SOUND CPU */
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(kingpin_sound_map,0)
- /*MDRV_CPU_IO_MAP(sound_io_map,0)*/
+ MDRV_CPU_PROGRAM_MAP(kingpin_sound_map)
+ /*MDRV_CPU_IO_MAP(sound_io_map)*/
/* VIDEO */
MDRV_IMPORT_FROM(tms9928a)
diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c
index 12bd45bdecd..c0e98b2e1f9 100644
--- a/src/mame/drivers/kinst.c
+++ b/src/mame/drivers/kinst.c
@@ -641,7 +641,7 @@ static MACHINE_DRIVER_START( kinst )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", R4600LE, MASTER_CLOCK*2)
MDRV_CPU_CONFIG(config)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_start)
MDRV_MACHINE_START(kinst)
diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c
index 00d7087a8a8..ef3cc0b1179 100644
--- a/src/mame/drivers/klax.c
+++ b/src/mame/drivers/klax.c
@@ -159,7 +159,7 @@ static MACHINE_DRIVER_START( klax )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(klax_map,0)
+ MDRV_CPU_PROGRAM_MAP(klax_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_MACHINE_RESET(klax)
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index 6cf47216abf..284687c6097 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -257,12 +257,12 @@ static MACHINE_DRIVER_START( kncljoe )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_6MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("soundcpu", M6803, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_PERIODIC_INT(sound_nmi, (double)3970) //measured 3.970 kHz
diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c
index bfc3b1586e6..186707ac34f 100644
--- a/src/mame/drivers/koftball.c
+++ b/src/mame/drivers/koftball.c
@@ -203,7 +203,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( koftball )
MDRV_CPU_ADD("maincpu", M68000, 21477270/2 )
- MDRV_CPU_PROGRAM_MAP(koftball_mem,0)
+ MDRV_CPU_PROGRAM_MAP(koftball_mem)
MDRV_CPU_VBLANK_INT_HACK(bmc_interrupt,3)
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c
index 51a2695cc36..09990612d15 100644
--- a/src/mame/drivers/koikoi.c
+++ b/src/mame/drivers/koikoi.c
@@ -251,8 +251,8 @@ static MACHINE_DRIVER_START( koikoi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,KOIKOI_CRYSTAL/4) /* ?? */
- MDRV_CPU_PROGRAM_MAP(koikoi_map, 0)
- MDRV_CPU_IO_MAP(koikoi_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(koikoi_map)
+ MDRV_CPU_IO_MAP(koikoi_io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index 9bcb920b884..4e9bb56d4ce 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -381,11 +381,11 @@ static MACHINE_RESET( konamigq )
static MACHINE_DRIVER_START( konamigq )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PSXCPU, XTAL_67_7376MHz )
- MDRV_CPU_PROGRAM_MAP( konamigq_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( konamigq_map)
MDRV_CPU_VBLANK_INT("screen", psx_vblank)
MDRV_CPU_ADD( "soundcpu", M68000, 8000000 )
- MDRV_CPU_PROGRAM_MAP( konamigq_sound_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( konamigq_sound_map)
MDRV_CPU_PERIODIC_INT( irq2_line_hold, 480 )
MDRV_MACHINE_START( konamigq )
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index 1d4a63f5782..d7faf801a68 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -348,7 +348,7 @@ static const psx_spu_interface konamigv_psxspu_interface =
static MACHINE_DRIVER_START( konamigv )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PSXCPU, XTAL_67_7376MHz )
- MDRV_CPU_PROGRAM_MAP( konamigv_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( konamigv_map)
MDRV_CPU_VBLANK_INT("screen", psx_vblank)
MDRV_MACHINE_RESET( konamigv )
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 7af11a202f7..765f3451095 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -1160,11 +1160,13 @@ static ADDRESS_MAP_START( gx_type1_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xf40000, 0xf7ffff) AM_READ(type1_roz_r2) // ROM readback
AM_RANGE(0xf80000, 0xf80fff) AM_RAM // chip 21Q / S
AM_RANGE(0xfc0000, 0xfc00ff) AM_RAM // chip 22N / S
+ AM_IMPORT_FROM(gx_base_memmap)
ADDRESS_MAP_END
static ADDRESS_MAP_START( gx_type2_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xcc0000, 0xcc0003) AM_WRITE(esc_w)
AM_RANGE(0xd90000, 0xd97fff) AM_RAM_WRITE(konamigx_palette_w) AM_BASE(&paletteram32)
+ AM_IMPORT_FROM(gx_base_memmap)
ADDRESS_MAP_END
static ADDRESS_MAP_START( gx_type3_map, ADDRESS_SPACE_PROGRAM, 32 )
@@ -1178,6 +1180,7 @@ static ADDRESS_MAP_START( gx_type3_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xea0000, 0xea3fff) AM_RAM_WRITE(konamigx_555_palette2_w) AM_BASE(&gx_subpaletteram32) // sub monitor palette
AM_RANGE(0xec0000, 0xec0003) AM_READ(type3_sync_r)
AM_RANGE(0xf00000, 0xf07fff) AM_RAM
+ AM_IMPORT_FROM(gx_base_memmap)
ADDRESS_MAP_END
static ADDRESS_MAP_START( gx_type4_map, ADDRESS_SPACE_PROGRAM, 32 )
@@ -1191,6 +1194,7 @@ static ADDRESS_MAP_START( gx_type4_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xea0000, 0xea7fff) AM_RAM_WRITE(konamigx_palette2_w) AM_BASE(&gx_subpaletteram32) // 5G/7G/9G (sub screen palette RAM)
AM_RANGE(0xec0000, 0xec0003) AM_READ(type3_sync_r) // type 4 polls this too
AM_RANGE(0xf00000, 0xf07fff) AM_RAM_WRITE(konamigx_t4_psacmap_w) AM_BASE(&gx_psacram) // PSAC2 tilemap
+ AM_IMPORT_FROM(gx_base_memmap)
ADDRESS_MAP_END
/**********************************************************************************/
@@ -1341,15 +1345,15 @@ GFXDECODE_END
static MACHINE_DRIVER_START( konamigx )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 24000000)
- MDRV_CPU_PROGRAM_MAP(gx_base_memmap, gx_type2_map)
+ MDRV_CPU_PROGRAM_MAP(gx_type2_map)
MDRV_CPU_VBLANK_INT("screen", konamigx_vbinterrupt)
MDRV_CPU_ADD("soundcpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(gxsndmap, 0)
+ MDRV_CPU_PROGRAM_MAP(gxsndmap)
MDRV_CPU_PERIODIC_INT(irq2_line_hold, 480)
MDRV_CPU_ADD("dasp", TMS57002, 12500000)
- MDRV_CPU_DATA_MAP(gxtmsmap, 0)
+ MDRV_CPU_DATA_MAP(gxtmsmap)
MDRV_CPU_PERIODIC_INT(tms_sync, 48000)
MDRV_QUANTUM_TIME(HZ(1920))
@@ -1422,7 +1426,7 @@ static MACHINE_DRIVER_START( opengolf )
MDRV_VIDEO_START(opengolf)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gx_base_memmap, gx_type1_map)
+ MDRV_CPU_PROGRAM_MAP(gx_type1_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( racinfrc )
@@ -1434,14 +1438,14 @@ static MACHINE_DRIVER_START( racinfrc )
MDRV_VIDEO_START(racinfrc)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gx_base_memmap, gx_type1_map)
+ MDRV_CPU_PROGRAM_MAP(gx_type1_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gxtype3 )
MDRV_IMPORT_FROM(konamigx)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gx_base_memmap, gx_type3_map)
+ MDRV_CPU_PROGRAM_MAP(gx_type3_map)
MDRV_CPU_VBLANK_INT_HACK(konamigx_hbinterrupt, 262)
MDRV_VIDEO_START(konamigx_type3)
@@ -1456,7 +1460,7 @@ static MACHINE_DRIVER_START( gxtype4 )
MDRV_IMPORT_FROM(konamigx)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gx_base_memmap, gx_type4_map)
+ MDRV_CPU_PROGRAM_MAP(gx_type4_map)
MDRV_CPU_VBLANK_INT_HACK(konamigx_hbinterrupt, 262)
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c
index 8c0e2177134..2e2cc6f01e3 100644
--- a/src/mame/drivers/konamim2.c
+++ b/src/mame/drivers/konamim2.c
@@ -1135,12 +1135,12 @@ static MACHINE_DRIVER_START( m2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PPC602, 33000000) /* actually PPC602, 66MHz */
MDRV_CPU_CONFIG(ppc602_config)
- MDRV_CPU_PROGRAM_MAP(m2_main, 0)
+ MDRV_CPU_PROGRAM_MAP(m2_main)
MDRV_CPU_VBLANK_INT("screen", m2)
MDRV_CPU_ADD("sub", PPC602, 33000000) /* actually PPC602, 66MHz */
MDRV_CPU_CONFIG(ppc602_config)
- MDRV_CPU_PROGRAM_MAP(m2_main, 0)
+ MDRV_CPU_PROGRAM_MAP(m2_main)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c
index c788decc009..bb7d776c365 100644
--- a/src/mame/drivers/kopunch.c
+++ b/src/mame/drivers/kopunch.c
@@ -183,8 +183,8 @@ static MACHINE_DRIVER_START( kopunch )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8085A, 4000000) /* 4 MHz ???? Uses SIM, must be 8085 */
- MDRV_CPU_PROGRAM_MAP(kopunch_map,0)
- MDRV_CPU_IO_MAP(kopunch_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(kopunch_map)
+ MDRV_CPU_IO_MAP(kopunch_io_map)
MDRV_CPU_VBLANK_INT("screen",kopunch_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index 01d2628f466..6592534b29a 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -241,11 +241,11 @@ GFXDECODE_END
static MACHINE_DRIVER_START( ksayakyu )
MDRV_CPU_ADD("maincpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(maincpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(maincpu_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 80000000/2)
- MDRV_CPU_PROGRAM_MAP(soundcpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(soundcpu_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
MDRV_QUANTUM_TIME(HZ(60000))
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index d7c68b57f2d..5358b48ded3 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -2785,7 +2785,7 @@ static DRIVER_INIT( salarymc )
static MACHINE_DRIVER_START( konami573 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PSXCPU, XTAL_67_7376MHz )
- MDRV_CPU_PROGRAM_MAP( konami573_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( konami573_map)
MDRV_CPU_VBLANK_INT("screen", sys573_vblank)
MDRV_MACHINE_RESET( konami573 )
diff --git a/src/mame/drivers/kungfur.c b/src/mame/drivers/kungfur.c
index f4ac8544ada..ded82f72a56 100644
--- a/src/mame/drivers/kungfur.c
+++ b/src/mame/drivers/kungfur.c
@@ -334,7 +334,7 @@ static MACHINE_DRIVER_START( kungfur )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M6809,8000000/2)
- MDRV_CPU_PROGRAM_MAP(kungfur_map,0)
+ MDRV_CPU_PROGRAM_MAP(kungfur_map)
MDRV_CPU_VBLANK_INT("screen",kungfur_irq)
MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index d4edcd6174e..b67b57b7b22 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -462,13 +462,13 @@ static MACHINE_DRIVER_START( gyrodine )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(gyrodine_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(gyrodine_portmap)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("sub", Z80, XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(gyrodine_sub_map,0)
- MDRV_CPU_IO_MAP(gyrodine_sub_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(gyrodine_sub_map)
+ MDRV_CPU_IO_MAP(gyrodine_sub_portmap)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -506,8 +506,8 @@ static MACHINE_DRIVER_START( sonofphx )
/* basic machine hardware */
MDRV_IMPORT_FROM(gyrodine)
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(sonofphx_sub_map,0)
- MDRV_CPU_IO_MAP(sonofphx_sub_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sonofphx_sub_map)
+ MDRV_CPU_IO_MAP(sonofphx_sub_portmap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( srdmissn )
@@ -515,11 +515,11 @@ static MACHINE_DRIVER_START( srdmissn )
/* basic machine hardware */
MDRV_IMPORT_FROM(gyrodine)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(srdmissn_portmap,0)
+ MDRV_CPU_IO_MAP(srdmissn_portmap)
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(srdmissn_sub_map,0)
- MDRV_CPU_IO_MAP(srdmissn_sub_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(srdmissn_sub_map)
+ MDRV_CPU_IO_MAP(srdmissn_sub_portmap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( flashgal )
@@ -527,7 +527,7 @@ static MACHINE_DRIVER_START( flashgal )
/* basic machine hardware */
MDRV_IMPORT_FROM(sonofphx)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(flashgal_portmap,0)
+ MDRV_CPU_IO_MAP(flashgal_portmap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( flashgla )
@@ -535,11 +535,11 @@ static MACHINE_DRIVER_START( flashgla )
/* basic machine hardware */
MDRV_IMPORT_FROM(gyrodine)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(flashgla_portmap,0)
+ MDRV_CPU_IO_MAP(flashgla_portmap)
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(flashgla_sub_map,0)
- MDRV_CPU_IO_MAP(flashgla_sub_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(flashgla_sub_map)
+ MDRV_CPU_IO_MAP(flashgla_sub_portmap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( legend )
@@ -547,8 +547,8 @@ static MACHINE_DRIVER_START( legend )
/* basic machine hardware */
MDRV_IMPORT_FROM(gyrodine)
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(legend_sub_map,0)
- MDRV_CPU_IO_MAP(srdmissn_sub_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(legend_sub_map)
+ MDRV_CPU_IO_MAP(srdmissn_sub_portmap)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c
index 61b4331e125..8b3b9a634c2 100644
--- a/src/mame/drivers/labyrunr.c
+++ b/src/mame/drivers/labyrunr.c
@@ -195,7 +195,7 @@ static MACHINE_DRIVER_START( labyrunr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8? */
- MDRV_CPU_PROGRAM_MAP(labyrunr_map,0)
+ MDRV_CPU_PROGRAM_MAP(labyrunr_map)
MDRV_CPU_VBLANK_INT_HACK(labyrunr_interrupt,8) /* 1 IRQ + 4 NMI (generated by 007121) */
/* video hardware */
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index 41c3cf1554d..d26e1f8e90c 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -682,7 +682,7 @@ static MACHINE_DRIVER_START( ladybug )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(ladybug_map,0)
+ MDRV_CPU_PROGRAM_MAP(ladybug_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -714,12 +714,12 @@ static MACHINE_DRIVER_START( sraider )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sraider_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(sraider_cpu1_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sraider_cpu2_map,0)
- MDRV_CPU_IO_MAP(sraider_cpu2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sraider_cpu2_map)
+ MDRV_CPU_IO_MAP(sraider_cpu2_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index d3cf3fa96f9..2a3918a981c 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -259,11 +259,11 @@ GFXDECODE_END
static MACHINE_DRIVER_START( ladyfrog )
MDRV_CPU_ADD("maincpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(ladyfrog_map,0)
+ MDRV_CPU_PROGRAM_MAP(ladyfrog_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(ladyfrog_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(ladyfrog_sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
/* video hardware */
diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c
index 60286fc8e98..fa78c398e6e 100644
--- a/src/mame/drivers/laserbas.c
+++ b/src/mame/drivers/laserbas.c
@@ -130,8 +130,8 @@ static INTERRUPT_GEN( laserbas_interrupt )
static MACHINE_DRIVER_START( laserbas )
MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(laserbas_memory,0)
- MDRV_CPU_IO_MAP(laserbas_io,0)
+ MDRV_CPU_PROGRAM_MAP(laserbas_memory)
+ MDRV_CPU_IO_MAP(laserbas_io)
MDRV_CPU_VBLANK_INT_HACK(laserbas_interrupt,2)
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index b9a96199a6e..6569e09039c 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -688,8 +688,8 @@ static INTERRUPT_GEN( zaccaria_cb1_toggle )
static MACHINE_DRIVER_START( laserbat )
MDRV_CPU_ADD("maincpu", S2650, 14318180/4) // ???
- MDRV_CPU_PROGRAM_MAP(laserbat_map,0)
- MDRV_CPU_IO_MAP(laserbat_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(laserbat_map)
+ MDRV_CPU_IO_MAP(laserbat_io_map)
MDRV_CPU_VBLANK_INT("screen", laserbat_interrupt)
/* video hardware */
@@ -722,12 +722,12 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( catnmous )
MDRV_CPU_ADD("maincpu", S2650, 14318000/4) /* ? */
- MDRV_CPU_PROGRAM_MAP(laserbat_map,0)
- MDRV_CPU_IO_MAP(catnmous_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(laserbat_map)
+ MDRV_CPU_IO_MAP(catnmous_io_map)
MDRV_CPU_VBLANK_INT("screen", laserbat_interrupt)
MDRV_CPU_ADD("audiocpu", M6802,3580000) /* ? */
- MDRV_CPU_PROGRAM_MAP(catnmous_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(catnmous_sound_map)
MDRV_CPU_PERIODIC_INT(zaccaria_cb1_toggle, (double)3580000/4096)
MDRV_PIA6821_ADD("pia", pia_intf)
diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c
index 3fb9d982838..c1fec447290 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -465,11 +465,11 @@ static MACHINE_DRIVER_START( base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 11289000/16) /* guess */
- MDRV_CPU_PROGRAM_MAP(lasso_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(lasso_main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", M6502, 600000)
- MDRV_CPU_PROGRAM_MAP(lasso_audio_map, 0)
+ MDRV_CPU_PROGRAM_MAP(lasso_audio_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -503,7 +503,7 @@ static MACHINE_DRIVER_START( lasso )
/* basic machine hardware */
MDRV_IMPORT_FROM(base)
MDRV_CPU_ADD("blitter", M6502, 11289000/16) /* guess */
- MDRV_CPU_PROGRAM_MAP(lasso_coprocessor_map,0)
+ MDRV_CPU_PROGRAM_MAP(lasso_coprocessor_map)
MACHINE_DRIVER_END
@@ -512,10 +512,10 @@ static MACHINE_DRIVER_START( chameleo )
/* basic machine hardware */
MDRV_IMPORT_FROM(base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(chameleo_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(chameleo_main_map)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(chameleo_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(chameleo_audio_map)
/* video hardware */
MDRV_VIDEO_UPDATE(chameleo)
@@ -526,10 +526,10 @@ static MACHINE_DRIVER_START( wwjgtin )
/* basic machine hardware */
MDRV_IMPORT_FROM(base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(wwjgtin_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(wwjgtin_main_map)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(wwjgtin_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(wwjgtin_audio_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -551,11 +551,11 @@ static MACHINE_DRIVER_START( pinbo )
/* basic machine hardware */
MDRV_IMPORT_FROM(base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pinbo_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(pinbo_main_map)
MDRV_CPU_REPLACE("audiocpu", Z80, 3000000)
- MDRV_CPU_PROGRAM_MAP(pinbo_audio_map,0)
- MDRV_CPU_IO_MAP(pinbo_audio_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(pinbo_audio_map)
+ MDRV_CPU_IO_MAP(pinbo_audio_io_map)
/* video hardware */
MDRV_GFXDECODE(pinbo)
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index b9d918ebe00..eb891114555 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -227,11 +227,11 @@ static MACHINE_DRIVER_START( lastduel )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* Could be 8 MHz */
- MDRV_CPU_PROGRAM_MAP(lastduel_map,0)
+ MDRV_CPU_PROGRAM_MAP(lastduel_map)
MDRV_CPU_VBLANK_INT_HACK(lastduel_interrupt,3) /* 1 for vbl, 2 for control reads?? */
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK | VIDEO_BUFFERS_SPRITERAM)
@@ -266,11 +266,11 @@ static MACHINE_DRIVER_START( madgear )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(madgear_map,0)
+ MDRV_CPU_PROGRAM_MAP(madgear_map)
MDRV_CPU_VBLANK_INT_HACK(madgear_interrupt,3) /* 1 for vbl, 2 for control reads?? */
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(madgear_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(madgear_sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK | VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c
index 57e7e3043e9..27da31035ae 100644
--- a/src/mame/drivers/lastfght.c
+++ b/src/mame/drivers/lastfght.c
@@ -462,7 +462,7 @@ static INTERRUPT_GEN( unknown_interrupt )
static MACHINE_DRIVER_START( lastfght )
MDRV_CPU_ADD("maincpu", H83044, 32000000/2)
- MDRV_CPU_PROGRAM_MAP( lastfght_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( lastfght_map)
MDRV_CPU_VBLANK_INT_HACK(unknown_interrupt,2)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c
index 075fc4979cd..21e896407bd 100644
--- a/src/mame/drivers/lazercmd.c
+++ b/src/mame/drivers/lazercmd.c
@@ -620,8 +620,8 @@ static MACHINE_DRIVER_START( lazercmd )
but memory and IO access is only possible
within the line and frame blanking period
thus requiring an extra loading of approx 3-5 */
- MDRV_CPU_PROGRAM_MAP(lazercmd_map,0)
- MDRV_CPU_IO_MAP(lazercmd_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(lazercmd_map)
+ MDRV_CPU_IO_MAP(lazercmd_portmap)
MDRV_CPU_VBLANK_INT_HACK(lazercmd_timer, 128) /* 7680 Hz */
/* video hardware */
@@ -655,8 +655,8 @@ static MACHINE_DRIVER_START( medlanes )
but memory and IO access is only possible
within the line and frame blanking period
thus requiring an extra loading of approx 3-5 */
- MDRV_CPU_PROGRAM_MAP(medlanes_map,0)
- MDRV_CPU_IO_MAP(lazercmd_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(medlanes_map)
+ MDRV_CPU_IO_MAP(lazercmd_portmap)
MDRV_CPU_VBLANK_INT_HACK(lazercmd_timer, 128) /* 7680 Hz */
/* video hardware */
@@ -690,8 +690,8 @@ static MACHINE_DRIVER_START( bbonk )
but memory and IO access is only possible
within the line and frame blanking period
thus requiring an extra loading of approx 3-5 */
- MDRV_CPU_PROGRAM_MAP(bbonk_map,0)
- MDRV_CPU_IO_MAP(lazercmd_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(bbonk_map)
+ MDRV_CPU_IO_MAP(lazercmd_portmap)
MDRV_CPU_VBLANK_INT_HACK(bbonk_timer, 128) /* 7680 Hz */
/* video hardware */
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index 961294ef002..d0c0a982d71 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -1036,7 +1036,7 @@ static MACHINE_DRIVER_START( legionna )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */
- MDRV_CPU_PROGRAM_MAP(legionna_map,0)
+ MDRV_CPU_PROGRAM_MAP(legionna_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
SEIBU_SOUND_SYSTEM_CPU(14318180/4)
@@ -1068,7 +1068,7 @@ static MACHINE_DRIVER_START( heatbrl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */
- MDRV_CPU_PROGRAM_MAP(heatbrl_map,0)
+ MDRV_CPU_PROGRAM_MAP(heatbrl_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
SEIBU_SOUND_SYSTEM_CPU(14318180/4)
@@ -1099,7 +1099,7 @@ static MACHINE_DRIVER_START( godzilla )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 20000000/2)
- MDRV_CPU_PROGRAM_MAP(godzilla_map,0)
+ MDRV_CPU_PROGRAM_MAP(godzilla_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
SEIBU2_SOUND_SYSTEM_CPU(14318180/4)
@@ -1130,7 +1130,7 @@ static MACHINE_DRIVER_START( denjinmk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 20000000/2)
- MDRV_CPU_PROGRAM_MAP(denjinmk_map,0)
+ MDRV_CPU_PROGRAM_MAP(denjinmk_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
SEIBU2_SOUND_SYSTEM_CPU(14318180/4)
@@ -1161,7 +1161,7 @@ static MACHINE_DRIVER_START( sdgndmrb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 20000000/2)
- MDRV_CPU_PROGRAM_MAP(sdgndmrb_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sdgndmrb_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
SEIBU2_SOUND_SYSTEM_CPU(14318180/4)
@@ -1193,7 +1193,7 @@ static MACHINE_DRIVER_START( cupsoc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,20000000/2)
- MDRV_CPU_PROGRAM_MAP(cupsoc_mem,0)
+ MDRV_CPU_PROGRAM_MAP(cupsoc_mem)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
SEIBU_SOUND_SYSTEM_CPU(14318180/4)
@@ -1225,13 +1225,13 @@ static MACHINE_DRIVER_START( cupsocbl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,12000000)
- MDRV_CPU_PROGRAM_MAP(cupsocbl_mem,0)
+ MDRV_CPU_PROGRAM_MAP(cupsocbl_mem)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold) /* VBL */
/*Different Sound hardware*/
//SEIBU_SOUND_SYSTEM_CPU(14318180/4)
MDRV_CPU_ADD("audiocpu", Z80,14318180/4)
- MDRV_CPU_PROGRAM_MAP(cupsocbl_sound_mem,0)
+ MDRV_CPU_PROGRAM_MAP(cupsocbl_sound_mem)
//MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
//MDRV_MACHINE_INIT(seibu_sound)
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index 10bb6cd18c1..e1adac2850e 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -709,13 +709,13 @@ static MACHINE_DRIVER_START( leland )
/* basic machine hardware */
MDRV_CPU_ADD("master", Z80, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(master_map_program,0)
- MDRV_CPU_IO_MAP(master_map_io,0)
+ MDRV_CPU_PROGRAM_MAP(master_map_program)
+ MDRV_CPU_IO_MAP(master_map_io)
MDRV_CPU_VBLANK_INT("screen", leland_master_interrupt)
MDRV_CPU_ADD("slave", Z80, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(slave_small_map_program,0)
- MDRV_CPU_IO_MAP(slave_map_io,0)
+ MDRV_CPU_PROGRAM_MAP(slave_small_map_program)
+ MDRV_CPU_IO_MAP(slave_map_io)
MDRV_MACHINE_START(leland)
MDRV_MACHINE_RESET(leland)
@@ -746,8 +746,8 @@ static MACHINE_DRIVER_START( redline )
MDRV_IMPORT_FROM(leland)
MDRV_CPU_ADD("audiocpu", I80186, MCU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(leland_80186_map_program,0)
- MDRV_CPU_IO_MAP(redline_80186_map_io,0)
+ MDRV_CPU_PROGRAM_MAP(leland_80186_map_program)
+ MDRV_CPU_IO_MAP(redline_80186_map_io)
/* sound hardware */
MDRV_SOUND_REPLACE("custom", REDLINE_80186, 0)
@@ -761,7 +761,7 @@ static MACHINE_DRIVER_START( quarterb )
MDRV_IMPORT_FROM(redline)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_IO_MAP(leland_80186_map_io,0)
+ MDRV_CPU_IO_MAP(leland_80186_map_io)
/* sound hardware */
MDRV_SOUND_REPLACE("custom", LELAND_80186, 0)
@@ -775,7 +775,7 @@ static MACHINE_DRIVER_START( lelandi )
MDRV_IMPORT_FROM(quarterb)
MDRV_CPU_MODIFY("slave")
- MDRV_CPU_PROGRAM_MAP(slave_large_map_program,0)
+ MDRV_CPU_PROGRAM_MAP(slave_large_map_program)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index fe8e0cd0c92..ef46005911d 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -251,11 +251,11 @@ static MACHINE_DRIVER_START( lemmings )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(lemmings_map,0)
+ MDRV_CPU_PROGRAM_MAP(lemmings_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", M6809,32220000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index d2d9cb25a1d..4f2b46faf53 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -612,11 +612,11 @@ GFXDECODE_END
static MACHINE_DRIVER_START( lethalen )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, MAIN_CLOCK/2) // ???
- MDRV_CPU_PROGRAM_MAP(le_main, 0)
+ MDRV_CPU_PROGRAM_MAP(le_main)
MDRV_CPU_VBLANK_INT("screen", lethalen_interrupt)
MDRV_CPU_ADD("soundcpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(le_sound, 0)
+ MDRV_CPU_PROGRAM_MAP(le_sound)
MDRV_MACHINE_START(lethalen)
MDRV_MACHINE_RESET(lethalen)
diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c
index 1261c2e716c..e085552ac6e 100644
--- a/src/mame/drivers/lethalj.c
+++ b/src/mame/drivers/lethalj.c
@@ -603,7 +603,7 @@ static MACHINE_DRIVER_START( gameroom )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS34010, MASTER_CLOCK)
MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(lethalj_map,0)
+ MDRV_CPU_PROGRAM_MAP(lethalj_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c
index 1e7b3ec5c74..54983e41f21 100644
--- a/src/mame/drivers/lgp.c
+++ b/src/mame/drivers/lgp.c
@@ -341,14 +341,14 @@ static MACHINE_START( lgp )
static MACHINE_DRIVER_START( lgp )
/* main cpu */
MDRV_CPU_ADD("maincpu", Z80, CPU_PCB_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_program_map,0)
- MDRV_CPU_IO_MAP(main_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_program_map)
+ MDRV_CPU_IO_MAP(main_io_map)
MDRV_CPU_VBLANK_INT("screen", vblank_callback_lgp)
/* sound cpu */
MDRV_CPU_ADD("audiocpu", Z80, SOUND_PCB_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_program_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_program_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_MACHINE_START(lgp)
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index e59c0f39a15..fe484f9e5ef 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -486,12 +486,12 @@ static MACHINE_DRIVER_START( liberate )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",DECO16, 2000000)
- MDRV_CPU_PROGRAM_MAP(liberate_map,0)
- MDRV_CPU_IO_MAP(deco16_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(liberate_map)
+ MDRV_CPU_IO_MAP(deco16_io_map)
MDRV_CPU_VBLANK_INT("screen", deco16_interrupt)
MDRV_CPU_ADD("audiocpu",M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(liberate_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(liberate_sound_map)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse,16*60) /* ??? */
MDRV_QUANTUM_TIME(HZ(12000))
@@ -527,8 +527,8 @@ static MACHINE_DRIVER_START( liberatb )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_TYPE(M6502)
- MDRV_CPU_PROGRAM_MAP(liberatb_map,0)
- MDRV_CPU_IO_MAP(0,0)
+ MDRV_CPU_PROGRAM_MAP(liberatb_map)
+ MDRV_CPU_IO_MAP(0)
MDRV_CPU_VBLANK_INT("screen", deco16_interrupt)
MACHINE_DRIVER_END
@@ -546,8 +546,8 @@ static MACHINE_DRIVER_START( prosoccr )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_CLOCK(3000000)
- MDRV_CPU_PROGRAM_MAP(liberate_map,0)
- MDRV_CPU_IO_MAP(deco16_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(liberate_map)
+ MDRV_CPU_IO_MAP(deco16_io_map)
MDRV_VIDEO_START(prosoccr)
MDRV_VIDEO_UPDATE(prosoccr)
@@ -557,11 +557,11 @@ static MACHINE_DRIVER_START( prosport )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", DECO16, 2000000)
- MDRV_CPU_PROGRAM_MAP(prosport_map,0)
- MDRV_CPU_IO_MAP(deco16_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(prosport_map)
+ MDRV_CPU_IO_MAP(deco16_io_map)
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(liberate_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(liberate_sound_map)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse,16*60) /* ??? */
MDRV_QUANTUM_TIME(HZ(12000))
diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c
index abdd6f840b9..781e0061f32 100644
--- a/src/mame/drivers/liberatr.c
+++ b/src/mame/drivers/liberatr.c
@@ -384,7 +384,7 @@ static MACHINE_DRIVER_START( liberatr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* 1.25Mhz divided from 20Mhz master clock */
- MDRV_CPU_PROGRAM_MAP(liberatr_map,0)
+ MDRV_CPU_PROGRAM_MAP(liberatr_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
MDRV_ATARIVGEAROM_ADD("earom")
@@ -418,7 +418,7 @@ static MACHINE_DRIVER_START( liberat2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(liberatr)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(liberat2_map,0)
+ MDRV_CPU_PROGRAM_MAP(liberat2_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index b5908a1cdb0..8669241f75b 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -633,8 +633,8 @@ GFXDECODE_END
static MACHINE_DRIVER_START( limenko )
MDRV_CPU_ADD("maincpu", E132XN, 20000000*4) /* 4x internal multiplier */
- MDRV_CPU_PROGRAM_MAP(limenko_map,0)
- MDRV_CPU_IO_MAP(limenko_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(limenko_map)
+ MDRV_CPU_IO_MAP(limenko_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_NVRAM_HANDLER(93C46)
@@ -658,12 +658,12 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( spotty )
MDRV_CPU_ADD("maincpu", GMS30C2232, 20000000) /* 20 MHz, no internal multiplier */
- MDRV_CPU_PROGRAM_MAP(spotty_map,0)
- MDRV_CPU_IO_MAP(spotty_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(spotty_map)
+ MDRV_CPU_IO_MAP(spotty_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", AT89C4051, 4000000) /* 4 MHz */
- MDRV_CPU_IO_MAP(spotty_sound_io_map,0)
+ MDRV_CPU_IO_MAP(spotty_sound_io_map)
MDRV_NVRAM_HANDLER(93C46)
diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c
index 515698b319c..29f55034cce 100644
--- a/src/mame/drivers/littlerb.c
+++ b/src/mame/drivers/littlerb.c
@@ -361,7 +361,7 @@ static VIDEO_UPDATE(littlerb)
static MACHINE_DRIVER_START( littlerb )
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(littlerb_main, 0)
+ MDRV_CPU_PROGRAM_MAP(littlerb_main)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index 2e494d67582..de402560ce8 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -353,16 +353,16 @@ static const ym2203_interface ym2203_config =
static MACHINE_DRIVER_START( lkage )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,6000000)
- MDRV_CPU_PROGRAM_MAP(lkage_map,0)
- MDRV_CPU_IO_MAP(lkage_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(lkage_map)
+ MDRV_CPU_IO_MAP(lkage_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(lkage_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(lkage_sound_map)
/* IRQs are triggered by the YM2203 */
MDRV_CPU_ADD("mcu", M68705,4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(lkage_m68705_map,0)
+ MDRV_CPU_PROGRAM_MAP(lkage_m68705_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -399,12 +399,12 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( lkageb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,6000000)
- MDRV_CPU_PROGRAM_MAP(lkage_map,0)
- MDRV_CPU_IO_MAP(lkage_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(lkage_map)
+ MDRV_CPU_IO_MAP(lkage_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(lkage_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(lkage_sound_map)
/* IRQs are triggered by the YM2203 */
/* video hardware */
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index 935826ebe47..d2b7d597e5d 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -460,17 +460,17 @@ static const ym2203_interface ym2203_config =
static MACHINE_DRIVER_START( lockon )
MDRV_CPU_ADD("maincpu", V30, XTAL_16MHz / 2)
- MDRV_CPU_PROGRAM_MAP(main_v30, 0)
+ MDRV_CPU_PROGRAM_MAP(main_v30)
MDRV_CPU_ADD("ground", V30, XTAL_16MHz / 2)
- MDRV_CPU_PROGRAM_MAP(ground_v30, 0)
+ MDRV_CPU_PROGRAM_MAP(ground_v30)
MDRV_CPU_ADD("object", V30, XTAL_16MHz / 2)
- MDRV_CPU_PROGRAM_MAP(object_v30, 0)
+ MDRV_CPU_PROGRAM_MAP(object_v30)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_16MHz / 4)
- MDRV_CPU_PROGRAM_MAP(sound_prg, 0)
- MDRV_CPU_IO_MAP(sound_io, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_prg)
+ MDRV_CPU_IO_MAP(sound_io)
MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_ASTABLE_NSEC(10000, 4700, 10000e-12) * 4096))
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index 658d22c705f..601c53de4cd 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -591,17 +591,17 @@ static MACHINE_DRIVER_START( looping )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS9995, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(looping_map,0)
- MDRV_CPU_IO_MAP(looping_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(looping_map)
+ MDRV_CPU_IO_MAP(looping_io_map)
MDRV_CPU_VBLANK_INT("screen", looping_interrupt)
MDRV_CPU_ADD("audiocpu", TMS9980, SOUND_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(looping_sound_map,0)
- MDRV_CPU_IO_MAP(looping_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(looping_sound_map)
+ MDRV_CPU_IO_MAP(looping_sound_io_map)
MDRV_CPU_ADD("mcu", COP420, COP_CLOCK)
- MDRV_CPU_PROGRAM_MAP(looping_cop_map,0)
- MDRV_CPU_DATA_MAP(looping_cop_data_map,0)
+ MDRV_CPU_PROGRAM_MAP(looping_cop_map)
+ MDRV_CPU_DATA_MAP(looping_cop_data_map)
MDRV_CPU_CONFIG(looping_cop_intf)
MDRV_MACHINE_START(looping)
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index de87453299b..4ebecdfa233 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -410,12 +410,12 @@ static const ym3812_interface lordgun_ym3812_interface =
static MACHINE_DRIVER_START( lordgun )
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(lordgun_map,0)
+ MDRV_CPU_PROGRAM_MAP(lordgun_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(lordgun_soundmem_map,0)
- MDRV_CPU_IO_MAP(lordgun_soundio_map,0)
+ MDRV_CPU_PROGRAM_MAP(lordgun_soundmem_map)
+ MDRV_CPU_IO_MAP(lordgun_soundio_map)
MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
@@ -455,10 +455,10 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hfh )
MDRV_IMPORT_FROM(lordgun)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hfh_map,0)
+ MDRV_CPU_PROGRAM_MAP(hfh_map)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_IO_MAP(hfh_soundio_map,0)
+ MDRV_CPU_IO_MAP(hfh_soundio_map)
// sound hardware
MDRV_SOUND_ADD("oki2", OKIM6295, 1000000) // 5MHz can't be right!
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index 1ab2532bddd..1851b1e2508 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -532,14 +532,14 @@ static MACHINE_DRIVER_START( lsasquad )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(lsasquad_map,0)
+ MDRV_CPU_PROGRAM_MAP(lsasquad_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(lsasquad_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(lsasquad_sound_map)
/* IRQs are triggered by the YM2203 */
MDRV_CPU_ADD("mcu", M68705,4000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(lsasquad_m68705_map,0)
+ MDRV_CPU_PROGRAM_MAP(lsasquad_m68705_map)
MDRV_QUANTUM_TIME(HZ(30000)) /* 500 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -577,11 +577,11 @@ static MACHINE_DRIVER_START( daikaiju )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(daikaiju_map, 0)
+ MDRV_CPU_PROGRAM_MAP(daikaiju_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3000000)
- MDRV_CPU_PROGRAM_MAP(daikaiju_sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(daikaiju_sound_map)
/* IRQs are triggered by the YM2203 */
MDRV_QUANTUM_TIME(HZ(30000)) /* 500 CPU slices per frame - an high value to ensure proper */
diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c
index 5e7fb859325..cc857ffb976 100644
--- a/src/mame/drivers/ltcasino.c
+++ b/src/mame/drivers/ltcasino.c
@@ -633,7 +633,7 @@ static VIDEO_UPDATE(ltcasino)
static MACHINE_DRIVER_START( ltcasino )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502,2000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(ltcasino_map,0)
+ MDRV_CPU_PROGRAM_MAP(ltcasino_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c
index 1f2e3a17d9f..f7166c9a46a 100644
--- a/src/mame/drivers/luckgrln.c
+++ b/src/mame/drivers/luckgrln.c
@@ -122,8 +122,8 @@ static VIDEO_UPDATE(luckgrln)
static MACHINE_DRIVER_START( luckgrln )
MDRV_CPU_ADD("maincpu", Z180,8000000)
- MDRV_CPU_PROGRAM_MAP(mainmap,0)
- MDRV_CPU_IO_MAP(portmap,0)
+ MDRV_CPU_PROGRAM_MAP(mainmap)
+ MDRV_CPU_IO_MAP(portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index ada6e1eba67..248f00a4293 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -1242,8 +1242,8 @@ static MACHINE_DRIVER_START( lucky74 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, C_06B49P_CLKOUT_03) /* 3 MHz. */
- MDRV_CPU_PROGRAM_MAP(lucky74_map, 0)
- MDRV_CPU_IO_MAP(lucky74_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(lucky74_map)
+ MDRV_CPU_IO_MAP(lucky74_portmap)
MDRV_CPU_VBLANK_INT("screen", nmi_interrupt) /* 60 Hz. measured */
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c
index 2226246bf48..0f1f8f54f96 100644
--- a/src/mame/drivers/lvcards.c
+++ b/src/mame/drivers/lvcards.c
@@ -472,8 +472,8 @@ static MACHINE_DRIVER_START( lvcards )
// basic machine hardware
MDRV_CPU_ADD("maincpu",Z80, 18432000/6) // 3.072 MHz ?
- MDRV_CPU_PROGRAM_MAP(lvcards_map, 0)
- MDRV_CPU_IO_MAP(lvcards_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(lvcards_map)
+ MDRV_CPU_IO_MAP(lvcards_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
// video hardware
@@ -506,7 +506,7 @@ static MACHINE_DRIVER_START( lvpoker )
// basic machine hardware
MDRV_NVRAM_HANDLER(generic_1fill)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(lvpoker_map,0)
+ MDRV_CPU_PROGRAM_MAP(lvpoker_map)
MDRV_MACHINE_START(lvpoker)
MDRV_MACHINE_RESET(lvpoker)
MACHINE_DRIVER_END
@@ -517,7 +517,7 @@ static MACHINE_DRIVER_START( ponttehk )
// basic machine hardware
MDRV_NVRAM_HANDLER(generic_1fill)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ponttehk_map,0)
+ MDRV_CPU_PROGRAM_MAP(ponttehk_map)
MDRV_MACHINE_RESET(lvpoker)
// video hardware
diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c
index ded52835e6b..7f4e79988fa 100644
--- a/src/mame/drivers/lwings.c
+++ b/src/mame/drivers/lwings.c
@@ -736,11 +736,11 @@ static MACHINE_DRIVER_START( lwings )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(lwings_map,0)
+ MDRV_CPU_PROGRAM_MAP(lwings_map)
MDRV_CPU_VBLANK_INT("screen", lwings_interrupt)
MDRV_CPU_ADD("soundcpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(lwings_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(lwings_sound_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* ??? */
/* video hardware */
@@ -780,11 +780,11 @@ static MACHINE_DRIVER_START( trojan )
MDRV_IMPORT_FROM( lwings )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(trojan_map,0)
+ MDRV_CPU_PROGRAM_MAP(trojan_map)
MDRV_CPU_ADD("adpcm", Z80, 4000000) // 3.579545 Mhz (?)
- MDRV_CPU_PROGRAM_MAP(trojan_adpcm_map,0)
- MDRV_CPU_IO_MAP(trojan_adpcm_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(trojan_adpcm_map)
+ MDRV_CPU_IO_MAP(trojan_adpcm_io_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, 4000)
/* video hardware */
@@ -803,11 +803,11 @@ static MACHINE_DRIVER_START( avengers )
MDRV_IMPORT_FROM( trojan )
MDRV_CPU_MODIFY("maincpu") //AT: (avengers37b16gre)
- MDRV_CPU_PROGRAM_MAP(avengers_map,0)
+ MDRV_CPU_PROGRAM_MAP(avengers_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) // RST 38h triggered by software
MDRV_CPU_MODIFY("adpcm")
- MDRV_CPU_IO_MAP(avengers_adpcm_io_map,0)
+ MDRV_CPU_IO_MAP(avengers_adpcm_io_map)
/* video hardware */
MDRV_VIDEO_START(avengers)
diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c
index 659c34daff0..cee4288b1f4 100644
--- a/src/mame/drivers/m10.c
+++ b/src/mame/drivers/m10.c
@@ -819,7 +819,7 @@ static MACHINE_DRIVER_START( m10 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502,IREMM10_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(m10_main,0)
+ MDRV_CPU_PROGRAM_MAP(m10_main)
MDRV_MACHINE_RESET(irem)
@@ -859,7 +859,7 @@ static MACHINE_DRIVER_START( m11 )
MDRV_IMPORT_FROM(m10)
MDRV_CPU_REPLACE("maincpu", M6502,IREMM10_CPU_CLOCK)
//MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(m11_main,0)
+ MDRV_CPU_PROGRAM_MAP(m11_main)
//MDRV_CPU_VBLANK_INT("screen", m11_interrupt)
/* sound hardware */
@@ -871,7 +871,7 @@ static MACHINE_DRIVER_START( m15 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502,IREMM15_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(m15_main,0)
+ MDRV_CPU_PROGRAM_MAP(m15_main)
MDRV_MACHINE_RESET(irem)
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index 8edfe58c10c..f6c7a5786fb 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -439,11 +439,11 @@ static MACHINE_DRIVER_START( firebarr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V33, 28000000/2) /* NEC V33, 28MHz clock */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_ADD("soundcpu", V30, 14318000/2)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_CONFIG(firebarr_config)
MDRV_MACHINE_START(m107)
diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c
index 0dfcd535831..3172ad94abf 100644
--- a/src/mame/drivers/m14.c
+++ b/src/mame/drivers/m14.c
@@ -279,8 +279,8 @@ static MACHINE_DRIVER_START( m14 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",8085A,6000000)
- MDRV_CPU_PROGRAM_MAP(m14_map,0)
- MDRV_CPU_IO_MAP(m14_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(m14_map)
+ MDRV_CPU_IO_MAP(m14_io_map)
MDRV_CPU_VBLANK_INT("screen",m14_irq)
/* video hardware */
diff --git a/src/mame/drivers/m52.c b/src/mame/drivers/m52.c
index 16a6e731ea2..3219a4c956c 100644
--- a/src/mame/drivers/m52.c
+++ b/src/mame/drivers/m52.c
@@ -384,8 +384,8 @@ static MACHINE_DRIVER_START( m52 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -410,7 +410,7 @@ static MACHINE_DRIVER_START( alpha1v )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(alpha1v_map,0)
+ MDRV_CPU_PROGRAM_MAP(alpha1v_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c
index 2f80886958d..7639bcf6f11 100644
--- a/src/mame/drivers/m57.c
+++ b/src/mame/drivers/m57.c
@@ -227,7 +227,7 @@ static MACHINE_DRIVER_START( m57 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c
index 1205396b15c..69f5ccf84b2 100644
--- a/src/mame/drivers/m58.c
+++ b/src/mame/drivers/m58.c
@@ -192,7 +192,7 @@ static MACHINE_DRIVER_START( yard )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2)
- MDRV_CPU_PROGRAM_MAP(yard_map, 0)
+ MDRV_CPU_PROGRAM_MAP(yard_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c
index 45918c75fb4..f8fb0e2c9fb 100644
--- a/src/mame/drivers/m62.c
+++ b/src/mame/drivers/m62.c
@@ -934,8 +934,8 @@ static MACHINE_DRIVER_START( ldrun )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 24000000/6)
- MDRV_CPU_PROGRAM_MAP(ldrun_map,0)
- MDRV_CPU_IO_MAP(kungfum_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(ldrun_map)
+ MDRV_CPU_IO_MAP(kungfum_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -963,8 +963,8 @@ static MACHINE_DRIVER_START( kungfum )
/* basic machine hardware */
MDRV_IMPORT_FROM(ldrun)
MDRV_CPU_REPLACE("maincpu", Z80, 18432000/6)
- MDRV_CPU_PROGRAM_MAP(kungfum_map,0)
- MDRV_CPU_IO_MAP(kungfum_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(kungfum_map)
+ MDRV_CPU_IO_MAP(kungfum_io_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -980,8 +980,8 @@ static MACHINE_DRIVER_START( battroad )
/* basic machine hardware */
MDRV_IMPORT_FROM(ldrun)
MDRV_CPU_REPLACE("maincpu", Z80, 18432000/6)
- MDRV_CPU_PROGRAM_MAP(battroad_map,0)
- MDRV_CPU_IO_MAP(battroad_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(battroad_map)
+ MDRV_CPU_IO_MAP(battroad_io_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -1000,8 +1000,8 @@ static MACHINE_DRIVER_START( ldrun2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(ldrun)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ldrun2_map,0)
- MDRV_CPU_IO_MAP(ldrun2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(ldrun2_map)
+ MDRV_CPU_IO_MAP(ldrun2_io_map)
MDRV_VIDEO_START(ldrun2)
MDRV_VIDEO_UPDATE(ldrun)
@@ -1013,8 +1013,8 @@ static MACHINE_DRIVER_START( ldrun3 )
/* basic machine hardware */
MDRV_IMPORT_FROM(ldrun)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ldrun3_map,0)
- MDRV_CPU_IO_MAP(ldrun3_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(ldrun3_map)
+ MDRV_CPU_IO_MAP(ldrun3_io_map)
/* video hardware */
MDRV_GFXDECODE(ldrun3)
@@ -1028,8 +1028,8 @@ static MACHINE_DRIVER_START( ldrun4 )
/* basic machine hardware */
MDRV_IMPORT_FROM(ldrun)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ldrun4_map,0)
- MDRV_CPU_IO_MAP(ldrun4_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(ldrun4_map)
+ MDRV_CPU_IO_MAP(ldrun4_io_map)
/* video hardware */
MDRV_GFXDECODE(ldrun3)
@@ -1043,7 +1043,7 @@ static MACHINE_DRIVER_START( lotlot )
/* basic machine hardware */
MDRV_IMPORT_FROM(ldrun)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(lotlot_map,0)
+ MDRV_CPU_PROGRAM_MAP(lotlot_map)
/* video hardware */
MDRV_GFXDECODE(lotlot)
@@ -1060,8 +1060,8 @@ static MACHINE_DRIVER_START( kidniki )
/* basic machine hardware */
MDRV_IMPORT_FROM(ldrun)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(kidniki_map,0)
- MDRV_CPU_IO_MAP(kidniki_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(kidniki_map)
+ MDRV_CPU_IO_MAP(kidniki_io_map)
/* video hardware */
MDRV_GFXDECODE(kidniki)
@@ -1076,7 +1076,7 @@ static MACHINE_DRIVER_START( spelunkr )
/* basic machine hardware */
MDRV_IMPORT_FROM(ldrun)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spelunkr_map,0)
+ MDRV_CPU_PROGRAM_MAP(spelunkr_map)
/* video hardware */
MDRV_GFXDECODE(spelunkr)
@@ -1091,7 +1091,7 @@ static MACHINE_DRIVER_START( spelunk2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(ldrun)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spelunk2_map,0)
+ MDRV_CPU_PROGRAM_MAP(spelunk2_map)
/* video hardware */
MDRV_GFXDECODE(spelunk2)
@@ -1108,8 +1108,8 @@ static MACHINE_DRIVER_START( youjyudn )
/* basic machine hardware */
MDRV_IMPORT_FROM(ldrun)
MDRV_CPU_REPLACE("maincpu", Z80, 18432000/6)
- MDRV_CPU_PROGRAM_MAP(youjyudn_map,0)
- MDRV_CPU_IO_MAP(youjyudn_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(youjyudn_map)
+ MDRV_CPU_IO_MAP(youjyudn_io_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -1126,7 +1126,7 @@ static MACHINE_DRIVER_START( horizon )
/* basic machine hardware */
MDRV_IMPORT_FROM(ldrun)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(horizon_map,0)
+ MDRV_CPU_PROGRAM_MAP(horizon_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index 4b0c9090e57..897d643e457 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -640,12 +640,12 @@ static MACHINE_DRIVER_START( m63 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,XTAL_12MHz/4) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(m63_map,0)
+ MDRV_CPU_PROGRAM_MAP(m63_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("soundcpu",I8039,XTAL_12MHz/4) /* ????? */
- MDRV_CPU_PROGRAM_MAP(i8039_map,0)
- MDRV_CPU_IO_MAP(i8039_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(i8039_map)
+ MDRV_CPU_IO_MAP(i8039_port_map)
MDRV_CPU_PERIODIC_INT(snd_irq, 60)
@@ -684,12 +684,12 @@ static MACHINE_DRIVER_START( fghtbskt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(fghtbskt_map,0)
+ MDRV_CPU_PROGRAM_MAP(fghtbskt_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("soundcpu", I8039,XTAL_12MHz/4) /* ????? */
- MDRV_CPU_PROGRAM_MAP(i8039_map,0)
- MDRV_CPU_IO_MAP(i8039_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(i8039_map)
+ MDRV_CPU_IO_MAP(i8039_port_map)
MDRV_CPU_PERIODIC_INT(snd_irq, 60/2)
/* video hardware */
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index cbe027e52c1..d5dc9d5def6 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -1791,12 +1791,12 @@ static MACHINE_DRIVER_START( rtype )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(rtype_map,0)
- MDRV_CPU_IO_MAP(m72_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(rtype_map)
+ MDRV_CPU_IO_MAP(m72_portmap)
MDRV_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_ram_map,0)
- MDRV_CPU_IO_MAP(rtype_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_ram_map)
+ MDRV_CPU_IO_MAP(rtype_sound_portmap)
/* IRQs are generated by main Z80 and YM2151 */
MDRV_MACHINE_START(m72)
@@ -1826,12 +1826,12 @@ static MACHINE_DRIVER_START( m72_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(m72_map,0)
- MDRV_CPU_IO_MAP(m72_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(m72_map)
+ MDRV_CPU_IO_MAP(m72_portmap)
MDRV_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_ram_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_ram_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_MACHINE_START(m72)
MDRV_MACHINE_RESET(m72)
@@ -1874,7 +1874,7 @@ static MACHINE_DRIVER_START( m72_8751 )
MDRV_IMPORT_FROM(m72_base)
MDRV_CPU_ADD("mcu",I8751, MASTER_CLOCK/4)
- MDRV_CPU_IO_MAP(mcu_io_map,0)
+ MDRV_CPU_IO_MAP(mcu_io_map)
MDRV_CPU_VBLANK_INT("screen", m72_mcu_int)
MACHINE_DRIVER_END
@@ -1884,12 +1884,12 @@ static MACHINE_DRIVER_START( dkgenm72 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(m72_map,0)
- MDRV_CPU_IO_MAP(m72_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(m72_map)
+ MDRV_CPU_IO_MAP(m72_portmap)
MDRV_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_ram_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_ram_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
@@ -1925,12 +1925,12 @@ static MACHINE_DRIVER_START( xmultipl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(xmultipl_map,0)
- MDRV_CPU_IO_MAP(m72_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(xmultipl_map)
+ MDRV_CPU_IO_MAP(m72_portmap)
MDRV_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_ram_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_ram_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
@@ -1966,12 +1966,12 @@ static MACHINE_DRIVER_START( dbreed )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(dbreed_map,0)
- MDRV_CPU_IO_MAP(hharry_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(dbreed_map)
+ MDRV_CPU_IO_MAP(hharry_portmap)
MDRV_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map,0)
- MDRV_CPU_IO_MAP(rtype2_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_rom_map)
+ MDRV_CPU_IO_MAP(rtype2_sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
@@ -2006,12 +2006,12 @@ static MACHINE_DRIVER_START( dbreed72 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(dbreed72_map,0)
- MDRV_CPU_IO_MAP(m72_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(dbreed72_map)
+ MDRV_CPU_IO_MAP(m72_portmap)
MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_ram_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_ram_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
@@ -2047,12 +2047,12 @@ static MACHINE_DRIVER_START( rtype2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(rtype2_map,0)
- MDRV_CPU_IO_MAP(rtype2_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(rtype2_map)
+ MDRV_CPU_IO_MAP(rtype2_portmap)
MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map,0)
- MDRV_CPU_IO_MAP(rtype2_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_rom_map)
+ MDRV_CPU_IO_MAP(rtype2_sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
@@ -2087,12 +2087,12 @@ static MACHINE_DRIVER_START( majtitle )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(majtitle_map,0)
- MDRV_CPU_IO_MAP(majtitle_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(majtitle_map)
+ MDRV_CPU_IO_MAP(majtitle_portmap)
MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map,0)
- MDRV_CPU_IO_MAP(rtype2_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_rom_map)
+ MDRV_CPU_IO_MAP(rtype2_sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
@@ -2127,12 +2127,12 @@ static MACHINE_DRIVER_START( hharry )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(hharry_map,0)
- MDRV_CPU_IO_MAP(hharry_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(hharry_map)
+ MDRV_CPU_IO_MAP(hharry_portmap)
MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map,0)
- MDRV_CPU_IO_MAP(rtype2_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_rom_map)
+ MDRV_CPU_IO_MAP(rtype2_sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
@@ -2168,12 +2168,12 @@ static MACHINE_DRIVER_START( hharryu )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(hharryu_map,0)
- MDRV_CPU_IO_MAP(rtype2_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(hharryu_map)
+ MDRV_CPU_IO_MAP(rtype2_portmap)
MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map,0)
- MDRV_CPU_IO_MAP(rtype2_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_rom_map)
+ MDRV_CPU_IO_MAP(rtype2_sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
@@ -2209,12 +2209,12 @@ static MACHINE_DRIVER_START( poundfor )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(rtype2_map,0)
- MDRV_CPU_IO_MAP(poundfor_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(rtype2_map)
+ MDRV_CPU_IO_MAP(poundfor_portmap)
MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map,0)
- MDRV_CPU_IO_MAP(poundfor_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_rom_map)
+ MDRV_CPU_IO_MAP(poundfor_sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
@@ -2249,12 +2249,12 @@ static MACHINE_DRIVER_START( cosmccop )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2)
- MDRV_CPU_PROGRAM_MAP(kengo_map,0)
- MDRV_CPU_IO_MAP(kengo_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(kengo_map)
+ MDRV_CPU_IO_MAP(kengo_portmap)
MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map,0)
- MDRV_CPU_IO_MAP(rtype2_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_rom_map)
+ MDRV_CPU_IO_MAP(rtype2_sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c
index 5a4b2b2894a..9f299b835ca 100644
--- a/src/mame/drivers/m79amb.c
+++ b/src/mame/drivers/m79amb.c
@@ -193,7 +193,7 @@ static MACHINE_DRIVER_START( m79amb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080, XTAL_19_6608MHz / 10)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", m79amb_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index 58358ea686d..8040434fbba 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -700,13 +700,13 @@ static INTERRUPT_GEN( bomblord_interrupt )
static MACHINE_DRIVER_START( m90 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,XTAL_32MHz/2/2) /* verified clock on cpu is 16Mhz but probably divided internally by 2 */
- MDRV_CPU_PROGRAM_MAP(m90_main_cpu_map,0)
- MDRV_CPU_IO_MAP(m90_main_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(m90_main_cpu_map)
+ MDRV_CPU_IO_MAP(m90_main_cpu_io_map)
MDRV_CPU_VBLANK_INT("screen", m90_interrupt)
MDRV_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map,0)
- MDRV_CPU_IO_MAP(m90_sound_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map)
+ MDRV_CPU_IO_MAP(m90_sound_cpu_io_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
@@ -781,13 +781,13 @@ static MACHINE_DRIVER_START( bombrman )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,XTAL_32MHz/2/2) /* verified clock on cpu is 16Mhz but probably divided internally by 2 */
MDRV_CPU_CONFIG(bomberman_config)
- MDRV_CPU_PROGRAM_MAP(m90_main_cpu_map,0)
- MDRV_CPU_IO_MAP(m90_main_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(m90_main_cpu_map)
+ MDRV_CPU_IO_MAP(m90_main_cpu_io_map)
MDRV_CPU_VBLANK_INT("screen", m90_interrupt)
MDRV_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map,0)
- MDRV_CPU_IO_MAP(m90_sound_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map)
+ MDRV_CPU_IO_MAP(m90_sound_cpu_io_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
MDRV_MACHINE_RESET(m72_sound)
@@ -825,13 +825,13 @@ static MACHINE_DRIVER_START( bbmanw )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,XTAL_32MHz/2/2) /* verified clock on cpu is 16Mhz but probably divided internally by 2 */
MDRV_CPU_CONFIG(dynablaster_config)
- MDRV_CPU_PROGRAM_MAP(m90_main_cpu_map,0)
- MDRV_CPU_IO_MAP(m90_main_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(m90_main_cpu_map)
+ MDRV_CPU_IO_MAP(m90_main_cpu_io_map)
MDRV_CPU_VBLANK_INT("screen", m90_interrupt)
MDRV_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map,0)
- MDRV_CPU_IO_MAP(bbmanw_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map)
+ MDRV_CPU_IO_MAP(bbmanw_sound_io_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
MDRV_MACHINE_RESET(m72_sound)
@@ -868,8 +868,8 @@ static MACHINE_DRIVER_START( bbmanwj )
MDRV_IMPORT_FROM( bbmanw )
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map,0)
- MDRV_CPU_IO_MAP(m90_sound_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map)
+ MDRV_CPU_IO_MAP(m90_sound_cpu_io_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
@@ -880,8 +880,8 @@ static MACHINE_DRIVER_START( bomblord )
MDRV_IMPORT_FROM( bbmanw )
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_CONFIG(no_table)
- MDRV_CPU_PROGRAM_MAP(bomblord_main_cpu_map,0)
- MDRV_CPU_IO_MAP(dynablsb_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(bomblord_main_cpu_map)
+ MDRV_CPU_IO_MAP(dynablsb_cpu_io_map)
MDRV_VIDEO_START(bomblord)
MDRV_VIDEO_UPDATE(bomblord)
@@ -894,13 +894,13 @@ static MACHINE_DRIVER_START( dynablsb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,32000000/4)
- MDRV_CPU_PROGRAM_MAP(dynablsb_main_cpu_map,0)
- MDRV_CPU_IO_MAP(dynablsb_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(dynablsb_main_cpu_map)
+ MDRV_CPU_IO_MAP(dynablsb_cpu_io_map)
MDRV_CPU_VBLANK_INT("screen", m90_interrupt)
MDRV_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map,0)
- MDRV_CPU_IO_MAP(m90_sound_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map)
+ MDRV_CPU_IO_MAP(m90_sound_cpu_io_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
MDRV_MACHINE_RESET(m72_sound)
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index 68df6c1832a..fab6cb8f9cb 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -917,11 +917,11 @@ static MACHINE_DRIVER_START( m92 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",V33,18000000/2) /* NEC V33, 18 MHz clock */
- MDRV_CPU_PROGRAM_MAP(m92_map,0)
- MDRV_CPU_IO_MAP(m92_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(m92_map)
+ MDRV_CPU_IO_MAP(m92_portmap)
MDRV_CPU_ADD("soundcpu" ,V30, 14318180/2) /* 14.31818 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_START(m92)
MDRV_MACHINE_RESET(m92)
@@ -973,7 +973,7 @@ static const nec_config lethalth_config ={ lethalth_decryption_table, };
static MACHINE_DRIVER_START( lethalth )
MDRV_IMPORT_FROM(m92)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(lethalth_map,0)
+ MDRV_CPU_PROGRAM_MAP(lethalth_map)
MDRV_CPU_MODIFY("soundcpu")
MDRV_CPU_CONFIG(lethalth_config)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index caf915d9092..96df040be61 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -606,11 +606,11 @@ static const es5506_interface es5506_config =
static MACHINE_DRIVER_START( macrossp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 50000000/2) /* 25 MHz */
- MDRV_CPU_PROGRAM_MAP(macrossp_map,0)
+ MDRV_CPU_PROGRAM_MAP(macrossp_map)
MDRV_CPU_VBLANK_INT("screen", irq3_line_hold) // there are others ...
MDRV_CPU_ADD("audiocpu", M68000, 32000000/2) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(macrossp_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(macrossp_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c
index 211d80fb052..7ff77f09000 100644
--- a/src/mame/drivers/macs.c
+++ b/src/mame/drivers/macs.c
@@ -348,8 +348,8 @@ static const st0016_interface st0016_config =
static MACHINE_DRIVER_START( macs )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,8000000) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(macs_mem,0)
- MDRV_CPU_IO_MAP(macs_io,0)
+ MDRV_CPU_PROGRAM_MAP(macs_mem)
+ MDRV_CPU_IO_MAP(macs_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index 79859b44fc9..efcab3af963 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -176,10 +176,10 @@ static MACHINE_DRIVER_START( madalien )
/* main CPU */
MDRV_CPU_ADD("maincpu", M6502, MADALIEN_MAIN_CLOCK / 8) /* 1324kHz */
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_ADD("audiocpu", M6502, SOUND_CLOCK / 8) /* 512kHz */
- MDRV_CPU_PROGRAM_MAP(audio_map, 0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index 6e73535cc2c..97c887215b6 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -233,11 +233,11 @@ static MACHINE_DRIVER_START( madmotor )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* Custom chip 59, 24 MHz crystal */
- MDRV_CPU_PROGRAM_MAP(madmotor_map,0)
+ MDRV_CPU_PROGRAM_MAP(madmotor_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
MDRV_CPU_ADD("audiocpu", H6280, 8053000/2) /* Custom chip 45, Crystal near CPU is 8.053 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c
index 4d13e286a36..613fe82ceeb 100644
--- a/src/mame/drivers/magic10.c
+++ b/src/mame/drivers/magic10.c
@@ -648,7 +648,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( magic10 )
/* basic machine hardware */
MDRV_CPU_ADD("cpu", M68000, 10000000) // ?
- MDRV_CPU_PROGRAM_MAP(magic10_map,0)
+ MDRV_CPU_PROGRAM_MAP(magic10_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -678,7 +678,7 @@ static MACHINE_DRIVER_START( magic10a )
/* basic machine hardware */
MDRV_IMPORT_FROM(magic10)
MDRV_CPU_MODIFY("cpu")
- MDRV_CPU_PROGRAM_MAP(magic10a_map,0)
+ MDRV_CPU_PROGRAM_MAP(magic10a_map)
MACHINE_DRIVER_END
@@ -686,7 +686,7 @@ static MACHINE_DRIVER_START( magic102 )
/* basic machine hardware */
MDRV_IMPORT_FROM(magic10)
MDRV_CPU_MODIFY("cpu")
- MDRV_CPU_PROGRAM_MAP(magic102_map,0)
+ MDRV_CPU_PROGRAM_MAP(magic102_map)
MDRV_SCREEN_MODIFY("screen")
MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 30*8-1)
@@ -697,7 +697,7 @@ static MACHINE_DRIVER_START( hotslot )
/* basic machine hardware */
MDRV_IMPORT_FROM(magic10)
MDRV_CPU_MODIFY("cpu")
- MDRV_CPU_PROGRAM_MAP(hotslot_map,0)
+ MDRV_CPU_PROGRAM_MAP(hotslot_map)
MDRV_SCREEN_MODIFY("screen")
MDRV_SCREEN_VISIBLE_AREA(8*8, 56*8-1, 2*8, 32*8-1)
@@ -708,7 +708,7 @@ static MACHINE_DRIVER_START( sgsafari )
/* basic machine hardware */
MDRV_IMPORT_FROM(magic10)
MDRV_CPU_MODIFY("cpu")
- MDRV_CPU_PROGRAM_MAP(sgsafari_map,0)
+ MDRV_CPU_PROGRAM_MAP(sgsafari_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold) /* L1 interrupts */
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c
index 1c8f9eeb794..ca2889afe88 100644
--- a/src/mame/drivers/magicard.c
+++ b/src/mame/drivers/magicard.c
@@ -417,7 +417,7 @@ static INTERRUPT_GEN( magicard_irq )
static MACHINE_DRIVER_START( magicard )
MDRV_CPU_ADD("maincpu", M68000, CLOCK_A/2) /* SCC-68070 CCA84 datasheet */
- MDRV_CPU_PROGRAM_MAP(magicard_mem,0)
+ MDRV_CPU_PROGRAM_MAP(magicard_mem)
MDRV_CPU_VBLANK_INT("screen", magicard_irq) /* no interrupts? (it erases the vectors..) */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c
index ddabdadca74..cc504fad453 100644
--- a/src/mame/drivers/magicfly.c
+++ b/src/mame/drivers/magicfly.c
@@ -755,7 +755,7 @@ static MACHINE_DRIVER_START( magicfly )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/12) /* guess */
- MDRV_CPU_PROGRAM_MAP(magicfly_map, 0)
+ MDRV_CPU_PROGRAM_MAP(magicfly_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c
index 07fe41946e8..b90622889c6 100644
--- a/src/mame/drivers/magictg.c
+++ b/src/mame/drivers/magictg.c
@@ -143,7 +143,7 @@ static MACHINE_DRIVER_START( magictg )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", R4600BE, 10000000) // ?? what cpu?
MDRV_CPU_CONFIG(config)
- MDRV_CPU_PROGRAM_MAP(magictg_map, 0)
+ MDRV_CPU_PROGRAM_MAP(magictg_map)
MDRV_SCREEN_ADD("screen", RASTER)
MDRV_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index 6761b28e348..431430f8c68 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -359,12 +359,12 @@ static MACHINE_DRIVER_START( magmax )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(magmax_map,0)
+ MDRV_CPU_PROGRAM_MAP(magmax_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,XTAL_20MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(magmax_sound_map,0)
- MDRV_CPU_IO_MAP(magmax_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(magmax_sound_map)
+ MDRV_CPU_IO_MAP(magmax_sound_io_map)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c
index 3c353924879..a8a5523f0a3 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -397,11 +397,11 @@ static MACHINE_DRIVER_START( mainevt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* ?? */
- MDRV_CPU_PROGRAM_MAP(mainevt_map,0)
+ MDRV_CPU_PROGRAM_MAP(mainevt_map)
MDRV_CPU_VBLANK_INT("screen", mainevt_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(mainevt_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(mainevt_sound_map)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse,8*60) /* ??? */
/* video hardware */
@@ -436,11 +436,11 @@ static MACHINE_DRIVER_START( devstors )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* ?? */
- MDRV_CPU_PROGRAM_MAP(devstors_map,0)
+ MDRV_CPU_PROGRAM_MAP(devstors_map)
MDRV_CPU_VBLANK_INT("screen", dv_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(devstors_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(devstors_sound_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* ??? */
/* video hardware */
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index c137a92735a..7e7f617bff4 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -397,12 +397,12 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mainsnk )
MDRV_CPU_ADD("maincpu", Z80, 3360000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, 244)
/* video hardware */
diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c
index d1273213609..de332b5dc6e 100644
--- a/src/mame/drivers/malzak.c
+++ b/src/mame/drivers/malzak.c
@@ -367,8 +367,8 @@ static MACHINE_DRIVER_START( malzak )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", S2650, 3800000/4)
- MDRV_CPU_PROGRAM_MAP(malzak_map,0)
- MDRV_CPU_IO_MAP(malzak_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(malzak_map)
+ MDRV_CPU_IO_MAP(malzak_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -403,7 +403,7 @@ static MACHINE_DRIVER_START( malzak2 )
MDRV_IMPORT_FROM( malzak )
MDRV_CPU_MODIFY( "maincpu" )
- MDRV_CPU_PROGRAM_MAP(malzak2_map,0)
+ MDRV_CPU_PROGRAM_MAP(malzak2_map)
MDRV_NVRAM_HANDLER( generic_0fill )
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 277f052f3db..947d821f278 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -1576,11 +1576,11 @@ static MACHINE_DRIVER_START( superpac )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(superpac_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(superpac_cpu1_map)
MDRV_CPU_VBLANK_INT("screen", mappy_interrupt_1) // also update the custom I/O chips
MDRV_CPU_ADD("sub", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(superpac_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(superpac_cpu2_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_WATCHDOG_VBLANK_INIT(8)
@@ -1623,15 +1623,15 @@ static MACHINE_DRIVER_START( phozon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* MAIN CPU */
- MDRV_CPU_PROGRAM_MAP(phozon_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(phozon_cpu1_map)
MDRV_CPU_VBLANK_INT("screen", mappy_interrupt_1) // also update the custom I/O chips
MDRV_CPU_ADD("sub", M6809, PIXEL_CLOCK/4) /* SOUND CPU */
- MDRV_CPU_PROGRAM_MAP(phozon_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(phozon_cpu2_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub2", M6809, PIXEL_CLOCK/4) /* SUB CPU */
- MDRV_CPU_PROGRAM_MAP(phozon_cpu3_map,0)
+ MDRV_CPU_PROGRAM_MAP(phozon_cpu3_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_WATCHDOG_VBLANK_INIT(8)
@@ -1664,11 +1664,11 @@ static MACHINE_DRIVER_START( mappy )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(mappy_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(mappy_cpu1_map)
MDRV_CPU_VBLANK_INT("screen", mappy_interrupt_1) // also update the custom I/O chips
MDRV_CPU_ADD("sub", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(mappy_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(mappy_cpu2_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_WATCHDOG_VBLANK_INIT(8)
diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c
index 354cac23e0e..76e0b70c8b6 100644
--- a/src/mame/drivers/marineb.c
+++ b/src/mame/drivers/marineb.c
@@ -507,8 +507,8 @@ static MACHINE_DRIVER_START( marineb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(marineb_map,0)
- MDRV_CPU_IO_MAP(marineb_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(marineb_map)
+ MDRV_CPU_IO_MAP(marineb_io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_RESET(marineb)
@@ -573,7 +573,7 @@ static MACHINE_DRIVER_START( wanted )
/* basic machine hardware */
MDRV_IMPORT_FROM(marineb)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(wanted_io_map,0)
+ MDRV_CPU_IO_MAP(wanted_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c
index 90039a1e60f..3ce227a8fac 100644
--- a/src/mame/drivers/marinedt.c
+++ b/src/mame/drivers/marinedt.c
@@ -570,8 +570,8 @@ static MACHINE_DRIVER_START( marinedt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,10000000/4)
- MDRV_CPU_PROGRAM_MAP(marinedt_map,0)
- MDRV_CPU_IO_MAP(marinedt_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(marinedt_map)
+ MDRV_CPU_IO_MAP(marinedt_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c
index 96dec60f9db..f695a638549 100644
--- a/src/mame/drivers/mario.c
+++ b/src/mame/drivers/mario.c
@@ -341,8 +341,8 @@ static MACHINE_DRIVER_START( mario_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, Z80_CLOCK) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mario_map, 0)
- MDRV_CPU_IO_MAP(mario_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mario_map)
+ MDRV_CPU_IO_MAP(mario_io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* devices */
@@ -377,8 +377,8 @@ static MACHINE_DRIVER_START( masao )
MDRV_IMPORT_FROM(mario_base )
MDRV_CPU_REPLACE("maincpu", Z80, 4000000) /* 4.000 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(masao_map, 0)
- MDRV_CPU_IO_MAP(mario_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(masao_map)
+ MDRV_CPU_IO_MAP(mario_io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* sound hardware */
diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c
index 48bc8735085..64355019f98 100644
--- a/src/mame/drivers/markham.c
+++ b/src/mame/drivers/markham.c
@@ -184,11 +184,11 @@ static MACHINE_DRIVER_START( markham )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
- MDRV_CPU_PROGRAM_MAP(markham_master_map,0)
+ MDRV_CPU_PROGRAM_MAP(markham_master_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */
- MDRV_CPU_PROGRAM_MAP(markham_slave_map,0)
+ MDRV_CPU_PROGRAM_MAP(markham_slave_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c
index 7e951eb6a3e..87c38031e31 100644
--- a/src/mame/drivers/mastboy.c
+++ b/src/mame/drivers/mastboy.c
@@ -857,8 +857,8 @@ static MACHINE_RESET( mastboy )
static MACHINE_DRIVER_START( mastboy )
MDRV_CPU_ADD("maincpu", Z180, 12000000/2) /* HD647180X0CP6-1M1R */
- MDRV_CPU_PROGRAM_MAP(mastboy_map,0)
- MDRV_CPU_IO_MAP(mastboy_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mastboy_map)
+ MDRV_CPU_IO_MAP(mastboy_io_map)
MDRV_CPU_VBLANK_INT("screen", mastboy_interrupt)
MDRV_NVRAM_HANDLER(generic_1fill)
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index 923cdc2cd4c..a7a6ee21572 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -272,11 +272,11 @@ static MACHINE_DRIVER_START( matmania )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(matmania_map,0)
+ MDRV_CPU_PROGRAM_MAP(matmania_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", M6502, 1200000) /* 1.2 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(matmania_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(matmania_sound_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,15) /* ???? */
/* IRQs are caused by the main CPU */
MDRV_QUANTUM_TIME(HZ(600))
@@ -327,15 +327,15 @@ static MACHINE_DRIVER_START( maniach )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(maniach_map,0)
+ MDRV_CPU_PROGRAM_MAP(maniach_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", M6809, 1500000) /* 1.5 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(maniach_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(maniach_sound_map)
/* IRQs are caused by the main CPU */
MDRV_CPU_ADD("mcu", M68705, 1500000*2) /* (don't know really how fast, but it doesn't need to even be this fast) */
- MDRV_CPU_PROGRAM_MAP(maniach_mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(maniach_mcu_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slice per frame - high interleaving to sync main and mcu */
diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c
index ec9694db70c..931a0bd2443 100644
--- a/src/mame/drivers/maxaflex.c
+++ b/src/mame/drivers/maxaflex.c
@@ -430,11 +430,11 @@ static const pokey_interface pokey_config = {
static MACHINE_DRIVER_START( a600xl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, FREQ_17_EXACT)
- MDRV_CPU_PROGRAM_MAP(a600xl_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(a600xl_mem)
MDRV_CPU_VBLANK_INT_HACK(a800xl_interrupt, TOTAL_LINES_60HZ)
MDRV_CPU_ADD("mcu", M68705, 3579545)
- MDRV_CPU_PROGRAM_MAP(mcu_mem,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_mem)
MDRV_PIA6821_ADD("pia", atarixl_pia_interface)
diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c
index 0c1ec0fdcf8..aba54d33998 100644
--- a/src/mame/drivers/maygay1b.c
+++ b/src/mame/drivers/maygay1b.c
@@ -798,7 +798,7 @@ static MACHINE_DRIVER_START( m1 )
MDRV_MACHINE_START(m1)
MDRV_MACHINE_RESET(m1)
MDRV_CPU_ADD("maincpu", M6809, M1_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(m1_memmap,0)
+ MDRV_CPU_PROGRAM_MAP(m1_memmap)
MDRV_DUART68681_ADD("duart68681", M1_DUART_CLOCK, maygaym1_duart68681_config)
MDRV_PIA6821_ADD("pia", m1_pia_intf)
diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c
index 2ab1b207c66..faa78946ea1 100644
--- a/src/mame/drivers/maygayv1.c
+++ b/src/mame/drivers/maygayv1.c
@@ -991,13 +991,13 @@ static INTERRUPT_GEN( vsync_interrupt )
static MACHINE_DRIVER_START( maygayv1 )
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2)
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", vsync_interrupt)
MDRV_CPU_ADD("soundcpu", I8052, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_prg, 0)
- MDRV_CPU_DATA_MAP(sound_data, 0)
- MDRV_CPU_IO_MAP(sound_io, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_prg)
+ MDRV_CPU_DATA_MAP(sound_data)
+ MDRV_CPU_IO_MAP(sound_io)
MDRV_PIA6821_ADD("pia", pia_intf)
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index 23f9d1c0daf..ead68986b8c 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -272,8 +272,8 @@ static MACHINE_DRIVER_START( mayumi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MCLK/2) /* 5.000 MHz ? */
- MDRV_CPU_PROGRAM_MAP(mayumi_map,0)
- MDRV_CPU_IO_MAP(mayumi_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mayumi_map)
+ MDRV_CPU_IO_MAP(mayumi_io_map)
MDRV_CPU_VBLANK_INT("screen", mayumi_interrupt)
MDRV_MACHINE_RESET( mayumi )
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index 76305ad4b4e..f43bb638568 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -1409,17 +1409,17 @@ static const ay8910_interface ay8912_interface_2 =
static MACHINE_DRIVER_START( mazerbla )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
- MDRV_CPU_PROGRAM_MAP(mazerbla_map,0)
- MDRV_CPU_IO_MAP(mazerbla_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mazerbla_map)
+ MDRV_CPU_IO_MAP(mazerbla_io_map)
MDRV_CPU_ADD("sub", Z80, 4000000) /* 4 MHz, NMI, IM1 INT */
- MDRV_CPU_PROGRAM_MAP(mazerbla_cpu2_map,0)
- MDRV_CPU_IO_MAP(mazerbla_cpu2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mazerbla_cpu2_map)
+ MDRV_CPU_IO_MAP(mazerbla_cpu2_io_map)
//MDRV_CPU_PERIODIC_INT(irq0_line_hold, 400 ) /* frequency in Hz */
MDRV_CPU_ADD("sub2", Z80, 4000000) /* 4 MHz, no NMI, IM1 INT */
- MDRV_CPU_PROGRAM_MAP(mazerbla_cpu3_map,0)
- MDRV_CPU_IO_MAP(mazerbla_cpu3_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mazerbla_cpu3_map)
+ MDRV_CPU_IO_MAP(mazerbla_cpu3_io_map)
/* (vblank related ??) int generated by a custom video processor
and cleared on ANY port access.
but handled differently for now
@@ -1452,16 +1452,16 @@ static MACHINE_DRIVER_START( greatgun )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
- MDRV_CPU_PROGRAM_MAP(mazerbla_map,0)
- MDRV_CPU_IO_MAP(greatgun_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mazerbla_map)
+ MDRV_CPU_IO_MAP(greatgun_io_map)
MDRV_CPU_ADD("sub", Z80, 14318000 / 4) /* 3.579500 MHz, NMI - caused by sound command write, periodic INT */
- MDRV_CPU_PROGRAM_MAP(greatgun_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(greatgun_sound_map)
MDRV_CPU_PERIODIC_INT(sound_interrupt, (double)14318180/16/16/16/16 )
MDRV_CPU_ADD("sub2", Z80, 4000000) /* 4 MHz, no NMI, IM1 INT */
- MDRV_CPU_PROGRAM_MAP(mazerbla_cpu3_map,0)
- MDRV_CPU_IO_MAP(greatgun_cpu3_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mazerbla_cpu3_map)
+ MDRV_CPU_IO_MAP(greatgun_cpu3_io_map)
/* (vblank related ??) int generated by a custom video processor
and cleared on ANY port access.
but handled differently for now
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index 429ab23347f..8181a4da1d7 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -434,12 +434,12 @@ static MACHINE_DRIVER_START( mcatadv )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mcatadv_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcatadv_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, XTAL_16MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mcatadv_sound_map,0)
- MDRV_CPU_IO_MAP(mcatadv_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcatadv_sound_map)
+ MDRV_CPU_IO_MAP(mcatadv_sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -473,8 +473,8 @@ static MACHINE_DRIVER_START( nost )
MDRV_IMPORT_FROM( mcatadv )
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(nost_sound_map,0)
- MDRV_CPU_IO_MAP(nost_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(nost_sound_map)
+ MDRV_CPU_IO_MAP(nost_sound_io_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index 94f2e4583a5..3fb82815eeb 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -1518,8 +1518,8 @@ static MACHINE_DRIVER_START( mcr_90009 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MAIN_OSC_MCR_I/8)
MDRV_CPU_CONFIG(mcr_daisy_chain)
- MDRV_CPU_PROGRAM_MAP(cpu_90009_map,0)
- MDRV_CPU_IO_MAP(cpu_90009_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cpu_90009_map)
+ MDRV_CPU_IO_MAP(cpu_90009_portmap)
MDRV_CPU_VBLANK_INT_HACK(mcr_interrupt,2)
MDRV_Z80CTC_ADD("ctc", MAIN_OSC_MCR_I/8 /* same as "maincpu" */, mcr_ctc_intf)
@@ -1556,8 +1556,8 @@ static MACHINE_DRIVER_START( mcr_90010 )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cpu_90010_map,0)
- MDRV_CPU_IO_MAP(cpu_90010_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cpu_90010_map)
+ MDRV_CPU_IO_MAP(cpu_90010_portmap)
/* video hardware */
MDRV_PALETTE_LENGTH(64)
@@ -1586,8 +1586,8 @@ static MACHINE_DRIVER_START( mcr_91490 )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_CLOCK(5000000)
- MDRV_CPU_PROGRAM_MAP(cpu_91490_map,0)
- MDRV_CPU_IO_MAP(cpu_91490_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(cpu_91490_map)
+ MDRV_CPU_IO_MAP(cpu_91490_portmap)
MDRV_DEVICE_MODIFY("ctc")
MDRV_DEVICE_CLOCK(5000000 /* same as "maincpu" */)
@@ -1612,8 +1612,8 @@ static MACHINE_DRIVER_START( mcr_91490_ipu )
MDRV_CPU_ADD("ipu", Z80, 7372800/2)
MDRV_CPU_CONFIG(mcr_ipu_daisy_chain)
- MDRV_CPU_PROGRAM_MAP(ipu_91695_map,0)
- MDRV_CPU_IO_MAP(ipu_91695_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(ipu_91695_map)
+ MDRV_CPU_IO_MAP(ipu_91695_portmap)
MDRV_CPU_VBLANK_INT_HACK(mcr_ipu_interrupt,2)
MDRV_Z80CTC_ADD("ipu_ctc", 7372800/2 /* same as "ipu" */, nflfoot_ctc_intf)
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index 0841b6a8f1f..bb392835dae 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -1096,8 +1096,8 @@ static MACHINE_DRIVER_START( mcrmono )
MDRV_IMPORT_FROM(mcr3_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mcrmono_map,0)
- MDRV_CPU_IO_MAP(mcrmono_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(mcrmono_map)
+ MDRV_CPU_IO_MAP(mcrmono_portmap)
/* video hardware */
MDRV_VIDEO_START(mcrmono)
@@ -1134,8 +1134,8 @@ static MACHINE_DRIVER_START( mcrscroll )
MDRV_IMPORT_FROM(mcr_ssio)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spyhunt_map,0)
- MDRV_CPU_IO_MAP(spyhunt_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(spyhunt_map)
+ MDRV_CPU_IO_MAP(spyhunt_portmap)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index 4c10b01215f..16ef8f3a56e 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -887,7 +887,7 @@ static MACHINE_DRIVER_START( zwackery )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 7652400) /* should be XTAL_16MHz/2 */
- MDRV_CPU_PROGRAM_MAP(zwackery_map,0)
+ MDRV_CPU_PROGRAM_MAP(zwackery_map)
MDRV_CPU_VBLANK_INT("screen", mcr68_interrupt)
// MDRV_WATCHDOG_VBLANK_INIT(8)
@@ -921,7 +921,7 @@ static MACHINE_DRIVER_START( mcr68 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 7723800)
- MDRV_CPU_PROGRAM_MAP(mcr68_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcr68_map)
MDRV_CPU_VBLANK_INT("screen", mcr68_interrupt)
MDRV_WATCHDOG_VBLANK_INIT(8)
@@ -979,7 +979,7 @@ static MACHINE_DRIVER_START( pigskin )
MDRV_IMPORT_FROM(williams_cvsd_sound)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pigskin_map,0)
+ MDRV_CPU_PROGRAM_MAP(pigskin_map)
MACHINE_DRIVER_END
@@ -990,7 +990,7 @@ static MACHINE_DRIVER_START( trisport )
MDRV_IMPORT_FROM(williams_cvsd_sound)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(trisport_map,0)
+ MDRV_CPU_PROGRAM_MAP(trisport_map)
MDRV_NVRAM_HANDLER(generic_0fill)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c
index 8b3361aa81b..dc1272eae71 100644
--- a/src/mame/drivers/meadows.c
+++ b/src/mame/drivers/meadows.c
@@ -590,11 +590,11 @@ static MACHINE_DRIVER_START( meadows )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
- MDRV_CPU_PROGRAM_MAP(meadows_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(meadows_main_map)
MDRV_CPU_VBLANK_INT("screen", meadows_interrupt) /* one interrupt per frame!? */
MDRV_CPU_ADD("audiocpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
MDRV_CPU_PERIODIC_INT(audio_interrupt, (double)5000000/131072)
MDRV_QUANTUM_TIME(HZ(600))
@@ -629,8 +629,8 @@ static MACHINE_DRIVER_START( minferno )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", S2650, MASTER_CLOCK/24) /* 5MHz / 8 / 3 = 208.33 kHz */
- MDRV_CPU_PROGRAM_MAP(minferno_main_map,0)
- MDRV_CPU_IO_MAP(minferno_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(minferno_main_map)
+ MDRV_CPU_IO_MAP(minferno_io_map)
MDRV_CPU_VBLANK_INT("screen", minferno_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index b90ee0069fd..3de5aa5a3bb 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -1035,8 +1035,8 @@ static MACHINE_DRIVER_START(mediagx)
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", MEDIAGX, 166000000)
- MDRV_CPU_PROGRAM_MAP(mediagx_map, 0)
- MDRV_CPU_IO_MAP(mediagx_io, 0)
+ MDRV_CPU_PROGRAM_MAP(mediagx_map)
+ MDRV_CPU_IO_MAP(mediagx_io)
MDRV_MACHINE_START(mediagx)
MDRV_MACHINE_RESET(mediagx)
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 28717d9a31a..29e938e4633 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -3886,8 +3886,8 @@ MACHINE_DRIVER_START( megdsvp )
MDRV_IMPORT_FROM(megadriv)
MDRV_CPU_ADD("svp", SSP1601, MASTER_CLOCK_NTSC / 7 * 3) /* ~23 MHz (guessed) */
- MDRV_CPU_PROGRAM_MAP(svp_ssp_map, 0)
- MDRV_CPU_IO_MAP(svp_ext_map, 0)
+ MDRV_CPU_PROGRAM_MAP(svp_ssp_map)
+ MDRV_CPU_IO_MAP(svp_ext_map)
/* IRQs are not used by this CPU */
MACHINE_DRIVER_END
@@ -3895,8 +3895,8 @@ MACHINE_DRIVER_START( megdsvppal )
MDRV_IMPORT_FROM(megadpal)
MDRV_CPU_ADD("svp", SSP1601, MASTER_CLOCK_PAL / 7 * 3) /* ~23 MHz (guessed) */
- MDRV_CPU_PROGRAM_MAP(svp_ssp_map, 0)
- MDRV_CPU_IO_MAP(svp_ext_map, 0)
+ MDRV_CPU_PROGRAM_MAP(svp_ssp_map)
+ MDRV_CPU_IO_MAP(svp_ext_map)
/* IRQs are not used by this CPU */
MACHINE_DRIVER_END
@@ -6184,12 +6184,12 @@ static NVRAM_HANDLER( megadriv )
MACHINE_DRIVER_START( megadriv )
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK_NTSC / 7) /* 7.67 MHz */
- MDRV_CPU_PROGRAM_MAP(megadriv_map,0)
+ MDRV_CPU_PROGRAM_MAP(megadriv_map)
/* IRQs are handled via the timers */
MDRV_CPU_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_NTSC / 15) /* 3.58 MHz */
- MDRV_CPU_PROGRAM_MAP(megadriv_z80_map,0)
- MDRV_CPU_IO_MAP(megadriv_z80_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(megadriv_z80_map)
+ MDRV_CPU_IO_MAP(megadriv_z80_io_map)
/* IRQ handled via the timers */
MDRV_MACHINE_RESET(megadriv)
@@ -6228,12 +6228,12 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START( megadpal )
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK_PAL / 7) /* 7.67 MHz */
- MDRV_CPU_PROGRAM_MAP(megadriv_map,0)
+ MDRV_CPU_PROGRAM_MAP(megadriv_map)
/* IRQs are handled via the timers */
MDRV_CPU_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_PAL / 15) /* 3.58 MHz */
- MDRV_CPU_PROGRAM_MAP(megadriv_z80_map,0)
- MDRV_CPU_IO_MAP(megadriv_z80_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(megadriv_z80_map)
+ MDRV_CPU_IO_MAP(megadriv_z80_io_map)
/* IRQ handled via the timers */
MDRV_MACHINE_RESET(megadriv)
@@ -6277,11 +6277,11 @@ MACHINE_DRIVER_START( genesis_32x )
MDRV_IMPORT_FROM(megadriv)
MDRV_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
- MDRV_CPU_PROGRAM_MAP(sh2_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sh2_main_map)
MDRV_CPU_CONFIG(sh2_conf_master)
MDRV_CPU_ADD("32x_slave_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
- MDRV_CPU_PROGRAM_MAP(sh2_slave_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sh2_slave_map)
MDRV_CPU_CONFIG(sh2_conf_slave)
// brutal needs at least 30000 or the backgrounds don't animate properly / lock up, and the game
@@ -6297,11 +6297,11 @@ MACHINE_DRIVER_START( genesis_32x_pal )
MDRV_IMPORT_FROM(megadpal)
MDRV_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
- MDRV_CPU_PROGRAM_MAP(sh2_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sh2_main_map)
MDRV_CPU_CONFIG(sh2_conf_master)
MDRV_CPU_ADD("32x_slave_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
- MDRV_CPU_PROGRAM_MAP(sh2_slave_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sh2_slave_map)
MDRV_CPU_CONFIG(sh2_conf_slave)
MACHINE_DRIVER_END
@@ -6310,14 +6310,14 @@ MACHINE_DRIVER_START( genesis_scd )
MDRV_IMPORT_FROM(megadriv)
MDRV_CPU_ADD("segacd_68k", M68000, SEGACD_CLOCK ) /* 12.5 MHz */
- MDRV_CPU_PROGRAM_MAP(segacd_map,0)
+ MDRV_CPU_PROGRAM_MAP(segacd_map)
MACHINE_DRIVER_END
MACHINE_DRIVER_START( genesis_32x_scd )
MDRV_IMPORT_FROM(genesis_32x)
MDRV_CPU_ADD("segacd_68k", M68000, SEGACD_CLOCK ) /* 12.5 MHz */
- MDRV_CPU_PROGRAM_MAP(segacd_map,0)
+ MDRV_CPU_PROGRAM_MAP(segacd_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index 701fcdc3e6f..87ba42f327a 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -779,8 +779,8 @@ static MACHINE_DRIVER_START( mpnew )
/* The Megaplay has an extra BIOS cpu which drives an SMS VDP
which includes an SN76496 for sound */
MDRV_CPU_ADD("mpbios", Z80, MASTER_CLOCK / 15) /* ?? */
- MDRV_CPU_PROGRAM_MAP(megaplay_bios_map,0)
- MDRV_CPU_IO_MAP(megaplay_bios_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(megaplay_bios_map)
+ MDRV_CPU_IO_MAP(megaplay_bios_io_map)
MDRV_CPU_VBLANK_INT_HACK(megaplay_bios_irq, 262)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 8ff16664045..4cc3dbab67a 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -1456,11 +1456,11 @@ static MACHINE_DRIVER_START( system_A )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz verified */
- MDRV_CPU_PROGRAM_MAP(megasys1A_map,0)
+ MDRV_CPU_PROGRAM_MAP(megasys1A_map)
MDRV_CPU_VBLANK_INT_HACK(interrupt_A,INTERRUPT_NUM_A)
MDRV_CPU_ADD("soundcpu", M68000, SOUND_CPU_CLOCK) /* 7MHz verified */
- MDRV_CPU_PROGRAM_MAP(megasys1A_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(megasys1A_sound_map)
MDRV_QUANTUM_TIME(HZ(120000))
@@ -1512,11 +1512,11 @@ static MACHINE_DRIVER_START( system_B )
MDRV_CPU_REPLACE("maincpu", M68000, SYS_B_CPU_CLOCK) /* 8MHz */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(megasys1B_map,0)
+ MDRV_CPU_PROGRAM_MAP(megasys1B_map)
MDRV_CPU_VBLANK_INT_HACK(interrupt_B,INTERRUPT_NUM_B)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(megasys1B_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(megasys1B_sound_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( system_B_hayaosi1 )
@@ -1542,11 +1542,11 @@ static MACHINE_DRIVER_START( system_C )
MDRV_IMPORT_FROM(system_A)
MDRV_CPU_REPLACE("maincpu", M68000, SYS_C_CPU_CLOCK) /* 12MHz */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(megasys1C_map,0)
+ MDRV_CPU_PROGRAM_MAP(megasys1C_map)
MDRV_CPU_VBLANK_INT_HACK(interrupt_C,INTERRUPT_NUM_C)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(megasys1B_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(megasys1B_sound_map)
MACHINE_DRIVER_END
@@ -1565,7 +1565,7 @@ static MACHINE_DRIVER_START( system_D )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, SYS_D_CPU_CLOCK) /* 8MHz */
- MDRV_CPU_PROGRAM_MAP(megasys1D_map,0)
+ MDRV_CPU_PROGRAM_MAP(megasys1D_map)
MDRV_CPU_VBLANK_INT("screen", interrupt_D)
MDRV_MACHINE_RESET(megasys1)
@@ -1627,12 +1627,12 @@ static MACHINE_DRIVER_START( system_Z )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz (12MHz / 2) */
- MDRV_CPU_PROGRAM_MAP(megasys1A_map,0)
+ MDRV_CPU_PROGRAM_MAP(megasys1A_map)
MDRV_CPU_VBLANK_INT_HACK(interrupt_A,INTERRUPT_NUM_A)
MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* OSC 12MHz divided by 4 ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map,0)
- MDRV_CPU_IO_MAP(z80_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_sound_map)
+ MDRV_CPU_IO_MAP(z80_sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index ba629257347..66811c5d11f 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -626,8 +626,8 @@ static MACHINE_DRIVER_START( megatech )
/* Megatech has an extra SMS based bios *and* an additional screen */
MDRV_CPU_ADD("mtbios", Z80, MASTER_CLOCK / 15) /* ?? */
- MDRV_CPU_PROGRAM_MAP(megatech_bios_map, 0)
- MDRV_CPU_IO_MAP(megatech_bios_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(megatech_bios_map)
+ MDRV_CPU_IO_MAP(megatech_bios_portmap)
MDRV_MACHINE_RESET(mtnew)
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index cda1fa79cc1..bae00c1ce95 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -242,17 +242,17 @@ static MACHINE_DRIVER_START( megazone )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 18432000/9) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(megazone_map,0)
+ MDRV_CPU_PROGRAM_MAP(megazone_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,18432000/6) /* Z80 Clock is derived from the H1 signal */
- MDRV_CPU_PROGRAM_MAP(megazone_sound_map,0)
- MDRV_CPU_IO_MAP(megazone_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(megazone_sound_map)
+ MDRV_CPU_IO_MAP(megazone_sound_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("daccpu", I8039,14318000/2) /* 1/2 14MHz crystal */
- MDRV_CPU_PROGRAM_MAP(megazone_i8039_map,0)
- MDRV_CPU_IO_MAP(megazone_i8039_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(megazone_i8039_map)
+ MDRV_CPU_IO_MAP(megazone_i8039_io_map)
MDRV_QUANTUM_TIME(HZ(900))
diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c
index 1d6fe7693fe..8c750042734 100644
--- a/src/mame/drivers/meijinsn.c
+++ b/src/mame/drivers/meijinsn.c
@@ -308,12 +308,12 @@ static MACHINE_RESET( meijinsn )
static MACHINE_DRIVER_START( meijinsn )
MDRV_CPU_ADD("maincpu", M68000, 9000000 )
- MDRV_CPU_PROGRAM_MAP(meijinsn_map, 0)
+ MDRV_CPU_PROGRAM_MAP(meijinsn_map)
MDRV_CPU_VBLANK_INT_HACK(meijinsn_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(meijinsn_sound_map,0)
- MDRV_CPU_IO_MAP(meijinsn_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(meijinsn_sound_map)
+ MDRV_CPU_IO_MAP(meijinsn_sound_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 160)
MDRV_MACHINE_RESET(meijinsn)
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index a6e7f7595d1..ab59607c83f 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -1175,8 +1175,8 @@ static MACHINE_START(casino5)
static MACHINE_DRIVER_START( pitboss )
MDRV_CPU_ADD("maincpu",Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(pitboss_map,0)
- MDRV_CPU_IO_MAP(trvwhiz_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(pitboss_map)
+ MDRV_CPU_IO_MAP(trvwhiz_io_map)
MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
@@ -1204,7 +1204,7 @@ static MACHINE_DRIVER_START( casino5 )
MDRV_IMPORT_FROM(pitboss)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(casino5_map, 0)
+ MDRV_CPU_PROGRAM_MAP(casino5_map)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -1215,8 +1215,8 @@ static MACHINE_DRIVER_START( bigappg )
MDRV_IMPORT_FROM(pitboss)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bigappg_map,0)
- MDRV_CPU_IO_MAP(tictac_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(bigappg_map)
+ MDRV_CPU_IO_MAP(tictac_io_map)
MDRV_NVRAM_HANDLER(generic_0fill)
MACHINE_DRIVER_END
@@ -1225,7 +1225,7 @@ static MACHINE_DRIVER_START( dodge )
MDRV_IMPORT_FROM(pitboss)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dodge_map,0)
+ MDRV_CPU_PROGRAM_MAP(dodge_map)
MDRV_NVRAM_HANDLER(dodge)
MACHINE_DRIVER_END
@@ -1234,40 +1234,40 @@ static MACHINE_DRIVER_START( tictac )
MDRV_IMPORT_FROM(pitboss)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tictac_map,0)
- MDRV_CPU_IO_MAP(tictac_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(tictac_map)
+ MDRV_CPU_IO_MAP(tictac_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( trvwhiz )
MDRV_IMPORT_FROM(pitboss)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(trvwhiz_map,0)
- MDRV_CPU_IO_MAP(trvwhiz_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(trvwhiz_map)
+ MDRV_CPU_IO_MAP(trvwhiz_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( phrcraze )
MDRV_IMPORT_FROM(pitboss)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(phrcraze_map,0)
- MDRV_CPU_IO_MAP(phrcraze_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(phrcraze_map)
+ MDRV_CPU_IO_MAP(phrcraze_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( trvwhziv )
MDRV_IMPORT_FROM(pitboss)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(trvwhziv_map,0)
- MDRV_CPU_IO_MAP(tictac_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(trvwhziv_map)
+ MDRV_CPU_IO_MAP(tictac_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( couple )
MDRV_IMPORT_FROM(pitboss)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(couple_map,0)
- MDRV_CPU_IO_MAP(tictac_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(couple_map)
+ MDRV_CPU_IO_MAP(tictac_io_map)
MDRV_DEVICE_MODIFY("ppi8255_0")
MDRV_DEVICE_CONFIG( ppi8255_couple_intf[0])
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index cd382cbd65c..9eded90ca9f 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -946,8 +946,8 @@ static NVRAM_HANDLER(meritm_crt260)
static MACHINE_DRIVER_START(meritm_crt250)
MDRV_CPU_ADD("maincpu", Z80, SYSTEM_CLK/6)
- MDRV_CPU_PROGRAM_MAP(meritm_crt250_map,0)
- MDRV_CPU_IO_MAP(meritm_crt250_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(meritm_crt250_map)
+ MDRV_CPU_IO_MAP(meritm_crt250_io_map)
MDRV_CPU_CONFIG(meritm_daisy_chain)
MDRV_CPU_VBLANK_INT_HACK(meritm_interrupt,262)
@@ -986,22 +986,22 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START(meritm_crt250_questions)
MDRV_IMPORT_FROM(meritm_crt250)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(meritm_crt250_questions_map,0)
+ MDRV_CPU_PROGRAM_MAP(meritm_crt250_questions_map)
MDRV_MACHINE_START(meritm_crt250_questions)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START(meritm_crt250_crt252_crt258)
MDRV_IMPORT_FROM(meritm_crt250_questions)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(meritm_crt250_crt258_io_map,0)
+ MDRV_CPU_IO_MAP(meritm_crt250_crt258_io_map)
MDRV_MACHINE_START(meritm_crt250_crt252_crt258)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START(meritm_crt260)
MDRV_IMPORT_FROM(meritm_crt250)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(meritm_map,0)
- MDRV_CPU_IO_MAP(meritm_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(meritm_map)
+ MDRV_CPU_IO_MAP(meritm_io_map)
MDRV_PPI8255_RECONFIG( "ppi8255", crt260_ppi8255_intf )
diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c
index 104886c373f..1d40c384235 100644
--- a/src/mame/drivers/mermaid.c
+++ b/src/mame/drivers/mermaid.c
@@ -349,7 +349,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mermaid )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, 4000000) // ???
- MDRV_CPU_PROGRAM_MAP(mermaid_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mermaid_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
// video hardware
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index ee292f178ae..fdb9e96a488 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -288,11 +288,11 @@ static MACHINE_DRIVER_START( metlclsh )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 1500000) // ?
- MDRV_CPU_PROGRAM_MAP(metlclsh_master_map, 0)
+ MDRV_CPU_PROGRAM_MAP(metlclsh_master_map)
// IRQ by YM3526, NMI by cpu #2
MDRV_CPU_ADD("sub", M6809, 1500000) // ?
- MDRV_CPU_PROGRAM_MAP(metlclsh_slave_map, 0)
+ MDRV_CPU_PROGRAM_MAP(metlclsh_slave_map)
MDRV_CPU_VBLANK_INT_HACK(metlclsh_interrupt2,2)
// IRQ by cpu #1, NMI by coins insertion
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 53c9fb2e1b5..46ddb8006ef 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -3431,7 +3431,7 @@ static MACHINE_DRIVER_START( balcube )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(balcube_map,0)
+ MDRV_CPU_PROGRAM_MAP(balcube_map)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
MDRV_MACHINE_RESET(metro)
@@ -3464,7 +3464,7 @@ static MACHINE_DRIVER_START( daitoa )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(daitoa_map,0)
+ MDRV_CPU_PROGRAM_MAP(daitoa_map)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
MDRV_MACHINE_RESET(metro)
@@ -3496,7 +3496,7 @@ static MACHINE_DRIVER_START( bangball )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(bangball_map,0)
+ MDRV_CPU_PROGRAM_MAP(bangball_map)
MDRV_CPU_VBLANK_INT("screen", bangball_interrupt)
MDRV_MACHINE_RESET(metro)
@@ -3529,7 +3529,7 @@ static MACHINE_DRIVER_START( batlbubl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(batlbubl_map,0)
+ MDRV_CPU_PROGRAM_MAP(batlbubl_map)
MDRV_CPU_VBLANK_INT("screen", bangball_interrupt)
MDRV_MACHINE_RESET(metro)
@@ -3561,13 +3561,13 @@ static MACHINE_DRIVER_START( daitorid )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(daitorid_map,0)
+ MDRV_CPU_PROGRAM_MAP(daitorid_map)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map,0)
- MDRV_CPU_IO_MAP(daitorid_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(metro_sound_map)
+ MDRV_CPU_IO_MAP(daitorid_sound_io_map)
MDRV_MACHINE_RESET(metro)
@@ -3604,13 +3604,13 @@ static MACHINE_DRIVER_START( dharma )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(dharma_map,0)
+ MDRV_CPU_PROGRAM_MAP(dharma_map)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map,0)
- MDRV_CPU_IO_MAP(metro_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(metro_sound_map)
+ MDRV_CPU_IO_MAP(metro_sound_io_map)
MDRV_MACHINE_RESET(metro)
@@ -3646,13 +3646,13 @@ static MACHINE_DRIVER_START( karatour )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(karatour_map,0)
+ MDRV_CPU_PROGRAM_MAP(karatour_map)
MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map,0)
- MDRV_CPU_IO_MAP(metro_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(metro_sound_map)
+ MDRV_CPU_IO_MAP(metro_sound_io_map)
MDRV_MACHINE_RESET(metro)
@@ -3688,13 +3688,13 @@ static MACHINE_DRIVER_START( 3kokushi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(kokushi_map,0)
+ MDRV_CPU_PROGRAM_MAP(kokushi_map)
MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map,0)
- MDRV_CPU_IO_MAP(metro_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(metro_sound_map)
+ MDRV_CPU_IO_MAP(metro_sound_io_map)
MDRV_MACHINE_RESET(metro)
@@ -3730,13 +3730,13 @@ static MACHINE_DRIVER_START( lastfort )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(lastfort_map,0)
+ MDRV_CPU_PROGRAM_MAP(lastfort_map)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map,0)
- MDRV_CPU_IO_MAP(metro_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(metro_sound_map)
+ MDRV_CPU_IO_MAP(metro_sound_io_map)
MDRV_MACHINE_RESET(metro)
@@ -3771,13 +3771,13 @@ static MACHINE_DRIVER_START( lastforg )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(lastforg_map,0)
+ MDRV_CPU_PROGRAM_MAP(lastforg_map)
MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map,0)
- MDRV_CPU_IO_MAP(metro_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(metro_sound_map)
+ MDRV_CPU_IO_MAP(metro_sound_io_map)
MDRV_MACHINE_RESET(metro)
@@ -3812,7 +3812,7 @@ static MACHINE_DRIVER_START( dokyusei )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(dokyusei_map,0)
+ MDRV_CPU_PROGRAM_MAP(dokyusei_map)
MDRV_CPU_VBLANK_INT_HACK(dokyusei_interrupt,2) /* ? */
MDRV_MACHINE_RESET(metro)
@@ -3862,7 +3862,7 @@ static MACHINE_DRIVER_START( dokyusp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(dokyusp_map,0)
+ MDRV_CPU_PROGRAM_MAP(dokyusp_map)
MDRV_CPU_VBLANK_INT("screen", gakusai_interrupt)
MDRV_MACHINE_RESET(metro)
@@ -3900,7 +3900,7 @@ static MACHINE_DRIVER_START( gakusai )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(gakusai_map,0)
+ MDRV_CPU_PROGRAM_MAP(gakusai_map)
MDRV_CPU_VBLANK_INT("screen", gakusai_interrupt)
MDRV_MACHINE_RESET(metro)
@@ -3938,7 +3938,7 @@ static MACHINE_DRIVER_START( gakusai2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(gakusai2_map,0)
+ MDRV_CPU_PROGRAM_MAP(gakusai2_map)
MDRV_CPU_VBLANK_INT("screen", gakusai_interrupt)
MDRV_MACHINE_RESET(metro)
@@ -3976,13 +3976,13 @@ static MACHINE_DRIVER_START( pangpoms )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(pangpoms_map,0)
+ MDRV_CPU_PROGRAM_MAP(pangpoms_map)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map,0)
- MDRV_CPU_IO_MAP(metro_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(metro_sound_map)
+ MDRV_CPU_IO_MAP(metro_sound_io_map)
MDRV_MACHINE_RESET(metro)
@@ -4018,13 +4018,13 @@ static MACHINE_DRIVER_START( poitto )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(poitto_map,0)
+ MDRV_CPU_PROGRAM_MAP(poitto_map)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map,0)
- MDRV_CPU_IO_MAP(metro_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(metro_sound_map)
+ MDRV_CPU_IO_MAP(metro_sound_io_map)
MDRV_MACHINE_RESET(metro)
@@ -4060,13 +4060,13 @@ static MACHINE_DRIVER_START( pururun )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(pururun_map,0)
+ MDRV_CPU_PROGRAM_MAP(pururun_map)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map,0)
- MDRV_CPU_IO_MAP(daitorid_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(metro_sound_map)
+ MDRV_CPU_IO_MAP(daitorid_sound_io_map)
MDRV_MACHINE_RESET(metro)
@@ -4103,13 +4103,13 @@ static MACHINE_DRIVER_START( skyalert )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(skyalert_map,0)
+ MDRV_CPU_PROGRAM_MAP(skyalert_map)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map,0)
- MDRV_CPU_IO_MAP(metro_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(metro_sound_map)
+ MDRV_CPU_IO_MAP(metro_sound_io_map)
MDRV_MACHINE_RESET(metro)
@@ -4145,13 +4145,13 @@ static MACHINE_DRIVER_START( toride2g )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(toride2g_map,0)
+ MDRV_CPU_PROGRAM_MAP(toride2g_map)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map,0)
- MDRV_CPU_IO_MAP(metro_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(metro_sound_map)
+ MDRV_CPU_IO_MAP(metro_sound_io_map)
MDRV_MACHINE_RESET(metro)
@@ -4187,7 +4187,7 @@ static MACHINE_DRIVER_START( mouja )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(mouja_map,0)
+ MDRV_CPU_PROGRAM_MAP(mouja_map)
MDRV_CPU_VBLANK_INT("screen", mouja_interrupt)
MDRV_MACHINE_RESET(metro)
@@ -4223,12 +4223,12 @@ static MACHINE_DRIVER_START( blzntrnd )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(blzntrnd_map,0)
+ MDRV_CPU_PROGRAM_MAP(blzntrnd_map)
MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(blzntrnd_sound_map, 0)
- MDRV_CPU_IO_MAP(blzntrnd_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(blzntrnd_sound_map)
+ MDRV_CPU_IO_MAP(blzntrnd_sound_io_map)
MDRV_MACHINE_RESET(metro)
@@ -4262,12 +4262,12 @@ static MACHINE_DRIVER_START( gstrik2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(blzntrnd_map,0)
+ MDRV_CPU_PROGRAM_MAP(blzntrnd_map)
MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(blzntrnd_sound_map, 0)
- MDRV_CPU_IO_MAP(blzntrnd_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(blzntrnd_sound_map)
+ MDRV_CPU_IO_MAP(blzntrnd_sound_io_map)
MDRV_MACHINE_RESET(metro)
@@ -4331,8 +4331,8 @@ static MACHINE_DRIVER_START( puzzlet )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", H83007, XTAL_20MHz) // H8/3007 - Hitachi HD6413007F20 CPU. Clock 20MHz
- MDRV_CPU_PROGRAM_MAP(puzzlet_map,0)
- MDRV_CPU_IO_MAP(puzzlet_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(puzzlet_map)
+ MDRV_CPU_IO_MAP(puzzlet_io_map)
MDRV_CPU_VBLANK_INT_HACK(puzzlet_interrupt, 5)
MDRV_MACHINE_RESET(metro)
diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c
index d518985e8dc..0170fccd2f5 100644
--- a/src/mame/drivers/mexico86.c
+++ b/src/mame/drivers/mexico86.c
@@ -342,18 +342,18 @@ static MACHINE_DRIVER_START( mexico86 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
- MDRV_CPU_PROGRAM_MAP(mexico86_map,0)
+ MDRV_CPU_PROGRAM_MAP(mexico86_map)
MDRV_CPU_ADD("audiocpu", Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
- MDRV_CPU_PROGRAM_MAP(mexico86_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(mexico86_sound_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("mcu", M68705, 4000000) /* xtal is 4MHz, divided by 4 internally */
- MDRV_CPU_PROGRAM_MAP(mexico86_m68705_map,0)
+ MDRV_CPU_PROGRAM_MAP(mexico86_m68705_map)
MDRV_CPU_VBLANK_INT_HACK(mexico86_m68705_interrupt,2)
MDRV_CPU_ADD("sub", Z80, 8000000/2) /* 4 MHz, Uses 8Mhz OSC */
- MDRV_CPU_PROGRAM_MAP(mexico86_sub_cpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mexico86_sub_cpu_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c
index f98660d4b5a..effb285f2de 100644
--- a/src/mame/drivers/mgolf.c
+++ b/src/mame/drivers/mgolf.c
@@ -293,7 +293,7 @@ static MACHINE_DRIVER_START( mgolf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 12096000 / 16) /* ? */
- MDRV_CPU_PROGRAM_MAP(cpu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(cpu_map)
MDRV_MACHINE_RESET(mgolf)
diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c
index dad461e1a00..1628e0815c2 100644
--- a/src/mame/drivers/mhavoc.c
+++ b/src/mame/drivers/mhavoc.c
@@ -475,10 +475,10 @@ static MACHINE_DRIVER_START( mhavoc )
/* basic machine hardware */
MDRV_CPU_ADD("alpha", M6502, MHAVOC_CLOCK_2_5M) /* 2.5 MHz */
- MDRV_CPU_PROGRAM_MAP(alpha_map, 0)
+ MDRV_CPU_PROGRAM_MAP(alpha_map)
MDRV_CPU_ADD("gamma", M6502, MHAVOC_CLOCK_1_25M) /* 1.25 MHz */
- MDRV_CPU_PROGRAM_MAP(gamma_map, 0)
+ MDRV_CPU_PROGRAM_MAP(gamma_map)
MDRV_MACHINE_RESET(mhavoc)
MDRV_NVRAM_HANDLER(generic_1fill)
@@ -523,7 +523,7 @@ static MACHINE_DRIVER_START( alphaone )
/* basic machine hardware */
MDRV_IMPORT_FROM(mhavoc)
MDRV_CPU_MODIFY("alpha")
- MDRV_CPU_PROGRAM_MAP(alphaone_map, 0)
+ MDRV_CPU_PROGRAM_MAP(alphaone_map)
MDRV_CPU_REMOVE("gamma")
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index 656b81d8cd5..2526b580a8f 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -648,16 +648,16 @@ static MACHINE_RESET( micro3d )
static MACHINE_DRIVER_START( micro3d )
MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2)
- MDRV_CPU_PROGRAM_MAP(hostmem, 0)
+ MDRV_CPU_PROGRAM_MAP(hostmem)
MDRV_CPU_VBLANK_INT("screen", micro3d_vblank)
MDRV_CPU_ADD("vgb", TMS34010, XTAL_40MHz)
MDRV_CPU_CONFIG(vgb_config)
- MDRV_CPU_PROGRAM_MAP(vgbmem, 0)
+ MDRV_CPU_PROGRAM_MAP(vgbmem)
MDRV_CPU_ADD("audiocpu", I8051, XTAL_11_0592MHz)
- MDRV_CPU_PROGRAM_MAP(soundmem_prg, 0)
- MDRV_CPU_IO_MAP(soundmem_io, 0)
+ MDRV_CPU_PROGRAM_MAP(soundmem_prg)
+ MDRV_CPU_IO_MAP(soundmem_io)
MDRV_DUART68681_ADD("duart68681", XTAL_3_6864MHz, micro3d_duart68681_config)
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index 4848446df17..d61c6b14ec5 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -435,7 +435,7 @@ static MACHINE_DRIVER_START( livequiz )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 24000000 / 2)
- MDRV_CPU_PROGRAM_MAP(mem_map,0)
+ MDRV_CPU_PROGRAM_MAP(mem_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_NVRAM_HANDLER(93C46)
diff --git a/src/mame/drivers/midtunit.c b/src/mame/drivers/midtunit.c
index e1ed2e9599b..ea4792f6342 100644
--- a/src/mame/drivers/midtunit.c
+++ b/src/mame/drivers/midtunit.c
@@ -605,7 +605,7 @@ static MACHINE_DRIVER_START( tunit_core )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS34010, CPU_CLOCK)
MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(midtunit)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c
index 567bfd13b74..38522a0e572 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -1022,7 +1022,7 @@ static MACHINE_DRIVER_START( midvcommon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS32031, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(midvunit_map,0)
+ MDRV_CPU_PROGRAM_MAP(midvunit_map)
MDRV_MACHINE_START(midvunit)
MDRV_MACHINE_RESET(midvunit)
@@ -1054,7 +1054,7 @@ static MACHINE_DRIVER_START( midvplus )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_CONFIG(midvplus_config)
- MDRV_CPU_PROGRAM_MAP(midvplus_map,0)
+ MDRV_CPU_PROGRAM_MAP(midvplus_map)
MDRV_MACHINE_RESET(midvplus)
MDRV_NVRAM_HANDLER(midway_serial_pic2)
diff --git a/src/mame/drivers/midwunit.c b/src/mame/drivers/midwunit.c
index 3b666579f86..d18fd80e387 100644
--- a/src/mame/drivers/midwunit.c
+++ b/src/mame/drivers/midwunit.c
@@ -635,7 +635,7 @@ static MACHINE_DRIVER_START( wunit )
MDRV_CPU_ADD("maincpu", TMS34010, 50000000)
MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(midwunit)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/midxunit.c b/src/mame/drivers/midxunit.c
index e97828eeec4..bca7e1b0793 100644
--- a/src/mame/drivers/midxunit.c
+++ b/src/mame/drivers/midxunit.c
@@ -260,7 +260,7 @@ static MACHINE_DRIVER_START( midxunit )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS34020, 40000000)
MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(midxunit)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c
index b4ce3132f2b..0e307664f48 100644
--- a/src/mame/drivers/midyunit.c
+++ b/src/mame/drivers/midyunit.c
@@ -1019,7 +1019,7 @@ static MACHINE_DRIVER_START( zunit )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS34010, FAST_MASTER_CLOCK)
MDRV_CPU_CONFIG(zunit_tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(midyunit)
MDRV_NVRAM_HANDLER(midyunit)
@@ -1052,7 +1052,7 @@ static MACHINE_DRIVER_START( yunit_core )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS34010, SLOW_MASTER_CLOCK)
MDRV_CPU_CONFIG(yunit_tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(midyunit)
MDRV_NVRAM_HANDLER(midyunit)
@@ -1138,7 +1138,7 @@ static MACHINE_DRIVER_START( mkyawdim )
MDRV_IMPORT_FROM(yunit_core)
MDRV_CPU_ADD("audiocpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(yawdim_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(yawdim_sound_map)
/* video hardware */
MDRV_PALETTE_LENGTH(4096)
diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c
index 6040aeb0aba..a6476f12004 100644
--- a/src/mame/drivers/midzeus.c
+++ b/src/mame/drivers/midzeus.c
@@ -1107,7 +1107,7 @@ static MACHINE_DRIVER_START( midzeus )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS32032, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(zeus_map,0)
+ MDRV_CPU_PROGRAM_MAP(zeus_map)
MDRV_CPU_VBLANK_INT("screen", display_irq)
MDRV_MACHINE_START(midzeus)
@@ -1133,7 +1133,7 @@ static MACHINE_DRIVER_START( midzeus2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS32032, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(zeus2_map,0)
+ MDRV_CPU_PROGRAM_MAP(zeus2_map)
MDRV_CPU_VBLANK_INT("screen", display_irq)
MDRV_MACHINE_START(midzeus)
diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c
index c3b0465b2da..d894ea9fdfc 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -194,11 +194,11 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mikie )
// basic machine hardware
MDRV_CPU_ADD("maincpu", M6809, 1250000) // ??? MC68A09E
- MDRV_CPU_PROGRAM_MAP(mikie_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mikie_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, CLK) // 3.58 MHz
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
// video hardware
diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c
index b04a95fd236..f1beddbd959 100644
--- a/src/mame/drivers/mil4000.c
+++ b/src/mame/drivers/mil4000.c
@@ -333,7 +333,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mil4000 )
MDRV_CPU_ADD("maincpu", M68000, 12000000 ) // ?
- MDRV_CPU_PROGRAM_MAP(mil4000_map,0)
+ MDRV_CPU_PROGRAM_MAP(mil4000_map)
// irq 2/4/5 point to the same place, others invalid
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c
index afbd11d45af..3363aa2f34d 100644
--- a/src/mame/drivers/miniboy7.c
+++ b/src/mame/drivers/miniboy7.c
@@ -273,7 +273,7 @@ static MACHINE_DRIVER_START( miniboy7 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* guess */
- MDRV_CPU_PROGRAM_MAP(miniboy7_map, 0)
+ MDRV_CPU_PROGRAM_MAP(miniboy7_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c
index a1f6ec4c699..c0b8195c321 100644
--- a/src/mame/drivers/minivadr.c
+++ b/src/mame/drivers/minivadr.c
@@ -71,7 +71,7 @@ static MACHINE_DRIVER_START( minivadr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,24000000 / 6) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(minivadr_map,0)
+ MDRV_CPU_PROGRAM_MAP(minivadr_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index ca49cd06d6a..61ec6451971 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -327,7 +327,7 @@ static MACHINE_DRIVER_START( mirage )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 28000000/2)
- MDRV_CPU_PROGRAM_MAP(mirage_map,0)
+ MDRV_CPU_PROGRAM_MAP(mirage_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c
index 17471255335..c626468edfb 100644
--- a/src/mame/drivers/mirax.c
+++ b/src/mame/drivers/mirax.c
@@ -176,8 +176,8 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( mirax )
MDRV_CPU_ADD("maincpu", Z80, 12000000) // audio cpu ?
- MDRV_CPU_PROGRAM_MAP(memory_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(memory_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
/* video hardware */
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 048069f4125..e64c31643b4 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -356,15 +356,15 @@ static INTERRUPT_GEN( missb2_interrupt )
static MACHINE_DRIVER_START( missb2 )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(master_map, 0)
+ MDRV_CPU_PROGRAM_MAP(master_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("slave", Z80, MAIN_XTAL/4) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(slave_map, 0)
+ MDRV_CPU_PROGRAM_MAP(slave_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_VBLANK_INT("screen", missb2_interrupt)
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index 7fa3e44544e..202cfd9c69c 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -978,7 +978,7 @@ static MACHINE_DRIVER_START( missile )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_START(missile)
MDRV_MACHINE_RESET(missile)
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index 7f6058f1efe..c7f47dc1617 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -1092,8 +1092,8 @@ static MACHINE_DRIVER_START( mgakuen )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(mgakuen_map,0)
- MDRV_CPU_IO_MAP(mitchell_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mgakuen_map)
+ MDRV_CPU_IO_MAP(mitchell_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
/* video hardware */
@@ -1126,8 +1126,8 @@ static MACHINE_DRIVER_START( pang )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80, 8000000) /* (verified on pcb) */
- MDRV_CPU_PROGRAM_MAP(mitchell_map,0)
- MDRV_CPU_IO_MAP(mitchell_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mitchell_map)
+ MDRV_CPU_IO_MAP(mitchell_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
MDRV_NVRAM_HANDLER(mitchell)
@@ -1197,13 +1197,13 @@ static MACHINE_DRIVER_START( spangbl )
MDRV_IMPORT_FROM(pang)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spangbl_map,0)
- MDRV_CPU_IO_MAP(spangbl_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(spangbl_map)
+ MDRV_CPU_IO_MAP(spangbl_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("soundcpu",Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(spangbl_sound_map,0 )
- MDRV_CPU_IO_MAP(spangbl_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(spangbl_sound_map)
+ MDRV_CPU_IO_MAP(spangbl_sound_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
@@ -1222,12 +1222,12 @@ static MACHINE_DRIVER_START( mstworld )
the interrupt handling (and probably various irq flags / vbl flags handling etc.) is
more likely wrong.. the game appears to run too fast anyway .. */
MDRV_CPU_ADD("maincpu", Z80, 6000000*4)
- MDRV_CPU_PROGRAM_MAP(mitchell_map,0)
- MDRV_CPU_IO_MAP(mstworld_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mitchell_map)
+ MDRV_CPU_IO_MAP(mstworld_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,6000000) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(mstworld_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(mstworld_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1256,8 +1256,8 @@ static MACHINE_DRIVER_START( marukin )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 8000000) /* Super Pang says 8MHZ ORIGINAL BOARD */
- MDRV_CPU_PROGRAM_MAP(mitchell_map,0)
- MDRV_CPU_IO_MAP(mitchell_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mitchell_map)
+ MDRV_CPU_IO_MAP(mitchell_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
MDRV_NVRAM_HANDLER(mitchell)
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index 0a3224c0edb..79029f45623 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -353,8 +353,8 @@ static MACHINE_DRIVER_START( mjkjidai )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,10000000/2) /* 5 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(mjkjidai_map,0)
- MDRV_CPU_IO_MAP(mjkjidai_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mjkjidai_map)
+ MDRV_CPU_IO_MAP(mjkjidai_io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_NVRAM_HANDLER(mjkjidai)
diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c
index 94fb455acff..fd86eadaa89 100644
--- a/src/mame/drivers/mjsister.c
+++ b/src/mame/drivers/mjsister.c
@@ -304,8 +304,8 @@ static MACHINE_DRIVER_START( mjsister )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MCLK/2) /* 6.000 MHz */
- MDRV_CPU_PROGRAM_MAP(mjsister_map,0)
- MDRV_CPU_IO_MAP(mjsister_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mjsister_map)
+ MDRV_CPU_IO_MAP(mjsister_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_MACHINE_RESET(mjsister)
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index d9f4cfef3e1..a3cc93dea4f 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -344,18 +344,18 @@ static MACHINE_DRIVER_START( mlanding )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000 ) /* 12 MHz ??? (guess) */
- MDRV_CPU_PROGRAM_MAP(mlanding_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(mlanding_mem)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("z80", Z80, 4000000 ) /* 4 MHz ??? (guess) */
- MDRV_CPU_PROGRAM_MAP(mlanding_z80_mem,0)
+ MDRV_CPU_PROGRAM_MAP(mlanding_z80_mem)
MDRV_CPU_ADD("sub", M68000, 12000000 ) /* 12 MHz ??? (guess) */
- MDRV_CPU_PROGRAM_MAP(mlanding_sub_mem,0)
+ MDRV_CPU_PROGRAM_MAP(mlanding_sub_mem)
MDRV_CPU_VBLANK_INT_HACK(irq6_line_hold,7)
MDRV_CPU_ADD("z80sub", Z80, 4000000 ) /* 4 MHz ??? (guess) */
- MDRV_CPU_PROGRAM_MAP(mlanding_z80_sub_mem,0)
+ MDRV_CPU_PROGRAM_MAP(mlanding_z80_sub_mem)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 3301f7ebb42..8ae60cc23f2 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -1450,12 +1450,12 @@ ROM_END
static MACHINE_DRIVER_START( model1 )
MDRV_CPU_ADD("maincpu", V60, 16000000)
- MDRV_CPU_PROGRAM_MAP(model1_mem, 0)
- MDRV_CPU_IO_MAP(model1_io, 0)
+ MDRV_CPU_PROGRAM_MAP(model1_mem)
+ MDRV_CPU_IO_MAP(model1_io)
MDRV_CPU_VBLANK_INT_HACK(model1_interrupt, 2)
MDRV_CPU_ADD("audiocpu", M68000, 10000000) // verified on real h/w
- MDRV_CPU_PROGRAM_MAP(model1_snd, 0)
+ MDRV_CPU_PROGRAM_MAP(model1_snd)
MDRV_MACHINE_RESET(model1)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -1489,16 +1489,16 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( model1_vr )
MDRV_CPU_ADD("maincpu", V60, 16000000)
- MDRV_CPU_PROGRAM_MAP(model1_vr_mem, 0)
- MDRV_CPU_IO_MAP(model1_vr_io, 0)
+ MDRV_CPU_PROGRAM_MAP(model1_vr_mem)
+ MDRV_CPU_IO_MAP(model1_vr_io)
MDRV_CPU_VBLANK_INT_HACK(model1_interrupt, 2)
MDRV_CPU_ADD("audiocpu", M68000, 10000000) // verified on real h/w
- MDRV_CPU_PROGRAM_MAP(model1_snd, 0)
+ MDRV_CPU_PROGRAM_MAP(model1_snd)
MDRV_CPU_ADD("tgp", MB86233, 16000000)
MDRV_CPU_CONFIG(model1_vr_tgp_config)
- MDRV_CPU_PROGRAM_MAP(model1_vr_tgp_map, 0)
+ MDRV_CPU_PROGRAM_MAP(model1_vr_tgp_map)
MDRV_MACHINE_RESET(model1_vr)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 2d6d30dca9a..a64363fda1a 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -1275,6 +1275,8 @@ static ADDRESS_MAP_START( model2o_mem, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x01c00040, 0x01c00043) AM_READ( daytona_unk_r )
AM_RANGE(0x01c00200, 0x01c002ff) AM_RAM AM_BASE( &model2_backup2 )
AM_RANGE(0x01c80000, 0x01c80003) AM_READWRITE( model2_serial_r, model2o_serial_w )
+
+ AM_IMPORT_FROM(model2_base_mem)
ADDRESS_MAP_END
/* 2A-CRX overrides */
@@ -1302,6 +1304,8 @@ static ADDRESS_MAP_START( model2a_crx_mem, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x01c00018, 0x01c0001b) AM_READ( hotd_unk_r )
AM_RANGE(0x01c0001c, 0x01c0001f) AM_READ_PORT("1c0001c") AM_WRITE( analog_2b_w )
AM_RANGE(0x01c80000, 0x01c80003) AM_READWRITE( model2_serial_r, model2_serial_w )
+
+ AM_IMPORT_FROM(model2_base_mem)
ADDRESS_MAP_END
/* 2B-CRX overrides */
@@ -1335,6 +1339,8 @@ static ADDRESS_MAP_START( model2b_crx_mem, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x01c00018, 0x01c0001b) AM_READ( hotd_unk_r )
AM_RANGE(0x01c0001c, 0x01c0001f) AM_READ_PORT("1c0001c") AM_WRITE( analog_2b_w )
AM_RANGE(0x01c80000, 0x01c80003) AM_READWRITE( model2_serial_r, model2_serial_w )
+
+ AM_IMPORT_FROM(model2_base_mem)
ADDRESS_MAP_END
/* 2C-CRX overrides */
@@ -1359,6 +1365,8 @@ static ADDRESS_MAP_START( model2c_crx_mem, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x01c00018, 0x01c0001b) AM_READ( hotd_unk_r )
AM_RANGE(0x01c0001c, 0x01c0001f) AM_READ_PORT("1c0001c") AM_WRITE( analog_2b_w )
AM_RANGE(0x01c80000, 0x01c80003) AM_READWRITE( model2_serial_r, model2_serial_w )
+
+ AM_IMPORT_FROM(model2_base_mem)
ADDRESS_MAP_END
/* Input definitions */
@@ -1812,15 +1820,15 @@ static const mb86233_cpu_core tgp_config =
/* original Model 2 */
static MACHINE_DRIVER_START( model2o )
MDRV_CPU_ADD("maincpu", I960, 25000000)
- MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2o_mem)
+ MDRV_CPU_PROGRAM_MAP(model2o_mem)
MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2)
MDRV_CPU_ADD("audiocpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(model1_snd, 0)
+ MDRV_CPU_PROGRAM_MAP(model1_snd)
MDRV_CPU_ADD("tgp", MB86233, 16000000)
MDRV_CPU_CONFIG(tgp_config)
- MDRV_CPU_PROGRAM_MAP(copro_tgp_map, 0)
+ MDRV_CPU_PROGRAM_MAP(copro_tgp_map)
MDRV_MACHINE_RESET(model2o)
MDRV_NVRAM_HANDLER( model2 )
@@ -1857,15 +1865,15 @@ MACHINE_DRIVER_END
/* 2A-CRX */
static MACHINE_DRIVER_START( model2a )
MDRV_CPU_ADD("maincpu", I960, 25000000)
- MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2a_crx_mem)
+ MDRV_CPU_PROGRAM_MAP(model2a_crx_mem)
MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2)
MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model2_snd, 0)
+ MDRV_CPU_PROGRAM_MAP(model2_snd)
MDRV_CPU_ADD("tgp", MB86233, 16000000)
MDRV_CPU_CONFIG(tgp_config)
- MDRV_CPU_PROGRAM_MAP(copro_tgp_map, 0)
+ MDRV_CPU_PROGRAM_MAP(copro_tgp_map)
MDRV_MACHINE_RESET(model2)
MDRV_NVRAM_HANDLER( model2 )
@@ -1901,19 +1909,19 @@ static const sharc_config sharc_cfg =
/* 2B-CRX */
static MACHINE_DRIVER_START( model2b )
MDRV_CPU_ADD("maincpu", I960, 25000000)
- MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2b_crx_mem)
+ MDRV_CPU_PROGRAM_MAP(model2b_crx_mem)
MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2)
MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model2_snd, 0)
+ MDRV_CPU_PROGRAM_MAP(model2_snd)
MDRV_CPU_ADD("dsp", ADSP21062, 40000000)
MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(copro_sharc_map, 0)
+ MDRV_CPU_DATA_MAP(copro_sharc_map)
//MDRV_CPU_ADD("dsp2", ADSP21062, 40000000)
//MDRV_CPU_CONFIG(sharc_cfg)
- //MDRV_CPU_DATA_MAP(geo_sharc_map, 0)
+ //MDRV_CPU_DATA_MAP(geo_sharc_map)
MDRV_QUANTUM_TIME(HZ(18000))
@@ -1945,11 +1953,11 @@ MACHINE_DRIVER_END
/* 2C-CRX */
static MACHINE_DRIVER_START( model2c )
MDRV_CPU_ADD("maincpu", I960, 25000000)
- MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2c_crx_mem)
+ MDRV_CPU_PROGRAM_MAP(model2c_crx_mem)
MDRV_CPU_VBLANK_INT_HACK(model2c_interrupt,3)
MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model2_snd, 0)
+ MDRV_CPU_PROGRAM_MAP(model2_snd)
MDRV_MACHINE_RESET(model2c)
MDRV_NVRAM_HANDLER( model2 )
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index ab41db5b3f1..32efc80022f 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -4372,11 +4372,11 @@ static const powerpc_config model3_2x =
static MACHINE_DRIVER_START( model3_10 )
MDRV_CPU_ADD("maincpu", PPC603E, 66000000)
MDRV_CPU_CONFIG(model3_10)
- MDRV_CPU_PROGRAM_MAP(model3_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(model3_mem)
MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2)
MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model3_snd, 0)
+ MDRV_CPU_PROGRAM_MAP(model3_snd)
MDRV_QUANTUM_TIME(HZ(600))
@@ -4412,11 +4412,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( model3_15 )
MDRV_CPU_ADD("maincpu", PPC603E, 100000000)
MDRV_CPU_CONFIG(model3_15)
- MDRV_CPU_PROGRAM_MAP(model3_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(model3_mem)
MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2)
MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model3_snd, 0)
+ MDRV_CPU_PROGRAM_MAP(model3_snd)
MDRV_MACHINE_START(model3_15)
MDRV_MACHINE_RESET(model3_15)
@@ -4450,11 +4450,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( model3_20 )
MDRV_CPU_ADD("maincpu", PPC603R, 166000000)
MDRV_CPU_CONFIG(model3_2x)
- MDRV_CPU_PROGRAM_MAP(model3_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(model3_mem)
MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2)
MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model3_snd, 0)
+ MDRV_CPU_PROGRAM_MAP(model3_snd)
MDRV_MACHINE_START(model3_20)
MDRV_MACHINE_RESET(model3_20)
@@ -4488,11 +4488,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( model3_21 )
MDRV_CPU_ADD("maincpu", PPC603R, 166000000)
MDRV_CPU_CONFIG(model3_2x)
- MDRV_CPU_PROGRAM_MAP(model3_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(model3_mem)
MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2)
MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model3_snd, 0)
+ MDRV_CPU_PROGRAM_MAP(model3_snd)
MDRV_MACHINE_START(model3_21)
MDRV_MACHINE_RESET(model3_21)
diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c
index f0840fa662c..61fde924ef5 100644
--- a/src/mame/drivers/mogura.c
+++ b/src/mame/drivers/mogura.c
@@ -173,8 +173,8 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mogura )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,3000000) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(mogura_map,0)
- MDRV_CPU_IO_MAP(mogura_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mogura_map)
+ MDRV_CPU_IO_MAP(mogura_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_GFXDECODE(mogura)
diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c
index 2e4ea15cec2..2712307d814 100644
--- a/src/mame/drivers/mole.c
+++ b/src/mame/drivers/mole.c
@@ -196,7 +196,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mole )
// basic machine hardware
MDRV_CPU_ADD("maincpu", M6502, 4000000) // ???
- MDRV_CPU_PROGRAM_MAP(mole_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mole_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
// video hardware
diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c
index fdb53981333..c507af5cde2 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -245,11 +245,11 @@ static MACHINE_DRIVER_START( momoko )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5.0MHz */
- MDRV_CPU_PROGRAM_MAP(momoko_map,0)
+ MDRV_CPU_PROGRAM_MAP(momoko_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 2500000) /* 2.5MHz */
- MDRV_CPU_PROGRAM_MAP(momoko_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(momoko_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index 1427f1d36b3..fc6681a0ba5 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -478,11 +478,11 @@ static MACHINE_DRIVER_START( moo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(moo_map,0)
+ MDRV_CPU_PROGRAM_MAP(moo_map)
MDRV_CPU_VBLANK_INT("screen", moo_interrupt)
MDRV_CPU_ADD("soundcpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_START(moo)
MDRV_MACHINE_RESET(moo)
@@ -520,7 +520,7 @@ static MACHINE_DRIVER_START( moobl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16100000)
- MDRV_CPU_PROGRAM_MAP(moobl_map,0)
+ MDRV_CPU_PROGRAM_MAP(moobl_map)
MDRV_CPU_VBLANK_INT("screen", moobl_interrupt)
MDRV_MACHINE_START(moo)
@@ -555,7 +555,7 @@ static MACHINE_DRIVER_START( bucky )
MDRV_IMPORT_FROM(moo)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bucky_map,0)
+ MDRV_CPU_PROGRAM_MAP(bucky_map)
/* video hardware */
MDRV_PALETTE_LENGTH(4096)
diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c
index 28e64968191..09c14fc86e3 100644
--- a/src/mame/drivers/mosaic.c
+++ b/src/mame/drivers/mosaic.c
@@ -260,8 +260,8 @@ static const ym2203_interface ym2203_config =
static MACHINE_DRIVER_START( mosaic )
MDRV_CPU_ADD("maincpu", Z180, 7000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(mosaic_map,0)
- MDRV_CPU_IO_MAP(mosaic_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mosaic_map)
+ MDRV_CPU_IO_MAP(mosaic_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -289,8 +289,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gfire2 )
MDRV_IMPORT_FROM(mosaic)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gfire2_map,0)
- MDRV_CPU_IO_MAP(gfire2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(gfire2_map)
+ MDRV_CPU_IO_MAP(gfire2_io_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index 652af30c74f..4baafaf9cbe 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -181,12 +181,12 @@ static MACHINE_DRIVER_START( mouser )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(mouser_map,0)
+ MDRV_CPU_PROGRAM_MAP(mouser_map)
MDRV_CPU_VBLANK_INT("screen", mouser_nmi_interrupt) /* NMI is masked externally */
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(mouser_sound_map,0)
- MDRV_CPU_IO_MAP(mouser_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mouser_sound_map)
+ MDRV_CPU_IO_MAP(mouser_sound_io_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* ??? This controls the sound tempo */
/* video hardware */
diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c
index 7bdf73fef73..a056a9939c4 100644
--- a/src/mame/drivers/mpoker.c
+++ b/src/mame/drivers/mpoker.c
@@ -153,7 +153,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mpoker )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index 8cb92118e28..2d23755b85d 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -1848,7 +1848,7 @@ static MACHINE_DRIVER_START( mpu4mod2 )
MDRV_MACHINE_START(mpu4mod2)
MDRV_MACHINE_RESET(mpu4)
MDRV_CPU_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(mod2_memmap,0)
+ MDRV_CPU_PROGRAM_MAP(mod2_memmap)
MDRV_TIMER_ADD_PERIODIC("50hz",gen_50hz, HZ(100))
@@ -1874,7 +1874,7 @@ static MACHINE_DRIVER_START( mod4yam )
MDRV_MACHINE_START(mpu4mod4)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mod4_yam_map,0)
+ MDRV_CPU_PROGRAM_MAP(mod4_yam_map)
MDRV_SOUND_REMOVE("ay8913")
MDRV_SOUND_ADD("ym2413", YM2413, MPU4_MASTER_CLOCK/4)
@@ -1888,7 +1888,7 @@ static MACHINE_DRIVER_START( mod4oki )
MDRV_PIA6821_ADD("pia_gamebd", pia_gameboard_intf)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mod4_oki_map,0)
+ MDRV_CPU_PROGRAM_MAP(mod4_oki_map)
MDRV_SOUND_REMOVE("ay8913")
MDRV_SOUND_ADD("msm6376", OKIM6376, 4000000) //?
@@ -1898,7 +1898,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mpu4dutch )
MDRV_IMPORT_FROM( mod4oki )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dutch_memmap,0) // setup read and write memorymap
+ MDRV_CPU_PROGRAM_MAP(dutch_memmap) // setup read and write memorymap
MDRV_MACHINE_START(mpu4dutch) // main mpu4 board initialisation
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index 538a33f3741..395db0e56eb 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -1680,7 +1680,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( mpu4_vid )
MDRV_CPU_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4 )
- MDRV_CPU_PROGRAM_MAP(mpu4_6809_map,0)
+ MDRV_CPU_PROGRAM_MAP(mpu4_6809_map)
MDRV_TIMER_ADD_PERIODIC("50hz",gen_50hz, HZ(100))
MDRV_NVRAM_HANDLER(generic_0fill) /* confirm */
@@ -1700,7 +1700,7 @@ static MACHINE_DRIVER_START( mpu4_vid )
MDRV_SCREEN_REFRESH_RATE(50)
MDRV_CPU_ADD("video", M68000, VIDEO_MASTER_CLOCK )
- MDRV_CPU_PROGRAM_MAP(mpu4_68k_map,0)
+ MDRV_CPU_PROGRAM_MAP(mpu4_68k_map)
MDRV_CPU_VBLANK_INT("screen", mpu4_vid_irq)
MDRV_QUANTUM_TIME(HZ(960))
@@ -1730,7 +1730,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( vgpoker )
MDRV_IMPORT_FROM( mpu4_vid )
MDRV_CPU_MODIFY("video")
- MDRV_CPU_PROGRAM_MAP(vp_68k_map,0)
+ MDRV_CPU_PROGRAM_MAP(vp_68k_map)
MACHINE_DRIVER_END
@@ -1739,7 +1739,7 @@ static MACHINE_DRIVER_START( dealem )
MDRV_MACHINE_START(mpu4mod2) /* main mpu4 board initialisation */
MDRV_MACHINE_RESET(mpu4_vid)
MDRV_CPU_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(dealem_memmap,0)
+ MDRV_CPU_PROGRAM_MAP(dealem_memmap)
MDRV_TIMER_ADD_PERIODIC("50hz",gen_50hz, HZ(100))
diff --git a/src/mame/drivers/mpu5.c b/src/mame/drivers/mpu5.c
index 85f56c70987..ebbffa5fe67 100644
--- a/src/mame/drivers/mpu5.c
+++ b/src/mame/drivers/mpu5.c
@@ -35,7 +35,7 @@ static VIDEO_UPDATE(mpu5)
static MACHINE_DRIVER_START( mpu5 )
MDRV_CPU_ADD("maincpu", M68EC020, 16000000) // ?
- MDRV_CPU_PROGRAM_MAP(mpu5_map,0)
+ MDRV_CPU_PROGRAM_MAP(mpu5_map)
/* actually non-video? */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index 539edd14000..670b93f1721 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -356,7 +356,7 @@ static MACHINE_DRIVER_START( mquake )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(mquake)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c
index 9538070e60a..874b62a0802 100644
--- a/src/mame/drivers/mrdo.c
+++ b/src/mame/drivers/mrdo.c
@@ -171,7 +171,7 @@ static MACHINE_DRIVER_START( mrdo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MAIN_CLOCK/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index bc66781e4ff..2308c020603 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -228,13 +228,13 @@ static MACHINE_DRIVER_START( mrflea )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(mrflea_master_map,0)
- MDRV_CPU_IO_MAP(mrflea_master_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mrflea_master_map)
+ MDRV_CPU_IO_MAP(mrflea_master_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* NMI resets the game */
MDRV_CPU_ADD("sub", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(mrflea_slave_map,0)
- MDRV_CPU_IO_MAP(mrflea_slave_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mrflea_slave_map)
+ MDRV_CPU_IO_MAP(mrflea_slave_io_map)
MDRV_CPU_VBLANK_INT_HACK(mrflea_slave_interrupt,2)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c
index 457c90d25e0..d1388312f97 100644
--- a/src/mame/drivers/mrjong.c
+++ b/src/mame/drivers/mrjong.c
@@ -164,8 +164,8 @@ static MACHINE_DRIVER_START( mrjong )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,15468000/6) /* 2.578 MHz?? */
- MDRV_CPU_PROGRAM_MAP(mrjong_map,0)
- MDRV_CPU_IO_MAP(mrjong_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mrjong_map)
+ MDRV_CPU_IO_MAP(mrjong_io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index 9b5727bfbda..e0da94a1880 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -1170,11 +1170,11 @@ static MACHINE_DRIVER_START( ms32 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V70, 20000000) // 20MHz
- MDRV_CPU_PROGRAM_MAP(ms32_map,0)
+ MDRV_CPU_PROGRAM_MAP(ms32_map)
MDRV_CPU_VBLANK_INT_HACK(ms32_interrupt,32)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(ms32_sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(ms32_sound_map)
MDRV_QUANTUM_TIME(HZ(60000))
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index 00715f757e1..a58ffcc1ffe 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -479,16 +479,16 @@ static MACHINE_DRIVER_START( msisaac )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(msisaac_map,0)
+ MDRV_CPU_PROGRAM_MAP(msisaac_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(msisaac_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(msisaac_sound_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* source of IRQs is unknown */
#ifdef USE_MCU
MDRV_CPU_ADD("mcu", M68705,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(msisaac_mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(msisaac_mcu_map)
#endif
MDRV_MACHINE_RESET(ta7630)
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index 12fd83cc73a..8ef4a6f070f 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -408,11 +408,11 @@ static const ym2151_interface ym2151_config =
static MACHINE_DRIVER_START( mugsmash )
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(mugsmash_map,0)
+ MDRV_CPU_PROGRAM_MAP(mugsmash_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* Guess */
- MDRV_CPU_PROGRAM_MAP(mugsmash_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(mugsmash_sound_map)
MDRV_SCREEN_ADD("screen", RASTER)
MDRV_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c
index 0376a8ad48b..cb431582ecd 100644
--- a/src/mame/drivers/multfish.c
+++ b/src/mame/drivers/multfish.c
@@ -428,8 +428,8 @@ static const ay8910_interface ay8910_config =
static MACHINE_DRIVER_START( multfish )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,6000000) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(multfish_map,0)
- MDRV_CPU_IO_MAP(multfish_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(multfish_map)
+ MDRV_CPU_IO_MAP(multfish_portmap)
MDRV_CPU_VBLANK_INT("screen",irq0_line_hold)
MDRV_MACHINE_RESET( multfish )
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index 1ee40c9cf0e..1a4bda8aec8 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -584,7 +584,7 @@ static MACHINE_RESET( multigm3 )
static MACHINE_DRIVER_START( multigam )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", N2A03, N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(multigam_map, 0)
+ MDRV_CPU_PROGRAM_MAP(multigam_map)
MDRV_MACHINE_RESET( multigam )
@@ -618,7 +618,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( multigm3 )
MDRV_IMPORT_FROM(multigam)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(multigm3_map, 0)
+ MDRV_CPU_PROGRAM_MAP(multigm3_map)
MDRV_MACHINE_RESET( multigm3 )
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c
index 24d4427bced..92eb3225bdf 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -272,11 +272,11 @@ static MACHINE_DRIVER_START( mnchmobl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_15MHz/4) /* ? */
- MDRV_CPU_PROGRAM_MAP(mnchmobl_map,0)
+ MDRV_CPU_PROGRAM_MAP(mnchmobl_map)
MDRV_CPU_VBLANK_INT_HACK(mnchmobl_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_15MHz/4) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_assert)
/* video hardware */
diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c
index 865ce328b41..be4c4c8317a 100644
--- a/src/mame/drivers/murogem.c
+++ b/src/mame/drivers/murogem.c
@@ -208,7 +208,7 @@ static const mc6845_interface mc6845_intf =
static MACHINE_DRIVER_START( murogem )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6802,8000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(murogem_map,0)
+ MDRV_CPU_PROGRAM_MAP(murogem_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c
index 4536c421b7e..072aa2f4373 100644
--- a/src/mame/drivers/murogmbl.c
+++ b/src/mame/drivers/murogmbl.c
@@ -169,7 +169,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( murogmbl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 1000000) /* Z80? */
- MDRV_CPU_PROGRAM_MAP(murogmbl_map, 0)
+ MDRV_CPU_PROGRAM_MAP(murogmbl_map)
MDRV_GFXDECODE(murogmbl)
diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c
index e698f793f00..03600818876 100644
--- a/src/mame/drivers/mustache.c
+++ b/src/mame/drivers/mustache.c
@@ -198,12 +198,12 @@ static MACHINE_DRIVER_START( mustache )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(memmap, 0)
+ MDRV_CPU_PROGRAM_MAP(memmap)
MDRV_CPU_VBLANK_INT("screen", assert_irq)
MDRV_CPU_ADD(CPUTAG_T5182,Z80, T5182_CLOCK)
- MDRV_CPU_PROGRAM_MAP(t5182_map, 0)
- MDRV_CPU_IO_MAP(t5182_io, 0)
+ MDRV_CPU_PROGRAM_MAP(t5182_map)
+ MDRV_CPU_IO_MAP(t5182_io)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c
index e1925039dda..96b00fcd680 100644
--- a/src/mame/drivers/mw8080bw.c
+++ b/src/mame/drivers/mw8080bw.c
@@ -225,7 +225,7 @@ MACHINE_DRIVER_START( mw8080bw_root )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",8080,MW8080BW_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_START(mw8080bw)
MDRV_MACHINE_RESET(mw8080bw)
@@ -405,7 +405,7 @@ static MACHINE_DRIVER_START( seawolf )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(seawolf_io_map,0)
+ MDRV_CPU_IO_MAP(seawolf_io_map)
/* there is no watchdog */
/* audio hardware */
@@ -499,7 +499,7 @@ static MACHINE_DRIVER_START( gunfight )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(gunfight_io_map,0)
+ MDRV_CPU_IO_MAP(gunfight_io_map)
/* there is no watchdog */
/* audio hardware */
@@ -722,7 +722,7 @@ static MACHINE_DRIVER_START( tornbase)
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(tornbase_io_map,0)
+ MDRV_CPU_IO_MAP(tornbase_io_map)
/* there is no watchdog */
/* audio hardware */
@@ -835,7 +835,7 @@ static MACHINE_DRIVER_START( zzzap )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(zzzap_io_map,0)
+ MDRV_CPU_IO_MAP(zzzap_io_map)
MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_M(1), CAP_U(1)))) /* 1.1s */
/* audio hardware */
@@ -946,7 +946,7 @@ static MACHINE_DRIVER_START( maze )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(maze_io_map,0)
+ MDRV_CPU_IO_MAP(maze_io_map)
MDRV_MACHINE_START(maze)
MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
@@ -1037,7 +1037,7 @@ static MACHINE_DRIVER_START( boothill )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(boothill_io_map,0)
+ MDRV_CPU_IO_MAP(boothill_io_map)
MDRV_MACHINE_START(boothill)
MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
@@ -1140,7 +1140,7 @@ static MACHINE_DRIVER_START( checkmat )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(checkmat_io_map,0)
+ MDRV_CPU_IO_MAP(checkmat_io_map)
MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
/* audio hardware */
@@ -1275,7 +1275,7 @@ static MACHINE_DRIVER_START( desertgu )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(desertgu_io_map,0)
+ MDRV_CPU_IO_MAP(desertgu_io_map)
MDRV_MACHINE_START(desertgu)
MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
@@ -1473,7 +1473,7 @@ static MACHINE_DRIVER_START( dplay )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(dplay_io_map,0)
+ MDRV_CPU_IO_MAP(dplay_io_map)
MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* audio hardware */
@@ -1564,7 +1564,7 @@ static MACHINE_DRIVER_START( gmissile )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(gmissile_io_map,0)
+ MDRV_CPU_IO_MAP(gmissile_io_map)
MDRV_MACHINE_START(gmissile)
MDRV_WATCHDOG_VBLANK_INIT(255) /* really based on a 60Hz clock source */
@@ -1654,7 +1654,7 @@ static MACHINE_DRIVER_START( m4 )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(m4_io_map,0)
+ MDRV_CPU_IO_MAP(m4_io_map)
MDRV_MACHINE_START(m4)
MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
@@ -1828,7 +1828,7 @@ static MACHINE_DRIVER_START( clowns )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(clowns_io_map,0)
+ MDRV_CPU_IO_MAP(clowns_io_map)
MDRV_MACHINE_START(clowns)
MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
@@ -1907,7 +1907,7 @@ static MACHINE_DRIVER_START( shuffle )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(shuffle_io_map,0)
+ MDRV_CPU_IO_MAP(shuffle_io_map)
MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* audio hardware */
@@ -1990,7 +1990,7 @@ static MACHINE_DRIVER_START( dogpatch )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(dogpatch_io_map,0)
+ MDRV_CPU_IO_MAP(dogpatch_io_map)
/* the watch dog time is unknown, but all other */
/* Midway boards of the era used the same circuit */
MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
@@ -2157,7 +2157,7 @@ static MACHINE_DRIVER_START( spcenctr )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(spcenctr_io_map,0)
+ MDRV_CPU_IO_MAP(spcenctr_io_map)
MDRV_MACHINE_START(spcenctr)
MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
@@ -2265,7 +2265,7 @@ static MACHINE_DRIVER_START( phantom2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(phantom2_io_map,0)
+ MDRV_CPU_IO_MAP(phantom2_io_map)
MDRV_MACHINE_START(phantom2)
MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
@@ -2402,7 +2402,7 @@ static MACHINE_DRIVER_START( bowler )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(bowler_io_map,0)
+ MDRV_CPU_IO_MAP(bowler_io_map)
MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* audio hardware */
@@ -2627,7 +2627,7 @@ MACHINE_DRIVER_START( invaders )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invaders_io_map,0)
+ MDRV_CPU_IO_MAP(invaders_io_map)
MDRV_MACHINE_START(invaders)
MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
@@ -2707,7 +2707,7 @@ static MACHINE_DRIVER_START( blueshrk )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(blueshrk_io_map,0)
+ MDRV_CPU_IO_MAP(blueshrk_io_map)
MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* audio hardware */
@@ -2805,7 +2805,7 @@ static MACHINE_DRIVER_START( invad2ct )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invad2ct_io_map,0)
+ MDRV_CPU_IO_MAP(invad2ct_io_map)
MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* audio hardware */
diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c
index 0d7c4c1b51f..62336755937 100644
--- a/src/mame/drivers/mwarr.c
+++ b/src/mame/drivers/mwarr.c
@@ -455,7 +455,7 @@ static VIDEO_UPDATE( mwarr )
static MACHINE_DRIVER_START( mwarr )
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(mwarr_map,0)
+ MDRV_CPU_PROGRAM_MAP(mwarr_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_GFXDECODE(mwarr)
diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c
index 26b2b5a20ea..50725a85117 100644
--- a/src/mame/drivers/mystston.c
+++ b/src/mame/drivers/mystston.c
@@ -207,7 +207,7 @@ static MACHINE_DRIVER_START( mystston )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
/* video hardware */
MDRV_IMPORT_FROM(mystston_video)
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index 0ca797dd624..440c6342b5b 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -848,11 +848,11 @@ static MACHINE_DRIVER_START( mystwarr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz (confirmed) */
- MDRV_CPU_PROGRAM_MAP(mystwarr_map,0)
+ MDRV_CPU_PROGRAM_MAP(mystwarr_map)
MDRV_CPU_VBLANK_INT_HACK(mystwarr_interrupt, 3)
MDRV_CPU_ADD("soundcpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(mystwarr_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(mystwarr_sound_map)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 480)
MDRV_QUANTUM_TIME(HZ(1920))
@@ -898,7 +898,7 @@ static MACHINE_DRIVER_START( viostorm )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(viostorm_map,0)
+ MDRV_CPU_PROGRAM_MAP(viostorm_map)
MDRV_CPU_VBLANK_INT_HACK(metamrph_interrupt, 40)
/* video hardware */
@@ -918,7 +918,7 @@ static MACHINE_DRIVER_START( metamrph )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(metamrph_map,0)
+ MDRV_CPU_PROGRAM_MAP(metamrph_map)
MDRV_CPU_VBLANK_INT_HACK(metamrph_interrupt, 40)
/* video hardware */
@@ -938,7 +938,7 @@ static MACHINE_DRIVER_START( dadandrn )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dadandrn_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dadandrn_map)
MDRV_CPU_VBLANK_INT("screen", ddd_interrupt)
MDRV_GFXDECODE(dadandrn)
@@ -960,7 +960,7 @@ static MACHINE_DRIVER_START( gaiapols )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gaiapols_map,0)
+ MDRV_CPU_PROGRAM_MAP(gaiapols_map)
MDRV_CPU_VBLANK_INT("screen", ddd_interrupt)
MDRV_GFXDECODE(gaiapols)
@@ -985,7 +985,7 @@ static MACHINE_DRIVER_START( martchmp )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(martchmp_map,0)
+ MDRV_CPU_PROGRAM_MAP(martchmp_map)
MDRV_CPU_VBLANK_INT_HACK(mchamp_interrupt, 2)
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c
index d35ac16b217..71709dbe5e8 100644
--- a/src/mame/drivers/n8080.c
+++ b/src/mame/drivers/n8080.c
@@ -108,8 +108,8 @@ static MACHINE_DRIVER_START( spacefev )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080, MASTER_CLOCK / 10)
MDRV_CPU_CONFIG(n8080_cpu_config)
- MDRV_CPU_PROGRAM_MAP(main_cpu_map, 0)
- MDRV_CPU_IO_MAP(main_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_cpu_map)
+ MDRV_CPU_IO_MAP(main_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -136,8 +136,8 @@ static MACHINE_DRIVER_START( sheriff )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080, MASTER_CLOCK / 10)
MDRV_CPU_CONFIG(n8080_cpu_config)
- MDRV_CPU_PROGRAM_MAP(main_cpu_map, 0)
- MDRV_CPU_IO_MAP(main_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_cpu_map)
+ MDRV_CPU_IO_MAP(main_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -164,8 +164,8 @@ static MACHINE_DRIVER_START( helifire )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080, MASTER_CLOCK / 10)
MDRV_CPU_CONFIG(n8080_cpu_config)
- MDRV_CPU_PROGRAM_MAP(helifire_main_cpu_map, 0)
- MDRV_CPU_IO_MAP(main_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(helifire_main_cpu_map)
+ MDRV_CPU_IO_MAP(main_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c
index d6d4f84790c..9cb07d7dbf4 100644
--- a/src/mame/drivers/namcofl.c
+++ b/src/mame/drivers/namcofl.c
@@ -522,11 +522,11 @@ static MACHINE_RESET( namcofl )
static MACHINE_DRIVER_START( namcofl )
MDRV_CPU_ADD("maincpu", I960, 20000000) // i80960KA-20 == 20 MHz part
- MDRV_CPU_PROGRAM_MAP(namcofl_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(namcofl_mem)
MDRV_CPU_ADD("mcu", M37702, 48384000/3)
- MDRV_CPU_PROGRAM_MAP(namcoc75_am, 0)
- MDRV_CPU_IO_MAP(namcoc75_io, 0)
+ MDRV_CPU_PROGRAM_MAP(namcoc75_am)
+ MDRV_CPU_IO_MAP(namcoc75_io)
MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
MDRV_MACHINE_START(namcofl)
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index 6f3da8a23d5..51f0c671e22 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -1007,12 +1007,12 @@ static const c140_interface C140_interface_typeA =
static MACHINE_DRIVER_START( namcona1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 50113000/4)
- MDRV_CPU_PROGRAM_MAP(namcona1_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(namcona1_main_map)
MDRV_CPU_VBLANK_INT_HACK(namcona1_interrupt,5)
MDRV_CPU_ADD("mcu", M37702, 50113000/4)
- MDRV_CPU_PROGRAM_MAP(namcona1_mcu_map, 0)
- MDRV_CPU_IO_MAP( namcona1_mcu_io_map, 0 )
+ MDRV_CPU_PROGRAM_MAP(namcona1_mcu_map)
+ MDRV_CPU_IO_MAP( namcona1_mcu_io_map)
MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 2)
MDRV_NVRAM_HANDLER(namcosna1)
@@ -1063,7 +1063,7 @@ static MACHINE_DRIVER_START( namcona2 )
MDRV_IMPORT_FROM(namcona1)
MDRV_CPU_REPLACE("maincpu", M68000, 50113000/4)
- MDRV_CPU_PROGRAM_MAP(namcona2_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(namcona2_main_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c
index 3053da75d95..d75f984dab8 100644
--- a/src/mame/drivers/namconb1.c
+++ b/src/mame/drivers/namconb1.c
@@ -1013,12 +1013,12 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( namconb1 )
MDRV_CPU_ADD("maincpu", M68EC020,MASTER_CLOCK_HZ/2)
- MDRV_CPU_PROGRAM_MAP(namconb1_am,0)
+ MDRV_CPU_PROGRAM_MAP(namconb1_am)
MDRV_CPU_VBLANK_INT("screen", namconb1_interrupt)
MDRV_CPU_ADD("mcu", M37702, MASTER_CLOCK_HZ/3)
- MDRV_CPU_PROGRAM_MAP(namcoc75_am, 0)
- MDRV_CPU_IO_MAP(namcoc75_io, 0)
+ MDRV_CPU_PROGRAM_MAP(namcoc75_am)
+ MDRV_CPU_IO_MAP(namcoc75_io)
MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
MDRV_NVRAM_HANDLER(namconb1)
@@ -1046,12 +1046,12 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( namconb2 )
MDRV_CPU_ADD("maincpu", M68EC020,MASTER_CLOCK_HZ/2)
- MDRV_CPU_PROGRAM_MAP(namconb2_am,0)
+ MDRV_CPU_PROGRAM_MAP(namconb2_am)
MDRV_CPU_VBLANK_INT("screen", namconb2_interrupt)
MDRV_CPU_ADD("mcu", M37702, MASTER_CLOCK_HZ/3)
- MDRV_CPU_PROGRAM_MAP(namcoc75_am, 0)
- MDRV_CPU_IO_MAP(namcoc75_io, 0)
+ MDRV_CPU_PROGRAM_MAP(namcoc75_am)
+ MDRV_CPU_IO_MAP(namcoc75_io)
MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
MDRV_NVRAM_HANDLER(namconb1)
diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c
index ed2be3c9cdf..461ef2b74ec 100644
--- a/src/mame/drivers/namcond1.c
+++ b/src/mame/drivers/namcond1.c
@@ -285,13 +285,13 @@ static MACHINE_DRIVER_START( namcond1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(namcond1_map,0)
+ MDRV_CPU_PROGRAM_MAP(namcond1_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_PERIODIC_INT(ygv608_timed_interrupt, 1000)
MDRV_CPU_ADD("mcu", H83002, 16384000 )
- MDRV_CPU_PROGRAM_MAP( nd1h8rwmap, 0 )
- MDRV_CPU_IO_MAP( nd1h8iomap, 0 )
+ MDRV_CPU_PROGRAM_MAP( nd1h8rwmap)
+ MDRV_CPU_IO_MAP( nd1h8iomap)
MDRV_CPU_VBLANK_INT("screen", mcu_interrupt)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index d842b867984..9fd4213fc6d 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -1081,20 +1081,20 @@ static MACHINE_DRIVER_START( ns1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809,49152000/32)
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub", M6809,49152000/32)
- MDRV_CPU_PROGRAM_MAP(sub_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("audiocpu", M6809,49152000/32)
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("mcu",HD63701,49152000/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map, 0)
- MDRV_CPU_IO_MAP(mcu_port_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MDRV_CPU_IO_MAP(mcu_port_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
// heavy sync required to prevent CPUs from fighting for video RAM access and going into deadlocks
diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c
index eaead435058..be497a2d949 100644
--- a/src/mame/drivers/namcos10.c
+++ b/src/mame/drivers/namcos10.c
@@ -378,7 +378,7 @@ static MACHINE_RESET( namcos10 )
static MACHINE_DRIVER_START( namcos10 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PSXCPU, XTAL_101_4912MHz )
- MDRV_CPU_PROGRAM_MAP( namcos10_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( namcos10_map)
MDRV_CPU_VBLANK_INT("screen", psx_vblank)
MDRV_MACHINE_RESET( namcos10 )
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index 72032c3c374..f67722b897a 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -872,7 +872,7 @@ static MACHINE_RESET( namcos11 )
static MACHINE_DRIVER_START( coh100 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PSXCPU, XTAL_67_7376MHz )
- MDRV_CPU_PROGRAM_MAP( namcos11_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( namcos11_map)
MDRV_CPU_VBLANK_INT("screen", namcos11_vblank)
MDRV_MACHINE_RESET( namcos11 )
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index 772c3198169..be9d0df33af 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1501,12 +1501,12 @@ static DRIVER_INIT( ghlpanic )
static MACHINE_DRIVER_START( coh700 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", CXD8661R, XTAL_100MHz )
- MDRV_CPU_PROGRAM_MAP( namcos12_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( namcos12_map)
MDRV_CPU_VBLANK_INT("screen", psx_vblank)
MDRV_CPU_ADD("sub", H83002, 14745600 ) /* verified 14.7456 MHz */
- MDRV_CPU_PROGRAM_MAP( s12h8rwmap, 0 )
- MDRV_CPU_IO_MAP( s12h8iomap, 0 )
+ MDRV_CPU_PROGRAM_MAP( s12h8rwmap)
+ MDRV_CPU_IO_MAP( s12h8iomap)
MDRV_CPU_VBLANK_INT("screen", irq1_line_pulse)
MDRV_MACHINE_RESET( namcos12 )
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index 3549d02233d..a1e202cb89c 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -1574,20 +1574,20 @@ via software as INT1
static MACHINE_DRIVER_START( default )
MDRV_CPU_ADD("maincpu", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(master_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(master_default_am)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
MDRV_CPU_ADD("slave", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(slave_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(slave_default_am)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
MDRV_CPU_ADD("audiocpu", M6809,3072000) // Sound handling
- MDRV_CPU_PROGRAM_MAP(sound_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(sound_default_am)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120)
MDRV_CPU_ADD("mcu", HD63705,2048000) // I/O handling
- MDRV_CPU_PROGRAM_MAP(mcu_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_default_am)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
@@ -1648,20 +1648,20 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gollygho )
MDRV_CPU_ADD("maincpu", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(master_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(master_default_am)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
MDRV_CPU_ADD("slave", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(slave_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(slave_default_am)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
MDRV_CPU_ADD("audiocpu", M6809,3072000) // Sound handling
- MDRV_CPU_PROGRAM_MAP(sound_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(sound_default_am)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120)
MDRV_CPU_ADD("mcu", HD63705,2048000) // I/O handling
- MDRV_CPU_PROGRAM_MAP(mcu_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_default_am)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
@@ -1698,20 +1698,20 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( finallap )
MDRV_CPU_ADD("maincpu", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(master_finallap_am,0)
+ MDRV_CPU_PROGRAM_MAP(master_finallap_am)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
MDRV_CPU_ADD("slave", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(slave_finallap_am,0)
+ MDRV_CPU_PROGRAM_MAP(slave_finallap_am)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
MDRV_CPU_ADD("audiocpu", M6809,3072000) // Sound handling
- MDRV_CPU_PROGRAM_MAP(sound_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(sound_default_am)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120)
MDRV_CPU_ADD("mcu", HD63705,2048000) // I/O handling
- MDRV_CPU_PROGRAM_MAP(mcu_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_default_am)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
@@ -1748,20 +1748,20 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sgunner )
MDRV_CPU_ADD("maincpu", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(master_sgunner_am,0)
+ MDRV_CPU_PROGRAM_MAP(master_sgunner_am)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
MDRV_CPU_ADD("slave", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(slave_sgunner_am,0)
+ MDRV_CPU_PROGRAM_MAP(slave_sgunner_am)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
MDRV_CPU_ADD("audiocpu", M6809,3072000) // Sound handling
- MDRV_CPU_PROGRAM_MAP(sound_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(sound_default_am)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120)
MDRV_CPU_ADD("mcu", HD63705,2048000) // I/O handling
- MDRV_CPU_PROGRAM_MAP(mcu_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_default_am)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
@@ -1798,20 +1798,20 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( luckywld )
MDRV_CPU_ADD("maincpu", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(master_luckywld_am,0)
+ MDRV_CPU_PROGRAM_MAP(master_luckywld_am)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
MDRV_CPU_ADD("slave", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(slave_luckywld_am,0)
+ MDRV_CPU_PROGRAM_MAP(slave_luckywld_am)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
MDRV_CPU_ADD("audiocpu", M6809,3072000) /* Sound handling */
- MDRV_CPU_PROGRAM_MAP(sound_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(sound_default_am)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,120)
MDRV_CPU_ADD("mcu", HD63705,2048000) /* I/O handling */
- MDRV_CPU_PROGRAM_MAP(mcu_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_default_am)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
@@ -1848,20 +1848,20 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( metlhawk )
MDRV_CPU_ADD("maincpu", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(master_metlhawk_am,0)
+ MDRV_CPU_PROGRAM_MAP(master_metlhawk_am)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
MDRV_CPU_ADD("slave", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(slave_metlhawk_am,0)
+ MDRV_CPU_PROGRAM_MAP(slave_metlhawk_am)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
MDRV_CPU_ADD("audiocpu", M6809,3072000) /* Sound handling */
- MDRV_CPU_PROGRAM_MAP(sound_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(sound_default_am)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,120)
MDRV_CPU_ADD("mcu", HD63705,2048000) /* I/O handling */
- MDRV_CPU_PROGRAM_MAP(mcu_default_am,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_default_am)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index 57e517bb2ae..acffffea2f1 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -1525,31 +1525,31 @@ static const c140_interface C140_interface_typeB =
static MACHINE_DRIVER_START( s21base )
MDRV_CPU_ADD("maincpu", M68000,12288000) /* Master */
- MDRV_CPU_PROGRAM_MAP(namcos21_68k_master, 0)
+ MDRV_CPU_PROGRAM_MAP(namcos21_68k_master)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
MDRV_CPU_ADD("slave", M68000,12288000) /* Slave */
- MDRV_CPU_PROGRAM_MAP(namcos21_68k_slave, 0)
+ MDRV_CPU_PROGRAM_MAP(namcos21_68k_slave)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
MDRV_CPU_ADD("audiocpu", M6809,3072000) /* Sound */
- MDRV_CPU_PROGRAM_MAP(am_sound_winrun,0)
+ MDRV_CPU_PROGRAM_MAP(am_sound_winrun)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,120)
MDRV_CPU_ADD("mcu", HD63705,2048000) /* IO */
- MDRV_CPU_PROGRAM_MAP(am_mcu_winrun,0)
+ MDRV_CPU_PROGRAM_MAP(am_mcu_winrun)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("dspmaster", TMS32025,24000000) /* 24 MHz? overclocked */
- MDRV_CPU_PROGRAM_MAP(master_dsp_program,0)
- MDRV_CPU_DATA_MAP(master_dsp_data,0)
- MDRV_CPU_IO_MAP(master_dsp_io,0)
+ MDRV_CPU_PROGRAM_MAP(master_dsp_program)
+ MDRV_CPU_DATA_MAP(master_dsp_data)
+ MDRV_CPU_IO_MAP(master_dsp_io)
MDRV_CPU_ADD("dspslave", TMS32025,24000000*4) /* 24 MHz?; overclocked */
- MDRV_CPU_PROGRAM_MAP(slave_dsp_program,0)
- MDRV_CPU_DATA_MAP(slave_dsp_data,0)
- MDRV_CPU_IO_MAP(slave_dsp_io,0)
+ MDRV_CPU_PROGRAM_MAP(slave_dsp_program)
+ MDRV_CPU_DATA_MAP(slave_dsp_data)
+ MDRV_CPU_IO_MAP(slave_dsp_io)
MDRV_QUANTUM_TIME(HZ(12000))
@@ -1604,26 +1604,26 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( driveyes )
MDRV_CPU_ADD("maincpu", M68000,12288000) /* Master */
- MDRV_CPU_PROGRAM_MAP(driveyes_68k_master, 0)
+ MDRV_CPU_PROGRAM_MAP(driveyes_68k_master)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
MDRV_CPU_ADD("slave", M68000,12288000) /* Slave */
- MDRV_CPU_PROGRAM_MAP(driveyes_68k_slave, 0)
+ MDRV_CPU_PROGRAM_MAP(driveyes_68k_slave)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
MDRV_CPU_ADD("audiocpu", M6809,3072000) /* Sound */
- MDRV_CPU_PROGRAM_MAP(am_sound_winrun,0)
+ MDRV_CPU_PROGRAM_MAP(am_sound_winrun)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,120)
MDRV_CPU_ADD("mcu", HD63705,2048000) /* IO */
- MDRV_CPU_PROGRAM_MAP(am_mcu_winrun,0)
+ MDRV_CPU_PROGRAM_MAP(am_mcu_winrun)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("dsp", TMS32025,24000000*2) /* 24 MHz? overclocked */
- MDRV_CPU_PROGRAM_MAP(winrun_dsp_program,0)
- MDRV_CPU_DATA_MAP(winrun_dsp_data,0)
- MDRV_CPU_IO_MAP(winrun_dsp_io,0)
+ MDRV_CPU_PROGRAM_MAP(winrun_dsp_program)
+ MDRV_CPU_DATA_MAP(winrun_dsp_data)
+ MDRV_CPU_IO_MAP(winrun_dsp_io)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
@@ -1659,29 +1659,29 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( winrun_c140_typeB )
MDRV_CPU_ADD("maincpu", M68000,12288000) /* Master */
- MDRV_CPU_PROGRAM_MAP(am_master_winrun,0)
+ MDRV_CPU_PROGRAM_MAP(am_master_winrun)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
MDRV_CPU_ADD("slave", M68000,12288000) /* Slave */
- MDRV_CPU_PROGRAM_MAP(am_slave_winrun,0)
+ MDRV_CPU_PROGRAM_MAP(am_slave_winrun)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
MDRV_CPU_ADD("audiocpu", M6809,3072000) /* Sound */
- MDRV_CPU_PROGRAM_MAP(am_sound_winrun,0)
+ MDRV_CPU_PROGRAM_MAP(am_sound_winrun)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,120)
MDRV_CPU_ADD("mcu", HD63705,2048000) /* IO */
- MDRV_CPU_PROGRAM_MAP(am_mcu_winrun,0)
+ MDRV_CPU_PROGRAM_MAP(am_mcu_winrun)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("dsp", TMS32025,24000000) /* 24 MHz? overclocked */
- MDRV_CPU_PROGRAM_MAP(winrun_dsp_program,0)
- MDRV_CPU_DATA_MAP(winrun_dsp_data,0)
- MDRV_CPU_IO_MAP(winrun_dsp_io,0)
+ MDRV_CPU_PROGRAM_MAP(winrun_dsp_program)
+ MDRV_CPU_DATA_MAP(winrun_dsp_data)
+ MDRV_CPU_IO_MAP(winrun_dsp_io)
MDRV_CPU_ADD("gpu", M68000,12288000) /* graphics coprocessor */
- MDRV_CPU_PROGRAM_MAP(am_gpu_winrun,0)
+ MDRV_CPU_PROGRAM_MAP(am_gpu_winrun)
MDRV_CPU_VBLANK_INT("screen", namcos2_68k_gpu_vblank)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index 035b77bb90f..0ff7c60fef8 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -2748,23 +2748,23 @@ static INTERRUPT_GEN( mcu_interrupt )
static MACHINE_DRIVER_START( namcos22s )
MDRV_CPU_ADD("maincpu", M68EC020,SS22_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(namcos22s_am,0)
+ MDRV_CPU_PROGRAM_MAP(namcos22s_am)
MDRV_CPU_VBLANK_INT_HACK(namcos22s_interrupt,2)
MDRV_CPU_ADD("master", TMS32025,SS22_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(master_dsp_program,0)
- MDRV_CPU_DATA_MAP(master_dsp_data,0)
- MDRV_CPU_IO_MAP(master_dsp_io,0)
+ MDRV_CPU_PROGRAM_MAP(master_dsp_program)
+ MDRV_CPU_DATA_MAP(master_dsp_data)
+ MDRV_CPU_IO_MAP(master_dsp_io)
MDRV_CPU_VBLANK_INT_HACK(dsp_serial_pulse1,SERIAL_IO_PERIOD)
MDRV_CPU_ADD("slave", TMS32025,SS22_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(slave_dsp_program,0)
- MDRV_CPU_DATA_MAP(slave_dsp_data,0)
- MDRV_CPU_IO_MAP(slave_dsp_io,0)
+ MDRV_CPU_PROGRAM_MAP(slave_dsp_program)
+ MDRV_CPU_DATA_MAP(slave_dsp_data)
+ MDRV_CPU_IO_MAP(slave_dsp_io)
MDRV_CPU_ADD("mcu", M37710, SS22_MASTER_CLOCK/3)
- MDRV_CPU_PROGRAM_MAP(mcu_program, 0)
- MDRV_CPU_IO_MAP( mcu_io, 0 )
+ MDRV_CPU_PROGRAM_MAP(mcu_program)
+ MDRV_CPU_IO_MAP( mcu_io)
MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -3164,23 +3164,23 @@ static MACHINE_RESET(namcos22)
static MACHINE_DRIVER_START( namcos22 )
MDRV_CPU_ADD("maincpu", M68020,SS22_MASTER_CLOCK/2) /* 25 MHz? */
- MDRV_CPU_PROGRAM_MAP(namcos22_am,0)
+ MDRV_CPU_PROGRAM_MAP(namcos22_am)
MDRV_CPU_VBLANK_INT_HACK(namcos22_interrupt,2)
MDRV_CPU_ADD("dspmaster", TMS32025,SS22_MASTER_CLOCK) /* ? */
- MDRV_CPU_PROGRAM_MAP(master_dsp_program,0)
- MDRV_CPU_DATA_MAP(master_dsp_data,0)
- MDRV_CPU_IO_MAP(master_dsp_io,0)
+ MDRV_CPU_PROGRAM_MAP(master_dsp_program)
+ MDRV_CPU_DATA_MAP(master_dsp_data)
+ MDRV_CPU_IO_MAP(master_dsp_io)
MDRV_CPU_VBLANK_INT_HACK(dsp_serial_pulse1,SERIAL_IO_PERIOD)
MDRV_CPU_ADD("dspslave", TMS32025,SS22_MASTER_CLOCK) /* ? */
- MDRV_CPU_PROGRAM_MAP(slave_dsp_program,0)
- MDRV_CPU_DATA_MAP(slave_dsp_data,0)
- MDRV_CPU_IO_MAP(slave_dsp_io,0)
+ MDRV_CPU_PROGRAM_MAP(slave_dsp_program)
+ MDRV_CPU_DATA_MAP(slave_dsp_data)
+ MDRV_CPU_IO_MAP(slave_dsp_io)
MDRV_CPU_ADD("mcu", M37702, SS22_MASTER_CLOCK/3) // C74 on the CPU board has no periodic interrupts, it runs entirely off Timer A0
- MDRV_CPU_PROGRAM_MAP( mcu_s22_program, 0 )
- MDRV_CPU_IO_MAP( mcu_s22_io, 0 )
+ MDRV_CPU_PROGRAM_MAP( mcu_s22_program)
+ MDRV_CPU_IO_MAP( mcu_s22_io)
MDRV_NVRAM_HANDLER(namcos22)
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index 64f6cb78f49..a5909965a92 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -1363,11 +1363,11 @@ static MACHINE_DRIVER_START( gorgon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", R4650BE, 133000000)
MDRV_CPU_CONFIG(config)
- MDRV_CPU_PROGRAM_MAP(gorgon_map, 0)
+ MDRV_CPU_PROGRAM_MAP(gorgon_map)
MDRV_CPU_ADD("audiocpu", H83002, 14745600 )
- MDRV_CPU_PROGRAM_MAP( s23h8rwmap, 0 )
- MDRV_CPU_IO_MAP( s23h8ionoiobmap, 0 )
+ MDRV_CPU_PROGRAM_MAP( s23h8rwmap)
+ MDRV_CPU_IO_MAP( s23h8ionoiobmap)
MDRV_CPU_VBLANK_INT("screen", irq1_line_pulse)
MDRV_QUANTUM_TIME(HZ(60000))
@@ -1401,16 +1401,16 @@ static MACHINE_DRIVER_START( s23 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", R4650BE, 166000000)
MDRV_CPU_CONFIG(config)
- MDRV_CPU_PROGRAM_MAP(ss23_map, 0)
+ MDRV_CPU_PROGRAM_MAP(ss23_map)
MDRV_CPU_ADD("audiocpu", H83002, 14745600 )
- MDRV_CPU_PROGRAM_MAP( s23h8rwmap, 0 )
- MDRV_CPU_IO_MAP( s23h8iomap, 0 )
+ MDRV_CPU_PROGRAM_MAP( s23h8rwmap)
+ MDRV_CPU_IO_MAP( s23h8iomap)
MDRV_CPU_VBLANK_INT("screen", irq1_line_pulse)
MDRV_CPU_ADD("ioboard", H83334, 14745600 )
- MDRV_CPU_PROGRAM_MAP( s23iobrdmap, 0 )
- MDRV_CPU_IO_MAP( s23iobrdiomap, 0 )
+ MDRV_CPU_PROGRAM_MAP( s23iobrdmap)
+ MDRV_CPU_IO_MAP( s23iobrdiomap)
MDRV_QUANTUM_TIME(HZ(60000))
@@ -1443,12 +1443,12 @@ static MACHINE_DRIVER_START( ss23 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", R4650BE, 166000000)
MDRV_CPU_CONFIG(config)
- MDRV_CPU_PROGRAM_MAP(ss23_map, 0)
+ MDRV_CPU_PROGRAM_MAP(ss23_map)
MDRV_CPU_VBLANK_INT("screen", namcos23_interrupt)
MDRV_CPU_ADD("audiocpu", H83002, 14745600 )
- MDRV_CPU_PROGRAM_MAP( s23h8rwmap, 0 )
- MDRV_CPU_IO_MAP( s23h8ionoiobmap, 0 )
+ MDRV_CPU_PROGRAM_MAP( s23h8rwmap)
+ MDRV_CPU_IO_MAP( s23h8ionoiobmap)
MDRV_CPU_VBLANK_INT("screen", irq1_line_pulse)
MDRV_QUANTUM_TIME(HZ(60000))
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index f9e69e33e1e..d3dcf4e8ae1 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -1018,16 +1018,16 @@ static MACHINE_DRIVER_START( hopmappy )
/* basic machine hardware */
MDRV_CPU_ADD("cpu1", M6809, 49152000/32)
- MDRV_CPU_PROGRAM_MAP(cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu1_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("cpu2", M6809, 49152000/32)
- MDRV_CPU_PROGRAM_MAP(hopmappy_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(hopmappy_cpu2_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("mcu", HD63701, 49152000/8) /* or compatible 6808 with extra instructions */
- MDRV_CPU_PROGRAM_MAP(hopmappy_mcu_map,0)
- MDRV_CPU_IO_MAP(mcu_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(hopmappy_mcu_map)
+ MDRV_CPU_IO_MAP(mcu_port_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* ??? */
MDRV_QUANTUM_TIME(HZ(48000)) /* heavy interleaving needed to avoid hangs in rthunder */
@@ -1068,10 +1068,10 @@ static MACHINE_DRIVER_START( skykiddx )
/* basic machine hardware */
MDRV_IMPORT_FROM(hopmappy)
MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(skykiddx_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(skykiddx_cpu2_map)
MDRV_CPU_MODIFY("mcu")
- MDRV_CPU_PROGRAM_MAP(skykiddx_mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(skykiddx_mcu_map)
MACHINE_DRIVER_END
@@ -1080,10 +1080,10 @@ static MACHINE_DRIVER_START( roishtar )
/* basic machine hardware */
MDRV_IMPORT_FROM(hopmappy)
MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(roishtar_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(roishtar_cpu2_map)
MDRV_CPU_MODIFY("mcu")
- MDRV_CPU_PROGRAM_MAP(roishtar_mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(roishtar_mcu_map)
MACHINE_DRIVER_END
@@ -1092,10 +1092,10 @@ static MACHINE_DRIVER_START( genpeitd )
/* basic machine hardware */
MDRV_IMPORT_FROM(hopmappy)
MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(genpeitd_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(genpeitd_cpu2_map)
MDRV_CPU_MODIFY("mcu")
- MDRV_CPU_PROGRAM_MAP(genpeitd_mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(genpeitd_mcu_map)
/* sound hardware */
MDRV_SOUND_ADD("namco2", NAMCO_63701X, 6000000)
@@ -1108,10 +1108,10 @@ static MACHINE_DRIVER_START( rthunder )
/* basic machine hardware */
MDRV_IMPORT_FROM(hopmappy)
MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(rthunder_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(rthunder_cpu2_map)
MDRV_CPU_MODIFY("mcu")
- MDRV_CPU_PROGRAM_MAP(rthunder_mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(rthunder_mcu_map)
/* sound hardware */
MDRV_SOUND_ADD("namco2", NAMCO_63701X, 6000000)
@@ -1124,10 +1124,10 @@ static MACHINE_DRIVER_START( wndrmomo )
/* basic machine hardware */
MDRV_IMPORT_FROM(hopmappy)
MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(wndrmomo_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(wndrmomo_cpu2_map)
MDRV_CPU_MODIFY("mcu")
- MDRV_CPU_PROGRAM_MAP(wndrmomo_mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(wndrmomo_mcu_map)
/* sound hardware */
MDRV_SOUND_ADD("namco2", NAMCO_63701X, 6000000)
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 4559d6e287a..ff9db9c6239 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -1138,12 +1138,12 @@ static MACHINE_DRIVER_START( naomi_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", SH4, CPU_CLOCK) // SH4!!!
MDRV_CPU_CONFIG(sh4cpu_config)
- MDRV_CPU_PROGRAM_MAP(naomi_map,0)
- MDRV_CPU_IO_MAP(naomi_port,0)
+ MDRV_CPU_PROGRAM_MAP(naomi_map)
+ MDRV_CPU_IO_MAP(naomi_port)
MDRV_CPU_VBLANK_INT("screen", naomi_vblank)
MDRV_CPU_ADD("soundcpu", ARM7, ((XTAL_33_8688MHz*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8.
- MDRV_CPU_PROGRAM_MAP(dc_audio_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dc_audio_map)
MDRV_MACHINE_START( dc )
MDRV_MACHINE_RESET( naomi )
@@ -1207,7 +1207,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( aw )
MDRV_IMPORT_FROM(naomi)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(aw_map,0)
+ MDRV_CPU_PROGRAM_MAP(aw_map)
MACHINE_DRIVER_END
#define ROM_LOAD16_WORD_SWAP_BIOS(bios,name,offset,length,hash) \
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index 8214cde78cc..6685e2a4618 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -367,7 +367,7 @@ static MACHINE_DRIVER_START( naughtyb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
- MDRV_CPU_PROGRAM_MAP(naughtyb_map,0)
+ MDRV_CPU_PROGRAM_MAP(naughtyb_map)
MDRV_CPU_VBLANK_INT("screen", naughtyb_interrupt)
/* video hardware */
@@ -403,7 +403,7 @@ static MACHINE_DRIVER_START( popflame )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
- MDRV_CPU_PROGRAM_MAP(popflame_map,0)
+ MDRV_CPU_PROGRAM_MAP(popflame_map)
MDRV_CPU_VBLANK_INT("screen", naughtyb_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index bf9898e877e..b34a6a082fc 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -2986,8 +2986,8 @@ static MACHINE_DRIVER_START( crystalg )
/* basic machine hardware */
MDRV_IMPORT_FROM(NBMJDRV_256)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map, 0)
- MDRV_CPU_IO_MAP(crystalg_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(secolove_map)
+ MDRV_CPU_IO_MAP(crystalg_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 96) // nmiclock = 2f
MACHINE_DRIVER_END
@@ -2997,8 +2997,8 @@ static MACHINE_DRIVER_START( apparel )
/* basic machine hardware */
MDRV_IMPORT_FROM(NBMJDRV_256)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map, 0)
- MDRV_CPU_IO_MAP(secolove_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(secolove_map)
+ MDRV_CPU_IO_MAP(secolove_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
MACHINE_DRIVER_END
@@ -3008,8 +3008,8 @@ static MACHINE_DRIVER_START( mbmj_h12bit )
/* basic machine hardware */
MDRV_IMPORT_FROM(NBMJDRV_4096)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map, 0)
- MDRV_CPU_IO_MAP(secolove_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(secolove_map)
+ MDRV_CPU_IO_MAP(secolove_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
/* video hardware */
@@ -3022,7 +3022,7 @@ static MACHINE_DRIVER_START( barline )
/* basic machine hardware */
MDRV_IMPORT_FROM(mbmj_h12bit)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(barline_io_map, 0)
+ MDRV_CPU_IO_MAP(barline_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
MDRV_SOUND_REPLACE("psg", YM3812, 20000000/8)
@@ -3036,8 +3036,8 @@ static MACHINE_DRIVER_START( mbmj_p16bit )
/* basic machine hardware */
MDRV_IMPORT_FROM(NBMJDRV_65536)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map, 0)
- MDRV_CPU_IO_MAP(secolove_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(secolove_map)
+ MDRV_CPU_IO_MAP(secolove_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60/40
/* video hardware */
@@ -3050,9 +3050,9 @@ static MACHINE_DRIVER_START( mbmj_p16bit_LCD )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz */
MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
- MDRV_CPU_PROGRAM_MAP(secolove_map, 0)
- MDRV_CPU_IO_MAP(secolove_io_map, 0)
- MDRV_CPU_IO_MAP(p16bit_LCD_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(secolove_map)
+ MDRV_CPU_IO_MAP(secolove_io_map)
+ MDRV_CPU_IO_MAP(p16bit_LCD_io_map)
MDRV_MACHINE_RESET(nb1413m3)
MDRV_NVRAM_HANDLER(nb1413m3)
@@ -3103,8 +3103,8 @@ static MACHINE_DRIVER_START( seiha )
/* basic machine hardware */
MDRV_IMPORT_FROM(NBMJDRV_65536)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map, 0)
- MDRV_CPU_IO_MAP(seiha_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(secolove_map)
+ MDRV_CPU_IO_MAP(seiha_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
MACHINE_DRIVER_END
@@ -3114,8 +3114,8 @@ static MACHINE_DRIVER_START( mjgaiden )
MDRV_IMPORT_FROM(NBMJDRV_4096)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ojousan_map, 0)
- MDRV_CPU_IO_MAP(mjgaiden_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(ojousan_map)
+ MDRV_CPU_IO_MAP(mjgaiden_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( iemoto )
@@ -3123,8 +3123,8 @@ static MACHINE_DRIVER_START( iemoto )
/* basic machine hardware */
MDRV_IMPORT_FROM(NBMJDRV_65536)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map, 0)
- MDRV_CPU_IO_MAP(iemoto_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(secolove_map)
+ MDRV_CPU_IO_MAP(iemoto_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
MACHINE_DRIVER_END
@@ -3134,8 +3134,8 @@ static MACHINE_DRIVER_START( ojousan )
/* basic machine hardware */
MDRV_IMPORT_FROM(NBMJDRV_65536)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ojousan_map, 0)
- MDRV_CPU_IO_MAP(iemoto_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(ojousan_map)
+ MDRV_CPU_IO_MAP(iemoto_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
MACHINE_DRIVER_END
@@ -3144,8 +3144,8 @@ static MACHINE_DRIVER_START( mbmj_p12bit )
/* basic machine hardware */
MDRV_IMPORT_FROM(NBMJDRV_4096)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjsikaku_map, 0)
- MDRV_CPU_IO_MAP(kaguya_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mjsikaku_map)
+ MDRV_CPU_IO_MAP(kaguya_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
MACHINE_DRIVER_END
@@ -3155,8 +3155,8 @@ static MACHINE_DRIVER_START( mjsikaku )
/* basic machine hardware */
MDRV_IMPORT_FROM(NBMJDRV_4096)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjsikaku_map, 0)
- MDRV_CPU_IO_MAP(mjsikaku_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mjsikaku_map)
+ MDRV_CPU_IO_MAP(mjsikaku_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 144) // nmiclock = 70
/* sound hardware */
@@ -3170,8 +3170,8 @@ static MACHINE_DRIVER_START( mmsikaku )
/* basic machine hardware */
MDRV_IMPORT_FROM(NBMJDRV_4096)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map, 0)
- MDRV_CPU_IO_MAP(mmsikaku_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(secolove_map)
+ MDRV_CPU_IO_MAP(mmsikaku_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
MACHINE_DRIVER_END
@@ -3181,7 +3181,7 @@ static MACHINE_DRIVER_START( otonano )
/* basic machine hardware */
MDRV_IMPORT_FROM(mjsikaku)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(otonano_io_map, 0)
+ MDRV_CPU_IO_MAP(otonano_io_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index 97ec49f8dbe..695e7a55866 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -2613,8 +2613,8 @@ static MACHINE_DRIVER_START( gionbana )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */
- MDRV_CPU_PROGRAM_MAP(gionbana_map, 0)
- MDRV_CPU_IO_MAP(gionbana_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(gionbana_map)
+ MDRV_CPU_IO_MAP(gionbana_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 132) // nmiclock = 60
MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
@@ -2649,8 +2649,8 @@ static MACHINE_DRIVER_START( mgion )
/* basic machine hardware */
MDRV_IMPORT_FROM(gionbana)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mgion_map,0)
- MDRV_CPU_IO_MAP(mgion_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mgion_map)
+ MDRV_CPU_IO_MAP(mgion_io_map)
MDRV_NVRAM_HANDLER(nb1413m3)
MACHINE_DRIVER_END
@@ -2661,8 +2661,8 @@ static MACHINE_DRIVER_START( omotesnd )
/* basic machine hardware */
MDRV_IMPORT_FROM(gionbana)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(omotesnd_map,0)
- MDRV_CPU_IO_MAP(omotesnd_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(omotesnd_map)
+ MDRV_CPU_IO_MAP(omotesnd_io_map)
MDRV_NVRAM_HANDLER(nb1413m3)
@@ -2679,7 +2679,7 @@ static MACHINE_DRIVER_START( mjcamerb )
/* basic machine hardware */
MDRV_IMPORT_FROM(gionbana)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(hanamomo_io_map, 0)
+ MDRV_CPU_IO_MAP(hanamomo_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // ?
MDRV_NVRAM_HANDLER(nb1413m3)
@@ -2695,7 +2695,7 @@ static MACHINE_DRIVER_START( mmcamera )
/* basic machine hardware */
MDRV_IMPORT_FROM(gionbana)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(hanamomo_io_map, 0)
+ MDRV_CPU_IO_MAP(hanamomo_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
MDRV_NVRAM_HANDLER(nb1413m3)
@@ -2711,8 +2711,8 @@ static MACHINE_DRIVER_START( hanamomo )
/* basic machine hardware */
MDRV_IMPORT_FROM(gionbana)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hanamomo_map, 0)
- MDRV_CPU_IO_MAP(hanamomo_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(hanamomo_map)
+ MDRV_CPU_IO_MAP(hanamomo_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
/* video hardware */
@@ -2727,8 +2727,8 @@ static MACHINE_DRIVER_START( msjiken )
/* basic machine hardware */
MDRV_IMPORT_FROM(hanamomo)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gionbana_map, 0)
- MDRV_CPU_IO_MAP(msjiken_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(gionbana_map)
+ MDRV_CPU_IO_MAP(msjiken_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // nmiclock = 70
MACHINE_DRIVER_END
@@ -2773,7 +2773,7 @@ static MACHINE_DRIVER_START( mjnanpas )
/* basic machine hardware */
MDRV_IMPORT_FROM(gionbana)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(club90s_map, 0)
+ MDRV_CPU_PROGRAM_MAP(club90s_map)
MACHINE_DRIVER_END
@@ -2782,8 +2782,8 @@ static MACHINE_DRIVER_START( maiko )
/* basic machine hardware */
MDRV_IMPORT_FROM(mjnanpas)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(maiko_map, 0)
- MDRV_CPU_IO_MAP(maiko_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(maiko_map)
+ MDRV_CPU_IO_MAP(maiko_io_map)
MACHINE_DRIVER_END
@@ -2792,7 +2792,7 @@ static MACHINE_DRIVER_START( mmaiko )
/* basic machine hardware */
MDRV_IMPORT_FROM(maiko)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(maiko_map, 0)
+ MDRV_CPU_PROGRAM_MAP(maiko_map)
MDRV_NVRAM_HANDLER(nb1413m3)
MACHINE_DRIVER_END
@@ -2803,8 +2803,8 @@ static MACHINE_DRIVER_START( lovehous )
/* basic machine hardware */
MDRV_IMPORT_FROM(mjnanpas)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(lovehous_map, 0)
- MDRV_CPU_IO_MAP(lovehous_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(lovehous_map)
+ MDRV_CPU_IO_MAP(lovehous_io_map)
MDRV_NVRAM_HANDLER(nb1413m3)
MACHINE_DRIVER_END
@@ -2815,7 +2815,7 @@ static MACHINE_DRIVER_START( hanaoji )
/* basic machine hardware */
MDRV_IMPORT_FROM(maiko)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hanaoji_map, 0)
+ MDRV_CPU_PROGRAM_MAP(hanaoji_map)
MDRV_NVRAM_HANDLER(nb1413m3)
MACHINE_DRIVER_END
@@ -2825,8 +2825,8 @@ static MACHINE_DRIVER_START( hnxmasev )
/* basic machine hardware */
MDRV_IMPORT_FROM(maiko)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hnxmasev_map, 0)
- MDRV_CPU_IO_MAP(maiko_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(hnxmasev_map)
+ MDRV_CPU_IO_MAP(maiko_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hnageman )
@@ -2834,8 +2834,8 @@ static MACHINE_DRIVER_START( hnageman )
/* basic machine hardware */
MDRV_IMPORT_FROM(maiko)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hnageman_map, 0)
- MDRV_CPU_IO_MAP(maiko_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(hnageman_map)
+ MDRV_CPU_IO_MAP(maiko_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( scandal )
@@ -2843,8 +2843,8 @@ static MACHINE_DRIVER_START( scandal )
/* basic machine hardware */
MDRV_IMPORT_FROM(hanamomo)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(scandalm_map, 0)
- MDRV_CPU_IO_MAP(scandal_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(scandalm_map)
+ MDRV_CPU_IO_MAP(scandal_io_map)
MACHINE_DRIVER_END
@@ -2853,8 +2853,8 @@ static MACHINE_DRIVER_START( bananadr )
/* basic machine hardware */
MDRV_IMPORT_FROM(mjnanpas)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(scandalm_map, 0)
- MDRV_CPU_IO_MAP(bananadr_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(scandalm_map)
+ MDRV_CPU_IO_MAP(bananadr_io_map)
MDRV_NVRAM_HANDLER(nb1413m3)
MACHINE_DRIVER_END
@@ -2866,8 +2866,8 @@ static MACHINE_DRIVER_START( mjfocusm )
/* basic machine hardware */
MDRV_IMPORT_FROM(gionbana)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(scandalm_map, 0)
- MDRV_CPU_IO_MAP(scandalm_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(scandalm_map)
+ MDRV_CPU_IO_MAP(scandalm_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
MDRV_NVRAM_HANDLER(nb1413m3)
@@ -2889,8 +2889,8 @@ static MACHINE_DRIVER_START( taiwanmb )
/* basic machine hardware */
MDRV_IMPORT_FROM(gionbana)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(taiwanmb_map, 0)
- MDRV_CPU_IO_MAP(taiwanmb_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(taiwanmb_map)
+ MDRV_CPU_IO_MAP(taiwanmb_io_map)
// MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
MDRV_NVRAM_HANDLER(nb1413m3)
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index 7686648b64a..6bc9dc020a9 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -1477,8 +1477,8 @@ static MACHINE_DRIVER_START( nbmjdrv1 ) // galkoku
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 25000000/5) /* 5.00 MHz ? */
- MDRV_CPU_PROGRAM_MAP(galkoku_map, 0)
- MDRV_CPU_IO_MAP(galkoku_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(galkoku_map)
+ MDRV_CPU_IO_MAP(galkoku_io_map)
MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
MDRV_MACHINE_RESET(nbmj8991)
@@ -1510,13 +1510,13 @@ static MACHINE_DRIVER_START( nbmjdrv2 ) // pstadium
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000/2) /* 3.00 MHz */
- MDRV_CPU_PROGRAM_MAP(pstadium_map, 0)
- MDRV_CPU_IO_MAP(pstadium_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(pstadium_map)
+ MDRV_CPU_IO_MAP(pstadium_io_map)
MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4.00 MHz */
- MDRV_CPU_PROGRAM_MAP(nbmj8991_sound_map, 0)
- MDRV_CPU_IO_MAP(nbmj8991_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(nbmj8991_sound_map)
+ MDRV_CPU_IO_MAP(nbmj8991_sound_io_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, 128*60) // ?
MDRV_MACHINE_RESET(nbmj8991)
@@ -1574,7 +1574,7 @@ static MACHINE_DRIVER_START( galkaika )
/* basic machine hardware */
MDRV_IMPORT_FROM(nbmjdrv1)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(galkaika_map, 0)
+ MDRV_CPU_PROGRAM_MAP(galkaika_map)
MACHINE_DRIVER_END
@@ -1583,7 +1583,7 @@ static MACHINE_DRIVER_START( tokyogal )
/* basic machine hardware */
MDRV_IMPORT_FROM(nbmjdrv1)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tokyogal_map, 0)
+ MDRV_CPU_PROGRAM_MAP(tokyogal_map)
MACHINE_DRIVER_END
@@ -1592,7 +1592,7 @@ static MACHINE_DRIVER_START( tokimbsj )
/* basic machine hardware */
MDRV_IMPORT_FROM(nbmjdrv1)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(galkaika_map, 0)
+ MDRV_CPU_PROGRAM_MAP(galkaika_map)
MDRV_NVRAM_HANDLER(nb1413m3)
MACHINE_DRIVER_END
@@ -1617,7 +1617,7 @@ static MACHINE_DRIVER_START( hyouban )
/* basic machine hardware */
MDRV_IMPORT_FROM(nbmjdrv3)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(hyouban_io_map, 0)
+ MDRV_CPU_IO_MAP(hyouban_io_map)
MDRV_NVRAM_HANDLER(nb1413m3)
MACHINE_DRIVER_END
@@ -1635,7 +1635,7 @@ static MACHINE_DRIVER_START( triplew1 )
/* basic machine hardware */
MDRV_IMPORT_FROM(nbmjdrv2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(triplew1_map, 0)
+ MDRV_CPU_PROGRAM_MAP(triplew1_map)
MACHINE_DRIVER_END
@@ -1644,7 +1644,7 @@ static MACHINE_DRIVER_START( triplew2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(nbmjdrv2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(triplew2_map, 0)
+ MDRV_CPU_PROGRAM_MAP(triplew2_map)
MACHINE_DRIVER_END
@@ -1660,7 +1660,7 @@ static MACHINE_DRIVER_START( mjlstory )
/* basic machine hardware */
MDRV_IMPORT_FROM(nbmjdrv2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjlstory_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mjlstory_map)
MACHINE_DRIVER_END
@@ -1691,7 +1691,7 @@ static MACHINE_DRIVER_START( mjgottub )
/* basic machine hardware */
MDRV_IMPORT_FROM(nbmjdrv2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(triplew1_map, 0)
+ MDRV_CPU_PROGRAM_MAP(triplew1_map)
MDRV_NVRAM_HANDLER(nb1413m3)
MACHINE_DRIVER_END
@@ -1702,8 +1702,8 @@ static MACHINE_DRIVER_START( av2mj1bb )
/* basic machine hardware */
MDRV_IMPORT_FROM(nbmjdrv2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(av2mj1bb_map, 0)
- MDRV_CPU_IO_MAP(av2mj1bb_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(av2mj1bb_map)
+ MDRV_CPU_IO_MAP(av2mj1bb_io_map)
MACHINE_DRIVER_END
@@ -1712,8 +1712,8 @@ static MACHINE_DRIVER_START( av2mj2rg )
/* basic machine hardware */
MDRV_IMPORT_FROM(nbmjdrv2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(av2mj2rg_map, 0)
- MDRV_CPU_IO_MAP(av2mj1bb_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(av2mj2rg_map)
+ MDRV_CPU_IO_MAP(av2mj1bb_io_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 535c9699d19..7e784be5c1b 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -2927,14 +2927,14 @@ static MACHINE_DRIVER_START( NBMJDRV1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 12000000/2) /* TMPZ84C011, 6.00 MHz */
MDRV_CPU_CONFIG(daisy_chain_main)
- MDRV_CPU_PROGRAM_MAP(sailorws_map, 0)
- MDRV_CPU_IO_MAP(sailorws_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sailorws_map)
+ MDRV_CPU_IO_MAP(sailorws_io_map)
MDRV_CPU_VBLANK_INT("screen", ctc0_trg1) /* vblank is connect to ctc triggfer */
MDRV_CPU_ADD("audiocpu", Z80, 8000000/1) /* TMPZ84C011, 8.00 MHz */
MDRV_CPU_CONFIG(daisy_chain_sound)
- MDRV_CPU_PROGRAM_MAP(sailorws_sound_map, 0)
- MDRV_CPU_IO_MAP(sailorws_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sailorws_sound_map)
+ MDRV_CPU_IO_MAP(sailorws_sound_io_map)
MDRV_Z80CTC_ADD("main_ctc", 12000000/2 /* same as "maincpu" */, ctc_intf_main)
MDRV_Z80CTC_ADD("audio_ctc", 8000000/1 /* same as "audiocpu" */, ctc_intf_audio)
@@ -2999,8 +2999,8 @@ static MACHINE_DRIVER_START( mjuraden )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjuraden_map, 0)
- MDRV_CPU_IO_MAP(mjuraden_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mjuraden_map)
+ MDRV_CPU_IO_MAP(mjuraden_io_map)
MACHINE_DRIVER_END
@@ -3009,8 +3009,8 @@ static MACHINE_DRIVER_START( koinomp )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(koinomp_map, 0)
- MDRV_CPU_IO_MAP(koinomp_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(koinomp_map)
+ MDRV_CPU_IO_MAP(koinomp_io_map)
MACHINE_DRIVER_END
@@ -3019,7 +3019,7 @@ static MACHINE_DRIVER_START( patimono )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(patimono_io_map, 0)
+ MDRV_CPU_IO_MAP(patimono_io_map)
MACHINE_DRIVER_END
@@ -3028,7 +3028,7 @@ static MACHINE_DRIVER_START( janbari )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(patimono_io_map, 0)
+ MDRV_CPU_IO_MAP(patimono_io_map)
MDRV_NVRAM_HANDLER(nbmj9195)
MACHINE_DRIVER_END
@@ -3039,8 +3039,8 @@ static MACHINE_DRIVER_START( mmehyou )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(koinomp_map, 0)
- MDRV_CPU_IO_MAP(mmehyou_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(koinomp_map)
+ MDRV_CPU_IO_MAP(mmehyou_io_map)
MDRV_NVRAM_HANDLER(nbmj9195)
MACHINE_DRIVER_END
@@ -3051,8 +3051,8 @@ static MACHINE_DRIVER_START( ultramhm )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(koinomp_map, 0)
- MDRV_CPU_IO_MAP(koinomp_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(koinomp_map)
+ MDRV_CPU_IO_MAP(koinomp_io_map)
MDRV_NVRAM_HANDLER(nbmj9195)
MACHINE_DRIVER_END
@@ -3063,7 +3063,7 @@ static MACHINE_DRIVER_START( gal10ren )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(gal10ren_io_map, 0)
+ MDRV_CPU_IO_MAP(gal10ren_io_map)
MACHINE_DRIVER_END
@@ -3072,7 +3072,7 @@ static MACHINE_DRIVER_START( renaiclb )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(renaiclb_io_map, 0)
+ MDRV_CPU_IO_MAP(renaiclb_io_map)
MACHINE_DRIVER_END
@@ -3081,7 +3081,7 @@ static MACHINE_DRIVER_START( mjlaman )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mjlaman_io_map, 0)
+ MDRV_CPU_IO_MAP(mjlaman_io_map)
MACHINE_DRIVER_END
@@ -3090,7 +3090,7 @@ static MACHINE_DRIVER_START( mkeibaou )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mkeibaou_io_map, 0)
+ MDRV_CPU_IO_MAP(mkeibaou_io_map)
MACHINE_DRIVER_END
@@ -3099,7 +3099,7 @@ static MACHINE_DRIVER_START( pachiten )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(pachiten_io_map, 0)
+ MDRV_CPU_IO_MAP(pachiten_io_map)
MDRV_NVRAM_HANDLER(nbmj9195)
MACHINE_DRIVER_END
@@ -3117,7 +3117,7 @@ static MACHINE_DRIVER_START( sailorwr )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(sailorwr_io_map, 0)
+ MDRV_CPU_IO_MAP(sailorwr_io_map)
MDRV_NVRAM_HANDLER(nbmj9195)
MACHINE_DRIVER_END
@@ -3128,7 +3128,7 @@ static MACHINE_DRIVER_START( psailor1 )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(psailor1_io_map, 0)
+ MDRV_CPU_IO_MAP(psailor1_io_map)
MACHINE_DRIVER_END
@@ -3137,7 +3137,7 @@ static MACHINE_DRIVER_START( psailor2 )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(psailor2_io_map, 0)
+ MDRV_CPU_IO_MAP(psailor2_io_map)
MACHINE_DRIVER_END
@@ -3146,7 +3146,7 @@ static MACHINE_DRIVER_START( otatidai )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(otatidai_io_map, 0)
+ MDRV_CPU_IO_MAP(otatidai_io_map)
MACHINE_DRIVER_END
@@ -3155,7 +3155,7 @@ static MACHINE_DRIVER_START( yosimoto )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(yosimoto_io_map, 0)
+ MDRV_CPU_IO_MAP(yosimoto_io_map)
MACHINE_DRIVER_END
@@ -3164,7 +3164,7 @@ static MACHINE_DRIVER_START( jituroku )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV1 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(jituroku_io_map, 0)
+ MDRV_CPU_IO_MAP(jituroku_io_map)
MACHINE_DRIVER_END
@@ -3173,8 +3173,8 @@ static MACHINE_DRIVER_START( ngpgal )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV2 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ngpgal_map, 0)
- MDRV_CPU_IO_MAP(ngpgal_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(ngpgal_map)
+ MDRV_CPU_IO_MAP(ngpgal_io_map)
MACHINE_DRIVER_END
@@ -3183,8 +3183,8 @@ static MACHINE_DRIVER_START( mjgottsu )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV2 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ngpgal_map, 0)
- MDRV_CPU_IO_MAP(mjgottsu_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(ngpgal_map)
+ MDRV_CPU_IO_MAP(mjgottsu_io_map)
MACHINE_DRIVER_END
@@ -3193,8 +3193,8 @@ static MACHINE_DRIVER_START( bakuhatu )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV2 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ngpgal_map, 0)
- MDRV_CPU_IO_MAP(mjgottsu_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(ngpgal_map)
+ MDRV_CPU_IO_MAP(mjgottsu_io_map)
MACHINE_DRIVER_END
@@ -3203,8 +3203,8 @@ static MACHINE_DRIVER_START( cmehyou )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV2 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ngpgal_map, 0)
- MDRV_CPU_IO_MAP(cmehyou_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(ngpgal_map)
+ MDRV_CPU_IO_MAP(cmehyou_io_map)
MACHINE_DRIVER_END
@@ -3213,8 +3213,8 @@ static MACHINE_DRIVER_START( mjkoiura )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV2 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjuraden_map, 0)
- MDRV_CPU_IO_MAP(mjkoiura_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mjuraden_map)
+ MDRV_CPU_IO_MAP(mjkoiura_io_map)
MACHINE_DRIVER_END
@@ -3223,8 +3223,8 @@ static MACHINE_DRIVER_START( mkoiuraa )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV2 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjuraden_map, 0)
- MDRV_CPU_IO_MAP(mkoiuraa_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mjuraden_map)
+ MDRV_CPU_IO_MAP(mkoiuraa_io_map)
MACHINE_DRIVER_END
@@ -3233,8 +3233,8 @@ static MACHINE_DRIVER_START( mscoutm )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV3 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mscoutm_map, 0)
- MDRV_CPU_IO_MAP(mscoutm_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mscoutm_map)
+ MDRV_CPU_IO_MAP(mscoutm_io_map)
MACHINE_DRIVER_END
@@ -3243,8 +3243,8 @@ static MACHINE_DRIVER_START( imekura )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV3 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjegolf_map, 0)
- MDRV_CPU_IO_MAP(imekura_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mjegolf_map)
+ MDRV_CPU_IO_MAP(imekura_io_map)
MACHINE_DRIVER_END
@@ -3253,8 +3253,8 @@ static MACHINE_DRIVER_START( mjegolf )
/* basic machine hardware */
MDRV_IMPORT_FROM( NBMJDRV3 )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjegolf_map, 0)
- MDRV_CPU_IO_MAP(mjegolf_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mjegolf_map)
+ MDRV_CPU_IO_MAP(mjegolf_io_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index c519b28c0a4..d21f314ab2b 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -1632,11 +1632,11 @@ static MACHINE_DRIVER_START( nemesis )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
// 14318180/2, /* From schematics, should be accurate */
- MDRV_CPU_PROGRAM_MAP(nemesis_map,0)
+ MDRV_CPU_PROGRAM_MAP(nemesis_map)
MDRV_CPU_VBLANK_INT("screen", nemesis_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* From schematics, should be accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map,0) /* fixed */
+ MDRV_CPU_PROGRAM_MAP(sound_map) /* fixed */
MDRV_MACHINE_RESET(nemesis)
@@ -1677,11 +1677,11 @@ static MACHINE_DRIVER_START( gx400 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
- MDRV_CPU_PROGRAM_MAP(gx400_map,0)
+ MDRV_CPU_PROGRAM_MAP(gx400_map)
MDRV_CPU_VBLANK_INT_HACK(gx400_interrupt,3)
MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(gx400_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(gx400_sound_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* interrupts are triggered by the main CPU */
MDRV_MACHINE_RESET(nemesis)
@@ -1723,11 +1723,11 @@ static MACHINE_DRIVER_START( konamigt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
- MDRV_CPU_PROGRAM_MAP(konamigt_map,0)
+ MDRV_CPU_PROGRAM_MAP(konamigt_map)
MDRV_CPU_VBLANK_INT_HACK(konamigt_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(nemesis)
@@ -1765,11 +1765,11 @@ static MACHINE_DRIVER_START( rf2_gx400 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
- MDRV_CPU_PROGRAM_MAP(rf2_gx400_map,0)
+ MDRV_CPU_PROGRAM_MAP(rf2_gx400_map)
MDRV_CPU_VBLANK_INT_HACK(gx400_interrupt,3)
MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(gx400_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(gx400_sound_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* interrupts are triggered by the main CPU */
MDRV_MACHINE_RESET(nemesis)
@@ -1811,11 +1811,11 @@ static MACHINE_DRIVER_START( salamand )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
- MDRV_CPU_PROGRAM_MAP(salamand_map,0)
+ MDRV_CPU_PROGRAM_MAP(salamand_map)
MDRV_CPU_VBLANK_INT("screen", salamand_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(sal_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sal_sound_map)
MDRV_MACHINE_RESET(nemesis)
@@ -1860,11 +1860,11 @@ static MACHINE_DRIVER_START( blkpnthr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
- MDRV_CPU_PROGRAM_MAP(blkpnthr_map,0)
+ MDRV_CPU_PROGRAM_MAP(blkpnthr_map)
MDRV_CPU_VBLANK_INT("screen", blkpnthr_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(blkpnthr_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(blkpnthr_sound_map)
MDRV_MACHINE_RESET(nemesis)
@@ -1905,11 +1905,11 @@ static MACHINE_DRIVER_START( citybomb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
- MDRV_CPU_PROGRAM_MAP(citybomb_map,0)
+ MDRV_CPU_PROGRAM_MAP(citybomb_map)
MDRV_CPU_VBLANK_INT("screen", salamand_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(city_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(city_sound_map)
MDRV_MACHINE_RESET(nemesis)
@@ -1954,11 +1954,11 @@ static MACHINE_DRIVER_START( nyanpani )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
- MDRV_CPU_PROGRAM_MAP(nyanpani_map,0)
+ MDRV_CPU_PROGRAM_MAP(nyanpani_map)
MDRV_CPU_VBLANK_INT("screen", salamand_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(city_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(city_sound_map)
MDRV_MACHINE_RESET(nemesis)
@@ -2003,11 +2003,11 @@ static MACHINE_DRIVER_START( hcrash )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,18432000/3) /* 6.144MHz */
- MDRV_CPU_PROGRAM_MAP(hcrash_map,0)
+ MDRV_CPU_PROGRAM_MAP(hcrash_map)
MDRV_CPU_VBLANK_INT_HACK(konamigt_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(sal_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sal_sound_map)
MDRV_MACHINE_RESET(nemesis)
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 1e5e77ba945..459a633011a 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -1336,11 +1336,11 @@ static MACHINE_DRIVER_START( neogeo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, NEOGEO_MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_ADD("audiocpu", Z80, NEOGEO_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
- MDRV_CPU_IO_MAP(auido_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
+ MDRV_CPU_IO_MAP(auido_io_map)
MDRV_WATCHDOG_TIME_INIT(USEC(128762))
diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c
index 1e6331c52c0..4459558b6ca 100644
--- a/src/mame/drivers/news.c
+++ b/src/mame/drivers/news.c
@@ -116,7 +116,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( news )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(news_map,0)
+ MDRV_CPU_PROGRAM_MAP(news_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c
index 6c496304284..6b8edc2b922 100644
--- a/src/mame/drivers/nightgal.c
+++ b/src/mame/drivers/nightgal.c
@@ -696,12 +696,12 @@ static const ay8910_interface ay8910_config =
static MACHINE_DRIVER_START( nightgal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,MASTER_CLOCK / 4) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(0,nightgal_map)
- MDRV_CPU_IO_MAP(0,nightgal_io)
+ MDRV_CPU_PROGRAM_MAP(nightgal_map)
+ MDRV_CPU_IO_MAP(nightgal_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", NSC8105, MASTER_CLOCK / 4)
- MDRV_CPU_PROGRAM_MAP(nsc_map, 0)
+ MDRV_CPU_PROGRAM_MAP(nsc_map)
MDRV_QUANTUM_PERFECT_CPU("maincpu")
@@ -731,12 +731,12 @@ static MACHINE_DRIVER_START( sexygal )
/* basic machine hardware */
MDRV_IMPORT_FROM( nightgal )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(0,sexygal_map)
- MDRV_CPU_IO_MAP(0,sexygal_io)
+ MDRV_CPU_PROGRAM_MAP(sexygal_map)
+ MDRV_CPU_IO_MAP(sexygal_io)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse,244)//???
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(sexygal_nsc_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sexygal_nsc_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_SOUND_REMOVE("ay")
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index f7c4f54baca..2bdc71f8f75 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -938,12 +938,12 @@ static MACHINE_DRIVER_START( ninjakd2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MAIN_CLOCK_12/2) /* verified */
- MDRV_CPU_PROGRAM_MAP(ninjakd2_main_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(ninjakd2_main_cpu)
MDRV_CPU_VBLANK_INT("screen", ninjakd2_interrupt)
MDRV_CPU_ADD("soundcpu", Z80, MAIN_CLOCK_5) /* verified */
- MDRV_CPU_PROGRAM_MAP(ninjakd2_sound_cpu,0)
- MDRV_CPU_IO_MAP(ninjakd2_sound_io,0)
+ MDRV_CPU_PROGRAM_MAP(ninjakd2_sound_cpu)
+ MDRV_CPU_IO_MAP(ninjakd2_sound_io)
MDRV_MACHINE_RESET(ninjakd2)
@@ -988,7 +988,7 @@ static MACHINE_DRIVER_START( mnight )
MDRV_IMPORT_FROM(ninjakd2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mnight_main_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(mnight_main_cpu)
/* video hardware */
MDRV_VIDEO_START(mnight)
@@ -1003,7 +1003,7 @@ static MACHINE_DRIVER_START( arkarea )
MDRV_IMPORT_FROM(ninjakd2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mnight_main_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(mnight_main_cpu)
/* video hardware */
MDRV_VIDEO_START(arkarea)
@@ -1018,7 +1018,7 @@ static MACHINE_DRIVER_START( robokid )
MDRV_IMPORT_FROM(mnight)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(robokid_main_cpu, 0)
+ MDRV_CPU_PROGRAM_MAP(robokid_main_cpu)
MDRV_MACHINE_RESET(robokid)
@@ -1036,7 +1036,7 @@ static MACHINE_DRIVER_START( omegaf )
MDRV_IMPORT_FROM(robokid)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(omegaf_main_cpu, 0)
+ MDRV_CPU_PROGRAM_MAP(omegaf_main_cpu)
MDRV_MACHINE_RESET(omegaf)
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index 99309ce5bde..09930c5052f 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -564,14 +564,14 @@ static MACHINE_DRIVER_START( ninjaw )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ninjaw_master_map,0)
+ MDRV_CPU_PROGRAM_MAP(ninjaw_master_map)
MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 16/4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ninjaw_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(ninjaw_sound_map)
MDRV_CPU_ADD("sub", M68000,16000000/2) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ninjaw_slave_map,0)
+ MDRV_CPU_PROGRAM_MAP(ninjaw_slave_map)
MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices */
@@ -637,14 +637,14 @@ static MACHINE_DRIVER_START( darius2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(darius2_master_map,0)
+ MDRV_CPU_PROGRAM_MAP(darius2_master_map)
MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ninjaw_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(ninjaw_sound_map)
MDRV_CPU_ADD("sub", M68000,16000000/2) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(darius2_slave_map,0)
+ MDRV_CPU_PROGRAM_MAP(darius2_slave_map)
MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices */
diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c
index d739a0d5703..9b4bb7200b2 100644
--- a/src/mame/drivers/nitedrvr.c
+++ b/src/mame/drivers/nitedrvr.c
@@ -137,7 +137,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( nitedrvr )
// basic machine hardware
MDRV_CPU_ADD("maincpu", M6502, 12096000/12) // 1 MHz
- MDRV_CPU_PROGRAM_MAP(nitedrvr_map, 0)
+ MDRV_CPU_PROGRAM_MAP(nitedrvr_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_WATCHDOG_VBLANK_INIT(3)
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index 69fe7ff50e1..ea0ee2e8ecd 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -780,13 +780,13 @@ static MACHINE_DRIVER_START( niyanpai )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12288000/2) /* TMP68301, 6.144 MHz */
- MDRV_CPU_PROGRAM_MAP(niyanpai_map,0)
+ MDRV_CPU_PROGRAM_MAP(niyanpai_map)
MDRV_CPU_VBLANK_INT("screen", niyanpai_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 8000000/1) /* TMPZ84C011, 8.00 MHz */
MDRV_CPU_CONFIG(daisy_chain_sound)
- MDRV_CPU_PROGRAM_MAP(niyanpai_sound_map, 0)
- MDRV_CPU_IO_MAP(niyanpai_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(niyanpai_sound_map)
+ MDRV_CPU_IO_MAP(niyanpai_sound_io_map)
MDRV_Z80CTC_ADD("ctc", 8000000/1 /* same as "audiocpu" */, ctc_intf)
@@ -824,7 +824,7 @@ static MACHINE_DRIVER_START( musobana )
/* basic machine hardware */
MDRV_IMPORT_FROM(niyanpai)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(musobana_map, 0)
+ MDRV_CPU_PROGRAM_MAP(musobana_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mhhonban )
@@ -832,7 +832,7 @@ static MACHINE_DRIVER_START( mhhonban )
/* basic machine hardware */
MDRV_IMPORT_FROM(niyanpai)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mhhonban_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mhhonban_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index 2454b40f98f..f3bc86372e6 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -984,12 +984,12 @@ static MACHINE_DRIVER_START( nmg5 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(nmg5_map,0)
+ MDRV_CPU_PROGRAM_MAP(nmg5_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(nmg5_sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(nmg5_sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_MACHINE_START(nmg5)
MDRV_MACHINE_RESET(nmg5)
@@ -1025,10 +1025,10 @@ static MACHINE_DRIVER_START( garogun )
MDRV_IMPORT_FROM(nmg5)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pclubys_map,0)
+ MDRV_CPU_PROGRAM_MAP(pclubys_map)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(pclubys_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(pclubys_sound_map)
MACHINE_DRIVER_END
@@ -1037,10 +1037,10 @@ static MACHINE_DRIVER_START( pclubys )
MDRV_IMPORT_FROM(nmg5)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pclubys_map,0)
+ MDRV_CPU_PROGRAM_MAP(pclubys_map)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(pclubys_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(pclubys_sound_map)
MDRV_GFXDECODE(pclubys)
MACHINE_DRIVER_END
@@ -1060,7 +1060,7 @@ static MACHINE_DRIVER_START( 7ordi )
MDRV_IMPORT_FROM(nmg5)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(pclubys_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(pclubys_sound_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 764e4ae20c2..edfddc9de98 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -3487,13 +3487,13 @@ static MACHINE_DRIVER_START( tharrier )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(tharrier_map,0)
+ MDRV_CPU_PROGRAM_MAP(tharrier_map)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
MDRV_CPU_ADD("audiocpu", Z80, 3000000)
- MDRV_CPU_PROGRAM_MAP(tharrier_sound_map,0)
- MDRV_CPU_IO_MAP(tharrier_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(tharrier_sound_map)
+ MDRV_CPU_IO_MAP(tharrier_sound_io_map)
MDRV_MACHINE_RESET(mustang_sound)
@@ -3536,13 +3536,13 @@ static MACHINE_DRIVER_START( manybloc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10? MHz - check */
- MDRV_CPU_PROGRAM_MAP(manybloc_map,0)
+ MDRV_CPU_PROGRAM_MAP(manybloc_map)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,56)/* this needs to equal the framerate on this, rather than being double it .. */
MDRV_CPU_ADD("audiocpu", Z80, 3000000)
- MDRV_CPU_PROGRAM_MAP(tharrier_sound_map,0)
- MDRV_CPU_IO_MAP(tharrier_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(tharrier_sound_map)
+ MDRV_CPU_IO_MAP(tharrier_sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -3582,7 +3582,7 @@ static MACHINE_DRIVER_START( mustang )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MDRV_CPU_PROGRAM_MAP(mustang_map,0)
+ MDRV_CPU_PROGRAM_MAP(mustang_map)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3627,7 +3627,7 @@ static MACHINE_DRIVER_START( mustangb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MDRV_CPU_PROGRAM_MAP(mustangb_map,0)
+ MDRV_CPU_PROGRAM_MAP(mustangb_map)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3709,7 +3709,7 @@ static MACHINE_DRIVER_START( bioship )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, BIOSHIP_CRYSTAL1 ) /* 10.0 MHz (verified) */
- MDRV_CPU_PROGRAM_MAP(bioship_map,0)
+ MDRV_CPU_PROGRAM_MAP(bioship_map)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3753,7 +3753,7 @@ static MACHINE_DRIVER_START( vandyke )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 68000p12 running at 10Mhz, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(vandyke_map,0)
+ MDRV_CPU_PROGRAM_MAP(vandyke_map)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3797,7 +3797,7 @@ static MACHINE_DRIVER_START( vandykeb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MDRV_CPU_PROGRAM_MAP(vandyke_map,0)
+ MDRV_CPU_PROGRAM_MAP(vandyke_map)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3833,7 +3833,7 @@ static MACHINE_DRIVER_START( acrobatm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz (verified on pcb) */
- MDRV_CPU_PROGRAM_MAP(acrobatm_map,0)
+ MDRV_CPU_PROGRAM_MAP(acrobatm_map)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3879,7 +3879,7 @@ static MACHINE_DRIVER_START( tdragonb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(tdragonb_map,0)
+ MDRV_CPU_PROGRAM_MAP(tdragonb_map)
//MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */
@@ -3911,7 +3911,7 @@ static MACHINE_DRIVER_START( tdragon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tdragon_map,0)
+ MDRV_CPU_PROGRAM_MAP(tdragon_map)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
//MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */
@@ -3957,12 +3957,12 @@ static MACHINE_DRIVER_START( ssmissin )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 Mhz */
- MDRV_CPU_PROGRAM_MAP(ssmissin_map,0)
+ MDRV_CPU_PROGRAM_MAP(ssmissin_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112) /* input related */
MDRV_CPU_ADD("audiocpu", Z80, 8000000/2) /* 4 Mhz */
- MDRV_CPU_PROGRAM_MAP(ssmissin_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(ssmissin_sound_map)
MDRV_MACHINE_RESET(nmk16)
@@ -3994,7 +3994,7 @@ static MACHINE_DRIVER_START( strahl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ? */
- MDRV_CPU_PROGRAM_MAP(strahl_map,0)
+ MDRV_CPU_PROGRAM_MAP(strahl_map)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -4039,7 +4039,7 @@ static MACHINE_DRIVER_START( hachamf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MDRV_CPU_PROGRAM_MAP(hachamf_map,0)
+ MDRV_CPU_PROGRAM_MAP(hachamf_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -4085,7 +4085,7 @@ static MACHINE_DRIVER_START( macross )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MDRV_CPU_PROGRAM_MAP(macross_map,0)
+ MDRV_CPU_PROGRAM_MAP(macross_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -4130,7 +4130,7 @@ static MACHINE_DRIVER_START( gunnail )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz? */
- MDRV_CPU_PROGRAM_MAP(gunnail_map, 0)
+ MDRV_CPU_PROGRAM_MAP(gunnail_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)
@@ -4175,13 +4175,13 @@ static MACHINE_DRIVER_START( macross2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MDRV_CPU_PROGRAM_MAP(macross2_map,0)
+ MDRV_CPU_PROGRAM_MAP(macross2_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(macross2_sound_map,0)
- MDRV_CPU_IO_MAP(macross2_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(macross2_sound_map)
+ MDRV_CPU_IO_MAP(macross2_sound_io_map)
MDRV_MACHINE_RESET(nmk16)
@@ -4220,13 +4220,13 @@ static MACHINE_DRIVER_START( tdragon2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(macross2_map,0)
+ MDRV_CPU_PROGRAM_MAP(macross2_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(macross2_sound_map,0)
- MDRV_CPU_IO_MAP(macross2_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(macross2_sound_map)
+ MDRV_CPU_IO_MAP(macross2_sound_io_map)
MDRV_MACHINE_RESET(nmk16)
@@ -4265,12 +4265,12 @@ static MACHINE_DRIVER_START( raphero )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000) /* 14 MHz measured */
- MDRV_CPU_PROGRAM_MAP(raphero_map,0)
+ MDRV_CPU_PROGRAM_MAP(raphero_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
MDRV_CPU_ADD("audiocpu",TMP90841, 8000000)
- MDRV_CPU_PROGRAM_MAP(raphero_sound_mem_map,0)
+ MDRV_CPU_PROGRAM_MAP(raphero_sound_mem_map)
MDRV_MACHINE_RESET(nmk16)
@@ -4309,7 +4309,7 @@ static MACHINE_DRIVER_START( bjtwin )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(bjtwin_map,0)
+ MDRV_CPU_PROGRAM_MAP(bjtwin_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */
@@ -4821,11 +4821,11 @@ static MACHINE_DRIVER_START( stagger1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,XTAL_12MHz) /* 68000p10 running at 12mhz, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(afega,0)
+ MDRV_CPU_PROGRAM_MAP(afega)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_4MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(afega_sound_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(afega_sound_cpu)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -4895,11 +4895,11 @@ static MACHINE_DRIVER_START( firehawk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,12000000)
- MDRV_CPU_PROGRAM_MAP(afega,0)
+ MDRV_CPU_PROGRAM_MAP(afega)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80,4000000)
- MDRV_CPU_PROGRAM_MAP(firehawk_sound_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(firehawk_sound_cpu)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -4934,12 +4934,12 @@ static MACHINE_DRIVER_START( twinactn )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,12000000)
- MDRV_CPU_PROGRAM_MAP(twinactn_map,0)
+ MDRV_CPU_PROGRAM_MAP(twinactn_map)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(twinactn_sound_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(twinactn_sound_cpu)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c
index b910beecc0d..46eb37f4239 100644
--- a/src/mame/drivers/norautp.c
+++ b/src/mame/drivers/norautp.c
@@ -531,8 +531,8 @@ static MACHINE_DRIVER_START( norautp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* guess */
- MDRV_CPU_PROGRAM_MAP(norautp_map, 0)
- MDRV_CPU_IO_MAP(norautp_portmap, 0)
+ MDRV_CPU_PROGRAM_MAP(norautp_map)
+ MDRV_CPU_IO_MAP(norautp_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -567,8 +567,8 @@ static MACHINE_DRIVER_START( gtipoker )
MDRV_IMPORT_FROM(norautp)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gtipoker_map, 0)
- MDRV_CPU_IO_MAP(gtipoker_portmap, 0)
+ MDRV_CPU_PROGRAM_MAP(gtipoker_map)
+ MDRV_CPU_IO_MAP(gtipoker_portmap)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index ed2b9ff8266..b0a7bd3cbc1 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -704,7 +704,7 @@ static MACHINE_DRIVER_START( nova2001 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz verified on schematics
- MDRV_CPU_PROGRAM_MAP(nova2001_map,0)
+ MDRV_CPU_PROGRAM_MAP(nova2001_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -737,11 +737,11 @@ static MACHINE_DRIVER_START( ninjakun )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(ninjakun_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(ninjakun_cpu1_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(ninjakun_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(ninjakun_cpu2_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ? */
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
@@ -778,8 +778,8 @@ static MACHINE_DRIVER_START( pkunwar )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(pkunwar_map,0)
- MDRV_CPU_IO_MAP(pkunwar_io,0)
+ MDRV_CPU_PROGRAM_MAP(pkunwar_map)
+ MDRV_CPU_IO_MAP(pkunwar_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -812,12 +812,12 @@ static MACHINE_DRIVER_START( raiders5 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(raiders5_cpu1_map,0)
- MDRV_CPU_IO_MAP(raiders5_io,0)
+ MDRV_CPU_PROGRAM_MAP(raiders5_cpu1_map)
+ MDRV_CPU_IO_MAP(raiders5_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(raiders5_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(raiders5_cpu2_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ? */
MDRV_QUANTUM_TIME(HZ(24000))
diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c
index 23de77ce23b..bc66e61262c 100644
--- a/src/mame/drivers/nss.c
+++ b/src/mame/drivers/nss.c
@@ -412,10 +412,10 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( snes )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", G65816, 3580000) /* 2.68Mhz, also 3.58Mhz */
- MDRV_CPU_PROGRAM_MAP(snes_map, 0)
+ MDRV_CPU_PROGRAM_MAP(snes_map)
MDRV_CPU_ADD("soundcpu", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */
- MDRV_CPU_PROGRAM_MAP(spc_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(spc_mem)
MDRV_QUANTUM_TIME(HZ(24000))
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index 2beb152051f..9203dc582b7 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -1031,14 +1031,14 @@ static MACHINE_DRIVER_START( nwktr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
- MDRV_CPU_PROGRAM_MAP(nwktr_map, 0)
+ MDRV_CPU_PROGRAM_MAP(nwktr_map)
MDRV_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */
- MDRV_CPU_PROGRAM_MAP(sound_memmap, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_memmap)
MDRV_CPU_ADD("dsp", ADSP21062, 36000000)
MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(sharc_map, 0)
+ MDRV_CPU_DATA_MAP(sharc_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index 95cf8dd03ca..bff847ffdc5 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -686,19 +686,19 @@ GFXDECODE_END
static MACHINE_DRIVER_START( nycaptor )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* ??? */
- MDRV_CPU_PROGRAM_MAP(nycaptor_master_map,0)
+ MDRV_CPU_PROGRAM_MAP(nycaptor_master_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(nycaptor_slave_map,0)
+ MDRV_CPU_PROGRAM_MAP(nycaptor_slave_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ generated by ??? */
MDRV_CPU_ADD("audiocpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(nycaptor_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(nycaptor_sound_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* IRQ generated by ??? */
MDRV_CPU_ADD("mcu", M68705,2000000)
- MDRV_CPU_PROGRAM_MAP(nycaptor_m68705_map,0)
+ MDRV_CPU_PROGRAM_MAP(nycaptor_m68705_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper synchronization of the CPUs */
@@ -746,20 +746,20 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cyclshtg )
MDRV_CPU_ADD("maincpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(cyclshtg_master_map,0)
+ MDRV_CPU_PROGRAM_MAP(cyclshtg_master_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(cyclshtg_slave_map,0)
+ MDRV_CPU_PROGRAM_MAP(cyclshtg_slave_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(nycaptor_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(nycaptor_sound_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,2*60)
#ifdef USE_MCU
MDRV_CPU_ADD("mcu", M68705,2000000)
- MDRV_CPU_PROGRAM_MAP(nycaptor_m68705_map,0)
+ MDRV_CPU_PROGRAM_MAP(nycaptor_m68705_map)
#endif
MDRV_QUANTUM_TIME(HZ(60))
@@ -806,16 +806,16 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bronx )
MDRV_CPU_ADD("maincpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(bronx_master_map,0)
+ MDRV_CPU_PROGRAM_MAP(bronx_master_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(bronx_slave_map, 0)
- MDRV_CPU_IO_MAP(bronx_slave_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(bronx_slave_map)
+ MDRV_CPU_IO_MAP(bronx_slave_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(nycaptor_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(nycaptor_sound_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,2*60)
MDRV_QUANTUM_TIME(HZ(120))
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index d9184acf7a9..f7dfbf5d1c3 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -666,14 +666,14 @@ static MACHINE_DRIVER_START( nyny )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 1400000) /* 1.40 MHz? The clock signal is generated by analog chips */
- MDRV_CPU_PROGRAM_MAP(nyny_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(nyny_main_map)
MDRV_CPU_PERIODIC_INT(update_pia_1, 25)
MDRV_CPU_ADD("audiocpu", M6802, AUDIO_CPU_1_CLOCK)
- MDRV_CPU_PROGRAM_MAP(nyny_audio_1_map,0)
+ MDRV_CPU_PROGRAM_MAP(nyny_audio_1_map)
MDRV_CPU_ADD("audio2", M6802, AUDIO_CPU_2_CLOCK)
- MDRV_CPU_PROGRAM_MAP(nyny_audio_2_map,0)
+ MDRV_CPU_PROGRAM_MAP(nyny_audio_2_map)
MDRV_MACHINE_START(nyny)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c
index 45bb0536695..3cd03bbd45e 100644
--- a/src/mame/drivers/offtwall.c
+++ b/src/mame/drivers/offtwall.c
@@ -398,7 +398,7 @@ static MACHINE_DRIVER_START( offtwall )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(offtwall)
MDRV_NVRAM_HANDLER(atarigen)
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index bdb10c23dc1..ad792f168c8 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -316,7 +316,7 @@ static MACHINE_DRIVER_START( ohmygod )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(ohmygod_map,0)
+ MDRV_CPU_PROGRAM_MAP(ohmygod_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_MACHINE_RESET(ohmygod)
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index 6b2d30d2df9..7793437b642 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -819,8 +819,8 @@ static MACHINE_DRIVER_START( ojankohs )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ojankohs_map,0)
- MDRV_CPU_IO_MAP(ojankohs_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(ojankohs_map)
+ MDRV_CPU_IO_MAP(ojankohs_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(ojankohs)
@@ -856,8 +856,8 @@ static MACHINE_DRIVER_START( ojankoy )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ojankoy_map,0)
- MDRV_CPU_IO_MAP(ojankoy_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(ojankoy_map)
+ MDRV_CPU_IO_MAP(ojankoy_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(ojankohs)
@@ -894,8 +894,8 @@ static MACHINE_DRIVER_START( ccasino )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ojankoy_map,0)
- MDRV_CPU_IO_MAP(ccasino_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(ojankoy_map)
+ MDRV_CPU_IO_MAP(ccasino_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(ojankohs)
@@ -931,8 +931,8 @@ static MACHINE_DRIVER_START( ojankoc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* 4.00 MHz */
- MDRV_CPU_PROGRAM_MAP(ojankoc_map,0)
- MDRV_CPU_IO_MAP(ojankoc_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(ojankoc_map)
+ MDRV_CPU_IO_MAP(ojankoc_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(ojankohs)
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index 639e49f1cd1..5da3b52e380 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -354,11 +354,11 @@ static MACHINE_DRIVER_START( olibochu )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ?? */
- MDRV_CPU_PROGRAM_MAP(olibochu_map,0)
+ MDRV_CPU_PROGRAM_MAP(olibochu_map)
MDRV_CPU_VBLANK_INT_HACK(olibochu_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ?? */
- MDRV_CPU_PROGRAM_MAP(olibochu_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(olibochu_sound_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,60) //???
// MDRV_QUANTUM_PERFECT_CPU("maincpu")
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index a8516f6300a..35280119e10 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -477,8 +477,8 @@ static MACHINE_DRIVER_START( omegrace )
/* XTAL101 Crystal @ 12mhz */
/* through 74LS161, Pin 13 = divide by 4 */
MDRV_CPU_ADD("maincpu", Z80,12000000/4)
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
- MDRV_CPU_IO_MAP(port_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(port_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,250)
/* audio CPU */
@@ -486,8 +486,8 @@ static MACHINE_DRIVER_START( omegrace )
/* through 74LS161, Pin 12 = divide by 8 */
/* Fed to CPU as 1.5mhz though line J4-D */
MDRV_CPU_ADD("audiocpu", Z80,12000000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
- MDRV_CPU_IO_MAP(sound_port, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_port)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse,250)
MDRV_MACHINE_RESET(omegrace)
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index ac7e7b6e58a..cd8feabade1 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -349,11 +349,11 @@ static MACHINE_DRIVER_START( oneshot )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(oneshot_map,0)
+ MDRV_CPU_PROGRAM_MAP(oneshot_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(oneshot_sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(oneshot_sound_map)
MDRV_GFXDECODE(oneshot)
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index 5cf10a704d5..748d5ce5e59 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -279,13 +279,13 @@ static const ym3812_interface ym3812_config =
static MACHINE_DRIVER_START( onetwo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,MASTER_CLOCK) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(main_cpu,0)
- MDRV_CPU_IO_MAP(main_cpu_io,0)
+ MDRV_CPU_PROGRAM_MAP(main_cpu)
+ MDRV_CPU_IO_MAP(main_cpu_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,MASTER_CLOCK) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_cpu,0)
- MDRV_CPU_IO_MAP(sound_cpu_io,0)
+ MDRV_CPU_PROGRAM_MAP(sound_cpu)
+ MDRV_CPU_IO_MAP(sound_cpu_io)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index c7713aff3e4..4568bb5f5f3 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -546,11 +546,11 @@ static MACHINE_DRIVER_START( opwolf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(opwolf_map,0)
+ MDRV_CPU_PROGRAM_MAP(opwolf_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK ) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(opwolf_sound_z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(opwolf_sound_z80_map)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -595,14 +595,14 @@ static MACHINE_DRIVER_START( opwolfb ) /* OSC clocks unknown for the bootleg, bu
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(opwolfb_map,0)
+ MDRV_CPU_PROGRAM_MAP(opwolfb_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK ) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(opwolf_sound_z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(opwolf_sound_z80_map)
MDRV_CPU_ADD("sub", Z80, SOUND_CPU_CLOCK ) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(opwolfb_sub_z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(opwolfb_sub_z80_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c
index 86dd3f970fe..423d7bb7a52 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -291,7 +291,7 @@ static MACHINE_DRIVER_START( orbit )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6800, MASTER_CLOCK / 16)
- MDRV_CPU_PROGRAM_MAP(orbit_map, 0)
+ MDRV_CPU_PROGRAM_MAP(orbit_map)
MDRV_CPU_VBLANK_INT("screen", orbit_interrupt)
MDRV_TIMER_ADD_SCANLINE("32v", nmi_32v, "screen", 0, 32)
diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c
index 0bd49aac3e7..cc88a03d8d0 100644
--- a/src/mame/drivers/othldrby.c
+++ b/src/mame/drivers/othldrby.c
@@ -232,7 +232,7 @@ static MACHINE_DRIVER_START( othldrby )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(othldrby_map,0)
+ MDRV_CPU_PROGRAM_MAP(othldrby_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index f4ef17f748b..4fe2cc6dfd8 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -692,11 +692,11 @@ static MACHINE_DRIVER_START( othunder )
/* basic machine hardware */
// MDRV_CPU_ADD("maincpu", M68000, 24000000/2 ) /* 12 MHz */
MDRV_CPU_ADD("maincpu", M68000, 13000000 ) /* fixes garbage graphics on startup */
- MDRV_CPU_PROGRAM_MAP(othunder_map,0)
+ MDRV_CPU_PROGRAM_MAP(othunder_map)
MDRV_CPU_VBLANK_INT("screen", vblank_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4 ) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_sound_map)
MDRV_NVRAM_HANDLER(othunder)
MDRV_MACHINE_START(othunder)
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index e8c415377b7..ee6db5dbff4 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -334,18 +334,18 @@ static MACHINE_DRIVER_START( overdriv )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(overdriv_master_map,0)
+ MDRV_CPU_PROGRAM_MAP(overdriv_master_map)
MDRV_CPU_VBLANK_INT_HACK(cpuA_interrupt,4) /* ??? IRQ 4 is vblank, IRQ 5 of unknown origin */
MDRV_CPU_ADD("sub", M68000,24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(overdriv_slave_map,0)
+ MDRV_CPU_PROGRAM_MAP(overdriv_slave_map)
MDRV_CPU_VBLANK_INT("screen", cpuB_interrupt) /* IRQ 5 and 6 are generated by the main CPU. */
/* IRQ 5 is used only in test mode, to request the checksums of the gfx ROMs. */
MDRV_CPU_ADD("audiocpu", M6809,3579545/2) /* 1.789 MHz?? This might be the right speed, but ROM testing */
/* takes a little too much (the counter wraps from 0000 to 9999). */
/* This might just mean that the video refresh rate is less than */
/* 60 fps, that's how I fixed it for now. */
- MDRV_CPU_PROGRAM_MAP(overdriv_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(overdriv_sound_map)
MDRV_QUANTUM_TIME(HZ(12000))
diff --git a/src/mame/drivers/pachifev.c b/src/mame/drivers/pachifev.c
index fb67457c066..09e12113751 100644
--- a/src/mame/drivers/pachifev.c
+++ b/src/mame/drivers/pachifev.c
@@ -91,8 +91,8 @@ static MACHINE_DRIVER_START( pachifev )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(pachifev_map,0)
- MDRV_CPU_IO_MAP(pachifev_io,0)
+ MDRV_CPU_PROGRAM_MAP(pachifev_map)
+ MDRV_CPU_IO_MAP(pachifev_io)
// MDRV_CPU_FLAGS(CPU_DISABLE)
// MDRV_CPU_VBLANK_INT("screen",irq0_line_hold)
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index 4c487485538..143977327c5 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -415,12 +415,12 @@ static MACHINE_DRIVER_START( pacland )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 49152000/32) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("mcu", HD63701, 49152000/8) /* 1.536 MHz? */
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
- MDRV_CPU_IO_MAP(mcu_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MDRV_CPU_IO_MAP(mcu_port_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_QUANTUM_TIME(HZ(6000)) /* we need heavy synching between the MCU and the CPU */
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index 36196def733..04053061606 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -1237,79 +1237,78 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x00, 0x00) AM_WRITE(pacman_interrupt_vector_w) /* Pac-Man only */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vanvan_writeport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( vanvan_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01, 0x01) AM_DEVWRITE("namco", sn76496_w)
AM_RANGE(0x02, 0x02) AM_DEVWRITE("sn2", sn76496_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dremshpr_writeport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dremshpr_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x06, 0x07) AM_DEVWRITE("namco", ay8910_data_address_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( piranha_writeport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( piranha_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(piranha_interrupt_vector_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nmouse_writeport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( nmouse_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(nmouse_interrupt_vector_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( theglobp_readport, ADDRESS_SPACE_IO, 8 )
- ADDRESS_MAP_GLOBAL_MASK(0xff)
+static ADDRESS_MAP_START( theglobp_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READ(theglobp_decrypt_rom) /* Switch protection logic */
+ AM_IMPORT_FROM(writeport)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( acitya_readport, ADDRESS_SPACE_IO, 8 )
- ADDRESS_MAP_GLOBAL_MASK(0xff)
+static ADDRESS_MAP_START( acitya_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READ(acitya_decrypt_rom) /* Switch protection logic */
+ AM_IMPORT_FROM(writeport)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mschamp_readport, ADDRESS_SPACE_IO, 8 )
- ADDRESS_MAP_GLOBAL_MASK(0xff)
+static ADDRESS_MAP_START( mschamp_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ(mschamp_kludge_r)
+ AM_IMPORT_FROM(writeport)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bigbucks_readport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bigbucks_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x0000, 0xffff) AM_READ(bigbucks_question_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drivfrcp_readport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( s2650games_writeport, ADDRESS_SPACE_IO, 8 )
+ AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_DEVWRITE("namco", sn76496_w)
+ADDRESS_MAP_END
+
+static ADDRESS_MAP_START( drivfrcp_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READNOP
AM_RANGE(0x01, 0x01) AM_READ(drivfrcp_port1_r)
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("Sense")
+ AM_IMPORT_FROM(s2650games_writeport)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( _8bpm_readport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( _8bpm_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READNOP
AM_RANGE(0x01, 0x01) AM_READ(_8bpm_port1_r)
AM_RANGE(0xe0, 0xe0) AM_READNOP
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("Sense")
+ AM_IMPORT_FROM(s2650games_writeport)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( porky_readport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( porky_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x01, 0x01) AM_READ(porky_port1_r)
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("Sense")
+ AM_IMPORT_FROM(s2650games_writeport)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( s2650games_writeport, ADDRESS_SPACE_IO, 8 )
- AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_DEVWRITE("namco", sn76496_w)
-ADDRESS_MAP_END
-
-static ADDRESS_MAP_START( crushs_readport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( crushs_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
+ AM_RANGE(0x00, 0x01) AM_DEVWRITE("namco", ay8910_data_address_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("DSW2")
AM_RANGE(0x02, 0x02) AM_READ_PORT("DSW1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( crushs_writeport, ADDRESS_SPACE_IO, 8 )
- ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x01) AM_DEVWRITE("namco", ay8910_data_address_w)
-ADDRESS_MAP_END
-
/*************************************
@@ -3174,8 +3173,8 @@ static MACHINE_DRIVER_START( pacman )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(pacman_map,0)
- MDRV_CPU_IO_MAP(0,writeport)
+ MDRV_CPU_PROGRAM_MAP(pacman_map)
+ MDRV_CPU_IO_MAP(writeport)
MDRV_CPU_VBLANK_INT_HACK(pacman_interrupt,2)
MDRV_WATCHDOG_VBLANK_INIT(16)
@@ -3206,7 +3205,7 @@ static MACHINE_DRIVER_START( piranha )
MDRV_IMPORT_FROM(pacman)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(0,piranha_writeport)
+ MDRV_CPU_IO_MAP(piranha_portmap)
MACHINE_DRIVER_END
@@ -3216,7 +3215,7 @@ static MACHINE_DRIVER_START( nmouse )
MDRV_IMPORT_FROM(pacman)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(0,nmouse_writeport)
+ MDRV_CPU_IO_MAP(nmouse_portmap)
MACHINE_DRIVER_END
@@ -3226,7 +3225,7 @@ static MACHINE_DRIVER_START( mspacman )
MDRV_IMPORT_FROM(pacman)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mspacman_map,0)
+ MDRV_CPU_PROGRAM_MAP(mspacman_map)
MACHINE_DRIVER_END
@@ -3236,7 +3235,7 @@ static MACHINE_DRIVER_START( woodpek )
MDRV_IMPORT_FROM(pacman)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(woodpek_map,0)
+ MDRV_CPU_PROGRAM_MAP(woodpek_map)
MACHINE_DRIVER_END
@@ -3247,7 +3246,7 @@ static MACHINE_DRIVER_START( alibaba )
MDRV_IMPORT_FROM(pacman)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(alibaba_map,0)
+ MDRV_CPU_PROGRAM_MAP(alibaba_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_DRIVER_END
@@ -3258,8 +3257,8 @@ static MACHINE_DRIVER_START( dremshpr )
MDRV_IMPORT_FROM(pacman)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dremshpr_map,0)
- MDRV_CPU_IO_MAP(0,dremshpr_writeport)
+ MDRV_CPU_PROGRAM_MAP(dremshpr_map)
+ MDRV_CPU_IO_MAP(dremshpr_portmap)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* sound hardware */
@@ -3274,8 +3273,8 @@ static MACHINE_DRIVER_START( theglobp )
MDRV_IMPORT_FROM(pacman)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(epos_map,0)
- MDRV_CPU_IO_MAP(theglobp_readport,writeport)
+ MDRV_CPU_PROGRAM_MAP(epos_map)
+ MDRV_CPU_IO_MAP(theglobp_portmap)
MDRV_MACHINE_RESET(theglobp)
MACHINE_DRIVER_END
@@ -3287,8 +3286,8 @@ static MACHINE_DRIVER_START( acitya )
MDRV_IMPORT_FROM(pacman)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(epos_map,0)
- MDRV_CPU_IO_MAP(acitya_readport,writeport)
+ MDRV_CPU_PROGRAM_MAP(epos_map)
+ MDRV_CPU_IO_MAP(acitya_portmap)
MDRV_MACHINE_RESET(acitya)
MACHINE_DRIVER_END
@@ -3300,8 +3299,8 @@ static MACHINE_DRIVER_START( vanvan )
MDRV_IMPORT_FROM(pacman)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(vanvan_map,0)
- MDRV_CPU_IO_MAP(0,vanvan_writeport)
+ MDRV_CPU_PROGRAM_MAP(vanvan_map)
+ MDRV_CPU_IO_MAP(vanvan_portmap)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
@@ -3322,8 +3321,8 @@ static MACHINE_DRIVER_START( bigbucks )
MDRV_IMPORT_FROM(pacman)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bigbucks_map,0)
- MDRV_CPU_IO_MAP(bigbucks_readport,0)
+ MDRV_CPU_PROGRAM_MAP(bigbucks_map)
+ MDRV_CPU_IO_MAP(bigbucks_portmap)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,20)
MDRV_SCREEN_MODIFY("screen")
@@ -3338,7 +3337,7 @@ static MACHINE_DRIVER_START( s2650games )
MDRV_CPU_REMOVE("maincpu")
MDRV_CPU_ADD("maincpu", S2650, MASTER_CLOCK/6/2) /* 2H */
- MDRV_CPU_PROGRAM_MAP(s2650games_map,0)
+ MDRV_CPU_PROGRAM_MAP(s2650games_map)
MDRV_CPU_VBLANK_INT("screen", s2650_interrupt)
MDRV_GFXDECODE(s2650games)
@@ -3363,7 +3362,7 @@ static MACHINE_DRIVER_START( drivfrcp )
MDRV_IMPORT_FROM(s2650games)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(drivfrcp_readport,s2650games_writeport)
+ MDRV_CPU_IO_MAP(drivfrcp_portmap)
MACHINE_DRIVER_END
@@ -3373,7 +3372,7 @@ static MACHINE_DRIVER_START( 8bpm )
MDRV_IMPORT_FROM(s2650games)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(_8bpm_readport,s2650games_writeport)
+ MDRV_CPU_IO_MAP(_8bpm_portmap)
MACHINE_DRIVER_END
@@ -3383,7 +3382,7 @@ static MACHINE_DRIVER_START( porky )
MDRV_IMPORT_FROM(s2650games)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(porky_readport,s2650games_writeport)
+ MDRV_CPU_IO_MAP(porky_portmap)
MACHINE_DRIVER_END
@@ -3393,7 +3392,7 @@ static MACHINE_DRIVER_START( rocktrv2 )
MDRV_IMPORT_FROM(pacman)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rocktrv2_map,0)
+ MDRV_CPU_PROGRAM_MAP(rocktrv2_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_SCREEN_MODIFY("screen")
@@ -3407,8 +3406,8 @@ static MACHINE_DRIVER_START( mschamp )
MDRV_IMPORT_FROM(pacman)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mschamp_map,0)
- MDRV_CPU_IO_MAP(mschamp_readport,writeport)
+ MDRV_CPU_PROGRAM_MAP(mschamp_map)
+ MDRV_CPU_IO_MAP(mschamp_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(mschamp)
@@ -3439,8 +3438,8 @@ static MACHINE_DRIVER_START( crushs )
MDRV_IMPORT_FROM(pacman)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(crushs_map,0)
- MDRV_CPU_IO_MAP(crushs_readport,crushs_writeport)
+ MDRV_CPU_PROGRAM_MAP(crushs_map)
+ MDRV_CPU_IO_MAP(crushs_portmap)
/* sound hardware */
MDRV_SOUND_REPLACE("namco", AY8912, 1789750)
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index 53a745f1daf..dc175a485d6 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -319,19 +319,19 @@ static MACHINE_DRIVER_START( pandoras )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809,18432000/6) /* CPU A */
- MDRV_CPU_PROGRAM_MAP(pandoras_master_map,0)
+ MDRV_CPU_PROGRAM_MAP(pandoras_master_map)
MDRV_CPU_VBLANK_INT("screen", pandoras_master_interrupt)
MDRV_CPU_ADD("sub", M6809,18432000/6) /* CPU B */
- MDRV_CPU_PROGRAM_MAP(pandoras_slave_map,0)
+ MDRV_CPU_PROGRAM_MAP(pandoras_slave_map)
MDRV_CPU_VBLANK_INT("screen", pandoras_slave_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,14318000/8)
- MDRV_CPU_PROGRAM_MAP(pandoras_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(pandoras_sound_map)
MDRV_CPU_ADD("mcu", I8039,14318000/2)
- MDRV_CPU_PROGRAM_MAP(pandoras_i8039_map,0)
- MDRV_CPU_IO_MAP(pandoras_i8039_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(pandoras_i8039_map)
+ MDRV_CPU_IO_MAP(pandoras_i8039_io_map)
MDRV_QUANTUM_TIME(HZ(3000)) /* slices per frame */
diff --git a/src/mame/drivers/pangofun.c b/src/mame/drivers/pangofun.c
index dd12dc2c92e..5e8f808c395 100644
--- a/src/mame/drivers/pangofun.c
+++ b/src/mame/drivers/pangofun.c
@@ -113,7 +113,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( pangofun )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", I486, 14318180*2) /* I486 ?? Mhz */
- MDRV_CPU_PROGRAM_MAP(pangofun_map, 0)
+ MDRV_CPU_PROGRAM_MAP(pangofun_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c
index aa1c47a0c8a..7a2d2e1e4ff 100644
--- a/src/mame/drivers/panicr.c
+++ b/src/mame/drivers/panicr.c
@@ -363,12 +363,12 @@ GFXDECODE_END
static MACHINE_DRIVER_START( panicr )
MDRV_CPU_ADD("maincpu", V20,MASTER_CLOCK/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */
- MDRV_CPU_PROGRAM_MAP(panicr_map,0)
+ MDRV_CPU_PROGRAM_MAP(panicr_map)
MDRV_CPU_VBLANK_INT_HACK(panicr_interrupt,2)
MDRV_CPU_ADD(CPUTAG_T5182,Z80,SOUND_CLOCK/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(t5182_map, 0)
- MDRV_CPU_IO_MAP(t5182_io, 0)
+ MDRV_CPU_PROGRAM_MAP(t5182_map)
+ MDRV_CPU_IO_MAP(t5182_io)
MDRV_SCREEN_ADD("screen", RASTER)
MDRV_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index 3cdb437a57d..ed0899488e4 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -544,8 +544,8 @@ static MACHINE_DRIVER_START( paradise )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Z8400B - 6mhz Verified */
- MDRV_CPU_PROGRAM_MAP(paradise_map,0)
- MDRV_CPU_IO_MAP(paradise_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(paradise_map)
+ MDRV_CPU_IO_MAP(paradise_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No nmi routine */
/* video hardware */
@@ -578,15 +578,15 @@ static MACHINE_DRIVER_START( tgtball )
/* basic machine hardware */
MDRV_IMPORT_FROM(paradise)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tgtball_map,0)
+ MDRV_CPU_PROGRAM_MAP(tgtball_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( torus )
/* basic machine hardware */
MDRV_IMPORT_FROM(paradise)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(torus_map,0)
- MDRV_CPU_IO_MAP(torus_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(torus_map)
+ MDRV_CPU_IO_MAP(torus_io_map)
MDRV_GFXDECODE(torus)
@@ -599,8 +599,8 @@ static MACHINE_DRIVER_START( madball )
/* basic machine hardware */
MDRV_IMPORT_FROM(paradise)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(torus_map,0)
- MDRV_CPU_IO_MAP(torus_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(torus_map)
+ MDRV_CPU_IO_MAP(torus_io_map)
MDRV_GFXDECODE(madball)
diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c
index fd13f4c834f..09279a178b4 100644
--- a/src/mame/drivers/paranoia.c
+++ b/src/mame/drivers/paranoia.c
@@ -138,19 +138,19 @@ static const c6280_interface c6280_config =
static MACHINE_DRIVER_START( paranoia )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
- MDRV_CPU_PROGRAM_MAP(pce_mem, 0)
- MDRV_CPU_IO_MAP(pce_io, 0)
+ MDRV_CPU_PROGRAM_MAP(pce_mem)
+ MDRV_CPU_IO_MAP(pce_io)
MDRV_CPU_VBLANK_INT_HACK(pce_interrupt, VDC_LPF)
MDRV_QUANTUM_TIME(HZ(60))
MDRV_CPU_ADD("sub", 8085A, 18000000/3)
- MDRV_CPU_PROGRAM_MAP(paranoia_8085_map,0)
- MDRV_CPU_IO_MAP(paranoia_8085_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(paranoia_8085_map)
+ MDRV_CPU_IO_MAP(paranoia_8085_io_map)
MDRV_CPU_ADD("sub2", Z80, 18000000/6)
- MDRV_CPU_PROGRAM_MAP(paranoia_z80_map,0)
- MDRV_CPU_IO_MAP(paranoia_z80_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(paranoia_z80_map)
+ MDRV_CPU_IO_MAP(paranoia_z80_io_map)
/* video hardware */
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index 0cfa32e0f31..6ef52dbe0a9 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -227,11 +227,11 @@ static MACHINE_DRIVER_START( parodius )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* 053248 */
- MDRV_CPU_PROGRAM_MAP(parodius_map,0)
+ MDRV_CPU_PROGRAM_MAP(parodius_map)
MDRV_CPU_VBLANK_INT("screen", parodius_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(parodius_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(parodius_sound_map)
/* NMIs are triggered by the 053260 */
MDRV_MACHINE_RESET(parodius)
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index a772f3a02f1..7a4149f5e4a 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -375,8 +375,8 @@ static MACHINE_RESET( pasha2 )
static MACHINE_DRIVER_START( pasha2 )
MDRV_CPU_ADD("maincpu", E116XT, 20000000*4) /* 4x internal multiplier */
- MDRV_CPU_PROGRAM_MAP(pasha2_map,0)
- MDRV_CPU_IO_MAP(pasha2_io,0)
+ MDRV_CPU_PROGRAM_MAP(pasha2_map)
+ MDRV_CPU_IO_MAP(pasha2_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(pasha2)
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index 692b4e10713..e62c7e506cd 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -244,12 +244,12 @@ GFXDECODE_END
static MACHINE_DRIVER_START( pass )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14318180/2 )
- MDRV_CPU_PROGRAM_MAP(pass_map,0)
+ MDRV_CPU_PROGRAM_MAP(pass_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold) /* all the same */
MDRV_CPU_ADD("audiocpu", Z80, 14318180/4 )
- MDRV_CPU_PROGRAM_MAP(pass_sound_map,0)
- MDRV_CPU_IO_MAP(pass_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(pass_sound_map)
+ MDRV_CPU_IO_MAP(pass_sound_io_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,60) /* probably not accurate, unknown timing and generation (ym2203 sound chip?). */
/* video hardware */
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c
index 49596310599..887f90570e8 100644
--- a/src/mame/drivers/pastelg.c
+++ b/src/mame/drivers/pastelg.c
@@ -401,8 +401,8 @@ static MACHINE_DRIVER_START( pastelg )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 19968000/8) /* 2.496 MHz ? */
- MDRV_CPU_PROGRAM_MAP(pastelg_map,0)
- MDRV_CPU_IO_MAP(pastelg_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(pastelg_map)
+ MDRV_CPU_IO_MAP(pastelg_io_map)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt,96) // nmiclock not written, chip is 1411M1 instead of 1413M3
MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
@@ -461,8 +461,8 @@ static MACHINE_DRIVER_START( threeds )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 19968000/8) /* 2.496 MHz ? */
- MDRV_CPU_PROGRAM_MAP(pastelg_map,0)
- MDRV_CPU_IO_MAP(threeds_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(pastelg_map)
+ MDRV_CPU_IO_MAP(threeds_io_map)
MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
MDRV_MACHINE_RESET(nb1413m3)
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index 0285de4f236..865c9fb784e 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -270,12 +270,12 @@ static MACHINE_DRIVER_START( pbaction )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(pbaction_map,0)
+ MDRV_CPU_PROGRAM_MAP(pbaction_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80, 3072000)
- MDRV_CPU_PROGRAM_MAP(pbaction_sound_map,0)
- MDRV_CPU_IO_MAP(pbaction_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(pbaction_sound_map)
+ MDRV_CPU_IO_MAP(pbaction_sound_io_map)
MDRV_CPU_VBLANK_INT_HACK(pbaction_interrupt,2) /* ??? */
/* IRQs are caused by the main CPU */
diff --git a/src/mame/drivers/pcat_nit.c b/src/mame/drivers/pcat_nit.c
index 4570edb4835..c529527a0bd 100644
--- a/src/mame/drivers/pcat_nit.c
+++ b/src/mame/drivers/pcat_nit.c
@@ -565,8 +565,8 @@ GFXDECODE_END
static MACHINE_DRIVER_START( pcat_nit )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
- MDRV_CPU_PROGRAM_MAP(pcat_map, 0)
- MDRV_CPU_IO_MAP(pcat_io, 0)
+ MDRV_CPU_PROGRAM_MAP(pcat_map)
+ MDRV_CPU_IO_MAP(pcat_io)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index c939d0e77d0..f70fe52239d 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -225,11 +225,11 @@ static MACHINE_DRIVER_START( pcktgal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 2000000)
- MDRV_CPU_PROGRAM_MAP(pcktgal_map,0)
+ MDRV_CPU_PROGRAM_MAP(pcktgal_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(pcktgal_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(pcktgal_sound_map)
/* IRQs are caused by the ADPCM chip */
/* NMIs are caused by the main CPU */
diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c
index 1bdc8e08686..fc6d54b7be5 100644
--- a/src/mame/drivers/pcxt.c
+++ b/src/mame/drivers/pcxt.c
@@ -908,8 +908,8 @@ static MACHINE_RESET( filetto )
static MACHINE_DRIVER_START( filetto )
MDRV_CPU_ADD("maincpu", I8088, 8000000) //or regular PC-XT 14318180/3 clock?
- MDRV_CPU_PROGRAM_MAP(filetto_map,0)
- MDRV_CPU_IO_MAP(filetto_io,0)
+ MDRV_CPU_PROGRAM_MAP(filetto_map)
+ MDRV_CPU_IO_MAP(filetto_io)
MDRV_MACHINE_RESET( filetto )
@@ -953,8 +953,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tetriskr )
MDRV_CPU_ADD("maincpu", I8088, 14318180/3)
- MDRV_CPU_PROGRAM_MAP(filetto_map,0)
- MDRV_CPU_IO_MAP(tetriskr_io,0)
+ MDRV_CPU_PROGRAM_MAP(filetto_map)
+ MDRV_CPU_IO_MAP(tetriskr_io)
MDRV_MACHINE_RESET( filetto )
diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c
index dc00464109d..3722abb87e0 100644
--- a/src/mame/drivers/pengo.c
+++ b/src/mame/drivers/pengo.c
@@ -348,7 +348,7 @@ static MACHINE_DRIVER_START( pengo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(pengo_map,0)
+ MDRV_CPU_PROGRAM_MAP(pengo_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -379,7 +379,7 @@ static MACHINE_DRIVER_START( jrpacmbl )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(jrpacmbl_map,0)
+ MDRV_CPU_PROGRAM_MAP(jrpacmbl_map)
MDRV_VIDEO_START(jrpacman)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index a96ba03a225..13c12a28bc0 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -1020,8 +1020,8 @@ static MACHINE_RESET( peplus )
static MACHINE_DRIVER_START( peplus )
// basic machine hardware
MDRV_CPU_ADD("maincpu", I80C32, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(peplus_map, 0)
- MDRV_CPU_IO_MAP(peplus_iomap, 0)
+ MDRV_CPU_PROGRAM_MAP(peplus_map)
+ MDRV_CPU_IO_MAP(peplus_iomap)
MDRV_MACHINE_RESET(peplus)
MDRV_NVRAM_HANDLER(peplus)
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 78ed04e4fad..51f4dc21213 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -1279,12 +1279,12 @@ static MACHINE_DRIVER_START( pgm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 20000000) /* 20 mhz! verified on real board */
- MDRV_CPU_PROGRAM_MAP(pgm_mem,0)
+ MDRV_CPU_PROGRAM_MAP(pgm_mem)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, 8468000)
- MDRV_CPU_PROGRAM_MAP(z80_mem, 0)
- MDRV_CPU_IO_MAP(z80_io, 0)
+ MDRV_CPU_PROGRAM_MAP(z80_mem)
+ MDRV_CPU_IO_MAP(z80_io)
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("ics", ICS2115, 0)
@@ -1322,7 +1322,7 @@ static MACHINE_DRIVER_START( killbld )
MDRV_IMPORT_FROM(pgm)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(killbld_mem,0)
+ MDRV_CPU_PROGRAM_MAP(killbld_mem)
MDRV_MACHINE_RESET(killbld)
@@ -1334,7 +1334,7 @@ static MACHINE_DRIVER_START( olds )
MDRV_IMPORT_FROM(pgm)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(olds_mem,0)
+ MDRV_CPU_PROGRAM_MAP(olds_mem)
MDRV_MACHINE_RESET(olds)
@@ -1344,33 +1344,33 @@ static MACHINE_DRIVER_START( kov )
MDRV_IMPORT_FROM(pgm)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(kovsh_mem,0)
+ MDRV_CPU_PROGRAM_MAP(kovsh_mem)
/* protection CPU */
MDRV_CPU_ADD("prot", ARM7, 20000000) // 5585E/F/G
- MDRV_CPU_PROGRAM_MAP(kovsh_arm7_map, 0)
+ MDRV_CPU_PROGRAM_MAP(kovsh_arm7_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kov2 )
MDRV_IMPORT_FROM(pgm)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(kov2_mem,0)
+ MDRV_CPU_PROGRAM_MAP(kov2_mem)
/* protection CPU */
MDRV_CPU_ADD("prot", ARM7, 20000000) // 5585F
- MDRV_CPU_PROGRAM_MAP(arm7_map, 0)
+ MDRV_CPU_PROGRAM_MAP(arm7_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( svg )
MDRV_IMPORT_FROM(pgm)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(svg_68k_mem,0)
+ MDRV_CPU_PROGRAM_MAP(svg_68k_mem)
/* protection CPU */
MDRV_CPU_ADD("prot", ARM7, 20000000) // 5585G
- MDRV_CPU_PROGRAM_MAP(svg_arm7_map, 0)
+ MDRV_CPU_PROGRAM_MAP(svg_arm7_map)
MACHINE_DRIVER_END
#if 0
@@ -1378,11 +1378,11 @@ static MACHINE_DRIVER_START( cavepgm )
MDRV_IMPORT_FROM(pgm)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cavepgm_mem,0)
+ MDRV_CPU_PROGRAM_MAP(cavepgm_mem)
/* protection CPU */
// MDRV_CPU_ADD("prot", ARM7, 20000000) // ???
-// MDRV_CPU_PROGRAM_MAP(arm7_map, 0)
+// MDRV_CPU_PROGRAM_MAP(arm7_map)
MACHINE_DRIVER_END
#endif
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index 936647bdda0..4e08b83317c 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -453,7 +453,7 @@ static MACHINE_DRIVER_START( phoenix )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8085A, CPU_CLOCK) /* 2.75 MHz */
- MDRV_CPU_PROGRAM_MAP(phoenix_memory_map, 0)
+ MDRV_CPU_PROGRAM_MAP(phoenix_memory_map)
MDRV_MACHINE_RESET(phoenix)
@@ -492,7 +492,7 @@ static MACHINE_DRIVER_START( pleiads )
/* basic machine hardware */
MDRV_IMPORT_FROM(phoenix)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pleiads_memory_map, 0)
+ MDRV_CPU_PROGRAM_MAP(pleiads_memory_map)
/* video hardware */
MDRV_GFXDECODE(pleiads)
@@ -526,7 +526,7 @@ static MACHINE_DRIVER_START( survival )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8085A, CPU_CLOCK) /* 5.50 MHz */
MDRV_CPU_CONFIG(survival_i8085_config)
- MDRV_CPU_PROGRAM_MAP(survival_memory_map, 0)
+ MDRV_CPU_PROGRAM_MAP(survival_memory_map)
MDRV_MACHINE_RESET(phoenix)
diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c
index 0ce964d6560..4c0704c54d1 100644
--- a/src/mame/drivers/pingpong.c
+++ b/src/mame/drivers/pingpong.c
@@ -457,7 +457,7 @@ static MACHINE_DRIVER_START( pingpong )
/* basic machine hardware */
MDRV_CPU_ADD("cpu",Z80,18432000/6) /* 3.072 MHz (probably) */
- MDRV_CPU_PROGRAM_MAP(pingpong_map,0)
+ MDRV_CPU_PROGRAM_MAP(pingpong_map)
MDRV_CPU_VBLANK_INT_HACK(pingpong_interrupt,16) /* 1 IRQ + 8 NMI */
/* video hardware */
@@ -486,7 +486,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( merlinmm )
MDRV_IMPORT_FROM( pingpong )
MDRV_CPU_MODIFY("cpu")
- MDRV_CPU_PROGRAM_MAP(merlinmm_map,0)
+ MDRV_CPU_PROGRAM_MAP(merlinmm_map)
MDRV_CPU_VBLANK_INT_HACK(pingpong_interrupt,2)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index ef2a9287fe1..df666fa10d5 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -550,13 +550,13 @@ static MACHINE_DRIVER_START( pipedrm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,14318000/4)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_MACHINE_RESET(pipedrm)
@@ -589,13 +589,13 @@ static MACHINE_DRIVER_START( hatris )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,14318000/4)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(hatris_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(hatris_sound_portmap)
MDRV_MACHINE_RESET(pipedrm)
diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c
index 7a3b971bff5..564997822c5 100644
--- a/src/mame/drivers/pipeline.c
+++ b/src/mame/drivers/pipeline.c
@@ -367,16 +367,16 @@ static MACHINE_DRIVER_START( pipeline )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 7372800/2)
- MDRV_CPU_PROGRAM_MAP(cpu0_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(cpu0_mem)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80, 7372800/2)
MDRV_CPU_CONFIG(daisy_chain_sound)
- MDRV_CPU_PROGRAM_MAP(cpu1_mem, 0)
- MDRV_CPU_IO_MAP(sound_port, 0)
+ MDRV_CPU_PROGRAM_MAP(cpu1_mem)
+ MDRV_CPU_IO_MAP(sound_port)
MDRV_CPU_ADD("mcu", M68705, 7372800/2)
- MDRV_CPU_PROGRAM_MAP(mcu_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(mcu_mem)
MDRV_Z80CTC_ADD( "ctc", 7372800/2 /* same as "audiocpu" */, ctc_intf )
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 2a0b9268dd0..04966f9f79c 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -277,7 +277,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( pirates )
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16mhz */
- MDRV_CPU_PROGRAM_MAP(pirates_map,0)
+ MDRV_CPU_PROGRAM_MAP(pirates_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_NVRAM_HANDLER(pirates)
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index 128f5a24eb5..ce0d588cc88 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -230,16 +230,16 @@ GFXDECODE_END
static MACHINE_DRIVER_START( pitnrun )
MDRV_CPU_ADD("maincpu", Z80,XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(pitnrun_map,0)
+ MDRV_CPU_PROGRAM_MAP(pitnrun_map)
MDRV_CPU_VBLANK_INT("screen", pitnrun_nmi_source)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_5MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(pitnrun_sound_map,0)
- MDRV_CPU_IO_MAP(pitnrun_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(pitnrun_sound_map)
+ MDRV_CPU_IO_MAP(pitnrun_sound_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("mcu", M68705,XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(pitnrun_mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(pitnrun_mcu_map)
MDRV_MACHINE_RESET(pitnrun)
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index a744b26ab53..b0353b75a79 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -273,7 +273,7 @@ static MACHINE_RESET( pkscramble)
static MACHINE_DRIVER_START( pkscramble )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000 )
- MDRV_CPU_PROGRAM_MAP(pkscramble_map,0)
+ MDRV_CPU_PROGRAM_MAP(pkscramble_map)
//MDRV_CPU_VBLANK_INT("screen", irq1_line_hold) /* only valid irq */
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c
index da7d42ea06a..d678b4b0a7f 100644
--- a/src/mame/drivers/pktgaldx.c
+++ b/src/mame/drivers/pktgaldx.c
@@ -301,7 +301,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( pktgaldx )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(pktgaldx_map,0)
+ MDRV_CPU_PROGRAM_MAP(pktgaldx_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
/* video hardware */
@@ -336,7 +336,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pktgaldb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(pktgaldb_map,0)
+ MDRV_CPU_PROGRAM_MAP(pktgaldb_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index 7802bdc3ca5..0a52c1e056c 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -687,12 +687,12 @@ static const nes_interface nes_config =
static MACHINE_DRIVER_START( playch10 )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, 8000000/2) // 4 MHz
- MDRV_CPU_PROGRAM_MAP(bios_map, 0)
- MDRV_CPU_IO_MAP(bios_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(bios_map)
+ MDRV_CPU_IO_MAP(bios_io_map)
MDRV_CPU_VBLANK_INT("top", playch10_interrupt)
MDRV_CPU_ADD("cart", N2A03, N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(cart_map, 0)
+ MDRV_CPU_PROGRAM_MAP(cart_map)
MDRV_MACHINE_RESET(pc10)
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index b3c7e137bbe..eedd2cf4673 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -920,12 +920,12 @@ static MACHINE_DRIVER_START( bigtwin )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(bigtwin_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(bigtwin_main_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", PIC16C57, 12000000) /* 3MHz */
/* Program and Data Maps are internal to the MCU */
- MDRV_CPU_IO_MAP(playmark_sound_io_map, 0)
+ MDRV_CPU_IO_MAP(playmark_sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -954,12 +954,12 @@ static MACHINE_DRIVER_START( wbeachvl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(wbeachvl_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(wbeachvl_main_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
// MDRV_CPU_ADD("audiocpu", PIC16C57, 12000000) /* 3MHz */
/* Program and Data Maps are internal to the MCU */
-// MDRV_CPU_IO_MAP(playmark_sound_io_map, 0)
+// MDRV_CPU_IO_MAP(playmark_sound_io_map)
MDRV_NVRAM_HANDLER(wbeachvl)
@@ -989,12 +989,12 @@ static MACHINE_DRIVER_START( excelsr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(excelsr_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(excelsr_main_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", PIC16C57, 12000000) /* 3MHz */
/* Program and Data Maps are internal to the MCU */
- MDRV_CPU_IO_MAP(playmark_sound_io_map, 0)
+ MDRV_CPU_IO_MAP(playmark_sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1022,12 +1022,12 @@ static MACHINE_DRIVER_START( hotmind )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(hotmind_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(hotmind_main_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */
/* Program and Data Maps are internal to the MCU */
- MDRV_CPU_IO_MAP(playmark_sound_io_map, 0)
+ MDRV_CPU_IO_MAP(playmark_sound_io_map)
MDRV_NVRAM_HANDLER(wbeachvl)
@@ -1057,12 +1057,12 @@ static MACHINE_DRIVER_START( hrdtimes )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(hrdtimes_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(hrdtimes_main_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
// MDRV_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */
/* Program and Data Maps are internal to the MCU */
-// MDRV_CPU_IO_MAP(playmark_sound_io_map, 0)
+// MDRV_CPU_IO_MAP(playmark_sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index c133c8f2aef..5ce38bd2c29 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -634,15 +634,15 @@ static MACHINE_START(polygonet)
static MACHINE_DRIVER_START( plygonet )
MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz (xtal is 32.0 MHz) */
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", polygonet_interrupt)
MDRV_CPU_ADD("dsp", DSP56156, 40000000) /* xtal is 40.0 MHz, DSP has an internal divide-by-2 */
- MDRV_CPU_PROGRAM_MAP(dsp_program_map, 0)
- MDRV_CPU_DATA_MAP(dsp_data_map, 0)
+ MDRV_CPU_PROGRAM_MAP(dsp_program_map)
+ MDRV_CPU_DATA_MAP(dsp_data_map)
MDRV_CPU_ADD("soundcpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_PERIODIC_INT(audio_interrupt, 480)
MDRV_MACHINE_START(polygonet)
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c
index 312ca2d5899..9fc80819d83 100644
--- a/src/mame/drivers/pntnpuzl.c
+++ b/src/mame/drivers/pntnpuzl.c
@@ -454,7 +454,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( pntnpuzl )
MDRV_CPU_ADD("maincpu", M68000, 12000000)//??
- MDRV_CPU_PROGRAM_MAP(pntnpuzl_map,0)
+ MDRV_CPU_PROGRAM_MAP(pntnpuzl_map)
MDRV_CPU_VBLANK_INT("screen", pntnpuzl_irq) // irq1 = coin irq2 = service irq4 = coin
MDRV_NVRAM_HANDLER(pntnpuzl)
diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c
index e864e1dac27..60728909523 100644
--- a/src/mame/drivers/pokechmp.c
+++ b/src/mame/drivers/pokechmp.c
@@ -231,11 +231,11 @@ static MACHINE_DRIVER_START( pokechmp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 4000000)
- MDRV_CPU_PROGRAM_MAP(pokechmp_map,0)
+ MDRV_CPU_PROGRAM_MAP(pokechmp_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", M6502, 4000000)
- MDRV_CPU_PROGRAM_MAP(pokechmp_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(pokechmp_sound_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 2eb9b0e88a5..687c0809853 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -834,22 +834,22 @@ static MACHINE_DRIVER_START( polepos )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 24576000/8) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(z80_map,0)
- MDRV_CPU_IO_MAP(z80_io,0)
+ MDRV_CPU_PROGRAM_MAP(z80_map)
+ MDRV_CPU_IO_MAP(z80_io)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_assert,2) /* 64V */
MDRV_CPU_ADD("sub", Z8000, 24576000/8) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(z8002_map,0)
+ MDRV_CPU_PROGRAM_MAP(z8002_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub2", Z8000, 24576000/8) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(z8002_map,0)
+ MDRV_CPU_PROGRAM_MAP(z8002_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD(CPUTAG_54XX, MB8844, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */
- MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program,0)
- MDRV_CPU_DATA_MAP(namco_54xx_map_data,0)
- MDRV_CPU_IO_MAP(namco_54xx_map_io,0)
+ MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program)
+ MDRV_CPU_DATA_MAP(namco_54xx_map_data)
+ MDRV_CPU_IO_MAP(namco_54xx_map_io)
MDRV_WATCHDOG_VBLANK_INIT(16) // 128V clocks the same as VBLANK
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index 6ebcb8c426c..b9feef665e4 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -441,7 +441,7 @@ static MACHINE_DRIVER_START( policetr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", R3000BE, MASTER_CLOCK/2)
MDRV_CPU_CONFIG(config)
- MDRV_CPU_PROGRAM_MAP(policetr_map,0)
+ MDRV_CPU_PROGRAM_MAP(policetr_map)
MDRV_CPU_VBLANK_INT("screen", irq4_gen)
MDRV_NVRAM_HANDLER(policetr)
@@ -474,7 +474,7 @@ static MACHINE_DRIVER_START( sshooter )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sshooter_map,0)
+ MDRV_CPU_PROGRAM_MAP(sshooter_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c
index dd8f21de499..5b41810ee72 100644
--- a/src/mame/drivers/polyplay.c
+++ b/src/mame/drivers/polyplay.c
@@ -280,8 +280,8 @@ static MACHINE_DRIVER_START( polyplay )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 9830400/4)
- MDRV_CPU_PROGRAM_MAP(polyplay_map,0)
- MDRV_CPU_IO_MAP(polyplay_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(polyplay_map)
+ MDRV_CPU_IO_MAP(polyplay_io_map)
MDRV_CPU_PERIODIC_INT(periodic_interrupt,75)
MDRV_CPU_VBLANK_INT("screen", coin_interrupt)
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index 14108b44c1f..b3690d2583a 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -216,7 +216,7 @@ static MACHINE_DRIVER_START( poolshrk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6800, 11055000 / 8) /* ? */
- MDRV_CPU_PROGRAM_MAP(poolshrk_cpu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(poolshrk_cpu_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
/* video hardware */
diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c
index e1070659cd4..299b7420d1b 100644
--- a/src/mame/drivers/pooyan.c
+++ b/src/mame/drivers/pooyan.c
@@ -217,7 +217,7 @@ static MACHINE_DRIVER_START( pooyan )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", pooyan_interrupt)
MDRV_MACHINE_START(pooyan)
diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c
index 0cf302f399d..cfe92c14208 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -445,8 +445,8 @@ static const ay8910_interface ay8910_config =
static MACHINE_DRIVER_START( skyskipr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(skyskipr_map,0)
- MDRV_CPU_IO_MAP(popeye_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(skyskipr_map)
+ MDRV_CPU_IO_MAP(popeye_io_map)
MDRV_CPU_VBLANK_INT("screen", popeye_interrupt)
/* video hardware */
@@ -476,7 +476,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( popeye )
MDRV_IMPORT_FROM(skyskipr)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(popeye_map,0)
+ MDRV_CPU_PROGRAM_MAP(popeye_map)
MDRV_VIDEO_START(popeye)
MACHINE_DRIVER_END
@@ -485,7 +485,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( popeyebl )
MDRV_IMPORT_FROM(skyskipr)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(popeyebl_map,0)
+ MDRV_CPU_PROGRAM_MAP(popeyebl_map)
MDRV_PALETTE_INIT(popeyebl)
MDRV_VIDEO_START(popeye)
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index 0f0a3e2da56..237607af6d6 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -289,11 +289,11 @@ static MACHINE_DRIVER_START( popper )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,18432000/6)
- MDRV_CPU_PROGRAM_MAP(popper_map,0)
+ MDRV_CPU_PROGRAM_MAP(popper_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80,18432000/12)
- MDRV_CPU_PROGRAM_MAP(popper_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(popper_sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) //NMIs caused by the main CPU
MDRV_QUANTUM_TIME(HZ(1800))
diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c
index 85de1ab120f..f4eb00855dd 100644
--- a/src/mame/drivers/portrait.c
+++ b/src/mame/drivers/portrait.c
@@ -250,11 +250,11 @@ GFXDECODE_END
static MACHINE_DRIVER_START( portrait )
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(portrait_map,0)
+ MDRV_CPU_PROGRAM_MAP(portrait_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", I8039, 3120000) /* ? */
- MDRV_CPU_PROGRAM_MAP(portrait_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(portrait_sound_map)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 983b19588ed..2785a6d9c98 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -488,7 +488,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( powerbal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(powerbal_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(powerbal_main_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
/* video hardware */
@@ -516,7 +516,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( magicstk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(magicstk_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(magicstk_main_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_NVRAM_HANDLER(magicstk)
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index 70f5a62dd2d..92580d3d0f1 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -357,12 +357,12 @@ static MACHINE_DRIVER_START( powerins )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12MHz */
- MDRV_CPU_PROGRAM_MAP(powerins_map,0)
+ MDRV_CPU_PROGRAM_MAP(powerins_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, 6000000) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(powerins_sound_map,0)
- MDRV_CPU_IO_MAP(powerins_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(powerins_sound_map)
+ MDRV_CPU_IO_MAP(powerins_sound_io_map)
MDRV_MACHINE_RESET(powerins)
@@ -402,7 +402,7 @@ static MACHINE_DRIVER_START( powerina )
MDRV_IMPORT_FROM(powerins)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(powerina_map,0)
+ MDRV_CPU_PROGRAM_MAP(powerina_map)
MDRV_SCREEN_MODIFY("screen")
MDRV_SCREEN_REFRESH_RATE(60)
@@ -426,7 +426,7 @@ static MACHINE_DRIVER_START( powerinb )
MDRV_SCREEN_REFRESH_RATE(60)
MDRV_CPU_MODIFY("soundcpu") /* 6 MHz */
- MDRV_CPU_IO_MAP(powerinb_sound_io_map,0)
+ MDRV_CPU_IO_MAP(powerinb_sound_io_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, 120) // YM2203 rate is at 150??
MDRV_SOUND_REMOVE("ym2203") // Sound code talks to one, but it's not fitted on the board
diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c
index 4c4230f916f..705596adbe2 100644
--- a/src/mame/drivers/ppmast93.c
+++ b/src/mame/drivers/ppmast93.c
@@ -342,13 +342,13 @@ static VIDEO_UPDATE( ppmast93 )
static MACHINE_DRIVER_START( ppmast93 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,5000000) /* 5 MHz */
- MDRV_CPU_PROGRAM_MAP(ppmast93_cpu1_map,0)
- MDRV_CPU_IO_MAP(ppmast93_cpu1_io,0)
+ MDRV_CPU_PROGRAM_MAP(ppmast93_cpu1_map)
+ MDRV_CPU_IO_MAP(ppmast93_cpu1_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80,5000000) /* 5 MHz */
- MDRV_CPU_PROGRAM_MAP(ppmast93_cpu2_map,0)
- MDRV_CPU_IO_MAP(ppmast93_cpu2_io,0)
+ MDRV_CPU_PROGRAM_MAP(ppmast93_cpu2_map)
+ MDRV_CPU_IO_MAP(ppmast93_cpu2_io)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,8000)
/* video hardware */
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index 5197c9f125c..7fcadc61afd 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -216,12 +216,12 @@ static MACHINE_DRIVER_START( prehisle )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_18MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(prehisle_map,0)
+ MDRV_CPU_PROGRAM_MAP(prehisle_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_4MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(prehisle_sound_map,0)
- MDRV_CPU_IO_MAP(prehisle_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(prehisle_sound_map)
+ MDRV_CPU_IO_MAP(prehisle_sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index 3f3708d64f8..6ba5870a3b0 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -183,11 +183,11 @@ static INTERRUPT_GEN( progolf_interrupt )
static MACHINE_DRIVER_START( progolf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 2000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(main_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(main_cpu)
// MDRV_CPU_VBLANK_INT("screen", progolf_interrupt)
MDRV_CPU_ADD("audiocpu", M6502, 500000)
- MDRV_CPU_PROGRAM_MAP(sound_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(sound_cpu)
// MDRV_CPU_VBLANK_INT("screen",nmi_line_pulse)
/* video hardware */
diff --git a/src/mame/drivers/psattack.c b/src/mame/drivers/psattack.c
index c22654f9e7c..0a9d9a3e61e 100644
--- a/src/mame/drivers/psattack.c
+++ b/src/mame/drivers/psattack.c
@@ -159,7 +159,7 @@ static const vr0_interface vr0_config =
static MACHINE_DRIVER_START( psattack )
MDRV_CPU_ADD("maincpu", SE3208, 43000000)
- MDRV_CPU_PROGRAM_MAP(psattack_mem,0)
+ MDRV_CPU_PROGRAM_MAP(psattack_mem)
MDRV_CPU_VBLANK_INT("screen", psattack_interrupt)
MDRV_MACHINE_START(psattack)
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 4f67efe5135..c4837b3bae7 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -1185,12 +1185,12 @@ static MACHINE_DRIVER_START( sngkace )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 16000000)
- MDRV_CPU_PROGRAM_MAP(psikyo_map,0)
+ MDRV_CPU_PROGRAM_MAP(psikyo_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(sngkace_sound_map,0)
- MDRV_CPU_IO_MAP(sngkace_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sngkace_sound_map)
+ MDRV_CPU_IO_MAP(sngkace_sound_io_map)
MDRV_MACHINE_RESET(psikyo)
@@ -1236,12 +1236,12 @@ static MACHINE_DRIVER_START( gunbird )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 16000000)
- MDRV_CPU_PROGRAM_MAP(psikyo_map,0)
+ MDRV_CPU_PROGRAM_MAP(psikyo_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ! LZ8420M (Z80 core) ! */
- MDRV_CPU_PROGRAM_MAP(gunbird_sound_map,0)
- MDRV_CPU_IO_MAP(gunbird_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(gunbird_sound_map)
+ MDRV_CPU_IO_MAP(gunbird_sound_io_map)
MDRV_MACHINE_RESET(psikyo)
@@ -1296,12 +1296,12 @@ static MACHINE_DRIVER_START( s1945 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 16000000)
- MDRV_CPU_PROGRAM_MAP(psikyo_map,0)
+ MDRV_CPU_PROGRAM_MAP(psikyo_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ! LZ8420M (Z80 core) ! */
- MDRV_CPU_PROGRAM_MAP(gunbird_sound_map,0)
- MDRV_CPU_IO_MAP(s1945_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(gunbird_sound_map)
+ MDRV_CPU_IO_MAP(s1945_sound_io_map)
/* MCU should go here */
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index cb6691acc11..d4b71bab127 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -434,7 +434,7 @@ static const ymf278b_interface ymf278b_config =
static MACHINE_DRIVER_START( ps4big )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", SH2, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(ps4_map,0)
+ MDRV_CPU_PROGRAM_MAP(ps4_map)
MDRV_CPU_VBLANK_INT("lscreen", psikyosh_interrupt)
MDRV_NVRAM_HANDLER(93C56)
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index 9377b31a482..c6c7dca03a3 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -539,7 +539,7 @@ static const ymf278b_interface ymf278b_config =
static MACHINE_DRIVER_START( psikyo3v1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", SH2, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(ps3v1_map,0)
+ MDRV_CPU_PROGRAM_MAP(ps3v1_map)
MDRV_CPU_VBLANK_INT("screen", psikyosh_interrupt)
MDRV_NVRAM_HANDLER(93C56)
@@ -575,7 +575,7 @@ static MACHINE_DRIVER_START( psikyo5 )
MDRV_IMPORT_FROM(psikyo3v1)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ps5_map,0)
+ MDRV_CPU_PROGRAM_MAP(ps5_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( psikyo5_240 )
@@ -583,7 +583,7 @@ static MACHINE_DRIVER_START( psikyo5_240 )
MDRV_IMPORT_FROM(psikyo3v1)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ps5_map,0)
+ MDRV_CPU_PROGRAM_MAP(ps5_map)
/* It probably has a register to change visarea */
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index b47961f4d1b..6fe22bdd798 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -681,12 +681,12 @@ static MACHINE_DRIVER_START( psychic5 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2)
- MDRV_CPU_PROGRAM_MAP(psychic5_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(psychic5_main_map)
MDRV_CPU_VBLANK_INT_HACK(psychic5_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2)
- MDRV_CPU_PROGRAM_MAP(psychic5_sound_map,0)
- MDRV_CPU_IO_MAP(psychic5_soundport_map,0)
+ MDRV_CPU_PROGRAM_MAP(psychic5_sound_map)
+ MDRV_CPU_IO_MAP(psychic5_soundport_map)
MDRV_QUANTUM_TIME(HZ(600)) /* Allow time for 2nd cpu to interleave */
MDRV_MACHINE_RESET(psychic5)
@@ -728,12 +728,12 @@ static MACHINE_DRIVER_START( bombsa )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2 ) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(bombsa_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(bombsa_main_map)
MDRV_CPU_VBLANK_INT_HACK(psychic5_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_5MHz )
- MDRV_CPU_PROGRAM_MAP(bombsa_sound_map,0)
- MDRV_CPU_IO_MAP(bombsa_soundport_map,0)
+ MDRV_CPU_PROGRAM_MAP(bombsa_sound_map)
+ MDRV_CPU_IO_MAP(bombsa_soundport_map)
MDRV_QUANTUM_TIME(HZ(600))
MDRV_MACHINE_RESET(psychic5)
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index 9ac51ff5a02..6c53bedceba 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -446,12 +446,12 @@ static MACHINE_RESET( pturn )
static MACHINE_DRIVER_START( pturn )
MDRV_CPU_ADD("maincpu", Z80, 12000000/3)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", pturn_main_intgen)
MDRV_MACHINE_RESET(pturn)
MDRV_CPU_ADD("audiocpu", Z80, 12000000/3)
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_VBLANK_INT_HACK(pturn_sub_intgen,3)
MDRV_GFXDECODE(pturn)
diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c
index e32d1432fc6..66e1fdf7a4f 100644
--- a/src/mame/drivers/puckpkmn.c
+++ b/src/mame/drivers/puckpkmn.c
@@ -164,7 +164,7 @@ static MACHINE_DRIVER_START( puckpkmn )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000, MASTER_CLOCK/7) /*???*/
- MDRV_CPU_PROGRAM_MAP(puckpkmn_map,0)
+ MDRV_CPU_PROGRAM_MAP(puckpkmn_map)
MDRV_CPU_VBLANK_INT("screen", genesis_vblank_interrupt)
MDRV_MACHINE_START(genesis)
diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c
index b8f9940539c..46c2a5ab446 100644
--- a/src/mame/drivers/punchout.c
+++ b/src/mame/drivers/punchout.c
@@ -606,12 +606,12 @@ static MACHINE_DRIVER_START( punchout )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(punchout_map,0)
- MDRV_CPU_IO_MAP(punchout_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(punchout_map)
+ MDRV_CPU_IO_MAP(punchout_io_map)
MDRV_CPU_VBLANK_INT("top", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", N2A03, N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(punchout_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(punchout_sound_map)
MDRV_CPU_VBLANK_INT("top", nmi_line_pulse)
MDRV_MACHINE_RESET(punchout)
@@ -657,7 +657,7 @@ static MACHINE_DRIVER_START( armwrest )
MDRV_IMPORT_FROM(punchout)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(armwrest_map,0)
+ MDRV_CPU_PROGRAM_MAP(armwrest_map)
/* video hardware */
MDRV_GFXDECODE(armwrest)
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index 019693d8597..6d776c8c87a 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -418,16 +418,16 @@ static MACHINE_DRIVER_START( pushman )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(pushman_map,0)
+ MDRV_CPU_PROGRAM_MAP(pushman_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
/* ElSemi. Reversed the CPU order so the sound callback works with bballs */
MDRV_CPU_ADD("mcu", M68705, 4000000) /* No idea */
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
MDRV_QUANTUM_TIME(HZ(3600))
@@ -460,12 +460,12 @@ static MACHINE_DRIVER_START( bballs )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(bballs_map,0)
+ MDRV_CPU_PROGRAM_MAP(bballs_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_QUANTUM_TIME(HZ(3600))
diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c
index d1530155df6..2cdc1b81eb6 100644
--- a/src/mame/drivers/pzletime.c
+++ b/src/mame/drivers/pzletime.c
@@ -273,7 +273,7 @@ static MACHINE_DRIVER_START( pzletime )
/* basic machine hardware */
MDRV_CPU_ADD("cpu",M68000,10000000)
- MDRV_CPU_PROGRAM_MAP(pzletime_map,0)
+ MDRV_CPU_PROGRAM_MAP(pzletime_map)
MDRV_CPU_VBLANK_INT("screen",irq4_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index 9476b8308a8..11097f30a94 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -620,7 +620,7 @@ static MACHINE_DRIVER_START( qdrmfgp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 32000000/2) /* 16.000 MHz */
- MDRV_CPU_PROGRAM_MAP(qdrmfgp_map,0)
+ MDRV_CPU_PROGRAM_MAP(qdrmfgp_map)
MDRV_CPU_VBLANK_INT_HACK(qdrmfgp_interrupt, 2)
MDRV_MACHINE_START(qdrmfgp)
@@ -655,7 +655,7 @@ static MACHINE_DRIVER_START( qdrmfgp2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 32000000/2) /* 16.000 MHz */
- MDRV_CPU_PROGRAM_MAP(qdrmfgp2_map,0)
+ MDRV_CPU_PROGRAM_MAP(qdrmfgp2_map)
MDRV_CPU_VBLANK_INT("screen", qdrmfgp2_interrupt)
MDRV_MACHINE_START(qdrmfgp)
diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c
index 58d4af9340d..3d365d293a5 100644
--- a/src/mame/drivers/qix.c
+++ b/src/mame/drivers/qix.c
@@ -554,7 +554,7 @@ static MACHINE_DRIVER_START( qix_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_CONFIG(encryption_config) // for kram3
/* high interleave needed to ensure correct text in service mode */
@@ -585,7 +585,7 @@ static MACHINE_DRIVER_START( mcu )
MDRV_IMPORT_FROM(qix)
MDRV_CPU_ADD("mcu", M68705, COIN_CLOCK_OSC) /* 1.00 MHz */
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
MDRV_MACHINE_START(qixmcu)
@@ -600,7 +600,7 @@ static MACHINE_DRIVER_START( zookeep )
MDRV_IMPORT_FROM(mcu)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(zoo_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(zoo_main_map)
/* video hardware */
MDRV_IMPORT_FROM(zookeep_video)
diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c
index 452c37c51eb..5d582a11d4a 100644
--- a/src/mame/drivers/quantum.c
+++ b/src/mame/drivers/quantum.c
@@ -229,7 +229,7 @@ static MACHINE_DRIVER_START( quantum )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2)
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_PERIODIC_INT(irq1_line_hold, (double)MASTER_CLOCK / 4096 / 12)
MDRV_NVRAM_HANDLER(generic_1fill)
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c
index d566044cb39..06352ad3777 100644
--- a/src/mame/drivers/quasar.c
+++ b/src/mame/drivers/quasar.c
@@ -320,13 +320,13 @@ static INTERRUPT_GEN( quasar_interrupt )
static MACHINE_DRIVER_START( quasar )
MDRV_CPU_ADD("maincpu", S2650, 14318000/4) /* 14 mhz crystal divide by 4 on board */
- MDRV_CPU_PROGRAM_MAP(quasar,0)
- MDRV_CPU_IO_MAP(quasar_io,0)
+ MDRV_CPU_PROGRAM_MAP(quasar)
+ MDRV_CPU_IO_MAP(quasar_io)
MDRV_CPU_VBLANK_INT("screen", quasar_interrupt)
MDRV_CPU_ADD("soundcpu",I8035,6000000) /* 6MHz crystal divide by 15 in CPU */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_MACHINE_START( cvs )
diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c
index db90f75f6e8..e6d19976793 100644
--- a/src/mame/drivers/queen.c
+++ b/src/mame/drivers/queen.c
@@ -73,8 +73,8 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( queen )
MDRV_CPU_ADD("maincpu", PENTIUM, 533000000) // Celeron or Pentium 3, 533 Mhz
- MDRV_CPU_PROGRAM_MAP(queen_map, 0)
- MDRV_CPU_IO_MAP(queen_io, 0)
+ MDRV_CPU_PROGRAM_MAP(queen_map)
+ MDRV_CPU_IO_MAP(queen_io)
MDRV_SCREEN_ADD("screen", RASTER)
MDRV_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c
index a7ec44fe9a9..2a29fec7b20 100644
--- a/src/mame/drivers/quizdna.c
+++ b/src/mame/drivers/quizdna.c
@@ -456,8 +456,8 @@ static MACHINE_DRIVER_START( quizdna )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */
- MDRV_CPU_PROGRAM_MAP(quizdna_map,0)
- MDRV_CPU_IO_MAP(quizdna_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(quizdna_map)
+ MDRV_CPU_IO_MAP(quizdna_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -495,7 +495,7 @@ static MACHINE_DRIVER_START( gakupara )
MDRV_IMPORT_FROM(quizdna)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(gakupara_io_map,0)
+ MDRV_CPU_IO_MAP(gakupara_io_map)
MACHINE_DRIVER_END
@@ -505,8 +505,8 @@ static MACHINE_DRIVER_START( gekiretu )
MDRV_IMPORT_FROM(quizdna)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gekiretu_map,0)
- MDRV_CPU_IO_MAP(gekiretu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(gekiretu_map)
+ MDRV_CPU_IO_MAP(gekiretu_io_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c
index d13267be4b9..944e38e99d2 100644
--- a/src/mame/drivers/quizo.c
+++ b/src/mame/drivers/quizo.c
@@ -186,8 +186,8 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( quizo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,XTAL1/2)
- MDRV_CPU_PROGRAM_MAP(memmap, 0)
- MDRV_CPU_IO_MAP(portmap, 0)
+ MDRV_CPU_PROGRAM_MAP(memmap)
+ MDRV_CPU_IO_MAP(portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c
index dcc12dba261..62306dbd39a 100644
--- a/src/mame/drivers/quizpani.c
+++ b/src/mame/drivers/quizpani.c
@@ -241,7 +241,7 @@ static MACHINE_RESET( quizpani )
static MACHINE_DRIVER_START( quizpani )
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(quizpani_map,0)
+ MDRV_CPU_PROGRAM_MAP(quizpani_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,164) // music tempo
diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c
index f871e681f8b..ce36033a90c 100644
--- a/src/mame/drivers/quizpun2.c
+++ b/src/mame/drivers/quizpun2.c
@@ -418,13 +418,13 @@ GFXDECODE_END
static MACHINE_DRIVER_START( quizpun2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) // 4 MHz?
- MDRV_CPU_PROGRAM_MAP(quizpun2_map,0)
- MDRV_CPU_IO_MAP(quizpun2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(quizpun2_map)
+ MDRV_CPU_IO_MAP(quizpun2_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_8MHz / 2) // 4 MHz?
- MDRV_CPU_PROGRAM_MAP(quizpun2_sound_map,0)
- MDRV_CPU_IO_MAP(quizpun2_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(quizpun2_sound_map)
+ MDRV_CPU_IO_MAP(quizpun2_sound_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
// NMI generated by main CPU
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index 77361ae5016..b193a0df3c7 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -515,10 +515,10 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( r2dtank )
MDRV_CPU_ADD("maincpu", M6809,3000000) /* ?? too fast ? */
- MDRV_CPU_PROGRAM_MAP(r2dtank_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(r2dtank_main_map)
MDRV_CPU_ADD("audiocpu", M6802,3000000) /* ?? */
- MDRV_CPU_PROGRAM_MAP(r2dtank_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(r2dtank_audio_map)
MDRV_MACHINE_START(r2dtank)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c
index d5c91c61e20..0e32c717c32 100644
--- a/src/mame/drivers/rabbit.c
+++ b/src/mame/drivers/rabbit.c
@@ -1022,7 +1022,7 @@ static INTERRUPT_GEN( rabbit_interrupts )
static MACHINE_DRIVER_START( rabbit )
MDRV_CPU_ADD("maincpu",M68EC020,24000000) /* 24 MHz */
- MDRV_CPU_PROGRAM_MAP(rabbit_map,0)
+ MDRV_CPU_PROGRAM_MAP(rabbit_map)
MDRV_CPU_VBLANK_INT_HACK(rabbit_interrupts,262)
/* (rabbit) */
/* lev 1 : 0x64 : 0000 027c -
@@ -1147,7 +1147,7 @@ static INTERRUPT_GEN( tmmjprd_interrupt )
static MACHINE_DRIVER_START( tmmjprd )
MDRV_IMPORT_FROM(rabbit)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tmmjprd_map,0)
+ MDRV_CPU_PROGRAM_MAP(tmmjprd_map)
MDRV_CPU_VBLANK_INT_HACK(tmmjprd_interrupt,2)
MDRV_VIDEO_START(tmmjprd)
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index 10173d36fa5..d28031e7d81 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -236,11 +236,11 @@ static MACHINE_DRIVER_START( raiden )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", raiden_interrupt)
MDRV_CPU_ADD("sub", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_VBLANK_INT("screen", raiden_interrupt)
SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verified on pcb */
@@ -275,11 +275,11 @@ static MACHINE_DRIVER_START( raidena )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
- MDRV_CPU_PROGRAM_MAP(alt_map,0)
+ MDRV_CPU_PROGRAM_MAP(alt_map)
MDRV_CPU_VBLANK_INT("screen", raiden_interrupt)
MDRV_CPU_ADD("sub", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_VBLANK_INT("screen", raiden_interrupt)
SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verified on pcb */
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index d8a42a67c32..18d210cc996 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -1079,7 +1079,7 @@ static MACHINE_DRIVER_START( raiden2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,XTAL_32MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(raiden2_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(raiden2_mem)
MDRV_CPU_VBLANK_INT("screen", raiden2_interrupt)
MDRV_MACHINE_RESET(raiden2)
@@ -2156,7 +2156,7 @@ static MACHINE_DRIVER_START( rdx_v33 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V33, 32000000/2 ) // ?
- MDRV_CPU_PROGRAM_MAP(rdx_v33_map, 0)
+ MDRV_CPU_PROGRAM_MAP(rdx_v33_map)
MDRV_CPU_VBLANK_INT("screen", rdx_v33_interrupt)
MDRV_MACHINE_RESET(rdx_v33)
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index 6275ce631f7..25cf95c1ea0 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -571,11 +571,11 @@ static MACHINE_DRIVER_START( rainbow )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rainbow_map,0)
+ MDRV_CPU_PROGRAM_MAP(rainbow_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rainbow_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(rainbow_sound_map)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -608,11 +608,11 @@ static MACHINE_DRIVER_START( jumping )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/3) /* not verified but matches original */
- MDRV_CPU_PROGRAM_MAP(jumping_map,0)
+ MDRV_CPU_PROGRAM_MAP(jumping_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6) /* not verified but music tempo matches original */
- MDRV_CPU_PROGRAM_MAP(jumping_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(jumping_sound_map)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough ? */
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index 65b22fa7da8..c32b722926a 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -857,8 +857,8 @@ static MACHINE_DRIVER_START( rallyx )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(rallyx_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(rallyx_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
/* video hardware */
@@ -895,7 +895,7 @@ static MACHINE_DRIVER_START( jungler )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(jungler_map,0)
+ MDRV_CPU_PROGRAM_MAP(jungler_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c
index 950854c37d9..ed0fd413326 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -337,7 +337,7 @@ static MACHINE_DRIVER_START( rampart )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_MACHINE_RESET(rampart)
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 303a7a26d55..6f92b9a0faf 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -385,11 +385,11 @@ static MACHINE_DRIVER_START( rastan )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rastan_map,0)
+ MDRV_CPU_PROGRAM_MAP(rastan_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rastan_s_map,0)
+ MDRV_CPU_PROGRAM_MAP(rastan_s_map)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index ea5827c7635..4c350bd18cb 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -481,7 +481,7 @@ static NVRAM_HANDLER( syf )
static MACHINE_DRIVER_START( rbmk )
MDRV_CPU_ADD("maincpu", M68000, 22000000 /2)
- MDRV_CPU_PROGRAM_MAP(rbmk_mem,0)
+ MDRV_CPU_PROGRAM_MAP(rbmk_mem)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_GFXDECODE(rbmk)
diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c
index 21e253e1096..a6256844df9 100644
--- a/src/mame/drivers/rcorsair.c
+++ b/src/mame/drivers/rcorsair.c
@@ -117,7 +117,7 @@ static MACHINE_DRIVER_START( rcorsair )
program code, unknown type */
MDRV_CPU_ADD("maincpu", 8085A,8000000) /* Sound CPU? */
- MDRV_CPU_PROGRAM_MAP(rcorsair_map,0)
+ MDRV_CPU_PROGRAM_MAP(rcorsair_map)
// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/re900.c b/src/mame/drivers/re900.c
index b5f841deff4..1a67220a2ba 100644
--- a/src/mame/drivers/re900.c
+++ b/src/mame/drivers/re900.c
@@ -391,8 +391,8 @@ static MACHINE_DRIVER_START( re900 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", I8051, MAIN_CLOCK)
- MDRV_CPU_PROGRAM_MAP(mem_prg, 0)
- MDRV_CPU_IO_MAP(mem_io, 0)
+ MDRV_CPU_PROGRAM_MAP(mem_prg)
+ MDRV_CPU_IO_MAP(mem_io)
MDRV_CPU_VBLANK_INT("screen", re900_video_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index b2cb88fb950..17b3483933d 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -171,6 +171,7 @@ ADDRESS_MAP_END
/*realbrk specific memory map*/
static ADDRESS_MAP_START( realbrk_mem, ADDRESS_SPACE_PROGRAM, 16 )
+ AM_IMPORT_FROM(base_mem)
AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ym", ym2413_w, 0x00ff) //
AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0") // P1 & P2 (Inputs)
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") // Coins
@@ -184,6 +185,7 @@ static ADDRESS_MAP_START( pkgnsh_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ym", ym2413_w, 0xff00 ) // YM2413
AM_RANGE(0xc00000, 0xc00013) AM_READ(pkgnsh_input_r ) // P1 & P2 (Inputs)
AM_RANGE(0xff0000, 0xfffbff) AM_READWRITE(backup_ram_r,backup_ram_w) AM_BASE(&backup_ram) // RAM
+ AM_IMPORT_FROM(base_mem)
ADDRESS_MAP_END
/*pkgnshdx specific memory map*/
@@ -192,6 +194,7 @@ static ADDRESS_MAP_START( pkgnshdx_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0xc00000, 0xc00013) AM_READ(pkgnshdx_input_r ) // P1 & P2 (Inputs)
AM_RANGE(0xc00004, 0xc00005) AM_WRITE(SMH_RAM) AM_BASE(&realbrk_dsw_select) // DSW select
AM_RANGE(0xff0000, 0xfffbff) AM_READWRITE(backup_ram_dx_r,backup_ram_w) AM_BASE(&backup_ram) // RAM
+ AM_IMPORT_FROM(base_mem)
ADDRESS_MAP_END
/*dai2kaku specific memory map*/
@@ -204,6 +207,7 @@ static ADDRESS_MAP_START( dai2kaku_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,SMH_RAM) AM_BASE(&realbrk_dsw_select) // DSW select
AM_RANGE(0xff0000, 0xfffbff) AM_RAM // RAM
AM_RANGE(0xfffd0a, 0xfffd0b) AM_WRITE(dai2kaku_flipscreen_w ) // Hack! Parallel port data register
+ AM_IMPORT_FROM(base_mem)
ADDRESS_MAP_END
/***************************************************************************
@@ -673,7 +677,7 @@ static MACHINE_DRIVER_START( realbrk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000, XTAL_32MHz / 2) /* !! TMP68301 !! */
- MDRV_CPU_PROGRAM_MAP(realbrk_mem,base_mem)
+ MDRV_CPU_PROGRAM_MAP(realbrk_mem)
MDRV_CPU_VBLANK_INT("screen", realbrk_interrupt)
MDRV_MACHINE_RESET( tmp68301 )
@@ -707,19 +711,19 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pkgnsh )
MDRV_IMPORT_FROM( realbrk )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(base_mem,pkgnsh_mem)
+ MDRV_CPU_PROGRAM_MAP(pkgnsh_mem)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pkgnshdx )
MDRV_IMPORT_FROM( realbrk )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(base_mem,pkgnshdx_mem)
+ MDRV_CPU_PROGRAM_MAP(pkgnshdx_mem)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( dai2kaku )
MDRV_IMPORT_FROM( realbrk )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(base_mem,dai2kaku_mem)
+ MDRV_CPU_PROGRAM_MAP(dai2kaku_mem)
MDRV_GFXDECODE(dai2kaku)
MDRV_VIDEO_UPDATE(dai2kaku)
diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c
index 7d1cb858eba..4f0c870a452 100644
--- a/src/mame/drivers/redalert.c
+++ b/src/mame/drivers/redalert.c
@@ -308,7 +308,7 @@ static MACHINE_DRIVER_START( redalert )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(redalert_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(redalert_main_map)
MDRV_CPU_VBLANK_INT("screen", redalert_vblank_interrupt)
/* video hardware */
@@ -322,7 +322,7 @@ static MACHINE_DRIVER_START( ww3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(ww3_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(ww3_main_map)
MDRV_CPU_VBLANK_INT("screen", redalert_vblank_interrupt)
/* video hardware */
@@ -336,7 +336,7 @@ static MACHINE_DRIVER_START( demoneye )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(demoneye_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(demoneye_main_map)
MDRV_CPU_VBLANK_INT("screen", redalert_vblank_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c
index 0b28df0e75a..abf12bf2642 100644
--- a/src/mame/drivers/redclash.c
+++ b/src/mame/drivers/redclash.c
@@ -341,7 +341,7 @@ static MACHINE_DRIVER_START( zerohour )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(zerohour_map,0)
+ MDRV_CPU_PROGRAM_MAP(zerohour_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -367,7 +367,7 @@ static MACHINE_DRIVER_START( redclash )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(redclash_map,0)
+ MDRV_CPU_PROGRAM_MAP(redclash_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index caf2d55d147..2b23efb214e 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -296,7 +296,7 @@ static MACHINE_DRIVER_START( relief )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(relief)
MDRV_NVRAM_HANDLER(atarigen)
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index a49c7b1d1eb..b3ca9570b8a 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -781,11 +781,11 @@ static MACHINE_DRIVER_START( renegade )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 12000000/8) /* 1.5 MHz (measured) */
- MDRV_CPU_PROGRAM_MAP(renegade_map,0)
+ MDRV_CPU_PROGRAM_MAP(renegade_map)
MDRV_CPU_VBLANK_INT_HACK(renegade_interrupt,2)
MDRV_CPU_ADD("audiocpu", M6809, 12000000/8)
- MDRV_CPU_PROGRAM_MAP(renegade_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(renegade_sound_map)
/* IRQs are caused by the main CPU */
MDRV_MACHINE_START(renegade)
MDRV_MACHINE_RESET(renegade)
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index d79d1a0d02f..b907e50bb9b 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -340,19 +340,19 @@ static MACHINE_DRIVER_START( retofinv )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub", Z80, 18432000/6) /* 3.072 MHz? */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("audiocpu", Z80, 18432000/6) /* 3.072 MHz? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,2)
MDRV_CPU_ADD("68705", M68705,18432000/6) /* 3.072 MHz? */
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - enough for the sound CPU to read all commands */
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index 4f467f8869d..6d1b0488894 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -439,8 +439,8 @@ static MACHINE_DRIVER_START( rmhaihai )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,20000000/4) /* 5 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(rmhaihai_map,0)
- MDRV_CPU_IO_MAP(rmhaihai_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(rmhaihai_map)
+ MDRV_CPU_IO_MAP(rmhaihai_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -486,8 +486,8 @@ static MACHINE_DRIVER_START( themj )
MDRV_IMPORT_FROM(rmhaihai)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(themj_map,0)
- MDRV_CPU_IO_MAP(themj_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(themj_map)
+ MDRV_CPU_IO_MAP(themj_io_map)
MDRV_MACHINE_RESET(themj)
diff --git a/src/mame/drivers/rockola.c b/src/mame/drivers/rockola.c
index 9c880b68177..46a218c9dfc 100644
--- a/src/mame/drivers/rockola.c
+++ b/src/mame/drivers/rockola.c
@@ -822,7 +822,7 @@ static MACHINE_RESET( pballoon )
static MACHINE_DRIVER_START( sasuke )
// basic machine hardware
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) // 700 kHz
- MDRV_CPU_PROGRAM_MAP(sasuke_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sasuke_map)
MDRV_CPU_VBLANK_INT_HACK(satansat_interrupt, 2)
MDRV_MACHINE_RESET(sasuke)
@@ -872,7 +872,7 @@ static MACHINE_DRIVER_START( satansat )
// basic machine hardware
MDRV_IMPORT_FROM(sasuke)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(satansat_map, 0)
+ MDRV_CPU_PROGRAM_MAP(satansat_map)
MDRV_MACHINE_RESET(satansat)
@@ -896,7 +896,7 @@ static MACHINE_DRIVER_START( vanguard )
// basic machine hardware
//MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8) // 1.4 MHz
MDRV_CPU_ADD("maincpu", M6502, 930000) // adjusted
- MDRV_CPU_PROGRAM_MAP(vanguard_map, 0)
+ MDRV_CPU_PROGRAM_MAP(vanguard_map)
MDRV_CPU_VBLANK_INT_HACK(rockola_interrupt, 2)
MDRV_MACHINE_RESET(vanguard)
@@ -942,7 +942,7 @@ static MACHINE_DRIVER_START( fantasy )
// basic machine hardware
MDRV_IMPORT_FROM(vanguard)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(fantasy_map, 0)
+ MDRV_CPU_PROGRAM_MAP(fantasy_map)
// sound hardware
MDRV_SOUND_REPLACE("samples", SAMPLES, 0)
@@ -972,7 +972,7 @@ static MACHINE_DRIVER_START( pballoon )
// basic machine hardware
MDRV_IMPORT_FROM(nibbler)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pballoon_map, 0)
+ MDRV_CPU_PROGRAM_MAP(pballoon_map)
MDRV_MACHINE_RESET(pballoon)
diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c
index f7754f5a7ec..6d9b5adc771 100644
--- a/src/mame/drivers/rockrage.c
+++ b/src/mame/drivers/rockrage.c
@@ -272,11 +272,11 @@ static MACHINE_DRIVER_START( rockrage )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8 */
- MDRV_CPU_PROGRAM_MAP(rockrage_map,0)
+ MDRV_CPU_PROGRAM_MAP(rockrage_map)
MDRV_CPU_VBLANK_INT("screen", rockrage_interrupt)
MDRV_CPU_ADD("audiocpu", M6809, 1500000) /* 24MHz/16 */
- MDRV_CPU_PROGRAM_MAP(rockrage_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(rockrage_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c
index 3ff72d93b52..bbdcd6f980a 100644
--- a/src/mame/drivers/rocnrope.c
+++ b/src/mame/drivers/rocnrope.c
@@ -165,7 +165,7 @@ static MACHINE_DRIVER_START( rocnrope )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK / 3 / 4) /* Verified in schematics */
- MDRV_CPU_PROGRAM_MAP(rocnrope_map,0)
+ MDRV_CPU_PROGRAM_MAP(rocnrope_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index 5a2a531f6de..032741b4a30 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -736,11 +736,11 @@ static MACHINE_DRIVER_START( rohga )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(rohga_map,0)
+ MDRV_CPU_PROGRAM_MAP(rohga_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
- MDRV_CPU_PROGRAM_MAP(rohga_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(rohga_sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
@@ -781,11 +781,11 @@ static MACHINE_DRIVER_START( wizdfire )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(wizdfire_map,0)
+ MDRV_CPU_PROGRAM_MAP(wizdfire_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
- MDRV_CPU_PROGRAM_MAP(rohga_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(rohga_sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
@@ -826,11 +826,11 @@ static MACHINE_DRIVER_START( nitrobal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(nitrobal_map,0)
+ MDRV_CPU_PROGRAM_MAP(nitrobal_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
- MDRV_CPU_PROGRAM_MAP(rohga_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(rohga_sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
@@ -871,11 +871,11 @@ static MACHINE_DRIVER_START( schmeisr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(schmeisr_map,0)
+ MDRV_CPU_PROGRAM_MAP(schmeisr_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
- MDRV_CPU_PROGRAM_MAP(rohga_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(rohga_sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index 3e688ce430a..b4187570b48 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -221,11 +221,11 @@ static MACHINE_DRIVER_START( rollerg )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(rollerg_map,0)
+ MDRV_CPU_PROGRAM_MAP(rollerg_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(rollerg_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(rollerg_sound_map)
/* NMIs are generated by the 053260 */
MDRV_MACHINE_RESET(rollerg)
diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c
index a97836f6fbf..3ffe3dc1fe4 100644
--- a/src/mame/drivers/rollrace.c
+++ b/src/mame/drivers/rollrace.c
@@ -214,11 +214,11 @@ static MACHINE_DRIVER_START( rollrace )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,XTAL_24MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rollrace_map,0)
+ MDRV_CPU_PROGRAM_MAP(rollrace_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80,XTAL_24MHz/16) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rollrace_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(rollrace_sound_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4)
/* video hardware */
diff --git a/src/mame/drivers/rotaryf.c b/src/mame/drivers/rotaryf.c
index 49f876df44b..f54c757c55b 100644
--- a/src/mame/drivers/rotaryf.c
+++ b/src/mame/drivers/rotaryf.c
@@ -152,8 +152,8 @@ static MACHINE_DRIVER_START( rotaryf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",8085A,4000000) /* 8080? */ /* 2 MHz? */
- MDRV_CPU_PROGRAM_MAP(rotaryf_map,0)
- MDRV_CPU_IO_MAP(rotaryf_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(rotaryf_map)
+ MDRV_CPU_IO_MAP(rotaryf_io_map)
MDRV_CPU_VBLANK_INT_HACK(rotaryf_interrupt,5)
/* video hardware */
diff --git a/src/mame/drivers/roul.c b/src/mame/drivers/roul.c
index c3b19490690..77f15ff6155 100644
--- a/src/mame/drivers/roul.c
+++ b/src/mame/drivers/roul.c
@@ -243,13 +243,13 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( roul )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(roul_map, 0)
- MDRV_CPU_IO_MAP(roul_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(roul_map)
+ MDRV_CPU_IO_MAP(roul_cpu_io_map)
MDRV_CPU_VBLANK_INT("screen",nmi_line_pulse)
MDRV_CPU_ADD("soundcpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
- MDRV_CPU_IO_MAP(sound_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_cpu_io_map)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c
index d5c06c738e2..681ce79d288 100644
--- a/src/mame/drivers/route16.c
+++ b/src/mame/drivers/route16.c
@@ -611,12 +611,12 @@ static MACHINE_DRIVER_START( route16 )
/* basic machine hardware */
MDRV_CPU_ADD("cpu1", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */
- MDRV_CPU_PROGRAM_MAP(route16_cpu1_map,0)
- MDRV_CPU_IO_MAP(cpu1_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(route16_cpu1_map)
+ MDRV_CPU_IO_MAP(cpu1_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("cpu2", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */
- MDRV_CPU_PROGRAM_MAP(route16_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(route16_cpu2_map)
/* video hardware */
MDRV_VIDEO_UPDATE(route16)
@@ -640,7 +640,7 @@ static MACHINE_DRIVER_START( routex )
/* basic machine hardware */
MDRV_IMPORT_FROM(route16)
MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(routex_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(routex_cpu1_map)
MACHINE_DRIVER_END
@@ -649,10 +649,10 @@ static MACHINE_DRIVER_START( stratvox )
/* basic machine hardware */
MDRV_IMPORT_FROM(route16)
MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(stratvox_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(stratvox_cpu1_map)
MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(stratvox_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(stratvox_cpu2_map)
/* video hardware */
MDRV_VIDEO_UPDATE(stratvox)
@@ -676,7 +676,7 @@ static MACHINE_DRIVER_START( speakres )
/* basic machine hardware */
MDRV_IMPORT_FROM(stratvox)
MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(speakres_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(speakres_cpu1_map)
MACHINE_DRIVER_END
@@ -693,8 +693,8 @@ static MACHINE_DRIVER_START( ttmahjng )
MDRV_IMPORT_FROM(route16)
MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(ttmahjng_cpu1_map,0)
- MDRV_CPU_IO_MAP(0,0)
+ MDRV_CPU_PROGRAM_MAP(ttmahjng_cpu1_map)
+ MDRV_CPU_IO_MAP(0)
/* video hardware */
MDRV_VIDEO_UPDATE(ttmahjng)
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index 13f83ed841b..c3a94a67daf 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -3097,8 +3097,8 @@ static MACHINE_DRIVER_START( royalmah )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(royalmah_map,0)
- MDRV_CPU_IO_MAP(royalmah_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(royalmah_map)
+ MDRV_CPU_IO_MAP(royalmah_iomap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -3128,11 +3128,11 @@ static MACHINE_DRIVER_START( janoh )
MDRV_IMPORT_FROM(royalmah)
MDRV_CPU_REPLACE("maincpu", Z80, 8000000/2) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(janho_map,0)
+ MDRV_CPU_PROGRAM_MAP(janho_map)
MDRV_CPU_ADD("sub", Z80, 4000000) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(janoh_sub_map,0)
- MDRV_CPU_IO_MAP(janoh_sub_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(janoh_sub_map)
+ MDRV_CPU_IO_MAP(janoh_sub_iomap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_DRIVER_END
@@ -3140,11 +3140,11 @@ static MACHINE_DRIVER_START( jansou )
MDRV_IMPORT_FROM(royalmah)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(jansou_map,0)
+ MDRV_CPU_PROGRAM_MAP(jansou_map)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4.000 MHz */
- MDRV_CPU_PROGRAM_MAP(jansou_sub_map,0)
- MDRV_CPU_IO_MAP(jansou_sub_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(jansou_sub_map)
+ MDRV_CPU_IO_MAP(jansou_sub_iomap)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,4000000/512)
MDRV_SOUND_ADD("dac", DAC, 0)
@@ -3154,31 +3154,31 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( dondenmj )
MDRV_IMPORT_FROM(royalmah)
MDRV_CPU_REPLACE("maincpu", Z80, 8000000/2) /* 4 MHz ? */
- MDRV_CPU_IO_MAP(dondenmj_iomap,0)
+ MDRV_CPU_IO_MAP(dondenmj_iomap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( makaijan )
MDRV_IMPORT_FROM(royalmah)
MDRV_CPU_REPLACE("maincpu", Z80, 8000000/2) /* 4 MHz ? */
- MDRV_CPU_IO_MAP(makaijan_iomap,0)
+ MDRV_CPU_IO_MAP(makaijan_iomap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( daisyari )
MDRV_IMPORT_FROM(royalmah)
MDRV_CPU_REPLACE("maincpu", Z80, 8000000/2) /* 4 MHz ? */
- MDRV_CPU_IO_MAP(daisyari_iomap,0)
+ MDRV_CPU_IO_MAP(daisyari_iomap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mjclub )
MDRV_IMPORT_FROM(royalmah)
MDRV_CPU_REPLACE("maincpu", Z80, 8000000/2) /* 4 MHz ? */
- MDRV_CPU_IO_MAP(mjclub_iomap,0)
+ MDRV_CPU_IO_MAP(mjclub_iomap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ippatsu )
MDRV_IMPORT_FROM(dondenmj)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(ippatsu_iomap,0)
+ MDRV_CPU_IO_MAP(ippatsu_iomap)
MACHINE_DRIVER_END
static INTERRUPT_GEN( suzume_irq )
@@ -3190,39 +3190,39 @@ static INTERRUPT_GEN( suzume_irq )
static MACHINE_DRIVER_START( suzume )
MDRV_IMPORT_FROM(dondenmj)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(suzume_iomap,0)
+ MDRV_CPU_IO_MAP(suzume_iomap)
MDRV_CPU_VBLANK_INT("screen", suzume_irq)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tontonb )
MDRV_IMPORT_FROM(dondenmj)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(tontonb_iomap,0)
+ MDRV_CPU_IO_MAP(tontonb_iomap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mjdiplob )
MDRV_IMPORT_FROM(dondenmj)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mjdiplob_iomap,0)
+ MDRV_CPU_IO_MAP(mjdiplob_iomap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( majs101b )
MDRV_IMPORT_FROM(dondenmj)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(majs101b_iomap,0)
+ MDRV_CPU_IO_MAP(majs101b_iomap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mjapinky )
MDRV_IMPORT_FROM(dondenmj)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjapinky_map,0)
- MDRV_CPU_IO_MAP(mjapinky_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(mjapinky_map)
+ MDRV_CPU_IO_MAP(mjapinky_iomap)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mjderngr )
MDRV_IMPORT_FROM(dondenmj)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mjderngr_iomap,0)
+ MDRV_CPU_IO_MAP(mjderngr_iomap)
/* video hardware */
MDRV_PALETTE_LENGTH(16*32)
@@ -3243,8 +3243,8 @@ static INTERRUPT_GEN( janptr96_interrupt )
static MACHINE_DRIVER_START( janptr96 )
MDRV_IMPORT_FROM(mjderngr)
MDRV_CPU_REPLACE("maincpu",Z80,24000000/4) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(janptr96_map,0)
- MDRV_CPU_IO_MAP(janptr96_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(janptr96_map)
+ MDRV_CPU_IO_MAP(janptr96_iomap)
MDRV_CPU_VBLANK_INT_HACK(janptr96_interrupt,3) /* IM 2 needs a vector on the data bus */
MDRV_SCREEN_MODIFY("screen")
@@ -3258,8 +3258,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mjifb )
MDRV_IMPORT_FROM(mjderngr)
MDRV_CPU_REPLACE("maincpu",TMP90841, 8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(mjifb_map,0)
- MDRV_CPU_IO_MAP(mjifb_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(mjifb_map)
+ MDRV_CPU_IO_MAP(mjifb_iomap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_SCREEN_MODIFY("screen")
@@ -3270,8 +3270,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mjdejavu )
MDRV_IMPORT_FROM(mjderngr)
MDRV_CPU_REPLACE("maincpu",TMP90841, 8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(mjdejavu_map,0)
- MDRV_CPU_IO_MAP(mjifb_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(mjdejavu_map)
+ MDRV_CPU_IO_MAP(mjifb_iomap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_SCREEN_MODIFY("screen")
@@ -3291,8 +3291,8 @@ static INTERRUPT_GEN( mjtensin_interrupt )
static MACHINE_DRIVER_START( mjtensin )
MDRV_IMPORT_FROM(mjderngr)
MDRV_CPU_REPLACE("maincpu",TMP90841, 12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(mjtensin_map,0)
- MDRV_CPU_IO_MAP(mjtensin_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(mjtensin_map)
+ MDRV_CPU_IO_MAP(mjtensin_iomap)
MDRV_CPU_VBLANK_INT_HACK( mjtensin_interrupt,2 )
MDRV_SCREEN_MODIFY("screen")
@@ -3305,8 +3305,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cafetime )
MDRV_IMPORT_FROM(mjderngr)
MDRV_CPU_REPLACE("maincpu",TMP90841, 12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(cafetime_map,0)
- MDRV_CPU_IO_MAP(cafetime_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(cafetime_map)
+ MDRV_CPU_IO_MAP(cafetime_iomap)
MDRV_CPU_VBLANK_INT_HACK(mjtensin_interrupt,2)
MDRV_SCREEN_MODIFY("screen")
@@ -3319,8 +3319,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mjvegasa )
MDRV_IMPORT_FROM(mjderngr)
MDRV_CPU_REPLACE("maincpu",TMP90841, XTAL_8MHz) /* ? */
- MDRV_CPU_PROGRAM_MAP(mjvegasa_map,0)
- MDRV_CPU_IO_MAP(mjvegasa_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(mjvegasa_map)
+ MDRV_CPU_IO_MAP(mjvegasa_iomap)
MDRV_CPU_VBLANK_INT_HACK(mjtensin_interrupt,2)
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index 8ab38a4fa2e..dffd3fc796e 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -483,10 +483,10 @@ static MACHINE_DRIVER_START( rpunch )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_ADD("audiocpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(rpunch)
diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c
index 77ea9a9f051..26b0f0991f8 100644
--- a/src/mame/drivers/runaway.c
+++ b/src/mame/drivers/runaway.c
@@ -355,7 +355,7 @@ static MACHINE_DRIVER_START( runaway )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 12096000 / 8) /* ? */
- MDRV_CPU_PROGRAM_MAP(runaway_map, 0)
+ MDRV_CPU_PROGRAM_MAP(runaway_map)
MDRV_MACHINE_RESET(runaway)
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index 8e6a8699b89..e115539ed46 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -305,11 +305,11 @@ static MACHINE_DRIVER_START( rng )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(rungun_map,0)
+ MDRV_CPU_PROGRAM_MAP(rungun_map)
MDRV_CPU_VBLANK_INT("screen", rng_interrupt)
MDRV_CPU_ADD("soundcpu", Z80, 10000000) // 8Mhz (10Mhz is much safer in self-test due to heavy sync)
- MDRV_CPU_PROGRAM_MAP(rungun_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(rungun_sound_map)
MDRV_CPU_PERIODIC_INT(audio_interrupt, 480)
MDRV_QUANTUM_TIME(HZ(6000)) // higher if sound stutters
diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c
index 89ee905c02f..4daa0ec699b 100644
--- a/src/mame/drivers/safarir.c
+++ b/src/mame/drivers/safarir.c
@@ -267,7 +267,7 @@ static MACHINE_DRIVER_START( safarir )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8085A, 3072000) /* 3 MHz ? */
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_START(safarir)
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index f8bb6f05e92..71f7e574f79 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -435,12 +435,12 @@ static MACHINE_DRIVER_START( sandscrp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,12000000) /* TMP68HC000N-12 */
- MDRV_CPU_PROGRAM_MAP(sandscrp,0)
+ MDRV_CPU_PROGRAM_MAP(sandscrp)
MDRV_CPU_VBLANK_INT("screen", sandscrp_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,4000000) /* Z8400AB1, Reads the DSWs: it can't be disabled */
- MDRV_CPU_PROGRAM_MAP(sandscrp_soundmem,0)
- MDRV_CPU_IO_MAP(sandscrp_soundport,0)
+ MDRV_CPU_PROGRAM_MAP(sandscrp_soundmem)
+ MDRV_CPU_IO_MAP(sandscrp_soundport)
MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c
index 4e3e3027357..055ac642b8a 100644
--- a/src/mame/drivers/sangho.c
+++ b/src/mame/drivers/sangho.c
@@ -223,8 +223,8 @@ static VIDEO_START( sangho )
static MACHINE_DRIVER_START(pzlestar)
MDRV_CPU_ADD("maincpu", Z80,8000000) // ?
- MDRV_CPU_PROGRAM_MAP(pzlestar_map, 0)
- MDRV_CPU_IO_MAP(pzlestar_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(pzlestar_map)
+ MDRV_CPU_IO_MAP(pzlestar_io_map)
MDRV_CPU_VBLANK_INT_HACK(sangho_interrupt,262)
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
@@ -256,8 +256,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START(sexyboom )
MDRV_CPU_ADD("maincpu", Z80,8000000) // ?
- MDRV_CPU_PROGRAM_MAP(pzlestar_map, 0)
- MDRV_CPU_IO_MAP(sexyboom_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(pzlestar_map)
+ MDRV_CPU_IO_MAP(sexyboom_io_map)
MDRV_CPU_VBLANK_INT_HACK(sangho_interrupt,262)
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index 7f9ed12f372..a1afeb19558 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -360,7 +360,7 @@ static MACHINE_DRIVER_START( trckydoc )
MDRV_IMPORT_FROM(tecfri)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(trckydoc_map,0 )
+ MDRV_CPU_PROGRAM_MAP(trckydoc_map)
MDRV_GFXDECODE(trckydoc)
@@ -373,11 +373,11 @@ static MACHINE_DRIVER_START( sauro )
MDRV_IMPORT_FROM(tecfri)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sauro_map, 0)
- MDRV_CPU_IO_MAP(sauro_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sauro_map)
+ MDRV_CPU_IO_MAP(sauro_io_map)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) // 4 MHz?
- MDRV_CPU_PROGRAM_MAP(sauro_sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sauro_sound_map)
MDRV_CPU_PERIODIC_INT(sauro_interrupt, 8*60) // ?
MDRV_GFXDECODE(sauro)
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index f2249f9cd0c..c93089c8ea1 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -188,11 +188,11 @@ static MACHINE_DRIVER_START( sbasketb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 1400000) /* 1.400 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sbasketb_map,0)
+ MDRV_CPU_PROGRAM_MAP(sbasketb_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz / 4) /* 3.5795 MHz */
- MDRV_CPU_PROGRAM_MAP(sbasketb_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sbasketb_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index c5aa302f939..7142e20028b 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -331,8 +331,8 @@ static PALETTE_INIT( sbowling )
static MACHINE_DRIVER_START( sbowling )
MDRV_CPU_ADD("maincpu", 8080, 19968000/10 )
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(port_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(port_map)
MDRV_CPU_VBLANK_INT_HACK(sbw_interrupt, 2)
MDRV_GFXDECODE(sbowling)
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index cfc431a82fa..8f062587ec6 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -479,7 +479,7 @@ static MACHINE_DRIVER_START( sbrkout )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502,MAIN_CLOCK/16) /* 375 KHz? Should be 750KHz? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_START(sbrkout)
MDRV_MACHINE_RESET(sbrkout)
diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c
index 9da71aee0c8..27400d11d55 100644
--- a/src/mame/drivers/sbugger.c
+++ b/src/mame/drivers/sbugger.c
@@ -220,8 +220,8 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( sbugger )
MDRV_CPU_ADD("maincpu", 8085A, 6000000) /* 3.00 MHz??? */
- MDRV_CPU_PROGRAM_MAP(sbugger_map,0)
- MDRV_CPU_IO_MAP(sbugger_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sbugger_map)
+ MDRV_CPU_IO_MAP(sbugger_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq3_line_hold,NUM_INTS_FRAME)
MDRV_GFXDECODE(sbugger)
diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c
index d01994389e1..a2c3c55db87 100644
--- a/src/mame/drivers/scobra.c
+++ b/src/mame/drivers/scobra.c
@@ -853,11 +853,11 @@ static MACHINE_DRIVER_START( type1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(type1_map,0)
+ MDRV_CPU_PROGRAM_MAP(type1_map)
MDRV_CPU_ADD("audiocpu", Z80,14318000/8) /* 1.78975 MHz */
- MDRV_CPU_PROGRAM_MAP(scobra_sound_map,0)
- MDRV_CPU_IO_MAP(scobra_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(scobra_sound_map)
+ MDRV_CPU_IO_MAP(scobra_sound_io_map)
MDRV_MACHINE_RESET(scramble)
@@ -928,7 +928,7 @@ static MACHINE_DRIVER_START( mimonkey )
/* basic machine hardware */
MDRV_IMPORT_FROM(type1)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mimonkey_map,0)
+ MDRV_CPU_PROGRAM_MAP(mimonkey_map)
/* video hardware */
MDRV_VIDEO_START(mimonkey)
@@ -940,7 +940,7 @@ static MACHINE_DRIVER_START( type2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(type1)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(type2_map,0)
+ MDRV_CPU_PROGRAM_MAP(type2_map)
MACHINE_DRIVER_END
@@ -977,11 +977,11 @@ static MACHINE_DRIVER_START( hustler )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(hustler_map,0)
+ MDRV_CPU_PROGRAM_MAP(hustler_map)
MDRV_CPU_ADD("audiocpu",Z80,14318000/8) /* 1.78975 MHz */
- MDRV_CPU_PROGRAM_MAP(hustler_sound_map,0)
- MDRV_CPU_IO_MAP(hustler_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(hustler_sound_map)
+ MDRV_CPU_IO_MAP(hustler_sound_io_map)
MDRV_MACHINE_RESET(scramble)
@@ -1017,11 +1017,11 @@ static MACHINE_DRIVER_START( hustlerb )
/* basic machine hardware */
MDRV_IMPORT_FROM(hustler)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hustlerb_map,0)
+ MDRV_CPU_PROGRAM_MAP(hustlerb_map)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(hustlerb_sound_map,0)
- MDRV_CPU_IO_MAP(hustlerb_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(hustlerb_sound_map)
+ MDRV_CPU_IO_MAP(hustlerb_sound_io_map)
MACHINE_DRIVER_END
@@ -1031,7 +1031,7 @@ static MACHINE_DRIVER_START( anteatg )
/* basic machine hardware */
MDRV_IMPORT_FROM(type1)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(anteatg_map,0)
+ MDRV_CPU_PROGRAM_MAP(anteatg_map)
MACHINE_DRIVER_END
/* same as type1 but with a strange memory map, maybe a kind of protection */
@@ -1040,7 +1040,7 @@ static MACHINE_DRIVER_START( anteatgb )
/* basic machine hardware */
MDRV_IMPORT_FROM(type1)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(anteatgb_map,0)
+ MDRV_CPU_PROGRAM_MAP(anteatgb_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index 036d4b30c4f..0827fe17fdf 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -193,12 +193,12 @@ static MACHINE_DRIVER_START( scotrsht )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(scotrsht_map,0)
+ MDRV_CPU_PROGRAM_MAP(scotrsht_map)
MDRV_CPU_VBLANK_INT("screen", scotrsht_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(scotrsht_sound_map,0)
- MDRV_CPU_IO_MAP(scotrsht_sound_port,0)
+ MDRV_CPU_PROGRAM_MAP(scotrsht_sound_map)
+ MDRV_CPU_IO_MAP(scotrsht_sound_port)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index 716ba311520..c61301a5411 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -1236,11 +1236,11 @@ static MACHINE_DRIVER_START( scramble )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(scramble_map,0)
+ MDRV_CPU_PROGRAM_MAP(scramble_map)
MDRV_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */
- MDRV_CPU_PROGRAM_MAP(scramble_sound_map,0)
- MDRV_CPU_IO_MAP(scramble_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(scramble_sound_map)
+ MDRV_CPU_IO_MAP(scramble_sound_io_map)
MDRV_MACHINE_RESET(scramble)
@@ -1277,7 +1277,7 @@ static MACHINE_DRIVER_START( mars )
/* basic machine hardware */
MDRV_IMPORT_FROM(scramble)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mars_map,0)
+ MDRV_CPU_PROGRAM_MAP(mars_map)
/* video hardware */
MDRV_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
@@ -1289,7 +1289,7 @@ static MACHINE_DRIVER_START( devilfsh )
/* basic machine hardware */
MDRV_IMPORT_FROM(scramble)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mars_map,0)
+ MDRV_CPU_PROGRAM_MAP(mars_map)
/* video hardware */
MDRV_GFXDECODE(devilfsh)
@@ -1302,7 +1302,7 @@ static MACHINE_DRIVER_START( newsin7 )
/* basic machine hardware */
MDRV_IMPORT_FROM(scramble)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(newsin7_map,0)
+ MDRV_CPU_PROGRAM_MAP(newsin7_map)
/* video hardware */
MDRV_GFXDECODE(newsin7)
@@ -1316,7 +1316,7 @@ static MACHINE_DRIVER_START( mrkougar )
/* basic machine hardware */
MDRV_IMPORT_FROM(scramble)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mrkougar_map,0)
+ MDRV_CPU_PROGRAM_MAP(mrkougar_map)
MDRV_PPI8255_RECONFIG( "ppi8255_1", mrkougar_ppi_1_intf )
@@ -1331,7 +1331,7 @@ static MACHINE_DRIVER_START( mrkougb )
/* basic machine hardware */
MDRV_IMPORT_FROM(scramble)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mrkougar_map,0)
+ MDRV_CPU_PROGRAM_MAP(mrkougar_map)
MDRV_PPI8255_RECONFIG( "ppi8255_1", mrkougar_ppi_1_intf )
@@ -1345,7 +1345,7 @@ static MACHINE_DRIVER_START( ckongs )
/* basic machine hardware */
MDRV_IMPORT_FROM(scramble)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ckongs_map,0)
+ MDRV_CPU_PROGRAM_MAP(ckongs_map)
/* video hardware */
MDRV_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
@@ -1358,13 +1358,13 @@ static MACHINE_DRIVER_START( hotshock )
/* basic machine hardware */
MDRV_IMPORT_FROM(scramble)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hotshock_map,0)
+ MDRV_CPU_PROGRAM_MAP(hotshock_map)
MDRV_PPI8255_REMOVE( "ppi8255_0" )
MDRV_PPI8255_REMOVE( "ppi8255_1" )
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_IO_MAP(hotshock_sound_io_map,0)
+ MDRV_CPU_IO_MAP(hotshock_sound_io_map)
MDRV_MACHINE_RESET(galaxold)
@@ -1397,7 +1397,7 @@ static MACHINE_DRIVER_START( mimonscr )
/* basic machine hardware */
MDRV_IMPORT_FROM(scramble)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mimonscr_map,0)
+ MDRV_CPU_PROGRAM_MAP(mimonscr_map)
/* video hardware */
MDRV_VIDEO_START(mimonkey)
@@ -1409,7 +1409,7 @@ static MACHINE_DRIVER_START( triplep )
/* basic machine hardware */
MDRV_IMPORT_FROM(scramble)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(triplep_io_map,0)
+ MDRV_CPU_IO_MAP(triplep_io_map)
MDRV_CPU_REMOVE("audiocpu")
@@ -1444,8 +1444,8 @@ static MACHINE_DRIVER_START( hunchbks )
/* basic machine hardware */
MDRV_IMPORT_FROM(scramble)
MDRV_CPU_REPLACE("maincpu", S2650, 18432000/6)
- MDRV_CPU_PROGRAM_MAP(hunchbks_map,0)
- MDRV_CPU_IO_MAP(hunchbks_readport,0)
+ MDRV_CPU_PROGRAM_MAP(hunchbks_map)
+ MDRV_CPU_IO_MAP(hunchbks_readport)
MDRV_CPU_VBLANK_INT("screen", hunchbks_vh_interrupt)
MDRV_SCREEN_MODIFY("screen")
@@ -1469,7 +1469,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ad2083 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(ad2083_map,0)
+ MDRV_CPU_PROGRAM_MAP(ad2083_map)
MDRV_MACHINE_RESET(galaxold)
@@ -1499,7 +1499,7 @@ static MACHINE_DRIVER_START( turpins )
/* basic machine hardware */
MDRV_IMPORT_FROM(scramble)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(turpins_map,0)
+ MDRV_CPU_PROGRAM_MAP(turpins_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c
index a655154b577..ff0a4bf5ae9 100644
--- a/src/mame/drivers/scregg.c
+++ b/src/mame/drivers/scregg.c
@@ -204,7 +204,7 @@ static MACHINE_DRIVER_START( dommy )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dommy_map,0)
+ MDRV_CPU_PROGRAM_MAP(dommy_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,16*60) //???
/* video hardware */
@@ -237,7 +237,7 @@ static MACHINE_DRIVER_START( scregg )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(eggs_map,0)
+ MDRV_CPU_PROGRAM_MAP(eggs_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,16*60) //???
/* video hardware */
diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c
index 16e89c0e7d2..ffcf70d392f 100644
--- a/src/mame/drivers/sderby.c
+++ b/src/mame/drivers/sderby.c
@@ -466,7 +466,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( sderby )
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(sderby_map,0)
+ MDRV_CPU_PROGRAM_MAP(sderby_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -491,7 +491,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( spacewin )
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(spacewin_map,0)
+ MDRV_CPU_PROGRAM_MAP(spacewin_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -516,7 +516,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pmroulet )
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(roulette_map,0)
+ MDRV_CPU_PROGRAM_MAP(roulette_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c
index 61ae43b06a6..6772b33cb24 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -2461,7 +2461,7 @@ static MACHINE_DRIVER_START( seattle_common )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", R5000LE, SYSTEM_CLOCK*3)
MDRV_CPU_CONFIG(config)
- MDRV_CPU_PROGRAM_MAP(seattle_map,0)
+ MDRV_CPU_PROGRAM_MAP(seattle_map)
MDRV_MACHINE_START(seattle)
MDRV_MACHINE_RESET(seattle)
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index 72809648135..7b127b1a5e3 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -1364,7 +1364,7 @@ static MACHINE_DRIVER_START( segac )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XL2_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_START(segac2)
MDRV_MACHINE_RESET(segac2)
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index 083730b2d02..dd1a003e88e 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -2024,8 +2024,8 @@ static VIDEO_UPDATE(systeme)
static MACHINE_DRIVER_START( systeme )
MDRV_CPU_ADD("maincpu", Z80, 10738600/2) /* correct for hangonjr, and astroflash/transformer at least */
- MDRV_CPU_PROGRAM_MAP(systeme_map,0)
- MDRV_CPU_IO_MAP(sms_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(systeme_map)
+ MDRV_CPU_IO_MAP(sms_io_map)
/* IRQ handled via the timers */
MDRV_MACHINE_RESET(systeme)
diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c
index e3dccf6fd66..a4e5fcbe644 100644
--- a/src/mame/drivers/segag80r.c
+++ b/src/mame/drivers/segag80r.c
@@ -834,8 +834,8 @@ static MACHINE_DRIVER_START( g80r_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, VIDEO_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", segag80r_vblank_start)
MDRV_MACHINE_START(g80r)
@@ -873,7 +873,7 @@ static MACHINE_DRIVER_START( 005 )
MDRV_IMPORT_FROM(g80r_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(main_ppi8255_portmap,0)
+ MDRV_CPU_IO_MAP(main_ppi8255_portmap)
/* sound boards */
MDRV_IMPORT_FROM(005_sound_board)
@@ -903,7 +903,7 @@ static MACHINE_DRIVER_START( monsterb )
MDRV_IMPORT_FROM(g80r_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(main_ppi8255_portmap,0)
+ MDRV_CPU_IO_MAP(main_ppi8255_portmap)
/* background board changes */
MDRV_GFXDECODE(monsterb)
@@ -934,7 +934,7 @@ static MACHINE_DRIVER_START( sindbadm )
/* basic machine hardware */
MDRV_IMPORT_FROM(g80r_base)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(sindbadm_portmap,0)
+ MDRV_CPU_IO_MAP(sindbadm_portmap)
MDRV_CPU_VBLANK_INT("screen", sindbadm_vblank_start)
MDRV_PPI8255_ADD( "ppi8255", sindbadm_ppi_intf )
@@ -946,7 +946,7 @@ static MACHINE_DRIVER_START( sindbadm )
/* sound boards */
MDRV_CPU_ADD("audiocpu", Z80, SINDBADM_SOUND_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(sindbadm_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sindbadm_sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
/* sound hardware */
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index c496d7689b0..f492ecf4a0d 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -916,8 +916,8 @@ static MACHINE_DRIVER_START( g80v_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_START(g80v)
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index 9092c5b62b1..c36a78a06d4 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -871,11 +871,11 @@ static MACHINE_DRIVER_START( hangon_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/4)
- MDRV_CPU_PROGRAM_MAP(hangon_map,0)
+ MDRV_CPU_PROGRAM_MAP(hangon_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("sub", M68000, MASTER_CLOCK_25MHz/4)
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_MACHINE_RESET(hangon)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -901,7 +901,7 @@ static MACHINE_DRIVER_START( sharrier_base )
/* basic machine hardware */
MDRV_CPU_REPLACE("maincpu", M68000, MASTER_CLOCK_10MHz)
- MDRV_CPU_PROGRAM_MAP(sharrier_map,0)
+ MDRV_CPU_PROGRAM_MAP(sharrier_map)
MDRV_CPU_VBLANK_INT("screen", i8751_main_cpu_vblank)
MDRV_CPU_REPLACE("sub", M68000, MASTER_CLOCK_10MHz)
@@ -915,8 +915,8 @@ static MACHINE_DRIVER_START( sound_board_2203 )
/* basic machine hardware */
MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
- MDRV_CPU_PROGRAM_MAP(sound_map_2203,0)
- MDRV_CPU_IO_MAP(sound_portmap_2203,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map_2203)
+ MDRV_CPU_IO_MAP(sound_portmap_2203)
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -943,8 +943,8 @@ static MACHINE_DRIVER_START( sound_board_2203x2 )
/* basic machine hardware */
MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
- MDRV_CPU_PROGRAM_MAP(sound_map_2151,0)
- MDRV_CPU_IO_MAP(sound_portmap_2203x2,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map_2151)
+ MDRV_CPU_IO_MAP(sound_portmap_2203x2)
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -981,8 +981,8 @@ static MACHINE_DRIVER_START( sound_board_2151 )
/* basic machine hardware */
MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
- MDRV_CPU_PROGRAM_MAP(sound_map_2151,0)
- MDRV_CPU_IO_MAP(sound_portmap_2151,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map_2151)
+ MDRV_CPU_IO_MAP(sound_portmap_2151)
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -1027,7 +1027,7 @@ static MACHINE_DRIVER_START( sharrier )
MDRV_IMPORT_FROM(sound_board_2203)
MDRV_CPU_ADD("mcu", I8751, 8000000)
- MDRV_CPU_IO_MAP(mcu_io_map,0)
+ MDRV_CPU_IO_MAP(mcu_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_pulse)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c
index f686e36059c..c41de8ecbee 100644
--- a/src/mame/drivers/segald.c
+++ b/src/mame/drivers/segald.c
@@ -338,8 +338,8 @@ static MACHINE_DRIVER_START( astron )
/* main cpu */
MDRV_CPU_ADD("maincpu", Z80, SCHEMATIC_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(mainmem,0)
- MDRV_CPU_IO_MAP(mainport,0)
+ MDRV_CPU_PROGRAM_MAP(mainmem)
+ MDRV_CPU_IO_MAP(mainport)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 1000.0/59.94)
MDRV_MACHINE_START(astron)
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index 39eaf6f7012..c7a0d4192ae 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -808,14 +808,14 @@ static MACHINE_DRIVER_START( outrundx )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(outrun_map,0)
+ MDRV_CPU_PROGRAM_MAP(outrun_map)
MDRV_CPU_ADD("sub", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_MACHINE_RESET(outrun)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index 6c91ece703a..bfbb4d91626 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -1741,15 +1741,15 @@ static MACHINE_DRIVER_START( system16a )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(system16a_map,0)
+ MDRV_CPU_PROGRAM_MAP(system16a_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_ADD("n7751", N7751, 6000000)
- MDRV_CPU_IO_MAP(n7751_portmap,0)
+ MDRV_CPU_IO_MAP(n7751_portmap)
MDRV_I8243_ADD("n7751_8243", NULL, n7751_rom_offset_w)
@@ -1799,7 +1799,7 @@ static MACHINE_DRIVER_START( system16a_8751 )
MDRV_CPU_VBLANK_INT("screen", i8751_main_cpu_vblank)
MDRV_CPU_ADD("mcu", I8751, 8000000)
- MDRV_CPU_IO_MAP(mcu_io_map,0)
+ MDRV_CPU_IO_MAP(mcu_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_pulse)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index 8556c8713bf..39d5735276a 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -3215,12 +3215,12 @@ static MACHINE_DRIVER_START( system16b )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK_10MHz)
- MDRV_CPU_PROGRAM_MAP(system16b_map,0)
+ MDRV_CPU_PROGRAM_MAP(system16b_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_10MHz/2)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_MACHINE_RESET(system16b)
MDRV_NVRAM_HANDLER(system16b)
@@ -3254,7 +3254,7 @@ static MACHINE_DRIVER_START( system16b_8751 )
MDRV_CPU_VBLANK_INT("screen", i8751_main_cpu_vblank)
MDRV_CPU_ADD("mcu", I8751, MASTER_CLOCK_8MHz)
- MDRV_CPU_IO_MAP(mcu_io_map,0)
+ MDRV_CPU_IO_MAP(mcu_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_pulse)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index 049db6932d0..634a88a836e 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -1261,12 +1261,12 @@ static MACHINE_DRIVER_START( system18 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(system18_map,0)
+ MDRV_CPU_PROGRAM_MAP(system18_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_MACHINE_RESET(system18)
MDRV_NVRAM_HANDLER(system18)
@@ -1304,7 +1304,7 @@ static MACHINE_DRIVER_START( system18_8751 )
MDRV_CPU_VBLANK_INT_HACK(NULL,0)
MDRV_CPU_ADD("mcu", I8751, 8000000)
- MDRV_CPU_IO_MAP(mcu_io_map,0)
+ MDRV_CPU_IO_MAP(mcu_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index 8c4914b8c51..996b7a104f5 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -1781,11 +1781,11 @@ static const ym2151_interface ym2151_config =
static MACHINE_DRIVER_START( system24 )
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(system24_cpu1_map, 0)
+ MDRV_CPU_PROGRAM_MAP(system24_cpu1_map)
MDRV_CPU_VBLANK_INT_HACK(irq_vbl, 2)
MDRV_CPU_ADD("sub", M68000, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(system24_cpu2_map, 0)
+ MDRV_CPU_PROGRAM_MAP(system24_cpu2_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 72d6a6d9149..14bcf8f14b3 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -2157,12 +2157,12 @@ static MACHINE_DRIVER_START( system32 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V60, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(system32_map,0)
+ MDRV_CPU_PROGRAM_MAP(system32_map)
MDRV_CPU_VBLANK_INT("screen", start_of_vblank_int)
MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(system32_sound_map,0)
- MDRV_CPU_IO_MAP(system32_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(system32_sound_map)
+ MDRV_CPU_IO_MAP(system32_sound_portmap)
MDRV_MACHINE_RESET(system32)
MDRV_NVRAM_HANDLER(system32)
@@ -2203,7 +2203,7 @@ static MACHINE_DRIVER_START( system32_v25 )
/* add a V25 for protection */
MDRV_CPU_ADD("mcu", V25, 10000000)
- MDRV_CPU_PROGRAM_MAP(ga2_v25_map,0)
+ MDRV_CPU_PROGRAM_MAP(ga2_v25_map)
MACHINE_DRIVER_END
@@ -2211,12 +2211,12 @@ static MACHINE_DRIVER_START( multi32 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V70, MULTI32_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(multi32_map,0)
+ MDRV_CPU_PROGRAM_MAP(multi32_map)
MDRV_CPU_VBLANK_INT("lscreen", start_of_vblank_int)
MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(multi32_sound_map,0)
- MDRV_CPU_IO_MAP(multi32_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(multi32_sound_map)
+ MDRV_CPU_IO_MAP(multi32_sound_portmap)
MDRV_MACHINE_RESET(system32)
MDRV_NVRAM_HANDLER(system32)
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index 1ed3bc77581..c910e73e1c7 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -1339,14 +1339,14 @@ static MACHINE_DRIVER_START( xboard )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_ADD("sub", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_MACHINE_RESET(xboard)
MDRV_NVRAM_HANDLER(xboard)
@@ -1382,8 +1382,8 @@ static MACHINE_DRIVER_START( smgp )
MDRV_IMPORT_FROM(xboard)
MDRV_CPU_ADD("comm", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(smgp_comm_map,0)
- MDRV_CPU_IO_MAP(smgp_comm_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(smgp_comm_map)
+ MDRV_CPU_IO_MAP(smgp_comm_portmap)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index 6cb99108ff4..3a7cba53434 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -968,17 +968,17 @@ static MACHINE_DRIVER_START( yboard )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_ADD("subx", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(subx_map,0)
+ MDRV_CPU_PROGRAM_MAP(subx_map)
MDRV_CPU_ADD("suby", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(suby_map,0)
+ MDRV_CPU_PROGRAM_MAP(suby_map)
MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_MACHINE_RESET(yboard)
MDRV_NVRAM_HANDLER(yboard)
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index a16a4ee3ad1..cc48dabce2d 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -1850,11 +1850,11 @@ static MACHINE_DRIVER_START( spi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", I386, 50000000/2) /* Intel 386DX, 25MHz */
- MDRV_CPU_PROGRAM_MAP(spi_map, 0)
+ MDRV_CPU_PROGRAM_MAP(spi_map)
MDRV_CPU_VBLANK_INT("screen", spi_interrupt)
MDRV_CPU_ADD("soundcpu", Z80, 28636360/4)
- MDRV_CPU_PROGRAM_MAP(spisound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(spisound_map)
MDRV_QUANTUM_TIME(HZ(12000))
@@ -2168,7 +2168,7 @@ static MACHINE_DRIVER_START( seibu386 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", I386, 40000000) /* AMD 386DX, 40MHz */
- MDRV_CPU_PROGRAM_MAP(seibu386_map, 0)
+ MDRV_CPU_PROGRAM_MAP(seibu386_map)
MDRV_CPU_VBLANK_INT("screen", spi_interrupt)
MDRV_NVRAM_HANDLER(sxx2f)
@@ -2223,7 +2223,7 @@ static MACHINE_DRIVER_START( sys386f2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", I386, 25000000) /* 25mhz */
- MDRV_CPU_PROGRAM_MAP(sys386f2_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sys386f2_map)
MDRV_CPU_VBLANK_INT("screen", spi_interrupt)
/* no z80? */
diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c
index e163c595764..255485e4372 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -401,12 +401,12 @@ static MACHINE_DRIVER_START( nvram )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("mcu", NSC8105, 6000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(mcu_nvram_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_nvram_map)
MDRV_QUANTUM_TIME(HZ(1200)) /* 20 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -445,7 +445,7 @@ static MACHINE_DRIVER_START( no_nvram )
/* basic machine hardware */
MDRV_IMPORT_FROM(nvram)
MDRV_CPU_MODIFY("mcu")
- MDRV_CPU_PROGRAM_MAP(mcu_no_nvram_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_no_nvram_map)
MDRV_NVRAM_HANDLER(NULL)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c
index 61f0e7980dc..f3b76707530 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -288,8 +288,8 @@ static MACHINE_DRIVER_START( sengokmj )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30, 16000000/2) /* V30-8 */
- MDRV_CPU_PROGRAM_MAP(sengokmj_map,0)
- MDRV_CPU_IO_MAP(sengokmj_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sengokmj_map)
+ MDRV_CPU_IO_MAP(sengokmj_io_map)
MDRV_CPU_VBLANK_INT("screen", sengokmj_interrupt)
SEIBU_SOUND_SYSTEM_CPU(14318180/4)
diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c
index b35e269f2b4..8ae2a847256 100644
--- a/src/mame/drivers/senjyo.c
+++ b/src/mame/drivers/senjyo.c
@@ -548,13 +548,13 @@ static MACHINE_DRIVER_START( senjyo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(senjyo_map,0)
+ MDRV_CPU_PROGRAM_MAP(senjyo_map)
MDRV_CPU_VBLANK_INT("screen", senjyo_interrupt)
MDRV_CPU_ADD("sub", Z80, 2000000) /* 2 MHz? */
MDRV_CPU_CONFIG(senjyo_daisy_chain)
- MDRV_CPU_PROGRAM_MAP(senjyo_sound_map,0)
- MDRV_CPU_IO_MAP(senjyo_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(senjyo_sound_map)
+ MDRV_CPU_IO_MAP(senjyo_sound_io_map)
MDRV_MACHINE_RESET(senjyo)
@@ -598,10 +598,10 @@ static MACHINE_DRIVER_START( starforb )
/* basic machine hardware */
MDRV_IMPORT_FROM(senjyo)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(starforb_map,0)
+ MDRV_CPU_PROGRAM_MAP(starforb_map)
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(starforb_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(starforb_sound_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index f4f5de34948..5eb36a29997 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -6350,11 +6350,11 @@ static MACHINE_DRIVER_START( tndrcade )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(tndrcade_map,0)
+ MDRV_CPU_PROGRAM_MAP(tndrcade_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(tndrcade_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(tndrcade_sub_map)
MDRV_CPU_VBLANK_INT_HACK(tndrcade_sub_interrupt,TNDRCADE_SUB_INTERRUPTS_NUM)
/* video hardware */
@@ -6399,11 +6399,11 @@ static MACHINE_DRIVER_START( twineagl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(downtown_map,0)
+ MDRV_CPU_PROGRAM_MAP(downtown_map)
MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(twineagl_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(twineagl_sub_map)
MDRV_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM)
/* video hardware */
@@ -6440,11 +6440,11 @@ static MACHINE_DRIVER_START( downtown )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(downtown_map,0)
+ MDRV_CPU_PROGRAM_MAP(downtown_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
MDRV_CPU_ADD("sub", M65C02, XTAL_16MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(downtown_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(downtown_sub_map)
MDRV_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM)
/* video hardware */
@@ -6499,11 +6499,11 @@ static MACHINE_DRIVER_START( usclssic )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(usclssic_map,0)
+ MDRV_CPU_PROGRAM_MAP(usclssic_map)
MDRV_CPU_VBLANK_INT_HACK(calibr50_interrupt,calibr50_INTERRUPTS_NUM)
MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(calibr50_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(calibr50_sub_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* NMI caused by main cpu when writing to the sound latch */
MDRV_MACHINE_RESET(calibr50)
@@ -6546,11 +6546,11 @@ static MACHINE_DRIVER_START( calibr50 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(calibr50_map,0)
+ MDRV_CPU_PROGRAM_MAP(calibr50_map)
MDRV_CPU_VBLANK_INT_HACK(calibr50_interrupt,calibr50_INTERRUPTS_NUM)
MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(calibr50_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(calibr50_sub_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* IRQ: 4/frame
NMI: when the 68k writes the sound latch */
@@ -6590,11 +6590,11 @@ static MACHINE_DRIVER_START( metafox )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(downtown_map,0)
+ MDRV_CPU_PROGRAM_MAP(downtown_map)
MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(metafox_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(metafox_sub_map)
MDRV_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM)
/* video hardware */
@@ -6629,7 +6629,7 @@ static MACHINE_DRIVER_START( atehate )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(atehate_map,0)
+ MDRV_CPU_PROGRAM_MAP(atehate_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -6670,7 +6670,7 @@ static MACHINE_DRIVER_START( blandia )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(blandia_map,0)
+ MDRV_CPU_PROGRAM_MAP(blandia_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -6702,7 +6702,7 @@ static MACHINE_DRIVER_START( blandiap )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(blandiap_map,0)
+ MDRV_CPU_PROGRAM_MAP(blandiap_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -6739,7 +6739,7 @@ static MACHINE_DRIVER_START( blockcar )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(blockcar_map,0)
+ MDRV_CPU_PROGRAM_MAP(blockcar_map)
MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
/* video hardware */
@@ -6774,7 +6774,7 @@ static MACHINE_DRIVER_START( daioh )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(daioh_map,0)
+ MDRV_CPU_PROGRAM_MAP(daioh_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -6814,7 +6814,7 @@ static MACHINE_DRIVER_START( drgnunit )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(drgnunit_map,0)
+ MDRV_CPU_PROGRAM_MAP(drgnunit_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -6848,7 +6848,7 @@ static MACHINE_DRIVER_START( qzkklgy2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(drgnunit_map,0)
+ MDRV_CPU_PROGRAM_MAP(drgnunit_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -6884,7 +6884,7 @@ static MACHINE_DRIVER_START( eightfrc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(wrofaero_map,0)
+ MDRV_CPU_PROGRAM_MAP(wrofaero_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -6924,7 +6924,7 @@ static MACHINE_DRIVER_START( extdwnhl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(extdwnhl_map,0)
+ MDRV_CPU_PROGRAM_MAP(extdwnhl_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -6976,7 +6976,7 @@ static MACHINE_DRIVER_START( gundhara )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(wrofaero_map,0)
+ MDRV_CPU_PROGRAM_MAP(wrofaero_map)
#if __uPD71054_TIMER
// MDRV_CPU_VBLANK_INT("screen", wrofaero_interrupt)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -7025,7 +7025,7 @@ static MACHINE_DRIVER_START( jjsquawk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(wrofaero_map,0)
+ MDRV_CPU_PROGRAM_MAP(wrofaero_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -7056,7 +7056,7 @@ static MACHINE_DRIVER_START( jjsquawb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(jjsquawb_map,0)
+ MDRV_CPU_PROGRAM_MAP(jjsquawb_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -7092,7 +7092,7 @@ static MACHINE_DRIVER_START( kamenrid )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(kamenrid_map,0)
+ MDRV_CPU_PROGRAM_MAP(kamenrid_map)
MDRV_CPU_VBLANK_INT("screen", wrofaero_interrupt)
#if __uPD71054_TIMER
@@ -7132,7 +7132,7 @@ static MACHINE_DRIVER_START( orbs )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14318180/2) /* 7.143 MHz */
- MDRV_CPU_PROGRAM_MAP(orbs_map,0)
+ MDRV_CPU_PROGRAM_MAP(orbs_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -7167,7 +7167,7 @@ static MACHINE_DRIVER_START( krzybowl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(krzybowl_map,0)
+ MDRV_CPU_PROGRAM_MAP(krzybowl_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -7203,7 +7203,7 @@ static MACHINE_DRIVER_START( madshark )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(madshark_map,0)
+ MDRV_CPU_PROGRAM_MAP(madshark_map)
MDRV_CPU_VBLANK_INT("screen", wrofaero_interrupt)
#if __uPD71054_TIMER
@@ -7245,7 +7245,7 @@ static MACHINE_DRIVER_START( msgundam )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(msgundam_map,0)
+ MDRV_CPU_PROGRAM_MAP(msgundam_map)
#if __uPD71054_TIMER
MDRV_CPU_VBLANK_INT("screen", wrofaero_interrupt)
#else
@@ -7290,7 +7290,7 @@ static MACHINE_DRIVER_START( oisipuzl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(oisipuzl_map,0)
+ MDRV_CPU_PROGRAM_MAP(oisipuzl_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -7326,7 +7326,7 @@ static MACHINE_DRIVER_START( triplfun )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(triplfun_map,0)
+ MDRV_CPU_PROGRAM_MAP(triplfun_map)
MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
/* video hardware */
@@ -7360,7 +7360,7 @@ static MACHINE_DRIVER_START( kiwame )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(kiwame_map,0)
+ MDRV_CPU_PROGRAM_MAP(kiwame_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* lev 1-7 are the same. WARNING:
the interrupt table is written to. */
@@ -7399,7 +7399,7 @@ static MACHINE_DRIVER_START( rezon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(wrofaero_map,0)
+ MDRV_CPU_PROGRAM_MAP(wrofaero_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -7437,7 +7437,7 @@ static MACHINE_DRIVER_START( thunderl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(thunderl_map,0)
+ MDRV_CPU_PROGRAM_MAP(thunderl_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
/* video hardware */
@@ -7468,11 +7468,11 @@ static MACHINE_DRIVER_START( wiggie )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(wiggie_map,0)
+ MDRV_CPU_PROGRAM_MAP(wiggie_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(wiggie_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(wiggie_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -7501,7 +7501,7 @@ static MACHINE_DRIVER_START( wits )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(thunderl_map,0)
+ MDRV_CPU_PROGRAM_MAP(thunderl_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
/* video hardware */
@@ -7536,7 +7536,7 @@ static MACHINE_DRIVER_START( umanclub )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(umanclub_map,0)
+ MDRV_CPU_PROGRAM_MAP(umanclub_map)
MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
/* video hardware */
@@ -7571,12 +7571,12 @@ static MACHINE_DRIVER_START( utoukond )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(utoukond_map,0)
+ MDRV_CPU_PROGRAM_MAP(utoukond_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
MDRV_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(utoukond_sound_map,0)
- MDRV_CPU_IO_MAP(utoukond_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(utoukond_sound_map)
+ MDRV_CPU_IO_MAP(utoukond_sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -7615,7 +7615,7 @@ static MACHINE_DRIVER_START( wrofaero )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(wrofaero_map,0)
+ MDRV_CPU_PROGRAM_MAP(wrofaero_map)
#if __uPD71054_TIMER
MDRV_CPU_VBLANK_INT("screen", wrofaero_interrupt)
#else
@@ -7665,7 +7665,7 @@ static MACHINE_DRIVER_START( zingzip )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(wrofaero_map,0)
+ MDRV_CPU_PROGRAM_MAP(wrofaero_map)
MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
/* video hardware */
@@ -7700,7 +7700,7 @@ static MACHINE_DRIVER_START( pairlove )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(pairlove_map,0)
+ MDRV_CPU_PROGRAM_MAP(pairlove_map)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* video hardware */
@@ -7744,7 +7744,7 @@ static MACHINE_DRIVER_START( crazyfgt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(crazyfgt_map,0)
+ MDRV_CPU_PROGRAM_MAP(crazyfgt_map)
MDRV_CPU_VBLANK_INT_HACK(crazyfgt_interrupt,1+5)
/* video hardware */
@@ -7835,7 +7835,7 @@ static MACHINE_DRIVER_START( inttoote )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(inttoote_map,0)
+ MDRV_CPU_PROGRAM_MAP(inttoote_map)
MDRV_CPU_VBLANK_INT_HACK(inttoote_interrupt,8+1+1+1)
MDRV_PIA6821_ADD("pia0", inttoote_pia0_intf)
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index 32395921128..3257a2da687 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -2274,7 +2274,7 @@ static MACHINE_DRIVER_START( mj4simai )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,50000000/3) /* !! TMP68301 @ 16.666666MHz !! */
- MDRV_CPU_PROGRAM_MAP(mj4simai_map,0)
+ MDRV_CPU_PROGRAM_MAP(mj4simai_map)
MDRV_CPU_VBLANK_INT("screen", seta2_interrupt)
MDRV_MACHINE_RESET( tmp68301 )
@@ -2308,7 +2308,7 @@ static MACHINE_DRIVER_START( gundamex )
/* basic machine hardware */
MDRV_IMPORT_FROM(mj4simai)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gundamex_map,0)
+ MDRV_CPU_PROGRAM_MAP(gundamex_map)
MDRV_NVRAM_HANDLER(93C46_gundamex)
@@ -2321,7 +2321,7 @@ static MACHINE_DRIVER_START( grdians )
MDRV_IMPORT_FROM(mj4simai)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(grdians_map,0)
+ MDRV_CPU_PROGRAM_MAP(grdians_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2334,7 +2334,7 @@ static MACHINE_DRIVER_START( myangel )
/* basic machine hardware */
MDRV_IMPORT_FROM(mj4simai)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(myangel_map,0)
+ MDRV_CPU_PROGRAM_MAP(myangel_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2349,7 +2349,7 @@ static MACHINE_DRIVER_START( myangel2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(mj4simai)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(myangel2_map,0)
+ MDRV_CPU_PROGRAM_MAP(myangel2_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2364,7 +2364,7 @@ static MACHINE_DRIVER_START( pzlbowl )
/* basic machine hardware */
MDRV_IMPORT_FROM(mj4simai)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pzlbowl_map,0)
+ MDRV_CPU_PROGRAM_MAP(pzlbowl_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2377,7 +2377,7 @@ static MACHINE_DRIVER_START( penbros )
/* basic machine hardware */
MDRV_IMPORT_FROM(mj4simai)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(penbros_map,0)
+ MDRV_CPU_PROGRAM_MAP(penbros_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2389,7 +2389,7 @@ static MACHINE_DRIVER_START( samshoot )
/* basic machine hardware */
MDRV_IMPORT_FROM(mj4simai)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(samshoot_map,0)
+ MDRV_CPU_PROGRAM_MAP(samshoot_map)
MDRV_CPU_VBLANK_INT_HACK(samshoot_interrupt,2)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -2449,12 +2449,12 @@ static MACHINE_RESET( funcube )
static MACHINE_DRIVER_START( funcube )
MDRV_CPU_ADD("maincpu", M68040, XTAL_25_447MHz) // !! XCF5206 actually !!
- MDRV_CPU_PROGRAM_MAP(funcube_map, 0)
+ MDRV_CPU_PROGRAM_MAP(funcube_map)
MDRV_CPU_VBLANK_INT_HACK(funcube_interrupt,2)
MDRV_CPU_ADD("sub", H83007, FUNCUBE_SUB_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(funcube_sub_map, 0)
- MDRV_CPU_IO_MAP(funcube_sub_io, 0)
+ MDRV_CPU_PROGRAM_MAP(funcube_sub_map)
+ MDRV_CPU_IO_MAP(funcube_sub_io)
MDRV_CPU_PERIODIC_INT(funcube_sub_timer_irq, 60*10 )
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index 9132345fd8f..b65ee3cff95 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -809,16 +809,16 @@ static MACHINE_DRIVER_START( sf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ? (xtal is 16MHz) */
- MDRV_CPU_PROGRAM_MAP(sf_map,0)
+ MDRV_CPU_PROGRAM_MAP(sf_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* ? xtal is 3.579545MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* NMIs are caused by the main CPU */
MDRV_CPU_ADD("audio2", Z80, 3579545) /* ? xtal is 3.579545MHz */
- MDRV_CPU_PROGRAM_MAP(sound2_map,0)
- MDRV_CPU_IO_MAP(sound2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound2_map)
+ MDRV_CPU_IO_MAP(sound2_io_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,8000)
/* video hardware */
@@ -860,7 +860,7 @@ static MACHINE_DRIVER_START( sfus )
/* basic machine hardware */
MDRV_IMPORT_FROM(sf)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sfus_map,0)
+ MDRV_CPU_PROGRAM_MAP(sfus_map)
MACHINE_DRIVER_END
@@ -869,7 +869,7 @@ static MACHINE_DRIVER_START( sfjp )
/* basic machine hardware */
MDRV_IMPORT_FROM(sf)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sfjp_map,0)
+ MDRV_CPU_PROGRAM_MAP(sfjp_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c
index 0d8789ba62c..c5d9f597388 100644
--- a/src/mame/drivers/sfbonus.c
+++ b/src/mame/drivers/sfbonus.c
@@ -941,8 +941,8 @@ static NVRAM_HANDLER( sfbonus )
static MACHINE_DRIVER_START( sfbonus )
MDRV_CPU_ADD("maincpu", Z80, 6000000) // custom packaged z80 CPU ?? Mhz
- MDRV_CPU_PROGRAM_MAP(0,sfbonus_map)
- MDRV_CPU_IO_MAP(0,sfbonus_io)
+ MDRV_CPU_PROGRAM_MAP(sfbonus_map)
+ MDRV_CPU_IO_MAP(sfbonus_io)
MDRV_CPU_VBLANK_INT("screen",irq0_line_hold)
//MDRV_CPU_PERIODIC_INT(nmi_line_pulse,100)
diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c
index d186f2da57f..8f08d4a6cc6 100644
--- a/src/mame/drivers/sfkick.c
+++ b/src/mame/drivers/sfkick.c
@@ -457,15 +457,15 @@ static const ym2203_interface ym2203_config =
static MACHINE_DRIVER_START( sfkick )
MDRV_CPU_ADD("maincpu",Z80,MASTER_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(sfkick_map,0)
- MDRV_CPU_IO_MAP(sfkick_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sfkick_map)
+ MDRV_CPU_IO_MAP(sfkick_io_map)
MDRV_CPU_VBLANK_INT_HACK(sfkick_interrupt,262)
MDRV_QUANTUM_TIME(HZ(60000))
MDRV_CPU_ADD("soundcpu",Z80,MASTER_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(sfkick_sound_map,0)
- MDRV_CPU_IO_MAP(sfkick_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sfkick_sound_map)
+ MDRV_CPU_IO_MAP(sfkick_sound_io_map)
MDRV_SCREEN_ADD("screen", RASTER)
MDRV_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c
index 4e5bf7e9cd1..294e8047bdf 100644
--- a/src/mame/drivers/sg1000a.c
+++ b/src/mame/drivers/sg1000a.c
@@ -266,8 +266,8 @@ static const ppi8255_interface ppi8255_intf =
static MACHINE_DRIVER_START( sg1000a )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(program_map, 0)
- MDRV_CPU_IO_MAP(io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(program_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", sg1000a_interrupt)
MDRV_PPI8255_ADD( "ppi8255", ppi8255_intf )
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 5dfb4470763..82c54922e8a 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -513,11 +513,11 @@ static const ym2151_interface ym2151_config =
static MACHINE_DRIVER_START( shadfrce )
MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(shadfrce_map,0)
+ MDRV_CPU_PROGRAM_MAP(shadfrce_map)
MDRV_TIMER_ADD_SCANLINE("scantimer", shadfrce_scanline, "screen", 0, 1)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(shadfrce_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(shadfrce_sound_map)
MDRV_SCREEN_ADD("screen", RASTER)
MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index f2fa2d4f818..7fbdf74a516 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -480,7 +480,7 @@ static MACHINE_DRIVER_START( shangha3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(shangha3_map,0)
+ MDRV_CPU_PROGRAM_MAP(shangha3_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
/* video hardware */
@@ -516,12 +516,12 @@ static MACHINE_DRIVER_START( heberpop )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(heberpop_map,0)
+ MDRV_CPU_PROGRAM_MAP(heberpop_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 6000000) /* 6 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(heberpop_sound_map,0)
- MDRV_CPU_IO_MAP(heberpop_sound_io_map,0) /* NMI triggered by YM3438 */
+ MDRV_CPU_PROGRAM_MAP(heberpop_sound_map)
+ MDRV_CPU_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
@@ -557,12 +557,12 @@ static MACHINE_DRIVER_START( blocken )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(blocken_map,0)
+ MDRV_CPU_PROGRAM_MAP(blocken_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 6000000) /* 6 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(heberpop_sound_map,0)
- MDRV_CPU_IO_MAP(heberpop_sound_io_map,0) /* NMI triggered by YM3438 */
+ MDRV_CPU_PROGRAM_MAP(heberpop_sound_map)
+ MDRV_CPU_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index f3d7d0cf64d..284ae8bd820 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -425,8 +425,8 @@ static MACHINE_DRIVER_START( shanghai )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,16000000/2) /* ? */
- MDRV_CPU_PROGRAM_MAP(shanghai_map,0)
- MDRV_CPU_IO_MAP(shanghai_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(shanghai_map)
+ MDRV_CPU_IO_MAP(shanghai_portmap)
MDRV_CPU_VBLANK_INT("screen", shanghai_interrupt)
/* video hardware */
@@ -458,8 +458,8 @@ static MACHINE_DRIVER_START( shangha2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,16000000/2) /* ? */
- MDRV_CPU_PROGRAM_MAP(shangha2_map,0)
- MDRV_CPU_IO_MAP(shangha2_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(shangha2_map)
+ MDRV_CPU_IO_MAP(shangha2_portmap)
MDRV_CPU_VBLANK_INT("screen", shanghai_interrupt)
/* video hardware */
@@ -490,7 +490,7 @@ static MACHINE_DRIVER_START( kothello )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30,16000000/2) /* ? */
- MDRV_CPU_PROGRAM_MAP(kothello_map, 0)
+ MDRV_CPU_PROGRAM_MAP(kothello_map)
MDRV_CPU_VBLANK_INT("screen", shanghai_interrupt)
SEIBU3A_SOUND_SYSTEM_CPU(14318180/4)
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index 623cc0174ad..bde24341c6d 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -377,17 +377,17 @@ static MACHINE_DRIVER_START( chinhero )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(chinhero_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(chinhero_main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("bbx", Z80, XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(chinhero_bbx_map,0)
- MDRV_CPU_IO_MAP(chinhero_bbx_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(chinhero_bbx_map)
+ MDRV_CPU_IO_MAP(chinhero_bbx_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(chinhero_sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(chinhero_sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_MACHINE_RESET(chinhero)
@@ -425,14 +425,14 @@ static MACHINE_DRIVER_START( shangkid )
/* basic machine hardware */
MDRV_IMPORT_FROM(chinhero)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(shangkid_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(shangkid_main_map)
MDRV_CPU_MODIFY("bbx")
- MDRV_CPU_PROGRAM_MAP(shangkid_bbx_map,0)
- MDRV_CPU_IO_MAP(shangkid_bbx_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(shangkid_bbx_map)
+ MDRV_CPU_IO_MAP(shangkid_bbx_portmap)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(shangkid_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(shangkid_sound_map)
MDRV_MACHINE_RESET(shangkid)
@@ -470,8 +470,8 @@ static MACHINE_DRIVER_START( dynamski )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(dynamski_map,0)
- MDRV_CPU_IO_MAP(dynamski_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(dynamski_map)
+ MDRV_CPU_IO_MAP(dynamski_portmap)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c
index 7cbfba657ec..ef2ba4555fc 100644
--- a/src/mame/drivers/shaolins.c
+++ b/src/mame/drivers/shaolins.c
@@ -212,7 +212,7 @@ static MACHINE_DRIVER_START( shaolins )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(shaolins_map,0)
+ MDRV_CPU_PROGRAM_MAP(shaolins_map)
MDRV_CPU_VBLANK_INT_HACK(shaolins_interrupt,16) /* 1 IRQ + 8 NMI */
/* video hardware */
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index 91fa72c3bd0..3bd299a65d3 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -219,13 +219,13 @@ static MACHINE_DRIVER_START( shisen )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000) /* 6 MHz ? */
- MDRV_CPU_PROGRAM_MAP(shisen_map,0)
- MDRV_CPU_IO_MAP(shisen_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(shisen_map)
+ MDRV_CPU_IO_MAP(shisen_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, 3579645)
- MDRV_CPU_PROGRAM_MAP(shisen_sound_map,0)
- MDRV_CPU_IO_MAP(shisen_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(shisen_sound_map)
+ MDRV_CPU_IO_MAP(shisen_sound_io_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index 6b040abac4d..e500035ca62 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -273,10 +273,10 @@ static MACHINE_DRIVER_START( shootout )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz? */
- MDRV_CPU_PROGRAM_MAP(shootout_map,0)
+ MDRV_CPU_PROGRAM_MAP(shootout_map)
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(shootout_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(shootout_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -306,7 +306,7 @@ static MACHINE_DRIVER_START( shootouj )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz? */
- MDRV_CPU_PROGRAM_MAP(shootouj_map,0)
+ MDRV_CPU_PROGRAM_MAP(shootouj_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index cc521c75492..32b91479cd0 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -376,17 +376,17 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( shougi )
MDRV_CPU_ADD("maincpu", Z80,10000000/4)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", shougi_vblank_nmi)
MDRV_CPU_ADD("sub", Z80,10000000/4)
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
- MDRV_CPU_IO_MAP(readport_sub,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
+ MDRV_CPU_IO_MAP(readport_sub)
/* NMIs triggered in shougi_vblank_nmi() */
/* MCU */
MDRV_CPU_ADD("mcu", ALPHA8201, 10000000/4/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
MDRV_QUANTUM_TIME(HZ(600))
MDRV_WATCHDOG_VBLANK_INIT(16) // assuming it's the same as champbas
diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c
index 74b3235769e..85bca9e8a1c 100644
--- a/src/mame/drivers/shuuz.c
+++ b/src/mame/drivers/shuuz.c
@@ -254,7 +254,7 @@ static MACHINE_DRIVER_START( shuuz )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(shuuz)
MDRV_NVRAM_HANDLER(atarigen)
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index 0062ede39e6..162f04fd65c 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -672,11 +672,11 @@ static MACHINE_DRIVER_START( sidearms )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(sidearms_map,0)
+ MDRV_CPU_PROGRAM_MAP(sidearms_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(sidearms_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sidearms_sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
@@ -717,11 +717,11 @@ static MACHINE_DRIVER_START( turtship )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(turtship_map,0)
+ MDRV_CPU_PROGRAM_MAP(turtship_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(sidearms_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sidearms_sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
@@ -761,12 +761,12 @@ static MACHINE_DRIVER_START( whizz )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(whizz_map,0)
+ MDRV_CPU_PROGRAM_MAP(whizz_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(whizz_sound_map,0)
- MDRV_CPU_IO_MAP(whizz_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(whizz_sound_map)
+ MDRV_CPU_IO_MAP(whizz_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(60000))
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index 02b8c02a8f4..931e7d475c0 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -271,11 +271,11 @@ static MACHINE_DRIVER_START( sidepckt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 2000000) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(sidepckt_map,0)
+ MDRV_CPU_PROGRAM_MAP(sidepckt_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", M6502, 1500000) /* 1.5 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* NMIs are triggered by the main cpu */
/* video hardware */
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index b5962b9e750..b830a41aa72 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -289,7 +289,7 @@ static MACHINE_DRIVER_START( silkroad )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 16000000)
- MDRV_CPU_PROGRAM_MAP(cpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index 0c5e39b17cc..0b4084c8c08 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -460,7 +460,7 @@ static MACHINE_DRIVER_START( chainrec )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM, 28000000 /* /4 */) /*DE156*/ /* 7.000 MHz */ /* measured at 7.. seems to need 28? */
- MDRV_CPU_PROGRAM_MAP(chainrec_map,0)
+ MDRV_CPU_PROGRAM_MAP(chainrec_map)
MDRV_CPU_VBLANK_INT("screen", simpl156_vbl_interrupt)
MDRV_NVRAM_HANDLER(simpl156) // 93C45
@@ -496,28 +496,28 @@ static MACHINE_DRIVER_START( magdrop )
/* basic machine hardware */
MDRV_IMPORT_FROM(chainrec)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(magdrop_map,0)
+ MDRV_CPU_PROGRAM_MAP(magdrop_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( magdropp )
/* basic machine hardware */
MDRV_IMPORT_FROM(chainrec)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(magdropp_map,0)
+ MDRV_CPU_PROGRAM_MAP(magdropp_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( joemacr )
/* basic machine hardware */
MDRV_IMPORT_FROM(chainrec)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(joemacr_map,0)
+ MDRV_CPU_PROGRAM_MAP(joemacr_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mitchell156 )
/* basic machine hardware */
MDRV_IMPORT_FROM(chainrec)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mitchell156_map,0)
+ MDRV_CPU_PROGRAM_MAP(mitchell156_map)
MDRV_SOUND_REPLACE("okimusic", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_pin7high)
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index 2ae9ffccb9b..60a8f182fb0 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -260,11 +260,11 @@ static MACHINE_DRIVER_START( simpsons )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* pin 18 of konami cpu is 12Mhz, while pin 17 is 3mhz. Clock probably divided internally by 4 */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", simpsons_irq) /* IRQ triggered by the 052109, FIRQ by the sprite hardware */
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_map)
/* NMIs are generated by the 053260 */
MDRV_MACHINE_RESET(simpsons)
diff --git a/src/mame/drivers/skimaxx.c b/src/mame/drivers/skimaxx.c
index 3e05eea2ee5..497a3851e42 100644
--- a/src/mame/drivers/skimaxx.c
+++ b/src/mame/drivers/skimaxx.c
@@ -234,15 +234,15 @@ static MACHINE_RESET( skimaxx )
static MACHINE_DRIVER_START( skimaxx )
MDRV_CPU_ADD("maincpu", M68020, XTAL_40MHz) // TODO: Should be a 68030!
- MDRV_CPU_PROGRAM_MAP(68030_1_map, 0)
+ MDRV_CPU_PROGRAM_MAP(68030_1_map)
// MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
MDRV_CPU_ADD("subcpu", M68020, XTAL_40MHz)
- MDRV_CPU_PROGRAM_MAP(68030_2_map, 0) // TODO: Should be a 68030!
+ MDRV_CPU_PROGRAM_MAP(68030_2_map) // TODO: Should be a 68030!
MDRV_CPU_ADD("tms", TMS34010, XTAL_50MHz)
MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(tms_program_map, 0)
+ MDRV_CPU_PROGRAM_MAP(tms_program_map)
MDRV_MACHINE_RESET(skimaxx)
diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c
index c9663722508..66f72c95283 100644
--- a/src/mame/drivers/skullxbo.c
+++ b/src/mame/drivers/skullxbo.c
@@ -247,7 +247,7 @@ static MACHINE_DRIVER_START( skullxbo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_MACHINE_RESET(skullxbo)
diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c
index 92f8e81806b..4f9214ef598 100644
--- a/src/mame/drivers/skyarmy.c
+++ b/src/mame/drivers/skyarmy.c
@@ -237,8 +237,8 @@ GFXDECODE_END
static MACHINE_DRIVER_START( skyarmy )
MDRV_CPU_ADD("maincpu", Z80,4000000)
- MDRV_CPU_PROGRAM_MAP(skyarmy_map,0)
- MDRV_CPU_IO_MAP(skyarmy_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(skyarmy_map)
+ MDRV_CPU_IO_MAP(skyarmy_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_PERIODIC_INT(skyarmy_nmi_source,650) /* Hz */
diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c
index 2c3f9c83864..bdc210c42e4 100644
--- a/src/mame/drivers/skydiver.c
+++ b/src/mame/drivers/skydiver.c
@@ -375,7 +375,7 @@ static MACHINE_DRIVER_START( skydiver )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6800,MASTER_CLOCK/16) /* ???? */
- MDRV_CPU_PROGRAM_MAP(skydiver_map, 0)
+ MDRV_CPU_PROGRAM_MAP(skydiver_map)
MDRV_CPU_VBLANK_INT_HACK(skydiver_interrupt, 5)
MDRV_WATCHDOG_VBLANK_INIT(8) // 128V clocks the same as VBLANK
diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c
index 1a4f3a5a0f9..220dc27baee 100644
--- a/src/mame/drivers/skyfox.c
+++ b/src/mame/drivers/skyfox.c
@@ -234,11 +234,11 @@ static MACHINE_DRIVER_START( skyfox )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(skyfox_map,0)
+ MDRV_CPU_PROGRAM_MAP(skyfox_map)
MDRV_CPU_VBLANK_INT("screen", skyfox_interrupt) /* NMI caused by coin insertion */
MDRV_CPU_ADD("audiocpu", Z80, 1748000)
- MDRV_CPU_PROGRAM_MAP(skyfox_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(skyfox_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index 44aa8f435e8..7caacf8adba 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -444,12 +444,12 @@ static MACHINE_DRIVER_START( skykid )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809,49152000/32)
- MDRV_CPU_PROGRAM_MAP(skykid_map,0)
+ MDRV_CPU_PROGRAM_MAP(skykid_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("mcu", HD63701,49152000/8) /* or compatible 6808 with extra instructions */
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
- MDRV_CPU_IO_MAP(mcu_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MDRV_CPU_IO_MAP(mcu_port_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_QUANTUM_TIME(HZ(6000)) /* we need heavy synch */
diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c
index 97d85929d04..bd432cd7c34 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -660,8 +660,8 @@ static MACHINE_DRIVER_START( skylncr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(mem_map_skylncr,0)
- MDRV_CPU_IO_MAP(io_map_skylncr,0)
+ MDRV_CPU_PROGRAM_MAP(mem_map_skylncr)
+ MDRV_CPU_IO_MAP(io_map_skylncr)
MDRV_CPU_VBLANK_INT("screen", skylncr_vblank_interrupt)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c
index f6678ccbd04..da40af960af 100644
--- a/src/mame/drivers/skyraid.c
+++ b/src/mame/drivers/skyraid.c
@@ -238,7 +238,7 @@ static MACHINE_DRIVER_START( skyraid )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 12096000 / 12)
- MDRV_CPU_PROGRAM_MAP(skyraid_map, 0)
+ MDRV_CPU_PROGRAM_MAP(skyraid_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index f8b9d98fb15..2c82d7a91d4 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -874,12 +874,12 @@ static MACHINE_DRIVER_START( perfrman )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,16000000/4) /* 4MHz ???, 16MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(perfrman_map,0)
- MDRV_CPU_IO_MAP(slapfght_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(perfrman_map)
+ MDRV_CPU_IO_MAP(slapfght_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,16000000/8) /* 2MHz ???, 16MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(perfrman_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(perfrman_sound_map)
MDRV_CPU_VBLANK_INT_HACK(getstar_interrupt,4) /* music speed, verified */
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -921,12 +921,12 @@ static MACHINE_DRIVER_START( tigerhb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(tigerh_map,0)
- MDRV_CPU_IO_MAP(tigerhb_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(tigerh_map)
+ MDRV_CPU_IO_MAP(tigerhb_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(slapfght_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(slapfght_sound_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,6) /* ??? */
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -967,16 +967,16 @@ static MACHINE_DRIVER_START( tigerh )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_36MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tigerh_map,0)
- MDRV_CPU_IO_MAP(tigerh_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(tigerh_map)
+ MDRV_CPU_IO_MAP(tigerh_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_36MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(slapfght_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(slapfght_sound_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,6) /* ??? */
MDRV_CPU_ADD("mcu", M68705,XTAL_36MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tigerh_m68705_map,0)
+ MDRV_CPU_PROGRAM_MAP(tigerh_m68705_map)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -1017,12 +1017,12 @@ static MACHINE_DRIVER_START( slapfigh )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80, XTAL_36MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(slapfght_map,0)
- MDRV_CPU_IO_MAP(slapfght_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(slapfght_map)
+ MDRV_CPU_IO_MAP(slapfght_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_36MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(slapfght_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(slapfght_sound_map)
MDRV_CPU_VBLANK_INT_HACK(getstar_interrupt, 3)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -1065,7 +1065,7 @@ static MACHINE_DRIVER_START( slapbtuk )
/* basic machine hardware */
MDRV_IMPORT_FROM(slapfigh)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(slapbtuk_map,0)
+ MDRV_CPU_PROGRAM_MAP(slapbtuk_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index 48da54f482c..5df2f29e451 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -518,11 +518,11 @@ static MACHINE_DRIVER_START( slapshot )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
- MDRV_CPU_PROGRAM_MAP(slapshot_map,0)
+ MDRV_CPU_PROGRAM_MAP(slapshot_map)
MDRV_CPU_VBLANK_INT("screen", slapshot_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,32000000/8) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(opwolf3_z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(opwolf3_z80_sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -560,11 +560,11 @@ static MACHINE_DRIVER_START( opwolf3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
- MDRV_CPU_PROGRAM_MAP(opwolf3_map,0)
+ MDRV_CPU_PROGRAM_MAP(opwolf3_map)
MDRV_CPU_VBLANK_INT("screen", slapshot_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,32000000/8) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(opwolf3_z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(opwolf3_z80_sound_map)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c
index b21d2c54520..b9581cca2af 100644
--- a/src/mame/drivers/sliver.c
+++ b/src/mame/drivers/sliver.c
@@ -534,12 +534,12 @@ static INTERRUPT_GEN( sliver_int )
static MACHINE_DRIVER_START( sliver )
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(sliver_map,0)
+ MDRV_CPU_PROGRAM_MAP(sliver_map)
MDRV_CPU_VBLANK_INT_HACK(sliver_int,3)
MDRV_CPU_ADD("audiocpu", I8051, 8000000)
- MDRV_CPU_PROGRAM_MAP(soundmem_prg,0)
- MDRV_CPU_IO_MAP(soundmem_io,0)
+ MDRV_CPU_PROGRAM_MAP(soundmem_prg)
+ MDRV_CPU_IO_MAP(soundmem_io)
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/slotcarn.c b/src/mame/drivers/slotcarn.c
index 21f48cf3999..734e3208f99 100644
--- a/src/mame/drivers/slotcarn.c
+++ b/src/mame/drivers/slotcarn.c
@@ -593,8 +593,8 @@ static MACHINE_DRIVER_START( slotcarn )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK) // 2.5 Mhz?
- MDRV_CPU_PROGRAM_MAP(slotcarn_map,0)
- MDRV_CPU_IO_MAP(spielbud_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(slotcarn_map)
+ MDRV_CPU_IO_MAP(spielbud_io_map)
/* 3x 8255 */
MDRV_PPI8255_ADD( "ppi8255_0", scarn_ppi8255_intf[0] )
diff --git a/src/mame/drivers/sms.c b/src/mame/drivers/sms.c
index 2a43af1c510..818fc955a06 100644
--- a/src/mame/drivers/sms.c
+++ b/src/mame/drivers/sms.c
@@ -532,10 +532,10 @@ static MACHINE_RESET( sms )
static MACHINE_DRIVER_START( sms )
MDRV_CPU_ADD("maincpu", I8088, XTAL_24MHz/8)
- MDRV_CPU_PROGRAM_MAP(sms_map,0)
+ MDRV_CPU_PROGRAM_MAP(sms_map)
MDRV_CPU_ADD("soundcpu", Z80, XTAL_16MHz/8)
- MDRV_CPU_PROGRAM_MAP(sub_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -572,7 +572,7 @@ static MACHINE_DRIVER_START(sureshot)
MDRV_IMPORT_FROM(sms)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sureshot_map,0)
+ MDRV_CPU_PROGRAM_MAP(sureshot_map)
MDRV_MACHINE_START(sureshot)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/snesb.c b/src/mame/drivers/snesb.c
index f0d831e4a5a..fa1718b8e3c 100644
--- a/src/mame/drivers/snesb.c
+++ b/src/mame/drivers/snesb.c
@@ -544,11 +544,11 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( kinstb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", G65816, 3580000) /* 2.68Mhz, also 3.58Mhz */
- MDRV_CPU_PROGRAM_MAP(snesb_map, 0)
+ MDRV_CPU_PROGRAM_MAP(snesb_map)
/* audio CPU */
MDRV_CPU_ADD("soundcpu", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */
- MDRV_CPU_PROGRAM_MAP(spc_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(spc_mem)
MDRV_QUANTUM_TIME(HZ(36000))
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index a04d7017866..c72da2c2b01 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -3567,16 +3567,16 @@ static MACHINE_DRIVER_START( marvins )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3360000) /* 3.36 MHz */
- MDRV_CPU_PROGRAM_MAP(marvins_cpuA_map,0)
+ MDRV_CPU_PROGRAM_MAP(marvins_cpuA_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, 3360000) /* 3.36 MHz */
- MDRV_CPU_PROGRAM_MAP(marvins_cpuB_map,0)
+ MDRV_CPU_PROGRAM_MAP(marvins_cpuB_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* verified on schematics */
- MDRV_CPU_PROGRAM_MAP(marvins_sound_map,0)
- MDRV_CPU_IO_MAP(marvins_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(marvins_sound_map)
+ MDRV_CPU_IO_MAP(marvins_sound_portmap)
MDRV_CPU_PERIODIC_INT(nmi_line_assert, 244) // schematics show a separate 244Hz timer
MDRV_QUANTUM_TIME(HZ(6000))
@@ -3617,10 +3617,10 @@ static MACHINE_DRIVER_START( vangrd2 )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(madcrash_cpuA_map,0)
+ MDRV_CPU_PROGRAM_MAP(madcrash_cpuA_map)
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(madcrash_cpuB_map,0)
+ MDRV_CPU_PROGRAM_MAP(madcrash_cpuB_map)
MACHINE_DRIVER_END
@@ -3628,16 +3628,16 @@ static MACHINE_DRIVER_START( jcross )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3350000) /* NOT verified */
- MDRV_CPU_PROGRAM_MAP(jcross_cpuA_map,0)
+ MDRV_CPU_PROGRAM_MAP(jcross_cpuA_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, 3350000) /* NOT verified */
- MDRV_CPU_PROGRAM_MAP(jcross_cpuB_map,0)
+ MDRV_CPU_PROGRAM_MAP(jcross_cpuB_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* NOT verified */
- MDRV_CPU_PROGRAM_MAP(jcross_sound_map,0)
- MDRV_CPU_IO_MAP(jcross_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(jcross_sound_map)
+ MDRV_CPU_IO_MAP(jcross_sound_portmap)
MDRV_CPU_PERIODIC_INT(irq0_line_assert, 244) // Marvin's frequency, sounds ok
MDRV_QUANTUM_TIME(HZ(6000))
@@ -3675,10 +3675,10 @@ static MACHINE_DRIVER_START( sgladiat )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sgladiat_cpuA_map,0)
+ MDRV_CPU_PROGRAM_MAP(sgladiat_cpuA_map)
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(sgladiat_cpuB_map,0)
+ MDRV_CPU_PROGRAM_MAP(sgladiat_cpuB_map)
/* video hardware */
/* visible area is correct. Debug info is shown in the black bars at the sides
@@ -3694,14 +3694,14 @@ static MACHINE_DRIVER_START( hal21 )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hal21_cpuA_map,0)
+ MDRV_CPU_PROGRAM_MAP(hal21_cpuA_map)
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(hal21_cpuB_map,0)
+ MDRV_CPU_PROGRAM_MAP(hal21_cpuB_map)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(hal21_sound_map,0)
- MDRV_CPU_IO_MAP(hal21_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(hal21_sound_map)
+ MDRV_CPU_IO_MAP(hal21_sound_portmap)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, 220) // music tempo, hand tuned
/* video hardware */
@@ -3713,15 +3713,15 @@ static MACHINE_DRIVER_START( tnk3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_13_4MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tnk3_cpuA_map,0)
+ MDRV_CPU_PROGRAM_MAP(tnk3_cpuA_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, XTAL_13_4MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tnk3_cpuB_map,0)
+ MDRV_CPU_PROGRAM_MAP(tnk3_cpuB_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tnk3_YM3526_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(tnk3_YM3526_sound_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -3756,13 +3756,13 @@ static MACHINE_DRIVER_START( aso )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(aso_cpuA_map,0)
+ MDRV_CPU_PROGRAM_MAP(aso_cpuA_map)
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(aso_cpuB_map,0)
+ MDRV_CPU_PROGRAM_MAP(aso_cpuB_map)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(aso_YM3526_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(aso_YM3526_sound_map)
/* video hardware */
MDRV_VIDEO_START(aso)
@@ -3775,7 +3775,7 @@ static MACHINE_DRIVER_START( athena )
/* basic machine hardware */
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map)
/* sound hardware */
MDRV_SOUND_ADD("ym2", YM3526, XTAL_8MHz/2) /* verified on pcb */
@@ -3791,7 +3791,7 @@ static MACHINE_DRIVER_START( fitegolf )
/* basic machine hardware */
MDRV_CPU_MODIFY("audiocpu")
// xtal is 4MHz instead of 8MHz/2 but the end result is the same
- MDRV_CPU_PROGRAM_MAP(YM3812_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(YM3812_sound_map)
/* sound hardware */
MDRV_SOUND_REPLACE("ym1", YM3812, XTAL_4MHz) /* verified on pcb */
@@ -3804,15 +3804,15 @@ static MACHINE_DRIVER_START( ikari )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_13_4MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(ikari_cpuA_map,0)
+ MDRV_CPU_PROGRAM_MAP(ikari_cpuA_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, XTAL_13_4MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(ikari_cpuB_map,0)
+ MDRV_CPU_PROGRAM_MAP(ikari_cpuB_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -3851,7 +3851,7 @@ static MACHINE_DRIVER_START( victroad )
/* basic machine hardware */
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
/* sound hardware */
MDRV_SOUND_REPLACE("ym2", Y8950, XTAL_8MHz/2) /* verified on pcb */
@@ -3864,15 +3864,15 @@ static MACHINE_DRIVER_START( bermudat )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(bermudat_cpuA_map,0)
+ MDRV_CPU_PROGRAM_MAP(bermudat_cpuA_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(bermudat_cpuB_map,0)
+ MDRV_CPU_PROGRAM_MAP(bermudat_cpuB_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
MDRV_QUANTUM_TIME(HZ(24000))
@@ -3919,10 +3919,10 @@ static MACHINE_DRIVER_START( gwar )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gwar_cpuA_map,0)
+ MDRV_CPU_PROGRAM_MAP(gwar_cpuA_map)
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(gwar_cpuB_map,0)
+ MDRV_CPU_PROGRAM_MAP(gwar_cpuB_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -3938,10 +3938,10 @@ static MACHINE_DRIVER_START( gwara )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gwara_cpuA_map,0)
+ MDRV_CPU_PROGRAM_MAP(gwara_cpuA_map)
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(gwara_cpuB_map,0)
+ MDRV_CPU_PROGRAM_MAP(gwara_cpuB_map)
MACHINE_DRIVER_END
@@ -3951,10 +3951,10 @@ static MACHINE_DRIVER_START( chopper1 )
/* basic machine hardware */
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(gwar_cpuB_map,0)
+ MDRV_CPU_PROGRAM_MAP(gwar_cpuB_map)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(YM3812_Y8950_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(YM3812_Y8950_sound_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -3975,7 +3975,7 @@ static MACHINE_DRIVER_START( choppera )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gwar_cpuA_map,0)
+ MDRV_CPU_PROGRAM_MAP(gwar_cpuA_map)
MACHINE_DRIVER_END
@@ -3983,15 +3983,15 @@ static MACHINE_DRIVER_START( tdfever )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(tdfever_cpuA_map,0)
+ MDRV_CPU_PROGRAM_MAP(tdfever_cpuA_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(tdfever_cpuB_map,0)
+ MDRV_CPU_PROGRAM_MAP(tdfever_cpuB_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -4030,7 +4030,7 @@ static MACHINE_DRIVER_START( tdfever2 )
/* basic machine hardware */
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(Y8950_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(Y8950_sound_map)
/* sound hardware */
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index 6b7c20181c3..d398aaacdf7 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -601,12 +601,12 @@ static MACHINE_DRIVER_START( pow )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_18MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(pow_map,0)
+ MDRV_CPU_PROGRAM_MAP(pow_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -639,7 +639,7 @@ static MACHINE_DRIVER_START( searchar )
MDRV_IMPORT_FROM(pow)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(searchar_map,0)
+ MDRV_CPU_PROGRAM_MAP(searchar_map)
MDRV_VIDEO_START(searchar)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c
index fd9eb23fddd..3892689a356 100644
--- a/src/mame/drivers/snookr10.c
+++ b/src/mame/drivers/snookr10.c
@@ -757,7 +757,7 @@ static MACHINE_DRIVER_START( snookr10 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M65SC02, MASTER_CLOCK/8) /* 2 MHz (1.999 MHz measured) */
- MDRV_CPU_PROGRAM_MAP(snookr10_map, 0)
+ MDRV_CPU_PROGRAM_MAP(snookr10_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -803,7 +803,7 @@ static MACHINE_DRIVER_START( tenballs )
/* basic machine hardware */
MDRV_IMPORT_FROM(snookr10)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tenballs_map, 0)
+ MDRV_CPU_PROGRAM_MAP(tenballs_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index 6e91e2fc422..c256d939407 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -1518,12 +1518,12 @@ static MACHINE_DRIVER_START( snowbros )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 Mhz - confirmed */
- MDRV_CPU_PROGRAM_MAP(snowbros_map,0)
+ MDRV_CPU_PROGRAM_MAP(snowbros_map)
MDRV_CPU_VBLANK_INT_HACK(snowbros_interrupt,3)
MDRV_CPU_ADD("soundcpu", Z80, 6000000) /* 6 MHz - confirmed */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1553,7 +1553,7 @@ static MACHINE_DRIVER_START( wintbob )
/* basic machine hardware */
MDRV_IMPORT_FROM(snowbros)
MDRV_CPU_REPLACE("maincpu", M68000, 10000000) /* 10mhz - Confirmed */
- MDRV_CPU_PROGRAM_MAP(wintbob_map,0)
+ MDRV_CPU_PROGRAM_MAP(wintbob_map)
/* video hardware */
MDRV_GFXDECODE(wb)
@@ -1567,10 +1567,10 @@ static MACHINE_DRIVER_START( semicom )
/* basic machine hardware */
MDRV_IMPORT_FROM(snowbros)
MDRV_CPU_REPLACE("maincpu", M68000, 16000000) /* 16mhz or 12mhz ? */
- MDRV_CPU_PROGRAM_MAP(hyperpac_map,0)
+ MDRV_CPU_PROGRAM_MAP(hyperpac_map)
MDRV_CPU_REPLACE("soundcpu", Z80, 4000000) /* 4.0 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(hyperpac_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(hyperpac_sound_map)
MDRV_GFXDECODE(hyperpac)
@@ -1593,8 +1593,8 @@ static MACHINE_DRIVER_START( semicom_mcu )
MDRV_IMPORT_FROM(semicom)
MDRV_CPU_ADD("protection", I8052, 16000000) // AT89C52
- MDRV_CPU_PROGRAM_MAP(protection_map,0)
- MDRV_CPU_IO_MAP(protection_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(protection_map)
+ MDRV_CPU_IO_MAP(protection_iomap)
MACHINE_DRIVER_END
@@ -1627,12 +1627,12 @@ static MACHINE_DRIVER_START( honeydol )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(honeydol_map,0)
+ MDRV_CPU_PROGRAM_MAP(honeydol_map)
MDRV_CPU_VBLANK_INT_HACK(snowbros_interrupt,3)
MDRV_CPU_ADD("soundcpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(honeydol_sound_map,0)
- MDRV_CPU_IO_MAP(honeydol_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(honeydol_sound_map)
+ MDRV_CPU_IO_MAP(honeydol_sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1666,12 +1666,12 @@ static MACHINE_DRIVER_START( twinadv )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) // or 12
- MDRV_CPU_PROGRAM_MAP(twinadv_map,0)
+ MDRV_CPU_PROGRAM_MAP(twinadv_map)
MDRV_CPU_VBLANK_INT_HACK(snowbros_interrupt,3)
MDRV_CPU_ADD("soundcpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(twinadv_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(twinadv_sound_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -1719,7 +1719,7 @@ static MACHINE_DRIVER_START( finalttr )
MDRV_IMPORT_FROM(semicom)
MDRV_CPU_REPLACE("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(finalttr_map,0)
+ MDRV_CPU_PROGRAM_MAP(finalttr_map)
MDRV_CPU_REPLACE("soundcpu", Z80, 3578545)
@@ -1746,7 +1746,7 @@ static MACHINE_DRIVER_START( snowbro3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16mhz or 12mhz ? */
- MDRV_CPU_PROGRAM_MAP(snowbros3_map,0)
+ MDRV_CPU_PROGRAM_MAP(snowbros3_map)
MDRV_CPU_VBLANK_INT_HACK(snowbro3_interrupt,3)
/* video hardware */
diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c
index 385cdbea64f..0376c241776 100644
--- a/src/mame/drivers/solomon.c
+++ b/src/mame/drivers/solomon.c
@@ -202,12 +202,12 @@ static MACHINE_DRIVER_START( solomon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz (?????) */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80, 3072000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? */
/* NMIs are caused by the main CPU */
diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c
index cad1a59f3e5..b9c8ed9e896 100644
--- a/src/mame/drivers/sonson.c
+++ b/src/mame/drivers/sonson.c
@@ -227,11 +227,11 @@ static MACHINE_DRIVER_START( sonson )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809,12000000/6) /* 2 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", M6809,12000000/6) /* 2 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* FIRQs are triggered by the main CPU */
diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c
index 9a1e554a8a1..658882037cd 100644
--- a/src/mame/drivers/sothello.c
+++ b/src/mame/drivers/sothello.c
@@ -349,16 +349,16 @@ static MACHINE_DRIVER_START( sothello )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80, MAINCPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(maincpu_mem_map,0)
- MDRV_CPU_IO_MAP(maincpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(maincpu_mem_map)
+ MDRV_CPU_IO_MAP(maincpu_io_map)
MDRV_CPU_VBLANK_INT_HACK(sothello_interrupt,262)
MDRV_CPU_ADD("soundcpu",Z80, SOUNDCPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(soundcpu_mem_map,0)
- MDRV_CPU_IO_MAP(soundcpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(soundcpu_mem_map)
+ MDRV_CPU_IO_MAP(soundcpu_io_map)
MDRV_CPU_ADD("sub",M6809, SUBCPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(subcpu_mem_map,0)
+ MDRV_CPU_PROGRAM_MAP(subcpu_mem_map)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index 4743528eac8..8a28c9cfb33 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -332,12 +332,12 @@ static MACHINE_DRIVER_START( spacefb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, SPACEFB_MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(spacefb_main_map,0)
- MDRV_CPU_IO_MAP(spacefb_main_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(spacefb_main_map)
+ MDRV_CPU_IO_MAP(spacefb_main_io_map)
MDRV_CPU_ADD("audiocpu", I8035, SPACEFB_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(spacefb_audio_map,0)
- MDRV_CPU_IO_MAP(spacefb_audio_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(spacefb_audio_map)
+ MDRV_CPU_IO_MAP(spacefb_audio_io_map)
MDRV_QUANTUM_TIME(HZ(180))
diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c
index b4374c148e7..2e61047cfcf 100644
--- a/src/mame/drivers/spaceg.c
+++ b/src/mame/drivers/spaceg.c
@@ -364,7 +364,7 @@ static MACHINE_DRIVER_START( spaceg )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,2500000) /* 2.5 MHz */
- MDRV_CPU_PROGRAM_MAP(spaceg_map,0)
+ MDRV_CPU_PROGRAM_MAP(spaceg_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* 60 Hz NMIs (verified) */
/* video hardware */
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index b315104f7bf..64ac1498e7b 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -341,11 +341,11 @@ static const ym3812_interface ym3812_config =
static MACHINE_DRIVER_START( spbactn )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(spbactn_map,0)
+ MDRV_CPU_PROGRAM_MAP(spbactn_map)
MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(spbactn_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(spbactn_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c
index f2517dcb4d9..9e6b9917886 100644
--- a/src/mame/drivers/spcforce.c
+++ b/src/mame/drivers/spcforce.c
@@ -245,12 +245,12 @@ static MACHINE_DRIVER_START( spcforce )
/* basic machine hardware */
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
MDRV_CPU_ADD("maincpu", 8085A, 8000000 * 2) /* 4.00 MHz??? */
- MDRV_CPU_PROGRAM_MAP(spcforce_map,0)
+ MDRV_CPU_PROGRAM_MAP(spcforce_map)
MDRV_CPU_VBLANK_INT("screen", irq3_line_pulse)
MDRV_CPU_ADD("audiocpu", I8035, 6144000) /* divisor ??? */
- MDRV_CPU_PROGRAM_MAP(spcforce_sound_map,0)
- MDRV_CPU_IO_MAP(spcforce_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(spcforce_sound_map)
+ MDRV_CPU_IO_MAP(spcforce_sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index 2e935e14dfc..60415342a49 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -435,11 +435,11 @@ static MACHINE_DRIVER_START( spdodgeb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502,12000000/6) /* 2MHz ? */
- MDRV_CPU_PROGRAM_MAP(spdodgeb_map,0)
+ MDRV_CPU_PROGRAM_MAP(spdodgeb_map)
MDRV_CPU_VBLANK_INT_HACK(spdodgeb_interrupt,33) /* 1 IRQ every 8 visible scanlines, plus NMI for vblank */
MDRV_CPU_ADD("audiocpu", M6809,12000000/6) /* 2MHz ? */
- MDRV_CPU_PROGRAM_MAP(spdodgeb_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(spdodgeb_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c
index 2ec20bb34de..6194a7b582c 100644
--- a/src/mame/drivers/speedatk.c
+++ b/src/mame/drivers/speedatk.c
@@ -280,8 +280,8 @@ GFXDECODE_END
static MACHINE_DRIVER_START( speedatk )
MDRV_CPU_ADD("maincpu", Z80,12000000/2)
- MDRV_CPU_PROGRAM_MAP(speedatk_mem,0)
- MDRV_CPU_IO_MAP(speedatk_io,0)
+ MDRV_CPU_PROGRAM_MAP(speedatk_mem)
+ MDRV_CPU_IO_MAP(speedatk_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c
index 31cd2185de5..6582f044308 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -229,13 +229,13 @@ static MACHINE_DRIVER_START( speedbal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_cpu_map,0)
- MDRV_CPU_IO_MAP(main_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_cpu_map)
+ MDRV_CPU_IO_MAP(main_cpu_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 2660000) /* 2.66 MHz ??? Maybe yes */
- MDRV_CPU_PROGRAM_MAP(sound_cpu_map,0)
- MDRV_CPU_IO_MAP(sound_cpu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_cpu_map)
+ MDRV_CPU_IO_MAP(sound_cpu_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8)
/* video hardware */
diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c
index 5b8a7c5322a..b458a890d94 100644
--- a/src/mame/drivers/speedspn.c
+++ b/src/mame/drivers/speedspn.c
@@ -281,12 +281,12 @@ static MACHINE_DRIVER_START( speedspn )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,6000000) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(speedspn_map,0)
- MDRV_CPU_IO_MAP(speedspn_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(speedspn_map)
+ MDRV_CPU_IO_MAP(speedspn_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,6000000) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(speedspn_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(speedspn_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c
index 7a39b6c55d1..44483025001 100644
--- a/src/mame/drivers/speglsht.c
+++ b/src/mame/drivers/speglsht.c
@@ -321,14 +321,14 @@ static MACHINE_RESET(speglsht)
static MACHINE_DRIVER_START( speglsht )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80, 8000000) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(st0016_mem,0)
- MDRV_CPU_IO_MAP(st0016_io,0)
+ MDRV_CPU_PROGRAM_MAP(st0016_mem)
+ MDRV_CPU_IO_MAP(st0016_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", R3000LE, 25000000)
MDRV_CPU_CONFIG(config)
- MDRV_CPU_PROGRAM_MAP(speglsht_mem,0)
+ MDRV_CPU_PROGRAM_MAP(speglsht_mem)
MDRV_CPU_VBLANK_INT("screen", irq4_gen)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c
index 35944f8a952..e759b10f7dc 100644
--- a/src/mame/drivers/spiders.c
+++ b/src/mame/drivers/spiders.c
@@ -707,11 +707,11 @@ static MACHINE_DRIVER_START( spiders )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 2800000)
- MDRV_CPU_PROGRAM_MAP(spiders_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(spiders_main_map)
MDRV_CPU_PERIODIC_INT(update_pia_1, 25)
MDRV_CPU_ADD("audiocpu", M6802, 3000000)
- MDRV_CPU_PROGRAM_MAP(spiders_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(spiders_audio_map)
MDRV_MACHINE_START(spiders)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index e6132c836a4..fe22d86c354 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -395,11 +395,11 @@ static MACHINE_DRIVER_START( splash )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz (24/2) */
- MDRV_CPU_PROGRAM_MAP(splash_map,0)
+ MDRV_CPU_PROGRAM_MAP(splash_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,30000000/8)
- MDRV_CPU_PROGRAM_MAP(splash_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(splash_sound_map)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse,60*64) /* needed for the msm5205 to play the samples */
/* video hardware */
@@ -448,12 +448,12 @@ static MACHINE_DRIVER_START( roldfrog )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz - verified */
- MDRV_CPU_PROGRAM_MAP(roldfrog_map,0)
+ MDRV_CPU_PROGRAM_MAP(roldfrog_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,3000000) /* 3 MHz - verified */
- MDRV_CPU_PROGRAM_MAP(roldfrog_sound_map,0)
- MDRV_CPU_IO_MAP(roldfrog_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(roldfrog_sound_map)
+ MDRV_CPU_IO_MAP(roldfrog_sound_io_map)
// MDRV_CPU_PERIODIC_INT(nmi_line_pulse,60*64) /* needed for the msm5205 to play the samples */
/* video hardware */
@@ -488,11 +488,11 @@ static MACHINE_DRIVER_START( funystrp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz (24/2) */
- MDRV_CPU_PROGRAM_MAP(funystrp_map,0)
+ MDRV_CPU_PROGRAM_MAP(funystrp_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
// MDRV_CPU_ADD("audiocpu", Z80,30000000/8)
-// MDRV_CPU_PROGRAM_MAP(funystrp_sound_map,0)
+// MDRV_CPU_PROGRAM_MAP(funystrp_sound_map)
// MDRV_CPU_PERIODIC_INT(nmi_line_pulse,60*64) /* needed for the msm5205 to play the samples */
/* video hardware */
diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c
index 9a6f542195e..0d00730747b 100644
--- a/src/mame/drivers/spoker.c
+++ b/src/mame/drivers/spoker.c
@@ -357,8 +357,8 @@ static INTERRUPT_GEN( spoker_interrupt )
static MACHINE_DRIVER_START( spoker )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(spoker_map,0)
- MDRV_CPU_IO_MAP(spoker_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(spoker_map)
+ MDRV_CPU_IO_MAP(spoker_portmap)
MDRV_CPU_VBLANK_INT("screen",spoker_interrupt)
MDRV_MACHINE_RESET(spoker)
diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c
index 734f27a7f15..c4b5f6bde4f 100644
--- a/src/mame/drivers/spool99.c
+++ b/src/mame/drivers/spool99.c
@@ -266,7 +266,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( spool99 )
MDRV_CPU_ADD("maincpu", Z80, 24000000/8)
- MDRV_CPU_PROGRAM_MAP(0,spool99_map)
+ MDRV_CPU_PROGRAM_MAP(spool99_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_GFXDECODE(spool99)
diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c
index 7c4f2e253bd..2963472163b 100644
--- a/src/mame/drivers/sprcros2.c
+++ b/src/mame/drivers/sprcros2.c
@@ -271,13 +271,13 @@ static MACHINE_DRIVER_START( sprcros2 )
/* basic machine hardware */
MDRV_CPU_ADD("master", Z80,10000000/2)
- MDRV_CPU_PROGRAM_MAP(sprcros2_master_map,0)
- MDRV_CPU_IO_MAP(sprcros2_master_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sprcros2_master_map)
+ MDRV_CPU_IO_MAP(sprcros2_master_io_map)
MDRV_CPU_VBLANK_INT_HACK(sprcros2_m_interrupt,2) //1 nmi + 1 irq
MDRV_CPU_ADD("slave", Z80,10000000/2)
- MDRV_CPU_PROGRAM_MAP(sprcros2_slave_map,0)
- MDRV_CPU_IO_MAP(sprcros2_slave_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sprcros2_slave_map)
+ MDRV_CPU_IO_MAP(sprcros2_slave_io_map)
MDRV_CPU_VBLANK_INT_HACK(sprcros2_s_interrupt,2) //2 nmis
MDRV_MACHINE_START(sprcros2)
diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c
index 19dcd5ec311..915bb33271a 100644
--- a/src/mame/drivers/sprint2.c
+++ b/src/mame/drivers/sprint2.c
@@ -496,7 +496,7 @@ static MACHINE_DRIVER_START( sprint2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 12096000 / 16)
- MDRV_CPU_PROGRAM_MAP(sprint2_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sprint2_map)
MDRV_CPU_VBLANK_INT("screen", sprint2)
MDRV_WATCHDOG_VBLANK_INIT(8)
diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c
index 81edf599186..2bbea182d07 100644
--- a/src/mame/drivers/sprint4.c
+++ b/src/mame/drivers/sprint4.c
@@ -406,7 +406,7 @@ static MACHINE_DRIVER_START( sprint4 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, PIXEL_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(sprint4_cpu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sprint4_cpu_map)
MDRV_WATCHDOG_VBLANK_INIT(8)
MDRV_MACHINE_RESET(sprint4)
diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c
index 193c899ea99..4deb4ca2cc3 100644
--- a/src/mame/drivers/sprint8.c
+++ b/src/mame/drivers/sprint8.c
@@ -460,7 +460,7 @@ static MACHINE_DRIVER_START( sprint8 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6800, 11055000 / 11) /* ? */
- MDRV_CPU_PROGRAM_MAP(sprint8_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sprint8_map)
MDRV_MACHINE_RESET(sprint8)
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index 80c5b8527f5..4e369b2b93e 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -472,11 +472,11 @@ static MACHINE_DRIVER_START( spy )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(spy_map,0)
+ MDRV_CPU_PROGRAM_MAP(spy_map)
MDRV_CPU_VBLANK_INT("screen", spy_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(spy_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(spy_sound_map)
/* nmi by the sound chip */
/* video hardware */
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index 8dbe79b92ef..1a56c4117d8 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -1026,7 +1026,7 @@ static MACHINE_DRIVER_START( srmp2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(srmp2_map,0)
+ MDRV_CPU_PROGRAM_MAP(srmp2_map)
MDRV_CPU_VBLANK_INT_HACK(srmp2_interrupt,16) /* Interrupt times is not understood */
MDRV_MACHINE_RESET(srmp2)
@@ -1065,8 +1065,8 @@ static MACHINE_DRIVER_START( srmp3 )
MDRV_CPU_ADD("maincpu", Z80, 3500000) /* 3.50 MHz ? */
// 4000000, /* 4.00 MHz ? */
- MDRV_CPU_PROGRAM_MAP(srmp3_map,0)
- MDRV_CPU_IO_MAP(srmp3_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(srmp3_map)
+ MDRV_CPU_IO_MAP(srmp3_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_MACHINE_RESET(srmp3)
@@ -1103,7 +1103,7 @@ static MACHINE_DRIVER_START( mjyuugi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(mjyuugi_map,0)
+ MDRV_CPU_PROGRAM_MAP(mjyuugi_map)
MDRV_CPU_VBLANK_INT_HACK(srmp2_interrupt,16) /* Interrupt times is not understood */
MDRV_MACHINE_RESET(srmp2)
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index 8984689a193..9c90c92cd8e 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -514,13 +514,13 @@ GFXDECODE_END
static MACHINE_DRIVER_START( srmp5 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,8000000)
- MDRV_CPU_PROGRAM_MAP(st0016_mem,0)
- MDRV_CPU_IO_MAP(st0016_io,0)
+ MDRV_CPU_PROGRAM_MAP(st0016_mem)
+ MDRV_CPU_IO_MAP(st0016_io)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", R3000LE, 25000000)
MDRV_CPU_CONFIG(config)
- MDRV_CPU_PROGRAM_MAP(srmp5_mem,0)
+ MDRV_CPU_PROGRAM_MAP(srmp5_mem)
//256???K??
MDRV_CPU_VBLANK_INT_HACK(irq4_gen, 256)
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index d585435bdea..6ce898a5220 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -645,7 +645,7 @@ static INTERRUPT_GEN(srmp6_interrupt)
static MACHINE_DRIVER_START( srmp6 )
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(srmp6,0)
+ MDRV_CPU_PROGRAM_MAP(srmp6)
MDRV_CPU_VBLANK_INT_HACK(srmp6_interrupt,2)
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index 9986469a8c3..16b92045db3 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -242,11 +242,11 @@ static MACHINE_DRIVER_START( srumbler )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 1500000) /* 1.5 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(srumbler_map,0)
+ MDRV_CPU_PROGRAM_MAP(srumbler_map)
MDRV_CPU_VBLANK_INT_HACK(srumbler_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(srumbler_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(srumbler_sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
MDRV_MACHINE_RESET(srumbler)
diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c
index 9fb9050dd0f..5f6a6a71820 100644
--- a/src/mame/drivers/ssfindo.c
+++ b/src/mame/drivers/ssfindo.c
@@ -599,7 +599,7 @@ static MACHINE_DRIVER_START( ssfindo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM7, 54000000) // guess...
- MDRV_CPU_PROGRAM_MAP(ssfindo_map,0)
+ MDRV_CPU_PROGRAM_MAP(ssfindo_map)
MDRV_CPU_VBLANK_INT("screen", ssfindo_interrupt)
MDRV_MACHINE_RESET(ssfindo)
@@ -622,7 +622,7 @@ static MACHINE_DRIVER_START( ppcar )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", ARM7, 54000000) // guess...
- MDRV_CPU_PROGRAM_MAP(ppcar_map,0)
+ MDRV_CPU_PROGRAM_MAP(ppcar_map)
MDRV_CPU_VBLANK_INT("screen", ssfindo_interrupt)
MDRV_MACHINE_RESET(ssfindo)
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index 2f3bf30fbf4..e57ab29d856 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -326,11 +326,11 @@ static MACHINE_DRIVER_START( sshangha )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 28000000/2)
- MDRV_CPU_PROGRAM_MAP(sshangha_map,0)
+ MDRV_CPU_PROGRAM_MAP(sshangha_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 16000000/4)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(sshangha) /* init machine */
diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c
index 63d80085ebb..1591bf06cae 100644
--- a/src/mame/drivers/ssingles.c
+++ b/src/mame/drivers/ssingles.c
@@ -258,8 +258,8 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( ssingles )
MDRV_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(ssingles_map,0)
- MDRV_CPU_IO_MAP(ssingles_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(ssingles_map)
+ MDRV_CPU_IO_MAP(ssingles_io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c
index adc7fc0b8d2..a4c509cbf9e 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -727,7 +727,7 @@ static MACHINE_DRIVER_START( sslam )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(sslam_program_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sslam_program_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", I8051, 12000000)
@@ -759,11 +759,11 @@ static MACHINE_DRIVER_START( powerbls )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(powerbls_map, 0)
+ MDRV_CPU_PROGRAM_MAP(powerbls_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", I80C51, 12000000) /* 83C751 */
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_IO_MAP(sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c
index e40b9b6f763..4bcab029b1f 100644
--- a/src/mame/drivers/ssozumo.c
+++ b/src/mame/drivers/ssozumo.c
@@ -191,11 +191,11 @@ static MACHINE_DRIVER_START( ssozumo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 1200000) /* 1.2 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(ssozumo_map,0)
+ MDRV_CPU_PROGRAM_MAP(ssozumo_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", M6502, 975000) /* 975 kHz ?? */
- MDRV_CPU_PROGRAM_MAP(ssozumo_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(ssozumo_sound_map)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse,60*16) /* not accurate */
/* video hardware */
diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c
index 07b8c62cb14..81ae5edcccc 100644
--- a/src/mame/drivers/sspeedr.c
+++ b/src/mame/drivers/sspeedr.c
@@ -190,8 +190,8 @@ static MACHINE_DRIVER_START( sspeedr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 19968000 / 8)
- MDRV_CPU_PROGRAM_MAP(sspeedr_map, 0)
- MDRV_CPU_IO_MAP(sspeedr_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sspeedr_map)
+ MDRV_CPU_IO_MAP(sspeedr_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
/* video hardware */
diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c
index 24ff74cf609..712e7828114 100644
--- a/src/mame/drivers/ssrj.c
+++ b/src/mame/drivers/ssrj.c
@@ -155,7 +155,7 @@ static MACHINE_DRIVER_START( ssrj )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(ssrj_map,0)
+ MDRV_CPU_PROGRAM_MAP(ssrj_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c
index 6c5b554d78e..115acc3404e 100644
--- a/src/mame/drivers/sstrangr.c
+++ b/src/mame/drivers/sstrangr.c
@@ -183,8 +183,8 @@ static MACHINE_DRIVER_START( sstrangr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",8080,1996800) /* clock is a guess, taken from mw8080bw */
- MDRV_CPU_PROGRAM_MAP(sstrangr_map,0)
- MDRV_CPU_IO_MAP(sstrangr_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sstrangr_map)
+ MDRV_CPU_IO_MAP(sstrangr_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
/* video hardware */
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index c3e8cd39f9c..4453d085784 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -2743,7 +2743,7 @@ static MACHINE_DRIVER_START( drifto94 )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(drifto94_map, 0)
+ MDRV_CPU_PROGRAM_MAP(drifto94_map)
MDRV_NVRAM_HANDLER(ssv)
@@ -2758,7 +2758,7 @@ static MACHINE_DRIVER_START( gdfs )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gdfs_map, 0)
+ MDRV_CPU_PROGRAM_MAP(gdfs_map)
MDRV_CPU_VBLANK_INT_HACK(gdfs_interrupt,1+4)
MDRV_NVRAM_HANDLER(gdfs)
@@ -2778,7 +2778,7 @@ static MACHINE_DRIVER_START( hypreact )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hypreact_map, 0)
+ MDRV_CPU_PROGRAM_MAP(hypreact_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2791,7 +2791,7 @@ static MACHINE_DRIVER_START( hypreac2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hypreac2_map, 0)
+ MDRV_CPU_PROGRAM_MAP(hypreac2_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2804,7 +2804,7 @@ static MACHINE_DRIVER_START( janjans1 )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(janjans1_map, 0)
+ MDRV_CPU_PROGRAM_MAP(janjans1_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2817,7 +2817,7 @@ static MACHINE_DRIVER_START( keithlcy )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(keithlcy_map, 0)
+ MDRV_CPU_PROGRAM_MAP(keithlcy_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2830,7 +2830,7 @@ static MACHINE_DRIVER_START( meosism )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(meosism_map, 0)
+ MDRV_CPU_PROGRAM_MAP(meosism_map)
MDRV_NVRAM_HANDLER(ssv)
@@ -2845,7 +2845,7 @@ static MACHINE_DRIVER_START( mslider )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mslider_map, 0)
+ MDRV_CPU_PROGRAM_MAP(mslider_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2858,7 +2858,7 @@ static MACHINE_DRIVER_START( ryorioh )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ryorioh_map, 0)
+ MDRV_CPU_PROGRAM_MAP(ryorioh_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2871,7 +2871,7 @@ static MACHINE_DRIVER_START( srmp4 )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(srmp4_map, 0)
+ MDRV_CPU_PROGRAM_MAP(srmp4_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2884,7 +2884,7 @@ static MACHINE_DRIVER_START( srmp7 )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(srmp7_map, 0)
+ MDRV_CPU_PROGRAM_MAP(srmp7_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2897,7 +2897,7 @@ static MACHINE_DRIVER_START( stmblade )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(drifto94_map, 0)
+ MDRV_CPU_PROGRAM_MAP(drifto94_map)
MDRV_NVRAM_HANDLER(ssv)
/* video hardware */
@@ -2911,7 +2911,7 @@ static MACHINE_DRIVER_START( survarts )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(survarts_map, 0)
+ MDRV_CPU_PROGRAM_MAP(survarts_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2932,7 +2932,7 @@ static MACHINE_DRIVER_START( eaglshot )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(eaglshot_map, 0)
+ MDRV_CPU_PROGRAM_MAP(eaglshot_map)
MDRV_NVRAM_HANDLER(ssv)
@@ -2951,7 +2951,7 @@ static MACHINE_DRIVER_START( sxyreact )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sxyreact_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sxyreact_map)
MDRV_NVRAM_HANDLER(ssv)
@@ -2966,7 +2966,7 @@ static MACHINE_DRIVER_START( twineag2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(twineag2_map, 0)
+ MDRV_CPU_PROGRAM_MAP(twineag2_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2979,7 +2979,7 @@ static MACHINE_DRIVER_START( ultrax )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ultrax_map, 0)
+ MDRV_CPU_PROGRAM_MAP(ultrax_map)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
@@ -2991,10 +2991,10 @@ static MACHINE_DRIVER_START( jsk )
/* basic machine hardware */
MDRV_IMPORT_FROM(ssv)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(jsk_map, 0)
+ MDRV_CPU_PROGRAM_MAP(jsk_map)
MDRV_CPU_ADD("sub", V810,25000000)
- MDRV_CPU_PROGRAM_MAP(jsk_v810_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(jsk_v810_mem)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c
index 803cf88569f..d7ec42f3361 100644
--- a/src/mame/drivers/st0016.c
+++ b/src/mame/drivers/st0016.c
@@ -436,8 +436,8 @@ static const st0016_interface st0016_config =
static MACHINE_DRIVER_START( st0016 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,8000000) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(st0016_mem,0)
- MDRV_CPU_IO_MAP(st0016_io,0)
+ MDRV_CPU_PROGRAM_MAP(st0016_mem)
+ MDRV_CPU_IO_MAP(st0016_io)
MDRV_CPU_VBLANK_INT_HACK(st0016_int,5) /* 4*nmi + int0 */
@@ -466,9 +466,9 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mayjinsn )
MDRV_IMPORT_FROM(st0016)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(st0016_m2_io,0)
+ MDRV_CPU_IO_MAP(st0016_m2_io)
MDRV_CPU_ADD("sub", V810, 10000000)//25 Mhz ?
- MDRV_CPU_PROGRAM_MAP(v810_mem,0)
+ MDRV_CPU_PROGRAM_MAP(v810_mem)
MDRV_QUANTUM_TIME(HZ(60))
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c
index 0953b3b0b02..90381c2cd6b 100644
--- a/src/mame/drivers/stactics.c
+++ b/src/mame/drivers/stactics.c
@@ -308,7 +308,7 @@ static MACHINE_DRIVER_START( stactics )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080, 1933560)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", stactics_interrupt)
MDRV_MACHINE_START(stactics)
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index 945800e6a64..9792ad3ae8e 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -223,11 +223,11 @@ static MACHINE_DRIVER_START( stadhero )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)/* VBL */
MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/starcrus.c b/src/mame/drivers/starcrus.c
index f964b9ec13d..3755ecbe8f2 100644
--- a/src/mame/drivers/starcrus.c
+++ b/src/mame/drivers/starcrus.c
@@ -158,8 +158,8 @@ static MACHINE_DRIVER_START( starcrus )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080,9750000/9) /* 8224 chip is a divide by 9 */
- MDRV_CPU_PROGRAM_MAP(starcrus_map,0)
- MDRV_CPU_IO_MAP(starcrus_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(starcrus_map)
+ MDRV_CPU_IO_MAP(starcrus_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c
index f29b8b375ca..8809c0b6a6c 100644
--- a/src/mame/drivers/starfire.c
+++ b/src/mame/drivers/starfire.c
@@ -265,7 +265,7 @@ static MACHINE_DRIVER_START( starfire )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, STARFIRE_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c
index 0289d4cd8b2..9f8e1333d47 100644
--- a/src/mame/drivers/starshp1.c
+++ b/src/mame/drivers/starshp1.c
@@ -298,7 +298,7 @@ static MACHINE_DRIVER_START( starshp1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, STARSHP1_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(starshp1_map, 0)
+ MDRV_CPU_PROGRAM_MAP(starshp1_map)
MDRV_CPU_VBLANK_INT("screen", starshp1_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index 4b58c6510a6..705a9de3aba 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -318,12 +318,12 @@ static MACHINE_DRIVER_START( starwars )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12)
MDRV_WATCHDOG_TIME_INIT(HZ(CLOCK_3KHZ / 128))
MDRV_CPU_ADD("audiocpu", M6809, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(starwars)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index 85279b578e6..04cfa7270a3 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -565,8 +565,8 @@ static MACHINE_DRIVER_START( statriv2 )
/* basic machine hardware */
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
MDRV_CPU_ADD("maincpu", 8085A, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(statriv2_map,0)
- MDRV_CPU_IO_MAP(statriv2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(statriv2_map)
+ MDRV_CPU_IO_MAP(statriv2_io_map)
MDRV_CPU_VBLANK_INT("screen", statriv2_interrupt)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c
index 5a686f463bf..af68f0c5f5b 100644
--- a/src/mame/drivers/stepstag.c
+++ b/src/mame/drivers/stepstag.c
@@ -111,11 +111,11 @@ static VIDEO_UPDATE(stepstag)
static MACHINE_DRIVER_START( stepstag )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000 ) //??
- MDRV_CPU_PROGRAM_MAP(stepstag_map,0)
+ MDRV_CPU_PROGRAM_MAP(stepstag_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold) // 4 & 6 valid
MDRV_CPU_ADD("sub", M68000, 16000000 ) //??
- MDRV_CPU_PROGRAM_MAP(stepstag_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(stepstag_sub_map)
/* video hardware */
MDRV_SCREEN_ADD("lscreen", RASTER)
diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c
index d5cefa0c144..c94e15da0f3 100644
--- a/src/mame/drivers/stfight.c
+++ b/src/mame/drivers/stfight.c
@@ -435,11 +435,11 @@ static MACHINE_DRIVER_START( stfight )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3000000) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu1_map)
MDRV_CPU_VBLANK_INT("screen", stfight_vb_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu2_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,120)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index 8a6923e60bb..d7510de3b92 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -237,7 +237,7 @@ static NVRAM_HANDLER( stlforce )
static MACHINE_DRIVER_START( stlforce )
/* basic machine hardware */
MDRV_CPU_ADD("cpu", M68000, 15000000)
- MDRV_CPU_PROGRAM_MAP(stlforce_map,0)
+ MDRV_CPU_PROGRAM_MAP(stlforce_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_NVRAM_HANDLER(stlforce)
diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c
index d1864f36a6f..a844cb3261a 100644
--- a/src/mame/drivers/strnskil.c
+++ b/src/mame/drivers/strnskil.c
@@ -325,11 +325,11 @@ static MACHINE_DRIVER_START( strnskil )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
- MDRV_CPU_PROGRAM_MAP(strnskil_map1,0)
+ MDRV_CPU_PROGRAM_MAP(strnskil_map1)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */
- MDRV_CPU_PROGRAM_MAP(strnskil_map2,0)
+ MDRV_CPU_PROGRAM_MAP(strnskil_map2)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 7ebb6106d84..bd18849d1af 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -2700,16 +2700,16 @@ static MACHINE_DRIVER_START( stv )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
- MDRV_CPU_PROGRAM_MAP(stv_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(stv_mem)
MDRV_CPU_VBLANK_INT("screen",stv_interrupt)
MDRV_CPU_CONFIG(sh2_conf_master)
MDRV_CPU_ADD("slave", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
- MDRV_CPU_PROGRAM_MAP(stv_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(stv_mem)
MDRV_CPU_CONFIG(sh2_conf_slave)
MDRV_CPU_ADD("audiocpu", M68000, MASTER_CLOCK_352/5) //11.46 MHz
- MDRV_CPU_PROGRAM_MAP(sound_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_mem)
MDRV_MACHINE_START(stv)
MDRV_MACHINE_RESET(stv)
diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c
index 94d72c60bac..c2a0adbb881 100644
--- a/src/mame/drivers/subs.c
+++ b/src/mame/drivers/subs.c
@@ -179,7 +179,7 @@ static MACHINE_DRIVER_START( subs )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502,12096000/16) /* clock input is the "4H" signal */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(subs_interrupt,4)
MDRV_MACHINE_RESET(subs)
diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c
index 652a5768670..76c1cc575ff 100644
--- a/src/mame/drivers/subsino.c
+++ b/src/mame/drivers/subsino.c
@@ -263,8 +263,8 @@ GFXDECODE_END
static MACHINE_DRIVER_START( victor5 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 3) // 4 MHz?
- MDRV_CPU_PROGRAM_MAP(victor5_map,0)
- MDRV_CPU_IO_MAP(subsino_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(victor5_map)
+ MDRV_CPU_IO_MAP(subsino_iomap)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -304,8 +304,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( srider )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 3) // 4 MHz?
- MDRV_CPU_PROGRAM_MAP(srider_map,0)
- MDRV_CPU_IO_MAP(subsino_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(srider_map)
+ MDRV_CPU_IO_MAP(subsino_iomap)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -338,8 +338,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( crsbingo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 3) // Unknown CPU and clock
- MDRV_CPU_PROGRAM_MAP(victor5_map,0)
- MDRV_CPU_IO_MAP(subsino_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(victor5_map)
+ MDRV_CPU_IO_MAP(subsino_iomap)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 6c773f88ec9..ec19cbc8e5e 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -763,19 +763,19 @@ static MACHINE_DRIVER_START( bssoccer )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(bssoccer_map,0)
+ MDRV_CPU_PROGRAM_MAP(bssoccer_map)
MDRV_CPU_VBLANK_INT_HACK(bssoccer_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* Z80B */
- MDRV_CPU_PROGRAM_MAP(bssoccer_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(bssoccer_sound_map)
MDRV_CPU_ADD("pcm1", Z80, 5000000) /* Z80B */
- MDRV_CPU_PROGRAM_MAP(bssoccer_pcm_1_map,0)
- MDRV_CPU_IO_MAP(bssoccer_pcm_1_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(bssoccer_pcm_1_map)
+ MDRV_CPU_IO_MAP(bssoccer_pcm_1_io_map)
MDRV_CPU_ADD("pcm2", Z80, 5000000) /* Z80B */
- MDRV_CPU_PROGRAM_MAP(bssoccer_pcm_2_map,0)
- MDRV_CPU_IO_MAP(bssoccer_pcm_2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(bssoccer_pcm_2_map)
+ MDRV_CPU_IO_MAP(bssoccer_pcm_2_io_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -823,15 +823,15 @@ static MACHINE_DRIVER_START( uballoon )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(uballoon_map,0)
+ MDRV_CPU_PROGRAM_MAP(uballoon_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* ? */
- MDRV_CPU_PROGRAM_MAP(uballoon_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(uballoon_sound_map)
MDRV_CPU_ADD("pcm1", Z80, 5000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(uballoon_pcm_1_map,0)
- MDRV_CPU_IO_MAP(uballoon_pcm_1_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(uballoon_pcm_1_map)
+ MDRV_CPU_IO_MAP(uballoon_pcm_1_io_map)
/* 2nd PCM Z80 missing */
@@ -874,15 +874,15 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sunaq )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 24000000/4)
- MDRV_CPU_PROGRAM_MAP(sunaq_map,0)
+ MDRV_CPU_PROGRAM_MAP(sunaq_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 14318000/4)
- MDRV_CPU_PROGRAM_MAP(sunaq_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sunaq_sound_map)
MDRV_CPU_ADD("pcm1", Z80, 24000000/4) /* Z80B */
- MDRV_CPU_PROGRAM_MAP(bssoccer_pcm_1_map,0)
- MDRV_CPU_IO_MAP(bssoccer_pcm_1_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(bssoccer_pcm_1_map)
+ MDRV_CPU_IO_MAP(bssoccer_pcm_1_io_map)
/* 2nd PCM Z80 missing */
@@ -946,15 +946,15 @@ static const ay8910_interface bestbest_ay8910_interface =
static MACHINE_DRIVER_START( bestbest )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 24000000/4)
- MDRV_CPU_PROGRAM_MAP(bestbest_map,0)
+ MDRV_CPU_PROGRAM_MAP(bestbest_map)
MDRV_CPU_VBLANK_INT_HACK(bssoccer_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 24000000/4)
- MDRV_CPU_PROGRAM_MAP(bestbest_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(bestbest_sound_map)
MDRV_CPU_ADD("pcm1", Z80, 24000000/4)
- MDRV_CPU_PROGRAM_MAP(bestbest_pcm_1_map,0)
- MDRV_CPU_IO_MAP(bestbest_pcm_1_iomap,0)
+ MDRV_CPU_PROGRAM_MAP(bestbest_pcm_1_map)
+ MDRV_CPU_IO_MAP(bestbest_pcm_1_iomap)
/* 2nd PCM Z80 missing */
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index b5bd4289d40..4b17711acaf 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -1411,13 +1411,13 @@ static MACHINE_DRIVER_START( hardhead )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(hardhead_map,0)
- MDRV_CPU_IO_MAP(hardhead_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(hardhead_map)
+ MDRV_CPU_IO_MAP(hardhead_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* No NMI */
MDRV_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(hardhead_sound_map,0)
- MDRV_CPU_IO_MAP(hardhead_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(hardhead_sound_map)
+ MDRV_CPU_IO_MAP(hardhead_sound_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */
/* video hardware */
@@ -1477,12 +1477,12 @@ static MACHINE_DRIVER_START( rranger )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(rranger_map,0)
- MDRV_CPU_IO_MAP(rranger_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(rranger_map)
+ MDRV_CPU_IO_MAP(rranger_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ & NMI ! */
MDRV_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(rranger_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(rranger_sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMI = retn */
/* video hardware */
@@ -1539,16 +1539,16 @@ static MACHINE_DRIVER_START( brickzn )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* SUNA PROTECTION BLOCK */
- MDRV_CPU_PROGRAM_MAP(brickzn_map,0)
+ MDRV_CPU_PROGRAM_MAP(brickzn_map)
// MDRV_CPU_VBLANK_INT_HACK(brickzn_interrupt, 2)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) // nmi breaks ramtest but is needed!
MDRV_CPU_ADD("soundcpu", Z80, SUNA8_MASTER_CLOCK / 4) /* Z0840006PSC */
- MDRV_CPU_PROGRAM_MAP(brickzn_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(brickzn_sound_map)
MDRV_CPU_ADD("pcm", Z80, SUNA8_MASTER_CLOCK / 4) /* Z0840006PSC */
- MDRV_CPU_PROGRAM_MAP(brickzn_pcm_map,0)
- MDRV_CPU_IO_MAP(brickzn_pcm_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(brickzn_pcm_map)
+ MDRV_CPU_IO_MAP(brickzn_pcm_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1615,7 +1615,7 @@ static MACHINE_DRIVER_START( hardhea2 )
MDRV_IMPORT_FROM( brickzn )
MDRV_CPU_MODIFY("maincpu") /* SUNA T568009 */
- MDRV_CPU_PROGRAM_MAP(hardhea2_map,0)
+ MDRV_CPU_PROGRAM_MAP(hardhea2_map)
MDRV_CPU_VBLANK_INT_HACK(hardhea2_interrupt,2) /* IRQ & NMI */
MDRV_MACHINE_RESET(hardhea2)
@@ -1641,13 +1641,13 @@ static MACHINE_DRIVER_START( starfigh )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(starfigh_map,0)
+ MDRV_CPU_PROGRAM_MAP(starfigh_map)
MDRV_CPU_VBLANK_INT_HACK(brickzn_interrupt,2) /* IRQ & NMI */
/* The sound section is identical to that of hardhead */
MDRV_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(hardhead_sound_map,0)
- MDRV_CPU_IO_MAP(hardhead_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(hardhead_sound_map)
+ MDRV_CPU_IO_MAP(hardhead_sound_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */
/* video hardware */
@@ -1700,12 +1700,12 @@ static MACHINE_DRIVER_START( sparkman )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(sparkman_map,0)
+ MDRV_CPU_PROGRAM_MAP(sparkman_map)
MDRV_CPU_VBLANK_INT_HACK(sparkman_interrupt,2) /* IRQ & NMI */
MDRV_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(hardhead_sound_map,0)
- MDRV_CPU_IO_MAP(hardhead_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(hardhead_sound_map)
+ MDRV_CPU_IO_MAP(hardhead_sound_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */
/* video hardware */
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index 4c77e310ab8..fab466a41c6 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -323,11 +323,11 @@ static MACHINE_DRIVER_START( supbtime )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(supbtime_map,0)
+ MDRV_CPU_PROGRAM_MAP(supbtime_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", H6280, 32220000/8) /* Custom chip 45, audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
@@ -363,11 +363,11 @@ static MACHINE_DRIVER_START( chinatwn )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(chinatwn_map,0)
+ MDRV_CPU_PROGRAM_MAP(chinatwn_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", H6280, 32220000/8) /* Custom chip 45, audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c
index 9cb55b5c74c..4c0af3b631f 100644
--- a/src/mame/drivers/supdrapo.c
+++ b/src/mame/drivers/supdrapo.c
@@ -246,7 +246,7 @@ static PALETTE_INIT( sdpoker )
static MACHINE_DRIVER_START( supdrapo )
MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* ??? */
- MDRV_CPU_PROGRAM_MAP(sdpoker_mem,0)
+ MDRV_CPU_PROGRAM_MAP(sdpoker_mem)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index 307c0711d98..00eeae71d90 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -396,13 +396,13 @@ static MACHINE_DRIVER_START( superchs )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(superchs_map,0)
+ MDRV_CPU_PROGRAM_MAP(superchs_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)/* VBL */
TAITO_F3_SOUND_SYSTEM_CPU(16000000)
MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(superchs_cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(superchs_cpub_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
MDRV_QUANTUM_TIME(HZ(480)) /* CPU slices - Need to interleave Cpu's 1 & 3 */
diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c
index a01b37f9d45..ec78a8dcdbc 100644
--- a/src/mame/drivers/superdq.c
+++ b/src/mame/drivers/superdq.c
@@ -300,8 +300,8 @@ static MACHINE_DRIVER_START( superdq )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(superdq_map,0)
- MDRV_CPU_IO_MAP(superdq_io,0)
+ MDRV_CPU_PROGRAM_MAP(superdq_map)
+ MDRV_CPU_IO_MAP(superdq_io)
MDRV_CPU_VBLANK_INT("screen", superdq_vblank)
MDRV_MACHINE_START(superdq)
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index b40d03c7aa8..b9c24cf6034 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -978,8 +978,8 @@ static INTERRUPT_GEN( bootleg_interrupt )
static MACHINE_DRIVER_START( pbillian )
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(pbillian_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(pbillian_port_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_START(pbillian)
@@ -1011,12 +1011,12 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hotsmash )
MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(hotsmash_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(hotsmash_port_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("mcu", M68705, 4000000) /* ???? */
- MDRV_CPU_PROGRAM_MAP(m68705_map,0)
+ MDRV_CPU_PROGRAM_MAP(m68705_map)
MDRV_MACHINE_START(pbillian)
@@ -1049,12 +1049,12 @@ static MACHINE_DRIVER_START( sqix )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 12000000/2) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(sqix_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(sqix_port_map)
MDRV_CPU_VBLANK_INT_HACK(sqix_interrupt,6) /* ??? */
MDRV_CPU_ADD("mcu", I8751, 12000000/3) /* ??? */
- MDRV_CPU_IO_MAP(mcu_io_map,0)
+ MDRV_CPU_IO_MAP(mcu_io_map)
MDRV_QUANTUM_TIME(HZ(30000))
@@ -1091,8 +1091,8 @@ static MACHINE_DRIVER_START( sqixbl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 12000000/2) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(bootleg_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(bootleg_port_map)
MDRV_CPU_VBLANK_INT_HACK(bootleg_interrupt,6) /* ??? */
MDRV_MACHINE_START(superqix)
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index 5a63e2ca705..a0a49c1bac8 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -414,8 +414,8 @@ static MACHINE_DRIVER_START( supertnk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS9980, 2598750) /* ? to which frequency is the 20.79 Mhz crystal mapped down? */
- MDRV_CPU_PROGRAM_MAP(supertnk_map,0)
- MDRV_CPU_IO_MAP(supertnk_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(supertnk_map)
+ MDRV_CPU_IO_MAP(supertnk_io_map)
MDRV_CPU_VBLANK_INT("screen", supertnk_interrupt)
MDRV_MACHINE_RESET(supertnk)
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index 514cba70284..c3b0c980544 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -414,8 +414,8 @@ GFXDECODE_END
static MACHINE_DRIVER_START( suprgolf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,4000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_VIDEO_START(suprgolf)
diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c
index b9442eb62f1..4f95860977f 100644
--- a/src/mame/drivers/suprloco.c
+++ b/src/mame/drivers/suprloco.c
@@ -168,11 +168,11 @@ static MACHINE_DRIVER_START( suprloco )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMIs are caused by the main CPU */
/* video hardware */
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index 3ad6eff3a09..034d5bca463 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -836,7 +836,7 @@ static const ymz280b_interface ymz280b_intf =
static MACHINE_DRIVER_START(skns)
MDRV_CPU_ADD("maincpu", SH2,28638000)
- MDRV_CPU_PROGRAM_MAP(skns_map,0)
+ MDRV_CPU_PROGRAM_MAP(skns_map)
MDRV_CPU_VBLANK_INT_HACK(skns_interrupt,2)
MDRV_MACHINE_RESET(skns)
diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c
index 475a4e2a5fe..9e3b1c4da84 100644
--- a/src/mame/drivers/suprridr.c
+++ b/src/mame/drivers/suprridr.c
@@ -358,13 +358,13 @@ static MACHINE_DRIVER_START( suprridr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_49_152MHz/16) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_portmap)
MDRV_CPU_VBLANK_INT("screen", main_nmi_gen)
MDRV_CPU_ADD("audiocpu", Z80, 10000000/4) /* 2.5 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_portmap)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index f66e6ce39cc..34fed01c53c 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -299,12 +299,12 @@ static const ym2610_interface ym2610_config =
static MACHINE_DRIVER_START( suprslam )
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(suprslam_map,0)
+ MDRV_CPU_PROGRAM_MAP(suprslam_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_GFXDECODE(suprslam)
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index 7c27b46c422..8fa40cbe2ec 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -179,7 +179,7 @@ static MACHINE_DRIVER_START( surpratk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* 053248 */
- MDRV_CPU_PROGRAM_MAP(surpratk_map,0)
+ MDRV_CPU_PROGRAM_MAP(surpratk_map)
MDRV_CPU_VBLANK_INT("screen", surpratk_interrupt)
MDRV_MACHINE_RESET(surpratk)
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index dc9375cea24..8985210103b 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -2106,12 +2106,12 @@ static MACHINE_DRIVER_START( sys1ppi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* not really, see notes above */
- MDRV_CPU_PROGRAM_MAP(system1_map,0)
- MDRV_CPU_IO_MAP(system1_ppi_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(system1_map)
+ MDRV_CPU_IO_MAP(system1_ppi_io_map)
MDRV_CPU_VBLANK_INT("screen", vblank_irq)
MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_TIMER_ADD_SCANLINE("soundirq", soundirq_gen, "screen", 32, 64)
MDRV_MACHINE_START(system1)
@@ -2158,7 +2158,7 @@ static MACHINE_DRIVER_START( sys1pio )
MDRV_IMPORT_FROM( sys1ppi )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(system1_pio_io_map,0)
+ MDRV_CPU_IO_MAP(system1_pio_io_map)
MDRV_PPI8255_REMOVE("ppi")
MDRV_Z80PIO_ADD("pio", pio_interface)
@@ -2182,7 +2182,7 @@ static MACHINE_DRIVER_START( nob )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(nobo_map,0)
+ MDRV_CPU_PROGRAM_MAP(nobo_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( nobm )
@@ -2190,7 +2190,7 @@ static MACHINE_DRIVER_START( nobm )
/* basic machine hardware */
MDRV_CPU_ADD("mcu", I8751, 8000000 /* unknown speed */)
- MDRV_CPU_IO_MAP(mcu_io_map,0)
+ MDRV_CPU_IO_MAP(mcu_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_pulse)
MACHINE_DRIVER_END
@@ -2210,7 +2210,7 @@ static MACHINE_DRIVER_START( sys2m )
/* basic machine hardware */
MDRV_CPU_ADD("mcu", I8751, 8000000 /* unknown speed */)
- MDRV_CPU_IO_MAP(mcu_io_map,0)
+ MDRV_CPU_IO_MAP(mcu_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_pulse)
MACHINE_DRIVER_END
@@ -2227,7 +2227,7 @@ static MACHINE_DRIVER_START( sys2rowm )
/* basic machine hardware */
MDRV_CPU_ADD("mcu", I8751, 8000000 /* unknown speed */)
- MDRV_CPU_IO_MAP(mcu_io_map,0)
+ MDRV_CPU_IO_MAP(mcu_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_pulse)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index 6a3c6c5fea9..1fff5b56038 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -408,8 +408,8 @@ static MACHINE_DRIVER_START( system16 )
MDRV_CPU_VBLANK_INT("screen", sys16_interrupt)
MDRV_CPU_ADD("soundcpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -440,8 +440,8 @@ static MACHINE_DRIVER_START( system16_7759 )
MDRV_IMPORT_FROM(system16)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(sound_7759_map,0)
- MDRV_CPU_IO_MAP(sound_7759_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_7759_map)
+ MDRV_CPU_IO_MAP(sound_7759_io_map)
/* sound hardware */
MDRV_SOUND_ADD("7759", UPD7759, UPD7759_STANDARD_CLOCK)
@@ -682,7 +682,7 @@ static MACHINE_DRIVER_START( bayroute )
/* basic machine hardware */
MDRV_IMPORT_FROM(system16_7759)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bayroute_map,0)
+ MDRV_CPU_PROGRAM_MAP(bayroute_map)
MDRV_MACHINE_RESET(bayroute)
MACHINE_DRIVER_END
@@ -817,7 +817,7 @@ static MACHINE_DRIVER_START( dduxbl )
/* basic machine hardware */
MDRV_IMPORT_FROM(system16)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dduxbl_map,0)
+ MDRV_CPU_PROGRAM_MAP(dduxbl_map)
MDRV_MACHINE_RESET(dduxbl)
MACHINE_DRIVER_END
@@ -936,7 +936,7 @@ static MACHINE_DRIVER_START( eswatbl )
/* basic machine hardware */
MDRV_IMPORT_FROM(system16_7759)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(eswatbl_map,0)
+ MDRV_CPU_PROGRAM_MAP(eswatbl_map)
MDRV_MACHINE_RESET(eswatbl)
MACHINE_DRIVER_END
@@ -1121,10 +1121,10 @@ static MACHINE_DRIVER_START( fpointbl )
/* basic machine hardware */
MDRV_IMPORT_FROM(system16)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(fpointbl_map,0)
+ MDRV_CPU_PROGRAM_MAP(fpointbl_map)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(fpointbl_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(fpointbl_sound_map)
MDRV_MACHINE_RESET(fpointbl)
MACHINE_DRIVER_END
@@ -1269,7 +1269,7 @@ static MACHINE_DRIVER_START( goldnaxe )
/* basic machine hardware */
MDRV_IMPORT_FROM(system16_7759)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(goldnaxe_map,0)
+ MDRV_CPU_PROGRAM_MAP(goldnaxe_map)
MDRV_MACHINE_RESET(goldnaxe)
MACHINE_DRIVER_END
@@ -1523,7 +1523,7 @@ static MACHINE_DRIVER_START( passsht )
/* basic machine hardware */
MDRV_IMPORT_FROM(system16_7759)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(passsht_map,0)
+ MDRV_CPU_PROGRAM_MAP(passsht_map)
MDRV_MACHINE_RESET(passsht)
MACHINE_DRIVER_END
@@ -1534,7 +1534,7 @@ static MACHINE_DRIVER_START( passht4b )
/* basic machine hardware */
MDRV_IMPORT_FROM(system16_7759)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(passht4b_map,0)
+ MDRV_CPU_PROGRAM_MAP(passht4b_map)
MDRV_MACHINE_RESET(passht4b)
MACHINE_DRIVER_END
@@ -1627,7 +1627,7 @@ static MACHINE_DRIVER_START( shinob2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(system16)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(shinobl_map,0)
+ MDRV_CPU_PROGRAM_MAP(shinobl_map)
MDRV_MACHINE_RESET(shinobl)
MACHINE_DRIVER_END
@@ -1758,7 +1758,7 @@ static MACHINE_DRIVER_START( tetrisbl )
/* basic machine hardware */
MDRV_IMPORT_FROM(system16)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tetrisbl_map,0)
+ MDRV_CPU_PROGRAM_MAP(tetrisbl_map)
MDRV_MACHINE_RESET(tetrisbl)
MACHINE_DRIVER_END
@@ -1768,7 +1768,7 @@ static MACHINE_DRIVER_START( beautyb )
/* basic machine hardware */
MDRV_IMPORT_FROM(system16)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(beautyb_map, 0)
+ MDRV_CPU_PROGRAM_MAP(beautyb_map)
MDRV_MACHINE_RESET(tetrisbl)
MACHINE_DRIVER_END
@@ -1930,11 +1930,11 @@ static MACHINE_DRIVER_START( tturfbl )
/* basic machine hardware */
MDRV_IMPORT_FROM(system16_7759)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tturfbl_map,0)
+ MDRV_CPU_PROGRAM_MAP(tturfbl_map)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(tturfbl_sound_map,0)
- MDRV_CPU_IO_MAP(tturfbl_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(tturfbl_sound_map)
+ MDRV_CPU_IO_MAP(tturfbl_sound_io_map)
MDRV_SOUND_REMOVE("7759")
MDRV_SOUND_ADD("5205", MSM5205, 220000)
@@ -2064,7 +2064,7 @@ static MACHINE_DRIVER_START( wb3bbl )
/* basic machine hardware */
MDRV_IMPORT_FROM(system16)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(wb3bbl_map,0)
+ MDRV_CPU_PROGRAM_MAP(wb3bbl_map)
MDRV_MACHINE_RESET(wb3bbl)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c
index aca06bbc1b1..0b41526f24f 100644
--- a/src/mame/drivers/system18.c
+++ b/src/mame/drivers/system18.c
@@ -1028,8 +1028,8 @@ static MACHINE_DRIVER_START( system18 )
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(sound_18_map,0)
- MDRV_CPU_IO_MAP(sound_18_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_18_map)
+ MDRV_CPU_IO_MAP(sound_18_io_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -1071,7 +1071,7 @@ static MACHINE_DRIVER_START( astormbl )
/* basic machine hardware */
MDRV_IMPORT_FROM(system18)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(astormbl_map,0)
+ MDRV_CPU_PROGRAM_MAP(astormbl_map)
MDRV_MACHINE_RESET(astormbl)
MACHINE_DRIVER_END
@@ -1082,7 +1082,7 @@ static MACHINE_DRIVER_START( mwalkbl )
/* basic machine hardware */
MDRV_IMPORT_FROM(system18)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mwalkbl_map,0)
+ MDRV_CPU_PROGRAM_MAP(mwalkbl_map)
MDRV_MACHINE_RESET(mwalkbl)
MACHINE_DRIVER_END
@@ -1093,11 +1093,11 @@ static MACHINE_DRIVER_START( shdancbl )
/* basic machine hardware */
MDRV_IMPORT_FROM(system18)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(shdancbl_map,0)
+ MDRV_CPU_PROGRAM_MAP(shdancbl_map)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(shdancbl_sound_map,0)
- MDRV_CPU_IO_MAP(shdancbl_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(shdancbl_sound_map)
+ MDRV_CPU_IO_MAP(shdancbl_sound_io_map)
MDRV_SOUND_REMOVE("5c68")
MDRV_SOUND_ADD("5205", MSM5205, 200000)
diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c
index 4c88f107e7c..24b1b5c29ea 100644
--- a/src/mame/drivers/tagteam.c
+++ b/src/mame/drivers/tagteam.c
@@ -228,11 +228,11 @@ static MACHINE_DRIVER_START( tagteam )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ?? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", tagteam_interrupt)
MDRV_CPU_ADD("audiocpu", M6502, 975000) /* 975 kHz ?? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* IRQs are triggered by the main CPU */
/* video hardware */
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index adc25977b9a..b7901f2684f 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -237,12 +237,12 @@ static MACHINE_DRIVER_START( tail2nos )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,XTAL_20MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_port_map)
/* IRQs are triggered by the YM2608 */
MDRV_MACHINE_RESET(tail2nos)
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 16af1b7a7c1..59b6fa237f1 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -2142,11 +2142,11 @@ static MACHINE_DRIVER_START( rastsag2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(rastsag2_map,0)
+ MDRV_CPU_PROGRAM_MAP(rastsag2_map)
MDRV_CPU_VBLANK_INT("screen", rastansaga2_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2180,11 +2180,11 @@ static MACHINE_DRIVER_START( ashura )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(rastsag2_map,0)
+ MDRV_CPU_PROGRAM_MAP(rastsag2_map)
MDRV_CPU_VBLANK_INT("screen", rastansaga2_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2218,11 +2218,11 @@ static MACHINE_DRIVER_START( crimec )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(crimec_map,0)
+ MDRV_CPU_PROGRAM_MAP(crimec_map)
MDRV_CPU_VBLANK_INT("screen", crimec_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2256,11 +2256,11 @@ static MACHINE_DRIVER_START( tetrist )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ???*/
- MDRV_CPU_PROGRAM_MAP(tetrist_map,0)
+ MDRV_CPU_PROGRAM_MAP(tetrist_map)
MDRV_CPU_VBLANK_INT("screen", rastansaga2_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2293,11 +2293,11 @@ static MACHINE_DRIVER_START( tetrista )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(tetrista_map,0)
+ MDRV_CPU_PROGRAM_MAP(tetrista_map)
MDRV_CPU_VBLANK_INT("screen", masterw_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(masterw_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(masterw_sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2331,11 +2331,11 @@ static MACHINE_DRIVER_START( hitice )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(hitice_map,0)
+ MDRV_CPU_PROGRAM_MAP(hitice_map)
MDRV_CPU_VBLANK_INT("screen", hitice_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(viofight_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(viofight_sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2375,11 +2375,11 @@ static MACHINE_DRIVER_START( rambo3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rambo3_map,0)
+ MDRV_CPU_PROGRAM_MAP(rambo3_map)
MDRV_CPU_VBLANK_INT("screen", rambo3_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2413,11 +2413,11 @@ static MACHINE_DRIVER_START( rambo3a )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rambo3_map,0)
+ MDRV_CPU_PROGRAM_MAP(rambo3_map)
MDRV_CPU_VBLANK_INT("screen", rambo3_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2451,11 +2451,11 @@ static MACHINE_DRIVER_START( pbobble )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(pbobble_map,0)
+ MDRV_CPU_PROGRAM_MAP(pbobble_map)
MDRV_CPU_VBLANK_INT("screen", pbobble_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2492,11 +2492,11 @@ static MACHINE_DRIVER_START( spacedx )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(spacedx_map,0)
+ MDRV_CPU_PROGRAM_MAP(spacedx_map)
MDRV_CPU_VBLANK_INT("screen", pbobble_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2533,11 +2533,11 @@ static MACHINE_DRIVER_START( spacedxo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(spacedxo_map,0)
+ MDRV_CPU_PROGRAM_MAP(spacedxo_map)
MDRV_CPU_VBLANK_INT("screen", selfeena_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2571,11 +2571,11 @@ static MACHINE_DRIVER_START( qzshowby )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz according to the readme*/
- MDRV_CPU_PROGRAM_MAP(qzshowby_map,0)
+ MDRV_CPU_PROGRAM_MAP(qzshowby_map)
MDRV_CPU_VBLANK_INT("screen", pbobble_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2612,11 +2612,11 @@ static MACHINE_DRIVER_START( viofight )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(viofight_map,0)
+ MDRV_CPU_PROGRAM_MAP(viofight_map)
MDRV_CPU_VBLANK_INT("screen", viofight_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 6000000) /* 6 MHz verified */
- MDRV_CPU_PROGRAM_MAP(viofight_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(viofight_sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2654,11 +2654,11 @@ static MACHINE_DRIVER_START( masterw )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(masterw_map,0)
+ MDRV_CPU_PROGRAM_MAP(masterw_map)
MDRV_CPU_VBLANK_INT("screen", masterw_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(masterw_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(masterw_sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2693,11 +2693,11 @@ static MACHINE_DRIVER_START( silentd )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(silentd_map,0)
+ MDRV_CPU_PROGRAM_MAP(silentd_map)
MDRV_CPU_VBLANK_INT("screen", silentd_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2731,11 +2731,11 @@ static MACHINE_DRIVER_START( selfeena )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(selfeena_map,0)
+ MDRV_CPU_PROGRAM_MAP(selfeena_map)
MDRV_CPU_VBLANK_INT("screen", selfeena_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2778,11 +2778,11 @@ static MACHINE_DRIVER_START( ryujin )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(selfeena_map,0)
+ MDRV_CPU_PROGRAM_MAP(selfeena_map)
MDRV_CPU_VBLANK_INT("screen", selfeena_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -2823,11 +2823,11 @@ static MACHINE_DRIVER_START( sbm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(sbm_map,0)
+ MDRV_CPU_PROGRAM_MAP(sbm_map)
MDRV_CPU_VBLANK_INT("screen", sbm_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index e00324a2023..0230892a246 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -3174,7 +3174,7 @@ static MACHINE_DRIVER_START( taito_f2 )
MDRV_CPU_VBLANK_INT("screen", taitof2_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 24000000/6) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_START(f2)
@@ -3210,7 +3210,7 @@ static MACHINE_DRIVER_START( finalb )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(finalb_map,0)
+ MDRV_CPU_PROGRAM_MAP(finalb_map)
/* video hardware */
MDRV_GFXDECODE(finalb)
@@ -3224,7 +3224,7 @@ static MACHINE_DRIVER_START( dondokod )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dondokod_map,0)
+ MDRV_CPU_PROGRAM_MAP(dondokod_map)
/* video hardware */
MDRV_GFXDECODE(pivot)
@@ -3239,7 +3239,7 @@ static MACHINE_DRIVER_START( megab )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(megab_map,0)
+ MDRV_CPU_PROGRAM_MAP(megab_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_megab)
@@ -3252,7 +3252,7 @@ static MACHINE_DRIVER_START( thundfox )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(thundfox_map,0)
+ MDRV_CPU_PROGRAM_MAP(thundfox_map)
/* video hardware */
MDRV_GFXDECODE(thundfox)
@@ -3267,7 +3267,7 @@ static MACHINE_DRIVER_START( cameltry )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cameltry_map,0)
+ MDRV_CPU_PROGRAM_MAP(cameltry_map)
/* video hardware */
MDRV_GFXDECODE(pivot)
@@ -3281,7 +3281,7 @@ static MACHINE_DRIVER_START( qtorimon )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(qtorimon_map,0)
+ MDRV_CPU_PROGRAM_MAP(qtorimon_map)
/* video hardware */
MDRV_GFXDECODE(yuyugogo)
@@ -3294,7 +3294,7 @@ static MACHINE_DRIVER_START( liquidk )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(liquidk_map,0)
+ MDRV_CPU_PROGRAM_MAP(liquidk_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_megab)
@@ -3308,7 +3308,7 @@ static MACHINE_DRIVER_START( quizhq )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(quizhq_map,0)
+ MDRV_CPU_PROGRAM_MAP(quizhq_map)
/* video hardware */
MDRV_GFXDECODE(yuyugogo)
@@ -3321,7 +3321,7 @@ static MACHINE_DRIVER_START( ssi )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ssi_map,0)
+ MDRV_CPU_PROGRAM_MAP(ssi_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_ssi)
@@ -3335,7 +3335,7 @@ static MACHINE_DRIVER_START( gunfront )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gunfront_map,0)
+ MDRV_CPU_PROGRAM_MAP(gunfront_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_gunfront)
@@ -3348,7 +3348,7 @@ static MACHINE_DRIVER_START( growl )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(growl_map,0)
+ MDRV_CPU_PROGRAM_MAP(growl_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_growl)
@@ -3361,7 +3361,7 @@ static MACHINE_DRIVER_START( mjnquest )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjnquest_map,0)
+ MDRV_CPU_PROGRAM_MAP(mjnquest_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_mjnquest)
@@ -3373,7 +3373,7 @@ static MACHINE_DRIVER_START( footchmp )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(footchmp_map,0)
+ MDRV_CPU_PROGRAM_MAP(footchmp_map)
/* video hardware */
MDRV_GFXDECODE(deadconx)
@@ -3388,7 +3388,7 @@ static MACHINE_DRIVER_START( hthero )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(footchmp_map,0)
+ MDRV_CPU_PROGRAM_MAP(footchmp_map)
/* video hardware */
MDRV_GFXDECODE(deadconx)
@@ -3403,7 +3403,7 @@ static MACHINE_DRIVER_START( koshien )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(koshien_map,0)
+ MDRV_CPU_PROGRAM_MAP(koshien_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_koshien)
@@ -3416,7 +3416,7 @@ static MACHINE_DRIVER_START( yuyugogo )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(yuyugogo_map,0)
+ MDRV_CPU_PROGRAM_MAP(yuyugogo_map)
/* video hardware */
MDRV_GFXDECODE(yuyugogo)
@@ -3430,7 +3430,7 @@ static MACHINE_DRIVER_START( ninjak )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ninjak_map,0)
+ MDRV_CPU_PROGRAM_MAP(ninjak_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_ninjak)
@@ -3443,7 +3443,7 @@ static MACHINE_DRIVER_START( solfigtr )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(solfigtr_map,0)
+ MDRV_CPU_PROGRAM_MAP(solfigtr_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_solfigtr)
@@ -3456,7 +3456,7 @@ static MACHINE_DRIVER_START( qzquest )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(qzquest_map,0)
+ MDRV_CPU_PROGRAM_MAP(qzquest_map)
/* video hardware */
MDRV_VIDEO_EOF(taitof2_partial_buffer_delayed)
@@ -3468,7 +3468,7 @@ static MACHINE_DRIVER_START( pulirula )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pulirula_map,0)
+ MDRV_CPU_PROGRAM_MAP(pulirula_map)
/* video hardware */
MDRV_GFXDECODE(pivot)
@@ -3482,7 +3482,7 @@ static MACHINE_DRIVER_START( metalb )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(metalb_map,0)
+ MDRV_CPU_PROGRAM_MAP(metalb_map)
/* video hardware */
MDRV_GFXDECODE(deadconx)
@@ -3497,7 +3497,7 @@ static MACHINE_DRIVER_START( qzchikyu )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(qzchikyu_map,0)
+ MDRV_CPU_PROGRAM_MAP(qzchikyu_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_qzchikyu)
@@ -3510,7 +3510,7 @@ static MACHINE_DRIVER_START( yesnoj )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(yesnoj_map,0)
+ MDRV_CPU_PROGRAM_MAP(yesnoj_map)
/* video hardware */
MDRV_GFXDECODE(yuyugogo)
@@ -3524,7 +3524,7 @@ static MACHINE_DRIVER_START( deadconx )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(deadconx_map,0)
+ MDRV_CPU_PROGRAM_MAP(deadconx_map)
/* video hardware */
MDRV_GFXDECODE(deadconx)
@@ -3538,7 +3538,7 @@ static MACHINE_DRIVER_START( deadconxj )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(deadconx_map,0)
+ MDRV_CPU_PROGRAM_MAP(deadconx_map)
/* video hardware */
MDRV_GFXDECODE(deadconx)
@@ -3552,7 +3552,7 @@ static MACHINE_DRIVER_START( dinorex )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dinorex_map,0)
+ MDRV_CPU_PROGRAM_MAP(dinorex_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_dinorex)
@@ -3565,7 +3565,7 @@ static MACHINE_DRIVER_START( qjinsei )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(qjinsei_map,0)
+ MDRV_CPU_PROGRAM_MAP(qjinsei_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_quiz)
@@ -3578,7 +3578,7 @@ static MACHINE_DRIVER_START( qcrayon )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(qcrayon_map,0)
+ MDRV_CPU_PROGRAM_MAP(qcrayon_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_quiz)
@@ -3591,7 +3591,7 @@ static MACHINE_DRIVER_START( qcrayon2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(qcrayon2_map,0)
+ MDRV_CPU_PROGRAM_MAP(qcrayon2_map)
/* video hardware */
MDRV_VIDEO_START(taitof2_quiz)
@@ -3604,7 +3604,7 @@ static MACHINE_DRIVER_START( driftout )
/* basic machine hardware */
MDRV_IMPORT_FROM(taito_f2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(driftout_map,0)
+ MDRV_CPU_PROGRAM_MAP(driftout_map)
/* video hardware */
MDRV_GFXDECODE(pivot)
@@ -3617,11 +3617,11 @@ static MACHINE_DRIVER_START( cameltrya )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cameltry_map,0)
+ MDRV_CPU_PROGRAM_MAP(cameltry_map)
MDRV_CPU_VBLANK_INT("screen", taitof2_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,24000000/4) /* verifed on pcb */
- MDRV_CPU_PROGRAM_MAP(cameltrya_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(cameltrya_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -3658,11 +3658,11 @@ static MACHINE_DRIVER_START( driveout )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(driveout_map,0)
+ MDRV_CPU_PROGRAM_MAP(driveout_map)
MDRV_CPU_VBLANK_INT("screen", taitof2_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,24000000/6) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(driveout_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(driveout_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index 0abb1f4455a..a5c3d341f29 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -417,7 +417,7 @@ static MACHINE_DRIVER_START( f3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 16000000)
- MDRV_CPU_PROGRAM_MAP(f3_map,0)
+ MDRV_CPU_PROGRAM_MAP(f3_map)
MDRV_CPU_VBLANK_INT("screen", f3_interrupt2)
TAITO_F3_SOUND_SYSTEM_CPU(16000000)
@@ -502,7 +502,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( bubsympb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 16000000)
- MDRV_CPU_PROGRAM_MAP(f3_map,0)
+ MDRV_CPU_PROGRAM_MAP(f3_map)
MDRV_CPU_VBLANK_INT("screen", f3_interrupt2)
MDRV_MACHINE_START(f3)
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index 710cf4c8f17..3e5ff2f9035 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -528,11 +528,11 @@ static MACHINE_DRIVER_START( syvalion )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000 / 2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(syvalion_map,0)
+ MDRV_CPU_PROGRAM_MAP(syvalion_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000 / 2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_START(taitoh)
MDRV_MACHINE_RESET(taitoh)
@@ -568,11 +568,11 @@ static MACHINE_DRIVER_START( recordbr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000 / 2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(recordbr_map,0)
+ MDRV_CPU_PROGRAM_MAP(recordbr_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000 / 2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_START(taitoh)
MDRV_MACHINE_RESET(taitoh)
@@ -608,11 +608,11 @@ static MACHINE_DRIVER_START( dleague )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000 / 2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(dleague_map,0)
+ MDRV_CPU_PROGRAM_MAP(dleague_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000 / 2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_START(taitoh)
MDRV_MACHINE_RESET(taitoh)
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index b28fd154fa0..957dd4ca1cc 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -1950,14 +1950,14 @@ static MACHINE_DRIVER_START( fhawk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */
- MDRV_CPU_PROGRAM_MAP(fhawk_map,0)
+ MDRV_CPU_PROGRAM_MAP(fhawk_map)
MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(fhawk_3_map,0)
+ MDRV_CPU_PROGRAM_MAP(fhawk_3_map)
MDRV_CPU_ADD("slave", Z80, 12000000/3) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(fhawk_2_map,0)
+ MDRV_CPU_PROGRAM_MAP(fhawk_2_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,3) /* fixes slow down problems */
MDRV_QUANTUM_TIME(HZ(6000))
@@ -1996,13 +1996,13 @@ static MACHINE_DRIVER_START( champwr )
/* basic machine hardware */
MDRV_IMPORT_FROM(fhawk)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(champwr_map,0)
+ MDRV_CPU_PROGRAM_MAP(champwr_map)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(champwr_3_map,0)
+ MDRV_CPU_PROGRAM_MAP(champwr_3_map)
MDRV_CPU_MODIFY("slave")
- MDRV_CPU_PROGRAM_MAP(champwr_2_map,0)
+ MDRV_CPU_PROGRAM_MAP(champwr_2_map)
MDRV_MACHINE_RESET(champwr)
@@ -2026,13 +2026,13 @@ static MACHINE_DRIVER_START( raimais )
/* basic machine hardware */
MDRV_IMPORT_FROM(fhawk)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(raimais_map,0)
+ MDRV_CPU_PROGRAM_MAP(raimais_map)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(raimais_3_map,0)
+ MDRV_CPU_PROGRAM_MAP(raimais_3_map)
MDRV_CPU_MODIFY("slave")
- MDRV_CPU_PROGRAM_MAP(raimais_2_map,0)
+ MDRV_CPU_PROGRAM_MAP(raimais_2_map)
MDRV_MACHINE_RESET(raimais)
@@ -2049,11 +2049,11 @@ static MACHINE_DRIVER_START( kurikint )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */
- MDRV_CPU_PROGRAM_MAP(kurikint_map,0)
+ MDRV_CPU_PROGRAM_MAP(kurikint_map)
MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
MDRV_CPU_ADD("audiocpu", Z80, 12000000/3) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(kurikint_2_map,0)
+ MDRV_CPU_PROGRAM_MAP(kurikint_2_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -2100,7 +2100,7 @@ static MACHINE_DRIVER_START( plotting )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */
- MDRV_CPU_PROGRAM_MAP(plotting_map,0)
+ MDRV_CPU_PROGRAM_MAP(plotting_map)
MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
MDRV_MACHINE_RESET(plotting)
@@ -2137,7 +2137,7 @@ static MACHINE_DRIVER_START( puzznic )
/* basic machine hardware */
MDRV_IMPORT_FROM(plotting)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(puzznic_map,0)
+ MDRV_CPU_PROGRAM_MAP(puzznic_map)
MDRV_MACHINE_RESET(puzznic)
MACHINE_DRIVER_END
@@ -2147,7 +2147,7 @@ static MACHINE_DRIVER_START( puzznici )
/* basic machine hardware */
MDRV_IMPORT_FROM(plotting)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(puzznici_map,0)
+ MDRV_CPU_PROGRAM_MAP(puzznici_map)
MDRV_MACHINE_RESET(puzznic)
MACHINE_DRIVER_END
@@ -2158,7 +2158,7 @@ static MACHINE_DRIVER_START( horshoes )
/* basic machine hardware */
MDRV_IMPORT_FROM(plotting)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(horshoes_map,0)
+ MDRV_CPU_PROGRAM_MAP(horshoes_map)
MDRV_MACHINE_RESET(horshoes)
MACHINE_DRIVER_END
@@ -2169,7 +2169,7 @@ static MACHINE_DRIVER_START( palamed )
/* basic machine hardware */
MDRV_IMPORT_FROM(plotting)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(palamed_map,0)
+ MDRV_CPU_PROGRAM_MAP(palamed_map)
MDRV_MACHINE_RESET(palamed)
MACHINE_DRIVER_END
@@ -2180,7 +2180,7 @@ static MACHINE_DRIVER_START( cachat )
/* basic machine hardware */
MDRV_IMPORT_FROM(plotting)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cachat_map,0)
+ MDRV_CPU_PROGRAM_MAP(cachat_map)
MDRV_MACHINE_RESET(cachat)
MACHINE_DRIVER_END
@@ -2189,11 +2189,11 @@ static MACHINE_DRIVER_START( evilston )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 13330560/2) /* not verfied */
- MDRV_CPU_PROGRAM_MAP(evilston_map,0)
+ MDRV_CPU_PROGRAM_MAP(evilston_map)
MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
MDRV_CPU_ADD("audiocpu", Z80, 12000000/3) /* not verified */
- MDRV_CPU_PROGRAM_MAP(evilston_2_map,0)
+ MDRV_CPU_PROGRAM_MAP(evilston_2_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/taito_o.c b/src/mame/drivers/taito_o.c
index 41e931d5489..067f826ae69 100644
--- a/src/mame/drivers/taito_o.c
+++ b/src/mame/drivers/taito_o.c
@@ -236,7 +236,7 @@ static MACHINE_DRIVER_START( parentj )
MDRV_CPU_ADD("maincpu", M68000,12000000 ) /*?? MHz */
- MDRV_CPU_PROGRAM_MAP(parentj_map,0)
+ MDRV_CPU_PROGRAM_MAP(parentj_map)
MDRV_CPU_VBLANK_INT_HACK(parentj_interrupt,2)
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 496856809de..25a649bbf94 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -917,11 +917,11 @@ static MACHINE_DRIVER_START( superman )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(superman_map,0)
+ MDRV_CPU_PROGRAM_MAP(superman_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -957,11 +957,11 @@ static MACHINE_DRIVER_START( daisenpu )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(daisenpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(daisenpu_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(daisenpu_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(daisenpu_sound_map)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -994,11 +994,11 @@ static MACHINE_DRIVER_START( gigandes )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(gigandes_map,0)
+ MDRV_CPU_PROGRAM_MAP(gigandes_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(ballbros_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(ballbros_sound_map)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -1033,11 +1033,11 @@ static MACHINE_DRIVER_START( ballbros )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(ballbros_map,0)
+ MDRV_CPU_PROGRAM_MAP(ballbros_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(ballbros_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(ballbros_sound_map)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index 73d14a145c4..dff9ec210fa 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -2899,14 +2899,14 @@ static MACHINE_DRIVER_START( contcirc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(contcirc_map,0)
+ MDRV_CPU_PROGRAM_MAP(contcirc_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_sound_map)
MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(contcirc_cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(contcirc_cpub_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_MACHINE_START(taitoz)
@@ -2955,14 +2955,14 @@ static MACHINE_DRIVER_START( chasehq )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(chasehq_map,0)
+ MDRV_CPU_PROGRAM_MAP(chasehq_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_sound_map)
MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(chq_cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(chq_cpub_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_MACHINE_START(taitoz)
@@ -3009,14 +3009,14 @@ static MACHINE_DRIVER_START( enforce )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(enforce_map,0)
+ MDRV_CPU_PROGRAM_MAP(enforce_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_sound_map)
MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(enforce_cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(enforce_cpub_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_MACHINE_START(taitoz)
@@ -3066,11 +3066,11 @@ static MACHINE_DRIVER_START( bshark )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(bshark_map,0)
+ MDRV_CPU_PROGRAM_MAP(bshark_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(bshark_cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(bshark_cpub_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_MACHINE_START(taitoz)
@@ -3118,14 +3118,14 @@ static MACHINE_DRIVER_START( sci )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sci_map,0)
+ MDRV_CPU_PROGRAM_MAP(sci_map)
MDRV_CPU_VBLANK_INT("screen", sci_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_sound_map)
MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sci_cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sci_cpub_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_MACHINE_START(taitoz)
@@ -3173,14 +3173,14 @@ static MACHINE_DRIVER_START( nightstr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(nightstr_map,0)
+ MDRV_CPU_PROGRAM_MAP(nightstr_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_sound_map)
MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(nightstr_cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(nightstr_cpub_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_MACHINE_START(taitoz)
@@ -3229,14 +3229,14 @@ static MACHINE_DRIVER_START( aquajack )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(aquajack_map,0)
+ MDRV_CPU_PROGRAM_MAP(aquajack_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_sound_map)
MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(aquajack_cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(aquajack_cpub_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_MACHINE_START(taitoz)
@@ -3284,11 +3284,11 @@ static MACHINE_DRIVER_START( spacegun )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(spacegun_map,0)
+ MDRV_CPU_PROGRAM_MAP(spacegun_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(spacegun_cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(spacegun_cpub_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_MACHINE_START(taitoz)
@@ -3336,14 +3336,14 @@ static MACHINE_DRIVER_START( dblaxle )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(dblaxle_map,0)
+ MDRV_CPU_PROGRAM_MAP(dblaxle_map)
MDRV_CPU_VBLANK_INT("screen", dblaxle_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_sound_map)
MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(dblaxle_cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(dblaxle_cpub_map)
MDRV_CPU_VBLANK_INT("screen", dblaxle_cpub_interrupt)
MDRV_MACHINE_START(taitoz)
@@ -3391,14 +3391,14 @@ static MACHINE_DRIVER_START( racingb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(racingb_map,0)
+ MDRV_CPU_PROGRAM_MAP(racingb_map)
MDRV_CPU_VBLANK_INT("screen", dblaxle_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_sound_map)
MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(racingb_cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(racingb_cpub_map)
MDRV_CPU_VBLANK_INT("screen", dblaxle_cpub_interrupt)
MDRV_MACHINE_START(taitoz)
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index 8f9afa15cba..5463bd5eda8 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -599,16 +599,16 @@ static MACHINE_DRIVER_START( airsys )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000 / 2) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(airsys_map, 0)
+ MDRV_CPU_PROGRAM_MAP(airsys_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000 / 2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_ADD("dsp", TMS32025,24000000) /* 24 MHz ??? *///
- MDRV_CPU_PROGRAM_MAP(DSP_map_program, 0)
- MDRV_CPU_DATA_MAP(DSP_map_data, 0)
- MDRV_CPU_IO_MAP(DSP_map_io, 0)
+ MDRV_CPU_PROGRAM_MAP(DSP_map_program)
+ MDRV_CPU_DATA_MAP(DSP_map_data)
+ MDRV_CPU_IO_MAP(DSP_map_io)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/taitogn.c b/src/mame/drivers/taitogn.c
index e7a32cb8b4c..3790cf6fb9e 100644
--- a/src/mame/drivers/taitogn.c
+++ b/src/mame/drivers/taitogn.c
@@ -888,7 +888,7 @@ static const psx_spu_interface psxspu_interface =
static MACHINE_DRIVER_START( coh3002t )
/* basic machine hardware */
MDRV_CPU_ADD( "maincpu", PSXCPU, XTAL_100MHz )
- MDRV_CPU_PROGRAM_MAP( zn_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( zn_map)
MDRV_CPU_VBLANK_INT("screen", psx_vblank)
/* video hardware */
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index 19990ae6e5a..e6df0575119 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -1295,19 +1295,19 @@ static INTERRUPT_GEN( taitojc_int6 )
static MACHINE_DRIVER_START( taitojc )
MDRV_CPU_ADD("maincpu", M68040, 25000000)
- MDRV_CPU_PROGRAM_MAP(taitojc_map, 0)
+ MDRV_CPU_PROGRAM_MAP(taitojc_map)
MDRV_CPU_VBLANK_INT("screen", taitojc_vblank)
MDRV_CPU_PERIODIC_INT(taitojc_int6, 1000)
TAITO_F3_SOUND_SYSTEM_CPU(16000000)
MDRV_CPU_ADD("sub", MC68HC11, 4000000)
- MDRV_CPU_PROGRAM_MAP(hc11_pgm_map, 0)
- MDRV_CPU_IO_MAP(hc11_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(hc11_pgm_map)
+ MDRV_CPU_IO_MAP(hc11_io_map)
MDRV_CPU_ADD("dsp", TMS32051, 50000000)
- MDRV_CPU_PROGRAM_MAP(tms_program_map, 0)
- MDRV_CPU_DATA_MAP(tms_data_map, 0)
+ MDRV_CPU_PROGRAM_MAP(tms_program_map)
+ MDRV_CPU_DATA_MAP(tms_data_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/taitopjc.c b/src/mame/drivers/taitopjc.c
index 950db0e17c1..e2b1189a794 100644
--- a/src/mame/drivers/taitopjc.c
+++ b/src/mame/drivers/taitopjc.c
@@ -89,7 +89,7 @@ static const powerpc_config ppc603e_config =
static MACHINE_DRIVER_START( taitopjc )
MDRV_CPU_ADD("maincpu", PPC603E, 100000000)
MDRV_CPU_CONFIG(ppc603e_config)
- MDRV_CPU_PROGRAM_MAP(ppc603e_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(ppc603e_mem)
/* TMP95C063F I/O CPU */
/* TMS320C53 DSP */
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index ddf60bb9e0b..13e9ff10b1b 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -1794,11 +1794,11 @@ static MACHINE_DRIVER_START( nomcu )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(taitosj_main_nomcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(taitosj_main_nomcu_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,6000000/2) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(taitosj_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(taitosj_audio_map)
/* interrupts: */
/* - no interrupts synced with vblank */
/* - NMI triggered by the main CPU */
@@ -1852,10 +1852,10 @@ static MACHINE_DRIVER_START( mcu )
/* basic machine hardware */
MDRV_IMPORT_FROM(nomcu)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(taitosj_main_mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(taitosj_main_mcu_map)
MDRV_CPU_ADD("mcu", M68705,3000000) /* xtal is 3MHz, divided by 4 internally */
- MDRV_CPU_PROGRAM_MAP(taitosj_mcu_map,0)
+ MDRV_CPU_PROGRAM_MAP(taitosj_mcu_map)
MDRV_QUANTUM_TIME(HZ(6000))
MACHINE_DRIVER_END
@@ -1866,7 +1866,7 @@ static MACHINE_DRIVER_START( kikstart )
/* basic machine hardware */
MDRV_IMPORT_FROM(mcu)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(kikstart_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(kikstart_main_map)
MDRV_VIDEO_UPDATE(kikstart)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/taitotz.c b/src/mame/drivers/taitotz.c
index 767d19d3982..8b27c95eb91 100644
--- a/src/mame/drivers/taitotz.c
+++ b/src/mame/drivers/taitotz.c
@@ -105,7 +105,7 @@ static const powerpc_config ppc603e_config =
static MACHINE_DRIVER_START( taitotz )
MDRV_CPU_ADD("maincpu", PPC603E, 100000000)
MDRV_CPU_CONFIG(ppc603e_config)
- MDRV_CPU_PROGRAM_MAP(ppc603e_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(ppc603e_mem)
/* TMP95C063F I/O CPU */
/* MN1020819DA sound CPU */
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index 10f3185b88f..0d83c540a67 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -601,8 +601,8 @@ static MACHINE_DRIVER_START(taitowlf)
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PENTIUM, 200000000)
- MDRV_CPU_PROGRAM_MAP(taitowlf_map, 0)
- MDRV_CPU_IO_MAP(taitowlf_io, 0)
+ MDRV_CPU_PROGRAM_MAP(taitowlf_map)
+ MDRV_CPU_IO_MAP(taitowlf_io)
MDRV_MACHINE_START(taitowlf)
MDRV_MACHINE_RESET(taitowlf)
diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c
index 37acd9e906b..b71e64b7d46 100644
--- a/src/mame/drivers/tank8.c
+++ b/src/mame/drivers/tank8.c
@@ -328,7 +328,7 @@ static MACHINE_DRIVER_START( tank8 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6800, 11055000 / 10) /* ? */
- MDRV_CPU_PROGRAM_MAP(tank8_cpu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(tank8_cpu_map)
MDRV_MACHINE_RESET(tank8)
diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c
index 78c9ce5f6f6..fbdb4ded656 100644
--- a/src/mame/drivers/tankbatt.c
+++ b/src/mame/drivers/tankbatt.c
@@ -283,7 +283,7 @@ static MACHINE_DRIVER_START( tankbatt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", tankbatt_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index 8074b9893ba..7e0fef2e60a 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -342,12 +342,12 @@ static MACHINE_DRIVER_START( tankbust )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, 4000000) /* 3.072 MHz ? */
- MDRV_CPU_PROGRAM_MAP(map_cpu2,0)
- MDRV_CPU_IO_MAP(port_map_cpu2,0)
+ MDRV_CPU_PROGRAM_MAP(map_cpu2)
+ MDRV_CPU_IO_MAP(port_map_cpu2)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index 29a4c07e396..e8c94ce1148 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -332,12 +332,12 @@ static const ym2610_interface ym2610_config =
static MACHINE_DRIVER_START( taotaido )
MDRV_CPU_ADD("maincpu", M68000, 32000000/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,20000000/4) // ??
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_port_map)
/* IRQs are triggered by the YM2610 */
MDRV_GFXDECODE(taotaido)
diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c
index fd5d6d5eb76..e5d4c4d2311 100644
--- a/src/mame/drivers/targeth.c
+++ b/src/mame/drivers/targeth.c
@@ -180,7 +180,7 @@ static MACHINE_DRIVER_START( targeth )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(targeth_interrupt,3)
/* video hardware */
diff --git a/src/mame/drivers/tarzan.c b/src/mame/drivers/tarzan.c
index 33c68b16ddb..2f89a2a5a96 100644
--- a/src/mame/drivers/tarzan.c
+++ b/src/mame/drivers/tarzan.c
@@ -54,7 +54,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( tarzan )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(tarzan_map,0)
+ MDRV_CPU_PROGRAM_MAP(tarzan_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index 364d590dba9..94dfbb578d3 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -860,18 +860,18 @@ static MACHINE_DRIVER_START( apache3 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30, CLOCK_1 / 2)
- MDRV_CPU_PROGRAM_MAP(apache3_v30_map,0)
+ MDRV_CPU_PROGRAM_MAP(apache3_v30_map)
MDRV_CPU_VBLANK_INT("screen", roundup5_interrupt)
MDRV_CPU_ADD("sub", M68000, CLOCK_2 / 4)
- MDRV_CPU_PROGRAM_MAP(apache3_68000_map,0)
+ MDRV_CPU_PROGRAM_MAP(apache3_68000_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", V20, CLOCK_1 / 2)
- MDRV_CPU_PROGRAM_MAP(apache3_v20_map,0)
+ MDRV_CPU_PROGRAM_MAP(apache3_v20_map)
MDRV_CPU_ADD("sub2", Z80, CLOCK_2 / 8)
- MDRV_CPU_PROGRAM_MAP(apache3_z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(apache3_z80_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -907,14 +907,14 @@ static MACHINE_DRIVER_START( roundup5 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30, CLOCK_1 / 2)
- MDRV_CPU_PROGRAM_MAP(roundup5_v30_map,0)
+ MDRV_CPU_PROGRAM_MAP(roundup5_v30_map)
MDRV_CPU_VBLANK_INT("screen", roundup5_interrupt)
MDRV_CPU_ADD("sub", M68000, CLOCK_2 / 4)
- MDRV_CPU_PROGRAM_MAP(roundup5_68000_map, 0)
+ MDRV_CPU_PROGRAM_MAP(roundup5_68000_map)
MDRV_CPU_ADD("audiocpu", Z80, CLOCK_1 / 4)
- MDRV_CPU_PROGRAM_MAP(roundup5_z80_map, 0)
+ MDRV_CPU_PROGRAM_MAP(roundup5_z80_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -950,15 +950,15 @@ static MACHINE_DRIVER_START( cyclwarr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, CLOCK_2 / 4)
- MDRV_CPU_PROGRAM_MAP(cyclwarr_68000a_map,0)
+ MDRV_CPU_PROGRAM_MAP(cyclwarr_68000a_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("sub", M68000, CLOCK_2 / 4)
- MDRV_CPU_PROGRAM_MAP(cyclwarr_68000b_map,0)
+ MDRV_CPU_PROGRAM_MAP(cyclwarr_68000b_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, CLOCK_1 / 4)
- MDRV_CPU_PROGRAM_MAP(cyclwarr_z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(cyclwarr_z80_map)
MDRV_QUANTUM_TIME(HZ(12000))
@@ -994,15 +994,15 @@ static MACHINE_DRIVER_START( bigfight )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, CLOCK_2 / 4)
- MDRV_CPU_PROGRAM_MAP(bigfight_68000a_map,0)
+ MDRV_CPU_PROGRAM_MAP(bigfight_68000a_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("sub", M68000, CLOCK_2 / 4)
- MDRV_CPU_PROGRAM_MAP(bigfight_68000b_map,0)
+ MDRV_CPU_PROGRAM_MAP(bigfight_68000b_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, CLOCK_1 / 4)
- MDRV_CPU_PROGRAM_MAP(cyclwarr_z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(cyclwarr_z80_map)
MDRV_QUANTUM_TIME(HZ(12000))
diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c
index 981001e9760..8444d77af96 100644
--- a/src/mame/drivers/tattack.c
+++ b/src/mame/drivers/tattack.c
@@ -182,7 +182,7 @@ static MACHINE_DRIVER_START( tattack )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 8000000 / 2) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(mem, 0)
+ MDRV_CPU_PROGRAM_MAP(mem)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c
index 09c686140af..956a7b07dfd 100644
--- a/src/mame/drivers/taxidrvr.c
+++ b/src/mame/drivers/taxidrvr.c
@@ -362,16 +362,16 @@ static MACHINE_DRIVER_START( taxidrvr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80,4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu2_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* ??? */
MDRV_CPU_ADD("audiocpu", Z80,4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cpu3_map,0)
- MDRV_CPU_IO_MAP(cpu3_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu3_map)
+ MDRV_CPU_IO_MAP(cpu3_port_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* ??? */
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index 7e0f09ac305..56c9b4508f2 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -481,17 +481,17 @@ static MACHINE_DRIVER_START( tbowl )
/* CPU on Board '6206B' */
MDRV_CPU_ADD("maincpu", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */
- MDRV_CPU_PROGRAM_MAP(6206B_map,0)
+ MDRV_CPU_PROGRAM_MAP(6206B_map)
MDRV_CPU_VBLANK_INT("lscreen", irq0_line_hold)
/* CPU on Board '6206C' */
MDRV_CPU_ADD("sub", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */
- MDRV_CPU_PROGRAM_MAP(6206C_map,0)
+ MDRV_CPU_PROGRAM_MAP(6206C_map)
MDRV_CPU_VBLANK_INT("lscreen", irq0_line_hold)
/* CPU on Board '6206A' */
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* Actual Z80 */
- MDRV_CPU_PROGRAM_MAP(6206A_map,0)
+ MDRV_CPU_PROGRAM_MAP(6206A_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index 2089316d49e..e31274b1ae3 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -381,22 +381,22 @@ static MACHINE_DRIVER_START( tceptor )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 49152000/32)
- MDRV_CPU_PROGRAM_MAP(m6809_map,0)
+ MDRV_CPU_PROGRAM_MAP(m6809_map)
MDRV_CPU_VBLANK_INT("2d", m6809_vb_interrupt)
MDRV_CPU_ADD("audiocpu", M65C02, 49152000/24)
- MDRV_CPU_PROGRAM_MAP(m6502_a_map,0)
+ MDRV_CPU_PROGRAM_MAP(m6502_a_map)
MDRV_CPU_ADD("audio2", M65C02, 49152000/24)
- MDRV_CPU_PROGRAM_MAP(m6502_b_map,0)
+ MDRV_CPU_PROGRAM_MAP(m6502_b_map)
MDRV_CPU_ADD("sub", M68000, 49152000/4)
- MDRV_CPU_PROGRAM_MAP(m68k_map,0)
+ MDRV_CPU_PROGRAM_MAP(m68k_map)
MDRV_CPU_VBLANK_INT("2d", m68k_vb_interrupt)
MDRV_CPU_ADD("mcu", HD63701, 49152000/8) /* or compatible 6808 with extra instructions */
- MDRV_CPU_PROGRAM_MAP(mcu_map,0)
- MDRV_CPU_IO_MAP(mcu_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MDRV_CPU_IO_MAP(mcu_io_map)
MDRV_CPU_VBLANK_INT("2d", mcu_vb_interrupt)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c
index 754e31f14be..20f6252d707 100644
--- a/src/mame/drivers/tcl.c
+++ b/src/mame/drivers/tcl.c
@@ -116,7 +116,7 @@ static MACHINE_DRIVER_START( tcl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/4)
- MDRV_CPU_PROGRAM_MAP(tcl_map,0)
+ MDRV_CPU_PROGRAM_MAP(tcl_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index 7f6c938f316..7e1dcb54278 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -572,11 +572,11 @@ static MACHINE_DRIVER_START( rygar )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rygar_map,0)
+ MDRV_CPU_PROGRAM_MAP(rygar_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, XTAL_4MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rygar_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(rygar_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -612,10 +612,10 @@ static MACHINE_DRIVER_START( gemini )
/* basic machine hardware */
MDRV_IMPORT_FROM(rygar)
MDRV_CPU_REPLACE("maincpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(gemini_map,0)
+ MDRV_CPU_PROGRAM_MAP(gemini_map)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(tecmo_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(tecmo_sound_map)
MACHINE_DRIVER_END
@@ -624,7 +624,7 @@ static MACHINE_DRIVER_START( silkworm )
/* basic machine hardware */
MDRV_IMPORT_FROM(gemini)
MDRV_CPU_REPLACE("maincpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(silkworm_map,0)
+ MDRV_CPU_PROGRAM_MAP(silkworm_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index 464713facc6..e6980b29fde 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -402,11 +402,11 @@ static MACHINE_DRIVER_START( fstarfrc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12MHz */
- MDRV_CPU_PROGRAM_MAP(fstarfrc_map,0)
+ MDRV_CPU_PROGRAM_MAP(fstarfrc_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* NMIs are triggered by the main CPU */
MDRV_QUANTUM_TIME(HZ(600))
@@ -442,7 +442,7 @@ static MACHINE_DRIVER_START( ginkun )
MDRV_IMPORT_FROM(fstarfrc)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ginkun_map,0)
+ MDRV_CPU_PROGRAM_MAP(ginkun_map)
MDRV_VIDEO_START(ginkun)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index e7af58a650a..528d07ee2f1 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -880,13 +880,13 @@ static const ymf262_interface tecmosys_ymf262_interface =
static MACHINE_DRIVER_START( deroon )
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_WATCHDOG_VBLANK_INIT(400) // guess
MDRV_CPU_ADD("audiocpu", Z80, 16000000/2 ) /* 8 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_GFXDECODE(tecmosys)
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index fd9623e7969..b73dba1ac1d 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -659,16 +659,16 @@ static MACHINE_DRIVER_START( tehkanwc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18432000/4) /* 18.432000 / 4 */
- MDRV_CPU_PROGRAM_MAP(main_mem,0)
+ MDRV_CPU_PROGRAM_MAP(main_mem)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, 18432000/4)
- MDRV_CPU_PROGRAM_MAP(sub_mem,0)
+ MDRV_CPU_PROGRAM_MAP(sub_mem)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 18432000/4)
- MDRV_CPU_PROGRAM_MAP(sound_mem,0)
- MDRV_CPU_IO_MAP(sound_port,0)
+ MDRV_CPU_PROGRAM_MAP(sound_mem)
+ MDRV_CPU_IO_MAP(sound_port)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - seems enough to keep the CPUs in sync */
diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c
index dad3c00f1c1..e8b79dc4250 100644
--- a/src/mame/drivers/tempest.c
+++ b/src/mame/drivers/tempest.c
@@ -574,7 +574,7 @@ static MACHINE_DRIVER_START( tempest )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12)
MDRV_WATCHDOG_TIME_INIT(HZ(CLOCK_3KHZ / 256))
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index b4fb9bfe47b..3e7de0ab69c 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -541,12 +541,12 @@ GFXDECODE_END
static MACHINE_DRIVER_START( amazon )
MDRV_CPU_ADD("maincpu", M68000, 8000000 )
- MDRV_CPU_PROGRAM_MAP(amazon_map,0)
+ MDRV_CPU_PROGRAM_MAP(amazon_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_3526_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_3526_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */
MDRV_MACHINE_START(amazon)
@@ -580,12 +580,12 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ym3526 )
MDRV_CPU_ADD("maincpu", M68000, 8000000 )
- MDRV_CPU_PROGRAM_MAP(terracre_map,0)
+ MDRV_CPU_PROGRAM_MAP(terracre_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_3526_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_3526_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */
@@ -617,12 +617,12 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ym2203 )
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(terracre_map,0)
+ MDRV_CPU_PROGRAM_MAP(terracre_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_2203_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_2203_io_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index f2e8f724394..f1117baa777 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -1103,7 +1103,7 @@ static MACHINE_DRIVER_START( tetrisp2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(tetrisp2_map,0)
+ MDRV_CPU_PROGRAM_MAP(tetrisp2_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_NVRAM_HANDLER(tetrisp2)
@@ -1136,7 +1136,7 @@ static MACHINE_DRIVER_START( nndmseal )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz)
- MDRV_CPU_PROGRAM_MAP(nndmseal_map,0)
+ MDRV_CPU_PROGRAM_MAP(nndmseal_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_NVRAM_HANDLER(tetrisp2)
@@ -1168,7 +1168,7 @@ static MACHINE_DRIVER_START( rockn )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(rockn1_map,0)
+ MDRV_CPU_PROGRAM_MAP(rockn1_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_NVRAM_HANDLER(tetrisp2)
@@ -1200,7 +1200,7 @@ static MACHINE_DRIVER_START( rockn2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(rockn2_map,0)
+ MDRV_CPU_PROGRAM_MAP(rockn2_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_NVRAM_HANDLER(tetrisp2)
@@ -1232,11 +1232,11 @@ static MACHINE_DRIVER_START( rocknms )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(rocknms_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(rocknms_main_map)
MDRV_CPU_VBLANK_INT("lscreen", irq2_line_hold)
MDRV_CPU_ADD("sub", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(rocknms_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(rocknms_sub_map)
MDRV_CPU_VBLANK_INT("lscreen", irq2_line_hold)
MDRV_NVRAM_HANDLER(tetrisp2)
diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c
index c80833f8e2b..fbefd1d8eee 100644
--- a/src/mame/drivers/thayers.c
+++ b/src/mame/drivers/thayers.c
@@ -758,11 +758,11 @@ static COP400_INTERFACE( thayers_cop_intf )
static MACHINE_DRIVER_START( thayers )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_4MHz)
- MDRV_CPU_PROGRAM_MAP(thayers_map, 0)
- MDRV_CPU_IO_MAP(thayers_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(thayers_map)
+ MDRV_CPU_IO_MAP(thayers_io_map)
MDRV_CPU_ADD("mcu", COP421, XTAL_4MHz/2) // COP421L-PCA/N
- MDRV_CPU_IO_MAP(thayers_cop_io_map, 0)
+ MDRV_CPU_IO_MAP(thayers_cop_io_map)
MDRV_CPU_CONFIG(thayers_cop_intf)
MDRV_MACHINE_START(thayers)
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index d20b89a550d..80617bb942d 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -353,11 +353,11 @@ static MACHINE_DRIVER_START( thedeep )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000) /* 6MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(thedeep_interrupt,2) /* IRQ by MCU, NMI by vblank (maskable) */
MDRV_CPU_ADD("audiocpu", M65C02, 2000000) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
/* IRQ by YM2203, NMI by when sound latch written by main cpu */
/* CPU3 is a i8751 */
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index 62c80600caa..9fa8045896c 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -652,12 +652,12 @@ static MACHINE_DRIVER_START( thepit )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(thepit_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(thepit_main_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4) /* 2.5 MHz */
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
- MDRV_CPU_IO_MAP(audio_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
+ MDRV_CPU_IO_MAP(audio_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -689,7 +689,7 @@ static MACHINE_DRIVER_START( intrepid )
/* basic machine hardware */
MDRV_IMPORT_FROM(thepit)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(intrepid_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(intrepid_main_map)
/* video hardware */
MDRV_GFXDECODE(intrepid)
diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c
index 296e34697cb..3d070c07450 100644
--- a/src/mame/drivers/thief.c
+++ b/src/mame/drivers/thief.c
@@ -454,8 +454,8 @@ static MACHINE_DRIVER_START( sharkatt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(sharkatt_main_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sharkatt_main_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", thief_interrupt)
/* video hardware */
@@ -492,8 +492,8 @@ static MACHINE_DRIVER_START( thief )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(thief_main_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(thief_main_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", thief_interrupt)
/* video hardware */
@@ -530,8 +530,8 @@ static MACHINE_DRIVER_START( natodef )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(thief_main_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(thief_main_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", thief_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c
index 06269c143f3..970218faac8 100644
--- a/src/mame/drivers/thoop2.c
+++ b/src/mame/drivers/thoop2.c
@@ -199,7 +199,7 @@ static MACHINE_DRIVER_START( thoop2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(thoop2_map,0)
+ MDRV_CPU_PROGRAM_MAP(thoop2_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c
index b4c798e419c..fc2184d6fb5 100644
--- a/src/mame/drivers/thunderj.c
+++ b/src/mame/drivers/thunderj.c
@@ -272,10 +272,10 @@ static MACHINE_DRIVER_START( thunderj )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(extra_map,0)
+ MDRV_CPU_PROGRAM_MAP(extra_map)
MDRV_MACHINE_RESET(thunderj)
MDRV_NVRAM_HANDLER(atarigen)
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index 486f6198d9a..b47bd894083 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -563,11 +563,11 @@ static MACHINE_DRIVER_START( scontra )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* 052001 */
- MDRV_CPU_PROGRAM_MAP(scontra_map,0)
+ MDRV_CPU_PROGRAM_MAP(scontra_map)
MDRV_CPU_VBLANK_INT("screen", scontra_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* ? */
- MDRV_CPU_PROGRAM_MAP(scontra_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(scontra_sound_map)
MDRV_MACHINE_RESET(scontra)
@@ -604,11 +604,11 @@ static MACHINE_DRIVER_START( thunderx )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(thunderx_map,0)
+ MDRV_CPU_PROGRAM_MAP(thunderx_map)
MDRV_CPU_VBLANK_INT("screen", scontra_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* ? */
- MDRV_CPU_PROGRAM_MAP(thunderx_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(thunderx_sound_map)
MDRV_MACHINE_RESET(thunderx)
diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c
index 5543b93526c..a65e28bc82c 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -221,8 +221,8 @@ GFXDECODE_END
static MACHINE_DRIVER_START( tiamc1 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080,16000000/9) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(tiamc1_map,0)
- MDRV_CPU_IO_MAP(tiamc1_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(tiamc1_map)
+ MDRV_CPU_IO_MAP(tiamc1_io_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c
index 81c3bfc34d8..b334a890a0d 100644
--- a/src/mame/drivers/tickee.c
+++ b/src/mame/drivers/tickee.c
@@ -429,7 +429,7 @@ static MACHINE_DRIVER_START( tickee )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(tickee_map,0)
+ MDRV_CPU_PROGRAM_MAP(tickee_map)
MDRV_MACHINE_RESET(tickee)
MDRV_NVRAM_HANDLER(generic_1fill)
@@ -460,7 +460,7 @@ static MACHINE_DRIVER_START( ghoshunt )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ghoshunt_map,0)
+ MDRV_CPU_PROGRAM_MAP(ghoshunt_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index 5e26a7f0d25..b7bc6918ca2 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -525,12 +525,12 @@ static MACHINE_DRIVER_START( tigeroad )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_port_map)
/* IRQs are triggered by the YM2203 */
@@ -570,8 +570,8 @@ static MACHINE_DRIVER_START( toramich )
MDRV_IMPORT_FROM(tigeroad)
MDRV_CPU_ADD("sample", Z80, 3579545) /* ? */
- MDRV_CPU_PROGRAM_MAP(sample_map,0)
- MDRV_CPU_IO_MAP(sample_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(sample_map)
+ MDRV_CPU_IO_MAP(sample_port_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,4000) /* ? */
/* sound hardware */
diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c
index 6d747e6cb12..2f929bbc5a3 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -245,13 +245,13 @@ static MACHINE_DRIVER_START( timelimt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5.000 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_io_map)
MDRV_CPU_VBLANK_INT("screen", timelimt_irq)
MDRV_CPU_ADD("audiocpu", Z80,18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* ? */
MDRV_QUANTUM_TIME(HZ(3000))
diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c
index 884ec688468..57caa2a7168 100644
--- a/src/mame/drivers/timeplt.c
+++ b/src/mame/drivers/timeplt.c
@@ -311,7 +311,7 @@ static MACHINE_DRIVER_START( timeplt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* not confirmed, but common for Konami games of the era */
- MDRV_CPU_PROGRAM_MAP(timeplt_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(timeplt_main_map)
MDRV_CPU_VBLANK_INT("screen", timeplt_interrupt)
MDRV_MACHINE_START(timeplt)
@@ -342,7 +342,7 @@ static MACHINE_DRIVER_START( psurge )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(psurge_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(psurge_main_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_START(NULL)
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 5fcf9785c89..50e0d8b612d 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -774,7 +774,7 @@ static const duart68681_config tmaster_duart68681_config =
static MACHINE_DRIVER_START( tm3k )
MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12MHz */
- MDRV_CPU_PROGRAM_MAP(tmaster_map,0)
+ MDRV_CPU_PROGRAM_MAP(tmaster_map)
MDRV_CPU_VBLANK_INT_HACK(tm3k_interrupt,2+20) // ??
MDRV_MACHINE_START(tmaster)
@@ -837,7 +837,7 @@ static MACHINE_RESET( galgames )
static MACHINE_DRIVER_START( galgames )
MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
- MDRV_CPU_PROGRAM_MAP(galgames_map,0)
+ MDRV_CPU_PROGRAM_MAP(galgames_map)
MDRV_CPU_VBLANK_INT_HACK(galgames_interrupt, 1+20) // ??
MDRV_NVRAM_HANDLER( galgames )
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 7a2ac23913c..9c9edf8ddb8 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -2076,7 +2076,7 @@ static MACHINE_DRIVER_START( cuebrick )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(cuebrick_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(cuebrick_main_map)
MDRV_CPU_VBLANK_INT_HACK(cuebrick_interrupt,10)
/* video hardware */
@@ -2109,11 +2109,11 @@ static MACHINE_DRIVER_START( mia )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/3)
- MDRV_CPU_PROGRAM_MAP(mia_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(mia_main_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(mia_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(mia_audio_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS)
@@ -2156,11 +2156,11 @@ static MACHINE_DRIVER_START( tmnt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/3)
- MDRV_CPU_PROGRAM_MAP(tmnt_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(tmnt_main_map)
MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(tmnt_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(tmnt_audio_map)
MDRV_MACHINE_RESET(tmnt)
@@ -2204,11 +2204,11 @@ static MACHINE_DRIVER_START( punkshot )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
- MDRV_CPU_PROGRAM_MAP(punkshot_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(punkshot_main_map)
MDRV_CPU_VBLANK_INT("screen", punkshot_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(punkshot_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(punkshot_audio_map)
/* NMIs are generated by the 053260 */
/* video hardware */
@@ -2242,11 +2242,11 @@ static MACHINE_DRIVER_START( lgtnfght )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
- MDRV_CPU_PROGRAM_MAP(lgtnfght_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(lgtnfght_main_map)
MDRV_CPU_VBLANK_INT("screen", lgtnfght_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(lgtnfght_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(lgtnfght_audio_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
@@ -2280,11 +2280,11 @@ static MACHINE_DRIVER_START( blswhstl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(blswhstl_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(blswhstl_main_map)
MDRV_CPU_VBLANK_INT("screen", punkshot_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(ssriders_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(ssriders_audio_map)
/* NMIs are generated by the 053260 */
MDRV_NVRAM_HANDLER(eeprom)
@@ -2339,11 +2339,11 @@ static MACHINE_DRIVER_START( glfgreat )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(glfgreat_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(glfgreat_main_map)
MDRV_CPU_VBLANK_INT("screen", lgtnfght_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(glfgreat_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(glfgreat_audio_map)
/* NMIs are generated by the 053260 */
/* video hardware */
@@ -2387,11 +2387,11 @@ static MACHINE_DRIVER_START( prmrsocr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(prmrsocr_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(prmrsocr_main_map)
MDRV_CPU_VBLANK_INT("screen", lgtnfght_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(prmrsocr_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(prmrsocr_audio_map)
/* NMIs are generated by the 054539 */
MDRV_NVRAM_HANDLER(thndrx2)
@@ -2426,7 +2426,7 @@ static MACHINE_DRIVER_START( tmnt2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
- MDRV_CPU_PROGRAM_MAP(tmnt2_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(tmnt2_main_map)
MDRV_CPU_VBLANK_INT("screen", punkshot_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 8000000) /* 8 MHz; clock is correct, but there's 1 cycle wait for ROM/RAM */
@@ -2434,7 +2434,7 @@ static MACHINE_DRIVER_START( tmnt2 )
/* without the wait, they cannot run on 8MHz. */
/* We are not emulating the wait state, so the ROM test ends at */
/* 02 instead of 00. */
- MDRV_CPU_PROGRAM_MAP(ssriders_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(ssriders_audio_map)
/* NMIs are generated by the 053260 */
MDRV_NVRAM_HANDLER(eeprom)
@@ -2471,11 +2471,11 @@ static MACHINE_DRIVER_START( ssriders )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
- MDRV_CPU_PROGRAM_MAP(ssriders_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(ssriders_main_map)
MDRV_CPU_VBLANK_INT("screen", punkshot_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ????? makes the ROM test sync */
- MDRV_CPU_PROGRAM_MAP(ssriders_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(ssriders_audio_map)
/* NMIs are generated by the 053260 */
MDRV_NVRAM_HANDLER(eeprom)
@@ -2512,7 +2512,7 @@ static MACHINE_DRIVER_START( sunsetbl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(sunsetbl_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(sunsetbl_main_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_NVRAM_HANDLER(eeprom)
@@ -2545,11 +2545,11 @@ static MACHINE_DRIVER_START( thndrx2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(thndrx2_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(thndrx2_main_map)
MDRV_CPU_VBLANK_INT("screen", punkshot_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(thndrx2_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(thndrx2_audio_map)
/* NMIs are generated by the 053260 */
MDRV_NVRAM_HANDLER(thndrx2)
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index 8c470946e60..c497222c6bf 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -1609,11 +1609,11 @@ static MACHINE_DRIVER_START( arknoid2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", arknoid2_interrupt)
MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_PERFECT_CPU("maincpu")
@@ -1648,11 +1648,11 @@ static MACHINE_DRIVER_START( drtoppel )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", arknoid2_interrupt)
MDRV_CPU_ADD("sub", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_PERFECT_CPU("maincpu")
@@ -1687,15 +1687,15 @@ static MACHINE_DRIVER_START( tnzs )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("mcu", I8742 ,12000000/2) /* 400KHz ??? - Main board Crystal is 12MHz */
- MDRV_CPU_IO_MAP(i8742_io_map,0)
+ MDRV_CPU_IO_MAP(i8742_io_map)
MDRV_QUANTUM_PERFECT_CPU("maincpu")
@@ -1728,11 +1728,11 @@ static MACHINE_DRIVER_START( insectx )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_PERFECT_CPU("maincpu")
@@ -1766,11 +1766,11 @@ static MACHINE_DRIVER_START( kageki )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(kageki_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(kageki_sub_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_PERFECT_CPU("maincpu")
@@ -1811,16 +1811,16 @@ static MACHINE_DRIVER_START( tnzsb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu0_type2,0)
+ MDRV_CPU_PROGRAM_MAP(cpu0_type2)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tnzsb_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(tnzsb_cpu1_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tnzsb_cpu2_map,0)
- MDRV_CPU_IO_MAP(tnzsb_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(tnzsb_cpu2_map)
+ MDRV_CPU_IO_MAP(tnzsb_io_map)
MDRV_QUANTUM_PERFECT_CPU("maincpu")
@@ -1858,10 +1858,10 @@ static MACHINE_DRIVER_START( kabukiz )
/* basic machine hardware */
MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(kabukiz_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(kabukiz_cpu1_map)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(kabukiz_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(kabukiz_cpu2_map)
MDRV_SOUND_MODIFY("ym")
MDRV_SOUND_CONFIG(kabukiz_ym2203_interface)
@@ -1879,11 +1879,11 @@ static MACHINE_DRIVER_START( jpopnics )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* Not verified - Main board Crystal is 12MHz */
- MDRV_CPU_PROGRAM_MAP(jpopnics_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(jpopnics_main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80,XTAL_12MHz/2) /* Not verified - Main board Crystal is 12MHz */
- MDRV_CPU_PROGRAM_MAP(jpopnics_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(jpopnics_sub_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_QUANTUM_PERFECT_CPU("maincpu")
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index 842101bd67a..538d7dfca9a 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -1238,12 +1238,12 @@ static MACHINE_DRIVER_START( rallybik )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(rallybik_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(rallybik_main_map)
MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */
- MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0)
- MDRV_CPU_IO_MAP(rallybik_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map)
+ MDRV_CPU_IO_MAP(rallybik_sound_io_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -1278,12 +1278,12 @@ static MACHINE_DRIVER_START( truxton )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(truxton_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(truxton_main_map)
MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */
- MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0)
- MDRV_CPU_IO_MAP(truxton_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map)
+ MDRV_CPU_IO_MAP(truxton_sound_io_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -1318,12 +1318,12 @@ static MACHINE_DRIVER_START( hellfire )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(hellfire_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(hellfire_main_map)
MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */
- MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0)
- MDRV_CPU_IO_MAP(hellfire_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map)
+ MDRV_CPU_IO_MAP(hellfire_sound_io_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -1358,12 +1358,12 @@ static MACHINE_DRIVER_START( zerowing )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(zerowing_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(zerowing_main_map)
MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */
- MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0)
- MDRV_CPU_IO_MAP(zerowing_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map)
+ MDRV_CPU_IO_MAP(zerowing_sound_io_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -1398,16 +1398,16 @@ static MACHINE_DRIVER_START( demonwld )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(demonwld_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(demonwld_main_map)
MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */
- MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0)
- MDRV_CPU_IO_MAP(demonwld_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map)
+ MDRV_CPU_IO_MAP(demonwld_sound_io_map)
MDRV_CPU_ADD("dsp", TMS32010,28000000/2) /* 14MHz CLKin */
- MDRV_CPU_PROGRAM_MAP(DSP_program_map,0)
- MDRV_CPU_IO_MAP(DSP_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(DSP_program_map)
+ MDRV_CPU_IO_MAP(DSP_io_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -1442,7 +1442,7 @@ static MACHINE_DRIVER_START( samesame )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(samesame_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(samesame_main_map)
MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
MDRV_MACHINE_RESET(toaplan1)
@@ -1476,12 +1476,12 @@ static MACHINE_DRIVER_START( outzone )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(outzone_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(outzone_main_map)
MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */
- MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0)
- MDRV_CPU_IO_MAP(outzone_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map)
+ MDRV_CPU_IO_MAP(outzone_sound_io_map)
MDRV_QUANTUM_TIME(HZ(600))
@@ -1516,7 +1516,7 @@ static MACHINE_DRIVER_START( vimana )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(vimana_main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(vimana_main_map)
MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
MDRV_MACHINE_RESET(vimana)
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index b51ede9fbd9..670f5add1e7 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -3362,12 +3362,12 @@ static MACHINE_DRIVER_START( tekipaki )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(tekipaki_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(tekipaki_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
#if USE_HD64x180
MDRV_CPU_ADD("mcu", Z180, XTAL_10MHz) /* HD647180 CPU actually */
- MDRV_CPU_PROGRAM_MAP(hd647180_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(hd647180_mem)
#endif
MDRV_MACHINE_RESET(toaplan2)
@@ -3401,12 +3401,12 @@ static MACHINE_DRIVER_START( ghox )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(ghox_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(ghox_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
#if USE_HD64x180
MDRV_CPU_ADD("mcu", Z180, XTAL_10MHz) /* HD647180 CPU actually */
- MDRV_CPU_PROGRAM_MAP(hd647180_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(hd647180_mem)
#endif
MDRV_MACHINE_RESET(ghox)
@@ -3439,13 +3439,13 @@ static MACHINE_DRIVER_START( dogyuun )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_25MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(dogyuun_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(dogyuun_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
#if USE_V25
MDRV_CPU_ADD("audiocpu", V25, XTAL_25MHz/2) /* NEC V25+ type Toaplan marked CPU ??? */
- MDRV_CPU_PROGRAM_MAP(V25_rambased_mem, 0)
- //MDRV_CPU_IO_MAP(V25_port, 0)
+ MDRV_CPU_PROGRAM_MAP(V25_rambased_mem)
+ //MDRV_CPU_IO_MAP(V25_port)
#endif
MDRV_MACHINE_RESET(dogyuun)
@@ -3482,14 +3482,14 @@ static MACHINE_DRIVER_START( kbash )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(kbash_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(kbash_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
/* ROM based v25 */
#if USE_V25
MDRV_CPU_ADD("mcu", V25, XTAL_16MHz) /* NEC V25+ type Toaplan marked CPU ??? */
- MDRV_CPU_PROGRAM_MAP(V25_mem, 0)
- MDRV_CPU_IO_MAP(V25_port, 0)
+ MDRV_CPU_PROGRAM_MAP(V25_mem)
+ MDRV_CPU_IO_MAP(V25_port)
#endif
MDRV_MACHINE_RESET(toaplan2)
@@ -3525,7 +3525,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kbash2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(kbash2_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(kbash2_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
MDRV_MACHINE_RESET(toaplan2)
@@ -3563,7 +3563,7 @@ static MACHINE_DRIVER_START( truxton2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(truxton2_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(truxton2_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq2)
MDRV_MACHINE_RESET(toaplan2)
@@ -3600,11 +3600,11 @@ static MACHINE_DRIVER_START( pipibibs )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(pipibibs_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(pipibibs_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
MDRV_CPU_ADD("audiocpu", Z80,XTAL_27MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_z80_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_z80_mem)
MDRV_QUANTUM_TIME(HZ(600))
@@ -3639,12 +3639,12 @@ static MACHINE_DRIVER_START( whoopee )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(tekipaki_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(tekipaki_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_27MHz/8) /* This should be a HD647180 */
/* Change this to 10MHz when HD647180 gets dumped. 10MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(sound_z80_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_z80_mem)
MDRV_QUANTUM_TIME(HZ(600))
@@ -3679,11 +3679,11 @@ static MACHINE_DRIVER_START( pipibibi )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(pipibibi_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(pipibibi_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_27MHz/8) /* ??? 3.37MHz */
- MDRV_CPU_PROGRAM_MAP(sound_z80_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_z80_mem)
MDRV_QUANTUM_TIME(HZ(600))
@@ -3718,13 +3718,13 @@ static MACHINE_DRIVER_START( fixeight )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(fixeight_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(fixeight_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
#if USE_V25
MDRV_CPU_ADD("audiocpu", V25, XTAL_16MHz) /* NEC V25+ type Toaplan marked CPU ??? */
- MDRV_CPU_PROGRAM_MAP(V25_rambased_mem, 0)
- //MDRV_CPU_IO_MAP(V25_port, 0)
+ MDRV_CPU_PROGRAM_MAP(V25_rambased_mem)
+ //MDRV_CPU_IO_MAP(V25_port)
#endif
MDRV_MACHINE_RESET(batsugun)
@@ -3761,7 +3761,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fixeighb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(fixeighb_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(fixeighb_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq2)
MDRV_MACHINE_RESET(toaplan2)
@@ -3795,13 +3795,13 @@ static MACHINE_DRIVER_START( vfive )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(vfive_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(vfive_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
#if USE_V25
MDRV_CPU_ADD("audiocpu", V25, XTAL_32MHz/2) /* NEC V25+ type Toaplan marked CPU ??? */
- MDRV_CPU_PROGRAM_MAP(V25_rambased_mem, 0)
- //MDRV_CPU_IO_MAP(V25_port, 0)
+ MDRV_CPU_PROGRAM_MAP(V25_rambased_mem)
+ //MDRV_CPU_IO_MAP(V25_port)
#endif
MDRV_MACHINE_RESET(vfive)
@@ -3851,13 +3851,13 @@ static MACHINE_DRIVER_START( batsugun )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(batsugun_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(batsugun_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
#if USE_V25
MDRV_CPU_ADD("audiocpu", V25, XTAL_32MHz/2) /* NEC V25+ type Toaplan marked CPU ??? */
- MDRV_CPU_PROGRAM_MAP(V25_rambased_mem, 0)
- //MDRV_CPU_IO_MAP(V25_port, 0)
+ MDRV_CPU_PROGRAM_MAP(V25_rambased_mem)
+ //MDRV_CPU_IO_MAP(V25_port)
#endif
MDRV_MACHINE_RESET(batsugun)
@@ -3895,7 +3895,7 @@ static MACHINE_DRIVER_START( snowbro2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(snowbro2_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(snowbro2_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
MDRV_MACHINE_RESET(toaplan2)
@@ -3932,11 +3932,11 @@ static MACHINE_DRIVER_START( mahoudai )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(mahoudai_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(mahoudai_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(raizing_sound_z80_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(raizing_sound_z80_mem)
MDRV_QUANTUM_TIME(HZ(600))
@@ -3974,11 +3974,11 @@ static MACHINE_DRIVER_START( shippumd )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(shippumd_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(shippumd_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(raizing_sound_z80_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(raizing_sound_z80_mem)
MDRV_QUANTUM_TIME(HZ(600))
@@ -4016,11 +4016,11 @@ static MACHINE_DRIVER_START( bgaregga )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(bgaregga_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(bgaregga_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(bgaregga_sound_z80_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(bgaregga_sound_z80_mem)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -4058,12 +4058,12 @@ static MACHINE_DRIVER_START( batrider )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(batrider_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(batrider_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq2)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(batrider_sound_z80_mem, 0)
- MDRV_CPU_IO_MAP(batrider_sound_z80_port, 0)
+ MDRV_CPU_PROGRAM_MAP(batrider_sound_z80_mem)
+ MDRV_CPU_IO_MAP(batrider_sound_z80_port)
MDRV_QUANTUM_TIME(HZ(600))
@@ -4103,12 +4103,12 @@ static MACHINE_DRIVER_START( bbakraid )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(bbakraid_68k_mem, 0)
+ MDRV_CPU_PROGRAM_MAP(bbakraid_68k_mem)
MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq1)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_32MHz/6) /* 5.3333MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(bbakraid_sound_z80_mem, 0)
- MDRV_CPU_IO_MAP(bbakraid_sound_z80_port, 0)
+ MDRV_CPU_PROGRAM_MAP(bbakraid_sound_z80_mem)
+ MDRV_CPU_IO_MAP(bbakraid_sound_z80_port)
MDRV_CPU_PERIODIC_INT(bbakraid_snd_interrupt, 448)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index a72e97024af..46b0025b699 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -434,7 +434,7 @@ static MACHINE_DRIVER_START( toki ) /* KOYO 20.000MHz near the cpu */
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,XTAL_20MHz /2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(toki_map,0)
+ MDRV_CPU_PROGRAM_MAP(toki_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* VBL */
SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verifed on pcb */
@@ -466,11 +466,11 @@ static MACHINE_DRIVER_START( tokib )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 10MHz causes bad slowdowns with monkey machine rd1 */
- MDRV_CPU_PROGRAM_MAP(tokib_map,0)
+ MDRV_CPU_PROGRAM_MAP(tokib_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL (could be level1, same vector) */
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* verified with PCB */
- MDRV_CPU_PROGRAM_MAP(tokib_audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(tokib_audio_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/tokyocop.c b/src/mame/drivers/tokyocop.c
index 0f2694b97f7..c0ecea9d30c 100644
--- a/src/mame/drivers/tokyocop.c
+++ b/src/mame/drivers/tokyocop.c
@@ -39,7 +39,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( tokyocop )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PENTIUM, 2000000000) /* Pentium4? */
- MDRV_CPU_PROGRAM_MAP(tokyocop_map, 0)
+ MDRV_CPU_PROGRAM_MAP(tokyocop_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c
index 50d2164ac91..8cfef7aa88b 100644
--- a/src/mame/drivers/tomcat.c
+++ b/src/mame/drivers/tomcat.c
@@ -375,17 +375,17 @@ static const riot6532_interface tomcat_riot6532_intf =
static MACHINE_DRIVER_START(tomcat)
MDRV_CPU_ADD("maincpu", M68010, XTAL_12MHz / 2)
- MDRV_CPU_PROGRAM_MAP(tomcat_map, 0)
+ MDRV_CPU_PROGRAM_MAP(tomcat_map)
MDRV_CPU_VBLANK_INT_HACK(irq1_line_assert, 5)
//MDRV_CPU_PERIODIC_INT(irq1_line_assert, (double)XTAL_12MHz / 16 / 16 / 16 / 12)
MDRV_CPU_ADD("dsp", TMS32010, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP( dsp_map, 0 )
- MDRV_CPU_IO_MAP( dsp_io_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( dsp_map)
+ MDRV_CPU_IO_MAP( dsp_io_map)
MDRV_CPU_ADD("soundcpu", M6502, XTAL_14_31818MHz / 8 )
MDRV_CPU_FLAGS( CPU_DISABLE )
- MDRV_CPU_PROGRAM_MAP( sound_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( sound_map)
MDRV_RIOT6532_ADD("riot", XTAL_14_31818MHz / 8, tomcat_riot6532_intf)
diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c
index ba26a21731b..3c42550641b 100644
--- a/src/mame/drivers/toobin.c
+++ b/src/mame/drivers/toobin.c
@@ -226,7 +226,7 @@ static MACHINE_DRIVER_START( toobin )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68010, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(toobin)
MDRV_NVRAM_HANDLER(atarigen)
diff --git a/src/mame/drivers/topshoot.c b/src/mame/drivers/topshoot.c
index 5f40f35a4e0..ac29d9b4d2f 100644
--- a/src/mame/drivers/topshoot.c
+++ b/src/mame/drivers/topshoot.c
@@ -224,7 +224,7 @@ static MACHINE_DRIVER_START( genesis_base )
MDRV_CPU_VBLANK_INT("screen", genesis_vblank_interrupt)
MDRV_CPU_ADD("genesis_snd_z80", Z80, MASTER_CLOCK / 15)
- MDRV_CPU_PROGRAM_MAP(genesis_z80_map, 0)
+ MDRV_CPU_PROGRAM_MAP(genesis_z80_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* from vdp at scanline 0xe0 */
MDRV_QUANTUM_TIME(HZ(6000))
@@ -259,7 +259,7 @@ static MACHINE_DRIVER_START( topshoot )
/* basic machine hardware */
MDRV_IMPORT_FROM( genesis_base )
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(topshoot_map,0)
+ MDRV_CPU_PROGRAM_MAP(topshoot_map)
/* video hardware */
MDRV_VIDEO_START(genesis)
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index b75a12b3c5f..8fd47c18aa3 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -675,14 +675,14 @@ static MACHINE_DRIVER_START( topspeed )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(topspeed_map,0)
+ MDRV_CPU_PROGRAM_MAP(topspeed_map)
MDRV_CPU_VBLANK_INT("screen", topspeed_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_map)
MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(topspeed_cpub_map,0)
+ MDRV_CPU_PROGRAM_MAP(topspeed_cpub_map)
MDRV_CPU_VBLANK_INT("screen", topspeed_cpub_interrupt)
MDRV_MACHINE_START(topspeed)
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index ce79b9eddc0..b2df265e0dd 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -372,7 +372,7 @@ static MACHINE_DRIVER_START( toratora )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6800,500000) /* ?????? game speed is entirely controlled by this */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_PERIODIC_INT(toratora_timer,16) /* timer counting at 16 Hz */
MDRV_PIA6821_ADD("pia_u1", pia_u1_intf)
diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c
index 8fee46f8ac5..64667edd47d 100644
--- a/src/mame/drivers/tourtabl.c
+++ b/src/mame/drivers/tourtabl.c
@@ -188,7 +188,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( tourtabl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 3) /* actually M6507 */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_START(tourtabl)
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index aed27c1e8b1..3ed4650370b 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -542,15 +542,15 @@ static MACHINE_DRIVER_START( liblrabl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 1536000) /* 1.536 MHz (measured on Libble Rabble board) */
- MDRV_CPU_PROGRAM_MAP(liblrabl_map,0)
+ MDRV_CPU_PROGRAM_MAP(liblrabl_map)
MDRV_CPU_VBLANK_INT("screen", toypop_main_interrupt)
MDRV_CPU_ADD("audiocpu", M6809, 1536000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("sub", M68000, 6144000) /* 6.144 MHz (measured on Libble Rabble board) */
- MDRV_CPU_PROGRAM_MAP(m68k_map,0)
+ MDRV_CPU_PROGRAM_MAP(m68k_map)
MDRV_CPU_VBLANK_INT("screen", toypop_m68000_interrupt)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
@@ -585,7 +585,7 @@ static MACHINE_DRIVER_START( toypop )
/* basic machine hardware */
MDRV_IMPORT_FROM(liblrabl)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(toypop_map,0)
+ MDRV_CPU_PROGRAM_MAP(toypop_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c
index dd7621d6ca2..afcc9c7fd4f 100644
--- a/src/mame/drivers/tp84.c
+++ b/src/mame/drivers/tp84.c
@@ -288,15 +288,15 @@ static MACHINE_DRIVER_START( tp84 )
/* basic machine hardware */
MDRV_CPU_ADD("cpu1",M6809, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tp84_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(tp84_cpu1_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", M6809, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu2_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(audio_map,0)
+ MDRV_CPU_PROGRAM_MAP(audio_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -338,7 +338,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tp84b )
MDRV_IMPORT_FROM(tp84)
MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(tp84b_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(tp84b_cpu1_map)
MACHINE_DRIVER_END
/***************************************************************************
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index 3109e69835a..c20428b497c 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -700,11 +700,11 @@ static MACHINE_DRIVER_START( trackfld )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/6/2) /* a guess for now */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -742,10 +742,10 @@ static MACHINE_DRIVER_START( hyprolyb )
MDRV_IMPORT_FROM(trackfld)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(hyprolyb_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(hyprolyb_sound_map)
MDRV_CPU_ADD("adpcm", M6802, SOUND_CLOCK/8) /* unknown clock */
- MDRV_CPU_PROGRAM_MAP(hyprolyb_adpcm_map,0)
+ MDRV_CPU_PROGRAM_MAP(hyprolyb_adpcm_map)
/* sound hardware */
MDRV_SOUND_REMOVE("vlm")
@@ -761,7 +761,7 @@ static MACHINE_DRIVER_START( mastkin )
/* basic machine hardware */
MDRV_IMPORT_FROM(trackfld)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mastkin_map,0)
+ MDRV_CPU_PROGRAM_MAP(mastkin_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( wizzquiz )
@@ -770,7 +770,7 @@ static MACHINE_DRIVER_START( wizzquiz )
MDRV_IMPORT_FROM(trackfld)
// right cpu?
MDRV_CPU_REPLACE("maincpu",M6800,2048000) /* 1.400 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(wizzquiz_map,0)
+ MDRV_CPU_PROGRAM_MAP(wizzquiz_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MACHINE_DRIVER_END
@@ -779,8 +779,8 @@ static MACHINE_DRIVER_START( reaktor )
/* basic machine hardware */
MDRV_IMPORT_FROM(trackfld)
MDRV_CPU_REPLACE("maincpu",Z80,MASTER_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(reaktor_map,0)
- MDRV_CPU_IO_MAP(reaktor_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(reaktor_map)
+ MDRV_CPU_IO_MAP(reaktor_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c
index c6e7bf0abd9..a6cc7b3be1d 100644
--- a/src/mame/drivers/travrusa.c
+++ b/src/mame/drivers/travrusa.c
@@ -308,7 +308,7 @@ static MACHINE_DRIVER_START( travrusa )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c
index cbc7c8f0f92..f56329b04fc 100644
--- a/src/mame/drivers/triforce.c
+++ b/src/mame/drivers/triforce.c
@@ -36,7 +36,7 @@ static MACHINE_DRIVER_START( triforce_base )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PPC403GA, 64000000) /* Wrong! */
- MDRV_CPU_PROGRAM_MAP(gc_map, 0)
+ MDRV_CPU_PROGRAM_MAP(gc_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c
index 319419a9ccd..ddccc853f44 100644
--- a/src/mame/drivers/triplhnt.c
+++ b/src/mame/drivers/triplhnt.c
@@ -313,7 +313,7 @@ static MACHINE_DRIVER_START( triplhnt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6800, 800000)
- MDRV_CPU_PROGRAM_MAP(triplhnt_map, 0)
+ MDRV_CPU_PROGRAM_MAP(triplhnt_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c
index e8002693d93..27ff6f9e428 100644
--- a/src/mame/drivers/truco.c
+++ b/src/mame/drivers/truco.c
@@ -139,7 +139,7 @@ static MACHINE_DRIVER_START( truco )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 750000) /* ?? guess */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", truco_interrupt)
diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c
index bfc1e11e091..47421063ee8 100644
--- a/src/mame/drivers/trucocl.c
+++ b/src/mame/drivers/trucocl.c
@@ -137,7 +137,7 @@ static INTERRUPT_GEN( trucocl_interrupt )
static MACHINE_DRIVER_START( trucocl )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18432000/6)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", trucocl_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c
index 50206ea1538..29ae2e1a977 100644
--- a/src/mame/drivers/trvmadns.c
+++ b/src/mame/drivers/trvmadns.c
@@ -285,8 +285,8 @@ static MACHINE_RESET( trvmadns )
static MACHINE_DRIVER_START( trvmadns )
MDRV_CPU_ADD("maincpu", Z80,10000000/2) // ?
- MDRV_CPU_PROGRAM_MAP(cpu_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_RESET(trvmadns)
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index ce81b634141..1c307ac7568 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -212,7 +212,7 @@ static MACHINE_DRIVER_START( trvquest )
MDRV_DRIVER_DATA(gameplan_state)
MDRV_CPU_ADD("maincpu", M6809,XTAL_6MHz/4)
- MDRV_CPU_PROGRAM_MAP(cpu_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu_map)
MDRV_CPU_VBLANK_INT("screen", trvquest_interrupt)
MDRV_NVRAM_HANDLER(generic_1fill)
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index 2d6d9773a7b..49643a5f1ef 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -191,11 +191,11 @@ static INTERRUPT_GEN( tryout_interrupt )
static MACHINE_DRIVER_START( tryout )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 2000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(main_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(main_cpu)
MDRV_CPU_VBLANK_INT("screen", tryout_interrupt)
MDRV_CPU_ADD("audiocpu", M6502, 1500000) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(sound_cpu)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse,800) /* ? */
/* video hardware */
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index fd2f8aaee2f..f8b61e6e794 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -662,15 +662,15 @@ static MACHINE_DRIVER_START( tsamurai )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(z80_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(z80_io_map)
MDRV_CPU_VBLANK_INT("screen", samurai_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound1_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound1_map)
MDRV_CPU_ADD("audio2", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound2_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound2_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -705,19 +705,19 @@ static MACHINE_DRIVER_START( m660 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(m660_map,0)
- MDRV_CPU_IO_MAP(z80_m660_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(m660_map)
+ MDRV_CPU_IO_MAP(z80_m660_io_map)
MDRV_CPU_VBLANK_INT("screen", samurai_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound1_m660_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound1_m660_map)
MDRV_CPU_ADD("audio2", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound2_m660_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound2_m660_map)
MDRV_CPU_ADD("audio3", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound3_m660_map,0)
- MDRV_CPU_IO_MAP(sound3_m660_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound3_m660_map)
+ MDRV_CPU_IO_MAP(sound3_m660_io_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
@@ -753,12 +753,12 @@ static MACHINE_DRIVER_START( vsgongf )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(vsgongf_map,0)
+ MDRV_CPU_PROGRAM_MAP(vsgongf_map)
MDRV_CPU_VBLANK_INT("screen", samurai_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_vsgongf_map,0)
- MDRV_CPU_IO_MAP(vsgongf_audio_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_vsgongf_map)
+ MDRV_CPU_IO_MAP(vsgongf_audio_io_map)
MDRV_CPU_VBLANK_INT_HACK(vsgongf_sound_interrupt,3)
/* video hardware */
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index e2376ce5579..941b0969e07 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -225,8 +225,8 @@ static INTERRUPT_GEN( ttchamp_irq ) /* right? */
static MACHINE_DRIVER_START( ttchamp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30, 8000000)
- MDRV_CPU_PROGRAM_MAP(ttchamp_map, 0)
- MDRV_CPU_IO_MAP(ttchamp_io,0)
+ MDRV_CPU_PROGRAM_MAP(ttchamp_map)
+ MDRV_CPU_IO_MAP(ttchamp_io)
MDRV_CPU_VBLANK_INT("screen", ttchamp_irq)
/* video hardware */
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index ddb53c7bfa3..08a44d329b6 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -896,19 +896,19 @@ static MACHINE_DRIVER_START( tubep )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(tubep_main_map,0)
- MDRV_CPU_IO_MAP(tubep_main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(tubep_main_map)
+ MDRV_CPU_IO_MAP(tubep_main_portmap)
MDRV_CPU_ADD("slave",Z80,16000000 / 4) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(tubep_second_map,0)
- MDRV_CPU_IO_MAP(tubep_second_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(tubep_second_map)
+ MDRV_CPU_IO_MAP(tubep_second_portmap)
MDRV_CPU_ADD("soundcpu",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */
- MDRV_CPU_PROGRAM_MAP(tubep_sound_map,0)
- MDRV_CPU_IO_MAP(tubep_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(tubep_sound_map)
+ MDRV_CPU_IO_MAP(tubep_sound_portmap)
MDRV_CPU_ADD("nsc",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */
- MDRV_CPU_PROGRAM_MAP(nsc_map,0)
+ MDRV_CPU_PROGRAM_MAP(nsc_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -952,7 +952,7 @@ static MACHINE_DRIVER_START( tubepb )
MDRV_CPU_REMOVE("nsc")
MDRV_CPU_ADD("mcu", M6802,6000000) /* ? MHz Xtal */
- MDRV_CPU_PROGRAM_MAP(nsc_map,0)
+ MDRV_CPU_PROGRAM_MAP(nsc_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MACHINE_DRIVER_END
@@ -961,19 +961,19 @@ static MACHINE_DRIVER_START( rjammer )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(rjammer_main_map,0)
- MDRV_CPU_IO_MAP(rjammer_main_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(rjammer_main_map)
+ MDRV_CPU_IO_MAP(rjammer_main_portmap)
MDRV_CPU_ADD("slave",Z80,16000000 / 4) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(rjammer_second_map,0)
- MDRV_CPU_IO_MAP(rjammer_second_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(rjammer_second_map)
+ MDRV_CPU_IO_MAP(rjammer_second_portmap)
MDRV_CPU_ADD("soundcpu",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */
- MDRV_CPU_PROGRAM_MAP(rjammer_sound_map,0)
- MDRV_CPU_IO_MAP(rjammer_sound_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(rjammer_sound_map)
+ MDRV_CPU_IO_MAP(rjammer_sound_portmap)
MDRV_CPU_ADD("nsc",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */
- MDRV_CPU_PROGRAM_MAP(nsc_map,0)
+ MDRV_CPU_PROGRAM_MAP(nsc_map)
MDRV_MACHINE_START(rjammer)
MDRV_MACHINE_RESET(rjammer)
diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c
index f5dea67a943..f546cff584e 100644
--- a/src/mame/drivers/tugboat.c
+++ b/src/mame/drivers/tugboat.c
@@ -315,7 +315,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( tugboat )
MDRV_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_MACHINE_RESET(tugboat)
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index 5e033cbc6d9..84a053452e9 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -1996,7 +1996,7 @@ static MACHINE_DRIVER_START( tumblepb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(tumblepopb_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(tumblepopb_main_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
/* video hardware */
@@ -2026,7 +2026,7 @@ static MACHINE_DRIVER_START( tumbleb2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(tumblepopb_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(tumblepopb_main_map)
MDRV_CPU_VBLANK_INT("screen", tumbleb2_interrupt)
/* video hardware */
@@ -2055,12 +2055,12 @@ static MACHINE_DRIVER_START( jumpkids )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(jumpkids_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(jumpkids_main_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
/* z80? */
MDRV_CPU_ADD("audiocpu", Z80, 8000000/2)
- MDRV_CPU_PROGRAM_MAP(jumpkids_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(jumpkids_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -2087,7 +2087,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fncywld )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(fncywld_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(fncywld_main_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
/* video hardware */
@@ -2145,11 +2145,11 @@ static MACHINE_RESET (htchctch)
static MACHINE_DRIVER_START( htchctch )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 15000000) /* verified */
- MDRV_CPU_PROGRAM_MAP(htchctch_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(htchctch_main_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 15000000/4) /* verified on dquizgo */
- MDRV_CPU_PROGRAM_MAP(semicom_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(semicom_sound_map)
MDRV_MACHINE_RESET ( htchctch )
@@ -2220,12 +2220,12 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( jumppop )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(jumppop_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(jumppop_main_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3500000) /* verified */
- MDRV_CPU_PROGRAM_MAP(jumppop_sound_map, 0)
- MDRV_CPU_IO_MAP(jumppop_sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(jumppop_sound_map)
+ MDRV_CPU_IO_MAP(jumppop_sound_io_map)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 1953) /* measured */
/* video hardware */
@@ -2258,11 +2258,11 @@ static MACHINE_DRIVER_START( suprtrio )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000) /* 14mhz should be correct, but lots of sprite flicker later in game */
- MDRV_CPU_PROGRAM_MAP(suprtrio_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(suprtrio_main_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(suprtrio_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(suprtrio_sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -2291,7 +2291,7 @@ static MACHINE_DRIVER_START( pangpang )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(pangpang_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(pangpang_main_map)
MDRV_CPU_VBLANK_INT("screen", tumbleb2_interrupt)
/* video hardware */
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index d03962a1ab5..5bd8fcf864d 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -288,11 +288,11 @@ static MACHINE_DRIVER_START( tumblep )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", H6280, 32220000/8) /* Custom chip 45; Audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c
index 4c4f15982e1..20bde735138 100644
--- a/src/mame/drivers/tunhunt.c
+++ b/src/mame/drivers/tunhunt.c
@@ -314,7 +314,7 @@ static MACHINE_DRIVER_START( tunhunt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502,2000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ? probably wrong */
/* video hardware */
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index 748b9bc2b00..20dfcbf2453 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -1079,7 +1079,7 @@ static MACHINE_DRIVER_START( turbo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(turbo_map,0)
+ MDRV_CPU_PROGRAM_MAP(turbo_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_PPI8255_ADD( "ppi8255_0", turbo_8255_intf[0] )
@@ -1110,7 +1110,7 @@ static MACHINE_DRIVER_START( subroc3d )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(subroc3d_map,0)
+ MDRV_CPU_PROGRAM_MAP(subroc3d_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_PPI8255_ADD( "ppi8255_0", subroc3d_8255_intf[0] )
@@ -1139,12 +1139,12 @@ static MACHINE_DRIVER_START( buckrog )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(buckrog_map,0)
+ MDRV_CPU_PROGRAM_MAP(buckrog_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(buckrog_cpu2_map,0)
- MDRV_CPU_IO_MAP(buckrog_cpu2_portmap,0)
+ MDRV_CPU_PROGRAM_MAP(buckrog_cpu2_map)
+ MDRV_CPU_IO_MAP(buckrog_cpu2_portmap)
MDRV_QUANTUM_TIME(HZ(600))
MDRV_MACHINE_RESET(buckrog)
diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c
index d21046aecdc..1b3cf68b8fb 100644
--- a/src/mame/drivers/tutankhm.c
+++ b/src/mame/drivers/tutankhm.c
@@ -182,7 +182,7 @@ static MACHINE_DRIVER_START( tutankhm )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 1500000) /* 1.5 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", tutankhm_interrupt)
MDRV_MACHINE_START(tutankhm)
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index 0a48f922964..d7455d234f4 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -729,15 +729,15 @@ static INTERRUPT_GEN( CPUB_interrupt )
static MACHINE_DRIVER_START( twin16 )
// basic machine hardware
MDRV_CPU_ADD("maincpu", M68000, XTAL_18_432MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", CPUA_interrupt)
MDRV_CPU_ADD("sub", M68000, XTAL_18_432MHz/2)
- MDRV_CPU_PROGRAM_MAP(sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(sub_map)
MDRV_CPU_VBLANK_INT("screen", CPUB_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -785,11 +785,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fround )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(fround_map,0)
+ MDRV_CPU_PROGRAM_MAP(fround_map)
MDRV_CPU_VBLANK_INT("screen", CPUA_interrupt)
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index 3982c27ffb7..a5719c70838 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -704,17 +704,17 @@ static MACHINE_DRIVER_START( twincobr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,28000000/4) /* 7.0MHz - Main board Crystal is 28MHz */
- MDRV_CPU_PROGRAM_MAP(main_program_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_program_map)
MDRV_CPU_VBLANK_INT("screen", twincobr_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,28000000/8) /* 3.5MHz */
- MDRV_CPU_PROGRAM_MAP(sound_program_map, 0)
- MDRV_CPU_IO_MAP(sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_program_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_CPU_ADD("dsp", TMS32010,28000000/2) /* 14MHz CLKin */
- MDRV_CPU_PROGRAM_MAP(DSP_program_map, 0)
+ MDRV_CPU_PROGRAM_MAP(DSP_program_map)
/* Data Map is internal to the CPU */
- MDRV_CPU_IO_MAP(DSP_io_map, 0)
+ MDRV_CPU_IO_MAP(DSP_io_map)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 4e5d6674bdb..73a00da2105 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -169,8 +169,8 @@ static const ay8910_interface ay8910_config =
static MACHINE_DRIVER_START( twins )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30, 8000000)
- MDRV_CPU_PROGRAM_MAP(twins_map, 0)
- MDRV_CPU_IO_MAP(twins_io,0)
+ MDRV_CPU_PROGRAM_MAP(twins_map)
+ MDRV_CPU_IO_MAP(twins_io)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
@@ -257,8 +257,8 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( twinsa )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", V30, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(twins_map, 0)
- MDRV_CPU_IO_MAP(twinsa_io,0)
+ MDRV_CPU_PROGRAM_MAP(twins_map)
+ MDRV_CPU_IO_MAP(twinsa_io)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index ed295e44a93..53ce2c41f86 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -702,15 +702,15 @@ static const ay8910_interface buggybjr_ym2149_interface_2 =
static MACHINE_DRIVER_START( tx1 )
MDRV_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MDRV_CPU_PROGRAM_MAP(tx1_main, 0)
+ MDRV_CPU_PROGRAM_MAP(tx1_main)
// MDRV_WATCHDOG_TIME_INIT(5)
MDRV_CPU_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MDRV_CPU_PROGRAM_MAP(tx1_math, 0)
+ MDRV_CPU_PROGRAM_MAP(tx1_math)
MDRV_CPU_ADD("audio_cpu", Z80, TX1_PIXEL_CLOCK / 2)
- MDRV_CPU_PROGRAM_MAP(tx1_sound_prg, 0)
- MDRV_CPU_IO_MAP(tx1_sound_io, 0)
+ MDRV_CPU_PROGRAM_MAP(tx1_sound_prg)
+ MDRV_CPU_IO_MAP(tx1_sound_io)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, TX1_PIXEL_CLOCK / 4 / 2048 / 2)
MDRV_MACHINE_RESET(tx1)
@@ -755,16 +755,16 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( buggyboy )
MDRV_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MDRV_CPU_PROGRAM_MAP(buggyboy_main, 0)
+ MDRV_CPU_PROGRAM_MAP(buggyboy_main)
// MDRV_WATCHDOG_TIME_INIT(5)
MDRV_CPU_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MDRV_CPU_PROGRAM_MAP(buggyboy_math, 0)
+ MDRV_CPU_PROGRAM_MAP(buggyboy_math)
MDRV_CPU_ADD("audio_cpu", Z80, BUGGYBOY_ZCLK / 2)
- MDRV_CPU_PROGRAM_MAP(buggyboy_sound_prg, 0)
+ MDRV_CPU_PROGRAM_MAP(buggyboy_sound_prg)
MDRV_CPU_PERIODIC_INT(z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048)
- MDRV_CPU_IO_MAP(buggyboy_sound_io, 0)
+ MDRV_CPU_IO_MAP(buggyboy_sound_io)
MDRV_MACHINE_RESET(buggyboy)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -810,15 +810,15 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( buggybjr )
MDRV_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MDRV_CPU_PROGRAM_MAP(buggybjr_main, 0)
+ MDRV_CPU_PROGRAM_MAP(buggybjr_main)
// MDRV_WATCHDOG_TIME_INIT(5)
MDRV_CPU_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MDRV_CPU_PROGRAM_MAP(buggyboy_math, 0)
+ MDRV_CPU_PROGRAM_MAP(buggyboy_math)
MDRV_CPU_ADD("audio_cpu", Z80, BUGGYBOY_ZCLK / 2)
- MDRV_CPU_PROGRAM_MAP(buggybjr_sound_prg, 0)
- MDRV_CPU_IO_MAP(buggyboy_sound_io, 0)
+ MDRV_CPU_PROGRAM_MAP(buggybjr_sound_prg)
+ MDRV_CPU_IO_MAP(buggyboy_sound_io)
MDRV_CPU_PERIODIC_INT(z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048)
MDRV_MACHINE_RESET(buggybjr)
diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c
index d1a264f9a76..519b762c841 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -186,12 +186,12 @@ static const c6280_interface c6280_config =
static MACHINE_DRIVER_START( uapce )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
- MDRV_CPU_PROGRAM_MAP(pce_mem, 0)
- MDRV_CPU_IO_MAP(pce_io, 0)
+ MDRV_CPU_PROGRAM_MAP(pce_mem)
+ MDRV_CPU_IO_MAP(pce_io)
MDRV_CPU_VBLANK_INT_HACK(pce_interrupt, VDC_LPF)
MDRV_CPU_ADD("sub", Z80, 1400000)
- MDRV_CPU_PROGRAM_MAP(z80_map, 0)
+ MDRV_CPU_PROGRAM_MAP(z80_map)
MDRV_QUANTUM_TIME(HZ(60))
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index 0818b1bdd17..f87249a6dc6 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -245,12 +245,12 @@ static MACHINE_DRIVER_START( ultraman )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,24000000/6) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c
index 2d5e21e3b56..342c144e2d1 100644
--- a/src/mame/drivers/ultratnk.c
+++ b/src/mame/drivers/ultratnk.c
@@ -291,7 +291,7 @@ static MACHINE_DRIVER_START( ultratnk )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, PIXEL_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(ultratnk_cpu_map, 0)
+ MDRV_CPU_PROGRAM_MAP(ultratnk_cpu_map)
MDRV_WATCHDOG_VBLANK_INIT(8)
MDRV_MACHINE_RESET(ultratnk)
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index a7f4deb535d..795db13f84e 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -197,11 +197,11 @@ static INTERRUPT_GEN( ultrsprt_vblank )
static MACHINE_DRIVER_START( ultrsprt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PPC403GA, 25000000) /* PowerPC 403GA 25MHz */
- MDRV_CPU_PROGRAM_MAP(ultrsprt_map, 0)
+ MDRV_CPU_PROGRAM_MAP(ultrsprt_map)
MDRV_CPU_VBLANK_INT("screen", ultrsprt_vblank)
MDRV_CPU_ADD("audiocpu", M68000, 8000000) /* Not sure about the frequency */
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_PERIODIC_INT(irq5_line_hold, 1) // ???
MDRV_QUANTUM_TIME(HZ(12000))
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index 85a90437aa6..37a0862717d 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -735,7 +735,7 @@ static MACHINE_DRIVER_START( undrfire )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(undrfire_map,0)
+ MDRV_CPU_PROGRAM_MAP(undrfire_map)
MDRV_CPU_VBLANK_INT("screen", undrfire_interrupt)
TAITO_F3_SOUND_SYSTEM_CPU(16000000)
@@ -766,13 +766,13 @@ static MACHINE_DRIVER_START( cbombers )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(cbombers_cpua_map, 0)
+ MDRV_CPU_PROGRAM_MAP(cbombers_cpua_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
TAITO_F3_SOUND_SYSTEM_CPU(16000000)
MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(cbombers_cpub_map, 0)
+ MDRV_CPU_PROGRAM_MAP(cbombers_cpub_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_QUANTUM_TIME(HZ(480)) /* CPU slices - Need to interleave Cpu's 1 & 3 */
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 41e53ec694d..ca3a7dd464f 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -615,7 +615,7 @@ static MACHINE_DRIVER_START( burglarx )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(burglarx_map,0)
+ MDRV_CPU_PROGRAM_MAP(burglarx_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_MACHINE_RESET(unico)
@@ -662,7 +662,7 @@ static MACHINE_DRIVER_START( zeropnt )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(zeropnt_map,0)
+ MDRV_CPU_PROGRAM_MAP(zeropnt_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_MACHINE_RESET(zeropt)
@@ -704,7 +704,7 @@ static MACHINE_DRIVER_START( zeropnt2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68EC020, 16000000)
- MDRV_CPU_PROGRAM_MAP(zeropnt2_map,0)
+ MDRV_CPU_PROGRAM_MAP(zeropnt2_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_MACHINE_RESET(zeropt)
diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c
index 63f18f1773e..07621d03014 100644
--- a/src/mame/drivers/upscope.c
+++ b/src/mame/drivers/upscope.c
@@ -300,7 +300,7 @@ static MACHINE_DRIVER_START( upscope )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(amiga)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c
index 8bd6824e5b4..339920a0c4f 100644
--- a/src/mame/drivers/usgames.c
+++ b/src/mame/drivers/usgames.c
@@ -239,7 +239,7 @@ static MACHINE_DRIVER_START( usg32 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, 2000000) /* ?? */
- MDRV_CPU_PROGRAM_MAP(usgames_map,0)
+ MDRV_CPU_PROGRAM_MAP(usgames_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,5*60) /* ?? */
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -271,7 +271,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( usg185 )
MDRV_IMPORT_FROM(usg32)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(usg185_map,0)
+ MDRV_CPU_PROGRAM_MAP(usg185_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index aaf9309d76a..a4b749d0bb7 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -669,7 +669,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( common )
MDRV_CPU_ADD("maincpu", E116T, 50000000) /* 50 MHz */
- MDRV_CPU_PROGRAM_MAP(common_map,0)
+ MDRV_CPU_PROGRAM_MAP(common_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_NVRAM_HANDLER(93C46_vamphalf)
@@ -716,15 +716,15 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sound_qs1000 )
MDRV_CPU_ADD("audiocpu", I8052, 24000000/4) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(qs1000_prg_map, 0)
- MDRV_CPU_IO_MAP( qs1000_io_map, 0 )
+ MDRV_CPU_PROGRAM_MAP(qs1000_prg_map)
+ MDRV_CPU_IO_MAP( qs1000_io_map)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( vamphalf )
MDRV_IMPORT_FROM(common)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(vamphalf_io,0)
+ MDRV_CPU_IO_MAP(vamphalf_io)
MDRV_IMPORT_FROM(sound_ym_oki)
MACHINE_DRIVER_END
@@ -732,7 +732,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( misncrft )
MDRV_IMPORT_FROM(common)
MDRV_CPU_REPLACE("maincpu", GMS30C2116, 50000000) /* 50 MHz */
- MDRV_CPU_IO_MAP(misncrft_io,0)
+ MDRV_CPU_IO_MAP(misncrft_io)
MDRV_IMPORT_FROM(sound_qs1000)
MACHINE_DRIVER_END
@@ -740,7 +740,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( coolmini )
MDRV_IMPORT_FROM(common)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(coolmini_io,0)
+ MDRV_CPU_IO_MAP(coolmini_io)
MDRV_IMPORT_FROM(sound_ym_oki)
MACHINE_DRIVER_END
@@ -748,7 +748,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( suplup )
MDRV_IMPORT_FROM(common)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(suplup_io,0)
+ MDRV_CPU_IO_MAP(suplup_io)
MDRV_IMPORT_FROM(sound_suplup)
MACHINE_DRIVER_END
@@ -756,7 +756,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( jmpbreak )
MDRV_IMPORT_FROM(common)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(jmpbreak_io,0)
+ MDRV_CPU_IO_MAP(jmpbreak_io)
MDRV_IMPORT_FROM(sound_ym_oki)
MACHINE_DRIVER_END
@@ -764,8 +764,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( wyvernwg )
MDRV_IMPORT_FROM(common)
MDRV_CPU_REPLACE("maincpu", E132T, 50000000) /* 50 MHz */
- MDRV_CPU_PROGRAM_MAP(common_32bit_map,0)
- MDRV_CPU_IO_MAP(wyvernwg_io,0)
+ MDRV_CPU_PROGRAM_MAP(common_32bit_map)
+ MDRV_CPU_IO_MAP(wyvernwg_io)
MDRV_IMPORT_FROM(sound_qs1000)
MACHINE_DRIVER_END
@@ -773,8 +773,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( finalgdr )
MDRV_IMPORT_FROM(common)
MDRV_CPU_REPLACE("maincpu", E132T, 50000000) /* 50 MHz */
- MDRV_CPU_PROGRAM_MAP(common_32bit_map,0)
- MDRV_CPU_IO_MAP(finalgdr_io,0)
+ MDRV_CPU_PROGRAM_MAP(common_32bit_map)
+ MDRV_CPU_IO_MAP(finalgdr_io)
MDRV_NVRAM_HANDLER(finalgdr)
@@ -783,8 +783,8 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( aoh )
MDRV_CPU_ADD("maincpu", E132XN, 20000000*4) /* 4x internal multiplier */
- MDRV_CPU_PROGRAM_MAP(aoh_map,0)
- MDRV_CPU_IO_MAP(aoh_io,0)
+ MDRV_CPU_PROGRAM_MAP(aoh_map)
+ MDRV_CPU_IO_MAP(aoh_io)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_NVRAM_HANDLER(93C46)
diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c
index 6a6b54681c5..da60777e7b1 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -220,11 +220,11 @@ static MACHINE_DRIVER_START( vaportra )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,12000000) /* Custom chip 59 */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("audiocpu", H6280, 32220000/4) /* Custom chip 45; Audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c
index f9924db7dac..9d2332e6b41 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -308,13 +308,13 @@ static MACHINE_DRIVER_START( vastar )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_port_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("sub", Z80, 3072000) /* 3.072 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(cpu2_map,0)
- MDRV_CPU_IO_MAP(cpu2_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu2_map)
+ MDRV_CPU_IO_MAP(cpu2_port_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ??? */
MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - seems enough to ensure proper */
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index 1f86ec33826..307f05b21ac 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -420,11 +420,11 @@ static MACHINE_DRIVER_START( vball )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* 2 MHz - measured by guru but it makes the game far far too slow ?! */
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_TIMER_ADD_SCANLINE("scantimer", vball_scanline, "screen", 0, 1)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c
index c9d590c0caa..cd21c971e22 100644
--- a/src/mame/drivers/vcombat.c
+++ b/src/mame/drivers/vcombat.c
@@ -549,20 +549,20 @@ static const mc6845_interface mc6845_intf =
static MACHINE_DRIVER_START( vcombat )
MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_assert)
/* The middle board i860 */
MDRV_CPU_ADD("vid_0", I860, XTAL_20MHz)
- MDRV_CPU_PROGRAM_MAP(vid_0_map,0)
+ MDRV_CPU_PROGRAM_MAP(vid_0_map)
/* The top board i860 */
MDRV_CPU_ADD("vid_1", I860, XTAL_20MHz)
- MDRV_CPU_PROGRAM_MAP(vid_1_map,0)
+ MDRV_CPU_PROGRAM_MAP(vid_1_map)
/* Sound CPU */
MDRV_CPU_ADD("soundcpu", M68000, XTAL_12MHz)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_PERIODIC_INT(irq1_line_hold, 15000) /* Remove this if MC6845 is enabled */
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -597,16 +597,16 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( shadfgtr )
MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_assert)
/* The middle board i860 */
MDRV_CPU_ADD("vid_0", I860, XTAL_20MHz)
- MDRV_CPU_PROGRAM_MAP(vid_0_map,0)
+ MDRV_CPU_PROGRAM_MAP(vid_0_map)
/* Sound CPU */
MDRV_CPU_ADD("soundcpu", M68000, XTAL_12MHz)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_NVRAM_HANDLER(generic_0fill)
MDRV_MACHINE_RESET(shadfgtr)
diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c
index fe1eab56150..2f310c38a93 100644
--- a/src/mame/drivers/vegaeo.c
+++ b/src/mame/drivers/vegaeo.c
@@ -164,7 +164,7 @@ static VIDEO_UPDATE( vega )
static MACHINE_DRIVER_START( vega )
MDRV_CPU_ADD("cpu", GMS30C2132, 55000000) /* 55 MHz */
- MDRV_CPU_PROGRAM_MAP(vega_map,0)
+ MDRV_CPU_PROGRAM_MAP(vega_map)
MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262)
/* sound cpu */
diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c
index d1ac6334b0a..6bcebb9f7cd 100644
--- a/src/mame/drivers/vegas.c
+++ b/src/mame/drivers/vegas.c
@@ -2212,7 +2212,7 @@ static MACHINE_DRIVER_START( vegascore )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", R5000LE, SYSTEM_CLOCK*2)
MDRV_CPU_CONFIG(config)
- MDRV_CPU_PROGRAM_MAP(vegas_map_8mb,0)
+ MDRV_CPU_PROGRAM_MAP(vegas_map_8mb)
MDRV_MACHINE_START(vegas)
MDRV_MACHINE_RESET(vegas)
@@ -2259,7 +2259,7 @@ static MACHINE_DRIVER_START( vegas32m )
MDRV_IMPORT_FROM(dcs2_audio_dsio)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(vegas_map_32mb,0)
+ MDRV_CPU_PROGRAM_MAP(vegas_map_32mb)
MACHINE_DRIVER_END
@@ -2268,7 +2268,7 @@ static MACHINE_DRIVER_START( vegasban )
MDRV_IMPORT_FROM(dcs2_audio_2104)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(vegas_map_32mb,0)
+ MDRV_CPU_PROGRAM_MAP(vegas_map_32mb)
MDRV_3DFX_VOODOO_REMOVE("voodoo")
MDRV_3DFX_VOODOO_BANSHEE_ADD("voodoo", STD_VOODOO_BANSHEE_CLOCK, 16, "screen")
@@ -2293,7 +2293,7 @@ static MACHINE_DRIVER_START( denver )
MDRV_IMPORT_FROM(dcs2_audio_denver)
MDRV_CPU_REPLACE("maincpu", RM7000LE, SYSTEM_CLOCK*2.5)
- MDRV_CPU_PROGRAM_MAP(vegas_map_32mb,0)
+ MDRV_CPU_PROGRAM_MAP(vegas_map_32mb)
MDRV_3DFX_VOODOO_REMOVE("voodoo")
MDRV_3DFX_VOODOO_3_ADD("voodoo", STD_VOODOO_3_CLOCK, 16, "screen")
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index 6f32067f975..d96aa892466 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -442,11 +442,11 @@ static MACHINE_DRIVER_START( vendetta )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, 6000000) /* this is strange, seems an overclock but */
// MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* is needed to have correct music speed */
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", vendetta_irq)
MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* verified with PCB */
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* interrupts are triggered by the main CPU */
MDRV_MACHINE_RESET(vendetta)
@@ -485,7 +485,7 @@ static MACHINE_DRIVER_START( esckids )
/* basic machine hardware */
MDRV_IMPORT_FROM(vendetta)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(esckids_map, 0)
+ MDRV_CPU_PROGRAM_MAP(esckids_map)
MDRV_SCREEN_MODIFY("screen")
//MDRV_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) /* black areas on the edges */
diff --git a/src/mame/drivers/vertigo.c b/src/mame/drivers/vertigo.c
index 721a329b0a5..95cf8e1538e 100644
--- a/src/mame/drivers/vertigo.c
+++ b/src/mame/drivers/vertigo.c
@@ -107,7 +107,7 @@ static MACHINE_DRIVER_START( vertigo )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(vertigo_map,0)
+ MDRV_CPU_PROGRAM_MAP(vertigo_map)
MDRV_CPU_PERIODIC_INT(vertigo_interrupt,60)
MDRV_IMPORT_FROM(exidy440_audio)
@@ -117,7 +117,7 @@ static MACHINE_DRIVER_START( vertigo )
/* motor controller */
/*
MDRV_CPU_ADD("motor", M6805, 1000000)
- MDRV_CPU_PROGRAM_MAP(vertigo_motor,0)
+ MDRV_CPU_PROGRAM_MAP(vertigo_motor)
*/
MDRV_MACHINE_RESET(vertigo)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index 9f79102ba51..ce7da058e07 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -328,8 +328,8 @@ static MACHINE_DRIVER_START( depthch )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_root)
MDRV_CPU_REPLACE("maincpu", 8080, VICDUAL_MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(depthch_map,0)
- MDRV_CPU_IO_MAP(depthch_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(depthch_map)
+ MDRV_CPU_IO_MAP(depthch_io_map)
/* video hardware */
MDRV_VIDEO_UPDATE(vicdual_bw)
@@ -416,8 +416,8 @@ static MACHINE_DRIVER_START( safari )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(safari_map,0)
- MDRV_CPU_IO_MAP(safari_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(safari_map)
+ MDRV_CPU_IO_MAP(safari_io_map)
/* video hardware */
MDRV_VIDEO_UPDATE(vicdual_bw)
@@ -518,8 +518,8 @@ static MACHINE_DRIVER_START( frogs )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(frogs_map,0)
- MDRV_CPU_IO_MAP(frogs_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(frogs_map)
+ MDRV_CPU_IO_MAP(frogs_io_map)
MDRV_MACHINE_START(frogs_audio)
/* video hardware */
@@ -705,8 +705,8 @@ static MACHINE_DRIVER_START( headon )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(headon_map,0)
- MDRV_CPU_IO_MAP(headon_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(headon_map)
+ MDRV_CPU_IO_MAP(headon_io_map)
/* video hardware */
MDRV_VIDEO_UPDATE(vicdual_bw_or_color)
@@ -723,8 +723,8 @@ static MACHINE_DRIVER_START( sspaceat )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(headon_map,0)
- MDRV_CPU_IO_MAP(sspaceat_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(headon_map)
+ MDRV_CPU_IO_MAP(sspaceat_io_map)
/* video hardware */
MDRV_VIDEO_UPDATE(vicdual_bw_or_color)
@@ -917,8 +917,8 @@ static MACHINE_DRIVER_START( headon2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(headon2_map,0)
- MDRV_CPU_IO_MAP(headon2_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(headon2_map)
+ MDRV_CPU_IO_MAP(headon2_io_map)
/* video hardware */
MDRV_VIDEO_UPDATE(vicdual_color)
@@ -935,8 +935,8 @@ static MACHINE_DRIVER_START( digger )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(headon2_map,0)
- MDRV_CPU_IO_MAP(digger_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(headon2_map)
+ MDRV_CPU_IO_MAP(digger_io_map)
/* video hardware */
MDRV_VIDEO_UPDATE(vicdual_color)
@@ -1829,7 +1829,7 @@ static MACHINE_DRIVER_START( vicdual_dualgame_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(vicdual_dualgame_map,0)
+ MDRV_CPU_PROGRAM_MAP(vicdual_dualgame_map)
/* video hardware */
MDRV_VIDEO_UPDATE(vicdual_color)
@@ -1842,7 +1842,7 @@ static MACHINE_DRIVER_START( invho2 )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_dualgame_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invho2_io_map,0)
+ MDRV_CPU_IO_MAP(invho2_io_map)
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -1857,7 +1857,7 @@ static MACHINE_DRIVER_START( invds )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_dualgame_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invds_io_map,0)
+ MDRV_CPU_IO_MAP(invds_io_map)
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -1871,7 +1871,7 @@ static MACHINE_DRIVER_START( sspacaho )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_dualgame_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(sspacaho_io_map,0)
+ MDRV_CPU_IO_MAP(sspacaho_io_map)
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -1884,7 +1884,7 @@ static MACHINE_DRIVER_START( spacetrk )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_dualgame_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(spacetrk_io_map,0)
+ MDRV_CPU_IO_MAP(spacetrk_io_map)
MACHINE_DRIVER_END
@@ -1894,7 +1894,7 @@ static MACHINE_DRIVER_START( carnival )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_dualgame_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(carnival_io_map,0)
+ MDRV_CPU_IO_MAP(carnival_io_map)
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -1908,7 +1908,7 @@ static MACHINE_DRIVER_START( tranqgun )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_dualgame_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(tranqgun_io_map,0)
+ MDRV_CPU_IO_MAP(tranqgun_io_map)
MACHINE_DRIVER_END
@@ -1918,7 +1918,7 @@ static MACHINE_DRIVER_START( brdrline )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_dualgame_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(brdrline_io_map,0)
+ MDRV_CPU_IO_MAP(brdrline_io_map)
MACHINE_DRIVER_END
@@ -1928,7 +1928,7 @@ static MACHINE_DRIVER_START( pulsar )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_dualgame_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(pulsar_io_map,0)
+ MDRV_CPU_IO_MAP(pulsar_io_map)
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -1942,7 +1942,7 @@ static MACHINE_DRIVER_START( heiankyo )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_dualgame_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(heiankyo_io_map,0)
+ MDRV_CPU_IO_MAP(heiankyo_io_map)
MACHINE_DRIVER_END
@@ -1952,7 +1952,7 @@ static MACHINE_DRIVER_START( alphaho )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_dualgame_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(alphaho_io_map,0)
+ MDRV_CPU_IO_MAP(alphaho_io_map)
MACHINE_DRIVER_END
@@ -2074,8 +2074,8 @@ static MACHINE_DRIVER_START( samurai )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(samurai_map,0)
- MDRV_CPU_IO_MAP(samurai_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(samurai_map)
+ MDRV_CPU_IO_MAP(samurai_io_map)
/* video hardware */
MDRV_VIDEO_UPDATE(vicdual_color)
@@ -2173,8 +2173,8 @@ static MACHINE_DRIVER_START( nsub )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(nsub_map,0)
- MDRV_CPU_IO_MAP(nsub_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(nsub_map)
+ MDRV_CPU_IO_MAP(nsub_io_map)
/* video hardware */
MDRV_VIDEO_UPDATE(vicdual_color)
@@ -2272,8 +2272,8 @@ static MACHINE_DRIVER_START( invinco )
/* basic machine hardware */
MDRV_IMPORT_FROM(vicdual_root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(invinco_map,0)
- MDRV_CPU_IO_MAP(invinco_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(invinco_map)
+ MDRV_CPU_IO_MAP(invinco_io_map)
/* video hardware */
MDRV_VIDEO_UPDATE(vicdual_color)
diff --git a/src/mame/drivers/victory.c b/src/mame/drivers/victory.c
index b66e9f7f935..d779c5656fe 100644
--- a/src/mame/drivers/victory.c
+++ b/src/mame/drivers/victory.c
@@ -211,8 +211,8 @@ static MACHINE_DRIVER_START( victory )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, VICTORY_MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(main_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(main_io_map)
MDRV_CPU_VBLANK_INT("screen", victory_vblank_interrupt)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index 9b33ff7c18d..8fa02ca82c5 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -325,7 +325,7 @@ static MACHINE_DRIVER_START( videopin )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 12096000 / 16)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(videopin)
diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c
index b4938686962..0e45f19ac62 100644
--- a/src/mame/drivers/videopkr.c
+++ b/src/mame/drivers/videopkr.c
@@ -1159,14 +1159,14 @@ static MACHINE_DRIVER_START( videopkr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", I8039, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(i8039_map, 0)
- MDRV_CPU_IO_MAP(i8039_io_port, 0)
+ MDRV_CPU_PROGRAM_MAP(i8039_map)
+ MDRV_CPU_IO_MAP(i8039_io_port)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
MDRV_CPU_ADD("soundcpu", I8039, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(i8039_sound_mem, 0)
- MDRV_CPU_IO_MAP(i8039_sound_port, 0)
+ MDRV_CPU_PROGRAM_MAP(i8039_sound_mem)
+ MDRV_CPU_IO_MAP(i8039_sound_port)
MDRV_MACHINE_START(videopkr)
MDRV_NVRAM_HANDLER(videopkr)
@@ -1227,8 +1227,8 @@ static MACHINE_DRIVER_START( babypkr )
MDRV_CPU_REPLACE("maincpu", I8039, CPU_CLOCK_ALT)
/* most likely romless or eprom */
MDRV_CPU_REPLACE("soundcpu", I8031, CPU_CLOCK )
- MDRV_CPU_PROGRAM_MAP(i8051_sound_mem, 0)
- MDRV_CPU_IO_MAP(i8051_sound_port, 0)
+ MDRV_CPU_PROGRAM_MAP(i8051_sound_mem)
+ MDRV_CPU_IO_MAP(i8051_sound_port)
/* video hardware */
MDRV_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index 61a0df20564..9b109a219cf 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -528,13 +528,13 @@ static MACHINE_DRIVER_START( vigilant )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */
- MDRV_CPU_PROGRAM_MAP(vigilant_map,0)
- MDRV_CPU_IO_MAP(vigilant_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(vigilant_map)
+ MDRV_CPU_IO_MAP(vigilant_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */
/* IRQs are generated by main Z80 and YM2151 */
MDRV_MACHINE_RESET(m72_sound)
@@ -571,13 +571,13 @@ static MACHINE_DRIVER_START( buccanrs )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 5688800) /* 5.688800 MHz */
- MDRV_CPU_PROGRAM_MAP(vigilant_map,0)
- MDRV_CPU_IO_MAP(vigilant_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(vigilant_map)
+ MDRV_CPU_IO_MAP(vigilant_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, 18432000/6) /* 3.072000 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(buccanrs_sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(buccanrs_sound_io_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */
/* IRQs are generated by main Z80 and YM2151 */
MDRV_MACHINE_RESET(m72_sound)
@@ -630,13 +630,13 @@ static MACHINE_DRIVER_START( kikcubic )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */
- MDRV_CPU_PROGRAM_MAP(kikcubic_map,0)
- MDRV_CPU_IO_MAP(kikcubic_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(kikcubic_map)
+ MDRV_CPU_IO_MAP(kikcubic_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */
/* IRQs are generated by main Z80 and YM2151 */
MDRV_MACHINE_RESET(m72_sound)
diff --git a/src/mame/drivers/vindictr.c b/src/mame/drivers/vindictr.c
index fe012637d8b..0b4b2291d10 100644
--- a/src/mame/drivers/vindictr.c
+++ b/src/mame/drivers/vindictr.c
@@ -188,7 +188,7 @@ static MACHINE_DRIVER_START( vindictr )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_MACHINE_RESET(vindictr)
MDRV_NVRAM_HANDLER(atarigen)
diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c
index e13454a8440..729f99958ee 100644
--- a/src/mame/drivers/viper.c
+++ b/src/mame/drivers/viper.c
@@ -595,7 +595,7 @@ static MACHINE_DRIVER_START(viper)
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", MPC8240, 200000000)
MDRV_CPU_CONFIG(viper_ppc_cfg)
- MDRV_CPU_PROGRAM_MAP(viper_map, 0)
+ MDRV_CPU_PROGRAM_MAP(viper_map)
MDRV_CPU_VBLANK_INT("screen", viper_vblank)
MDRV_MACHINE_RESET(viper)
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index 8811287ea51..179c8aecf19 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -426,7 +426,7 @@ static VIDEO_UPDATE(varia)
static MACHINE_DRIVER_START( varia )
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(varia_program_map, 0)
+ MDRV_CPU_PROGRAM_MAP(varia_program_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold) // also level 3
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index c3240a9dea2..05274cda23d 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -247,11 +247,11 @@ static MACHINE_DRIVER_START( volfied )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 8MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 4MHz sound CPU, required to run the game */
- MDRV_CPU_PROGRAM_MAP(z80_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_map)
MDRV_QUANTUM_TIME(HZ(1200))
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index c121d0068f1..399e31ba92d 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -260,8 +260,8 @@ static const ppi8255_interface ppi8255_intf[2] =
static MACHINE_DRIVER_START( vroulet )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, 4000000) //???
- MDRV_CPU_PROGRAM_MAP(vroulet_map, 0)
- MDRV_CPU_IO_MAP(vroulet_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(vroulet_map)
+ MDRV_CPU_IO_MAP(vroulet_io_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_NVRAM_HANDLER(generic_1fill)
diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c
index f188d0ee6e5..d120b5c0623 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -1765,7 +1765,7 @@ static MACHINE_DRIVER_START( vsnes )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", N2A03,N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(vsnes_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(vsnes_cpu1_map)
/* some carts also trigger IRQs */
MDRV_MACHINE_RESET(vsnes)
@@ -1800,10 +1800,10 @@ static MACHINE_DRIVER_START( vsdual )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", N2A03,N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(vsnes_cpu1_map,0)
+ MDRV_CPU_PROGRAM_MAP(vsnes_cpu1_map)
/* some carts also trigger IRQs */
MDRV_CPU_ADD("sub", N2A03,N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(vsnes_cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(vsnes_cpu2_map)
/* some carts also trigger IRQs */
MDRV_MACHINE_RESET(vsdual)
diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c
index 9c6d187c8a0..b6369151e1d 100644
--- a/src/mame/drivers/vulgus.c
+++ b/src/mame/drivers/vulgus.c
@@ -234,11 +234,11 @@ static MACHINE_DRIVER_START( vulgus )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(vulgus_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8)
/* video hardware */
diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c
index d6f2274bffb..485ae5a418c 100644
--- a/src/mame/drivers/wallc.c
+++ b/src/mame/drivers/wallc.c
@@ -278,7 +278,7 @@ static DRIVER_INIT( wallca )
static MACHINE_DRIVER_START( wallc )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 12288000 / 4) /* 3.072 MHz ? */
- MDRV_CPU_PROGRAM_MAP(wallc_map,0)
+ MDRV_CPU_PROGRAM_MAP(wallc_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 399e38e24b6..c43303a8229 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -438,18 +438,18 @@ static MACHINE_DRIVER_START( wardner )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,24000000/4) /* 6MHz ??? - Real board crystal is 24MHz */
- MDRV_CPU_PROGRAM_MAP(main_program_map, 0)
- MDRV_CPU_IO_MAP(main_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_program_map)
+ MDRV_CPU_IO_MAP(main_io_map)
MDRV_CPU_VBLANK_INT("screen", wardner_interrupt)
MDRV_CPU_ADD("audiocpu", Z80,24000000/7) /* 3.43MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_program_map, 0)
- MDRV_CPU_IO_MAP(sound_io_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_program_map)
+ MDRV_CPU_IO_MAP(sound_io_map)
MDRV_CPU_ADD("dsp", TMS32010,14000000) /* 14MHz Crystal CLKin */
- MDRV_CPU_PROGRAM_MAP(DSP_program_map, 0)
+ MDRV_CPU_PROGRAM_MAP(DSP_program_map)
/* Data Map is internal to the CPU */
- MDRV_CPU_IO_MAP(DSP_io_map, 0)
+ MDRV_CPU_IO_MAP(DSP_io_map)
MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index 85a23eed9b8..020d98cae04 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -725,8 +725,8 @@ static MACHINE_DRIVER_START( geebee )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080, MASTER_CLOCK/9) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(geebee_map,0)
- MDRV_CPU_IO_MAP(geebee_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(geebee_map)
+ MDRV_CPU_IO_MAP(geebee_port_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
@@ -765,7 +765,7 @@ static MACHINE_DRIVER_START( bombbee )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080, MASTER_CLOCK/9) /* 18.432 MHz / 9 */
- MDRV_CPU_PROGRAM_MAP(bombbee_map,0)
+ MDRV_CPU_PROGRAM_MAP(bombbee_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
/* video hardware */
@@ -792,7 +792,7 @@ static MACHINE_DRIVER_START( warpwarp )
/* basic machine hardware */
MDRV_IMPORT_FROM(bombbee)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(warpwarp_map,0)
+ MDRV_CPU_PROGRAM_MAP(warpwarp_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index eedbd0f70ec..e6d12b18bb9 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -448,11 +448,11 @@ static MACHINE_DRIVER_START( darius2d )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? (Might well be 16!) */
- MDRV_CPU_PROGRAM_MAP(darius2d_map,0)
+ MDRV_CPU_PROGRAM_MAP(darius2d_map)
MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_sound_map)
MDRV_MACHINE_START( warriorb )
MDRV_MACHINE_RESET( taito_dualscreen )
@@ -506,11 +506,11 @@ static MACHINE_DRIVER_START( warriorb )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ? */
- MDRV_CPU_PROGRAM_MAP(warriorb_map,0)
+ MDRV_CPU_PROGRAM_MAP(warriorb_map)
MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_sound_map)
MDRV_MACHINE_START( warriorb )
MDRV_MACHINE_RESET( taito_dualscreen )
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index 497aa4dfc79..8372868b07f 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -299,15 +299,15 @@ static MACHINE_DRIVER_START( wc90 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 6000000) /* 6.0 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(wc90_map_1,0)
+ MDRV_CPU_PROGRAM_MAP(wc90_map_1)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, 6000000) /* 6.0 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(wc90_map_2,0)
+ MDRV_CPU_PROGRAM_MAP(wc90_map_2)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* NMIs are triggered by the main CPU */
/* video hardware */
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index dc6cb9ded31..85a085e9256 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -386,15 +386,15 @@ static MACHINE_DRIVER_START( wc90b )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, XTAL_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(wc90b_map1,0)
+ MDRV_CPU_PROGRAM_MAP(wc90b_map1)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("sub", Z80, XTAL_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(wc90b_map2,0)
+ MDRV_CPU_PROGRAM_MAP(wc90b_map2)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_19_6608MHz/8)
- MDRV_CPU_PROGRAM_MAP(sound_cpu,0)
+ MDRV_CPU_PROGRAM_MAP(sound_cpu)
/* IRQs are triggered by the main CPU */
/* video hardware */
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index 9a786e28e56..80fc01f2151 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -1087,15 +1087,15 @@ static MACHINE_DRIVER_START( wecleman )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* Schems show 10MHz */
- MDRV_CPU_PROGRAM_MAP(wecleman_map,0)
+ MDRV_CPU_PROGRAM_MAP(wecleman_map)
MDRV_CPU_VBLANK_INT_HACK(wecleman_interrupt,5 + 1) /* in order to read the inputs once per frame */
MDRV_CPU_ADD("sub", M68000, 10000000) /* Schems show 10MHz */
- MDRV_CPU_PROGRAM_MAP(wecleman_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(wecleman_sub_map)
/* Schems: can be reset, no nmi, soundlatch, 3.58MHz */
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(wecleman_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(wecleman_sound_map)
MDRV_QUANTUM_TIME(HZ(6000))
@@ -1142,14 +1142,14 @@ static MACHINE_DRIVER_START( hotchase )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */
- MDRV_CPU_PROGRAM_MAP(hotchase_map,0)
+ MDRV_CPU_PROGRAM_MAP(hotchase_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("sub", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */
- MDRV_CPU_PROGRAM_MAP(hotchase_sub_map,0)
+ MDRV_CPU_PROGRAM_MAP(hotchase_sub_map)
MDRV_CPU_ADD("audiocpu", M6809, 3579545 / 2) /* 3.579/2 MHz - PCB is drawn in one set's readme */
- MDRV_CPU_PROGRAM_MAP(hotchase_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(hotchase_sound_map)
MDRV_CPU_PERIODIC_INT( hotchase_sound_timer, 496 )
/* Amuse: every 2 ms */
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index ba03c6b1e79..eb40578e669 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -719,12 +719,12 @@ static MACHINE_DRIVER_START( welltris )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,20000000/2) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_port_map,0) /* IRQs are triggered by the YM2610 */
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_port_map) /* IRQs are triggered by the YM2610 */
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index 0f813ffe074..5a062167dbb 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -954,14 +954,14 @@ static MACHINE_DRIVER_START( wgp )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(z80_sound_map)
MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cpu2_map,0)
+ MDRV_CPU_PROGRAM_MAP(cpu2_map)
MDRV_CPU_VBLANK_INT("screen", wgp_cpub_interrupt)
MDRV_MACHINE_START(wgp)
diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c
index 2a59f3c9a33..fc30791779b 100644
--- a/src/mame/drivers/wheelfir.c
+++ b/src/mame/drivers/wheelfir.c
@@ -631,11 +631,11 @@ static INTERRUPT_GEN( wheelfir_irq )
static MACHINE_DRIVER_START( wheelfir )
MDRV_CPU_ADD("maincpu", M68000, 32000000)
- MDRV_CPU_PROGRAM_MAP(wheelfir_main, 0)
+ MDRV_CPU_PROGRAM_MAP(wheelfir_main)
MDRV_CPU_VBLANK_INT_HACK(wheelfir_irq,256) // 1,3,5 valid
MDRV_CPU_ADD("sub", M68000, 32000000/2)
- MDRV_CPU_PROGRAM_MAP(wheelfir_sub, 0)
+ MDRV_CPU_PROGRAM_MAP(wheelfir_sub)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold) // 1 valid
MDRV_MACHINE_RESET (wheelfir)
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index 90f82ad3011..13345b8dea6 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -1426,10 +1426,10 @@ static MACHINE_DRIVER_START( defender )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4)
- MDRV_CPU_PROGRAM_MAP(defender_map,0)
+ MDRV_CPU_PROGRAM_MAP(defender_map)
MDRV_CPU_ADD("soundcpu", M6808, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(defender_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(defender_sound_map)
MDRV_MACHINE_RESET(defender)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -1471,10 +1471,10 @@ static MACHINE_DRIVER_START( williams )
MDRV_IMPORT_FROM(defender)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(williams_map,0)
+ MDRV_CPU_PROGRAM_MAP(williams_map)
MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_RESET(williams)
MDRV_SCREEN_MODIFY("screen")
@@ -1498,7 +1498,7 @@ static MACHINE_DRIVER_START( williams_extra_ram )
MDRV_IMPORT_FROM(williams)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(williams_extra_ram_map,0)
+ MDRV_CPU_PROGRAM_MAP(williams_extra_ram_map)
MACHINE_DRIVER_END
@@ -1528,7 +1528,7 @@ static MACHINE_DRIVER_START( alienar )
MDRV_IMPORT_FROM(defender)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(williams_map,0)
+ MDRV_CPU_PROGRAM_MAP(williams_map)
MDRV_MACHINE_RESET(williams)
MDRV_SCREEN_MODIFY("screen")
@@ -1579,7 +1579,7 @@ static MACHINE_DRIVER_START( blaster )
MDRV_IMPORT_FROM(williams)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(blaster_map,0)
+ MDRV_CPU_PROGRAM_MAP(blaster_map)
MDRV_MACHINE_RESET(blaster)
@@ -1606,10 +1606,10 @@ static MACHINE_DRIVER_START( williams2 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4)
- MDRV_CPU_PROGRAM_MAP(williams2_map,0)
+ MDRV_CPU_PROGRAM_MAP(williams2_map)
MDRV_CPU_ADD("soundcpu", M6808, MASTER_CLOCK/3) /* yes, this is different from the older games */
- MDRV_CPU_PROGRAM_MAP(williams2_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(williams2_sound_map)
MDRV_MACHINE_RESET(williams2)
MDRV_NVRAM_HANDLER(generic_0fill)
@@ -1645,7 +1645,7 @@ static MACHINE_DRIVER_START( williams2_extra_ram )
MDRV_IMPORT_FROM(williams2)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(williams2_extra_ram_map,0)
+ MDRV_CPU_PROGRAM_MAP(williams2_extra_ram_map)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index 7177fda6874..b79c874db86 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -323,13 +323,13 @@ static MACHINE_RESET( wink )
static MACHINE_DRIVER_START( wink )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 12000000 / 4)
- MDRV_CPU_PROGRAM_MAP(wink_map,0)
- MDRV_CPU_IO_MAP(wink_io,0)
+ MDRV_CPU_PROGRAM_MAP(wink_map)
+ MDRV_CPU_IO_MAP(wink_io)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80, 12000000 / 8)
- MDRV_CPU_PROGRAM_MAP(wink_sound_map,0)
- MDRV_CPU_IO_MAP(wink_sound_io,0)
+ MDRV_CPU_PROGRAM_MAP(wink_sound_map)
+ MDRV_CPU_IO_MAP(wink_sound_io)
MDRV_CPU_PERIODIC_INT(wink_sound, 15625)
MDRV_NVRAM_HANDLER(generic_1fill)
diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c
index b71d05056f8..1aed56ebf8a 100644
--- a/src/mame/drivers/wiping.c
+++ b/src/mame/drivers/wiping.c
@@ -293,11 +293,11 @@ static MACHINE_DRIVER_START( wiping )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,120) /* periodic interrupt, don't know about the frequency */
/* video hardware */
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index 1cfdd86d07c..62982698eb1 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -763,12 +763,12 @@ static INTERRUPT_GEN( witch_sub_interrupt )
static MACHINE_DRIVER_START( witch )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(map_main, 0)
+ MDRV_CPU_PROGRAM_MAP(map_main)
MDRV_CPU_VBLANK_INT("screen", witch_main_interrupt)
/* 2nd z80 */
MDRV_CPU_ADD("sub", Z80,8000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(map_sub, 0)
+ MDRV_CPU_PROGRAM_MAP(map_sub)
MDRV_CPU_VBLANK_INT("screen", witch_sub_interrupt)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index e19e515d658..10c37fdfc05 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -699,11 +699,11 @@ static MACHINE_DRIVER_START( wiz )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", Z80, 14318000/8) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* ??? */
MDRV_MACHINE_RESET( wiz )
@@ -743,7 +743,7 @@ static MACHINE_DRIVER_START( stinger )
MDRV_IMPORT_FROM(wiz)
MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(stinger_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(stinger_sound_map)
/* video hardware */
MDRV_GFXDECODE(stinger)
diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c
index 549fc54f2c9..51437882129 100644
--- a/src/mame/drivers/wldarrow.c
+++ b/src/mame/drivers/wldarrow.c
@@ -344,7 +344,7 @@ static MACHINE_DRIVER_START( wldarrow )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", 8080, 2000000)
- MDRV_CPU_PROGRAM_MAP(wldarrow_map,0)
+ MDRV_CPU_PROGRAM_MAP(wldarrow_map)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c
index b5278eb11f4..37a80cd13ef 100644
--- a/src/mame/drivers/wolfpack.c
+++ b/src/mame/drivers/wolfpack.c
@@ -311,7 +311,7 @@ static MACHINE_DRIVER_START(wolfpack)
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, 12096000 / 16)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
/* video hardware */
MDRV_MACHINE_RESET(wolfpack)
diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c
index f53f47f1836..7d28e680a39 100644
--- a/src/mame/drivers/wrally.c
+++ b/src/mame/drivers/wrally.c
@@ -248,13 +248,13 @@ GFXDECODE_END
static MACHINE_DRIVER_START( wrally )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000,XTAL_24MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(wrally_map, 0)
+ MDRV_CPU_PROGRAM_MAP(wrally_map)
MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
MDRV_CPU_ADD("mcu", DS5002FP, XTAL_24MHz/2) /* verified on pcb */
MDRV_CPU_CONFIG(dallas_config)
- MDRV_CPU_PROGRAM_MAP(dallas_rom, 0)
- MDRV_CPU_IO_MAP(dallas_ram, 0)
+ MDRV_CPU_PROGRAM_MAP(dallas_rom)
+ MDRV_CPU_IO_MAP(dallas_ram)
MDRV_QUANTUM_TIME(HZ(38400)) /* heavy sync */
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index 40843a3d0d5..eddf0326b4c 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -437,11 +437,11 @@ static MACHINE_DRIVER_START( wwfsstar )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_TIMER_ADD_SCANLINE("scantimer", wwfsstar_scanline, "screen", 0, 1)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(sound_map, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index 944fe350a39..bb27990b53f 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -394,11 +394,11 @@ static MACHINE_DRIVER_START( wwfwfest )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 24 crystal, 12 rated chip */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_TIMER_ADD_SCANLINE("scantimer", wwfwfest_scanline, "screen", 0, 1)
MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index 17ff4e00417..446ac61b3de 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -479,17 +479,17 @@ static MACHINE_DRIVER_START( xsleena )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, CPU_CLOCK) /* Confirmed 1.5MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_TIMER_ADD_SCANLINE("scantimer", xain_scanline, "screen", 0, 1)
MDRV_CPU_ADD("sub", M6809, CPU_CLOCK) /* Confirmed 1.5MHz */
- MDRV_CPU_PROGRAM_MAP(cpu_map_B,0)
+ MDRV_CPU_PROGRAM_MAP(cpu_map_B)
MDRV_CPU_ADD("audiocpu", M6809, CPU_CLOCK) /* Confirmed 1.5MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
// MDRV_CPU_ADD("mcu", M68705, MCU_CLOCK) /* Confirmed 3MHz */
-// MDRV_CPU_PROGRAM_MAP(mcu_map,0)
+// MDRV_CPU_PROGRAM_MAP(mcu_map)
MDRV_MACHINE_START(xsleena)
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index 7681e243df2..dcb730a33cc 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -443,13 +443,13 @@ static MACHINE_DRIVER_START( xexex )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) // 16MHz (32MHz xtal)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(xexex_interrupt,2)
// 8MHz (PCB shows one 32MHz/18.432MHz xtal, reference: www.system16.com)
// more likely 32MHz since 18.432MHz yields 4.608MHz(too slow) or 9.216MHz(too fast) with integer divisors
MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(1920))
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 30a50f4493b..311f0012449 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -351,11 +351,11 @@ static MACHINE_DRIVER_START( xmen )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(xmen_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80,8000000) /* verified with M1, guessed but accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_MACHINE_START(xmen)
@@ -416,11 +416,11 @@ static MACHINE_DRIVER_START( xmen6p )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(6p_main_map,0)
+ MDRV_CPU_PROGRAM_MAP(6p_main_map)
MDRV_CPU_VBLANK_INT_HACK(xmen6p_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80,8000000) /* verified with M1, guessed but accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_NVRAM_HANDLER(xmen)
diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c
index 525e49d716b..02018031fc9 100644
--- a/src/mame/drivers/xorworld.c
+++ b/src/mame/drivers/xorworld.c
@@ -202,7 +202,7 @@ static INTERRUPT_GEN( xorworld_interrupt )
static MACHINE_DRIVER_START( xorworld )
// basic machine hardware
MDRV_CPU_ADD("maincpu", M68000, 10000000) // 10 MHz
- MDRV_CPU_PROGRAM_MAP(xorworld_map, 0)
+ MDRV_CPU_PROGRAM_MAP(xorworld_map)
MDRV_CPU_VBLANK_INT_HACK(xorworld_interrupt, 4) // 1 IRQ2 + 1 IRQ4 + 1 IRQ6
MDRV_QUANTUM_TIME(HZ(60))
diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c
index 2516c39c01d..834d0cbf033 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -344,7 +344,7 @@ static MACHINE_DRIVER_START( xtheball )
MDRV_CPU_ADD("maincpu", TMS34010, 40000000)
MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,15000)
MDRV_MACHINE_RESET(xtheball)
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index 0cda3c72301..295da55f9b0 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -307,11 +307,11 @@ static MACHINE_DRIVER_START( xxmissio )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,12000000/4) /* 3.0MHz */
- MDRV_CPU_PROGRAM_MAP(map1,0)
+ MDRV_CPU_PROGRAM_MAP(map1)
MDRV_CPU_VBLANK_INT("screen", xxmissio_interrupt_m)
MDRV_CPU_ADD("sub", Z80,12000000/4) /* 3.0MHz */
- MDRV_CPU_PROGRAM_MAP(map2,0)
+ MDRV_CPU_PROGRAM_MAP(map2)
MDRV_CPU_VBLANK_INT_HACK(xxmissio_interrupt_s,2)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c
index d1bf8e6bc36..5600a81aff2 100644
--- a/src/mame/drivers/xybots.c
+++ b/src/mame/drivers/xybots.c
@@ -187,7 +187,7 @@ static MACHINE_DRIVER_START( xybots )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
MDRV_MACHINE_RESET(xybots)
diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c
index fee30657cb8..6ae80858585 100644
--- a/src/mame/drivers/xyonix.c
+++ b/src/mame/drivers/xyonix.c
@@ -224,8 +224,8 @@ static MACHINE_DRIVER_START( xyonix )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,16000000 / 4) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(port_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(port_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_PERIODIC_INT(irq0_line_assert,4*60) /* ?? controls music tempo */
diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c
index 0fa577ed535..c3803c6ec8e 100644
--- a/src/mame/drivers/yiear.c
+++ b/src/mame/drivers/yiear.c
@@ -197,7 +197,7 @@ static MACHINE_DRIVER_START( yiear )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809,18432000/16) /* ???? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
MDRV_CPU_PERIODIC_INT(yiear_nmi_interrupt,500) /* music tempo (correct frequency unknown) */
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index d3f70e67b68..7d859e4fa3f 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -585,12 +585,12 @@ static MACHINE_DRIVER_START( magicbub )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(sound_port_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(sound_port_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@@ -629,7 +629,7 @@ static MACHINE_DRIVER_START( shocking )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c
index 8574fb95a6b..f482e5078dd 100644
--- a/src/mame/drivers/yunsung8.c
+++ b/src/mame/drivers/yunsung8.c
@@ -507,12 +507,12 @@ static MACHINE_DRIVER_START( yunsung8 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 8000000) /* Z80B */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_IO_MAP(port_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(port_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* No nmi routine */
MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* NMI caused by the MSM5205? */
MDRV_MACHINE_RESET(yunsung8)
diff --git a/src/mame/drivers/zac2650.c b/src/mame/drivers/zac2650.c
index 0f13f5efcec..a4d60dec7f4 100644
--- a/src/mame/drivers/zac2650.c
+++ b/src/mame/drivers/zac2650.c
@@ -242,8 +242,8 @@ static MACHINE_DRIVER_START( tinvader )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", S2650, 3800000/4)
- MDRV_CPU_PROGRAM_MAP(main_map, 0)
- MDRV_CPU_IO_MAP(port_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
+ MDRV_CPU_IO_MAP(port_map)
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index f3727cf63f8..96db25bbdac 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -571,15 +571,15 @@ static MACHINE_DRIVER_START( zaccaria )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
MDRV_CPU_ADD("audiocpu", M6802,XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map_1,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map_1)
MDRV_CPU_PERIODIC_INT(zaccaria_cb1_toggle,(double)3580000/4096)
MDRV_CPU_ADD("audio2", M6802,XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map_2,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map_2)
MDRV_PPI8255_ADD( "ppi8255", ppi8255_intf )
MDRV_PIA6821_ADD( "pia0", pia_0_intf )
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index 9fc5e3c819a..b7fb1c8f61f 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -986,7 +986,7 @@ static MACHINE_DRIVER_START( root )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/16)
- MDRV_CPU_PROGRAM_MAP(zaxxon_map, 0)
+ MDRV_CPU_PROGRAM_MAP(zaxxon_map)
MDRV_CPU_VBLANK_INT("screen", vblank_int)
MDRV_MACHINE_START(zaxxon)
@@ -1047,12 +1047,12 @@ static MACHINE_DRIVER_START( congo )
MDRV_IMPORT_FROM(root)
MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(congo_map, 0)
+ MDRV_CPU_PROGRAM_MAP(congo_map)
MDRV_PPI8255_RECONFIG( "ppi8255", congo_ppi_intf )
MDRV_CPU_ADD("audiocpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(congo_sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(congo_sound_map)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)SOUND_CLOCK/16/16/16/4)
/* video hardware */
diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c
index e8e5051fd99..ddaba5221f5 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -177,11 +177,11 @@ static MACHINE_DRIVER_START( zerozone )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("audiocpu", Z80, 1000000) /* 1 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
MDRV_QUANTUM_TIME(HZ(600))
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index b8cfd82b5db..1743728f63f 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -444,7 +444,7 @@ static void zn_machine_init( running_machine *machine )
static MACHINE_DRIVER_START( zn1_1mb_vram )
/* basic machine hardware */
MDRV_CPU_ADD( "maincpu", PSXCPU, XTAL_67_7376MHz )
- MDRV_CPU_PROGRAM_MAP( zn_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( zn_map)
MDRV_CPU_VBLANK_INT("screen", psx_vblank)
/* video hardware */
@@ -482,7 +482,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( zn2 )
/* basic machine hardware */
MDRV_CPU_ADD( "maincpu", PSXCPU, XTAL_100MHz )
- MDRV_CPU_PROGRAM_MAP( zn_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( zn_map)
MDRV_CPU_VBLANK_INT("screen", psx_vblank)
/* video hardware */
@@ -699,8 +699,8 @@ static MACHINE_DRIVER_START( coh1000c )
MDRV_IMPORT_FROM( zn1_1mb_vram )
MDRV_CPU_ADD("audiocpu", Z80, 8000000 ) /* 8MHz ?? */
- MDRV_CPU_PROGRAM_MAP( qsound_map, 0 )
- MDRV_CPU_IO_MAP( qsound_portmap, 0 )
+ MDRV_CPU_PROGRAM_MAP( qsound_map)
+ MDRV_CPU_IO_MAP( qsound_portmap)
MDRV_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */
MDRV_MACHINE_RESET( coh1000c )
@@ -714,8 +714,8 @@ static MACHINE_DRIVER_START( coh1002c )
MDRV_IMPORT_FROM( zn1_2mb_vram )
MDRV_CPU_ADD("audiocpu", Z80, 8000000 ) /* 8MHz ?? */
- MDRV_CPU_PROGRAM_MAP( qsound_map, 0 )
- MDRV_CPU_IO_MAP( qsound_portmap, 0 )
+ MDRV_CPU_PROGRAM_MAP( qsound_map)
+ MDRV_CPU_IO_MAP( qsound_portmap)
MDRV_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */
MDRV_MACHINE_RESET( coh1000c )
@@ -895,8 +895,8 @@ static MACHINE_DRIVER_START( coh3002c )
MDRV_IMPORT_FROM( zn2 )
MDRV_CPU_ADD("audiocpu", Z80, 8000000 ) /* 8MHz ?? */
- MDRV_CPU_PROGRAM_MAP( qsound_map, 0 )
- MDRV_CPU_IO_MAP( qsound_portmap, 0 )
+ MDRV_CPU_PROGRAM_MAP( qsound_map)
+ MDRV_CPU_IO_MAP( qsound_portmap)
MDRV_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */
MDRV_MACHINE_RESET( coh3002c )
@@ -1222,7 +1222,7 @@ static MACHINE_DRIVER_START( coh1000ta )
MDRV_IMPORT_FROM( zn1_1mb_vram )
MDRV_CPU_ADD("audiocpu", Z80, 16000000 / 4 ) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP( fx1a_sound_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( fx1a_sound_map)
MDRV_MACHINE_RESET( coh1000ta )
MDRV_NVRAM_HANDLER( coh1000ta )
@@ -1675,7 +1675,7 @@ static MACHINE_DRIVER_START( coh1002e )
MDRV_IMPORT_FROM( zn1_2mb_vram )
MDRV_CPU_ADD("audiocpu", M68000, 12000000 )
- MDRV_CPU_PROGRAM_MAP( psarc_snd_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( psarc_snd_map)
MDRV_MACHINE_RESET( coh1002e )
@@ -2306,7 +2306,7 @@ static MACHINE_DRIVER_START( coh1001l )
MDRV_IMPORT_FROM( zn1_2mb_vram )
// MDRV_CPU_ADD("audiocpu", M68000, 10000000 )
-// MDRV_CPU_PROGRAM_MAP( atlus_snd_map, 0 )
+// MDRV_CPU_PROGRAM_MAP( atlus_snd_map)
MDRV_MACHINE_RESET( coh1001l )
@@ -2593,8 +2593,8 @@ static MACHINE_DRIVER_START( coh1002msnd )
MDRV_IMPORT_FROM( zn1_2mb_vram )
MDRV_CPU_ADD("audiocpu", Z80, 32000000/8 )
- MDRV_CPU_PROGRAM_MAP( cbaj_z80_map, 0 )
- MDRV_CPU_IO_MAP( cbaj_z80_port_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( cbaj_z80_map)
+ MDRV_CPU_IO_MAP( cbaj_z80_port_map)
MDRV_MACHINE_RESET( coh1002m )
@@ -2607,7 +2607,7 @@ static MACHINE_DRIVER_START( coh1002ml )
MDRV_IMPORT_FROM( zn1_2mb_vram )
MDRV_CPU_ADD("link", Z80, 8000000 )
- MDRV_CPU_PROGRAM_MAP( link_map, 0 )
+ MDRV_CPU_PROGRAM_MAP( link_map)
MDRV_MACHINE_RESET( coh1002m )
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c
index 5a2c09bd0e6..ac2c07404d6 100644
--- a/src/mame/drivers/zodiack.c
+++ b/src/mame/drivers/zodiack.c
@@ -518,12 +518,12 @@ static MACHINE_DRIVER_START( zodiack )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4.00 MHz??? */
- MDRV_CPU_PROGRAM_MAP(main_map,0)
+ MDRV_CPU_PROGRAM_MAP(main_map)
MDRV_CPU_VBLANK_INT_HACK(zodiac_master_interrupt,2)
MDRV_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz??? */
- MDRV_CPU_PROGRAM_MAP(sound_map,0)
- MDRV_CPU_IO_MAP(io_map,0)
+ MDRV_CPU_PROGRAM_MAP(sound_map)
+ MDRV_CPU_IO_MAP(io_map)
MDRV_CPU_VBLANK_INT_HACK(espial_sound_nmi_gen,8) /* IRQs are triggered by the main CPU */
MDRV_MACHINE_RESET(zodiack)
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index a6e614f9584..fe924b0e29f 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -717,15 +717,15 @@ static MACHINE_DRIVER_START( zr107 )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
- MDRV_CPU_PROGRAM_MAP(zr107_map, 0)
+ MDRV_CPU_PROGRAM_MAP(zr107_map)
MDRV_CPU_VBLANK_INT("screen", zr107_vblank)
MDRV_CPU_ADD("audiocpu", M68000, 64000000/8) /* 8MHz */
- MDRV_CPU_PROGRAM_MAP(sound_memmap, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_memmap)
MDRV_CPU_ADD("dsp", ADSP21062, 36000000)
MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(sharc_map, 0)
+ MDRV_CPU_DATA_MAP(sharc_map)
MDRV_QUANTUM_TIME(HZ(30000))
@@ -762,15 +762,15 @@ static MACHINE_DRIVER_START( jetwave )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
- MDRV_CPU_PROGRAM_MAP(jetwave_map, 0)
+ MDRV_CPU_PROGRAM_MAP(jetwave_map)
MDRV_CPU_VBLANK_INT("screen", zr107_vblank)
MDRV_CPU_ADD("audiocpu", M68000, 64000000/8) /* 8MHz */
- MDRV_CPU_PROGRAM_MAP(sound_memmap, 0)
+ MDRV_CPU_PROGRAM_MAP(sound_memmap)
MDRV_CPU_ADD("dsp", ADSP21062, 36000000)
MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(sharc_map, 0)
+ MDRV_CPU_DATA_MAP(sharc_map)
MDRV_QUANTUM_TIME(HZ(30000))
diff --git a/src/mame/machine/asic65.c b/src/mame/machine/asic65.c
index 5b6843af1b4..c071ab67dbb 100644
--- a/src/mame/machine/asic65.c
+++ b/src/mame/machine/asic65.c
@@ -543,8 +543,8 @@ MACHINE_DRIVER_START( asic65 )
/* ASIC65 */
MDRV_CPU_ADD("asic65", TMS32010, 20000000)
- MDRV_CPU_PROGRAM_MAP(asic65_program_map,0)
- MDRV_CPU_IO_MAP(asic65_io_map,0)
+ MDRV_CPU_PROGRAM_MAP(asic65_program_map)
+ MDRV_CPU_IO_MAP(asic65_io_map)
MACHINE_DRIVER_END
diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c
index f927b99fae5..2843d2e55d7 100644
--- a/src/mame/video/qix.c
+++ b/src/mame/video/qix.c
@@ -446,7 +446,7 @@ static const m6809_config encryption_config =
MACHINE_DRIVER_START( qix_video )
MDRV_CPU_ADD("videocpu", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */
- MDRV_CPU_PROGRAM_MAP(qix_video_map,0)
+ MDRV_CPU_PROGRAM_MAP(qix_video_map)
MDRV_CPU_CONFIG(encryption_config) // for kram3
MDRV_VIDEO_START(qix)
@@ -462,11 +462,11 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START( zookeep_video )
MDRV_CPU_MODIFY("videocpu")
- MDRV_CPU_PROGRAM_MAP(zookeep_video_map,0)
+ MDRV_CPU_PROGRAM_MAP(zookeep_video_map)
MACHINE_DRIVER_END
MACHINE_DRIVER_START( slither_video )
MDRV_CPU_REPLACE("videocpu", M6809, SLITHER_CLOCK_OSC/4/4) /* 1.34 MHz */
- MDRV_CPU_PROGRAM_MAP(slither_video_map,0)
+ MDRV_CPU_PROGRAM_MAP(slither_video_map)
MACHINE_DRIVER_END