summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-07-18 17:08:58 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-07-18 17:08:58 +0000
commit023423726f09c23e3bcba40568590d485d7cdd6a (patch)
tree567149fe963fec42e8b9c42e2f98853d547bd493
parent3e004766e4d1f20ec2974e8a40bc0d82bc9c6f8f (diff)
Removed MDRV_SOUND_ADD. Renamed MDRV_SOUND_ADD_TAG to
MDRV_SOUND_ADD. All sound chips must now include a tag. Laboriously changed all existing drivers to define a unique tag for each sound chip. CPUs are next, but will require a more hands-on manual process to produce reasonable tags.
-rw-r--r--src/emu/mconfig.h5
-rw-r--r--src/emu/sound/flt_rc.h2
-rw-r--r--src/mame/audio/astrof.c4
-rw-r--r--src/mame/audio/atarijsa.c18
-rw-r--r--src/mame/audio/cage.c12
-rw-r--r--src/mame/audio/carnival.c6
-rw-r--r--src/mame/audio/cinemat.c37
-rw-r--r--src/mame/audio/crbaloon.c4
-rw-r--r--src/mame/audio/dcs.c22
-rw-r--r--src/mame/audio/depthch.c2
-rw-r--r--src/mame/audio/dkong.c10
-rw-r--r--src/mame/audio/exidy.c14
-rw-r--r--src/mame/audio/exidy440.c12
-rw-r--r--src/mame/audio/invinco.c2
-rw-r--r--src/mame/audio/irem.c16
-rw-r--r--src/mame/audio/jedi.c12
-rw-r--r--src/mame/audio/mario.c10
-rw-r--r--src/mame/audio/mcr.c14
-rw-r--r--src/mame/audio/mw8080bw.c56
-rw-r--r--src/mame/audio/n8080.c19
-rw-r--r--src/mame/audio/namcoc7x.h2
-rw-r--r--src/mame/audio/pulsar.c2
-rw-r--r--src/mame/audio/qix.c4
-rw-r--r--src/mame/audio/redalert.c14
-rw-r--r--src/mame/audio/scramble.c8
-rw-r--r--src/mame/audio/segag80r.c16
-rw-r--r--src/mame/audio/segasnd.c6
-rw-r--r--src/mame/audio/seibu.h46
-rw-r--r--src/mame/audio/spacefb.c4
-rw-r--r--src/mame/audio/spiders.c2
-rw-r--r--src/mame/audio/taito_en.h4
-rw-r--r--src/mame/audio/targ.c8
-rw-r--r--src/mame/audio/timeplt.c16
-rw-r--r--src/mame/audio/turbo.c6
-rw-r--r--src/mame/audio/vicdual.c6
-rw-r--r--src/mame/audio/williams.c20
-rw-r--r--src/mame/audio/zaxxon.c4
-rw-r--r--src/mame/drivers/1942.c8
-rw-r--r--src/mame/drivers/1943.c8
-rw-r--r--src/mame/drivers/1945kiii.c6
-rw-r--r--src/mame/drivers/20pacgal.c6
-rw-r--r--src/mame/drivers/2mindril.c2
-rw-r--r--src/mame/drivers/39in1.c2
-rw-r--r--src/mame/drivers/40love.c26
-rw-r--r--src/mame/drivers/4enraya.c4
-rw-r--r--src/mame/drivers/8080bw.c16
-rw-r--r--src/mame/drivers/88games.c10
-rw-r--r--src/mame/drivers/ace.c2
-rw-r--r--src/mame/drivers/acefruit.c2
-rw-r--r--src/mame/drivers/acommand.c6
-rw-r--r--src/mame/drivers/actfancr.c22
-rw-r--r--src/mame/drivers/adp.c2
-rw-r--r--src/mame/drivers/aeroboto.c8
-rw-r--r--src/mame/drivers/aerofgt.c64
-rw-r--r--src/mame/drivers/airbustr.c10
-rw-r--r--src/mame/drivers/ajax.c12
-rw-r--r--src/mame/drivers/aleck64.c8
-rw-r--r--src/mame/drivers/alg.c4
-rw-r--r--src/mame/drivers/aliens.c8
-rw-r--r--src/mame/drivers/alpha68k.c56
-rw-r--r--src/mame/drivers/ambush.c4
-rw-r--r--src/mame/drivers/ampoker2.c2
-rw-r--r--src/mame/drivers/amspdwy.c2
-rw-r--r--src/mame/drivers/angelkds.c4
-rw-r--r--src/mame/drivers/appoooh.c16
-rw-r--r--src/mame/drivers/aquarium.c4
-rw-r--r--src/mame/drivers/arabian.c2
-rw-r--r--src/mame/drivers/arcadecl.c2
-rw-r--r--src/mame/drivers/arcadia.c2
-rw-r--r--src/mame/drivers/argus.c14
-rw-r--r--src/mame/drivers/arkanoid.c2
-rw-r--r--src/mame/drivers/armedf.c42
-rw-r--r--src/mame/drivers/artmagic.c2
-rw-r--r--src/mame/drivers/ashnojoe.c4
-rw-r--r--src/mame/drivers/asterix.c4
-rw-r--r--src/mame/drivers/asteroid.c4
-rw-r--r--src/mame/drivers/astinvad.c4
-rw-r--r--src/mame/drivers/astrocde.c18
-rw-r--r--src/mame/drivers/astrocorp.c2
-rw-r--r--src/mame/drivers/asuka.c16
-rw-r--r--src/mame/drivers/atarifb.c2
-rw-r--r--src/mame/drivers/atarisy1.c6
-rw-r--r--src/mame/drivers/atarisy2.c8
-rw-r--r--src/mame/drivers/ataxx.c4
-rw-r--r--src/mame/drivers/atetris.c10
-rw-r--r--src/mame/drivers/attckufo.c2
-rw-r--r--src/mame/drivers/avalnche.c2
-rw-r--r--src/mame/drivers/aztarac.c8
-rw-r--r--src/mame/drivers/backfire.c2
-rw-r--r--src/mame/drivers/badlands.c4
-rw-r--r--src/mame/drivers/bagman.c12
-rw-r--r--src/mame/drivers/balsente.c12
-rw-r--r--src/mame/drivers/bankp.c6
-rw-r--r--src/mame/drivers/baraduke.c2
-rw-r--r--src/mame/drivers/battlane.c2
-rw-r--r--src/mame/drivers/battlera.c6
-rw-r--r--src/mame/drivers/battlex.c2
-rw-r--r--src/mame/drivers/battlnts.c4
-rw-r--r--src/mame/drivers/bbusters.c4
-rw-r--r--src/mame/drivers/beezer.c2
-rw-r--r--src/mame/drivers/berzerk.c4
-rw-r--r--src/mame/drivers/bestleag.c2
-rw-r--r--src/mame/drivers/bfcobra.c4
-rw-r--r--src/mame/drivers/bfm_sc2.c4
-rw-r--r--src/mame/drivers/bigevglf.c4
-rw-r--r--src/mame/drivers/bigfghtr.c6
-rw-r--r--src/mame/drivers/bigstrkb.c6
-rw-r--r--src/mame/drivers/bionicc.c2
-rw-r--r--src/mame/drivers/bishi.c2
-rw-r--r--src/mame/drivers/bking.c6
-rw-r--r--src/mame/drivers/blackt96.c4
-rw-r--r--src/mame/drivers/bladestl.c4
-rw-r--r--src/mame/drivers/blktiger.c4
-rw-r--r--src/mame/drivers/blmbycar.c4
-rw-r--r--src/mame/drivers/blockade.c4
-rw-r--r--src/mame/drivers/blockhl.c2
-rw-r--r--src/mame/drivers/blockout.c4
-rw-r--r--src/mame/drivers/blueprnt.c4
-rw-r--r--src/mame/drivers/bmcbowl.c4
-rw-r--r--src/mame/drivers/bnstars.c4
-rw-r--r--src/mame/drivers/bogeyman.c4
-rw-r--r--src/mame/drivers/bombjack.c6
-rw-r--r--src/mame/drivers/boogwing.c6
-rw-r--r--src/mame/drivers/bottom9.c4
-rw-r--r--src/mame/drivers/brkthru.c8
-rw-r--r--src/mame/drivers/bsktball.c2
-rw-r--r--src/mame/drivers/btime.c4
-rw-r--r--src/mame/drivers/btoads.c2
-rw-r--r--src/mame/drivers/bublbobl.c6
-rw-r--r--src/mame/drivers/buggychl.c6
-rw-r--r--src/mame/drivers/bwidow.c4
-rw-r--r--src/mame/drivers/bwing.c6
-rw-r--r--src/mame/drivers/bzone.c4
-rw-r--r--src/mame/drivers/cabal.c12
-rw-r--r--src/mame/drivers/calomega.c2
-rw-r--r--src/mame/drivers/calorie.c6
-rw-r--r--src/mame/drivers/canyon.c2
-rw-r--r--src/mame/drivers/capbowl.c4
-rw-r--r--src/mame/drivers/cardline.c2
-rw-r--r--src/mame/drivers/carjmbre.c4
-rw-r--r--src/mame/drivers/carrera.c2
-rw-r--r--src/mame/drivers/cave.c44
-rw-r--r--src/mame/drivers/cbasebal.c4
-rw-r--r--src/mame/drivers/cbuster.c8
-rw-r--r--src/mame/drivers/ccastles.c4
-rw-r--r--src/mame/drivers/cchasm.c8
-rw-r--r--src/mame/drivers/cclimber.c12
-rw-r--r--src/mame/drivers/centiped.c6
-rw-r--r--src/mame/drivers/chaknpop.c4
-rw-r--r--src/mame/drivers/cham24.c4
-rw-r--r--src/mame/drivers/champbas.c22
-rw-r--r--src/mame/drivers/champbwl.c2
-rw-r--r--src/mame/drivers/changela.c4
-rw-r--r--src/mame/drivers/cheekyms.c2
-rw-r--r--src/mame/drivers/cherrym.c2
-rw-r--r--src/mame/drivers/cherrym2.c2
-rw-r--r--src/mame/drivers/chinagat.c12
-rw-r--r--src/mame/drivers/chinsan.c2
-rw-r--r--src/mame/drivers/chqflag.c6
-rw-r--r--src/mame/drivers/cidelsa.c10
-rw-r--r--src/mame/drivers/circus.c16
-rw-r--r--src/mame/drivers/circusc.c6
-rw-r--r--src/mame/drivers/cischeat.c10
-rw-r--r--src/mame/drivers/citycon.c4
-rw-r--r--src/mame/drivers/cliffhgr.c4
-rw-r--r--src/mame/drivers/cloak.c4
-rw-r--r--src/mame/drivers/cloud9.c4
-rw-r--r--src/mame/drivers/clshroad.c4
-rw-r--r--src/mame/drivers/cninja.c36
-rw-r--r--src/mame/drivers/cntsteer.c6
-rw-r--r--src/mame/drivers/coinmstr.c2
-rw-r--r--src/mame/drivers/cojag.c4
-rw-r--r--src/mame/drivers/combatsc.c8
-rw-r--r--src/mame/drivers/commando.c4
-rw-r--r--src/mame/drivers/compgolf.c2
-rw-r--r--src/mame/drivers/contra.c2
-rw-r--r--src/mame/drivers/coolpool.c4
-rw-r--r--src/mame/drivers/cop01.c8
-rw-r--r--src/mame/drivers/cosmic.c12
-rw-r--r--src/mame/drivers/couple.c2
-rw-r--r--src/mame/drivers/cowrace.c4
-rw-r--r--src/mame/drivers/cps1.c12
-rw-r--r--src/mame/drivers/cps2.c2
-rw-r--r--src/mame/drivers/cps3.c2
-rw-r--r--src/mame/drivers/crgolf.c4
-rw-r--r--src/mame/drivers/crimfght.c4
-rw-r--r--src/mame/drivers/crospang.c8
-rw-r--r--src/mame/drivers/crshrace.c2
-rw-r--r--src/mame/drivers/crystal.c2
-rw-r--r--src/mame/drivers/csk.c2
-rw-r--r--src/mame/drivers/cubocd32.c4
-rw-r--r--src/mame/drivers/cultures.c2
-rw-r--r--src/mame/drivers/cvs.c6
-rw-r--r--src/mame/drivers/cyberbal.c6
-rw-r--r--src/mame/drivers/cybertnk.c4
-rw-r--r--src/mame/drivers/dacholer.c8
-rw-r--r--src/mame/drivers/dambustr.c2
-rw-r--r--src/mame/drivers/darius.c42
-rw-r--r--src/mame/drivers/darkhors.c2
-rw-r--r--src/mame/drivers/darkmist.c2
-rw-r--r--src/mame/drivers/darkseal.c8
-rw-r--r--src/mame/drivers/dassault.c8
-rw-r--r--src/mame/drivers/dblewing.c4
-rw-r--r--src/mame/drivers/dbz.c4
-rw-r--r--src/mame/drivers/dcheese.c2
-rw-r--r--src/mame/drivers/dday.c4
-rw-r--r--src/mame/drivers/ddayjlc.c4
-rw-r--r--src/mame/drivers/ddenlovr.c34
-rw-r--r--src/mame/drivers/ddragon.c16
-rw-r--r--src/mame/drivers/ddragon3.c4
-rw-r--r--src/mame/drivers/ddrible.c10
-rw-r--r--src/mame/drivers/ddz.c2
-rw-r--r--src/mame/drivers/dec0.c48
-rw-r--r--src/mame/drivers/dec8.c38
-rw-r--r--src/mame/drivers/deco156.c6
-rw-r--r--src/mame/drivers/deco32.c42
-rw-r--r--src/mame/drivers/deco_mlc.c4
-rw-r--r--src/mame/drivers/decocass.c4
-rw-r--r--src/mame/drivers/deniam.c8
-rw-r--r--src/mame/drivers/dietgo.c4
-rw-r--r--src/mame/drivers/discoboy.c4
-rw-r--r--src/mame/drivers/diverboy.c2
-rw-r--r--src/mame/drivers/djboy.c6
-rw-r--r--src/mame/drivers/djmain.c4
-rw-r--r--src/mame/drivers/dlair.c8
-rw-r--r--src/mame/drivers/docastle.c10
-rw-r--r--src/mame/drivers/dogfgt.c4
-rw-r--r--src/mame/drivers/dominob.c2
-rw-r--r--src/mame/drivers/dooyong.c12
-rw-r--r--src/mame/drivers/dragrace.c2
-rw-r--r--src/mame/drivers/dreamwld.c4
-rw-r--r--src/mame/drivers/drgnmst.c4
-rw-r--r--src/mame/drivers/drmicro.c8
-rw-r--r--src/mame/drivers/drtomy.c2
-rw-r--r--src/mame/drivers/drw80pkr.c2
-rw-r--r--src/mame/drivers/dunhuang.c6
-rw-r--r--src/mame/drivers/dwarfd.c2
-rw-r--r--src/mame/drivers/dynadice.c2
-rw-r--r--src/mame/drivers/dynax.c30
-rw-r--r--src/mame/drivers/egghunt.c2
-rw-r--r--src/mame/drivers/enigma2.c4
-rw-r--r--src/mame/drivers/eolith16.c2
-rw-r--r--src/mame/drivers/epos.c4
-rw-r--r--src/mame/drivers/equites.c10
-rw-r--r--src/mame/drivers/esd16.c4
-rw-r--r--src/mame/drivers/espial.c2
-rw-r--r--src/mame/drivers/ettrivia.c6
-rw-r--r--src/mame/drivers/exedexes.c6
-rw-r--r--src/mame/drivers/exerion.c4
-rw-r--r--src/mame/drivers/expro02.c2
-rw-r--r--src/mame/drivers/exprraid.c4
-rw-r--r--src/mame/drivers/exterm.c4
-rw-r--r--src/mame/drivers/exzisus.c2
-rw-r--r--src/mame/drivers/f-32.c4
-rw-r--r--src/mame/drivers/f1gp.c4
-rw-r--r--src/mame/drivers/fantland.c16
-rw-r--r--src/mame/drivers/fastfred.c4
-rw-r--r--src/mame/drivers/fastlane.c4
-rw-r--r--src/mame/drivers/fcombat.c6
-rw-r--r--src/mame/drivers/fcrash.c12
-rw-r--r--src/mame/drivers/finalizr.c4
-rw-r--r--src/mame/drivers/findout.c2
-rw-r--r--src/mame/drivers/firebeat.c8
-rw-r--r--src/mame/drivers/firetrap.c8
-rw-r--r--src/mame/drivers/firetrk.c2
-rw-r--r--src/mame/drivers/fitfight.c4
-rw-r--r--src/mame/drivers/flkatck.c4
-rw-r--r--src/mame/drivers/flower.c2
-rw-r--r--src/mame/drivers/flstory.c18
-rw-r--r--src/mame/drivers/foodf.c6
-rw-r--r--src/mame/drivers/freekick.c8
-rw-r--r--src/mame/drivers/fromanc2.c6
-rw-r--r--src/mame/drivers/fromance.c12
-rw-r--r--src/mame/drivers/funkybee.c2
-rw-r--r--src/mame/drivers/funkyjet.c4
-rw-r--r--src/mame/drivers/funworld.c2
-rw-r--r--src/mame/drivers/funybubl.c2
-rw-r--r--src/mame/drivers/fuukifg2.c6
-rw-r--r--src/mame/drivers/fuukifg3.c4
-rw-r--r--src/mame/drivers/gaelco.c10
-rw-r--r--src/mame/drivers/gaelco2.c12
-rw-r--r--src/mame/drivers/gaelco3d.c8
-rw-r--r--src/mame/drivers/gaiden.c10
-rw-r--r--src/mame/drivers/galaga.c18
-rw-r--r--src/mame/drivers/galaxian.c34
-rw-r--r--src/mame/drivers/galaxold.c24
-rw-r--r--src/mame/drivers/galivan.c12
-rw-r--r--src/mame/drivers/galpani2.c4
-rw-r--r--src/mame/drivers/galpani3.c2
-rw-r--r--src/mame/drivers/galpanic.c2
-rw-r--r--src/mame/drivers/galspnbl.c4
-rw-r--r--src/mame/drivers/gameplan.c2
-rw-r--r--src/mame/drivers/gaplus.c4
-rw-r--r--src/mame/drivers/gauntlet.c6
-rw-r--r--src/mame/drivers/gberet.c2
-rw-r--r--src/mame/drivers/gbusters.c4
-rw-r--r--src/mame/drivers/gcpinbal.c4
-rw-r--r--src/mame/drivers/genesis.c2
-rw-r--r--src/mame/drivers/getrivia.c2
-rw-r--r--src/mame/drivers/gijoe.c4
-rw-r--r--src/mame/drivers/ginganin.c4
-rw-r--r--src/mame/drivers/gladiatr.c8
-rw-r--r--src/mame/drivers/glass.c2
-rw-r--r--src/mame/drivers/gng.c4
-rw-r--r--src/mame/drivers/goal92.c6
-rw-r--r--src/mame/drivers/goindol.c2
-rw-r--r--src/mame/drivers/goldstar.c12
-rw-r--r--src/mame/drivers/gomoku.c2
-rw-r--r--src/mame/drivers/good.c2
-rw-r--r--src/mame/drivers/gotcha.c4
-rw-r--r--src/mame/drivers/gottlieb.c16
-rw-r--r--src/mame/drivers/gotya.c2
-rw-r--r--src/mame/drivers/gradius3.c4
-rw-r--r--src/mame/drivers/grchamp.c8
-rw-r--r--src/mame/drivers/gridlee.c4
-rw-r--r--src/mame/drivers/gstream.c4
-rw-r--r--src/mame/drivers/gstriker.c4
-rw-r--r--src/mame/drivers/gsword.c12
-rw-r--r--src/mame/drivers/gticlub.c4
-rw-r--r--src/mame/drivers/guab.c2
-rw-r--r--src/mame/drivers/gumbo.c2
-rw-r--r--src/mame/drivers/gundealr.c2
-rw-r--r--src/mame/drivers/gunsmoke.c4
-rw-r--r--src/mame/drivers/gyruss.c12
-rw-r--r--src/mame/drivers/hal21.c6
-rw-r--r--src/mame/drivers/halleys.c8
-rw-r--r--src/mame/drivers/hanaawas.c2
-rw-r--r--src/mame/drivers/hanaroku.c2
-rw-r--r--src/mame/drivers/harddriv.c6
-rw-r--r--src/mame/drivers/hcastle.c6
-rw-r--r--src/mame/drivers/hexa.c2
-rw-r--r--src/mame/drivers/hexion.c4
-rw-r--r--src/mame/drivers/higemaru.c4
-rw-r--r--src/mame/drivers/hikaru.c2
-rw-r--r--src/mame/drivers/hitme.c2
-rw-r--r--src/mame/drivers/hnayayoi.c4
-rw-r--r--src/mame/drivers/holeland.c8
-rw-r--r--src/mame/drivers/homedata.c12
-rw-r--r--src/mame/drivers/homerun.c2
-rw-r--r--src/mame/drivers/hornet.c2
-rw-r--r--src/mame/drivers/hotblock.c2
-rw-r--r--src/mame/drivers/hshavoc.c4
-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/igs_180.c4
-rw-r--r--src/mame/drivers/igs_blit.c8
-rw-r--r--src/mame/drivers/igs_m68.c2
-rw-r--r--src/mame/drivers/ikki.c4
-rw-r--r--src/mame/drivers/imolagp.c2
-rw-r--r--src/mame/drivers/inufuku.c2
-rw-r--r--src/mame/drivers/iqblock.c6
-rw-r--r--src/mame/drivers/irobot.c8
-rw-r--r--src/mame/drivers/ironhors.c4
-rw-r--r--src/mame/drivers/itech32.c2
-rw-r--r--src/mame/drivers/itech8.c8
-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.c2
-rw-r--r--src/mame/drivers/jackal.c2
-rw-r--r--src/mame/drivers/jackpool.c2
-rw-r--r--src/mame/drivers/jailbrek.c4
-rw-r--r--src/mame/drivers/jalmah.c2
-rw-r--r--src/mame/drivers/jchan.c2
-rw-r--r--src/mame/drivers/jcross.c6
-rw-r--r--src/mame/drivers/jollyjgr.c2
-rw-r--r--src/mame/drivers/jongkyo.c2
-rw-r--r--src/mame/drivers/jpmimpct.c2
-rw-r--r--src/mame/drivers/jrpacman.c2
-rw-r--r--src/mame/drivers/junofrst.c10
-rw-r--r--src/mame/drivers/kaneko16.c28
-rw-r--r--src/mame/drivers/kangaroo.c2
-rw-r--r--src/mame/drivers/karnov.c8
-rw-r--r--src/mame/drivers/kchamp.c12
-rw-r--r--src/mame/drivers/kickgoal.c4
-rw-r--r--src/mame/drivers/kingobox.c8
-rw-r--r--src/mame/drivers/kingpin.c2
-rw-r--r--src/mame/drivers/kinstb.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.c2
-rw-r--r--src/mame/drivers/konamigq.c4
-rw-r--r--src/mame/drivers/konamigv.c4
-rw-r--r--src/mame/drivers/konamigx.c4
-rw-r--r--src/mame/drivers/ksayakyu.c6
-rw-r--r--src/mame/drivers/ksys573.c4
-rw-r--r--src/mame/drivers/kyugo.c4
-rw-r--r--src/mame/drivers/labyrunr.c4
-rw-r--r--src/mame/drivers/ladybug.c14
-rw-r--r--src/mame/drivers/ladyfrog.c4
-rw-r--r--src/mame/drivers/laserbat.c10
-rw-r--r--src/mame/drivers/lasso.c10
-rw-r--r--src/mame/drivers/lastduel.c10
-rw-r--r--src/mame/drivers/lazercmd.c6
-rw-r--r--src/mame/drivers/legionna.c4
-rw-r--r--src/mame/drivers/leland.c6
-rw-r--r--src/mame/drivers/lemmings.c4
-rw-r--r--src/mame/drivers/lethal.c2
-rw-r--r--src/mame/drivers/lethalj.c6
-rw-r--r--src/mame/drivers/liberate.c8
-rw-r--r--src/mame/drivers/liberatr.c4
-rw-r--r--src/mame/drivers/limenko.c2
-rw-r--r--src/mame/drivers/lkage.c8
-rw-r--r--src/mame/drivers/lockon.c14
-rw-r--r--src/mame/drivers/looping.c6
-rw-r--r--src/mame/drivers/lordgun.c6
-rw-r--r--src/mame/drivers/lsasquad.c8
-rw-r--r--src/mame/drivers/ltcasino.c2
-rw-r--r--src/mame/drivers/lucky74.c2
-rw-r--r--src/mame/drivers/lucky8.c2
-rw-r--r--src/mame/drivers/lvcards.c2
-rw-r--r--src/mame/drivers/lwings.c6
-rw-r--r--src/mame/drivers/m10.c4
-rw-r--r--src/mame/drivers/m107.c4
-rw-r--r--src/mame/drivers/m63.c8
-rw-r--r--src/mame/drivers/m72.c46
-rw-r--r--src/mame/drivers/m90.c16
-rw-r--r--src/mame/drivers/m92.c4
-rw-r--r--src/mame/drivers/macrossp.c2
-rw-r--r--src/mame/drivers/macs.c2
-rw-r--r--src/mame/drivers/madalien.c2
-rw-r--r--src/mame/drivers/madmotor.c8
-rw-r--r--src/mame/drivers/magic10.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.c4
-rw-r--r--src/mame/drivers/mappy.c8
-rw-r--r--src/mame/drivers/marineb.c4
-rw-r--r--src/mame/drivers/markham.c4
-rw-r--r--src/mame/drivers/marvins.c12
-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/mayumi.c2
-rw-r--r--src/mame/drivers/mazerbla.c4
-rw-r--r--src/mame/drivers/mcatadv.c2
-rw-r--r--src/mame/drivers/mcr.c2
-rw-r--r--src/mame/drivers/meadows.c6
-rw-r--r--src/mame/drivers/mediagx.c4
-rw-r--r--src/mame/drivers/megadriv.c8
-rw-r--r--src/mame/drivers/megaplay.c2
-rw-r--r--src/mame/drivers/megasys1.c10
-rw-r--r--src/mame/drivers/megatech.c2
-rw-r--r--src/mame/drivers/megazone.c10
-rw-r--r--src/mame/drivers/meijinsn.c2
-rw-r--r--src/mame/drivers/merit.c2
-rw-r--r--src/mame/drivers/meritm.c2
-rw-r--r--src/mame/drivers/mermaid.c4
-rw-r--r--src/mame/drivers/metlclsh.c4
-rw-r--r--src/mame/drivers/metro.c78
-rw-r--r--src/mame/drivers/mexico86.c2
-rw-r--r--src/mame/drivers/mhavoc.c10
-rw-r--r--src/mame/drivers/micro3d.c8
-rw-r--r--src/mame/drivers/midas.c2
-rw-r--r--src/mame/drivers/midyunit.c2
-rw-r--r--src/mame/drivers/mikie.c4
-rw-r--r--src/mame/drivers/mirage.c4
-rw-r--r--src/mame/drivers/mirax.c4
-rw-r--r--src/mame/drivers/missb2.c4
-rw-r--r--src/mame/drivers/missile.c2
-rw-r--r--src/mame/drivers/mitchell.c14
-rw-r--r--src/mame/drivers/mjkjidai.c6
-rw-r--r--src/mame/drivers/mjsister.c4
-rw-r--r--src/mame/drivers/mjsiyoub.c4
-rw-r--r--src/mame/drivers/mlanding.c4
-rw-r--r--src/mame/drivers/model1.c12
-rw-r--r--src/mame/drivers/model2.c12
-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.c6
-rw-r--r--src/mame/drivers/mosaic.c2
-rw-r--r--src/mame/drivers/mouser.c4
-rw-r--r--src/mame/drivers/mpu4.c2
-rw-r--r--src/mame/drivers/mpu4drvr.c6
-rw-r--r--src/mame/drivers/mquake.c4
-rw-r--r--src/mame/drivers/mrdo.c4
-rw-r--r--src/mame/drivers/mrflea.c6
-rw-r--r--src/mame/drivers/mrjong.c4
-rw-r--r--src/mame/drivers/ms32.c2
-rw-r--r--src/mame/drivers/msisaac.c6
-rw-r--r--src/mame/drivers/mugsmash.c4
-rw-r--r--src/mame/drivers/multigam.c4
-rw-r--r--src/mame/drivers/munchmo.c4
-rw-r--r--src/mame/drivers/mustache.c2
-rw-r--r--src/mame/drivers/mwarr.c4
-rw-r--r--src/mame/drivers/mystston.c4
-rw-r--r--src/mame/drivers/mystwarr.c4
-rw-r--r--src/mame/drivers/namcona1.c4
-rw-r--r--src/mame/drivers/namcond1.c2
-rw-r--r--src/mame/drivers/namcos1.c6
-rw-r--r--src/mame/drivers/namcos12.c2
-rw-r--r--src/mame/drivers/namcos2.c24
-rw-r--r--src/mame/drivers/namcos21.c16
-rw-r--r--src/mame/drivers/namcos22.c4
-rw-r--r--src/mame/drivers/namcos23.c4
-rw-r--r--src/mame/drivers/namcos86.c10
-rw-r--r--src/mame/drivers/naomi.c2
-rw-r--r--src/mame/drivers/naughtyb.c8
-rw-r--r--src/mame/drivers/nbmj8688.c8
-rw-r--r--src/mame/drivers/nbmj8891.c4
-rw-r--r--src/mame/drivers/nbmj8991.c10
-rw-r--r--src/mame/drivers/nbmj9195.c6
-rw-r--r--src/mame/drivers/nemesis.c58
-rw-r--r--src/mame/drivers/neogeo.c2
-rw-r--r--src/mame/drivers/news.c2
-rw-r--r--src/mame/drivers/ninjakd2.c6
-rw-r--r--src/mame/drivers/ninjaw.c24
-rw-r--r--src/mame/drivers/nitedrvr.c2
-rw-r--r--src/mame/drivers/niyanpai.c6
-rw-r--r--src/mame/drivers/nmg5.c4
-rw-r--r--src/mame/drivers/nmk16.c102
-rw-r--r--src/mame/drivers/nova2001.c16
-rw-r--r--src/mame/drivers/nss.c2
-rw-r--r--src/mame/drivers/nwk-tr.c2
-rw-r--r--src/mame/drivers/nycaptor.c18
-rw-r--r--src/mame/drivers/nyny.c8
-rw-r--r--src/mame/drivers/ohmygod.c2
-rw-r--r--src/mame/drivers/ojankohs.c16
-rw-r--r--src/mame/drivers/olibochu.c2
-rw-r--r--src/mame/drivers/omegrace.c4
-rw-r--r--src/mame/drivers/oneshot.c4
-rw-r--r--src/mame/drivers/onetwo.c4
-rw-r--r--src/mame/drivers/opwolf.c12
-rw-r--r--src/mame/drivers/orbit.c2
-rw-r--r--src/mame/drivers/othldrby.c2
-rw-r--r--src/mame/drivers/othunder.c14
-rw-r--r--src/mame/drivers/overdriv.c6
-rw-r--r--src/mame/drivers/pacland.c2
-rw-r--r--src/mame/drivers/pacman.c4
-rw-r--r--src/mame/drivers/pandoras.c4
-rw-r--r--src/mame/drivers/panicr.c2
-rw-r--r--src/mame/drivers/paradise.c4
-rw-r--r--src/mame/drivers/paranoia.c2
-rw-r--r--src/mame/drivers/parodius.c4
-rw-r--r--src/mame/drivers/pasha2.c4
-rw-r--r--src/mame/drivers/pass.c4
-rw-r--r--src/mame/drivers/pastelg.c4
-rw-r--r--src/mame/drivers/pbaction.c6
-rw-r--r--src/mame/drivers/pcktgal.c6
-rw-r--r--src/mame/drivers/pengo.c2
-rw-r--r--src/mame/drivers/peplus.c2
-rw-r--r--src/mame/drivers/pgm.c2
-rw-r--r--src/mame/drivers/phoenix.c8
-rw-r--r--src/mame/drivers/pingpong.c2
-rw-r--r--src/mame/drivers/pipedrm.c4
-rw-r--r--src/mame/drivers/pipeline.c2
-rw-r--r--src/mame/drivers/pirates.c2
-rw-r--r--src/mame/drivers/pitnrun.c4
-rw-r--r--src/mame/drivers/pkscram.c2
-rw-r--r--src/mame/drivers/pktgaldx.c4
-rw-r--r--src/mame/drivers/playch10.c4
-rw-r--r--src/mame/drivers/playmark.c10
-rw-r--r--src/mame/drivers/plygonet.c4
-rw-r--r--src/mame/drivers/pokechmp.c6
-rw-r--r--src/mame/drivers/polepos.c8
-rw-r--r--src/mame/drivers/policetr.c2
-rw-r--r--src/mame/drivers/polyplay.c2
-rw-r--r--src/mame/drivers/poolshrk.c2
-rw-r--r--src/mame/drivers/popeye.c2
-rw-r--r--src/mame/drivers/popper.c4
-rw-r--r--src/mame/drivers/portrait.c2
-rw-r--r--src/mame/drivers/powerbal.c4
-rw-r--r--src/mame/drivers/powerins.c6
-rw-r--r--src/mame/drivers/ppmast93.c4
-rw-r--r--src/mame/drivers/prehisle.c4
-rw-r--r--src/mame/drivers/progolf.c4
-rw-r--r--src/mame/drivers/psikyo.c6
-rw-r--r--src/mame/drivers/psikyo4.c2
-rw-r--r--src/mame/drivers/psikyosh.c2
-rw-r--r--src/mame/drivers/psychic5.c4
-rw-r--r--src/mame/drivers/pturn.c4
-rw-r--r--src/mame/drivers/puckpkmn.c6
-rw-r--r--src/mame/drivers/punchout.c4
-rw-r--r--src/mame/drivers/pushman.c8
-rw-r--r--src/mame/drivers/qdrmfgp.c4
-rw-r--r--src/mame/drivers/quantum.c4
-rw-r--r--src/mame/drivers/quasar.c2
-rw-r--r--src/mame/drivers/quizdna.c4
-rw-r--r--src/mame/drivers/quizo.c2
-rw-r--r--src/mame/drivers/quizpani.c2
-rw-r--r--src/mame/drivers/r2dtank.c4
-rw-r--r--src/mame/drivers/raiden2.c2
-rw-r--r--src/mame/drivers/rainbow.c6
-rw-r--r--src/mame/drivers/rallyx.c4
-rw-r--r--src/mame/drivers/rampart.c4
-rw-r--r--src/mame/drivers/rastan.c4
-rw-r--r--src/mame/drivers/rbmk.c2
-rw-r--r--src/mame/drivers/rcasino.c2
-rw-r--r--src/mame/drivers/realbrk.c4
-rw-r--r--src/mame/drivers/relief.c4
-rw-r--r--src/mame/drivers/renegade.c4
-rw-r--r--src/mame/drivers/retofinv.c4
-rw-r--r--src/mame/drivers/rmhaihai.c4
-rw-r--r--src/mame/drivers/rockola.c18
-rw-r--r--src/mame/drivers/rockrage.c4
-rw-r--r--src/mame/drivers/rohga.c24
-rw-r--r--src/mame/drivers/rollerg.c4
-rw-r--r--src/mame/drivers/rollrace.c6
-rw-r--r--src/mame/drivers/route16.c6
-rw-r--r--src/mame/drivers/royalmah.c2
-rw-r--r--src/mame/drivers/rpunch.c4
-rw-r--r--src/mame/drivers/runaway.c4
-rw-r--r--src/mame/drivers/rungun.c4
-rw-r--r--src/mame/drivers/sandscrp.c4
-rw-r--r--src/mame/drivers/sangho.c4
-rw-r--r--src/mame/drivers/sauro.c4
-rw-r--r--src/mame/drivers/sbasketb.c6
-rw-r--r--src/mame/drivers/sbowling.c2
-rw-r--r--src/mame/drivers/sbrkout.c2
-rw-r--r--src/mame/drivers/sbugger.c4
-rw-r--r--src/mame/drivers/scobra.c6
-rw-r--r--src/mame/drivers/scotrsht.c2
-rw-r--r--src/mame/drivers/scramble.c18
-rw-r--r--src/mame/drivers/scregg.c8
-rw-r--r--src/mame/drivers/sderby.c4
-rw-r--r--src/mame/drivers/segac2.c6
-rw-r--r--src/mame/drivers/segae.c4
-rw-r--r--src/mame/drivers/segag80r.c4
-rw-r--r--src/mame/drivers/segag80v.c8
-rw-r--r--src/mame/drivers/segahang.c14
-rw-r--r--src/mame/drivers/segaorun.c4
-rw-r--r--src/mame/drivers/segas16a.c4
-rw-r--r--src/mame/drivers/segas16b.c4
-rw-r--r--src/mame/drivers/segas18.c6
-rw-r--r--src/mame/drivers/segas24.c4
-rw-r--r--src/mame/drivers/segas32.c10
-rw-r--r--src/mame/drivers/segaxbd.c4
-rw-r--r--src/mame/drivers/segaybd.c4
-rw-r--r--src/mame/drivers/seibuspi.c6
-rw-r--r--src/mame/drivers/seicross.c4
-rw-r--r--src/mame/drivers/senjyo.c8
-rw-r--r--src/mame/drivers/seta.c78
-rw-r--r--src/mame/drivers/seta2.c2
-rw-r--r--src/mame/drivers/sf.c6
-rw-r--r--src/mame/drivers/sg1000a.c2
-rw-r--r--src/mame/drivers/sgladiat.c4
-rw-r--r--src/mame/drivers/shadfrce.c4
-rw-r--r--src/mame/drivers/shangha3.c12
-rw-r--r--src/mame/drivers/shanghai.c4
-rw-r--r--src/mame/drivers/shangkid.c6
-rw-r--r--src/mame/drivers/shaolins.c4
-rw-r--r--src/mame/drivers/shisen.c4
-rw-r--r--src/mame/drivers/shootout.c4
-rw-r--r--src/mame/drivers/shougi.c2
-rw-r--r--src/mame/drivers/shuuz.c2
-rw-r--r--src/mame/drivers/sidearms.c10
-rw-r--r--src/mame/drivers/sidepckt.c8
-rw-r--r--src/mame/drivers/silkroad.c6
-rw-r--r--src/mame/drivers/simpl156.c6
-rw-r--r--src/mame/drivers/simpsons.c4
-rw-r--r--src/mame/drivers/skyarmy.c2
-rw-r--r--src/mame/drivers/skydiver.c2
-rw-r--r--src/mame/drivers/skyfox.c4
-rw-r--r--src/mame/drivers/skykid.c2
-rw-r--r--src/mame/drivers/skylncr.c2
-rw-r--r--src/mame/drivers/slapfght.c16
-rw-r--r--src/mame/drivers/slapshot.c4
-rw-r--r--src/mame/drivers/sliver.c2
-rw-r--r--src/mame/drivers/smstrv.c2
-rw-r--r--src/mame/drivers/snk.c40
-rw-r--r--src/mame/drivers/snk68.c4
-rw-r--r--src/mame/drivers/snookr10.c2
-rw-r--r--src/mame/drivers/snowbros.c12
-rw-r--r--src/mame/drivers/solomon.c6
-rw-r--r--src/mame/drivers/sonson.c4
-rw-r--r--src/mame/drivers/spaceg.c8
-rw-r--r--src/mame/drivers/spbactn.c4
-rw-r--r--src/mame/drivers/spcforce.c6
-rw-r--r--src/mame/drivers/spdodgeb.c6
-rw-r--r--src/mame/drivers/speedatk.c2
-rw-r--r--src/mame/drivers/speedbal.c2
-rw-r--r--src/mame/drivers/speedspn.c2
-rw-r--r--src/mame/drivers/speglsht.c2
-rw-r--r--src/mame/drivers/splash.c10
-rw-r--r--src/mame/drivers/sprcros2.c6
-rw-r--r--src/mame/drivers/sprint2.c2
-rw-r--r--src/mame/drivers/sprint4.c2
-rw-r--r--src/mame/drivers/spy.c6
-rw-r--r--src/mame/drivers/srmp2.c12
-rw-r--r--src/mame/drivers/srmp5.c2
-rw-r--r--src/mame/drivers/srmp6.c2
-rw-r--r--src/mame/drivers/srumbler.c4
-rw-r--r--src/mame/drivers/sshangha.c4
-rw-r--r--src/mame/drivers/ssingles.c4
-rw-r--r--src/mame/drivers/sslam.c4
-rw-r--r--src/mame/drivers/ssozumo.c6
-rw-r--r--src/mame/drivers/ssrj.c2
-rw-r--r--src/mame/drivers/ssv.c2
-rw-r--r--src/mame/drivers/st0016.c2
-rw-r--r--src/mame/drivers/stadhero.c6
-rw-r--r--src/mame/drivers/starcrus.c2
-rw-r--r--src/mame/drivers/starwars.c10
-rw-r--r--src/mame/drivers/statriv2.c2
-rw-r--r--src/mame/drivers/stfight.c6
-rw-r--r--src/mame/drivers/stlforce.c2
-rw-r--r--src/mame/drivers/strnskil.c4
-rw-r--r--src/mame/drivers/stv.c2
-rw-r--r--src/mame/drivers/subs.c2
-rw-r--r--src/mame/drivers/subsino.c8
-rw-r--r--src/mame/drivers/suna16.c34
-rw-r--r--src/mame/drivers/suna8.c34
-rw-r--r--src/mame/drivers/supbtime.c8
-rw-r--r--src/mame/drivers/supdrapo.c2
-rw-r--r--src/mame/drivers/superdq.c4
-rw-r--r--src/mame/drivers/superqix.c16
-rw-r--r--src/mame/drivers/supertnk.c2
-rw-r--r--src/mame/drivers/suprgolf.c2
-rw-r--r--src/mame/drivers/suprloco.c4
-rw-r--r--src/mame/drivers/suprnova.c2
-rw-r--r--src/mame/drivers/suprridr.c4
-rw-r--r--src/mame/drivers/suprslam.c2
-rw-r--r--src/mame/drivers/surpratk.c2
-rw-r--r--src/mame/drivers/system1.c4
-rw-r--r--src/mame/drivers/system16.c6
-rw-r--r--src/mame/drivers/system18.c8
-rw-r--r--src/mame/drivers/tagteam.c6
-rw-r--r--src/mame/drivers/tail2nos.c2
-rw-r--r--src/mame/drivers/taito_b.c40
-rw-r--r--src/mame/drivers/taito_f2.c8
-rw-r--r--src/mame/drivers/taito_f3.c2
-rw-r--r--src/mame/drivers/taito_h.c6
-rw-r--r--src/mame/drivers/taito_l.c10
-rw-r--r--src/mame/drivers/taito_x.c8
-rw-r--r--src/mame/drivers/taito_z.c104
-rw-r--r--src/mame/drivers/taitoair.c2
-rw-r--r--src/mame/drivers/taitosj.c10
-rw-r--r--src/mame/drivers/tank8.c2
-rw-r--r--src/mame/drivers/tankbatt.c2
-rw-r--r--src/mame/drivers/tankbust.c4
-rw-r--r--src/mame/drivers/taotaido.c2
-rw-r--r--src/mame/drivers/targeth.c2
-rw-r--r--src/mame/drivers/tatsumi.c16
-rw-r--r--src/mame/drivers/taxidrvr.c4
-rw-r--r--src/mame/drivers/tbowl.c8
-rw-r--r--src/mame/drivers/tceptor.c6
-rw-r--r--src/mame/drivers/tcl.c2
-rw-r--r--src/mame/drivers/tecmo.c4
-rw-r--r--src/mame/drivers/tecmo16.c8
-rw-r--r--src/mame/drivers/tecmosys.c6
-rw-r--r--src/mame/drivers/tehkanwc.c6
-rw-r--r--src/mame/drivers/tempest.c4
-rw-r--r--src/mame/drivers/terracre.c20
-rw-r--r--src/mame/drivers/tetrisp2.c10
-rw-r--r--src/mame/drivers/thedeep.c2
-rw-r--r--src/mame/drivers/thepit.c4
-rw-r--r--src/mame/drivers/thief.c18
-rw-r--r--src/mame/drivers/thoop2.c2
-rw-r--r--src/mame/drivers/thunderx.c6
-rw-r--r--src/mame/drivers/tiamc1.c2
-rw-r--r--src/mame/drivers/tickee.c4
-rw-r--r--src/mame/drivers/tigeroad.c6
-rw-r--r--src/mame/drivers/timelimt.c4
-rw-r--r--src/mame/drivers/tmaster.c4
-rw-r--r--src/mame/drivers/tmnt.c44
-rw-r--r--src/mame/drivers/tnzs.c18
-rw-r--r--src/mame/drivers/toaplan1.c16
-rw-r--r--src/mame/drivers/toaplan2.c62
-rw-r--r--src/mame/drivers/toki.c4
-rw-r--r--src/mame/drivers/topshoot.c4
-rw-r--r--src/mame/drivers/topspeed.c4
-rw-r--r--src/mame/drivers/toratora.c4
-rw-r--r--src/mame/drivers/tourtabl.c2
-rw-r--r--src/mame/drivers/toypop.c2
-rw-r--r--src/mame/drivers/tp84.c12
-rw-r--r--src/mame/drivers/trackfld.c12
-rw-r--r--src/mame/drivers/triplhnt.c4
-rw-r--r--src/mame/drivers/truco.c2
-rw-r--r--src/mame/drivers/trucocl.c2
-rw-r--r--src/mame/drivers/trvmadns.c2
-rw-r--r--src/mame/drivers/trvquest.c4
-rw-r--r--src/mame/drivers/tryout.c2
-rw-r--r--src/mame/drivers/tsamurai.c16
-rw-r--r--src/mame/drivers/tubep.c14
-rw-r--r--src/mame/drivers/tugboat.c2
-rw-r--r--src/mame/drivers/tumbleb.c22
-rw-r--r--src/mame/drivers/tumblep.c4
-rw-r--r--src/mame/drivers/tunhunt.c4
-rw-r--r--src/mame/drivers/twin16.c12
-rw-r--r--src/mame/drivers/twincobr.c2
-rw-r--r--src/mame/drivers/twins.c4
-rw-r--r--src/mame/drivers/tx1.c16
-rw-r--r--src/mame/drivers/uapce.c2
-rw-r--r--src/mame/drivers/ultraman.c4
-rw-r--r--src/mame/drivers/ultratnk.c2
-rw-r--r--src/mame/drivers/ultrsprt.c2
-rw-r--r--src/mame/drivers/unico.c14
-rw-r--r--src/mame/drivers/upscope.c2
-rw-r--r--src/mame/drivers/usgames.c2
-rw-r--r--src/mame/drivers/vamphalf.c4
-rw-r--r--src/mame/drivers/vaportra.c8
-rw-r--r--src/mame/drivers/vastar.c2
-rw-r--r--src/mame/drivers/vball.c8
-rw-r--r--src/mame/drivers/vendetta.c4
-rw-r--r--src/mame/drivers/videopin.c2
-rw-r--r--src/mame/drivers/vigilant.c14
-rw-r--r--src/mame/drivers/vmetal.c4
-rw-r--r--src/mame/drivers/volfied.c2
-rw-r--r--src/mame/drivers/vroulet.c2
-rw-r--r--src/mame/drivers/vsnes.c12
-rw-r--r--src/mame/drivers/vulgus.c4
-rw-r--r--src/mame/drivers/wallc.c2
-rw-r--r--src/mame/drivers/wardner.c2
-rw-r--r--src/mame/drivers/warpwarp.c4
-rw-r--r--src/mame/drivers/warriorb.c20
-rw-r--r--src/mame/drivers/wc90.c2
-rw-r--r--src/mame/drivers/wc90b.c4
-rw-r--r--src/mame/drivers/wecleman.c10
-rw-r--r--src/mame/drivers/welltris.c2
-rw-r--r--src/mame/drivers/wgp.c2
-rw-r--r--src/mame/drivers/williams.c8
-rw-r--r--src/mame/drivers/wink.c2
-rw-r--r--src/mame/drivers/wiping.c2
-rw-r--r--src/mame/drivers/witch.c6
-rw-r--r--src/mame/drivers/wiz.c8
-rw-r--r--src/mame/drivers/wldarrow.c2
-rw-r--r--src/mame/drivers/wolfpack.c2
-rw-r--r--src/mame/drivers/wrally.c2
-rw-r--r--src/mame/drivers/wwfsstar.c4
-rw-r--r--src/mame/drivers/wwfwfest.c4
-rw-r--r--src/mame/drivers/xain.c4
-rw-r--r--src/mame/drivers/xexex.c12
-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/xyonix.c4
-rw-r--r--src/mame/drivers/yiear.c4
-rw-r--r--src/mame/drivers/yumefuda.c2
-rw-r--r--src/mame/drivers/yunsun16.c6
-rw-r--r--src/mame/drivers/yunsung8.c4
-rw-r--r--src/mame/drivers/zaccaria.c10
-rw-r--r--src/mame/drivers/zaxxon.c4
-rw-r--r--src/mame/drivers/zerozone.c2
-rw-r--r--src/mame/drivers/zn.c18
-rw-r--r--src/mame/drivers/zodiack.c2
-rw-r--r--src/mame/drivers/zr107.c8
841 files changed, 2895 insertions, 2908 deletions
diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h
index ddc1591007b..b8172a8f648 100644
--- a/src/emu/mconfig.h
+++ b/src/emu/mconfig.h
@@ -396,13 +396,10 @@ union _machine_config_token
/* add/remove/replace sounds */
-#define MDRV_SOUND_ADD_TAG(_tag, _type, _clock) \
+#define MDRV_SOUND_ADD(_tag, _type, _clock) \
TOKEN_UINT64_PACK3(MCONFIG_TOKEN_SOUND_ADD, 8, SOUND_##_type, 24, _clock, 32), \
TOKEN_STRING(_tag),
-#define MDRV_SOUND_ADD(_type, _clock) \
- MDRV_SOUND_ADD_TAG(NULL, _type, _clock)
-
#define MDRV_SOUND_REMOVE(_tag) \
TOKEN_UINT32_PACK1(MCONFIG_TOKEN_SOUND_REMOVE, 8), \
TOKEN_STRING(_tag),
diff --git a/src/emu/sound/flt_rc.h b/src/emu/sound/flt_rc.h
index c8b16324df8..b8e90ff15f6 100644
--- a/src/emu/sound/flt_rc.h
+++ b/src/emu/sound/flt_rc.h
@@ -33,7 +33,7 @@
* Same as FLT_RC_HIGHPASS, but with standard frequency of 16 HZ
* This filter may be setup just with
*
- * MDRV_SOUND_ADD(FILTER_RC, 0)
+ * MDRV_SOUND_ADD("tag", FILTER_RC, 0)
* MDRV_SOUND_CONFIG(&flt_rc_ac_default)
*
* Default behaviour:
diff --git a/src/mame/audio/astrof.c b/src/mame/audio/astrof.c
index f58846c3e13..a19276afb46 100644
--- a/src/mame/audio/astrof.c
+++ b/src/mame/audio/astrof.c
@@ -184,7 +184,7 @@ static const struct Samplesinterface astrof_samples_interface =
MACHINE_DRIVER_START( astrof_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("samples", SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(astrof_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -267,7 +267,7 @@ static const struct SN76477interface tomahawk_sn76477_interface =
MACHINE_DRIVER_START( tomahawk_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn", SN76477, 0)
MDRV_SOUND_CONFIG(tomahawk_sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index 0fcd6151d43..820b1cfa589 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -803,7 +803,7 @@ MACHINE_DRIVER_START( jsa_i_stereo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("ym", YM2151, JSA_MASTER_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
@@ -831,7 +831,7 @@ MACHINE_DRIVER_START( jsa_i_stereo_pokey )
MDRV_IMPORT_FROM(jsa_i_stereo)
/* sound hardware */
- MDRV_SOUND_ADD(POKEY, JSA_MASTER_CLOCK/2)
+ MDRV_SOUND_ADD("pokey", POKEY, JSA_MASTER_CLOCK/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
@@ -848,12 +848,12 @@ MACHINE_DRIVER_START( jsa_i_mono_speech )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("ym", YM2151, JSA_MASTER_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD(TMS5220, JSA_MASTER_CLOCK*2/11) /* potentially JSA_MASTER_CLOCK/9 as well */
+ MDRV_SOUND_ADD("tms", TMS5220, JSA_MASTER_CLOCK*2/11) /* potentially JSA_MASTER_CLOCK/9 as well */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -869,12 +869,12 @@ MACHINE_DRIVER_START( jsa_ii_mono )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("ym", YM2151, JSA_MASTER_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD_TAG("adpcm", OKIM6295, JSA_MASTER_CLOCK/3)
+ MDRV_SOUND_ADD("adpcm", OKIM6295, JSA_MASTER_CLOCK/3)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
@@ -912,16 +912,16 @@ MACHINE_DRIVER_START( jsa_iiis_stereo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("ym", YM2151, JSA_MASTER_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
- MDRV_SOUND_ADD(OKIM6295, JSA_MASTER_CLOCK/3)
+ MDRV_SOUND_ADD("oki1", OKIM6295, JSA_MASTER_CLOCK/3)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75)
- MDRV_SOUND_ADD(OKIM6295, JSA_MASTER_CLOCK/3)
+ MDRV_SOUND_ADD("oki2", OKIM6295, JSA_MASTER_CLOCK/3)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c
index 681a22bca9d..468fecb6e96 100644
--- a/src/mame/audio/cage.c
+++ b/src/mame/audio/cage.c
@@ -651,22 +651,22 @@ MACHINE_DRIVER_START( cage )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
#if (DAC_BUFFER_CHANNELS == 4)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac1", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac2", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac3", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac4", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
#else
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac1", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac2", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
#endif
MACHINE_DRIVER_END
diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c
index 7902ad599fc..4da940e41c3 100644
--- a/src/mame/audio/carnival.c
+++ b/src/mame/audio/carnival.c
@@ -296,16 +296,16 @@ ADDRESS_MAP_END
MACHINE_DRIVER_START( carnival_audio )
- MDRV_CPU_ADD(I8039, 3579545)
+ MDRV_CPU_ADD_TAG("audio", I8039, 3579545)
MDRV_CPU_PROGRAM_MAP(carnival_audio_map,0)
MDRV_CPU_IO_MAP(carnival_audio_io_map,0)
MDRV_INTERLEAVE(10)
- MDRV_SOUND_ADD(AY8910, PSG_CLOCK)
+ MDRV_SOUND_ADD("psg", AY8910, PSG_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(carnival_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index 7734ea9d538..55ca1ae8703 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -206,7 +206,7 @@ MACHINE_DRIVER_START( spacewar_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(spacewar_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -259,7 +259,7 @@ MACHINE_DRIVER_START( barrier_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(barrier_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -317,7 +317,7 @@ MACHINE_DRIVER_START( speedfrk_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(speedfrk_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -391,7 +391,7 @@ MACHINE_DRIVER_START( starhawk_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(starhawk_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -459,7 +459,7 @@ MACHINE_DRIVER_START( sundance_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(sundance_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -546,7 +546,7 @@ MACHINE_DRIVER_START( tailg_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(tailg_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -613,7 +613,7 @@ MACHINE_DRIVER_START( warrior_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(warrior_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -706,7 +706,7 @@ MACHINE_DRIVER_START( armora_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(armora_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -796,7 +796,7 @@ MACHINE_DRIVER_START( ripoff_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(ripoff_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -908,7 +908,7 @@ MACHINE_DRIVER_START( starcas_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(starcas_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
@@ -1043,7 +1043,7 @@ MACHINE_DRIVER_START( solarq_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(solarq_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
@@ -1176,7 +1176,7 @@ MACHINE_DRIVER_START( boxingb_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(boxingb_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1288,7 +1288,7 @@ MACHINE_DRIVER_START( wotw_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(wotw_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1400,7 +1400,7 @@ MACHINE_DRIVER_START( wotwc_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(wotwc_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1558,8 +1558,7 @@ static const struct z80_irq_daisy_chain daisy_chain[] =
MACHINE_DRIVER_START( demon_sound )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3579545)
- /* audio CPU */
+ MDRV_CPU_ADD_TAG("audio", Z80, 3579545)
MDRV_CPU_CONFIG(daisy_chain)
MDRV_CPU_PROGRAM_MAP(demon_sound_map,0)
MDRV_CPU_IO_MAP(demon_sound_ports,0)
@@ -1569,14 +1568,14 @@ MACHINE_DRIVER_START( demon_sound )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 3579545)
+ MDRV_SOUND_ADD("ay1", AY8910, 3579545)
MDRV_SOUND_CONFIG(demon_ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 3579545)
+ MDRV_SOUND_ADD("ay2", AY8910, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 3579545)
+ MDRV_SOUND_ADD("ay3", AY8910, 3579545)
MDRV_SOUND_CONFIG(demon_ay8910_interface_3)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/crbaloon.c b/src/mame/audio/crbaloon.c
index 8b9d54a91d7..bd25e45f131 100644
--- a/src/mame/audio/crbaloon.c
+++ b/src/mame/audio/crbaloon.c
@@ -169,11 +169,11 @@ MACHINE_DRIVER_START( crbaloon_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn", SN76477, 0)
MDRV_SOUND_CONFIG(sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(crbaloon)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index c188fe3c334..655d3005e04 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -596,7 +596,7 @@ MACHINE_DRIVER_START( dcs_audio_2k )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -634,10 +634,10 @@ MACHINE_DRIVER_START( dcs2_audio_2115 )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac1", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac2", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MACHINE_DRIVER_END
@@ -665,10 +665,10 @@ MACHINE_DRIVER_START( dcs2_audio_dsio )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac1", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac2", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MACHINE_DRIVER_END
@@ -688,22 +688,22 @@ MACHINE_DRIVER_START( dcs2_audio_denver )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac1", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac2", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac3", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac4", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac5", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac6", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/depthch.c b/src/mame/audio/depthch.c
index 75ea5ead7f0..e5f4f61952b 100644
--- a/src/mame/audio/depthch.c
+++ b/src/mame/audio/depthch.c
@@ -37,7 +37,7 @@ static const struct Samplesinterface depthch_samples_interface =
MACHINE_DRIVER_START( depthch_audio )
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(depthch_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index a51ce98d20c..b0a8b48ca52 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -1313,7 +1313,7 @@ MACHINE_DRIVER_START( dkong2b_audio )
MDRV_SOUND_RESET(dkong)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(dkong2b)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1335,7 +1335,7 @@ MACHINE_DRIVER_START( radarsc1_audio )
MDRV_CPU_MODIFY("sound")
MDRV_CPU_IO_MAP(radarsc1_sound_io_map, 0)
- MDRV_SOUND_ADD(M58817, XTAL_640kHz)
+ MDRV_SOUND_ADD("tms", M58817, XTAL_640kHz)
MDRV_SOUND_CONFIG(tms5110_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1352,7 +1352,7 @@ MACHINE_DRIVER_START( dkongjr_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(dkongjr)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1369,11 +1369,11 @@ MACHINE_DRIVER_START( dkong3_audio )
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NES, N2A03_DEFAULTCLOCK)
+ MDRV_SOUND_ADD("nes1", NES, N2A03_DEFAULTCLOCK)
MDRV_SOUND_CONFIG(nes_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(NES, N2A03_DEFAULTCLOCK)
+ MDRV_SOUND_ADD("nes2", NES, N2A03_DEFAULTCLOCK)
MDRV_SOUND_CONFIG(nes_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index ba3ae99373a..d21804c4bbb 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -835,12 +835,12 @@ ADDRESS_MAP_END
MACHINE_DRIVER_START( venture_audio )
- MDRV_CPU_ADD(M6502, 3579545/4)
+ MDRV_CPU_ADD_TAG("audio", M6502, 3579545/4)
MDRV_CPU_PROGRAM_MAP(venture_audio_map,0)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("custom", CUSTOM, 0)
MDRV_SOUND_CONFIG(venture_custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -895,12 +895,12 @@ ADDRESS_MAP_END
MACHINE_DRIVER_START( mtrap_cvsd_audio )
- MDRV_CPU_ADD(Z80, CVSD_Z80_CLOCK)
+ MDRV_CPU_ADD_TAG("audio", Z80, CVSD_Z80_CLOCK)
MDRV_CPU_PROGRAM_MAP(cvsd_map,0)
MDRV_CPU_IO_MAP(cvsd_iomap,0)
/* audio hardware */
- MDRV_SOUND_ADD(MC3417, CVSD_CLOCK)
+ MDRV_SOUND_ADD("cvsd", MC3417, CVSD_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -1030,15 +1030,15 @@ ADDRESS_MAP_END
MACHINE_DRIVER_START( victory_audio )
- MDRV_CPU_ADD(M6502, VICTORY_AUDIO_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("audio", M6502, VICTORY_AUDIO_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(victory_audio_map,0)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("custom", CUSTOM, 0)
MDRV_SOUND_CONFIG(victory_custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(TMS5220, 640000)
+ MDRV_SOUND_ADD("tms", TMS5220, 640000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c
index 3006b1d4513..5c9d4f13068 100644
--- a/src/mame/audio/exidy440.c
+++ b/src/mame/audio/exidy440.c
@@ -930,26 +930,26 @@ static const struct CustomSound_interface custom_interface =
MACHINE_DRIVER_START( exidy440_audio )
- MDRV_CPU_ADD(M6809, EXIDY440_AUDIO_CLOCK)
+ MDRV_CPU_ADD_TAG("audio", M6809, EXIDY440_AUDIO_CLOCK)
MDRV_CPU_PROGRAM_MAP(exidy440_audio_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(CUSTOM, EXIDY440_MASTER_CLOCK/256)
+ MDRV_SOUND_ADD("custom", CUSTOM, EXIDY440_MASTER_CLOCK/256)
MDRV_SOUND_CONFIG(custom_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
-// MDRV_SOUND_ADD(MC3418, EXIDY440_MC3418_CLOCK)
+// MDRV_SOUND_ADD("cvsd1", MC3418, EXIDY440_MC3418_CLOCK)
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
-// MDRV_SOUND_ADD(MC3418, EXIDY440_MC3418_CLOCK)
+// MDRV_SOUND_ADD("cvsd2", MC3418, EXIDY440_MC3418_CLOCK)
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
-// MDRV_SOUND_ADD(MC3417, EXIDY440_MC3417_CLOCK)
+// MDRV_SOUND_ADD("cvsd3", MC3417, EXIDY440_MC3417_CLOCK)
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
-// MDRV_SOUND_ADD(MC3417, EXIDY440_MC3417_CLOCK)
+// MDRV_SOUND_ADD("cvsd4", MC3417, EXIDY440_MC3417_CLOCK)
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/invinco.c b/src/mame/audio/invinco.c
index efa3d124667..bcccdb83f6c 100644
--- a/src/mame/audio/invinco.c
+++ b/src/mame/audio/invinco.c
@@ -43,7 +43,7 @@ static const struct Samplesinterface invinco_samples_interface =
MACHINE_DRIVER_START( invinco_audio )
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(invinco_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index 321f197e750..a0508d730e6 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -369,19 +369,19 @@ static MACHINE_DRIVER_START( irem_audio_base )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(irem_ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(irem_ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(MSM5205, XTAL_384kHz) /* verified on pcb */
+ MDRV_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
MDRV_SOUND_CONFIG(irem_msm5205_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(MSM5205, XTAL_384kHz) /* verified on pcb */
+ MDRV_SOUND_ADD("msm2", MSM5205, XTAL_384kHz) /* verified on pcb */
MDRV_SOUND_CONFIG(irem_msm5205_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -398,19 +398,19 @@ MACHINE_DRIVER_START( m52_sound_c_audio )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("ay8910.0", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ay8910.0", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(irem_ay8910_interface_1)
MDRV_SOUND_ROUTE_EX(0, "filtermix", 1.0, 0)
- MDRV_SOUND_ADD_TAG("ay8910.0", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ay8910.0", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(irem_ay8910_interface_2)
MDRV_SOUND_ROUTE_EX(0, "filtermix", 1.0, 1)
- MDRV_SOUND_ADD_TAG("msm5250", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MDRV_SOUND_ADD("msm5250", MSM5205, XTAL_384kHz) /* verified on pcb */
MDRV_SOUND_CONFIG(irem_msm5205_interface_1)
MDRV_SOUND_ROUTE_EX(0, "filtermix", 1.0, 2)
- MDRV_SOUND_ADD_TAG("filtermix", DISCRETE, 0)
+ MDRV_SOUND_ADD("filtermix", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(m52_sound_c)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c
index 406c5212071..81576dd105d 100644
--- a/src/mame/audio/jedi.c
+++ b/src/mame/audio/jedi.c
@@ -199,7 +199,7 @@ ADDRESS_MAP_END
MACHINE_DRIVER_START( jedi_audio )
- MDRV_CPU_ADD(M6502, JEDI_AUDIO_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("audio", M6502, JEDI_AUDIO_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(audio_map,0)
MDRV_SOUND_START(jedi)
@@ -207,21 +207,21 @@ MACHINE_DRIVER_START( jedi_audio )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(POKEY, JEDI_POKEY_CLOCK)
+ MDRV_SOUND_ADD("pokey1", POKEY, JEDI_POKEY_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30)
- MDRV_SOUND_ADD(POKEY, JEDI_POKEY_CLOCK)
+ MDRV_SOUND_ADD("pokey2", POKEY, JEDI_POKEY_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30)
- MDRV_SOUND_ADD(POKEY, JEDI_POKEY_CLOCK)
+ MDRV_SOUND_ADD("pokey3", POKEY, JEDI_POKEY_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30)
- MDRV_SOUND_ADD(POKEY, JEDI_POKEY_CLOCK)
+ MDRV_SOUND_ADD("pokey4", POKEY, JEDI_POKEY_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30)
- MDRV_SOUND_ADD(TMS5220, JEDI_TMS5220_CLOCK)
+ MDRV_SOUND_ADD("tms", TMS5220, JEDI_TMS5220_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index beeff05f12f..6ccdb795a5e 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -448,9 +448,9 @@ static const struct AY8910interface ay8910_interface =
MACHINE_DRIVER_START( mario_audio )
#if USE_8039
- MDRV_CPU_ADD(I8039, I8035_CLOCK) /* audio CPU */ /* 730 kHz */
+ MDRV_CPU_ADD_TAG("audio", I8039, I8035_CLOCK) /* audio CPU */ /* 730 kHz */
#else
- MDRV_CPU_ADD(M58715, I8035_CLOCK) /* audio CPU */ /* 730 kHz */
+ MDRV_CPU_ADD_TAG("audio", M58715, I8035_CLOCK) /* audio CPU */ /* 730 kHz */
#endif
MDRV_CPU_PROGRAM_MAP(mario_sound_map, 0)
MDRV_CPU_IO_MAP(mario_sound_io_map, 0)
@@ -459,7 +459,7 @@ MACHINE_DRIVER_START( mario_audio )
MDRV_SOUND_RESET(mario)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(mario)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.5)
@@ -467,7 +467,7 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START( masao_audio )
- MDRV_CPU_ADD(Z80,24576000/16) /* audio CPU */ /* ???? */
+ MDRV_CPU_ADD_TAG("audio", Z80,24576000/16) /* audio CPU */ /* ???? */
MDRV_CPU_PROGRAM_MAP(masao_sound_map,0)
MDRV_SOUND_START(mario)
@@ -475,7 +475,7 @@ MACHINE_DRIVER_START( masao_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 14318000/6)
+ MDRV_SOUND_ADD("ay", AY8910, 14318000/6)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c
index e77e9b6042d..050bfedcf25 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -493,11 +493,11 @@ MACHINE_DRIVER_START(mcr_ssio)
MDRV_CPU_PERIODIC_INT(ssio_14024_clock, SSIO_CLOCK/2/16/10)
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("ssio.1", AY8910, SSIO_CLOCK/2/4)
+ MDRV_SOUND_ADD("ssio.1", AY8910, SSIO_CLOCK/2/4)
MDRV_SOUND_CONFIG(ssio_ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.33)
- MDRV_SOUND_ADD_TAG("ssio.2", AY8910, SSIO_CLOCK/2/4)
+ MDRV_SOUND_ADD("ssio.2", AY8910, SSIO_CLOCK/2/4)
MDRV_SOUND_CONFIG(ssio_ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.33)
MACHINE_DRIVER_END
@@ -612,7 +612,7 @@ MACHINE_DRIVER_START(chip_squeak_deluxe)
MDRV_CPU_PROGRAM_MAP(csdeluxe_map,0)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("csd", DAC, 0)
+ MDRV_SOUND_ADD("csd", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -620,7 +620,7 @@ MACHINE_DRIVER_START(chip_squeak_deluxe_stereo)
MDRV_CPU_ADD_TAG("csd", M68000, CSDELUXE_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(csdeluxe_map,0)
- MDRV_SOUND_ADD_TAG("csd", DAC, 0)
+ MDRV_SOUND_ADD("csd", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
@@ -719,7 +719,7 @@ MACHINE_DRIVER_START(sounds_good)
MDRV_CPU_PROGRAM_MAP(soundsgood_map,0)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("sg", DAC, 0)
+ MDRV_SOUND_ADD("sg", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -808,7 +808,7 @@ MACHINE_DRIVER_START(turbo_chip_squeak)
MDRV_CPU_PROGRAM_MAP(turbocs_map,0)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("tcs", DAC, 0)
+ MDRV_SOUND_ADD("tcs", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -956,7 +956,7 @@ MACHINE_DRIVER_START(squawk_n_talk)
MDRV_CPU_PROGRAM_MAP(squawkntalk_map,0)
/* only used on Discs of Tron, which is stereo */
- MDRV_SOUND_ADD_TAG("snt", TMS5200, 640000)
+ MDRV_SOUND_ADD("snt", TMS5200, 640000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c
index fdd1bc7caf4..5b4a6600e11 100644
--- a/src/mame/audio/mw8080bw.c
+++ b/src/mame/audio/mw8080bw.c
@@ -138,7 +138,7 @@ MACHINE_DRIVER_START( seawolf_audio )
MDRV_SOUND_START(samples)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(seawolf_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
MACHINE_DRIVER_END
@@ -199,11 +199,11 @@ MACHINE_DRIVER_START( gunfight_audio )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples1", SAMPLES, 0)
MDRV_SOUND_CONFIG(gunfight_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples2", SAMPLES, 0)
MDRV_SOUND_CONFIG(gunfight_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
MACHINE_DRIVER_END
@@ -303,7 +303,7 @@ DISCRETE_SOUND_END
MACHINE_DRIVER_START( tornbase_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(tornbase)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_DRIVER_END
@@ -561,7 +561,7 @@ DISCRETE_SOUND_END
MACHINE_DRIVER_START( maze_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(maze)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -796,7 +796,7 @@ DISCRETE_SOUND_END
MACHINE_DRIVER_START( boothill_audio )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(boothill)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -1033,7 +1033,7 @@ DISCRETE_SOUND_END
MACHINE_DRIVER_START( checkmat_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(checkmat)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
MACHINE_DRIVER_END
@@ -1272,7 +1272,7 @@ DISCRETE_SOUND_END
MACHINE_DRIVER_START( desertgu_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(desertgu)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_DRIVER_END
@@ -1566,7 +1566,7 @@ DISCRETE_SOUND_END
MACHINE_DRIVER_START( dplay_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(dplay)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_DRIVER_END
@@ -1618,11 +1618,11 @@ MACHINE_DRIVER_START( gmissile_audio )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples1", SAMPLES, 0)
MDRV_SOUND_CONFIG(gmissile_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.9)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples2", SAMPLES, 0)
MDRV_SOUND_CONFIG(gmissile_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.9)
MACHINE_DRIVER_END
@@ -1716,11 +1716,11 @@ MACHINE_DRIVER_START( m4_audio )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples1", SAMPLES, 0)
MDRV_SOUND_CONFIG(m4_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples2", SAMPLES, 0)
MDRV_SOUND_CONFIG(m4_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1)
MACHINE_DRIVER_END
@@ -2004,11 +2004,11 @@ MACHINE_DRIVER_START( clowns_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(clowns_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(clowns)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -2144,7 +2144,7 @@ DISCRETE_SOUND_END
MACHINE_DRIVER_START( dogpatch_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(dogpatch)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.3)
MACHINE_DRIVER_END
@@ -2687,11 +2687,11 @@ DISCRETE_SOUND_END
MACHINE_DRIVER_START( spcenctr_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn", SN76477, 0)
MDRV_SOUND_CONFIG(spcenctr_sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(spcenctr)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_DRIVER_END
@@ -2770,7 +2770,7 @@ MACHINE_DRIVER_START( phantom2_audio )
MDRV_SOUND_START(samples)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(phantom2_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_DRIVER_END
@@ -2898,7 +2898,7 @@ DISCRETE_SOUND_END
MACHINE_DRIVER_START( bowler_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(bowler)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_DRIVER_END
@@ -3051,11 +3051,11 @@ MACHINE_DRIVER_START( invaders_samples_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn", SN76477, 0)
MDRV_SOUND_CONFIG(invaders_sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(invaders_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3628,11 +3628,11 @@ DISCRETE_SOUND_END
MACHINE_DRIVER_START( invaders_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn", SN76477, 0)
MDRV_SOUND_CONFIG(invaders_sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(invaders)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
@@ -3784,7 +3784,7 @@ DISCRETE_SOUND_END
MACHINE_DRIVER_START( blueshrk_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(blueshrk)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -4003,16 +4003,16 @@ DISCRETE_SOUND_END
MACHINE_DRIVER_START( invad2ct_audio )
MDRV_SPEAKER_STANDARD_STEREO("#1", "#2")
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(invad2ct)
MDRV_SOUND_ROUTE(0, "#1", 0.5)
MDRV_SOUND_ROUTE(1, "#2", 0.5)
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn1", SN76477, 0)
MDRV_SOUND_CONFIG(invad2ct_p1_sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "#1", 0.3)
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn2", SN76477, 0)
MDRV_SOUND_CONFIG(invad2ct_p2_sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "#2", 0.3)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c
index aceb09344a0..96ae094c1ce 100644
--- a/src/mame/audio/n8080.c
+++ b/src/mame/audio/n8080.c
@@ -546,8 +546,7 @@ ADDRESS_MAP_END
MACHINE_DRIVER_START( spacefev_sound )
/* basic machine hardware */
- MDRV_CPU_ADD(I8035, 6000000)
- /* audio CPU */
+ MDRV_CPU_ADD_TAG("audio", I8035, 6000000)
MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map, 0)
MDRV_CPU_IO_MAP(n8080_sound_io_map, 0)
@@ -556,10 +555,10 @@ MACHINE_DRIVER_START( spacefev_sound )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn", SN76477, 0)
MDRV_SOUND_CONFIG(spacefev_sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_DRIVER_END
@@ -568,8 +567,7 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START( sheriff_sound )
/* basic machine hardware */
- MDRV_CPU_ADD(I8035, 6000000)
- /* audio CPU */
+ MDRV_CPU_ADD_TAG("audio", I8035, 6000000)
MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map, 0)
MDRV_CPU_IO_MAP(n8080_sound_io_map, 0)
@@ -578,10 +576,10 @@ MACHINE_DRIVER_START( sheriff_sound )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn", SN76477, 0)
MDRV_SOUND_CONFIG(sheriff_sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_DRIVER_END
@@ -590,8 +588,7 @@ MACHINE_DRIVER_END
MACHINE_DRIVER_START( helifire_sound )
/* basic machine hardware */
- MDRV_CPU_ADD(I8035, 6000000)
- /* audio CPU */
+ MDRV_CPU_ADD_TAG("audio", I8035, 6000000)
MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map, 0)
MDRV_CPU_IO_MAP(helifire_sound_io_map, 0)
@@ -600,6 +597,6 @@ MACHINE_DRIVER_START( helifire_sound )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/namcoc7x.h b/src/mame/audio/namcoc7x.h
index 6c606ea1a5e..e8ade7a1dfb 100644
--- a/src/mame/audio/namcoc7x.h
+++ b/src/mame/audio/namcoc7x.h
@@ -47,7 +47,7 @@ static const struct C352interface namcoc7x_c352_interface = \
#define NAMCO_C7X_SOUND(clock) \
MDRV_SPEAKER_STANDARD_STEREO("left", "right") \
- MDRV_SOUND_ADD(C352, clock) \
+ MDRV_SOUND_ADD("namco", C352, clock) \
MDRV_SOUND_CONFIG(namcoc7x_c352_interface) \
MDRV_SOUND_ROUTE(0, "right", 1.00) \
MDRV_SOUND_ROUTE(1, "left", 1.00) \
diff --git a/src/mame/audio/pulsar.c b/src/mame/audio/pulsar.c
index 1748210f2fb..8f155c3fb97 100644
--- a/src/mame/audio/pulsar.c
+++ b/src/mame/audio/pulsar.c
@@ -60,7 +60,7 @@ static const struct Samplesinterface pulsar_samples_interface =
MACHINE_DRIVER_START( pulsar_audio )
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(pulsar_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c
index 37e642b6d18..9dc4bde7b7d 100644
--- a/src/mame/audio/qix.c
+++ b/src/mame/audio/qix.c
@@ -108,7 +108,7 @@ MACHINE_DRIVER_START( qix_audio )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(qix)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -125,6 +125,6 @@ MACHINE_DRIVER_START( slither_audio )
MDRV_SOUND_REPLACE("discrete", SN76489, SLITHER_CLOCK_OSC/4/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76489, SLITHER_CLOCK_OSC/4/4)
+ MDRV_SOUND_ADD("sn", SN76489, SLITHER_CLOCK_OSC/4/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c
index 8808472be34..8d1db53e11c 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -215,24 +215,24 @@ static SOUND_START( redalert )
MACHINE_DRIVER_START( redalert_audio )
- MDRV_CPU_ADD(M6502, REDALERT_AUDIO_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("audio", M6502, REDALERT_AUDIO_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(redalert_audio_map,0)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ)
- MDRV_CPU_ADD(8085A, REDALERT_VOICE_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("voice", 8085A, REDALERT_VOICE_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(redalert_voice_map,0)
MDRV_SOUND_START( redalert )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, REDALERT_AY8910_CLOCK)
+ MDRV_SOUND_ADD("ay", AY8910, REDALERT_AY8910_CLOCK)
MDRV_SOUND_CONFIG(redalert_ay8910_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
/* channel C is used a noise source and is not connected to a speaker */
- MDRV_SOUND_ADD(HC55516, REDALERT_HC55516_CLOCK)
+ MDRV_SOUND_ADD("cvsd", HC55516, REDALERT_HC55516_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -366,7 +366,7 @@ static SOUND_RESET( demoneye )
MACHINE_DRIVER_START( demoneye_audio )
- MDRV_CPU_ADD(M6802, DEMONEYE_AUDIO_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("audio", M6802, DEMONEYE_AUDIO_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(demoneye_audio_map,0)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) /* guess */
@@ -375,10 +375,10 @@ MACHINE_DRIVER_START( demoneye_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, DEMONEYE_AY8910_CLOCK)
+ MDRV_SOUND_ADD("ay1", AY8910, DEMONEYE_AY8910_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(AY8910, DEMONEYE_AY8910_CLOCK)
+ MDRV_SOUND_ADD("ay2", AY8910, DEMONEYE_AY8910_CLOCK)
MDRV_SOUND_CONFIG(demoneye_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index dfd750a23ad..fc1dd70e9fe 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -424,22 +424,22 @@ static SOUND_START( ad2083 )
MACHINE_DRIVER_START( ad2083_audio )
- MDRV_CPU_ADD(Z80, 14318000/8) /* 1.78975 MHz */
+ MDRV_CPU_ADD_TAG("audio", Z80, 14318000/8) /* 1.78975 MHz */
MDRV_CPU_PROGRAM_MAP(ad2083_sound_map,0)
MDRV_CPU_IO_MAP(ad2083_sound_io_map,0)
MDRV_SOUND_START(ad2083)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 14318000/8)
+ MDRV_SOUND_ADD("ay1", AY8910, 14318000/8)
MDRV_SOUND_CONFIG(ad2083_ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MDRV_SOUND_ADD(AY8910, 14318000/8)
+ MDRV_SOUND_ADD("ay2", AY8910, 14318000/8)
MDRV_SOUND_CONFIG(ad2083_ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MDRV_SOUND_ADD(TMS5110A, AD2083_TMS5110_CLOCK)
+ MDRV_SOUND_ADD("tms", TMS5110A, AD2083_TMS5110_CLOCK)
MDRV_SOUND_CONFIG(ad2083_tms5110_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c
index f1e0fb5ef34..f0181fa7f97 100644
--- a/src/mame/audio/segag80r.c
+++ b/src/mame/audio/segag80r.c
@@ -209,7 +209,7 @@ MACHINE_DRIVER_START( astrob_sound_board )
MDRV_SOUND_START(astrob)
/* sound hardware */
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(astrob_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -444,11 +444,11 @@ MACHINE_DRIVER_START( 005_sound_board )
/* sound hardware */
MDRV_SOUND_START(005)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(sega005_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("005", CUSTOM, 0)
MDRV_SOUND_CONFIG(sega005_custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -665,7 +665,7 @@ MACHINE_DRIVER_START( spaceod_sound_board )
/* sound hardware */
MDRV_SOUND_START(spaceod)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(spaceod_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -838,22 +838,22 @@ MACHINE_DRIVER_START( monsterb_sound_board )
MDRV_DEVICE_CONFIG( monsterb_ppi_intf )
/* basic machine hardware */
- MDRV_CPU_ADD(N7751, 6000000)
+ MDRV_CPU_ADD_TAG("audio", N7751, 6000000)
MDRV_CPU_PROGRAM_MAP(monsterb_7751_map,0)
MDRV_CPU_IO_MAP(monsterb_7751_portmap,0)
/* sound hardware */
MDRV_SOUND_START(monsterb)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(monsterb_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(TMS36XX, 247)
+ MDRV_SOUND_ADD("music", TMS36XX, 247)
MDRV_SOUND_CONFIG(monsterb_tms3617_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c
index b31788bbb77..384badac670 100644
--- a/src/mame/audio/segasnd.c
+++ b/src/mame/audio/segasnd.c
@@ -280,12 +280,12 @@ static const struct sp0250_interface sp0250_interface =
MACHINE_DRIVER_START( sega_speech_board )
/* CPU for the speech board */
- MDRV_CPU_ADD(I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */
+ MDRV_CPU_ADD_TAG("audio", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */
MDRV_CPU_PROGRAM_MAP(speech_map, 0)
MDRV_CPU_IO_MAP(speech_portmap, 0)
/* sound hardware */
- MDRV_SOUND_ADD(SP0250, SPEECH_MASTER_CLOCK)
+ MDRV_SOUND_ADD("speech", SP0250, SPEECH_MASTER_CLOCK)
MDRV_SOUND_CONFIG(sp0250_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -923,7 +923,7 @@ MACHINE_DRIVER_START( sega_universal_sound_board )
MDRV_CPU_IO_MAP(usb_portmap, 0)
/* sound hardware */
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("usb", CUSTOM, 0)
MDRV_SOUND_CONFIG(usb_custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h
index 55582a23462..812cc6dceda 100644
--- a/src/mame/audio/seibu.h
+++ b/src/mame/audio/seibu.h
@@ -77,56 +77,56 @@ extern const struct YM2203interface seibu_ym2203_interface;
#define SEIBU_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD(Z80, freq) \
+ MDRV_CPU_ADD_TAG("audio", Z80, freq) \
MDRV_CPU_PROGRAM_MAP(seibu_sound_map,0) \
#define SEIBU2_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD(Z80, freq) \
+ MDRV_CPU_ADD_TAG("audio", Z80, freq) \
MDRV_CPU_PROGRAM_MAP(seibu2_sound_map,0) \
-#define SEIBU2_RAIDEN2_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD(Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu2_raiden2_sound_map,0) \
+#define SEIBU2_RAIDEN2_SOUND_SYSTEM_CPU(freq) \
+ MDRV_CPU_ADD_TAG("audio", Z80, freq) \
+ MDRV_CPU_PROGRAM_MAP(seibu2_raiden2_sound_map,0) \
#define SEIBU3_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD(Z80, freq) \
+ MDRV_CPU_ADD_TAG("audio", Z80, freq) \
MDRV_CPU_PROGRAM_MAP(seibu3_sound_map,0) \
#define SEIBU3A_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD(Z80, freq) \
+ MDRV_CPU_ADD_TAG("audio", Z80, freq) \
MDRV_CPU_PROGRAM_MAP(seibu3_adpcm_sound_map,0) \
#define SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(freq1,freq2,region) \
MDRV_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD(YM3812, freq1) \
+ MDRV_SOUND_ADD("ym", YM3812, freq1) \
MDRV_SOUND_CONFIG(seibu_ym3812_interface) \
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
\
- MDRV_SOUND_ADD(OKIM6295, freq2) \
+ MDRV_SOUND_ADD("oki", OKIM6295, freq2) \
MDRV_SOUND_CONFIG(okim6295_interface_region_##region##_pin7low) \
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
#define SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(freq1,freq2,region) \
MDRV_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD(YM3812, freq1) \
+ MDRV_SOUND_ADD("ym", YM3812, freq1) \
MDRV_SOUND_CONFIG(seibu_ym3812_interface) \
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
\
- MDRV_SOUND_ADD(OKIM6295, freq2) \
+ MDRV_SOUND_ADD("oki", OKIM6295, freq2) \
MDRV_SOUND_CONFIG(okim6295_interface_region_##region##_pin7high)\
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
#define SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(freq1,freq2,region) \
MDRV_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD(YM2151, freq1) \
+ MDRV_SOUND_ADD("ym", YM2151, freq1) \
MDRV_SOUND_CONFIG(seibu_ym2151_interface) \
MDRV_SOUND_ROUTE(0, "mono", 0.50) \
MDRV_SOUND_ROUTE(1, "mono", 0.50) \
\
- MDRV_SOUND_ADD(OKIM6295, freq2) \
+ MDRV_SOUND_ADD("oki", OKIM6295, freq2) \
MDRV_SOUND_CONFIG(okim6295_interface_region_##region##_pin7low) \
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
@@ -134,36 +134,36 @@ extern const struct YM2203interface seibu_ym2203_interface;
#define SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(freq1,freq2,regiona, regionb) \
MDRV_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD(YM2151, freq1) \
+ MDRV_SOUND_ADD("ym", YM2151, freq1) \
MDRV_SOUND_CONFIG(seibu_ym2151_interface) \
MDRV_SOUND_ROUTE(0, "mono", 0.50) \
MDRV_SOUND_ROUTE(1, "mono", 0.50) \
\
- MDRV_SOUND_ADD(OKIM6295, freq2) \
- MDRV_SOUND_CONFIG(okim6295_interface_region_##regiona##_pin7high) \
+ MDRV_SOUND_ADD("oki1", OKIM6295, freq2) \
+ MDRV_SOUND_CONFIG(okim6295_interface_region_##regiona##_pin7high)\
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
- \
- MDRV_SOUND_ADD(OKIM6295, freq2) \
- MDRV_SOUND_CONFIG(okim6295_interface_region_##regionb##_pin7high) \
+ \
+ MDRV_SOUND_ADD("oki2", OKIM6295, freq2) \
+ MDRV_SOUND_CONFIG(okim6295_interface_region_##regionb##_pin7high)\
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
#define SEIBU_SOUND_SYSTEM_YM2203_INTERFACE(freq) \
MDRV_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD(YM2203, freq) \
+ MDRV_SOUND_ADD("ym1", YM2203, freq) \
MDRV_SOUND_CONFIG(seibu_ym2203_interface) \
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \
\
- MDRV_SOUND_ADD(YM2203, freq) \
+ MDRV_SOUND_ADD("ym2", YM2203, freq) \
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \
#define SEIBU_SOUND_SYSTEM_ADPCM_INTERFACE \
- MDRV_SOUND_ADD(CUSTOM, 8000) \
+ MDRV_SOUND_ADD("adpcm1", CUSTOM, 8000) \
MDRV_SOUND_CONFIG(seibu_adpcm_interface) \
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
\
- MDRV_SOUND_ADD(CUSTOM, 8000) \
+ MDRV_SOUND_ADD("adpcm2", CUSTOM, 8000) \
MDRV_SOUND_CONFIG(seibu_adpcm_interface) \
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
diff --git a/src/mame/audio/spacefb.c b/src/mame/audio/spacefb.c
index 6b0b57afe90..9f1e5a9e731 100644
--- a/src/mame/audio/spacefb.c
+++ b/src/mame/audio/spacefb.c
@@ -87,10 +87,10 @@ static const struct Samplesinterface spacefb_samples_interface =
MACHINE_DRIVER_START( spacefb_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(spacefb_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/spiders.c b/src/mame/audio/spiders.c
index e972fc61090..e457c4378a8 100644
--- a/src/mame/audio/spiders.c
+++ b/src/mame/audio/spiders.c
@@ -201,7 +201,7 @@ WRITE8_HANDLER( spiders_audio_ctrl_w )
MACHINE_DRIVER_START( spiders_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(spiders)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/taito_en.h b/src/mame/audio/taito_en.h
index ab8a2c84f3b..96e033061a6 100644
--- a/src/mame/audio/taito_en.h
+++ b/src/mame/audio/taito_en.h
@@ -12,13 +12,13 @@ void f3_68681_reset(void);
void taito_f3_soundsystem_reset(running_machine *machine);
#define TAITO_F3_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD(M68000, freq) \
+ MDRV_CPU_ADD_TAG("audio", M68000, freq) \
MDRV_CPU_PROGRAM_MAP(f3_sound_map,0) \
#define TAITO_F3_SOUND_SYSTEM_ES5505(freq) \
MDRV_SPEAKER_STANDARD_STEREO("left", "right") \
- MDRV_SOUND_ADD(ES5505, freq) \
+ MDRV_SOUND_ADD("es", ES5505, freq) \
MDRV_SOUND_CONFIG(es5505_interface) \
MDRV_SOUND_ROUTE(0, "left", 1.0) \
MDRV_SOUND_ROUTE(1, "right", 1.0) \
diff --git a/src/mame/audio/targ.c b/src/mame/audio/targ.c
index 8a52c5f628b..745c1acd0d8 100644
--- a/src/mame/audio/targ.c
+++ b/src/mame/audio/targ.c
@@ -194,11 +194,11 @@ MACHINE_DRIVER_START( spectar_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(spectar_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -207,10 +207,10 @@ MACHINE_DRIVER_START( targ_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(targ_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c
index 32d7b6e4d9b..1f71c2ed103 100644
--- a/src/mame/audio/timeplt.c
+++ b/src/mame/audio/timeplt.c
@@ -181,29 +181,29 @@ MACHINE_DRIVER_START( timeplt_sound )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/8)
MDRV_SOUND_CONFIG(timeplt_ay8910_interface)
MDRV_SOUND_ROUTE(0, "filter.0.0", 0.60)
MDRV_SOUND_ROUTE(1, "filter.0.1", 0.60)
MDRV_SOUND_ROUTE(2, "filter.0.2", 0.60)
- MDRV_SOUND_ADD(AY8910, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/8)
MDRV_SOUND_ROUTE(0, "filter.1.0", 0.60)
MDRV_SOUND_ROUTE(1, "filter.1.1", 0.60)
MDRV_SOUND_ROUTE(2, "filter.1.2", 0.60)
- MDRV_SOUND_ADD_TAG("filter.0.0", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter.0.0", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter.0.1", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter.0.1", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter.0.2", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter.0.2", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter.1.0", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter.1.0", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter.1.1", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter.1.1", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter.1.2", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter.1.2", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/turbo.c b/src/mame/audio/turbo.c
index 8d692d4bb46..032f8fe0d0e 100644
--- a/src/mame/audio/turbo.c
+++ b/src/mame/audio/turbo.c
@@ -195,7 +195,7 @@ MACHINE_DRIVER_START( turbo_samples )
MDRV_SPEAKER_ADD("left", -0.2, 0.0, 1.0)
MDRV_SPEAKER_ADD("right", 0.2, 0.0, 1.0)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(turbo_samples_interface)
/* channel 0 = CRASH.S -> CRASH.S/SM */
@@ -446,7 +446,7 @@ static const struct Samplesinterface subroc3d_samples_interface =
MACHINE_DRIVER_START( subroc3d_samples )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(subroc3d_samples_interface)
/* MISSILE in channels 0 and 1 */
@@ -598,7 +598,7 @@ static const struct Samplesinterface buckrog_samples_interface =
MACHINE_DRIVER_START( buckrog_samples )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(buckrog_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/vicdual.c b/src/mame/audio/vicdual.c
index d52798700a6..f23aaaf9d25 100644
--- a/src/mame/audio/vicdual.c
+++ b/src/mame/audio/vicdual.c
@@ -121,11 +121,11 @@ static const struct Samplesinterface frogs_samples_interface =
MACHINE_DRIVER_START( frogs_audio )
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(frogs_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(frogs)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -443,7 +443,7 @@ DISCRETE_SOUND_END
MACHINE_DRIVER_START( headon_audio )
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(headon)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index 16fcac9fc8f..06ccc02bb2e 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -195,14 +195,14 @@ MACHINE_DRIVER_START( williams_cvsd_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, CVSD_FM_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, CVSD_FM_CLOCK)
MDRV_SOUND_CONFIG(cvsd_ym2151_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(HC55516, 0)
+ MDRV_SOUND_ADD("cvsd", HC55516, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
@@ -216,20 +216,20 @@ MACHINE_DRIVER_START( williams_narc_sound )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, NARC_FM_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, NARC_FM_CLOCK)
MDRV_SOUND_CONFIG(adpcm_ym2151_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(HC55516, 0)
+ MDRV_SOUND_ADD("cvsd", HC55516, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
MACHINE_DRIVER_END
@@ -241,14 +241,14 @@ MACHINE_DRIVER_START( williams_adpcm_sound )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, ADPCM_FM_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, ADPCM_FM_CLOCK)
MDRV_SOUND_CONFIG(adpcm_ym2151_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(OKIM6295, ADPCM_MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("oki", OKIM6295, ADPCM_MASTER_CLOCK/8)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/audio/zaxxon.c b/src/mame/audio/zaxxon.c
index 0851cbe462f..5ef2f36e85e 100644
--- a/src/mame/audio/zaxxon.c
+++ b/src/mame/audio/zaxxon.c
@@ -108,7 +108,7 @@ static const struct Samplesinterface zaxxon_samples_interface =
MACHINE_DRIVER_START( zaxxon_samples )
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(zaxxon_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -214,7 +214,7 @@ static const struct Samplesinterface congo_samples_interface =
MACHINE_DRIVER_START( congo_samples )
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(congo_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c
index 93f4ad0cc49..343b1e2b854 100644
--- a/src/mame/drivers/1942.c
+++ b/src/mame/drivers/1942.c
@@ -270,11 +270,11 @@ GFXDECODE_END
static MACHINE_DRIVER_START( 1942 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */
MDRV_CPU_PROGRAM_MAP(c1942_map, 0)
MDRV_CPU_VBLANK_INT_HACK(c1942_interrupt,2)
- MDRV_CPU_ADD(Z80, SOUND_CPU_CLOCK) /* 3 MHz ??? */
+ MDRV_CPU_ADD_TAG("audio", Z80, SOUND_CPU_CLOCK) /* 3 MHz ??? */
MDRV_CPU_PROGRAM_MAP(sound_map, 0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
@@ -296,9 +296,9 @@ static MACHINE_DRIVER_START( 1942 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, AUDIO_CLOCK) /* 1.5 MHz */
+ MDRV_SOUND_ADD("ay1", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, AUDIO_CLOCK) /* 1.5 MHz */
+ MDRV_SOUND_ADD("ay2", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c
index c4958316097..2c32437f77f 100644
--- a/src/mame/drivers/1943.c
+++ b/src/mame/drivers/1943.c
@@ -250,11 +250,11 @@ GFXDECODE_END
static MACHINE_DRIVER_START( 1943 )
// basic machine hardware
- MDRV_CPU_ADD(Z80, XTAL_24MHz/4) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_24MHz/4) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(c1943_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
- MDRV_CPU_ADD(Z80, XTAL_24MHz/8) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("audio", Z80, XTAL_24MHz/8) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(sound_map, 0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
@@ -276,13 +276,13 @@ static MACHINE_DRIVER_START( 1943 )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_24MHz/16) /* verified on pcb */
+ MDRV_SOUND_ADD("ym1", YM2203, XTAL_24MHz/16) /* verified on pcb */
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.10)
- MDRV_SOUND_ADD(YM2203, XTAL_24MHz/16) /* verified on pcb */
+ MDRV_SOUND_ADD("ym2", YM2203, XTAL_24MHz/16) /* verified on pcb */
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c
index 9f3958f1058..26cc382a63c 100644
--- a/src/mame/drivers/1945kiii.c
+++ b/src/mame/drivers/1945kiii.c
@@ -232,7 +232,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( k3 )
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(k3_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -252,11 +252,11 @@ static MACHINE_DRIVER_START( k3 )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index 94650e7a787..555a58faad0 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -295,7 +295,7 @@ static MACHINE_DRIVER_START( 20pacgal )
MDRV_DRIVER_DATA(_20pacgal_state)
/* basic machine hardware */
- MDRV_CPU_ADD(Z180, MAIN_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", Z180, MAIN_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(20pacgal_map,0)
MDRV_CPU_IO_MAP(20pacgal_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
@@ -308,11 +308,11 @@ static MACHINE_DRIVER_START( 20pacgal )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO, NAMCO_AUDIO_CLOCK)
+ MDRV_SOUND_ADD("namco", NAMCO, NAMCO_AUDIO_CLOCK)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index 5ce78e58e9b..8f7f93f20ee 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -210,7 +210,7 @@ static MACHINE_DRIVER_START( drill )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c
index e4f16b1bc47..fbfd804bb7a 100644
--- a/src/mame/drivers/39in1.c
+++ b/src/mame/drivers/39in1.c
@@ -34,7 +34,7 @@ static VIDEO_UPDATE( 39in1 )
}
static MACHINE_DRIVER_START( 39in1 )
- MDRV_CPU_ADD(ARM7, 200000000) // actually Xscale PXA255, but ARM7 is a compatible subset
+ MDRV_CPU_ADD_TAG("main", ARM7, 200000000) // actually Xscale PXA255, but ARM7 is a compatible subset
MDRV_CPU_PROGRAM_MAP(39in1_map,0)
MDRV_PALETTE_LENGTH(32768)
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index 26471196293..94934c694e4 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -1023,16 +1023,15 @@ static const struct MSM5232interface msm5232_interface =
static MACHINE_DRIVER_START( 40love )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000/2) /* OK */
+ MDRV_CPU_ADD_TAG("main",Z80,8000000/2) /* OK */
MDRV_CPU_PROGRAM_MAP(40love_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
- MDRV_CPU_ADD(Z80,8000000/2)
- /* audio CPU */ /* OK */
+ MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* OK */
MDRV_CPU_PROGRAM_MAP(sound_map,0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* source/number of IRQs is unknown */
- MDRV_CPU_ADD(M68705,18432000/6) /* OK */
+ MDRV_CPU_ADD_TAG("mcu",M68705,18432000/6) /* OK */
MDRV_CPU_PROGRAM_MAP(mcu_map,0)
MDRV_INTERLEAVE(100) /* high interleave to ensure proper synchronization of CPUs */
@@ -1055,11 +1054,11 @@ static MACHINE_DRIVER_START( 40love )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(MSM5232, 8000000/4)
+ MDRV_SOUND_ADD("msm", MSM5232, 8000000/4)
MDRV_SOUND_CONFIG(msm5232_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
@@ -1073,23 +1072,22 @@ static MACHINE_DRIVER_START( 40love )
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( undoukai )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000/2)
+ MDRV_CPU_ADD_TAG("main",Z80,8000000/2)
MDRV_CPU_PROGRAM_MAP(undoukai_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
- MDRV_CPU_ADD(Z80,8000000/2)
- /* audio CPU */
+ MDRV_CPU_ADD_TAG("audio",Z80,8000000/2)
MDRV_CPU_PROGRAM_MAP(sound_map,0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* source/number of IRQs is unknown */
-// MDRV_CPU_ADD(M68705,18432000/6)
+// MDRV_CPU_ADD_TAG("mcu",M68705,18432000/6)
// MDRV_CPU_PROGRAM_MAP(mcu_map,0)
MDRV_MACHINE_RESET(ta7630) /* init machine */
@@ -1111,11 +1109,11 @@ static MACHINE_DRIVER_START( undoukai )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(MSM5232, 8000000/4)
+ MDRV_SOUND_ADD("msm", MSM5232, 8000000/4)
MDRV_SOUND_CONFIG(msm5232_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
@@ -1129,7 +1127,7 @@ static MACHINE_DRIVER_START( undoukai )
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c
index 1ff59387866..fe25f9d0f58 100644
--- a/src/mame/drivers/4enraya.c
+++ b/src/mame/drivers/4enraya.c
@@ -159,7 +159,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( 4enraya )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000/2)
+ MDRV_CPU_ADD_TAG("main",Z80,8000000/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
@@ -179,7 +179,7 @@ static MACHINE_DRIVER_START( 4enraya )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/4 /* guess */)
+ MDRV_SOUND_ADD("ay", AY8910, 8000000/4 /* guess */)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index 3f9458a2f8a..a5fbb28345d 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -280,7 +280,7 @@ static MACHINE_DRIVER_START( spcewars )
MDRV_IMPORT_FROM(invaders_samples_audio)
/* extra audio channel */
- MDRV_SOUND_ADD(SPEAKER, 0)
+ MDRV_SOUND_ADD("speaker", SPEAKER, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -561,12 +561,12 @@ static MACHINE_DRIVER_START( lrescue )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(lrescue_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
/* extra audio channel */
- MDRV_SOUND_ADD(SPEAKER, 0)
+ MDRV_SOUND_ADD("speaker", SPEAKER, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -808,12 +808,12 @@ static MACHINE_DRIVER_START( schaser )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn", SN76477, 0)
MDRV_SOUND_CONFIG(schaser_sn76477_interface)
// This will be routed to the discrete system when that feature is working.
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(schaser)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -874,7 +874,7 @@ static MACHINE_DRIVER_START( schasrcv )
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
- MDRV_SOUND_ADD(SPEAKER, 0)
+ MDRV_SOUND_ADD("speaker", SPEAKER, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -1143,7 +1143,7 @@ static MACHINE_DRIVER_START( polaris )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(polaris)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1437,7 +1437,7 @@ static MACHINE_DRIVER_START( indianbt )
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(indianbt)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index 3714db5e99c..480dbfd96c9 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -271,11 +271,11 @@ static const struct upd7759_interface upd7759_interface_2 =
static MACHINE_DRIVER_START( 88games )
/* basic machine hardware */
- MDRV_CPU_ADD(KONAMI, 3000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* ? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", k88games_interrupt)
- MDRV_CPU_ADD(Z80, 3579545)
+ MDRV_CPU_ADD_TAG("audio", Z80, 3579545)
MDRV_CPU_PROGRAM_MAP(sound_map,0)
MDRV_MACHINE_RESET(88games)
@@ -298,15 +298,15 @@ static MACHINE_DRIVER_START( 88games )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "mono", 0.75)
MDRV_SOUND_ROUTE(1, "mono", 0.75)
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd1", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd2", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c
index f40fb51f64d..d6aceb3ce75 100644
--- a/src/mame/drivers/ace.c
+++ b/src/mame/drivers/ace.c
@@ -309,7 +309,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( ace )
/* basic machine hardware */
- MDRV_CPU_ADD(8080, 18000000 / 9) /* 2 MHz ? */
+ MDRV_CPU_ADD_TAG("main", 8080, 18000000 / 9) /* 2 MHz ? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
/* video hardware */
diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c
index fcdc13f0fca..8b7998a238d 100644
--- a/src/mame/drivers/acefruit.c
+++ b/src/mame/drivers/acefruit.c
@@ -545,7 +545,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( acefruit )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 2500000) /* 2.5MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 2500000) /* 2.5MHz */
MDRV_CPU_PROGRAM_MAP(acefruit_map,0)
MDRV_CPU_IO_MAP(acefruit_io,0)
MDRV_GFXDECODE(acefruit)
diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c
index 33ab3f5f452..66d63891834 100644
--- a/src/mame/drivers/acommand.c
+++ b/src/mame/drivers/acommand.c
@@ -517,7 +517,7 @@ static INTERRUPT_GEN( acommand_irq )
static MACHINE_DRIVER_START( acommand )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,12000000)
+ MDRV_CPU_ADD_TAG("main",M68000,12000000)
MDRV_CPU_PROGRAM_MAP(acommand,0)
MDRV_CPU_VBLANK_INT_HACK(acommand_irq,2)
@@ -537,11 +537,11 @@ static MACHINE_DRIVER_START( acommand )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 2400000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 2400000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 2400000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 2400000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index 758c6aafe58..789ae73c4c4 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -349,12 +349,11 @@ static const struct YM3812interface ym3812_interface =
static MACHINE_DRIVER_START( actfancr )
/* basic machine hardware */
- MDRV_CPU_ADD(H6280,21477200/3) /* Should be accurate */
+ MDRV_CPU_ADD_TAG("main",H6280,21477200/3) /* Should be accurate */
MDRV_CPU_PROGRAM_MAP(actfan_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* VBL */
- MDRV_CPU_ADD(M6502, 1500000)
- /* audio CPU */ /* Should be accurate */
+ MDRV_CPU_ADD_TAG("audio",M6502, 1500000) /* Should be accurate */
MDRV_CPU_PROGRAM_MAP(dec0_s_map,0)
/* video hardware */
@@ -375,17 +374,17 @@ static MACHINE_DRIVER_START( actfancr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
MDRV_SOUND_ROUTE(2, "mono", 0.90)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD(OKIM6295, 1024188)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1024188)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_DRIVER_END
@@ -393,12 +392,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( triothep )
/* basic machine hardware */
- MDRV_CPU_ADD(H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */
+ MDRV_CPU_ADD_TAG("main",H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */
MDRV_CPU_PROGRAM_MAP(triothep_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* VBL */
- MDRV_CPU_ADD(M6502, XTAL_12MHz/8) /* verified on pcb */
- /* audio CPU */ /* Should be accurate */
+ MDRV_CPU_ADD_TAG("audio",M6502, XTAL_12MHz/8) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(dec0_s_map,0)
/* video hardware */
@@ -419,17 +417,17 @@ static MACHINE_DRIVER_START( triothep )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
MDRV_SOUND_ROUTE(2, "mono", 0.90)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(YM3812, XTAL_12MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM3812, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD(OKIM6295, XTAL_1_056MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_1_056MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c
index d570cfa6211..f3d4b879efa 100644
--- a/src/mame/drivers/adp.c
+++ b/src/mame/drivers/adp.c
@@ -172,7 +172,7 @@ static MACHINE_DRIVER_START( skattv )
MDRV_VIDEO_UPDATE(skattv)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 3686400/2)
+ MDRV_SOUND_ADD("ay", AY8910, 3686400/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c
index 1d2c875f8d0..aece24414e9 100644
--- a/src/mame/drivers/aeroboto.c
+++ b/src/mame/drivers/aeroboto.c
@@ -231,11 +231,11 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( formatz )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, XTAL_10MHz/8) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M6809, XTAL_10MHz/8) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", aeroboto_interrupt)
- MDRV_CPU_ADD(M6809, XTAL_10MHz/16) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("audio", M6809, XTAL_10MHz/16) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(sound_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -258,11 +258,11 @@ static MACHINE_DRIVER_START( formatz )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_10MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_10MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, XTAL_10MHz/16) /* verified on pcb */
+ MDRV_SOUND_ADD("ay2", AY8910, XTAL_10MHz/16) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 41dfd8dae24..35abde6d0fe 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -1324,11 +1324,11 @@ static const struct YM3812interface ym3812_interface =
static MACHINE_DRIVER_START( pspikes )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */
+ MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */
MDRV_CPU_PROGRAM_MAP(pspikes_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */
+ MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* 4 MHz ??? */
MDRV_CPU_PROGRAM_MAP(sound_map,0)
MDRV_CPU_IO_MAP(turbofrc_sound_portmap,0)
/* IRQs are triggered by the YM2610 */
@@ -1352,7 +1352,7 @@ static MACHINE_DRIVER_START( pspikes )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -1363,7 +1363,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( spikes91 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */
+ MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */
MDRV_CPU_PROGRAM_MAP(spikes91_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */
@@ -1394,7 +1394,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pspikesb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */
+ MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */
MDRV_CPU_PROGRAM_MAP(pspikesb_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */
@@ -1414,7 +1414,7 @@ static MACHINE_DRIVER_START( pspikesb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1422,7 +1422,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pspikesc )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */
+ MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */
MDRV_CPU_PROGRAM_MAP(pspikesc_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */
@@ -1442,7 +1442,7 @@ static MACHINE_DRIVER_START( pspikesc )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1450,11 +1450,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( karatblz )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */
+ MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */
MDRV_CPU_PROGRAM_MAP(karatblz_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
- MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */
+ MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* 4 MHz ??? */
MDRV_CPU_PROGRAM_MAP(sound_map,0)
MDRV_CPU_IO_MAP(turbofrc_sound_portmap,0)
/* IRQs are triggered by the YM2610 */
@@ -1477,7 +1477,7 @@ static MACHINE_DRIVER_START( karatblz )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -1488,11 +1488,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( spinlbrk )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */
+ MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */
MDRV_CPU_PROGRAM_MAP(spinlbrk_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* there are vectors for 3 and 4 too */
- MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */
+ MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* 4 MHz ??? */
MDRV_CPU_PROGRAM_MAP(sound_map,0)
MDRV_CPU_IO_MAP(turbofrc_sound_portmap,0)
/* IRQs are triggered by the YM2610 */
@@ -1515,7 +1515,7 @@ static MACHINE_DRIVER_START( spinlbrk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -1526,11 +1526,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( turbofrc )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (verified on pcb) */
+ MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (verified on pcb) */
MDRV_CPU_PROGRAM_MAP(turbofrc_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD(Z80,5000000) /* 5 MHz (verified on pcb) */
+ MDRV_CPU_ADD_TAG("audio",Z80,5000000) /* 5 MHz (verified on pcb) */
MDRV_CPU_PROGRAM_MAP(sound_map,0)
MDRV_CPU_IO_MAP(turbofrc_sound_portmap,0)
/* IRQs are triggered by the YM2610 */
@@ -1553,7 +1553,7 @@ static MACHINE_DRIVER_START( turbofrc )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000) /* (verified on pcb) */
+ MDRV_SOUND_ADD("ym", YM2610, 8000000) /* (verified on pcb) */
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -1564,11 +1564,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( aerofgtb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */
+ MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */
MDRV_CPU_PROGRAM_MAP(aerofgtb_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */
+ MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* 4 MHz ??? */
MDRV_CPU_PROGRAM_MAP(sound_map,0)
MDRV_CPU_IO_MAP(aerofgt_sound_portmap,0)
/* IRQs are triggered by the YM2610 */
@@ -1592,7 +1592,7 @@ static MACHINE_DRIVER_START( aerofgtb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -1603,11 +1603,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( aerofgt )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (verified on pcb) */
+ MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (verified on pcb) */
MDRV_CPU_PROGRAM_MAP(aerofgt_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD(Z80,5000000) /* 5 MHz (verified on pcb) */
+ MDRV_CPU_ADD_TAG("audio",Z80,5000000) /* 5 MHz (verified on pcb) */
MDRV_CPU_PROGRAM_MAP(sound_map,0)
MDRV_CPU_IO_MAP(aerofgt_sound_portmap,0)
/* IRQs are triggered by the YM2610 */
@@ -1631,7 +1631,7 @@ static MACHINE_DRIVER_START( aerofgt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000) /* (verified on pcb) */
+ MDRV_SOUND_ADD("ym", YM2610, 8000000) /* (verified on pcb) */
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -1642,11 +1642,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( aerfboot )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */
+ MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */
MDRV_CPU_PROGRAM_MAP(aerfboot_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
- MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */
+ MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* 4 MHz ??? */
MDRV_CPU_PROGRAM_MAP(aerfboot_sound_map,0)
/* video hardware */
@@ -1666,7 +1666,7 @@ static MACHINE_DRIVER_START( aerfboot )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1674,7 +1674,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( aerfboo2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */
+ MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */
MDRV_CPU_PROGRAM_MAP(aerfboo2_map,0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -1695,7 +1695,7 @@ static MACHINE_DRIVER_START( aerfboo2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1703,11 +1703,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( wbbc97 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */
+ MDRV_CPU_ADD_TAG("main",M68000,20000000/2) /* 10 MHz (?) */
MDRV_CPU_PROGRAM_MAP(wbbc97_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */
+ MDRV_CPU_ADD_TAG("audio",Z80,8000000/2) /* 4 MHz ??? */
MDRV_CPU_PROGRAM_MAP(wbbc97_sound_map,0)
/* IRQs are triggered by the YM3812 */
@@ -1728,11 +1728,11 @@ static MACHINE_DRIVER_START( wbbc97 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 3579545)
+ MDRV_SOUND_ADD("ym", YM3812, 3579545)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 9eab169867f..10f98d6b866 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -603,17 +603,17 @@ static MACHINE_RESET( airbustr )
static MACHINE_DRIVER_START( airbustr )
// basic machine hardware
- MDRV_CPU_ADD(Z80, 6000000) // ???
+ MDRV_CPU_ADD_TAG("master", Z80, 6000000) // ???
MDRV_CPU_PROGRAM_MAP(master_map, 0)
MDRV_CPU_IO_MAP(master_io_map, 0)
MDRV_CPU_VBLANK_INT_HACK(master_interrupt, 2) // nmi caused by sub cpu?, ?
- MDRV_CPU_ADD(Z80, 6000000) // ???
+ MDRV_CPU_ADD_TAG("slave", Z80, 6000000) // ???
MDRV_CPU_PROGRAM_MAP(slave_map, 0)
MDRV_CPU_IO_MAP(slave_io_map, 0)
MDRV_CPU_VBLANK_INT_HACK(slave_interrupt, 2) // nmi caused by main cpu, ?
- MDRV_CPU_ADD(Z80, 6000000) // ???
+ MDRV_CPU_ADD_TAG("audio", Z80, 6000000) // ???
MDRV_CPU_PROGRAM_MAP(sound_map, 0)
MDRV_CPU_IO_MAP(sound_io_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // nmi are caused by sub cpu writing a sound command
@@ -641,14 +641,14 @@ static MACHINE_DRIVER_START( airbustr )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 0.25)
MDRV_SOUND_ROUTE(2, "mono", 0.25)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(OKIM6295, 12000000/4)
+ MDRV_SOUND_ADD("oki", OKIM6295, 12000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index 2e8e52cd163..ff923dbe501 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -228,14 +228,14 @@ static const struct K007232_interface k007232_interface_2 =
static MACHINE_DRIVER_START( ajax )
/* basic machine hardware */
- MDRV_CPU_ADD(KONAMI, 3000000) /* 12/4 MHz*/
+ MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* 12/4 MHz*/
MDRV_CPU_PROGRAM_MAP(ajax_main_map,0)
MDRV_CPU_VBLANK_INT("main", ajax_interrupt) /* IRQs triggered by the 051960 */
- MDRV_CPU_ADD(M6809, 3000000) /* ? */
+ MDRV_CPU_ADD_TAG("sub", M6809, 3000000) /* ? */
MDRV_CPU_PROGRAM_MAP(ajax_sub_map,0)
- MDRV_CPU_ADD(Z80, 3579545) /* 3.58 MHz */
+ MDRV_CPU_ADD_TAG("audio", Z80, 3579545) /* 3.58 MHz */
MDRV_CPU_PROGRAM_MAP(ajax_sound_map,0)
MDRV_INTERLEAVE(10)
@@ -259,18 +259,18 @@ static MACHINE_DRIVER_START( ajax )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami1", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface_1)
MDRV_SOUND_ROUTE(0, "left", 0.20)
MDRV_SOUND_ROUTE(0, "right", 0.20)
MDRV_SOUND_ROUTE(1, "left", 0.20)
MDRV_SOUND_ROUTE(1, "right", 0.20)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami2", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface_2)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c
index 73283e5e15e..4904b0034e2 100644
--- a/src/mame/drivers/aleck64.c
+++ b/src/mame/drivers/aleck64.c
@@ -427,12 +427,12 @@ static MACHINE_RESET( aleck64 )
static MACHINE_DRIVER_START( aleck64 )
/* basic machine hardware */
- MDRV_CPU_ADD(R4600BE, 93750000)
+ MDRV_CPU_ADD_TAG("main", R4600BE, 93750000)
MDRV_CPU_CONFIG(config)
MDRV_CPU_PROGRAM_MAP(n64_map, 0)
MDRV_CPU_VBLANK_INT("main", n64_vblank)
- MDRV_CPU_ADD(RSP, 62500000)
+ MDRV_CPU_ADD_TAG("rsp", RSP, 62500000)
MDRV_CPU_CONFIG(n64_rsp_config)
MDRV_CPU_PROGRAM_MAP(rsp_map, 0)
@@ -451,9 +451,9 @@ static MACHINE_DRIVER_START( aleck64 )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac1", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac2", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index 76ed5dfbcef..a915c8aa51f 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -490,14 +490,14 @@ static MACHINE_DRIVER_START( alg_r1 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(CUSTOM, 3579545)
+ MDRV_SOUND_ADD("amiga", CUSTOM, 3579545)
MDRV_SOUND_CONFIG(amiga_custom_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(1, "right", 0.25)
MDRV_SOUND_ROUTE(2, "right", 0.25)
MDRV_SOUND_ROUTE(3, "left", 0.25)
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("laserdisc", CUSTOM, 0)
MDRV_SOUND_CONFIG(laserdisc_custom_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index 1ef1c30ec9c..a84301cf3bf 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -239,11 +239,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(KONAMI, 6000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", KONAMI, 6000000) /* ? */
MDRV_CPU_PROGRAM_MAP(aliens_map,0)
MDRV_CPU_VBLANK_INT("main", aliens_interrupt)
- MDRV_CPU_ADD(Z80, 3579545)
+ MDRV_CPU_ADD_TAG("audio", Z80, 3579545)
MDRV_CPU_PROGRAM_MAP(aliens_sound_map,0)
MDRV_MACHINE_RESET(aliens)
@@ -266,12 +266,12 @@ static MACHINE_DRIVER_START( aliens )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index f60039150b7..b91bbde7f4c 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -1990,12 +1990,11 @@ static INTERRUPT_GEN( alpha68k_interrupt )
static MACHINE_DRIVER_START( sstingry )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 6000000) /* 24MHz/4? */
+ MDRV_CPU_ADD_TAG("main", M68000, 6000000) /* 24MHz/4? */
MDRV_CPU_PROGRAM_MAP(kyros_map,0)
MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
- MDRV_CPU_ADD(Z80, 3579545)
- /* audio CPU */ /* ? */
+ MDRV_CPU_ADD_TAG("audio", Z80, 3579545)
MDRV_CPU_PROGRAM_MAP(sstingry_sound_map,0)
MDRV_CPU_IO_MAP(kyros_sound_portmap,0)
//AT
@@ -2023,16 +2022,16 @@ static MACHINE_DRIVER_START( sstingry )
//AT
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym3", YM2203, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
//ZT
MACHINE_DRIVER_END
@@ -2040,12 +2039,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kyros )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 6000000) /* 24MHz/4? */
+ MDRV_CPU_ADD_TAG("main", M68000, 6000000) /* 24MHz/4? */
MDRV_CPU_PROGRAM_MAP(kyros_map,0)
MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
- MDRV_CPU_ADD(Z80, 3579545)
- /* audio CPU */ /* ? */
+ MDRV_CPU_ADD_TAG("audio", Z80, 3579545)
MDRV_CPU_PROGRAM_MAP(kyros_sound_map,0)
MDRV_CPU_IO_MAP(kyros_sound_portmap,0)
//AT
@@ -2072,16 +2070,16 @@ static MACHINE_DRIVER_START( kyros )
//AT
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym3", YM2203, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
//ZT
MACHINE_DRIVER_END
@@ -2116,7 +2114,7 @@ static MACHINE_DRIVER_START( jongbou )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MACHINE_DRIVER_END
@@ -2148,7 +2146,7 @@ static MACHINE_DRIVER_START( alpha68k_I )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -2184,14 +2182,14 @@ static MACHINE_DRIVER_START( alpha68k_II )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
- MDRV_SOUND_ADD(YM2413, 8000000)
+ MDRV_SOUND_ADD("ym2", YM2413, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
@@ -2232,14 +2230,14 @@ static MACHINE_DRIVER_START( alpha68k_II_gm )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
- MDRV_SOUND_ADD(YM2413, 8000000)
+ MDRV_SOUND_ADD("ym2", YM2413, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
//ZT
@@ -2274,14 +2272,14 @@ static MACHINE_DRIVER_START( alpha68k_V )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
- MDRV_SOUND_ADD(YM2413, 8000000)
+ MDRV_SOUND_ADD("ym2", YM2413, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
@@ -2315,14 +2313,14 @@ static MACHINE_DRIVER_START( alpha68k_V_sb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
- MDRV_SOUND_ADD(YM2413, 8000000)
+ MDRV_SOUND_ADD("ym2", YM2413, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
@@ -2355,7 +2353,7 @@ static MACHINE_DRIVER_START( tnexspce )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index 2dd44f09d43..256aefb2555 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -204,11 +204,11 @@ static MACHINE_DRIVER_START( ambush )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index d2610f1ab9b..182b09619f3 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -1043,7 +1043,7 @@ static MACHINE_DRIVER_START( ampoker2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910,MASTER_CLOCK/4) /* 1.5 MHz, measured */
+ MDRV_SOUND_ADD("ay", AY8910,MASTER_CLOCK/4) /* 1.5 MHz, measured */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index 9eb9ed3755f..4dfac7ab22e 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -279,7 +279,7 @@ static MACHINE_DRIVER_START( amspdwy )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3000000)
+ MDRV_SOUND_ADD("ym", YM2151, 3000000)
MDRV_SOUND_CONFIG(amspdwy_ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index 95cd8199ec7..aa88dd7c9db 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -625,14 +625,14 @@ static MACHINE_DRIVER_START( angelkds )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.65)
MDRV_SOUND_ROUTE(1, "mono", 0.65)
MDRV_SOUND_ROUTE(2, "mono", 0.65)
MDRV_SOUND_ROUTE(3, "mono", 0.45)
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 4000000)
MDRV_SOUND_ROUTE(0, "mono", 0.65)
MDRV_SOUND_ROUTE(1, "mono", 0.65)
MDRV_SOUND_ROUTE(2, "mono", 0.65)
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index 5cafad62d21..131ee47e3a8 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -235,16 +235,16 @@ static MACHINE_DRIVER_START( appoooh )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489, 18432000/6)
+ MDRV_SOUND_ADD("sn1", SN76489, 18432000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(SN76489, 18432000/6)
+ MDRV_SOUND_ADD("sn2", SN76489, 18432000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(SN76489, 18432000/6)
+ MDRV_SOUND_ADD("sn3", SN76489, 18432000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -437,16 +437,16 @@ static MACHINE_DRIVER_START( robowres )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489, 18432000/6)
+ MDRV_SOUND_ADD("sn1", SN76489, 18432000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(SN76489, 18432000/6)
+ MDRV_SOUND_ADD("sn2", SN76489, 18432000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(SN76489, 18432000/6)
+ MDRV_SOUND_ADD("sn3", SN76489, 18432000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index 4949095a9ef..4bf12e7e94e 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -376,12 +376,12 @@ static MACHINE_DRIVER_START( aquarium )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 1122000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1122000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47)
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index f0fb6c4e1aa..16ec3c4bc5a 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -373,7 +373,7 @@ static MACHINE_DRIVER_START( arabian )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, MAIN_OSC/4/2)
+ MDRV_SOUND_ADD("ay", AY8910, MAIN_OSC/4/2)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c
index 8c75debc8ff..78512d6e4be 100644
--- a/src/mame/drivers/arcadecl.c
+++ b/src/mame/drivers/arcadecl.c
@@ -368,7 +368,7 @@ static MACHINE_DRIVER_START( arcadecl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, MASTER_CLOCK/4/3)
+ MDRV_SOUND_ADD("oki", OKIM6295, MASTER_CLOCK/4/3)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index bea4cac1d80..f07cbd07bf2 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -307,7 +307,7 @@ static MACHINE_DRIVER_START( arcadia )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(CUSTOM, 3579545)
+ MDRV_SOUND_ADD("amiga", CUSTOM, 3579545)
MDRV_SOUND_CONFIG(amiga_custom_interface)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index f867e33eccf..4f9e80e5b4f 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -727,7 +727,7 @@ static MACHINE_DRIVER_START( argus )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 6000000 / 4)
+ MDRV_SOUND_ADD("ym", YM2203, 6000000 / 4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
@@ -764,14 +764,14 @@ static MACHINE_DRIVER_START( valtric )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 6000000 / 4)
+ MDRV_SOUND_ADD("ym1", YM2203, 6000000 / 4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(YM2203, 6000000 / 4)
+ MDRV_SOUND_ADD("ym2", YM2203, 6000000 / 4)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
@@ -807,14 +807,14 @@ static MACHINE_DRIVER_START( butasan )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 6000000 / 4)
+ MDRV_SOUND_ADD("ym1", YM2203, 6000000 / 4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.30)
MDRV_SOUND_ROUTE(1, "mono", 0.30)
MDRV_SOUND_ROUTE(2, "mono", 0.30)
MDRV_SOUND_ROUTE(3, "mono", 1.0)
- MDRV_SOUND_ADD(YM2203, 6000000 / 4)
+ MDRV_SOUND_ADD("ym2", YM2203, 6000000 / 4)
MDRV_SOUND_ROUTE(0, "mono", 0.30)
MDRV_SOUND_ROUTE(1, "mono", 0.30)
MDRV_SOUND_ROUTE(2, "mono", 0.30)
@@ -850,14 +850,14 @@ static MACHINE_DRIVER_START( bombsa )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 12000000 / 8)
+ MDRV_SOUND_ADD("ym1", YM2203, 12000000 / 8)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.30)
MDRV_SOUND_ROUTE(1, "mono", 0.30)
MDRV_SOUND_ROUTE(2, "mono", 0.30)
MDRV_SOUND_ROUTE(3, "mono", 1.0)
- MDRV_SOUND_ADD(YM2203, 12000000 / 8)
+ MDRV_SOUND_ADD("ym2", YM2203, 12000000 / 8)
MDRV_SOUND_ROUTE(0, "mono", 0.30)
MDRV_SOUND_ROUTE(1, "mono", 0.30)
MDRV_SOUND_ROUTE(2, "mono", 0.30)
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index 2b4d3b1a991..edf05391f84 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -778,7 +778,7 @@ static MACHINE_DRIVER_START( arkanoid )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_12MHz/4/2) /* YM2149 clock is 3mhz, pin 26 is low so 3mhz/2 */
+ MDRV_SOUND_ADD("ay", AY8910, XTAL_12MHz/4/2) /* YM2149 clock is 3mhz, pin 26 is low so 3mhz/2 */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index a18f98c7ef0..1966b73188d 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -783,13 +783,13 @@ static MACHINE_DRIVER_START( terraf )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -830,13 +830,13 @@ static MACHINE_DRIVER_START( terrafb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -872,13 +872,13 @@ static MACHINE_DRIVER_START( kodure )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
@@ -914,13 +914,13 @@ static MACHINE_DRIVER_START( armedf )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
@@ -955,13 +955,13 @@ static MACHINE_DRIVER_START( cclimbr2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
@@ -996,13 +996,13 @@ static MACHINE_DRIVER_START( legion )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
@@ -1038,13 +1038,13 @@ static MACHINE_DRIVER_START( legiono )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index 734b6edb171..d12d4a6c39e 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -718,7 +718,7 @@ static MACHINE_DRIVER_START( artmagic )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, MASTER_CLOCK_40MHz/3/10)
+ MDRV_SOUND_ADD("oki", OKIM6295, MASTER_CLOCK_40MHz/3/10)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index 18775bec55c..85d6b621f39 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -363,11 +363,11 @@ static MACHINE_DRIVER_START( ashnojoe )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 4000000) /* 4 MHz (verified on pcb) */
+ MDRV_SOUND_ADD("ym", YM2203, 4000000) /* 4 MHz (verified on pcb) */
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index a769aae4cbe..4cfad52e603 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -280,11 +280,11 @@ static MACHINE_DRIVER_START( asterix )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K053260, 4000000)
+ MDRV_SOUND_ADD("konami", K053260, 4000000)
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index 57c7b83ae62..a32e37769bc 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -603,7 +603,7 @@ static MACHINE_DRIVER_START( asteroid )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("disc", DISCRETE, 0)
+ MDRV_SOUND_ADD("disc", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(asteroid)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4)
MACHINE_DRIVER_END
@@ -631,7 +631,7 @@ static MACHINE_DRIVER_START( astdelux )
MDRV_SOUND_CONFIG_DISCRETE(astdelux)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("pokey", POKEY, MASTER_CLOCK/8)
MDRV_SOUND_CONFIG(pokey_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index 702cc16a00f..0b35eea6714 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -530,7 +530,7 @@ static MACHINE_DRIVER_START( kamikaze )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(astinvad_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -566,7 +566,7 @@ static MACHINE_DRIVER_START( spaceint )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(astinvad_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index 4d6a74072d8..7c24629cf68 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -1299,7 +1299,7 @@ static MACHINE_DRIVER_START( astrocade_mono_sound )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(ASTROCADE, ASTROCADE_CLOCK/4)
+ MDRV_SOUND_ADD("astrocade", ASTROCADE, ASTROCADE_CLOCK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1309,10 +1309,10 @@ static MACHINE_DRIVER_START( astrocade_stereo_sound )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(ASTROCADE, ASTROCADE_CLOCK/4)
+ MDRV_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD(ASTROCADE, ASTROCADE_CLOCK/4)
+ MDRV_SOUND_ADD("astrocade2", ASTROCADE, ASTROCADE_CLOCK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
@@ -1335,7 +1335,7 @@ static MACHINE_DRIVER_START( seawolf2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(seawolf2_samples_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(1, "left", 0.25)
@@ -1389,7 +1389,7 @@ static MACHINE_DRIVER_START( wow )
/* sound hardware */
MDRV_SPEAKER_ADD("center", 0.0, 0.0, 1.0)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(wow_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "center", 0.85)
MACHINE_DRIVER_END
@@ -1411,13 +1411,13 @@ static MACHINE_DRIVER_START( gorf )
MDRV_SPEAKER_ADD("upper", 0.0, 0.0, 1.0)
MDRV_SPEAKER_ADD("lower", 0.0, -0.5, 1.0)
- MDRV_SOUND_ADD(ASTROCADE, ASTROCADE_CLOCK/4)
+ MDRV_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "upper", 1.0)
- MDRV_SOUND_ADD(ASTROCADE, ASTROCADE_CLOCK/4)
+ MDRV_SOUND_ADD("astrocade2", ASTROCADE, ASTROCADE_CLOCK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lower", 1.0)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(gorf_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "upper", 0.85)
MACHINE_DRIVER_END
@@ -1474,7 +1474,7 @@ static MACHINE_DRIVER_START( tenpindx )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8912, ASTROCADE_CLOCK/4) /* real clock unknown */
+ MDRV_SOUND_ADD("ay", AY8912, ASTROCADE_CLOCK/4) /* real clock unknown */
MDRV_SOUND_CONFIG(ay8912_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index 8cecb2f9986..8ac3193c887 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -274,7 +274,7 @@ static MACHINE_DRIVER_START( astrocorp )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, XTAL_20MHz/16)
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_20MHz/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index 06ac89d5b12..c1e4310fd32 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -813,7 +813,7 @@ static MACHINE_DRIVER_START( bonzeadv )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -851,12 +851,12 @@ static MACHINE_DRIVER_START( asuka )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_16MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD(MSM5205, XTAL_384kHz) /* verified on pcb */
+ MDRV_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -892,7 +892,7 @@ static MACHINE_DRIVER_START( cadash )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_8MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
@@ -929,12 +929,12 @@ static MACHINE_DRIVER_START( mofflott )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -970,7 +970,7 @@ static MACHINE_DRIVER_START( galmedes )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
@@ -1007,7 +1007,7 @@ static MACHINE_DRIVER_START( eto )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c
index 65f86dd42a9..5d85e8de3e3 100644
--- a/src/mame/drivers/atarifb.c
+++ b/src/mame/drivers/atarifb.c
@@ -581,7 +581,7 @@ static MACHINE_DRIVER_START( atarifb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(atarifb)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.18)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index 72f91358269..7ab7b276eed 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -727,16 +727,16 @@ static MACHINE_DRIVER_START( atarisy1 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, ATARI_CLOCK_14MHz/4)
+ MDRV_SOUND_ADD("ym", YM2151, ATARI_CLOCK_14MHz/4)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
- MDRV_SOUND_ADD(POKEY, ATARI_CLOCK_14MHz/8)
+ MDRV_SOUND_ADD("pokey", POKEY, ATARI_CLOCK_14MHz/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
- MDRV_SOUND_ADD(TMS5220, ATARI_CLOCK_14MHz/2/11)
+ MDRV_SOUND_ADD("tms", TMS5220, ATARI_CLOCK_14MHz/2/11)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index f810f2df43e..d6037be0d88 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -1165,19 +1165,19 @@ static MACHINE_DRIVER_START( atarisy2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("ym", YM2151, SOUND_CLOCK/4)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK/4)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
- MDRV_SOUND_ADD(POKEY, SOUND_CLOCK/8)
+ MDRV_SOUND_ADD("pokey1", POKEY, SOUND_CLOCK/8)
MDRV_SOUND_CONFIG(pokey_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.35)
- MDRV_SOUND_ADD(POKEY, SOUND_CLOCK/8)
+ MDRV_SOUND_ADD("pokey2", POKEY, SOUND_CLOCK/8)
MDRV_SOUND_CONFIG(pokey_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.35)
- MDRV_SOUND_ADD_TAG("tms", TMS5220, MASTER_CLOCK/4/4/2)
+ MDRV_SOUND_ADD("tms", TMS5220, MASTER_CLOCK/4/4/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index 278ae94c5a6..8e4b6e85c4d 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -330,7 +330,7 @@ static MACHINE_DRIVER_START( ataxx )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("leland", CUSTOM, 0)
MDRV_SOUND_CONFIG(i80186_custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -342,7 +342,7 @@ static MACHINE_DRIVER_START( wsf )
MDRV_IMPORT_FROM(ataxx)
/* sound hardware */
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_ROUTE(0, "mono", 0.40)
MDRV_SOUND_ROUTE(1, "mono", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index df8f88477f7..d09955d3428 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -365,11 +365,11 @@ static MACHINE_DRIVER_START( atetris )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/8)
MDRV_SOUND_CONFIG(pokey_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/8)
MDRV_SOUND_CONFIG(pokey_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -401,13 +401,13 @@ static MACHINE_DRIVER_START( atetrsb2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, BOOTLEG_CLOCK/8)
+ MDRV_SOUND_ADD("sn1", SN76496, BOOTLEG_CLOCK/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76496, BOOTLEG_CLOCK/8)
+ MDRV_SOUND_ADD("sn2", SN76496, BOOTLEG_CLOCK/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76496, BOOTLEG_CLOCK/8)
+ MDRV_SOUND_ADD("sn3", SN76496, BOOTLEG_CLOCK/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c
index 6ab5d98802a..53e1a4df620 100644
--- a/src/mame/drivers/attckufo.c
+++ b/src/mame/drivers/attckufo.c
@@ -148,7 +148,7 @@ static MACHINE_DRIVER_START( attckufo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("attckufo", CUSTOM, 0)
MDRV_SOUND_CONFIG(attckufo_sound_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c
index 09f2593ef7e..1d16b0ac3aa 100644
--- a/src/mame/drivers/avalnche.c
+++ b/src/mame/drivers/avalnche.c
@@ -234,7 +234,7 @@ static MACHINE_DRIVER_START( avalnche )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(avalnche)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c
index 8e97e8301f4..36a18f90d22 100644
--- a/src/mame/drivers/aztarac.c
+++ b/src/mame/drivers/aztarac.c
@@ -171,16 +171,16 @@ static MACHINE_DRIVER_START( aztarac )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay3", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay4", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index dc844cb2986..903a8b1b57a 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -514,7 +514,7 @@ static MACHINE_DRIVER_START( backfire )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 28000000 / 2)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 28000000 / 2)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c
index 39fa3d2f231..e70531435e5 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -463,7 +463,7 @@ static MACHINE_DRIVER_START( badlands )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, ATARI_CLOCK_14MHz/4)
+ MDRV_SOUND_ADD("ym", YM2151, ATARI_CLOCK_14MHz/4)
MDRV_SOUND_ROUTE(0, "mono", 0.30)
MDRV_SOUND_ROUTE(1, "mono", 0.30)
MACHINE_DRIVER_END
@@ -679,7 +679,7 @@ static MACHINE_DRIVER_START( badlandb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 2800000/4)
+ MDRV_SOUND_ADD("ym", YM2151, 2800000/4)
MDRV_SOUND_ROUTE(0, "mono", 0.30)
MDRV_SOUND_ROUTE(1, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index 803b66f6057..c0ace85decd 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -483,11 +483,11 @@ static MACHINE_DRIVER_START( bagman )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(TMS5110A, 640000)
+ MDRV_SOUND_ADD("tms", TMS5110A, 640000)
MDRV_SOUND_CONFIG(tms5110_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -519,12 +519,12 @@ static MACHINE_DRIVER_START( pickin )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
/* maybe */
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
@@ -574,11 +574,11 @@ static MACHINE_DRIVER_START( botanic )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c
index 2a2f4d97ec2..dcbb6936f8a 100644
--- a/src/mame/drivers/balsente.c
+++ b/src/mame/drivers/balsente.c
@@ -1202,27 +1202,27 @@ static MACHINE_DRIVER_START( balsente )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CEM3394, 0)
+ MDRV_SOUND_ADD("cem1", CEM3394, 0)
MDRV_SOUND_CONFIG(cem_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD(CEM3394, 0)
+ MDRV_SOUND_ADD("cem2", CEM3394, 0)
MDRV_SOUND_CONFIG(cem_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD(CEM3394, 0)
+ MDRV_SOUND_ADD("cem3", CEM3394, 0)
MDRV_SOUND_CONFIG(cem_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD(CEM3394, 0)
+ MDRV_SOUND_ADD("cem4", CEM3394, 0)
MDRV_SOUND_CONFIG(cem_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD(CEM3394, 0)
+ MDRV_SOUND_ADD("cem5", CEM3394, 0)
MDRV_SOUND_CONFIG(cem_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD(CEM3394, 0)
+ MDRV_SOUND_ADD("cem6", CEM3394, 0)
MDRV_SOUND_CONFIG(cem_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c
index 873126bff17..b947b67fb1b 100644
--- a/src/mame/drivers/bankp.c
+++ b/src/mame/drivers/bankp.c
@@ -279,13 +279,13 @@ static MACHINE_DRIVER_START( bankp )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489, BANKP_SN76496_CLOCK)
+ MDRV_SOUND_ADD("sn1", SN76489, BANKP_SN76496_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76489, BANKP_SN76496_CLOCK)
+ MDRV_SOUND_ADD("sn2", SN76489, BANKP_SN76496_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76489, BANKP_SN76496_CLOCK)
+ MDRV_SOUND_ADD("sn3", SN76489, BANKP_SN76496_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index 66b600dd41a..27e64bbe59c 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -422,7 +422,7 @@ static MACHINE_DRIVER_START( baraduke )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO_CUS30, 49152000/2048)
+ MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index 27235a04501..6e1a34e0889 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -280,7 +280,7 @@ static MACHINE_DRIVER_START( battlane )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 3000000)
+ MDRV_SOUND_ADD("ym", YM3526, 3000000)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c
index 6017ef28e53..3fe5877f0f5 100644
--- a/src/mame/drivers/battlera.c
+++ b/src/mame/drivers/battlera.c
@@ -269,16 +269,16 @@ static MACHINE_DRIVER_START( battlera )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, 12000000 / 8)
+ MDRV_SOUND_ADD("ym", YM2203, 12000000 / 8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.85)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.85)
- MDRV_SOUND_ADD(C6280, 21477270/6)
+ MDRV_SOUND_ADD("huc", C6280, 21477270/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c
index edaf04f0cfb..ea28524efbc 100644
--- a/src/mame/drivers/battlex.c
+++ b/src/mame/drivers/battlex.c
@@ -229,7 +229,7 @@ static MACHINE_DRIVER_START( battlex )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 10000000/8)
+ MDRV_SOUND_ADD("ay", AY8910, 10000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c
index d9375cb1350..9c3a573a492 100644
--- a/src/mame/drivers/battlnts.c
+++ b/src/mame/drivers/battlnts.c
@@ -285,10 +285,10 @@ static MACHINE_DRIVER_START( battlnts )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym1", YM3812, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index fa8e54f8517..7b044d661eb 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -760,7 +760,7 @@ static MACHINE_DRIVER_START( bbusters )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 3.0)
MDRV_SOUND_ROUTE(0, "right", 3.0)
@@ -802,7 +802,7 @@ static MACHINE_DRIVER_START( mechatt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2608, 8000000)
+ MDRV_SOUND_ADD("ym", YM2608, 8000000)
MDRV_SOUND_CONFIG(ym2608_interface)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(0, "right", 0.50)
diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c
index e0fdcd3da99..358aee13aa0 100644
--- a/src/mame/drivers/beezer.c
+++ b/src/mame/drivers/beezer.c
@@ -110,7 +110,7 @@ static MACHINE_DRIVER_START( beezer )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index 8b2345494e1..ae9e8175e9b 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -883,11 +883,11 @@ static MACHINE_DRIVER_START( berzerk )
MDRV_SOUND_RESET(berzerk)
- MDRV_SOUND_ADD(S14001A, 0) /* placeholder - the clock is software controllable */
+ MDRV_SOUND_ADD("speech", S14001A, 0) /* placeholder - the clock is software controllable */
MDRV_SOUND_CONFIG(berzerk_s14001a_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("exidy", CUSTOM, 0)
MDRV_SOUND_CONFIG(berzerk_custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c
index 2625e479d1d..7e550febcd8 100644
--- a/src/mame/drivers/bestleag.c
+++ b/src/mame/drivers/bestleag.c
@@ -333,7 +333,7 @@ static MACHINE_DRIVER_START( bestleag )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1000000) /* Hand-tuned */
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000) /* Hand-tuned */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.00)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.00)
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index 65fb2db3bda..229ba143b35 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -1743,10 +1743,10 @@ static MACHINE_DRIVER_START( bfcobra )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, M6809_XTAL)
+ MDRV_SOUND_ADD("ay", AY8910, M6809_XTAL)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index bb01e1861c3..1a749e9bdc2 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -2252,11 +2252,11 @@ static MACHINE_DRIVER_START( scorpion2_vid )
MDRV_CPU_VBLANK_INT("ADDER", adder2_vbl) // board has a VBL IRQ
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(YM2413, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index 50bc4f66d29..fbd9abbb28b 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -514,10 +514,10 @@ static MACHINE_DRIVER_START( bigevglf )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay", AY8910, 8000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) /* YM2149 really */
- MDRV_SOUND_ADD(MSM5232, 8000000/4)
+ MDRV_SOUND_ADD("msm", MSM5232, 8000000/4)
MDRV_SOUND_CONFIG(msm5232_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index ec9b759593d..d86fbac78fc 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -448,13 +448,13 @@ static MACHINE_DRIVER_START( bigfghtr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c
index 69df2135c95..4b487b2aec1 100644
--- a/src/mame/drivers/bigstrkb.c
+++ b/src/mame/drivers/bigstrkb.c
@@ -242,14 +242,14 @@ static MACHINE_DRIVER_START( bigstrkb )
MDRV_VIDEO_UPDATE(bigstrkb)
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
-// MDRV_SOUND_ADD(YM2151, ym2151_interface)
+// MDRV_SOUND_ADD("ym", YM2151, ym2151_interface)
- MDRV_SOUND_ADD(OKIM6295, 4000000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 4000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30)
- MDRV_SOUND_ADD(OKIM6295, 4000000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 4000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30)
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index 902418fe39c..64852a2d923 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -377,7 +377,7 @@ static MACHINE_DRIVER_START( bionicc )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c
index 5a95f5de5a2..a21b19411b5 100644
--- a/src/mame/drivers/bishi.c
+++ b/src/mame/drivers/bishi.c
@@ -363,7 +363,7 @@ static MACHINE_DRIVER_START( bishi )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, SOUND_CLOCK) /* 16.9344MHz */
+ MDRV_SOUND_ADD("ymz", YMZ280B, SOUND_CLOCK) /* 16.9344MHz */
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index 9e959ffe0b1..aeea3b70122 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -477,14 +477,14 @@ static MACHINE_DRIVER_START( bking )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_6MHz/4)
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_6MHz/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, XTAL_6MHz/4)
+ MDRV_SOUND_ADD("ay2", AY8910, XTAL_6MHz/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c
index 6b6546f8450..8b294177db5 100644
--- a/src/mame/drivers/blackt96.c
+++ b/src/mame/drivers/blackt96.c
@@ -503,12 +503,12 @@ static MACHINE_DRIVER_START( blackt96 )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 8000000/8)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 8000000/8)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47)
- MDRV_SOUND_ADD(OKIM6295, 8000000/8)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 8000000/8)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47)
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index 4f3a1d27434..1eb925630cd 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -368,11 +368,11 @@ static MACHINE_DRIVER_START( bladestl )
called at initialization time */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(YM2203, 3579545)
+ MDRV_SOUND_ADD("ym", YM2203, 3579545)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index f86ceb689e3..4ea1b1e0ba3 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -283,11 +283,11 @@ static MACHINE_DRIVER_START( blktiger )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c
index b3d6119d752..f57e9b7144d 100644
--- a/src/mame/drivers/blmbycar.c
+++ b/src/mame/drivers/blmbycar.c
@@ -404,7 +404,7 @@ static MACHINE_DRIVER_START( blmbycar )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -434,7 +434,7 @@ static MACHINE_DRIVER_START( watrball )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c
index 2364833257a..98ff2ab6729 100644
--- a/src/mame/drivers/blockade.c
+++ b/src/mame/drivers/blockade.c
@@ -478,11 +478,11 @@ static MACHINE_DRIVER_START( blockade )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(blockade_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(blockade)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index a451ba8ddde..1a0c8b386cf 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -236,7 +236,7 @@ static MACHINE_DRIVER_START( blockhl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index e49857c69b2..a075e585f68 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -224,12 +224,12 @@ static MACHINE_DRIVER_START( blockout )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index 1f059e8b01d..d423885a4e1 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -299,11 +299,11 @@ static MACHINE_DRIVER_START( blueprnt )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 10000000/2/2/2)
+ MDRV_SOUND_ADD("ay1", AY8910, 10000000/2/2/2)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 10000000/2/2/2/2)
+ MDRV_SOUND_ADD("ay2", AY8910, 10000000/2/2/2/2)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c
index 63e42f413bc..f3ba7682b4a 100644
--- a/src/mame/drivers/bmcbowl.c
+++ b/src/mame/drivers/bmcbowl.c
@@ -516,12 +516,12 @@ static MACHINE_DRIVER_START( bmcbowl )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(AY8910, 3579545/2)
+ MDRV_SOUND_ADD("ay", AY8910, 3579545/2)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(OKIM6295, 1122000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1122000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index b0e35e3aa12..6f545989c1a 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -1372,12 +1372,12 @@ static MACHINE_DRIVER_START( bnstars )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMF271, 16934400)
+ MDRV_SOUND_ADD("ymf1", YMF271, 16934400)
MDRV_SOUND_CONFIG(ymf271_interface1)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(YMF271, 16934400)
+ MDRV_SOUND_ADD("ymf2", YMF271, 16934400)
MDRV_SOUND_CONFIG(ymf271_interface2)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c
index da19fd9b77f..ea98f7fdcc2 100644
--- a/src/mame/drivers/bogeyman.c
+++ b/src/mame/drivers/bogeyman.c
@@ -250,10 +250,10 @@ static MACHINE_DRIVER_START( bogeyman )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c
index f40d945dc78..7f559b46378 100644
--- a/src/mame/drivers/bombjack.c
+++ b/src/mame/drivers/bombjack.c
@@ -360,13 +360,13 @@ static MACHINE_DRIVER_START( bombjack )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay3", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index d7507c78d26..6be5f7f9629 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -327,17 +327,17 @@ static MACHINE_DRIVER_START( boogwing )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.40)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30)
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index 1e352d9f896..560884c737c 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -428,12 +428,12 @@ static MACHINE_DRIVER_START( bottom9 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami1", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface_1)
MDRV_SOUND_ROUTE(0, "mono", 0.40)
MDRV_SOUND_ROUTE(1, "mono", 0.40)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami2", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface_2)
MDRV_SOUND_ROUTE(0, "mono", 0.40)
MDRV_SOUND_ROUTE(1, "mono", 0.40)
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index 74d5a0df4d0..1230d75547b 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -411,13 +411,13 @@ static MACHINE_DRIVER_START( brkthru )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/8)
MDRV_SOUND_ROUTE(0, "mono", 0.10)
MDRV_SOUND_ROUTE(1, "mono", 0.10)
MDRV_SOUND_ROUTE(2, "mono", 0.10)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(YM3526, MASTER_CLOCK/4)
+ MDRV_SOUND_ADD("ym2", YM3526, MASTER_CLOCK/4)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -460,13 +460,13 @@ static MACHINE_DRIVER_START( darwin )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/8)
MDRV_SOUND_ROUTE(0, "mono", 0.10)
MDRV_SOUND_ROUTE(1, "mono", 0.10)
MDRV_SOUND_ROUTE(2, "mono", 0.10)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(YM3526, MASTER_CLOCK/4)
+ MDRV_SOUND_ADD("ym2", YM3526, MASTER_CLOCK/4)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c
index 225d0192558..b3c7a40f919 100644
--- a/src/mame/drivers/bsktball.c
+++ b/src/mame/drivers/bsktball.c
@@ -231,7 +231,7 @@ static MACHINE_DRIVER_START( bsktball )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(bsktball)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index 24bbea66b93..a76e98a3185 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -1167,10 +1167,10 @@ static MACHINE_DRIVER_START( btime )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c
index 7bbfb8d1770..ca9cc17c474 100644
--- a/src/mame/drivers/btoads.c
+++ b/src/mame/drivers/btoads.c
@@ -361,7 +361,7 @@ static MACHINE_DRIVER_START( btoads )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(BSMT2000, SOUND_CLOCK)
+ MDRV_SOUND_ADD("bsmt", BSMT2000, SOUND_CLOCK)
MDRV_SOUND_CONFIG(bsmt2000_interface_region_1)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index 9ba6660374a..b3af20dbe00 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -719,7 +719,7 @@ static MACHINE_DRIVER_START( tokio )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, MAIN_XTAL/8)
+ MDRV_SOUND_ADD("ym", YM2203, MAIN_XTAL/8)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.08)
MDRV_SOUND_ROUTE(1, "mono", 0.08)
@@ -764,11 +764,11 @@ static MACHINE_DRIVER_START( bublbobl )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, MAIN_XTAL/8)
+ MDRV_SOUND_ADD("ym1", YM2203, MAIN_XTAL/8)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(YM3526, MAIN_XTAL/8)
+ MDRV_SOUND_ADD("ym2", YM3526, MAIN_XTAL/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index 0e1a7ccbacd..6eae773f233 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -436,15 +436,15 @@ static MACHINE_DRIVER_START( buggychl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay1", AY8910, 8000000/4)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay2", AY8910, 8000000/4)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(MSM5232, 2000000)
+ MDRV_SOUND_ADD("msm", MSM5232, 2000000)
MDRV_SOUND_CONFIG(msm5232_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c
index 1546492b680..eef127ff47d 100644
--- a/src/mame/drivers/bwidow.c
+++ b/src/mame/drivers/bwidow.c
@@ -701,11 +701,11 @@ static MACHINE_DRIVER_START( bwidow )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK / 8)
+ MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK / 8)
MDRV_SOUND_CONFIG(pokey_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK / 8)
+ MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK / 8)
MDRV_SOUND_CONFIG(pokey_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index 4ea8d19515f..d9eea33580e 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -426,13 +426,13 @@ static MACHINE_DRIVER_START( bwing )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index 9389d0a51a0..b855b87e115 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -593,11 +593,11 @@ static MACHINE_DRIVER_START( bzone )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("pokey", POKEY, MASTER_CLOCK / 8)
+ MDRV_SOUND_ADD("pokey", POKEY, MASTER_CLOCK / 8)
MDRV_SOUND_CONFIG(bzone_pokey_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("custom", CUSTOM, 0)
+ MDRV_SOUND_ADD("custom", CUSTOM, 0)
MDRV_SOUND_CONFIG(bzone_custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index b5d914f234e..e6725332db7 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -528,15 +528,15 @@ static MACHINE_DRIVER_START( cabal )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(seibu_ym2151_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80)
- MDRV_SOUND_ADD(CUSTOM, 8000) /* it should use the msm5205 */
+ MDRV_SOUND_ADD("adpcm1", CUSTOM, 8000) /* it should use the msm5205 */
MDRV_SOUND_CONFIG(seibu_adpcm_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.40)
- MDRV_SOUND_ADD(CUSTOM, 8000) /* it should use the msm5205 */
+ MDRV_SOUND_ADD("adpcm2", CUSTOM, 8000) /* it should use the msm5205 */
MDRV_SOUND_CONFIG(seibu_adpcm_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.40)
MACHINE_DRIVER_END
@@ -585,15 +585,15 @@ static MACHINE_DRIVER_START( cabalbl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(cabalbl_ym2151_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80)
- MDRV_SOUND_ADD(MSM5205, XTAL_12MHz/32) /* verified on pcb (no resonator) */
+ MDRV_SOUND_ADD("msm1", MSM5205, XTAL_12MHz/32) /* verified on pcb (no resonator) */
MDRV_SOUND_CONFIG(msm5205_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(MSM5205, XTAL_12MHz/32) /* verified on pcb (no resonator)*/
+ MDRV_SOUND_ADD("msm2", MSM5205, XTAL_12MHz/32) /* verified on pcb (no resonator)*/
MDRV_SOUND_CONFIG(msm5205_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index 0a1788920af..9ad81bab533 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -1937,7 +1937,7 @@ static MACHINE_DRIVER_START( sys903 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("ay8912", AY8912, SND_CLOCK) /* confirmed */
+ MDRV_SOUND_ADD("ay8912", AY8912, SND_CLOCK) /* confirmed */
MDRV_SOUND_CONFIG(sys903_ay8912_intf)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index 976218d3f28..f0c5f6db38c 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -386,13 +386,13 @@ static MACHINE_DRIVER_START( calorie )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) /* YM2149 really */
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) /* YM2149 really */
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay3", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) /* YM2149 really */
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c
index f5f9799cf85..7cce841cc19 100644
--- a/src/mame/drivers/canyon.c
+++ b/src/mame/drivers/canyon.c
@@ -258,7 +258,7 @@ static MACHINE_DRIVER_START( canyon )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(canyon)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index 02659926e01..5e2b196fa85 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -377,14 +377,14 @@ static MACHINE_DRIVER_START( capbowl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, MASTER_CLOCK/2)
+ MDRV_SOUND_ADD("ym", YM2203, MASTER_CLOCK/2)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.07)
MDRV_SOUND_ROUTE(1, "mono", 0.07)
MDRV_SOUND_ROUTE(2, "mono", 0.07)
MDRV_SOUND_ROUTE(3, "mono", 0.75)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c
index ff9190531c3..9453c7b382f 100644
--- a/src/mame/drivers/cardline.c
+++ b/src/mame/drivers/cardline.c
@@ -218,7 +218,7 @@ static MACHINE_DRIVER_START( cardline )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c
index 1871867f6be..f6d380226bb 100644
--- a/src/mame/drivers/carjmbre.c
+++ b/src/mame/drivers/carjmbre.c
@@ -212,10 +212,10 @@ static MACHINE_DRIVER_START( carjmbre )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c
index 7522d92fcb4..237adc4cdfc 100644
--- a/src/mame/drivers/carrera.c
+++ b/src/mame/drivers/carrera.c
@@ -314,7 +314,7 @@ static MACHINE_DRIVER_START( carrera )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, MASTER_CLOCK/12)
+ MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/12)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index 7b87f8c9d9e..73a43fc2d06 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -2025,7 +2025,7 @@ static MACHINE_DRIVER_START( dfeveron )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2064,7 +2064,7 @@ static MACHINE_DRIVER_START( ddonpach )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2103,12 +2103,12 @@ static MACHINE_DRIVER_START( donpachi )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.60)
- MDRV_SOUND_ADD(OKIM6295, 2112000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 2112000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -2147,7 +2147,7 @@ static MACHINE_DRIVER_START( esprade )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2185,7 +2185,7 @@ static MACHINE_DRIVER_START( gaia )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2224,7 +2224,7 @@ static MACHINE_DRIVER_START( guwange )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2267,7 +2267,7 @@ static MACHINE_DRIVER_START( hotdogst )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "left", 0.20)
MDRV_SOUND_ROUTE(0, "right", 0.20)
@@ -2278,7 +2278,7 @@ static MACHINE_DRIVER_START( hotdogst )
MDRV_SOUND_ROUTE(3, "left", 0.80)
MDRV_SOUND_ROUTE(3, "right", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -2317,7 +2317,7 @@ static MACHINE_DRIVER_START( korokoro )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2363,7 +2363,7 @@ static MACHINE_DRIVER_START( mazinger )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "left", 0.20)
MDRV_SOUND_ROUTE(0, "right", 0.20)
@@ -2374,7 +2374,7 @@ static MACHINE_DRIVER_START( mazinger )
MDRV_SOUND_ROUTE(3, "left", 0.60)
MDRV_SOUND_ROUTE(3, "right", 0.60)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 2.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 2.0)
@@ -2420,17 +2420,17 @@ static MACHINE_DRIVER_START( metmqstr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 16000000/4)
+ MDRV_SOUND_ADD("ym", YM2151, 16000000/4)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.20)
MDRV_SOUND_ROUTE(1, "right", 1.20)
- MDRV_SOUND_ADD(OKIM6295, 32000000 / 16 )
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32000000 / 16 )
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32000000 / 16 )
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32000000 / 16 )
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -2476,7 +2476,7 @@ static MACHINE_DRIVER_START( pwrinst2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, 16000000 / 4)
+ MDRV_SOUND_ADD("ym", YM2203, 16000000 / 4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "left", 0.40)
MDRV_SOUND_ROUTE(0, "right", 0.40)
@@ -2487,12 +2487,12 @@ static MACHINE_DRIVER_START( pwrinst2 )
MDRV_SOUND_ROUTE(3, "left", 0.80)
MDRV_SOUND_ROUTE(3, "right", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 3000000 )
+ MDRV_SOUND_ADD("oki1", OKIM6295, 3000000 )
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 3000000 )
+ MDRV_SOUND_ADD("oki2", OKIM6295, 3000000 )
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.00)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.00)
@@ -2537,17 +2537,17 @@ static MACHINE_DRIVER_START( sailormn )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 16000000/4)
+ MDRV_SOUND_ADD("ym", YM2151, 16000000/4)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.30)
MDRV_SOUND_ROUTE(1, "right", 0.30)
- MDRV_SOUND_ADD(OKIM6295, 2112000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 2112000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 2112000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 2112000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -2585,7 +2585,7 @@ static MACHINE_DRIVER_START( uopoko )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index 6f6912dafce..23db718c19e 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -266,11 +266,11 @@ static MACHINE_DRIVER_START( cbasebal )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index 8c968de3b3f..3bfa38b374b 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -369,19 +369,19 @@ static MACHINE_DRIVER_START( twocrude )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 32220000/8)
+ MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.45)
MDRV_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c
index 8c1b845a1e0..e41d79c1d46 100644
--- a/src/mame/drivers/ccastles.c
+++ b/src/mame/drivers/ccastles.c
@@ -489,10 +489,10 @@ static MACHINE_DRIVER_START( ccastles )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/8)
MDRV_SOUND_CONFIG(pokey_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c
index 58ca25b73b3..7e999c8122d 100644
--- a/src/mame/drivers/cchasm.c
+++ b/src/mame/drivers/cchasm.c
@@ -174,16 +174,16 @@ static MACHINE_DRIVER_START( cchasm )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1818182)
+ MDRV_SOUND_ADD("ay1", AY8910, 1818182)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(AY8910, 1818182)
+ MDRV_SOUND_ADD("ay2", AY8910, 1818182)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c
index 799738a4e52..c215dcbabf4 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -1097,11 +1097,11 @@ static MACHINE_DRIVER_START( cclimber )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, MASTER_CLOCK/3/2/2)
+ MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/3/2/2)
MDRV_SOUND_CONFIG(cclimber_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(cclimber_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1141,10 +1141,10 @@ static MACHINE_DRIVER_START( yamato )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1536000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1536000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1536000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1536000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -1196,10 +1196,10 @@ static MACHINE_DRIVER_START( swimmer )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 4000000/2)
+ MDRV_SOUND_ADD("ay1", AY8910, 4000000/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 4000000/2)
+ MDRV_SOUND_ADD("ay2", AY8910, 4000000/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index 2fe88c3daf3..bb392bff6f3 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -1650,7 +1650,7 @@ static MACHINE_DRIVER_START( centiped )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("pokey", POKEY, 12096000/8)
+ MDRV_SOUND_ADD("pokey", POKEY, 12096000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1712,7 +1712,7 @@ static MACHINE_DRIVER_START( milliped )
MDRV_SOUND_CONFIG(milliped_pokey_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(POKEY, 12096000/8)
+ MDRV_SOUND_ADD("pokey2", POKEY, 12096000/8)
MDRV_SOUND_CONFIG(milliped_pokey_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1775,7 +1775,7 @@ static MACHINE_DRIVER_START( bullsdrt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 12096000/8)
+ MDRV_SOUND_ADD("sn", SN76496, 12096000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c
index 3ca5a02aef6..6e06661a279 100644
--- a/src/mame/drivers/chaknpop.c
+++ b/src/mame/drivers/chaknpop.c
@@ -288,11 +288,11 @@ static MACHINE_DRIVER_START( chaknpop )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 18432000 / 12)
+ MDRV_SOUND_ADD("ay1", AY8910, 18432000 / 12)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 18432000 / 12)
+ MDRV_SOUND_ADD("ay2", AY8910, 18432000 / 12)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c
index 43db52d5734..f36c7569776 100644
--- a/src/mame/drivers/cham24.c
+++ b/src/mame/drivers/cham24.c
@@ -274,11 +274,11 @@ static MACHINE_DRIVER_START( cham24 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NES, N2A03_DEFAULTCLOCK)
+ MDRV_SOUND_ADD("nes", NES, N2A03_DEFAULTCLOCK)
MDRV_SOUND_CONFIG(cham24_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index 44e2d6f05b8..22b8e116017 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -636,7 +636,7 @@ static MACHINE_DRIVER_START( talbot )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_18_432MHz/12)
+ MDRV_SOUND_ADD("ay", AY8910, XTAL_18_432MHz/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
@@ -671,10 +671,10 @@ static MACHINE_DRIVER_START( champbas )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_18_432MHz/12)
+ MDRV_SOUND_ADD("ay", AY8910, XTAL_18_432MHz/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -728,22 +728,22 @@ static MACHINE_DRIVER_START( exctsccr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay3", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay4", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -776,10 +776,10 @@ static MACHINE_DRIVER_START( exctsccb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_18_432MHz/12)
+ MDRV_SOUND_ADD("ay", AY8910, XTAL_18_432MHz/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c
index 45e5c855863..f7c716ad553 100644
--- a/src/mame/drivers/champbwl.c
+++ b/src/mame/drivers/champbwl.c
@@ -355,7 +355,7 @@ static MACHINE_DRIVER_START( champbwl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000)
+ MDRV_SOUND_ADD("x1", X1_010, 16000000)
MDRV_SOUND_CONFIG(champbwl_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c
index df6bcea4efa..98c2a892fdc 100644
--- a/src/mame/drivers/changela.c
+++ b/src/mame/drivers/changela.c
@@ -519,11 +519,11 @@ static MACHINE_DRIVER_START( changela )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1250000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1250000)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(AY8910, 1250000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1250000)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c
index c9a05bdefd2..bdbc3ef6e9b 100644
--- a/src/mame/drivers/cheekyms.c
+++ b/src/mame/drivers/cheekyms.c
@@ -143,7 +143,7 @@ static MACHINE_DRIVER_START( cheekyms )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cherrym.c b/src/mame/drivers/cherrym.c
index a62d871fdd7..510208c4df4 100644
--- a/src/mame/drivers/cherrym.c
+++ b/src/mame/drivers/cherrym.c
@@ -398,7 +398,7 @@ static MACHINE_DRIVER_START( cmv801 )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910,18432000/12)
+ MDRV_SOUND_ADD("ay", AY8910,18432000/12)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/cherrym2.c b/src/mame/drivers/cherrym2.c
index cb66b6cee72..de1758da619 100644
--- a/src/mame/drivers/cherrym2.c
+++ b/src/mame/drivers/cherrym2.c
@@ -377,7 +377,7 @@ static MACHINE_DRIVER_START( cm2v841 )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910,18432000/12)
+ MDRV_SOUND_ADD("ay", AY8910,18432000/12)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index c2a3846999a..471f49f428f 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -525,12 +525,12 @@ static MACHINE_DRIVER_START( chinagat )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.80)
MDRV_SOUND_ROUTE(1, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1452000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1452000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_DRIVER_END
@@ -573,12 +573,12 @@ static MACHINE_DRIVER_START( saiyugb1 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.80)
MDRV_SOUND_ROUTE(1, "mono", 0.80)
- MDRV_SOUND_ADD(MSM5205, 9263750 / 24)
+ MDRV_SOUND_ADD("msm", MSM5205, 9263750 / 24)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
@@ -617,14 +617,14 @@ static MACHINE_DRIVER_START( saiyugb2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3579545)
+ MDRV_SOUND_ADD("ym1", YM2203, 3579545)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_SOUND_ADD(YM2203, 3579545)
+ MDRV_SOUND_ADD("ym2", YM2203, 3579545)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c
index 19b9da9982d..f90bebe5271 100644
--- a/src/mame/drivers/chinsan.c
+++ b/src/mame/drivers/chinsan.c
@@ -485,7 +485,7 @@ static MACHINE_DRIVER_START( chinsan )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000) /* ? Mhz */
+ MDRV_SOUND_ADD("ym", YM2203, 1500000) /* ? Mhz */
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index cbcd929d979..48b85a13376 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -388,19 +388,19 @@ static MACHINE_DRIVER_START( chqflag )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
- MDRV_SOUND_ADD(K007232, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("konami1", K007232, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(k007232_interface_1)
MDRV_SOUND_ROUTE(0, "left", 0.20)
MDRV_SOUND_ROUTE(0, "right", 0.20)
MDRV_SOUND_ROUTE(1, "left", 0.20)
MDRV_SOUND_ROUTE(1, "right", 0.20)
- MDRV_SOUND_ADD(K007232, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("konami2", K007232, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(k007232_interface_2)
MDRV_SOUND_ROUTE(0, "left", 0.20)
MDRV_SOUND_ROUTE(1, "right", 0.20)
diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c
index b8869eacee8..4c0463b365a 100644
--- a/src/mame/drivers/cidelsa.c
+++ b/src/mame/drivers/cidelsa.c
@@ -606,7 +606,7 @@ static MACHINE_DRIVER_START( destryer )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CDP1869, DESTRYER_CHR2)
+ MDRV_SOUND_ADD("cdp", CDP1869, DESTRYER_CHR2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -632,7 +632,7 @@ static MACHINE_DRIVER_START( destryea )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CDP1869, DESTRYER_CHR2)
+ MDRV_SOUND_ADD("cdp", CDP1869, DESTRYER_CHR2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -671,7 +671,7 @@ static MACHINE_DRIVER_START( altair )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CDP1869, ALTAIR_CHR2)
+ MDRV_SOUND_ADD("cdp", CDP1869, ALTAIR_CHR2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -716,9 +716,9 @@ static MACHINE_DRIVER_START( draco )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CDP1869, DRACO_CHR2)
+ MDRV_SOUND_ADD("cdp", CDP1869, DRACO_CHR2)
- MDRV_SOUND_ADD(AY8910, DRACO_SND_CHR1)
+ MDRV_SOUND_ADD("ay", AY8910, DRACO_SND_CHR1)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c
index 339e30159d1..9ab5531e5ab 100644
--- a/src/mame/drivers/circus.c
+++ b/src/mame/drivers/circus.c
@@ -293,11 +293,11 @@ static MACHINE_DRIVER_START( circus )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(circus_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(circus)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -328,11 +328,11 @@ static MACHINE_DRIVER_START( robotbwl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(robotbwl_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(robotbwl)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -362,11 +362,11 @@ static MACHINE_DRIVER_START( crash )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(crash_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(crash)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -396,11 +396,11 @@ static MACHINE_DRIVER_START( ripcord )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(ripcord_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(circus)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index a869a8a34b5..85bd809904b 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -350,13 +350,13 @@ static MACHINE_DRIVER_START( circusc )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 14318180/8)
+ MDRV_SOUND_ADD("sn1", SN76496, 14318180/8)
MDRV_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 0)
- MDRV_SOUND_ADD(SN76496, 14318180/8)
+ MDRV_SOUND_ADD("sn2", SN76496, 14318180/8)
MDRV_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 1)
- MDRV_SOUND_ADD_TAG("fltdisc", DISCRETE, 0)
+ MDRV_SOUND_ADD("fltdisc", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(circusc)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index f9708f55b38..7236997eae2 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -1785,15 +1785,15 @@ static MACHINE_DRIVER_START( bigrun )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, STD_FM_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, STD_FM_CLOCK)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
- MDRV_SOUND_ADD(OKIM6295, STD_OKI_CLOCK)
+ MDRV_SOUND_ADD("oki1", OKIM6295, STD_OKI_CLOCK)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD(OKIM6295, STD_OKI_CLOCK)
+ MDRV_SOUND_ADD("oki2", OKIM6295, STD_OKI_CLOCK)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
@@ -1916,12 +1916,12 @@ static MACHINE_DRIVER_START( scudhamm )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 2112000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 2112000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 2112000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 2112000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index 8118d614cac..d545a228b2a 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -240,10 +240,10 @@ static MACHINE_DRIVER_START( citycon )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1250000)
+ MDRV_SOUND_ADD("ay", AY8910, 1250000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(YM2203, 1250000)
+ MDRV_SOUND_ADD("ym", YM2203, 1250000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.40)
MDRV_SOUND_ROUTE(1, "mono", 0.40)
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index 508624eb73a..89759813fd6 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -759,13 +759,13 @@ static MACHINE_DRIVER_START( cliffhgr )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
/* laserdisc audio */
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("laserdisc", CUSTOM, 0)
MDRV_SOUND_CONFIG(laserdisc_custom_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
/* discrete sounds */
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(cliffhgr)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index 9df61088c0f..f861204b48e 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -354,11 +354,11 @@ static MACHINE_DRIVER_START( cloak )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, 1500000)
+ MDRV_SOUND_ADD("pokey1", POKEY, 1500000)
MDRV_SOUND_CONFIG(pokey_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(POKEY, 1500000)
+ MDRV_SOUND_ADD("pokey2", POKEY, 1500000)
MDRV_SOUND_CONFIG(pokey_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c
index 3b0f7eb0c57..7f9e6e8563d 100644
--- a/src/mame/drivers/cloud9.c
+++ b/src/mame/drivers/cloud9.c
@@ -482,10 +482,10 @@ static MACHINE_DRIVER_START( cloud9 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/8)
MDRV_SOUND_CONFIG(pokey_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c
index 6a71a310372..6076bc564f6 100644
--- a/src/mame/drivers/clshroad.c
+++ b/src/mame/drivers/clshroad.c
@@ -311,7 +311,7 @@ static MACHINE_DRIVER_START( firebatl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("firebatl", CUSTOM, 0)
MDRV_SOUND_CONFIG(custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -348,7 +348,7 @@ static MACHINE_DRIVER_START( clshroad )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("clshroad", CUSTOM, 0)
MDRV_SOUND_CONFIG(custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index 22e83d09767..c075908ee5b 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -808,19 +808,19 @@ static MACHINE_DRIVER_START( cninja )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 32220000/8)
+ MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.45)
MDRV_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
@@ -857,16 +857,16 @@ static MACHINE_DRIVER_START( stoneage )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface2)
MDRV_SOUND_ROUTE(0, "mono", 0.45)
MDRV_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
@@ -903,19 +903,19 @@ static MACHINE_DRIVER_START( edrandy )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 32220000/8)
+ MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.45)
MDRV_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
@@ -952,21 +952,21 @@ static MACHINE_DRIVER_START( robocop2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, 32220000/8)
+ MDRV_SOUND_ADD("ym", YM2203, 32220000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
@@ -1001,17 +1001,17 @@ static MACHINE_DRIVER_START( mutantf )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index b596996be90..655963ad1ee 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -747,7 +747,7 @@ static MACHINE_DRIVER_START( cntsteer )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD(YM2203, ym2203_interface)
+// MDRV_SOUND_ADD("ym", YM2203, ym2203_interface)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( zerotrgt )
@@ -786,10 +786,10 @@ static MACHINE_DRIVER_START( zerotrgt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index d93518a22a8..ee1f0bcfa9d 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -653,7 +653,7 @@ static MACHINE_DRIVER_START( coinmstr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8912_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c
index ce7a2b42cd1..98f48646d71 100644
--- a/src/mame/drivers/cojag.c
+++ b/src/mame/drivers/cojag.c
@@ -1021,10 +1021,10 @@ static MACHINE_DRIVER_START( cojagr3k )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index 1a090875cb2..d2b69a84357 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -698,11 +698,11 @@ static MACHINE_DRIVER_START( combasc )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -741,11 +741,11 @@ static MACHINE_DRIVER_START( combascb )
/* We are using the original sound subsystem */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index 4db0e7611d7..af72e1e6f89 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -269,10 +269,10 @@ static MACHINE_DRIVER_START( commando )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, PHI_B/2)
+ MDRV_SOUND_ADD("ym1", YM2203, PHI_B/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(YM2203, PHI_B/2)
+ MDRV_SOUND_ADD("ym2", YM2203, PHI_B/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c
index 042faa21bc2..470ffb40a80 100644
--- a/src/mame/drivers/compgolf.c
+++ b/src/mame/drivers/compgolf.c
@@ -233,7 +233,7 @@ static MACHINE_DRIVER_START( compgolf )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index a63704570fa..c5b01918bb5 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -274,7 +274,7 @@ static MACHINE_DRIVER_START( contra )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3582071)
+ MDRV_SOUND_ADD("ym", YM2151, 3582071)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index b01421a3f9a..d51f69f92aa 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -705,7 +705,7 @@ static MACHINE_DRIVER_START( amerdart )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -734,7 +734,7 @@ static MACHINE_DRIVER_START( coolpool )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index a815d667528..db79145e626 100644
--- a/src/mame/drivers/cop01.c
+++ b/src/mame/drivers/cop01.c
@@ -442,13 +442,13 @@ static MACHINE_DRIVER_START( cop01 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay3", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_DRIVER_END
@@ -483,7 +483,7 @@ static MACHINE_DRIVER_START( mightguy )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 4000000)
+ MDRV_SOUND_ADD("ym", YM3526, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index c08775b99bd..cf8ebf57bb7 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -1017,11 +1017,11 @@ static MACHINE_DRIVER_START( panic )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(panic_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1071,11 +1071,11 @@ static MACHINE_DRIVER_START( cosmicg )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(cosmicg_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1099,7 +1099,7 @@ static MACHINE_DRIVER_START( magspot )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1133,7 +1133,7 @@ static MACHINE_DRIVER_START( nomnlnd )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/couple.c b/src/mame/drivers/couple.c
index 25c9459fa1a..2038d3e4cbd 100644
--- a/src/mame/drivers/couple.c
+++ b/src/mame/drivers/couple.c
@@ -464,7 +464,7 @@ static MACHINE_DRIVER_START( couple )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 4000000)
+ MDRV_SOUND_ADD("ay", AY8910, 4000000)
// MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c
index 80b6115e277..b03b8c722b2 100644
--- a/src/mame/drivers/cowrace.c
+++ b/src/mame/drivers/cowrace.c
@@ -190,12 +190,12 @@ static MACHINE_DRIVER_START( cowrace )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80)
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80)
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 924549f98a5..58877114dd5 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -3633,12 +3633,12 @@ static MACHINE_DRIVER_START( cps1_10MHz )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("2151", YM2151, 3579545)
+ MDRV_SOUND_ADD("2151", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.35)
MDRV_SOUND_ROUTE(1, "mono", 0.35)
- MDRV_SOUND_ADD_TAG("okim", OKIM6295, 1000000)
+ MDRV_SOUND_ADD("okim", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // pin 7 can be changed by the game code, see f006 on z80
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -3717,7 +3717,7 @@ static MACHINE_DRIVER_START( cpspicb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("okim", OKIM6295, 1000000)
+ MDRV_SOUND_ADD("okim", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -3793,17 +3793,17 @@ static MACHINE_DRIVER_START( sf2mdt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("2151", YM2151, 3579545)
+ MDRV_SOUND_ADD("2151", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.35)
MDRV_SOUND_ROUTE(1, "mono", 0.35)
/* has 2x MSM5205 instead of OKI6295 */
- MDRV_SOUND_ADD(MSM5205, 24000000/64) /* ? */
+ MDRV_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
MDRV_SOUND_CONFIG(msm5205_interface1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(MSM5205, 24000000/64) /* ? */
+ MDRV_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
MDRV_SOUND_CONFIG(msm5205_interface2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 5dbd66abe72..145c53188c4 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -1268,7 +1268,7 @@ static MACHINE_DRIVER_START( cps2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(QSOUND, QSOUND_CLOCK)
+ MDRV_SOUND_ADD("qsound", QSOUND, QSOUND_CLOCK)
MDRV_SOUND_CONFIG(qsound_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index 679ac450692..d79818ae9de 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -2695,7 +2695,7 @@ static MACHINE_DRIVER_START( cps3 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(CUSTOM, MASTER_CLOCK / 3)
+ MDRV_SOUND_ADD("cps3", CUSTOM, MASTER_CLOCK / 3)
MDRV_SOUND_CONFIG(custom_interface)
MDRV_SOUND_ROUTE(1, "left", 1.0)
MDRV_SOUND_ROUTE(0, "right", 1.0)
diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c
index b864de311bd..fc124c0971c 100644
--- a/src/mame/drivers/crgolf.c
+++ b/src/mame/drivers/crgolf.c
@@ -379,7 +379,7 @@ static MACHINE_DRIVER_START( crgolf )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, MASTER_CLOCK/3/2/2)
+ MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/3/2/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -387,7 +387,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( crgolfhi )
MDRV_IMPORT_FROM(crgolf)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_intf)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index 505c485ba44..61a2eb702fe 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -393,12 +393,12 @@ static MACHINE_DRIVER_START( crimfght )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545) /* verified with PCB */
+ MDRV_SOUND_ADD("ym", YM2151, 3579545) /* verified with PCB */
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "left", 0.20)
MDRV_SOUND_ROUTE(0, "right", 0.20)
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index 9bb67ec5a13..cafc897de95 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -429,11 +429,11 @@ static MACHINE_DRIVER_START( crospang )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 14318180/4)
+ MDRV_SOUND_ADD("ym", YM3812, 14318180/4)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -467,11 +467,11 @@ static MACHINE_DRIVER_START( bestri )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 14318180/4)
+ MDRV_SOUND_ADD("ym", YM3812, 14318180/4)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index 3fee3ae8fdc..902ead98c1a 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -650,7 +650,7 @@ static MACHINE_DRIVER_START( crshrace )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index e9131558d3e..ab7c876fc6e 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -828,7 +828,7 @@ static MACHINE_DRIVER_START( crystal )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(VRENDER0, 0)
+ MDRV_SOUND_ADD("vrender", VRENDER0, 0)
MDRV_SOUND_CONFIG(vr0_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/csk.c b/src/mame/drivers/csk.c
index 37fb790134a..3de4714b84d 100644
--- a/src/mame/drivers/csk.c
+++ b/src/mame/drivers/csk.c
@@ -759,7 +759,7 @@ static MACHINE_DRIVER_START( cpoker )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c
index 1cd33a3db68..c51c95a26a8 100644
--- a/src/mame/drivers/cubocd32.c
+++ b/src/mame/drivers/cubocd32.c
@@ -252,14 +252,14 @@ static MACHINE_DRIVER_START( cd32 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(CUSTOM, 3579545)
+ MDRV_SOUND_ADD("amiga", CUSTOM, 3579545)
MDRV_SOUND_CONFIG(amiga_custom_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(1, "right", 0.25)
MDRV_SOUND_ROUTE(2, "right", 0.25)
MDRV_SOUND_ROUTE(3, "left", 0.25)
- MDRV_SOUND_ADD( CDDA, 0 )
+ MDRV_SOUND_ADD( "cdda", CDDA, 0 )
MDRV_SOUND_ROUTE( 0, "left", 0.50 )
MDRV_SOUND_ROUTE( 1, "right", 0.50 )
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c
index 5bf2fb620d5..0989d42ef94 100644
--- a/src/mame/drivers/cultures.c
+++ b/src/mame/drivers/cultures.c
@@ -381,7 +381,7 @@ static MACHINE_DRIVER_START( cultures )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, (MCLK/1024)*132)
+ MDRV_SOUND_ADD("oki", OKIM6295, (MCLK/1024)*132)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index e395816ed3b..a5f1dc89ef3 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -1046,13 +1046,13 @@ static MACHINE_DRIVER_START( cvs )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(TMS5100, 640000)
+ MDRV_SOUND_ADD("tms", TMS5100, 640000)
MDRV_SOUND_CONFIG(tms5100_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index c8f23bbaf73..e9577c78c6c 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -476,15 +476,15 @@ static MACHINE_DRIVER_START( cyberbal )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, ATARI_CLOCK_14MHz/4)
+ MDRV_SOUND_ADD("ym", YM2151, ATARI_CLOCK_14MHz/4)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index 647ed6430ff..8507ef98433 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -593,12 +593,12 @@ static MACHINE_DRIVER_START( cybertnk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(Y8950, 3579500)
+ MDRV_SOUND_ADD("ym1", Y8950, 3579500)
MDRV_SOUND_CONFIG(y8950_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(Y8950, 3579500)
+ MDRV_SOUND_ADD("ym2", Y8950, 3579500)
MDRV_SOUND_CONFIG(y8950_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index 070aa646d2b..96013646825 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -428,16 +428,16 @@ static MACHINE_DRIVER_START( dacholer )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay3", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(MSM5205, 375000)
+ MDRV_SOUND_ADD("msm", MSM5205, 375000)
MDRV_SOUND_CONFIG(msm_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c
index a8d2e56228b..dd8e9b50dbf 100644
--- a/src/mame/drivers/dambustr.c
+++ b/src/mame/drivers/dambustr.c
@@ -204,7 +204,7 @@ static MACHINE_DRIVER_START( dambustr )
MDRV_SPEAKER_STANDARD_MONO("mono")
/* sound hardware */
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(galaxian_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 9bdbeada888..8c38b185490 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -890,7 +890,7 @@ static MACHINE_DRIVER_START( darius )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_interface_1)
MDRV_SOUND_ROUTE(0, "filter.2203.0.0l", 0.08)
MDRV_SOUND_ROUTE(0, "filter.2203.0.0r", 0.08)
@@ -901,7 +901,7 @@ static MACHINE_DRIVER_START( darius )
MDRV_SOUND_ROUTE(3, "filter.2203.0.3l", 0.60)
MDRV_SOUND_ROUTE(3, "filter.2203.0.3r", 0.60)
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_interface_2)
MDRV_SOUND_ROUTE(0, "filter.2203.1.0l", 0.08)
MDRV_SOUND_ROUTE(0, "filter.2203.1.0r", 0.08)
@@ -912,48 +912,48 @@ static MACHINE_DRIVER_START( darius )
MDRV_SOUND_ROUTE(3, "filter.2203.1.3l", 0.60)
MDRV_SOUND_ROUTE(3, "filter.2203.1.3r", 0.60)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.l", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.r", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.0.0l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.0.0l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.0.0r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.0.0r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.0.1l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.0.1l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.0.1r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.0.1r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.0.2l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.0.2l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.0.2r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.0.2r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.0.3l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.0.3l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.0.3r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.0.3r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.1.0l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.1.0l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.1.0r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.1.0r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.1.1l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.1.1l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.1.1r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.1.1r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.1.2l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.1.2l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.1.2r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.1.2r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.1.3l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.1.3l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("filter.2203.1.3r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter.2203.1.3r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("msm5205.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("msm5205.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("msm5205.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("msm5205.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 6c1c05bf1ba..6c15ae0bcb0 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -616,7 +616,7 @@ static MACHINE_DRIVER_START( darkhors )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 528000) // ??
+ MDRV_SOUND_ADD("oki", OKIM6295, 528000) // ??
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c
index dc5ad4f7d78..13b497f7481 100644
--- a/src/mame/drivers/darkmist.c
+++ b/src/mame/drivers/darkmist.c
@@ -272,7 +272,7 @@ static MACHINE_DRIVER_START( darkmist )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 14318180/4) /* 3.579545 MHz */
+ MDRV_SOUND_ADD("ym", YM2151, 14318180/4) /* 3.579545 MHz */
MDRV_SOUND_CONFIG(t5182_ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index e3a429fe399..2f241b03200 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -313,19 +313,19 @@ static MACHINE_DRIVER_START( darkseal )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 32220000/8)
+ MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.55)
MDRV_SOUND_ROUTE(1, "mono", 0.55)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index 36f73b21bea..b8d7164c884 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -586,21 +586,21 @@ static MACHINE_DRIVER_START( dassault )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, 32220000/8)
+ MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(OKIM6295, 2047848)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 2047848)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.25)
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index 84f484b4e46..d470c62b284 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -563,11 +563,11 @@ static MACHINE_DRIVER_START( dblewing )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 4568787bd36..1ea7a9dcbec 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -465,12 +465,12 @@ static MACHINE_DRIVER_START( dbz )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index 775d8e5fbea..46e921115ee 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -424,7 +424,7 @@ static MACHINE_DRIVER_START( dcheese )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(BSMT2000, SOUND_OSC)
+ MDRV_SOUND_ADD("bsmt", BSMT2000, SOUND_OSC)
MDRV_SOUND_CONFIG(bsmt2000_interface_region_1)
MDRV_SOUND_ROUTE(0, "left", 1.2)
MDRV_SOUND_ROUTE(1, "right", 1.2)
diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c
index 8e7eb795ea4..30da11307f5 100644
--- a/src/mame/drivers/dday.c
+++ b/src/mame/drivers/dday.c
@@ -280,10 +280,10 @@ static MACHINE_DRIVER_START( dday )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index 34f8da1f8d4..cb331ab3038 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -428,11 +428,11 @@ static MACHINE_DRIVER_START( ddayjlc )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/6)
+ MDRV_SOUND_ADD("ay1", AY8910, 12000000/6)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(AY8910, 12000000/6)
+ MDRV_SOUND_ADD("ay2", AY8910, 12000000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index f205217352b..92d9d070aa5 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -6554,13 +6554,13 @@ static MACHINE_DRIVER_START( ddenlovr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD_TAG("ay8910", AY8910, 1789772)
+ MDRV_SOUND_ADD("ay8910", AY8910, 1789772)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(OKIM6295, 1022720)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1022720)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -6674,10 +6674,10 @@ static MACHINE_DRIVER_START( quizchq )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1022720)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1022720)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -6752,13 +6752,13 @@ static MACHINE_DRIVER_START( mmpanic )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(AY8910, 3579545)
+ MDRV_SOUND_ADD("ay", AY8910, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(OKIM6295, 1022720)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1022720)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -6819,10 +6819,10 @@ static MACHINE_DRIVER_START( hanakanz )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1022720)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1022720)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -6878,7 +6878,7 @@ static MACHINE_DRIVER_START( mjchuuka )
MDRV_CPU_IO_MAP(mjchuuka_readport,mjchuuka_writeport)
MDRV_CPU_VBLANK_INT("main", mjchuuka_irq)
- MDRV_SOUND_ADD(AY8910, 1789772)
+ MDRV_SOUND_ADD("ay", AY8910, 1789772)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -6953,7 +6953,7 @@ static MACHINE_DRIVER_START( mjmyster )
MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2)
MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1)
- MDRV_SOUND_ADD(AY8910, 3579545)
+ MDRV_SOUND_ADD("ay", AY8910, 3579545)
MDRV_SOUND_CONFIG(mjmyster_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -7001,7 +7001,7 @@ static MACHINE_DRIVER_START( hginga )
MDRV_CPU_IO_MAP(hginga_readport,hginga_writeport)
MDRV_CPU_VBLANK_INT("main", hginga_irq)
- MDRV_SOUND_ADD(AY8910, 3579545)
+ MDRV_SOUND_ADD("ay", AY8910, 3579545)
MDRV_SOUND_CONFIG(hginga_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -7014,7 +7014,7 @@ static MACHINE_DRIVER_START( hgokou )
MDRV_CPU_IO_MAP(hgokou_readport,hgokou_writeport)
MDRV_CPU_VBLANK_INT("main", hginga_irq)
- MDRV_SOUND_ADD(AY8910, 3579545)
+ MDRV_SOUND_ADD("ay", AY8910, 3579545)
MDRV_SOUND_CONFIG(hginga_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -7036,7 +7036,7 @@ static MACHINE_DRIVER_START( mjmyuniv )
MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2)
MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1)
- MDRV_SOUND_ADD(AY8910, 1789772)
+ MDRV_SOUND_ADD("ay", AY8910, 1789772)
MDRV_SOUND_CONFIG(mjmyster_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -7049,7 +7049,7 @@ static MACHINE_DRIVER_START( mjmyornt )
MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2)
MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1)
- MDRV_SOUND_ADD(AY8910, 1789772)
+ MDRV_SOUND_ADD("ay", AY8910, 1789772)
MDRV_SOUND_CONFIG(mjmyster_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -7081,7 +7081,7 @@ static MACHINE_DRIVER_START( mjflove )
MDRV_VIDEO_START(mjflove) // blitter commands in the roms are shuffled around
- MDRV_SOUND_ADD(AY8910, 28636363/8)
+ MDRV_SOUND_ADD("ay", AY8910, 28636363/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 1ac95860dee..3d418b5f561 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -999,16 +999,16 @@ static MACHINE_DRIVER_START( ddragon )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("fm", YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("fm", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD_TAG("oki1", MSM5205, MAIN_CLOCK/32)
+ MDRV_SOUND_ADD("oki1", MSM5205, MAIN_CLOCK/32)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("oki2", MSM5205, MAIN_CLOCK/32)
+ MDRV_SOUND_ADD("oki2", MSM5205, MAIN_CLOCK/32)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1064,16 +1064,16 @@ static MACHINE_DRIVER_START( ddgn6809 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("fm", YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("fm", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD_TAG("oki1", MSM5205, MAIN_CLOCK/32)
+ MDRV_SOUND_ADD("oki1", MSM5205, MAIN_CLOCK/32)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("oki2", MSM5205, MAIN_CLOCK/32)
+ MDRV_SOUND_ADD("oki2", MSM5205, MAIN_CLOCK/32)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1110,12 +1110,12 @@ static MACHINE_DRIVER_START( ddragon2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index c5907627cbc..4012ea6a18b 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -509,12 +509,12 @@ static MACHINE_DRIVER_START( ddragon3 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("ym2151", YM2151, 3579545) /* music */
+ MDRV_SOUND_ADD("ym2151", YM2151, 3579545) /* music */
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD_TAG("oki", OKIM6295, 1000000) /* sound fx */
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000) /* sound fx */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.50)
diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c
index d8c5577c0f9..4cbe233b0f0 100644
--- a/src/mame/drivers/ddrible.c
+++ b/src/mame/drivers/ddrible.c
@@ -380,22 +380,22 @@ static MACHINE_DRIVER_START( ddribble )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2203, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "filter1", 0.25)
MDRV_SOUND_ROUTE(1, "filter2", 0.25)
MDRV_SOUND_ROUTE(2, "filter3", 0.25)
MDRV_SOUND_ROUTE(3, "mono", 0.25)
- MDRV_SOUND_ADD(VLM5030, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(vlm5030_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter1", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter1", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter2", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter2", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter3", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter3", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c
index 17a4e746092..cb8fe8b50a8 100644
--- a/src/mame/drivers/ddz.c
+++ b/src/mame/drivers/ddz.c
@@ -75,7 +75,7 @@ static MACHINE_DRIVER_START( ddz )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(VRENDER0, 0)
+ MDRV_SOUND_ADD("vrender", VRENDER0, 0)
MDRV_SOUND_CONFIG(vr0_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 826f0502d3b..696643f0312 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -952,17 +952,17 @@ static MACHINE_DRIVER_START( hbarrel )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
MDRV_SOUND_ROUTE(2, "mono", 0.90)
MDRV_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -995,17 +995,17 @@ static MACHINE_DRIVER_START( baddudes )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
MDRV_SOUND_ROUTE(2, "mono", 0.90)
MDRV_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -1038,17 +1038,17 @@ static MACHINE_DRIVER_START( birdtry )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
MDRV_SOUND_ROUTE(2, "mono", 0.90)
MDRV_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -1086,17 +1086,17 @@ static MACHINE_DRIVER_START( robocop )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
MDRV_SOUND_ROUTE(2, "mono", 0.90)
MDRV_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -1129,17 +1129,17 @@ static MACHINE_DRIVER_START( robocopb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
MDRV_SOUND_ROUTE(2, "mono", 0.90)
MDRV_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -1177,17 +1177,17 @@ static MACHINE_DRIVER_START( hippodrm )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
MDRV_SOUND_ROUTE(2, "mono", 0.90)
MDRV_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -1220,17 +1220,17 @@ static MACHINE_DRIVER_START( slyspy )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
MDRV_SOUND_ROUTE(2, "mono", 0.90)
MDRV_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD(YM3812, XTAL_12MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3812b_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, XTAL_12MHz/12) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_12MHz/12) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -1263,17 +1263,17 @@ static MACHINE_DRIVER_START( midres )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_24MHz/16) /* verified on pcb */
+ MDRV_SOUND_ADD("ym1", YM2203, XTAL_24MHz/16) /* verified on pcb */
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
MDRV_SOUND_ROUTE(2, "mono", 0.90)
MDRV_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD(YM3812, XTAL_24MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym2", YM3812, XTAL_24MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3812b_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, XTAL_1MHz) /* verified on pcb (1mhz crystal) */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_1MHz) /* verified on pcb (1mhz crystal) */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // pin 7 verified on pcb
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 3dfdaaddb5e..b9f12718f50 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -2112,13 +2112,13 @@ static MACHINE_DRIVER_START( cobracom )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.53)
MDRV_SOUND_ROUTE(1, "mono", 0.53)
MDRV_SOUND_ROUTE(2, "mono", 0.53)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -2156,13 +2156,13 @@ static MACHINE_DRIVER_START( ghostb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.23)
MDRV_SOUND_ROUTE(1, "mono", 0.23)
MDRV_SOUND_ROUTE(2, "mono", 0.23)
MDRV_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -2198,13 +2198,13 @@ static MACHINE_DRIVER_START( srdarwin )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.23)
MDRV_SOUND_ROUTE(1, "mono", 0.23)
MDRV_SOUND_ROUTE(2, "mono", 0.23)
MDRV_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -2241,13 +2241,13 @@ static MACHINE_DRIVER_START( gondo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.23)
MDRV_SOUND_ROUTE(1, "mono", 0.23)
MDRV_SOUND_ROUTE(2, "mono", 0.23)
MDRV_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD(YM3526, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3526, 3000000)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -2287,13 +2287,13 @@ static MACHINE_DRIVER_START( oscar )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(0, "mono", 0.23)
MDRV_SOUND_ROUTE(1, "mono", 0.23)
MDRV_SOUND_ROUTE(2, "mono", 0.23)
MDRV_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD(YM3526, XTAL_12MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ym2", YM3526, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(oscar_ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -2332,13 +2332,13 @@ static MACHINE_DRIVER_START( lastmiss )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.23)
MDRV_SOUND_ROUTE(1, "mono", 0.23)
MDRV_SOUND_ROUTE(2, "mono", 0.23)
MDRV_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD(YM3526, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3526, 3000000)
MDRV_SOUND_CONFIG(oscar_ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -2377,13 +2377,13 @@ static MACHINE_DRIVER_START( shackled )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.23)
MDRV_SOUND_ROUTE(1, "mono", 0.23)
MDRV_SOUND_ROUTE(2, "mono", 0.23)
MDRV_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD(YM3526, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3526, 3000000)
MDRV_SOUND_CONFIG(oscar_ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -2423,17 +2423,17 @@ static MACHINE_DRIVER_START( csilver )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(0, "mono", 0.23)
MDRV_SOUND_ROUTE(1, "mono", 0.23)
MDRV_SOUND_ROUTE(2, "mono", 0.23)
MDRV_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD(YM3526, XTAL_12MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ym2", YM3526, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(oscar_ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD(MSM5205, XTAL_384kHz) /* verified on pcb */
+ MDRV_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.88)
MACHINE_DRIVER_END
@@ -2470,13 +2470,13 @@ static MACHINE_DRIVER_START( garyoret )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.23)
MDRV_SOUND_ROUTE(1, "mono", 0.23)
MDRV_SOUND_ROUTE(2, "mono", 0.23)
MDRV_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD(YM3526, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3526, 3000000)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index 844fba53968..7d1fcfce429 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -446,12 +446,12 @@ static MACHINE_DRIVER_START( hvysmsh )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 28000000/28)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 28000000/28)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 28000000/14)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 28000000/14)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35)
@@ -485,7 +485,7 @@ static MACHINE_DRIVER_START( wcvol95 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 28000000 / 2)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 28000000 / 2)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 00d77860e5e..7b5dda18187 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -1901,17 +1901,17 @@ static MACHINE_DRIVER_START( captaven )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.42)
MDRV_SOUND_ROUTE(1, "right", 0.42)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35)
@@ -1948,17 +1948,17 @@ static MACHINE_DRIVER_START( fghthist )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.42)
MDRV_SOUND_ROUTE(1, "right", 0.42)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35)
@@ -1994,17 +1994,17 @@ static MACHINE_DRIVER_START( fghthsta )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.42)
MDRV_SOUND_ROUTE(1, "right", 0.42)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35)
@@ -2043,22 +2043,22 @@ static MACHINE_DRIVER_START( dragngun )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.42)
MDRV_SOUND_ROUTE(1, "right", 0.42)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki3", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_3_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -2097,22 +2097,22 @@ static MACHINE_DRIVER_START( lockload )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.42)
MDRV_SOUND_ROUTE(1, "right", 0.42)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki3", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_3_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -2150,7 +2150,7 @@ static MACHINE_DRIVER_START( tattass )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(BSMT2000, 24000000)
+ MDRV_SOUND_ADD("bsmt", BSMT2000, 24000000)
MDRV_SOUND_CONFIG(bsmt2000_interface_region_1)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2187,17 +2187,17 @@ static MACHINE_DRIVER_START( nslasher )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface_nslasher)
MDRV_SOUND_ROUTE(0, "left", 0.40)
MDRV_SOUND_ROUTE(1, "right", 0.40)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10)
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index f30ba6f668a..e542b719ada 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -455,7 +455,7 @@ static MACHINE_DRIVER_START( avengrgs )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 42000000 / 3)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 42000000 / 3)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -487,7 +487,7 @@ static MACHINE_DRIVER_START( mlc )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 42000000 / 3)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 42000000 / 3)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index fb94a0a5320..967743bc5be 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -415,10 +415,10 @@ static MACHINE_DRIVER_START( decocass )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index eaa3a011ac2..44e25169550 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -348,11 +348,11 @@ static MACHINE_DRIVER_START( deniam16b )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 25000000/8)
+ MDRV_SOUND_ADD("ym", YM3812, 25000000/8)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -383,11 +383,11 @@ static MACHINE_DRIVER_START( deniam16c )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 25000000/8)
+ MDRV_SOUND_ADD("ym", YM3812, 25000000/8)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index 6114e587883..d13375b2d1c 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -218,11 +218,11 @@ static MACHINE_DRIVER_START( dietgo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_32_22MHz/9) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_32_22MHz/9) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
- MDRV_SOUND_ADD(OKIM6295, XTAL_32_22MHz/32) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_32_22MHz/32) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index fe4e6978b32..bc433eb77fd 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -502,11 +502,11 @@ static MACHINE_DRIVER_START( discoboy )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 2500000)
+ MDRV_SOUND_ADD("ym", YM3812, 2500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(MSM5205, 384000) // ???? unknown
+ MDRV_SOUND_ADD("msm", MSM5205, 384000) // ???? unknown
MDRV_SOUND_CONFIG(discoboy_msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index 09121844449..dc1bb68195a 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -217,7 +217,7 @@ static MACHINE_DRIVER_START( diverboy )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1320000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1320000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c
index 4f4d91d581d..6cdb3232917 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -859,14 +859,14 @@ static MACHINE_DRIVER_START( djboy )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 12000000 / 8)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 12000000 / 8)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(OKIM6295, 12000000 / 8)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 12000000 / 8)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index 70037742c63..dc5a46f20f1 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -1252,12 +1252,12 @@ static MACHINE_DRIVER_START( djmain )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami1", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami2", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index 8755c00616c..028ccabff3c 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -827,11 +827,11 @@ static MACHINE_DRIVER_START( dlair )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(AY8910, MASTER_CLOCK_US/8)
+ MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK_US/8)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.33)
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("laserdisc", CUSTOM, 0)
MDRV_SOUND_CONFIG(laserdisc_custom_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -870,11 +870,11 @@ static MACHINE_DRIVER_START( dleuro )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(BEEP, 0)
+ MDRV_SOUND_ADD("beep", BEEP, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.33)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.33)
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("laserdisc", CUSTOM, 0)
MDRV_SOUND_CONFIG(laserdisc_custom_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c
index c1075ff9fca..e186505181c 100644
--- a/src/mame/drivers/docastle.c
+++ b/src/mame/drivers/docastle.c
@@ -683,16 +683,16 @@ static MACHINE_DRIVER_START( docastle )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489, 4000000)
+ MDRV_SOUND_ADD("sn1", SN76489, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(SN76489, 4000000)
+ MDRV_SOUND_ADD("sn2", SN76489, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(SN76489, 4000000)
+ MDRV_SOUND_ADD("sn3", SN76489, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(SN76489, 4000000)
+ MDRV_SOUND_ADD("sn4", SN76489, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -724,7 +724,7 @@ static MACHINE_DRIVER_START( idsoccer )
MDRV_VIDEO_START(dorunrun)
// sound hardware
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index 1aa55cfe75a..6957be1d78c 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -268,10 +268,10 @@ static MACHINE_DRIVER_START( dogfgt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index 69a7093c3d2..7dafa63e3af 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -276,7 +276,7 @@ static MACHINE_DRIVER_START( dominob )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/4 /* guess */)
+ MDRV_SOUND_ADD("ay", AY8910, 8000000/4 /* guess */)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index 06ec4c12a49..1647bdcec53 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -943,11 +943,11 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( sound_2203 )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
@@ -955,12 +955,12 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sound_2151 )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
@@ -968,12 +968,12 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sound_2151_m68k )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c
index e6554e2e4a7..4ec96791b2e 100644
--- a/src/mame/drivers/dragrace.c
+++ b/src/mame/drivers/dragrace.c
@@ -351,7 +351,7 @@ static MACHINE_DRIVER_START( dragrace )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(dragrace)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index 9042c84ed25..07a8225af44 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -465,12 +465,12 @@ static MACHINE_DRIVER_START( dreamwld )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, MASTER_CLOCK/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, MASTER_CLOCK/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(OKIM6295, MASTER_CLOCK/32)
+ MDRV_SOUND_ADD("oki2", OKIM6295, MASTER_CLOCK/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index 8a4eb79112f..91127495f5b 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -384,12 +384,12 @@ static MACHINE_DRIVER_START( drgnmst )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 32000000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32000000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(OKIM6295, 32000000/32)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32000000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c
index d6e55c082ea..6efda2c145a 100644
--- a/src/mame/drivers/drmicro.c
+++ b/src/mame/drivers/drmicro.c
@@ -254,16 +254,16 @@ static MACHINE_DRIVER_START( drmicro )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, MCLK/4)
+ MDRV_SOUND_ADD("sn1", SN76496, MCLK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76496, MCLK/4)
+ MDRV_SOUND_ADD("sn2", SN76496, MCLK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76496, MCLK/4)
+ MDRV_SOUND_ADD("sn3", SN76496, MCLK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c
index c3d86a1986b..e60871cb2aa 100644
--- a/src/mame/drivers/drtomy.c
+++ b/src/mame/drivers/drtomy.c
@@ -271,7 +271,7 @@ static MACHINE_DRIVER_START( drtomy )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 26000000/16)
+ MDRV_SOUND_ADD("oki", OKIM6295, 26000000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c
index de13a8b911f..889456422fb 100644
--- a/src/mame/drivers/drw80pkr.c
+++ b/src/mame/drivers/drw80pkr.c
@@ -242,7 +242,7 @@ static MACHINE_DRIVER_START( drw80pkr )
MDRV_VIDEO_UPDATE(drw80pkr)
// sound hardware
- MDRV_SOUND_ADD(AY8912, 20000000/12)
+ MDRV_SOUND_ADD("ay", AY8912, 20000000/12)
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index 56628a2bba6..f7ef2419de6 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -698,14 +698,14 @@ static MACHINE_DRIVER_START( dunhuang )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD_TAG("ay8910", AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay8910", AY8910, 12000000/8)
MDRV_SOUND_CONFIG(dunhuang_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(OKIM6295, 12000000/8)
+ MDRV_SOUND_ADD("oki", OKIM6295, 12000000/8)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c
index 9b9f01acb50..22dd18cfc48 100644
--- a/src/mame/drivers/dwarfd.c
+++ b/src/mame/drivers/dwarfd.c
@@ -712,7 +712,7 @@ static MACHINE_DRIVER_START( dwarfd )
MDRV_VIDEO_UPDATE(dwarfd)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c
index 57267da2b61..d6753b94863 100644
--- a/src/mame/drivers/dynadice.c
+++ b/src/mame/drivers/dynadice.c
@@ -224,7 +224,7 @@ static MACHINE_DRIVER_START( dynadice )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index 9e92f661483..31e3423aae5 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -3652,17 +3652,17 @@ static MACHINE_DRIVER_START( hanamai )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 22000000 / 8)
+ MDRV_SOUND_ADD("ay", AY8910, 22000000 / 8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(YM2203, 22000000 / 8)
+ MDRV_SOUND_ADD("ym", YM2203, 22000000 / 8)
MDRV_SOUND_CONFIG(hanamai_ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
MDRV_SOUND_ROUTE(2, "mono", 0.20)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(hanamai_msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3708,14 +3708,14 @@ static MACHINE_DRIVER_START( hnoridur )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 22000000 / 16)
+ MDRV_SOUND_ADD("ay", AY8910, 22000000 / 16)
MDRV_SOUND_CONFIG(hnoridur_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(hanamai_msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3765,7 +3765,7 @@ static MACHINE_DRIVER_START( sprtmtch )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 22000000 / 8)
+ MDRV_SOUND_ADD("ym", YM2203, 22000000 / 8)
MDRV_SOUND_CONFIG(sprtmtch_ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
@@ -3805,7 +3805,7 @@ static MACHINE_DRIVER_START( mjfriday )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 24000000/6)
+ MDRV_SOUND_ADD("ym", YM2413, 24000000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3960,17 +3960,17 @@ static MACHINE_DRIVER_START( jantouki )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 22000000 / 8)
+ MDRV_SOUND_ADD("ay", AY8910, 22000000 / 8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(YM2203, 22000000 / 8)
+ MDRV_SOUND_ADD("ym", YM2203, 22000000 / 8)
MDRV_SOUND_CONFIG(jantouki_ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
MDRV_SOUND_ROUTE(2, "mono", 0.20)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(jantouki_msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -4114,11 +4114,11 @@ static MACHINE_DRIVER_START( htengoku )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 20000000 / 16)
+ MDRV_SOUND_ADD("ay", AY8910, 20000000 / 16)
MDRV_SOUND_CONFIG(htengoku_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* devices */
@@ -4175,11 +4175,11 @@ static MACHINE_DRIVER_START( tenkai )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 22000000 / 16)
+ MDRV_SOUND_ADD("ay", AY8910, 22000000 / 16)
MDRV_SOUND_CONFIG(tenkai_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* devices */
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index b68a56c6ac2..95c8b5dd267 100644
--- a/src/mame/drivers/egghunt.c
+++ b/src/mame/drivers/egghunt.c
@@ -412,7 +412,7 @@ static MACHINE_DRIVER_START( egghunt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000) // ?
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000) // ?
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c
index e8ff28b16b5..9aaedcda45c 100644
--- a/src/mame/drivers/enigma2.c
+++ b/src/mame/drivers/enigma2.c
@@ -583,7 +583,7 @@ static MACHINE_DRIVER_START( enigma2 )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, AY8910_CLOCK)
+ MDRV_SOUND_ADD("ay", AY8910, AY8910_CLOCK)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -613,7 +613,7 @@ static MACHINE_DRIVER_START( enigma2a )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, AY8910_CLOCK)
+ MDRV_SOUND_ADD("ay", AY8910, AY8910_CLOCK)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c
index 43fc54fb457..830982a0b21 100644
--- a/src/mame/drivers/eolith16.c
+++ b/src/mame/drivers/eolith16.c
@@ -186,7 +186,7 @@ static MACHINE_DRIVER_START( eolith16 )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c
index 320f27bbec6..319b6cb6068 100644
--- a/src/mame/drivers/epos.c
+++ b/src/mame/drivers/epos.c
@@ -375,7 +375,7 @@ static MACHINE_DRIVER_START( epos )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 11000000/4)
+ MDRV_SOUND_ADD("ay", AY8910, 11000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -404,7 +404,7 @@ static MACHINE_DRIVER_START( dealer )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 11000000/4)
+ MDRV_SOUND_ADD("ay", AY8910, 11000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index d44a63968eb..7e71c1841a3 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -1162,7 +1162,7 @@ static MACHINE_DRIVER_START( common_sound )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(MSM5232, MSM5232_MAX_CLOCK) // will be adjusted at runtime through PORT_ADJUSTER
+ MDRV_SOUND_ADD("msm", MSM5232, MSM5232_MAX_CLOCK) // will be adjusted at runtime through PORT_ADJUSTER
MDRV_SOUND_CONFIG(equites_5232intf)
MDRV_SOUND_ROUTE(0, "mono", MSM5232_BASE_VOLUME/2.2) // pin 28 2'-1 : 22k resistor
MDRV_SOUND_ROUTE(1, "mono", MSM5232_BASE_VOLUME/1.5) // pin 29 4'-1 : 15k resistor
@@ -1176,17 +1176,17 @@ static MACHINE_DRIVER_START( common_sound )
MDRV_SOUND_ROUTE(9, "mono", 1.0) // pin 2 SOLO 16' (this actually feeds an analog section)
MDRV_SOUND_ROUTE(10,"mono", 0.12) // pin 22 Noise Output (this actually feeds an analog section)
- MDRV_SOUND_ADD(AY8910, XTAL_6_144MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ay", AY8910, XTAL_6_144MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(equites_8910intf)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(alphamc07_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index 8411f545dff..8359d094aa9 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -597,10 +597,10 @@ static MACHINE_DRIVER_START( multchmp )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c
index 4263aa2f8e7..32c0a07d4c2 100644
--- a/src/mame/drivers/espial.c
+++ b/src/mame/drivers/espial.c
@@ -341,7 +341,7 @@ static MACHINE_DRIVER_START( espial )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index d4676f8bab4..4ec04b8ce97 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -262,14 +262,14 @@ static MACHINE_DRIVER_START( ettrivia )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8912_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay3", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8912_interface_3)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c
index d7d4b5f3c37..4cf90c22fce 100644
--- a/src/mame/drivers/exedexes.c
+++ b/src/mame/drivers/exedexes.c
@@ -253,13 +253,13 @@ static MACHINE_DRIVER_START( exedexes )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(SN76489, 3000000)
+ MDRV_SOUND_ADD("sn1", SN76489, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.36)
- MDRV_SOUND_ADD(SN76489, 3000000)
+ MDRV_SOUND_ADD("sn2", SN76489, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.36)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index ad0d13352ae..9395c2458ff 100644
--- a/src/mame/drivers/exerion.c
+++ b/src/mame/drivers/exerion.c
@@ -299,10 +299,10 @@ static MACHINE_DRIVER_START( exerion )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, EXERION_AY8910_CLOCK)
+ MDRV_SOUND_ADD("ay1", AY8910, EXERION_AY8910_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, EXERION_AY8910_CLOCK)
+ MDRV_SOUND_ADD("ay2", AY8910, EXERION_AY8910_CLOCK)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index 30565191a7f..7f757ab28da 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -336,7 +336,7 @@ static MACHINE_DRIVER_START( galsnew )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("oki", OKIM6295, 12000000/6)
+ MDRV_SOUND_ADD("oki", OKIM6295, 12000000/6)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index 6e0aaf241c8..5bdeee1f82d 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -328,10 +328,10 @@ static MACHINE_DRIVER_START( exprraid )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(YM3526, 3600000)
+ MDRV_SOUND_ADD("ym2", YM3526, 3600000)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index a6a3773d23d..4af0052e481 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -507,10 +507,10 @@ static MACHINE_DRIVER_START( exterm )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index 7e3db62422f..9e83bcbfb4f 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -359,7 +359,7 @@ static MACHINE_DRIVER_START( exzisus )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c
index 9b90e9ff927..c8dd2cbf353 100644
--- a/src/mame/drivers/f-32.c
+++ b/src/mame/drivers/f-32.c
@@ -172,11 +172,11 @@ static MACHINE_DRIVER_START( mosaicf2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 14318180/4)
+ MDRV_SOUND_ADD("ym", YM2151, 14318180/4)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1789772.5)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1789772.5)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index a4970ac5c3b..326c4f92445 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -596,7 +596,7 @@ static MACHINE_DRIVER_START( f1gp )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, XTAL_8MHz)
+ MDRV_SOUND_ADD("ym", YM2610, XTAL_8MHz)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -635,7 +635,7 @@ static MACHINE_DRIVER_START( f1gpb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index 6028bb09b04..543a11a3a08 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -839,11 +839,11 @@ static MACHINE_DRIVER_START( fantland )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3000000)
+ MDRV_SOUND_ADD("ym", YM2151, 3000000)
MDRV_SOUND_ROUTE(0, "mono", 0.35)
MDRV_SOUND_ROUTE(1, "mono", 0.35)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -888,7 +888,7 @@ static MACHINE_DRIVER_START( galaxygn )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3000000)
+ MDRV_SOUND_ADD("ym", YM2151, 3000000)
MDRV_SOUND_CONFIG(galaxygn_ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -940,10 +940,10 @@ static MACHINE_DRIVER_START( borntofi )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MDRV_SOUND_ADD("msm1", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MDRV_SOUND_ADD("msm2", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MDRV_SOUND_ADD("msm3", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MDRV_SOUND_ADD("msm4", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -987,7 +987,7 @@ static MACHINE_DRIVER_START( wheelrun )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, XTAL_14MHz/4)
+ MDRV_SOUND_ADD("ym", YM3526, XTAL_14MHz/4)
MDRV_SOUND_CONFIG(wheelrun_ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c
index bd398756b15..11f039e6d6b 100644
--- a/src/mame/drivers/fastfred.c
+++ b/src/mame/drivers/fastfred.c
@@ -584,10 +584,10 @@ static MACHINE_DRIVER_START( fastfred )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("ay8910.1", AY8910, CLOCK/12)
+ MDRV_SOUND_ADD("ay8910.1", AY8910, CLOCK/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD_TAG("ay8910.2", AY8910, CLOCK/12)
+ MDRV_SOUND_ADD("ay8910.2", AY8910, CLOCK/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c
index f0c7f37754e..2d45b6feeb7 100644
--- a/src/mame/drivers/fastlane.c
+++ b/src/mame/drivers/fastlane.c
@@ -299,12 +299,12 @@ static MACHINE_DRIVER_START( fastlane )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami1", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface_1)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami2", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface_2)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c
index a22dd806b5a..6be3071fd67 100644
--- a/src/mame/drivers/fcombat.c
+++ b/src/mame/drivers/fcombat.c
@@ -303,13 +303,13 @@ static MACHINE_DRIVER_START( fcombat )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay3", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index 7d5b834e88e..b33d4c98371 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -687,23 +687,23 @@ static MACHINE_DRIVER_START( fcrash )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 24000000/6) /* ? */
+ MDRV_SOUND_ADD("ym1", YM2203, 24000000/6) /* ? */
MDRV_SOUND_ROUTE(0, "mono", 0.10)
MDRV_SOUND_ROUTE(1, "mono", 0.10)
MDRV_SOUND_ROUTE(2, "mono", 0.10)
MDRV_SOUND_ROUTE(3, "mono", 1.0)
- MDRV_SOUND_ADD(YM2203, 24000000/6) /* ? */
+ MDRV_SOUND_ADD("ym2", YM2203, 24000000/6) /* ? */
MDRV_SOUND_ROUTE(0, "mono", 0.10)
MDRV_SOUND_ROUTE(1, "mono", 0.10)
MDRV_SOUND_ROUTE(2, "mono", 0.10)
MDRV_SOUND_ROUTE(3, "mono", 1.0)
- MDRV_SOUND_ADD(MSM5205, 24000000/64) /* ? */
+ MDRV_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
MDRV_SOUND_CONFIG(msm5205_interface1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(MSM5205, 24000000/64) /* ? */
+ MDRV_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
MDRV_SOUND_CONFIG(msm5205_interface2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -737,12 +737,12 @@ static MACHINE_DRIVER_START( kodb )
/* sound hardware */
// MDRV_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD_TAG("2151", YM2151, 3579545)
+// MDRV_SOUND_ADD("2151", YM2151, 3579545)
// MDRV_SOUND_CONFIG(ym2151_interface)
// MDRV_SOUND_ROUTE(0, "mono", 0.35)
// MDRV_SOUND_ROUTE(1, "mono", 0.35)
-// MDRV_SOUND_ADD_TAG("okim", OKIM6295, 1000000)
+// MDRV_SOUND_ADD("okim", OKIM6295, 1000000)
// MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // pin 7 can be changed by the game code, see f006 on z80
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index c7d361a1d57..9b1c425c77c 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -431,10 +431,10 @@ static MACHINE_DRIVER_START( finalizr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 18432000/12)
+ MDRV_SOUND_ADD("sn", SN76496, 18432000/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c
index 6a980c8a6e6..2216c901d96 100644
--- a/src/mame/drivers/findout.c
+++ b/src/mame/drivers/findout.c
@@ -480,7 +480,7 @@ static MACHINE_DRIVER_START( findout )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index d24a9d60505..5dc99eda41c 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -2043,12 +2043,12 @@ static MACHINE_DRIVER_START(firebeat)
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(CDDA, 0)
+ MDRV_SOUND_ADD("cdda", CDDA, 0)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2088,12 +2088,12 @@ static MACHINE_DRIVER_START(firebeat2)
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(CDDA, 0)
+ MDRV_SOUND_ADD("cdda", CDDA, 0)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index 4d3c9a67f10..9238ed22ff9 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -605,10 +605,10 @@ static MACHINE_DRIVER_START( firetrap )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 3000000)
+ MDRV_SOUND_ADD("ym", YM3526, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -644,10 +644,10 @@ static MACHINE_DRIVER_START( firetpbl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 3000000)
+ MDRV_SOUND_ADD("ym", YM3526, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c
index cddaa39c7ba..663442099cb 100644
--- a/src/mame/drivers/firetrk.c
+++ b/src/mame/drivers/firetrk.c
@@ -896,7 +896,7 @@ static MACHINE_DRIVER_START( firetrk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(firetrk)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index 32aba70542d..dd2a97d0a5f 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -778,7 +778,7 @@ static MACHINE_DRIVER_START( fitfight )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1333333) // ~8080Hz ??? TODO: find out the real frequency
+ MDRV_SOUND_ADD("oki", OKIM6295, 1333333) // ~8080Hz ??? TODO: find out the real frequency
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -805,7 +805,7 @@ static MACHINE_DRIVER_START( bbprot )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1333333) // ~8080Hz ??? TODO: find out the real frequency
+ MDRV_SOUND_ADD("oki", OKIM6295, 1333333) // ~8080Hz ??? TODO: find out the real frequency
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 0db82876316..8d4e7de56b3 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -312,11 +312,11 @@ static MACHINE_DRIVER_START( flkatck )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(0, "right", 0.50)
diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c
index 9cdfe6d4e12..eb72a925aa1 100644
--- a/src/mame/drivers/flower.c
+++ b/src/mame/drivers/flower.c
@@ -266,7 +266,7 @@ static MACHINE_DRIVER_START( flower )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("flower", CUSTOM, 0)
MDRV_SOUND_CONFIG(custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index 92667e6d50b..7be59ae5e69 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -686,11 +686,11 @@ static MACHINE_DRIVER_START( flstory )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_8MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ay", AY8910, XTAL_8MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(MSM5232, XTAL_8MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("msm", MSM5232, XTAL_8MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(msm5232_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
@@ -704,7 +704,7 @@ static MACHINE_DRIVER_START( flstory )
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -744,11 +744,11 @@ static MACHINE_DRIVER_START( onna34ro )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay", AY8910, 8000000/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(MSM5232, 2000000)
+ MDRV_SOUND_ADD("msm", MSM5232, 2000000)
MDRV_SOUND_CONFIG(msm5232_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
@@ -762,7 +762,7 @@ static MACHINE_DRIVER_START( onna34ro )
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -802,11 +802,11 @@ static MACHINE_DRIVER_START( victnine )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay", AY8910, 8000000/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(MSM5232, 2000000)
+ MDRV_SOUND_ADD("msm", MSM5232, 2000000)
MDRV_SOUND_CONFIG(msm5232_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
@@ -820,7 +820,7 @@ static MACHINE_DRIVER_START( victnine )
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c
index c98c5251fd4..dca12d4b17b 100644
--- a/src/mame/drivers/foodf.c
+++ b/src/mame/drivers/foodf.c
@@ -397,14 +397,14 @@ static MACHINE_DRIVER_START( foodf )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK/2/10)
+ MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/2/10)
MDRV_SOUND_CONFIG(pokey_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK/2/10)
+ MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/2/10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK/2/10)
+ MDRV_SOUND_ADD("pokey3", POKEY, MASTER_CLOCK/2/10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index 9b5749114f5..e49cde09350 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -682,16 +682,16 @@ static MACHINE_DRIVER_START( base )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 12000000/4)
+ MDRV_SOUND_ADD("sn1", SN76496, 12000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76496, 12000000/4)
+ MDRV_SOUND_ADD("sn2", SN76496, 12000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76496, 12000000/4)
+ MDRV_SOUND_ADD("sn3", SN76496, 12000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76496, 12000000/4)
+ MDRV_SOUND_ADD("sn4", SN76496, 12000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index 317d1f8d47a..969150dc1f0 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -745,7 +745,7 @@ static MACHINE_DRIVER_START( fromanc2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.75)
@@ -797,7 +797,7 @@ static MACHINE_DRIVER_START( fromancr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.75)
@@ -846,7 +846,7 @@ static MACHINE_DRIVER_START( fromanc4 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.75)
diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c
index 04efb99b1ae..efa52ea252a 100644
--- a/src/mame/drivers/fromance.c
+++ b/src/mame/drivers/fromance.c
@@ -1083,10 +1083,10 @@ static MACHINE_DRIVER_START( nekkyoku )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/6)
+ MDRV_SOUND_ADD("ay", AY8910, 12000000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -1121,10 +1121,10 @@ static MACHINE_DRIVER_START( idolmj )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/6)
+ MDRV_SOUND_ADD("ay", AY8910, 12000000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -1159,10 +1159,10 @@ static MACHINE_DRIVER_START( fromance )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index 40c2de030d4..7e11ab209b5 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -326,7 +326,7 @@ static MACHINE_DRIVER_START( funkybee )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index 4b4d599158b..410de7a63ca 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -390,12 +390,12 @@ static MACHINE_DRIVER_START( funkyjet )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index 4dd557947e9..f470604a4b3 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -1702,7 +1702,7 @@ static MACHINE_DRIVER_START( funworld )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz */
+ MDRV_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz */
MDRV_SOUND_CONFIG(ay8910_intf)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.5) /* analyzed to avoid clips */
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c
index 8ed8c18b523..974d1587681 100644
--- a/src/mame/drivers/funybubl.c
+++ b/src/mame/drivers/funybubl.c
@@ -270,7 +270,7 @@ static MACHINE_DRIVER_START( funybubl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index fd04f31b3ef..394b72757b3 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -589,16 +589,16 @@ static MACHINE_DRIVER_START( fuuki16 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.15)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.15)
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 4000000)
MDRV_SOUND_CONFIG(fuuki16_ym3812_intf)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.85)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.85)
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index ee86234f90f..e30f803674f 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -633,14 +633,14 @@ static MACHINE_DRIVER_START( fuuki32 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMF262, FM_SOUND_CLOCK) /* 33.8688MHz OSC divided by 2 is 16.9344MHz */
+ MDRV_SOUND_ADD("ymf1", YMF262, FM_SOUND_CLOCK) /* 33.8688MHz OSC divided by 2 is 16.9344MHz */
MDRV_SOUND_CONFIG(ymf262_interface)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
MDRV_SOUND_ROUTE(2, "left", 0.50)
MDRV_SOUND_ROUTE(3, "right", 0.50)
- MDRV_SOUND_ADD(YMF278B, YMF278B_STD_CLOCK) /* YMF278B_STD_CLOCK = OSC 33.8688MHz */
+ MDRV_SOUND_ADD("ymf2", YMF278B, YMF278B_STD_CLOCK) /* YMF278B_STD_CLOCK = OSC 33.8688MHz */
MDRV_SOUND_CONFIG(ymf278b_interface)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 628948b724a..36921db5468 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -244,10 +244,10 @@ static MACHINE_DRIVER_START( bigkarnk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 3580000)
+ MDRV_SOUND_ADD("ym", YM3812, 3580000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -493,7 +493,7 @@ static MACHINE_DRIVER_START( maniacsq )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -748,7 +748,7 @@ static MACHINE_DRIVER_START( squash )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -916,7 +916,7 @@ static MACHINE_DRIVER_START( thoop )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c
index e97b7fae156..eeab0cf5f7c 100644
--- a/src/mame/drivers/gaelco2.c
+++ b/src/mame/drivers/gaelco2.c
@@ -189,7 +189,7 @@ static MACHINE_DRIVER_START( maniacsq )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(GAELCO_GAE1, 0)
+ MDRV_SOUND_ADD("gaelco", GAELCO_GAE1, 0)
MDRV_SOUND_CONFIG(maniacsq_snd_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -318,7 +318,7 @@ static MACHINE_DRIVER_START( bang )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(GAELCO_CG1V, 0)
+ MDRV_SOUND_ADD("gaelco", GAELCO_CG1V, 0)
MDRV_SOUND_CONFIG(bang_snd_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -521,7 +521,7 @@ static MACHINE_DRIVER_START( alighunt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(GAELCO_GAE1, 0)
+ MDRV_SOUND_ADD("gaelco", GAELCO_GAE1, 0)
MDRV_SOUND_CONFIG(alighunt_snd_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -782,7 +782,7 @@ static MACHINE_DRIVER_START( touchgo )
/* the chip is stereo, but the game sound is mono because the right channel
output is for cabinet 1 and the left channel output is for cabinet 2 */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(GAELCO_GAE1, 0)
+ MDRV_SOUND_ADD("gaelco", GAELCO_GAE1, 0)
MDRV_SOUND_CONFIG(touchgo_snd_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -979,7 +979,7 @@ static MACHINE_DRIVER_START( snowboar )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(GAELCO_CG1V, 0)
+ MDRV_SOUND_ADD("gaelco", GAELCO_CG1V, 0)
MDRV_SOUND_CONFIG(snowboar_snd_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -1240,7 +1240,7 @@ static MACHINE_DRIVER_START( wrally2 )
/* the chip is stereo, but the game sound is mono because the right channel
output is for cabinet 1 and the left channel output is for cabinet 2 */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(GAELCO_GAE1, 0)
+ MDRV_SOUND_ADD("gaelco", GAELCO_GAE1, 0)
MDRV_SOUND_CONFIG(wrally2_snd_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index f152d4fb87f..720255e2cc2 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -950,16 +950,16 @@ static MACHINE_DRIVER_START( gaelco3d )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac1", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: front mono */
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac2", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: left rear */
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac3", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: right rear */
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac4", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: seat speaker */
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 8358571b46a..4e978dc8b51 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -1002,20 +1002,20 @@ static MACHINE_DRIVER_START( shadoww )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.60)
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 4000000)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.60)
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -1060,10 +1060,10 @@ static MACHINE_DRIVER_START( drgnbowl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index c29f26c81b0..3189d02b04d 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -1697,16 +1697,16 @@ static MACHINE_DRIVER_START( bosco )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO, 18432000/6/32)
+ MDRV_SOUND_ADD("namco1", NAMCO, 18432000/6/32)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
- MDRV_SOUND_ADD(NAMCO_52XX, 18432000/12) /* 1.536 MHz */
+ MDRV_SOUND_ADD("namco2", NAMCO_52XX, 18432000/12) /* 1.536 MHz */
MDRV_SOUND_CONFIG(namco_52xx_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
/* discrete circuit on the 54XX outputs */
- MDRV_SOUND_ADD_TAG("Discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("Discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(bosco)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_DRIVER_END
@@ -1756,12 +1756,12 @@ static MACHINE_DRIVER_START( galaga )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO, 18432000/6/32)
+ MDRV_SOUND_ADD("namco", NAMCO, 18432000/6/32)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
/* discrete circuit on the 54XX outputs */
- MDRV_SOUND_ADD_TAG("Discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("Discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(galaga)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_DRIVER_END
@@ -1829,12 +1829,12 @@ static MACHINE_DRIVER_START( xevious )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO, 18432000/6/32)
+ MDRV_SOUND_ADD("namco", NAMCO, 18432000/6/32)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
/* discrete circuit on the 54XX outputs */
- MDRV_SOUND_ADD_TAG("Discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("Discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(galaga)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_DRIVER_END
@@ -1859,7 +1859,7 @@ static MACHINE_DRIVER_START( battles )
/* sound hardware */
MDRV_SOUND_REMOVE("Discrete")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(battles_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -1903,7 +1903,7 @@ static MACHINE_DRIVER_START( digdug )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO, 18432000/6/32)
+ MDRV_SOUND_ADD("namco", NAMCO, 18432000/6/32)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 573d1512350..b9d22a5101f 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -1777,7 +1777,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( galaxian_sound )
/* sound hardware */
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(galaxian_custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1802,13 +1802,13 @@ static MACHINE_DRIVER_START( konami_sound_1x_ay8910 )
MDRV_CPU_IO_MAP(frogger_sound_portmap,0)
/* sound hardware */
- MDRV_SOUND_ADD_TAG("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
+ MDRV_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
MDRV_SOUND_CONFIG(frogger_ay8910_interface)
MDRV_SOUND_ROUTE_EX(0, "konami", 1.0, 3)
MDRV_SOUND_ROUTE_EX(1, "konami", 1.0, 4)
MDRV_SOUND_ROUTE_EX(2, "konami", 1.0, 5)
- MDRV_SOUND_ADD_TAG("konami", DISCRETE, 0)
+ MDRV_SOUND_ADD("konami", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(konami_sound)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
@@ -1822,19 +1822,19 @@ static MACHINE_DRIVER_START( konami_sound_2x_ay8910 )
MDRV_CPU_IO_MAP(konami_sound_portmap,0)
/* sound hardware */
- MDRV_SOUND_ADD_TAG("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
+ MDRV_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
MDRV_SOUND_CONFIG(konami_ay8910_interface_1)
MDRV_SOUND_ROUTE_EX(0, "konami", 1.0, 0)
MDRV_SOUND_ROUTE_EX(1, "konami", 1.0, 1)
MDRV_SOUND_ROUTE_EX(2, "konami", 1.0, 2)
- MDRV_SOUND_ADD_TAG("8910.1", AY8910, KONAMI_SOUND_CLOCK/8)
+ MDRV_SOUND_ADD("8910.1", AY8910, KONAMI_SOUND_CLOCK/8)
MDRV_SOUND_CONFIG(konami_ay8910_interface_2)
MDRV_SOUND_ROUTE_EX(0, "konami", 1.0, 3)
MDRV_SOUND_ROUTE_EX(1, "konami", 1.0, 4)
MDRV_SOUND_ROUTE_EX(2, "konami", 1.0, 5)
- MDRV_SOUND_ADD_TAG("konami", DISCRETE, 0)
+ MDRV_SOUND_ADD("konami", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(konami_sound)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
MACHINE_DRIVER_END
@@ -1868,7 +1868,7 @@ static MACHINE_DRIVER_START( zigzag )
MDRV_GFXDECODE(pacmanbl)
/* sound hardware */
- MDRV_SOUND_ADD(AY8910, 1789750)
+ MDRV_SOUND_ADD("ay", AY8910, 1789750)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1901,7 +1901,7 @@ static MACHINE_DRIVER_START( jumpbug )
MDRV_CPU_PROGRAM_MAP(jumpbug_map,0)
/* sound hardware */
- MDRV_SOUND_ADD(AY8910, 1789750)
+ MDRV_SOUND_ADD("ay", AY8910, 1789750)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1916,7 +1916,7 @@ static MACHINE_DRIVER_START( checkman )
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* NMIs are triggered by the main CPU */
/* sound hardware */
- MDRV_SOUND_ADD(AY8910, 1789750)
+ MDRV_SOUND_ADD("ay", AY8910, 1789750)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1931,7 +1931,7 @@ static MACHINE_DRIVER_START( checkmaj )
MDRV_TIMER_ADD_SCANLINE("irq0", checkmaj_irq0_gen, "main", 0, 8)
/* sound hardware */
- MDRV_SOUND_ADD(AY8910, 1620000)
+ MDRV_SOUND_ADD("ay", AY8910, 1620000)
MDRV_SOUND_CONFIG(checkmaj_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1946,11 +1946,11 @@ static MACHINE_DRIVER_START( mshuttle )
MDRV_CPU_IO_MAP(mshuttle_portmap,0)
/* sound hardware */
- MDRV_SOUND_ADD(AY8910, GALAXIAN_PIXEL_CLOCK/3/4)
+ MDRV_SOUND_ADD("ay", AY8910, GALAXIAN_PIXEL_CLOCK/3/4)
MDRV_SOUND_CONFIG(cclimber_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(cclimber_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
@@ -1965,7 +1965,7 @@ static MACHINE_DRIVER_START( kingball )
MDRV_CPU_IO_MAP(kingball_sound_portmap,0)
/* sound hardware */
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -2065,11 +2065,11 @@ static MACHINE_DRIVER_START( explorer )
MDRV_CPU_IO_MAP(konami_sound_portmap,0)
/* sound hardware */
- MDRV_SOUND_ADD_TAG("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
+ MDRV_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
MDRV_SOUND_CONFIG(explorer_ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD_TAG("8910.1", AY8910, KONAMI_SOUND_CLOCK/8)
+ MDRV_SOUND_ADD("8910.1", AY8910, KONAMI_SOUND_CLOCK/8)
MDRV_SOUND_CONFIG(explorer_ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -2085,7 +2085,7 @@ static MACHINE_DRIVER_START( scorpion )
MDRV_DEVICE_CONFIG( scorpion_ppi8255_intf[1] )
/* extra AY8910 with I/O ports */
- MDRV_SOUND_ADD_TAG("8910.2", AY8910, KONAMI_SOUND_CLOCK/8)
+ MDRV_SOUND_ADD("8910.2", AY8910, KONAMI_SOUND_CLOCK/8)
MDRV_SOUND_CONFIG(scorpion_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -2120,7 +2120,7 @@ static MACHINE_DRIVER_START( sfx )
MDRV_SOUND_CONFIG(sfx_ay8910_interface)
/* DAC for the sample player */
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index c638b256d21..17952ac3796 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -2332,7 +2332,7 @@ static MACHINE_DRIVER_START( galaxian )
MDRV_IMPORT_FROM(galaxold_base)
/* sound hardware */
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(galaxian_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -2461,7 +2461,7 @@ static MACHINE_DRIVER_START( ozon1 )
MDRV_PALETTE_LENGTH(32)
MDRV_VIDEO_START(galaxold_plain)
- MDRV_SOUND_ADD(AY8910, 1789750)
+ MDRV_SOUND_ADD("ay", AY8910, 1789750)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -2491,7 +2491,7 @@ static MACHINE_DRIVER_START( drivfrcg )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(galaxian_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -2506,7 +2506,7 @@ static MACHINE_DRIVER_START( bongo )
MDRV_VIDEO_START(bongo)
MDRV_VIDEO_UPDATE(galaxold)
- MDRV_SOUND_ADD(AY8910, 1789750)
+ MDRV_SOUND_ADD("ay", AY8910, 1789750)
MDRV_SOUND_CONFIG(bongo_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -2533,7 +2533,7 @@ static MACHINE_DRIVER_START( hunchbkg )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(galaxian_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -2557,13 +2557,13 @@ static MACHINE_DRIVER_START( harem )
MDRV_VIDEO_START(galaxold_plain)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33/3)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33/3)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay3", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33/3)
MACHINE_DRIVER_END
@@ -2595,13 +2595,13 @@ static MACHINE_DRIVER_START( racknrol )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, PIXEL_CLOCK/2)
+ MDRV_SOUND_ADD("sn1", SN76496, PIXEL_CLOCK/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76496, PIXEL_CLOCK/2)
+ MDRV_SOUND_ADD("sn2", SN76496, PIXEL_CLOCK/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76496, PIXEL_CLOCK/2)
+ MDRV_SOUND_ADD("sn3", SN76496, PIXEL_CLOCK/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -2653,7 +2653,7 @@ static MACHINE_DRIVER_START( hexpoola )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, PIXEL_CLOCK/2)
+ MDRV_SOUND_ADD("sn", SN76496, PIXEL_CLOCK/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index 1a2934f1fd0..d1e15210717 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -587,13 +587,13 @@ static MACHINE_DRIVER_START( galivan )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 8000000/2)
+ MDRV_SOUND_ADD("ym", YM3526, 8000000/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -630,13 +630,13 @@ static MACHINE_DRIVER_START( ninjemak )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 8000000/2)
+ MDRV_SOUND_ADD("ym", YM3526, 8000000/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index 8d8fdad9994..79449869d4f 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -489,11 +489,11 @@ static MACHINE_DRIVER_START( galpani2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1584000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1584000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1584000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 1584000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index bc82adcd266..7f3a6445d3d 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -390,7 +390,7 @@ static MACHINE_DRIVER_START( galpani3 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YMZ280B, 28636400 / 2)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 28636400 / 2)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index f71b5cb78c8..ba2eb642b58 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -953,7 +953,7 @@ static MACHINE_DRIVER_START( galpanic )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("oki", OKIM6295, XTAL_12MHz/6) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_12MHz/6) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index 670c7533423..4c88571d95f 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -304,11 +304,11 @@ static MACHINE_DRIVER_START( galspnbl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 3579545)
+ MDRV_SOUND_ADD("ym", YM3812, 3579545)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index 305ed65014e..0f30634c055 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -1187,7 +1187,7 @@ static MACHINE_DRIVER_START( gameplan )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, GAMEPLAN_AY8910_CLOCK)
+ MDRV_SOUND_ADD("ay", AY8910, GAMEPLAN_AY8910_CLOCK)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index 722c33b79d6..e549b522a00 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -574,11 +574,11 @@ static MACHINE_DRIVER_START( gaplus )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO_15XX, 24576000/1024)
+ MDRV_SOUND_ADD("namco", NAMCO_15XX, 24576000/1024)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index c307773cd65..72e605a3c4f 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -554,15 +554,15 @@ static MACHINE_DRIVER_START( gauntlet )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, ATARI_CLOCK_14MHz/4)
+ MDRV_SOUND_ADD("ym", YM2151, ATARI_CLOCK_14MHz/4)
MDRV_SOUND_ROUTE(0, "left", 0.48)
MDRV_SOUND_ROUTE(1, "right", 0.48)
- MDRV_SOUND_ADD(POKEY, ATARI_CLOCK_14MHz/8)
+ MDRV_SOUND_ADD("pokey", POKEY, ATARI_CLOCK_14MHz/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.32)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.32)
- MDRV_SOUND_ADD(TMS5220, ATARI_CLOCK_14MHz/2/11) /* potentially ATARI_CLOCK_14MHz/2/9 as well */
+ MDRV_SOUND_ADD("tms", TMS5220, ATARI_CLOCK_14MHz/2/11) /* potentially ATARI_CLOCK_14MHz/2/9 as well */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c
index 175d32025ab..8007d3b3cdd 100644
--- a/src/mame/drivers/gberet.c
+++ b/src/mame/drivers/gberet.c
@@ -573,7 +573,7 @@ static MACHINE_DRIVER_START( gberet )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 18432000/12)
+ MDRV_SOUND_ADD("sn", SN76496, 18432000/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index 211c0d2644b..53b83005a9a 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -327,11 +327,11 @@ static MACHINE_DRIVER_START( gbusters )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.30)
MDRV_SOUND_ROUTE(1, "mono", 0.30)
diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c
index ab1c0aadb98..a5de71bedf6 100644
--- a/src/mame/drivers/gcpinbal.c
+++ b/src/mame/drivers/gcpinbal.c
@@ -400,11 +400,11 @@ static MACHINE_DRIVER_START( gcpinbal )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c
index 9655ce3d1a8..3b3b65d6866 100644
--- a/src/mame/drivers/genesis.c
+++ b/src/mame/drivers/genesis.c
@@ -681,7 +681,7 @@ static MACHINE_DRIVER_START( genesis_base )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3438, MASTER_CLOCK/7)
+ MDRV_SOUND_ADD("ym", YM3438, MASTER_CLOCK/7)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/getrivia.c b/src/mame/drivers/getrivia.c
index f7579487552..76763ed5b5f 100644
--- a/src/mame/drivers/getrivia.c
+++ b/src/mame/drivers/getrivia.c
@@ -497,7 +497,7 @@ static MACHINE_DRIVER_START( getrivia )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index f1135d34fbf..a630dc4527c 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -370,11 +370,11 @@ static MACHINE_DRIVER_START( gijoe )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c
index f54a3634009..9c5ed2c581f 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -375,10 +375,10 @@ static MACHINE_DRIVER_START( ginganin )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 3579545 / 2)
+ MDRV_SOUND_ADD("ay", AY8910, 3579545 / 2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(Y8950, 3579545)
+ MDRV_SOUND_ADD("ym", Y8950, 3579545)
MDRV_SOUND_CONFIG(y8950_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index ec7e04a0da7..7c049408ef4 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -719,14 +719,14 @@ static MACHINE_DRIVER_START( ppking )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(ppking_ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
MDRV_SOUND_ROUTE(2, "mono", 0.60)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(MSM5205, XTAL_455kHz) /* verified on pcb */
+ MDRV_SOUND_ADD("msm", MSM5205, XTAL_455kHz) /* verified on pcb */
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
@@ -769,14 +769,14 @@ static MACHINE_DRIVER_START( gladiatr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(gladiatr_ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
MDRV_SOUND_ROUTE(2, "mono", 0.60)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(MSM5205, XTAL_455kHz) /* verified on pcb */
+ MDRV_SOUND_ADD("msm", MSM5205, XTAL_455kHz) /* verified on pcb */
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 6eafc866e38..212aec0aa8a 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -224,7 +224,7 @@ static MACHINE_DRIVER_START( glass )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index c9843e69d11..b2250606867 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -371,13 +371,13 @@ static MACHINE_DRIVER_START( gng )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.40)
MDRV_SOUND_ROUTE(1, "mono", 0.40)
MDRV_SOUND_ROUTE(2, "mono", 0.40)
MDRV_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym2", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.40)
MDRV_SOUND_ROUTE(1, "mono", 0.40)
MDRV_SOUND_ROUTE(2, "mono", 0.40)
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index cae9eb6728d..9913d0015a5 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -341,14 +341,14 @@ static MACHINE_DRIVER_START( goal92 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 2500000/2)
+ MDRV_SOUND_ADD("ym1", YM2203, 2500000/2)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(YM2203, 2500000/2)
+ MDRV_SOUND_ADD("ym2", YM2203, 2500000/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c
index 1b3f38659e9..9b3bf7bdc09 100644
--- a/src/mame/drivers/goindol.c
+++ b/src/mame/drivers/goindol.c
@@ -298,7 +298,7 @@ static MACHINE_DRIVER_START( goindol )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 2000000)
+ MDRV_SOUND_ADD("ym", YM2203, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 72076013da7..7f6dbf35b70 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -308,11 +308,11 @@ static MACHINE_DRIVER_START( goldstar )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")//set up a standard mono speaker called 'mono'
- MDRV_SOUND_ADD(AY8910,1500000)//1 AY8910, at clock 150000Hz
+ MDRV_SOUND_ADD("ay", AY8910,1500000)//1 AY8910, at clock 150000Hz
MDRV_SOUND_CONFIG(ay8910_interface)//read extra data from interface
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)//all sound goes to the 'mono' speaker, at 0.50 X maximum
- MDRV_SOUND_ADD(OKIM6295, 1056000)//clock
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)//clock
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified //REGION_SOUND1
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)//all sound goes to the 'mono' speaker, at 1.0 X maximum
@@ -344,11 +344,11 @@ static MACHINE_DRIVER_START( goldstbl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")//set up a standard mono speaker called 'mono'
- MDRV_SOUND_ADD(AY8910,1500000)//1 AY8910, at clock 150000Hz
+ MDRV_SOUND_ADD("ay", AY8910,1500000)//1 AY8910, at clock 150000Hz
MDRV_SOUND_CONFIG(ay8910_interface)//read extra data from interface
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)//all sound goes to the 'mono' speaker, at 0.50 X maximum
- MDRV_SOUND_ADD(OKIM6295, 1056000)//clock
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)//clock
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified //REGION_SOUND1
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)//all sound goes to the 'mono' speaker, at 1.0 X maximum
MACHINE_DRIVER_END
@@ -379,11 +379,11 @@ static MACHINE_DRIVER_START( moonlght )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")//set up a standard mono speaker called 'mono'
- MDRV_SOUND_ADD(AY8910,1500000)//1 AY8910, at clock 150000Hz
+ MDRV_SOUND_ADD("ay", AY8910,1500000)//1 AY8910, at clock 150000Hz
MDRV_SOUND_CONFIG(ay8910_interface)//read extra data from interface
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)//all sound goes to the 'mono' speaker, at 0.50 X maximum
- MDRV_SOUND_ADD(OKIM6295, 1056000)//clock
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)//clock
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)// clock frequency & pin 7 not verified //REGION_SOUND1
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)//all sound goes to the 'mono' speaker, at 1.0 X maximum
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c
index b08bc25c761..4fc116f01c9 100644
--- a/src/mame/drivers/gomoku.c
+++ b/src/mame/drivers/gomoku.c
@@ -190,7 +190,7 @@ static MACHINE_DRIVER_START( gomoku )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("gomoku", CUSTOM, 0)
MDRV_SOUND_CONFIG(custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c
index def822f399d..2643cde773b 100644
--- a/src/mame/drivers/good.c
+++ b/src/mame/drivers/good.c
@@ -292,7 +292,7 @@ static MACHINE_DRIVER_START( good )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47)
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index 3b1c649c510..7ab1a3b5b1a 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -300,12 +300,12 @@ static MACHINE_DRIVER_START( gotcha )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 14318180/4)
+ MDRV_SOUND_ADD("ym", YM2151, 14318180/4)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.80)
MDRV_SOUND_ROUTE(1, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index 68e54bcfef2..7845983d0fa 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -1549,7 +1549,7 @@ static MACHINE_DRIVER_START( gottlieb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1566,7 +1566,7 @@ static MACHINE_DRIVER_START( reactor )
/* video hardware */
MDRV_GFXDECODE(charRAM)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(reactor_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1578,7 +1578,7 @@ static MACHINE_DRIVER_START( qbert )
MDRV_IMPORT_FROM(gottlieb)
/* video hardware */
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(qbert_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1630,19 +1630,19 @@ static MACHINE_DRIVER_START( gottlieb2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(SP0250, 3120000)
+ MDRV_SOUND_ADD("sp", SP0250, 3120000)
MDRV_SOUND_CONFIG(sp0250_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c
index 342bd1b7171..de5eaa152a8 100644
--- a/src/mame/drivers/gotya.c
+++ b/src/mame/drivers/gotya.c
@@ -220,7 +220,7 @@ static MACHINE_DRIVER_START( gotya )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index 482e71c8545..8b07973c3ba 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -372,11 +372,11 @@ static MACHINE_DRIVER_START( gradius3 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "left", 0.20)
MDRV_SOUND_ROUTE(0, "right", 0.20)
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index dca5ef090f2..aa57d230bac 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -709,18 +709,18 @@ static MACHINE_DRIVER_START( grchamp )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, SOUND_CLOCK/4) /* 3B */
+ MDRV_SOUND_ADD("ay1", AY8910, SOUND_CLOCK/4) /* 3B */
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
- MDRV_SOUND_ADD(AY8910, SOUND_CLOCK/4)
+ MDRV_SOUND_ADD("ay2", AY8910, SOUND_CLOCK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
- MDRV_SOUND_ADD(AY8910, SOUND_CLOCK/4) /* 1B */
+ MDRV_SOUND_ADD("ay3", AY8910, SOUND_CLOCK/4) /* 1B */
MDRV_SOUND_CONFIG(ay8910_interface_3)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(grchamp)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c
index eccacce9517..705819729f8 100644
--- a/src/mame/drivers/gridlee.c
+++ b/src/mame/drivers/gridlee.c
@@ -454,11 +454,11 @@ static MACHINE_DRIVER_START( gridlee )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("gridlee", CUSTOM, 0)
MDRV_SOUND_CONFIG(custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c
index 7192c446d92..4782e346e88 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -433,11 +433,11 @@ static MACHINE_DRIVER_START( gstream )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000) /* 1 Mhz? */
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1000000) /* 1 Mhz? */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) // pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(OKIM6295, 1000000) /* 1 Mhz? */
+ MDRV_SOUND_ADD("oki2", OKIM6295, 1000000) /* 1 Mhz? */
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low) // pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index 6ce7cb5b4cc..ff403b62a23 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -600,7 +600,7 @@ static MACHINE_DRIVER_START( gstriker )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -641,7 +641,7 @@ static MACHINE_DRIVER_START( vgoal )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index 5b79d740d03..5268bd20b86 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -735,14 +735,14 @@ static MACHINE_DRIVER_START( gsword )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_18MHz/12) /* verified on pcb */
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_18MHz/12) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(MSM5205, XTAL_400kHz) /* verified on pcb */
+ MDRV_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb */
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
@@ -782,15 +782,15 @@ static MACHINE_DRIVER_START( josvolly )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
#if 0
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
#endif
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index 7102dbf2b8d..e555a0268d3 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -936,7 +936,7 @@ static MACHINE_DRIVER_START( gticlub )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(RF5C400, 64000000/4)
+ MDRV_SOUND_ADD("rf", RF5C400, 64000000/4)
MDRV_SOUND_CONFIG(rf5c400_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -1001,7 +1001,7 @@ static MACHINE_DRIVER_START( hangplt )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(RF5C400, 64000000/4)
+ MDRV_SOUND_ADD("rf", RF5C400, 64000000/4)
MDRV_SOUND_CONFIG(rf5c400_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 679b879f1fe..c812ddd4c1f 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -772,7 +772,7 @@ static MACHINE_DRIVER_START( guab )
MDRV_SPEAKER_STANDARD_MONO("mono")
/* TODO: Verify clock */
- MDRV_SOUND_ADD(SN76489, 2000000)
+ MDRV_SOUND_ADD("sn", SN76489, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c
index 8a678704d63..d2a05e63e8a 100644
--- a/src/mame/drivers/gumbo.c
+++ b/src/mame/drivers/gumbo.c
@@ -328,7 +328,7 @@ static MACHINE_DRIVER_START( gumbo )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1122000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1122000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47)
diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c
index ebed2ea2e1e..bd9cc8423b7 100644
--- a/src/mame/drivers/gundealr.c
+++ b/src/mame/drivers/gundealr.c
@@ -484,7 +484,7 @@ static MACHINE_DRIVER_START( gundealr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c
index f2e88befb6f..5765111ec2a 100644
--- a/src/mame/drivers/gunsmoke.c
+++ b/src/mame/drivers/gunsmoke.c
@@ -314,13 +314,13 @@ static MACHINE_DRIVER_START( gunsmoke )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.22)
MDRV_SOUND_ROUTE(1, "mono", 0.22)
MDRV_SOUND_ROUTE(2, "mono", 0.22)
MDRV_SOUND_ROUTE(3, "mono", 0.14)
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.22)
MDRV_SOUND_ROUTE(1, "mono", 0.22)
MDRV_SOUND_ROUTE(2, "mono", 0.22)
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index 8cf1357eec2..eb09bad93ae 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -555,37 +555,37 @@ static MACHINE_DRIVER_START( gyruss )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(AY8910, 14318180/8)
+ MDRV_SOUND_ADD("ay1", AY8910, 14318180/8)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE_EX(0, "konami", 1.0, 0)
MDRV_SOUND_ROUTE_EX(1, "konami", 1.0, 1)
MDRV_SOUND_ROUTE_EX(2, "konami", 1.0, 2)
- MDRV_SOUND_ADD(AY8910, 14318180/8)
+ MDRV_SOUND_ADD("ay2", AY8910, 14318180/8)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE_EX(0, "konami", 1.0, 3)
MDRV_SOUND_ROUTE_EX(1, "konami", 1.0, 4)
MDRV_SOUND_ROUTE_EX(2, "konami", 1.0, 5)
- MDRV_SOUND_ADD(AY8910, 14318180/8)
+ MDRV_SOUND_ADD("ay3", AY8910, 14318180/8)
MDRV_SOUND_CONFIG(ay8910_interface_3)
MDRV_SOUND_ROUTE_EX(0, "konami", 1.0, 6)
MDRV_SOUND_ROUTE_EX(1, "konami", 1.0, 7)
MDRV_SOUND_ROUTE_EX(2, "konami", 1.0, 8)
- MDRV_SOUND_ADD(AY8910, 14318180/8)
+ MDRV_SOUND_ADD("ay4", AY8910, 14318180/8)
MDRV_SOUND_CONFIG(ay8910_interface_4)
MDRV_SOUND_ROUTE_EX(0, "konami", 1.0, 9)
MDRV_SOUND_ROUTE_EX(1, "konami", 1.0, 10)
MDRV_SOUND_ROUTE_EX(2, "konami", 1.0, 11)
- MDRV_SOUND_ADD(AY8910, 14318180/8)
+ MDRV_SOUND_ADD("ay5", AY8910, 14318180/8)
MDRV_SOUND_CONFIG(ay8910_interface_5)
MDRV_SOUND_ROUTE_EX(0, "konami", 1.0, 12)
MDRV_SOUND_ROUTE_EX(1, "konami", 1.0, 13)
MDRV_SOUND_ROUTE_EX(2, "konami", 1.0, 14)
- MDRV_SOUND_ADD_TAG("konami", DISCRETE, 0)
+ MDRV_SOUND_ADD("konami", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(gyruss_sound)
MDRV_SOUND_ROUTE(0, "right", 1.0)
MDRV_SOUND_ROUTE(1, "left", 1.0)
diff --git a/src/mame/drivers/hal21.c b/src/mame/drivers/hal21.c
index 14b5c0e182a..98363b1afd7 100644
--- a/src/mame/drivers/hal21.c
+++ b/src/mame/drivers/hal21.c
@@ -734,7 +734,7 @@ static MACHINE_DRIVER_START( aso )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 4000000)
+ MDRV_SOUND_ADD("ym", YM3526, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -780,10 +780,10 @@ static MACHINE_DRIVER_START( hal21 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index b22ce051833..5bee7c790b0 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -1979,16 +1979,16 @@ static MACHINE_DRIVER_START( halleys )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_6MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_6MHz/4) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, XTAL_6MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ay2", AY8910, XTAL_6MHz/4) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, XTAL_6MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ay3", AY8910, XTAL_6MHz/4) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, XTAL_6MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ay4", AY8910, XTAL_6MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c
index ea85de24efe..36c1263ac58 100644
--- a/src/mame/drivers/hanaawas.c
+++ b/src/mame/drivers/hanaawas.c
@@ -230,7 +230,7 @@ static MACHINE_DRIVER_START( hanaawas )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 18432000/12)
+ MDRV_SOUND_ADD("ay", AY8910, 18432000/12)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/hanaroku.c
index 5057fbea7b8..0e8467a6d0b 100644
--- a/src/mame/drivers/hanaroku.c
+++ b/src/mame/drivers/hanaroku.c
@@ -262,7 +262,7 @@ static MACHINE_DRIVER_START( hanaroku )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index 1763a22d7bd..0611386a8c4 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -1089,10 +1089,10 @@ static MACHINE_DRIVER_START( ds4 )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
@@ -1151,7 +1151,7 @@ static MACHINE_DRIVER_START( driversnd )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index 62bdd2c6bbc..eae24902b46 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -294,16 +294,16 @@ static MACHINE_DRIVER_START( hcastle )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami1", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.44)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD(YM3812, 3579545)
+ MDRV_SOUND_ADD("ym", YM3812, 3579545)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD(K051649, 3579545/2)
+ MDRV_SOUND_ADD("konami2", K051649, 3579545/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c
index 287e772e74b..b5e62eb1422 100644
--- a/src/mame/drivers/hexa.c
+++ b/src/mame/drivers/hexa.c
@@ -157,7 +157,7 @@ static MACHINE_DRIVER_START( hexa )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index 81108649b68..2753c9bb9c3 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -304,11 +304,11 @@ static MACHINE_DRIVER_START( hexion )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(K051649, 24000000/16)
+ MDRV_SOUND_ADD("konami", K051649, 24000000/16)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c
index d609a994cb8..d7ffc86daa3 100644
--- a/src/mame/drivers/higemaru.c
+++ b/src/mame/drivers/higemaru.c
@@ -195,10 +195,10 @@ static MACHINE_DRIVER_START( higemaru )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay1", AY8910, 12000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay2", AY8910, 12000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c
index b7ff34fe68a..aaab7cbd970 100644
--- a/src/mame/drivers/hikaru.c
+++ b/src/mame/drivers/hikaru.c
@@ -308,7 +308,7 @@ static MACHINE_DRIVER_START( hikaru )
MDRV_VIDEO_UPDATE(hikaru)
// MDRV_SPEAKER_STANDARD_STEREO("left", "right")
-// MDRV_SOUND_ADD(AICA, 0)
+// MDRV_SOUND_ADD("aica", AICA, 0)
// MDRV_SOUND_CONFIG(aica_interface)
// MDRV_SOUND_ROUTE(0, "left", 2.0)
// MDRV_SOUND_ROUTE(0, "right", 2.0)
diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c
index a9bb9207f89..0aae90af944 100644
--- a/src/mame/drivers/hitme.c
+++ b/src/mame/drivers/hitme.c
@@ -321,7 +321,7 @@ static MACHINE_DRIVER_START( hitme )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(hitme)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c
index 98074b6da7e..3c736778aed 100644
--- a/src/mame/drivers/hnayayoi.c
+++ b/src/mame/drivers/hnayayoi.c
@@ -613,14 +613,14 @@ static MACHINE_DRIVER_START( hnayayoi )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 20000000/8)
+ MDRV_SOUND_ADD("ym", YM2203, 20000000/8)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 0.25)
MDRV_SOUND_ROUTE(2, "mono", 0.25)
MDRV_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c
index 4f66b55813b..c34e34e25c9 100644
--- a/src/mame/drivers/holeland.c
+++ b/src/mame/drivers/holeland.c
@@ -328,11 +328,11 @@ static MACHINE_DRIVER_START( holeland )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1818182)
+ MDRV_SOUND_ADD("ay1", AY8910, 1818182)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1818182)
+ MDRV_SOUND_ADD("ay2", AY8910, 1818182)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -397,11 +397,11 @@ static MACHINE_DRIVER_START( crzrally )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 20000000/16)
+ MDRV_SOUND_ADD("ay1", AY8910, 20000000/16)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 20000000/16)
+ MDRV_SOUND_ADD("ay2", AY8910, 20000000/16)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index 890f706fb4b..d4d702555ae 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -1254,10 +1254,10 @@ static MACHINE_DRIVER_START( mrokumei )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489A, 16000000/4) // SN76489AN actually
+ MDRV_SOUND_ADD("sn", SN76489A, 16000000/4) // SN76489AN actually
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1322,14 +1322,14 @@ static MACHINE_DRIVER_START( reikaids )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 0.25)
MDRV_SOUND_ROUTE(2, "mono", 0.25)
MDRV_SOUND_ROUTE(3, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
@@ -1373,10 +1373,10 @@ static MACHINE_DRIVER_START( pteacher )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489A, 16000000/4) // SN76489AN actually
+ MDRV_SOUND_ADD("sn", SN76489A, 16000000/4) // SN76489AN actually
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c
index 7d2a55c9b4c..e13e9829976 100644
--- a/src/mame/drivers/homerun.c
+++ b/src/mame/drivers/homerun.c
@@ -212,7 +212,7 @@ static MACHINE_DRIVER_START( homerun )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 6000000/2)
+ MDRV_SOUND_ADD("ym", YM2203, 6000000/2)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index 7dcb15199ec..ec1ff13995d 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -1080,7 +1080,7 @@ static MACHINE_DRIVER_START( hornet )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(RF5C400, 64000000/4)
+ MDRV_SOUND_ADD("rf", RF5C400, 64000000/4)
MDRV_SOUND_CONFIG(rf5c400_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index 8fe21c80317..2cd6368eda4 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -210,7 +210,7 @@ static MACHINE_DRIVER_START( hotblock )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1000000)
+ MDRV_SOUND_ADD("ay", AY8910, 1000000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c
index 2bc73d473f4..afae1792960 100644
--- a/src/mame/drivers/hshavoc.c
+++ b/src/mame/drivers/hshavoc.c
@@ -161,7 +161,7 @@ static MACHINE_DRIVER_START( genesis_base )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3438, MASTER_CLOCK/7)
+ MDRV_SOUND_ADD("ym", YM3438, MASTER_CLOCK/7)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MACHINE_DRIVER_END
@@ -174,7 +174,7 @@ static MACHINE_DRIVER_START( hshavoc )
MDRV_CPU_PROGRAM_MAP(topshoot_readmem,topshoot_writemem)
/* sound hardware */
- MDRV_SOUND_ADD(SN76496, MASTER_CLOCK/15)
+ MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/15)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index 6caae1cb691..cda2fefcfcd 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -291,11 +291,11 @@ static MACHINE_DRIVER_START( hyhoo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1250000)
+ MDRV_SOUND_ADD("ay", AY8910, 1250000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c
index 03f6fd9deec..234412dc382 100644
--- a/src/mame/drivers/hyperspt.c
+++ b/src/mame/drivers/hyperspt.c
@@ -429,13 +429,13 @@ static MACHINE_DRIVER_START( hyperspt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(SN76496, XTAL_14_31818MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("sn", SN76496, XTAL_14_31818MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(VLM5030, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(hyperspt_vlm5030_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index d15dc390132..91a8220d0af 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -745,12 +745,12 @@ static MACHINE_DRIVER_START( hyprduel )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 4000000/16/16*132)
+ MDRV_SOUND_ADD("oki", OKIM6295, 4000000/16/16*132)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.57)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.57)
@@ -786,11 +786,11 @@ static MACHINE_DRIVER_START( magerror )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.57)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.57)
- MDRV_SOUND_ADD(OKIM6295, 4000000/16/16*132)
+ MDRV_SOUND_ADD("oki", OKIM6295, 4000000/16/16*132)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.57)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.57)
diff --git a/src/mame/drivers/igs_180.c b/src/mame/drivers/igs_180.c
index aca84e80c6d..3d5ce2c33a7 100644
--- a/src/mame/drivers/igs_180.c
+++ b/src/mame/drivers/igs_180.c
@@ -712,10 +712,10 @@ static MACHINE_DRIVER_START( igs_180 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD(OKIM6295, XTAL_16MHz / 16)
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_16MHz / 16)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c
index bb58c6d0f6c..1d707cbc1c0 100644
--- a/src/mame/drivers/igs_blit.c
+++ b/src/mame/drivers/igs_blit.c
@@ -2377,7 +2377,7 @@ static MACHINE_DRIVER_START( igs_base )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("OKIM6295", OKIM6295, 1047600)
+ MDRV_SOUND_ADD("OKIM6295", OKIM6295, 1047600)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -2401,7 +2401,7 @@ static MACHINE_DRIVER_START( chmplst2 )
// MDRV_GFXDECODE(chmplst2)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_DRIVER_END
@@ -2412,7 +2412,7 @@ static MACHINE_DRIVER_START( chindrag )
MDRV_CPU_PROGRAM_MAP(chindrag_readmem,chindrag_writemem)
MDRV_CPU_VBLANK_INT_HACK(chmplst2_interrupt,1+4) // lev5 frequency drives the music tempo
- MDRV_SOUND_ADD(YM3812, 3579545)
+ MDRV_SOUND_ADD("ym", YM3812, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_DRIVER_END
@@ -2486,7 +2486,7 @@ static MACHINE_DRIVER_START( vbowl )
// MDRV_GFXDECODE(chmplst2)
MDRV_SOUND_REMOVE("OKIM6295")
- MDRV_SOUND_ADD(ICS2115, 0)
+ MDRV_SOUND_ADD("ics", ICS2115, 0)
MDRV_SOUND_CONFIG(pgm_ics2115_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/igs_m68.c b/src/mame/drivers/igs_m68.c
index b37173cb65d..5c4844b1155 100644
--- a/src/mame/drivers/igs_m68.c
+++ b/src/mame/drivers/igs_m68.c
@@ -60,7 +60,7 @@ static MACHINE_DRIVER_START( igs_m68 )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 8000000/8)
+ MDRV_SOUND_ADD("oki", OKIM6295, 8000000/8)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47)
diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c
index d5a04f2ebb9..c1550955ad3 100644
--- a/src/mame/drivers/ikki.c
+++ b/src/mame/drivers/ikki.c
@@ -221,10 +221,10 @@ static MACHINE_DRIVER_START( ikki )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 8000000/4)
+ MDRV_SOUND_ADD("sn1", SN76496, 8000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD(SN76496, 8000000/2)
+ MDRV_SOUND_ADD("sn2", SN76496, 8000000/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c
index 1c3fd3aadc1..6334a175fc9 100644
--- a/src/mame/drivers/imolagp.c
+++ b/src/mame/drivers/imolagp.c
@@ -431,7 +431,7 @@ static MACHINE_DRIVER_START( imolagp )
MDRV_VIDEO_START(imolagp)
MDRV_VIDEO_UPDATE(imolagp)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index 12fc4674246..c253005aeeb 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -428,7 +428,7 @@ static MACHINE_DRIVER_START( inufuku )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 32000000/4)
+ MDRV_SOUND_ADD("ym", YM2610, 32000000/4)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.75)
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index dcae42f5f19..f5a031a1208 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -321,7 +321,7 @@ static MACHINE_DRIVER_START( iqblock )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -353,7 +353,7 @@ static MACHINE_DRIVER_START( cabaret )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -385,7 +385,7 @@ static MACHINE_DRIVER_START( pokerigs )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c
index 6e7a3db775f..e37052722fc 100644
--- a/src/mame/drivers/irobot.c
+++ b/src/mame/drivers/irobot.c
@@ -320,17 +320,17 @@ static MACHINE_DRIVER_START( irobot )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, 1250000)
+ MDRV_SOUND_ADD("pokey1", POKEY, 1250000)
MDRV_SOUND_CONFIG(pokey_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(POKEY, 1250000)
+ MDRV_SOUND_ADD("pokey2", POKEY, 1250000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(POKEY, 1250000)
+ MDRV_SOUND_ADD("pokey3", POKEY, 1250000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(POKEY, 1250000)
+ MDRV_SOUND_ADD("pokey4", POKEY, 1250000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index 61890d80f8b..daf59751a69 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -469,7 +469,7 @@ static MACHINE_DRIVER_START( ironhors )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("ym2203", YM2203, 18432000/6)
+ MDRV_SOUND_ADD("ym2203", YM2203, 18432000/6)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE_EX(0, "disc_ih", 1.0, 0)
@@ -477,7 +477,7 @@ static MACHINE_DRIVER_START( ironhors )
MDRV_SOUND_ROUTE_EX(2, "disc_ih", 1.0, 2)
MDRV_SOUND_ROUTE_EX(3, "disc_ih", 1.0, 3)
- MDRV_SOUND_ADD_TAG("disc_ih", DISCRETE, 0)
+ MDRV_SOUND_ADD("disc_ih", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(ironhors)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 27a76ee4ff4..238a41cf595 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -1557,7 +1557,7 @@ static MACHINE_DRIVER_START( timekill )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(ES5506, SOUND_CLOCK)
+ MDRV_SOUND_ADD("es", ES5506, SOUND_CLOCK)
MDRV_SOUND_CONFIG(es5506_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index 196b1fb0c6f..4794d0a5c76 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -1743,7 +1743,7 @@ static MACHINE_DRIVER_START( itech8_core_lo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("oki", OKIM6295, CLOCK_8MHz/8) // was /128??
+ MDRV_SOUND_ADD("oki", OKIM6295, CLOCK_8MHz/8) // was /128??
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // was /128, not /132, so unsure so pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
@@ -1765,7 +1765,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym2203 )
MDRV_CPU_PROGRAM_MAP(sound2203_map,0)
/* sound hardware */
- MDRV_SOUND_ADD_TAG("ym", YM2203, CLOCK_8MHz/2)
+ MDRV_SOUND_ADD("ym", YM2203, CLOCK_8MHz/2)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.07)
MDRV_SOUND_ROUTE(1, "mono", 0.07)
@@ -1781,7 +1781,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym3812 )
MDRV_CPU_PROGRAM_MAP(sound3812_map,0)
/* sound hardware */
- MDRV_SOUND_ADD_TAG("ym", YM3812, CLOCK_8MHz/2)
+ MDRV_SOUND_ADD("ym", YM3812, CLOCK_8MHz/2)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
@@ -1794,7 +1794,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym3812_external )
MDRV_CPU_PROGRAM_MAP(sound3812_external_map,0)
/* sound hardware */
- MDRV_SOUND_ADD_TAG("ym", YM3812, CLOCK_8MHz/2)
+ MDRV_SOUND_ADD("ym", YM3812, CLOCK_8MHz/2)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c
index 7497db881fc..ecfcb297499 100644
--- a/src/mame/drivers/itgambl2.c
+++ b/src/mame/drivers/itgambl2.c
@@ -212,7 +212,7 @@ static MACHINE_DRIVER_START( itgambl2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c
index 06c9b12b97d..4c1839e1c6d 100644
--- a/src/mame/drivers/itgambl3.c
+++ b/src/mame/drivers/itgambl3.c
@@ -191,7 +191,7 @@ static MACHINE_DRIVER_START( itgambl3 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("oki", OKIM6295, MAIN_CLOCK/16) /* 1MHz */
+ MDRV_SOUND_ADD("oki", OKIM6295, MAIN_CLOCK/16) /* 1MHz */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c
index e4ff3461329..7a922d0e7c5 100644
--- a/src/mame/drivers/itgamble.c
+++ b/src/mame/drivers/itgamble.c
@@ -201,7 +201,7 @@ static MACHINE_DRIVER_START( itgamble )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("oki", OKIM6295, SND_CLOCK) /* 1MHz resonator */
+ MDRV_SOUND_ADD("oki", OKIM6295, SND_CLOCK) /* 1MHz resonator */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index 72585481409..a237e4a0a5b 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -901,7 +901,7 @@ static MACHINE_DRIVER_START( jack )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 18000000/12)
+ MDRV_SOUND_ADD("ay", AY8910, 18000000/12)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index 047d89a3d3b..3f54a11f647 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -331,7 +331,7 @@ static MACHINE_DRIVER_START( jackal )
// sound hardware
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK) // verified on pcb
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) // verified on pcb
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c
index f74f9ba6776..84d2d85ac24 100644
--- a/src/mame/drivers/jackpool.c
+++ b/src/mame/drivers/jackpool.c
@@ -194,7 +194,7 @@ static MACHINE_DRIVER_START( jackpool )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c
index 000eacc422e..83ad7df23d7 100644
--- a/src/mame/drivers/jailbrek.c
+++ b/src/mame/drivers/jailbrek.c
@@ -262,10 +262,10 @@ static MACHINE_DRIVER_START( jailbrek )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, MASTER_CLOCK/12)
+ MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(VLM5030, VOICE_CLOCK)
+ MDRV_SOUND_ADD("vlm", VLM5030, VOICE_CLOCK)
MDRV_SOUND_CONFIG(vlm5030_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index 48e7edffd55..ebe0c422391 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -837,7 +837,7 @@ static MACHINE_DRIVER_START( jalmah )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 4000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 4000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index f1c2b493691..1900abc3906 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -771,7 +771,7 @@ static MACHINE_DRIVER_START( jchan )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16000000)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16000000)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/jcross.c b/src/mame/drivers/jcross.c
index 42a965be72f..a0cb1c39644 100644
--- a/src/mame/drivers/jcross.c
+++ b/src/mame/drivers/jcross.c
@@ -288,13 +288,13 @@ static MACHINE_DRIVER_START( jcross )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD(NAMCO, 24000)
+ MDRV_SOUND_ADD("namco", NAMCO, 24000)
MDRV_SOUND_CONFIG(snkwave_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c
index 659430ae394..28dffda99bf 100644
--- a/src/mame/drivers/jollyjgr.c
+++ b/src/mame/drivers/jollyjgr.c
@@ -420,7 +420,7 @@ static MACHINE_DRIVER_START( jollyjgr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 3579545)
+ MDRV_SOUND_ADD("ay", AY8910, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c
index d16083e6c46..8aecb6ba16f 100644
--- a/src/mame/drivers/jongkyo.c
+++ b/src/mame/drivers/jongkyo.c
@@ -611,7 +611,7 @@ static MACHINE_DRIVER_START( jongkyo )
MDRV_VIDEO_UPDATE(jongkyo)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, JONGKYO_CLOCK/8)
+ MDRV_SOUND_ADD("ay", AY8910, JONGKYO_CLOCK/8)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index c870d3999d4..6c82b5ca6dd 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -877,7 +877,7 @@ static MACHINE_DRIVER_START( jpmimpct )
MDRV_PALETTE_LENGTH(256)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c
index e2621428dbc..45287d5363f 100644
--- a/src/mame/drivers/jrpacman.c
+++ b/src/mame/drivers/jrpacman.c
@@ -288,7 +288,7 @@ static MACHINE_DRIVER_START( jrpacman )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO, 3072000/32)
+ MDRV_SOUND_ADD("namco", NAMCO, 3072000/32)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index 74f5a61ff72..8f8cbc812e6 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -362,20 +362,20 @@ static MACHINE_DRIVER_START( junofrst )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 14318000/8)
+ MDRV_SOUND_ADD("ay", AY8910, 14318000/8)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(0, "filter.0.0", 0.30)
MDRV_SOUND_ROUTE(1, "filter.0.1", 0.30)
MDRV_SOUND_ROUTE(2, "filter.0.2", 0.30)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("filter.0.0", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter.0.0", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter.0.1", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter.0.1", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter.0.2", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter.0.2", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 299bc9be6d0..891e1d3d8bb 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -1718,14 +1718,14 @@ static MACHINE_DRIVER_START( berlwall )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(AY8910, 1000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1000000)
MDRV_SOUND_CONFIG(ay8910_intf_dsw)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD(AY8910, 1000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 12000000/6)
+ MDRV_SOUND_ADD("oki", OKIM6295, 12000000/6)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -1765,14 +1765,14 @@ static MACHINE_DRIVER_START( bakubrkr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_12MHz/6) /* verified on pcb */
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_12MHz/6) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(AY8910, XTAL_12MHz/6) /* verified on pcb */
+ MDRV_SOUND_ADD("ay2", AY8910, XTAL_12MHz/6) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_intf_eeprom)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, XTAL_12MHz/6) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_12MHz/6) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1824,7 +1824,7 @@ static MACHINE_DRIVER_START( blazeon )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
MACHINE_DRIVER_END
@@ -1873,11 +1873,11 @@ static MACHINE_DRIVER_START( gtmr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, XTAL_16MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("oki1", OKIM6295, XTAL_16MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD(OKIM6295, XTAL_16MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("oki2", OKIM6295, XTAL_16MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
@@ -1966,14 +1966,14 @@ static MACHINE_DRIVER_START( mgcrystl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_12MHz/6) /* verified on pcb */
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_12MHz/6) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(AY8910, XTAL_12MHz/6) /* verified on pcb */
+ MDRV_SOUND_ADD("ay2", AY8910, XTAL_12MHz/6) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_intf_eeprom)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, XTAL_12MHz/6) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_12MHz/6) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -2033,11 +2033,11 @@ static MACHINE_DRIVER_START( shogwarr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1980000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1980000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1980000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 1980000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c
index facd2d95849..8e9ae98a979 100644
--- a/src/mame/drivers/kangaroo.c
+++ b/src/mame/drivers/kangaroo.c
@@ -394,7 +394,7 @@ static MACHINE_DRIVER_START( nomcu )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index 9cf723f5336..18a75b6ec6c 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -717,10 +717,10 @@ static MACHINE_DRIVER_START( karnov )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(YM3526, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3526, 3000000)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -759,10 +759,10 @@ static MACHINE_DRIVER_START( wndrplnt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(YM3526, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3526, 3000000)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index c3d50183a4a..ead1faf823d 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -470,13 +470,13 @@ static MACHINE_DRIVER_START( kchampvs )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(MSM5205, 375000)
+ MDRV_SOUND_ADD("msm", MSM5205, 375000)
MDRV_SOUND_CONFIG(msm_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -519,13 +519,13 @@ static MACHINE_DRIVER_START( kchamp )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index 0c5d317a20d..c050764f193 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -693,7 +693,7 @@ static MACHINE_DRIVER_START( kickgoal )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 12000000/8)
+ MDRV_SOUND_ADD("oki", OKIM6295, 12000000/8)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -728,7 +728,7 @@ static MACHINE_DRIVER_START( actionhw )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, XTAL_12MHz/12) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_12MHz/12) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index 81e1b846075..eb7ab4206cf 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -590,11 +590,11 @@ static MACHINE_DRIVER_START( kingofb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -641,11 +641,11 @@ static MACHINE_DRIVER_START( ringking )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c
index 293a83b713c..50d08fe399f 100644
--- a/src/mame/drivers/kingpin.c
+++ b/src/mame/drivers/kingpin.c
@@ -169,7 +169,7 @@ static MACHINE_DRIVER_START( kingpin )
/*
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8912, 1500000)
+ MDRV_SOUND_ADD("ay", AY8912, 1500000)
MDRV_SOUND_CONFIG(ay8912_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
*/
diff --git a/src/mame/drivers/kinstb.c b/src/mame/drivers/kinstb.c
index 96158f2bfbe..0969e06344e 100644
--- a/src/mame/drivers/kinstb.c
+++ b/src/mame/drivers/kinstb.c
@@ -225,7 +225,7 @@ static MACHINE_DRIVER_START( kinstb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("snes", CUSTOM, 0)
MDRV_SOUND_CONFIG(snes_sound_interface)
MDRV_SOUND_ROUTE(0, "left", 1.00)
MDRV_SOUND_ROUTE(1, "right", 1.00)
diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c
index 05b2786f081..71b7b7ed12d 100644
--- a/src/mame/drivers/klax.c
+++ b/src/mame/drivers/klax.c
@@ -220,7 +220,7 @@ static MACHINE_DRIVER_START( klax )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, ATARI_CLOCK_14MHz/4/4)
+ MDRV_SOUND_ADD("oki", OKIM6295, ATARI_CLOCK_14MHz/4/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index 5d7bf3322f7..a9d79897a94 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -293,14 +293,14 @@ static MACHINE_DRIVER_START( kncljoe )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ay", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(SN76489, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("sn1", SN76489, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(SN76489, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("sn2", SN76489, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c
index d79b892e201..d448a6876a4 100644
--- a/src/mame/drivers/koftball.c
+++ b/src/mame/drivers/koftball.c
@@ -222,7 +222,7 @@ static MACHINE_DRIVER_START( koftball )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1122000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1122000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) /* clock frequency & pin 7 not verified */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c
index 644a93fd4e8..3c46f34d8f0 100644
--- a/src/mame/drivers/koikoi.c
+++ b/src/mame/drivers/koikoi.c
@@ -281,7 +281,7 @@ static MACHINE_DRIVER_START( koikoi )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, KOIKOI_CRYSTAL/8)
+ MDRV_SOUND_ADD("ay", AY8910, KOIKOI_CRYSTAL/8)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index 4c23608d1b6..54e17110523 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -398,12 +398,12 @@ static MACHINE_DRIVER_START( konamigq )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami1", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami2", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index 4705c951700..36e6fc52f2c 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -366,12 +366,12 @@ static MACHINE_DRIVER_START( konamigv )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD( PSXSPU, 0 )
+ MDRV_SOUND_ADD( "spu", PSXSPU, 0 )
MDRV_SOUND_CONFIG( konamigv_psxspu_interface )
MDRV_SOUND_ROUTE( 0, "left", 0.75 )
MDRV_SOUND_ROUTE( 1, "right", 0.75 )
- MDRV_SOUND_ADD( CDDA, 0 )
+ MDRV_SOUND_ADD( "cdda", CDDA, 0 )
MDRV_SOUND_ROUTE( 0, "left", 1.0 )
MDRV_SOUND_ROUTE( 1, "right", 1.0 )
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index fe65f92168a..e5d37fc92ef 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -1346,12 +1346,12 @@ static MACHINE_DRIVER_START( konamigx )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami1", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami2", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index 548c0af12f5..c899c912ac1 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -272,15 +272,15 @@ static MACHINE_DRIVER_START( ksayakyu )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 2000000)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 2000000)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index 084ccd53bd9..4d927e59bc1 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -2746,12 +2746,12 @@ static MACHINE_DRIVER_START( konami573 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD( PSXSPU, 0 )
+ MDRV_SOUND_ADD( "spu", PSXSPU, 0 )
MDRV_SOUND_CONFIG( konami573_psxspu_interface )
MDRV_SOUND_ROUTE( 0, "left", 1.0 )
MDRV_SOUND_ROUTE( 1, "right", 1.0 )
- MDRV_SOUND_ADD( CDDA, 0 )
+ MDRV_SOUND_ADD( "cdda", CDDA, 0 )
MDRV_SOUND_ROUTE( 0, "left", 1.0 )
MDRV_SOUND_ROUTE( 1, "right", 1.0 )
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index c5af7bdb35c..428831640d2 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -529,11 +529,11 @@ static MACHINE_DRIVER_START( gyrodine )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MDRV_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c
index 102dee8fef3..efd7f969826 100644
--- a/src/mame/drivers/labyrunr.c
+++ b/src/mame/drivers/labyrunr.c
@@ -275,14 +275,14 @@ static MACHINE_DRIVER_START( labyrunr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface_1)
MDRV_SOUND_ROUTE(0, "mono", 0.40)
MDRV_SOUND_ROUTE(1, "mono", 0.40)
MDRV_SOUND_ROUTE(2, "mono", 0.40)
MDRV_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface_2)
MDRV_SOUND_ROUTE(0, "mono", 0.40)
MDRV_SOUND_ROUTE(1, "mono", 0.40)
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index 810610fe2e3..f667ce54ba4 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -690,10 +690,10 @@ static MACHINE_DRIVER_START( ladybug )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489, 4000000)
+ MDRV_SOUND_ADD("sn1", SN76489, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76489, 4000000)
+ MDRV_SOUND_ADD("sn2", SN76489, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -729,19 +729,19 @@ static MACHINE_DRIVER_START( sraider )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489, 4000000)
+ MDRV_SOUND_ADD("sn1", SN76489, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76489, 4000000)
+ MDRV_SOUND_ADD("sn2", SN76489, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76489, 4000000)
+ MDRV_SOUND_ADD("sn3", SN76489, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76489, 4000000)
+ MDRV_SOUND_ADD("sn4", SN76489, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76489, 4000000)
+ MDRV_SOUND_ADD("sn5", SN76489, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index 13c95337976..1ebc99d79a1 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -314,11 +314,11 @@ static MACHINE_DRIVER_START( ladyfrog )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay", AY8910, 8000000/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(MSM5232, 2000000)
+ MDRV_SOUND_ADD("msm", MSM5232, 2000000)
MDRV_SOUND_CONFIG(msm5232_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index 6e2cd0e638b..847cf09ca0f 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -717,13 +717,13 @@ static MACHINE_DRIVER_START( laserbat )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76477, 0) // output not connected
+ MDRV_SOUND_ADD("sn", SN76477, 0) // output not connected
MDRV_SOUND_CONFIG(sn76477_interface)
- MDRV_SOUND_ADD(TMS3615, 4000000/8/2) // 250 kHz, from second chip's clock out
+ MDRV_SOUND_ADD("tms1", TMS3615, 4000000/8/2) // 250 kHz, from second chip's clock out
MDRV_SOUND_ROUTE(TMS3615_FOOTAGE_8, "mono", 1.0)
- MDRV_SOUND_ADD(TMS3615, 4000000/8) // 500 kHz
+ MDRV_SOUND_ADD("tms2", TMS3615, 4000000/8) // 500 kHz
MDRV_SOUND_ROUTE(TMS3615_FOOTAGE_8, "mono", 1.0)
MACHINE_DRIVER_END
@@ -758,11 +758,11 @@ static MACHINE_DRIVER_START( catnmous )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 3580000/2) // ?
+ MDRV_SOUND_ADD("ay1", AY8910, 3580000/2) // ?
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(AY8910, 3580000/2) // ?
+ MDRV_SOUND_ADD("ay2", AY8910, 3580000/2) // ?
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c
index f18676fe3b8..8f9c45bda8b 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -492,10 +492,10 @@ static MACHINE_DRIVER_START( base )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("sn76489.1", SN76489, 2000000)
+ MDRV_SOUND_ADD("sn76489.1", SN76489, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("sn76489.2", SN76489, 2000000)
+ MDRV_SOUND_ADD("sn76489.2", SN76489, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -543,7 +543,7 @@ static MACHINE_DRIVER_START( wwjgtin )
MDRV_VIDEO_UPDATE(wwjgtin)
/* sound hardware */
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -570,10 +570,10 @@ static MACHINE_DRIVER_START( pinbo )
MDRV_SOUND_REMOVE("sn76489.1")
MDRV_SOUND_REMOVE("sn76489.2")
- MDRV_SOUND_ADD(AY8910, 1250000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1250000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.55)
- MDRV_SOUND_ADD(AY8910, 1250000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1250000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.55)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index eea91de11bf..7d82dae2b82 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -294,11 +294,11 @@ static MACHINE_DRIVER_START( lastduel )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3579545)
+ MDRV_SOUND_ADD("ym1", YM2203, 3579545)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(YM2203, 3579545)
+ MDRV_SOUND_ADD("ym2", YM2203, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
@@ -334,14 +334,14 @@ static MACHINE_DRIVER_START( madgear )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(OKIM6295, XTAL_10MHz/10)
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_10MHz/10)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.98)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c
index 0525d295b38..47cfe004d44 100644
--- a/src/mame/drivers/lazercmd.c
+++ b/src/mame/drivers/lazercmd.c
@@ -641,7 +641,7 @@ static MACHINE_DRIVER_START( lazercmd )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -676,7 +676,7 @@ static MACHINE_DRIVER_START( medlanes )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -711,7 +711,7 @@ static MACHINE_DRIVER_START( bbonk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index 16091dd3041..326cc03ebc4 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -1257,11 +1257,11 @@ static MACHINE_DRIVER_START( cupsocbl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index eb2ea65c5d4..bfd65e4f500 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -737,15 +737,15 @@ static MACHINE_DRIVER_START( leland )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("ay8910.1", AY8910, 10000000/6)
+ MDRV_SOUND_ADD("ay8910.1", AY8910, 10000000/6)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD_TAG("ay8910.2", AY8910, 10000000/6)
+ MDRV_SOUND_ADD("ay8910.2", AY8910, 10000000/6)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD_TAG("custom", CUSTOM, 0)
+ MDRV_SOUND_ADD("custom", CUSTOM, 0)
MDRV_SOUND_CONFIG(dac_custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index b2de9d8a885..926049cd43f 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -300,12 +300,12 @@ static MACHINE_DRIVER_START( lemmings )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index ddeda1101ea..de3ce18a2a0 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -688,7 +688,7 @@ static MACHINE_DRIVER_START( lethalen )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c
index ba15eb07726..2cc9ca9f2fd 100644
--- a/src/mame/drivers/lethalj.c
+++ b/src/mame/drivers/lethalj.c
@@ -537,15 +537,15 @@ static MACHINE_DRIVER_START( gameroom )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, SOUND_CLOCK)
+ MDRV_SOUND_ADD("oki1", OKIM6295, SOUND_CLOCK)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.26)
- MDRV_SOUND_ADD(OKIM6295, SOUND_CLOCK)
+ MDRV_SOUND_ADD("oki2", OKIM6295, SOUND_CLOCK)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.26)
- MDRV_SOUND_ADD(OKIM6295, SOUND_CLOCK)
+ MDRV_SOUND_ADD("oki3", OKIM6295, SOUND_CLOCK)
MDRV_SOUND_CONFIG(okim6295_interface_region_3_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.26)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index 1267e8932f1..f4438173c96 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -550,10 +550,10 @@ static MACHINE_DRIVER_START( liberate )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -620,10 +620,10 @@ static MACHINE_DRIVER_START( prosport )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c
index e646c14092b..7b32cb393d0 100644
--- a/src/mame/drivers/liberatr.c
+++ b/src/mame/drivers/liberatr.c
@@ -402,11 +402,11 @@ static MACHINE_DRIVER_START( liberatr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK/16) /* 1.25Mhz from Phi2 signal from 6502 */
+ MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/16) /* 1.25Mhz from Phi2 signal from 6502 */
MDRV_SOUND_CONFIG(pokey_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK/16) /* 1.25Mhz from Phi2 signal from 6502 */
+ MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/16) /* 1.25Mhz from Phi2 signal from 6502 */
MDRV_SOUND_CONFIG(pokey_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index 21411e67dd3..15ac07fb89f 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -529,7 +529,7 @@ static MACHINE_DRIVER_START( spotty )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 4000000 / 4 ) //?
+ MDRV_SOUND_ADD("oki", OKIM6295, 4000000 / 4 ) //?
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index 08e6f57de97..f676383c2e3 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -335,14 +335,14 @@ static MACHINE_DRIVER_START( lkage )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 4000000)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
@@ -378,14 +378,14 @@ static MACHINE_DRIVER_START( lkageb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 4000000)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index 11813b7de28..2737900ac8e 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -508,7 +508,7 @@ static MACHINE_DRIVER_START( lockon )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, XTAL_16MHz / 4)
+ MDRV_SOUND_ADD("ym", YM2203, XTAL_16MHz / 4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "left", 0.40)
MDRV_SOUND_ROUTE(0, "right", 0.40)
@@ -519,17 +519,17 @@ static MACHINE_DRIVER_START( lockon )
MDRV_SOUND_ROUTE(3, "f2203.3l", 1.0)
MDRV_SOUND_ROUTE(3, "f2203.3r", 1.0)
- MDRV_SOUND_ADD_TAG("f2203.1l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("f2203.1l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("f2203.1r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("f2203.1r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("f2203.2l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("f2203.2l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("f2203.2r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("f2203.2r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("f2203.3l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("f2203.3l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("f2203.3r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("f2203.3r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index 89ea820674e..fc65440f4dc 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -620,15 +620,15 @@ static MACHINE_DRIVER_START( looping )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, SOUND_CLOCK/4)
+ MDRV_SOUND_ADD("ay", AY8910, SOUND_CLOCK/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(TMS5220, TMS_CLOCK)
+ MDRV_SOUND_ADD("tms", TMS5220, TMS_CLOCK)
MDRV_SOUND_CONFIG(tms5220_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index d3fc3308af5..035fc44674b 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -471,12 +471,12 @@ static MACHINE_DRIVER_START( lordgun )
// sound hardware
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3812, 3579545)
+ MDRV_SOUND_ADD("ym", YM3812, 3579545)
MDRV_SOUND_CONFIG(lordgun_ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1000000) // 5MHz can't be right!
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000) // 5MHz can't be right!
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -492,7 +492,7 @@ static MACHINE_DRIVER_START( hfh )
MDRV_CPU_IO_MAP(hfh_soundio_map,0)
// sound hardware
- MDRV_SOUND_ADD(OKIM6295, 1000000) // 5MHz can't be right!
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000) // 5MHz can't be right!
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index 2cc200e7f28..f508a770be0 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -591,10 +591,10 @@ static MACHINE_DRIVER_START( lsasquad )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 3000000)
+ MDRV_SOUND_ADD("ay", AY8910, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.12)
MDRV_SOUND_ROUTE(1, "mono", 0.12)
@@ -637,10 +637,10 @@ static MACHINE_DRIVER_START( daikaiju )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 3000000)
+ MDRV_SOUND_ADD("ay", AY8910, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.12)
MDRV_SOUND_ROUTE(1, "mono", 0.12)
diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c
index ab01ec15301..2918d07d3c5 100644
--- a/src/mame/drivers/ltcasino.c
+++ b/src/mame/drivers/ltcasino.c
@@ -668,7 +668,7 @@ static MACHINE_DRIVER_START( ltcasino )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1000000)
+ MDRV_SOUND_ADD("ay", AY8910, 1000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index ad7954b5a13..ac43ad9a734 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -873,7 +873,7 @@ static MACHINE_DRIVER_START( lucky74 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, MASTER_CLOCK/8) /* YM2149F */
+ MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/8) /* YM2149F */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/lucky8.c b/src/mame/drivers/lucky8.c
index 2b536871e96..18c63292d0c 100644
--- a/src/mame/drivers/lucky8.c
+++ b/src/mame/drivers/lucky8.c
@@ -379,7 +379,7 @@ static MACHINE_DRIVER_START( lucky8 )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/12)
+ MDRV_SOUND_ADD("ay", AY8910, 12000000/12)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c
index fbba10807a5..805e7d1232a 100644
--- a/src/mame/drivers/lvcards.c
+++ b/src/mame/drivers/lvcards.c
@@ -494,7 +494,7 @@ static MACHINE_DRIVER_START( lvcards )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 18432000/12)
+ MDRV_SOUND_ADD("ay", AY8910, 18432000/12)
MDRV_SOUND_CONFIG(lcay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c
index 296884ad2a8..b4c906c8e30 100644
--- a/src/mame/drivers/lwings.c
+++ b/src/mame/drivers/lwings.c
@@ -785,13 +785,13 @@ static MACHINE_DRIVER_START( lwings )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("2203a", YM2203, 1500000)
+ MDRV_SOUND_ADD("2203a", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
MDRV_SOUND_ROUTE(2, "mono", 0.20)
MDRV_SOUND_ROUTE(3, "mono", 0.10)
- MDRV_SOUND_ADD_TAG("2203b", YM2203, 1500000)
+ MDRV_SOUND_ADD("2203b", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
MDRV_SOUND_ROUTE(2, "mono", 0.20)
@@ -817,7 +817,7 @@ static MACHINE_DRIVER_START( trojan )
MDRV_VIDEO_UPDATE(trojan)
/* sound hardware */
- MDRV_SOUND_ADD_TAG("5205", MSM5205, 384000)
+ MDRV_SOUND_ADD("5205", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c
index 80ecdf41b9d..749fe6386d5 100644
--- a/src/mame/drivers/m10.c
+++ b/src/mame/drivers/m10.c
@@ -772,7 +772,7 @@ static MACHINE_DRIVER_START( m10 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(m10_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -818,7 +818,7 @@ static MACHINE_DRIVER_START( m15 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(m10_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index 9614f16f58a..92f5f44cc3c 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -508,12 +508,12 @@ static MACHINE_DRIVER_START( firebarr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 14318180/4)
+ MDRV_SOUND_ADD("ym", YM2151, 14318180/4)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.40)
MDRV_SOUND_ROUTE(1, "right", 0.40)
- MDRV_SOUND_ADD(IREMGA20, 14318180/4)
+ MDRV_SOUND_ADD("irem", IREMGA20, 14318180/4)
MDRV_SOUND_CONFIG(iremGA20_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index ac8dba8484d..8acf6fab436 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -654,10 +654,10 @@ static MACHINE_DRIVER_START( m63 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono") /* ????? */
- MDRV_SOUND_ADD(AY8910, 3579545/4)
+ MDRV_SOUND_ADD("ay1", AY8910, 3579545/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(AY8910, 3579545/4) /* ????? */
+ MDRV_SOUND_ADD("ay2", AY8910, 3579545/4) /* ????? */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -698,10 +698,10 @@ static MACHINE_DRIVER_START( fghtbskt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/4/2)
+ MDRV_SOUND_ADD("ay", AY8910, 12000000/4/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(fghtbskt_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index 8408c887b0e..79ee0b2b276 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -1664,7 +1664,7 @@ static MACHINE_DRIVER_START( rtype )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -1730,12 +1730,12 @@ static MACHINE_DRIVER_START( m72 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
@@ -1780,12 +1780,12 @@ static MACHINE_DRIVER_START( dkgenm72 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
@@ -1821,12 +1821,12 @@ static MACHINE_DRIVER_START( xmultipl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
@@ -1862,12 +1862,12 @@ static MACHINE_DRIVER_START( dbreed )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
@@ -1902,12 +1902,12 @@ static MACHINE_DRIVER_START( dbreed72 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
@@ -1943,12 +1943,12 @@ static MACHINE_DRIVER_START( rtype2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
@@ -1983,12 +1983,12 @@ static MACHINE_DRIVER_START( majtitle )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
@@ -2023,12 +2023,12 @@ static MACHINE_DRIVER_START( hharry )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
@@ -2064,12 +2064,12 @@ static MACHINE_DRIVER_START( hharryu )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
@@ -2105,12 +2105,12 @@ static MACHINE_DRIVER_START( poundfor )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
@@ -2145,12 +2145,12 @@ static MACHINE_DRIVER_START( cosmccop )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index d19ac15b803..3b68532d616 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -781,12 +781,12 @@ static MACHINE_DRIVER_START( m90 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
@@ -863,12 +863,12 @@ static MACHINE_DRIVER_START( bombrman )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
@@ -909,12 +909,12 @@ static MACHINE_DRIVER_START( bbmanw )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
@@ -971,12 +971,12 @@ static MACHINE_DRIVER_START( dynablsb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index 38e9566a4ae..04e15d0eac9 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -988,12 +988,12 @@ static MACHINE_DRIVER_START( m92 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 14318180/4)
+ MDRV_SOUND_ADD("ym", YM2151, 14318180/4)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.40)
MDRV_SOUND_ROUTE(1, "mono", 0.40)
- MDRV_SOUND_ADD(IREMGA20, 14318180/4)
+ MDRV_SOUND_ADD("irem", IREMGA20, 14318180/4)
MDRV_SOUND_CONFIG(iremGA20_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index 38c8311de9c..a75a7bd95e2 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -557,7 +557,7 @@ static MACHINE_DRIVER_START( macrossp )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(ES5506, 16000000)
+ MDRV_SOUND_ADD("es", ES5506, 16000000)
MDRV_SOUND_CONFIG(es5506_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c
index a43fa37b525..211e48080b4 100644
--- a/src/mame/drivers/macs.c
+++ b/src/mame/drivers/macs.c
@@ -371,7 +371,7 @@ static MACHINE_DRIVER_START( macs )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(ST0016, 0)
+ MDRV_SOUND_ADD("st", ST0016, 0)
MDRV_SOUND_CONFIG(st0016_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index bb4982fc25a..4e13152a938 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -189,7 +189,7 @@ static MACHINE_DRIVER_START( madalien )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, SOUND_CLOCK / 4)
+ MDRV_SOUND_ADD("ay", AY8910, SOUND_CLOCK / 4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index 15cee1b76a3..4cfeb5d429f 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -311,19 +311,19 @@ static MACHINE_DRIVER_START( madmotor )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 21470000/6)
+ MDRV_SOUND_ADD("ym1", YM2203, 21470000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(YM2151, 21470000/6)
+ MDRV_SOUND_ADD("ym2", YM2151, 21470000/6)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.45)
MDRV_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(OKIM6295, 2047848)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 2047848)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c
index 0a23a47e9cb..b8845181dc4 100644
--- a/src/mame/drivers/magic10.c
+++ b/src/mame/drivers/magic10.c
@@ -365,7 +365,7 @@ static MACHINE_DRIVER_START( magic10 )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index 50eeff46413..13a13bc8c52 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -395,14 +395,14 @@ static MACHINE_DRIVER_START( magmax )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_20MHz/16) /* verified on pcb */
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_20MHz/16) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(AY8910, XTAL_20MHz/16) /* verified on pcb */
+ MDRV_SOUND_ADD("ay2", AY8910, XTAL_20MHz/16) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(AY8910, XTAL_20MHz/16) /* verified on pcb */
+ MDRV_SOUND_ADD("ay3", AY8910, XTAL_20MHz/16) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c
index 4899b49b405..10627a9e6a9 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -734,12 +734,12 @@ static MACHINE_DRIVER_START( mainevt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -775,11 +775,11 @@ static MACHINE_DRIVER_START( devstors )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "mono", 0.30)
MDRV_SOUND_ROUTE(1, "mono", 0.30)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index 9bed8289cbe..1940a62e1f9 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -397,13 +397,13 @@ static MACHINE_DRIVER_START( mainsnk )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD(NAMCO, 24000)
+ MDRV_SOUND_ADD("namco", NAMCO, 24000)
MDRV_SOUND_CONFIG(snkwave_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c
index 2e701bbab30..8b96c7f38cf 100644
--- a/src/mame/drivers/malzak.c
+++ b/src/mame/drivers/malzak.c
@@ -364,11 +364,11 @@ static MACHINE_DRIVER_START( malzak )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn1", SN76477, 0)
MDRV_SOUND_CONFIG(sn76477_intf)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn2", SN76477, 0)
MDRV_SOUND_CONFIG(sn76477_intf)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 07aa646b3f4..7c0386fb18b 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -1598,7 +1598,7 @@ static MACHINE_DRIVER_START( superpac )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO_15XX, 18432000/768)
+ MDRV_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1609,7 +1609,7 @@ static MACHINE_DRIVER_START( grobda )
MDRV_IMPORT_FROM( superpac )
/* sound hardware */
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.55)
MACHINE_DRIVER_END
@@ -1649,7 +1649,7 @@ static MACHINE_DRIVER_START( phozon )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO_15XX, 18432000/768)
+ MDRV_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1686,7 +1686,7 @@ static MACHINE_DRIVER_START( mappy )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO_15XX, 18432000/768)
+ MDRV_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c
index cfab6b342a1..0d1dea43d7f 100644
--- a/src/mame/drivers/marineb.c
+++ b/src/mame/drivers/marineb.c
@@ -532,7 +532,7 @@ static MACHINE_DRIVER_START( marineb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("8910", AY8910, 1500000)
+ MDRV_SOUND_ADD("8910", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -586,7 +586,7 @@ static MACHINE_DRIVER_START( wanted )
MDRV_SOUND_REPLACE("8910", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c
index d44dfec8814..cb5fc3f4ebd 100644
--- a/src/mame/drivers/markham.c
+++ b/src/mame/drivers/markham.c
@@ -226,10 +226,10 @@ static MACHINE_DRIVER_START( markham )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 8000000/2)
+ MDRV_SOUND_ADD("sn1", SN76496, 8000000/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD(SN76496, 8000000/2)
+ MDRV_SOUND_ADD("sn2", SN76496, 8000000/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/marvins.c b/src/mame/drivers/marvins.c
index dffb2b69f23..2159837b00a 100644
--- a/src/mame/drivers/marvins.c
+++ b/src/mame/drivers/marvins.c
@@ -545,13 +545,13 @@ static MACHINE_DRIVER_START( marvins )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(NAMCO, 8000000/256)
+ MDRV_SOUND_ADD("namco", NAMCO, 8000000/256)
MDRV_SOUND_CONFIG(snkwave_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
@@ -595,13 +595,13 @@ static MACHINE_DRIVER_START( vangrd2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(NAMCO, 8000000/256)
+ MDRV_SOUND_ADD("namco", NAMCO, 8000000/256)
MDRV_SOUND_CONFIG(snkwave_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c
index d3e567639fc..6ffd41de35f 100644
--- a/src/mame/drivers/mastboy.c
+++ b/src/mame/drivers/mastboy.c
@@ -883,10 +883,10 @@ static MACHINE_DRIVER_START( mastboy )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAA1099, 6000000 )
+ MDRV_SOUND_ADD("saa", SAA1099, 6000000 )
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index 9ca9c245832..2316aca7208 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -350,13 +350,13 @@ static MACHINE_DRIVER_START( matmania )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
@@ -408,11 +408,11 @@ static MACHINE_DRIVER_START( maniach )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 3600000)
+ MDRV_SOUND_ADD("ym", YM3526, 3600000)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c
index 65184aea4f9..3a38c524bb1 100644
--- a/src/mame/drivers/maxaflex.c
+++ b/src/mame/drivers/maxaflex.c
@@ -454,11 +454,11 @@ static MACHINE_DRIVER_START( a600xl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, FREQ_17_EXACT)
+ MDRV_SOUND_ADD("pokey", POKEY, FREQ_17_EXACT)
MDRV_SOUND_CONFIG(pokey_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SPEAKER, 0)
+ MDRV_SOUND_ADD("speaker", SPEAKER, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MDRV_MACHINE_START( a600xl )
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index eae3646d662..b8559b9df4b 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -307,7 +307,7 @@ static MACHINE_DRIVER_START( mayumi )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, MCLK/4)
+ MDRV_SOUND_ADD("ym", YM2203, MCLK/4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index 9f8c9abcd07..76e73105dca 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -1572,11 +1572,11 @@ but handled differently for now
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 14318000 / 8)
+ MDRV_SOUND_ADD("ay1", AY8910, 14318000 / 8)
MDRV_SOUND_CONFIG(ay8912_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, 14318000 / 8)
+ MDRV_SOUND_ADD("ay2", AY8910, 14318000 / 8)
MDRV_SOUND_CONFIG(ay8912_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index 835c52020a7..291253b2a9a 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -520,7 +520,7 @@ static MACHINE_DRIVER_START( mcatadv )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, XTAL_16MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2610, XTAL_16MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(mcatadv_ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.32)
MDRV_SOUND_ROUTE(0, "right", 0.32)
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index 2572242fd36..6a0c220f32c 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -1562,7 +1562,7 @@ static MACHINE_DRIVER_START( mcr_91475 )
MDRV_PALETTE_LENGTH(128)
/* sound hardware */
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(journey_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.25)
diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c
index fb0871faafd..b57efbb2198 100644
--- a/src/mame/drivers/meadows.c
+++ b/src/mame/drivers/meadows.c
@@ -615,10 +615,10 @@ static MACHINE_DRIVER_START( meadows )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(meadows_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -655,7 +655,7 @@ static MACHINE_DRIVER_START( bowl3d )
MDRV_IMPORT_FROM(meadows)
/* audio hardware */
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(bowl3d_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index f7d8e7d9bf7..9e85cdee0bc 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -1074,10 +1074,10 @@ static MACHINE_DRIVER_START(mediagx)
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac1", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD(DMADAC, 0)
+ MDRV_SOUND_ADD("dac2", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 9cbaaf17f11..3e67155ee18 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -5048,22 +5048,22 @@ MACHINE_DRIVER_START( megadriv )
#if 0
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2612, MASTER_CLOCK/7) /* 7.67 MHz */
+ MDRV_SOUND_ADD("ym", YM2612, MASTER_CLOCK/7) /* 7.67 MHz */
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
/* sound hardware */
- MDRV_SOUND_ADD(SN76496, MASTER_CLOCK/15)
+ MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/15)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* 3.58 MHz */
#else
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2612, MASTER_CLOCK/7) /* 7.67 MHz */
+ MDRV_SOUND_ADD("ym", YM2612, MASTER_CLOCK/7) /* 7.67 MHz */
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
/* sound hardware */
- MDRV_SOUND_ADD(SN76496, MASTER_CLOCK/15)
+ MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/15)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25) /* 3.58 MHz */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right",0.25) /* 3.58 MHz */
#endif
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index b96969e9ee5..0dae0b87187 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -771,7 +771,7 @@ static MACHINE_DRIVER_START( mpnew )
MDRV_INTERLEAVE(100)
- MDRV_SOUND_ADD(SN76496, MASTER_CLOCK/15)
+ MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/15)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25) /* 3.58 MHz */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right",0.25) /* 3.58 MHz */
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index e696e5e59d1..9c1f642a4a0 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -646,17 +646,17 @@ static MACHINE_DRIVER_START( system_A )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CPU_CLOCK/2) /* 3.5MHz (7MHz / 2) verified */
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CPU_CLOCK/2) /* 3.5MHz (7MHz / 2) verified */
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
- MDRV_SOUND_ADD_TAG("OKI1",OKIM6295, OKI4_SOUND_CLOCK) /* 4MHz verified */
+ MDRV_SOUND_ADD("OKI1",OKIM6295, OKI4_SOUND_CLOCK) /* 4MHz verified */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30)
- MDRV_SOUND_ADD_TAG("OKI2",OKIM6295, OKI4_SOUND_CLOCK) /* 4MHz verified */
+ MDRV_SOUND_ADD("OKI2",OKIM6295, OKI4_SOUND_CLOCK) /* 4MHz verified */
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30)
@@ -750,7 +750,7 @@ static MACHINE_DRIVER_START( system_D )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("OKI1",OKIM6295, SYS_D_CPU_CLOCK/4) /* 2MHz (8MHz / 4) */
+ MDRV_SOUND_ADD("OKI1",OKIM6295, SYS_D_CPU_CLOCK/4) /* 2MHz (8MHz / 4) */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -814,7 +814,7 @@ static MACHINE_DRIVER_START( system_Z )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index f8d9a0a45d3..f3c0f2be9b4 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -632,7 +632,7 @@ static MACHINE_DRIVER_START( megatech )
MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1)
/* sound hardware */
- MDRV_SOUND_ADD(SN76496, MASTER_CLOCK/15)
+ MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/15)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index 19ac78403df..96b7039ea64 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -348,20 +348,20 @@ static MACHINE_DRIVER_START( megazone )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 14318000/8)
+ MDRV_SOUND_ADD("ay", AY8910, 14318000/8)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(0, "filter.0.0", 0.30)
MDRV_SOUND_ROUTE(1, "filter.0.1", 0.30)
MDRV_SOUND_ROUTE(2, "filter.0.2", 0.30)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("filter.0.0", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter.0.0", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter.0.1", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter.0.1", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter.0.2", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter.0.2", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c
index 1ad7078e80c..7c5c4426eba 100644
--- a/src/mame/drivers/meijinsn.c
+++ b/src/mame/drivers/meijinsn.c
@@ -333,7 +333,7 @@ static MACHINE_DRIVER_START( meijinsn )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index 763fe2b275e..733cc428efa 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -829,7 +829,7 @@ static MACHINE_DRIVER_START( pitboss )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2500000)
+ MDRV_SOUND_ADD("ay", AY8910, 2500000)
MDRV_SOUND_CONFIG(merit_ay8912_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index fc72117d52b..9bf761c4de4 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -912,7 +912,7 @@ static MACHINE_DRIVER_START(meritm_crt250)
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, SYSTEM_CLK/12)
+ MDRV_SOUND_ADD("ay", AY8910, SYSTEM_CLK/12)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c
index cbd06ed7bed..4a52138cc0d 100644
--- a/src/mame/drivers/mermaid.c
+++ b/src/mame/drivers/mermaid.c
@@ -277,10 +277,10 @@ static MACHINE_DRIVER_START( mermaid )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index 055ac3b6d3c..43d871f7f2d 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -342,13 +342,13 @@ static MACHINE_DRIVER_START( metlclsh )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.10)
MDRV_SOUND_ROUTE(1, "mono", 0.10)
MDRV_SOUND_ROUTE(2, "mono", 0.10)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(YM3526, 3000000)
+ MDRV_SOUND_ADD("ym", YM3526, 3000000)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 838844b39b3..3d2eb1c8141 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -3786,7 +3786,7 @@ static MACHINE_DRIVER_START( balcube )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMF278B, YMF278B_STD_CLOCK)
+ MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
MDRV_SOUND_CONFIG(ymf278b_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -3819,7 +3819,7 @@ static MACHINE_DRIVER_START( bangball )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMF278B, YMF278B_STD_CLOCK)
+ MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
MDRV_SOUND_CONFIG(ymf278b_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -3852,7 +3852,7 @@ static MACHINE_DRIVER_START( batlbubl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMF278B, YMF278B_STD_CLOCK)
+ MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
MDRV_SOUND_CONFIG(ymf278b_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -3890,12 +3890,12 @@ static MACHINE_DRIVER_START( daitorid )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1200000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1200000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // was /128.. so pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
@@ -3934,12 +3934,12 @@ static MACHINE_DRIVER_START( dharma )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1200000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1200000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // was /128.. so pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
MACHINE_DRIVER_END
@@ -3977,12 +3977,12 @@ static MACHINE_DRIVER_START( karatour )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1200000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1200000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // was /128.. so pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
MACHINE_DRIVER_END
@@ -4020,12 +4020,12 @@ static MACHINE_DRIVER_START( 3kokushi )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1200000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1200000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // was /128.. so pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
MACHINE_DRIVER_END
@@ -4063,12 +4063,12 @@ static MACHINE_DRIVER_START( lastfort )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1200000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1200000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // was /128.. so pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
MACHINE_DRIVER_END
@@ -4105,12 +4105,12 @@ static MACHINE_DRIVER_START( lastforg )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1200000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1200000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // was /128.. so pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
MACHINE_DRIVER_END
@@ -4141,12 +4141,12 @@ static MACHINE_DRIVER_START( dokyusei )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(YM2413, 8000000)
+ MDRV_SOUND_ADD("ym", YM2413, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
MACHINE_DRIVER_END
@@ -4192,12 +4192,12 @@ static MACHINE_DRIVER_START( dokyusp )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 2112000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 2112000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(YM2413, 8000000)
+ MDRV_SOUND_ADD("ym", YM2413, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
MACHINE_DRIVER_END
@@ -4230,12 +4230,12 @@ static MACHINE_DRIVER_START( gakusai )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 2112000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 2112000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(YM2413, 8000000)
+ MDRV_SOUND_ADD("ym", YM2413, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
MACHINE_DRIVER_END
@@ -4268,12 +4268,12 @@ static MACHINE_DRIVER_START( gakusai2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 2112000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 2112000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(YM2413, 8000000)
+ MDRV_SOUND_ADD("ym", YM2413, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
MACHINE_DRIVER_END
@@ -4311,12 +4311,12 @@ static MACHINE_DRIVER_START( pangpoms )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1200000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1200000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // was /128.. so pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
MACHINE_DRIVER_END
@@ -4354,12 +4354,12 @@ static MACHINE_DRIVER_START( poitto )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1200000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1200000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // was /128.. so pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
MACHINE_DRIVER_END
@@ -4397,12 +4397,12 @@ static MACHINE_DRIVER_START( pururun )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1200000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1200000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // was /128.. so pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
@@ -4441,12 +4441,12 @@ static MACHINE_DRIVER_START( skyalert )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1200000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1200000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // was /128.. so pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
MACHINE_DRIVER_END
@@ -4484,12 +4484,12 @@ static MACHINE_DRIVER_START( toride2g )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1200000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1200000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // was /128.. so pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
MACHINE_DRIVER_END
@@ -4520,12 +4520,12 @@ static MACHINE_DRIVER_START( mouja )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 16000000/1024*132)
+ MDRV_SOUND_ADD("oki", OKIM6295, 16000000/1024*132)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.25)
- MDRV_SOUND_ADD(YM2413, 3579545)
+ MDRV_SOUND_ADD("ym", YM2413, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.00)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.00)
MACHINE_DRIVER_END
@@ -4562,7 +4562,7 @@ static MACHINE_DRIVER_START( blzntrnd )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(blzntrnd_ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -4602,7 +4602,7 @@ static MACHINE_DRIVER_START( gstrik2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(blzntrnd_ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -4669,12 +4669,12 @@ static MACHINE_DRIVER_START( puzzlet )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, XTAL_20MHz/5)
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_20MHz/5)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(YM2413, XTAL_20MHz/5)
+ MDRV_SOUND_ADD("ym", YM2413, XTAL_20MHz/5)
MDRV_SOUND_ROUTE(0, "left", 0.90)
MDRV_SOUND_ROUTE(1, "right", 0.90)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c
index 5983b091b95..1c529545de6 100644
--- a/src/mame/drivers/mexico86.c
+++ b/src/mame/drivers/mexico86.c
@@ -405,7 +405,7 @@ static MACHINE_DRIVER_START( mexico86 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.30)
MDRV_SOUND_ROUTE(1, "mono", 0.30)
diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c
index 8f6f138edf4..125d6860dab 100644
--- a/src/mame/drivers/mhavoc.c
+++ b/src/mame/drivers/mhavoc.c
@@ -539,17 +539,17 @@ static MACHINE_DRIVER_START( mhavoc )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("pokey.1", POKEY, MHAVOC_CLOCK_1_25M)
+ MDRV_SOUND_ADD("pokey.1", POKEY, MHAVOC_CLOCK_1_25M)
MDRV_SOUND_CONFIG(pokey_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD_TAG("pokey.2", POKEY, MHAVOC_CLOCK_1_25M)
+ MDRV_SOUND_ADD("pokey.2", POKEY, MHAVOC_CLOCK_1_25M)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD_TAG("pokey.3", POKEY, MHAVOC_CLOCK_1_25M)
+ MDRV_SOUND_ADD("pokey.3", POKEY, MHAVOC_CLOCK_1_25M)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD_TAG("pokey.4", POKEY, MHAVOC_CLOCK_1_25M)
+ MDRV_SOUND_ADD("pokey.4", POKEY, MHAVOC_CLOCK_1_25M)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -557,7 +557,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mhavocrv )
MDRV_IMPORT_FROM( mhavoc )
- MDRV_SOUND_ADD(TMS5220, MHAVOC_CLOCK/2/9)
+ MDRV_SOUND_ADD("tms", TMS5220, MHAVOC_CLOCK/2/9)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index 36aafdd58ed..effbaf862b6 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -885,19 +885,19 @@ static MACHINE_DRIVER_START( micro3d )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.0) /* muted - I don't think it's directly used */
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.15)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.15)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index d13cd769020..6e11678e147 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -462,7 +462,7 @@ static MACHINE_DRIVER_START( livequiz )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c
index 3021e32fc0c..f0e0d285eb9 100644
--- a/src/mame/drivers/midyunit.c
+++ b/src/mame/drivers/midyunit.c
@@ -1146,7 +1146,7 @@ static MACHINE_DRIVER_START( mkyawdim )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c
index d6e8f13b4f4..fa55753f537 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -271,10 +271,10 @@ static MACHINE_DRIVER_START( mikie )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, XTAL/8)
+ MDRV_SOUND_ADD("sn1", SN76496, XTAL/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(SN76496, CLK)
+ MDRV_SOUND_ADD("sn2", SN76496, CLK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index 240c848baca..dd9e78c37f1 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -367,11 +367,11 @@ static MACHINE_DRIVER_START( mirage )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c
index f364fe4b9bb..4a0ee662c3f 100644
--- a/src/mame/drivers/mirax.c
+++ b/src/mame/drivers/mirax.c
@@ -196,9 +196,9 @@ static MACHINE_DRIVER_START( mirax )
MDRV_VIDEO_UPDATE(mirax)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/6 /* guess */)
+ MDRV_SOUND_ADD("ay1", AY8910, 12000000/6 /* guess */)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(AY8910, 12000000/6 /* guess */)
+ MDRV_SOUND_ADD("ay2", AY8910, 12000000/6 /* guess */)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index d66a7adb6b7..0c96221a053 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -388,11 +388,11 @@ static MACHINE_DRIVER_START( missb2 )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, MAIN_XTAL/8)
+ MDRV_SOUND_ADD("ym", YM3526, MAIN_XTAL/8)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index 4565670ffa3..75096a3f12e 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -906,7 +906,7 @@ static MACHINE_DRIVER_START( missile )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("pokey", POKEY, MASTER_CLOCK/8)
MDRV_SOUND_CONFIG(pokey_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index 555f0d97da0..e6cd25cbd13 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -1153,11 +1153,11 @@ static MACHINE_DRIVER_START( mgakuen )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 990000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 990000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(YM2413, 4000000)
+ MDRV_SOUND_ADD("ym", YM2413, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1189,11 +1189,11 @@ static MACHINE_DRIVER_START( pang )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("oki", OKIM6295, 1000000) /* (verified on pcb) */
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000) /* (verified on pcb) */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("ym2413",YM2413, 4000000) /* (verified on pcb) */
+ MDRV_SOUND_ADD("ym2413",YM2413, 4000000) /* (verified on pcb) */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1290,7 +1290,7 @@ static MACHINE_DRIVER_START( mstworld )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 990000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 990000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1323,11 +1323,11 @@ static MACHINE_DRIVER_START( marukin )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 990000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 990000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(YM2413, 4000000)
+ MDRV_SOUND_ADD("ym", YM2413, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index 21d3f170a8e..667882a182a 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -380,13 +380,13 @@ static MACHINE_DRIVER_START( mjkjidai )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489, 10000000/4)
+ MDRV_SOUND_ADD("sn1", SN76489, 10000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76489, 10000000/4)
+ MDRV_SOUND_ADD("sn2", SN76489, 10000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(CUSTOM, 6000)
+ MDRV_SOUND_ADD("adpcm", CUSTOM, 6000)
MDRV_SOUND_CONFIG(adpcm_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c
index 92cab7415b8..892ada43fff 100644
--- a/src/mame/drivers/mjsister.c
+++ b/src/mame/drivers/mjsister.c
@@ -335,11 +335,11 @@ static MACHINE_DRIVER_START( mjsister )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, MCLK/8)
+ MDRV_SOUND_ADD("ay", AY8910, MCLK/8)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mjsiyoub.c b/src/mame/drivers/mjsiyoub.c
index 7ed002e6548..0c30b32d3b9 100644
--- a/src/mame/drivers/mjsiyoub.c
+++ b/src/mame/drivers/mjsiyoub.c
@@ -108,11 +108,11 @@ static MACHINE_DRIVER_START( mjsiyoub )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 18432000/16) // ??
+ MDRV_SOUND_ADD("ay", AY8910, 18432000/16) // ??
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(MSM5205, 18432000/32) // ??
+ MDRV_SOUND_ADD("msm", MSM5205, 18432000/32) // ??
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index 8e0508b0ba0..2e727c3c9b1 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -393,12 +393,12 @@ static MACHINE_DRIVER_START( mlanding )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 13ffd481199..2a0f1ca3a89 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -1534,16 +1534,16 @@ static MACHINE_DRIVER_START( model1 )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3438, 8000000)
+ MDRV_SOUND_ADD("ym", YM3438, 8000000)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
- MDRV_SOUND_ADD(MULTIPCM, 8000000)
+ MDRV_SOUND_ADD("sega1", MULTIPCM, 8000000)
MDRV_SOUND_CONFIG(m1_multipcm_interface_1)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(MULTIPCM, 8000000)
+ MDRV_SOUND_ADD("sega2", MULTIPCM, 8000000)
MDRV_SOUND_CONFIG(m1_multipcm_interface_2)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -1582,16 +1582,16 @@ static MACHINE_DRIVER_START( model1_vr )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3438, 8000000)
+ MDRV_SOUND_ADD("ym", YM3438, 8000000)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
- MDRV_SOUND_ADD(MULTIPCM, 8000000)
+ MDRV_SOUND_ADD("sega1", MULTIPCM, 8000000)
MDRV_SOUND_CONFIG(m1_multipcm_interface_1)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(MULTIPCM, 8000000)
+ MDRV_SOUND_ADD("sega2", MULTIPCM, 8000000)
MDRV_SOUND_CONFIG(m1_multipcm_interface_2)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index a45b00e7756..0e702083659 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -1818,16 +1818,16 @@ static MACHINE_DRIVER_START( model2o )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3438, 8000000)
+ MDRV_SOUND_ADD("ym", YM3438, 8000000)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
- MDRV_SOUND_ADD(MULTIPCM, 8000000)
+ MDRV_SOUND_ADD("sega1", MULTIPCM, 8000000)
MDRV_SOUND_CONFIG(m1_multipcm_interface_1)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(MULTIPCM, 8000000)
+ MDRV_SOUND_ADD("sega2", MULTIPCM, 8000000)
MDRV_SOUND_CONFIG(m1_multipcm_interface_2)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -1865,7 +1865,7 @@ static MACHINE_DRIVER_START( model2a )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SCSP, 0)
+ MDRV_SOUND_ADD("scsp", SCSP, 0)
MDRV_SOUND_CONFIG(scsp_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
@@ -1915,7 +1915,7 @@ static MACHINE_DRIVER_START( model2b )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SCSP, 0)
+ MDRV_SOUND_ADD("scsp", SCSP, 0)
MDRV_SOUND_CONFIG(scsp_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
@@ -1949,7 +1949,7 @@ static MACHINE_DRIVER_START( model2c )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SCSP, 0)
+ MDRV_SOUND_ADD("scsp", SCSP, 0)
MDRV_SOUND_CONFIG(scsp_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index d64b2764372..24f42e21c0a 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -4265,11 +4265,11 @@ static MACHINE_DRIVER_START( model3_10 )
MDRV_VIDEO_UPDATE(model3)
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SCSP, 0)
+ MDRV_SOUND_ADD("scsp1", SCSP, 0)
MDRV_SOUND_CONFIG(scsp_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
- MDRV_SOUND_ADD(SCSP, 0)
+ MDRV_SOUND_ADD("scsp2", SCSP, 0)
MDRV_SOUND_CONFIG(scsp2_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
@@ -4302,11 +4302,11 @@ static MACHINE_DRIVER_START( model3_15 )
MDRV_VIDEO_UPDATE(model3)
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SCSP, 0)
+ MDRV_SOUND_ADD("scsp1", SCSP, 0)
MDRV_SOUND_CONFIG(scsp_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
- MDRV_SOUND_ADD(SCSP, 0)
+ MDRV_SOUND_ADD("scsp2", SCSP, 0)
MDRV_SOUND_CONFIG(scsp2_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
@@ -4339,11 +4339,11 @@ static MACHINE_DRIVER_START( model3_20 )
MDRV_VIDEO_UPDATE(model3)
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SCSP, 0)
+ MDRV_SOUND_ADD("scsp1", SCSP, 0)
MDRV_SOUND_CONFIG(scsp_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
- MDRV_SOUND_ADD(SCSP, 0)
+ MDRV_SOUND_ADD("scsp2", SCSP, 0)
MDRV_SOUND_CONFIG(scsp2_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
@@ -4377,11 +4377,11 @@ static MACHINE_DRIVER_START( model3_21 )
MDRV_VIDEO_UPDATE(model3)
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SCSP, 0)
+ MDRV_SOUND_ADD("scsp1", SCSP, 0)
MDRV_SOUND_CONFIG(scsp_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
- MDRV_SOUND_ADD(SCSP, 0)
+ MDRV_SOUND_ADD("scsp2", SCSP, 0)
MDRV_SOUND_CONFIG(scsp2_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c
index 6516ea85b3f..41012408a93 100644
--- a/src/mame/drivers/mogura.c
+++ b/src/mame/drivers/mogura.c
@@ -236,10 +236,10 @@ static MACHINE_DRIVER_START( mogura )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c
index 219913e0628..a9af5cdec81 100644
--- a/src/mame/drivers/mole.c
+++ b/src/mame/drivers/mole.c
@@ -218,7 +218,7 @@ static MACHINE_DRIVER_START( mole )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c
index ffee74f701f..a24e2d28e2e 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -283,13 +283,13 @@ static MACHINE_DRIVER_START( momoko )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1250000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1250000)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_SOUND_ADD(YM2203, 1250000)
+ MDRV_SOUND_ADD("ym2", YM2203, 1250000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index a215e16e23b..e44ce1e816c 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -605,11 +605,11 @@ static MACHINE_DRIVER_START( moo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
@@ -644,7 +644,7 @@ static MACHINE_DRIVER_START( moobl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c
index 59324c307fc..0c468bad8fc 100644
--- a/src/mame/drivers/mosaic.c
+++ b/src/mame/drivers/mosaic.c
@@ -312,7 +312,7 @@ static MACHINE_DRIVER_START( mosaic )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index f08c1d03ea6..5a144e9bdf8 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -227,10 +227,10 @@ static MACHINE_DRIVER_START( mouser )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 4000000/2)
+ MDRV_SOUND_ADD("ay1", AY8910, 4000000/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(AY8910, 4000000/2)
+ MDRV_SOUND_ADD("ay2", AY8910, 4000000/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index 20296a83752..98c9cd9d325 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -1407,7 +1407,7 @@ static MACHINE_DRIVER_START( mpu4mod2 )
MDRV_TIMER_ADD_PERIODIC("50HZ",gen_50hz, HZ(100))
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("AY8913",AY8913, MPU4_MASTER_CLOCK/4)
+ MDRV_SOUND_ADD("AY8913",AY8913, MPU4_MASTER_CLOCK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index 14cb1132733..96a90178674 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -1697,11 +1697,11 @@ static MACHINE_DRIVER_START( mpu4_vid )
MDRV_PALETTE_LENGTH(16)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("AY8913",AY8913, MPU4_MASTER_CLOCK/4)
+ MDRV_SOUND_ADD("AY8913",AY8913, MPU4_MASTER_CLOCK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MDRV_SPEAKER_STANDARD_STEREO("left", "right")/* Present on all video cards */
- MDRV_SOUND_ADD(SAA1099, 8000000)
+ MDRV_SOUND_ADD("saa", SAA1099, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.00)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.00)
MACHINE_DRIVER_END
@@ -1723,7 +1723,7 @@ static MACHINE_DRIVER_START( dealem )
MDRV_TIMER_ADD_PERIODIC("50HZ",gen_50hz, HZ(100))
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("AY8913",AY8913, MPU4_MASTER_CLOCK/4)
+ MDRV_SOUND_ADD("AY8913",AY8913, MPU4_MASTER_CLOCK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index 649806872b3..ca7dcf60424 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -376,14 +376,14 @@ static MACHINE_DRIVER_START( mquake )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(CUSTOM, 3579545)
+ MDRV_SOUND_ADD("amiga", CUSTOM, 3579545)
MDRV_SOUND_CONFIG(amiga_custom_interface)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
MDRV_SOUND_ROUTE(2, "right", 0.50)
MDRV_SOUND_ROUTE(3, "left", 0.50)
- MDRV_SOUND_ADD(ES5503, 7159090) /* ES5503 is likely mono due to channel strobe used as bank select */
+ MDRV_SOUND_ADD("es", ES5503, 7159090) /* ES5503 is likely mono due to channel strobe used as bank select */
MDRV_SOUND_CONFIG(es5503_intf)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(0, "right", 0.50)
diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c
index b5b7260d2c9..49c21904826 100644
--- a/src/mame/drivers/mrdo.c
+++ b/src/mame/drivers/mrdo.c
@@ -198,10 +198,10 @@ static MACHINE_DRIVER_START( mrdo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489, 4000000)
+ MDRV_SOUND_ADD("sn1", SN76489, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76489, 4000000)
+ MDRV_SOUND_ADD("sn2", SN76489, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index a42c993fe8b..91d0ca76c04 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -308,13 +308,13 @@ static MACHINE_DRIVER_START( mrflea )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay3", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c
index 03d1cfae8f0..a4f29031cbb 100644
--- a/src/mame/drivers/mrjong.c
+++ b/src/mame/drivers/mrjong.c
@@ -202,10 +202,10 @@ static MACHINE_DRIVER_START( mrjong )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489, 15468000/6)
+ MDRV_SOUND_ADD("sn1", SN76489, 15468000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76489, 15468000/6)
+ MDRV_SOUND_ADD("sn2", SN76489, 15468000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index 6d1ab3343cb..69003357b1b 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -1428,7 +1428,7 @@ static MACHINE_DRIVER_START( ms32 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMF271, 16934400)
+ MDRV_SOUND_ADD("ymf", YMF271, 16934400)
MDRV_SOUND_CONFIG(ymf271_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index 78da26d446f..6d782d7da03 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -551,13 +551,13 @@ static MACHINE_DRIVER_START( msisaac )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(MSM5232, 2000000)
+ MDRV_SOUND_ADD("msm", MSM5232, 2000000)
MDRV_SOUND_CONFIG(msm5232_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index 18da4383915..e13db267f2e 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -452,12 +452,12 @@ static MACHINE_DRIVER_START( mugsmash )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.00) /* music */
MDRV_SOUND_ROUTE(1, "right", 1.00)
- MDRV_SOUND_ADD(OKIM6295, 1122000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1122000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) /* sound fx */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index 9f1b70f5068..35d0e486f76 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -590,11 +590,11 @@ static MACHINE_DRIVER_START( multigam )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NES, N2A03_DEFAULTCLOCK)
+ MDRV_SOUND_ADD("nes", NES, N2A03_DEFAULTCLOCK)
MDRV_SOUND_CONFIG(multigam_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c
index c8b5dbf6ba9..58e9cc1b8a7 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -308,10 +308,10 @@ static MACHINE_DRIVER_START( munchmo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c
index cf806588c1e..162a499cb39 100644
--- a/src/mame/drivers/mustache.c
+++ b/src/mame/drivers/mustache.c
@@ -230,7 +230,7 @@ static MACHINE_DRIVER_START( mustache )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, YM_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2151, YM_CLOCK)
MDRV_SOUND_CONFIG(t5182_ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c
index aee79954ebe..fb4d57d694b 100644
--- a/src/mame/drivers/mwarr.c
+++ b/src/mame/drivers/mwarr.c
@@ -471,11 +471,11 @@ static MACHINE_DRIVER_START( mwarr )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 937500 )
+ MDRV_SOUND_ADD("oki1", OKIM6295, 937500 )
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 937500 )
+ MDRV_SOUND_ADD("oki2", OKIM6295, 937500 )
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c
index d0291e16d7f..75c861b0779 100644
--- a/src/mame/drivers/mystston.c
+++ b/src/mame/drivers/mystston.c
@@ -220,10 +220,10 @@ static MACHINE_DRIVER_START( mystston )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, AY8910_CLOCK)
+ MDRV_SOUND_ADD("ay1", AY8910, AY8910_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, AY8910_CLOCK)
+ MDRV_SOUND_ADD("ay2", AY8910, AY8910_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index 7a0e35c305b..5d8b4df63ef 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -968,12 +968,12 @@ static MACHINE_DRIVER_START( mystwarr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami1", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "right", 1.0) /* stereo channels are inverted */
MDRV_SOUND_ROUTE(1, "left", 1.0)
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami2", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "right", 1.0) /* stereo channels are inverted */
MDRV_SOUND_ROUTE(1, "left", 1.0)
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index b568e3faebc..6254d55b00a 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -1313,7 +1313,7 @@ static MACHINE_DRIVER_START( namcona1 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(C140, 44100)
+ MDRV_SOUND_ADD("namco", C140, 44100)
MDRV_SOUND_CONFIG(C140_interface_typeA)
MDRV_SOUND_ROUTE(0, "right", 1.00)
MDRV_SOUND_ROUTE(1, "left", 1.00)
@@ -1400,7 +1400,7 @@ static MACHINE_DRIVER_START( namcona2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(NAMCONA, 4*8000)
+ MDRV_SOUND_ADD("namco", NAMCONA, 4*8000)
MDRV_SOUND_CONFIG(NAMCONA_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c
index 0e79708c74e..255463637c4 100644
--- a/src/mame/drivers/namcond1.c
+++ b/src/mame/drivers/namcond1.c
@@ -326,7 +326,7 @@ static MACHINE_DRIVER_START( namcond1 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(C352, 16384000)
+ MDRV_SOUND_ADD("namco", C352, 16384000)
MDRV_SOUND_CONFIG(c352_interface)
MDRV_SOUND_ROUTE(0, "right", 1.00)
MDRV_SOUND_ROUTE(1, "left", 1.00)
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index f9ff9e4f1c0..f771078c64b 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -1016,17 +1016,17 @@ static MACHINE_DRIVER_START( ns1 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579580)
+ MDRV_SOUND_ADD("ym", YM2151, 3579580)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD(NAMCO_CUS30, 49152000/2048/2)
+ MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048/2)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index eeac89bebcb..ef4a11a6dc4 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1501,7 +1501,7 @@ static MACHINE_DRIVER_START( coh700 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(C352, 14745600)
+ MDRV_SOUND_ADD("namco", C352, 14745600)
MDRV_SOUND_CONFIG(c352_interface)
MDRV_SOUND_ROUTE(0, "right", 1.00)
MDRV_SOUND_ROUTE(1, "left", 1.00)
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index 66b6a58fa75..2a6a0711d3e 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -1615,12 +1615,12 @@ static MACHINE_DRIVER_START( default )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("C140", C140, 8000000/374)
+ MDRV_SOUND_ADD("C140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
- MDRV_SOUND_ADD_TAG("2151", YM2151, 3579580)
+ MDRV_SOUND_ADD("2151", YM2151, 3579580)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
MACHINE_DRIVER_END
@@ -1689,12 +1689,12 @@ static MACHINE_DRIVER_START( gollygho )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("C140", C140, 8000000/374)
+ MDRV_SOUND_ADD("C140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
- MDRV_SOUND_ADD(YM2151, 3579580)
+ MDRV_SOUND_ADD("ym", YM2151, 3579580)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
MACHINE_DRIVER_END
@@ -1739,12 +1739,12 @@ static MACHINE_DRIVER_START( finallap )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("C140", C140, 8000000/374)
+ MDRV_SOUND_ADD("C140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
- MDRV_SOUND_ADD(YM2151, 3579580)
+ MDRV_SOUND_ADD("ym", YM2151, 3579580)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
MACHINE_DRIVER_END
@@ -1789,12 +1789,12 @@ static MACHINE_DRIVER_START( sgunner )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("C140", C140, 8000000/374)
+ MDRV_SOUND_ADD("C140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
- MDRV_SOUND_ADD(YM2151, 3579580)
+ MDRV_SOUND_ADD("ym", YM2151, 3579580)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
MACHINE_DRIVER_END
@@ -1839,12 +1839,12 @@ static MACHINE_DRIVER_START( luckywld )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("C140", C140, 8000000/374)
+ MDRV_SOUND_ADD("C140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
- MDRV_SOUND_ADD(YM2151, 3579580)
+ MDRV_SOUND_ADD("ym", YM2151, 3579580)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
MACHINE_DRIVER_END
@@ -1889,12 +1889,12 @@ static MACHINE_DRIVER_START( metlhawk )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("C140", C140, 8000000/374)
+ MDRV_SOUND_ADD("C140", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(YM2151, 3579580)
+ MDRV_SOUND_ADD("ym", YM2151, 3579580)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index e55a72b5cb7..4d1dc673b6a 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -1588,12 +1588,12 @@ static MACHINE_DRIVER_START( poly_c140_typeA )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(C140, 8000000/374)
+ MDRV_SOUND_ADD("namco", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface_typeA)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD(YM2151, 3579580)
+ MDRV_SOUND_ADD("ym", YM2151, 3579580)
MDRV_SOUND_ROUTE(0, "left", 0.30)
MDRV_SOUND_ROUTE(1, "right", 0.30)
MACHINE_DRIVER_END
@@ -1603,12 +1603,12 @@ static MACHINE_DRIVER_START( poly_c140_typeB )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(C140, 8000000/374)
+ MDRV_SOUND_ADD("namco", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface_typeB)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD(YM2151, 3579580)
+ MDRV_SOUND_ADD("ym", YM2151, 3579580)
MDRV_SOUND_ROUTE(0, "left", 0.30)
MDRV_SOUND_ROUTE(1, "right", 0.30)
MACHINE_DRIVER_END
@@ -1658,12 +1658,12 @@ static MACHINE_DRIVER_START( driveyes )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(C140, 8000000/374)
+ MDRV_SOUND_ADD("namco", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface_typeA)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD(YM2151, 3579580)
+ MDRV_SOUND_ADD("ym", YM2151, 3579580)
MDRV_SOUND_ROUTE(0, "left", 0.30)
MDRV_SOUND_ROUTE(1, "right", 0.30)
MACHINE_DRIVER_END
@@ -1716,12 +1716,12 @@ static MACHINE_DRIVER_START( winrun_c140_typeB )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(C140, 8000000/374)
+ MDRV_SOUND_ADD("namco", C140, 8000000/374)
MDRV_SOUND_CONFIG(C140_interface_typeB)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD(YM2151, 3579580)
+ MDRV_SOUND_ADD("ym", YM2151, 3579580)
MDRV_SOUND_ROUTE(0, "left", 0.30)
MDRV_SOUND_ROUTE(1, "right", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index e879a1a9eca..e69833f7fd0 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -2697,7 +2697,7 @@ static MACHINE_DRIVER_START( namcos22s )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(C352, SS22_MASTER_CLOCK/3)
+ MDRV_SOUND_ADD("namco", C352, SS22_MASTER_CLOCK/3)
MDRV_SOUND_CONFIG(c352_interface)
MDRV_SOUND_ROUTE(0, "right", 1.00)
MDRV_SOUND_ROUTE(1, "left", 1.00)
@@ -3111,7 +3111,7 @@ static MACHINE_DRIVER_START( namcos22 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(C352, SS22_MASTER_CLOCK/3)
+ MDRV_SOUND_ADD("namco", C352, SS22_MASTER_CLOCK/3)
MDRV_SOUND_CONFIG(c352_interface)
MDRV_SOUND_ROUTE(0, "right", 1.00)
MDRV_SOUND_ROUTE(1, "left", 1.00)
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index 15a16a69eca..807ae6bf1ce 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -1054,7 +1054,7 @@ static MACHINE_DRIVER_START( s23 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(C352, 14745600)
+ MDRV_SOUND_ADD("namco", C352, 14745600)
MDRV_SOUND_CONFIG(c352_interface)
MDRV_SOUND_ROUTE(0, "right", 1.00)
MDRV_SOUND_ROUTE(1, "left", 1.00)
@@ -1093,7 +1093,7 @@ static MACHINE_DRIVER_START( ss23 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(C352, 14745600)
+ MDRV_SOUND_ADD("namco", C352, 14745600)
MDRV_SOUND_CONFIG(c352_interface)
MDRV_SOUND_ROUTE(0, "right", 1.00)
MDRV_SOUND_ROUTE(1, "left", 1.00)
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index 5068eabb06f..76db5a754a1 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -1099,11 +1099,11 @@ static MACHINE_DRIVER_START( hopmappy )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579580)
+ MDRV_SOUND_ADD("ym", YM2151, 3579580)
MDRV_SOUND_ROUTE(0, "mono", 0.0)
MDRV_SOUND_ROUTE(1, "mono", 0.60) /* only right channel is connected */
- MDRV_SOUND_ADD(NAMCO_CUS30, 49152000/2048)
+ MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1144,7 +1144,7 @@ static MACHINE_DRIVER_START( genpeitd )
MDRV_CPU_PROGRAM_MAP(genpeitd_mcu_map,0)
/* sound hardware */
- MDRV_SOUND_ADD(NAMCO_63701X, 6000000)
+ MDRV_SOUND_ADD("namco", NAMCO_63701X, 6000000)
MDRV_SOUND_CONFIG(namco_63701x_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1161,7 +1161,7 @@ static MACHINE_DRIVER_START( rthunder )
MDRV_CPU_PROGRAM_MAP(rthunder_mcu_map,0)
/* sound hardware */
- MDRV_SOUND_ADD(NAMCO_63701X, 6000000)
+ MDRV_SOUND_ADD("namco", NAMCO_63701X, 6000000)
MDRV_SOUND_CONFIG(namco_63701x_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1178,7 +1178,7 @@ static MACHINE_DRIVER_START( wndrmomo )
MDRV_CPU_PROGRAM_MAP(wndrmomo_mcu_map,0)
/* sound hardware */
- MDRV_SOUND_ADD(NAMCO_63701X, 6000000)
+ MDRV_SOUND_ADD("namco", NAMCO_63701X, 6000000)
MDRV_SOUND_CONFIG(namco_63701x_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 8baac7fe158..5cb097a51fb 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -797,7 +797,7 @@ static MACHINE_DRIVER_START( naomi )
MDRV_VIDEO_UPDATE(dc)
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(AICA, 0)
+ MDRV_SOUND_ADD("aica", AICA, 0)
MDRV_SOUND_CONFIG(aica_interface)
MDRV_SOUND_ROUTE(0, "left", 2.0)
MDRV_SOUND_ROUTE(0, "right", 2.0)
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index c6f3f0d9900..7db5a5ba7e6 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -402,11 +402,11 @@ static MACHINE_DRIVER_START( naughtyb )
/* uses the TMS3615NS for sound */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(TMS36XX, 350)
+ MDRV_SOUND_ADD("tms", TMS36XX, 350)
MDRV_SOUND_CONFIG(tms3615_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("naughtyb", CUSTOM, 0)
MDRV_SOUND_CONFIG(naughtyb_custom_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.40)
MACHINE_DRIVER_END
@@ -438,11 +438,11 @@ static MACHINE_DRIVER_START( popflame )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(TMS36XX, 350)
+ MDRV_SOUND_ADD("tms", TMS36XX, 350)
MDRV_SOUND_CONFIG(tms3615_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("popflame", CUSTOM, 0)
MDRV_SOUND_CONFIG(popflame_custom_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index 42e6c03c2da..f5ee5436370 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -2834,11 +2834,11 @@ static MACHINE_DRIVER_START( NBMJDRV_4096 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("8910", AY8910, 1250000)
+ MDRV_SOUND_ADD("8910", AY8910, 1250000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -2966,11 +2966,11 @@ static MACHINE_DRIVER_START( mbmj_p16bit_LCD )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("8910", AY8910, 1250000)
+ MDRV_SOUND_ADD("8910", AY8910, 1250000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index fb9b5935299..4bcb92d524a 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -2749,10 +2749,10 @@ static MACHINE_DRIVER_START( gionbana )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("3812", YM3812, 2500000)
+ MDRV_SOUND_ADD("3812", YM3812, 2500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index 4327f084d86..ea6620360d1 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -1614,10 +1614,10 @@ static MACHINE_DRIVER_START( nbmjdrv1 ) // galkoku
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("3812", YM3812, 25000000/10)
+ MDRV_SOUND_ADD("3812", YM3812, 25000000/10)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD_TAG("dac", DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1654,13 +1654,13 @@ static MACHINE_DRIVER_START( nbmjdrv2 ) // pstadium
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 25000000/6.25)
+ MDRV_SOUND_ADD("ym", YM3812, 25000000/6.25)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 5e4ccc5f685..ecf67d50532 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -3686,13 +3686,13 @@ static MACHINE_DRIVER_START( NBMJDRV1 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index 1b5c2c44cb1..49216365c10 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -2177,19 +2177,19 @@ static MACHINE_DRIVER_START( nemesis )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 14318180/8)
+ MDRV_SOUND_ADD("ay1", AY8910, 14318180/8)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) /* verified with OST */
- MDRV_SOUND_ADD(AY8910, 14318180/8)
+ MDRV_SOUND_ADD("ay2", AY8910, 14318180/8)
MDRV_SOUND_CONFIG(ay8910_interface_2) /* fixed */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* verified with OST */
- MDRV_SOUND_ADD(K005289, 3579545/2)
+ MDRV_SOUND_ADD("konami", K005289, 3579545/2)
MDRV_SOUND_CONFIG(k005289_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) /* verified with OST */
- MDRV_SOUND_ADD(VLM5030, 3579545)
+ MDRV_SOUND_ADD("vlm", VLM5030, 3579545)
MDRV_SOUND_CONFIG(vlm5030_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) /* unused */
MACHINE_DRIVER_END
@@ -2225,15 +2225,15 @@ static MACHINE_DRIVER_START( konamigt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 14318180/8)
+ MDRV_SOUND_ADD("ay1", AY8910, 14318180/8)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
- MDRV_SOUND_ADD(AY8910, 14318180/8)
+ MDRV_SOUND_ADD("ay2", AY8910, 14318180/8)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(K005289, 3579545/2)
+ MDRV_SOUND_ADD("konami", K005289, 3579545/2)
MDRV_SOUND_CONFIG(k005289_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
@@ -2271,19 +2271,19 @@ static MACHINE_DRIVER_START( salamand )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(VLM5030, 3579545)
+ MDRV_SOUND_ADD("vlm", VLM5030, 3579545)
MDRV_SOUND_CONFIG(vlm5030_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "left", 0.10)
MDRV_SOUND_ROUTE(0, "right", 0.10)
MDRV_SOUND_ROUTE(1, "left", 0.10)
MDRV_SOUND_ROUTE(1, "right", 0.10)
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2322,14 +2322,14 @@ static MACHINE_DRIVER_START( blkpnthr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "left", 0.10)
MDRV_SOUND_ROUTE(0, "right", 0.10)
MDRV_SOUND_ROUTE(1, "left", 0.10)
MDRV_SOUND_ROUTE(1, "right", 0.10)
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2368,19 +2368,19 @@ static MACHINE_DRIVER_START( citybomb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami1", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "left", 0.30)
MDRV_SOUND_ROUTE(0, "right", 0.30)
MDRV_SOUND_ROUTE(1, "left", 0.30)
MDRV_SOUND_ROUTE(1, "right", 0.30)
- MDRV_SOUND_ADD(YM3812, 3579545)
+ MDRV_SOUND_ADD("ym", YM3812, 3579545)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(K051649, 3579545/2)
+ MDRV_SOUND_ADD("konami2", K051649, 3579545/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.38)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.38)
MACHINE_DRIVER_END
@@ -2418,19 +2418,19 @@ static MACHINE_DRIVER_START( nyanpani )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami1", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "left", 0.30)
MDRV_SOUND_ROUTE(0, "right", 0.30)
MDRV_SOUND_ROUTE(1, "left", 0.30)
MDRV_SOUND_ROUTE(1, "right", 0.30)
- MDRV_SOUND_ADD(YM3812, 3579545)
+ MDRV_SOUND_ADD("ym", YM3812, 3579545)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(K051649, 3579545/2)
+ MDRV_SOUND_ADD("konami2", K051649, 3579545/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.38)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.38)
MACHINE_DRIVER_END
@@ -2466,19 +2466,19 @@ static MACHINE_DRIVER_START( gx400 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 14318180/8)
+ MDRV_SOUND_ADD("ay1", AY8910, 14318180/8)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) /* verified with OST */
- MDRV_SOUND_ADD(AY8910, 14318180/8)
+ MDRV_SOUND_ADD("ay2", AY8910, 14318180/8)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* verified with OST */
- MDRV_SOUND_ADD(K005289, 3579545/2)
+ MDRV_SOUND_ADD("konami", K005289, 3579545/2)
MDRV_SOUND_CONFIG(k005289_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) /* verified with OST */
- MDRV_SOUND_ADD(VLM5030, 3579545)
+ MDRV_SOUND_ADD("vlm", VLM5030, 3579545)
MDRV_SOUND_CONFIG(vlm5030_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) /* unused */
MACHINE_DRIVER_END
@@ -2515,19 +2515,19 @@ static MACHINE_DRIVER_START( rf2_gx400 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 14318180/8)
+ MDRV_SOUND_ADD("ay1", AY8910, 14318180/8)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
- MDRV_SOUND_ADD(AY8910, 14318180/8)
+ MDRV_SOUND_ADD("ay2", AY8910, 14318180/8)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(K005289, 3579545/2)
+ MDRV_SOUND_ADD("konami", K005289, 3579545/2)
MDRV_SOUND_CONFIG(k005289_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(VLM5030, 3579545)
+ MDRV_SOUND_ADD("vlm", VLM5030, 3579545)
MDRV_SOUND_CONFIG(vlm5030_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -2562,19 +2562,19 @@ static MACHINE_DRIVER_START( hcrash )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(VLM5030, 3579545)
+ MDRV_SOUND_ADD("vlm", VLM5030, 3579545)
MDRV_SOUND_CONFIG(vlm5030_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "left", 0.10)
MDRV_SOUND_ROUTE(0, "right", 0.10)
MDRV_SOUND_ROUTE(1, "left", 0.10)
MDRV_SOUND_ROUTE(1, "right", 0.10)
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index dcb417ef6ba..28e7f5c0791 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -1261,7 +1261,7 @@ static MACHINE_DRIVER_START( neogeo )
/* audio hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, NEOGEO_YM2610_CLOCK)
+ MDRV_SOUND_ADD("ym", YM2610, NEOGEO_YM2610_CLOCK)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(0, "right", 0.60)
diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c
index d17360086a6..0f1253bc983 100644
--- a/src/mame/drivers/news.c
+++ b/src/mame/drivers/news.c
@@ -142,7 +142,7 @@ static MACHINE_DRIVER_START( news )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index 3d51a7724b4..4d0592c0493 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -958,20 +958,20 @@ static MACHINE_DRIVER_START( ninjakd2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("2203.1", YM2203, MAIN_CLOCK_12/8) /* verified */
+ MDRV_SOUND_ADD("2203.1", YM2203, MAIN_CLOCK_12/8) /* verified */
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.10)
MDRV_SOUND_ROUTE(1, "mono", 0.10)
MDRV_SOUND_ROUTE(2, "mono", 0.10)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("2203.2", YM2203, MAIN_CLOCK_12/8) /* verified */
+ MDRV_SOUND_ADD("2203.2", YM2203, MAIN_CLOCK_12/8) /* verified */
MDRV_SOUND_ROUTE(0, "mono", 0.10)
MDRV_SOUND_ROUTE(1, "mono", 0.10)
MDRV_SOUND_ROUTE(2, "mono", 0.10)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("PCM", SAMPLES, 0)
+ MDRV_SOUND_ADD("PCM", SAMPLES, 0)
MDRV_SOUND_CONFIG(samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index 45a9b0c2807..2e59d3e3337 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -671,7 +671,7 @@ static MACHINE_DRIVER_START( ninjaw )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -680,16 +680,16 @@ static MACHINE_DRIVER_START( ninjaw )
MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
-// MDRV_SOUND_ADD(CUSTOM, subwoofer_interface)
+// MDRV_SOUND_ADD("subwoofer", CUSTOM, subwoofer_interface)
MACHINE_DRIVER_END
@@ -745,7 +745,7 @@ static MACHINE_DRIVER_START( darius2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -754,16 +754,16 @@ static MACHINE_DRIVER_START( darius2 )
MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
-// MDRV_SOUND_ADD(CUSTOM, subwoofer_interface)
+// MDRV_SOUND_ADD("subwoofer", CUSTOM, subwoofer_interface)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c
index dce92f5097e..d7be28ee8c3 100644
--- a/src/mame/drivers/nitedrvr.c
+++ b/src/mame/drivers/nitedrvr.c
@@ -172,7 +172,7 @@ static MACHINE_DRIVER_START( nitedrvr )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(nitedrvr)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index ce29228e93f..18b55b9fe37 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -850,13 +850,13 @@ static MACHINE_DRIVER_START( niyanpai )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index 826e92f35d0..283d978ee03 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -1011,11 +1011,11 @@ static MACHINE_DRIVER_START( nmg5 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000) /* 4MHz */
+ MDRV_SOUND_ADD("ym", YM3812, 4000000) /* 4MHz */
MDRV_SOUND_CONFIG(ym3812_intf)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1000000 )
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000 )
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 39e641001b0..4990b880c42 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -3547,18 +3547,18 @@ static MACHINE_DRIVER_START( tharrier )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3594,18 +3594,18 @@ static MACHINE_DRIVER_START( manybloc )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3639,18 +3639,18 @@ static MACHINE_DRIVER_START( mustang )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3765,18 +3765,18 @@ static MACHINE_DRIVER_START( bioship )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, BIOSHIP_CRYSTAL2 / 8) /* 1.5 Mhz (verified) */
+ MDRV_SOUND_ADD("ym", YM2203, BIOSHIP_CRYSTAL2 / 8) /* 1.5 Mhz (verified) */
MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD(OKIM6295, BIOSHIP_CRYSTAL2 / 3 ) /* 4.0 Mhz, Pin 7 High (verified) */
+ MDRV_SOUND_ADD("oki1", OKIM6295, BIOSHIP_CRYSTAL2 / 3 ) /* 4.0 Mhz, Pin 7 High (verified) */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, BIOSHIP_CRYSTAL2 / 3 ) /* 4.0 Mhz, Pin 7 High (verified) */
+ MDRV_SOUND_ADD("oki2", OKIM6295, BIOSHIP_CRYSTAL2 / 3 ) /* 4.0 Mhz, Pin 7 High (verified) */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3809,18 +3809,18 @@ static MACHINE_DRIVER_START( vandyke )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD(OKIM6295, XTAL_12MHz/3) /* verified on pcb */
+ MDRV_SOUND_ADD("oki1", OKIM6295, XTAL_12MHz/3) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, XTAL_12MHz/3) /* verified on pcb */
+ MDRV_SOUND_ADD("oki2", OKIM6295, XTAL_12MHz/3) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3856,7 +3856,7 @@ static MACHINE_DRIVER_START( vandykeb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3889,18 +3889,18 @@ static MACHINE_DRIVER_START( acrobatm )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000) /* (verified on pcb) */
+ MDRV_SOUND_ADD("ym", YM2203, 1500000) /* (verified on pcb) */
MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4) /* (verified on pcb) */
+ MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4) /* (verified on pcb) */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) /* on the pcb pin7 is not connected to gnd or +5v! */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4) /* (verified on pcb) */
+ MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4) /* (verified on pcb) */
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low) /* on the pcb pin7 is not connected to gnd or +5v! */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -3968,18 +3968,18 @@ static MACHINE_DRIVER_START( tdragon )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD(OKIM6295, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("oki1", OKIM6295, XTAL_8MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("oki2", OKIM6295, XTAL_8MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -4015,7 +4015,7 @@ static MACHINE_DRIVER_START( ssmissin )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 8000000/8) /* 1 Mhz, pin 7 high */
+ MDRV_SOUND_ADD("oki", OKIM6295, 8000000/8) /* 1 Mhz, pin 7 high */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -4049,18 +4049,18 @@ static MACHINE_DRIVER_START( strahl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -4094,18 +4094,18 @@ static MACHINE_DRIVER_START( hachamf )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -4139,18 +4139,18 @@ static MACHINE_DRIVER_START( macross )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -4184,18 +4184,18 @@ static MACHINE_DRIVER_START( gunnail )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -4234,15 +4234,15 @@ static MACHINE_DRIVER_START( macross2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -4280,15 +4280,15 @@ static MACHINE_DRIVER_START( tdragon2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
MACHINE_DRIVER_END
@@ -4324,15 +4324,15 @@ static MACHINE_DRIVER_START( raphero )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -4365,11 +4365,11 @@ static MACHINE_DRIVER_START( bjtwin )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 16000000/4) /* verified on pcb */
+ MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/4) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4) /* verified on pcb */
+ MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/4) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -4878,12 +4878,12 @@ static MACHINE_DRIVER_START( stagger1 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, XTAL_4MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_4MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(afega_ym2151_intf)
MDRV_SOUND_ROUTE(0, "left", 0.30)
MDRV_SOUND_ROUTE(1, "right", 0.30)
- MDRV_SOUND_ADD(OKIM6295, XTAL_4MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_4MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.70)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.70)
@@ -4946,11 +4946,11 @@ static MACHINE_DRIVER_START( firehawk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -4987,7 +4987,7 @@ static MACHINE_DRIVER_START( twinactn )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index f9602c81c80..187e5caf86b 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -723,11 +723,11 @@ static MACHINE_DRIVER_START( nova2001 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, MAIN_CLOCK/6) // 2 MHz verified on schematics
+ MDRV_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/6) // 2 MHz verified on schematics
MDRV_SOUND_CONFIG(nova2001_ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, MAIN_CLOCK/6)
+ MDRV_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/6)
MDRV_SOUND_CONFIG(nova2001_ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -764,11 +764,11 @@ static MACHINE_DRIVER_START( ninjakun )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, MAIN_CLOCK/4) // 3 MHz
+ MDRV_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/4) // 3 MHz
MDRV_SOUND_CONFIG(nova2001_ay8910_interface_2) // note swapped order wrt nova2001
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(AY8910, MAIN_CLOCK/4) // 3 MHz
+ MDRV_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/4) // 3 MHz
MDRV_SOUND_CONFIG(nova2001_ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -798,11 +798,11 @@ static MACHINE_DRIVER_START( pkunwar )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, MAIN_CLOCK/8) // 1.5MHz (correct?)
+ MDRV_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/8) // 1.5MHz (correct?)
MDRV_SOUND_CONFIG(pkunwar_ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, MAIN_CLOCK/8)
+ MDRV_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/8)
MDRV_SOUND_CONFIG(pkunwar_ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -837,11 +837,11 @@ static MACHINE_DRIVER_START( raiders5 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, MAIN_CLOCK/8) // 1.5MHz
+ MDRV_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/8) // 1.5MHz
MDRV_SOUND_CONFIG(pkunwar_ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, MAIN_CLOCK/8)
+ MDRV_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/8)
MDRV_SOUND_CONFIG(pkunwar_ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c
index 321b4e380b5..4acab99bc94 100644
--- a/src/mame/drivers/nss.c
+++ b/src/mame/drivers/nss.c
@@ -435,7 +435,7 @@ static MACHINE_DRIVER_START( snes )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("snes", CUSTOM, 0)
MDRV_SOUND_CONFIG(snes_sound_interface)
MDRV_SOUND_ROUTE(0, "left", 1.00)
MDRV_SOUND_ROUTE(1, "right", 1.00)
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index 87bef42403b..a3248caa330 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -1124,7 +1124,7 @@ static MACHINE_DRIVER_START( nwktr )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(RF5C400, 64000000/4)
+ MDRV_SOUND_ADD("rf", RF5C400, 64000000/4)
MDRV_SOUND_CONFIG(rf5c400_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index e66ab197201..8c90571a1c1 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -807,15 +807,15 @@ static MACHINE_DRIVER_START( nycaptor )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay1", AY8910, 8000000/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay2", AY8910, 8000000/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(MSM5232, 2000000)
+ MDRV_SOUND_ADD("msm", MSM5232, 2000000)
MDRV_SOUND_CONFIG(msm5232_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
@@ -868,15 +868,15 @@ static MACHINE_DRIVER_START( cyclshtg )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay1", AY8910, 8000000/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay2", AY8910, 8000000/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(MSM5232, 2000000)
+ MDRV_SOUND_ADD("msm", MSM5232, 2000000)
MDRV_SOUND_CONFIG(msm5232_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
@@ -927,15 +927,15 @@ static MACHINE_DRIVER_START( bronx )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay1", AY8910, 8000000/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay2", AY8910, 8000000/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(MSM5232, 2000000)
+ MDRV_SOUND_ADD("msm", MSM5232, 2000000)
MDRV_SOUND_CONFIG(msm5232_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index 9b52315b3ab..8da9c738a7b 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -692,18 +692,18 @@ static MACHINE_DRIVER_START( nyny )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, AUDIO_CPU_1_CLOCK)
+ MDRV_SOUND_ADD("ay1", AY8910, AUDIO_CPU_1_CLOCK)
MDRV_SOUND_CONFIG(ay8910_37_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, AUDIO_CPU_1_CLOCK)
+ MDRV_SOUND_ADD("ay2", AY8910, AUDIO_CPU_1_CLOCK)
MDRV_SOUND_CONFIG(ay8910_64_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, AUDIO_CPU_2_CLOCK)
+ MDRV_SOUND_ADD("ay3", AY8910, AUDIO_CPU_2_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.03)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index 7eb950df86f..10b1395414d 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -354,7 +354,7 @@ static MACHINE_DRIVER_START( ohmygod )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 14000000/8)
+ MDRV_SOUND_ADD("oki", OKIM6295, 14000000/8)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index 1629478dcc0..c5fc5aec6f1 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -900,11 +900,11 @@ static MACHINE_DRIVER_START( ojankohs )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/6)
+ MDRV_SOUND_ADD("ay", AY8910, 12000000/6)
MDRV_SOUND_CONFIG(ojankohs_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -938,11 +938,11 @@ static MACHINE_DRIVER_START( ojankoy )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay", AY8910, 12000000/8)
MDRV_SOUND_CONFIG(ojankoy_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -975,11 +975,11 @@ static MACHINE_DRIVER_START( ccasino )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay", AY8910, 12000000/8)
MDRV_SOUND_CONFIG(ojankoy_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1011,11 +1011,11 @@ static MACHINE_DRIVER_START( ojankoc )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay", AY8910, 8000000/4)
MDRV_SOUND_CONFIG(ojankoc_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(MSM5205, 8000000/22)
+ MDRV_SOUND_ADD("msm", MSM5205, 8000000/22)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index 8faeb2a1f91..b0fcd7b064a 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -393,7 +393,7 @@ static MACHINE_DRIVER_START( olibochu )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index e5e73c10d9b..80c3b8e5eed 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -510,10 +510,10 @@ static MACHINE_DRIVER_START( omegrace )
/* XTAL101 Crystal @ 12mhz */
/* through 74LS92, Pin 8 = divide by 12 */
- MDRV_SOUND_ADD(AY8912, 12000000/12)
+ MDRV_SOUND_ADD("ay1", AY8912, 12000000/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8912, 12000000/12)
+ MDRV_SOUND_ADD("ay2", AY8912, 12000000/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index 3d9df1d6371..5f4360b8560 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -393,11 +393,11 @@ static MACHINE_DRIVER_START( oneshot )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 3500000)
+ MDRV_SOUND_ADD("ym", YM3812, 3500000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index f77774b3338..abe6a259d18 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -302,11 +302,11 @@ static MACHINE_DRIVER_START( onetwo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1056000*2)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000*2)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index 18fce3d1373..0e1fe9b62b7 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -587,17 +587,17 @@ static MACHINE_DRIVER_START( opwolf )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm1", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm2", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
@@ -639,17 +639,17 @@ static MACHINE_DRIVER_START( opwolfb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm1", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm2", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c
index 78854045703..ca2c8901009 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -313,7 +313,7 @@ static MACHINE_DRIVER_START( orbit )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(orbit)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c
index cb72551f48e..aa54ab8f24d 100644
--- a/src/mame/drivers/othldrby.c
+++ b/src/mame/drivers/othldrby.c
@@ -262,7 +262,7 @@ static MACHINE_DRIVER_START( othldrby )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1584000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1584000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index 76ace1f6641..898c542df5d 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -735,7 +735,7 @@ static MACHINE_DRIVER_START( othunder )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "2610.0l", 0.25)
MDRV_SOUND_ROUTE(0, "2610.0r", 0.25)
@@ -744,17 +744,17 @@ static MACHINE_DRIVER_START( othunder )
MDRV_SOUND_ROUTE(2, "2610.2l", 1.0)
MDRV_SOUND_ROUTE(2, "2610.2r", 1.0)
- MDRV_SOUND_ADD_TAG("2610.0l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.0l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.0r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.0r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index 1f7a1d511a1..86fead70513 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -436,16 +436,16 @@ static MACHINE_DRIVER_START( overdriv )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K053260, 3579545)
+ MDRV_SOUND_ADD("konami1", K053260, 3579545)
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(0, "left", 0.70)
MDRV_SOUND_ROUTE(1, "right", 0.70)
- MDRV_SOUND_ADD(K053260, 3579545)
+ MDRV_SOUND_ADD("konami2", K053260, 3579545)
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(0, "left", 0.70)
MDRV_SOUND_ROUTE(1, "right", 0.70)
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index 23d008fdbcd..d33f17ae517 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -443,7 +443,7 @@ static MACHINE_DRIVER_START( pacland )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO_CUS30, 49152000/2/1024)
+ MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2/1024)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index 04213aaea02..8489bd8f976 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -3087,7 +3087,7 @@ static MACHINE_DRIVER_START( pacman )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("namco", NAMCO, MASTER_CLOCK/6/32)
+ MDRV_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3206,7 +3206,7 @@ static MACHINE_DRIVER_START( vanvan )
/* sound hardware */
MDRV_SOUND_REPLACE("namco", SN76496, 1789750)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD(SN76496, 1789750)
+ MDRV_SOUND_ADD("sn", SN76496, 1789750)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index f2df4cba78f..773637e138a 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -419,11 +419,11 @@ static MACHINE_DRIVER_START( pandoras )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 14318000/8)
+ MDRV_SOUND_ADD("ay", AY8910, 14318000/8)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c
index 3aaf21549f9..93711c824e4 100644
--- a/src/mame/drivers/panicr.c
+++ b/src/mame/drivers/panicr.c
@@ -381,7 +381,7 @@ static MACHINE_DRIVER_START( panicr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 14318180/4) /* 3.579545 MHz */
+ MDRV_SOUND_ADD("ym", YM2151, 14318180/4) /* 3.579545 MHz */
MDRV_SOUND_CONFIG(t5182_ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index 2146777ffc4..d7d6c56211f 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -559,11 +559,11 @@ static MACHINE_DRIVER_START( paradise )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, XTAL_12MHz/12) /* verified on pcb */
+ MDRV_SOUND_ADD("oki1", OKIM6295, XTAL_12MHz/12) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("oki2", OKIM6295, XTAL_12MHz/12) /* verified on pcb */
+ MDRV_SOUND_ADD("oki2", OKIM6295, XTAL_12MHz/12) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c
index 5e5d24c1d49..d32520795a7 100644
--- a/src/mame/drivers/paranoia.c
+++ b/src/mame/drivers/paranoia.c
@@ -159,7 +159,7 @@ static MACHINE_DRIVER_START( paranoia )
MDRV_VIDEO_UPDATE( pce )
MDRV_SPEAKER_STANDARD_STEREO("left","right")
- MDRV_SOUND_ADD(C6280, PCE_MAIN_CLOCK/6)
+ MDRV_SOUND_ADD("huc", C6280, PCE_MAIN_CLOCK/6)
MDRV_SOUND_ROUTE(0, "left", 1.00)
MDRV_SOUND_ROUTE(1, "right", 1.00)
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index ea8ce5d9f56..7ce1efcb110 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -326,11 +326,11 @@ static MACHINE_DRIVER_START( parodius )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K053260, 3579545)
+ MDRV_SOUND_ADD("konami", K053260, 3579545)
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(0, "left", 0.70)
MDRV_SOUND_ROUTE(1, "right", 0.70)
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index 9c7f111c586..e4d4d0e4983 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -410,11 +410,11 @@ static MACHINE_DRIVER_START( pasha2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index ef9173b160d..23045459ba6 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -298,10 +298,10 @@ static MACHINE_DRIVER_START( pass )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 14318180/4)
+ MDRV_SOUND_ADD("ym", YM2203, 14318180/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(OKIM6295, 792000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 792000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c
index fa0de9a25da..8bb64422cb3 100644
--- a/src/mame/drivers/pastelg.c
+++ b/src/mame/drivers/pastelg.c
@@ -221,11 +221,11 @@ static MACHINE_DRIVER_START( pastelg )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1250000)
+ MDRV_SOUND_ADD("ay", AY8910, 1250000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index b178786e77d..5cbf6186c46 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -293,13 +293,13 @@ static MACHINE_DRIVER_START( pbaction )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay3", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index 825aa169319..b62b34c5662 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -264,13 +264,13 @@ static MACHINE_DRIVER_START( pcktgal )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c
index 1bbecf76193..b1d792ce815 100644
--- a/src/mame/drivers/pengo.c
+++ b/src/mame/drivers/pengo.c
@@ -365,7 +365,7 @@ static MACHINE_DRIVER_START( pengo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO, MASTER_CLOCK/6/32)
+ MDRV_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index cc6ff3fbc22..f6f1c0ac4c2 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -1028,7 +1028,7 @@ static MACHINE_DRIVER_START( peplus )
MDRV_VIDEO_UPDATE(peplus)
// sound hardware
- MDRV_SOUND_ADD(AY8912, 20000000/12)
+ MDRV_SOUND_ADD("ay", AY8912, 20000000/12)
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index a727ad1712d..c9cc1f439b6 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -1546,7 +1546,7 @@ static MACHINE_DRIVER_START( pgm )
/* audio CPU */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(ICS2115, 0)
+ MDRV_SOUND_ADD("ics", ICS2115, 0)
MDRV_SOUND_CONFIG(pgm_ics2115_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index bc03d878108..8a3080e2629 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -462,15 +462,15 @@ static MACHINE_DRIVER_START( phoenix )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("tms", TMS36XX, 372)
+ MDRV_SOUND_ADD("tms", TMS36XX, 372)
MDRV_SOUND_CONFIG(phoenix_tms36xx_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD_TAG("cust", CUSTOM, 0)
+ MDRV_SOUND_ADD("cust", CUSTOM, 0)
MDRV_SOUND_CONFIG(phoenix_custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 120000)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 120000)
MDRV_SOUND_CONFIG_DISCRETE(phoenix)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
MACHINE_DRIVER_END
@@ -531,7 +531,7 @@ static MACHINE_DRIVER_START( survival )
MDRV_SPEAKER_STANDARD_MONO("mono")
/* FIXME: check clock */
- MDRV_SOUND_ADD(AY8910, 11000000/4)
+ MDRV_SOUND_ADD("ay", AY8910, 11000000/4)
MDRV_SOUND_CONFIG(survival_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c
index 33048415f6b..9f1b91ea7ee 100644
--- a/src/mame/drivers/pingpong.c
+++ b/src/mame/drivers/pingpong.c
@@ -477,7 +477,7 @@ static MACHINE_DRIVER_START( pingpong )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 18432000/8)
+ MDRV_SOUND_ADD("sn", SN76496, 18432000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index 4d134e99182..51d9a7c94d3 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -589,7 +589,7 @@ static MACHINE_DRIVER_START( pipedrm )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -629,7 +629,7 @@ static MACHINE_DRIVER_START( hatris )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2608, 8000000)
+ MDRV_SOUND_ADD("ym", YM2608, 8000000)
MDRV_SOUND_CONFIG(ym2608_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c
index 7730791a8d9..123009df77c 100644
--- a/src/mame/drivers/pipeline.c
+++ b/src/mame/drivers/pipeline.c
@@ -413,7 +413,7 @@ static MACHINE_DRIVER_START( pipeline )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 7372800/4)
+ MDRV_SOUND_ADD("ym", YM2203, 7372800/4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index ab3f2304658..7cadc20c6de 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -308,7 +308,7 @@ static MACHINE_DRIVER_START( pirates )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1333333)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1333333)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index 9f7bf6ef17e..45871f80bcd 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -293,11 +293,11 @@ static MACHINE_DRIVER_START( pitnrun )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MDRV_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index 228f7c20d23..6381d9883a8 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -311,7 +311,7 @@ static MACHINE_DRIVER_START( pkscramble )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 12000000/4)
+ MDRV_SOUND_ADD("ym", YM2203, 12000000/4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c
index ee4a0d76501..4cf496c28a0 100644
--- a/src/mame/drivers/pktgaldx.c
+++ b/src/mame/drivers/pktgaldx.c
@@ -363,12 +363,12 @@ static MACHINE_DRIVER_START( pktgaldx )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index bdbe2b32074..a7e7ce09354 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -718,11 +718,11 @@ static MACHINE_DRIVER_START( playch10 )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NES, N2A03_DEFAULTCLOCK)
+ MDRV_SOUND_ADD("nes", NES, N2A03_DEFAULTCLOCK)
MDRV_SOUND_CONFIG(nes_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index 2473dd18045..fa708374518 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -990,7 +990,7 @@ static MACHINE_DRIVER_START( bigtwin )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1026,7 +1026,7 @@ static MACHINE_DRIVER_START( wbeachvl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1059,7 +1059,7 @@ static MACHINE_DRIVER_START( excelsr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1094,7 +1094,7 @@ static MACHINE_DRIVER_START( hotmind )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, XTAL_1MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_1MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1127,7 +1127,7 @@ static MACHINE_DRIVER_START( hrdtimes )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, XTAL_1MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_1MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 71de74228ff..8df53fdb412 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -717,12 +717,12 @@ static MACHINE_DRIVER_START( plygonet )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami1", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami2", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c
index 26457e44569..e82005c8484 100644
--- a/src/mame/drivers/pokechmp.c
+++ b/src/mame/drivers/pokechmp.c
@@ -271,13 +271,13 @@ static MACHINE_DRIVER_START( pokechmp )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 4000000/4) // ?? unknown frequency
+ MDRV_SOUND_ADD("oki", OKIM6295, 4000000/4) // ?? unknown frequency
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* sound fx */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 1727b8d5568..15044a09f47 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -883,24 +883,24 @@ static MACHINE_DRIVER_START( polepos )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(NAMCO, 24576000/512)
+ MDRV_SOUND_ADD("namco1", NAMCO, 24576000/512)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
- MDRV_SOUND_ADD(NAMCO_52XX, 24576000/16) /* 1.536 MHz */
+ MDRV_SOUND_ADD("namco2", NAMCO_52XX, 24576000/16) /* 1.536 MHz */
MDRV_SOUND_CONFIG(namco_52xx_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80)
/* discrete circuit on the 54XX outputs */
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(polepos)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90)
/* engine sound */
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("polepos", CUSTOM, 0)
MDRV_SOUND_CONFIG(custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90 * 0.77)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90 * 0.77)
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index f04cf270aab..22264ddac1c 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -487,7 +487,7 @@ static MACHINE_DRIVER_START( policetr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(BSMT2000, MASTER_CLOCK/2)
+ MDRV_SOUND_ADD("bsmt", BSMT2000, MASTER_CLOCK/2)
MDRV_SOUND_CONFIG(bsmt2000_interface_region_1)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c
index 6f95fa6d742..3ee845b37af 100644
--- a/src/mame/drivers/polyplay.c
+++ b/src/mame/drivers/polyplay.c
@@ -313,7 +313,7 @@ static MACHINE_DRIVER_START( polyplay )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(polyplay_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index 57ea4e8dae2..776e87057a3 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -234,7 +234,7 @@ static MACHINE_DRIVER_START( poolshrk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(poolshrk)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c
index 11d3fcc2f2d..52a63335626 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -506,7 +506,7 @@ static MACHINE_DRIVER_START( skyskipr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/4)
+ MDRV_SOUND_ADD("ay", AY8910, 8000000/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index 345ab239406..e4a0c177324 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -339,10 +339,10 @@ static MACHINE_DRIVER_START( popper )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 18432000/12)
+ MDRV_SOUND_ADD("ay1", AY8910, 18432000/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 18432000/12)
+ MDRV_SOUND_ADD("ay2", AY8910, 18432000/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c
index d468bb1ce6b..aebbed5888a 100644
--- a/src/mame/drivers/portrait.c
+++ b/src/mame/drivers/portrait.c
@@ -276,7 +276,7 @@ static MACHINE_DRIVER_START( portrait )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(TMS5200, 640000)
+ MDRV_SOUND_ADD("tms", TMS5200, 640000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 79989dc154a..5aaa9f2fd33 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -432,7 +432,7 @@ static MACHINE_DRIVER_START( powerbal )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -462,7 +462,7 @@ static MACHINE_DRIVER_START( magicstk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index 8db29d9dcca..272b0ec3d68 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -378,15 +378,15 @@ static MACHINE_DRIVER_START( powerins )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("oki1", OKIM6295, 4000000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 4000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("oki2", OKIM6295, 4000000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 4000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("ym2203", YM2203, 12000000 / 8)
+ MDRV_SOUND_ADD("ym2203", YM2203, 12000000 / 8)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c
index 17bdbb96144..4dbd169a8e3 100644
--- a/src/mame/drivers/ppmast93.c
+++ b/src/mame/drivers/ppmast93.c
@@ -372,10 +372,10 @@ static MACHINE_DRIVER_START( ppmast93 )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 5000000/2)
+ MDRV_SOUND_ADD("ym", YM2413, 5000000/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index f5447bf6f59..a16a52454ba 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -259,11 +259,11 @@ static MACHINE_DRIVER_START( prehisle )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, XTAL_4MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM3812, XTAL_4MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index 133d21dcdfe..2d9aa905231 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -216,10 +216,10 @@ static MACHINE_DRIVER_START( progolf )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 3c13c118860..ea5680a9aa9 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -1591,7 +1591,7 @@ static MACHINE_DRIVER_START( sngkace )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(sngkace_ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 1.2)
MDRV_SOUND_ROUTE(0, "right", 1.2)
@@ -1645,7 +1645,7 @@ static MACHINE_DRIVER_START( gunbird )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(gunbird_ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 1.2)
MDRV_SOUND_ROUTE(0, "right", 1.2)
@@ -1709,7 +1709,7 @@ static MACHINE_DRIVER_START( s1945 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMF278B, YMF278B_STD_CLOCK)
+ MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
MDRV_SOUND_CONFIG(ymf278b_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index 3c53ce606de..56ac1b6a42c 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -520,7 +520,7 @@ static MACHINE_DRIVER_START( ps4big )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMF278B, MASTER_CLOCK/2)
+ MDRV_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2)
MDRV_SOUND_CONFIG(ymf278b_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index a65af3918c1..5e36c4810f1 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -621,7 +621,7 @@ static MACHINE_DRIVER_START( psikyo3v1 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMF278B, MASTER_CLOCK/2)
+ MDRV_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2)
MDRV_SOUND_CONFIG(ymf278b_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index 8a5e851ddac..d182121e199 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -583,14 +583,14 @@ static MACHINE_DRIVER_START( psychic5 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 6000000/4)
+ MDRV_SOUND_ADD("ym1", YM2203, 6000000/4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(YM2203, 6000000/4)
+ MDRV_SOUND_ADD("ym2", YM2203, 6000000/4)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index 4bdb3d5c795..4e2466a2753 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -474,10 +474,10 @@ static MACHINE_DRIVER_START( pturn )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c
index 679d2af156c..1e950991014 100644
--- a/src/mame/drivers/puckpkmn.c
+++ b/src/mame/drivers/puckpkmn.c
@@ -179,16 +179,16 @@ static MACHINE_DRIVER_START( puckpkmn )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3438, MASTER_CLOCK/7)
+ MDRV_SOUND_ADD("ym", YM3438, MASTER_CLOCK/7)
MDRV_SOUND_CONFIG(ym3438_intf)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD(SN76496, MASTER_CLOCK/15)
+ MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/15)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* sound hardware */
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c
index 8160157f3dc..233cf019b59 100644
--- a/src/mame/drivers/punchout.c
+++ b/src/mame/drivers/punchout.c
@@ -737,11 +737,11 @@ static MACHINE_DRIVER_START( punchout )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NES, N2A03_DEFAULTCLOCK)
+ MDRV_SOUND_ADD("nes", NES, N2A03_DEFAULTCLOCK)
MDRV_SOUND_CONFIG(nes_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(VLM5030, 3580000)
+ MDRV_SOUND_ADD("vlm", VLM5030, 3580000)
MDRV_SOUND_CONFIG(vlm5030_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index 977fc2da0a3..92a8bad865c 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -483,11 +483,11 @@ static MACHINE_DRIVER_START( pushman )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 2000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 2000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(YM2203, 2000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
@@ -524,11 +524,11 @@ static MACHINE_DRIVER_START( bballs )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 2000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 2000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(YM2203, 2000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index d8e4a984a13..9a69a155115 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -682,7 +682,7 @@ static MACHINE_DRIVER_START( qdrmfgp )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K054539, 18432000/384)
+ MDRV_SOUND_ADD("konami", K054539, 18432000/384)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -717,7 +717,7 @@ static MACHINE_DRIVER_START( qdrmfgp2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K054539, 18432000/384)
+ MDRV_SOUND_ADD("konami", K054539, 18432000/384)
MDRV_SOUND_CONFIG(gp2_k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c
index e48fc8d6712..43333e899e8 100644
--- a/src/mame/drivers/quantum.c
+++ b/src/mame/drivers/quantum.c
@@ -255,11 +255,11 @@ static MACHINE_DRIVER_START( quantum )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, 600000)
+ MDRV_SOUND_ADD("pokey1", POKEY, 600000)
MDRV_SOUND_CONFIG(pokey_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(POKEY, 600000)
+ MDRV_SOUND_ADD("pokey2", POKEY, 600000)
MDRV_SOUND_CONFIG(pokey_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c
index 48457e41c63..4dabbb57257 100644
--- a/src/mame/drivers/quasar.c
+++ b/src/mame/drivers/quasar.c
@@ -374,7 +374,7 @@ static MACHINE_DRIVER_START( quasar )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c
index c0bc6220e78..5fb8b858f39 100644
--- a/src/mame/drivers/quizdna.c
+++ b/src/mame/drivers/quizdna.c
@@ -482,14 +482,14 @@ static MACHINE_DRIVER_START( quizdna )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, MCLK/4)
+ MDRV_SOUND_ADD("ym", YM2203, MCLK/4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.10)
MDRV_SOUND_ROUTE(1, "mono", 0.10)
MDRV_SOUND_ROUTE(2, "mono", 0.10)
MDRV_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_SOUND_ADD(OKIM6295, (MCLK/1024)*132)
+ MDRV_SOUND_ADD("oki", OKIM6295, (MCLK/1024)*132)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c
index ee1c309c037..b6857ab237b 100644
--- a/src/mame/drivers/quizo.c
+++ b/src/mame/drivers/quizo.c
@@ -207,7 +207,7 @@ static MACHINE_DRIVER_START( quizo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL2/16 )
+ MDRV_SOUND_ADD("ay", AY8910, XTAL2/16 )
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c
index 97644db3690..a7956ef78ec 100644
--- a/src/mame/drivers/quizpani.c
+++ b/src/mame/drivers/quizpani.c
@@ -270,7 +270,7 @@ static MACHINE_DRIVER_START( quizpani )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
+ MDRV_SOUND_ADD("oki", OKIM6295, 16000000/4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index 0bf37ffa5fa..9724f416470 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -560,11 +560,11 @@ static MACHINE_DRIVER_START( r2dtank )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, (4000000 / 4))
+ MDRV_SOUND_ADD("ay1", AY8910, (4000000 / 4))
MDRV_SOUND_CONFIG(ay8910_1_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, (4000000 / 4))
+ MDRV_SOUND_ADD("ay2", AY8910, (4000000 / 4))
MDRV_SOUND_CONFIG(ay8910_2_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index b48599b7436..794d180cc2f 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -2149,7 +2149,7 @@ static MACHINE_DRIVER_START( rdx_v33 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index 3d6245680a3..d52ef4a900d 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -635,7 +635,7 @@ static MACHINE_DRIVER_START( rainbow )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_16MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
@@ -672,10 +672,10 @@ static MACHINE_DRIVER_START( jumping )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_18_432MHz/6) /* not verified */
+ MDRV_SOUND_ADD("ym1", YM2203, XTAL_18_432MHz/6) /* not verified */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(YM2203, XTAL_18_432MHz/6) /* not verified */
+ MDRV_SOUND_ADD("ym2", YM2203, XTAL_18_432MHz/6) /* not verified */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index 219e041f4d6..a910095d86d 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -864,11 +864,11 @@ static MACHINE_DRIVER_START( rallyx )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO, 18432000/6/32)
+ MDRV_SOUND_ADD("namco", NAMCO, 18432000/6/32)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c
index 3edebcd4666..5667451693c 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -407,11 +407,11 @@ static MACHINE_DRIVER_START( rampart )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, MASTER_CLOCK/4/3)
+ MDRV_SOUND_ADD("oki", OKIM6295, MASTER_CLOCK/4/3)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(YM2413, MASTER_CLOCK/4)
+ MDRV_SOUND_ADD("ym", YM2413, MASTER_CLOCK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 86446eda492..779c5be4d5e 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -404,12 +404,12 @@ static MACHINE_DRIVER_START( rastan )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_16MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD(MSM5205, XTAL_384kHz) /* verified on pcb */
+ MDRV_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index 80883fe9c1b..f3fb92a7c92 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -522,7 +522,7 @@ static MACHINE_DRIVER_START( rbmk )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1122000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1122000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47)
diff --git a/src/mame/drivers/rcasino.c b/src/mame/drivers/rcasino.c
index c0a19e3b8fc..013ee9332aa 100644
--- a/src/mame/drivers/rcasino.c
+++ b/src/mame/drivers/rcasino.c
@@ -319,7 +319,7 @@ static MACHINE_DRIVER_START( rcasino )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 18432000/12)
+ MDRV_SOUND_ADD("ay", AY8910, 18432000/12)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index 51172d0a7b4..2af43d177c0 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -704,12 +704,12 @@ static MACHINE_DRIVER_START( realbrk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 33868800 / 2)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 33868800 / 2)
MDRV_SOUND_CONFIG(realbrk_ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD(YM2413, 3579000)
+ MDRV_SOUND_ADD("ym", YM2413, 3579000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index 6b62642e720..c363c1632c0 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -365,11 +365,11 @@ static MACHINE_DRIVER_START( relief )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, ATARI_CLOCK_14MHz/4/3)
+ MDRV_SOUND_ADD("oki", OKIM6295, ATARI_CLOCK_14MHz/4/3)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(YM2413, ATARI_CLOCK_14MHz/4)
+ MDRV_SOUND_ADD("ym", YM2413, ATARI_CLOCK_14MHz/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index b0fe0541363..ef73fc7d62d 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -819,11 +819,11 @@ static MACHINE_DRIVER_START( renegade )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 12000000/4)
+ MDRV_SOUND_ADD("ym", YM3526, 12000000/4)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(CUSTOM, 8000)
+ MDRV_SOUND_ADD("adpcm", CUSTOM, 8000)
MDRV_SOUND_CONFIG(adpcm_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index d2d46576978..badd6fa3a48 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -373,10 +373,10 @@ static MACHINE_DRIVER_START( retofinv )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 18432000/6)
+ MDRV_SOUND_ADD("sn1", SN76496, 18432000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(SN76496, 18432000/6)
+ MDRV_SOUND_ADD("sn2", SN76496, 18432000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index 98b1649a58e..186a9f1569b 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -472,11 +472,11 @@ static MACHINE_DRIVER_START( rmhaihai )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 20000000/16)
+ MDRV_SOUND_ADD("ay", AY8910, 20000000/16)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(MSM5205, 500000)
+ MDRV_SOUND_ADD("msm", MSM5205, 500000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rockola.c b/src/mame/drivers/rockola.c
index 51e92019479..9f994c41b4e 100644
--- a/src/mame/drivers/rockola.c
+++ b/src/mame/drivers/rockola.c
@@ -1104,23 +1104,23 @@ static MACHINE_DRIVER_START( sasuke )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("sasuke", CUSTOM, 0)
MDRV_SOUND_CONFIG(custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("samples", SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(sasuke_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD_TAG("SN76477.1", SN76477, 0)
+ MDRV_SOUND_ADD("SN76477.1", SN76477, 0)
MDRV_SOUND_CONFIG(sasuke_sn76477_intf_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("SN76477.2", SN76477, 0)
+ MDRV_SOUND_ADD("SN76477.2", SN76477, 0)
MDRV_SOUND_CONFIG(sasuke_sn76477_intf_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("SN76477.3", SN76477, 0)
+ MDRV_SOUND_ADD("SN76477.3", SN76477, 0)
MDRV_SOUND_CONFIG(sasuke_sn76477_intf_3)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1179,19 +1179,19 @@ static MACHINE_DRIVER_START( vanguard )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("vanguard", CUSTOM, 0)
MDRV_SOUND_CONFIG(custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("samples", SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(vanguard_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD_TAG("SN76477.1", SN76477, 0)
+ MDRV_SOUND_ADD("SN76477.1", SN76477, 0)
MDRV_SOUND_CONFIG(vanguard_sn76477_intf_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("SN76477.2", SN76477, 0)
+ MDRV_SOUND_ADD("SN76477.2", SN76477, 0)
MDRV_SOUND_CONFIG(vanguard_sn76477_intf_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c
index 762fb73352c..dabfb972a42 100644
--- a/src/mame/drivers/rockrage.c
+++ b/src/mame/drivers/rockrage.c
@@ -318,11 +318,11 @@ static MACHINE_DRIVER_START( rockrage )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD(VLM5030, 3579545)
+ MDRV_SOUND_ADD("vlm", VLM5030, 3579545)
MDRV_SOUND_CONFIG(vlm5030_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index f2171887054..0fa467c518e 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -840,17 +840,17 @@ static MACHINE_DRIVER_START( rohga )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.78)
MDRV_SOUND_ROUTE(1, "right", 0.78)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
@@ -885,17 +885,17 @@ static MACHINE_DRIVER_START( wizdfire )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
@@ -930,17 +930,17 @@ static MACHINE_DRIVER_START( nitrobal )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
@@ -975,17 +975,17 @@ static MACHINE_DRIVER_START( schmeisr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index e393fc151b5..79a7101631b 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -273,10 +273,10 @@ static MACHINE_DRIVER_START( rollerg )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 3579545)
+ MDRV_SOUND_ADD("ym", YM3812, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(K053260, 3579545)
+ MDRV_SOUND_ADD("konami", K053260, 3579545)
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c
index 5e95214f48f..ba684315252 100644
--- a/src/mame/drivers/rollrace.c
+++ b/src/mame/drivers/rollrace.c
@@ -263,13 +263,13 @@ static MACHINE_DRIVER_START( rollrace )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(AY8910,XTAL_24MHz/16) /* verified on pcb */
+ MDRV_SOUND_ADD("ay1", AY8910,XTAL_24MHz/16) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10)
- MDRV_SOUND_ADD(AY8910,XTAL_24MHz/16) /* verified on pcb */
+ MDRV_SOUND_ADD("ay2", AY8910,XTAL_24MHz/16) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10)
- MDRV_SOUND_ADD(AY8910,XTAL_24MHz/16) /* verified on pcb */
+ MDRV_SOUND_ADD("ay3", AY8910,XTAL_24MHz/16) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c
index a54bf60f831..6ac9d33f02a 100644
--- a/src/mame/drivers/route16.c
+++ b/src/mame/drivers/route16.c
@@ -629,7 +629,7 @@ static MACHINE_DRIVER_START( route16 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("ay8910", AY8910, 10000000/8)
+ MDRV_SOUND_ADD("ay8910", AY8910, 10000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -661,11 +661,11 @@ static MACHINE_DRIVER_START( stratvox )
MDRV_SOUND_CONFIG(stratvox_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn", SN76477, 0)
MDRV_SOUND_CONFIG(sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index f728e22ff94..dd8436d6074 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -2238,7 +2238,7 @@ static MACHINE_DRIVER_START( royalmah )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 18432000/12)
+ MDRV_SOUND_ADD("ay", AY8910, 18432000/12)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index 47e25cb7aa7..53e549afc83 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -528,12 +528,12 @@ static MACHINE_DRIVER_START( rpunch )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, MASTER_CLOCK/4)
+ MDRV_SOUND_ADD("ym", YM2151, MASTER_CLOCK/4)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c
index 8b8b8699333..77ac04289b9 100644
--- a/src/mame/drivers/runaway.c
+++ b/src/mame/drivers/runaway.c
@@ -374,11 +374,11 @@ static MACHINE_DRIVER_START( runaway )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, 12096000 / 8)
+ MDRV_SOUND_ADD("pokey1", POKEY, 12096000 / 8)
MDRV_SOUND_CONFIG(pokey_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(POKEY, 12096000 / 8)
+ MDRV_SOUND_ADD("pokey2", POKEY, 12096000 / 8)
MDRV_SOUND_CONFIG(pokey_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index 99987f35152..599635d1ef3 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -362,12 +362,12 @@ static MACHINE_DRIVER_START( rng )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami1", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami2", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index 907bdb39528..c823190029a 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -466,12 +466,12 @@ static MACHINE_DRIVER_START( sandscrp )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 12000000/6)
+ MDRV_SOUND_ADD("oki", OKIM6295, 12000000/6)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.25)
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_intf_sandscrp)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.25)
diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c
index b608963e076..85bcdb48976 100644
--- a/src/mame/drivers/sangho.c
+++ b/src/mame/drivers/sangho.c
@@ -258,7 +258,7 @@ static MACHINE_DRIVER_START(pzlestar)
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 3580000)
+ MDRV_SOUND_ADD("ym", YM2413, 3580000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -290,7 +290,7 @@ static MACHINE_DRIVER_START(sexyboom )
MDRV_VIDEO_UPDATE( generic_bitmapped )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, 3580000)
+ MDRV_SOUND_ADD("ym", YM2413, 3580000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index 9b0cdb91e30..7c1cd48ec32 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -379,7 +379,7 @@ static MACHINE_DRIVER_START( tecfri )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 3600000)
+ MDRV_SOUND_ADD("ym", YM3812, 3600000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -413,7 +413,7 @@ static MACHINE_DRIVER_START( sauro )
MDRV_VIDEO_START(sauro)
MDRV_VIDEO_UPDATE(sauro)
- MDRV_SOUND_ADD(SP0256, 3120000)
+ MDRV_SOUND_ADD("sp", SP0256, 3120000)
MDRV_SOUND_CONFIG(sauro_sp256)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index 2b3c607894d..8548f0309b6 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -262,13 +262,13 @@ static MACHINE_DRIVER_START( sbasketb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(SN76496, 14318180/8)
+ MDRV_SOUND_ADD("sn", SN76496, 14318180/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(VLM5030, 3580000)
+ MDRV_SOUND_ADD("vlm", VLM5030, 3580000)
MDRV_SOUND_CONFIG(sbasketb_vlm5030_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index c5b457925ca..49474872d67 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -349,7 +349,7 @@ static MACHINE_DRIVER_START( sbowling )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 19968000 / 16)
+ MDRV_SOUND_ADD("ay", AY8910, 19968000 / 16)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index 88d66563a07..9578f548bb1 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -498,7 +498,7 @@ static MACHINE_DRIVER_START( sbrkout )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c
index 0bd75068665..feedc79259d 100644
--- a/src/mame/drivers/sbugger.c
+++ b/src/mame/drivers/sbugger.c
@@ -251,10 +251,10 @@ static MACHINE_DRIVER_START( sbugger )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("sn76489.1", SN76489, 3000000)
+ MDRV_SOUND_ADD("sn76489.1", SN76489, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("sn76489.2", SN76489, 3000000)
+ MDRV_SOUND_ADD("sn76489.2", SN76489, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c
index 7f1aeb0df76..b487d54bc2f 100644
--- a/src/mame/drivers/scobra.c
+++ b/src/mame/drivers/scobra.c
@@ -1147,10 +1147,10 @@ static MACHINE_DRIVER_START( type1 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 14318000/8)
+ MDRV_SOUND_ADD("ay1", AY8910, 14318000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
- MDRV_SOUND_ADD(AY8910, 14318000/8)
+ MDRV_SOUND_ADD("ay2", AY8910, 14318000/8)
MDRV_SOUND_CONFIG(scobra_ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
MACHINE_DRIVER_END
@@ -1287,7 +1287,7 @@ static MACHINE_DRIVER_START( hustler )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 14318000/8)
+ MDRV_SOUND_ADD("ay", AY8910, 14318000/8)
MDRV_SOUND_CONFIG(hustler_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index a85534e4154..07f57abd680 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -250,7 +250,7 @@ static MACHINE_DRIVER_START( scotrsht )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 18432000/6)
+ MDRV_SOUND_ADD("ym", YM2203, 18432000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index 6cdc1ab7ec7..e262f121bde 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -1888,10 +1888,10 @@ static MACHINE_DRIVER_START( scramble )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("8910.1", AY8910, 14318000/8)
+ MDRV_SOUND_ADD("8910.1", AY8910, 14318000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
- MDRV_SOUND_ADD_TAG("8910.2", AY8910, 14318000/8)
+ MDRV_SOUND_ADD("8910.2", AY8910, 14318000/8)
MDRV_SOUND_CONFIG(scramble_ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
MACHINE_DRIVER_END
@@ -1905,11 +1905,11 @@ static MACHINE_DRIVER_START( fscramble )
MDRV_SOUND_ROUTE(1, "filter1B", 1.0)
MDRV_SOUND_ROUTE(2, "filter1C", 1.0)
- MDRV_SOUND_ADD_TAG("filter1A", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter1A", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.3)
- MDRV_SOUND_ADD_TAG("filter1B", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter1B", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.3)
- MDRV_SOUND_ADD_TAG("filter1C", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter1C", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) // scramblec057gre
MDRV_SOUND_MODIFY("8910.2")
@@ -1917,11 +1917,11 @@ static MACHINE_DRIVER_START( fscramble )
MDRV_SOUND_ROUTE(1, "filter2B", 1.0)
MDRV_SOUND_ROUTE(2, "filter2C", 1.0)
- MDRV_SOUND_ADD_TAG("filter2A", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter2A", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.3)
- MDRV_SOUND_ADD_TAG("filter2B", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter2B", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.3)
- MDRV_SOUND_ADD_TAG("filter2C", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter2C", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) // scramblec057gre
MACHINE_DRIVER_END
@@ -2202,7 +2202,7 @@ static MACHINE_DRIVER_START( scorpion )
MDRV_SOUND_CONFIG(triplep_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
- MDRV_SOUND_ADD(AY8910, 14318000/8)
+ MDRV_SOUND_ADD("ay", AY8910, 14318000/8)
MDRV_SOUND_CONFIG(scramble_ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c
index 47d4071808f..6b1087e541a 100644
--- a/src/mame/drivers/scregg.c
+++ b/src/mame/drivers/scregg.c
@@ -253,10 +253,10 @@ static MACHINE_DRIVER_START( dommy )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_DRIVER_END
@@ -286,10 +286,10 @@ static MACHINE_DRIVER_START( scregg )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c
index 2449afd9de5..60e17bdceba 100644
--- a/src/mame/drivers/sderby.c
+++ b/src/mame/drivers/sderby.c
@@ -272,7 +272,7 @@ static MACHINE_DRIVER_START( sderby )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -300,7 +300,7 @@ static MACHINE_DRIVER_START( pmroulet )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index c31145d3a59..8d89a68bf6b 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -1394,12 +1394,12 @@ static MACHINE_DRIVER_START( segac )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3438, XL2_CLOCK/7)
+ MDRV_SOUND_ADD("ym", YM3438, XL2_CLOCK/7)
MDRV_SOUND_CONFIG(ym3438_intf)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
/* right channel not connected */
- MDRV_SOUND_ADD(SN76496, XL2_CLOCK/15)
+ MDRV_SOUND_ADD("sn", SN76496, XL2_CLOCK/15)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1410,7 +1410,7 @@ static MACHINE_DRIVER_START( segac2 )
MDRV_IMPORT_FROM( segac )
/* sound hardware */
- MDRV_SOUND_ADD(UPD7759, XL1_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, XL1_CLOCK)
MDRV_SOUND_CONFIG(upd7759_intf)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index b146f3c5d90..df9a8ac8478 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -2066,10 +2066,10 @@ static MACHINE_DRIVER_START( systeme )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 3579540)
+ MDRV_SOUND_ADD("sn1", SN76496, 3579540)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76496, 3579540)
+ MDRV_SOUND_ADD("sn2", SN76496, 3579540)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c
index 39c8995f4fa..5b42ff23143 100644
--- a/src/mame/drivers/segag80r.c
+++ b/src/mame/drivers/segag80r.c
@@ -968,10 +968,10 @@ static MACHINE_DRIVER_START( sindbadm )
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
/* sound hardware */
- MDRV_SOUND_ADD(SN76496, SINDBADM_SOUND_CLOCK/4)
+ MDRV_SOUND_ADD("sn1", SN76496, SINDBADM_SOUND_CLOCK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76496, SINDBADM_SOUND_CLOCK/2)
+ MDRV_SOUND_ADD("sn2", SN76496, SINDBADM_SOUND_CLOCK/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index 5f5dd408499..a9dab0ced13 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -946,7 +946,7 @@ static MACHINE_DRIVER_START( elim2 )
MDRV_IMPORT_FROM(g80v_base)
/* custom sound board */
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(elim2_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -956,7 +956,7 @@ static MACHINE_DRIVER_START( spacfury )
MDRV_IMPORT_FROM(g80v_base)
/* custom sound board */
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(spacfury_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
@@ -969,11 +969,11 @@ static MACHINE_DRIVER_START( zektor )
MDRV_IMPORT_FROM(g80v_base)
/* custom sound board */
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(zektor_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(AY8910, CPU_CLOCK/2/2)
+ MDRV_SOUND_ADD("ay", AY8910, CPU_CLOCK/2/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
/* speech board */
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index b095e0791c2..01ea35af762 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -925,7 +925,7 @@ static MACHINE_DRIVER_START( sound_board_2203 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, MASTER_CLOCK_8MHz/2)
+ MDRV_SOUND_ADD("ym", YM2203, MASTER_CLOCK_8MHz/2)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "left", 0.13)
MDRV_SOUND_ROUTE(0, "right", 0.13)
@@ -936,7 +936,7 @@ static MACHINE_DRIVER_START( sound_board_2203 )
MDRV_SOUND_ROUTE(3, "left", 0.37)
MDRV_SOUND_ROUTE(3, "right", 0.37)
- MDRV_SOUND_ADD_TAG("pcm", SEGAPCM, MASTER_CLOCK_8MHz)
+ MDRV_SOUND_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz)
MDRV_SOUND_CONFIG(segapcm_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -953,7 +953,7 @@ static MACHINE_DRIVER_START( sound_board_2203x2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, MASTER_CLOCK_8MHz/2)
+ MDRV_SOUND_ADD("ym1", YM2203, MASTER_CLOCK_8MHz/2)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "left", 0.13)
MDRV_SOUND_ROUTE(0, "right", 0.13)
@@ -964,7 +964,7 @@ static MACHINE_DRIVER_START( sound_board_2203x2 )
MDRV_SOUND_ROUTE(3, "left", 0.37)
MDRV_SOUND_ROUTE(3, "right", 0.37)
- MDRV_SOUND_ADD(YM2203, MASTER_CLOCK_8MHz/2)
+ MDRV_SOUND_ADD("ym2", YM2203, MASTER_CLOCK_8MHz/2)
MDRV_SOUND_ROUTE(0, "left", 0.13)
MDRV_SOUND_ROUTE(0, "right", 0.13)
MDRV_SOUND_ROUTE(1, "left", 0.13)
@@ -974,7 +974,7 @@ static MACHINE_DRIVER_START( sound_board_2203x2 )
MDRV_SOUND_ROUTE(3, "left", 0.37)
MDRV_SOUND_ROUTE(3, "right", 0.37)
- MDRV_SOUND_ADD_TAG("pcm", SEGAPCM, MASTER_CLOCK_8MHz/2)
+ MDRV_SOUND_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz/2)
MDRV_SOUND_CONFIG(segapcm_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -991,12 +991,12 @@ static MACHINE_DRIVER_START( sound_board_2151 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, MASTER_CLOCK_8MHz/2)
+ MDRV_SOUND_ADD("ym", YM2151, MASTER_CLOCK_8MHz/2)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.43)
MDRV_SOUND_ROUTE(1, "right", 0.43)
- MDRV_SOUND_ADD_TAG("pcm", SEGAPCM, MASTER_CLOCK_8MHz/2)
+ MDRV_SOUND_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz/2)
MDRV_SOUND_CONFIG(segapcm_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index 750b5880beb..71e33ed5e5c 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -846,11 +846,11 @@ static MACHINE_DRIVER_START( outrundx )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, SOUND_CLOCK/4)
+ MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK/4)
MDRV_SOUND_ROUTE(0, "left", 0.43)
MDRV_SOUND_ROUTE(1, "right", 0.43)
- MDRV_SOUND_ADD_TAG("pcm", SEGAPCM, SOUND_CLOCK/4)
+ MDRV_SOUND_ADD("pcm", SEGAPCM, SOUND_CLOCK/4)
MDRV_SOUND_CONFIG(segapcm_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index 5c5f8122eff..02682544d7d 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -1807,11 +1807,11 @@ static MACHINE_DRIVER_START( system16a )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("2151", YM2151, 4000000)
+ MDRV_SOUND_ADD("2151", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.43)
- MDRV_SOUND_ADD_TAG("dac", DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index 343db21e859..afe88c299fe 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -3268,10 +3268,10 @@ static MACHINE_DRIVER_START( system16b )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("2151", YM2151, MASTER_CLOCK_8MHz/2)
+ MDRV_SOUND_ADD("2151", YM2151, MASTER_CLOCK_8MHz/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.43)
- MDRV_SOUND_ADD_TAG("7759", UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("7759", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.48)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index 6d2e00398cf..f728618c14b 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -1294,13 +1294,13 @@ static MACHINE_DRIVER_START( system18 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("3438", YM3438, 8000000)
+ MDRV_SOUND_ADD("3438", YM3438, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD_TAG("3438", YM3438, 8000000)
+ MDRV_SOUND_ADD("3438", YM3438, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD_TAG("5c68", RF5C68, 10000000)
+ MDRV_SOUND_ADD("5c68", RF5C68, 10000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index 1a58f815c6a..2d76013cc77 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -1926,12 +1926,12 @@ static MACHINE_DRIVER_START( system24 )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 7828d33ed09..5f3d764cbe2 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -2187,16 +2187,16 @@ static MACHINE_DRIVER_START( system32 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3438, MASTER_CLOCK/4)
+ MDRV_SOUND_ADD("ym1", YM3438, MASTER_CLOCK/4)
MDRV_SOUND_CONFIG(ym3438_interface)
MDRV_SOUND_ROUTE(0, "left", 0.40)
MDRV_SOUND_ROUTE(1, "right", 0.40)
- MDRV_SOUND_ADD(YM3438, MASTER_CLOCK/4)
+ MDRV_SOUND_ADD("ym2", YM3438, MASTER_CLOCK/4)
MDRV_SOUND_ROUTE(0, "left", 0.40)
MDRV_SOUND_ROUTE(1, "right", 0.40)
- MDRV_SOUND_ADD(RF5C68, RFC_CLOCK/4)
+ MDRV_SOUND_ADD("rf", RF5C68, RFC_CLOCK/4)
MDRV_SOUND_ROUTE(0, "left", 0.55)
MDRV_SOUND_ROUTE(1, "right", 0.55)
MACHINE_DRIVER_END
@@ -2248,12 +2248,12 @@ static MACHINE_DRIVER_START( multi32 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3438, MASTER_CLOCK/4)
+ MDRV_SOUND_ADD("ym", YM3438, MASTER_CLOCK/4)
MDRV_SOUND_CONFIG(ym3438_interface)
MDRV_SOUND_ROUTE(1, "left", 0.40)
MDRV_SOUND_ROUTE(0, "right", 0.40)
- MDRV_SOUND_ADD(MULTIPCM, MASTER_CLOCK/4)
+ MDRV_SOUND_ADD("sega", MULTIPCM, MASTER_CLOCK/4)
MDRV_SOUND_CONFIG(multi32_pcm_interface)
MDRV_SOUND_ROUTE(1, "left", 1.0)
MDRV_SOUND_ROUTE(0, "right", 1.0)
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index 271eb1f5fb9..9e075713b38 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -1150,12 +1150,12 @@ static MACHINE_DRIVER_START( xboard )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("2151", YM2151, SOUND_CLOCK/4)
+ MDRV_SOUND_ADD("2151", YM2151, SOUND_CLOCK/4)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.43)
MDRV_SOUND_ROUTE(1, "right", 0.43)
- MDRV_SOUND_ADD_TAG("pcm", SEGAPCM, SOUND_CLOCK/4)
+ MDRV_SOUND_ADD("pcm", SEGAPCM, SOUND_CLOCK/4)
MDRV_SOUND_CONFIG(segapcm_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index 8a13720446c..b3cfbc50f3d 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -994,12 +994,12 @@ static MACHINE_DRIVER_START( yboard )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("2151", YM2151, SOUND_CLOCK/8)
+ MDRV_SOUND_ADD("2151", YM2151, SOUND_CLOCK/8)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.43)
MDRV_SOUND_ROUTE(1, "right", 0.43)
- MDRV_SOUND_ADD_TAG("pcm", SEGAPCM, SOUND_CLOCK/8)
+ MDRV_SOUND_ADD("pcm", SEGAPCM, SOUND_CLOCK/8)
MDRV_SOUND_CONFIG(segapcm_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index cf47d3b1057..cc4a5332f29 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -1798,7 +1798,7 @@ static MACHINE_DRIVER_START( spi )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("audio", YMF271, 16934400)
+ MDRV_SOUND_ADD("audio", YMF271, 16934400)
MDRV_SOUND_CONFIG(ymf271_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2111,11 +2111,11 @@ static MACHINE_DRIVER_START( seibu386 )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1431815)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1431815)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(OKIM6295, 1431815)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 1431815)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c
index 9ea212f7955..41cd9d8743f 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -433,11 +433,11 @@ static MACHINE_DRIVER_START( nvram )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1536000)
+ MDRV_SOUND_ADD("ay", AY8910, 1536000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c
index 9f797d8dc2d..3299fa4bc44 100644
--- a/src/mame/drivers/senjyo.c
+++ b/src/mame/drivers/senjyo.c
@@ -676,16 +676,16 @@ static MACHINE_DRIVER_START( senjyo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 2000000)
+ MDRV_SOUND_ADD("sn1", SN76496, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76496, 2000000)
+ MDRV_SOUND_ADD("sn2", SN76496, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76496, 2000000)
+ MDRV_SOUND_ADD("sn3", SN76496, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(senjyo_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index eca587c73a4..d38f525a16d 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -6740,12 +6740,12 @@ static MACHINE_DRIVER_START( tndrcade )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, 16000000/4) /* 4 MHz */
+ MDRV_SOUND_ADD("ym1", YM2203, 16000000/4) /* 4 MHz */
MDRV_SOUND_CONFIG(tndrcade_ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35)
- MDRV_SOUND_ADD(YM3812, 16000000/4) /* 4 MHz */
+ MDRV_SOUND_ADD("ym2", YM3812, 16000000/4) /* 4 MHz */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
@@ -6790,7 +6790,7 @@ static MACHINE_DRIVER_START( twineagl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -6832,7 +6832,7 @@ static MACHINE_DRIVER_START( downtown )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -6895,7 +6895,7 @@ static MACHINE_DRIVER_START( usclssic )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf2)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -6942,7 +6942,7 @@ static MACHINE_DRIVER_START( calibr50 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf2)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -6983,7 +6983,7 @@ static MACHINE_DRIVER_START( metafox )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7022,7 +7022,7 @@ static MACHINE_DRIVER_START( atehate )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7066,7 +7066,7 @@ static MACHINE_DRIVER_START( blandia )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7098,7 +7098,7 @@ static MACHINE_DRIVER_START( blandiap )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7133,7 +7133,7 @@ static MACHINE_DRIVER_START( blockcar )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7168,7 +7168,7 @@ static MACHINE_DRIVER_START( daioh )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7209,7 +7209,7 @@ static MACHINE_DRIVER_START( drgnunit )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7243,7 +7243,7 @@ static MACHINE_DRIVER_START( qzkklgy2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7278,7 +7278,7 @@ static MACHINE_DRIVER_START( eightfrc )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7319,7 +7319,7 @@ static MACHINE_DRIVER_START( extdwnhl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7380,7 +7380,7 @@ static MACHINE_DRIVER_START( gundhara )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7420,7 +7420,7 @@ static MACHINE_DRIVER_START( jjsquawk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7459,7 +7459,7 @@ static MACHINE_DRIVER_START( kamenrid )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7495,7 +7495,7 @@ static MACHINE_DRIVER_START( orbs )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 14318180) /* 14.318180 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 14318180) /* 14.318180 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7530,7 +7530,7 @@ static MACHINE_DRIVER_START( krzybowl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7572,7 +7572,7 @@ static MACHINE_DRIVER_START( madshark )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7617,7 +7617,7 @@ static MACHINE_DRIVER_START( msgundam )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7653,7 +7653,7 @@ static MACHINE_DRIVER_START( oisipuzl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7689,7 +7689,7 @@ static MACHINE_DRIVER_START( triplfun )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 792000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 792000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -7724,7 +7724,7 @@ static MACHINE_DRIVER_START( kiwame )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7762,7 +7762,7 @@ static MACHINE_DRIVER_START( rezon )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7800,7 +7800,7 @@ static MACHINE_DRIVER_START( thunderl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7834,7 +7834,7 @@ static MACHINE_DRIVER_START( wiggie )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -7864,7 +7864,7 @@ static MACHINE_DRIVER_START( wits )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7900,7 +7900,7 @@ static MACHINE_DRIVER_START( umanclub )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -7940,12 +7940,12 @@ static MACHINE_DRIVER_START( utoukond )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000)
+ MDRV_SOUND_ADD("x1", X1_010, 16000000)
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(YM3438, 16000000/4) /* 4 MHz */
+ MDRV_SOUND_ADD("ym", YM3438, 16000000/4) /* 4 MHz */
MDRV_SOUND_CONFIG(utoukond_ym3438_intf)
MDRV_SOUND_ROUTE(0, "left", 0.30)
MDRV_SOUND_ROUTE(1, "right", 0.30)
@@ -7988,7 +7988,7 @@ static MACHINE_DRIVER_START( wrofaero )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -8031,7 +8031,7 @@ static MACHINE_DRIVER_START( zingzip )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -8065,7 +8065,7 @@ static MACHINE_DRIVER_START( pairlove )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000) /* 16 MHz */
+ MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -8110,10 +8110,10 @@ static MACHINE_DRIVER_START( crazyfgt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 16000000/4) /* 4 MHz */
+ MDRV_SOUND_ADD("ym", YM3812, 16000000/4) /* 4 MHz */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1000000) // clock?
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000) // clock?
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -8169,7 +8169,7 @@ static MACHINE_DRIVER_START( inttoote )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 16000000)
+ MDRV_SOUND_ADD("x1", X1_010, 16000000)
MDRV_SOUND_CONFIG(seta_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index e5fd5423afc..73000e7624c 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -1834,7 +1834,7 @@ static MACHINE_DRIVER_START( mj4simai )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(X1_010, 50000000/3)
+ MDRV_SOUND_ADD("x1", X1_010, 50000000/3)
MDRV_SOUND_CONFIG(x1_010_sound_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index 7012ebfd48f..001d0d88608 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -848,17 +848,17 @@ static MACHINE_DRIVER_START( sf )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm1", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm2", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c
index f82528d754b..28490ef3cb1 100644
--- a/src/mame/drivers/sg1000a.c
+++ b/src/mame/drivers/sg1000a.c
@@ -280,7 +280,7 @@ static MACHINE_DRIVER_START( sg1000a )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489, 3579545)
+ MDRV_SOUND_ADD("sn", SN76489, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/sgladiat.c b/src/mame/drivers/sgladiat.c
index 1c9bbf7cf88..5566d0e4ab8 100644
--- a/src/mame/drivers/sgladiat.c
+++ b/src/mame/drivers/sgladiat.c
@@ -179,10 +179,10 @@ static MACHINE_DRIVER_START( sgladiat )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 78b403dc20f..063b246d909 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -578,12 +578,12 @@ static MACHINE_DRIVER_START( shadfrce )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD(OKIM6295, 1584000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1584000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index 5e0215aa93f..8656025de7b 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -523,11 +523,11 @@ static MACHINE_DRIVER_START( shangha3 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -564,12 +564,12 @@ static MACHINE_DRIVER_START( heberpop )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3438, 8000000)
+ MDRV_SOUND_ADD("ym", YM3438, 8000000)
MDRV_SOUND_CONFIG(ym3438_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.40)
MDRV_SOUND_ROUTE(1, "mono", 0.40)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -606,12 +606,12 @@ static MACHINE_DRIVER_START( blocken )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3438, 8000000)
+ MDRV_SOUND_ADD("ym", YM3438, 8000000)
MDRV_SOUND_CONFIG(ym3438_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.40)
MDRV_SOUND_ROUTE(1, "mono", 0.40)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index 250c507f8de..e2e7a1380d4 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -1008,7 +1008,7 @@ static MACHINE_DRIVER_START( shanghai )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 16000000/4)
+ MDRV_SOUND_ADD("ym", YM2203, 16000000/4)
MDRV_SOUND_CONFIG(sh_ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
@@ -1040,7 +1040,7 @@ static MACHINE_DRIVER_START( shangha2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 16000000/4)
+ MDRV_SOUND_ADD("ym", YM2203, 16000000/4)
MDRV_SOUND_CONFIG(sh_ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index be5e8888443..ccd432c37b3 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -419,10 +419,10 @@ static MACHINE_DRIVER_START( chinhero )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MDRV_SOUND_ADD("ay", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
@@ -496,7 +496,7 @@ static MACHINE_DRIVER_START( dynamski )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c
index f71f1b29499..b1e6255b797 100644
--- a/src/mame/drivers/shaolins.c
+++ b/src/mame/drivers/shaolins.c
@@ -240,10 +240,10 @@ static MACHINE_DRIVER_START( shaolins )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, XTAL_18_432MHz/12) /* verified on pcb */
+ MDRV_SOUND_ADD("sn1", SN76496, XTAL_18_432MHz/12) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76496, XTAL_18_432MHz/6) /* verified on pcb */
+ MDRV_SOUND_ADD("sn2", SN76496, XTAL_18_432MHz/6) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index c0082b9b52b..9432eb2792c 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -272,12 +272,12 @@ static MACHINE_DRIVER_START( shisen )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index 2c21e90d144..3fc8d684f65 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -337,7 +337,7 @@ static MACHINE_DRIVER_START( shootout )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -368,7 +368,7 @@ static MACHINE_DRIVER_START( shootouj )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_interface2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index 6e1dde3f6ee..fa4297da24f 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -406,7 +406,7 @@ static MACHINE_DRIVER_START( shougi )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 10000000/8)
+ MDRV_SOUND_ADD("ay", AY8910, 10000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c
index 389dc6c6256..35fbf5c2fcb 100644
--- a/src/mame/drivers/shuuz.c
+++ b/src/mame/drivers/shuuz.c
@@ -303,7 +303,7 @@ static MACHINE_DRIVER_START( shuuz )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, ATARI_CLOCK_14MHz/16)
+ MDRV_SOUND_ADD("oki", OKIM6295, ATARI_CLOCK_14MHz/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index 9bf9691041a..21a56226cf4 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -747,14 +747,14 @@ static MACHINE_DRIVER_START( sidearms )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.25)
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 4000000)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
@@ -793,14 +793,14 @@ static MACHINE_DRIVER_START( turtship )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.25)
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 4000000)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
@@ -842,7 +842,7 @@ static MACHINE_DRIVER_START( whizz )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(whizz_ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index 502baef67e9..61e1e9843d8 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -319,10 +319,10 @@ static MACHINE_DRIVER_START( sidepckt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(YM3526, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3526, 3000000)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -358,10 +358,10 @@ static MACHINE_DRIVER_START( sidepctj )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(YM3526, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3526, 3000000)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index b5e9b8e2d10..4cebf3f38e4 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -391,16 +391,16 @@ static MACHINE_DRIVER_START( silkroad )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.45)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 2112000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 2112000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.45)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.45)
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index 37ffc215798..730f82b9a62 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -501,12 +501,12 @@ static MACHINE_DRIVER_START( chainrec )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("OKIM6295_EFFECTS", OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("OKIM6295_EFFECTS", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.6)
- MDRV_SOUND_ADD_TAG("OKIM6295_MUSIC", OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("OKIM6295_MUSIC", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.2)
@@ -541,7 +541,7 @@ static MACHINE_DRIVER_START( mitchell156 )
MDRV_SOUND_REMOVE("OKIM6295_MUSIC")
- MDRV_SOUND_ADD_TAG("OKIM6295_MUSIC_SLOWER", OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("OKIM6295_MUSIC_SLOWER", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.2)
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index 2f76e02e4cd..808ad1ba187 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -291,13 +291,13 @@ static MACHINE_DRIVER_START( simpsons )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_ROUTE(0, "left", 1.0) /* only left channel is connected */
MDRV_SOUND_ROUTE(0, "right", 1.0)
MDRV_SOUND_ROUTE(1, "left", 0.0)
MDRV_SOUND_ROUTE(1, "right", 0.0)
- MDRV_SOUND_ADD(K053260, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c
index 249ebc66518..fae58097de8 100644
--- a/src/mame/drivers/skyarmy.c
+++ b/src/mame/drivers/skyarmy.c
@@ -284,7 +284,7 @@ static MACHINE_DRIVER_START( skyarmy )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2500000)
+ MDRV_SOUND_ADD("ay", AY8910, 2500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c
index 3d78a164e7d..00fc2cc29ec 100644
--- a/src/mame/drivers/skydiver.c
+++ b/src/mame/drivers/skydiver.c
@@ -394,7 +394,7 @@ static MACHINE_DRIVER_START( skydiver )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(skydiver)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c
index dde2bfe88a2..e5281d3af2e 100644
--- a/src/mame/drivers/skyfox.c
+++ b/src/mame/drivers/skyfox.c
@@ -279,10 +279,10 @@ static MACHINE_DRIVER_START( skyfox )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1748000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1748000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(YM2203, 1748000)
+ MDRV_SOUND_ADD("ym2", YM2203, 1748000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index 2559df8c041..e1a9337b9ca 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -482,7 +482,7 @@ static MACHINE_DRIVER_START( skykid )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO_CUS30, 49152000/2048)
+ MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c
index e2b7ae7e3b3..7f77aa6329b 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -450,7 +450,7 @@ static MACHINE_DRIVER_START( skylncr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay", AY8910, 12000000/8)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index ab19a3e5ed0..4d185655287 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -865,11 +865,11 @@ static MACHINE_DRIVER_START( perfrman )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 16000000/8)
+ MDRV_SOUND_ADD("ay1", AY8910, 16000000/8)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 16000000/8)
+ MDRV_SOUND_ADD("ay2", AY8910, 16000000/8)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -912,11 +912,11 @@ static MACHINE_DRIVER_START( tigerhb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -961,11 +961,11 @@ static MACHINE_DRIVER_START( tigerh )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_36MHz/24) /* verified on pcb */
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_36MHz/24) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, XTAL_36MHz/24) /* verified on pcb */
+ MDRV_SOUND_ADD("ay2", AY8910, XTAL_36MHz/24) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -1008,11 +1008,11 @@ static MACHINE_DRIVER_START( slapfigh )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_36MHz/24) /* verified on pcb */
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_36MHz/24) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, XTAL_36MHz/24) /* verified on pcb */
+ MDRV_SOUND_ADD("ay2", AY8910, XTAL_36MHz/24) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index e59e3fa4545..88a07748346 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -585,7 +585,7 @@ static MACHINE_DRIVER_START( slapshot )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610B, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610B, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -626,7 +626,7 @@ static MACHINE_DRIVER_START( opwolf3 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610B, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610B, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c
index 76520cb2aeb..3125b1d7a51 100644
--- a/src/mame/drivers/sliver.c
+++ b/src/mame/drivers/sliver.c
@@ -558,7 +558,7 @@ static MACHINE_DRIVER_START( sliver )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.6)
diff --git a/src/mame/drivers/smstrv.c b/src/mame/drivers/smstrv.c
index 4e761bffaac..af3efca1b33 100644
--- a/src/mame/drivers/smstrv.c
+++ b/src/mame/drivers/smstrv.c
@@ -256,7 +256,7 @@ static MACHINE_DRIVER_START( smstrv )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index 421f09c5fee..afe5644b4f2 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -850,7 +850,7 @@ static MACHINE_DRIVER_START( tnk3 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM3526, XTAL_8MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3526_interface_0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -894,11 +894,11 @@ static MACHINE_DRIVER_START( athena )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 4000000)
+ MDRV_SOUND_ADD("ym1", YM3526, 4000000)
MDRV_SOUND_CONFIG(ym3526_interface_0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(YM3526, 4000000)
+ MDRV_SOUND_ADD("ym2", YM3526, 4000000)
MDRV_SOUND_CONFIG(ym3526_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -942,11 +942,11 @@ static MACHINE_DRIVER_START( ikari )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym1", YM3526, XTAL_8MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3526_interface_0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym2", YM3526, XTAL_8MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3526_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -990,11 +990,11 @@ static MACHINE_DRIVER_START( victroad )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym1", YM3526, XTAL_8MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3526_interface_0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(Y8950, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym2", Y8950, XTAL_8MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(y8950_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1036,11 +1036,11 @@ static MACHINE_DRIVER_START( gwar )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym1", YM3526, XTAL_8MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3526_interface_0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(Y8950, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym2", Y8950, XTAL_8MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(y8950_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1083,11 +1083,11 @@ static MACHINE_DRIVER_START( bermudat )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 4000000)
+ MDRV_SOUND_ADD("ym1", YM3526, 4000000)
MDRV_SOUND_CONFIG(ym3526_interface_0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(Y8950, 4000000)
+ MDRV_SOUND_ADD("ym2", Y8950, 4000000)
MDRV_SOUND_CONFIG(y8950_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1129,11 +1129,11 @@ static MACHINE_DRIVER_START( psychos )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 4000000)
+ MDRV_SOUND_ADD("ym1", YM3526, 4000000)
MDRV_SOUND_CONFIG(ym3526_interface_0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(Y8950, 4000000)
+ MDRV_SOUND_ADD("ym2", Y8950, 4000000)
MDRV_SOUND_CONFIG(y8950_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1175,11 +1175,11 @@ static MACHINE_DRIVER_START( chopper1 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym1", YM3812, 4000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(Y8950, 4000000)
+ MDRV_SOUND_ADD("ym2", Y8950, 4000000)
MDRV_SOUND_CONFIG(y8950_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1223,11 +1223,11 @@ static MACHINE_DRIVER_START( tdfever )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 4000000)
+ MDRV_SOUND_ADD("ym1", YM3526, 4000000)
MDRV_SOUND_CONFIG(ym3526_interface_0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(Y8950, 4000000)
+ MDRV_SOUND_ADD("ym2", Y8950, 4000000)
MDRV_SOUND_CONFIG(y8950_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1271,11 +1271,11 @@ static MACHINE_DRIVER_START( tdfever2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 4000000)
+ MDRV_SOUND_ADD("ym1", YM3526, 4000000)
MDRV_SOUND_CONFIG(ym3526_interface_0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(Y8950, 4000000)
+ MDRV_SOUND_ADD("ym2", Y8950, 4000000)
MDRV_SOUND_CONFIG(y8950_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1319,7 +1319,7 @@ static MACHINE_DRIVER_START( fsoccer )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(Y8950, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", Y8950, XTAL_8MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(y8950_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index 96ffed6dfe0..3efd8c1862b 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -624,11 +624,11 @@ static MACHINE_DRIVER_START( pow )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM3812, XTAL_8MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c
index 7b55ed4b9e7..3b577127a97 100644
--- a/src/mame/drivers/snookr10.c
+++ b/src/mame/drivers/snookr10.c
@@ -745,7 +745,7 @@ static MACHINE_DRIVER_START( snookr10 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, MASTER_CLOCK/16) /* 1 MHz (995.5 kHz measured) */
+ MDRV_SOUND_ADD("oki", OKIM6295, MASTER_CLOCK/16) /* 1 MHz (995.5 kHz measured) */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* pin7 checked HIGH on PCB */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.8)
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index fa32466f652..f24aa73ca29 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -1580,7 +1580,7 @@ static MACHINE_DRIVER_START( snowbros )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("3812", YM3812, 3000000)
+ MDRV_SOUND_ADD("3812", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1618,7 +1618,7 @@ static MACHINE_DRIVER_START( semicom )
MDRV_SOUND_ROUTE(0, "mono", 0.10)
MDRV_SOUND_ROUTE(1, "mono", 0.10)
- MDRV_SOUND_ADD_TAG("oki", OKIM6295, 999900)
+ MDRV_SOUND_ADD("oki", OKIM6295, 999900)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1678,12 +1678,12 @@ static MACHINE_DRIVER_START( honeydol )
/* sound hardware */
- MDRV_SOUND_ADD_TAG("3812", YM3812, 3000000)
+ MDRV_SOUND_ADD("3812", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("oki", OKIM6295, 999900) /* freq? */
+ MDRV_SOUND_ADD("oki", OKIM6295, 999900) /* freq? */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1718,7 +1718,7 @@ static MACHINE_DRIVER_START( twinadv )
MDRV_SPEAKER_STANDARD_MONO("mono")
/* sound hardware */
- MDRV_SOUND_ADD_TAG("oki", OKIM6295, 12000000/12) /* freq? */
+ MDRV_SOUND_ADD("oki", OKIM6295, 12000000/12) /* freq? */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1792,7 +1792,7 @@ static MACHINE_DRIVER_START( snowbro3 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 999900)
+ MDRV_SOUND_ADD("oki", OKIM6295, 999900)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c
index dca1bd0681a..b9b8604cb04 100644
--- a/src/mame/drivers/solomon.c
+++ b/src/mame/drivers/solomon.c
@@ -231,13 +231,13 @@ static MACHINE_DRIVER_START( solomon )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay3", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c
index 938ff2dda99..7a2e451fc57 100644
--- a/src/mame/drivers/sonson.c
+++ b/src/mame/drivers/sonson.c
@@ -255,10 +255,10 @@ static MACHINE_DRIVER_START( sonson )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay1", AY8910, 12000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay2", AY8910, 12000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c
index 125e699a327..16027cd60d3 100644
--- a/src/mame/drivers/spaceg.c
+++ b/src/mame/drivers/spaceg.c
@@ -383,16 +383,16 @@ static MACHINE_DRIVER_START( spaceg )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD(SN76496, 15468480/4)
+// MDRV_SOUND_ADD("sn1", SN76496, 15468480/4)
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-// MDRV_SOUND_ADD(SN76496, 15468480/4)
+// MDRV_SOUND_ADD("sn2", SN76496, 15468480/4)
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-// MDRV_SOUND_ADD(SN76496, 15468480/4)
+// MDRV_SOUND_ADD("sn3", SN76496, 15468480/4)
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-// MDRV_SOUND_ADD(DAC, 0)
+// MDRV_SOUND_ADD("dac", DAC, 0)
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index 8761cdc4a0d..be0500b685a 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -378,11 +378,11 @@ static MACHINE_DRIVER_START( spbactn )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 3579545)
+ MDRV_SOUND_ADD("ym", YM3812, 3579545)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c
index bf638e4ba62..b24decfe6d0 100644
--- a/src/mame/drivers/spcforce.c
+++ b/src/mame/drivers/spcforce.c
@@ -284,13 +284,13 @@ static MACHINE_DRIVER_START( spcforce )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 2000000)
+ MDRV_SOUND_ADD("sn1", SN76496, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76496, 2000000)
+ MDRV_SOUND_ADD("sn2", SN76496, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76496, 2000000)
+ MDRV_SOUND_ADD("sn3", SN76496, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index 92dfd6f1fe9..f227582b1df 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -459,17 +459,17 @@ static MACHINE_DRIVER_START( spdodgeb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm1", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm2", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c
index a2302f70474..64470de75f3 100644
--- a/src/mame/drivers/speedatk.c
+++ b/src/mame/drivers/speedatk.c
@@ -290,7 +290,7 @@ static MACHINE_DRIVER_START( speedatk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 4000000)
+ MDRV_SOUND_ADD("ay", AY8910, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c
index 7cb0479367e..e61be68c364 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -255,7 +255,7 @@ static MACHINE_DRIVER_START( speedbal )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 3600000)
+ MDRV_SOUND_ADD("ym", YM3812, 3600000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c
index 52910179f9a..1f4de026dd1 100644
--- a/src/mame/drivers/speedspn.c
+++ b/src/mame/drivers/speedspn.c
@@ -328,7 +328,7 @@ static MACHINE_DRIVER_START( speedspn )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1122000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1122000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c
index bd9eb81684f..13eed70f9a4 100644
--- a/src/mame/drivers/speglsht.c
+++ b/src/mame/drivers/speglsht.c
@@ -297,7 +297,7 @@ static MACHINE_DRIVER_START( speglsht )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(ST0016, 0)
+ MDRV_SOUND_ADD("st", ST0016, 0)
MDRV_SOUND_CONFIG(st0016_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index d56700f42d7..b9e98f29ad7 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -459,10 +459,10 @@ static MACHINE_DRIVER_START( splash )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym", YM3812, 3000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(splash_msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -512,7 +512,7 @@ static MACHINE_DRIVER_START( roldfrog )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
@@ -550,10 +550,10 @@ static MACHINE_DRIVER_START( funystrp )
/* sound hardware */
// MDRV_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD(YM3812, 3000000)
+// MDRV_SOUND_ADD("ym", YM3812, 3000000)
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
-// MDRV_SOUND_ADD(MSM5205, 384000)
+// MDRV_SOUND_ADD("msm", MSM5205, 384000)
// MDRV_SOUND_CONFIG(msm5205_interface)
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c
index 7af4f184e57..ca0c83dca33 100644
--- a/src/mame/drivers/sprcros2.c
+++ b/src/mame/drivers/sprcros2.c
@@ -331,13 +331,13 @@ static MACHINE_DRIVER_START( sprcros2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489, 10000000/4)
+ MDRV_SOUND_ADD("sn1", SN76489, 10000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76489, 10000000/4)
+ MDRV_SOUND_ADD("sn2", SN76489, 10000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76489, 10000000/4)
+ MDRV_SOUND_ADD("sn3", SN76489, 10000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c
index 5138d9abec6..281e9785d64 100644
--- a/src/mame/drivers/sprint2.c
+++ b/src/mame/drivers/sprint2.c
@@ -524,7 +524,7 @@ static MACHINE_DRIVER_START( sprint2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(sprint2)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c
index 2a3fc8a23c7..4a53aa824e3 100644
--- a/src/mame/drivers/sprint4.c
+++ b/src/mame/drivers/sprint4.c
@@ -425,7 +425,7 @@ static MACHINE_DRIVER_START( sprint4 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(sprint4)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index 8abdfa7a70a..2a8c83c704e 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -563,16 +563,16 @@ static MACHINE_DRIVER_START( spy )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 3579545)
+ MDRV_SOUND_ADD("ym", YM3812, 3579545)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami1", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface_1)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami2", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface_2)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index 20901f68760..b66547be804 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -1090,11 +1090,11 @@ static MACHINE_DRIVER_START( srmp2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 20000000/16)
+ MDRV_SOUND_ADD("ay", AY8910, 20000000/16)
MDRV_SOUND_CONFIG(srmp2_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_DRIVER_END
@@ -1130,11 +1130,11 @@ static MACHINE_DRIVER_START( srmp3 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 16000000/16)
+ MDRV_SOUND_ADD("ay", AY8910, 16000000/16)
MDRV_SOUND_CONFIG(srmp2_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_DRIVER_END
@@ -1166,11 +1166,11 @@ static MACHINE_DRIVER_START( mjyuugi )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 16000000/16)
+ MDRV_SOUND_ADD("ay", AY8910, 16000000/16)
MDRV_SOUND_CONFIG(srmp2_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index 6f178627835..2401fe012b0 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -658,7 +658,7 @@ static MACHINE_DRIVER_START( srmp5 )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(ST0016, 0)
+ MDRV_SOUND_ADD("st", ST0016, 0)
MDRV_SOUND_CONFIG(st0016_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index 5f20b3fc7ef..a8e2efb6a53 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -702,7 +702,7 @@ static MACHINE_DRIVER_START( srmp6 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(NILE, 0)
+ MDRV_SOUND_ADD("nile", NILE, 0)
MDRV_SOUND_CONFIG(nile_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index 9dc53fcc2c6..3f4dde82cf4 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -287,13 +287,13 @@ static MACHINE_DRIVER_START( srumbler )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 4000000)
MDRV_SOUND_ROUTE(0, "mono", 0.10)
MDRV_SOUND_ROUTE(1, "mono", 0.10)
MDRV_SOUND_ROUTE(2, "mono", 0.10)
MDRV_SOUND_ROUTE(3, "mono", 0.30)
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 4000000)
MDRV_SOUND_ROUTE(0, "mono", 0.10)
MDRV_SOUND_ROUTE(1, "mono", 0.10)
MDRV_SOUND_ROUTE(2, "mono", 0.10)
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index 8d5c5e61bbf..830568adc9a 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -373,12 +373,12 @@ static MACHINE_DRIVER_START( sshangha )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, 16000000/4)
+ MDRV_SOUND_ADD("ym", YM2203, 16000000/4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.33)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.33)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.27)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.27)
diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c
index 794699c8a17..e271d29a2e2 100644
--- a/src/mame/drivers/ssingles.c
+++ b/src/mame/drivers/ssingles.c
@@ -275,10 +275,10 @@ static MACHINE_DRIVER_START( ssingles )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000) /* ? MHz */
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000) /* ? MHz */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD(AY8910, 1500000) /* ? MHz */
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000) /* ? MHz */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c
index c2c98c16d9a..7334c8f5b3c 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -754,7 +754,7 @@ static MACHINE_DRIVER_START( sslam )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -787,7 +787,7 @@ static MACHINE_DRIVER_START( powerbls )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000) /* verified on original PCB */
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000) /* verified on original PCB */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c
index 9ac3018a695..63e60563f27 100644
--- a/src/mame/drivers/ssozumo.c
+++ b/src/mame/drivers/ssozumo.c
@@ -260,13 +260,13 @@ static MACHINE_DRIVER_START( ssozumo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c
index 2f2c69bc821..fb29517fe5f 100644
--- a/src/mame/drivers/ssrj.c
+++ b/src/mame/drivers/ssrj.c
@@ -189,7 +189,7 @@ static MACHINE_DRIVER_START( ssrj )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/5)
+ MDRV_SOUND_ADD("ay", AY8910, 8000000/5)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index f6a18ced7da..001d28bdad8 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -2815,7 +2815,7 @@ static MACHINE_DRIVER_START( ssv )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(ES5506, 16000000)
+ MDRV_SOUND_ADD("es", ES5506, 16000000)
MDRV_SOUND_CONFIG(es5506_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c
index fdbf4ee4657..a9aab0c9481 100644
--- a/src/mame/drivers/st0016.c
+++ b/src/mame/drivers/st0016.c
@@ -440,7 +440,7 @@ static MACHINE_DRIVER_START( st0016 )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(ST0016, 0)
+ MDRV_SOUND_ADD("st", ST0016, 0)
MDRV_SOUND_CONFIG(st0016_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index 5574fb994ef..2d32213be50 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -270,17 +270,17 @@ static MACHINE_DRIVER_START( stadhero )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.95)
MDRV_SOUND_ROUTE(1, "mono", 0.95)
MDRV_SOUND_ROUTE(2, "mono", 0.95)
MDRV_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 3000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/starcrus.c b/src/mame/drivers/starcrus.c
index 2b79ef3e37c..826758a2256 100644
--- a/src/mame/drivers/starcrus.c
+++ b/src/mame/drivers/starcrus.c
@@ -193,7 +193,7 @@ static MACHINE_DRIVER_START( starcrus )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index 9d39b3007e7..dcbd934d6ca 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -399,19 +399,19 @@ static MACHINE_DRIVER_START( starwars )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, 1500000)
+ MDRV_SOUND_ADD("pokey1", POKEY, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(POKEY, 1500000)
+ MDRV_SOUND_ADD("pokey2", POKEY, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(POKEY, 1500000)
+ MDRV_SOUND_ADD("pokey3", POKEY, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(POKEY, 1500000)
+ MDRV_SOUND_ADD("pokey4", POKEY, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(TMS5220, 640000)
+ MDRV_SOUND_ADD("tms", TMS5220, 640000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index caa93d38c00..ea67a54052c 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -629,7 +629,7 @@ static MACHINE_DRIVER_START( statriv2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c
index dad83109617..1666b2b103c 100644
--- a/src/mame/drivers/stfight.c
+++ b/src/mame/drivers/stfight.c
@@ -485,19 +485,19 @@ static MACHINE_DRIVER_START( stfight )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 3000000)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.10)
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 3000000)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.10)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index ffc03ce2d88..815b8873867 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -263,7 +263,7 @@ static MACHINE_DRIVER_START( stlforce )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 937500 )
+ MDRV_SOUND_ADD("oki", OKIM6295, 937500 )
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c
index 1726a3c92b3..8b8b53880b7 100644
--- a/src/mame/drivers/strnskil.c
+++ b/src/mame/drivers/strnskil.c
@@ -363,10 +363,10 @@ static MACHINE_DRIVER_START( strnskil )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 8000000/4)
+ MDRV_SOUND_ADD("sn1", SN76496, 8000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD(SN76496, 8000000/2)
+ MDRV_SOUND_ADD("sn2", SN76496, 8000000/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 3735fbd0be8..3b19abf3acb 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -2610,7 +2610,7 @@ static MACHINE_DRIVER_START( stv )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SCSP, 0)
+ MDRV_SOUND_ADD("scsp", SCSP, 0)
MDRV_SOUND_CONFIG(scsp_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c
index 52c77b0950f..4785bedc010 100644
--- a/src/mame/drivers/subs.c
+++ b/src/mame/drivers/subs.c
@@ -219,7 +219,7 @@ static MACHINE_DRIVER_START( subs )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(subs)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c
index f5955817153..82e6729cbaf 100644
--- a/src/mame/drivers/subsino.c
+++ b/src/mame/drivers/subsino.c
@@ -285,10 +285,10 @@ static MACHINE_DRIVER_START( victor5 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2413, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, XTAL_4_433619MHz / 4)
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_4_433619MHz / 4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -325,10 +325,10 @@ static MACHINE_DRIVER_START( srider )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM3812, XTAL_3_579545MHz)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, XTAL_4_433619MHz / 4)
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_4_433619MHz / 4)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index de642389186..1aa5e5ba0c0 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -889,20 +889,20 @@ static MACHINE_DRIVER_START( bssoccer )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "left", 0.20)
MDRV_SOUND_ROUTE(1, "right", 0.20)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac3", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac4", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
@@ -951,14 +951,14 @@ static MACHINE_DRIVER_START( uballoon )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
MACHINE_DRIVER_END
@@ -1003,14 +1003,14 @@ static MACHINE_DRIVER_START( sunaq )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 14318000/4)
+ MDRV_SOUND_ADD("ym", YM2151, 14318000/4)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
MACHINE_DRIVER_END
@@ -1075,26 +1075,26 @@ static MACHINE_DRIVER_START( bestbest )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(AY8910, 24000000/16)
+ MDRV_SOUND_ADD("ay", AY8910, 24000000/16)
MDRV_SOUND_CONFIG(bestbest_ay8910_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(YM3526, 24000000/8)
+ MDRV_SOUND_ADD("ym", YM3526, 24000000/8)
MDRV_SOUND_CONFIG(bestbest_ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac3", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac4", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index 2818e636244..d78c50fe7ea 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -1580,16 +1580,16 @@ static MACHINE_DRIVER_START( hardhead )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(AY8910, 24000000 / 16)
+ MDRV_SOUND_ADD("ay", AY8910, 24000000 / 16)
MDRV_SOUND_CONFIG(hardhead_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(suna8_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
@@ -1635,11 +1635,11 @@ static MACHINE_DRIVER_START( rranger )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
MACHINE_DRIVER_END
@@ -1698,25 +1698,25 @@ static MACHINE_DRIVER_START( brickzn )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_CONFIG(brickzn_ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(AY8910, 24000000 / 16)
+ MDRV_SOUND_ADD("ay", AY8910, 24000000 / 16)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.33)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.33)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.17)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.17)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac3", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.17)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac4", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.17)
MACHINE_DRIVER_END
@@ -1799,16 +1799,16 @@ static MACHINE_DRIVER_START( starfigh )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(AY8910, 24000000 / 16)
+ MDRV_SOUND_ADD("ay", AY8910, 24000000 / 16)
MDRV_SOUND_CONFIG(starfigh_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(suna8_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
@@ -1858,16 +1858,16 @@ static MACHINE_DRIVER_START( sparkman )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(AY8910, 24000000 / 16)
+ MDRV_SOUND_ADD("ay", AY8910, 24000000 / 16)
MDRV_SOUND_CONFIG(hardhead_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(suna8_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index 671a9c1f5cd..10b619f5341 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -400,12 +400,12 @@ static MACHINE_DRIVER_START( supbtime )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.45)
MDRV_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -441,12 +441,12 @@ static MACHINE_DRIVER_START( chinatwn )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.45)
MDRV_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c
index 211045d9eee..3d80ccdc5b9 100644
--- a/src/mame/drivers/supdrapo.c
+++ b/src/mame/drivers/supdrapo.c
@@ -282,7 +282,7 @@ static MACHINE_DRIVER_START( supdrapo )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 8000000/2)
+ MDRV_SOUND_ADD("ay", AY8910, 8000000/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c
index 3ce1e387845..02f54a85676 100644
--- a/src/mame/drivers/superdq.c
+++ b/src/mame/drivers/superdq.c
@@ -359,10 +359,10 @@ static MACHINE_DRIVER_START( superdq )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(SN76496, MASTER_CLOCK/8)
+ MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.8)
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("laserdisc", CUSTOM, 0)
MDRV_SOUND_CONFIG(laserdisc_custom_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index 237ad057a57..66a45336a93 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -1005,11 +1005,11 @@ static MACHINE_DRIVER_START( pbillian )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay", AY8910, 12000000/8)
MDRV_SOUND_CONFIG(pbillian_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(pbillian_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1041,11 +1041,11 @@ static MACHINE_DRIVER_START( hotsmash )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay", AY8910, 12000000/8)
MDRV_SOUND_CONFIG(hotsmash_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(pbillian_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1083,11 +1083,11 @@ static MACHINE_DRIVER_START( sqix )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay1", AY8910, 12000000/8)
MDRV_SOUND_CONFIG(sqix_ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay2", AY8910, 12000000/8)
MDRV_SOUND_CONFIG(sqix_ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -1120,11 +1120,11 @@ static MACHINE_DRIVER_START( sqixbl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay1", AY8910, 12000000/8)
MDRV_SOUND_CONFIG(bootleg_ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 12000000/8)
+ MDRV_SOUND_ADD("ay2", AY8910, 12000000/8)
MDRV_SOUND_CONFIG(bootleg_ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index 55471661710..b32a3f17a0f 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -431,7 +431,7 @@ static MACHINE_DRIVER_START( supertnk )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index 3675e72e416..9c25610fc84 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -315,7 +315,7 @@ static MACHINE_DRIVER_START( suprgolf )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c
index d5d2488239d..9a7b05d4b07 100644
--- a/src/mame/drivers/suprloco.c
+++ b/src/mame/drivers/suprloco.c
@@ -195,10 +195,10 @@ static MACHINE_DRIVER_START( suprloco )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 4000000)
+ MDRV_SOUND_ADD("sn1", SN76496, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76496, 2000000)
+ MDRV_SOUND_ADD("sn2", SN76496, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index 2808eb16426..75abcb27749 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -976,7 +976,7 @@ static MACHINE_DRIVER_START(skns)
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 33333333 / 2)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 33333333 / 2)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c
index 71043d0cefe..092155c8c4b 100644
--- a/src/mame/drivers/suprridr.c
+++ b/src/mame/drivers/suprridr.c
@@ -384,10 +384,10 @@ static MACHINE_DRIVER_START( suprridr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_49_152MHz/32)
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_49_152MHz/32)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, XTAL_49_152MHz/32)
+ MDRV_SOUND_ADD("ay2", AY8910, XTAL_49_152MHz/32)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index fa2663619ef..c20d630fb14 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -353,7 +353,7 @@ static MACHINE_DRIVER_START( suprslam )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index b32e023e03b..67308189a3d 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -261,7 +261,7 @@ static MACHINE_DRIVER_START( surpratk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index 6255ac422f5..9daf202d2c9 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -2514,10 +2514,10 @@ static MACHINE_DRIVER_START( system1 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489A, 2000000)
+ MDRV_SOUND_ADD("sn1", SN76489A, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76489A, 4000000)
+ MDRV_SOUND_ADD("sn2", SN76489A, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index 8eadb0d26cf..29018654c71 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -468,7 +468,7 @@ static MACHINE_DRIVER_START( system16 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("2151", YM2151, 4000000)
+ MDRV_SOUND_ADD("2151", YM2151, 4000000)
MDRV_SOUND_ROUTE(0, "left", 0.32)
MDRV_SOUND_ROUTE(1, "right", 0.32)
MACHINE_DRIVER_END
@@ -484,7 +484,7 @@ static MACHINE_DRIVER_START( system16_7759 )
MDRV_CPU_IO_MAP(sound_readport,sound_writeport_7759)
/* sound hardware */
- MDRV_SOUND_ADD_TAG("7759", UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("7759", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(sys16_upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.48)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.48)
@@ -2026,7 +2026,7 @@ static MACHINE_DRIVER_START( tturfbl )
MDRV_CPU_IO_MAP(tturfbl_sound_readport,tturfbl_sound_writeport)
MDRV_SOUND_REMOVE("7759")
- MDRV_SOUND_ADD_TAG("5205", MSM5205, 220000)
+ MDRV_SOUND_ADD("5205", MSM5205, 220000)
MDRV_SOUND_CONFIG(tturfbl_msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80)
diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c
index 610c276a9e3..c8e912d0d80 100644
--- a/src/mame/drivers/system18.c
+++ b/src/mame/drivers/system18.c
@@ -1115,19 +1115,19 @@ static MACHINE_DRIVER_START( system18 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("3438.0", YM3438, 8000000)
+ MDRV_SOUND_ADD("3438.0", YM3438, 8000000)
MDRV_SOUND_ROUTE(0, "left", 0.40)
MDRV_SOUND_ROUTE(1, "right", 0.40)
MDRV_SOUND_ROUTE(2, "left", 0.40)
MDRV_SOUND_ROUTE(3, "right", 0.40)
- MDRV_SOUND_ADD_TAG("3438.1", YM3438, 8000000)
+ MDRV_SOUND_ADD("3438.1", YM3438, 8000000)
MDRV_SOUND_ROUTE(0, "left", 0.40)
MDRV_SOUND_ROUTE(1, "right", 0.40)
MDRV_SOUND_ROUTE(2, "left", 0.40)
MDRV_SOUND_ROUTE(3, "right", 0.40)
- MDRV_SOUND_ADD_TAG("5c68", RF5C68, 8000000)
+ MDRV_SOUND_ADD("5c68", RF5C68, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
@@ -1168,7 +1168,7 @@ static MACHINE_DRIVER_START( shdancbl )
MDRV_CPU_IO_MAP(shdancbl_sound_readport,shdancbl_sound_writeport)
MDRV_SOUND_REMOVE("5c68")
- MDRV_SOUND_ADD_TAG("5205", MSM5205, 200000)
+ MDRV_SOUND_ADD("5205", MSM5205, 200000)
MDRV_SOUND_CONFIG(shdancbl_msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80)
diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c
index e35a9bbb7a8..fec541d7da6 100644
--- a/src/mame/drivers/tagteam.c
+++ b/src/mame/drivers/tagteam.c
@@ -281,13 +281,13 @@ static MACHINE_DRIVER_START( tagteam )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index 9a034760827..f02344989b2 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -268,7 +268,7 @@ static MACHINE_DRIVER_START( tail2nos )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2608, XTAL_8MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2608, XTAL_8MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2608_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 85d8f39d768..cc7790d7eb0 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -2481,7 +2481,7 @@ static MACHINE_DRIVER_START( rastsag2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface_rsaga2)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -2519,7 +2519,7 @@ static MACHINE_DRIVER_START( ashura )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface_crimec)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -2557,7 +2557,7 @@ static MACHINE_DRIVER_START( crimec )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface_crimec)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -2595,7 +2595,7 @@ static MACHINE_DRIVER_START( tetrist )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface_rsaga2)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -2632,7 +2632,7 @@ static MACHINE_DRIVER_START( tetrista )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 0.25)
@@ -2671,14 +2671,14 @@ static MACHINE_DRIVER_START( hitice )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 0.25)
MDRV_SOUND_ROUTE(2, "mono", 0.25)
MDRV_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -2714,7 +2714,7 @@ static MACHINE_DRIVER_START( rambo3 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, XTAL_16MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2610, XTAL_16MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2610_interface_crimec)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -2752,7 +2752,7 @@ static MACHINE_DRIVER_START( rambo3a )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, XTAL_16MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2610, XTAL_16MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2610_interface_crimec)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -2793,7 +2793,7 @@ static MACHINE_DRIVER_START( pbobble )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610B, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610B, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface_crimec)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -2834,7 +2834,7 @@ static MACHINE_DRIVER_START( spacedx )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface_crimec)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -2872,7 +2872,7 @@ static MACHINE_DRIVER_START( spacedxo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface_crimec)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -2913,7 +2913,7 @@ static MACHINE_DRIVER_START( qzshowby )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610B, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610B, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface_crimec)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -2951,14 +2951,14 @@ static MACHINE_DRIVER_START( viofight )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 0.25)
MDRV_SOUND_ROUTE(2, "mono", 0.25)
MDRV_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -2993,7 +2993,7 @@ static MACHINE_DRIVER_START( masterw )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 0.25)
@@ -3032,7 +3032,7 @@ static MACHINE_DRIVER_START( silentd )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface_rsaga2)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -3070,7 +3070,7 @@ static MACHINE_DRIVER_START( selfeena )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface_crimec)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -3117,7 +3117,7 @@ static MACHINE_DRIVER_START( ryujin )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface_crimec)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -3162,7 +3162,7 @@ static MACHINE_DRIVER_START( sbm )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610B, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610B, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface_crimec)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index 67c483fc8c4..c18ce4feaaa 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -3763,7 +3763,7 @@ static MACHINE_DRIVER_START( taito_f2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 24000000/3) /* Was 16000000/2, but only a 24Mhz OSC */
+ MDRV_SOUND_ADD("ym", YM2610, 24000000/3) /* Was 16000000/2, but only a 24Mhz OSC */
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -4215,14 +4215,14 @@ static MACHINE_DRIVER_START( camltrya )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 24000000/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2203, 24000000/8) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
MDRV_SOUND_ROUTE(2, "mono", 0.20)
MDRV_SOUND_ROUTE(3, "mono", 0.60)
- MDRV_SOUND_ADD(OKIM6295, 4224000/4) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, 4224000/4) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
@@ -4257,7 +4257,7 @@ static MACHINE_DRIVER_START( driveout )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right") /* does it ? */
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index 942fa3321ca..9b18b1ce6d9 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -518,7 +518,7 @@ static MACHINE_DRIVER_START( bubsympb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000 ) // not verified
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000 ) // not verified
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index 82b432b3768..b724ea821c6 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -608,7 +608,7 @@ static MACHINE_DRIVER_START( syvalion )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(syvalion_ym2610_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -647,7 +647,7 @@ static MACHINE_DRIVER_START( recordbr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(syvalion_ym2610_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -686,7 +686,7 @@ static MACHINE_DRIVER_START( dleague )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(dleague_ym2610_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index e5029a69fb4..8f4f6b5014d 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -2204,7 +2204,7 @@ static MACHINE_DRIVER_START( fhawk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("2203", YM2203, 3000000) /* verified on pcb */
+ MDRV_SOUND_ADD("2203", YM2203, 3000000) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_interface_triple)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
@@ -2236,7 +2236,7 @@ static MACHINE_DRIVER_START( champwr )
MDRV_SOUND_ROUTE(2, "mono", 0.20)
MDRV_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -2300,7 +2300,7 @@ static MACHINE_DRIVER_START( kurikint )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("2203", YM2203, 3000000) /* verified on pcb */
+ MDRV_SOUND_ADD("2203", YM2203, 3000000) /* verified on pcb */
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
MDRV_SOUND_ROUTE(2, "mono", 0.20)
@@ -2345,7 +2345,7 @@ static MACHINE_DRIVER_START( plotting )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("2203", YM2203, 3330000) /* verified on pcb */
+ MDRV_SOUND_ADD("2203", YM2203, 3330000) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_interface_single)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
@@ -2440,7 +2440,7 @@ static MACHINE_DRIVER_START( evilston )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("2203", YM2203, 12000000/4) /* not verified */
+ MDRV_SOUND_ADD("2203", YM2203, 12000000/4) /* not verified */
MDRV_SOUND_ROUTE(0, "mono", 0.00)
MDRV_SOUND_ROUTE(1, "mono", 0.00)
MDRV_SOUND_ROUTE(2, "mono", 0.00)
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 7954c94c188..6b07f33b110 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -1033,7 +1033,7 @@ static MACHINE_DRIVER_START( superman )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, XTAL_16MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2610, XTAL_16MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -1072,7 +1072,7 @@ static MACHINE_DRIVER_START( daisenpu )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, XTAL_16MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
@@ -1109,7 +1109,7 @@ static MACHINE_DRIVER_START( gigandes )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ballbros_ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -1148,7 +1148,7 @@ static MACHINE_DRIVER_START( ballbros )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ballbros_ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index 7ce464131ee..2b8850ea418 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -3074,7 +3074,7 @@ static MACHINE_DRIVER_START( contcirc )
MDRV_SPEAKER_ADD("rear", 0.0, 0.0, 1.3)
MDRV_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "subwoofer", 0.20)
MDRV_SOUND_ROUTE(1, "2610.1.l", 2.0)
@@ -3082,16 +3082,16 @@ static MACHINE_DRIVER_START( contcirc )
MDRV_SOUND_ROUTE(2, "2610.2.l", 2.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 2.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
-// MDRV_SOUND_ADD(CUSTOM, subwoofer_interface)
+// MDRV_SOUND_ADD("subwoofer", CUSTOM, subwoofer_interface)
MACHINE_DRIVER_END
@@ -3131,7 +3131,7 @@ static MACHINE_DRIVER_START( chasehq )
MDRV_SPEAKER_ADD("rear", 0.0, 0.0, 1.3)
MDRV_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "subwoofer", 0.20)
MDRV_SOUND_ROUTE(1, "2610.1.l", 1.0)
@@ -3139,13 +3139,13 @@ static MACHINE_DRIVER_START( chasehq )
MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
MACHINE_DRIVER_END
@@ -3186,7 +3186,7 @@ static MACHINE_DRIVER_START( enforce )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -3195,16 +3195,16 @@ static MACHINE_DRIVER_START( enforce )
MDRV_SOUND_ROUTE(2, "2610.2.l", 20.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 20.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
-// MDRV_SOUND_ADD(CUSTOM, subwoofer_interface)
+// MDRV_SOUND_ADD("subwoofer", CUSTOM, subwoofer_interface)
MACHINE_DRIVER_END
@@ -3240,7 +3240,7 @@ static MACHINE_DRIVER_START( bshark )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interfaceb)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -3249,13 +3249,13 @@ static MACHINE_DRIVER_START( bshark )
MDRV_SOUND_ROUTE(2, "2610.2.l", 28.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 28.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MACHINE_DRIVER_END
@@ -3296,7 +3296,7 @@ static MACHINE_DRIVER_START( sci )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -3305,13 +3305,13 @@ static MACHINE_DRIVER_START( sci )
MDRV_SOUND_ROUTE(2, "2610.2.l", 2.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 2.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MACHINE_DRIVER_END
@@ -3354,7 +3354,7 @@ static MACHINE_DRIVER_START( nightstr )
MDRV_SPEAKER_ADD("rear", 0.0, 0.0, 1.3)
MDRV_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "subwoofer", 0.20)
MDRV_SOUND_ROUTE(1, "2610.1.l", 2.0)
@@ -3362,13 +3362,13 @@ static MACHINE_DRIVER_START( nightstr )
MDRV_SOUND_ROUTE(2, "2610.2.l", 2.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 2.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
MACHINE_DRIVER_END
@@ -3409,7 +3409,7 @@ static MACHINE_DRIVER_START( aquajack )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -3418,13 +3418,13 @@ static MACHINE_DRIVER_START( aquajack )
MDRV_SOUND_ROUTE(2, "2610.2.l", 2.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 2.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MACHINE_DRIVER_END
@@ -3461,7 +3461,7 @@ static MACHINE_DRIVER_START( spacegun )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interfaceb)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -3470,13 +3470,13 @@ static MACHINE_DRIVER_START( spacegun )
MDRV_SOUND_ROUTE(2, "2610.2.l", 8.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 8.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MACHINE_DRIVER_END
@@ -3517,7 +3517,7 @@ static MACHINE_DRIVER_START( dblaxle )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -3526,13 +3526,13 @@ static MACHINE_DRIVER_START( dblaxle )
MDRV_SOUND_ROUTE(2, "2610.2.l", 8.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 8.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MACHINE_DRIVER_END
@@ -3572,7 +3572,7 @@ static MACHINE_DRIVER_START( racingb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -3581,13 +3581,13 @@ static MACHINE_DRIVER_START( racingb )
MDRV_SOUND_ROUTE(2, "2610.2.l", 8.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 8.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index 18776082d99..21b0e6c988a 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -627,7 +627,7 @@ static MACHINE_DRIVER_START( airsys )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(airsys_ym2610_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.30)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index 8933766ec0f..e66f69d6325 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -1853,23 +1853,23 @@ static MACHINE_DRIVER_START( nomcu )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 6000000/4)
+ MDRV_SOUND_ADD("ay1", AY8910, 6000000/4)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 6000000/4)
+ MDRV_SOUND_ADD("ay2", AY8910, 6000000/4)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 6000000/4)
+ MDRV_SOUND_ADD("ay3", AY8910, 6000000/4)
MDRV_SOUND_CONFIG(ay8910_interface_3)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, 6000000/4)
+ MDRV_SOUND_ADD("ay4", AY8910, 6000000/4)
MDRV_SOUND_CONFIG(ay8910_interface_4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c
index c56a229bff3..3369ab2de32 100644
--- a/src/mame/drivers/tank8.c
+++ b/src/mame/drivers/tank8.c
@@ -355,7 +355,7 @@ static MACHINE_DRIVER_START( tank8 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(tank8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c
index 8edb965dbcf..c991a65e241 100644
--- a/src/mame/drivers/tankbatt.c
+++ b/src/mame/drivers/tankbatt.c
@@ -297,7 +297,7 @@ static MACHINE_DRIVER_START( tankbatt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index c8e064e72e2..86e44572d64 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -368,11 +368,11 @@ static MACHINE_DRIVER_START( tankbust )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay1", AY8910, 2000000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay2", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index 53b42d0ff56..da5d02f4ba1 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -359,7 +359,7 @@ static MACHINE_DRIVER_START( taotaido )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c
index 0f6a2167b40..c1fe73a6299 100644
--- a/src/mame/drivers/targeth.c
+++ b/src/mame/drivers/targeth.c
@@ -200,7 +200,7 @@ static MACHINE_DRIVER_START( targeth )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index 60d578d166e..0ffb01de4e8 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -865,12 +865,12 @@ static MACHINE_DRIVER_START( apache3 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 16000000/4)
+ MDRV_SOUND_ADD("ym", YM2151, 16000000/4)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4/2)
+ MDRV_SOUND_ADD("oki", OKIM6295, 16000000/4/2)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75)
@@ -908,12 +908,12 @@ static MACHINE_DRIVER_START( roundup5 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 16000000/4)
+ MDRV_SOUND_ADD("ym", YM2151, 16000000/4)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4/2)
+ MDRV_SOUND_ADD("oki", OKIM6295, 16000000/4/2)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75)
@@ -952,12 +952,12 @@ static MACHINE_DRIVER_START( cyclwarr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 16000000/4)
+ MDRV_SOUND_ADD("ym", YM2151, 16000000/4)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 16000000/8)
+ MDRV_SOUND_ADD("oki", OKIM6295, 16000000/8)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75)
@@ -996,12 +996,12 @@ static MACHINE_DRIVER_START( bigfight )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 16000000/4)
+ MDRV_SOUND_ADD("ym", YM2151, 16000000/4)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 16000000/8/2) // Measured value of 2MHz seems too fast
+ MDRV_SOUND_ADD("oki", OKIM6295, 16000000/8/2) // Measured value of 2MHz seems too fast
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75)
diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c
index 3463849dba6..2af05dcf08a 100644
--- a/src/mame/drivers/taxidrvr.c
+++ b/src/mame/drivers/taxidrvr.c
@@ -407,11 +407,11 @@ static MACHINE_DRIVER_START( taxidrvr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1250000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1250000)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1250000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1250000)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index 73f5aa5bef2..eb0931a3d07 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -627,19 +627,19 @@ static MACHINE_DRIVER_START( tbowl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym1", YM3812, 4000000)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym2", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* something for the samples? */
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm1", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm2", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index 17a161460cf..1d0fd217af6 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -445,16 +445,16 @@ static MACHINE_DRIVER_START( tceptor )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 14318180/4)
+ MDRV_SOUND_ADD("ym", YM2151, 14318180/4)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(NAMCO_CUS30, 49152000/2048)
+ MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(0, "left", 0.40)
MDRV_SOUND_ROUTE(1, "right", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c
index d7b47ca9acb..fd7b98d0c57 100644
--- a/src/mame/drivers/tcl.c
+++ b/src/mame/drivers/tcl.c
@@ -136,7 +136,7 @@ static MACHINE_DRIVER_START( tcl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000/6)
+ MDRV_SOUND_ADD("ay", AY8910, 12000000/6)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index 722d9f7136a..898996ab90e 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -590,11 +590,11 @@ static MACHINE_DRIVER_START( rygar )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, XTAL_4MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM3812, XTAL_4MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(MSM5205, XTAL_400kHz) /* verified on pcb, even if schematics shows a 384khz resonator */
+ MDRV_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb, even if schematics shows a 384khz resonator */
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index 1695f0e7c79..370b1ea673f 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -467,12 +467,12 @@ static MACHINE_DRIVER_START( fstarfrc )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 8000000/2)
+ MDRV_SOUND_ADD("ym", YM2151, 8000000/2)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
- MDRV_SOUND_ADD(OKIM6295, 999900)
+ MDRV_SOUND_ADD("oki", OKIM6295, 999900)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
@@ -508,12 +508,12 @@ static MACHINE_DRIVER_START( ginkun )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 8000000/2)
+ MDRV_SOUND_ADD("ym", YM2151, 8000000/2)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
- MDRV_SOUND_ADD(OKIM6295, 999900)
+ MDRV_SOUND_ADD("oki", OKIM6295, 999900)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index 3469751b726..cdb40c1ae9b 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -950,19 +950,19 @@ static MACHINE_DRIVER_START( deroon )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMF262, 14318180)
+ MDRV_SOUND_ADD("ymf", YMF262, 14318180)
MDRV_SOUND_CONFIG(ymf262_interface)
MDRV_SOUND_ROUTE(0, "left", 1.00)
MDRV_SOUND_ROUTE(1, "right", 1.00)
MDRV_SOUND_ROUTE(2, "left", 1.00)
MDRV_SOUND_ROUTE(3, "right", 1.00)
- MDRV_SOUND_ADD(OKIM6295, 16000000/8)
+ MDRV_SOUND_ADD("oki", OKIM6295, 16000000/8)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
- MDRV_SOUND_ADD(YMZ280B, 16900000)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16900000)
MDRV_SOUND_CONFIG(ymz280b_interface)
MDRV_SOUND_ROUTE(0, "left", 0.30)
MDRV_SOUND_ROUTE(1, "right", 0.30)
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index 74582e2fe41..0e6b0fcf6ae 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -696,15 +696,15 @@ static MACHINE_DRIVER_START( tehkanwc )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1536000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1536000)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1536000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1536000)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c
index a00e579b48b..c6ee6cdbe8f 100644
--- a/src/mame/drivers/tempest.c
+++ b/src/mame/drivers/tempest.c
@@ -599,11 +599,11 @@ static MACHINE_DRIVER_START( tempest )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, 12096000/8)
+ MDRV_SOUND_ADD("pokey1", POKEY, 12096000/8)
MDRV_SOUND_CONFIG(pokey_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(POKEY, 12096000/8)
+ MDRV_SOUND_ADD("pokey2", POKEY, 12096000/8)
MDRV_SOUND_CONFIG(pokey_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index 76d351f6b69..919abd86255 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -591,13 +591,13 @@ static MACHINE_DRIVER_START( amazon )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 4000000)
+ MDRV_SOUND_ADD("ym", YM3526, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -629,13 +629,13 @@ static MACHINE_DRIVER_START( ym3526 )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3526, 4000000)
+ MDRV_SOUND_ADD("ym", YM3526, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -667,22 +667,22 @@ static MACHINE_DRIVER_START( ym2203 )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 4000000)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
MDRV_SOUND_ROUTE(2, "mono", 0.20)
MDRV_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 4000000)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
MDRV_SOUND_ROUTE(2, "mono", 0.20)
MDRV_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index 81121aa9227..4c2bf7ea9f8 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -1273,7 +1273,7 @@ static MACHINE_DRIVER_START( tetrisp2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -1306,7 +1306,7 @@ static MACHINE_DRIVER_START( nndmseal )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, XTAL_2MHz)
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_2MHz)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1338,7 +1338,7 @@ static MACHINE_DRIVER_START( rockn )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -1371,7 +1371,7 @@ static MACHINE_DRIVER_START( rockn2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -1418,7 +1418,7 @@ static MACHINE_DRIVER_START( rocknms )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index 9e15be613ca..fa5aae549f9 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -399,7 +399,7 @@ static MACHINE_DRIVER_START( thedeep )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym", YM2203, 3000000)
MDRV_SOUND_CONFIG(thedeep_ym2203_intf)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index 07c99ad2de4..57536fd0b06 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -671,11 +671,11 @@ static MACHINE_DRIVER_START( thepit )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, PIXEL_CLOCK/4)
+ MDRV_SOUND_ADD("ay1", AY8910, PIXEL_CLOCK/4)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, PIXEL_CLOCK/4)
+ MDRV_SOUND_ADD("ay2", AY8910, PIXEL_CLOCK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c
index 141b95084c2..b13c3c31ab0 100644
--- a/src/mame/drivers/thief.c
+++ b/src/mame/drivers/thief.c
@@ -482,13 +482,13 @@ static MACHINE_DRIVER_START( sharkatt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 4000000/4)
+ MDRV_SOUND_ADD("ay1", AY8910, 4000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(AY8910, 4000000/4)
+ MDRV_SOUND_ADD("ay2", AY8910, 4000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(sharkatt_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -518,13 +518,13 @@ static MACHINE_DRIVER_START( thief )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 4000000/4)
+ MDRV_SOUND_ADD("ay1", AY8910, 4000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(AY8910, 4000000/4)
+ MDRV_SOUND_ADD("ay2", AY8910, 4000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(thief_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -554,13 +554,13 @@ static MACHINE_DRIVER_START( natodef )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 4000000/4)
+ MDRV_SOUND_ADD("ay1", AY8910, 4000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(AY8910, 4000000/4)
+ MDRV_SOUND_ADD("ay2", AY8910, 4000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(natodef_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c
index 4205caf2109..163074611a7 100644
--- a/src/mame/drivers/thoop2.c
+++ b/src/mame/drivers/thoop2.c
@@ -217,7 +217,7 @@ static MACHINE_DRIVER_START( thoop2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index cb18469c9e9..85603871067 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -725,11 +725,11 @@ static MACHINE_DRIVER_START( scontra )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
@@ -767,7 +767,7 @@ static MACHINE_DRIVER_START( thunderx )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c
index 012d4a92f39..dbe4e3ff789 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -301,7 +301,7 @@ static MACHINE_DRIVER_START( tiamc1 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("2 x 8253", CUSTOM, 16000000/9)
+ MDRV_SOUND_ADD("2 x 8253", CUSTOM, 16000000/9)
MDRV_SOUND_CONFIG(tiamc1_custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c
index cc7d5c02905..5c4e1e83fef 100644
--- a/src/mame/drivers/tickee.c
+++ b/src/mame/drivers/tickee.c
@@ -443,11 +443,11 @@ static MACHINE_DRIVER_START( tickee )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2149, VIDEO_CLOCK/8)
+ MDRV_SOUND_ADD("ym1", YM2149, VIDEO_CLOCK/8)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(YM2149, VIDEO_CLOCK/8)
+ MDRV_SOUND_ADD("ym2", YM2149, VIDEO_CLOCK/8)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index 24fb2e28f2f..1f29abbf91f 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -580,11 +580,11 @@ static MACHINE_DRIVER_START( tigeroad )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
@@ -602,7 +602,7 @@ static MACHINE_DRIVER_START( toramich )
MDRV_CPU_PERIODIC_INT(irq0_line_hold,4000) /* ? */
/* sound hardware */
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c
index d686cba8930..cf360a9fe8f 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -297,10 +297,10 @@ static MACHINE_DRIVER_START( timelimt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 18432000/12)
+ MDRV_SOUND_ADD("ay1", AY8910, 18432000/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 18432000/12)
+ MDRV_SOUND_ADD("ay2", AY8910, 18432000/12)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 164f67adf15..dd4635051d1 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -799,7 +799,7 @@ static MACHINE_DRIVER_START( tm3k )
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("OKI",OKIM6295, XTAL_32MHz / 16) /* 2MHz */
+ MDRV_SOUND_ADD("OKI",OKIM6295, XTAL_32MHz / 16) /* 2MHz */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -857,7 +857,7 @@ static MACHINE_DRIVER_START( galgames )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, XTAL_24MHz / 8) // ??
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_24MHz / 8) // ??
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 3f512835d82..44ef6dbba80 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -2365,7 +2365,7 @@ static MACHINE_DRIVER_START( cuebrick )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz)
MDRV_SOUND_CONFIG(ym2151_interface_cbj)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -2400,11 +2400,11 @@ static MACHINE_DRIVER_START( mia )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ADD(K007232, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("konami", K007232, XTAL_3_579545MHz)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
@@ -2448,20 +2448,20 @@ static MACHINE_DRIVER_START( tmnt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ADD(K007232, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("konami", K007232, XTAL_3_579545MHz)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ADD(UPD7759, XTAL_640kHz)
+ MDRV_SOUND_ADD("upd", UPD7759, XTAL_640kHz)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -2496,11 +2496,11 @@ static MACHINE_DRIVER_START( punkshot )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ADD(K053260, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz)
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -2534,11 +2534,11 @@ static MACHINE_DRIVER_START( lgtnfght )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K053260, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz)
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(0, "left", 0.70)
MDRV_SOUND_ROUTE(1, "right", 0.70)
@@ -2577,11 +2577,11 @@ static MACHINE_DRIVER_START( blswhstl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz)
MDRV_SOUND_ROUTE(0, "left", 0.70)
MDRV_SOUND_ROUTE(1, "right", 0.70)
- MDRV_SOUND_ADD(K053260, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz)
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(0, "right", 0.50) /* fixed inverted stereo channels */
MDRV_SOUND_ROUTE(1, "left", 0.50)
@@ -2635,7 +2635,7 @@ static MACHINE_DRIVER_START( glfgreat )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K053260, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz)
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2687,7 +2687,7 @@ static MACHINE_DRIVER_START( prmrsocr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2730,11 +2730,11 @@ static MACHINE_DRIVER_START( tmnt2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K053260, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz)
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
@@ -2773,11 +2773,11 @@ static MACHINE_DRIVER_START( ssriders )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K053260, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz)
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(0, "left", 0.70)
MDRV_SOUND_ROUTE(1, "right", 0.70)
@@ -2811,7 +2811,7 @@ static MACHINE_DRIVER_START( sunsetbl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -2848,11 +2848,11 @@ static MACHINE_DRIVER_START( thndrx2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K053260, XTAL_3_579545MHz)
+ MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz)
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index 9b8ed5b2eb8..b12b20b6857 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -1410,7 +1410,7 @@ static MACHINE_DRIVER_START( arknoid2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -1449,7 +1449,7 @@ static MACHINE_DRIVER_START( drtoppel )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_12MHz/4)
+ MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -1495,7 +1495,7 @@ static MACHINE_DRIVER_START( tnzs )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_12MHz/4)
+ MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -1533,7 +1533,7 @@ static MACHINE_DRIVER_START( insectx )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -1571,14 +1571,14 @@ static MACHINE_DRIVER_START( kageki )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(kageki_ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1620,7 +1620,7 @@ static MACHINE_DRIVER_START( tnzsb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("ym2203", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ym2203", YM2203, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203b_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
@@ -1647,7 +1647,7 @@ static MACHINE_DRIVER_START( kabukiz )
MDRV_SOUND_ROUTE(2, "mono", 1.0)
MDRV_SOUND_ROUTE(3, "mono", 2.0)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1682,7 +1682,7 @@ static MACHINE_DRIVER_START( jpopnics )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_12MHz/4) /* Not verified - Main board Crystal is 12MHz */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_12MHz/4) /* Not verified - Main board Crystal is 12MHz */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index 30235872d89..51f9c5883dc 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -1268,7 +1268,7 @@ static MACHINE_DRIVER_START( rallybik )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 28000000/8)
+ MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1308,7 +1308,7 @@ static MACHINE_DRIVER_START( truxton )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 28000000/8)
+ MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1348,7 +1348,7 @@ static MACHINE_DRIVER_START( hellfire )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 28000000/8)
+ MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1388,7 +1388,7 @@ static MACHINE_DRIVER_START( zerowing )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 28000000/8)
+ MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1432,7 +1432,7 @@ static MACHINE_DRIVER_START( demonwld )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 28000000/8)
+ MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1466,7 +1466,7 @@ static MACHINE_DRIVER_START( samesame )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 28000000/8)
+ MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1506,7 +1506,7 @@ static MACHINE_DRIVER_START( outzone )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 28000000/8)
+ MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1540,7 +1540,7 @@ static MACHINE_DRIVER_START( vimana )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, XTAL_28MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM3812, XTAL_28MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 10348109d05..83ab43e9ccb 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -3457,7 +3457,7 @@ static MACHINE_DRIVER_START( tekipaki )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 27000000/8)
+ MDRV_SOUND_ADD("ym", YM3812, 27000000/8)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3496,7 +3496,7 @@ static MACHINE_DRIVER_START( ghox )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_27MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3535,10 +3535,10 @@ static MACHINE_DRIVER_START( dogyuun )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_27MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, XTAL_25MHz/24) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_25MHz/24) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3579,10 +3579,10 @@ static MACHINE_DRIVER_START( kbash )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 27000000/8)
+ MDRV_SOUND_ADD("ym", YM2151, 27000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32000000/32)
+ MDRV_SOUND_ADD("oki", OKIM6295, 32000000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3615,11 +3615,11 @@ static MACHINE_DRIVER_START( kbash2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 16000000/16)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 16000000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 16000000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 16000000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3653,10 +3653,10 @@ static MACHINE_DRIVER_START( truxton2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_27MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, XTAL_16MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_16MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3695,7 +3695,7 @@ static MACHINE_DRIVER_START( pipibibs )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, XTAL_27MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM3812, XTAL_27MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3735,7 +3735,7 @@ static MACHINE_DRIVER_START( whoopee )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 27000000/8)
+ MDRV_SOUND_ADD("ym", YM3812, 27000000/8)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3774,7 +3774,7 @@ static MACHINE_DRIVER_START( pipibibi )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 27000000/8)
+ MDRV_SOUND_ADD("ym", YM3812, 27000000/8)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3815,10 +3815,10 @@ static MACHINE_DRIVER_START( fixeight )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, XTAL_27MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym", YM2151, XTAL_27MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, XTAL_16MHz/16) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_16MHz/16) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3851,7 +3851,7 @@ static MACHINE_DRIVER_START( fixeighb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 14000000/16)
+ MDRV_SOUND_ADD("oki", OKIM6295, 14000000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3891,7 +3891,7 @@ static MACHINE_DRIVER_START( vfive )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 27000000/8)
+ MDRV_SOUND_ADD("ym", YM2151, 27000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3947,11 +3947,11 @@ static MACHINE_DRIVER_START( batsugun )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 27000000/8)
+ MDRV_SOUND_ADD("ym", YM2151, 27000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MDRV_SOUND_CONFIG(batsugun_ym2151_interface)
- MDRV_SOUND_ADD(OKIM6295, 32000000/8)
+ MDRV_SOUND_ADD("oki", OKIM6295, 32000000/8)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -3985,10 +3985,10 @@ static MACHINE_DRIVER_START( snowbro2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 27000000/8)
+ MDRV_SOUND_ADD("ym", YM2151, 27000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 27000000/10)
+ MDRV_SOUND_ADD("oki", OKIM6295, 27000000/10)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -4027,10 +4027,10 @@ static MACHINE_DRIVER_START( mahoudai )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 27000000/8)
+ MDRV_SOUND_ADD("ym", YM2151, 27000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32000000/32)
+ MDRV_SOUND_ADD("oki", OKIM6295, 32000000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -4069,10 +4069,10 @@ static MACHINE_DRIVER_START( shippumd )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 27000000/8)
+ MDRV_SOUND_ADD("ym", YM2151, 27000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono",1.0)
- MDRV_SOUND_ADD(OKIM6295, 32000000/32)
+ MDRV_SOUND_ADD("oki", OKIM6295, 32000000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -4111,10 +4111,10 @@ static MACHINE_DRIVER_START( bgaregga )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 32000000/8)
+ MDRV_SOUND_ADD("ym", YM2151, 32000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32000000/16)
+ MDRV_SOUND_ADD("oki", OKIM6295, 32000000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -4153,14 +4153,14 @@ static MACHINE_DRIVER_START( batrider )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 32000000/8)
+ MDRV_SOUND_ADD("ym", YM2151, 32000000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32000000/10)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32000000/10)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 32000000/10)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32000000/10)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -4200,7 +4200,7 @@ static MACHINE_DRIVER_START( bbakraid )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index 475657382dc..14b6d1527d9 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -494,10 +494,10 @@ static MACHINE_DRIVER_START( tokib )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 3579545)
+ MDRV_SOUND_ADD("ym", YM3812, 3579545)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/topshoot.c b/src/mame/drivers/topshoot.c
index cb60dc1018c..b51a8294b79 100644
--- a/src/mame/drivers/topshoot.c
+++ b/src/mame/drivers/topshoot.c
@@ -266,7 +266,7 @@ static MACHINE_DRIVER_START( genesis_base )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3438, MASTER_CLOCK/7)
+ MDRV_SOUND_ADD("ym", YM3438, MASTER_CLOCK/7)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MACHINE_DRIVER_END
@@ -284,7 +284,7 @@ static MACHINE_DRIVER_START( topshoot )
MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 223)
/* sound hardware */
- MDRV_SOUND_ADD(SN76496, MASTER_CLOCK/15)
+ MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/15)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index 810ca17f203..60c74668e4a 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -726,12 +726,12 @@ static MACHINE_DRIVER_START( topspeed )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.30)
MDRV_SOUND_ROUTE(1, "mono", 0.30)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index 38ce3ea85dc..1252c96fb6b 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -419,11 +419,11 @@ static MACHINE_DRIVER_START( toratora )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn1", SN76477, 0)
MDRV_SOUND_CONFIG(sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(SN76477, 0)
+ MDRV_SOUND_ADD("sn2", SN76477, 0)
MDRV_SOUND_CONFIG(sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c
index 2ebf3be9867..63e63499baf 100644
--- a/src/mame/drivers/tourtabl.c
+++ b/src/mame/drivers/tourtabl.c
@@ -226,7 +226,7 @@ static MACHINE_DRIVER_START( tourtabl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(TIA, MASTER_CLOCK/114)
+ MDRV_SOUND_ADD("tia", TIA, MASTER_CLOCK/114)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index 1ce4194860d..3a45911733e 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -603,7 +603,7 @@ static MACHINE_DRIVER_START( liblrabl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NAMCO_15XX, 24000)
+ MDRV_SOUND_ADD("namco", NAMCO_15XX, 24000)
MDRV_SOUND_CONFIG(namco_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c
index b8fc4ae0421..e1d96aface4 100644
--- a/src/mame/drivers/tp84.c
+++ b/src/mame/drivers/tp84.c
@@ -450,20 +450,20 @@ static MACHINE_DRIVER_START( tp84 )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76489A, XTAL_14_31818MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("sn1", SN76489A, XTAL_14_31818MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 0.75)
- MDRV_SOUND_ADD(SN76489A, XTAL_14_31818MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("sn2", SN76489A, XTAL_14_31818MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "filter2", 0.75)
- MDRV_SOUND_ADD(SN76489A, XTAL_14_31818MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("sn3", SN76489A, XTAL_14_31818MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "filter3", 0.75)
- MDRV_SOUND_ADD_TAG("filter1", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter1", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter2", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter2", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD_TAG("filter3", FILTER_RC, 0)
+ MDRV_SOUND_ADD("filter3", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index 95f8352ae47..d65a3767a15 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -828,13 +828,13 @@ static MACHINE_DRIVER_START( trackfld )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(SN76496, 14318180/8)
+ MDRV_SOUND_ADD("sn", SN76496, 14318180/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(VLM5030, 3580000)
+ MDRV_SOUND_ADD("vlm", VLM5030, 3580000)
MDRV_SOUND_CONFIG(trackfld_vlm5030_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -872,13 +872,13 @@ static MACHINE_DRIVER_START( hyprolyb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD(SN76496, 14318180/8)
+ MDRV_SOUND_ADD("sn", SN76496, 14318180/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c
index 12b77a6797f..d572a27e3c8 100644
--- a/src/mame/drivers/triplhnt.c
+++ b/src/mame/drivers/triplhnt.c
@@ -338,11 +338,11 @@ static MACHINE_DRIVER_START( triplhnt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAMPLES, 0)
+ MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(triplhnt_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(triplhnt)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c
index e4d85ab5ffa..d7098f90f01 100644
--- a/src/mame/drivers/truco.c
+++ b/src/mame/drivers/truco.c
@@ -161,7 +161,7 @@ static MACHINE_DRIVER_START( truco )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c
index c33790c08e0..52501163824 100644
--- a/src/mame/drivers/trucocl.c
+++ b/src/mame/drivers/trucocl.c
@@ -157,7 +157,7 @@ static MACHINE_DRIVER_START( trucocl )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c
index 108f4ef0249..264c8676a09 100644
--- a/src/mame/drivers/trvmadns.c
+++ b/src/mame/drivers/trvmadns.c
@@ -300,7 +300,7 @@ static MACHINE_DRIVER_START( trvmadns )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 10000000/2/4) //?
+ MDRV_SOUND_ADD("ay", AY8910, 10000000/2/4) //?
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index e2b26bc987c..e6d8c44a180 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -217,10 +217,10 @@ static MACHINE_DRIVER_START( trvquest )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index 932c8ba47dc..30454ee4614 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -216,7 +216,7 @@ static MACHINE_DRIVER_START( tryout )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym", YM2203, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index 94119467424..9c37581d13f 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -782,13 +782,13 @@ static MACHINE_DRIVER_START( tsamurai )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -833,13 +833,13 @@ static MACHINE_DRIVER_START( m660 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
@@ -874,10 +874,10 @@ static MACHINE_DRIVER_START( vsgongf )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index 18e32407a38..873d7d44b59 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -939,15 +939,15 @@ static MACHINE_DRIVER_START( tubep )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 19968000 / 8 / 2)
+ MDRV_SOUND_ADD("ay1", AY8910, 19968000 / 8 / 2)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(AY8910, 19968000 / 8 / 2)
+ MDRV_SOUND_ADD("ay2", AY8910, 19968000 / 8 / 2)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(AY8910, 19968000 / 8 / 2)
+ MDRV_SOUND_ADD("ay3", AY8910, 19968000 / 8 / 2)
MDRV_SOUND_CONFIG(ay8910_interface_3)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
@@ -1003,19 +1003,19 @@ static MACHINE_DRIVER_START( rjammer )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 19968000 / 8 / 2)
+ MDRV_SOUND_ADD("ay1", AY8910, 19968000 / 8 / 2)
MDRV_SOUND_CONFIG(ay8910_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(AY8910, 19968000 / 8 / 2)
+ MDRV_SOUND_ADD("ay2", AY8910, 19968000 / 8 / 2)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(AY8910, 19968000 / 8 / 2)
+ MDRV_SOUND_ADD("ay3", AY8910, 19968000 / 8 / 2)
MDRV_SOUND_CONFIG(ay8910_interface_3)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c
index 6b688647bbc..7b9058ff48e 100644
--- a/src/mame/drivers/tugboat.c
+++ b/src/mame/drivers/tugboat.c
@@ -326,7 +326,7 @@ static MACHINE_DRIVER_START( tugboat )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index a5680255dc4..f8b7ae2c49c 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -2165,7 +2165,7 @@ static MACHINE_DRIVER_START( tumblepb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 8000000/10)
+ MDRV_SOUND_ADD("oki", OKIM6295, 8000000/10)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -2195,7 +2195,7 @@ static MACHINE_DRIVER_START( tumbleb2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 8000000/10)
+ MDRV_SOUND_ADD("oki", OKIM6295, 8000000/10)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -2228,7 +2228,7 @@ static MACHINE_DRIVER_START( jumpkids )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 8000000/8)
+ MDRV_SOUND_ADD("oki", OKIM6295, 8000000/8)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
@@ -2256,11 +2256,11 @@ static MACHINE_DRIVER_START( fncywld )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_ROUTE(0, "left", 0.20)
MDRV_SOUND_ROUTE(1, "right", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -2321,12 +2321,12 @@ static MACHINE_DRIVER_START( htchctch )
/* sound hardware - same as hyperpac */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD_TAG("ym2151", YM2151, 3427190)
+ MDRV_SOUND_ADD("ym2151", YM2151, 3427190)
MDRV_SOUND_CONFIG(semicom_ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.10)
MDRV_SOUND_ROUTE(1, "right", 0.10)
- MDRV_SOUND_ADD(OKIM6295, 1024000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1024000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -2396,11 +2396,11 @@ static MACHINE_DRIVER_START( jumppop )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3812, 3500000)
+ MDRV_SOUND_ADD("ym", YM3812, 3500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.70)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.70)
- MDRV_SOUND_ADD(OKIM6295, 875000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 875000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
@@ -2434,7 +2434,7 @@ static MACHINE_DRIVER_START( suprtrio )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 875000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 875000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
@@ -2464,7 +2464,7 @@ static MACHINE_DRIVER_START( pangpang )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 8000000/10)
+ MDRV_SOUND_ADD("oki", OKIM6295, 8000000/10)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index 87e45debea3..b0eae66e501 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -326,12 +326,12 @@ static MACHINE_DRIVER_START( tumblep )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 1023924)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1023924)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c
index b10ac58edfe..7513cef6ed7 100644
--- a/src/mame/drivers/tunhunt.c
+++ b/src/mame/drivers/tunhunt.c
@@ -332,11 +332,11 @@ static MACHINE_DRIVER_START( tunhunt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(POKEY, 1209600)
+ MDRV_SOUND_ADD("pokey1", POKEY, 1209600)
MDRV_SOUND_CONFIG(pokey_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(POKEY, 1209600)
+ MDRV_SOUND_ADD("pokey2", POKEY, 1209600)
MDRV_SOUND_CONFIG(pokey_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index 6fb6ae7f18d..53ff4e87aec 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -947,18 +947,18 @@ static MACHINE_DRIVER_START( twin16 )
// sound hardware
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 7159160/2)
+ MDRV_SOUND_ADD("ym", YM2151, 7159160/2)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "left", 0.20)
MDRV_SOUND_ROUTE(0, "right", 0.20)
MDRV_SOUND_ROUTE(1, "left", 0.20)
MDRV_SOUND_ROUTE(1, "right", 0.20)
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.20)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.20)
@@ -1001,18 +1001,18 @@ static MACHINE_DRIVER_START( fround )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 7159160/2)
+ MDRV_SOUND_ADD("ym", YM2151, 7159160/2)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(k007232_interface)
MDRV_SOUND_ROUTE(0, "left", 0.20)
MDRV_SOUND_ROUTE(0, "right", 0.20)
MDRV_SOUND_ROUTE(1, "left", 0.20)
MDRV_SOUND_ROUTE(1, "right", 0.20)
- MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK)
+ MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_CONFIG(upd7759_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.20)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.20)
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index 08644c2ed4d..23b2ae744cb 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -685,7 +685,7 @@ static MACHINE_DRIVER_START( twincobr )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 28000000/8)
+ MDRV_SOUND_ADD("ym", YM3812, 28000000/8)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 7916192eb3e..99153a7c423 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -188,7 +188,7 @@ static MACHINE_DRIVER_START( twins )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -276,7 +276,7 @@ static MACHINE_DRIVER_START( twinsa )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_16MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ay", AY8910, XTAL_16MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index f037a7a5bd5..0a9a99024cb 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -743,12 +743,12 @@ static MACHINE_DRIVER_START( tx1 )
MDRV_SPEAKER_STANDARD_STEREO("Front Left", "Front Right")
// MDRV_SPEAKER_STANDARD_STEREO("Rear Left", "Rear Right")
- MDRV_SOUND_ADD(AY8910, TX1_PIXEL_CLOCK / 8)
+ MDRV_SOUND_ADD("ay", AY8910, TX1_PIXEL_CLOCK / 8)
MDRV_SOUND_CONFIG(tx1_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "Front Left", 0.1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "Front Right", 0.1)
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("tx1", CUSTOM, 0)
MDRV_SOUND_CONFIG(tx1_custom_interface)
MDRV_SOUND_ROUTE(0, "Front Left", 0.2)
MDRV_SOUND_ROUTE(1, "Front Right", 0.2)
@@ -798,15 +798,15 @@ static MACHINE_DRIVER_START( buggyboy )
MDRV_SPEAKER_STANDARD_STEREO("Front Left", "Front Right")
// MDRV_SPEAKER_STANDARD_STEREO("Rear Left", "Rear Right")
- MDRV_SOUND_ADD(YM2149, BUGGYBOY_ZCLK / 4)
+ MDRV_SOUND_ADD("ym1", YM2149, BUGGYBOY_ZCLK / 4)
MDRV_SOUND_CONFIG(buggyboy_ym2149_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "Front Left", 0.15)
- MDRV_SOUND_ADD(YM2149, BUGGYBOY_ZCLK / 4)
+ MDRV_SOUND_ADD("ym2", YM2149, BUGGYBOY_ZCLK / 4)
MDRV_SOUND_CONFIG(buggyboy_ym2149_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "Front Right", 0.15)
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("buggyboy", CUSTOM, 0)
MDRV_SOUND_CONFIG(bb_custom_interface)
MDRV_SOUND_ROUTE(0, "Front Left", 0.2)
MDRV_SOUND_ROUTE(1, "Front Right", 0.2)
@@ -851,15 +851,15 @@ static MACHINE_DRIVER_START( buggybjr )
MDRV_SPEAKER_STANDARD_STEREO("Front Left", "Front Right")
// MDRV_SPEAKER_STANDARD_STEREO("Rear Left", "Rear Right")
- MDRV_SOUND_ADD(YM2149, BUGGYBOY_ZCLK / 4)
+ MDRV_SOUND_ADD("ym1", YM2149, BUGGYBOY_ZCLK / 4)
MDRV_SOUND_CONFIG(buggyboy_ym2149_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "Front Left", 0.15)
- MDRV_SOUND_ADD(YM2149, BUGGYBOY_ZCLK / 4)
+ MDRV_SOUND_ADD("ym2", YM2149, BUGGYBOY_ZCLK / 4)
MDRV_SOUND_CONFIG(buggyboy_ym2149_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "Front Right", 0.15)
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("buggyboy", CUSTOM, 0)
MDRV_SOUND_CONFIG(bb_custom_interface)
MDRV_SOUND_ROUTE(0, "Front Left", 0.2)
MDRV_SOUND_ROUTE(1, "Front Right", 0.2)
diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c
index c984197b280..d1cf18e4552 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -205,7 +205,7 @@ static MACHINE_DRIVER_START( uapce )
MDRV_VIDEO_UPDATE( pce )
MDRV_SPEAKER_STANDARD_STEREO("left","right")
- MDRV_SOUND_ADD(C6280, PCE_MAIN_CLOCK/6)
+ MDRV_SOUND_ADD("huc", C6280, PCE_MAIN_CLOCK/6)
MDRV_SOUND_ROUTE(0, "left", 1.00)
MDRV_SOUND_ROUTE(1, "right", 1.00)
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index 68250f1de37..36192b6e51d 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -275,11 +275,11 @@ static MACHINE_DRIVER_START( ultraman )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 24000000/6)
+ MDRV_SOUND_ADD("ym", YM2151, 24000000/6)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c
index ae360da8fbc..5d33736d6d0 100644
--- a/src/mame/drivers/ultratnk.c
+++ b/src/mame/drivers/ultratnk.c
@@ -312,7 +312,7 @@ static MACHINE_DRIVER_START( ultratnk )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(ultratnk)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index 16afa777355..70a1c063db2 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -267,7 +267,7 @@ static MACHINE_DRIVER_START( ultrsprt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 79bf4e406c2..ff3031a1972 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -697,11 +697,11 @@ static MACHINE_DRIVER_START( burglarx )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */
+ MDRV_SOUND_ADD("ym", YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80)
@@ -744,11 +744,11 @@ static MACHINE_DRIVER_START( zeropnt )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */
+ MDRV_SOUND_ADD("ym", YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80)
@@ -788,15 +788,15 @@ static MACHINE_DRIVER_START( zeropnt2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "left", 0.70)
MDRV_SOUND_ROUTE(1, "right", 0.70)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40)
- MDRV_SOUND_ADD(OKIM6295, 3960000)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 3960000)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.20)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c
index 5bcd62375ef..fc7cd0aef0b 100644
--- a/src/mame/drivers/upscope.c
+++ b/src/mame/drivers/upscope.c
@@ -314,7 +314,7 @@ static MACHINE_DRIVER_START( upscope )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(CUSTOM, 3579545)
+ MDRV_SOUND_ADD("amiga", CUSTOM, 3579545)
MDRV_SOUND_CONFIG(amiga_custom_interface)
MDRV_SOUND_ROUTE(0, "right", 0.50)
MDRV_SOUND_ROUTE(1, "left", 0.50)
diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c
index b5f063d9f58..3174c9f960b 100644
--- a/src/mame/drivers/usgames.c
+++ b/src/mame/drivers/usgames.c
@@ -286,7 +286,7 @@ static MACHINE_DRIVER_START( usg32 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index af6a67ecf10..ce6817f00c1 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -604,11 +604,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sound_ym_oki )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 14318180/4)
+ MDRV_SOUND_ADD("ym", YM2151, 14318180/4)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(OKIM6295, 1789772.5 )
+ MDRV_SOUND_ADD("oki", OKIM6295, 1789772.5 )
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c
index c8f8290a814..e56ac8bb838 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -271,19 +271,19 @@ static MACHINE_DRIVER_START( vaportra )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 32220000/8)
+ MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD(YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.60)
MDRV_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD(OKIM6295, 32220000/32)
+ MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD(OKIM6295, 32220000/16)
+ MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16)
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c
index 6ea2ee4a5e4..357534c817e 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -339,7 +339,7 @@ static MACHINE_DRIVER_START( vastar )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index 84b65e6b013..9ad637c8894 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -425,12 +425,12 @@ static MACHINE_DRIVER_START( vball )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
@@ -464,12 +464,12 @@ static MACHINE_DRIVER_START( vball2pj )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.60)
MDRV_SOUND_ROUTE(1, "right", 0.60)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index ad53cac9fdd..c4ce86510e9 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -609,11 +609,11 @@ static MACHINE_DRIVER_START( vendetta )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545) /* verified with PCB */
+ MDRV_SOUND_ADD("ym", YM2151, 3579545) /* verified with PCB */
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD(K053260, 3579545) /* verified with PCB */
+ MDRV_SOUND_ADD("konami", K053260, 3579545) /* verified with PCB */
MDRV_SOUND_CONFIG(k053260_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index d85a5ffbf18..67e08e17ff6 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -343,7 +343,7 @@ static MACHINE_DRIVER_START( videopin )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("discrete", DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(videopin)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index 79b262aa9d7..dacd2e967fc 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -558,12 +558,12 @@ static MACHINE_DRIVER_START( vigilant )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579645)
+ MDRV_SOUND_ADD("ym", YM2151, 3579645)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.55)
MDRV_SOUND_ROUTE(1, "right", 0.55)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
@@ -601,7 +601,7 @@ static MACHINE_DRIVER_START( buccanrs )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2203, 18432000/6)
+ MDRV_SOUND_ADD("ym1", YM2203, 18432000/6)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "left", 0.35)
MDRV_SOUND_ROUTE(0, "right", 0.35)
@@ -612,7 +612,7 @@ static MACHINE_DRIVER_START( buccanrs )
MDRV_SOUND_ROUTE(3, "left", 0.50)
MDRV_SOUND_ROUTE(3, "right", 0.50)
- MDRV_SOUND_ADD(YM2203, 18432000/6)
+ MDRV_SOUND_ADD("ym2", YM2203, 18432000/6)
MDRV_SOUND_ROUTE(0, "left", 0.35)
MDRV_SOUND_ROUTE(0, "right", 0.35)
MDRV_SOUND_ROUTE(1, "left", 0.35)
@@ -622,7 +622,7 @@ static MACHINE_DRIVER_START( buccanrs )
MDRV_SOUND_ROUTE(3, "left", 0.50)
MDRV_SOUND_ROUTE(3, "right", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35)
MACHINE_DRIVER_END
@@ -660,12 +660,12 @@ static MACHINE_DRIVER_START( kikcubic )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579645)
+ MDRV_SOUND_ADD("ym", YM2151, 3579645)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.55)
MDRV_SOUND_ROUTE(1, "right", 0.55)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index 729b1be836f..cd4eb6db482 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -444,12 +444,12 @@ static MACHINE_DRIVER_START( varia )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1320000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1320000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75)
- MDRV_SOUND_ADD(ES8712, 12000)
+ MDRV_SOUND_ADD("es", ES8712, 12000)
MDRV_SOUND_CONFIG(es8712_interface_region_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index 4ba1c7b1a33..e7ae18528d3 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -265,7 +265,7 @@ static MACHINE_DRIVER_START( volfied )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 4000000)
+ MDRV_SOUND_ADD("ym", YM2203, 4000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index 7110a1bb77d..96be9b6a55c 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -289,7 +289,7 @@ static MACHINE_DRIVER_START( vroulet )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD("ay", AY8910, 2000000)
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c
index 4021c850ffa..14d0e0f466b 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -2055,11 +2055,11 @@ static MACHINE_DRIVER_START( vsnes )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NES, N2A03_DEFAULTCLOCK)
+ MDRV_SOUND_ADD("nes", NES, N2A03_DEFAULTCLOCK)
MDRV_SOUND_CONFIG(nes_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -2098,18 +2098,18 @@ static MACHINE_DRIVER_START( vsdual )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(NES, N2A03_DEFAULTCLOCK)
+ MDRV_SOUND_ADD("nes1", NES, N2A03_DEFAULTCLOCK)
MDRV_SOUND_CONFIG(nes_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(NES, N2A03_DEFAULTCLOCK)
+ MDRV_SOUND_ADD("nes2", NES, N2A03_DEFAULTCLOCK)
MDRV_SOUND_CONFIG(nes_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c
index b802dd5456d..e6832c3b548 100644
--- a/src/mame/drivers/vulgus.c
+++ b/src/mame/drivers/vulgus.c
@@ -261,10 +261,10 @@ static MACHINE_DRIVER_START( vulgus )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay1", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c
index 36a4d0c385f..2836c3d6288 100644
--- a/src/mame/drivers/wallc.c
+++ b/src/mame/drivers/wallc.c
@@ -297,7 +297,7 @@ static MACHINE_DRIVER_START( wallc )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12288000 / 8)
+ MDRV_SOUND_ADD("ay", AY8910, 12288000 / 8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 4189bcb6b9c..878a99dbd60 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -502,7 +502,7 @@ static MACHINE_DRIVER_START( wardner )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM3812, 24000000/7)
+ MDRV_SOUND_ADD("ym", YM3812, 24000000/7)
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index ba5d9409185..070b0689bca 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -825,7 +825,7 @@ static MACHINE_DRIVER_START( geebee )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("geebee", CUSTOM, 0)
MDRV_SOUND_CONFIG(geebee_custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -868,7 +868,7 @@ static MACHINE_DRIVER_START( bombbee )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("warpwarp", CUSTOM, 0)
MDRV_SOUND_CONFIG(warpwarp_custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index ceb97ce19c8..4ae95b07baf 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -481,7 +481,7 @@ static MACHINE_DRIVER_START( darius2d )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -490,13 +490,13 @@ static MACHINE_DRIVER_START( darius2d )
MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
@@ -540,7 +540,7 @@ static MACHINE_DRIVER_START( warriorb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -549,13 +549,13 @@ static MACHINE_DRIVER_START( warriorb )
MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0)
MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.1.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("2610.2.r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index 670e71b5062..a9b8f1db2da 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -350,7 +350,7 @@ static MACHINE_DRIVER_START( wc90 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2608, 8000000)
+ MDRV_SOUND_ADD("ym", YM2608, 8000000)
MDRV_SOUND_CONFIG(ym2608_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index 631cf707a56..203a78ad4aa 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -413,11 +413,11 @@ static MACHINE_DRIVER_START( wc90b )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 2510000/2)
+ MDRV_SOUND_ADD("ym", YM2203, 2510000/2)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index 8ab2bbca0ca..ea01ff3e20c 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -1132,11 +1132,11 @@ static MACHINE_DRIVER_START( wecleman )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_ROUTE(0, "mono", 0.85)
MDRV_SOUND_ROUTE(1, "mono", 0.85)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami", K007232, 3579545)
MDRV_SOUND_CONFIG(wecleman_k007232_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
@@ -1188,17 +1188,17 @@ static MACHINE_DRIVER_START( hotchase )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami1", K007232, 3579545)
MDRV_SOUND_CONFIG(hotchase_k007232_interface_1)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami2", K007232, 3579545)
MDRV_SOUND_CONFIG(hotchase_k007232_interface_2)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ADD(K007232, 3579545)
+ MDRV_SOUND_ADD("konami3", K007232, 3579545)
MDRV_SOUND_CONFIG(hotchase_k007232_interface_3)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index 7096c5f6761..ea675fe0e2d 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -747,7 +747,7 @@ static MACHINE_DRIVER_START( welltris )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2610, 8000000)
+ MDRV_SOUND_ADD("ym", YM2610, 8000000)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.25)
MDRV_SOUND_ROUTE(1, "mono", 0.75)
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index cd5d3749b2d..e8593ca5abe 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -983,7 +983,7 @@ static MACHINE_DRIVER_START( wgp )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2610, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index a70510b2fcb..3a70aa57253 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -1441,7 +1441,7 @@ static MACHINE_DRIVER_START( defender )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
@@ -1501,7 +1501,7 @@ static MACHINE_DRIVER_START( sinistar )
MDRV_IMPORT_FROM(williams_extra_ram)
/* sound hardware */
- MDRV_SOUND_ADD(HC55516, 0)
+ MDRV_SOUND_ADD("cvsd", HC55516, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -1516,7 +1516,7 @@ static MACHINE_DRIVER_START( playball )
MDRV_SCREEN_VISIBLE_AREA(6, 298-1, 8, 239-1)
/* sound hardware */
- MDRV_SOUND_ADD(HC55516, 0)
+ MDRV_SOUND_ADD("cvsd", HC55516, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
@@ -1564,7 +1564,7 @@ static MACHINE_DRIVER_START( williams2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("wmsdac", DAC, 0)
+ MDRV_SOUND_ADD("wmsdac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index 39c94f65159..8470d1e0930 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -350,7 +350,7 @@ static MACHINE_DRIVER_START( wink )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 12000000 / 8) // AY8912 actually
+ MDRV_SOUND_ADD("ay", AY8910, 12000000 / 8) // AY8912 actually
MDRV_SOUND_CONFIG(ay8912_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c
index 393371b420d..60e28ae1169 100644
--- a/src/mame/drivers/wiping.c
+++ b/src/mame/drivers/wiping.c
@@ -315,7 +315,7 @@ static MACHINE_DRIVER_START( wiping )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(CUSTOM, 0)
+ MDRV_SOUND_ADD("wiping", CUSTOM, 0)
MDRV_SOUND_CONFIG(custom_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index 4adb02a6f94..3e30b1f02ff 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -805,15 +805,15 @@ static MACHINE_DRIVER_START( witch )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(ES8712, 8000)
+ MDRV_SOUND_ADD("es", ES8712, 8000)
MDRV_SOUND_CONFIG(es8712_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_interface_0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD("ym2", YM2203, 1500000)
MDRV_SOUND_CONFIG(ym2203_interface_1)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index 75ef1a506e0..2fee4cb0fa6 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -719,13 +719,13 @@ static MACHINE_DRIVER_START( wiz )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("8910.1", AY8910, 18432000/12)
+ MDRV_SOUND_ADD("8910.1", AY8910, 18432000/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD_TAG("8910.2", AY8910, 18432000/12)
+ MDRV_SOUND_ADD("8910.2", AY8910, 18432000/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD_TAG("8910.3", AY8910, 18432000/12)
+ MDRV_SOUND_ADD("8910.3", AY8910, 18432000/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
@@ -748,7 +748,7 @@ static MACHINE_DRIVER_START( stinger )
MDRV_SOUND_REMOVE("8910.3")
- MDRV_SOUND_ADD(DISCRETE, 0)
+ MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(stinger)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c
index f4de9c569fd..748545b089d 100644
--- a/src/mame/drivers/wldarrow.c
+++ b/src/mame/drivers/wldarrow.c
@@ -361,7 +361,7 @@ static MACHINE_DRIVER_START( wldarrow )
/* audio hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c
index 3c691c402b8..a7bf1473104 100644
--- a/src/mame/drivers/wolfpack.c
+++ b/src/mame/drivers/wolfpack.c
@@ -344,7 +344,7 @@ static MACHINE_DRIVER_START(wolfpack)
MDRV_VIDEO_EOF(wolfpack)
/* sound hardware */
- MDRV_SOUND_ADD(S14001A, 20000) /* RC Clock (C=100pf, R=470K-670K ohms, adjustable) ranging from 14925.37313hz to 21276.59574hz, likely factory set to 20000hz since anything below 19500 is too slow */
+ MDRV_SOUND_ADD("speech", S14001A, 20000) /* RC Clock (C=100pf, R=470K-670K ohms, adjustable) ranging from 14925.37313hz to 21276.59574hz, likely factory set to 20000hz since anything below 19500 is too slow */
MDRV_SOUND_CONFIG(wolfpack_s14001a_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c
index c82a4e3bbc2..446844eda84 100644
--- a/src/mame/drivers/wrally.c
+++ b/src/mame/drivers/wrally.c
@@ -276,7 +276,7 @@ static MACHINE_DRIVER_START( wrally )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, XTAL_1MHz) /* verified on pcb */
+ MDRV_SOUND_ADD("oki", OKIM6295, XTAL_1MHz) /* verified on pcb */
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index 4bf20058747..fb786919d59 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -369,12 +369,12 @@ static MACHINE_DRIVER_START( wwfsstar )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 1122000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1122000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47)
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index e7096a762b0..dc694759c55 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -414,12 +414,12 @@ static MACHINE_DRIVER_START( wwfwfest )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2151, 3579545)
+ MDRV_SOUND_ADD("ym", YM2151, 3579545)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.45)
MDRV_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_SOUND_ADD(OKIM6295, 1024188)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1024188)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index 11b5859ac94..cf9119383d6 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -494,14 +494,14 @@ static MACHINE_DRIVER_START( xsleena )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym1", YM2203, 3000000)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD("ym2", YM2203, 3000000)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index 6956b262063..049c68d1530 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -491,26 +491,26 @@ static MACHINE_DRIVER_START( xexex )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_ROUTE(0, "filter1l", 0.50)
MDRV_SOUND_ROUTE(0, "filter1r", 0.50)
MDRV_SOUND_ROUTE(1, "filter2l", 0.50)
MDRV_SOUND_ROUTE(1, "filter2r", 0.50)
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(0, "right", 1.0)
MDRV_SOUND_ROUTE(1, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
- MDRV_SOUND_ADD_TAG("filter1l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter1l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("filter1r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter1r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD_TAG("filter2l", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter2l", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
- MDRV_SOUND_ADD_TAG("filter2r", FILTER_VOLUME, 0)
+ MDRV_SOUND_ADD("filter2r", FILTER_VOLUME, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 001a414578f..8d1e30a98a3 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -503,11 +503,11 @@ static MACHINE_DRIVER_START( xmen )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
@@ -581,11 +581,11 @@ static MACHINE_DRIVER_START( xmen6p )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, 4000000)
+ MDRV_SOUND_ADD("ym", YM2151, 4000000)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 0.80)
MDRV_SOUND_ROUTE(1, "right", 0.80)
diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c
index e62ebae5477..ff5b464fc5d 100644
--- a/src/mame/drivers/xorworld.c
+++ b/src/mame/drivers/xorworld.c
@@ -233,7 +233,7 @@ static MACHINE_DRIVER_START( xorworld )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SAA1099, 8000000 /* guess */)
+ MDRV_SOUND_ADD("saa", SAA1099, 8000000 /* guess */)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c
index 21958497b51..e50b5e30500 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -374,7 +374,7 @@ static MACHINE_DRIVER_START( xtheball )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index c4d18b707c3..6c3b0f3d598 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -331,14 +331,14 @@ static MACHINE_DRIVER_START( xxmissio )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 12000000/8)
+ MDRV_SOUND_ADD("ym1", YM2203, 12000000/8)
MDRV_SOUND_CONFIG(ym2203_interface_1)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_SOUND_ADD(YM2203, 12000000/8)
+ MDRV_SOUND_ADD("ym2", YM2203, 12000000/8)
MDRV_SOUND_CONFIG(ym2203_interface_2)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c
index a42ef46b9fd..c6e9371f830 100644
--- a/src/mame/drivers/xyonix.c
+++ b/src/mame/drivers/xyonix.c
@@ -255,10 +255,10 @@ static MACHINE_DRIVER_START( xyonix )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 16000000/4)
+ MDRV_SOUND_ADD("sn1", SN76496, 16000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76496, 16000000/4)
+ MDRV_SOUND_ADD("sn2", SN76496, 16000000/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c
index 8a38dea9f97..b95e18d3550 100644
--- a/src/mame/drivers/yiear.c
+++ b/src/mame/drivers/yiear.c
@@ -277,10 +277,10 @@ static MACHINE_DRIVER_START( yiear )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 18432000/12)
+ MDRV_SOUND_ADD("sn", SN76496, 18432000/12)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(VLM5030, 3580000)
+ MDRV_SOUND_ADD("vlm", VLM5030, 3580000)
MDRV_SOUND_CONFIG(vlm5030_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/yumefuda.c b/src/mame/drivers/yumefuda.c
index 93ae096d3cc..6c1057dcfd3 100644
--- a/src/mame/drivers/yumefuda.c
+++ b/src/mame/drivers/yumefuda.c
@@ -247,7 +247,7 @@ static MACHINE_DRIVER_START( yumefuda )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1500000)
+ MDRV_SOUND_ADD("ay", AY8910, 1500000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index 6c17bbea0d1..df15bf0a731 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -609,12 +609,12 @@ static MACHINE_DRIVER_START( magicbub )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_CONFIG(magicbub_ym3812_intf)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.20)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80)
@@ -649,7 +649,7 @@ static MACHINE_DRIVER_START( shocking )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1000000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c
index caafbf4be5a..1b543408226 100644
--- a/src/mame/drivers/yunsung8.c
+++ b/src/mame/drivers/yunsung8.c
@@ -535,11 +535,11 @@ static MACHINE_DRIVER_START( yunsung8 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD(MSM5205, 384000)
+ MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(yunsung8_msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80)
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index e2463372afe..0ca853a51f1 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -672,22 +672,22 @@ static MACHINE_DRIVER_START( zaccaria )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, XTAL_3_579545MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ay1", AY8910, XTAL_3_579545MHz/2) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(AY8910, XTAL_3_579545MHz/2) /* verified on pcb */
+ MDRV_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/2) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.0) /* first DAC sounds awful */
- MDRV_SOUND_ADD(DAC, 0)
+ MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* There is no xtal, the clock is obtained from a RC oscillator as shown in the TMS5220 datasheet (R=100kOhm C=22pF) */
/* 162kHz measured on pin 3 20 minutesa fter power on. Clock would then be 162*4=648kHz. */
- MDRV_SOUND_ADD(TMS5200, 640000)
+ MDRV_SOUND_ADD("tms", TMS5200, 640000)
MDRV_SOUND_CONFIG(tms5220_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index 9834c0e3294..ffae781174c 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -1064,10 +1064,10 @@ static MACHINE_DRIVER_START( congo )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, SOUND_CLOCK)
+ MDRV_SOUND_ADD("sn1", SN76496, SOUND_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76496, SOUND_CLOCK/4)
+ MDRV_SOUND_ADD("sn2", SN76496, SOUND_CLOCK/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MDRV_IMPORT_FROM(congo_samples)
diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c
index 5c21e31e9ca..ea5c3f31875 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -203,7 +203,7 @@ static MACHINE_DRIVER_START( zerozone )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1056000)
+ MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index afbdcb4ec47..e34039d5bc5 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -442,7 +442,7 @@ static MACHINE_DRIVER_START( zn1_1mb_vram )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD( PSXSPU, 0 )
+ MDRV_SOUND_ADD( "spu", PSXSPU, 0 )
MDRV_SOUND_CONFIG( psxspu_interface )
MDRV_SOUND_ROUTE(0, "left", 0.35)
MDRV_SOUND_ROUTE(1, "right", 0.35)
@@ -478,7 +478,7 @@ static MACHINE_DRIVER_START( zn2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD( PSXSPU, 0 )
+ MDRV_SOUND_ADD( "spu", PSXSPU, 0 )
MDRV_SOUND_CONFIG( psxspu_interface )
MDRV_SOUND_ROUTE(0, "left", 0.35)
MDRV_SOUND_ROUTE(1, "right", 0.35)
@@ -688,7 +688,7 @@ static MACHINE_DRIVER_START( coh1000c )
MDRV_MACHINE_RESET( coh1000c )
MDRV_NVRAM_HANDLER( at28c16_0 )
- MDRV_SOUND_ADD( QSOUND, QSOUND_CLOCK )
+ MDRV_SOUND_ADD( "qsound", QSOUND, QSOUND_CLOCK )
MDRV_SOUND_CONFIG( qsound_interface )
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -706,7 +706,7 @@ static MACHINE_DRIVER_START( coh1002c )
MDRV_MACHINE_RESET( coh1000c )
MDRV_NVRAM_HANDLER( at28c16_0 )
- MDRV_SOUND_ADD( QSOUND, QSOUND_CLOCK )
+ MDRV_SOUND_ADD( "qsound", QSOUND, QSOUND_CLOCK )
MDRV_SOUND_CONFIG( qsound_interface )
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -890,7 +890,7 @@ static MACHINE_DRIVER_START( coh3002c )
MDRV_MACHINE_RESET( coh3002c )
MDRV_NVRAM_HANDLER( at28c16_0 )
- MDRV_SOUND_ADD( QSOUND, QSOUND_CLOCK )
+ MDRV_SOUND_ADD( "qsound", QSOUND, QSOUND_CLOCK )
MDRV_SOUND_CONFIG( qsound_interface )
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -1293,7 +1293,7 @@ static MACHINE_DRIVER_START( coh1000ta )
MDRV_MACHINE_RESET( coh1000ta )
MDRV_NVRAM_HANDLER( coh1000ta )
- MDRV_SOUND_ADD(YM2610B, 16000000/2)
+ MDRV_SOUND_ADD("ym", YM2610B, 16000000/2)
MDRV_SOUND_CONFIG(ym2610_interface)
MDRV_SOUND_ROUTE(0, "left", 0.25)
MDRV_SOUND_ROUTE(0, "right", 0.25)
@@ -1937,7 +1937,7 @@ static MACHINE_DRIVER_START( coh1002e )
MDRV_MACHINE_RESET( coh1002e )
MDRV_NVRAM_HANDLER( at28c16_0 )
- MDRV_SOUND_ADD( YMF271, 16934400 )
+ MDRV_SOUND_ADD( "ymf", YMF271, 16934400 )
MDRV_SOUND_CONFIG( ymf271_interface )
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
@@ -2400,7 +2400,7 @@ static MACHINE_DRIVER_START( coh1001l )
MDRV_MACHINE_RESET( coh1001l )
MDRV_NVRAM_HANDLER( at28c16_0 )
-// MDRV_SOUND_ADD( YMZ280B, ymz280b_intf )
+// MDRV_SOUND_ADD( "ymz", wYMZ280B, ymz280b_intf )
MACHINE_DRIVER_END
/*
@@ -2718,7 +2718,7 @@ static MACHINE_DRIVER_START( coh1002msnd )
MDRV_MACHINE_RESET( coh1002m )
MDRV_NVRAM_HANDLER( at28c16_0 )
- MDRV_SOUND_ADD(YMZ280B, 16934400)
+ MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
MDRV_SOUND_CONFIG(ymz280b_intf)
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c
index c3e88d9a2e2..8caec0194f4 100644
--- a/src/mame/drivers/zodiack.c
+++ b/src/mame/drivers/zodiack.c
@@ -486,7 +486,7 @@ static MACHINE_DRIVER_START( zodiack )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 1789750)
+ MDRV_SOUND_ADD("ay", AY8910, 1789750)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index 61cb49f24c1..001ca45e176 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -768,12 +768,12 @@ static MACHINE_DRIVER_START( zr107 )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami1", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami2", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
@@ -813,12 +813,12 @@ static MACHINE_DRIVER_START( jetwave )
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami1", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)
- MDRV_SOUND_ADD(K054539, 48000)
+ MDRV_SOUND_ADD("konami2", K054539, 48000)
MDRV_SOUND_CONFIG(k054539_interface)
MDRV_SOUND_ROUTE(0, "left", 0.75)
MDRV_SOUND_ROUTE(1, "right", 0.75)