summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Vas Crabb <vas@vastheman.com>2018-05-15 05:43:28 +1000
committerGravatarGravatar Vas Crabb <vas@vastheman.com>2018-05-15 05:43:28 +1000
commit23325728009b85bad264dcc175c8f1b8c5e51678 (patch) (github)
tree47e270288dae6d6e6f2cce33c779e94ffc2d39ab
parentd1f8569f4d2729631ef5c3fd6de4e3cfca9856e8 (diff)
downloadmame-23325728009b85bad264dcc175c8f1b8c5e51678.tar.bz2
mame-23325728009b85bad264dcc175c8f1b8c5e51678.zip
More cleanup/streamlining of machine configuration and macros:
* Get rid of implicit prefix for GFX decode names and prefix them all * Get rid of special macro for adding GFXDECODE in favour of constructor * Make empty GFX decode a static member of interface * Allow palette to be specified to GFXDECODE as a device finder * Removed diserial.h from emu.h as it's used relatively infrequently Also fix darkseal and vaportra propely. The palette device automatically attaches itself to a share with matching tag. The correct solution here is to rename one or the other out of the way, since it was never attached to a share before.
-rw-r--r--src/devices/bus/apricot/keyboard/hle.h1
-rw-r--r--src/devices/bus/c64/xl80.cpp4
-rw-r--r--src/devices/bus/comx35/clm.cpp4
-rw-r--r--src/devices/bus/einstein/pipe/tk02.cpp4
-rw-r--r--src/devices/bus/interpro/keyboard/hle.h1
-rw-r--r--src/devices/bus/isa/mda.cpp8
-rw-r--r--src/devices/bus/isa/pgc.cpp4
-rw-r--r--src/devices/bus/isa/sblaster.h1
-rw-r--r--src/devices/bus/nes_ctrl/miracle.h1
-rw-r--r--src/devices/bus/rs232/null_modem.h1
-rw-r--r--src/devices/bus/rs232/printer.h1
-rw-r--r--src/devices/bus/rs232/pty.h1
-rw-r--r--src/devices/bus/rs232/rs232.h2
-rw-r--r--src/devices/bus/rs232/ser_mouse.h1
-rw-r--r--src/devices/bus/rs232/xvd701.h5
-rw-r--r--src/devices/bus/snes_ctrl/miracle.h3
-rw-r--r--src/devices/bus/sunkbd/hlekbd.h1
-rw-r--r--src/devices/bus/sunkbd/sunkbd.h1
-rw-r--r--src/devices/bus/ti8x/graphlinkhle.h2
-rw-r--r--src/devices/bus/vic20/videopak.cpp4
-rw-r--r--src/devices/imagedev/midiin.h7
-rw-r--r--src/devices/imagedev/midiout.h9
-rw-r--r--src/devices/machine/68561mpcc.h1
-rw-r--r--src/devices/machine/i8251.h1
-rw-r--r--src/devices/machine/ie15.cpp4
-rw-r--r--src/devices/machine/ie15.h1
-rw-r--r--src/devices/machine/im6402.h1
-rw-r--r--src/devices/machine/ins8250.h1
-rw-r--r--src/devices/machine/mc2661.h2
-rw-r--r--src/devices/machine/mc6852.h3
-rw-r--r--src/devices/machine/mc68681.h1
-rw-r--r--src/devices/machine/mc68901.h1
-rw-r--r--src/devices/machine/microtch.h1
-rw-r--r--src/devices/machine/scnxx562.h1
-rw-r--r--src/devices/machine/tms5501.h1
-rw-r--r--src/devices/machine/ym2148.h1
-rw-r--r--src/devices/machine/ym3802.h9
-rw-r--r--src/devices/machine/z80dart.h1
-rw-r--r--src/devices/machine/z80scc.h1
-rw-r--r--src/devices/machine/z80sti.h1
-rw-r--r--src/emu/digfx.cpp81
-rw-r--r--src/emu/digfx.h23
-rw-r--r--src/emu/diserial.cpp5
-rw-r--r--src/emu/diserial.h2
-rw-r--r--src/emu/drawgfx.cpp3
-rw-r--r--src/emu/drawgfx.h9
-rw-r--r--src/emu/emu.h1
-rw-r--r--src/mame/drivers/1942.cpp8
-rw-r--r--src/mame/drivers/1943.cpp4
-rw-r--r--src/mame/drivers/1945kiii.cpp4
-rw-r--r--src/mame/drivers/2mindril.cpp4
-rw-r--r--src/mame/drivers/3x3puzzl.cpp4
-rw-r--r--src/mame/drivers/40love.cpp6
-rw-r--r--src/mame/drivers/4enraya.cpp4
-rw-r--r--src/mame/drivers/4roses.cpp4
-rw-r--r--src/mame/drivers/5clown.cpp4
-rw-r--r--src/mame/drivers/a5105.cpp4
-rw-r--r--src/mame/drivers/a51xx.cpp4
-rw-r--r--src/mame/drivers/ac1.cpp4
-rw-r--r--src/mame/drivers/ace.cpp4
-rw-r--r--src/mame/drivers/acefruit.cpp4
-rw-r--r--src/mame/drivers/acommand.cpp4
-rw-r--r--src/mame/drivers/actfancr.cpp8
-rw-r--r--src/mame/drivers/aeroboto.cpp4
-rw-r--r--src/mame/drivers/aerofgt.cpp46
-rw-r--r--src/mame/drivers/airbustr.cpp4
-rw-r--r--src/mame/drivers/albazc.cpp4
-rw-r--r--src/mame/drivers/albazg.cpp4
-rw-r--r--src/mame/drivers/alpha68k.cpp26
-rw-r--r--src/mame/drivers/alphatpx.cpp6
-rw-r--r--src/mame/drivers/alphatro.cpp4
-rw-r--r--src/mame/drivers/amaticmg.cpp10
-rw-r--r--src/mame/drivers/ambush.cpp12
-rw-r--r--src/mame/drivers/ampoker2.cpp8
-rw-r--r--src/mame/drivers/amspdwy.cpp4
-rw-r--r--src/mame/drivers/amusco.cpp4
-rw-r--r--src/mame/drivers/amust.cpp4
-rw-r--r--src/mame/drivers/angelkds.cpp4
-rw-r--r--src/mame/drivers/anzterm.cpp4
-rw-r--r--src/mame/drivers/apc.cpp4
-rw-r--r--src/mame/drivers/apexc.cpp4
-rw-r--r--src/mame/drivers/apogee.cpp4
-rw-r--r--src/mame/drivers/apple2gs.cpp4
-rw-r--r--src/mame/drivers/appoooh.cpp8
-rw-r--r--src/mame/drivers/apricotf.cpp4
-rw-r--r--src/mame/drivers/apricotp.cpp4
-rw-r--r--src/mame/drivers/aquarium.cpp4
-rw-r--r--src/mame/drivers/aquarius.cpp4
-rw-r--r--src/mame/drivers/arcadecl.cpp4
-rw-r--r--src/mame/drivers/arcadia.cpp4
-rw-r--r--src/mame/drivers/argus.cpp12
-rw-r--r--src/mame/drivers/aristmk4.cpp4
-rw-r--r--src/mame/drivers/arkanoid.cpp10
-rw-r--r--src/mame/drivers/armedf.cpp18
-rw-r--r--src/mame/drivers/ashnojoe.cpp4
-rw-r--r--src/mame/drivers/astrcorp.cpp6
-rw-r--r--src/mame/drivers/asuka.cpp12
-rw-r--r--src/mame/drivers/atarifb.cpp8
-rw-r--r--src/mame/drivers/atarig1.cpp4
-rw-r--r--src/mame/drivers/atarig42.cpp4
-rw-r--r--src/mame/drivers/atarigt.cpp4
-rw-r--r--src/mame/drivers/atarigx2.cpp4
-rw-r--r--src/mame/drivers/atarisy1.cpp4
-rw-r--r--src/mame/drivers/atarisy2.cpp4
-rw-r--r--src/mame/drivers/atetris.cpp6
-rw-r--r--src/mame/drivers/atm.cpp8
-rw-r--r--src/mame/drivers/att4425.cpp4
-rw-r--r--src/mame/drivers/aussiebyte.cpp4
-rw-r--r--src/mame/drivers/avigo.cpp4
-rw-r--r--src/mame/drivers/avt.cpp4
-rw-r--r--src/mame/drivers/ax20.cpp4
-rw-r--r--src/mame/drivers/b16.cpp4
-rw-r--r--src/mame/drivers/backfire.cpp4
-rw-r--r--src/mame/drivers/badlands.cpp4
-rw-r--r--src/mame/drivers/badlandsbl.cpp4
-rw-r--r--src/mame/drivers/bagman.cpp10
-rw-r--r--src/mame/drivers/banctec.cpp4
-rw-r--r--src/mame/drivers/bankp.cpp4
-rw-r--r--src/mame/drivers/baraduke.cpp4
-rw-r--r--src/mame/drivers/batman.cpp4
-rw-r--r--src/mame/drivers/battlane.cpp4
-rw-r--r--src/mame/drivers/battlex.cpp4
-rw-r--r--src/mame/drivers/battlnts.cpp4
-rw-r--r--src/mame/drivers/bbusters.cpp8
-rw-r--r--src/mame/drivers/bcs3.cpp6
-rw-r--r--src/mame/drivers/bestleag.cpp4
-rw-r--r--src/mame/drivers/bigbord2.cpp4
-rw-r--r--src/mame/drivers/bigevglf.cpp4
-rw-r--r--src/mame/drivers/bigstrkb.cpp4
-rw-r--r--src/mame/drivers/binbug.cpp6
-rw-r--r--src/mame/drivers/bingoman.cpp4
-rw-r--r--src/mame/drivers/bingor.cpp4
-rw-r--r--src/mame/drivers/bionicc.cpp4
-rw-r--r--src/mame/drivers/bking.cpp4
-rw-r--r--src/mame/drivers/blackt96.cpp4
-rw-r--r--src/mame/drivers/bladestl.cpp4
-rw-r--r--src/mame/drivers/blktiger.cpp4
-rw-r--r--src/mame/drivers/blmbycar.cpp4
-rw-r--r--src/mame/drivers/blockade.cpp4
-rw-r--r--src/mame/drivers/bloodbro.cpp8
-rw-r--r--src/mame/drivers/blstroid.cpp4
-rw-r--r--src/mame/drivers/blueprnt.cpp4
-rw-r--r--src/mame/drivers/bmcpokr.cpp4
-rw-r--r--src/mame/drivers/bmjr.cpp4
-rw-r--r--src/mame/drivers/bnstars.cpp4
-rw-r--r--src/mame/drivers/bogeyman.cpp4
-rw-r--r--src/mame/drivers/bombjack.cpp4
-rw-r--r--src/mame/drivers/boogwing.cpp4
-rw-r--r--src/mame/drivers/boxer.cpp4
-rw-r--r--src/mame/drivers/brkthru.cpp6
-rw-r--r--src/mame/drivers/bsktball.cpp4
-rw-r--r--src/mame/drivers/btime.cpp26
-rw-r--r--src/mame/drivers/bublbobl.cpp6
-rw-r--r--src/mame/drivers/buggychl.cpp4
-rw-r--r--src/mame/drivers/buster.cpp4
-rw-r--r--src/mame/drivers/bw12.cpp4
-rw-r--r--src/mame/drivers/bwing.cpp4
-rw-r--r--src/mame/drivers/c10.cpp4
-rw-r--r--src/mame/drivers/c128.cpp6
-rw-r--r--src/mame/drivers/c65.cpp4
-rw-r--r--src/mame/drivers/c900.cpp4
-rw-r--r--src/mame/drivers/cabal.cpp6
-rw-r--r--src/mame/drivers/cabaret.cpp4
-rw-r--r--src/mame/drivers/calomega.cpp8
-rw-r--r--src/mame/drivers/calorie.cpp4
-rw-r--r--src/mame/drivers/canyon.cpp4
-rw-r--r--src/mame/drivers/cardline.cpp4
-rw-r--r--src/mame/drivers/carjmbre.cpp4
-rw-r--r--src/mame/drivers/carpolo.cpp4
-rw-r--r--src/mame/drivers/carrera.cpp4
-rw-r--r--src/mame/drivers/casloopy.cpp2
-rw-r--r--src/mame/drivers/caswin.cpp4
-rw-r--r--src/mame/drivers/cave.cpp56
-rw-r--r--src/mame/drivers/cb2001.cpp4
-rw-r--r--src/mame/drivers/cball.cpp4
-rw-r--r--src/mame/drivers/cbasebal.cpp4
-rw-r--r--src/mame/drivers/cbuster.cpp4
-rw-r--r--src/mame/drivers/ccastles.cpp4
-rw-r--r--src/mame/drivers/cchance.cpp4
-rw-r--r--src/mame/drivers/cclimber.cpp16
-rw-r--r--src/mame/drivers/cd2650.cpp4
-rw-r--r--src/mame/drivers/cdc721.cpp4
-rw-r--r--src/mame/drivers/centiped.cpp14
-rw-r--r--src/mame/drivers/chaknpop.cpp4
-rw-r--r--src/mame/drivers/champbas.cpp14
-rw-r--r--src/mame/drivers/champbwl.cpp6
-rw-r--r--src/mame/drivers/chanbara.cpp4
-rw-r--r--src/mame/drivers/chance32.cpp4
-rw-r--r--src/mame/drivers/cheekyms.cpp4
-rw-r--r--src/mame/drivers/chinagat.cpp8
-rw-r--r--src/mame/drivers/chinsan.cpp4
-rw-r--r--src/mame/drivers/chsuper.cpp4
-rw-r--r--src/mame/drivers/circus.cpp12
-rw-r--r--src/mame/drivers/circusc.cpp4
-rw-r--r--src/mame/drivers/cischeat.cpp18
-rw-r--r--src/mame/drivers/citycon.cpp4
-rw-r--r--src/mame/drivers/cloak.cpp4
-rw-r--r--src/mame/drivers/cloud9.cpp4
-rw-r--r--src/mame/drivers/clpoker.cpp4
-rw-r--r--src/mame/drivers/clshroad.cpp8
-rw-r--r--src/mame/drivers/cmmb.cpp4
-rw-r--r--src/mame/drivers/cninja.cpp20
-rw-r--r--src/mame/drivers/cntsteer.cpp8
-rw-r--r--src/mame/drivers/coinmstr.cpp4
-rw-r--r--src/mame/drivers/coinmvga.cpp8
-rw-r--r--src/mame/drivers/combatsc.cpp8
-rw-r--r--src/mame/drivers/commando.cpp4
-rw-r--r--src/mame/drivers/compgolf.cpp4
-rw-r--r--src/mame/drivers/comquest.cpp4
-rw-r--r--src/mame/drivers/contra.cpp4
-rw-r--r--src/mame/drivers/coolridr.cpp4
-rw-r--r--src/mame/drivers/cop01.cpp6
-rw-r--r--src/mame/drivers/copsnrob.cpp4
-rw-r--r--src/mame/drivers/cosmic.cpp12
-rw-r--r--src/mame/drivers/cps1.cpp4
-rw-r--r--src/mame/drivers/cps2.cpp2
-rw-r--r--src/mame/drivers/cps3.cpp2
-rw-r--r--src/mame/drivers/crbaloon.cpp4
-rw-r--r--src/mame/drivers/crospang.cpp4
-rw-r--r--src/mame/drivers/crshrace.cpp4
-rw-r--r--src/mame/drivers/cswat.cpp4
-rw-r--r--src/mame/drivers/cultures.cpp4
-rw-r--r--src/mame/drivers/cvs.cpp4
-rw-r--r--src/mame/drivers/cyberbal.cpp8
-rw-r--r--src/mame/drivers/cybertnk.cpp4
-rw-r--r--src/mame/drivers/cybstorm.cpp4
-rw-r--r--src/mame/drivers/cyclemb.cpp4
-rw-r--r--src/mame/drivers/d9final.cpp4
-rw-r--r--src/mame/drivers/dacholer.cpp8
-rw-r--r--src/mame/drivers/dai.cpp4
-rw-r--r--src/mame/drivers/dambustr.cpp4
-rw-r--r--src/mame/drivers/darius.cpp4
-rw-r--r--src/mame/drivers/darkmist.cpp4
-rw-r--r--src/mame/drivers/darkseal.cpp21
-rw-r--r--src/mame/drivers/dassault.cpp4
-rw-r--r--src/mame/drivers/dblcrown.cpp4
-rw-r--r--src/mame/drivers/dblewing.cpp4
-rw-r--r--src/mame/drivers/dbz.cpp4
-rw-r--r--src/mame/drivers/dcon.cpp6
-rw-r--r--src/mame/drivers/dday.cpp4
-rw-r--r--src/mame/drivers/ddayjlc.cpp4
-rw-r--r--src/mame/drivers/ddealer.cpp4
-rw-r--r--src/mame/drivers/ddragon.cpp8
-rw-r--r--src/mame/drivers/ddragon3.cpp8
-rw-r--r--src/mame/drivers/ddribble.cpp4
-rw-r--r--src/mame/drivers/deadang.cpp8
-rw-r--r--src/mame/drivers/dec0.cpp16
-rw-r--r--src/mame/drivers/dec8.cpp30
-rw-r--r--src/mame/drivers/deco156.cpp6
-rw-r--r--src/mame/drivers/deco32.cpp22
-rw-r--r--src/mame/drivers/deco_ld.cpp4
-rw-r--r--src/mame/drivers/deco_mlc.cpp14
-rw-r--r--src/mame/drivers/decocass.cpp4
-rw-r--r--src/mame/drivers/deniam.cpp6
-rw-r--r--src/mame/drivers/destroyr.cpp4
-rw-r--r--src/mame/drivers/dfruit.cpp4
-rw-r--r--src/mame/drivers/dgn_beta.cpp4
-rw-r--r--src/mame/drivers/dietgo.cpp4
-rw-r--r--src/mame/drivers/dim68k.cpp4
-rw-r--r--src/mame/drivers/discoboy.cpp4
-rw-r--r--src/mame/drivers/divebomb.cpp4
-rw-r--r--src/mame/drivers/diverboy.cpp4
-rw-r--r--src/mame/drivers/djboy.cpp4
-rw-r--r--src/mame/drivers/djmain.cpp4
-rw-r--r--src/mame/drivers/dkong.cpp6
-rw-r--r--src/mame/drivers/dlair.cpp4
-rw-r--r--src/mame/drivers/dlair2.cpp4
-rw-r--r--src/mame/drivers/dmndrby.cpp4
-rw-r--r--src/mame/drivers/dmv.cpp56
-rw-r--r--src/mame/drivers/docastle.cpp4
-rw-r--r--src/mame/drivers/dogfgt.cpp4
-rw-r--r--src/mame/drivers/dominob.cpp4
-rw-r--r--src/mame/drivers/dooyong.cpp28
-rw-r--r--src/mame/drivers/dragrace.cpp4
-rw-r--r--src/mame/drivers/dreambal.cpp4
-rw-r--r--src/mame/drivers/dreamwld.cpp4
-rw-r--r--src/mame/drivers/drgnmst.cpp4
-rw-r--r--src/mame/drivers/drmicro.cpp4
-rw-r--r--src/mame/drivers/drtomy.cpp4
-rw-r--r--src/mame/drivers/drw80pkr.cpp4
-rw-r--r--src/mame/drivers/duet16.cpp4
-rw-r--r--src/mame/drivers/dunhuang.cpp4
-rw-r--r--src/mame/drivers/dvk_kcgd.cpp4
-rw-r--r--src/mame/drivers/dvk_ksm.cpp4
-rw-r--r--src/mame/drivers/dwarfd.cpp4
-rw-r--r--src/mame/drivers/dynadice.cpp4
-rw-r--r--src/mame/drivers/dynduke.cpp4
-rw-r--r--src/mame/drivers/ec65.cpp6
-rw-r--r--src/mame/drivers/egghunt.cpp4
-rw-r--r--src/mame/drivers/elwro800.cpp4
-rw-r--r--src/mame/drivers/eprom.cpp10
-rw-r--r--src/mame/drivers/equites.cpp8
-rw-r--r--src/mame/drivers/esd16.cpp20
-rw-r--r--src/mame/drivers/esh.cpp4
-rw-r--r--src/mame/drivers/espial.cpp4
-rw-r--r--src/mame/drivers/esprit.cpp4
-rw-r--r--src/mame/drivers/ettrivia.cpp4
-rw-r--r--src/mame/drivers/excali64.cpp4
-rw-r--r--src/mame/drivers/exedexes.cpp4
-rw-r--r--src/mame/drivers/exerion.cpp4
-rw-r--r--src/mame/drivers/exidy.cpp4
-rw-r--r--src/mame/drivers/expro02.cpp8
-rw-r--r--src/mame/drivers/exprraid.cpp4
-rw-r--r--src/mame/drivers/exzisus.cpp4
-rw-r--r--src/mame/drivers/f1gp.cpp10
-rw-r--r--src/mame/drivers/fantland.cpp10
-rw-r--r--src/mame/drivers/fastfred.cpp12
-rw-r--r--src/mame/drivers/fastinvaders.cpp4
-rw-r--r--src/mame/drivers/fastlane.cpp4
-rw-r--r--src/mame/drivers/fc100.cpp4
-rw-r--r--src/mame/drivers/fcombat.cpp4
-rw-r--r--src/mame/drivers/fcrash.cpp20
-rw-r--r--src/mame/drivers/feversoc.cpp4
-rw-r--r--src/mame/drivers/fgoal.cpp4
-rw-r--r--src/mame/drivers/finalizr.cpp4
-rw-r--r--src/mame/drivers/firefox.cpp4
-rw-r--r--src/mame/drivers/firetrap.cpp6
-rw-r--r--src/mame/drivers/firetrk.cpp12
-rw-r--r--src/mame/drivers/fitfight.cpp8
-rw-r--r--src/mame/drivers/flipjack.cpp4
-rw-r--r--src/mame/drivers/flkatck.cpp4
-rw-r--r--src/mame/drivers/flower.cpp4
-rw-r--r--src/mame/drivers/flstory.cpp10
-rw-r--r--src/mame/drivers/flyball.cpp4
-rw-r--r--src/mame/drivers/fmtowns.cpp4
-rw-r--r--src/mame/drivers/foodf.cpp4
-rw-r--r--src/mame/drivers/fortecar.cpp4
-rw-r--r--src/mame/drivers/fp1100.cpp4
-rw-r--r--src/mame/drivers/fp200.cpp4
-rw-r--r--src/mame/drivers/fp6000.cpp4
-rw-r--r--src/mame/drivers/freekick.cpp6
-rw-r--r--src/mame/drivers/fresh.cpp4
-rw-r--r--src/mame/drivers/fromanc2.cpp10
-rw-r--r--src/mame/drivers/fromance.cpp8
-rw-r--r--src/mame/drivers/funkybee.cpp4
-rw-r--r--src/mame/drivers/funkyjet.cpp4
-rw-r--r--src/mame/drivers/funtech.cpp4
-rw-r--r--src/mame/drivers/funworld.cpp12
-rw-r--r--src/mame/drivers/funybubl.cpp4
-rw-r--r--src/mame/drivers/fuukifg2.cpp4
-rw-r--r--src/mame/drivers/fuukifg3.cpp4
-rw-r--r--src/mame/drivers/gaelco.cpp10
-rw-r--r--src/mame/drivers/gaelco2.cpp18
-rw-r--r--src/mame/drivers/gaiden.cpp12
-rw-r--r--src/mame/drivers/gal3.cpp4
-rw-r--r--src/mame/drivers/galaga.cpp16
-rw-r--r--src/mame/drivers/galastrm.cpp4
-rw-r--r--src/mame/drivers/galaxi.cpp4
-rw-r--r--src/mame/drivers/galaxia.cpp8
-rw-r--r--src/mame/drivers/galaxian.cpp18
-rw-r--r--src/mame/drivers/galaxold.cpp24
-rw-r--r--src/mame/drivers/galaxy.cpp4
-rw-r--r--src/mame/drivers/galeb.cpp4
-rw-r--r--src/mame/drivers/galivan.cpp6
-rw-r--r--src/mame/drivers/galpani2.cpp4
-rw-r--r--src/mame/drivers/galpanic.cpp4
-rw-r--r--src/mame/drivers/galspnbl.cpp4
-rw-r--r--src/mame/drivers/gamecstl.cpp4
-rw-r--r--src/mame/drivers/gaplus.cpp4
-rw-r--r--src/mame/drivers/gatron.cpp4
-rw-r--r--src/mame/drivers/gauntlet.cpp4
-rw-r--r--src/mame/drivers/gb.cpp10
-rw-r--r--src/mame/drivers/gberet.cpp8
-rw-r--r--src/mame/drivers/gcpinbal.cpp10
-rw-r--r--src/mame/drivers/ginganin.cpp4
-rw-r--r--src/mame/drivers/gkigt.cpp4
-rw-r--r--src/mame/drivers/gladiatr.cpp8
-rw-r--r--src/mame/drivers/glass.cpp4
-rw-r--r--src/mame/drivers/gluck2.cpp4
-rw-r--r--src/mame/drivers/gng.cpp4
-rw-r--r--src/mame/drivers/go2000.cpp4
-rw-r--r--src/mame/drivers/goal92.cpp4
-rw-r--r--src/mame/drivers/goindol.cpp4
-rw-r--r--src/mame/drivers/goldngam.cpp4
-rw-r--r--src/mame/drivers/goldnpkr.cpp14
-rw-r--r--src/mame/drivers/goldstar.cpp114
-rw-r--r--src/mame/drivers/gomoku.cpp4
-rw-r--r--src/mame/drivers/good.cpp4
-rw-r--r--src/mame/drivers/goodejan.cpp4
-rw-r--r--src/mame/drivers/gotcha.cpp4
-rw-r--r--src/mame/drivers/gottlieb.cpp2
-rw-r--r--src/mame/drivers/gotya.cpp4
-rw-r--r--src/mame/drivers/gpworld.cpp4
-rw-r--r--src/mame/drivers/grchamp.cpp4
-rw-r--r--src/mame/drivers/groundfx.cpp4
-rw-r--r--src/mame/drivers/gstream.cpp8
-rw-r--r--src/mame/drivers/gstriker.cpp4
-rw-r--r--src/mame/drivers/gsword.cpp6
-rw-r--r--src/mame/drivers/gumbo.cpp4
-rw-r--r--src/mame/drivers/gunbustr.cpp4
-rw-r--r--src/mame/drivers/gundealr.cpp4
-rw-r--r--src/mame/drivers/gunsmoke.cpp4
-rw-r--r--src/mame/drivers/gyruss.cpp4
-rw-r--r--src/mame/drivers/h19.cpp4
-rw-r--r--src/mame/drivers/hanaawas.cpp4
-rw-r--r--src/mame/drivers/hazeltin.cpp4
-rw-r--r--src/mame/drivers/hcastle.cpp4
-rw-r--r--src/mame/drivers/headonb.cpp4
-rw-r--r--src/mame/drivers/hexion.cpp4
-rw-r--r--src/mame/drivers/hideseek.cpp4
-rw-r--r--src/mame/drivers/higemaru.cpp4
-rw-r--r--src/mame/drivers/himesiki.cpp4
-rw-r--r--src/mame/drivers/hitme.cpp8
-rw-r--r--src/mame/drivers/hitpoker.cpp4
-rw-r--r--src/mame/drivers/hng64.cpp4
-rw-r--r--src/mame/drivers/holeland.cpp8
-rw-r--r--src/mame/drivers/homedata.cpp20
-rw-r--r--src/mame/drivers/homelab.cpp8
-rw-r--r--src/mame/drivers/homerun.cpp4
-rw-r--r--src/mame/drivers/homez80.cpp4
-rw-r--r--src/mame/drivers/hp9k.cpp4
-rw-r--r--src/mame/drivers/hprot1.cpp4
-rw-r--r--src/mame/drivers/huebler.cpp4
-rw-r--r--src/mame/drivers/hvyunit.cpp4
-rw-r--r--src/mame/drivers/hyperspt.cpp8
-rw-r--r--src/mame/drivers/hyprduel.cpp4
-rw-r--r--src/mame/drivers/i7000.cpp14
-rw-r--r--src/mame/drivers/ibmpcjr.cpp8
-rw-r--r--src/mame/drivers/icatel.cpp4
-rw-r--r--src/mame/drivers/ichiban.cpp4
-rw-r--r--src/mame/drivers/igs009.cpp8
-rw-r--r--src/mame/drivers/igs011.cpp12
-rw-r--r--src/mame/drivers/igs_fear.cpp4
-rw-r--r--src/mame/drivers/igspoker.cpp8
-rw-r--r--src/mame/drivers/ikki.cpp4
-rw-r--r--src/mame/drivers/imds2.cpp4
-rw-r--r--src/mame/drivers/intrscti.cpp4
-rw-r--r--src/mame/drivers/intv.cpp4
-rw-r--r--src/mame/drivers/inufuku.cpp8
-rw-r--r--src/mame/drivers/ipds.cpp4
-rw-r--r--src/mame/drivers/iqblock.cpp4
-rw-r--r--src/mame/drivers/irisha.cpp4
-rw-r--r--src/mame/drivers/irobot.cpp4
-rw-r--r--src/mame/drivers/ironhors.cpp8
-rw-r--r--src/mame/drivers/isbc8010.cpp4
-rw-r--r--src/mame/drivers/istellar.cpp4
-rw-r--r--src/mame/drivers/istrebiteli.cpp4
-rw-r--r--src/mame/drivers/itgambl2.cpp4
-rw-r--r--src/mame/drivers/itgambl3.cpp4
-rw-r--r--src/mame/drivers/itgamble.cpp4
-rw-r--r--src/mame/drivers/itt3030.cpp4
-rw-r--r--src/mame/drivers/jack.cpp8
-rw-r--r--src/mame/drivers/jackal.cpp4
-rw-r--r--src/mame/drivers/jackie.cpp4
-rw-r--r--src/mame/drivers/jackpool.cpp4
-rw-r--r--src/mame/drivers/jailbrek.cpp4
-rw-r--r--src/mame/drivers/jalmah.cpp8
-rw-r--r--src/mame/drivers/jchan.cpp4
-rw-r--r--src/mame/drivers/jclub2.cpp4
-rw-r--r--src/mame/drivers/jokrwild.cpp4
-rw-r--r--src/mame/drivers/jollyjgr.cpp4
-rw-r--r--src/mame/drivers/jonos.cpp4
-rw-r--r--src/mame/drivers/joystand.cpp4
-rw-r--r--src/mame/drivers/jr100.cpp4
-rw-r--r--src/mame/drivers/jr200.cpp4
-rw-r--r--src/mame/drivers/jrpacman.cpp4
-rw-r--r--src/mame/drivers/jtc.cpp8
-rw-r--r--src/mame/drivers/jubilee.cpp4
-rw-r--r--src/mame/drivers/jungleyo.cpp4
-rw-r--r--src/mame/drivers/jupace.cpp4
-rw-r--r--src/mame/drivers/kaneko16.cpp20
-rw-r--r--src/mame/drivers/karnov.cpp6
-rw-r--r--src/mame/drivers/kaypro.cpp8
-rw-r--r--src/mame/drivers/kchamp.cpp6
-rw-r--r--src/mame/drivers/kickgoal.cpp8
-rw-r--r--src/mame/drivers/kingdrby.cpp8
-rw-r--r--src/mame/drivers/kingobox.cpp8
-rw-r--r--src/mame/drivers/klax.cpp8
-rw-r--r--src/mame/drivers/kncljoe.cpp4
-rw-r--r--src/mame/drivers/koftball.cpp4
-rw-r--r--src/mame/drivers/koikoi.cpp4
-rw-r--r--src/mame/drivers/konamigx.cpp16
-rw-r--r--src/mame/drivers/konblands.cpp4
-rw-r--r--src/mame/drivers/kopunch.cpp4
-rw-r--r--src/mame/drivers/kramermc.cpp4
-rw-r--r--src/mame/drivers/ksayakyu.cpp4
-rw-r--r--src/mame/drivers/kyugo.cpp4
-rw-r--r--src/mame/drivers/labyrunr.cpp4
-rw-r--r--src/mame/drivers/ladybug.cpp8
-rw-r--r--src/mame/drivers/ladyfrog.cpp4
-rw-r--r--src/mame/drivers/laserbat.cpp8
-rw-r--r--src/mame/drivers/lasso.cpp12
-rw-r--r--src/mame/drivers/lastbank.cpp4
-rw-r--r--src/mame/drivers/lastduel.cpp8
-rw-r--r--src/mame/drivers/lazercmd.cpp8
-rw-r--r--src/mame/drivers/lbeach.cpp4
-rw-r--r--src/mame/drivers/lcmate2.cpp4
-rw-r--r--src/mame/drivers/legionna.cpp20
-rw-r--r--src/mame/drivers/lemmings.cpp4
-rw-r--r--src/mame/drivers/lgp.cpp4
-rw-r--r--src/mame/drivers/liberate.cpp12
-rw-r--r--src/mame/drivers/limenko.cpp6
-rw-r--r--src/mame/drivers/lkage.cpp6
-rw-r--r--src/mame/drivers/llc.cpp8
-rw-r--r--src/mame/drivers/lockon.cpp4
-rw-r--r--src/mame/drivers/looping.cpp4
-rw-r--r--src/mame/drivers/lordgun.cpp6
-rw-r--r--src/mame/drivers/lsasquad.cpp6
-rw-r--r--src/mame/drivers/ltcasino.cpp4
-rw-r--r--src/mame/drivers/luckgrln.cpp4
-rw-r--r--src/mame/drivers/lucky74.cpp4
-rw-r--r--src/mame/drivers/lvcards.cpp4
-rw-r--r--src/mame/drivers/lwings.cpp10
-rw-r--r--src/mame/drivers/m10.cpp6
-rw-r--r--src/mame/drivers/m107.cpp10
-rw-r--r--src/mame/drivers/m14.cpp4
-rw-r--r--src/mame/drivers/m3.cpp4
-rw-r--r--src/mame/drivers/m52.cpp4
-rw-r--r--src/mame/drivers/m57.cpp4
-rw-r--r--src/mame/drivers/m58.cpp4
-rw-r--r--src/mame/drivers/m62.cpp44
-rw-r--r--src/mame/drivers/m63.cpp8
-rw-r--r--src/mame/drivers/m72.cpp16
-rw-r--r--src/mame/drivers/m79152pc.cpp4
-rw-r--r--src/mame/drivers/m90.cpp4
-rw-r--r--src/mame/drivers/m92.cpp14
-rw-r--r--src/mame/drivers/macrossp.cpp4
-rw-r--r--src/mame/drivers/madmotor.cpp4
-rw-r--r--src/mame/drivers/magic10.cpp4
-rw-r--r--src/mame/drivers/magicfly.cpp4
-rw-r--r--src/mame/drivers/magmax.cpp4
-rw-r--r--src/mame/drivers/magreel.cpp2
-rw-r--r--src/mame/drivers/mainsnk.cpp4
-rw-r--r--src/mame/drivers/majorpkr.cpp4
-rw-r--r--src/mame/drivers/malzak.cpp4
-rw-r--r--src/mame/drivers/mappy.cpp16
-rw-r--r--src/mame/drivers/marineb.cpp20
-rw-r--r--src/mame/drivers/marinedt.cpp4
-rw-r--r--src/mame/drivers/mario.cpp4
-rw-r--r--src/mame/drivers/markham.cpp4
-rw-r--r--src/mame/drivers/mastboy.cpp4
-rw-r--r--src/mame/drivers/mastboyo.cpp4
-rw-r--r--src/mame/drivers/matmania.cpp8
-rw-r--r--src/mame/drivers/mbc200.cpp4
-rw-r--r--src/mame/drivers/mbee.cpp12
-rw-r--r--src/mame/drivers/mcatadv.cpp4
-rw-r--r--src/mame/drivers/mcr.cpp4
-rw-r--r--src/mame/drivers/mcr3.cpp8
-rw-r--r--src/mame/drivers/mcr68.cpp4
-rw-r--r--src/mame/drivers/meadows.cpp10
-rw-r--r--src/mame/drivers/mediagx.cpp4
-rw-r--r--src/mame/drivers/megasys1.cpp12
-rw-r--r--src/mame/drivers/megazone.cpp4
-rw-r--r--src/mame/drivers/mermaid.cpp4
-rw-r--r--src/mame/drivers/metlclsh.cpp4
-rw-r--r--src/mame/drivers/metlfrzr.cpp4
-rw-r--r--src/mame/drivers/metro.cpp20
-rw-r--r--src/mame/drivers/mexico86.cpp4
-rw-r--r--src/mame/drivers/mgames.cpp4
-rw-r--r--src/mame/drivers/mgolf.cpp4
-rw-r--r--src/mame/drivers/micral.cpp2
-rw-r--r--src/mame/drivers/microtan.cpp4
-rw-r--r--src/mame/drivers/midas.cpp6
-rw-r--r--src/mame/drivers/mikie.cpp4
-rw-r--r--src/mame/drivers/mikro80.cpp4
-rw-r--r--src/mame/drivers/mikrosha.cpp4
-rw-r--r--src/mame/drivers/mil4000.cpp4
-rw-r--r--src/mame/drivers/miniboy7.cpp4
-rw-r--r--src/mame/drivers/mirage.cpp4
-rw-r--r--src/mame/drivers/mirax.cpp4
-rw-r--r--src/mame/drivers/missb2.cpp8
-rw-r--r--src/mame/drivers/mitchell.cpp24
-rw-r--r--src/mame/drivers/mjkjidai.cpp4
-rw-r--r--src/mame/drivers/model3.cpp8
-rw-r--r--src/mame/drivers/modellot.cpp4
-rw-r--r--src/mame/drivers/mogura.cpp4
-rw-r--r--src/mame/drivers/mole.cpp4
-rw-r--r--src/mame/drivers/molecular.cpp4
-rw-r--r--src/mame/drivers/momoko.cpp4
-rw-r--r--src/mame/drivers/monzagp.cpp4
-rw-r--r--src/mame/drivers/mosaic.cpp4
-rw-r--r--src/mame/drivers/mouser.cpp4
-rw-r--r--src/mame/drivers/mpu12wbk.cpp4
-rw-r--r--src/mame/drivers/mpu4dealem.cpp4
-rw-r--r--src/mame/drivers/mpu4vid.cpp2
-rw-r--r--src/mame/drivers/mrdo.cpp4
-rw-r--r--src/mame/drivers/mrflea.cpp4
-rw-r--r--src/mame/drivers/mrgame.cpp4
-rw-r--r--src/mame/drivers/mrjong.cpp4
-rw-r--r--src/mame/drivers/ms32.cpp8
-rw-r--r--src/mame/drivers/ms6102.cpp4
-rw-r--r--src/mame/drivers/msisaac.cpp4
-rw-r--r--src/mame/drivers/mugsmash.cpp4
-rw-r--r--src/mame/drivers/multfish.cpp4
-rw-r--r--src/mame/drivers/multi8.cpp4
-rw-r--r--src/mame/drivers/munchmo.cpp4
-rw-r--r--src/mame/drivers/murogem.cpp4
-rw-r--r--src/mame/drivers/murogmbl.cpp9
-rw-r--r--src/mame/drivers/mustache.cpp4
-rw-r--r--src/mame/drivers/mwarr.cpp4
-rw-r--r--src/mame/drivers/mx2178.cpp4
-rw-r--r--src/mame/drivers/mycom.cpp4
-rw-r--r--src/mame/drivers/mystwarr.cpp8
-rw-r--r--src/mame/drivers/mz2000.cpp4
-rw-r--r--src/mame/drivers/mz2500.cpp4
-rw-r--r--src/mame/drivers/mz3500.cpp4
-rw-r--r--src/mame/drivers/mz700.cpp8
-rw-r--r--src/mame/drivers/mz80.cpp8
-rw-r--r--src/mame/drivers/nakajies.cpp16
-rw-r--r--src/mame/drivers/namcofl.cpp4
-rw-r--r--src/mame/drivers/namcona1.cpp4
-rw-r--r--src/mame/drivers/namconb1.cpp8
-rw-r--r--src/mame/drivers/namcos1.cpp4
-rw-r--r--src/mame/drivers/namcos2.cpp24
-rw-r--r--src/mame/drivers/namcos21.cpp8
-rw-r--r--src/mame/drivers/namcos22.cpp8
-rw-r--r--src/mame/drivers/namcos23.cpp8
-rw-r--r--src/mame/drivers/namcos86.cpp4
-rw-r--r--src/mame/drivers/nanos.cpp8
-rw-r--r--src/mame/drivers/nascom1.cpp8
-rw-r--r--src/mame/drivers/naughtyb.cpp6
-rw-r--r--src/mame/drivers/nemesis.cpp22
-rw-r--r--src/mame/drivers/neoprint.cpp6
-rw-r--r--src/mame/drivers/neptunp2.cpp4
-rw-r--r--src/mame/drivers/nes_vt.cpp4
-rw-r--r--src/mame/drivers/news.cpp4
-rw-r--r--src/mame/drivers/nibble.cpp4
-rw-r--r--src/mame/drivers/ninjakd2.cpp8
-rw-r--r--src/mame/drivers/ninjaw.cpp6
-rw-r--r--src/mame/drivers/nitedrvr.cpp4
-rw-r--r--src/mame/drivers/nmg5.cpp10
-rw-r--r--src/mame/drivers/nmk16.cpp70
-rw-r--r--src/mame/drivers/norautp.cpp4
-rw-r--r--src/mame/drivers/nova2001.cpp16
-rw-r--r--src/mame/drivers/nsmpoker.cpp4
-rw-r--r--src/mame/drivers/nycaptor.cpp8
-rw-r--r--src/mame/drivers/odyssey2.cpp10
-rw-r--r--src/mame/drivers/offtwall.cpp4
-rw-r--r--src/mame/drivers/ohmygod.cpp4
-rw-r--r--src/mame/drivers/ojankohs.cpp8
-rw-r--r--src/mame/drivers/okean240.cpp8
-rw-r--r--src/mame/drivers/olibochu.cpp4
-rw-r--r--src/mame/drivers/oneshot.cpp4
-rw-r--r--src/mame/drivers/onetwo.cpp4
-rw-r--r--src/mame/drivers/opwolf.cpp8
-rw-r--r--src/mame/drivers/orbit.cpp4
-rw-r--r--src/mame/drivers/osborne1.cpp4
-rw-r--r--src/mame/drivers/osi.cpp8
-rw-r--r--src/mame/drivers/othunder.cpp4
-rw-r--r--src/mame/drivers/p2000t.cpp4
-rw-r--r--src/mame/drivers/pacland.cpp4
-rw-r--r--src/mame/drivers/pacman.cpp16
-rw-r--r--src/mame/drivers/pandoras.cpp4
-rw-r--r--src/mame/drivers/panicr.cpp4
-rw-r--r--src/mame/drivers/paradise.cpp12
-rw-r--r--src/mame/drivers/partner.cpp4
-rw-r--r--src/mame/drivers/paso1600.cpp4
-rw-r--r--src/mame/drivers/pasopia.cpp4
-rw-r--r--src/mame/drivers/pasopia7.cpp6
-rw-r--r--src/mame/drivers/pass.cpp4
-rw-r--r--src/mame/drivers/patapata.cpp4
-rw-r--r--src/mame/drivers/pb1000.cpp4
-rw-r--r--src/mame/drivers/pbaction.cpp4
-rw-r--r--src/mame/drivers/pc100.cpp4
-rw-r--r--src/mame/drivers/pc2000.cpp4
-rw-r--r--src/mame/drivers/pc4.cpp4
-rw-r--r--src/mame/drivers/pc6001.cpp6
-rw-r--r--src/mame/drivers/pc8801.cpp4
-rw-r--r--src/mame/drivers/pc88va.cpp4
-rw-r--r--src/mame/drivers/pc9801.cpp4
-rw-r--r--src/mame/drivers/pcktgal.cpp8
-rw-r--r--src/mame/drivers/pcm.cpp4
-rw-r--r--src/mame/drivers/pda600.cpp4
-rw-r--r--src/mame/drivers/pdp1.cpp4
-rw-r--r--src/mame/drivers/pegasus.cpp4
-rw-r--r--src/mame/drivers/pengo.cpp4
-rw-r--r--src/mame/drivers/pentagon.cpp4
-rw-r--r--src/mame/drivers/peoplepc.cpp2
-rw-r--r--src/mame/drivers/peplus.cpp6
-rw-r--r--src/mame/drivers/pgm.cpp4
-rw-r--r--src/mame/drivers/pgm2.cpp4
-rw-r--r--src/mame/drivers/phoenix.cpp10
-rw-r--r--src/mame/drivers/photoply.cpp4
-rw-r--r--src/mame/drivers/phunsy.cpp4
-rw-r--r--src/mame/drivers/pinball2k.cpp14
-rw-r--r--src/mame/drivers/pingpong.cpp4
-rw-r--r--src/mame/drivers/pinkiri8.cpp4
-rw-r--r--src/mame/drivers/pipedrm.cpp8
-rw-r--r--src/mame/drivers/pipeline.cpp4
-rw-r--r--src/mame/drivers/pirates.cpp4
-rw-r--r--src/mame/drivers/pitnrun.cpp4
-rw-r--r--src/mame/drivers/pk8020.cpp4
-rw-r--r--src/mame/drivers/pkscram.cpp4
-rw-r--r--src/mame/drivers/pktgaldx.cpp8
-rw-r--r--src/mame/drivers/plan80.cpp4
-rw-r--r--src/mame/drivers/playch10.cpp4
-rw-r--r--src/mame/drivers/playmark.cpp28
-rw-r--r--src/mame/drivers/plygonet.cpp4
-rw-r--r--src/mame/drivers/pocketc.cpp8
-rw-r--r--src/mame/drivers/pofo.cpp4
-rw-r--r--src/mame/drivers/pokechmp.cpp4
-rw-r--r--src/mame/drivers/poker72.cpp4
-rw-r--r--src/mame/drivers/polepos.cpp6
-rw-r--r--src/mame/drivers/poly88.cpp4
-rw-r--r--src/mame/drivers/polyplay.cpp4
-rw-r--r--src/mame/drivers/poolshrk.cpp4
-rw-r--r--src/mame/drivers/pooyan.cpp4
-rw-r--r--src/mame/drivers/popeye.cpp4
-rw-r--r--src/mame/drivers/popobear.cpp4
-rw-r--r--src/mame/drivers/popper.cpp4
-rw-r--r--src/mame/drivers/portrait.cpp4
-rw-r--r--src/mame/drivers/powerbal.cpp6
-rw-r--r--src/mame/drivers/powerins.cpp4
-rw-r--r--src/mame/drivers/ppmast93.cpp4
-rw-r--r--src/mame/drivers/prehisle.cpp4
-rw-r--r--src/mame/drivers/progolf.cpp4
-rw-r--r--src/mame/drivers/proteus3.cpp4
-rw-r--r--src/mame/drivers/psikyo.cpp10
-rw-r--r--src/mame/drivers/psikyo4.cpp4
-rw-r--r--src/mame/drivers/psikyosh.cpp4
-rw-r--r--src/mame/drivers/psion.cpp4
-rw-r--r--src/mame/drivers/psychic5.cpp8
-rw-r--r--src/mame/drivers/ptcsol.cpp4
-rw-r--r--src/mame/drivers/pturn.cpp4
-rw-r--r--src/mame/drivers/punchout.cpp8
-rw-r--r--src/mame/drivers/pv1000.cpp4
-rw-r--r--src/mame/drivers/px4.cpp1
-rw-r--r--src/mame/drivers/px8.cpp4
-rw-r--r--src/mame/drivers/pyl601.cpp8
-rw-r--r--src/mame/drivers/pzletime.cpp4
-rw-r--r--src/mame/drivers/quasar.cpp4
-rw-r--r--src/mame/drivers/quickpick5.cpp2
-rw-r--r--src/mame/drivers/quizdna.cpp4
-rw-r--r--src/mame/drivers/quizpani.cpp4
-rw-r--r--src/mame/drivers/quizpun2.cpp4
-rw-r--r--src/mame/drivers/quizshow.cpp4
-rw-r--r--src/mame/drivers/qx10.cpp4
-rw-r--r--src/mame/drivers/r2dx_v33.cpp6
-rw-r--r--src/mame/drivers/rabbit.cpp4
-rw-r--r--src/mame/drivers/rad_eu3a05.cpp4
-rw-r--r--src/mame/drivers/rad_eu3a14.cpp4
-rw-r--r--src/mame/drivers/radio86.cpp4
-rw-r--r--src/mame/drivers/raiden.cpp4
-rw-r--r--src/mame/drivers/raiden2.cpp6
-rw-r--r--src/mame/drivers/rainbow.cpp366
-rw-r--r--src/mame/drivers/rallyx.cpp8
-rw-r--r--src/mame/drivers/rampart.cpp4
-rw-r--r--src/mame/drivers/rastan.cpp4
-rw-r--r--src/mame/drivers/rbisland.cpp8
-rw-r--r--src/mame/drivers/rbmk.cpp4
-rw-r--r--src/mame/drivers/rcorsair.cpp4
-rw-r--r--src/mame/drivers/rd100.cpp2
-rw-r--r--src/mame/drivers/realbrk.cpp8
-rw-r--r--src/mame/drivers/redclash.cpp6
-rw-r--r--src/mame/drivers/relief.cpp4
-rw-r--r--src/mame/drivers/renegade.cpp4
-rw-r--r--src/mame/drivers/replicator.cpp4
-rw-r--r--src/mame/drivers/retofinv.cpp4
-rw-r--r--src/mame/drivers/rex6000.cpp4
-rw-r--r--src/mame/drivers/rgum.cpp4
-rw-r--r--src/mame/drivers/rmhaihai.cpp10
-rw-r--r--src/mame/drivers/rockrage.cpp4
-rw-r--r--src/mame/drivers/rocnrope.cpp4
-rw-r--r--src/mame/drivers/rohga.cpp14
-rw-r--r--src/mame/drivers/rollrace.cpp4
-rw-r--r--src/mame/drivers/ron.cpp4
-rw-r--r--src/mame/drivers/rpunch.cpp8
-rw-r--r--src/mame/drivers/rt1715.cpp4
-rw-r--r--src/mame/drivers/runaway.cpp8
-rw-r--r--src/mame/drivers/rungun.cpp4
-rw-r--r--src/mame/drivers/rx78.cpp4
-rw-r--r--src/mame/drivers/safarir.cpp4
-rw-r--r--src/mame/drivers/sandscrp.cpp4
-rw-r--r--src/mame/drivers/sanremo.cpp4
-rw-r--r--src/mame/drivers/saturn.cpp2
-rw-r--r--src/mame/drivers/sauro.cpp8
-rw-r--r--src/mame/drivers/sbasketb.cpp4
-rw-r--r--src/mame/drivers/sbc6510.cpp4
-rw-r--r--src/mame/drivers/sbowling.cpp4
-rw-r--r--src/mame/drivers/sbrkout.cpp4
-rw-r--r--src/mame/drivers/sbugger.cpp4
-rw-r--r--src/mame/drivers/scobra.cpp6
-rw-r--r--src/mame/drivers/scopus.cpp4
-rw-r--r--src/mame/drivers/scorpion.cpp12
-rw-r--r--src/mame/drivers/scotrsht.cpp4
-rw-r--r--src/mame/drivers/scramble.cpp20
-rw-r--r--src/mame/drivers/scregg.cpp6
-rw-r--r--src/mame/drivers/scv.cpp4
-rw-r--r--src/mame/drivers/scyclone.cpp4
-rw-r--r--src/mame/drivers/sderby.cpp14
-rw-r--r--src/mame/drivers/sderby2.cpp4
-rw-r--r--src/mame/drivers/seabattl.cpp4
-rw-r--r--src/mame/drivers/sealy.cpp4
-rw-r--r--src/mame/drivers/segag80r.cpp16
-rw-r--r--src/mame/drivers/segahang.cpp4
-rw-r--r--src/mame/drivers/segald.cpp13
-rw-r--r--src/mame/drivers/segaorun.cpp4
-rw-r--r--src/mame/drivers/segas16a.cpp4
-rw-r--r--src/mame/drivers/segas16b.cpp8
-rw-r--r--src/mame/drivers/segas18.cpp4
-rw-r--r--src/mame/drivers/segas32.cpp6
-rw-r--r--src/mame/drivers/segaxbd.cpp4
-rw-r--r--src/mame/drivers/segaybd.cpp2
-rw-r--r--src/mame/drivers/seibucats.cpp4
-rw-r--r--src/mame/drivers/seibuspi.cpp10
-rw-r--r--src/mame/drivers/seicross.cpp4
-rw-r--r--src/mame/drivers/seicupbl.cpp30
-rw-r--r--src/mame/drivers/sengokmj.cpp4
-rw-r--r--src/mame/drivers/senjyo.cpp4
-rw-r--r--src/mame/drivers/seta.cpp123
-rw-r--r--src/mame/drivers/seta2.cpp16
-rw-r--r--src/mame/drivers/sf.cpp4
-rw-r--r--src/mame/drivers/sfbonus.cpp4
-rw-r--r--src/mame/drivers/shadfrce.cpp4
-rw-r--r--src/mame/drivers/shangha3.cpp8
-rw-r--r--src/mame/drivers/shangkid.cpp12
-rw-r--r--src/mame/drivers/shaolins.cpp4
-rw-r--r--src/mame/drivers/shisen.cpp4
-rw-r--r--src/mame/drivers/shootout.cpp6
-rw-r--r--src/mame/drivers/shuuz.cpp4
-rw-r--r--src/mame/drivers/sidearms.cpp10
-rw-r--r--src/mame/drivers/sidepckt.cpp4
-rw-r--r--src/mame/drivers/sigmab98.cpp10
-rw-r--r--src/mame/drivers/silkroad.cpp4
-rw-r--r--src/mame/drivers/silvmil.cpp4
-rw-r--r--src/mame/drivers/simpl156.cpp4
-rw-r--r--src/mame/drivers/skimaxx.cpp11
-rw-r--r--src/mame/drivers/skullxbo.cpp4
-rw-r--r--src/mame/drivers/skyarmy.cpp4
-rw-r--r--src/mame/drivers/skydiver.cpp4
-rw-r--r--src/mame/drivers/skyfox.cpp4
-rw-r--r--src/mame/drivers/skykid.cpp4
-rw-r--r--src/mame/drivers/skylncr.cpp16
-rw-r--r--src/mame/drivers/skyraid.cpp4
-rw-r--r--src/mame/drivers/slapfght.cpp10
-rw-r--r--src/mame/drivers/slapshot.cpp6
-rw-r--r--src/mame/drivers/slotcarn.cpp4
-rw-r--r--src/mame/drivers/sm1800.cpp4
-rw-r--r--src/mame/drivers/sm7238.cpp4
-rw-r--r--src/mame/drivers/smc777.cpp2
-rw-r--r--src/mame/drivers/snk.cpp22
-rw-r--r--src/mame/drivers/snk6502.cpp12
-rw-r--r--src/mame/drivers/snk68.cpp4
-rw-r--r--src/mame/drivers/snookr10.cpp4
-rw-r--r--src/mame/drivers/snowbros.cpp28
-rw-r--r--src/mame/drivers/solomon.cpp4
-rw-r--r--src/mame/drivers/sonson.cpp4
-rw-r--r--src/mame/drivers/sorcerer.cpp4
-rw-r--r--src/mame/drivers/spartanxtec.cpp4
-rw-r--r--src/mame/drivers/spbactn.cpp8
-rw-r--r--src/mame/drivers/spcforce.cpp4
-rw-r--r--src/mame/drivers/spdodgeb.cpp4
-rw-r--r--src/mame/drivers/spectrum.cpp4
-rw-r--r--src/mame/drivers/speedatk.cpp4
-rw-r--r--src/mame/drivers/speedbal.cpp4
-rw-r--r--src/mame/drivers/speedspn.cpp4
-rw-r--r--src/mame/drivers/speglsht.cpp4
-rw-r--r--src/mame/drivers/splash.cpp8
-rw-r--r--src/mame/drivers/spoker.cpp8
-rw-r--r--src/mame/drivers/spool99.cpp4
-rw-r--r--src/mame/drivers/sprcros2.cpp4
-rw-r--r--src/mame/drivers/sprint2.cpp4
-rw-r--r--src/mame/drivers/sprint4.cpp4
-rw-r--r--src/mame/drivers/sprint8.cpp4
-rw-r--r--src/mame/drivers/spyhuntertec.cpp4
-rw-r--r--src/mame/drivers/srmp2.cpp10
-rw-r--r--src/mame/drivers/srmp5.cpp4
-rw-r--r--src/mame/drivers/srmp6.cpp2
-rw-r--r--src/mame/drivers/srumbler.cpp4
-rw-r--r--src/mame/drivers/sshangha.cpp4
-rw-r--r--src/mame/drivers/sshot.cpp4
-rw-r--r--src/mame/drivers/ssingles.cpp8
-rw-r--r--src/mame/drivers/sslam.cpp8
-rw-r--r--src/mame/drivers/ssozumo.cpp4
-rw-r--r--src/mame/drivers/sspeedr.cpp4
-rw-r--r--src/mame/drivers/ssrj.cpp4
-rw-r--r--src/mame/drivers/ssv.cpp12
-rw-r--r--src/mame/drivers/stadhero.cpp4
-rw-r--r--src/mame/drivers/starcrus.cpp4
-rw-r--r--src/mame/drivers/starshp1.cpp4
-rw-r--r--src/mame/drivers/statriv2.cpp8
-rw-r--r--src/mame/drivers/stlforce.cpp4
-rw-r--r--src/mame/drivers/strnskil.cpp4
-rw-r--r--src/mame/drivers/stuntair.cpp4
-rw-r--r--src/mame/drivers/stv.cpp2
-rw-r--r--src/mame/drivers/sub.cpp4
-rw-r--r--src/mame/drivers/subhuntr.cpp4
-rw-r--r--src/mame/drivers/subs.cpp4
-rw-r--r--src/mame/drivers/subsino.cpp10
-rw-r--r--src/mame/drivers/subsino2.cpp10
-rw-r--r--src/mame/drivers/summit.cpp4
-rw-r--r--src/mame/drivers/suna16.cpp12
-rw-r--r--src/mame/drivers/suna8.cpp14
-rw-r--r--src/mame/drivers/supbtime.cpp4
-rw-r--r--src/mame/drivers/supdrapo.cpp4
-rw-r--r--src/mame/drivers/supduck.cpp4
-rw-r--r--src/mame/drivers/super80.cpp20
-rw-r--r--src/mame/drivers/superchs.cpp4
-rw-r--r--src/mame/drivers/supercrd.cpp4
-rw-r--r--src/mame/drivers/superdq.cpp4
-rw-r--r--src/mame/drivers/superqix.cpp10
-rw-r--r--src/mame/drivers/superwng.cpp4
-rw-r--r--src/mame/drivers/supracan.cpp4
-rw-r--r--src/mame/drivers/suprgolf.cpp4
-rw-r--r--src/mame/drivers/suprloco.cpp4
-rw-r--r--src/mame/drivers/suprnova.cpp2
-rw-r--r--src/mame/drivers/suprridr.cpp4
-rw-r--r--src/mame/drivers/suprslam.cpp4
-rw-r--r--src/mame/drivers/sys9002.cpp2
-rw-r--r--src/mame/drivers/system1.cpp4
-rw-r--r--src/mame/drivers/system16.cpp12
-rw-r--r--src/mame/drivers/tagteam.cpp4
-rw-r--r--src/mame/drivers/tail2nos.cpp4
-rw-r--r--src/mame/drivers/taito_b.cpp38
-rw-r--r--src/mame/drivers/taito_f2.cpp52
-rw-r--r--src/mame/drivers/taito_f3.cpp8
-rw-r--r--src/mame/drivers/taito_h.cpp12
-rw-r--r--src/mame/drivers/taito_l.cpp2
-rw-r--r--src/mame/drivers/taito_o.cpp4
-rw-r--r--src/mame/drivers/taito_x.cpp12
-rw-r--r--src/mame/drivers/taito_z.cpp26
-rw-r--r--src/mame/drivers/taitoair.cpp4
-rw-r--r--src/mame/drivers/taitojc.cpp2
-rw-r--r--src/mame/drivers/taitopjc.cpp2
-rw-r--r--src/mame/drivers/taitosj.cpp4
-rw-r--r--src/mame/drivers/tandy1t.cpp4
-rw-r--r--src/mame/drivers/tank8.cpp4
-rw-r--r--src/mame/drivers/tankbatt.cpp4
-rw-r--r--src/mame/drivers/tankbust.cpp4
-rw-r--r--src/mame/drivers/taotaido.cpp4
-rw-r--r--src/mame/drivers/targeth.cpp4
-rw-r--r--src/mame/drivers/tasman.cpp4
-rw-r--r--src/mame/drivers/tatsumi.cpp14
-rw-r--r--src/mame/drivers/tattack.cpp4
-rw-r--r--src/mame/drivers/taxidriv.cpp4
-rw-r--r--src/mame/drivers/tbowl.cpp4
-rw-r--r--src/mame/drivers/tceptor.cpp4
-rw-r--r--src/mame/drivers/tecmo.cpp4
-rw-r--r--src/mame/drivers/tecmo16.cpp4
-rw-r--r--src/mame/drivers/tecmosys.cpp4
-rw-r--r--src/mame/drivers/tehkanwc.cpp4
-rw-r--r--src/mame/drivers/tek410x.cpp4
-rw-r--r--src/mame/drivers/terracre.cpp4
-rw-r--r--src/mame/drivers/tetrisp2.cpp38
-rw-r--r--src/mame/drivers/thedealr.cpp4
-rw-r--r--src/mame/drivers/thedeep.cpp4
-rw-r--r--src/mame/drivers/thepit.cpp14
-rw-r--r--src/mame/drivers/thoop2.cpp4
-rw-r--r--src/mame/drivers/thunderj.cpp4
-rw-r--r--src/mame/drivers/ti630.cpp4
-rw-r--r--src/mame/drivers/tiamc1.cpp8
-rw-r--r--src/mame/drivers/tigeroad.cpp6
-rw-r--r--src/mame/drivers/tim100.cpp4
-rw-r--r--src/mame/drivers/timelimt.cpp4
-rw-r--r--src/mame/drivers/timeplt.cpp10
-rw-r--r--src/mame/drivers/timex.cpp4
-rw-r--r--src/mame/drivers/tk80bs.cpp4
-rw-r--r--src/mame/drivers/tmmjprd.cpp4
-rw-r--r--src/mame/drivers/tmnt.cpp6
-rw-r--r--src/mame/drivers/tmspoker.cpp4
-rw-r--r--src/mame/drivers/tnzs.cpp8
-rw-r--r--src/mame/drivers/toaplan1.cpp22
-rw-r--r--src/mame/drivers/toaplan2.cpp24
-rw-r--r--src/mame/drivers/toki.cpp8
-rw-r--r--src/mame/drivers/toobin.cpp4
-rw-r--r--src/mame/drivers/topspeed.cpp4
-rw-r--r--src/mame/drivers/toypop.cpp4
-rw-r--r--src/mame/drivers/tp84.cpp4
-rw-r--r--src/mame/drivers/trackfld.cpp6
-rw-r--r--src/mame/drivers/travrusa.cpp10
-rw-r--r--src/mame/drivers/triplhnt.cpp4
-rw-r--r--src/mame/drivers/trs80.cpp24
-rw-r--r--src/mame/drivers/trs80dt1.cpp4
-rw-r--r--src/mame/drivers/trucocl.cpp4
-rw-r--r--src/mame/drivers/trvmadns.cpp4
-rw-r--r--src/mame/drivers/tryout.cpp4
-rw-r--r--src/mame/drivers/tsamurai.cpp8
-rw-r--r--src/mame/drivers/tugboat.cpp4
-rw-r--r--src/mame/drivers/tumbleb.cpp20
-rw-r--r--src/mame/drivers/tunhunt.cpp4
-rw-r--r--src/mame/drivers/turbo.cpp8
-rw-r--r--src/mame/drivers/twin16.cpp8
-rw-r--r--src/mame/drivers/twincobr.cpp4
-rw-r--r--src/mame/drivers/tx0.cpp4
-rw-r--r--src/mame/drivers/ultratnk.cpp4
-rw-r--r--src/mame/drivers/umipoker.cpp4
-rw-r--r--src/mame/drivers/undrfire.cpp8
-rw-r--r--src/mame/drivers/unico.cpp8
-rw-r--r--src/mame/drivers/unior.cpp4
-rw-r--r--src/mame/drivers/unistar.cpp4
-rw-r--r--src/mame/drivers/univac.cpp4
-rw-r--r--src/mame/drivers/usgames.cpp4
-rw-r--r--src/mame/drivers/ut88.cpp4
-rw-r--r--src/mame/drivers/v6809.cpp4
-rw-r--r--src/mame/drivers/vamphalf.cpp6
-rw-r--r--src/mame/drivers/vaportra.cpp25
-rw-r--r--src/mame/drivers/vastar.cpp4
-rw-r--r--src/mame/drivers/vball.cpp4
-rw-r--r--src/mame/drivers/vega.cpp4
-rw-r--r--src/mame/drivers/vg5k.cpp4
-rw-r--r--src/mame/drivers/videopin.cpp4
-rw-r--r--src/mame/drivers/videopkr.cpp10
-rw-r--r--src/mame/drivers/vigilant.cpp12
-rw-r--r--src/mame/drivers/vindictr.cpp4
-rw-r--r--src/mame/drivers/vlc.cpp4
-rw-r--r--src/mame/drivers/volfied.cpp4
-rw-r--r--src/mame/drivers/vpoker.cpp4
-rw-r--r--src/mame/drivers/vroulet.cpp4
-rw-r--r--src/mame/drivers/vt100.cpp4
-rw-r--r--src/mame/drivers/vt240.cpp4
-rw-r--r--src/mame/drivers/vta2000.cpp4
-rw-r--r--src/mame/drivers/vtech2.cpp4
-rw-r--r--src/mame/drivers/vulgus.cpp4
-rw-r--r--src/mame/drivers/wallc.cpp4
-rw-r--r--src/mame/drivers/wardner.cpp4
-rw-r--r--src/mame/drivers/warpsped.cpp4
-rw-r--r--src/mame/drivers/warpwarp.cpp14
-rw-r--r--src/mame/drivers/warriorb.cpp6
-rw-r--r--src/mame/drivers/wc90.cpp4
-rw-r--r--src/mame/drivers/wc90b.cpp4
-rw-r--r--src/mame/drivers/wecleman.cpp8
-rw-r--r--src/mame/drivers/welltris.cpp4
-rw-r--r--src/mame/drivers/wgp.cpp4
-rw-r--r--src/mame/drivers/williams.cpp4
-rw-r--r--src/mame/drivers/wink.cpp4
-rw-r--r--src/mame/drivers/wiping.cpp4
-rw-r--r--src/mame/drivers/witch.cpp8
-rw-r--r--src/mame/drivers/wiz.cpp8
-rw-r--r--src/mame/drivers/wms.cpp4
-rw-r--r--src/mame/drivers/wolfpack.cpp4
-rw-r--r--src/mame/drivers/wrally.cpp4
-rw-r--r--src/mame/drivers/wswan.cpp4
-rw-r--r--src/mame/drivers/wwfsstar.cpp4
-rw-r--r--src/mame/drivers/wyvernf0.cpp4
-rw-r--r--src/mame/drivers/x07.cpp4
-rw-r--r--src/mame/drivers/x1.cpp4
-rw-r--r--src/mame/drivers/x1twin.cpp4
-rw-r--r--src/mame/drivers/x68k.cpp2
-rw-r--r--src/mame/drivers/xain.cpp4
-rw-r--r--src/mame/drivers/xavix.cpp4
-rw-r--r--src/mame/drivers/xerox820.cpp8
-rw-r--r--src/mame/drivers/xorworld.cpp4
-rw-r--r--src/mame/drivers/xxmissio.cpp4
-rw-r--r--src/mame/drivers/xybots.cpp4
-rw-r--r--src/mame/drivers/xyonix.cpp4
-rw-r--r--src/mame/drivers/yiear.cpp4
-rw-r--r--src/mame/drivers/yunsun16.cpp6
-rw-r--r--src/mame/drivers/yunsung8.cpp4
-rw-r--r--src/mame/drivers/z1013.cpp4
-rw-r--r--src/mame/drivers/z9001.cpp4
-rw-r--r--src/mame/drivers/zac2650.cpp4
-rw-r--r--src/mame/drivers/zaccaria.cpp4
-rw-r--r--src/mame/drivers/zaxxon.cpp4
-rw-r--r--src/mame/drivers/zerozone.cpp4
-rw-r--r--src/mame/drivers/zodiack.cpp4
-rw-r--r--src/mame/drivers/zorba.cpp7
-rw-r--r--src/mame/drivers/zrt80.cpp4
-rw-r--r--src/mame/drivers/zwackery.cpp4
-rw-r--r--src/mame/etc/korgm1.cpp4
-rw-r--r--src/mame/etc/template_driver.cpp4
-rw-r--r--src/mame/includes/apollo.h3
-rw-r--r--src/mame/includes/cps1.h4
-rw-r--r--src/mame/includes/darkseal.h35
-rw-r--r--src/mame/includes/pgm.h2
-rw-r--r--src/mame/includes/saturn.h8
-rw-r--r--src/mame/includes/stv.h8
-rw-r--r--src/mame/includes/vaportra.h8
-rw-r--r--src/mame/machine/apollo_kbd.h3
-rw-r--r--src/mame/machine/cit101_kbd.h1
-rw-r--r--src/mame/machine/dec_lk201.h3
-rw-r--r--src/mame/machine/esqpanel.h2
-rw-r--r--src/mame/machine/megacd.cpp4
-rw-r--r--src/mame/machine/midikbd.h2
-rw-r--r--src/mame/machine/ms7004.h4
-rw-r--r--src/mame/machine/saturn.cpp2
-rw-r--r--src/mame/machine/wangpckb.h3
-rw-r--r--src/mame/machine/zx8302.h1
-rw-r--r--src/mame/video/733_asr.cpp4
-rw-r--r--src/mame/video/911_vdt.cpp12
-rw-r--r--src/mame/video/abc80.cpp4
-rw-r--r--src/mame/video/airraid_dev.cpp4
-rw-r--r--src/mame/video/bfm_adr2.cpp4
-rw-r--r--src/mame/video/cgc7900.cpp4
-rw-r--r--src/mame/video/madalien.cpp4
-rw-r--r--src/mame/video/mikromik.cpp4
-rw-r--r--src/mame/video/mystston.cpp4
-rw-r--r--src/mame/video/newbrain.cpp4
-rw-r--r--src/mame/video/pcd.cpp4
-rw-r--r--src/mame/video/pcd.h3
-rw-r--r--src/mame/video/stfight_dev.cpp12
-rw-r--r--src/mame/video/tmc600.cpp4
-rw-r--r--src/mame/video/ygv608.cpp4
1082 files changed, 3599 insertions, 3537 deletions
diff --git a/src/devices/bus/apricot/keyboard/hle.h b/src/devices/bus/apricot/keyboard/hle.h
index 6335a71ca73..5565ff6026a 100644
--- a/src/devices/bus/apricot/keyboard/hle.h
+++ b/src/devices/bus/apricot/keyboard/hle.h
@@ -14,6 +14,7 @@
#include "keyboard.h"
#include "machine/keyboard.h"
#include "machine/msm5832.h"
+#include "diserial.h"
//**************************************************************************
diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp
index 3c6d3d099dd..f6f5162aa1e 100644
--- a/src/devices/bus/c64/xl80.cpp
+++ b/src/devices/bus/c64/xl80.cpp
@@ -114,7 +114,7 @@ MC6845_UPDATE_ROW( c64_xl80_device::crtc_update_row )
// GFXDECODE( c64_xl80 )
//-------------------------------------------------
-static GFXDECODE_START( c64_xl80 )
+static GFXDECODE_START( gfx_c64_xl80 )
GFXDECODE_ENTRY(HD46505SP_TAG, 0x0000, gfx_8x8x1, 0, 1)
GFXDECODE_END
@@ -130,7 +130,7 @@ MACHINE_CONFIG_START(c64_xl80_device::device_add_mconfig)
MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 24*8-1)
MCFG_SCREEN_REFRESH_RATE(50)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", c64_xl80)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_c64_xl80)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_MC6845_ADD(HD46505SP_TAG, H46505, MC6845_SCREEN_TAG, XTAL(14'318'181) / 8)
diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp
index 07b6a737133..38f52cc4bc1 100644
--- a/src/devices/bus/comx35/clm.cpp
+++ b/src/devices/bus/comx35/clm.cpp
@@ -127,7 +127,7 @@ MC6845_UPDATE_ROW( comx_clm_device::crtc_update_row )
// GFXDECODE( comx_clm )
//-------------------------------------------------
-static GFXDECODE_START( comx_clm )
+static GFXDECODE_START( gfx_comx_clm )
GFXDECODE_ENTRY(MC6845_TAG, 0x0000, gfx_8x8x1, 0, 1)
GFXDECODE_END
@@ -144,7 +144,7 @@ MACHINE_CONFIG_START(comx_clm_device::device_add_mconfig)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
MCFG_SCREEN_REFRESH_RATE(50)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", comx_clm)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_comx_clm)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_MC6845_ADD(MC6845_TAG, MC6845, MC6845_SCREEN_TAG, XTAL(14'318'181)/7)
diff --git a/src/devices/bus/einstein/pipe/tk02.cpp b/src/devices/bus/einstein/pipe/tk02.cpp
index 2e5ebd8f85b..866d4234175 100644
--- a/src/devices/bus/einstein/pipe/tk02.cpp
+++ b/src/devices/bus/einstein/pipe/tk02.cpp
@@ -87,7 +87,7 @@ static const gfx_layout tk02_charlayout =
8*8
};
-static GFXDECODE_START( tk02 )
+static GFXDECODE_START( gfx_tk02 )
GFXDECODE_ENTRY("gfx", 0x0000, tk02_charlayout, 0, 1)
GFXDECODE_ENTRY("gfx", 0x1000, tk02_charlayout, 0, 1)
GFXDECODE_END
@@ -103,7 +103,7 @@ MACHINE_CONFIG_START(tk02_device::device_add_mconfig)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", tk02)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tk02)
MCFG_MC6845_ADD("crtc", MC6845, "mono", XTAL(8'000'000) / 4)
MCFG_MC6845_SHOW_BORDER_AREA(false)
diff --git a/src/devices/bus/interpro/keyboard/hle.h b/src/devices/bus/interpro/keyboard/hle.h
index 356500225c4..944569b9658 100644
--- a/src/devices/bus/interpro/keyboard/hle.h
+++ b/src/devices/bus/interpro/keyboard/hle.h
@@ -8,6 +8,7 @@
#include "keyboard.h"
#include "machine/keyboard.h"
#include "sound/beep.h"
+#include "diserial.h"
namespace bus { namespace interpro { namespace keyboard {
diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp
index 718c59735bd..bd1f2d19300 100644
--- a/src/devices/bus/isa/mda.cpp
+++ b/src/devices/bus/isa/mda.cpp
@@ -81,7 +81,7 @@ static const gfx_layout pc_8_charlayout =
8*8 /* every char takes 8 bytes */
};
-static GFXDECODE_START( pcmda )
+static GFXDECODE_START( gfx_pcmda )
GFXDECODE_ENTRY( "gfx1", 0x0000, pc_16_charlayout, 1, 1 )
GFXDECODE_ENTRY( "gfx1", 0x1000, pc_8_charlayout, 1, 1 )
GFXDECODE_END
@@ -124,7 +124,7 @@ MACHINE_CONFIG_START(isa8_mda_device::device_add_mconfig)
MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, isa8_mda_device, hsync_changed))
MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, isa8_mda_device, vsync_changed))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", pcmda)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pcmda)
MCFG_DEVICE_ADD("lpt", PC_LPT, 0)
MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(*this, isa8_mda_device, pc_cpu_line))
@@ -519,7 +519,7 @@ allow this.
The divder/pixels per 6845 clock is 9 for text mode and 16 for graphics mode.
*/
-static GFXDECODE_START( pcherc )
+static GFXDECODE_START( gfx_pcherc )
GFXDECODE_ENTRY( "gfx1", 0x0000, pc_16_charlayout, 1, 1 )
GFXDECODE_END
@@ -552,7 +552,7 @@ MACHINE_CONFIG_START(isa8_hercules_device::device_add_mconfig)
MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, isa8_mda_device, hsync_changed))
MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, isa8_mda_device, vsync_changed))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", pcherc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pcherc)
MCFG_DEVICE_ADD("lpt", PC_LPT, 0)
MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(*this, isa8_mda_device, pc_cpu_line))
diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp
index fb010d5f49a..7fb721a1db7 100644
--- a/src/devices/bus/isa/pgc.cpp
+++ b/src/devices/bus/isa/pgc.cpp
@@ -135,7 +135,7 @@ static const gfx_layout pgc_charlayout =
8*16 /* every char takes 10 bytes */
};
-static GFXDECODE_START( pgc )
+static GFXDECODE_START( gfx_pgc )
GFXDECODE_REVERSEBITS("chargen", 0, pgc_charlayout, 0, 1)
GFXDECODE_END
@@ -172,7 +172,7 @@ MACHINE_CONFIG_START(isa8_pgc_device::device_add_mconfig)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, isa8_pgc_device, vblank_irq))
#endif
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", pgc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pgc)
MCFG_PALETTE_ADD( "palette", 256 )
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h
index c6c3a6f6f17..d54dda024b1 100644
--- a/src/devices/bus/isa/sblaster.h
+++ b/src/devices/bus/isa/sblaster.h
@@ -11,6 +11,7 @@
#include "sound/3812intf.h"
#include "sound/dac.h"
#include "sound/saa1099.h"
+#include "diserial.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/nes_ctrl/miracle.h b/src/devices/bus/nes_ctrl/miracle.h
index 16c15ab65db..16cc1c57cd1 100644
--- a/src/devices/bus/nes_ctrl/miracle.h
+++ b/src/devices/bus/nes_ctrl/miracle.h
@@ -13,6 +13,7 @@
#include "ctrl.h"
#include "bus/midi/midi.h"
+#include "diserial.h"
//**************************************************************************
diff --git a/src/devices/bus/rs232/null_modem.h b/src/devices/bus/rs232/null_modem.h
index 69f3ad75103..7ba5cddbb78 100644
--- a/src/devices/bus/rs232/null_modem.h
+++ b/src/devices/bus/rs232/null_modem.h
@@ -5,6 +5,7 @@
#include "rs232.h"
#include "imagedev/bitbngr.h"
+#include "diserial.h"
class null_modem_device : public device_t,
public device_serial_interface,
diff --git a/src/devices/bus/rs232/printer.h b/src/devices/bus/rs232/printer.h
index 099e3a33138..8cab55e7344 100644
--- a/src/devices/bus/rs232/printer.h
+++ b/src/devices/bus/rs232/printer.h
@@ -7,6 +7,7 @@
#include "rs232.h"
#include "imagedev/printer.h"
+#include "diserial.h"
class serial_printer_device : public device_t,
public device_serial_interface,
diff --git a/src/devices/bus/rs232/pty.h b/src/devices/bus/rs232/pty.h
index f5ed25d7167..88550fd5791 100644
--- a/src/devices/bus/rs232/pty.h
+++ b/src/devices/bus/rs232/pty.h
@@ -7,6 +7,7 @@
#include "rs232.h"
#include "dipty.h"
+#include "diserial.h"
class pseudo_terminal_device : public device_t,
public device_serial_interface,
diff --git a/src/devices/bus/rs232/rs232.h b/src/devices/bus/rs232/rs232.h
index 56c8ec7b896..c4db0af2313 100644
--- a/src/devices/bus/rs232/rs232.h
+++ b/src/devices/bus/rs232/rs232.h
@@ -5,6 +5,8 @@
#pragma once
+#include "diserial.h"
+
#define MCFG_RS232_RXD_HANDLER(_devcb) \
devcb = &downcast<rs232_port_device &>(*device).set_rxd_handler(DEVCB_##_devcb);
diff --git a/src/devices/bus/rs232/ser_mouse.h b/src/devices/bus/rs232/ser_mouse.h
index 28d6e73d0d3..ff4e7a81995 100644
--- a/src/devices/bus/rs232/ser_mouse.h
+++ b/src/devices/bus/rs232/ser_mouse.h
@@ -10,6 +10,7 @@
#define MAME_BUS_RS232_SER_MOUSE_H
#include "rs232.h"
+#include "diserial.h"
class serial_mouse_device :
public device_t,
diff --git a/src/devices/bus/rs232/xvd701.h b/src/devices/bus/rs232/xvd701.h
index 1327c3b2c2b..b018659210e 100644
--- a/src/devices/bus/rs232/xvd701.h
+++ b/src/devices/bus/rs232/xvd701.h
@@ -4,10 +4,11 @@
#define MAME_BUS_RS232_XVD701_H
#include "rs232.h"
+#include "diserial.h"
class jvc_xvd701_device : public device_t,
- public device_serial_interface,
- public device_rs232_port_interface
+ public device_serial_interface,
+ public device_rs232_port_interface
{
public:
jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
diff --git a/src/devices/bus/snes_ctrl/miracle.h b/src/devices/bus/snes_ctrl/miracle.h
index 587ba741506..cb1b89a6eda 100644
--- a/src/devices/bus/snes_ctrl/miracle.h
+++ b/src/devices/bus/snes_ctrl/miracle.h
@@ -11,9 +11,10 @@
#pragma once
-
#include "ctrl.h"
#include "bus/midi/midi.h"
+#include "diserial.h"
+
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/sunkbd/hlekbd.h b/src/devices/bus/sunkbd/hlekbd.h
index c2dbf17f67e..21caa54dac9 100644
--- a/src/devices/bus/sunkbd/hlekbd.h
+++ b/src/devices/bus/sunkbd/hlekbd.h
@@ -8,6 +8,7 @@
#include "sunkbd.h"
#include "machine/keyboard.h"
#include "sound/beep.h"
+#include "diserial.h"
namespace bus { namespace sunkbd {
diff --git a/src/devices/bus/sunkbd/sunkbd.h b/src/devices/bus/sunkbd/sunkbd.h
index b0b9d4f0494..d40d9e20a39 100644
--- a/src/devices/bus/sunkbd/sunkbd.h
+++ b/src/devices/bus/sunkbd/sunkbd.h
@@ -5,6 +5,7 @@
#pragma once
+#include "diserial.h"
#define MCFG_SUNKBD_RXD_HANDLER(cb) \
diff --git a/src/devices/bus/ti8x/graphlinkhle.h b/src/devices/bus/ti8x/graphlinkhle.h
index 55f8a838cfe..310a4daf133 100644
--- a/src/devices/bus/ti8x/graphlinkhle.h
+++ b/src/devices/bus/ti8x/graphlinkhle.h
@@ -20,6 +20,8 @@
#include "bus/rs232/rs232.h"
+#include "diserial.h"
+
#include <memory>
diff --git a/src/devices/bus/vic20/videopak.cpp b/src/devices/bus/vic20/videopak.cpp
index ed071d13554..1a88798b580 100644
--- a/src/devices/bus/vic20/videopak.cpp
+++ b/src/devices/bus/vic20/videopak.cpp
@@ -88,7 +88,7 @@ MC6845_UPDATE_ROW( vic20_video_pak_device::crtc_update_row )
// GFXDECODE( vic20_video_pak )
//-------------------------------------------------
-static GFXDECODE_START( vic20_video_pak )
+static GFXDECODE_START( gfx_vic20_video_pak )
GFXDECODE_ENTRY(MC6845_TAG, 0x0000, gfx_8x8x1, 0, 1)
GFXDECODE_END
@@ -104,7 +104,7 @@ MACHINE_CONFIG_START(vic20_video_pak_device::device_add_mconfig)
MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 24*8-1)
MCFG_SCREEN_REFRESH_RATE(50)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", vic20_video_pak)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vic20_video_pak)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_MC6845_ADD(MC6845_TAG, H46505, MC6845_SCREEN_TAG, XTAL(14'318'181) / 8)
diff --git a/src/devices/imagedev/midiin.h b/src/devices/imagedev/midiin.h
index 776112b2625..aaba86fc2d1 100644
--- a/src/devices/imagedev/midiin.h
+++ b/src/devices/imagedev/midiin.h
@@ -8,11 +8,12 @@
*********************************************************************/
-#ifndef MAME_DEVICES_IMAGEDEV_MIDIIN_H
-#define MAME_DEVICES_IMAGEDEV_MIDIIN_H
+#ifndef MAME_IMAGEDEV_MIDIIN_H
+#define MAME_IMAGEDEV_MIDIIN_H
#pragma once
+#include "diserial.h"
#define MCFG_MIDIIN_INPUT_CB(_devcb) \
devcb = &downcast<midiin_device &>(*device).set_input_callback(DEVCB_##_devcb);
@@ -76,4 +77,4 @@ DECLARE_DEVICE_TYPE(MIDIIN, midiin_device)
// device iterator
typedef device_type_iterator<midiin_device> midiin_device_iterator;
-#endif // MAME_DEVICES_IMAGEDEV_MIDIIN_H
+#endif // MAME_IMAGEDEV_MIDIIN_H
diff --git a/src/devices/imagedev/midiout.h b/src/devices/imagedev/midiout.h
index 0bd1c0c38af..713c783b992 100644
--- a/src/devices/imagedev/midiout.h
+++ b/src/devices/imagedev/midiout.h
@@ -8,9 +8,12 @@
*********************************************************************/
-#ifndef MAME_DEVICES_IMAGEDEV_MIDIOUT_H
-#define MAME_DEVICES_IMAGEDEV_MIDIOUT_H
+#ifndef MAME_IMAGEDEV_MIDIOUT_H
+#define MAME_IMAGEDEV_MIDIOUT_H
+#pragma once
+
+#include "diserial.h"
/***************************************************************************
CONSTANTS
@@ -67,4 +70,4 @@ DECLARE_DEVICE_TYPE(MIDIOUT, midiout_device)
// device iterator
typedef device_type_iterator<midiout_device> midiout_device_iterator;
-#endif // MAME_DEVICES_IMAGEDEV_MIDIOUT_H
+#endif // MAME_IMAGEDEV_MIDIOUT_H
diff --git a/src/devices/machine/68561mpcc.h b/src/devices/machine/68561mpcc.h
index a91a5221e56..ad4f4f2dda4 100644
--- a/src/devices/machine/68561mpcc.h
+++ b/src/devices/machine/68561mpcc.h
@@ -38,6 +38,7 @@
#ifndef MAME_MACHINE_68561MPCC_H
#define MAME_MACHINE_68561MPCC_H
+#include "diserial.h"
/* Variant ADD macros - use the right one to enable the right feature set! */
#define MCFG_MPCC68560_ADD(_tag, _clock, _rx, _tx) \
diff --git a/src/devices/machine/i8251.h b/src/devices/machine/i8251.h
index 9ff9062a8f9..a475e39ae36 100644
--- a/src/devices/machine/i8251.h
+++ b/src/devices/machine/i8251.h
@@ -13,6 +13,7 @@
#pragma once
+#include "diserial.h"
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
diff --git a/src/devices/machine/ie15.cpp b/src/devices/machine/ie15.cpp
index a44283aeb43..3539a28bc9f 100644
--- a/src/devices/machine/ie15.cpp
+++ b/src/devices/machine/ie15.cpp
@@ -562,7 +562,7 @@ static const gfx_layout ie15_charlayout =
8*8 /* every char takes 8 bytes */
};
-static GFXDECODE_START( ie15 )
+static GFXDECODE_START( gfx_ie15 )
GFXDECODE_ENTRY("chargen", 0x0000, ie15_charlayout, 0, 1)
GFXDECODE_END
@@ -610,7 +610,7 @@ MACHINE_CONFIG_START(ie15_device::device_add_mconfig)
IE15_HORZ_START+IE15_DISP_HORZ, IE15_TOTAL_VERT, IE15_VERT_START,
IE15_VERT_START+IE15_DISP_VERT);
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ie15)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ie15)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MACHINE_CONFIG_END
diff --git a/src/devices/machine/ie15.h b/src/devices/machine/ie15.h
index 715642e9665..7390fb5fea5 100644
--- a/src/devices/machine/ie15.h
+++ b/src/devices/machine/ie15.h
@@ -13,6 +13,7 @@
#include "screen.h"
#include "speaker.h"
+#include "diserial.h"
#define SCREEN_PAGE (80*48)
diff --git a/src/devices/machine/im6402.h b/src/devices/machine/im6402.h
index b2ea2fc4441..ae505ef54c1 100644
--- a/src/devices/machine/im6402.h
+++ b/src/devices/machine/im6402.h
@@ -41,6 +41,7 @@
#pragma once
+#include "diserial.h"
diff --git a/src/devices/machine/ins8250.h b/src/devices/machine/ins8250.h
index fcd52f2ba89..7bd6753b391 100644
--- a/src/devices/machine/ins8250.h
+++ b/src/devices/machine/ins8250.h
@@ -11,6 +11,7 @@
#pragma once
+#include "diserial.h"
/***************************************************************************
CLASS DEFINITIONS
diff --git a/src/devices/machine/mc2661.h b/src/devices/machine/mc2661.h
index 8e03672d483..b4e575cd53b 100644
--- a/src/devices/machine/mc2661.h
+++ b/src/devices/machine/mc2661.h
@@ -28,7 +28,7 @@
#pragma once
-
+#include "diserial.h"
/***************************************************************************
diff --git a/src/devices/machine/mc6852.h b/src/devices/machine/mc6852.h
index 3f32eb5ea5f..2ca977cacdc 100644
--- a/src/devices/machine/mc6852.h
+++ b/src/devices/machine/mc6852.h
@@ -26,8 +26,9 @@
#pragma once
-#include <queue>
+#include "diserial.h"
+#include <queue>
//**************************************************************************
diff --git a/src/devices/machine/mc68681.h b/src/devices/machine/mc68681.h
index afcaed336aa..72b5f9b53b2 100644
--- a/src/devices/machine/mc68681.h
+++ b/src/devices/machine/mc68681.h
@@ -5,6 +5,7 @@
#pragma once
+#include "diserial.h"
#define MCFG_MC68681_IRQ_CALLBACK(_cb) \
devcb = &downcast<duart_base_device &>(*device).set_irq_cb(DEVCB_##_cb);
diff --git a/src/devices/machine/mc68901.h b/src/devices/machine/mc68901.h
index 63a0c456e62..b4a3e2a17b1 100644
--- a/src/devices/machine/mc68901.h
+++ b/src/devices/machine/mc68901.h
@@ -38,6 +38,7 @@
#pragma once
+#include "diserial.h"
//**************************************************************************
diff --git a/src/devices/machine/microtch.h b/src/devices/machine/microtch.h
index d39e930de10..fcff6cfd552 100644
--- a/src/devices/machine/microtch.h
+++ b/src/devices/machine/microtch.h
@@ -5,6 +5,7 @@
#pragma once
+#include "diserial.h"
class microtouch_device :
public device_t,
diff --git a/src/devices/machine/scnxx562.h b/src/devices/machine/scnxx562.h
index 160c6d1214c..c47dbaf2798 100644
--- a/src/devices/machine/scnxx562.h
+++ b/src/devices/machine/scnxx562.h
@@ -42,6 +42,7 @@
#pragma once
#include "cpu/z80/z80daisy.h"
+#include "diserial.h"
//**************************************************************************
// DEVICE CONFIGURATION MACROS
diff --git a/src/devices/machine/tms5501.h b/src/devices/machine/tms5501.h
index a10589b895c..b7970ed1a48 100644
--- a/src/devices/machine/tms5501.h
+++ b/src/devices/machine/tms5501.h
@@ -34,6 +34,7 @@
#pragma once
+#include "diserial.h"
diff --git a/src/devices/machine/ym2148.h b/src/devices/machine/ym2148.h
index 3286ef0ad6c..d3dad3db350 100644
--- a/src/devices/machine/ym2148.h
+++ b/src/devices/machine/ym2148.h
@@ -13,6 +13,7 @@
#pragma once
+#include "diserial.h"
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
diff --git a/src/devices/machine/ym3802.h b/src/devices/machine/ym3802.h
index 4f58b19ac7a..4b05098fc7d 100644
--- a/src/devices/machine/ym3802.h
+++ b/src/devices/machine/ym3802.h
@@ -14,12 +14,13 @@
* reg6 : IER DSR AMR RDR --- TDR CCR SPR(L) MTR(L) EOR/EIR
* reg7 : --- DNR ADR --- --- --- CDR SPR(H) MTR(H) ---
*/
-
-#ifndef DEVICES_MACHINE_YM3802_H
-#define DEVICES_MACHINE_YM3802_H
+#ifndef MAME_MACHINE_YM3802_H
+#define MAME_MACHINE_YM3802_H
#pragma once
+#include "diserial.h"
+
#include <queue>
#define MCFG_YM3802_IRQ_HANDLER(_devcb) \
@@ -168,4 +169,4 @@ private:
DECLARE_DEVICE_TYPE(YM3802, ym3802_device)
-#endif // DEVICES_MACHINE_YM3802_H
+#endif // MAME_MACHINE_YM3802_H
diff --git a/src/devices/machine/z80dart.h b/src/devices/machine/z80dart.h
index 04806d3f957..b0fcc13489f 100644
--- a/src/devices/machine/z80dart.h
+++ b/src/devices/machine/z80dart.h
@@ -148,6 +148,7 @@
#pragma once
#include "cpu/z80/z80daisy.h"
+#include "diserial.h"
//**************************************************************************
diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h
index d98df7da3f9..72b3c46b184 100644
--- a/src/devices/machine/z80scc.h
+++ b/src/devices/machine/z80scc.h
@@ -36,6 +36,7 @@
#pragma once
#include "cpu/z80/z80daisy.h"
+#include "diserial.h"
//**************************************************************************
// DEVICE CONFIGURATION MACROS
diff --git a/src/devices/machine/z80sti.h b/src/devices/machine/z80sti.h
index 8a1afae831a..2d1dea133b9 100644
--- a/src/devices/machine/z80sti.h
+++ b/src/devices/machine/z80sti.h
@@ -35,6 +35,7 @@
#pragma once
#include "cpu/z80/z80daisy.h"
+#include "diserial.h"
//**************************************************************************
diff --git a/src/emu/digfx.cpp b/src/emu/digfx.cpp
index 3f6ed1b4804..0055421b80c 100644
--- a/src/emu/digfx.cpp
+++ b/src/emu/digfx.cpp
@@ -16,17 +16,21 @@
// DEVICE GFX INTERFACE
//**************************************************************************
+GFXDECODE_START( device_gfx_interface::empty )
+GFXDECODE_END
+
//-------------------------------------------------
// device_gfx_interface - constructor
//-------------------------------------------------
-device_gfx_interface::device_gfx_interface(const machine_config &mconfig, device_t &device,
- const gfx_decode_entry *gfxinfo, const char *palette_tag)
- : device_interface(device, "gfx"),
- m_palette(nullptr),
+device_gfx_interface::device_gfx_interface(
+ const machine_config &mconfig,
+ device_t &device,
+ const gfx_decode_entry *gfxinfo,
+ const char *palette_tag) :
+ device_interface(device, "gfx"),
+ m_palette(*this, palette_tag),
m_gfxdecodeinfo(gfxinfo),
- m_palette_tag(palette_tag),
- m_palette_is_sibling(palette_tag == nullptr),
m_palette_is_disabled(false),
m_decoded(false)
{
@@ -59,32 +63,25 @@ void device_gfx_interface::set_palette_disable(bool disable)
void device_gfx_interface::interface_pre_start()
{
- if (!m_palette_is_disabled)
+ if (!m_palette_is_disabled && !m_palette)
{
- if (m_palette_tag == nullptr)
- fatalerror("No palette specified for device\n");
-
- // find our palette device, either as a sibling device or subdevice
- device_t *paldev;
- if (m_palette_is_sibling)
- paldev = device().owner()->subdevice(m_palette_tag);
+ std::pair<device_t &, char const *> const target(m_palette.finder_target());
+ if (target.second == finder_base::DUMMY_TAG)
+ {
+ fatalerror("No palette specified for device %s\n", device().tag());
+ }
else
- paldev = device().subdevice(m_palette_tag);
-
- if (paldev == nullptr)
- fatalerror("Device '%s' specifies nonexistent %sdevice '%s' as palette\n",
- device().tag(),
- (m_palette_is_sibling ? "sibling " : "sub"),
- m_palette_tag);
- if (!paldev->interface(m_palette))
- fatalerror("Device '%s' specifies %sdevice '%s' as palette, but it has no palette interface\n",
- device().tag(),
- (m_palette_is_sibling ? "sibling " : "sub"),
- m_palette_tag);
+ {
+ fatalerror(
+ "Device '%s' specifies nonexistent device '%s' relative to '%s' as palette\n",
+ device().tag(),
+ target.second,
+ target.first.tag());
+ }
}
// if palette device isn't started, wait for it
- // if (!m_palette->device().started())
+ // if (m_palette && !m_palette->device().started())
// throw device_missing_dependencies();
}
@@ -280,30 +277,20 @@ void device_gfx_interface::decode_gfx(const gfx_decode_entry *gfxdecodeinfo)
void device_gfx_interface::interface_validity_check(validity_checker &valid) const
{
- if (!m_palette_is_disabled)
+ if (!m_palette_is_disabled && !m_palette)
{
- // validate palette tag
- if (m_palette_tag == nullptr)
+ std::pair<device_t &, char const *> const target(m_palette.finder_target());
+ if (target.second == finder_base::DUMMY_TAG)
+ {
osd_printf_error("No palette specified for device '%s'\n", device().tag());
+ }
else
{
- device_t *paldev;
- if (m_palette_is_sibling)
- paldev = device().owner()->subdevice(m_palette_tag);
- else
- paldev = device().subdevice(m_palette_tag);
- if (paldev == nullptr)
- osd_printf_error("Nonexistent %sdevice '%s' specified as palette\n",
- (m_palette_is_sibling ? "sibling " : "sub"),
- m_palette_tag);
- else
- {
- device_palette_interface *palintf;
- if (!paldev->interface(palintf))
- osd_printf_error("%sdevice '%s' specified as palette, but it has no palette interface\n",
- (m_palette_is_sibling ? "Sibling " : "Sub"),
- m_palette_tag);
- }
+ osd_printf_error(
+ "Device '%s' specifies nonexistent device '%s' relative to '%s' as palette\n",
+ device().tag(),
+ target.second,
+ target.first.tag());
}
}
diff --git a/src/emu/digfx.h b/src/emu/digfx.h
index f63231c7ad8..1b9bfccb798 100644
--- a/src/emu/digfx.h
+++ b/src/emu/digfx.h
@@ -102,9 +102,7 @@ const gfx_layout name = { width, height, RGN_FRAC(1,1), 8, { GFX_RAW }, { 0 }, {
// these macros are used for declaring gfx_decode_entry info arrays
-#define GFXDECODE_NAME( name ) gfxdecodeinfo_##name
-#define GFXDECODE_EXTERN( name ) extern const gfx_decode_entry GFXDECODE_NAME(name)[]
-#define GFXDECODE_START( name ) const gfx_decode_entry GFXDECODE_NAME(name)[] = {
+#define GFXDECODE_START( name ) const gfx_decode_entry name[] = {
#define GFXDECODE_END { 0 } };
// use these to declare a gfx_decode_entry array as a member of a device class
@@ -131,7 +129,7 @@ const gfx_layout name = { width, height, RGN_FRAC(1,1), 8, { GFX_RAW }, { 0 }, {
dynamic_cast<device_gfx_interface &>(*device).set_palette(_palette_tag);
#define MCFG_GFX_INFO(_info) \
- dynamic_cast<device_gfx_interface &>(*device).set_info(GFXDECODE_NAME(_info));
+ dynamic_cast<device_gfx_interface &>(*device).set_info(_info);
@@ -139,11 +137,6 @@ const gfx_layout name = { width, height, RGN_FRAC(1,1), 8, { GFX_RAW }, { 0 }, {
// DEVICE CONFIGURATION MACROS
//**************************************************************************
-#define MCFG_GFXDECODE_ADD(_tag, _palette_tag, _info) \
- MCFG_DEVICE_ADD(_tag, GFXDECODE) \
- MCFG_GFX_PALETTE(_palette_tag) \
- MCFG_GFX_INFO(_info)
-
#define MCFG_GFXDECODE_MODIFY(_tag, _info) \
MCFG_DEVICE_MODIFY(_tag) \
MCFG_GFX_INFO(_info)
@@ -186,19 +179,21 @@ struct gfx_decode_entry
class device_gfx_interface : public device_interface
{
public:
+ static const gfx_decode_entry empty[];
+
// construction/destruction
device_gfx_interface(const machine_config &mconfig, device_t &device,
- const gfx_decode_entry *gfxinfo = nullptr, const char *palette_tag = nullptr);
+ const gfx_decode_entry *gfxinfo = nullptr, const char *palette_tag = finder_base::DUMMY_TAG);
virtual ~device_gfx_interface();
// configuration
void set_info(const gfx_decode_entry *gfxinfo) { m_gfxdecodeinfo = gfxinfo; }
- void set_palette(const char *tag) { m_palette_tag = tag; m_palette_is_sibling = true; }
+ template <typename T> void set_palette(T &&tag) { m_palette.set_tag(std::forward<T>(tag)); }
void set_palette_disable(bool disable);
// getters
- device_palette_interface &palette() const { assert(m_palette != nullptr); return *m_palette; }
+ device_palette_interface &palette() const { assert(m_palette); return *m_palette; }
gfx_element *gfx(u8 index) const { assert(index < MAX_GFX_ELEMENTS); return m_gfx[index].get(); }
// decoding
@@ -214,13 +209,11 @@ protected:
virtual void interface_post_start() override;
private:
- device_palette_interface * m_palette; // pointer to the palette device interface
+ optional_device<device_palette_interface> m_palette; // configured tag for palette device
std::unique_ptr<gfx_element> m_gfx[MAX_GFX_ELEMENTS]; // array of pointers to graphic sets
// configuration
const gfx_decode_entry * m_gfxdecodeinfo; // pointer to array of gfx decode information
- const char * m_palette_tag; // configured tag for palette device
- bool m_palette_is_sibling; // is palette a sibling or a subdevice?
bool m_palette_is_disabled; // no palette associated with this gfx decode
// internal state
diff --git a/src/emu/diserial.cpp b/src/emu/diserial.cpp
index db8f726d8c7..8c1abb494fc 100644
--- a/src/emu/diserial.cpp
+++ b/src/emu/diserial.cpp
@@ -8,9 +8,10 @@
***************************************************************************/
#include "emu.h"
+#include "diserial.h"
-device_serial_interface::device_serial_interface(const machine_config &mconfig, device_t &device)
- : device_interface(device, "serial"),
+device_serial_interface::device_serial_interface(const machine_config &mconfig, device_t &device) :
+ device_interface(device, "serial"),
m_start_bit_hack_for_external_clocks(false),
m_df_start_bit_count(0),
m_df_word_length(0),
diff --git a/src/emu/diserial.h b/src/emu/diserial.h
index 924ffb08824..af55c7d4bc5 100644
--- a/src/emu/diserial.h
+++ b/src/emu/diserial.h
@@ -5,6 +5,8 @@
#pragma once
+#include <cassert>
+
// Windows headers are crap, let me count the ways
#undef PARITY_NONE
#undef PARITY_ODD
diff --git a/src/emu/drawgfx.cpp b/src/emu/drawgfx.cpp
index eff4e46f2cf..8c86de6ad9a 100644
--- a/src/emu/drawgfx.cpp
+++ b/src/emu/drawgfx.cpp
@@ -2112,6 +2112,3 @@ void copyrozbitmap_trans(bitmap_rgb32 &dest, const rectangle &cliprect, const bi
DECLARE_NO_PRIORITY;
COPYROZBITMAP_CORE(u32, PIXEL_OP_COPY_TRANSPEN, NO_PRIORITY);
}
-
-GFXDECODE_START( empty )
-GFXDECODE_END
diff --git a/src/emu/drawgfx.h b/src/emu/drawgfx.h
index 43e0b85472f..96bdc592ab1 100644
--- a/src/emu/drawgfx.h
+++ b/src/emu/drawgfx.h
@@ -455,12 +455,17 @@ class gfxdecode_device : public device_t, public device_gfx_interface
{
public:
// construction/destruction
+ template <typename T>
+ gfxdecode_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&palette_tag, const gfx_decode_entry *gfxinfo)
+ : gfxdecode_device(mconfig, tag, owner, 0)
+ {
+ set_palette(std::forward<T>(palette_tag));
+ set_info(gfxinfo);
+ }
gfxdecode_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
protected:
virtual void device_start() override {}
};
-GFXDECODE_EXTERN(empty);
-
#endif // MAME_EMU_DRAWGFX_H
diff --git a/src/emu/emu.h b/src/emu/emu.h
index 642bc65ad54..cc9f158df7c 100644
--- a/src/emu/emu.h
+++ b/src/emu/emu.h
@@ -91,7 +91,6 @@ class address_map; // Forward declaration
// common device interfaces
#include "diexec.h"
-#include "diserial.h"
#include "devcpu.h"
// video-related
diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp
index e929c72885c..c9726cb027d 100644
--- a/src/mame/drivers/1942.cpp
+++ b/src/mame/drivers/1942.cpp
@@ -495,7 +495,7 @@ static const gfx_layout spritelayout =
64*8
};
-static GFXDECODE_START( 1942 )
+static GFXDECODE_START( gfx_1942 )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 64*4, 4*32 )
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 64*4+4*32*8, 16 )
@@ -538,7 +538,7 @@ static const gfx_layout spritelayout_p =
32*8
};
-static GFXDECODE_START( 1942p )
+static GFXDECODE_START( gfx_1942p )
GFXDECODE_ENTRY( "gfx1", 0, charlayout_p, 0x000, 64 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout_p, 0x300, 32 )
GFXDECODE_ENTRY( "gfx3", 0, spritelayout_p, 0x400, 16 )
@@ -572,7 +572,7 @@ MACHINE_CONFIG_START(_1942_state::_1942)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1942)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1942)
MCFG_PALETTE_ADD("palette", 64*4+4*32*8+16*16)
MCFG_PALETTE_INDIRECT_ENTRIES(256)
@@ -641,7 +641,7 @@ MACHINE_CONFIG_START(_1942_state::_1942p)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1942p)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1942p)
MCFG_PALETTE_ADD("palette", 0x500)
MCFG_PALETTE_INDIRECT_ENTRIES(0x400)
MCFG_PALETTE_INIT_OWNER(_1942_state, 1942p)
diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp
index 02b25ec733f..ac8b48b1161 100644
--- a/src/mame/drivers/1943.cpp
+++ b/src/mame/drivers/1943.cpp
@@ -287,7 +287,7 @@ static const gfx_layout spritelayout =
/* Graphics Decode Info */
-static GFXDECODE_START( 1943 )
+static GFXDECODE_START( gfx_1943 )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 32*4, 16 )
GFXDECODE_ENTRY( "gfx3", 0, bgtilelayout, 32*4+16*16, 16 )
@@ -333,7 +333,7 @@ MACHINE_CONFIG_START(_1943_state::_1943)
MCFG_SCREEN_UPDATE_DRIVER(_1943_state, screen_update_1943)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1943)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1943)
MCFG_PALETTE_ADD("palette", 32*4+16*16+16*16+16*16)
MCFG_PALETTE_INDIRECT_ENTRIES(256)
MCFG_PALETTE_INIT_OWNER(_1943_state, 1943)
diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp
index 8d0d07ef655..8a92dd4d254 100644
--- a/src/mame/drivers/1945kiii.cpp
+++ b/src/mame/drivers/1945kiii.cpp
@@ -372,7 +372,7 @@ static const gfx_layout k3_layout =
};
-static GFXDECODE_START( 1945kiii )
+static GFXDECODE_START( gfx_1945kiii )
GFXDECODE_ENTRY( "gfx1", 0, k3_layout, 0x0, 2 ) /* bg tiles */
GFXDECODE_ENTRY( "gfx2", 0, k3_layout, 0x0, 2 ) /* bg tiles */
GFXDECODE_END
@@ -388,7 +388,7 @@ MACHINE_CONFIG_START(k3_state::flagrall)
MCFG_DEVICE_PROGRAM_MAP(flagrall_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", k3_state, irq4_line_hold)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1945kiii)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1945kiii)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp
index 413a5e687b3..a5496117458 100644
--- a/src/mame/drivers/2mindril.cpp
+++ b/src/mame/drivers/2mindril.cpp
@@ -312,7 +312,7 @@ static const gfx_layout tile_layout =
128*8 /* every sprite takes 128 consecutive bytes */
};
-static GFXDECODE_START( 2mindril )
+static GFXDECODE_START( gfx_2mindril )
GFXDECODE_ENTRY( nullptr, 0x000000, charlayout, 0x0000, 0x0400>>4 ) /* Dynamically modified */
GFXDECODE_ENTRY( "gfx2", 0x000000, tile_layout, 0x0000, 0x2000>>4 ) /* Tiles area */
GFXDECODE_ENTRY( "gfx1", 0x000000, spriteram_layout, 0x1000, 0x1000>>4 ) /* Sprites area */
@@ -359,7 +359,7 @@ MACHINE_CONFIG_START(_2mindril_state::drill)
MCFG_DEVICE_PROGRAM_MAP(drill_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _2mindril_state, drill_vblank_irq)
//MCFG_DEVICE_PERIODIC_INT_DRIVER(_2mindril_state, drill_device_irq, 60)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", 2mindril)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_2mindril)
MCFG_DEVICE_ADD("tc0510nio", TC0510NIO, 0)
MCFG_TC0510NIO_READ_0_CB(IOPORT("DSW"))
diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp
index 2780d8d6b4f..12f5455f6a9 100644
--- a/src/mame/drivers/3x3puzzl.cpp
+++ b/src/mame/drivers/3x3puzzl.cpp
@@ -366,7 +366,7 @@ static const gfx_layout tiles8x8_layout =
};
-static GFXDECODE_START( _3x3puzzle )
+static GFXDECODE_START( gfx_3x3puzzle )
GFXDECODE_ENTRY( "gfx1", 0, tiles16x16x8_layout, 0, 3 )
GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout, 0, 3 )
GFXDECODE_ENTRY( "gfx3", 0, tiles8x8_layout, 0, 3 )
@@ -400,7 +400,7 @@ MACHINE_CONFIG_START(_3x3puzzle_state::_3x3puzzle)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", _3x3puzzle)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_3x3puzzle)
MCFG_PALETTE_ADD("palette", 0x600/2)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
diff --git a/src/mame/drivers/40love.cpp b/src/mame/drivers/40love.cpp
index e510ca171af..f59a4b1edc9 100644
--- a/src/mame/drivers/40love.cpp
+++ b/src/mame/drivers/40love.cpp
@@ -657,7 +657,7 @@ static const gfx_layout sprite_layout =
};
-static GFXDECODE_START( 40love )
+static GFXDECODE_START( gfx_40love )
GFXDECODE_ENTRY( "gfx2", 0, char_layout, 0, 64 )
GFXDECODE_ENTRY( "gfx1", 0, sprite_layout, 0, 64 )
GFXDECODE_END
@@ -736,7 +736,7 @@ MACHINE_CONFIG_START(fortyl_state::_40love)
MCFG_SCREEN_UPDATE_DRIVER(fortyl_state, screen_update_fortyl)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", 40love)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_40love)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 1024)
/* sound hardware */
@@ -802,7 +802,7 @@ MACHINE_CONFIG_START(fortyl_state::undoukai)
MCFG_SCREEN_UPDATE_DRIVER(fortyl_state, screen_update_fortyl)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", 40love)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_40love)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 1024)
/* sound hardware */
diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp
index 3684994a7a6..13786a6c6b9 100644
--- a/src/mame/drivers/4enraya.cpp
+++ b/src/mame/drivers/4enraya.cpp
@@ -444,7 +444,7 @@ static const gfx_layout charlayout =
8*8
};
-static GFXDECODE_START( 4enraya )
+static GFXDECODE_START( gfx_4enraya )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 )
GFXDECODE_END
@@ -487,7 +487,7 @@ MACHINE_CONFIG_START(_4enraya_state::_4enraya )
MCFG_SCREEN_UPDATE_DRIVER(_4enraya_state, screen_update_4enraya)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", 4enraya)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_4enraya)
MCFG_PALETTE_ADD_3BIT_RGB("palette")
diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp
index 5909cd6ba6e..98feee3d6f3 100644
--- a/src/mame/drivers/4roses.cpp
+++ b/src/mame/drivers/4roses.cpp
@@ -431,7 +431,7 @@ static const gfx_layout charlayout =
* Graphics Decode Information *
******************************/
-static GFXDECODE_START( 4roses )
+static GFXDECODE_START( gfx_4roses )
GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 16 )
GFXDECODE_END
@@ -458,7 +458,7 @@ MACHINE_CONFIG_START(_4roses_state::_4roses)
MCFG_SCREEN_UPDATE_DRIVER(_4roses_state, screen_update_funworld)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", 4roses)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_4roses)
MCFG_PALETTE_ADD("palette", 0x1000)
MCFG_PALETTE_INIT_OWNER(_4roses_state,funworld)
diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp
index bd92b5bceec..e07c6a41c21 100644
--- a/src/mame/drivers/5clown.cpp
+++ b/src/mame/drivers/5clown.cpp
@@ -1010,7 +1010,7 @@ static const gfx_layout tilelayout =
* Graphics Decode Information *
******************************/
-static GFXDECODE_START( fclown )
+static GFXDECODE_START( gfx_fclown )
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 16 )
GFXDECODE_END
@@ -1050,7 +1050,7 @@ MACHINE_CONFIG_START(_5clown_state::fclown)
MCFG_SCREEN_UPDATE_DRIVER(_5clown_state, screen_update_fclown)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", fclown)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fclown)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(_5clown_state, _5clown)
diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp
index 99f02db6ba1..d77e02c7a8c 100644
--- a/src/mame/drivers/a5105.cpp
+++ b/src/mame/drivers/a5105.cpp
@@ -518,7 +518,7 @@ static const gfx_layout a5105_chars_8x8 =
8*8
};
-static GFXDECODE_START( a5105 )
+static GFXDECODE_START( gfx_a5105 )
GFXDECODE_ENTRY( "pcg", 0x0000, a5105_chars_8x8, 0, 8 )
GFXDECODE_END
@@ -580,7 +580,7 @@ MACHINE_CONFIG_START(a5105_state::a5105)
MCFG_SCREEN_UPDATE_DEVICE("upd7220", upd7220_device, screen_update)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 25*8-1)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", a5105)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_a5105)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(a5105_state, a5105)
diff --git a/src/mame/drivers/a51xx.cpp b/src/mame/drivers/a51xx.cpp
index 9f4887180b8..430f2dbdca4 100644
--- a/src/mame/drivers/a51xx.cpp
+++ b/src/mame/drivers/a51xx.cpp
@@ -118,7 +118,7 @@ static const gfx_layout a51xx_charlayout =
8*8 /* every char takes 2 x 8 bytes */
};
-static GFXDECODE_START( a51xx )
+static GFXDECODE_START( gfx_a51xx )
GFXDECODE_ENTRY( "chargen", 0x0000, a51xx_charlayout, 0, 1 )
GFXDECODE_END
@@ -138,7 +138,7 @@ MACHINE_CONFIG_START(a51xx_state::a5120)
MCFG_SCREEN_UPDATE_DRIVER(a51xx_state, screen_update_a5120)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", a51xx)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_a51xx)
MCFG_PALETTE_ADD_MONOCHROME("palette")
diff --git a/src/mame/drivers/ac1.cpp b/src/mame/drivers/ac1.cpp
index ae87d006c56..6d7a52581a2 100644
--- a/src/mame/drivers/ac1.cpp
+++ b/src/mame/drivers/ac1.cpp
@@ -29,7 +29,7 @@
#include "speaker.h"
-static GFXDECODE_START( ac1 )
+static GFXDECODE_START( gfx_ac1 )
GFXDECODE_ENTRY( "gfx1", 0x0000, ac1_charlayout, 0, 1 )
GFXDECODE_END
@@ -150,7 +150,7 @@ MACHINE_CONFIG_START(ac1_state::ac1)
MCFG_SCREEN_UPDATE_DRIVER(ac1_state, screen_update_ac1)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ac1 )
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ac1 )
MCFG_PALETTE_ADD_MONOCHROME("palette")
diff --git a/src/mame/drivers/ace.cpp b/src/mame/drivers/ace.cpp
index 8a0f914df83..d33abfdea4b 100644
--- a/src/mame/drivers/ace.cpp
+++ b/src/mame/drivers/ace.cpp
@@ -294,7 +294,7 @@ static const gfx_layout scorelayout =
32*8 /* every char takes 32 consecutive bytes */
};
-static GFXDECODE_START( ace )
+static GFXDECODE_START( gfx_ace )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 2 )
GFXDECODE_ENTRY( nullptr, 0x8000, charlayout0, 0, 2 ) /* the game dynamically modifies this */
GFXDECODE_ENTRY( nullptr, 0x8000, charlayout1, 0, 2 ) /* the game dynamically modifies this */
@@ -337,7 +337,7 @@ MACHINE_CONFIG_START(aceal_state::ace)
MCFG_SCREEN_UPDATE_DRIVER(aceal_state, screen_update_ace)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ace)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ace)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* sound hardware */
diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp
index b56f00b539a..f7816abf9b0 100644
--- a/src/mame/drivers/acefruit.cpp
+++ b/src/mame/drivers/acefruit.cpp
@@ -620,7 +620,7 @@ static const gfx_layout spritelayout =
32*32 /* every sprite takes 128 bytes */
};
-static GFXDECODE_START( acefruit )
+static GFXDECODE_START( gfx_acefruit )
GFXDECODE_ENTRY( "gfx1", 0x0000, spritelayout, 0, 1 )
GFXDECODE_ENTRY( "gfx1", 0x1800, charlayout, 8, 4 )
GFXDECODE_END
@@ -635,7 +635,7 @@ MACHINE_CONFIG_START(acefruit_state::acefruit)
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", acefruit)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_acefruit)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/acommand.cpp b/src/mame/drivers/acommand.cpp
index ec932e5e973..8987e31531a 100644
--- a/src/mame/drivers/acommand.cpp
+++ b/src/mame/drivers/acommand.cpp
@@ -452,7 +452,7 @@ static const gfx_layout tilelayout =
32*32
};
-static GFXDECODE_START( acommand )
+static GFXDECODE_START( gfx_acommand )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0x1800, 256 )
GFXDECODE_END
@@ -483,7 +483,7 @@ MACHINE_CONFIG_START(acommand_state::acommand)
MCFG_SCREEN_UPDATE_DRIVER(acommand_state, screen_update_acommand)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", acommand)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_acommand)
MCFG_PALETTE_ADD("palette", 0x4000)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp
index 13b27ad817c..08e9c50d3f5 100644
--- a/src/mame/drivers/actfancr.cpp
+++ b/src/mame/drivers/actfancr.cpp
@@ -260,13 +260,13 @@ static const gfx_layout sprites =
32*8 /* every sprite takes 32 consecutive bytes */
};
-static GFXDECODE_START( actfan )
+static GFXDECODE_START( gfx_actfan )
GFXDECODE_ENTRY( "chars", 0, chars, 0, 16 )
GFXDECODE_ENTRY( "sprites", 0, sprites, 512, 16 )
GFXDECODE_ENTRY( "tiles", 0, tiles, 256, 16 )
GFXDECODE_END
-static GFXDECODE_START( triothep )
+static GFXDECODE_START( gfx_triothep )
GFXDECODE_ENTRY( "chars", 0, chars, 0, 16 )
GFXDECODE_ENTRY( "sprites", 0, sprites, 256, 16 )
GFXDECODE_ENTRY( "tiles", 0, tiles, 512, 16 )
@@ -305,7 +305,7 @@ MACHINE_CONFIG_START(actfancr_state::actfancr)
MCFG_SCREEN_UPDATE_DRIVER(actfancr_state, screen_update_actfancr)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", actfan)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_actfan)
MCFG_PALETTE_ADD("palette", 768)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
@@ -363,7 +363,7 @@ MACHINE_CONFIG_START(actfancr_state::triothep)
MCFG_SCREEN_UPDATE_DRIVER(actfancr_state, screen_update_actfancr)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", triothep)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_triothep)
MCFG_PALETTE_ADD("palette", 768)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
diff --git a/src/mame/drivers/aeroboto.cpp b/src/mame/drivers/aeroboto.cpp
index ba579c96b44..ca6bca9d49c 100644
--- a/src/mame/drivers/aeroboto.cpp
+++ b/src/mame/drivers/aeroboto.cpp
@@ -216,7 +216,7 @@ static const gfx_layout spritelayout =
16*8
};
-static GFXDECODE_START( aeroboto )
+static GFXDECODE_START( gfx_aeroboto )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) /* chars */
// GFXDECODE_ENTRY( "gfx2", 0, starlayout, 0, 128 ) /* sky */
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0, 8 )
@@ -263,7 +263,7 @@ MACHINE_CONFIG_START(aeroboto_state::formatz)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, aeroboto_state, vblank_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", aeroboto)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_aeroboto)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256)
diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp
index 0f0bdd358f2..47045783352 100644
--- a/src/mame/drivers/aerofgt.cpp
+++ b/src/mame/drivers/aerofgt.cpp
@@ -1379,54 +1379,54 @@ static const gfx_layout kickball_spritelayout =
32*8
};
-static GFXDECODE_START( pspikes )
+static GFXDECODE_START( gfx_pspikes )
GFXDECODE_ENTRY( "gfx1", 0, pspikes_charlayout, 0, 64 ) /* colors 0-1023 in 8 banks */
GFXDECODE_ENTRY( "gfx2", 0, pspikes_spritelayout, 1024, 64 ) /* colors 1024-2047 in 4 banks */
GFXDECODE_END
-static GFXDECODE_START( pspikesb )
+static GFXDECODE_START( gfx_pspikesb )
GFXDECODE_ENTRY( "gfx1", 0, pspikesb_charlayout, 0, 64 ) /* colors 0-1023 in 8 banks */
GFXDECODE_ENTRY( "gfx2", 0, pspikesb_spritelayout, 1024, 64 ) /* colors 1024-2047 in 4 banks */
GFXDECODE_END
-static GFXDECODE_START( spikes91 )
+static GFXDECODE_START( gfx_spikes91 )
GFXDECODE_ENTRY( "gfx1", 0, pspikesb_charlayout, 0, 64 ) /* colors 0-1023 in 8 banks */
GFXDECODE_ENTRY( "gfx2", 0, spikes91_spritelayout, 1024, 64 ) /* colors 1024-2047 in 4 banks */
GFXDECODE_END
-static GFXDECODE_START( kickball )
+static GFXDECODE_START( gfx_kickball )
GFXDECODE_ENTRY( "gfx1", 0, pspikes_charlayout, 0, 64 ) /* colors 0-1023 in 8 banks */
GFXDECODE_ENTRY( "gfx2", 0, kickball_spritelayout, 1024, 64 ) /* colors 1024-2047 in 4 banks */
GFXDECODE_END
-static GFXDECODE_START( turbofrc )
+static GFXDECODE_START( gfx_turbofrc )
GFXDECODE_ENTRY( "gfx1", 0, pspikes_charlayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, pspikes_charlayout, 256, 16 )
GFXDECODE_ENTRY( "spritegfx", 0, pspikes_spritelayout, 512, 16 )
GFXDECODE_ENTRY( "gfx4", 0, pspikes_spritelayout, 768, 16 )
GFXDECODE_END
-static GFXDECODE_START( aerofgt )
+static GFXDECODE_START( gfx_aerofgt )
GFXDECODE_ENTRY( "gfx1", 0, aerofgt_charlayout, 0, 16 )
GFXDECODE_ENTRY( "gfx1", 0, aerofgt_charlayout, 256, 16 )
GFXDECODE_ENTRY( "gfx2", 0, aerofgt_spritelayout, 512, 32 )
GFXDECODE_END
-static GFXDECODE_START( aerfboot )
+static GFXDECODE_START( gfx_aerfboot )
GFXDECODE_ENTRY( "gfx1", 0, aerfboot_charlayout, 0, 16 )
GFXDECODE_ENTRY( "gfx1", 0x20000, aerfboot_charlayout, 256, 16 )
GFXDECODE_ENTRY( "gfx2", 0, aerfboot_spritelayout, 512, 16 )
GFXDECODE_ENTRY( "spritegfx", 0, aerfboot_spritelayout, 768, 16 )
GFXDECODE_END
-static GFXDECODE_START( aerfboo2 )
+static GFXDECODE_START( gfx_aerfboo2 )
GFXDECODE_ENTRY( "gfx1", 0, aerfboo2_charlayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, aerfboo2_charlayout, 256, 16 )
GFXDECODE_ENTRY( "spritegfx", 0, aerfboo2_spritelayout, 512, 16 )
GFXDECODE_ENTRY( "spritegfx", 0x100000,aerfboo2_spritelayout, 768, 16 )
GFXDECODE_END
-static GFXDECODE_START( wbbc97 )
+static GFXDECODE_START( gfx_wbbc97 )
GFXDECODE_ENTRY( "gfx1", 0, pspikes_charlayout, 0, 64 ) /* colors 0-1023 in 8 banks */
GFXDECODE_ENTRY( "gfx2", 0, wbbc97_spritelayout, 1024, 64 ) /* colors 1024-2047 in 4 banks */
GFXDECODE_END
@@ -1485,7 +1485,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikes)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_pspikes)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", pspikes)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pspikes)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -1535,7 +1535,7 @@ MACHINE_CONFIG_START(aerofgt_state::spikes91)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_spikes91)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", spikes91)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spikes91)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -1571,7 +1571,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikesb)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_pspikesb)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", pspikesb)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pspikesb)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -1616,7 +1616,7 @@ MACHINE_CONFIG_START(aerofgt_state::kickball)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_pspikes)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", kickball)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kickball)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -1663,7 +1663,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikesc)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_pspikes)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", pspikes)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pspikes)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -1707,7 +1707,7 @@ MACHINE_CONFIG_START(aerofgt_state::karatblz)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_karatblz)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", turbofrc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_turbofrc)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -1764,7 +1764,7 @@ MACHINE_CONFIG_START(aerofgt_state::karatblzbl)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_karatblz)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", turbofrc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_turbofrc)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -1821,7 +1821,7 @@ MACHINE_CONFIG_START(aerofgt_state::spinlbrk)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_spinlbrk)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", turbofrc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_turbofrc)
MCFG_PALETTE_ADD_INIT_BLACK("palette", 1024) // doesn't fully initialize palette at start-up ...
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -1880,7 +1880,7 @@ MACHINE_CONFIG_START(aerofgt_state::turbofrc)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_turbofrc)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", turbofrc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_turbofrc)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -1939,7 +1939,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgtb)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_turbofrc)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", turbofrc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_turbofrc)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -2010,7 +2010,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgt)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_aerofgt)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", aerofgt)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_aerofgt)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -2060,7 +2060,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerfboot)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_aerfboot)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", aerfboot)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_aerfboot)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -2100,7 +2100,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerfboo2)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_aerfboo2)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", aerfboo2)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_aerfboo2)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -2136,7 +2136,7 @@ MACHINE_CONFIG_START(aerofgt_state::wbbc97)
MCFG_SCREEN_VISIBLE_AREA(0*8+14, 44*8-1+4, 0*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(aerofgt_state, screen_update_wbbc97)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", wbbc97)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wbbc97)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp
index 3a3cb01574b..cb01ba195da 100644
--- a/src/mame/drivers/airbustr.cpp
+++ b/src/mame/drivers/airbustr.cpp
@@ -511,7 +511,7 @@ static const gfx_layout sprite_gfxlayout =
/* Graphics Decode Information */
-static GFXDECODE_START( airbustr )
+static GFXDECODE_START( gfx_airbustr )
GFXDECODE_ENTRY( "gfx1", 0, tile_gfxlayout, 0, 32 ) // tiles
GFXDECODE_ENTRY( "gfx2", 0, sprite_gfxlayout, 512, 16 ) // sprites
GFXDECODE_END
@@ -596,7 +596,7 @@ MACHINE_CONFIG_START(airbustr_state::airbustr)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, airbustr_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", airbustr)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_airbustr)
MCFG_PALETTE_ADD("palette", 768)
MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB)
diff --git a/src/mame/drivers/albazc.cpp b/src/mame/drivers/albazc.cpp
index e47cb1a87bd..27392c688af 100644
--- a/src/mame/drivers/albazc.cpp
+++ b/src/mame/drivers/albazc.cpp
@@ -274,7 +274,7 @@ static const gfx_layout hanaroku_charlayout =
-static GFXDECODE_START( hanaroku )
+static GFXDECODE_START( gfx_hanaroku )
GFXDECODE_ENTRY( "gfx1", 0, hanaroku_charlayout, 0, 32 )
GFXDECODE_END
@@ -298,7 +298,7 @@ MACHINE_CONFIG_START(albazc_state::hanaroku)
MCFG_SCREEN_UPDATE_DRIVER(albazc_state, screen_update_hanaroku)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", hanaroku)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hanaroku)
MCFG_PALETTE_ADD("palette", 0x200)
MCFG_PALETTE_INIT_OWNER(albazc_state, albazc)
diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp
index c2573fb780e..817ed154c4e 100644
--- a/src/mame/drivers/albazg.cpp
+++ b/src/mame/drivers/albazg.cpp
@@ -133,7 +133,7 @@ static const gfx_layout charlayout =
8*8
};
-static GFXDECODE_START( yumefuda )
+static GFXDECODE_START( gfx_yumefuda )
GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 8 )
GFXDECODE_END
@@ -390,7 +390,7 @@ MACHINE_CONFIG_START(albazg_state::yumefuda)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", yumefuda )
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_yumefuda )
MCFG_PALETTE_ADD("palette", 0x80)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp
index 7ecad756ef8..0bc0bff7e8d 100644
--- a/src/mame/drivers/alpha68k.cpp
+++ b/src/mame/drivers/alpha68k.cpp
@@ -1760,28 +1760,28 @@ static const gfx_layout jongbou_layout5 =
/******************************************************************************/
-static GFXDECODE_START( alpha68k_I )
+static GFXDECODE_START( gfx_alpha68k_I )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 )
GFXDECODE_END
-static GFXDECODE_START( alpha68k_II )
+static GFXDECODE_START( gfx_alpha68k_II )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 128 )
GFXDECODE_END
-static GFXDECODE_START( alpha68k_V )
+static GFXDECODE_START( gfx_alpha68k_V )
GFXDECODE_ENTRY( "gfx1", 0, charlayout_V, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 256 )
GFXDECODE_END
-static GFXDECODE_START( sstingry )
+static GFXDECODE_START( gfx_sstingry )
GFXDECODE_ENTRY( "gfx1", 0x00000, sting_layout1, 0, 32 )
GFXDECODE_ENTRY( "gfx1", 0x00000, sting_layout2, 0, 32 )
GFXDECODE_ENTRY( "gfx1", 0x10000, sting_layout1, 0, 32 )
GFXDECODE_ENTRY( "gfx1", 0x10000, sting_layout3, 0, 32 )
GFXDECODE_END
-static GFXDECODE_START( kyros )
+static GFXDECODE_START( gfx_kyros )
GFXDECODE_ENTRY( "gfx1", 0x00000, kyros_char_layout1, 0, 32 )
GFXDECODE_ENTRY( "gfx1", 0x00000, kyros_char_layout2, 0, 32 )
GFXDECODE_ENTRY( "gfx1", 0x18000, kyros_char_layout1, 0, 32 )
@@ -1792,7 +1792,7 @@ static GFXDECODE_START( kyros )
GFXDECODE_ENTRY( "gfx1", 0x48000, kyros_char_layout2, 0, 32 )
GFXDECODE_END
-static GFXDECODE_START( jongbou )
+static GFXDECODE_START( gfx_jongbou )
GFXDECODE_ENTRY( "gfx1", 0, jongbou_layout1, 0, 32 )
GFXDECODE_ENTRY( "gfx1", 0, jongbou_layout2, 0, 32 )
GFXDECODE_ENTRY( "gfx1", 0, jongbou_layout3, 0, 32 )
@@ -1941,7 +1941,7 @@ MACHINE_CONFIG_START(alpha68k_state::sstingry)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_sstingry)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", sstingry)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sstingry)
MCFG_PALETTE_ADD("palette", 256 + 1)
MCFG_PALETTE_INDIRECT_ENTRIES(256)
@@ -1993,7 +1993,7 @@ MACHINE_CONFIG_START(alpha68k_state::kyros)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_kyros)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", kyros)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kyros)
MCFG_PALETTE_ADD("palette", 256 + 1)
MCFG_PALETTE_INDIRECT_ENTRIES(256)
@@ -2044,7 +2044,7 @@ MACHINE_CONFIG_START(alpha68k_state::jongbou)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_kyros)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", jongbou)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jongbou)
MCFG_PALETTE_ADD("palette", 256 + 1)
MCFG_PALETTE_INDIRECT_ENTRIES(256)
@@ -2083,7 +2083,7 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_I)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_alpha68k_I)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", alpha68k_I)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_alpha68k_I)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_INDIRECT_ENTRIES(256)
@@ -2130,7 +2130,7 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_II)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_alpha68k_II)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", alpha68k_II)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_alpha68k_II)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRGBRRRRGGGGBBBB_bit0)
@@ -2192,7 +2192,7 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_V)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_alpha68k_V)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", alpha68k_V)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_alpha68k_V)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_FORMAT(xRGBRRRRGGGGBBBB_bit0)
@@ -2247,7 +2247,7 @@ MACHINE_CONFIG_START(alpha68k_state::tnextspc)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_alpha68k_I)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", alpha68k_I)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_alpha68k_I)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_INDIRECT_ENTRIES(256)
diff --git a/src/mame/drivers/alphatpx.cpp b/src/mame/drivers/alphatpx.cpp
index e1815886121..ea170023a98 100644
--- a/src/mame/drivers/alphatpx.cpp
+++ b/src/mame/drivers/alphatpx.cpp
@@ -939,7 +939,7 @@ uint32_t alphatp_12_state::screen_update(screen_device &screen, bitmap_rgb32 &bi
// VIDEO - Alphatronic P3, P4, P30 and P40
//**************************************************************************
-static GFXDECODE_START( alphatp3 )
+static GFXDECODE_START( gfx_alphatp3 )
GFXDECODE_ENTRY("gfx", 0, charlayout, 0, 1)
GFXDECODE_END
@@ -1237,7 +1237,7 @@ MACHINE_CONFIG_START(alphatp_12_state::alphatp2)
MCFG_TMS9927_VSYN_CALLBACK(INPUTLINE("maincpu", I8085_RST65_LINE)) MCFG_DEVCB_XOR(1)
MCFG_VIDEO_SET_SCREEN("screen")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", alphatp3)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_alphatp3)
// sound hardware
SPEAKER(config, "mono").front_center();
@@ -1318,7 +1318,7 @@ MACHINE_CONFIG_START(alphatp_34_state::alphatp3)
MCFG_TMS9927_VSYN_CALLBACK(INPUTLINE("maincpu", I8085_RST65_LINE)) MCFG_DEVCB_XOR(1)
MCFG_VIDEO_SET_SCREEN("screen")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", alphatp3)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_alphatp3)
// sound hardware
SPEAKER(config, "mono").front_center();
diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp
index 29c9c1d833f..06697d9a16e 100644
--- a/src/mame/drivers/alphatro.cpp
+++ b/src/mame/drivers/alphatro.cpp
@@ -580,7 +580,7 @@ static const gfx_layout charlayout =
8*16
};
-static GFXDECODE_START( alphatro )
+static GFXDECODE_START( gfx_alphatro )
GFXDECODE_ENTRY( "chargen", 0, charlayout, 0, 4 )
GFXDECODE_END
@@ -711,7 +711,7 @@ MACHINE_CONFIG_START(alphatro_state::alphatro)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", alphatro)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_alphatro)
MCFG_PALETTE_ADD("palette", 9) // 8 colours + amber
MCFG_PALETTE_INIT_OWNER(alphatro_state, alphatro)
diff --git a/src/mame/drivers/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp
index 42e451cd405..56c1974777c 100644
--- a/src/mame/drivers/amaticmg.cpp
+++ b/src/mame/drivers/amaticmg.cpp
@@ -809,11 +809,11 @@ static const gfx_layout charlayout_6bpp =
* Graphics Decode Information *
************************************/
-static GFXDECODE_START( amaticmg )
+static GFXDECODE_START( gfx_amaticmg )
GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout_4bpp, 0, 0x20 )
GFXDECODE_END
-static GFXDECODE_START( amaticmg2 )
+static GFXDECODE_START( gfx_amaticmg2 )
GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout_6bpp, 0, 0x10000/0x40 )
GFXDECODE_END
@@ -875,7 +875,7 @@ MACHINE_CONFIG_START(amaticmg_state::amaticmg)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI)) // no NMI mask?
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", amaticmg)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_amaticmg)
MCFG_PALETTE_ADD("palette", 0x200)
MCFG_PALETTE_INIT_OWNER(amaticmg_state, amaticmg)
@@ -909,7 +909,7 @@ MACHINE_CONFIG_START(amaticmg_state::amaticmg2)
MCFG_DEVICE_MODIFY("crtc")
MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, amaticmg_state, amaticmg2_irq))
- MCFG_GFXDECODE_MODIFY("gfxdecode", amaticmg2)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_amaticmg2)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(0x10000)
MCFG_PALETTE_INIT_OWNER(amaticmg_state,amaticmg2)
@@ -930,7 +930,7 @@ MACHINE_CONFIG_START(amaticmg_state::amaticmg4)
MCFG_DEVICE_MODIFY("crtc")
MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, amaticmg_state, amaticmg2_irq))
- MCFG_GFXDECODE_MODIFY("gfxdecode", amaticmg2)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_amaticmg2)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(0x10000)
MCFG_PALETTE_INIT_OWNER(amaticmg_state,amaticmg2)
diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp
index 579b3542646..051fd5bf2d6 100644
--- a/src/mame/drivers/ambush.cpp
+++ b/src/mame/drivers/ambush.cpp
@@ -557,7 +557,7 @@ static const gfx_layout spritelayout =
32*8
};
-static GFXDECODE_START( ambush )
+static GFXDECODE_START( gfx_ambush )
GFXDECODE_ENTRY("gfx1", 0, gfx_8x8x2_planar, 0, 64)
GFXDECODE_ENTRY("gfx1", 0, spritelayout, 0, 64)
GFXDECODE_END
@@ -576,12 +576,12 @@ static const gfx_layout spritelayout_mariobl =
32*8
};
-static GFXDECODE_START( mariobl )
+static GFXDECODE_START( gfx_mariobl )
GFXDECODE_ENTRY("gfx1", 0, gfx_8x8x2_planar, 0, 32)
GFXDECODE_ENTRY("gfx2", 0, spritelayout_mariobl, 0, 32)
GFXDECODE_END
-static GFXDECODE_START( dkong3abl )
+static GFXDECODE_START( gfx_dkong3abl )
GFXDECODE_ENTRY("gfx1", 0, gfx_8x8x2_planar, 0, 64)
GFXDECODE_ENTRY("gfx2", 0, spritelayout, 0, 32)
GFXDECODE_END
@@ -712,7 +712,7 @@ MACHINE_CONFIG_START(ambush_state::ambush)
MCFG_SCREEN_UPDATE_DRIVER(ambush_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ambush)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ambush)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(ambush_state, ambush)
@@ -745,7 +745,7 @@ MACHINE_CONFIG_START(ambush_state::mariobl)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(ambush_state, screen_update_bootleg)
- MCFG_GFXDECODE_MODIFY("gfxdecode", mariobl)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_mariobl)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(ambush_state, mario)
@@ -763,7 +763,7 @@ MACHINE_CONFIG_START(ambush_state::dkong3abl)
mariobl(config);
MCFG_MACHINE_START_OVERRIDE(ambush_state, dkong3abl)
- MCFG_GFXDECODE_MODIFY("gfxdecode", dkong3abl)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_dkong3abl)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(ambush_state, dkong3)
diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp
index 458c47cd3c1..e9ae00f0d29 100644
--- a/src/mame/drivers/ampoker2.cpp
+++ b/src/mame/drivers/ampoker2.cpp
@@ -1134,11 +1134,11 @@ static const gfx_layout s2k_charlayout =
* Graphics Decode Information *
******************************/
-static GFXDECODE_START( ampoker2 )
+static GFXDECODE_START( gfx_ampoker2 )
GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 128 )
GFXDECODE_END
-static GFXDECODE_START( sigma2k )
+static GFXDECODE_START( gfx_sigma2k )
GFXDECODE_ENTRY( "gfx1", 0x0000, s2k_charlayout, 0, 128 )
GFXDECODE_END
@@ -1170,7 +1170,7 @@ MACHINE_CONFIG_START(ampoker2_state::ampoker2)
MCFG_SCREEN_UPDATE_DRIVER(ampoker2_state, screen_update_ampoker2)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ampoker2)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ampoker2)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INIT_OWNER(ampoker2_state, ampoker2)
@@ -1184,7 +1184,7 @@ MACHINE_CONFIG_START(ampoker2_state::sigma2k)
ampoker2(config);
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", sigma2k)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_sigma2k)
MCFG_VIDEO_START_OVERRIDE(ampoker2_state, sigma2k)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/amspdwy.cpp b/src/mame/drivers/amspdwy.cpp
index ae10844f279..f308c26eaf1 100644
--- a/src/mame/drivers/amspdwy.cpp
+++ b/src/mame/drivers/amspdwy.cpp
@@ -216,7 +216,7 @@ static const gfx_layout layout_8x8x2 =
8*8
};
-static GFXDECODE_START( amspdwy )
+static GFXDECODE_START( gfx_amspdwy )
GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x2, 0, 8 )
GFXDECODE_END
@@ -269,7 +269,7 @@ MACHINE_CONFIG_START(amspdwy_state::amspdwy)
MCFG_SCREEN_UPDATE_DRIVER(amspdwy_state, screen_update_amspdwy)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", amspdwy)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_amspdwy)
MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_FORMAT(BBGGGRRR_inverted)
diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp
index 48393267f88..89f25c92022 100644
--- a/src/mame/drivers/amusco.cpp
+++ b/src/mame/drivers/amusco.cpp
@@ -455,7 +455,7 @@ static const gfx_layout charlayout =
* Graphics Decode Information *
******************************/
-static GFXDECODE_START( amusco )
+static GFXDECODE_START( gfx_amusco )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) // current palette has only 8 colors...
GFXDECODE_END
@@ -579,7 +579,7 @@ MACHINE_CONFIG_START(amusco_state::amusco)
MCFG_SCREEN_VISIBLE_AREA(0*8, 74*8-1, 0*10, 24*10-1) // visible scr: 74*8 24*10
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", amusco)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_amusco)
MCFG_PALETTE_ADD("palette",8*8)
MCFG_PALETTE_INIT_OWNER(amusco_state, amusco)
diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp
index 5efd8677bd9..0301b5ba7f6 100644
--- a/src/mame/drivers/amust.cpp
+++ b/src/mame/drivers/amust.cpp
@@ -320,7 +320,7 @@ static const gfx_layout amust_charlayout =
8*8 /* every char takes 8 bytes */
};
-static GFXDECODE_START( amust )
+static GFXDECODE_START( gfx_amust )
GFXDECODE_ENTRY( "chargen", 0x0000, amust_charlayout, 0, 1 )
GFXDECODE_END
@@ -392,7 +392,7 @@ MACHINE_CONFIG_START(amust_state::amust)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", amust)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_amust)
/* sound hardware */
SPEAKER(config, "mono").front_center();
diff --git a/src/mame/drivers/angelkds.cpp b/src/mame/drivers/angelkds.cpp
index 33a5d5712af..e4637d7e635 100644
--- a/src/mame/drivers/angelkds.cpp
+++ b/src/mame/drivers/angelkds.cpp
@@ -474,7 +474,7 @@ static const gfx_layout angelkds_spritelayout =
16*32
};
-static GFXDECODE_START( angelkds )
+static GFXDECODE_START( gfx_angelkds )
GFXDECODE_ENTRY( "gfx1", 0, angelkds_charlayout, 0x30, 1 )
GFXDECODE_ENTRY( "gfx3", 0, angelkds_charlayout, 0, 16 )
GFXDECODE_ENTRY( "gfx4", 0, angelkds_charlayout, 0, 16 )
@@ -549,7 +549,7 @@ MACHINE_CONFIG_START(angelkds_state::angelkds)
MCFG_SCREEN_UPDATE_DRIVER(angelkds_state, screen_update_angelkds)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", angelkds)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_angelkds)
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
diff --git a/src/mame/drivers/anzterm.cpp b/src/mame/drivers/anzterm.cpp
index 04e840e7881..1f3b7fe95bd 100644
--- a/src/mame/drivers/anzterm.cpp
+++ b/src/mame/drivers/anzterm.cpp
@@ -395,7 +395,7 @@ gfx_layout const printfont =
64 // stride
};
-GFXDECODE_START( anzterm )
+GFXDECODE_START( gfx_anzterm )
GFXDECODE_ENTRY("crtc", 0x0000, screenfont, 0, 1)
GFXDECODE_ENTRY("prnt", 0x0000, printfont, 0, 1)
GFXDECODE_END
@@ -428,7 +428,7 @@ MACHINE_CONFIG_START(anzterm_state::anzterm)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", anzterm)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_anzterm)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp
index ddaa61ba90d..3b39cdc5ca5 100644
--- a/src/mame/drivers/apc.cpp
+++ b/src/mame/drivers/apc.cpp
@@ -784,7 +784,7 @@ static const gfx_layout charset_pcg =
};
#endif
-static GFXDECODE_START( apc )
+static GFXDECODE_START( gfx_apc )
GFXDECODE_ENTRY( "gfx", 0x0000, charset_8x16, 0, 128 )
GFXDECODE_ENTRY( "gfx", 0x0800, charset_8x16, 0, 128 )
GFXDECODE_ENTRY( "gfx", 0x1000, charset_8x16, 0, 128 )
@@ -976,7 +976,7 @@ MACHINE_CONFIG_START(apc_state::apc)
MCFG_PALETTE_ADD_3BIT_BRG("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", apc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_apc)
MCFG_DEVICE_ADD("upd7220_chr", UPD7220, 3579545) // unk clock
MCFG_DEVICE_ADDRESS_MAP(0, upd7220_1_map)
diff --git a/src/mame/drivers/apexc.cpp b/src/mame/drivers/apexc.cpp
index 5ce35c016b7..fbd4d6ff2d5 100644
--- a/src/mame/drivers/apexc.cpp
+++ b/src/mame/drivers/apexc.cpp
@@ -837,7 +837,7 @@ static const gfx_layout fontlayout =
8*8 /* every char takes 8 consecutive bytes */
};
-static GFXDECODE_START( apexc )
+static GFXDECODE_START( gfx_apexc )
GFXDECODE_ENTRY( "chargen", 0, fontlayout, 0, 2 )
GFXDECODE_END
@@ -870,7 +870,7 @@ MACHINE_CONFIG_START(apexc_state::apexc)
MCFG_SCREEN_UPDATE_DRIVER(apexc_state, screen_update_apexc)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", apexc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_apexc)
MCFG_PALETTE_ADD("palette", APEXC_PALETTE_SIZE)
MCFG_PALETTE_INIT_OWNER(apexc_state, apexc)
diff --git a/src/mame/drivers/apogee.cpp b/src/mame/drivers/apogee.cpp
index ddb49aef0c8..44b8bd4b2fb 100644
--- a/src/mame/drivers/apogee.cpp
+++ b/src/mame/drivers/apogee.cpp
@@ -209,7 +209,7 @@ static const gfx_layout apogee_charlayout =
8*8 /* every char takes 8 bytes */
};
-static GFXDECODE_START( apogee )
+static GFXDECODE_START( gfx_apogee )
GFXDECODE_ENTRY( "gfx1", 0x0000, apogee_charlayout, 0, 1 )
GFXDECODE_END
@@ -249,7 +249,7 @@ MACHINE_CONFIG_START(apogee_state::apogee)
MCFG_SCREEN_SIZE(78*6, 30*10)
MCFG_SCREEN_VISIBLE_AREA(0, 78*6-1, 0, 30*10-1)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", apogee)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_apogee)
MCFG_PALETTE_ADD("palette", 3)
MCFG_PALETTE_INIT_OWNER(apogee_state,radio86)
diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp
index 662021a230f..de0a78d1d38 100644
--- a/src/mame/drivers/apple2gs.cpp
+++ b/src/mame/drivers/apple2gs.cpp
@@ -103,7 +103,7 @@ static const gfx_layout apple2gs_dbltext_layout =
8*8 /* every char takes 8 bytes */
};
-static GFXDECODE_START( apple2gs )
+static GFXDECODE_START( gfx_apple2gs )
GFXDECODE_ENTRY( "gfx1", 0x0000, apple2gs_text_layout, 0, 2 )
GFXDECODE_ENTRY( "gfx1", 0x0000, apple2gs_dbltext_layout, 0, 2 )
GFXDECODE_END
@@ -340,7 +340,7 @@ MACHINE_CONFIG_START(apple2gs_state::apple2gs)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(apple2gs_state, apple2gs)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", apple2gs )
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_apple2gs )
MCFG_MACHINE_START_OVERRIDE(apple2gs_state, apple2gs )
MCFG_MACHINE_RESET_OVERRIDE(apple2gs_state, apple2gs )
diff --git a/src/mame/drivers/appoooh.cpp b/src/mame/drivers/appoooh.cpp
index b840e16cc73..516a9be71c9 100644
--- a/src/mame/drivers/appoooh.cpp
+++ b/src/mame/drivers/appoooh.cpp
@@ -349,7 +349,7 @@ static const gfx_layout spritelayout =
32*8 /* every char takes 8 consecutive bytes */
};
-static GFXDECODE_START( appoooh )
+static GFXDECODE_START( gfx_appoooh )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
GFXDECODE_ENTRY( "gfx2", 0, charlayout, 32*8, 32 )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 32 )
@@ -382,7 +382,7 @@ static const gfx_layout robowres_spritelayout =
};
-static GFXDECODE_START( robowres )
+static GFXDECODE_START( gfx_robowres )
GFXDECODE_ENTRY( "gfx1", 0, robowres_charlayout, 0, 32 )
GFXDECODE_ENTRY( "gfx2", 0, robowres_charlayout, 0, 32 )
GFXDECODE_ENTRY( "gfx1", 0, robowres_spritelayout, 0, 32 )
@@ -459,7 +459,7 @@ MACHINE_CONFIG_START(appoooh_state::appoooh)
MCFG_SCREEN_UPDATE_DRIVER(appoooh_state, screen_update_appoooh)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", appoooh)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_appoooh)
MCFG_PALETTE_ADD("palette", 32*8+32*8)
MCFG_PALETTE_INIT_OWNER(appoooh_state,appoooh)
@@ -481,7 +481,7 @@ MACHINE_CONFIG_START(appoooh_state::robowres)
MCFG_SCREEN_UPDATE_DRIVER(appoooh_state, screen_update_robowres)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", robowres)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_robowres)
MCFG_PALETTE_ADD("palette", 32*8+32*8)
MCFG_PALETTE_INIT_OWNER(appoooh_state,robowres)
diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp
index b9a020ad635..8397709b352 100644
--- a/src/mame/drivers/apricotf.cpp
+++ b/src/mame/drivers/apricotf.cpp
@@ -191,7 +191,7 @@ static const gfx_layout charset_8x8 =
};
-static GFXDECODE_START( act_f1 )
+static GFXDECODE_START( gfx_act_f1 )
GFXDECODE_ENTRY( I8086_TAG, 0x0800, charset_8x8, 0, 1 )
GFXDECODE_END
@@ -360,7 +360,7 @@ MACHINE_CONFIG_START(f1_state::act_f1)
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 16)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", act_f1)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_act_f1)
/* Devices */
MCFG_DEVICE_ADD(APRICOT_KEYBOARD_TAG, APRICOT_KEYBOARD, 0)
diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp
index 44298865874..43ed5c07a71 100644
--- a/src/mame/drivers/apricotp.cpp
+++ b/src/mame/drivers/apricotp.cpp
@@ -213,7 +213,7 @@ static const gfx_layout charset_8x8 =
};
-static GFXDECODE_START( act_f1 )
+static GFXDECODE_START( gfx_act_f1 )
GFXDECODE_ENTRY( I8086_TAG, 0x0800, charset_8x8, 0, 1 )
GFXDECODE_END
@@ -615,7 +615,7 @@ MACHINE_CONFIG_START(fp_state::fp)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1)
MCFG_PALETTE_ADD("palette", 16)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", act_f1)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_act_f1)
MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_CRT_TAG, 4000000)
MCFG_MC6845_SHOW_BORDER_AREA(false)
diff --git a/src/mame/drivers/aquarium.cpp b/src/mame/drivers/aquarium.cpp
index 9411231eb38..8e70fc0febb 100644
--- a/src/mame/drivers/aquarium.cpp
+++ b/src/mame/drivers/aquarium.cpp
@@ -280,7 +280,7 @@ void aquarium_state::init_aquarium()
}
-static GFXDECODE_START( aquarium )
+static GFXDECODE_START( gfx_aquarium )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0x300, 32 )
GFXDECODE_ENTRY( "gfx1", 0, char5bpplayout, 0x400, 32 )
GFXDECODE_ENTRY( "gfx2", 0, char_8x8_layout, 0x200, 32 )
@@ -310,7 +310,7 @@ MACHINE_CONFIG_START(aquarium_state::aquarium)
MCFG_SCREEN_UPDATE_DRIVER(aquarium_state, screen_update_aquarium)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", aquarium)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_aquarium)
MCFG_PALETTE_ADD("palette", 0x1000/2)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp
index a4e9802a00f..92c56bca854 100644
--- a/src/mame/drivers/aquarius.cpp
+++ b/src/mame/drivers/aquarius.cpp
@@ -340,7 +340,7 @@ static const gfx_layout aquarius_charlayout =
/* Graphics Decode Information */
-static GFXDECODE_START( aquarius )
+static GFXDECODE_START( gfx_aquarius )
GFXDECODE_ENTRY( "gfx1", 0x0000, aquarius_charlayout, 0, 256 )
GFXDECODE_END
@@ -365,7 +365,7 @@ MACHINE_CONFIG_START(aquarius_state::aquarius)
MCFG_SCREEN_UPDATE_DRIVER(aquarius_state, screen_update_aquarius)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", aquarius )
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_aquarius)
MCFG_TEA1002_ADD("encoder", XTAL(8'867'238))
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INDIRECT_ENTRIES(16)
diff --git a/src/mame/drivers/arcadecl.cpp b/src/mame/drivers/arcadecl.cpp
index f1855246dcf..12babfab424 100644
--- a/src/mame/drivers/arcadecl.cpp
+++ b/src/mame/drivers/arcadecl.cpp
@@ -307,7 +307,7 @@ static const gfx_layout molayout =
};
-static GFXDECODE_START( arcadecl )
+static GFXDECODE_START( gfx_arcadecl )
GFXDECODE_ENTRY( "gfx1", 0, molayout, 256, 16 )
GFXDECODE_END
@@ -331,7 +331,7 @@ MACHINE_CONFIG_START(sparkz_state::sparkz)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", arcadecl)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_arcadecl)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB)
MCFG_PALETTE_MEMBITS(8)
diff --git a/src/mame/drivers/arcadia.cpp b/src/mame/drivers/arcadia.cpp
index 78600c20b10..8011ac8d150 100644
--- a/src/mame/drivers/arcadia.cpp
+++ b/src/mame/drivers/arcadia.cpp
@@ -409,7 +409,7 @@ static const gfx_layout arcadia_charlayout =
1*8
};
-static GFXDECODE_START( arcadia )
+static GFXDECODE_START( gfx_arcadia )
GFXDECODE_ENTRY( "gfx1", 0x0000, arcadia_charlayout, 0, 68 )
GFXDECODE_END
@@ -488,7 +488,7 @@ MACHINE_CONFIG_START(arcadia_state::arcadia)
MCFG_SCREEN_UPDATE_DRIVER(arcadia_state, screen_update_arcadia)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", arcadia)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_arcadia)
MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(arcadia_palette))
MCFG_PALETTE_INDIRECT_ENTRIES(8)
MCFG_PALETTE_INIT_OWNER(arcadia_state, arcadia)
diff --git a/src/mame/drivers/argus.cpp b/src/mame/drivers/argus.cpp
index cc9e1465b5d..5e1501ba75c 100644
--- a/src/mame/drivers/argus.cpp
+++ b/src/mame/drivers/argus.cpp
@@ -461,20 +461,20 @@ static const gfx_layout tilelayout =
128*8
};
-static GFXDECODE_START( argus )
+static GFXDECODE_START( gfx_argus )
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0*16, 8 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 8*16, 16 )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 24*16, 16 )
GFXDECODE_ENTRY( "gfx4", 0, charlayout, 40*16, 16 )
GFXDECODE_END
-static GFXDECODE_START( valtric )
+static GFXDECODE_START( gfx_valtric )
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0*16, 16 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 16*16, 16 )
GFXDECODE_ENTRY( "gfx3", 0, charlayout, 32*16, 16 )
GFXDECODE_END
-static GFXDECODE_START( butasan )
+static GFXDECODE_START( gfx_butasan )
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0*16, 16 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 16*16, 16 )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 12*16, 16 )
@@ -503,7 +503,7 @@ MACHINE_CONFIG_START(argus_state::argus)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(argus_state, screen_update_argus)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", argus)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_argus)
MCFG_PALETTE_ADD("palette", 896)
MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0)
@@ -545,7 +545,7 @@ MACHINE_CONFIG_START(argus_state::valtric)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(argus_state, screen_update_valtric)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", valtric)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_valtric)
MCFG_PALETTE_ADD("palette", 768)
MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0)
@@ -593,7 +593,7 @@ MACHINE_CONFIG_START(argus_state::butasan)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(argus_state, screen_update_butasan)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", butasan)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_butasan)
MCFG_PALETTE_ADD("palette", 768)
MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0)
diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp
index 4704829c715..a120bdab526 100644
--- a/src/mame/drivers/aristmk4.cpp
+++ b/src/mame/drivers/aristmk4.cpp
@@ -1664,7 +1664,7 @@ static const gfx_layout layout8x8x6 =
8*8
};
-static GFXDECODE_START(aristmk4)
+static GFXDECODE_START(gfx_aristmk4)
GFXDECODE_ENTRY("tile_gfx",0x0,layout8x8x6, 0, 8 )
GFXDECODE_END
@@ -1784,7 +1784,7 @@ MACHINE_CONFIG_START(aristmk4_state::aristmk4)
MCFG_SCREEN_UPDATE_DRIVER(aristmk4_state, screen_update_aristmk4)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", aristmk4)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_aristmk4)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INIT_OWNER(aristmk4_state, aristmk4)
diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp
index 2ccab2fd017..7298d14a966 100644
--- a/src/mame/drivers/arkanoid.cpp
+++ b/src/mame/drivers/arkanoid.cpp
@@ -1297,12 +1297,12 @@ static const gfx_layout charlayout =
/* Graphics Decode Information */
-static GFXDECODE_START( arkanoid )
+static GFXDECODE_START( gfx_arkanoid )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 )
// sprites use the same characters above, but are 16x8
GFXDECODE_END
-static GFXDECODE_START( hexa )
+static GFXDECODE_START( gfx_hexa )
GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0 , 32 )
GFXDECODE_END
@@ -1365,7 +1365,7 @@ MACHINE_CONFIG_START(arkanoid_state::arkanoid)
MCFG_SCREEN_UPDATE_DRIVER(arkanoid_state, screen_update_arkanoid)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", arkanoid)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_arkanoid)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 512)
/* sound hardware */
@@ -1439,7 +1439,7 @@ MACHINE_CONFIG_START(arkanoid_state::hexa)
MCFG_SCREEN_UPDATE_DRIVER(arkanoid_state, screen_update_hexa)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", hexa)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hexa)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256)
/* sound hardware */
@@ -1482,7 +1482,7 @@ MACHINE_CONFIG_START(arkanoid_state::brixian)
MCFG_SCREEN_UPDATE_DRIVER(arkanoid_state, screen_update_hexa)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", arkanoid)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_arkanoid)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 512)
/* sound hardware */
diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp
index c49a353af6d..8dcaaf19346 100644
--- a/src/mame/drivers/armedf.cpp
+++ b/src/mame/drivers/armedf.cpp
@@ -1210,7 +1210,7 @@ static const gfx_layout sprite_layout =
64*8
};
-static GFXDECODE_START( armedf )
+static GFXDECODE_START( gfx_armedf )
GFXDECODE_ENTRY( "gfx1", 0, char_layout, 0*16, 32 )
GFXDECODE_ENTRY( "gfx2", 0, tile_layout, 64*16, 32 )
GFXDECODE_ENTRY( "gfx3", 0, tile_layout, 96*16, 32 )
@@ -1294,7 +1294,7 @@ MACHINE_CONFIG_START(armedf_state::terraf)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_armedf)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB)
@@ -1336,7 +1336,7 @@ MACHINE_CONFIG_START(armedf_state::terrafjb)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_armedf)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB)
@@ -1386,7 +1386,7 @@ MACHINE_CONFIG_START(armedf_state::kozure)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_armedf)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB)
@@ -1423,7 +1423,7 @@ MACHINE_CONFIG_START(armedf_state::armedf)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_armedf)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB)
@@ -1473,7 +1473,7 @@ MACHINE_CONFIG_START(armedf_state::cclimbr2)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_armedf)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB)
@@ -1523,7 +1523,7 @@ MACHINE_CONFIG_START(armedf_state::legion)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_armedf)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB)
@@ -1571,7 +1571,7 @@ MACHINE_CONFIG_START(armedf_state::legionjb)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_armedf)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB)
@@ -1615,7 +1615,7 @@ MACHINE_CONFIG_START(bigfghtr_state::bigfghtr)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_armedf)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB)
diff --git a/src/mame/drivers/ashnojoe.cpp b/src/mame/drivers/ashnojoe.cpp
index 06dce6ea2e1..254cdd2d52b 100644
--- a/src/mame/drivers/ashnojoe.cpp
+++ b/src/mame/drivers/ashnojoe.cpp
@@ -254,7 +254,7 @@ static const gfx_layout tiles16x16_layout =
16*64
};
-static GFXDECODE_START( ashnojoe )
+static GFXDECODE_START( gfx_ashnojoe )
GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 0x100 )
GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout, 0, 0x100 )
GFXDECODE_ENTRY( "gfx3", 0, tiles8x8_layout, 0, 0x100 )
@@ -325,7 +325,7 @@ MACHINE_CONFIG_START(ashnojoe_state::ashnojoe)
MCFG_SCREEN_UPDATE_DRIVER(ashnojoe_state, screen_update_ashnojoe)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ashnojoe)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ashnojoe)
MCFG_PALETTE_ADD("palette", 0x1000/2)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp
index 87b78c75c6d..87baae01025 100644
--- a/src/mame/drivers/astrcorp.cpp
+++ b/src/mame/drivers/astrcorp.cpp
@@ -483,7 +483,7 @@ static const gfx_layout layout_16x16x8 =
16*16*8
};
-static GFXDECODE_START( astrocorp )
+static GFXDECODE_START( gfx_astrocorp )
GFXDECODE_ENTRY("sprites", 0, layout_16x16x8, 0, 1)
GFXDECODE_END
@@ -528,7 +528,7 @@ MACHINE_CONFIG_START(astrocorp_state::showhand)
MCFG_SCREEN_UPDATE_DRIVER(astrocorp_state, screen_update_astrocorp)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", astrocorp)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_astrocorp)
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_PALETTE_FORMAT(BBBBBGGGGGGRRRRR)
@@ -583,7 +583,7 @@ MACHINE_CONFIG_START(astrocorp_state::skilldrp)
MCFG_SCREEN_UPDATE_DRIVER(astrocorp_state, screen_update_astrocorp)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", astrocorp)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_astrocorp)
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_PALETTE_FORMAT(BBBBBGGGGGGRRRRR)
diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp
index 0a63af77c2d..90b6c43558c 100644
--- a/src/mame/drivers/asuka.cpp
+++ b/src/mame/drivers/asuka.cpp
@@ -779,7 +779,7 @@ static const gfx_layout tilelayout =
128*8
};
-static GFXDECODE_START( asuka )
+static GFXDECODE_START( gfx_asuka )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 256 ) /* OBJ */
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) /* SCR */
GFXDECODE_END
@@ -870,7 +870,7 @@ MACHINE_CONFIG_START(asuka_state::bonzeadv)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, asuka_state, screen_vblank_asuka))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", asuka)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_asuka)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_DEVICE_ADD("pc090oj", PC090OJ, 0)
@@ -932,7 +932,7 @@ MACHINE_CONFIG_START(asuka_state::asuka)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, asuka_state, screen_vblank_asuka))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", asuka)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_asuka)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_DEVICE_ADD("pc090oj", PC090OJ, 0)
@@ -1007,7 +1007,7 @@ MACHINE_CONFIG_START(asuka_state::cadash)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, asuka_state, screen_vblank_asuka))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", asuka)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_asuka)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_DEVICE_ADD("pc090oj", PC090OJ, 0)
@@ -1071,7 +1071,7 @@ MACHINE_CONFIG_START(asuka_state::mofflott)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, asuka_state, screen_vblank_asuka))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", asuka)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_asuka)
MCFG_PALETTE_ADD("palette", 4096) /* only Mofflott uses full palette space */
MCFG_DEVICE_ADD("pc090oj", PC090OJ, 0)
@@ -1142,7 +1142,7 @@ MACHINE_CONFIG_START(asuka_state::eto)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, asuka_state, screen_vblank_asuka))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", asuka)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_asuka)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_DEVICE_ADD("pc090oj", PC090OJ, 0)
diff --git a/src/mame/drivers/atarifb.cpp b/src/mame/drivers/atarifb.cpp
index c78e6879d14..0aabcc0c65b 100644
--- a/src/mame/drivers/atarifb.cpp
+++ b/src/mame/drivers/atarifb.cpp
@@ -491,13 +491,13 @@ static const gfx_layout spritemasklayout =
};
-static GFXDECODE_START( atarifb )
+static GFXDECODE_START( gfx_atarifb )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x00, 0x01 ) /* offset into colors, # of colors */
GFXDECODE_ENTRY( "gfx2", 0, fieldlayout, 0x02, 0x01 ) /* offset into colors, # of colors */
GFXDECODE_END
-static GFXDECODE_START( soccer )
+static GFXDECODE_START( gfx_soccer )
GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0x00, 0x01 ) /* offset into colors, # of colors */
GFXDECODE_ENTRY( "gfx3", 0x0400, soccer_fieldlayout, 0x06, 0x01 ) /* offset into colors, # of colors */
GFXDECODE_ENTRY( "gfx2", 0x0000, spritelayout, 0x02, 0x02 ) /* offset into colors, # of colors */
@@ -572,7 +572,7 @@ MACHINE_CONFIG_START(atarifb_state::atarifb)
MCFG_SCREEN_UPDATE_DRIVER(atarifb_state, screen_update_atarifb)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", atarifb)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_atarifb)
MCFG_PALETTE_ADD("palette", 12)
MCFG_PALETTE_INIT_OWNER(atarifb_state, atarifb)
@@ -621,7 +621,7 @@ MACHINE_CONFIG_START(atarifb_state::soccer)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0*8, 38*8-1, 2*8, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(atarifb_state, screen_update_soccer)
- MCFG_GFXDECODE_MODIFY("gfxdecode", soccer)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_soccer)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarig1.cpp b/src/mame/drivers/atarig1.cpp
index 3d105968259..b0ee6e59eff 100644
--- a/src/mame/drivers/atarig1.cpp
+++ b/src/mame/drivers/atarig1.cpp
@@ -347,7 +347,7 @@ static const gfx_layout anlayout =
};
-static GFXDECODE_START( atarig1 )
+static GFXDECODE_START( gfx_atarig1 )
GFXDECODE_ENTRY( "gfx1", 0, pflayout, 0x300, 8 )
GFXDECODE_ENTRY( "gfx2", 0, anlayout, 0x100, 16 )
GFXDECODE_ENTRY( "gfx1", 0, pftoplayout, 0x300, 8 )
@@ -415,7 +415,7 @@ MACHINE_CONFIG_START(atarig1_state::atarig1)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", atarig1)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_atarig1)
MCFG_PALETTE_ADD("palette", 1280)
MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp
index a4c0374846d..2e38b4f05eb 100644
--- a/src/mame/drivers/atarig42.cpp
+++ b/src/mame/drivers/atarig42.cpp
@@ -463,7 +463,7 @@ static const gfx_layout anlayout =
32*8
};
-static GFXDECODE_START( atarig42 )
+static GFXDECODE_START( gfx_atarig42 )
GFXDECODE_ENTRY( "gfx1", 0, pflayout, 0x000, 64 )
GFXDECODE_ENTRY( "gfx2", 0, anlayout, 0x000, 16 )
GFXDECODE_ENTRY( "gfx1", 0, pftoplayout, 0x000, 64 )
@@ -529,7 +529,7 @@ MACHINE_CONFIG_START(atarig42_state::atarig42)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", atarig42)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_atarig42)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp
index fc8b951c442..4347b158579 100644
--- a/src/mame/drivers/atarigt.cpp
+++ b/src/mame/drivers/atarigt.cpp
@@ -759,7 +759,7 @@ static const gfx_layout anlayout =
};
-static GFXDECODE_START( atarigt )
+static GFXDECODE_START( gfx_atarigt )
GFXDECODE_ENTRY( "gfx1", 0, pflayout, 0x000, 64 )
GFXDECODE_ENTRY( "gfx2", 0, anlayout, 0x000, 16 )
GFXDECODE_ENTRY( "gfx1", 0, pftoplayout, 0x000, 64 )
@@ -810,7 +810,7 @@ MACHINE_CONFIG_START(atarigt_state::atarigt)
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", atarigt)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_atarigt)
MCFG_PALETTE_ADD("palette", 32768)
MCFG_TILEMAP_ADD_CUSTOM("playfield", "gfxdecode", 2, atarigt_state, get_playfield_tile_info, 8,8, atarigt_playfield_scan, 128,64)
diff --git a/src/mame/drivers/atarigx2.cpp b/src/mame/drivers/atarigx2.cpp
index 6a1e561c581..347af745949 100644
--- a/src/mame/drivers/atarigx2.cpp
+++ b/src/mame/drivers/atarigx2.cpp
@@ -1436,7 +1436,7 @@ static const gfx_layout anlayout =
32*8
};
-static GFXDECODE_START( atarigx2 )
+static GFXDECODE_START( gfx_atarigx2 )
GFXDECODE_ENTRY( "gfx1", 0, pflayout, 0x000, 64 )
GFXDECODE_ENTRY( "gfx2", 0, anlayout, 0x000, 16 )
GFXDECODE_ENTRY( "gfx1", 0, pftoplayout, 0x000, 64 )
@@ -1504,7 +1504,7 @@ MACHINE_CONFIG_START(atarigx2_state::atarigx2)
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", atarigx2)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_atarigx2)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp
index 3bc3b60947c..eb622a3fc6f 100644
--- a/src/mame/drivers/atarisy1.cpp
+++ b/src/mame/drivers/atarisy1.cpp
@@ -695,7 +695,7 @@ static const gfx_layout anlayout =
};
-static GFXDECODE_START( atarisy1 )
+static GFXDECODE_START( gfx_atarisy1 )
GFXDECODE_ENTRY( "alpha", 0x00000, anlayout, 0, 64 )
GFXDECODE_END
@@ -750,7 +750,7 @@ MACHINE_CONFIG_START(atarisy1_state::atarisy1)
MCFG_TIMER_DRIVER_ADD("yreset_timer", atarisy1_state, atarisy1_reset_yscroll_callback)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", atarisy1)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_atarisy1)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(IIIIRRRRGGGGBBBB)
diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp
index bbf95d5e006..9a44eb4852b 100644
--- a/src/mame/drivers/atarisy2.cpp
+++ b/src/mame/drivers/atarisy2.cpp
@@ -1167,7 +1167,7 @@ static const gfx_layout molayout =
};
-static GFXDECODE_START( atarisy2 )
+static GFXDECODE_START( gfx_atarisy2 )
GFXDECODE_ENTRY( "gfx1", 0, pflayout, 128, 8 )
GFXDECODE_ENTRY( "gfx2", 0, molayout, 0, 4 )
GFXDECODE_ENTRY( "gfx3", 0, anlayout, 64, 8 )
@@ -1209,7 +1209,7 @@ MACHINE_CONFIG_START(atarisy2_state::atarisy2)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", atarisy2)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_atarisy2)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_FORMAT_CLASS(2, atarisy2_state, RRRRGGGGBBBBIIII)
diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp
index 473edff9323..a9de1971421 100644
--- a/src/mame/drivers/atetris.cpp
+++ b/src/mame/drivers/atetris.cpp
@@ -318,7 +318,7 @@ static const gfx_layout charlayout =
};
-static GFXDECODE_START( atetris )
+static GFXDECODE_START( gfx_atetris )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 )
GFXDECODE_END
@@ -342,7 +342,7 @@ MACHINE_CONFIG_START(atetris_state::atetris)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", atetris)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_atetris)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_FORMAT(RRRGGGBB)
@@ -381,7 +381,7 @@ MACHINE_CONFIG_START(atetris_state::atetrisb2)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", atetris)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_atetris)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_FORMAT(RRRGGGBB)
diff --git a/src/mame/drivers/atm.cpp b/src/mame/drivers/atm.cpp
index 3b33f49b274..ac537320afc 100644
--- a/src/mame/drivers/atm.cpp
+++ b/src/mame/drivers/atm.cpp
@@ -177,11 +177,11 @@ static const gfx_layout spectrum_charlayout =
8*8 /* every char takes 8 bytes */
};
-static GFXDECODE_START( atm )
+static GFXDECODE_START( gfx_atm )
GFXDECODE_ENTRY( "maincpu", 0x1fd00, spectrum_charlayout, 0, 8 )
GFXDECODE_END
-static GFXDECODE_START( atmtb2 )
+static GFXDECODE_START( gfx_atmtb2 )
GFXDECODE_ENTRY( "maincpu", 0x13d00, spectrum_charlayout, 0, 8 )
GFXDECODE_END
@@ -196,14 +196,14 @@ MACHINE_CONFIG_START(atm_state::atm)
MCFG_BETA_DISK_ADD(BETA_DISK_TAG)
- MCFG_GFXDECODE_MODIFY("gfxdecode", atm)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_atm)
MCFG_DEVICE_REMOVE("exp")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(atm_state::atmtb2)
atm(config);
- MCFG_GFXDECODE_MODIFY("gfxdecode", atmtb2)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_atmtb2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/att4425.cpp b/src/mame/drivers/att4425.cpp
index 73f650eeaf4..81d77f12e1b 100644
--- a/src/mame/drivers/att4425.cpp
+++ b/src/mame/drivers/att4425.cpp
@@ -205,7 +205,7 @@ static const gfx_layout att4425_charlayout =
16*8
};
-static GFXDECODE_START( att4425 )
+static GFXDECODE_START( gfx_att4425 )
GFXDECODE_ENTRY( "chargen", 0x0000, att4425_charlayout, 0, 1 )
GFXDECODE_END
@@ -253,7 +253,7 @@ MACHINE_CONFIG_START(att4425_state::att4425)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_SIZE(720, 351)
MCFG_SCREEN_VISIBLE_AREA(0, 720-1, 0, 351-1)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", att4425)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_att4425)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
// ch.3 -- timer?
diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp
index 0c6117e201f..d762763b273 100644
--- a/src/mame/drivers/aussiebyte.cpp
+++ b/src/mame/drivers/aussiebyte.cpp
@@ -341,7 +341,7 @@ static const gfx_layout crt8002_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( crt8002 )
+static GFXDECODE_START( gfx_crt8002 )
GFXDECODE_ENTRY( "chargen", 0x0000, crt8002_charlayout, 0, 1 )
GFXDECODE_END
@@ -508,7 +508,7 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_SCREEN_UPDATE_DEVICE("crtc", sy6545_1_device, screen_update)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", crt8002)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_crt8002)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* sound hardware */
diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp
index 901cf4f51f7..b57aaa8a942 100644
--- a/src/mame/drivers/avigo.cpp
+++ b/src/mame/drivers/avigo.cpp
@@ -670,7 +670,7 @@ static const gfx_layout avigo_6_by_8 =
16*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( avigo )
+static GFXDECODE_START( gfx_avigo )
GFXDECODE_ENTRY( "flash0", 0x08992, avigo_charlayout, 0, 1 )
GFXDECODE_ENTRY( "flash0", 0x0c020, avigo_8_by_14, 0, 1 )
GFXDECODE_ENTRY( "flash0", 0x0c020, avigo_16_by_15, 0, 1 )
@@ -780,7 +780,7 @@ MACHINE_CONFIG_START(avigo_state::avigo)
MCFG_DEFAULT_LAYOUT(layout_avigo)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", avigo)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_avigo)
MCFG_PALETTE_ADD("palette", AVIGO_NUM_COLOURS)
MCFG_PALETTE_INIT_OWNER(avigo_state, avigo)
diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp
index 3df955b7e4c..f07083299bb 100644
--- a/src/mame/drivers/avt.cpp
+++ b/src/mame/drivers/avt.cpp
@@ -935,7 +935,7 @@ static const gfx_layout tilelayout =
* Graphics Decode Information *
**************************************************/
-static GFXDECODE_START( avt )
+static GFXDECODE_START( gfx_avt )
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 16 )
GFXDECODE_END
@@ -973,7 +973,7 @@ MACHINE_CONFIG_START(avt_state::avt)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) /* 240x224 (through CRTC) */
MCFG_SCREEN_UPDATE_DRIVER(avt_state, screen_update_avt)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", avt)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_avt)
MCFG_PALETTE_ADD("palette", 8*16)
MCFG_PALETTE_INIT_OWNER(avt_state, avt)
diff --git a/src/mame/drivers/ax20.cpp b/src/mame/drivers/ax20.cpp
index a8ac0e5d2c1..320346496d7 100644
--- a/src/mame/drivers/ax20.cpp
+++ b/src/mame/drivers/ax20.cpp
@@ -118,7 +118,7 @@ static const gfx_layout ax20_charlayout =
8*16
};
-static GFXDECODE_START( ax20 )
+static GFXDECODE_START( gfx_ax20 )
GFXDECODE_ENTRY( "chargen", 0x0000, ax20_charlayout, 0, 1 )
GFXDECODE_END
@@ -142,7 +142,7 @@ MACHINE_CONFIG_START(ax20_state::ax20)
MCFG_SCREEN_SIZE(80*8, 24*12)
MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 24*12-1)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ax20)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ax20)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_I8272A_ADD("fdc", true)
diff --git a/src/mame/drivers/b16.cpp b/src/mame/drivers/b16.cpp
index 9a60f6d0c36..5cbbffc6375 100644
--- a/src/mame/drivers/b16.cpp
+++ b/src/mame/drivers/b16.cpp
@@ -247,7 +247,7 @@ static const gfx_layout b16_charlayout =
8*16
};
-static GFXDECODE_START( b16 )
+static GFXDECODE_START( gfx_b16 )
GFXDECODE_ENTRY( "pcg", 0x0000, b16_charlayout, 0, 1 )
GFXDECODE_END
@@ -298,7 +298,7 @@ MACHINE_CONFIG_START(b16_state::b16)
MCFG_I8237_IN_MEMR_CB(READ8(*this, b16_state, memory_read_byte))
MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, b16_state, memory_write_byte))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", b16)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_b16)
MCFG_PALETTE_ADD("palette", 8)
// MCFG_PALETTE_INIT_STANDARD(black_and_white) // TODO
diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp
index d855df1be93..385ca14ff5b 100644
--- a/src/mame/drivers/backfire.cpp
+++ b/src/mame/drivers/backfire.cpp
@@ -372,7 +372,7 @@ static const gfx_layout tilelayout =
};
-static GFXDECODE_START( backfire )
+static GFXDECODE_START( gfx_backfire )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 128 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 128 ) /* Characters 8x8 */
@@ -435,7 +435,7 @@ MACHINE_CONFIG_START(backfire_state::backfire)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", backfire)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_backfire)
MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
MCFG_SCREEN_ADD("lscreen", RASTER)
diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp
index aa180c3862e..0671f81c1ba 100644
--- a/src/mame/drivers/badlands.cpp
+++ b/src/mame/drivers/badlands.cpp
@@ -427,7 +427,7 @@ static const gfx_layout badlands_molayout =
64*8
};
-static GFXDECODE_START( badlands )
+static GFXDECODE_START( gfx_badlands )
GFXDECODE_ENTRY( "gfx1", 0, pflayout, 0, 8 )
GFXDECODE_ENTRY( "gfx2", 0, badlands_molayout, 128, 8 )
GFXDECODE_END
@@ -460,7 +460,7 @@ MACHINE_CONFIG_START(badlands_state::badlands)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", badlands)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_badlands)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB)
MCFG_PALETTE_MEMBITS(8)
diff --git a/src/mame/drivers/badlandsbl.cpp b/src/mame/drivers/badlandsbl.cpp
index 645036ad6fa..785dee352a2 100644
--- a/src/mame/drivers/badlandsbl.cpp
+++ b/src/mame/drivers/badlandsbl.cpp
@@ -194,7 +194,7 @@ static const gfx_layout badlands_molayout =
64*8
};
-static GFXDECODE_START( badlandsb )
+static GFXDECODE_START( gfx_badlandsb )
GFXDECODE_ENTRY( "gfx1", 0, pflayout_bootleg, 0, 8 )
GFXDECODE_ENTRY( "gfx2", 0, badlands_molayout, 128, 8 )
GFXDECODE_END
@@ -236,7 +236,7 @@ MACHINE_CONFIG_START(badlandsbl_state::badlandsb)
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", badlandsb)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_badlandsb)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB)
MCFG_PALETTE_MEMBITS(8)
diff --git a/src/mame/drivers/bagman.cpp b/src/mame/drivers/bagman.cpp
index 17fc1de7b12..453961e3f29 100644
--- a/src/mame/drivers/bagman.cpp
+++ b/src/mame/drivers/bagman.cpp
@@ -385,13 +385,13 @@ static const gfx_layout spritelayout =
-static GFXDECODE_START( bagman )
+static GFXDECODE_START( gfx_bagman )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) /* char set #1 */
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 16 ) /* sprites */
GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 16 ) /* char set #2 */
GFXDECODE_END
-static GFXDECODE_START( pickin )
+static GFXDECODE_START( gfx_pickin )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) /* char set #1 */
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 16 ) /* sprites */
/* no gfx2 */
@@ -448,7 +448,7 @@ MACHINE_CONFIG_START(bagman_state::bagman)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bagman_state, vblank_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bagman)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bagman)
MCFG_PALETTE_ADD("palette", 64)
MCFG_PALETTE_INIT_OWNER(bagman_state,bagman)
@@ -528,7 +528,7 @@ MACHINE_CONFIG_START(bagman_state::pickin)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bagman_state, vblank_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", pickin)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pickin)
MCFG_PALETTE_ADD("palette", 64)
MCFG_PALETTE_INIT_OWNER(bagman_state,bagman)
@@ -588,7 +588,7 @@ MACHINE_CONFIG_START(bagman_state::botanic)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bagman_state, vblank_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bagman)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bagman)
MCFG_PALETTE_ADD("palette", 64)
MCFG_PALETTE_INIT_OWNER(bagman_state,bagman)
diff --git a/src/mame/drivers/banctec.cpp b/src/mame/drivers/banctec.cpp
index 4fb320f7c0f..d22886378dc 100644
--- a/src/mame/drivers/banctec.cpp
+++ b/src/mame/drivers/banctec.cpp
@@ -131,7 +131,7 @@ const gfx_layout banctec_gfx_layout =
8 /* size of one char */
};
-static GFXDECODE_START( banctec )
+static GFXDECODE_START( gfx_banctec )
GFXDECODE_ENTRY( "chargen", 0x00000, banctec_gfx_layout, 0, 1 )
GFXDECODE_END
@@ -154,7 +154,7 @@ MACHINE_CONFIG_START(banctec_state::banctec)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 25*8-1)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", banctec)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_banctec)
MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL(2'000'000)) /* (?) */
MCFG_MC6845_SHOW_BORDER_AREA(false)
diff --git a/src/mame/drivers/bankp.cpp b/src/mame/drivers/bankp.cpp
index 7fe025897d7..7b6e8f65a66 100644
--- a/src/mame/drivers/bankp.cpp
+++ b/src/mame/drivers/bankp.cpp
@@ -269,7 +269,7 @@ static const gfx_layout charlayout2 =
8*8 /* every char takes 8 consecutive bytes */
};
-static GFXDECODE_START( bankp )
+static GFXDECODE_START( gfx_bankp )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
GFXDECODE_ENTRY( "gfx2", 0, charlayout2, 32*4, 16 )
GFXDECODE_END
@@ -308,7 +308,7 @@ MACHINE_CONFIG_START(bankp_state::bankp)
MCFG_SCREEN_UPDATE_DRIVER(bankp_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bankp)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bankp)
MCFG_PALETTE_ADD("palette", 32*4+16*8)
MCFG_PALETTE_INDIRECT_ENTRIES(32)
MCFG_PALETTE_INIT_OWNER(bankp_state, bankp)
diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp
index 8538d2e8389..ec556cc3f71 100644
--- a/src/mame/drivers/baraduke.cpp
+++ b/src/mame/drivers/baraduke.cpp
@@ -364,7 +364,7 @@ static const gfx_layout spritelayout =
128*8
};
-static GFXDECODE_START( baraduke )
+static GFXDECODE_START( gfx_baraduke )
GFXDECODE_ENTRY( "gfx1", 0, text_layout, 0, 512 )
GFXDECODE_ENTRY( "gfx2", 0x0000, tile_layout, 0, 256 )
GFXDECODE_ENTRY( "gfx2", 0x4000, tile_layout, 0, 256 )
@@ -394,7 +394,7 @@ MACHINE_CONFIG_START(baraduke_state::baraduke)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, baraduke_state, screen_vblank_baraduke))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", baraduke)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_baraduke)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_INIT_OWNER(baraduke_state, baraduke)
diff --git a/src/mame/drivers/batman.cpp b/src/mame/drivers/batman.cpp
index efd855757c5..42368855c51 100644
--- a/src/mame/drivers/batman.cpp
+++ b/src/mame/drivers/batman.cpp
@@ -169,7 +169,7 @@ static const gfx_layout pfmolayout =
};
-static GFXDECODE_START( batman )
+static GFXDECODE_START( gfx_batman )
GFXDECODE_ENTRY( "gfx3", 0, pfmolayout, 512, 32 ) /* sprites & playfield */
GFXDECODE_ENTRY( "gfx2", 0, pfmolayout, 256, 16 ) /* sprites & playfield */
GFXDECODE_ENTRY( "gfx1", 0, anlayout, 0, 64 ) /* characters 8x8 */
@@ -195,7 +195,7 @@ MACHINE_CONFIG_START(batman_state::batman)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", batman)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_batman)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/battlane.cpp b/src/mame/drivers/battlane.cpp
index 0cd6ce53c5d..933d7da9073 100644
--- a/src/mame/drivers/battlane.cpp
+++ b/src/mame/drivers/battlane.cpp
@@ -246,7 +246,7 @@ static const gfx_layout tilelayout2 =
};
-static GFXDECODE_START( battlane )
+static GFXDECODE_START( gfx_battlane )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 2 ) /* colors 0x00-0x0f */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 32, 4 ) /* colors 0x20-0x3f */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout2, 32, 4 ) /* colors 0x20-0x3f */
@@ -293,7 +293,7 @@ MACHINE_CONFIG_START(battlane_state::battlane)
MCFG_SCREEN_UPDATE_DRIVER(battlane_state, screen_update_battlane)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", battlane)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_battlane)
MCFG_PALETTE_ADD("palette", 64)
diff --git a/src/mame/drivers/battlex.cpp b/src/mame/drivers/battlex.cpp
index 1231c6c7f4d..51e3b0e6fbe 100644
--- a/src/mame/drivers/battlex.cpp
+++ b/src/mame/drivers/battlex.cpp
@@ -262,7 +262,7 @@ static const gfx_layout battlex_spritelayout =
16*16
};
-static GFXDECODE_START( battlex )
+static GFXDECODE_START( gfx_battlex )
GFXDECODE_ENTRY( "gfx1", 0, battlex_charlayout, 64, 8 )
GFXDECODE_ENTRY( "gfx2", 0, battlex_spritelayout, 0, 8 )
GFXDECODE_END
@@ -309,7 +309,7 @@ MACHINE_CONFIG_START(battlex_state::battlex)
MCFG_SCREEN_UPDATE_DRIVER(battlex_state, screen_update_battlex)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", battlex)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_battlex)
MCFG_PALETTE_ADD("palette", 64 + 128)
/* sound hardware */
diff --git a/src/mame/drivers/battlnts.cpp b/src/mame/drivers/battlnts.cpp
index ba9d121c5cb..97a043f87a0 100644
--- a/src/mame/drivers/battlnts.cpp
+++ b/src/mame/drivers/battlnts.cpp
@@ -205,7 +205,7 @@ static const gfx_layout spritelayout =
};
-static GFXDECODE_START( battlnts )
+static GFXDECODE_START( gfx_battlnts )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) /* colors 0-15 */
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 4*16, 1 ) /* colors 64-79 */
GFXDECODE_END
@@ -252,7 +252,7 @@ MACHINE_CONFIG_START(battlnts_state::battlnts)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, battlnts_state, vblank_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", battlnts)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_battlnts)
MCFG_PALETTE_ADD("palette", 128)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
diff --git a/src/mame/drivers/bbusters.cpp b/src/mame/drivers/bbusters.cpp
index abd5b59c9c7..68dd8354f95 100644
--- a/src/mame/drivers/bbusters.cpp
+++ b/src/mame/drivers/bbusters.cpp
@@ -633,7 +633,7 @@ static const gfx_layout tilelayout =
128*8
};
-static GFXDECODE_START( bbusters )
+static GFXDECODE_START( gfx_bbusters )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 16 )
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 512, 16 )
@@ -641,7 +641,7 @@ static GFXDECODE_START( bbusters )
GFXDECODE_ENTRY( "gfx5", 0, tilelayout, 1024+256, 16 )
GFXDECODE_END
-static GFXDECODE_START( mechatt )
+static GFXDECODE_START( gfx_mechatt )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 16 )
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 512, 16 )
@@ -675,7 +675,7 @@ MACHINE_CONFIG_START(bbusters_state::bbusters)
MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("spriteram2", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bbusters)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bbusters)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
@@ -718,7 +718,7 @@ MACHINE_CONFIG_START(bbusters_state::mechatt)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", mechatt)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mechatt)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp
index 6bf176c2ae0..22214e186eb 100644
--- a/src/mame/drivers/bcs3.cpp
+++ b/src/mame/drivers/bcs3.cpp
@@ -326,7 +326,7 @@ static const gfx_layout bcs3_charlayout =
8*8 /* every char takes 8 bytes */
};
-static GFXDECODE_START( bcs3 )
+static GFXDECODE_START( gfx_bcs3 )
GFXDECODE_ENTRY( "chargen", 0x0000, bcs3_charlayout, 0, 1 )
GFXDECODE_END
@@ -399,7 +399,7 @@ MACHINE_CONFIG_START(bcs3_state::bcs3)
MCFG_SCREEN_VISIBLE_AREA(0,28*8-1,0,12*10-1)
MCFG_SCREEN_UPDATE_DRIVER(bcs3_state, screen_update_bcs3)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bcs3)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bcs3)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(5'000'000) / 2)
@@ -426,7 +426,7 @@ MACHINE_CONFIG_START(bcs3_state::bcs3a)
MCFG_SCREEN_VISIBLE_AREA(0,29*8-1,0,12*10-1)
MCFG_SCREEN_UPDATE_DRIVER(bcs3_state, screen_update_bcs3a)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bcs3)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bcs3)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(7'000'000) / 2)
diff --git a/src/mame/drivers/bestleag.cpp b/src/mame/drivers/bestleag.cpp
index d111d8ca6b2..6c92dd88bde 100644
--- a/src/mame/drivers/bestleag.cpp
+++ b/src/mame/drivers/bestleag.cpp
@@ -373,7 +373,7 @@ static const gfx_layout bestleag_char16layout =
16*16
};
-static GFXDECODE_START( bestleag )
+static GFXDECODE_START( gfx_bestleag )
GFXDECODE_ENTRY( "gfx1", 0, bestleag_charlayout, 0x200, 16 )
GFXDECODE_ENTRY( "gfx1", 0, bestleag_char16layout, 0x000, 32 )
GFXDECODE_ENTRY( "gfx2", 0, bestleag_char16layout, 0x300, 16 )
@@ -392,7 +392,7 @@ MACHINE_CONFIG_START(bestleag_state::bestleag)
MCFG_SCREEN_UPDATE_DRIVER(bestleag_state, screen_update_bestleag)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bestleag)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bestleag)
MCFG_PALETTE_ADD("palette", 0x800)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp
index 881e51491c7..1c73812a6e2 100644
--- a/src/mame/drivers/bigbord2.cpp
+++ b/src/mame/drivers/bigbord2.cpp
@@ -455,7 +455,7 @@ static const gfx_layout crt8002_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( crt8002 )
+static GFXDECODE_START( gfx_crt8002 )
GFXDECODE_ENTRY( "chargen", 0x0000, crt8002_charlayout, 0, 1 )
GFXDECODE_END
@@ -557,7 +557,7 @@ MACHINE_CONFIG_START(bigbord2_state::bigbord2)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(10'694'250), 700, 0, 560, 260, 0, 240)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", crt8002)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_crt8002)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("ctc_clock", CLOCK, MAIN_CLOCK)
diff --git a/src/mame/drivers/bigevglf.cpp b/src/mame/drivers/bigevglf.cpp
index 15fca00eceb..c58b30e8961 100644
--- a/src/mame/drivers/bigevglf.cpp
+++ b/src/mame/drivers/bigevglf.cpp
@@ -344,7 +344,7 @@ static const gfx_layout gfxlayout =
8*8
};
-static GFXDECODE_START( bigevglf )
+static GFXDECODE_START( gfx_bigevglf )
GFXDECODE_ENTRY( "gfx1", 0, gfxlayout, 0x20*16, 16 )
GFXDECODE_END
@@ -418,7 +418,7 @@ MACHINE_CONFIG_START(bigevglf_state::bigevglf)
MCFG_SCREEN_UPDATE_DRIVER(bigevglf_state, screen_update_bigevglf)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bigevglf)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bigevglf)
MCFG_PALETTE_ADD("palette", 0x800)
/* sound hardware */
diff --git a/src/mame/drivers/bigstrkb.cpp b/src/mame/drivers/bigstrkb.cpp
index 3d96eb37fda..37adafdd92a 100644
--- a/src/mame/drivers/bigstrkb.cpp
+++ b/src/mame/drivers/bigstrkb.cpp
@@ -191,7 +191,7 @@ static const gfx_layout bigstrkb_char16layout =
-static GFXDECODE_START( bigstrkb )
+static GFXDECODE_START( gfx_bigstrkb )
GFXDECODE_ENTRY( "gfx1", 0, bigstrkb_charlayout, 0x200, 16 )
GFXDECODE_ENTRY( "gfx2", 0, bigstrkb_char16layout, 0, 32 )
GFXDECODE_ENTRY( "gfx3", 0, bigstrkb_char16layout, 0x300, 16 )
@@ -206,7 +206,7 @@ MACHINE_CONFIG_START(bigstrkb_state::bigstrkb)
MCFG_DEVICE_PROGRAM_MAP(bigstrkb_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bigstrkb_state, irq6_line_hold)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bigstrkb)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bigstrkb)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp
index 5f012bcf423..602dd0fc9e5 100644
--- a/src/mame/drivers/binbug.cpp
+++ b/src/mame/drivers/binbug.cpp
@@ -222,7 +222,7 @@ static const gfx_layout dg640_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( dg640 )
+static GFXDECODE_START( gfx_dg640 )
GFXDECODE_ENTRY( "chargen", 0x0000, dg640_charlayout, 0, 1 )
GFXDECODE_END
@@ -315,7 +315,7 @@ MACHINE_CONFIG_START(binbug_state::binbug)
MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 255)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dg640)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dg640)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* Keyboard */
@@ -550,7 +550,7 @@ MACHINE_CONFIG_START(dg680_state::dg680)
MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 255)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dg640)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dg640)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* Keyboard */
diff --git a/src/mame/drivers/bingoman.cpp b/src/mame/drivers/bingoman.cpp
index 4ca2e3a35ca..ef86f484641 100644
--- a/src/mame/drivers/bingoman.cpp
+++ b/src/mame/drivers/bingoman.cpp
@@ -358,7 +358,7 @@ static const gfx_layout charlayout =
};
#endif
-static GFXDECODE_START( bingoman )
+static GFXDECODE_START( gfx_bingoman )
// GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 )
GFXDECODE_END
@@ -392,7 +392,7 @@ MACHINE_CONFIG_START(bingoman_state::bingoman)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bingoman)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bingoman)
MCFG_PALETTE_ADD("palette", 8)
MCFG_PALETTE_INIT_OWNER(bingoman_state, bingoman)
diff --git a/src/mame/drivers/bingor.cpp b/src/mame/drivers/bingor.cpp
index 7e3bc25cd83..4517e97ccdd 100644
--- a/src/mame/drivers/bingor.cpp
+++ b/src/mame/drivers/bingor.cpp
@@ -685,7 +685,7 @@ static const gfx_layout bingor_layout =
8*32
};
-static GFXDECODE_START( bingor )
+static GFXDECODE_START( gfx_bingor )
GFXDECODE_ENTRY( "gfx", 0, bingor_layout, 0x0, 2 )
GFXDECODE_END
@@ -699,7 +699,7 @@ MACHINE_CONFIG_START(bingor_state::bingor)
MCFG_DEVICE_ADD("pic", PIC16C57, 12000000) //?? Mhz
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bingor)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bingor)
//MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp
index b57d44c4272..db7b5b4ff58 100644
--- a/src/mame/drivers/bionicc.cpp
+++ b/src/mame/drivers/bionicc.cpp
@@ -357,7 +357,7 @@ static const gfx_layout scroll1layout_bionicc=
512 /* each tile takes 512 consecutive bytes */
};
-static GFXDECODE_START( bionicc )
+static GFXDECODE_START( gfx_bionicc )
GFXDECODE_ENTRY( "gfx1", 0, vramlayout_bionicc, 768, 64 ) /* colors 768-1023 */
GFXDECODE_ENTRY( "gfx2", 0, scroll2layout_bionicc, 0, 4 ) /* colors 0- 63 */
GFXDECODE_ENTRY( "gfx3", 0, scroll1layout_bionicc, 256, 4 ) /* colors 256- 319 */
@@ -414,7 +414,7 @@ MACHINE_CONFIG_START(bionicc_state::bionicc)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bionicc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bionicc)
MCFG_DEVICE_ADD("spritegen", TIGEROAD_SPRITE, 0)
diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp
index 0aa2fb462c7..4116cb337a8 100644
--- a/src/mame/drivers/bking.cpp
+++ b/src/mame/drivers/bking.cpp
@@ -310,7 +310,7 @@ static const gfx_layout balllayout =
16*8 /* every sprite takes 16 consecutive bytes */
};
-static GFXDECODE_START( bking )
+static GFXDECODE_START( gfx_bking )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 4 ) /* playfield */
GFXDECODE_ENTRY( "gfx2", 0, crowlayout, 4*8, 4 ) /* crow */
GFXDECODE_ENTRY( "gfx3", 0, balllayout, 4*8+4*4, 4 ) /* ball 1 */
@@ -417,7 +417,7 @@ MACHINE_CONFIG_START(bking_state::bking)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bking_state, screen_vblank_bking))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bking)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bking)
MCFG_PALETTE_ADD("palette", 4*8+4*4+4*2+4*2)
MCFG_PALETTE_INIT_OWNER(bking_state, bking)
diff --git a/src/mame/drivers/blackt96.cpp b/src/mame/drivers/blackt96.cpp
index 22f4f5d5d76..4a30d477eaf 100644
--- a/src/mame/drivers/blackt96.cpp
+++ b/src/mame/drivers/blackt96.cpp
@@ -383,7 +383,7 @@ static const gfx_layout blackt96_text_layout =
16*16
};
-static GFXDECODE_START( blackt96 )
+static GFXDECODE_START( gfx_blackt96 )
GFXDECODE_ENTRY( "gfx1", 0, blackt96_layout, 0, 8 )
GFXDECODE_ENTRY( "gfx2", 0, blackt962_layout, 0, 128 )
GFXDECODE_ENTRY( "gfx3", 0, blackt96_text_layout, 0, 16 )
@@ -488,7 +488,7 @@ MACHINE_CONFIG_START(blackt96_state::blackt96)
MCFG_PIC16C5x_READ_C_CB(READ8(*this, blackt96_state, blackt96_soundio_port_c_r))
MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, blackt96_state, blackt96_soundio_port_c_w))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", blackt96)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_blackt96)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp
index c07a246ed37..8305cc9fca4 100644
--- a/src/mame/drivers/bladestl.cpp
+++ b/src/mame/drivers/bladestl.cpp
@@ -270,7 +270,7 @@ static const gfx_layout spritelayout =
32*8 /* every sprite takes 32 consecutive bytes */
};
-static GFXDECODE_START( bladestl )
+static GFXDECODE_START( gfx_bladestl )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 2 ) /* colors 00..31 */
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 32, 16 ) /* colors 32..47 but using lookup table */
GFXDECODE_END
@@ -325,7 +325,7 @@ MACHINE_CONFIG_START(bladestl_state::bladestl)
MCFG_SCREEN_UPDATE_DRIVER(bladestl_state, screen_update_bladestl)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD(m_gfxdecode, "palette", bladestl)
+ MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, "palette", gfx_bladestl)
MCFG_PALETTE_ADD("palette", 32 + 16*16)
MCFG_PALETTE_INDIRECT_ENTRIES(32+16)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp
index 1d56e202c15..d98845de5ba 100644
--- a/src/mame/drivers/blktiger.cpp
+++ b/src/mame/drivers/blktiger.cpp
@@ -252,7 +252,7 @@ static const gfx_layout spritelayout =
32*16
};
-static GFXDECODE_START( blktiger )
+static GFXDECODE_START( gfx_blktiger )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x300, 32 ) /* colors 0x300-0x37f */
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x000, 16 ) /* colors 0x000-0x0ff */
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x200, 8 ) /* colors 0x200-0x27f */
@@ -319,7 +319,7 @@ MACHINE_CONFIG_START(blktiger_state::blktiger)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", blktiger)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_blktiger)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG)
diff --git a/src/mame/drivers/blmbycar.cpp b/src/mame/drivers/blmbycar.cpp
index 8b1a07a8e64..ee4483b7333 100644
--- a/src/mame/drivers/blmbycar.cpp
+++ b/src/mame/drivers/blmbycar.cpp
@@ -325,7 +325,7 @@ static const gfx_layout layout_16x16x4 =
};
/* Layers both use the first $20 color codes. Sprites the next $10 */
-static GFXDECODE_START( blmbycar )
+static GFXDECODE_START( gfx_blmbycar )
GFXDECODE_ENTRY( "sprites", 0, layout_16x16x4, 0x0, 0x30 ) // [0] Layers + Sprites
GFXDECODE_END
@@ -373,7 +373,7 @@ MACHINE_CONFIG_START(blmbycar_state::blmbycar)
MCFG_SCREEN_UPDATE_DRIVER(blmbycar_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", blmbycar)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_blmbycar)
MCFG_PALETTE_ADD("palette", 0x300)
MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG)
diff --git a/src/mame/drivers/blockade.cpp b/src/mame/drivers/blockade.cpp
index 5f27ef1e6be..bcac7543fd3 100644
--- a/src/mame/drivers/blockade.cpp
+++ b/src/mame/drivers/blockade.cpp
@@ -367,7 +367,7 @@ uint32_t blockade_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
return 0;
}
-static GFXDECODE_START( blockade )
+static GFXDECODE_START( gfx_blockade )
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x1, 0, 1 )
GFXDECODE_END
@@ -477,7 +477,7 @@ MACHINE_CONFIG_START(blockade_state::blockade)
MCFG_SCREEN_UPDATE_DRIVER(blockade_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", blockade)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_blockade)
MCFG_PALETTE_ADD_MONOCHROME("palette")
diff --git a/src/mame/drivers/bloodbro.cpp b/src/mame/drivers/bloodbro.cpp
index 3b0d8607f37..feecec8dbd0 100644
--- a/src/mame/drivers/bloodbro.cpp
+++ b/src/mame/drivers/bloodbro.cpp
@@ -491,14 +491,14 @@ static const gfx_layout weststry_spritelayout =
/* Graphics Decode Info */
-static GFXDECODE_START( bloodbro )
+static GFXDECODE_START( gfx_bloodbro )
GFXDECODE_ENTRY( "gfx1", 0x00000, textlayout, 0x70*16, 0x10 ) /* Text */
GFXDECODE_ENTRY( "gfx2", 0x00000, spritelayout, 0x40*16, 0x10 ) /* Background */
GFXDECODE_ENTRY( "gfx2", 0x00000, spritelayout, 0x50*16, 0x10 ) /* Foreground */
GFXDECODE_ENTRY( "gfx3", 0x00000, spritelayout, 0x00*16, 0x10 ) /* Sprites */
GFXDECODE_END
-static GFXDECODE_START( weststry )
+static GFXDECODE_START( gfx_weststry )
GFXDECODE_ENTRY( "gfx1", 0x00000, weststry_textlayout, 0x10*16, 0x10 )
GFXDECODE_ENTRY( "gfx2", 0x00000, weststry_spritelayout, 0x30*16, 0x10 )
GFXDECODE_ENTRY( "gfx2", 0x00000, weststry_spritelayout, 0x20*16, 0x10 )
@@ -546,7 +546,7 @@ MACHINE_CONFIG_START(bloodbro_state::bloodbro)
MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, bloodbro_state, layer_scroll_w))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bloodbro)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bloodbro)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
@@ -578,7 +578,7 @@ MACHINE_CONFIG_START(bloodbro_state::weststry)
MCFG_DEVICE_CLOCK(XTAL(20'000'000)/4) /* 5MHz - verified on PCB */
MCFG_DEVICE_PROGRAM_MAP(weststry_sound_map)
- MCFG_GFXDECODE_MODIFY("gfxdecode", weststry)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_weststry)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(1024)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
diff --git a/src/mame/drivers/blstroid.cpp b/src/mame/drivers/blstroid.cpp
index 0ebab5e84c9..14e87bdefa2 100644
--- a/src/mame/drivers/blstroid.cpp
+++ b/src/mame/drivers/blstroid.cpp
@@ -161,7 +161,7 @@ static const gfx_layout molayout =
};
-static GFXDECODE_START( blstroid )
+static GFXDECODE_START( gfx_blstroid )
GFXDECODE_ENTRY( "gfx1", 0, pflayout, 256, 16 )
GFXDECODE_ENTRY( "gfx2", 0, molayout, 0, 16 )
GFXDECODE_END
@@ -186,7 +186,7 @@ MACHINE_CONFIG_START(blstroid_state::blstroid)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", blstroid)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_blstroid)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp
index b2d9acbdda6..e0d9debbdfd 100644
--- a/src/mame/drivers/blueprnt.cpp
+++ b/src/mame/drivers/blueprnt.cpp
@@ -322,7 +322,7 @@ static const gfx_layout spritelayout =
};
-static GFXDECODE_START( blueprnt )
+static GFXDECODE_START( gfx_blueprnt )
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x2_planar, 0, 128 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 128*4, 1 )
GFXDECODE_END
@@ -373,7 +373,7 @@ MACHINE_CONFIG_START(blueprnt_state::blueprnt)
MCFG_SCREEN_UPDATE_DRIVER(blueprnt_state, screen_update_blueprnt)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", blueprnt)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_blueprnt)
MCFG_PALETTE_ADD("palette", 128*4+8)
MCFG_PALETTE_INIT_OWNER(blueprnt_state, blueprnt)
diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp
index c0f50d3d983..441d03b18a6 100644
--- a/src/mame/drivers/bmcpokr.cpp
+++ b/src/mame/drivers/bmcpokr.cpp
@@ -781,7 +781,7 @@ static const gfx_layout tiles8x8_layout =
8*8*4
};
-static GFXDECODE_START( bmcpokr )
+static GFXDECODE_START( gfx_bmcpokr )
GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 1 )
GFXDECODE_END
@@ -824,7 +824,7 @@ MACHINE_CONFIG_START(bmcpokr_state::bmcpokr)
MCFG_PALETTE_ADD("palette", 256)
MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bmcpokr)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bmcpokr)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/bmjr.cpp b/src/mame/drivers/bmjr.cpp
index 7e94078ed1f..ad3b8cf5517 100644
--- a/src/mame/drivers/bmjr.cpp
+++ b/src/mame/drivers/bmjr.cpp
@@ -321,7 +321,7 @@ static const gfx_layout bmjr_charlayout =
8*8
};
-static GFXDECODE_START( bmjr )
+static GFXDECODE_START( gfx_bmjr )
GFXDECODE_ENTRY( "chargen", 0x0000, bmjr_charlayout, 0, 4 )
GFXDECODE_END
@@ -353,7 +353,7 @@ MACHINE_CONFIG_START(bmjr_state::bmjr)
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD_3BIT_BRG("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bmjr)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bmjr)
/* Audio */
SPEAKER(config, "mono").front_center();
diff --git a/src/mame/drivers/bnstars.cpp b/src/mame/drivers/bnstars.cpp
index 45fe9c90e2f..79701d83dd3 100644
--- a/src/mame/drivers/bnstars.cpp
+++ b/src/mame/drivers/bnstars.cpp
@@ -700,7 +700,7 @@ static GFXLAYOUT_RAW( spritelayout, 256, 256, 256*8, 256*256*8 )
static GFXLAYOUT_RAW( bglayout, 16, 16, 16*8, 16*16*8 )
static GFXLAYOUT_RAW( txlayout, 8, 8, 8*8, 8*8*8 )
-static GFXDECODE_START( bnstars )
+static GFXDECODE_START( gfx_bnstars )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0x0000, 0x10 )
GFXDECODE_ENTRY( "gfx2", 0, bglayout, 0x5000, 0x10 ) /* Roz scr1 */
GFXDECODE_ENTRY( "gfx4", 0, bglayout, 0x1000, 0x10 ) /* Bg scr1 */
@@ -817,7 +817,7 @@ MACHINE_CONFIG_START(bnstars_state::bnstars)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bnstars)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bnstars)
MCFG_PALETTE_ADD("palette", 0x8000)
MCFG_PALETTE_FORMAT(XBRG)
diff --git a/src/mame/drivers/bogeyman.cpp b/src/mame/drivers/bogeyman.cpp
index 9ece5da93fe..f8db9b88e48 100644
--- a/src/mame/drivers/bogeyman.cpp
+++ b/src/mame/drivers/bogeyman.cpp
@@ -192,7 +192,7 @@ static const gfx_layout sprites =
/* Graphics Decode Information */
-static GFXDECODE_START( bogeyman )
+static GFXDECODE_START( gfx_bogeyman )
GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout1, 16, 32 )
GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout2, 16, 32 )
GFXDECODE_ENTRY( "gfx2", 0x00000, sprites, 0, 2 )
@@ -248,7 +248,7 @@ MACHINE_CONFIG_START(bogeyman_state::bogeyman)
MCFG_SCREEN_UPDATE_DRIVER(bogeyman_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bogeyman)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bogeyman)
MCFG_PALETTE_ADD("palette", 16+256)
MCFG_PALETTE_FORMAT(BBGGGRRR_inverted)
MCFG_PALETTE_INIT_OWNER(bogeyman_state, bogeyman)
diff --git a/src/mame/drivers/bombjack.cpp b/src/mame/drivers/bombjack.cpp
index 4af7cdbe04b..6f67c9ab9a3 100644
--- a/src/mame/drivers/bombjack.cpp
+++ b/src/mame/drivers/bombjack.cpp
@@ -313,7 +313,7 @@ static const gfx_layout spritelayout2 =
128*8 /* every sprite takes 128 consecutive bytes */
};
-static GFXDECODE_START( bombjack )
+static GFXDECODE_START( gfx_bombjack )
GFXDECODE_ENTRY( "chars", 0x0000, charlayout1, 0, 16 ) /* characters */
GFXDECODE_ENTRY( "tiles", 0x0000, charlayout2, 0, 16 ) /* background tiles */
GFXDECODE_ENTRY( "sprites", 0x0000, spritelayout1, 0, 16 ) /* normal sprites */
@@ -372,7 +372,7 @@ MACHINE_CONFIG_START(bombjack_state::bombjack)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bombjack_state, vblank_irq))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bombjack)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bombjack)
MCFG_PALETTE_ADD("palette", 128)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
diff --git a/src/mame/drivers/boogwing.cpp b/src/mame/drivers/boogwing.cpp
index 614656da3fb..8bf4f2c8d30 100644
--- a/src/mame/drivers/boogwing.cpp
+++ b/src/mame/drivers/boogwing.cpp
@@ -302,7 +302,7 @@ static const gfx_layout spritelayout =
};
-static GFXDECODE_START( boogwing )
+static GFXDECODE_START( gfx_boogwing )
GFXDECODE_ENTRY( "tiles1", 0, tile_8x8_layout, 0, 16 ) /* Tiles (8x8) */
GFXDECODE_ENTRY( "tiles2", 0, tile_16x16_layout_5bpp, 0x100, 16 ) /* Tiles (16x16) */
GFXDECODE_ENTRY( "tiles3", 0, tile_16x16_layout, 0x300, 32 ) /* Tiles (16x16) */
@@ -354,7 +354,7 @@ MACHINE_CONFIG_START(boogwing_state::boogwing)
MCFG_SCREEN_RAW_PARAMS(MAIN_XTAL / 4, 442, 0, 320, 274, 8, 248) // same as robocop2(cninja.cpp)? verify this from real pcb.
MCFG_SCREEN_UPDATE_DRIVER(boogwing_state, screen_update_boogwing)
- MCFG_GFXDECODE_ADD("gfxdecode", "deco_ace", boogwing)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "deco_ace", gfx_boogwing)
MCFG_DEVICE_ADD("spriteram1", BUFFERED_SPRITERAM16)
MCFG_DEVICE_ADD("spriteram2", BUFFERED_SPRITERAM16)
diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp
index d0de30412f2..f03a24a3337 100644
--- a/src/mame/drivers/boxer.cpp
+++ b/src/mame/drivers/boxer.cpp
@@ -455,7 +455,7 @@ static const gfx_layout sprite_layout =
};
-static GFXDECODE_START( boxer )
+static GFXDECODE_START( gfx_boxer )
GFXDECODE_ENTRY( "gfx1", 0, sprite_layout, 0, 1 )
GFXDECODE_ENTRY( "gfx2", 0, sprite_layout, 0, 1 )
GFXDECODE_ENTRY( "gfx3", 0, tile_layout, 2, 1 )
@@ -502,7 +502,7 @@ MACHINE_CONFIG_START(boxer_state::boxer)
MCFG_SCREEN_UPDATE_DRIVER(boxer_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", boxer)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_boxer)
MCFG_PALETTE_ADD("palette", 4)
MCFG_PALETTE_INIT_OWNER(boxer_state, boxer)
diff --git a/src/mame/drivers/brkthru.cpp b/src/mame/drivers/brkthru.cpp
index 2ababee4150..4253dde6cbc 100644
--- a/src/mame/drivers/brkthru.cpp
+++ b/src/mame/drivers/brkthru.cpp
@@ -330,7 +330,7 @@ static const gfx_layout spritelayout =
32*8 /* every sprite takes 32 consecutive bytes */
};
-static GFXDECODE_START( brkthru )
+static GFXDECODE_START( gfx_brkthru )
GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 0x00, 1 ) /* use colors 0x00-0x07 */
GFXDECODE_ENTRY( "gfx2", 0x00000, tilelayout1, 0x80, 16 ) /* use colors 0x80-0xff */
GFXDECODE_ENTRY( "gfx2", 0x01000, tilelayout2, 0x80, 16 )
@@ -384,7 +384,7 @@ MACHINE_CONFIG_START(brkthru_state::brkthru)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", brkthru)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_brkthru)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(brkthru_state, brkthru)
@@ -425,7 +425,7 @@ MACHINE_CONFIG_START(brkthru_state::darwin)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", brkthru)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_brkthru)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(brkthru_state, brkthru)
diff --git a/src/mame/drivers/bsktball.cpp b/src/mame/drivers/bsktball.cpp
index a367e496a94..7e55c07c8ac 100644
--- a/src/mame/drivers/bsktball.cpp
+++ b/src/mame/drivers/bsktball.cpp
@@ -195,7 +195,7 @@ static const gfx_layout motionlayout =
};
-static GFXDECODE_START( bsktball )
+static GFXDECODE_START( gfx_bsktball )
GFXDECODE_ENTRY( "gfx1", 0x0600, charlayout, 0x00, 0x02 )
GFXDECODE_ENTRY( "gfx1", 0x0000, motionlayout, 0x08, 0x40 )
GFXDECODE_END
@@ -264,7 +264,7 @@ MACHINE_CONFIG_START(bsktball_state::bsktball)
MCFG_SCREEN_UPDATE_DRIVER(bsktball_state, screen_update_bsktball)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bsktball)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bsktball)
MCFG_PALETTE_ADD("palette", 2*4 + 4*4*4*4)
MCFG_PALETTE_INDIRECT_ENTRIES(4)
MCFG_PALETTE_INIT_OWNER(bsktball_state, bsktball)
diff --git a/src/mame/drivers/btime.cpp b/src/mame/drivers/btime.cpp
index 50a0af5ae67..c6986a67c8f 100644
--- a/src/mame/drivers/btime.cpp
+++ b/src/mame/drivers/btime.cpp
@@ -1104,36 +1104,36 @@ static const gfx_layout bnj_tile16layout =
64*8
};
-static GFXDECODE_START( btime )
+static GFXDECODE_START( gfx_btime )
GFXDECODE_ENTRY( "gfx1", 0, tile8layout, 0, 1 ) /* char set #1 */
GFXDECODE_ENTRY( "gfx1", 0, tile16layout, 0, 1 ) /* sprites */
GFXDECODE_ENTRY( "gfx2", 0, tile16layout, 8, 1 ) /* background tiles */
GFXDECODE_END
-static GFXDECODE_START( cookrace )
+static GFXDECODE_START( gfx_cookrace )
GFXDECODE_ENTRY( "gfx1", 0, tile8layout, 0, 1 ) /* char set #1 */
GFXDECODE_ENTRY( "gfx1", 0, tile16layout, 0, 1 ) /* sprites */
GFXDECODE_ENTRY( "gfx2", 0, tile8layout, 8, 1 ) /* background tiles */
GFXDECODE_END
-static GFXDECODE_START( lnc )
+static GFXDECODE_START( gfx_lnc )
GFXDECODE_ENTRY( "gfx1", 0, tile8layout, 0, 1 ) /* char set #1 */
GFXDECODE_ENTRY( "gfx1", 0, tile16layout, 0, 1 ) /* sprites */
GFXDECODE_END
-static GFXDECODE_START( bnj )
+static GFXDECODE_START( gfx_bnj )
GFXDECODE_ENTRY( "gfx1", 0, tile8layout, 0, 1 ) /* char set #1 */
GFXDECODE_ENTRY( "gfx1", 0, tile16layout, 0, 1 ) /* sprites */
GFXDECODE_ENTRY( "gfx2", 0, bnj_tile16layout,8, 1 ) /* background tiles */
GFXDECODE_END
-static GFXDECODE_START( zoar )
+static GFXDECODE_START( gfx_zoar )
GFXDECODE_ENTRY( "gfx1", 0, tile8layout, 0, 8 ) /* char set #1 */
GFXDECODE_ENTRY( "gfx3", 0, tile16layout, 0, 8 ) /* sprites */
GFXDECODE_ENTRY( "gfx2", 0, tile16layout, 0, 8 ) /* background tiles */
GFXDECODE_END
-static GFXDECODE_START( disco )
+static GFXDECODE_START( gfx_disco )
GFXDECODE_ENTRY( nullptr, 0, disco_tile8layout, 0, 4 ) /* char set #1 */
GFXDECODE_ENTRY( nullptr, 0, disco_tile16layout, 0, 4 ) /* sprites */
GFXDECODE_END
@@ -1299,7 +1299,7 @@ MACHINE_CONFIG_START(btime_state::btime)
MCFG_MACHINE_START_OVERRIDE(btime_state,btime)
MCFG_MACHINE_RESET_OVERRIDE(btime_state,btime)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", btime)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_btime)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(btime_state,btime)
@@ -1342,7 +1342,7 @@ MACHINE_CONFIG_START(btime_state::cookrace)
MCFG_DEVICE_PROGRAM_MAP(audio_map)
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", cookrace)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_cookrace)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(btime_state, screen_update_cookrace)
@@ -1359,7 +1359,7 @@ MACHINE_CONFIG_START(btime_state::lnc)
MCFG_MACHINE_RESET_OVERRIDE(btime_state,lnc)
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", lnc)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_lnc)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(8)
@@ -1401,7 +1401,7 @@ MACHINE_CONFIG_START(btime_state::bnj)
MCFG_DEVICE_PROGRAM_MAP(bnj_map)
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", bnj)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_bnj)
MCFG_VIDEO_START_OVERRIDE(btime_state,bnj)
@@ -1428,7 +1428,7 @@ MACHINE_CONFIG_START(btime_state::zoar)
MCFG_DEVICE_PROGRAM_MAP(zoar_map)
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", zoar)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_zoar)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(64)
@@ -1464,7 +1464,7 @@ MACHINE_CONFIG_START(btime_state::disco)
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", disco)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_disco)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(32)
@@ -1484,7 +1484,7 @@ MACHINE_CONFIG_START(btime_state::tisland)
MCFG_DEVICE_PROGRAM_MAP(tisland_map)
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", zoar)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_zoar)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bublbobl.cpp b/src/mame/drivers/bublbobl.cpp
index 8bee75a493b..c7dae019b81 100644
--- a/src/mame/drivers/bublbobl.cpp
+++ b/src/mame/drivers/bublbobl.cpp
@@ -803,7 +803,7 @@ static const gfx_layout charlayout =
16*8
};
-static GFXDECODE_START( bublbobl )
+static GFXDECODE_START( gfx_bublbobl )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 )
GFXDECODE_END
@@ -874,7 +874,7 @@ MACHINE_CONFIG_START(bublbobl_state::tokio)
MCFG_SCREEN_UPDATE_DRIVER(bublbobl_state, screen_update_bublbobl)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bublbobl)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bublbobl)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG)
@@ -987,7 +987,7 @@ MACHINE_CONFIG_START(bublbobl_state::bublbobl_nomcu)
MCFG_SCREEN_UPDATE_DRIVER(bublbobl_state, screen_update_bublbobl)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bublbobl)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bublbobl)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG)
diff --git a/src/mame/drivers/buggychl.cpp b/src/mame/drivers/buggychl.cpp
index 9f55f294404..5fbf72f9b25 100644
--- a/src/mame/drivers/buggychl.cpp
+++ b/src/mame/drivers/buggychl.cpp
@@ -391,7 +391,7 @@ static const gfx_layout spritelayout =
8
};
-static GFXDECODE_START( buggychl )
+static GFXDECODE_START( gfx_buggychl )
GFXDECODE_ENTRY( nullptr, 0, charlayout, 0, 8 ) /* decoded at runtime */
/* sprites are drawn pixel by pixel by draw_sprites() */
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 8 )
@@ -483,7 +483,7 @@ MACHINE_CONFIG_START(buggychl_state::buggychl)
MCFG_SCREEN_UPDATE_DRIVER(buggychl_state, screen_update_buggychl)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", buggychl)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_buggychl)
MCFG_PALETTE_ADD("palette", 128+128)
MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB)
MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG)
diff --git a/src/mame/drivers/buster.cpp b/src/mame/drivers/buster.cpp
index 144384d7e46..dda17312e78 100644
--- a/src/mame/drivers/buster.cpp
+++ b/src/mame/drivers/buster.cpp
@@ -315,7 +315,7 @@ static const gfx_layout tiles8x8_layout =
8*4
};
-static GFXDECODE_START( buster )
+static GFXDECODE_START( gfx_buster )
GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 1 )
GFXDECODE_END
@@ -339,7 +339,7 @@ MACHINE_CONFIG_START(buster_state::buster)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", buster)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_buster)
MCFG_PALETTE_ADD_3BIT_RGB("palette")
diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp
index 4401dd72a0c..d94e3ea7f1e 100644
--- a/src/mame/drivers/bw12.cpp
+++ b/src/mame/drivers/bw12.cpp
@@ -541,7 +541,7 @@ static const gfx_layout bw12_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( bw12 )
+static GFXDECODE_START( gfx_bw12 )
GFXDECODE_ENTRY( "chargen", 0x0000, bw12_charlayout, 0, 1 )
GFXDECODE_END
@@ -561,7 +561,7 @@ MACHINE_CONFIG_START(bw12_state::common)
MCFG_SCREEN_SIZE(640, 200)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bw12)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bw12)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(16'000'000)/8)
diff --git a/src/mame/drivers/bwing.cpp b/src/mame/drivers/bwing.cpp
index 3094447482d..a248b6a32d1 100644
--- a/src/mame/drivers/bwing.cpp
+++ b/src/mame/drivers/bwing.cpp
@@ -325,7 +325,7 @@ static const gfx_layout ram_tilelayout =
32*8
};
-static GFXDECODE_START( bwing )
+static GFXDECODE_START( gfx_bwing )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x00, 1 ) // chars
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x20, 2 ) // sprites
GFXDECODE_RAM( "gfxram", 0, ram_tilelayout, 0x10, 2 ) // foreground tiles
@@ -396,7 +396,7 @@ MACHINE_CONFIG_START(bwing_state::bwing)
MCFG_SCREEN_UPDATE_DRIVER(bwing_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bwing)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bwing)
MCFG_PALETTE_ADD("palette", 64)
diff --git a/src/mame/drivers/c10.cpp b/src/mame/drivers/c10.cpp
index 3054cbf12be..08cfb7982b3 100644
--- a/src/mame/drivers/c10.cpp
+++ b/src/mame/drivers/c10.cpp
@@ -153,7 +153,7 @@ static const gfx_layout c10_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( c10 )
+static GFXDECODE_START( gfx_c10 )
GFXDECODE_ENTRY( "chargen", 0x0000, c10_charlayout, 0, 1 )
GFXDECODE_END
@@ -172,7 +172,7 @@ MACHINE_CONFIG_START(c10_state::c10)
MCFG_SCREEN_SIZE(640, 250)
MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", c10)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_c10)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/c128.cpp b/src/mame/drivers/c128.cpp
index 712004bff05..d6448b773d8 100644
--- a/src/mame/drivers/c128.cpp
+++ b/src/mame/drivers/c128.cpp
@@ -1109,7 +1109,7 @@ READ_LINE_MEMBER( c128_state::mmu_sense40_r )
// mc6845
//-------------------------------------------------
-static GFXDECODE_START( c128 )
+static GFXDECODE_START( gfx_c128 )
GFXDECODE_ENTRY( "charom", 0x0000, gfx_8x8x1, 0, 1 )
GFXDECODE_END
@@ -1730,7 +1730,7 @@ MACHINE_CONFIG_START(c128_state::ntsc)
MCFG_SCREEN_VISIBLE_AREA(0, VIC6567_VISIBLECOLUMNS - 1, 0, VIC6567_VISIBLELINES - 1)
MCFG_SCREEN_UPDATE_DEVICE(MOS8564_TAG, mos8564_device, screen_update)
- MCFG_GFXDECODE_ADD("gfxdecode", MOS8563_TAG":palette", c128)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, MOS8563_TAG":palette", gfx_c128)
// sound hardware
SPEAKER(config, "speaker").front_center();
@@ -1904,7 +1904,7 @@ MACHINE_CONFIG_START(c128_state::pal)
MCFG_SCREEN_VISIBLE_AREA(0, VIC6569_VISIBLECOLUMNS - 1, 0, VIC6569_VISIBLELINES - 1)
MCFG_SCREEN_UPDATE_DEVICE(MOS8566_TAG, mos8566_device, screen_update)
- MCFG_GFXDECODE_ADD("gfxdecode", MOS8563_TAG":palette", c128)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, MOS8563_TAG":palette", gfx_c128)
// sound hardware
SPEAKER(config, "speaker").front_center();
diff --git a/src/mame/drivers/c65.cpp b/src/mame/drivers/c65.cpp
index 25d8db91e77..1829d329b32 100644
--- a/src/mame/drivers/c65.cpp
+++ b/src/mame/drivers/c65.cpp
@@ -648,7 +648,7 @@ static const gfx_layout charlayout =
8*8
};
-static GFXDECODE_START( c65 )
+static GFXDECODE_START( gfx_c65 )
GFXDECODE_ENTRY( "maincpu", 0xd000, charlayout, 0, 16 ) // another identical copy is at 0x9000
GFXDECODE_END
@@ -715,7 +715,7 @@ MACHINE_CONFIG_START(c65_state::c65)
MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK*4, 910, 0, 640, 262, 0, 200) // mods needed
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", c65)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_c65)
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_PALETTE_INIT_OWNER(c65_state, c65)
diff --git a/src/mame/drivers/c900.cpp b/src/mame/drivers/c900.cpp
index 4537867bf80..5b9ad8bbe7c 100644
--- a/src/mame/drivers/c900.cpp
+++ b/src/mame/drivers/c900.cpp
@@ -110,7 +110,7 @@ static const gfx_layout c900_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( c900 )
+static GFXDECODE_START( gfx_c900 )
GFXDECODE_ENTRY( "chargen", 0x0000, c900_charlayout, 0, 1 )
GFXDECODE_END
@@ -123,7 +123,7 @@ MACHINE_CONFIG_START(c900_state::c900)
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(c900_state, kbd_put))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", c900)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_c900)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("cio", Z8036, 6'000'000)
diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp
index ba325630773..54627c02063 100644
--- a/src/mame/drivers/cabal.cpp
+++ b/src/mame/drivers/cabal.cpp
@@ -494,7 +494,7 @@ static const gfx_layout sprite_layout =
-static GFXDECODE_START( cabal )
+static GFXDECODE_START( gfx_cabal )
GFXDECODE_ENTRY( "gfx1", 0x000000, text_layout, 0, 1024/4 )
GFXDECODE_ENTRY( "gfx2", 0x000000, tile_layout, 32*16, 16 )
GFXDECODE_ENTRY( "gfx3", 0x000000, sprite_layout, 16*16, 16 )
@@ -524,7 +524,7 @@ MACHINE_CONFIG_START(cabal_state::cabal)
MCFG_SCREEN_UPDATE_DRIVER(cabal_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cabal)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cabal)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
@@ -607,7 +607,7 @@ MACHINE_CONFIG_START(cabal_state::cabalbl)
MCFG_SCREEN_UPDATE_DRIVER(cabal_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cabal)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cabal)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp
index 81ab6dcd5e5..44ba9efefab 100644
--- a/src/mame/drivers/cabaret.cpp
+++ b/src/mame/drivers/cabaret.cpp
@@ -334,7 +334,7 @@ static const gfx_layout layout_8x32x6i =
8*32*2
};
-static GFXDECODE_START( cabaret )
+static GFXDECODE_START( gfx_cabaret )
GFXDECODE_ENTRY( "gfx1", 0x00000, layout_8x8x6, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0x00000, layout_8x32x6i, 0, 16 )
GFXDECODE_END
@@ -389,7 +389,7 @@ MACHINE_CONFIG_START(cabaret_state::cabaret)
MCFG_SCREEN_UPDATE_DRIVER(cabaret_state, screen_update_cabaret)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cabaret)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cabaret)
MCFG_PALETTE_ADD("palette", 0x800)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp
index fe74c2664ae..0b1b747e70d 100644
--- a/src/mame/drivers/calomega.cpp
+++ b/src/mame/drivers/calomega.cpp
@@ -2347,12 +2347,12 @@ static const gfx_layout tilelayout =
* Graphics Decode Information *
*************************************************/
-static GFXDECODE_START( calomega )
+static GFXDECODE_START( gfx_calomega )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 32 )
GFXDECODE_END
-static GFXDECODE_START( sys906 )
+static GFXDECODE_START( gfx_sys906 )
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 32 )
GFXDECODE_ENTRY( "gfx1", 0x1000, tilelayout, 0, 32 )
GFXDECODE_END
@@ -2597,7 +2597,7 @@ MACHINE_CONFIG_START(calomega_state::sys903)
MCFG_SCREEN_UPDATE_DRIVER(calomega_state, screen_update_calomega)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", calomega)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_calomega)
MCFG_PALETTE_ADD("palette", 256) /* or 128? is the upper half of the PROMs really valid colors? */
MCFG_PALETTE_INIT_OWNER(calomega_state, calomega)
@@ -2684,7 +2684,7 @@ MACHINE_CONFIG_START(calomega_state::sys906)
MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, calomega_state, pia1_aout_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, calomega_state, pia1_bout_w))
- MCFG_GFXDECODE_MODIFY("gfxdecode", sys906)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_sys906)
/* sound hardware */
MCFG_DEVICE_MODIFY("ay8912")
diff --git a/src/mame/drivers/calorie.cpp b/src/mame/drivers/calorie.cpp
index 8c0b803ea58..685f4e4f8e5 100644
--- a/src/mame/drivers/calorie.cpp
+++ b/src/mame/drivers/calorie.cpp
@@ -438,7 +438,7 @@ static const gfx_layout tiles32x32_layout =
128*8
};
-static GFXDECODE_START( calorie )
+static GFXDECODE_START( gfx_calorie )
GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout, 0, 16 )
GFXDECODE_ENTRY( "gfx3", 0, tiles16x16_layout, 0, 16 )
GFXDECODE_ENTRY( "gfx1", 0, tiles16x16_layout, 0, 16 )
@@ -486,7 +486,7 @@ MACHINE_CONFIG_START(calorie_state::calorie)
MCFG_SCREEN_UPDATE_DRIVER(calorie_state, screen_update_calorie)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", calorie)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_calorie)
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
diff --git a/src/mame/drivers/canyon.cpp b/src/mame/drivers/canyon.cpp
index 7e8163fdfc5..f47da9a86a5 100644
--- a/src/mame/drivers/canyon.cpp
+++ b/src/mame/drivers/canyon.cpp
@@ -225,7 +225,7 @@ static const gfx_layout sprite_layout =
};
-static GFXDECODE_START( canyon )
+static GFXDECODE_START( gfx_canyon )
GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0, 2 )
GFXDECODE_ENTRY( "gfx2", 0, sprite_layout, 0, 2 )
GFXDECODE_END
@@ -265,7 +265,7 @@ MACHINE_CONFIG_START(canyon_state::canyon)
MCFG_SCREEN_UPDATE_DRIVER(canyon_state, screen_update_canyon)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", canyon)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_canyon)
MCFG_PALETTE_ADD("palette", 4)
MCFG_PALETTE_INIT_OWNER(canyon_state, canyon)
diff --git a/src/mame/drivers/cardline.cpp b/src/mame/drivers/cardline.cpp
index 5d25bd58dae..848ca3213de 100644
--- a/src/mame/drivers/cardline.cpp
+++ b/src/mame/drivers/cardline.cpp
@@ -285,7 +285,7 @@ static const gfx_layout charlayout =
8*8*8
};
-static GFXDECODE_START( cardline )
+static GFXDECODE_START( gfx_cardline )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 2 )
GFXDECODE_END
@@ -337,7 +337,7 @@ MACHINE_CONFIG_START(cardline_state::cardline)
//MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cardline)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cardline)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INIT_OWNER(cardline_state, cardline)
diff --git a/src/mame/drivers/carjmbre.cpp b/src/mame/drivers/carjmbre.cpp
index 7e5d2d1ff36..244541ffe54 100644
--- a/src/mame/drivers/carjmbre.cpp
+++ b/src/mame/drivers/carjmbre.cpp
@@ -349,7 +349,7 @@ static const gfx_layout carjmbre_spritelayout =
16*8
};
-static GFXDECODE_START( carjmbre )
+static GFXDECODE_START( gfx_carjmbre )
GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x2_planar, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, carjmbre_spritelayout, 0, 16 )
GFXDECODE_END
@@ -375,7 +375,7 @@ MACHINE_CONFIG_START(carjmbre_state::carjmbre)
MCFG_SCREEN_UPDATE_DRIVER(carjmbre_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", carjmbre)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_carjmbre)
MCFG_PALETTE_ADD("palette", 64)
MCFG_PALETTE_INIT_OWNER(carjmbre_state, carjmbre)
diff --git a/src/mame/drivers/carpolo.cpp b/src/mame/drivers/carpolo.cpp
index a717568599e..203dad48769 100644
--- a/src/mame/drivers/carpolo.cpp
+++ b/src/mame/drivers/carpolo.cpp
@@ -220,7 +220,7 @@ static const gfx_layout alphalayout =
8*8
};
-static GFXDECODE_START( carpolo )
+static GFXDECODE_START( gfx_carpolo )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 12 )
GFXDECODE_ENTRY( "gfx2", 0, goallayout, 12*2, 2 )
GFXDECODE_ENTRY( "gfx3", 0, alphalayout, 12*2+2*16, 4 )
@@ -292,7 +292,7 @@ MACHINE_CONFIG_START(carpolo_state::carpolo)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, carpolo_state, screen_vblank_carpolo))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", carpolo)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_carpolo)
MCFG_PALETTE_ADD("palette", 12*2+2*16+4*2)
MCFG_PALETTE_INIT_OWNER(carpolo_state,carpolo)
diff --git a/src/mame/drivers/carrera.cpp b/src/mame/drivers/carrera.cpp
index 47da6a5148f..ab24a98c3ee 100644
--- a/src/mame/drivers/carrera.cpp
+++ b/src/mame/drivers/carrera.cpp
@@ -259,7 +259,7 @@ static const gfx_layout tiles8x8_layout =
8*8
};
-static GFXDECODE_START( carrera )
+static GFXDECODE_START( gfx_carrera )
GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 1 )
GFXDECODE_END
@@ -333,7 +333,7 @@ MACHINE_CONFIG_START(carrera_state::carrera)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", carrera)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_carrera)
MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_INIT_OWNER(carrera_state, carrera)
diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp
index 4421f5829b4..93da8efaa41 100644
--- a/src/mame/drivers/casloopy.cpp
+++ b/src/mame/drivers/casloopy.cpp
@@ -538,7 +538,7 @@ MACHINE_CONFIG_START(casloopy_state::casloopy)
MCFG_PALETTE_ADD("palette", 512)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty)
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "loopy_cart")
MCFG_GENERIC_EXTENSIONS("bin,ic1")
diff --git a/src/mame/drivers/caswin.cpp b/src/mame/drivers/caswin.cpp
index 829f037be49..22e9e96f88c 100644
--- a/src/mame/drivers/caswin.cpp
+++ b/src/mame/drivers/caswin.cpp
@@ -301,7 +301,7 @@ static const gfx_layout tiles8x8_layout =
8*8
};
-static GFXDECODE_START( vvillage )
+static GFXDECODE_START( gfx_vvillage )
GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 )
GFXDECODE_END
@@ -350,7 +350,7 @@ MACHINE_CONFIG_START(caswin_state::vvillage)
MCFG_NVRAM_ADD_0FILL("nvram")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", vvillage)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vvillage)
MCFG_PALETTE_ADD("palette", 0x40)
MCFG_PALETTE_INIT_OWNER(caswin_state, caswin)
diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp
index cdc97afca5b..0fd48df444a 100644
--- a/src/mame/drivers/cave.cpp
+++ b/src/mame/drivers/cave.cpp
@@ -1910,7 +1910,7 @@ static const gfx_layout layout_sprites =
Dangun Feveron
***************************************************************************/
-static GFXDECODE_START( dfeveron )
+static GFXDECODE_START( gfx_dfeveron )
/* There are only $800 colors here, the first half for sprites
the second half for tiles. We use $8000 virtual colors instead
for consistency with games having $8000 real colors.
@@ -1925,7 +1925,7 @@ GFXDECODE_END
Dodonpachi
***************************************************************************/
-static GFXDECODE_START( ddonpach )
+static GFXDECODE_START( gfx_ddonpach )
/* Layers 01 are 4 bit deep and use the first 16 of every 256
colors for any given color code (a palette_init function
is provided for these layers, filling the 8000-83ff entries
@@ -1942,7 +1942,7 @@ GFXDECODE_END
Donpachi
***************************************************************************/
-static GFXDECODE_START( donpachi )
+static GFXDECODE_START( gfx_donpachi )
/* There are only $800 colors here, the first half for sprites
the second half for tiles. We use $8000 virtual colors instead
for consistency with games having $8000 real colors.
@@ -1958,7 +1958,7 @@ GFXDECODE_END
Esprade
***************************************************************************/
-static GFXDECODE_START( esprade )
+static GFXDECODE_START( gfx_esprade )
// "sprites"
GFXDECODE_ENTRY( "layer0", 0, layout_8x8x8, 0x4000, 0x40 ) // [0] Layer 0
GFXDECODE_ENTRY( "layer1", 0, layout_8x8x8, 0x4000, 0x40 ) // [1] Layer 1
@@ -1969,7 +1969,7 @@ GFXDECODE_END
Hotdog Storm
***************************************************************************/
-static GFXDECODE_START( hotdogst )
+static GFXDECODE_START( gfx_hotdogst )
/* There are only $800 colors here, the first half for sprites
the second half for tiles. We use $8000 virtual colors instead
for consistency with games having $8000 real colors.
@@ -1985,7 +1985,7 @@ GFXDECODE_END
Koro Koro Quest
***************************************************************************/
-static GFXDECODE_START( korokoro )
+static GFXDECODE_START( gfx_korokoro )
// "sprites"
GFXDECODE_ENTRY( "layer0", 0, layout_8x8x4, 0x4400, 0x40 ) // [0] Layer 0
GFXDECODE_END
@@ -1994,7 +1994,7 @@ GFXDECODE_END
Mazinger Z
***************************************************************************/
-static GFXDECODE_START( mazinger )
+static GFXDECODE_START( gfx_mazinger )
/* Sprites are 4 bit deep.
Layer 0 is 4 bit deep.
Layer 1 uses 64 color palettes, but the game only fills the
@@ -2012,7 +2012,7 @@ GFXDECODE_END
Poka Poka Satan
***************************************************************************/
-static GFXDECODE_START( ppsatan )
+static GFXDECODE_START( gfx_ppsatan )
GFXDECODE_ENTRY( "layer0", 0, layout_8x8x4, 0x4000, 0x40 ) // [0] Layer 0
GFXDECODE_ENTRY( "layer1", 0, layout_8x8x4, 0x4000, 0x40 ) // [1] Layer 1
GFXDECODE_ENTRY( "layer2", 0, layout_8x8x4, 0x4000, 0x40 ) // [2] Layer 2
@@ -2022,7 +2022,7 @@ GFXDECODE_END
Power Instinct 2
***************************************************************************/
-static GFXDECODE_START( pwrinst2 )
+static GFXDECODE_START( gfx_pwrinst2 )
// "sprites"
GFXDECODE_ENTRY( "layer0", 0, layout_8x8x4, 0x0800+0x8000, 0x40 ) // [0] Layer 0
GFXDECODE_ENTRY( "layer1", 0, layout_8x8x4, 0x1000+0x8000, 0x40 ) // [1] Layer 1
@@ -2035,7 +2035,7 @@ GFXDECODE_END
Sailor Moon
***************************************************************************/
-static GFXDECODE_START( sailormn )
+static GFXDECODE_START( gfx_sailormn )
/* 4 bit sprites ? */
// "sprites"
GFXDECODE_ENTRY( "layer0", 0, layout_8x8x4, 0x4400, 0x40 ) // [0] Layer 0
@@ -2048,7 +2048,7 @@ GFXDECODE_END
Uo Poko
***************************************************************************/
-static GFXDECODE_START( uopoko )
+static GFXDECODE_START( gfx_uopoko )
// "sprites"
GFXDECODE_ENTRY( "layer0", 0, layout_8x8x8, 0x4000, 0x40 ) // [0] Layer 0
GFXDECODE_END
@@ -2115,7 +2115,7 @@ MACHINE_CONFIG_START(cave_state::dfeveron)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dfeveron)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dfeveron)
MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
MCFG_PALETTE_INIT_OWNER(cave_state,dfeveron)
@@ -2156,7 +2156,7 @@ MACHINE_CONFIG_START(cave_state::ddonpach)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ddonpach)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddonpach)
MCFG_PALETTE_ADD("palette", 0x8000 + 0x40*16) // $400 extra entries for layers 1&2
MCFG_PALETTE_INIT_OWNER(cave_state,ddonpach)
@@ -2196,7 +2196,7 @@ MACHINE_CONFIG_START(cave_state::donpachi)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", donpachi)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_donpachi)
MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
MCFG_PALETTE_INIT_OWNER(cave_state,dfeveron)
@@ -2243,7 +2243,7 @@ MACHINE_CONFIG_START(cave_state::esprade)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", esprade)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_esprade)
MCFG_PALETTE_ADD("palette", 0x8000)
MCFG_PALETTE_INIT_OWNER(cave_state,cave)
@@ -2284,7 +2284,7 @@ MACHINE_CONFIG_START(cave_state::gaia)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", esprade)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_esprade)
MCFG_PALETTE_ADD("palette", 0x8000)
MCFG_PALETTE_INIT_OWNER(cave_state,cave)
@@ -2324,7 +2324,7 @@ MACHINE_CONFIG_START(cave_state::guwange)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", esprade)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_esprade)
MCFG_PALETTE_ADD("palette", 0x8000)
MCFG_PALETTE_INIT_OWNER(cave_state,cave)
@@ -2367,7 +2367,7 @@ MACHINE_CONFIG_START(cave_state::hotdogst)
MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", hotdogst)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hotdogst)
MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
MCFG_PALETTE_INIT_OWNER(cave_state,dfeveron)
@@ -2417,7 +2417,7 @@ MACHINE_CONFIG_START(cave_state::korokoro)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1-2, 0, 240-1-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", korokoro)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_korokoro)
MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
MCFG_PALETTE_INIT_OWNER(cave_state,korokoro)
@@ -2470,7 +2470,7 @@ MACHINE_CONFIG_START(cave_state::mazinger)
MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", mazinger)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mazinger)
MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
MCFG_PALETTE_INIT_OWNER(cave_state,mazinger)
@@ -2527,7 +2527,7 @@ MACHINE_CONFIG_START(cave_state::metmqstr)
MCFG_SCREEN_VISIBLE_AREA(0x7d, 0x7d + 0x180-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", donpachi)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_donpachi)
MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
MCFG_PALETTE_INIT_OWNER(cave_state,dfeveron)
@@ -2585,7 +2585,7 @@ MACHINE_CONFIG_START(cave_state::pacslot)
MCFG_SCREEN_VISIBLE_AREA(0x80, 0x80 + 0x140-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", uopoko)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_uopoko)
MCFG_PALETTE_ADD("palette", 0x8000)
MCFG_PALETTE_INIT_OWNER(cave_state,cave)
@@ -2660,7 +2660,7 @@ MACHINE_CONFIG_START(cave_state::ppsatan)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_ppsatan_right)
MCFG_TIMER_DRIVER_ADD("int_timer_right", cave_state, cave_vblank_start_right)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ppsatan)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ppsatan)
MCFG_PALETTE_ADD("palette", 0x8000)
MCFG_PALETTE_INIT_OWNER(cave_state,ppsatan)
MCFG_DEFAULT_LAYOUT(layout_ppsatan)
@@ -2708,7 +2708,7 @@ MACHINE_CONFIG_START(cave_state::pwrinst2)
MCFG_SCREEN_VISIBLE_AREA(0x70, 0x70 + 0x140-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", pwrinst2)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pwrinst2)
MCFG_PALETTE_ADD("palette", 0x8000+0x2800)
MCFG_PALETTE_INIT_OWNER(cave_state,pwrinst2)
@@ -2785,7 +2785,7 @@ MACHINE_CONFIG_START(cave_state::sailormn)
MCFG_SCREEN_VISIBLE_AREA(0+1, 320+1-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", sailormn)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sailormn)
MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
MCFG_PALETTE_INIT_OWNER(cave_state,sailormn) // 4 bit sprites, 6 bit tiles
@@ -2845,7 +2845,7 @@ MACHINE_CONFIG_START(cave_state::tekkencw)
MCFG_SCREEN_VISIBLE_AREA(0x80, 0x80 + 0x140-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", uopoko)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_uopoko)
MCFG_PALETTE_ADD("palette", 0x8000)
MCFG_PALETTE_INIT_OWNER(cave_state,cave)
@@ -2901,7 +2901,7 @@ MACHINE_CONFIG_START(cave_state::tjumpman)
MCFG_SCREEN_VISIBLE_AREA(0x80, 0x80 + 0x140-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", uopoko)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_uopoko)
MCFG_PALETTE_ADD("palette", 0x8000)
MCFG_PALETTE_INIT_OWNER(cave_state,cave)
@@ -2943,7 +2943,7 @@ MACHINE_CONFIG_START(cave_state::uopoko)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(cave_state, screen_update_cave)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", uopoko)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_uopoko)
MCFG_PALETTE_ADD("palette", 0x8000)
MCFG_PALETTE_INIT_OWNER(cave_state,cave)
diff --git a/src/mame/drivers/cb2001.cpp b/src/mame/drivers/cb2001.cpp
index 2609acd3f61..a460372ce0e 100644
--- a/src/mame/drivers/cb2001.cpp
+++ b/src/mame/drivers/cb2001.cpp
@@ -786,7 +786,7 @@ static const gfx_layout cb2001_layout32 =
32*32
};
-static GFXDECODE_START( cb2001 )
+static GFXDECODE_START( gfx_cb2001 )
GFXDECODE_ENTRY( "gfx", 0, cb2001_layout, 0x0, 32 )
GFXDECODE_ENTRY( "gfx", 0, cb2001_layout32, 0x0, 32 )
GFXDECODE_END
@@ -837,7 +837,7 @@ MACHINE_CONFIG_START(cb2001_state::cb2001)
MCFG_I8255_IN_PORTB_CB(IOPORT("DSW2"))
MCFG_I8255_IN_PORTC_CB(IOPORT("DSW3"))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cb2001)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cb2001)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp
index 4fd85e9edd6..761633c8062 100644
--- a/src/mame/drivers/cball.cpp
+++ b/src/mame/drivers/cball.cpp
@@ -256,7 +256,7 @@ static const gfx_layout sprite_layout =
};
-static GFXDECODE_START( cball )
+static GFXDECODE_START( gfx_cball )
GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0, 2 )
GFXDECODE_ENTRY( "gfx2", 0, sprite_layout, 4, 1 )
GFXDECODE_END
@@ -277,7 +277,7 @@ MACHINE_CONFIG_START(cball_state::cball)
MCFG_SCREEN_UPDATE_DRIVER(cball_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cball)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cball)
MCFG_PALETTE_ADD("palette", 6)
MCFG_PALETTE_INIT_OWNER(cball_state, cball)
diff --git a/src/mame/drivers/cbasebal.cpp b/src/mame/drivers/cbasebal.cpp
index f65f6a45bce..4cf9f1824a1 100644
--- a/src/mame/drivers/cbasebal.cpp
+++ b/src/mame/drivers/cbasebal.cpp
@@ -220,7 +220,7 @@ static const gfx_layout cbasebal_spritelayout =
64*8 /* every sprite takes 64 consecutive bytes */
};
-static GFXDECODE_START( cbasebal )
+static GFXDECODE_START( gfx_cbasebal )
GFXDECODE_ENTRY( "gfx1", 0, cbasebal_textlayout, 256, 8 ) /* colors 256- 287 */
GFXDECODE_ENTRY( "gfx2", 0, cbasebal_tilelayout, 768, 16 ) /* colors 768-1023 */
GFXDECODE_ENTRY( "gfx3", 0, cbasebal_spritelayout, 512, 8 ) /* colors 512- 639 */
@@ -282,7 +282,7 @@ MACHINE_CONFIG_START(cbasebal_state::cbasebal)
MCFG_SCREEN_UPDATE_DRIVER(cbasebal_state, screen_update_cbasebal)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cbasebal)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cbasebal)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG)
diff --git a/src/mame/drivers/cbuster.cpp b/src/mame/drivers/cbuster.cpp
index 09fcea024d4..ea83e7724ae 100644
--- a/src/mame/drivers/cbuster.cpp
+++ b/src/mame/drivers/cbuster.cpp
@@ -275,7 +275,7 @@ static const gfx_layout spritelayout =
64*8
};
-static GFXDECODE_START( cbuster )
+static GFXDECODE_START( gfx_cbuster )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 128 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 128 ) /* Tiles 16x16 */
@@ -318,7 +318,7 @@ MACHINE_CONFIG_START(cbuster_state::twocrude)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(cbuster_state, screen_update_twocrude)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cbuster)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cbuster)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(XBGR)
diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp
index 4133d0d3635..9fa64c913c5 100644
--- a/src/mame/drivers/ccastles.cpp
+++ b/src/mame/drivers/ccastles.cpp
@@ -443,7 +443,7 @@ static const gfx_layout ccastles_spritelayout =
};
-static GFXDECODE_START( ccastles )
+static GFXDECODE_START( gfx_ccastles )
GFXDECODE_ENTRY( "gfx1", 0x0000, ccastles_spritelayout, 0, 2 )
GFXDECODE_END
@@ -467,7 +467,7 @@ MACHINE_CONFIG_START(ccastles_state::ccastles)
MCFG_X2212_ADD_AUTOSAVE("nvram_4a")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ccastles)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ccastles)
MCFG_PALETTE_ADD("palette", 32)
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/cchance.cpp b/src/mame/drivers/cchance.cpp
index c42b17bb98e..ff8a45294dc 100644
--- a/src/mame/drivers/cchance.cpp
+++ b/src/mame/drivers/cchance.cpp
@@ -195,7 +195,7 @@ static const gfx_layout cchance_layout =
-static GFXDECODE_START( cchance )
+static GFXDECODE_START( gfx_cchance )
GFXDECODE_ENTRY( "gfx1", 0, cchance_layout, 0x0, 32 )
GFXDECODE_END
@@ -218,7 +218,7 @@ MACHINE_CONFIG_START(cchance_state::cchance)
MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cchance_state, irq0_line_hold)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cchance)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cchance)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp
index 2e65a074090..7482e77bbb8 100644
--- a/src/mame/drivers/cclimber.cpp
+++ b/src/mame/drivers/cclimber.cpp
@@ -1072,25 +1072,25 @@ static const gfx_layout swimmer_spritelayout =
32*8
};
-static GFXDECODE_START( cclimber )
+static GFXDECODE_START( gfx_cclimber )
GFXDECODE_ENTRY( "gfx1", 0x0000, cclimber_charlayout, 0, 16 ) /* characters */
GFXDECODE_ENTRY( "gfx1", 0x0000, cclimber_spritelayout, 0, 16 ) /* sprites */
GFXDECODE_ENTRY( "gfx2", 0x0000, cclimber_charlayout, 16*4, 8 ) /* big sprites */
GFXDECODE_END
-static GFXDECODE_START( cannonb )
+static GFXDECODE_START( gfx_cannonb )
GFXDECODE_ENTRY( "gfx1", 0x0000, cannonb_charlayout, 0, 16 ) /* characters */
GFXDECODE_ENTRY( "gfx1", 0x1000, cannonb_spritelayout, 0, 16 ) /* sprites */
GFXDECODE_ENTRY( "gfx2", 0x0000, cclimber_charlayout, 16*4, 8 ) /* big sprites */
GFXDECODE_END
-static GFXDECODE_START( swimmer )
+static GFXDECODE_START( gfx_swimmer )
GFXDECODE_ENTRY( "gfx1", 0x0000, swimmer_charlayout, 0, 32 ) /* characters */
GFXDECODE_ENTRY( "gfx1", 0x0000, swimmer_spritelayout, 0, 32 ) /* sprites */
GFXDECODE_ENTRY( "gfx2", 0x0000, swimmer_charlayout, 32*8, 4 ) /* big sprites */
GFXDECODE_END
-static GFXDECODE_START( toprollr )
+static GFXDECODE_START( gfx_toprollr )
GFXDECODE_ENTRY( "gfx1", 0x0000, cclimber_charlayout, 0, 16 )
GFXDECODE_ENTRY( "gfx1", 0x0000, cclimber_spritelayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0x0000, cclimber_charlayout, 16*4, 8 ) /* big sprites */
@@ -1131,7 +1131,7 @@ MACHINE_CONFIG_START(cclimber_state::root)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cclimber_state, vblank_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cclimber)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cclimber)
MCFG_PALETTE_ADD("palette", 16*4+8*4)
MCFG_PALETTE_INIT_OWNER(cclimber_state,cclimber)
@@ -1176,7 +1176,7 @@ MACHINE_CONFIG_START(cclimber_state::cannonb)
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // not used
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", cannonb)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_cannonb)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cclimber_state::bagmanf)
@@ -1239,7 +1239,7 @@ MACHINE_CONFIG_START(cclimber_state::toprollr)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, cclimber_state, toprollr_rombank_w))
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", toprollr)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_toprollr)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(32*5)
MCFG_PALETTE_INIT_OWNER(cclimber_state,toprollr)
@@ -1278,7 +1278,7 @@ MACHINE_CONFIG_START(cclimber_state::swimmer)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cclimber_state, vblank_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", swimmer)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_swimmer)
MCFG_PALETTE_ADD("palette", 32*8+4*8+1)
MCFG_PALETTE_INIT_OWNER(cclimber_state,swimmer)
diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp
index fdf37f7dd0c..277f48b31e9 100644
--- a/src/mame/drivers/cd2650.cpp
+++ b/src/mame/drivers/cd2650.cpp
@@ -206,7 +206,7 @@ static const gfx_layout cd2650_charlayout =
8*8 /* every char takes 8 bytes */
};
-static GFXDECODE_START( cd2650 )
+static GFXDECODE_START( gfx_cd2650 )
GFXDECODE_ENTRY( "chargen", 0x0000, cd2650_charlayout, 0, 1 )
GFXDECODE_END
@@ -308,7 +308,7 @@ MACHINE_CONFIG_START(cd2650_state::cd2650)
MCFG_SCREEN_UPDATE_DRIVER(cd2650_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cd2650)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cd2650)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* quickload */
diff --git a/src/mame/drivers/cdc721.cpp b/src/mame/drivers/cdc721.cpp
index caddbad42a6..6b44e98d1a8 100644
--- a/src/mame/drivers/cdc721.cpp
+++ b/src/mame/drivers/cdc721.cpp
@@ -242,7 +242,7 @@ static const gfx_layout cdc721_charlayout =
8 /* every char takes 16 x 1 bytes */
};
-static GFXDECODE_START( cdc721 )
+static GFXDECODE_START( gfx_cdc721 )
GFXDECODE_ENTRY( "chargen", 0x0000, cdc721_charlayout, 0, 1 )
GFXDECODE_END
@@ -342,7 +342,7 @@ MACHINE_CONFIG_START(cdc721_state::cdc721)
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 3)
MCFG_PALETTE_INIT_OWNER(cdc721_state, cdc721)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cdc721)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cdc721)
MCFG_DEVICE_ADD("crtc", CRT5037, 12.936_MHz_XTAL / 8)
MCFG_TMS9927_CHAR_WIDTH(8)
diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp
index 59f7de330f0..4320ccc5e10 100644
--- a/src/mame/drivers/centiped.cpp
+++ b/src/mame/drivers/centiped.cpp
@@ -1670,12 +1670,12 @@ static const gfx_layout spritelayout =
16*8
};
-static GFXDECODE_START( centiped )
+static GFXDECODE_START( gfx_centiped )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 4, 4*4*4 )
GFXDECODE_END
-static GFXDECODE_START( milliped )
+static GFXDECODE_START( gfx_milliped )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 4 )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 4*4, 4*4*4*4 )
GFXDECODE_END
@@ -1699,7 +1699,7 @@ static const gfx_layout warlords_charlayout =
8*8
};
-static GFXDECODE_START( warlords )
+static GFXDECODE_START( gfx_warlords )
GFXDECODE_ENTRY( "gfx1", 0x000, warlords_charlayout, 0, 8 )
GFXDECODE_ENTRY( "gfx1", 0x200, warlords_charlayout, 8*4, 8*4 )
GFXDECODE_END
@@ -1741,7 +1741,7 @@ MACHINE_CONFIG_START(centiped_state::centiped_base)
MCFG_SCREEN_UPDATE_DRIVER(centiped_state, screen_update_centiped)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", centiped)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_centiped)
MCFG_PALETTE_ADD("palette", 4+4*4*4*4)
MCFG_VIDEO_START_OVERRIDE(centiped_state,centiped)
@@ -1844,7 +1844,7 @@ MACHINE_CONFIG_START(centiped_state::milliped)
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, centiped_state, control_select_w)) // CNTRLSEL
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", milliped)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_milliped)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(4*4+4*4*4*4*4)
@@ -1890,7 +1890,7 @@ MACHINE_CONFIG_START(centiped_state::warlords)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(OUTPUT("led3")) MCFG_DEVCB_INVERT // LED 4
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", warlords)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_warlords)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(8*4+8*4)
@@ -1952,7 +1952,7 @@ MACHINE_CONFIG_START(centiped_state::bullsdrt)
MCFG_SCREEN_UPDATE_DRIVER(centiped_state, screen_update_bullsdrt)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", centiped)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_centiped)
MCFG_PALETTE_ADD("palette", 4+4*4*4*4)
MCFG_VIDEO_START_OVERRIDE(centiped_state,bullsdrt)
diff --git a/src/mame/drivers/chaknpop.cpp b/src/mame/drivers/chaknpop.cpp
index 3e5c337c9b7..8ea9c559342 100644
--- a/src/mame/drivers/chaknpop.cpp
+++ b/src/mame/drivers/chaknpop.cpp
@@ -338,7 +338,7 @@ static const gfx_layout charlayout =
8*8 /* every char takes 8 consecutive bytes */
};
-static GFXDECODE_START( chaknpop )
+static GFXDECODE_START( gfx_chaknpop )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 8 )
GFXDECODE_ENTRY( "gfx2", 0, charlayout, 32, 8 )
GFXDECODE_END
@@ -381,7 +381,7 @@ MACHINE_CONFIG_START(chaknpop_state::chaknpop)
MCFG_SCREEN_UPDATE_DRIVER(chaknpop_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", chaknpop)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_chaknpop)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_INIT_OWNER(chaknpop_state, chaknpop)
diff --git a/src/mame/drivers/champbas.cpp b/src/mame/drivers/champbas.cpp
index 8f9633c3993..7cf0c104dc3 100644
--- a/src/mame/drivers/champbas.cpp
+++ b/src/mame/drivers/champbas.cpp
@@ -435,12 +435,12 @@ static const gfx_layout spritelayout =
64*8
};
-static GFXDECODE_START( talbot )
+static GFXDECODE_START( gfx_talbot )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x100, 0x100>>2 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x000, 0x100>>2 )
GFXDECODE_END
-static GFXDECODE_START( champbas )
+static GFXDECODE_START( gfx_champbas )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 0x200>>2 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 0x200>>2 )
GFXDECODE_END
@@ -479,7 +479,7 @@ static const gfx_layout spritelayout_4bpp =
64*8
};
-static GFXDECODE_START( exctsccr )
+static GFXDECODE_START( gfx_exctsccr )
GFXDECODE_ENTRY( "gfx1", 0, charlayout_3bpp, 0x000, 0x080>>3 ) /* chars */
GFXDECODE_ENTRY( "gfx2", 0, spritelayout_3bpp, 0x080, 0x080>>3 ) /* sprites */
GFXDECODE_ENTRY( "gfx3", 0, spritelayout_4bpp, 0x100, 0x100>>4 ) /* sprites */
@@ -551,7 +551,7 @@ MACHINE_CONFIG_START(champbas_state::talbot)
MCFG_SCREEN_UPDATE_DRIVER(champbas_state, screen_update_champbas)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", talbot)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_talbot)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INDIRECT_ENTRIES(32)
MCFG_PALETTE_INIT_OWNER(champbas_state,champbas)
@@ -598,7 +598,7 @@ MACHINE_CONFIG_START(champbas_state::champbas)
MCFG_SCREEN_UPDATE_DRIVER(champbas_state, screen_update_champbas)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", champbas)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_champbas)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INDIRECT_ENTRIES(32)
MCFG_PALETTE_INIT_OWNER(champbas_state,champbas)
@@ -709,7 +709,7 @@ MACHINE_CONFIG_START(champbas_state::exctsccr)
MCFG_SCREEN_UPDATE_DRIVER(champbas_state, screen_update_exctsccr)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", exctsccr)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_exctsccr)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INDIRECT_ENTRIES(32)
MCFG_PALETTE_INIT_OWNER(champbas_state,exctsccr)
@@ -775,7 +775,7 @@ MACHINE_CONFIG_START(champbas_state::exctsccrb)
MCFG_SCREEN_UPDATE_DRIVER(champbas_state, screen_update_exctsccr)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", exctsccr)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_exctsccr)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INDIRECT_ENTRIES(32)
MCFG_PALETTE_INIT_OWNER(champbas_state,exctsccr)
diff --git a/src/mame/drivers/champbwl.cpp b/src/mame/drivers/champbwl.cpp
index 7421993c1f7..369d0fdb1b6 100644
--- a/src/mame/drivers/champbwl.cpp
+++ b/src/mame/drivers/champbwl.cpp
@@ -446,7 +446,7 @@ static const gfx_layout charlayout =
32*8
};
-static GFXDECODE_START( champbwl )
+static GFXDECODE_START( gfx_champbwl )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
GFXDECODE_END
@@ -512,7 +512,7 @@ MACHINE_CONFIG_START(champbwl_state::champbwl)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, champbwl_state, screen_vblank_champbwl))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", champbwl)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_champbwl)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INIT_OWNER(champbwl_state,champbwl)
@@ -577,7 +577,7 @@ MACHINE_CONFIG_START(champbwl_state::doraemon)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, champbwl_state, screen_vblank_doraemon))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", champbwl)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_champbwl)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INIT_OWNER(champbwl_state,champbwl)
diff --git a/src/mame/drivers/chanbara.cpp b/src/mame/drivers/chanbara.cpp
index d290bdcd8bf..ee4fd7c7c64 100644
--- a/src/mame/drivers/chanbara.cpp
+++ b/src/mame/drivers/chanbara.cpp
@@ -347,7 +347,7 @@ static const gfx_layout spritelayout =
16*16
};
-static GFXDECODE_START( chanbara )
+static GFXDECODE_START( gfx_chanbara )
GFXDECODE_ENTRY( "gfx1", 0x00000, tilelayout, 0x40, 32 )
GFXDECODE_ENTRY( "sprites", 0x00000, spritelayout, 0x80, 16 )
GFXDECODE_ENTRY( "gfx3", 0x00000, tile16layout, 0, 32 )
@@ -405,7 +405,7 @@ MACHINE_CONFIG_START(chanbara_state::chanbara)
MCFG_SCREEN_UPDATE_DRIVER(chanbara_state, screen_update_chanbara)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", chanbara)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_chanbara)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(chanbara_state, chanbara)
diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp
index 65f5f264a50..78336ebc597 100644
--- a/src/mame/drivers/chance32.cpp
+++ b/src/mame/drivers/chance32.cpp
@@ -434,7 +434,7 @@ static const gfx_layout tiles8x8_layout =
128*8
};
-static GFXDECODE_START( chance32 )
+static GFXDECODE_START( gfx_chance32 )
GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 8 )
GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout, 0, 8 )
GFXDECODE_END
@@ -471,7 +471,7 @@ MACHINE_CONFIG_START(chance32_state::chance32)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", chance32)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_chance32)
MCFG_PALETTE_ADD("palette", 0x800)
MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB)
diff --git a/src/mame/drivers/cheekyms.cpp b/src/mame/drivers/cheekyms.cpp
index 0ffa248489b..5023905be72 100644
--- a/src/mame/drivers/cheekyms.cpp
+++ b/src/mame/drivers/cheekyms.cpp
@@ -103,7 +103,7 @@ static const gfx_layout spritelayout =
-static GFXDECODE_START( cheekyms )
+static GFXDECODE_START( gfx_cheekyms )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x00, 0x20 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x80, 0x10 )
GFXDECODE_END
@@ -139,7 +139,7 @@ MACHINE_CONFIG_START(cheekyms_state::cheekyms)
MCFG_SCREEN_UPDATE_DRIVER(cheekyms_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cheekyms)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cheekyms)
MCFG_PALETTE_ADD("palette", 0xc0)
MCFG_PALETTE_INIT_OWNER(cheekyms_state, cheekyms)
diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp
index 2256917ad11..4e2fbd52297 100644
--- a/src/mame/drivers/chinagat.cpp
+++ b/src/mame/drivers/chinagat.cpp
@@ -512,7 +512,7 @@ static const gfx_layout tilelayout =
64*8 /* every char takes 64 consecutive bytes */
};
-static GFXDECODE_START( chinagat )
+static GFXDECODE_START( gfx_chinagat )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0,16 ) /* 8x8 chars */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 128, 8 ) /* 16x16 sprites */
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 256, 8 ) /* 16x16 background tiles */
@@ -581,7 +581,7 @@ MACHINE_CONFIG_START(chinagat_state::chinagat)
MCFG_SCREEN_UPDATE_DRIVER(chinagat_state, screen_update_ddragon)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", chinagat)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_chinagat)
MCFG_PALETTE_ADD("palette", 384)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
@@ -635,7 +635,7 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub1)
MCFG_SCREEN_UPDATE_DRIVER(chinagat_state, screen_update_ddragon)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", chinagat)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_chinagat)
MCFG_PALETTE_ADD("palette", 384)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
@@ -682,7 +682,7 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub2)
MCFG_SCREEN_UPDATE_DRIVER(chinagat_state, screen_update_ddragon)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", chinagat)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_chinagat)
MCFG_PALETTE_ADD("palette", 384)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp
index a4e2e47f113..8cbc7dea6b2 100644
--- a/src/mame/drivers/chinsan.cpp
+++ b/src/mame/drivers/chinsan.cpp
@@ -378,7 +378,7 @@ uint32_t chinsan_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
// DRAWGFX LAYOUTS
//**************************************************************************
-static GFXDECODE_START( chinsan )
+static GFXDECODE_START( gfx_chinsan )
GFXDECODE_ENTRY("gfx1", 0, gfx_8x8x3_planar, 0, 32)
GFXDECODE_END
@@ -528,7 +528,7 @@ MACHINE_CONFIG_START(chinsan_state::chinsan)
MCFG_SCREEN_UPDATE_DRIVER(chinsan_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", chinsan)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_chinsan)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256)
// sound hardware
diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp
index a6cdad56745..092585caa67 100644
--- a/src/mame/drivers/chsuper.cpp
+++ b/src/mame/drivers/chsuper.cpp
@@ -344,7 +344,7 @@ static const gfx_layout charlayout =
8*32
};
-static GFXDECODE_START( chsuper )
+static GFXDECODE_START( gfx_chsuper )
GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 0, 1 )
GFXDECODE_END
@@ -377,7 +377,7 @@ MACHINE_CONFIG_START(chsuper_state::chsuper)
MCFG_NVRAM_ADD_0FILL("nvram")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", chsuper)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_chsuper)
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
diff --git a/src/mame/drivers/circus.cpp b/src/mame/drivers/circus.cpp
index 8858ce3ed32..55a9b48ca03 100644
--- a/src/mame/drivers/circus.cpp
+++ b/src/mame/drivers/circus.cpp
@@ -253,12 +253,12 @@ static const gfx_layout robotlayout =
8
};
-static GFXDECODE_START( circus )
+static GFXDECODE_START( gfx_circus )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 )
GFXDECODE_ENTRY( "gfx2", 0, clownlayout, 0, 1 )
GFXDECODE_END
-static GFXDECODE_START( robotbwl )
+static GFXDECODE_START( gfx_robotbwl )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 )
GFXDECODE_ENTRY( "gfx2", 0, robotlayout, 0, 1 )
GFXDECODE_END
@@ -300,7 +300,7 @@ MACHINE_CONFIG_START(circus_state::circus)
MCFG_SCREEN_UPDATE_DRIVER(circus_state, screen_update_circus)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", circus)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_circus)
MCFG_PALETTE_ADD_MONOCHROME("palette")
@@ -334,7 +334,7 @@ MACHINE_CONFIG_START(circus_state::robotbwl)
MCFG_SCREEN_UPDATE_DRIVER(circus_state, screen_update_robotbwl)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", robotbwl)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_robotbwl)
MCFG_PALETTE_ADD_MONOCHROME("palette")
@@ -375,7 +375,7 @@ MACHINE_CONFIG_START(circus_state::crash)
MCFG_SCREEN_UPDATE_DRIVER(circus_state, screen_update_crash)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", circus)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_circus)
MCFG_PALETTE_ADD_MONOCHROME("palette")
@@ -408,7 +408,7 @@ MACHINE_CONFIG_START(circus_state::ripcord)
MCFG_SCREEN_UPDATE_DRIVER(circus_state, screen_update_ripcord)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", circus)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_circus)
MCFG_PALETTE_ADD_MONOCHROME("palette")
diff --git a/src/mame/drivers/circusc.cpp b/src/mame/drivers/circusc.cpp
index 7812d48558c..f457d7447f7 100644
--- a/src/mame/drivers/circusc.cpp
+++ b/src/mame/drivers/circusc.cpp
@@ -302,7 +302,7 @@ static const gfx_layout spritelayout =
32*4*8 /* every sprite takes 128 consecutive bytes */
};
-static GFXDECODE_START( circusc )
+static GFXDECODE_START( gfx_circusc )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 16*16, 16 )
GFXDECODE_END
@@ -375,7 +375,7 @@ MACHINE_CONFIG_START(circusc_state::circusc)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, circusc_state, vblank_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", circusc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_circusc)
MCFG_PALETTE_ADD("palette", 16*16+16*16)
MCFG_PALETTE_INDIRECT_ENTRIES(32)
MCFG_PALETTE_INIT_OWNER(circusc_state, circusc)
diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp
index ad6bf83a88e..6457a7f5953 100644
--- a/src/mame/drivers/cischeat.cpp
+++ b/src/mame/drivers/cischeat.cpp
@@ -1844,7 +1844,7 @@ static const gfx_layout road_layout =
Big Run
**************************************************************************/
-static GFXDECODE_START( bigrun )
+static GFXDECODE_START( gfx_bigrun )
//GFXDECODE_ENTRY( "scroll0", 0, tiles_8x8, 0x0e00/2 , 16 ) // Scroll 0
//GFXDECODE_ENTRY( "scroll1", 0, tiles_8x8, 0x1600/2 , 16 ) // Scroll 1
//GFXDECODE_ENTRY( "scroll2", 0, tiles_8x8, 0x3600/2 , 16 ) // Scroll 2
@@ -1857,7 +1857,7 @@ GFXDECODE_END
Cisco Heat
**************************************************************************/
-static GFXDECODE_START( cischeat )
+static GFXDECODE_START( gfx_cischeat )
//GFXDECODE_ENTRY( "scroll0", 0, tiles_8x8, 0x1c00/2, 32 ) // Scroll 0
//GFXDECODE_ENTRY( "scroll1", 0, tiles_8x8, 0x2c00/2, 32 ) // Scroll 1
//GFXDECODE_ENTRY( "scroll2", 0, tiles_8x8, 0x6c00/2, 32 ) // Scroll 2
@@ -1870,7 +1870,7 @@ GFXDECODE_END
F1 GrandPrix Star
**************************************************************************/
-static GFXDECODE_START( f1gpstar )
+static GFXDECODE_START( gfx_f1gpstar )
//GFXDECODE_ENTRY( "scroll0", 0, tiles_8x8, 0x1e00/2, 16 ) // Scroll 0
//GFXDECODE_ENTRY( "scroll1", 0, tiles_8x8, 0x2e00/2, 16 ) // Scroll 1
//GFXDECODE_ENTRY( "scroll2", 0, tiles_8x8, 0x6e00/2, 16 ) // Scroll 2
@@ -1883,7 +1883,7 @@ GFXDECODE_END
Scud Hammer
**************************************************************************/
-static GFXDECODE_START( scudhamm )
+static GFXDECODE_START( gfx_scudhamm )
//GFXDECODE_ENTRY( "scroll0", 0, tiles_8x8, 0x1e00/2, 16 ) // Scroll 0
//GFXDECODE_ENTRY( "scroll0", 0, tiles_8x8, 0x0000/2, 16 ) // UNUSED
//GFXDECODE_ENTRY( "scroll2", 0, tiles_8x8, 0x4e00/2, 16 ) // Scroll 2
@@ -1961,7 +1961,7 @@ MACHINE_CONFIG_START(cischeat_state::bigrun)
MCFG_SCREEN_UPDATE_DRIVER(cischeat_state, screen_update_bigrun)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bigrun)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bigrun)
MCFG_PALETTE_ADD_INIT_BLACK("palette", 0x4000/2)
MCFG_PALETTE_ENABLE_SHADOWS()
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -2012,7 +2012,7 @@ MACHINE_CONFIG_START(cischeat_state::cischeat)
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-8-1)
MCFG_SCREEN_UPDATE_DRIVER(cischeat_state, screen_update_cischeat)
- MCFG_GFXDECODE_MODIFY("gfxdecode", cischeat)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_cischeat)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(0x8000/2)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -2049,7 +2049,7 @@ MACHINE_CONFIG_START(cischeat_state::f1gpstar)
MCFG_DEVICE_PROGRAM_MAP(f1gpstar_sound_map)
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", f1gpstar)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_f1gpstar)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(0x8000/2)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -2132,7 +2132,7 @@ MACHINE_CONFIG_START(cischeat_state::scudhamm)
MCFG_SCREEN_UPDATE_DRIVER(cischeat_state, screen_update_scudhamm)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", scudhamm)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_scudhamm)
MCFG_PALETTE_ADD_INIT_BLACK("palette", 0x8000/2)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
MCFG_PALETTE_ENABLE_SHADOWS()
@@ -2223,7 +2223,7 @@ MACHINE_CONFIG_START(cischeat_state::captflag)
MCFG_SCREEN_UPDATE_DRIVER(cischeat_state, screen_update_scudhamm)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", scudhamm)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_scudhamm)
MCFG_PALETTE_ADD_INIT_BLACK("palette", 0x8000/2)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
MCFG_PALETTE_ENABLE_SHADOWS()
diff --git a/src/mame/drivers/citycon.cpp b/src/mame/drivers/citycon.cpp
index 8de0a4a1edc..5b9031cc32f 100644
--- a/src/mame/drivers/citycon.cpp
+++ b/src/mame/drivers/citycon.cpp
@@ -157,7 +157,7 @@ static const gfx_layout spritelayout =
};
-static GFXDECODE_START( citycon )
+static GFXDECODE_START( gfx_citycon )
// GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 512, 32 ) /* colors 512-639 */
GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 640, 32 ) /* colors 512-639 */
GFXDECODE_ENTRY( "gfx2", 0x00000, spritelayout, 0, 16 ) /* colors 0-255 */
@@ -207,7 +207,7 @@ MACHINE_CONFIG_START(citycon_state::citycon)
MCFG_SCREEN_UPDATE_DRIVER(citycon_state, screen_update_citycon)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", citycon)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_citycon)
MCFG_PALETTE_ADD_INIT_BLACK("palette", 640+1024) /* 640 real palette + 1024 virtual palette */
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
diff --git a/src/mame/drivers/cloak.cpp b/src/mame/drivers/cloak.cpp
index 2029b3b0810..3b6bb6a1d3b 100644
--- a/src/mame/drivers/cloak.cpp
+++ b/src/mame/drivers/cloak.cpp
@@ -301,7 +301,7 @@ static const gfx_layout spritelayout =
16*16
};
-static GFXDECODE_START( cloak )
+static GFXDECODE_START( gfx_cloak )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 32, 1 )
GFXDECODE_END
@@ -347,7 +347,7 @@ MACHINE_CONFIG_START(cloak_state::cloak)
MCFG_SCREEN_UPDATE_DRIVER(cloak_state, screen_update_cloak)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cloak)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cloak)
MCFG_PALETTE_ADD("palette", 64)
diff --git a/src/mame/drivers/cloud9.cpp b/src/mame/drivers/cloud9.cpp
index 2db933026f4..0cc979e0227 100644
--- a/src/mame/drivers/cloud9.cpp
+++ b/src/mame/drivers/cloud9.cpp
@@ -393,7 +393,7 @@ INPUT_PORTS_END
*
*************************************/
-static GFXDECODE_START( cloud9 )
+static GFXDECODE_START( gfx_cloud9 )
GFXDECODE_ENTRY( "gfx1", 0x0000, gfx_16x16x4_planar, 0, 4 )
GFXDECODE_END
@@ -422,7 +422,7 @@ MACHINE_CONFIG_START(cloud9_state::cloud9)
MCFG_X2212_ADD_AUTOSAVE("nvram")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cloud9)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cloud9)
MCFG_PALETTE_ADD("palette", 64)
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/clpoker.cpp b/src/mame/drivers/clpoker.cpp
index 6c54b5384bb..5b88faf8990 100644
--- a/src/mame/drivers/clpoker.cpp
+++ b/src/mame/drivers/clpoker.cpp
@@ -248,7 +248,7 @@ static const gfx_layout gfx_layout =
};
-static GFXDECODE_START( clpoker )
+static GFXDECODE_START( gfx_clpoker )
GFXDECODE_ENTRY( "gfx1", 0, gfx_layout, 0x0, 1 )
GFXDECODE_END
@@ -285,7 +285,7 @@ MACHINE_CONFIG_START(clpoker_state::clpoker)
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HM86171
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", clpoker)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_clpoker)
/* sound hardware */
SPEAKER(config, "mono").front_center();
diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp
index 1c8ddeadf61..e34d040de8d 100644
--- a/src/mame/drivers/clshroad.cpp
+++ b/src/mame/drivers/clshroad.cpp
@@ -246,13 +246,13 @@ static const gfx_layout layout_16x16x4 =
16*16*2
};
-static GFXDECODE_START( firebatl )
+static GFXDECODE_START( gfx_firebatl )
GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0, 16 ) // [0] Sprites
GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x4, 16, 1 ) // [1] Layer 0
GFXDECODE_ENTRY( "gfx3", 0, layout_8x8x2, 512, 64 ) // [2] Layer 1
GFXDECODE_END
-static GFXDECODE_START( clshroad )
+static GFXDECODE_START( gfx_clshroad )
GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0, 16 ) // [0] Sprites
GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x4, 0x90, 1 ) // [1] Layer 0
GFXDECODE_ENTRY( "gfx3", 0, layout_8x8x4, 0, 16 ) // [2] Layer 1
@@ -298,7 +298,7 @@ MACHINE_CONFIG_START(clshroad_state::firebatl)
MCFG_SCREEN_UPDATE_DRIVER(clshroad_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", firebatl)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_firebatl)
MCFG_PALETTE_ADD("palette", 512+64*4)
MCFG_PALETTE_INDIRECT_ENTRIES(256)
MCFG_PALETTE_INIT_OWNER(clshroad_state,firebatl)
@@ -339,7 +339,7 @@ MACHINE_CONFIG_START(clshroad_state::clshroad)
MCFG_SCREEN_UPDATE_DRIVER(clshroad_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", clshroad)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_clshroad)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(clshroad_state,clshroad)
diff --git a/src/mame/drivers/cmmb.cpp b/src/mame/drivers/cmmb.cpp
index 2d0cabc5efe..be9bfd75da9 100644
--- a/src/mame/drivers/cmmb.cpp
+++ b/src/mame/drivers/cmmb.cpp
@@ -386,7 +386,7 @@ static const gfx_layout spritelayout =
};
-static GFXDECODE_START( cmmb )
+static GFXDECODE_START( gfx_cmmb )
GFXDECODE_ENTRY( "gfx", 0, charlayout, 0x00, 4 )
GFXDECODE_ENTRY( "gfx", 0, spritelayout, 0x10, 4 )
GFXDECODE_END
@@ -422,7 +422,7 @@ MACHINE_CONFIG_START(cmmb_state::cmmb)
MCFG_SCREEN_UPDATE_DRIVER(cmmb_state, screen_update_cmmb)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cmmb)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cmmb)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_FORMAT(RRRGGGBB_inverted)
diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp
index b5406feb8b1..9705aa3d1ee 100644
--- a/src/mame/drivers/cninja.cpp
+++ b/src/mame/drivers/cninja.cpp
@@ -702,14 +702,14 @@ static const gfx_layout tilelayout_8bpp =
64*8
};
-static GFXDECODE_START( cninja )
+static GFXDECODE_START( gfx_cninja )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 32 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 512, 64 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx4", 0, spritelayout,768, 32 ) /* Sprites 16x16 */
GFXDECODE_END
-static GFXDECODE_START( cninjabl )
+static GFXDECODE_START( gfx_cninjabl )
GFXDECODE_ENTRY( "gfx1", 0, charlayout_boot, 0, 32 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx2", 0, spritelayout,0, 32 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx3", 0, spritelayout,512, 64 ) /* Tiles 16x16 */
@@ -717,7 +717,7 @@ static GFXDECODE_START( cninjabl )
GFXDECODE_END
-static GFXDECODE_START( robocop2 )
+static GFXDECODE_START( gfx_robocop2 )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 32 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 512, 64 ) /* Tiles 16x16 */
@@ -725,7 +725,7 @@ static GFXDECODE_START( robocop2 )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout_8bpp, 512, 1 ) /* Tiles 16x16 */
GFXDECODE_END
-static GFXDECODE_START( mutantf )
+static GFXDECODE_START( gfx_mutantf )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 64 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0, 80 ) /* Tiles 16x16 */
@@ -815,7 +815,7 @@ MACHINE_CONFIG_START(cninja_state::cninja)
MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_cninja)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cninja)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cninja)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(XBGR)
@@ -903,7 +903,7 @@ MACHINE_CONFIG_START(cninja_state::stoneage)
MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_cninja)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cninja)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cninja)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(XBGR)
@@ -1003,7 +1003,7 @@ MACHINE_CONFIG_START(cninja_state::cninjabl)
MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_cninjabl)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cninjabl)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cninjabl)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(XBGR)
@@ -1075,7 +1075,7 @@ MACHINE_CONFIG_START(cninja_state::edrandy)
MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_edrandy)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cninja)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cninja)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(XBGR)
@@ -1165,7 +1165,7 @@ MACHINE_CONFIG_START(cninja_state::robocop2)
MCFG_MACHINE_START_OVERRIDE(cninja_state,robocop2)
MCFG_MACHINE_RESET_OVERRIDE(cninja_state,robocop2)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", robocop2)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_robocop2)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(XBGR)
@@ -1258,7 +1258,7 @@ MACHINE_CONFIG_START(cninja_state::mutantf)
MCFG_MACHINE_RESET_OVERRIDE(cninja_state,robocop2)
MCFG_VIDEO_START_OVERRIDE(cninja_state,mutantf)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", mutantf)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mutantf)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(XBGR)
diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp
index 741c147ba4e..91b0b5f2be1 100644
--- a/src/mame/drivers/cntsteer.cpp
+++ b/src/mame/drivers/cntsteer.cpp
@@ -858,14 +858,14 @@ static const gfx_layout tilelayout =
8*16
};
-static GFXDECODE_START( cntsteer )
+static GFXDECODE_START( gfx_cntsteer )
GFXDECODE_ENTRY( "gfx1", 0x00000, cntsteer_charlayout, 0, 256 ) /* Only 1 used so far :/ */
GFXDECODE_ENTRY( "gfx2", 0x00000, sprites, 0, 256 )
GFXDECODE_ENTRY( "gfx3", 0x00000, tilelayout, 0, 256 )
GFXDECODE_END
-static GFXDECODE_START( zerotrgt )
+static GFXDECODE_START( gfx_zerotrgt )
GFXDECODE_ENTRY( "gfx1", 0x00000, zerotrgt_charlayout, 0, 256 ) /* Only 1 used so far :/ */
GFXDECODE_ENTRY( "gfx2", 0x00000, sprites, 0, 256 )
GFXDECODE_ENTRY( "gfx3", 0x00000, tilelayout, 0, 256 )
@@ -949,7 +949,7 @@ MACHINE_CONFIG_START(cntsteer_state::cntsteer)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
MCFG_QUANTUM_PERFECT_CPU("subcpu")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cntsteer)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cntsteer)
MCFG_PALETTE_ADD("palette", 256)
// MCFG_PALETTE_INIT_OWNER(cntsteer_state,zerotrgt)
@@ -1001,7 +1001,7 @@ MACHINE_CONFIG_START(cntsteer_state::zerotrgt)
MCFG_SCREEN_UPDATE_DRIVER(cntsteer_state, screen_update_zerotrgt)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", zerotrgt)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_zerotrgt)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(cntsteer_state,zerotrgt)
diff --git a/src/mame/drivers/coinmstr.cpp b/src/mame/drivers/coinmstr.cpp
index 566f32e94b0..db439c11704 100644
--- a/src/mame/drivers/coinmstr.cpp
+++ b/src/mame/drivers/coinmstr.cpp
@@ -1223,7 +1223,7 @@ static const gfx_layout charlayout =
8*8
};
-static GFXDECODE_START( coinmstr )
+static GFXDECODE_START( gfx_coinmstr )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 46*32 )
GFXDECODE_END
@@ -1280,7 +1280,7 @@ MACHINE_CONFIG_START(coinmstr_state::coinmstr)
MCFG_SCREEN_UPDATE_DRIVER(coinmstr_state, screen_update_coinmstr)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", coinmstr)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_coinmstr)
MCFG_PALETTE_ADD("palette", 46*32*4)
MCFG_MC6845_ADD("crtc", H46505, "screen", 14000000 / 16)
diff --git a/src/mame/drivers/coinmvga.cpp b/src/mame/drivers/coinmvga.cpp
index 79b9f54e93a..0dc08c63f84 100644
--- a/src/mame/drivers/coinmvga.cpp
+++ b/src/mame/drivers/coinmvga.cpp
@@ -600,11 +600,11 @@ static const gfx_layout tiles16x16_layout =
* Graphics Decode Information *
******************************/
-static GFXDECODE_START( coinmvga )
+static GFXDECODE_START( gfx_coinmvga )
GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0x000, 16 ) /* Foreground GFX */
GFXDECODE_END
-static GFXDECODE_START( coinmvga2 )
+static GFXDECODE_START( gfx_coinmvga2 )
GFXDECODE_ENTRY( "gfx2", 0, tiles16x16_layout, 0x000, 1 ) /* Background GFX */
GFXDECODE_END
@@ -654,8 +654,8 @@ MACHINE_CONFIG_START(coinmvga_state::coinmvga)
MCFG_SCREEN_UPDATE_DRIVER(coinmvga_state, screen_update_coinmvga)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", coinmvga)
- MCFG_GFXDECODE_ADD("gfxdecode2", "palette2", coinmvga2)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_coinmvga)
+ MCFG_DEVICE_ADD("gfxdecode2", GFXDECODE, "palette2", gfx_coinmvga2)
MCFG_PALETTE_ADD("palette", 256)
MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp
index 594e2cefccd..542fc5599f0 100644
--- a/src/mame/drivers/combatsc.cpp
+++ b/src/mame/drivers/combatsc.cpp
@@ -624,12 +624,12 @@ static const gfx_layout sprite_layout =
8*8*4
};
-static GFXDECODE_START( combatsc )
+static GFXDECODE_START( gfx_combatsc )
GFXDECODE_ENTRY( "gfx1", 0x00000, gfxlayout, 0, 8*16 )
GFXDECODE_ENTRY( "gfx2", 0x00000, gfxlayout, 0, 8*16 )
GFXDECODE_END
-static GFXDECODE_START( combatscb )
+static GFXDECODE_START( gfx_combatscb )
GFXDECODE_ENTRY( "gfx1", 0x00000, tile_layout, 0, 8*16 )
GFXDECODE_ENTRY( "gfx1", 0x40000, tile_layout, 0, 8*16 )
GFXDECODE_ENTRY( "gfx2", 0x00000, sprite_layout, 0, 8*16 )
@@ -722,7 +722,7 @@ MACHINE_CONFIG_START(combatsc_state::combatsc)
MCFG_SCREEN_UPDATE_DRIVER(combatsc_state, screen_update_combatsc)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", combatsc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_combatsc)
MCFG_PALETTE_ADD("palette", 8*16*16)
MCFG_PALETTE_INDIRECT_ENTRIES(128)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
@@ -773,7 +773,7 @@ MACHINE_CONFIG_START(combatsc_state::combatscb)
MCFG_SCREEN_UPDATE_DRIVER(combatsc_state, screen_update_combatscb)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", combatscb)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_combatscb)
MCFG_PALETTE_ADD("palette", 8*16*16)
MCFG_PALETTE_INDIRECT_ENTRIES(128)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
diff --git a/src/mame/drivers/commando.cpp b/src/mame/drivers/commando.cpp
index 4b0b8ebe9a9..53b8d36df4e 100644
--- a/src/mame/drivers/commando.cpp
+++ b/src/mame/drivers/commando.cpp
@@ -215,7 +215,7 @@ static const gfx_layout spritelayout =
/* Graphics Decode Information */
-static GFXDECODE_START( commando )
+static GFXDECODE_START( gfx_commando )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 192, 16 ) // colors 192-255
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 16 ) // colors 0-127
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 128, 4 ) // colors 128-191
@@ -275,7 +275,7 @@ MACHINE_CONFIG_START(commando_state::commando)
MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, commando_state, vblank_irq))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", commando)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_commando)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256)
MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8)
diff --git a/src/mame/drivers/compgolf.cpp b/src/mame/drivers/compgolf.cpp
index d4fa087a121..5a4f3a4e876 100644
--- a/src/mame/drivers/compgolf.cpp
+++ b/src/mame/drivers/compgolf.cpp
@@ -191,7 +191,7 @@ static const gfx_layout tilelayout8 =
16*8
};
-static GFXDECODE_START( compgolf )
+static GFXDECODE_START( gfx_compgolf )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 0x10 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayoutbg, 0, 0x20 )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout8, 0, 0x10 )
@@ -240,7 +240,7 @@ MACHINE_CONFIG_START(compgolf_state::compgolf)
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_PALETTE_INIT_OWNER(compgolf_state, compgolf)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", compgolf)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_compgolf)
SPEAKER(config, "mono").front_center();
diff --git a/src/mame/drivers/comquest.cpp b/src/mame/drivers/comquest.cpp
index 2304eee3229..8c9cd3727af 100644
--- a/src/mame/drivers/comquest.cpp
+++ b/src/mame/drivers/comquest.cpp
@@ -201,7 +201,7 @@ static const gfx_layout comquest_charlayout =
8*8
};
-static GFXDECODE_START( comquest )
+static GFXDECODE_START( gfx_comquest )
GFXDECODE_ENTRY( "gfx1", 0x0000, comquest_charlayout, 0, 2 )
GFXDECODE_END
@@ -255,7 +255,7 @@ MACHINE_CONFIG_START(comquest_state::comquest)
MCFG_SCREEN_UPDATE_DRIVER(comquest_state, screen_update_comquest)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", comquest )
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_comquest )
MCFG_PALETTE_ADD_MONOCHROME("palette")
diff --git a/src/mame/drivers/contra.cpp b/src/mame/drivers/contra.cpp
index 5b1f7286cb3..7b8c56ebcaa 100644
--- a/src/mame/drivers/contra.cpp
+++ b/src/mame/drivers/contra.cpp
@@ -187,7 +187,7 @@ static const gfx_layout gfxlayout =
32*8
};
-static GFXDECODE_START( contra )
+static GFXDECODE_START( gfx_contra )
GFXDECODE_ENTRY( "gfx1", 0, gfxlayout, 0, 8*16 )
GFXDECODE_ENTRY( "gfx2", 0, gfxlayout, 8*16*16, 8*16 )
GFXDECODE_END
@@ -228,7 +228,7 @@ MACHINE_CONFIG_START(contra_state::contra)
MCFG_SCREEN_UPDATE_DRIVER(contra_state, screen_update_contra)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", contra)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_contra)
MCFG_PALETTE_ADD("palette", 2*8*16*16)
MCFG_PALETTE_INDIRECT_ENTRIES(128)
diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp
index c778ba6cc7c..e7960932e13 100644
--- a/src/mame/drivers/coolridr.cpp
+++ b/src/mame/drivers/coolridr.cpp
@@ -3002,7 +3002,7 @@ void coolridr_state::system_h1_sound_map(address_map &map)
-static GFXDECODE_START( coolridr )
+static GFXDECODE_START( gfx_coolridr )
// GFXDECODE_ENTRY( nullptr, 0, tiles16x16_layout, 0, 0x100 )
GFXDECODE_END
@@ -3289,7 +3289,7 @@ MACHINE_CONFIG_START(coolridr_state::coolridr)
MCFG_315_5649_AN5_CB(IOPORT("AN5"))
MCFG_315_5649_AN6_CB(IOPORT("AN6"))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", coolridr)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_coolridr)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/cop01.cpp b/src/mame/drivers/cop01.cpp
index 1d9078719c5..301fe62848a 100644
--- a/src/mame/drivers/cop01.cpp
+++ b/src/mame/drivers/cop01.cpp
@@ -414,7 +414,7 @@ static const gfx_layout spritelayout =
64*8
};
-static GFXDECODE_START( cop01 )
+static GFXDECODE_START( gfx_cop01 )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 16, 8 )
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 16+8*16, 16 )
@@ -468,7 +468,7 @@ MACHINE_CONFIG_START(cop01_state::cop01)
MCFG_SCREEN_UPDATE_DRIVER(cop01_state, screen_update_cop01)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cop01)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cop01)
MCFG_PALETTE_ADD("palette", 16+8*16+16*16)
MCFG_PALETTE_INDIRECT_ENTRIES(256)
MCFG_PALETTE_INIT_OWNER(cop01_state, cop01)
@@ -512,7 +512,7 @@ MACHINE_CONFIG_START(mightguy_state::mightguy)
MCFG_SCREEN_UPDATE_DRIVER(cop01_state, screen_update_cop01)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cop01)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cop01)
MCFG_PALETTE_ADD("palette", 16+8*16+16*16)
MCFG_PALETTE_INDIRECT_ENTRIES(256)
MCFG_PALETTE_INIT_OWNER(cop01_state, cop01)
diff --git a/src/mame/drivers/copsnrob.cpp b/src/mame/drivers/copsnrob.cpp
index 67c2da36ce4..fecc88c4b9b 100644
--- a/src/mame/drivers/copsnrob.cpp
+++ b/src/mame/drivers/copsnrob.cpp
@@ -220,7 +220,7 @@ static const gfx_layout trucklayout =
};
-static GFXDECODE_START( copsnrob )
+static GFXDECODE_START( gfx_copsnrob )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 )
GFXDECODE_ENTRY( "gfx2", 0, carlayout, 0, 1 )
GFXDECODE_ENTRY( "gfx3", 0, trucklayout, 0, 1 )
@@ -263,7 +263,7 @@ MACHINE_CONFIG_START(copsnrob_state::copsnrob)
MCFG_SCREEN_UPDATE_DRIVER(copsnrob_state, screen_update_copsnrob)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", copsnrob)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_copsnrob)
MCFG_PALETTE_ADD_MONOCHROME("palette")
copsnrob_audio(config);
diff --git a/src/mame/drivers/cosmic.cpp b/src/mame/drivers/cosmic.cpp
index 1239ef64d1f..1c098288a54 100644
--- a/src/mame/drivers/cosmic.cpp
+++ b/src/mame/drivers/cosmic.cpp
@@ -902,12 +902,12 @@ static const gfx_layout cosmic_spritelayout32 =
};
-static GFXDECODE_START( panic )
+static GFXDECODE_START( gfx_panic )
GFXDECODE_ENTRY( "gfx1", 0, cosmic_spritelayout16, 16, 8 )
GFXDECODE_ENTRY( "gfx1", 0, cosmic_spritelayout32, 16, 8 )
GFXDECODE_END
-static GFXDECODE_START( cosmica )
+static GFXDECODE_START( gfx_cosmica )
GFXDECODE_ENTRY( "gfx1", 0, cosmic_spritelayout16, 8, 16 )
GFXDECODE_ENTRY( "gfx1", 0, cosmic_spritelayout32, 8, 16 )
GFXDECODE_END
@@ -1042,7 +1042,7 @@ MACHINE_CONFIG_START(cosmic_state::panic)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", cosmic_state, panic_scanline, "screen", 0, 1)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", panic)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_panic)
MCFG_PALETTE_ADD("palette", 16+8*4)
MCFG_PALETTE_INDIRECT_ENTRIES(16)
MCFG_PALETTE_INIT_OWNER(cosmic_state,panic)
@@ -1072,7 +1072,7 @@ MACHINE_CONFIG_START(cosmic_state::cosmica)
MCFG_DEVICE_PROGRAM_MAP(cosmica_map)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cosmica)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cosmica)
MCFG_PALETTE_ADD("palette", 8+16*4)
MCFG_PALETTE_INDIRECT_ENTRIES(8)
MCFG_PALETTE_INIT_OWNER(cosmic_state,cosmica)
@@ -1135,7 +1135,7 @@ MACHINE_CONFIG_START(cosmic_state::magspot)
MCFG_DEVICE_PROGRAM_MAP(magspot_map)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", panic)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_panic)
MCFG_PALETTE_ADD("palette", 16+8*4)
MCFG_PALETTE_INDIRECT_ENTRIES(16)
MCFG_PALETTE_INIT_OWNER(cosmic_state,magspot)
@@ -1171,7 +1171,7 @@ MACHINE_CONFIG_START(cosmic_state::nomnlnd)
MCFG_DEVICE_PROGRAM_MAP(magspot_map)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", panic)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_panic)
MCFG_PALETTE_ADD("palette", 16+8*4)
MCFG_PALETTE_INDIRECT_ENTRIES(16)
MCFG_PALETTE_INIT_OWNER(cosmic_state,nomnlnd)
diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp
index 6ea42dc10ec..649e4f5742b 100644
--- a/src/mame/drivers/cps1.cpp
+++ b/src/mame/drivers/cps1.cpp
@@ -3319,7 +3319,7 @@ static const gfx_layout cps1_layout32x32 =
4*32*32
};
-GFXDECODE_START( cps1 )
+GFXDECODE_START( gfx_cps1 )
GFXDECODE_ENTRY( "gfx", 0, cps1_layout8x8, 0, 0x100 )
GFXDECODE_ENTRY( "gfx", 0, cps1_layout8x8_2, 0, 0x100 )
GFXDECODE_ENTRY( "gfx", 0, cps1_layout16x16, 0, 0x100 )
@@ -3373,7 +3373,7 @@ MACHINE_CONFIG_START(cps_state::cps1_10MHz)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1)
MCFG_PALETTE_ADD("palette", 0xc00)
MCFG_VIDEO_START_OVERRIDE(cps_state, cps1)
diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp
index c1777d69df4..13f3547fa81 100644
--- a/src/mame/drivers/cps2.cpp
+++ b/src/mame/drivers/cps2.cpp
@@ -1328,7 +1328,7 @@ MACHINE_CONFIG_START(cps_state::cps2)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1)
MCFG_PALETTE_ADD("palette", 0xc00)
MCFG_VIDEO_START_OVERRIDE(cps_state, cps2)
diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp
index cc724f66fba..49958c74349 100644
--- a/src/mame/drivers/cps3.cpp
+++ b/src/mame/drivers/cps3.cpp
@@ -2554,7 +2554,7 @@ MACHINE_CONFIG_START(cps3_state::cps3)
MCFG_NVRAM_ADD_0FILL("eeprom")
MCFG_PALETTE_ADD("palette", 0x10000) // actually 0x20000 ...
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty)
/* sound hardware */
SPEAKER(config, "lspeaker").front_left();
diff --git a/src/mame/drivers/crbaloon.cpp b/src/mame/drivers/crbaloon.cpp
index 6380bd50e23..59594bc58f6 100644
--- a/src/mame/drivers/crbaloon.cpp
+++ b/src/mame/drivers/crbaloon.cpp
@@ -325,7 +325,7 @@ static const gfx_layout charlayout =
};
-static GFXDECODE_START( crbaloon )
+static GFXDECODE_START( gfx_crbaloon )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 )
GFXDECODE_END
@@ -371,7 +371,7 @@ MACHINE_CONFIG_START(crbaloon_state::crbaloon)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", crbaloon)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_crbaloon)
MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_INIT_OWNER(crbaloon_state, crbaloon)
diff --git a/src/mame/drivers/crospang.cpp b/src/mame/drivers/crospang.cpp
index e83cb2a19fa..23cd77b9557 100644
--- a/src/mame/drivers/crospang.cpp
+++ b/src/mame/drivers/crospang.cpp
@@ -321,7 +321,7 @@ static const gfx_layout tlayout =
};
-static GFXDECODE_START( crospang )
+static GFXDECODE_START( gfx_crospang )
//GFXDECODE_ENTRY( "gfx1", 0, tcharlayout, 256, 16 ) /* Characters 8x8 */
//GFXDECODE_ENTRY( "gfx1", 0, tlayout, 512, 16 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx2", 0, tlayout, 0, 64 ) /* Tiles 16x16 */
@@ -364,7 +364,7 @@ MACHINE_CONFIG_START(crospang_state::crospang)
MCFG_PALETTE_ADD("palette", 0x300)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", crospang)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_crospang)
MCFG_DEVICE_ADD("spritegen", DECO_SPRITE, 0)
diff --git a/src/mame/drivers/crshrace.cpp b/src/mame/drivers/crshrace.cpp
index cd4b316efea..e6a99dc32db 100644
--- a/src/mame/drivers/crshrace.cpp
+++ b/src/mame/drivers/crshrace.cpp
@@ -379,7 +379,7 @@ static const gfx_layout spritelayout =
128*8
};
-static GFXDECODE_START( crshrace )
+static GFXDECODE_START( gfx_crshrace )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 256, 16 )
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 512, 32 )
@@ -424,7 +424,7 @@ MACHINE_CONFIG_START(crshrace_state::crshrace)
MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("spriteram2", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", crshrace)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_crshrace)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xGGGGGBBBBBRRRRR)
diff --git a/src/mame/drivers/cswat.cpp b/src/mame/drivers/cswat.cpp
index a121d8193d1..8c19667adf7 100644
--- a/src/mame/drivers/cswat.cpp
+++ b/src/mame/drivers/cswat.cpp
@@ -236,7 +236,7 @@ static const gfx_layout charlayout =
16*8
};
-static GFXDECODE_START( cswat )
+static GFXDECODE_START( gfx_cswat )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 )
GFXDECODE_END
@@ -274,7 +274,7 @@ MACHINE_CONFIG_START(cswat_state::cswat)
MCFG_SCREEN_UPDATE_DRIVER(cswat_state, screen_update_cswat)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cswat)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cswat)
MCFG_PALETTE_ADD("palette", 4*256)
/* sound hardware */
diff --git a/src/mame/drivers/cultures.cpp b/src/mame/drivers/cultures.cpp
index 3ca3cb4e8a1..a01da67d1a6 100644
--- a/src/mame/drivers/cultures.cpp
+++ b/src/mame/drivers/cultures.cpp
@@ -369,7 +369,7 @@ static const gfx_layout gfxlayout =
8*64,
};
-static GFXDECODE_START( culture )
+static GFXDECODE_START( gfx_cultures )
GFXDECODE_ENTRY("bg0", 0, gfxlayout, 0x0000, 16 )
GFXDECODE_ENTRY("bg1", 0, gfxlayout, 0x1000, 8 )
GFXDECODE_ENTRY("bg2", 0, gfxlayout, 0x1000, 8 )
@@ -428,7 +428,7 @@ MACHINE_CONFIG_START(cultures_state::cultures)
MCFG_SCREEN_UPDATE_DRIVER(cultures_state, screen_update_cultures)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", culture)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cultures)
MCFG_PALETTE_ADD("palette", 0x3000/2)
MCFG_PALETTE_FORMAT(xRGBRRRRGGGGBBBB_bit0)
diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp
index 42d98ec98a3..6e9c16f84ed 100644
--- a/src/mame/drivers/cvs.cpp
+++ b/src/mame/drivers/cvs.cpp
@@ -912,7 +912,7 @@ static const gfx_layout charlayout =
8*8 /* every char takes 8 consecutive bytes */
};
-static GFXDECODE_START( cvs )
+static GFXDECODE_START( gfx_cvs )
GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 256+4 )
GFXDECODE_ENTRY( nullptr, 0x0000, charlayout, 0, 256+4 )
GFXDECODE_END
@@ -990,7 +990,7 @@ MACHINE_CONFIG_START(cvs_state::cvs)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(cvs_state,cvs)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cvs)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cvs)
MCFG_PALETTE_ADD("palette", (256+4)*8+8+1)
MCFG_PALETTE_INDIRECT_ENTRIES(16)
diff --git a/src/mame/drivers/cyberbal.cpp b/src/mame/drivers/cyberbal.cpp
index 13f1a4aa5f1..b69fe1a0579 100644
--- a/src/mame/drivers/cyberbal.cpp
+++ b/src/mame/drivers/cyberbal.cpp
@@ -372,13 +372,13 @@ static const gfx_layout molayout =
16*8
};
-static GFXDECODE_START( cyberbal )
+static GFXDECODE_START( gfx_cyberbal )
GFXDECODE_ENTRY( "gfx2", 0, pfanlayout, 0, 128 )
GFXDECODE_ENTRY( "gfx1", 0, molayout, 0x600, 16 )
GFXDECODE_ENTRY( "gfx3", 0, pfanlayout, 0x780, 8 )
GFXDECODE_END
-static GFXDECODE_START( interleaved )
+static GFXDECODE_START( gfx_interleaved )
GFXDECODE_ENTRY( "gfx2", 0, pfanlayout_interleaved, 0, 128 )
GFXDECODE_ENTRY( "gfx1", 0, molayout, 0x600, 16 )
GFXDECODE_ENTRY( "gfx3", 0, pfanlayout_interleaved, 0x780, 8 )
@@ -417,7 +417,7 @@ MACHINE_CONFIG_START(cyberbal_state::cyberbal)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "lpalette", interleaved)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "lpalette", gfx_interleaved)
MCFG_PALETTE_ADD("lpalette", 2048)
MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB)
@@ -491,7 +491,7 @@ MACHINE_CONFIG_START(cyberbal2p_state::cyberbal2p)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cyberbal)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cyberbal)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp
index 0041ee4d61e..8d02b41ce71 100644
--- a/src/mame/drivers/cybertnk.cpp
+++ b/src/mame/drivers/cybertnk.cpp
@@ -819,7 +819,7 @@ static const gfx_layout roadlayout =
xoffsets
};
-static GFXDECODE_START( cybertnk )
+static GFXDECODE_START( gfx_cybertnk )
GFXDECODE_ENTRY( "tilemap0_gfx", 0, tile_8x8x4, 0x1400, 64 ) /*Pal offset???*/
GFXDECODE_ENTRY( "tilemap1_gfx", 0, tile_8x8x4, 0x1800, 64 )
GFXDECODE_ENTRY( "tilemap2_gfx", 0, tile_8x8x4, 0x1c00, 64 )
@@ -871,7 +871,7 @@ MACHINE_CONFIG_START(cybertnk_state::cybertnk)
MCFG_SCREEN_UPDATE_DRIVER(cybertnk_state, screen_update_cybertnk_right)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cybertnk)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cybertnk)
MCFG_PALETTE_ADD("palette", 0x4000)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
diff --git a/src/mame/drivers/cybstorm.cpp b/src/mame/drivers/cybstorm.cpp
index 1953ed198fa..3eea0a05b29 100644
--- a/src/mame/drivers/cybstorm.cpp
+++ b/src/mame/drivers/cybstorm.cpp
@@ -207,7 +207,7 @@ static const gfx_layout molayout =
};
-static GFXDECODE_START( cybstorm )
+static GFXDECODE_START( gfx_cybstorm )
GFXDECODE_ENTRY( "gfx2", 0, pflayout, 0, 16 ) /* sprites & playfield */
GFXDECODE_ENTRY( "gfx3", 0, molayout, 4096, 64 ) /* sprites & playfield */
GFXDECODE_ENTRY( "gfx1", 0, anlayout, 16384, 64 ) /* characters 8x8 */
@@ -245,7 +245,7 @@ MACHINE_CONFIG_START(cybstorm_state::round2)
MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(16)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x90000)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cybstorm)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cybstorm)
MCFG_PALETTE_ADD("palette", 32768)
MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/cyclemb.cpp b/src/mame/drivers/cyclemb.cpp
index 4663493f3c7..6e7274f201c 100644
--- a/src/mame/drivers/cyclemb.cpp
+++ b/src/mame/drivers/cyclemb.cpp
@@ -958,7 +958,7 @@ static const gfx_layout spritelayout_32x32 =
64*8*4 /* every sprite takes (64*8=16x6)*4) bytes */
};
-static GFXDECODE_START( cyclemb )
+static GFXDECODE_START( gfx_cyclemb )
GFXDECODE_ENTRY( "tilemap_data", 0, charlayout, 0, 0x40 )
GFXDECODE_ENTRY( "sprite_data", 0, spritelayout_16x16, 0x00, 0x40 )
GFXDECODE_ENTRY( "sprite_data", 0, spritelayout_32x32, 0x00, 0x40 )
@@ -985,7 +985,7 @@ MACHINE_CONFIG_START(cyclemb_state::cyclemb)
MCFG_SCREEN_UPDATE_DRIVER(cyclemb_state, screen_update_cyclemb)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cyclemb)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cyclemb)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(cyclemb_state, cyclemb)
diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp
index 248c15dca3f..d7fb98b9f37 100644
--- a/src/mame/drivers/d9final.cpp
+++ b/src/mame/drivers/d9final.cpp
@@ -288,7 +288,7 @@ static const gfx_layout tiles16x8_layout =
32*8
};
-static GFXDECODE_START( d9final )
+static GFXDECODE_START( gfx_d9final )
GFXDECODE_ENTRY( "gfx1", 0, tiles16x8_layout, 0, 16*4 )
GFXDECODE_END
@@ -316,7 +316,7 @@ MACHINE_CONFIG_START(d9final_state::d9final)
MCFG_SCREEN_UPDATE_DRIVER(d9final_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", d9final)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_d9final)
MCFG_PALETTE_ADD_INIT_BLACK("palette", 0x400)
MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG)
diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp
index 90febc0c774..076b5cd7118 100644
--- a/src/mame/drivers/dacholer.cpp
+++ b/src/mame/drivers/dacholer.cpp
@@ -559,13 +559,13 @@ static const gfx_layout spritelayout =
16*16*4
};
-static GFXDECODE_START( dacholer )
+static GFXDECODE_START( gfx_dacholer )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x00, 1 )
GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0x10, 1 )
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x10, 1 )
GFXDECODE_END
-static GFXDECODE_START( itaten )
+static GFXDECODE_START( gfx_itaten )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x00, 1 )
GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0x00, 1 )
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x10, 1 )
@@ -682,7 +682,7 @@ MACHINE_CONFIG_START(dacholer_state::dacholer)
MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_INIT_OWNER(dacholer_state, dacholer)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dacholer)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dacholer)
/* sound hardware */
@@ -716,7 +716,7 @@ MACHINE_CONFIG_START(dacholer_state::itaten)
MCFG_DEVICE_IO_MAP(itaten_snd_io_map)
MCFG_DEVICE_VBLANK_INT_REMOVE()
- MCFG_GFXDECODE_MODIFY("gfxdecode", itaten)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_itaten)
MCFG_DEVICE_REMOVE("msm")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dai.cpp b/src/mame/drivers/dai.cpp
index 54819f000a1..0f1088a6b36 100644
--- a/src/mame/drivers/dai.cpp
+++ b/src/mame/drivers/dai.cpp
@@ -182,7 +182,7 @@ static const gfx_layout dai_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( dai )
+static GFXDECODE_START( gfx_dai )
GFXDECODE_ENTRY( "gfx1", 0x0000, dai_charlayout, 0, 8 )
GFXDECODE_END
@@ -214,7 +214,7 @@ MACHINE_CONFIG_START(dai_state::dai)
MCFG_SCREEN_UPDATE_DRIVER(dai_state, screen_update_dai)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dai)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dai)
MCFG_PALETTE_ADD("palette", sizeof (dai_palette) / 3)
MCFG_PALETTE_INIT_OWNER(dai_state, dai)
diff --git a/src/mame/drivers/dambustr.cpp b/src/mame/drivers/dambustr.cpp
index 820ca1931b1..e22f17b6d99 100644
--- a/src/mame/drivers/dambustr.cpp
+++ b/src/mame/drivers/dambustr.cpp
@@ -207,7 +207,7 @@ static const gfx_layout dambustr_spritelayout =
};
-static GFXDECODE_START( dambustr )
+static GFXDECODE_START( gfx_dambustr )
GFXDECODE_ENTRY( "gfx1", 0x0000, dambustr_charlayout, 0, 8 )
GFXDECODE_ENTRY( "gfx1", 0x0000, dambustr_spritelayout, 0, 8 )
GFXDECODE_END
@@ -282,7 +282,7 @@ MACHINE_CONFIG_START(dambustr_state::dambustr)
MCFG_SCREEN_UPDATE_DRIVER(dambustr_state, screen_update_dambustr)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dambustr)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dambustr)
MCFG_PALETTE_ADD("palette", 32+2+64+8) /* 32 for the characters, 2 for the bullets, 64 for the stars, 8 for the background */
MCFG_PALETTE_INIT_OWNER(dambustr_state,dambustr)
diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp
index 8c5f9923d24..776edc89044 100644
--- a/src/mame/drivers/darius.cpp
+++ b/src/mame/drivers/darius.cpp
@@ -648,7 +648,7 @@ static const gfx_layout char2layout =
16*8 /* every sprite takes 32 consecutive bytes */
};
-static GFXDECODE_START( darius )
+static GFXDECODE_START( gfx_darius )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 128 ) /* sprites */
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) /* scr tiles */
GFXDECODE_ENTRY( "gfx3", 0, char2layout, 0, 128 ) /* top layer scr tiles */
@@ -727,7 +727,7 @@ MACHINE_CONFIG_START(darius_state::darius)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", darius)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_darius)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
MCFG_DEFAULT_LAYOUT(layout_darius)
diff --git a/src/mame/drivers/darkmist.cpp b/src/mame/drivers/darkmist.cpp
index 191a426a9bd..7a6240a64aa 100644
--- a/src/mame/drivers/darkmist.cpp
+++ b/src/mame/drivers/darkmist.cpp
@@ -219,7 +219,7 @@ static const gfx_layout tilelayout =
};
-static GFXDECODE_START( darkmist )
+static GFXDECODE_START( gfx_darkmist )
GFXDECODE_ENTRY( "tx_gfx", 0, charlayout, 0x300, 16 )
GFXDECODE_ENTRY( "bg_gfx", 0, tilelayout, 0x000, 16 )
GFXDECODE_ENTRY( "fg_gfx", 0, tilelayout, 0x100, 16 )
@@ -257,7 +257,7 @@ MACHINE_CONFIG_START(darkmist_state::darkmist)
MCFG_SCREEN_UPDATE_DRIVER(darkmist_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", darkmist)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_darkmist)
MCFG_PALETTE_ADD("palette", 0x100*4)
MCFG_PALETTE_INDIRECT_ENTRIES(256+1)
MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB)
diff --git a/src/mame/drivers/darkseal.cpp b/src/mame/drivers/darkseal.cpp
index 2f78ade259b..ac4245060f5 100644
--- a/src/mame/drivers/darkseal.cpp
+++ b/src/mame/drivers/darkseal.cpp
@@ -194,7 +194,7 @@ static const gfx_layout seallayout2 =
64*8
};
-static GFXDECODE_START( darkseal )
+static GFXDECODE_START( gfx_darkseal )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx2", 0, seallayout, 768, 16 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx3", 0, seallayout, 1024, 16 ) /* Tiles 16x16 */
@@ -206,11 +206,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(darkseal_state::darkseal)
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* Custom chip 59 */
+ MCFG_DEVICE_ADD(m_maincpu, M68000, XTAL(24'000'000)/2) /* Custom chip 59 */
MCFG_DEVICE_PROGRAM_MAP(darkseal_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", darkseal_state, irq6_line_assert)/* VBL */
- MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000)/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
+ MCFG_DEVICE_ADD(m_audiocpu, H6280, XTAL(32'220'000)/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
@@ -220,13 +220,12 @@ MACHINE_CONFIG_START(darkseal_state::darkseal)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(darkseal_state, screen_update)
- MCFG_SCREEN_PALETTE("palette")
+ MCFG_SCREEN_PALETTE("colors")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", darkseal)
- MCFG_PALETTE_ADD("palette", 2048)
- MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, m_palette, gfx_darkseal)
+ MCFG_PALETTE_ADD(m_palette, 2048)
- MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16)
+ MCFG_DEVICE_ADD(m_spriteram, BUFFERED_SPRITERAM16)
MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0)
MCFG_DECO16IC_SPLIT(0)
@@ -256,7 +255,7 @@ MACHINE_CONFIG_START(darkseal_state::darkseal)
MCFG_DECO16IC_PF12_16X16_BANK(2)
MCFG_DECO16IC_GFXDECODE("gfxdecode")
- MCFG_DEVICE_ADD("spritegen", DECO_SPRITE, 0)
+ MCFG_DEVICE_ADD(m_sprgen, DECO_SPRITE, 0)
MCFG_DECO_SPRITE_GFX_REGION(3)
MCFG_DECO_SPRITE_GFXDECODE("gfxdecode")
@@ -264,8 +263,8 @@ MACHINE_CONFIG_START(darkseal_state::darkseal)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
+ MCFG_GENERIC_LATCH_8_ADD(m_soundlatch)
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE(m_audiocpu, 0))
MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp
index 87a3f9d4215..3d79d5285c0 100644
--- a/src/mame/drivers/dassault.cpp
+++ b/src/mame/drivers/dassault.cpp
@@ -495,7 +495,7 @@ static const gfx_layout tilelayout =
64*8
};
-static GFXDECODE_START( dassault )
+static GFXDECODE_START( gfx_dassault )
/* "gfx1" is copied to "gfx2" at runtime */
GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 32 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 32 ) /* Tiles 16x16 */
@@ -550,7 +550,7 @@ MACHINE_CONFIG_START(dassault_state::dassault)
MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248) // same as robocop2(cninja.cpp)? verify this from real pcb.
MCFG_SCREEN_UPDATE_DRIVER(dassault_state, screen_update_dassault)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dassault)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dassault)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_FORMAT(XBGR)
diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp
index 9b2a65f9f04..d14916d6099 100644
--- a/src/mame/drivers/dblcrown.cpp
+++ b/src/mame/drivers/dblcrown.cpp
@@ -530,7 +530,7 @@ static const gfx_layout char_16x16_layout =
};
-static GFXDECODE_START( dblcrown )
+static GFXDECODE_START( gfx_dblcrown )
#ifdef DEBUG_VRAM
GFXDECODE_ENTRY( "vram", 0, char_8x8_layout, 0, 0x10 )
#endif
@@ -619,7 +619,7 @@ MACHINE_CONFIG_START(dblcrown_state::dblcrown)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dblcrown)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dblcrown)
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_PALETTE_INIT_OWNER(dblcrown_state, dblcrown)
diff --git a/src/mame/drivers/dblewing.cpp b/src/mame/drivers/dblewing.cpp
index 088884495cd..5c537f8d4aa 100644
--- a/src/mame/drivers/dblewing.cpp
+++ b/src/mame/drivers/dblewing.cpp
@@ -258,7 +258,7 @@ static const gfx_layout spritelayout =
};
-static GFXDECODE_START( dblewing )
+static GFXDECODE_START( gfx_dblewing )
GFXDECODE_ENTRY( "gfx1", 0, tile_8x8_layout, 0x000, 32 ) /* Tiles (8x8) */
GFXDECODE_ENTRY( "gfx1", 0, tile_16x16_layout, 0x000, 32 ) /* Tiles (16x16) */
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x200, 32 ) /* Sprites (16x16) */
@@ -378,7 +378,7 @@ MACHINE_CONFIG_START(dblewing_state::dblewing)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dblewing)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dblewing)
MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0)
MCFG_DECO16IC_SPLIT(0)
diff --git a/src/mame/drivers/dbz.cpp b/src/mame/drivers/dbz.cpp
index 20974d47c9b..6dee5557436 100644
--- a/src/mame/drivers/dbz.cpp
+++ b/src/mame/drivers/dbz.cpp
@@ -294,7 +294,7 @@ static const gfx_layout bglayout =
128*8
};
-static GFXDECODE_START( dbz )
+static GFXDECODE_START( gfx_dbz )
GFXDECODE_ENTRY( "gfx3", 0, bglayout, 0, 512 )
GFXDECODE_ENTRY( "gfx4", 0, bglayout, 0, 512 )
GFXDECODE_END
@@ -348,7 +348,7 @@ MACHINE_CONFIG_START(dbz_state::dbz)
MCFG_SCREEN_UPDATE_DRIVER(dbz_state, screen_update_dbz)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dbz)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dbz)
MCFG_PALETTE_ADD("palette", 0x4000/2)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/dcon.cpp b/src/mame/drivers/dcon.cpp
index 25696fad99a..39745954c8b 100644
--- a/src/mame/drivers/dcon.cpp
+++ b/src/mame/drivers/dcon.cpp
@@ -255,7 +255,7 @@ static const gfx_layout dcon_tilelayout =
1024
};
-static GFXDECODE_START( dcon )
+static GFXDECODE_START( gfx_dcon )
GFXDECODE_ENTRY( "gfx1", 0, dcon_charlayout, 1024+768, 16 )
GFXDECODE_ENTRY( "gfx2", 0, dcon_tilelayout, 1024+0, 16 )
GFXDECODE_ENTRY( "gfx3", 0, dcon_tilelayout, 1024+512, 16 )
@@ -298,7 +298,7 @@ MACHINE_CONFIG_START(dcon_state::dcon)
MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, dcon_state, layer_en_w))
MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, dcon_state, layer_scroll_w))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dcon)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dcon)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
@@ -342,7 +342,7 @@ MACHINE_CONFIG_START(dcon_state::sdgndmps) /* PCB number is PB91008 */
MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, dcon_state, layer_en_w))
MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, dcon_state, layer_scroll_w))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dcon)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dcon)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
diff --git a/src/mame/drivers/dday.cpp b/src/mame/drivers/dday.cpp
index a2cbd3d454b..2fd83e41126 100644
--- a/src/mame/drivers/dday.cpp
+++ b/src/mame/drivers/dday.cpp
@@ -229,7 +229,7 @@ static const gfx_layout layout_3bpp =
8*8 /* every char takes 8 consecutive bytes */
};
-static GFXDECODE_START( dday )
+static GFXDECODE_START( gfx_dday )
GFXDECODE_ENTRY( "gfx1", 0, layout_3bpp, 0, 256/8 ) /* background */
GFXDECODE_ENTRY( "gfx2", 0, layout_2bpp, 8*4, 8 ) /* foreground */
GFXDECODE_ENTRY( "gfx3", 0, layout_2bpp, 8*4+8*4, 8 ) /* text */
@@ -270,7 +270,7 @@ MACHINE_CONFIG_START(dday_state::dday)
MCFG_SCREEN_UPDATE_DRIVER(dday_state, screen_update_dday)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dday)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dday)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INDIRECT_ENTRIES(256) /* HACK!!! */
MCFG_PALETTE_ENABLE_SHADOWS()
diff --git a/src/mame/drivers/ddayjlc.cpp b/src/mame/drivers/ddayjlc.cpp
index ca8f58bdedf..6ffa3e15921 100644
--- a/src/mame/drivers/ddayjlc.cpp
+++ b/src/mame/drivers/ddayjlc.cpp
@@ -514,7 +514,7 @@ static const gfx_layout spritelayout =
16*16,
};
-static GFXDECODE_START( ddayjlc )
+static GFXDECODE_START( gfx_ddayjlc )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0x000, 16 ) // upper 16 colors are unused
GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0x200, 1 )
GFXDECODE_ENTRY( "gfx3", 0, charlayout, 0x100, 16 )
@@ -617,7 +617,7 @@ MACHINE_CONFIG_START(ddayjlc_state::ddayjlc)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddayjlc_state, vblank_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ddayjlc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddayjlc)
MCFG_PALETTE_ADD("palette", 0x200+4)
MCFG_PALETTE_INIT_OWNER(ddayjlc_state, ddayjlc)
diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp
index 489fe204dd3..b0287d68866 100644
--- a/src/mame/drivers/ddealer.cpp
+++ b/src/mame/drivers/ddealer.cpp
@@ -595,7 +595,7 @@ static const gfx_layout tilelayout =
32*32
};
-static GFXDECODE_START( ddealer )
+static GFXDECODE_START( gfx_ddealer )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0x100, 16 )
GFXDECODE_END
@@ -629,7 +629,7 @@ MACHINE_CONFIG_START(ddealer_state::ddealer)
// M50747 or NMK-110 8131 MCU
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ddealer)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddealer)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp
index cd292abf197..b65d279e222 100644
--- a/src/mame/drivers/ddragon.cpp
+++ b/src/mame/drivers/ddragon.cpp
@@ -932,7 +932,7 @@ static const gfx_layout tile_layout =
};
-static GFXDECODE_START( ddragon )
+static GFXDECODE_START( gfx_ddragon )
GFXDECODE_ENTRY( "gfx1", 0, char_layout, 0, 8 ) /* colors 0-127 */
GFXDECODE_ENTRY( "gfx2", 0, tile_layout, 128, 8 ) /* colors 128-255 */
GFXDECODE_ENTRY( "gfx3", 0, tile_layout, 256, 8 ) /* colors 256-383 */
@@ -963,7 +963,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon)
MCFG_MACHINE_RESET_OVERRIDE(ddragon_state,ddragon)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ddragon)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddragon)
MCFG_PALETTE_ADD("palette", 384)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
@@ -1035,7 +1035,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon6809)
MCFG_MACHINE_RESET_OVERRIDE(ddragon_state,ddragon)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ddragon)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddragon)
MCFG_PALETTE_ADD("palette", 384)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
@@ -1088,7 +1088,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon2)
MCFG_MACHINE_RESET_OVERRIDE(ddragon_state,ddragon)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ddragon)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddragon)
MCFG_PALETTE_ADD("palette", 384)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp
index a99c0329058..37c44b4fbf8 100644
--- a/src/mame/drivers/ddragon3.cpp
+++ b/src/mame/drivers/ddragon3.cpp
@@ -753,13 +753,13 @@ static const gfx_layout wwf_sprite_layout = {
*
*************************************/
-static GFXDECODE_START( ddragon3 )
+static GFXDECODE_START( gfx_ddragon3 )
GFXDECODE_ENTRY( "gfx1", 0, wwf_tile_layout, 512, 32 )
GFXDECODE_ENTRY( "gfx1", 0, wwf_tile_layout, 256, 32 )
GFXDECODE_ENTRY( "gfx2", 0, wwf_sprite_layout, 0, 16 )
GFXDECODE_END
-static GFXDECODE_START( wwfwfest )
+static GFXDECODE_START( gfx_wwfwfest )
GFXDECODE_ENTRY( "gfx3", 0, wwf_tile_layout, 0x0c00, 16 )
GFXDECODE_ENTRY( "gfx3", 0, wwf_tile_layout, 0x1000, 16 )
GFXDECODE_ENTRY( "gfx2", 0, wwf_sprite_layout, 0x0400, 16 )
@@ -837,7 +837,7 @@ MACHINE_CONFIG_START(ddragon3_state::ddragon3)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ddragon3)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddragon3)
MCFG_PALETTE_ADD("palette", 768)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
@@ -917,7 +917,7 @@ MACHINE_CONFIG_START(wwfwfest_state::wwfwfest)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", wwfwfest)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wwfwfest)
MCFG_PALETTE_ADD("palette", 8192)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp
index d15bdaf6cd3..04f3aa1d94a 100644
--- a/src/mame/drivers/ddribble.cpp
+++ b/src/mame/drivers/ddribble.cpp
@@ -221,7 +221,7 @@ static const gfx_layout spritelayout =
32*32
};
-static GFXDECODE_START( ddribble )
+static GFXDECODE_START( gfx_ddribble )
GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 48, 1 ) /* colors 48-63 */
GFXDECODE_ENTRY( "gfx2", 0x00000, charlayout, 16, 1 ) /* colors 16-31 */
GFXDECODE_ENTRY( "gfx1", 0x20000, spritelayout, 32, 1 ) /* colors 32-47 */
@@ -285,7 +285,7 @@ MACHINE_CONFIG_START(ddribble_state::ddribble)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddribble_state, vblank_irq))
- MCFG_GFXDECODE_ADD(m_gfxdecode, "palette", ddribble)
+ MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, "palette", gfx_ddribble)
MCFG_PALETTE_ADD("palette", 64 + 256)
MCFG_PALETTE_INDIRECT_ENTRIES(64)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
diff --git a/src/mame/drivers/deadang.cpp b/src/mame/drivers/deadang.cpp
index ebe2e8d9d09..361eb30c691 100644
--- a/src/mame/drivers/deadang.cpp
+++ b/src/mame/drivers/deadang.cpp
@@ -301,7 +301,7 @@ static const gfx_layout popnrun_spritelayout =
/* Graphics Decode Information */
-static GFXDECODE_START( deadang )
+static GFXDECODE_START( gfx_deadang )
GFXDECODE_ENTRY( "gfx1", 0x000000, charlayout, 512, 16 )
GFXDECODE_ENTRY( "gfx2", 0x000000, spritelayout, 768, 16 )
GFXDECODE_ENTRY( "gfx3", 0x000000, spritelayout, 1024, 16 )
@@ -309,7 +309,7 @@ static GFXDECODE_START( deadang )
GFXDECODE_ENTRY( "gfx5", 0x000000, spritelayout, 0, 16 )
GFXDECODE_END
-static GFXDECODE_START( popnrun )
+static GFXDECODE_START( gfx_popnrun )
GFXDECODE_ENTRY( "gfx1", 0x000000, popnrun_charlayout, 0x20, 4 )
// TODO: probably runs on ROM based palette or just uses the first three entries?
GFXDECODE_ENTRY( "gfx2", 0x000000, spritelayout, 0, 8 )
@@ -375,7 +375,7 @@ MACHINE_CONFIG_START(deadang_state::deadang)
MCFG_SCREEN_UPDATE_DRIVER(deadang_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", deadang)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_deadang)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
@@ -420,7 +420,7 @@ MACHINE_CONFIG_START(popnrun_state::popnrun)
MCFG_DEVICE_REMOVE("watchdog")
- MCFG_GFXDECODE_MODIFY("gfxdecode", popnrun)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_popnrun)
MCFG_DEVICE_REMOVE("ym1")
MCFG_DEVICE_REMOVE("ym2")
diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp
index e6b93ee6103..1b78d1df538 100644
--- a/src/mame/drivers/dec0.cpp
+++ b/src/mame/drivers/dec0.cpp
@@ -1564,14 +1564,14 @@ static const gfx_layout automat_tilelayout2 =
};
-static GFXDECODE_START( dec0 )
+static GFXDECODE_START( gfx_dec0 )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 512, 16 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 768, 16 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx4", 0, tilelayout, 256, 16 ) /* Sprites 16x16 */
GFXDECODE_END
-static GFXDECODE_START( midres )
+static GFXDECODE_START( gfx_midres )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 256, 16 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 512, 16 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 768, 16 ) /* Tiles 16x16 */
@@ -1582,14 +1582,14 @@ GFXDECODE_END
-static GFXDECODE_START( automat )
+static GFXDECODE_START( gfx_automat )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx2", 0, automat_tilelayout3, 512, 16 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx3", 0, automat_tilelayout2, 768, 16 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx4", 0, automat_spritelayout, 256, 16 ) /* Sprites 16x16 */
GFXDECODE_END
-static GFXDECODE_START( secretab )
+static GFXDECODE_START( gfx_secretab )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x000, 0x10 )
GFXDECODE_ENTRY( "gfx2", 0, automat_tilelayout2, 0x200, 0x10 )
GFXDECODE_ENTRY( "gfx3", 0, automat_tilelayout2, 0x300, 0x10 )
@@ -1618,7 +1618,7 @@ MACHINE_CONFIG_START(dec0_state::dec0_base)
//MCFG_SCREEN_UPDATE_DRIVER differs per game
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dec0)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dec0)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_DEVICE_ADD("tilegen1", DECO_BAC06, 0)
@@ -1768,7 +1768,7 @@ MACHINE_CONFIG_START(dec0_automat_state::automat)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", automat)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_automat)
/* sound hardware */
SPEAKER(config, "mono").front_center();
@@ -1843,7 +1843,7 @@ MACHINE_CONFIG_START(dec0_automat_state::secretab)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", secretab)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_secretab)
/* sound hardware */
SPEAKER(config, "mono").front_center();
@@ -2029,7 +2029,7 @@ MACHINE_CONFIG_START(dec0_state::midres)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(dec0_state, screen_update_midres)
- MCFG_GFXDECODE_MODIFY("gfxdecode", midres)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_midres)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec0_state::midresb)
diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp
index 9e591661d68..f1ad0dc02f1 100644
--- a/src/mame/drivers/dec8.cpp
+++ b/src/mame/drivers/dec8.cpp
@@ -1821,20 +1821,20 @@ static const gfx_layout tiles_r =
16*16
};
-static GFXDECODE_START( cobracom )
+static GFXDECODE_START( gfx_cobracom )
GFXDECODE_ENTRY( "gfx1", 0, charlayout_32k, 0, 8 )
GFXDECODE_ENTRY( "gfx2", 0, tiles, 64, 4 )
GFXDECODE_ENTRY( "gfx4", 0, tiles, 128, 4 )
GFXDECODE_ENTRY( "gfx3", 0, tiles, 192, 4 )
GFXDECODE_END
-static GFXDECODE_START( ghostb )
+static GFXDECODE_START( gfx_ghostb )
GFXDECODE_ENTRY( "gfx1", 0, chars_3bpp, 0, 4 )
GFXDECODE_ENTRY( "gfx2", 0, tiles, 256, 16 )
GFXDECODE_ENTRY( "gfx3", 0, tiles_r, 512, 16 )
GFXDECODE_END
-static GFXDECODE_START( srdarwin )
+static GFXDECODE_START( gfx_srdarwin )
GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout_16k,128, 4 ) /* Only 1 used so far :/ */
GFXDECODE_ENTRY( "gfx2", 0x00000, sr_sprites, 64, 8 )
GFXDECODE_ENTRY( "gfx3", 0x00000, srdarwin_tiles, 0, 8 )
@@ -1843,19 +1843,19 @@ static GFXDECODE_START( srdarwin )
GFXDECODE_ENTRY( "gfx3", 0x30000, srdarwin_tiles, 0, 8 )
GFXDECODE_END
-static GFXDECODE_START( gondo )
+static GFXDECODE_START( gfx_gondo )
GFXDECODE_ENTRY( "gfx1", 0, chars_3bpp, 0, 16 ) /* Chars */
GFXDECODE_ENTRY( "gfx2", 0, tiles, 256, 32 ) /* Sprites */
GFXDECODE_ENTRY( "gfx3", 0, tiles, 768, 16 ) /* Tiles */
GFXDECODE_END
-static GFXDECODE_START( oscar )
+static GFXDECODE_START( gfx_oscar )
GFXDECODE_ENTRY( "gfx1", 0, oscar_charlayout, 256, 8 ) /* Chars */
GFXDECODE_ENTRY( "gfx2", 0, tiles, 0, 16 ) /* Sprites */
GFXDECODE_ENTRY( "gfx3", 0, tiles, 384, 8 ) /* Tiles */
GFXDECODE_END
-static GFXDECODE_START( shackled )
+static GFXDECODE_START( gfx_shackled )
GFXDECODE_ENTRY( "gfx1", 0, chars_3bpp, 0, 4 )
GFXDECODE_ENTRY( "gfx2", 0, tiles, 256, 16 )
GFXDECODE_ENTRY( "gfx3", 0, tiles, 768, 16 )
@@ -1978,7 +1978,7 @@ MACHINE_CONFIG_START(dec8_state::lastmisn)
MCFG_SCREEN_UPDATE_DRIVER(dec8_state, screen_update_lastmisn)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", shackled)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_shackled)
MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024)
@@ -2043,7 +2043,7 @@ MACHINE_CONFIG_START(dec8_state::shackled)
MCFG_SCREEN_UPDATE_DRIVER(dec8_state, screen_update_shackled)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", shackled)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_shackled)
MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024)
@@ -2104,7 +2104,7 @@ MACHINE_CONFIG_START(dec8_state::gondo)
MCFG_INPUT_MERGER_ALL_HIGH("nmigate")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", gondo)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gondo)
MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024)
@@ -2165,7 +2165,7 @@ MACHINE_CONFIG_START(dec8_state::garyoret)
MCFG_INPUT_MERGER_ALL_HIGH("nmigate")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", gondo)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gondo)
MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024)
@@ -2227,7 +2227,7 @@ MACHINE_CONFIG_START(dec8_state::ghostb)
MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, dec8_state, ghostb_nmi_w))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ghostb)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ghostb)
MCFG_DECO_RMC3_ADD_PROMS("palette","proms",1024) // xxxxBBBBGGGGRRRR with custom weighting
MCFG_VIDEO_START_OVERRIDE(dec8_state,ghostb)
@@ -2285,7 +2285,7 @@ MACHINE_CONFIG_START(dec8_state::csilver)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("sub", INPUT_LINE_NMI))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", shackled)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_shackled)
MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024)
@@ -2349,7 +2349,7 @@ MACHINE_CONFIG_START(dec8_state::oscar)
MCFG_SCREEN_UPDATE_DRIVER(dec8_state, screen_update_oscar)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", oscar)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_oscar)
MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024)
@@ -2403,7 +2403,7 @@ MACHINE_CONFIG_START(dec8_state::srdarwin)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", srdarwin)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_srdarwin)
MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
MCFG_DECO_RMC3_SET_PALETTE_SIZE(144)
@@ -2460,7 +2460,7 @@ MACHINE_CONFIG_START(dec8_state::cobracom)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cobracom)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cobracom)
MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
MCFG_DECO_RMC3_SET_PALETTE_SIZE(256)
diff --git a/src/mame/drivers/deco156.cpp b/src/mame/drivers/deco156.cpp
index f444dee5ecc..98f55b96954 100644
--- a/src/mame/drivers/deco156.cpp
+++ b/src/mame/drivers/deco156.cpp
@@ -295,7 +295,7 @@ static const gfx_layout tilelayout =
64*8
};
-static GFXDECODE_START( hvysmsh )
+static GFXDECODE_START( gfx_hvysmsh )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 32 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 512, 32 ) /* Sprites 16x16 */
@@ -343,7 +343,7 @@ MACHINE_CONFIG_START(deco156_state::hvysmsh)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(deco156_state, screen_update)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", hvysmsh)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hvysmsh)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(XBGR)
@@ -397,7 +397,7 @@ MACHINE_CONFIG_START(deco156_state::wcvol95)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(deco156_state, screen_update)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", hvysmsh)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hvysmsh)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp
index 7e3288a7245..0c431730688 100644
--- a/src/mame/drivers/deco32.cpp
+++ b/src/mame/drivers/deco32.cpp
@@ -1820,21 +1820,21 @@ static const gfx_layout spritelayout5 =
16*16*8
};
-static GFXDECODE_START( captaven )
+static GFXDECODE_START( gfx_captaven )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 128 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout_8bpp, 0, 128 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0, 32 ) /* Sprites 16x16 */
GFXDECODE_END
-static GFXDECODE_START( fghthist )
+static GFXDECODE_START( gfx_fghthist )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 128 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 128 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 1024, 128 ) /* Sprites 16x16 */
GFXDECODE_END
-static GFXDECODE_START( dragngun )
+static GFXDECODE_START( gfx_dragngun )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 64 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx3", 0, tilelayout_8bpp, 0, 8 ) /* Tiles 16x16 */
@@ -1842,7 +1842,7 @@ static GFXDECODE_START( dragngun )
GFXDECODE_ENTRY( "gfx4", 0, spritelayout5, 0, 32 ) /* Sprites 16x16 */
GFXDECODE_END
-static GFXDECODE_START( tattass )
+static GFXDECODE_START( gfx_tattass )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 128 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 128 ) /* Tiles 16x16 */
@@ -1850,7 +1850,7 @@ static GFXDECODE_START( tattass )
GFXDECODE_ENTRY( "gfx4", 0, spritelayout, 1024+256, 32 ) /* Sprites 16x16 */
GFXDECODE_END
-static GFXDECODE_START( nslasher )
+static GFXDECODE_START( gfx_nslasher )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) /* Characters 8x8 */
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 128 ) /* Tiles 16x16 */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 128 ) /* Tiles 16x16 */
@@ -1884,7 +1884,7 @@ MACHINE_CONFIG_START(captaven_state::captaven)
MCFG_SCREEN_UPDATE_DRIVER(captaven_state, screen_update_captaven)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", captaven)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_captaven)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(XBGR)
@@ -1965,7 +1965,7 @@ MACHINE_CONFIG_START(fghthist_state::fghthist)
MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(fghthist_state, screen_update_fghthist)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", fghthist)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fghthist)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0)
@@ -2134,7 +2134,7 @@ MACHINE_CONFIG_START(dragngun_state::dragngun)
MCFG_DEVICE_ADD("spritegen_zoom", DECO_ZOOMSPR, 0)
MCFG_DECO_ZOOMSPR_GFXDECODE("gfxdecode")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dragngun)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dragngun)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_VIDEO_START_OVERRIDE(dragngun_state,dragngun)
@@ -2232,7 +2232,7 @@ MACHINE_CONFIG_START(dragngun_state::lockload)
MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM32)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dragngun)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dragngun)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_VIDEO_START_OVERRIDE(dragngun_state, dragngun)
@@ -2357,7 +2357,7 @@ MACHINE_CONFIG_START(nslasher_state::tattass)
MCFG_DECO_SPRITE_GFX_REGION(4)
MCFG_DECO_SPRITE_GFXDECODE("gfxdecode")
- MCFG_GFXDECODE_ADD("gfxdecode", "deco_ace", tattass)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "deco_ace", gfx_tattass)
MCFG_DECO104_ADD("ioprot")
MCFG_DECO146_IN_PORTA_CB(IOPORT("IN0"))
@@ -2436,7 +2436,7 @@ MACHINE_CONFIG_START(nslasher_state::nslasher)
MCFG_DECO_SPRITE_GFX_REGION(4)
MCFG_DECO_SPRITE_GFXDECODE("gfxdecode")
- MCFG_GFXDECODE_ADD("gfxdecode", "deco_ace", nslasher)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "deco_ace", gfx_nslasher)
MCFG_VIDEO_START_OVERRIDE(nslasher_state, nslasher)
diff --git a/src/mame/drivers/deco_ld.cpp b/src/mame/drivers/deco_ld.cpp
index e9bda52913d..517faaa9292 100644
--- a/src/mame/drivers/deco_ld.cpp
+++ b/src/mame/drivers/deco_ld.cpp
@@ -451,7 +451,7 @@ static const gfx_layout spritelayout =
16*16
};
-static GFXDECODE_START( rblaster )
+static GFXDECODE_START( gfx_rblaster )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 8 )
GFXDECODE_END
@@ -480,7 +480,7 @@ MACHINE_CONFIG_START(deco_ld_state::rblaster)
/* video hardware */
MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", rblaster)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rblaster)
MCFG_PALETTE_ADD("palette", 0x800)
MCFG_PALETTE_FORMAT(BBGGGRRR_inverted)
diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp
index 07d4647975c..97bcb17c059 100644
--- a/src/mame/drivers/deco_mlc.cpp
+++ b/src/mame/drivers/deco_mlc.cpp
@@ -489,15 +489,15 @@ static const gfx_layout spritelayout_6bpp =
16*32
};
-static GFXDECODE_START( deco_mlc )
+static GFXDECODE_START( gfx_deco_mlc )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout_4bpp, 0, 256 )
GFXDECODE_END
-static GFXDECODE_START( 5bpp )
+static GFXDECODE_START( gfx_5bpp )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout_5bpp, 0, 128 )
GFXDECODE_END
-static GFXDECODE_START( 6bpp )
+static GFXDECODE_START( gfx_6bpp )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout_6bpp, 0, 64 )
GFXDECODE_END
@@ -529,7 +529,7 @@ MACHINE_CONFIG_START(deco_mlc_state::avengrgs)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, deco_mlc_state, screen_vblank_mlc))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", deco_mlc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_deco_mlc)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
MCFG_PALETTE_MEMBITS(16)
@@ -565,7 +565,7 @@ MACHINE_CONFIG_START(deco_mlc_state::mlc)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, deco_mlc_state, screen_vblank_mlc))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", deco_mlc)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_deco_mlc)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
MCFG_PALETTE_MEMBITS(16)
@@ -586,12 +586,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(deco_mlc_state::mlc_6bpp)
mlc(config);
- MCFG_GFXDECODE_MODIFY("gfxdecode", 6bpp)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_6bpp)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(deco_mlc_state::mlc_5bpp)
mlc(config);
- MCFG_GFXDECODE_MODIFY("gfxdecode", 5bpp)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_5bpp)
// TODO: mono? ch.0 doesn't output any sound in-game
MCFG_DEVICE_MODIFY("ymz")
diff --git a/src/mame/drivers/decocass.cpp b/src/mame/drivers/decocass.cpp
index 422bee1aba0..77c4e200b5a 100644
--- a/src/mame/drivers/decocass.cpp
+++ b/src/mame/drivers/decocass.cpp
@@ -932,7 +932,7 @@ static const gfx_layout objlayout =
objlayout_yoffset
};
-static GFXDECODE_START( decocass )
+static GFXDECODE_START( gfx_decocass )
GFXDECODE_ENTRY( nullptr, 0x6000, charlayout, 0, 4 ) /* char set #1 */
GFXDECODE_ENTRY( nullptr, 0x6000, spritelayout, 0, 4 ) /* sprites */
GFXDECODE_ENTRY( nullptr, 0xd000, tilelayout, 0, 8 ) /* background tiles */
@@ -980,7 +980,7 @@ MACHINE_CONFIG_START(decocass_state::decocass)
MCFG_SCREEN_UPDATE_DRIVER(decocass_state, screen_update_decocass)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", decocass)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_decocass)
MCFG_PALETTE_ADD("palette", 64)
MCFG_PALETTE_INDIRECT_ENTRIES(32)
MCFG_PALETTE_INIT_OWNER(decocass_state, decocass)
diff --git a/src/mame/drivers/deniam.cpp b/src/mame/drivers/deniam.cpp
index 3e5b8e85d84..e89c80610b7 100644
--- a/src/mame/drivers/deniam.cpp
+++ b/src/mame/drivers/deniam.cpp
@@ -215,7 +215,7 @@ static const gfx_layout charlayout =
};
-static GFXDECODE_START( deniam )
+static GFXDECODE_START( gfx_deniam )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) /* colors 0-1023 */
/* sprites use colors 1024-2047 */
GFXDECODE_END
@@ -272,7 +272,7 @@ MACHINE_CONFIG_START(deniam_state::deniam16b)
MCFG_SCREEN_UPDATE_DRIVER(deniam_state, screen_update_deniam)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", deniam)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_deniam)
MCFG_PALETTE_ADD("palette", 2048)
@@ -308,7 +308,7 @@ MACHINE_CONFIG_START(deniam_state::deniam16c)
MCFG_SCREEN_UPDATE_DRIVER(deniam_state, screen_update_deniam)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", deniam)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_deniam)
MCFG_PALETTE_ADD("palette", 2048)
diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp
index 24a1f698fb9..7d2f3ea1e21 100644
--- a/src/mame/drivers/destroyr.cpp
+++ b/src/mame/drivers/destroyr.cpp
@@ -429,7 +429,7 @@ static const gfx_layout destroyr_waves_layout =
};
-static GFXDECODE_START( destroyr )
+static GFXDECODE_START( gfx_destroyr )
GFXDECODE_ENTRY( "gfx1", 0, destroyr_alpha_num_layout, 4, 1 )
GFXDECODE_ENTRY( "gfx2", 0, destroyr_minor_object_layout, 4, 1 )
GFXDECODE_ENTRY( "gfx3", 0, destroyr_major_object_layout, 0, 1 )
@@ -491,7 +491,7 @@ MACHINE_CONFIG_START(destroyr_state::destroyr)
MCFG_SCREEN_UPDATE_DRIVER(destroyr_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", destroyr)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_destroyr)
MCFG_PALETTE_ADD("palette", 8)
MCFG_PALETTE_INIT_OWNER(destroyr_state, destroyr)
diff --git a/src/mame/drivers/dfruit.cpp b/src/mame/drivers/dfruit.cpp
index 2c8a9d9809d..fd27b603c56 100644
--- a/src/mame/drivers/dfruit.cpp
+++ b/src/mame/drivers/dfruit.cpp
@@ -342,7 +342,7 @@ static const gfx_layout char_layout =
};
#endif
-static GFXDECODE_START( dfruit )
+static GFXDECODE_START( gfx_dfruit )
GFXDECODE_ENTRY( "gfx1", 0, bg2_layout, 0, 16 )
GFXDECODE_ENTRY( "gfx1", 0, sp2_layout, 0, 16 )
//GFXDECODE_ENTRY( nullptr, 0, char_layout, 0, 16 ) // Ram-based
@@ -390,7 +390,7 @@ MACHINE_CONFIG_START(dfruit_state::dfruit)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dfruit_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dfruit )
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dfruit )
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_DEVICE_ADD("tc0091lvc", TC0091LVC, 0)
diff --git a/src/mame/drivers/dgn_beta.cpp b/src/mame/drivers/dgn_beta.cpp
index b8efd11ce4d..f664ed16dff 100644
--- a/src/mame/drivers/dgn_beta.cpp
+++ b/src/mame/drivers/dgn_beta.cpp
@@ -305,7 +305,7 @@ static const gfx_layout dgnbeta_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( dgnbeta )
+static GFXDECODE_START( gfx_dgnbeta )
GFXDECODE_ENTRY( "gfx1", 0x0000, dgnbeta_charlayout, 0, 8 )
GFXDECODE_END
@@ -338,7 +338,7 @@ MACHINE_CONFIG_START(dgn_beta_state::dgnbeta)
MCFG_SCREEN_UPDATE_DEVICE( "crtc", hd6845_device, screen_update )
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dgnbeta)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dgnbeta)
MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(dgnbeta_palette) / 3)
MCFG_PALETTE_INIT_OWNER(dgn_beta_state, dgn)
diff --git a/src/mame/drivers/dietgo.cpp b/src/mame/drivers/dietgo.cpp
index 84dac403408..06ec4bfcb85 100644
--- a/src/mame/drivers/dietgo.cpp
+++ b/src/mame/drivers/dietgo.cpp
@@ -195,7 +195,7 @@ static const gfx_layout spritelayout =
32*32
};
-static GFXDECODE_START( dietgo )
+static GFXDECODE_START( gfx_dietgo )
GFXDECODE_ENTRY( "gfx1", 0, tile_8x8_layout, 0, 32 ) /* Tiles (8x8) */
GFXDECODE_ENTRY( "gfx1", 0, tile_16x16_layout, 0, 32 ) /* Tiles (16x16) */
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 512, 16 ) /* Sprites (16x16) */
@@ -229,7 +229,7 @@ MACHINE_CONFIG_START(dietgo_state::dietgo)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(XBGR)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dietgo)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dietgo)
MCFG_DEVICE_ADD("tilegen", DECO16IC, 0)
MCFG_DECO16IC_SPLIT(0)
diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp
index 7c6f21c04c0..7126ce49dfd 100644
--- a/src/mame/drivers/dim68k.cpp
+++ b/src/mame/drivers/dim68k.cpp
@@ -293,7 +293,7 @@ static const gfx_layout dim68k_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( dim68k )
+static GFXDECODE_START( gfx_dim68k )
GFXDECODE_ENTRY( "chargen", 0x0000, dim68k_charlayout, 0, 1 )
GFXDECODE_END
@@ -320,7 +320,7 @@ MACHINE_CONFIG_START(dim68k_state::dim68k)
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 250-1)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dim68k)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dim68k)
/* sound hardware */
SPEAKER(config, "mono").front_center();
diff --git a/src/mame/drivers/discoboy.cpp b/src/mame/drivers/discoboy.cpp
index cadca9d9828..eba4909d68d 100644
--- a/src/mame/drivers/discoboy.cpp
+++ b/src/mame/drivers/discoboy.cpp
@@ -423,7 +423,7 @@ static const gfx_layout tiles8x8_layout2 =
8*8
};
-static GFXDECODE_START( discoboy )
+static GFXDECODE_START( gfx_discoboy )
GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0x000, 128 )
GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout2, 0x000, 128 )
GFXDECODE_END
@@ -479,7 +479,7 @@ MACHINE_CONFIG_START(discoboy_state::discoboy)
MCFG_SCREEN_UPDATE_DRIVER(discoboy_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", discoboy)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_discoboy)
MCFG_PALETTE_ADD("palette", 0x1000)
diff --git a/src/mame/drivers/divebomb.cpp b/src/mame/drivers/divebomb.cpp
index 4d34eec9658..0421442f998 100644
--- a/src/mame/drivers/divebomb.cpp
+++ b/src/mame/drivers/divebomb.cpp
@@ -373,7 +373,7 @@ static const gfx_layout tiles16x16_layout =
};
-static GFXDECODE_START( divebomb )
+static GFXDECODE_START( gfx_divebomb )
GFXDECODE_ENTRY( "fgrom", 0, tiles8x8_layout, 0x400+0x400, 16 )
GFXDECODE_ENTRY( "sprites", 0, tiles16x16_layout, 0x400+0x400+0x400, 16 )
GFXDECODE_END
@@ -448,7 +448,7 @@ MACHINE_CONFIG_START(divebomb_state::divebomb)
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("spritecpu", INPUT_LINE_NMI))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("rozcpu", INPUT_LINE_NMI))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", divebomb)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_divebomb)
MCFG_PALETTE_ADD("palette", 0x400+0x400+0x400+0x100)
MCFG_PALETTE_INIT_OWNER(divebomb_state, divebomb)
diff --git a/src/mame/drivers/diverboy.cpp b/src/mame/drivers/diverboy.cpp
index 135287a8904..f5d78ba2581 100644
--- a/src/mame/drivers/diverboy.cpp
+++ b/src/mame/drivers/diverboy.cpp
@@ -260,7 +260,7 @@ static const gfx_layout diverboy_spritelayout =
16*64
};
-static GFXDECODE_START( diverboy )
+static GFXDECODE_START( gfx_diverboy )
GFXDECODE_ENTRY( "gfx1", 0, diverboy_spritelayout, 0, 4*16 )
GFXDECODE_ENTRY( "gfx2", 0, diverboy_spritelayout, 0, 4*16 )
GFXDECODE_END
@@ -280,7 +280,7 @@ MACHINE_CONFIG_START(diverboy_state::diverboy)
MCFG_DEVICE_PROGRAM_MAP(snd_map)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", diverboy)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_diverboy)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp
index 0fcee4cd315..d8fa3f97c98 100644
--- a/src/mame/drivers/djboy.cpp
+++ b/src/mame/drivers/djboy.cpp
@@ -429,7 +429,7 @@ static const gfx_layout tile_layout =
16*16*4
};
-static GFXDECODE_START( djboy )
+static GFXDECODE_START( gfx_djboy )
GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0x100, 16 ) /* sprite bank */
GFXDECODE_ENTRY( "gfx2", 0, tile_layout, 0x000, 16 ) /* background tiles */
GFXDECODE_END
@@ -523,7 +523,7 @@ MACHINE_CONFIG_START(djboy_state::djboy)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, djboy_state, screen_vblank_djboy))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", djboy)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_djboy)
MCFG_PALETTE_ADD("palette", 0x200)
MCFG_DEVICE_ADD("pandora", KANEKO_PANDORA, 0)
diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp
index a291b5964fb..e1e781bcf3d 100644
--- a/src/mame/drivers/djmain.cpp
+++ b/src/mame/drivers/djmain.cpp
@@ -1330,7 +1330,7 @@ static const gfx_layout spritelayout =
16*16*4
};
-static GFXDECODE_START( djmain )
+static GFXDECODE_START( gfx_djmain )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, (0x4440/4)/16 )
GFXDECODE_END
@@ -1399,7 +1399,7 @@ MACHINE_CONFIG_START(djmain_state::djmainj)
MCFG_PALETTE_ADD("palette", 0x4440/4)
MCFG_PALETTE_FORMAT(XBGR)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", djmain)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_djmain)
MCFG_DEVICE_ADD("k056832", K056832, 0)
MCFG_K056832_CB(djmain_state, tile_callback)
diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp
index ebe8eb9b17c..20e9e79b10c 100644
--- a/src/mame/drivers/dkong.cpp
+++ b/src/mame/drivers/dkong.cpp
@@ -1614,7 +1614,7 @@ static const gfx_layout spritelayout =
16*8 /* every sprite takes 16 consecutive bytes */
};
-static GFXDECODE_START( dkong )
+static GFXDECODE_START( gfx_dkong )
GFXDECODE_ENTRY( "gfx1", 0x0000, gfx_8x8x2_planar, 0, 64 )
GFXDECODE_ENTRY( "gfx2", 0x0000, spritelayout, 0, 64 )
GFXDECODE_END
@@ -1716,7 +1716,7 @@ MACHINE_CONFIG_START(dkong_state::dkong_base)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dkong_state, vblank_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dkong)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dkong)
MCFG_PALETTE_ADD("palette", DK2B_PALETTE_LENGTH)
MCFG_PALETTE_INIT_OWNER(dkong_state,dkong2b)
@@ -1811,7 +1811,7 @@ MACHINE_CONFIG_START(dkong_state::dkong3)
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("n2a03a", INPUT_LINE_NMI))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("n2a03b", INPUT_LINE_NMI))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dkong)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dkong)
MCFG_PALETTE_ADD("palette", DK3_PALETTE_LENGTH)
MCFG_PALETTE_INIT_OWNER(dkong_state,dkong3)
diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp
index 53a800177c8..e2b22408788 100644
--- a/src/mame/drivers/dlair.cpp
+++ b/src/mame/drivers/dlair.cpp
@@ -718,7 +718,7 @@ static const gfx_layout charlayout =
};
-static GFXDECODE_START( dlair )
+static GFXDECODE_START( gfx_dlair )
GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 8 )
GFXDECODE_END
@@ -791,7 +791,7 @@ MACHINE_CONFIG_START(dlair_state::dleuro)
/* video hardware */
MCFG_LASERDISC_SCREEN_ADD_PAL("screen", "ld_22vp932")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dlair)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dlair)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(dlair_state,dleuro)
diff --git a/src/mame/drivers/dlair2.cpp b/src/mame/drivers/dlair2.cpp
index e9fa0a26e4e..ea30e38503f 100644
--- a/src/mame/drivers/dlair2.cpp
+++ b/src/mame/drivers/dlair2.cpp
@@ -158,7 +158,7 @@ static const gfx_layout charlayout =
8*8
};
-static GFXDECODE_START( dlair2 )
+static GFXDECODE_START( gfx_dlair2 )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 )
GFXDECODE_END
*/
@@ -197,7 +197,7 @@ MACHINE_CONFIG_START(dlair2_state::dlair2)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
MCFG_SCREEN_PALETTE("palette")
-// MCFG_GFXDECODE_ADD("gfxdecode", "palette", dlair2)
+// MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dlair2)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(dlair2_state, dlair2)
diff --git a/src/mame/drivers/dmndrby.cpp b/src/mame/drivers/dmndrby.cpp
index a1516ad6d93..18a75a103de 100644
--- a/src/mame/drivers/dmndrby.cpp
+++ b/src/mame/drivers/dmndrby.cpp
@@ -337,7 +337,7 @@ static const gfx_layout tiles8x8_layout2 =
8*8,
};
-static GFXDECODE_START( dmndrby )
+static GFXDECODE_START( gfx_dmndrby )
GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 32*16, 32 )
GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout2, 0, 8)
GFXDECODE_ENTRY( "gfx3", 0, tiles16x16_layout, 16*16, 32 )
@@ -550,7 +550,7 @@ MACHINE_CONFIG_START(dmndrby_state::dderby)
MCFG_SCREEN_UPDATE_DRIVER(dmndrby_state, screen_update_dderby)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dmndrby)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dmndrby)
MCFG_PALETTE_ADD("palette", 0x300)
MCFG_PALETTE_INDIRECT_ENTRIES(0x20)
MCFG_PALETTE_INIT_OWNER(dmndrby_state, dmndrby)
diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp
index 4519d6d2576..d51c3bb07c6 100644
--- a/src/mame/drivers/dmv.cpp
+++ b/src/mame/drivers/dmv.cpp
@@ -44,32 +44,32 @@ class dmv_state : public driver_device
{
public:
dmv_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_screen(*this, "screen"),
- m_hgdc(*this, "upd7220"),
- m_dmac(*this, "dma8237"),
- m_pit(*this, "pit8253"),
- m_fdc(*this, "i8272"),
- m_floppy0(*this, "i8272:0"),
- m_floppy1(*this, "i8272:1"),
- m_keyboard(*this, "keyboard"),
- m_speaker(*this, "speaker"),
- m_video_ram(*this, "video_ram"),
- m_palette(*this, "palette"),
- m_ram(*this, "ram"),
- m_bootrom(*this, "boot"),
- m_chargen(*this, "chargen"),
- m_slot1(*this, "slot1"),
- m_slot2(*this, "slot2"),
- m_slot2a(*this, "slot2a"),
- m_slot3(*this, "slot3"),
- m_slot4(*this, "slot4"),
- m_slot5(*this, "slot5"),
- m_slot6(*this, "slot6"),
- m_slot7(*this, "slot7"),
- m_slot7a(*this, "slot7a")
- { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_screen(*this, "screen")
+ , m_hgdc(*this, "upd7220")
+ , m_dmac(*this, "dma8237")
+ , m_pit(*this, "pit8253")
+ , m_fdc(*this, "i8272")
+ , m_floppy0(*this, "i8272:0")
+ , m_floppy1(*this, "i8272:1")
+ , m_keyboard(*this, "keyboard")
+ , m_speaker(*this, "speaker")
+ , m_video_ram(*this, "video_ram")
+ , m_palette(*this, "palette")
+ , m_ram(*this, "ram")
+ , m_bootrom(*this, "boot")
+ , m_chargen(*this, "chargen")
+ , m_slot1(*this, "slot1")
+ , m_slot2(*this, "slot2")
+ , m_slot2a(*this, "slot2a")
+ , m_slot3(*this, "slot3")
+ , m_slot4(*this, "slot4")
+ , m_slot5(*this, "slot5")
+ , m_slot6(*this, "slot6")
+ , m_slot7(*this, "slot7")
+ , m_slot7a(*this, "slot7a")
+ { }
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
@@ -663,7 +663,7 @@ static const gfx_layout dmv_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( dmv )
+static GFXDECODE_START( gfx_dmv )
GFXDECODE_ENTRY("chargen", 0x0000, dmv_charlayout, 0, 1)
GFXDECODE_END
@@ -788,7 +788,7 @@ MACHINE_CONFIG_START(dmv_state::dmv)
MCFG_SCREEN_SIZE(640, 400)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dmv)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dmv)
MCFG_PALETTE_ADD_3BIT_RGB("palette")
MCFG_DEFAULT_LAYOUT(layout_dmv)
diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp
index 238afb67ee8..d83e8582a90 100644
--- a/src/mame/drivers/docastle.cpp
+++ b/src/mame/drivers/docastle.cpp
@@ -553,7 +553,7 @@ static const gfx_layout spritelayout =
/* Graphics Decode Information */
-static GFXDECODE_START( docastle )
+static GFXDECODE_START( gfx_docastle )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 32*2 )
GFXDECODE_END
@@ -645,7 +645,7 @@ MACHINE_CONFIG_START(docastle_state::docastle)
MCFG_SCREEN_UPDATE_DRIVER(docastle_state, screen_update_docastle)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", docastle)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_docastle)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INIT_OWNER(docastle_state, docastle)
diff --git a/src/mame/drivers/dogfgt.cpp b/src/mame/drivers/dogfgt.cpp
index d7d44aa13ab..b06334f4fe2 100644
--- a/src/mame/drivers/dogfgt.cpp
+++ b/src/mame/drivers/dogfgt.cpp
@@ -204,7 +204,7 @@ static const gfx_layout spritelayout =
16*16
};
-static GFXDECODE_START( dogfgt )
+static GFXDECODE_START( gfx_dogfgt )
GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 16, 4 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 2 )
GFXDECODE_END
@@ -260,7 +260,7 @@ MACHINE_CONFIG_START(dogfgt_state::dogfgt)
MCFG_SCREEN_UPDATE_DRIVER(dogfgt_state, screen_update_dogfgt)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dogfgt)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dogfgt)
MCFG_PALETTE_ADD("palette", 16+64)
MCFG_PALETTE_FORMAT(BBGGGRRR)
MCFG_PALETTE_INIT_OWNER(dogfgt_state, dogfgt)
diff --git a/src/mame/drivers/dominob.cpp b/src/mame/drivers/dominob.cpp
index 454336dcfac..f0417b7f9f8 100644
--- a/src/mame/drivers/dominob.cpp
+++ b/src/mame/drivers/dominob.cpp
@@ -288,7 +288,7 @@ static const gfx_layout bglayout =
16*32*2
};
-static GFXDECODE_START( dominob )
+static GFXDECODE_START( gfx_dominob )
GFXDECODE_ENTRY("gfx1", 0, charlayout, 0, 0x20)
GFXDECODE_ENTRY("gfx2", 0, bglayout, 0x100, 0x10)
GFXDECODE_END
@@ -311,7 +311,7 @@ MACHINE_CONFIG_START(dominob_state::dominob)
MCFG_SCREEN_UPDATE_DRIVER(dominob_state, screen_update_dominob)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dominob)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dominob)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB)
diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp
index 0fc2dd3b831..1ea9272763a 100644
--- a/src/mame/drivers/dooyong.cpp
+++ b/src/mame/drivers/dooyong.cpp
@@ -1369,21 +1369,21 @@ const gfx_layout rshark_spritelayout =
128*8
};
-GFXDECODE_START( lastday )
+GFXDECODE_START( gfx_lastday )
GFXDECODE_ENTRY( "gfx1", 0, lastday_charlayout, 0, 16+64 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 16+64 )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 768, 16+64 )
GFXDECODE_ENTRY( "gfx4", 0, tilelayout, 512, 16+64 )
GFXDECODE_END
-GFXDECODE_START( flytiger )
+GFXDECODE_START( gfx_flytiger )
GFXDECODE_ENTRY( "gfx1", 0, lastday_charlayout, 0, 16+64 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 16+64 )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 768, 16+64 )
GFXDECODE_ENTRY( "gfx4", 0, tilelayout, 512, 32+64 )
GFXDECODE_END
-GFXDECODE_START( bluehawk )
+GFXDECODE_START( gfx_bluehawk )
GFXDECODE_ENTRY( "gfx1", 0, bluehawk_charlayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 16 )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 768, 16 )
@@ -1391,14 +1391,14 @@ GFXDECODE_START( bluehawk )
GFXDECODE_ENTRY( "gfx5", 0, tilelayout, 0, 16 )
GFXDECODE_END
-GFXDECODE_START( primella )
+GFXDECODE_START( gfx_primella )
GFXDECODE_ENTRY( "gfx1", 0, bluehawk_charlayout, 0, 16 )
/* no sprites */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 768, 16 )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 512, 16 )
GFXDECODE_END
-GFXDECODE_START( rshark )
+GFXDECODE_START( gfx_rshark )
/* no chars */
GFXDECODE_ENTRY( "gfx1", 0, rshark_spritelayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 16 )
@@ -1407,7 +1407,7 @@ GFXDECODE_START( rshark )
GFXDECODE_ENTRY( "gfx5", 0, spritelayout, 1024, 16 )
GFXDECODE_END
-GFXDECODE_START( popbingo )
+GFXDECODE_START( gfx_popbingo )
/* no chars */
GFXDECODE_ENTRY( "gfx1", 0, rshark_spritelayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 1 )
@@ -1498,7 +1498,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastday)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lastday)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
MCFG_DOOYONG_ROM_TILEMAP_ADD("bg1", "gfxdecode", 2, "gfx5", 0x00000)
@@ -1551,7 +1551,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::gulfstrm)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastday)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lastday)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
MCFG_DOOYONG_ROM_TILEMAP_ADD("bg1", "gfxdecode", 2, "gfx5", 0x00000)
@@ -1589,7 +1589,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::pollux)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastday)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lastday)
MCFG_PALETTE_ADD("palette", 1024*2)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
MCFG_DOOYONG_ROM_TILEMAP_ADD("bg1", "gfxdecode", 2, "gfx5", 0x00000)
@@ -1627,7 +1627,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::bluehawk)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bluehawk)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bluehawk)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
MCFG_DOOYONG_ROM_TILEMAP_ADD("bg1", "gfxdecode", 2, "gfx3", 0x3c000)
@@ -1667,7 +1667,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::flytiger)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", flytiger)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_flytiger)
MCFG_PALETTE_ADD("palette", 1024*2)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
MCFG_DOOYONG_ROM_TILEMAP_ADD("bg1", "gfxdecode", 2, "gfx3", 0x3c000)
@@ -1703,7 +1703,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::primella)
MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_state, screen_update_primella)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", primella)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_primella)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
MCFG_DOOYONG_ROM_TILEMAP_ADD("bg1", "gfxdecode", 1, "gfx2", -0x4000)
@@ -1753,7 +1753,7 @@ MACHINE_CONFIG_START(rshark_state::dooyong_68k)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", rshark)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rshark)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -1805,7 +1805,7 @@ MACHINE_CONFIG_START(popbingo_state::popbingo)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", popbingo)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_popbingo)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/dragrace.cpp b/src/mame/drivers/dragrace.cpp
index dc5fa24440c..39010d60c0d 100644
--- a/src/mame/drivers/dragrace.cpp
+++ b/src/mame/drivers/dragrace.cpp
@@ -233,7 +233,7 @@ static const gfx_layout dragrace_tile_layout2 =
};
-static GFXDECODE_START( dragrace )
+static GFXDECODE_START( gfx_dragrace )
GFXDECODE_ENTRY( "gfx1", 0, dragrace_tile_layout1, 0, 4 )
GFXDECODE_ENTRY( "gfx2", 0, dragrace_tile_layout2, 8, 2 )
GFXDECODE_END
@@ -291,7 +291,7 @@ MACHINE_CONFIG_START(dragrace_state::dragrace)
MCFG_SCREEN_UPDATE_DRIVER(dragrace_state, screen_update_dragrace)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dragrace)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dragrace)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(dragrace_state, dragrace)
diff --git a/src/mame/drivers/dreambal.cpp b/src/mame/drivers/dreambal.cpp
index 17dc01a213a..36c1399e771 100644
--- a/src/mame/drivers/dreambal.cpp
+++ b/src/mame/drivers/dreambal.cpp
@@ -164,7 +164,7 @@ static const gfx_layout tile_16x16_layout =
};
-static GFXDECODE_START( dreambal )
+static GFXDECODE_START( gfx_dreambal )
GFXDECODE_ENTRY( "gfx1", 0, tile_8x8_layout, 0x000, 32 ) /* Tiles (8x8) */
GFXDECODE_ENTRY( "gfx1", 0, tile_16x16_layout, 0x000, 32 ) /* Tiles (16x16) */
GFXDECODE_END
@@ -325,7 +325,7 @@ MACHINE_CONFIG_START(dreambal_state::dreambal)
MCFG_PALETTE_ADD("palette", 0x400/2)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dreambal)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dreambal)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") // 93lc46b
diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp
index b066938c823..0a464e4b5ab 100644
--- a/src/mame/drivers/dreamwld.cpp
+++ b/src/mame/drivers/dreamwld.cpp
@@ -713,7 +713,7 @@ static const gfx_layout layout_16x16x4 =
16*16*4
};
-static GFXDECODE_START( dreamwld )
+static GFXDECODE_START( gfx_dreamwld )
GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x000, 0x40 ) // [0] Sprites
GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x4, 0x800, 0x48 ) // [1] Layer 0 + 1
GFXDECODE_END
@@ -766,7 +766,7 @@ MACHINE_CONFIG_START(dreamwld_state::baryon)
MCFG_PALETTE_ADD("palette", 0x1000)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dreamwld)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dreamwld)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
diff --git a/src/mame/drivers/drgnmst.cpp b/src/mame/drivers/drgnmst.cpp
index fb75a8d4e01..8b777fe4f00 100644
--- a/src/mame/drivers/drgnmst.cpp
+++ b/src/mame/drivers/drgnmst.cpp
@@ -344,7 +344,7 @@ static const gfx_layout drgnmst_char32x32_layout =
};
-static GFXDECODE_START( drgnmst )
+static GFXDECODE_START( gfx_drgnmst )
GFXDECODE_ENTRY( "gfx1", 0, drgnmst_char16x16_layout, 0, 0x200 ) /* sprite tiles */
GFXDECODE_ENTRY( "gfx2", 0, drgnmst_char8x8_layout, 0x200, 0x200 ) /* fg tiles */
GFXDECODE_ENTRY( "gfx2", 0, drgnmst_char16x16_layout, 0x0400, 0x200 ) /* md tiles */
@@ -388,7 +388,7 @@ MACHINE_CONFIG_START(drgnmst_state::drgnmst)
MCFG_PIC16C5x_READ_C_CB(READ8(*this, drgnmst_state, drgnmst_snd_flag_r))
MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, drgnmst_state, drgnmst_snd_control_w))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", drgnmst)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_drgnmst)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/drmicro.cpp b/src/mame/drivers/drmicro.cpp
index 222e34359e3..1b2776403b3 100644
--- a/src/mame/drivers/drmicro.cpp
+++ b/src/mame/drivers/drmicro.cpp
@@ -211,7 +211,7 @@ static const gfx_layout charlayout8 =
8*8*1
};
-static GFXDECODE_START( drmicro )
+static GFXDECODE_START( gfx_drmicro )
GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout4, 0, 64 ) /* tiles */
GFXDECODE_ENTRY( "gfx2", 0x0000, charlayout8, 256, 32 ) /* tiles */
GFXDECODE_ENTRY( "gfx1", 0x0000, spritelayout4, 0, 64 ) /* sprites */
@@ -260,7 +260,7 @@ MACHINE_CONFIG_START(drmicro_state::drmicro)
MCFG_SCREEN_UPDATE_DRIVER(drmicro_state, screen_update_drmicro)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", drmicro)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_drmicro)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INDIRECT_ENTRIES(32)
MCFG_PALETTE_INIT_OWNER(drmicro_state, drmicro)
diff --git a/src/mame/drivers/drtomy.cpp b/src/mame/drivers/drtomy.cpp
index 4cb5209dd7b..928d82f27f7 100644
--- a/src/mame/drivers/drtomy.cpp
+++ b/src/mame/drivers/drtomy.cpp
@@ -212,7 +212,7 @@ static const gfx_layout tilelayout16 =
32*8
};
-static GFXDECODE_START( drtomy )
+static GFXDECODE_START( gfx_drtomy )
GFXDECODE_ENTRY( "gfx1", 0, tilelayout8, 0x100, 16 ) /* Sprites */
GFXDECODE_ENTRY( "gfx1", 0, tilelayout16, 0x000, 16 ) /* BG */
GFXDECODE_ENTRY( "gfx1", 0, tilelayout16, 0x200, 16 ) /* FG */
@@ -319,7 +319,7 @@ MACHINE_CONFIG_START(drtomy_state::drtomy)
MCFG_SCREEN_UPDATE_DRIVER(drtomy_state, screen_update_drtomy)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", drtomy)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_drtomy)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/drw80pkr.cpp b/src/mame/drivers/drw80pkr.cpp
index 6a189a6444f..074d406eee8 100644
--- a/src/mame/drivers/drw80pkr.cpp
+++ b/src/mame/drivers/drw80pkr.cpp
@@ -382,7 +382,7 @@ static const gfx_layout charlayout =
* Graphics Decode Information *
******************************/
-static GFXDECODE_START( drw80pkr )
+static GFXDECODE_START( gfx_drw80pkr )
GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 0, 16 )
GFXDECODE_END
@@ -470,7 +470,7 @@ MACHINE_CONFIG_START(drw80pkr_state::drw80pkr)
MCFG_SCREEN_UPDATE_DRIVER(drw80pkr_state, screen_update_drw80pkr)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", drw80pkr)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_drw80pkr)
MCFG_PALETTE_ADD("palette", 16*16)
MCFG_PALETTE_INIT_OWNER(drw80pkr_state, drw80pkr)
diff --git a/src/mame/drivers/duet16.cpp b/src/mame/drivers/duet16.cpp
index 527241d65b6..481bad2103c 100644
--- a/src/mame/drivers/duet16.cpp
+++ b/src/mame/drivers/duet16.cpp
@@ -328,7 +328,7 @@ static const gfx_layout duet16_charlayout =
8*16 /* every char takes 8 bytes */
};
-static GFXDECODE_START(duet16)
+static GFXDECODE_START(gfx_duet16)
GFXDECODE_ENTRY( "char", 0x0000, duet16_charlayout, 0, 1 )
GFXDECODE_END
@@ -421,7 +421,7 @@ MACHINE_CONFIG_START(duet16_state::duet16)
MCFG_PALETTE_ADD("palette", 8)
MCFG_PALETTE_ADD_3BIT_BRG("chrpal")
- MCFG_GFXDECODE_ADD("gfxdecode", "chrpal", duet16)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "chrpal", gfx_duet16)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp
index dd18efb52ac..28a65424a0a 100644
--- a/src/mame/drivers/dunhuang.cpp
+++ b/src/mame/drivers/dunhuang.cpp
@@ -750,7 +750,7 @@ static const gfx_layout layout_8x32 =
32*32
};
-static GFXDECODE_START( dunhuang )
+static GFXDECODE_START( gfx_dunhuang )
GFXDECODE_ENTRY( "gfx1", 0, layout_8x8, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, layout_8x32, 0, 16 )
GFXDECODE_END
@@ -823,7 +823,7 @@ MACHINE_CONFIG_START(dunhuang_state::dunhuang)
MCFG_SCREEN_UPDATE_DRIVER(dunhuang_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dunhuang)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dunhuang)
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC
diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp
index 6cfca1dfd85..594827c6ac7 100644
--- a/src/mame/drivers/dvk_kcgd.cpp
+++ b/src/mame/drivers/dvk_kcgd.cpp
@@ -342,7 +342,7 @@ static const gfx_layout kcgd_charlayout =
8*10 /* every char takes 10 bytes */
};
-static GFXDECODE_START( kcgd )
+static GFXDECODE_START( gfx_kcgd )
GFXDECODE_ENTRY("maincpu", 0112236, kcgd_charlayout, 0, 1)
GFXDECODE_END
@@ -364,7 +364,7 @@ MACHINE_CONFIG_START(kcgd_state::kcgd)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(kcgd_state, kcgd)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", kcgd)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kcgd)
#if 0
MCFG_DEVICE_ADD("ms7004", MS7004, 0)
MCFG_MS7004_TX_HANDLER(WRITELINE("i8251kbd", i8251_device, write_rxd))
diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp
index 0a920a0b98e..a1d0f0a4a67 100644
--- a/src/mame/drivers/dvk_ksm.cpp
+++ b/src/mame/drivers/dvk_ksm.cpp
@@ -411,7 +411,7 @@ static const gfx_layout ksm_charlayout =
8*8 /* every char takes 8 bytes */
};
-static GFXDECODE_START( ksm )
+static GFXDECODE_START( gfx_ksm )
GFXDECODE_ENTRY("chargen", 0x0000, ksm_charlayout, 0, 1)
GFXDECODE_END
@@ -431,7 +431,7 @@ MACHINE_CONFIG_START(ksm_state::ksm)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ksm)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ksm)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
diff --git a/src/mame/drivers/dwarfd.cpp b/src/mame/drivers/dwarfd.cpp
index 9fb6e53593a..53c29308118 100644
--- a/src/mame/drivers/dwarfd.cpp
+++ b/src/mame/drivers/dwarfd.cpp
@@ -695,7 +695,7 @@ static const gfx_layout tiles8x8_layout =
8*16
};
-static GFXDECODE_START( dwarfd )
+static GFXDECODE_START( gfx_dwarfd )
GFXDECODE_REVERSEBITS("gfx1", 0, tiles8x8_layout, 0, 8)
GFXDECODE_END
@@ -751,7 +751,7 @@ MACHINE_CONFIG_START(dwarfd_state::dwarfd)
MCFG_I8275_IRQ_CALLBACK(INPUTLINE("maincpu", I8085_RST55_LINE))
MCFG_I8275_DRQ_CALLBACK(WRITELINE(*this, dwarfd_state, drq_w))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dwarfd)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dwarfd)
MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_INIT_OWNER(dwarfd_state, dwarfd)
diff --git a/src/mame/drivers/dynadice.cpp b/src/mame/drivers/dynadice.cpp
index f2a0f16769d..ab0234f2f96 100644
--- a/src/mame/drivers/dynadice.cpp
+++ b/src/mame/drivers/dynadice.cpp
@@ -209,7 +209,7 @@ static const gfx_layout charlayout2 =
};
-static GFXDECODE_START( dynadice )
+static GFXDECODE_START( gfx_dynadice )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) /* 1bpp */
GFXDECODE_ENTRY( "gfx2", 0, charlayout2, 0, 1 ) /* 3bpp */
GFXDECODE_END
@@ -270,7 +270,7 @@ MACHINE_CONFIG_START(dynadice_state::dynadice)
MCFG_SCREEN_UPDATE_DRIVER(dynadice_state, screen_update_dynadice)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dynadice)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dynadice)
MCFG_PALETTE_ADD_3BIT_BRG("palette")
SPEAKER(config, "mono").front_center();
diff --git a/src/mame/drivers/dynduke.cpp b/src/mame/drivers/dynduke.cpp
index b8dce9c8377..0040de40f42 100644
--- a/src/mame/drivers/dynduke.cpp
+++ b/src/mame/drivers/dynduke.cpp
@@ -294,7 +294,7 @@ static const gfx_layout fg_layout =
/* Graphics Decode Information */
-static GFXDECODE_START( dynduke )
+static GFXDECODE_START( gfx_dynduke )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x500, 16 )
GFXDECODE_ENTRY( "gfx2", 0, bg_layout, 0x000, 128 )
GFXDECODE_ENTRY( "gfx3", 0, fg_layout, 0x200, 16 )
@@ -344,7 +344,7 @@ MACHINE_CONFIG_START(dynduke_state::dynduke)
MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, dynduke_state, vblank_irq))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", dynduke)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dynduke)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
diff --git a/src/mame/drivers/ec65.cpp b/src/mame/drivers/ec65.cpp
index f7e48d9d137..27a5e43d549 100644
--- a/src/mame/drivers/ec65.cpp
+++ b/src/mame/drivers/ec65.cpp
@@ -166,7 +166,7 @@ static const gfx_layout ec65_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( ec65 )
+static GFXDECODE_START( gfx_ec65 )
GFXDECODE_ENTRY( "chargen", 0x0000, ec65_charlayout, 0, 1 )
GFXDECODE_END
@@ -184,7 +184,7 @@ MACHINE_CONFIG_START(ec65_state::ec65)
MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 200 - 1)
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ec65)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ec65)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_MC6845_ADD(MC6845_TAG, MC6845, "screen", XTAL(16'000'000) / 8)
@@ -222,7 +222,7 @@ MACHINE_CONFIG_START(ec65k_state::ec65k)
MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 200 - 1)
MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ec65)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ec65)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_MC6845_ADD(MC6845_TAG, MC6845, "screen", XTAL(16'000'000) / 8)
diff --git a/src/mame/drivers/egghunt.cpp b/src/mame/drivers/egghunt.cpp
index 56f03419fd2..67280149389 100644
--- a/src/mame/drivers/egghunt.cpp
+++ b/src/mame/drivers/egghunt.cpp
@@ -404,7 +404,7 @@ static const gfx_layout tiles16x16_layout =
16*16
};
-static GFXDECODE_START( egghunt )
+static GFXDECODE_START( gfx_egghunt )
GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 64 )
GFXDECODE_ENTRY( "gfx2", 0, tiles16x16_layout, 0, 64 )
GFXDECODE_END
@@ -445,7 +445,7 @@ MACHINE_CONFIG_START(egghunt_state::egghunt)
MCFG_SCREEN_UPDATE_DRIVER(egghunt_state, screen_update_egghunt)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", egghunt)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_egghunt)
MCFG_PALETTE_ADD("palette", 0x400)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp
index 82754cef8ce..bc3343b41b2 100644
--- a/src/mame/drivers/elwro800.cpp
+++ b/src/mame/drivers/elwro800.cpp
@@ -561,7 +561,7 @@ static const gfx_layout elwro800_charlayout =
8*8 /* every char takes 8 bytes */
};
-static GFXDECODE_START( elwro800 )
+static GFXDECODE_START( gfx_elwro800 )
GFXDECODE_ENTRY( "maincpu", 0x3c00, elwro800_charlayout, 0, 8 )
GFXDECODE_END
@@ -589,7 +589,7 @@ MACHINE_CONFIG_START(elwro800_state::elwro800)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(elwro800_state, spectrum )
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", elwro800)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_elwro800)
MCFG_VIDEO_START_OVERRIDE(elwro800_state, spectrum )
diff --git a/src/mame/drivers/eprom.cpp b/src/mame/drivers/eprom.cpp
index edece316c8d..90221777d4c 100644
--- a/src/mame/drivers/eprom.cpp
+++ b/src/mame/drivers/eprom.cpp
@@ -360,13 +360,13 @@ static const gfx_layout pfmolayout =
};
-static GFXDECODE_START( eprom )
+static GFXDECODE_START( gfx_eprom )
GFXDECODE_ENTRY( "gfx1", 0, pfmolayout, 256, 32 ) /* sprites & playfield */
GFXDECODE_ENTRY( "gfx2", 0, anlayout, 0, 64 ) /* characters 8x8 */
GFXDECODE_END
-static GFXDECODE_START( guts )
+static GFXDECODE_START( gfx_guts )
GFXDECODE_ENTRY( "gfx1", 0, pfmolayout, 256, 32 ) /* sprites */
GFXDECODE_ENTRY( "gfx2", 0, anlayout, 0, 64 ) /* characters 8x8 */
GFXDECODE_ENTRY( "gfx3", 0, pfmolayout, 256, 32 ) /* playfield */
@@ -403,7 +403,7 @@ MACHINE_CONFIG_START(eprom_state::eprom)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", eprom)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_eprom)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, eprom_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,64)
@@ -446,7 +446,7 @@ MACHINE_CONFIG_START(eprom_state::klaxp)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", eprom)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_eprom)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, eprom_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,64)
@@ -494,7 +494,7 @@ MACHINE_CONFIG_START(eprom_state::guts)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", guts)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_guts)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, eprom_state, guts_get_playfield_tile_info, 8,8, SCAN_COLS, 64,64)
diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp
index ecc77debb35..8687f60caac 100644
--- a/src/mame/drivers/equites.cpp
+++ b/src/mame/drivers/equites.cpp
@@ -1011,13 +1011,13 @@ static const gfx_layout spritelayout_32x32 =
};
-static GFXDECODE_START( equites )
+static GFXDECODE_START( gfx_equites )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x000, 0x80/4 ) // chars
GFXDECODE_ENTRY( "gfx2", 0, tilelayout_3bpp, 0x080, 0x80/8 ) // tiles
GFXDECODE_ENTRY( "gfx3", 0, spritelayout_16x14, 0x100, 0x80/8 ) // sprites
GFXDECODE_END
-static GFXDECODE_START( splndrbt )
+static GFXDECODE_START( gfx_splndrbt )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x000, 0x100/4 ) // chars
GFXDECODE_ENTRY( "gfx2", 0, tilelayout_2bpp, 0x100, 0x080/4 ) // tiles
GFXDECODE_ENTRY( "gfx3", 0, spritelayout_32x32, 0x180, 0x100/8 ) // sprites
@@ -1180,7 +1180,7 @@ MACHINE_CONFIG_START(equites_state::equites)
MCFG_SCREEN_UPDATE_DRIVER(equites_state, screen_update_equites)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", equites)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_equites)
MCFG_PALETTE_ADD("palette", 0x180)
MCFG_PALETTE_INDIRECT_ENTRIES(0x100)
MCFG_PALETTE_INIT_OWNER(equites_state,equites)
@@ -1230,7 +1230,7 @@ MACHINE_CONFIG_START(splndrbt_state::splndrbt)
MCFG_SCREEN_UPDATE_DRIVER(splndrbt_state, screen_update_splndrbt)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", splndrbt)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_splndrbt)
MCFG_PALETTE_ADD("palette", 0x280)
MCFG_PALETTE_INDIRECT_ENTRIES(0x100)
MCFG_PALETTE_INIT_OWNER(splndrbt_state,splndrbt)
diff --git a/src/mame/drivers/esd16.cpp b/src/mame/drivers/esd16.cpp
index 7221ccec908..74a537b0dee 100644
--- a/src/mame/drivers/esd16.cpp
+++ b/src/mame/drivers/esd16.cpp
@@ -585,16 +585,16 @@ static const gfx_layout hedpanic_layout_16x16x8 =
};
-static GFXDECODE_START( esd16 )
- GFXDECODE_ENTRY( "spr", 0, hedpanic_sprite_16x16x5, 0x200, 8 ) // [0] Sprites
- GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_8x8x8, 0x000, 2 ) // [1] Layers
- GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_16x16x8, 0x000, 2 ) // [1] Layers
+static GFXDECODE_START( gfx_esd16 )
+ GFXDECODE_ENTRY( "spr", 0, hedpanic_sprite_16x16x5, 0x200, 8 ) // [0] Sprites
+ GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_8x8x8, 0x000, 2 ) // [1] Layers
+ GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_16x16x8, 0x000, 2 ) // [1] Layers
GFXDECODE_END
-static GFXDECODE_START( jumppop )
- GFXDECODE_ENTRY( "spr", 0, jumppop_sprite_16x16x4, 0x000, 0x40 ) /* Sprites 16x16 */ // has 4bpp sprites, unlike the others
- GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_8x8x8, 0x000, 4 ) /* Characters 8x8 */
- GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_16x16x8, 0x000, 4 ) /* Tiles 16x16 */
+static GFXDECODE_START( gfx_jumppop )
+ GFXDECODE_ENTRY( "spr", 0, jumppop_sprite_16x16x4, 0x000, 0x40 ) // Sprites 16x16 - has 4bpp sprites, unlike the others
+ GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_8x8x8, 0x000, 4 ) // Characters 8x8
+ GFXDECODE_ENTRY( "bgs", 0, hedpanic_layout_16x16x8, 0x000, 4 ) // Tiles 16x16
GFXDECODE_END
@@ -659,7 +659,7 @@ MACHINE_CONFIG_START(esd16_state::esd16)
MCFG_DECO_SPRITE_FLIPALLX(1)
MCFG_DECO_SPRITE_GFXDECODE("gfxdecode")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", esd16)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_esd16)
MCFG_PALETTE_ADD("palette", 0x1000/2)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -688,7 +688,7 @@ MACHINE_CONFIG_START(esd16_state::jumppop)
MCFG_DEVICE_MODIFY("audiocpu")
MCFG_DEVICE_CLOCK( XTAL(14'000'000)/4) /* 3.5MHz - Verified */
- MCFG_GFXDECODE_MODIFY("gfxdecode", jumppop)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_jumppop)
MCFG_DEVICE_REPLACE("ymsnd", YM3812, XTAL(14'000'000)/4) /* 3.5MHz - Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
diff --git a/src/mame/drivers/esh.cpp b/src/mame/drivers/esh.cpp
index 4d96ebc8aa5..6d76a0977d1 100644
--- a/src/mame/drivers/esh.cpp
+++ b/src/mame/drivers/esh.cpp
@@ -331,7 +331,7 @@ static const gfx_layout esh_gfx_layout =
8*8
};
-static GFXDECODE_START( esh )
+static GFXDECODE_START( gfx_esh )
GFXDECODE_ENTRY("gfx1", 0, esh_gfx_layout, 0x0, 0x20)
GFXDECODE_ENTRY("gfx2", 0, esh_gfx_layout, 0x0, 0x20)
GFXDECODE_END
@@ -375,7 +375,7 @@ MACHINE_CONFIG_START(esh_state::esh)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(esh_state, esh)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", esh)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_esh)
/* sound hardware */
SPEAKER(config, "lspeaker").front_left();
diff --git a/src/mame/drivers/espial.cpp b/src/mame/drivers/espial.cpp
index 69863db6397..6ad84cbc12a 100644
--- a/src/mame/drivers/espial.cpp
+++ b/src/mame/drivers/espial.cpp
@@ -311,7 +311,7 @@ static const gfx_layout spritelayout =
};
-static GFXDECODE_START( espial )
+static GFXDECODE_START( gfx_espial )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 64 )
GFXDECODE_END
@@ -342,7 +342,7 @@ MACHINE_CONFIG_START(espial_state::espial)
MCFG_SCREEN_UPDATE_DRIVER(espial_state, screen_update_espial)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", espial)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_espial)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(espial_state, espial)
diff --git a/src/mame/drivers/esprit.cpp b/src/mame/drivers/esprit.cpp
index 3e794ff43e9..30465820adb 100644
--- a/src/mame/drivers/esprit.cpp
+++ b/src/mame/drivers/esprit.cpp
@@ -106,7 +106,7 @@ static const gfx_layout esprit_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( esprit )
+static GFXDECODE_START( gfx_esprit )
GFXDECODE_ENTRY( "chargen", 0x0000, esprit_charlayout, 0, 1 )
GFXDECODE_END
@@ -129,7 +129,7 @@ MACHINE_CONFIG_START(esprit_state::esprit)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", esprit)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_esprit)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* Devices */
diff --git a/src/mame/drivers/ettrivia.cpp b/src/mame/drivers/ettrivia.cpp
index a98d3fcc77c..633ea6cc70f 100644
--- a/src/mame/drivers/ettrivia.cpp
+++ b/src/mame/drivers/ettrivia.cpp
@@ -209,7 +209,7 @@ static const gfx_layout charlayout =
8*8
};
-static GFXDECODE_START( ettrivia )
+static GFXDECODE_START( gfx_ettrivia )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
GFXDECODE_ENTRY( "gfx2", 0, charlayout, 32*4, 32 )
GFXDECODE_END
@@ -311,7 +311,7 @@ MACHINE_CONFIG_START(ettrivia_state::ettrivia)
MCFG_SCREEN_UPDATE_DRIVER(ettrivia_state, screen_update_ettrivia)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ettrivia)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ettrivia)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(ettrivia_state, ettrivia)
diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp
index 98b98ba58dd..1d0aee2ebd0 100644
--- a/src/mame/drivers/excali64.cpp
+++ b/src/mame/drivers/excali64.cpp
@@ -447,7 +447,7 @@ static const gfx_layout excali64_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( excali64 )
+static GFXDECODE_START( gfx_excali64 )
GFXDECODE_ENTRY( "chargen", 0x0000, excali64_charlayout, 0, 1 )
GFXDECODE_END
@@ -588,7 +588,7 @@ MACHINE_CONFIG_START(excali64_state::excali64)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
MCFG_PALETTE_ADD("palette", 40)
MCFG_PALETTE_INIT_OWNER(excali64_state, excali64)
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", excali64)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_excali64)
MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(16'000'000) / 16) // 1MHz for lowres; 2MHz for highres
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
diff --git a/src/mame/drivers/exedexes.cpp b/src/mame/drivers/exedexes.cpp
index f073596aebb..b64dfb84521 100644
--- a/src/mame/drivers/exedexes.cpp
+++ b/src/mame/drivers/exedexes.cpp
@@ -195,7 +195,7 @@ static const gfx_layout tilelayout =
-static GFXDECODE_START( exedexes )
+static GFXDECODE_START( gfx_exedexes )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 64*4, 64 ) /* 32x32 Tiles */
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 2*64*4, 16 ) /* 16x16 Tiles */
@@ -243,7 +243,7 @@ MACHINE_CONFIG_START(exedexes_state::exedexes)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", exedexes)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_exedexes)
MCFG_PALETTE_ADD("palette", 64*4+64*4+16*16+16*16)
MCFG_PALETTE_INDIRECT_ENTRIES(256)
diff --git a/src/mame/drivers/exerion.cpp b/src/mame/drivers/exerion.cpp
index 0fffdb53c06..528e67c796c 100644
--- a/src/mame/drivers/exerion.cpp
+++ b/src/mame/drivers/exerion.cpp
@@ -333,7 +333,7 @@ static const gfx_layout spritelayout =
};
-static GFXDECODE_START( exerion )
+static GFXDECODE_START( gfx_exerion )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 64 )
GFXDECODE_SCALE( "gfx2", 0, spritelayout, 256, 64, 2, 2 )
@@ -387,7 +387,7 @@ MACHINE_CONFIG_START(exerion_state::exerion)
MCFG_SCREEN_UPDATE_DRIVER(exerion_state, screen_update_exerion)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", exerion)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_exerion)
MCFG_PALETTE_ADD("palette", 256*3)
MCFG_PALETTE_INDIRECT_ENTRIES(32)
MCFG_PALETTE_INIT_OWNER(exerion_state, exerion)
diff --git a/src/mame/drivers/exidy.cpp b/src/mame/drivers/exidy.cpp
index 685e46ad769..68a9560461d 100644
--- a/src/mame/drivers/exidy.cpp
+++ b/src/mame/drivers/exidy.cpp
@@ -798,7 +798,7 @@ static const gfx_layout spritelayout =
};
-static GFXDECODE_START( exidy )
+static GFXDECODE_START( gfx_exidy )
GFXDECODE_ENTRY( "gfx1", 0x0000, spritelayout, 0, 2 )
GFXDECODE_END
@@ -828,7 +828,7 @@ MACHINE_CONFIG_START(exidy_state::base)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", exidy_state, exidy_vblank_interrupt)
/* video hardware */
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", exidy)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_exidy)
MCFG_PALETTE_ADD("palette", 8)
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp
index b12fe6cfaa6..8170a4bea09 100644
--- a/src/mame/drivers/expro02.cpp
+++ b/src/mame/drivers/expro02.cpp
@@ -892,12 +892,12 @@ static const gfx_layout layout_16x16x4 =
};
-static GFXDECODE_START( expro02 )
+static GFXDECODE_START( gfx_expro02 )
GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x100, 0x40 ) // [0] Sprites
GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x4, 0x400, 0x40 ) // [0] View2 tiles
GFXDECODE_END
-static GFXDECODE_START( expro02_noview2 )
+static GFXDECODE_START( gfx_expro02_noview2 )
GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x100, 0x40 ) // [0] Sprites
GFXDECODE_END
@@ -925,7 +925,7 @@ MACHINE_CONFIG_START(expro02_state::expro02)
MCFG_SCREEN_UPDATE_DRIVER(expro02_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", expro02)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_expro02)
MCFG_PALETTE_ADD("palette", 2048 + 32768)
MCFG_PALETTE_FORMAT(GGGGGRRRRRBBBBBx)
MCFG_PALETTE_INIT_OWNER(expro02_state, expro02)
@@ -980,7 +980,7 @@ MACHINE_CONFIG_START(expro02_state::comad_noview2)
comad(config);
MCFG_DEVICE_REMOVE("view2_0")
- MCFG_GFXDECODE_MODIFY("gfxdecode", expro02_noview2)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_expro02_noview2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exprraid.cpp b/src/mame/drivers/exprraid.cpp
index bddc177b451..4c384c0997d 100644
--- a/src/mame/drivers/exprraid.cpp
+++ b/src/mame/drivers/exprraid.cpp
@@ -455,7 +455,7 @@ static const gfx_layout tile2 =
};
-static GFXDECODE_START( exprraid )
+static GFXDECODE_START( gfx_exprraid )
GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 128, 2 ) /* characters */
GFXDECODE_ENTRY( "gfx2", 0x00000, spritelayout, 64, 8 ) /* sprites */
GFXDECODE_ENTRY( "gfx3", 0x00000, tile1, 0, 4 ) /* background tiles */
@@ -513,7 +513,7 @@ MACHINE_CONFIG_START(exprraid_state::exprraid)
MCFG_SCREEN_UPDATE_DRIVER(exprraid_state, screen_update_exprraid)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", exprraid)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_exprraid)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256)
/* sound hardware */
diff --git a/src/mame/drivers/exzisus.cpp b/src/mame/drivers/exzisus.cpp
index 70bc4363907..c1c20817150 100644
--- a/src/mame/drivers/exzisus.cpp
+++ b/src/mame/drivers/exzisus.cpp
@@ -221,7 +221,7 @@ static const gfx_layout charlayout =
16*8
};
-static GFXDECODE_START( exzisus )
+static GFXDECODE_START( gfx_exzisus )
GFXDECODE_ENTRY( "bg0", 0, charlayout, 0, 256 )
GFXDECODE_ENTRY( "bg1", 0, charlayout, 256, 256 )
GFXDECODE_END
@@ -258,7 +258,7 @@ MACHINE_CONFIG_START(exzisus_state::exzisus)
MCFG_SCREEN_UPDATE_DRIVER(exzisus_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", exzisus)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_exzisus)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 1024)
/* sound hardware */
diff --git a/src/mame/drivers/f1gp.cpp b/src/mame/drivers/f1gp.cpp
index 90b16ecb6dd..4ba6b37b042 100644
--- a/src/mame/drivers/f1gp.cpp
+++ b/src/mame/drivers/f1gp.cpp
@@ -350,14 +350,14 @@ static const gfx_layout spritelayout =
128*8
};
-static GFXDECODE_START( f1gp )
+static GFXDECODE_START( gfx_f1gp )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x000, 1 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x100, 16 )
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x200, 16 )
GFXDECODE_ENTRY( "gfx4", 0, tilelayout2, 0x300, 16 )
GFXDECODE_END
-static GFXDECODE_START( f1gp2 )
+static GFXDECODE_START( gfx_f1gp2 )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x000, 1 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x200, 32 )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0x100, 16 )
@@ -427,7 +427,7 @@ MACHINE_CONFIG_START(f1gp_state::f1gp)
MCFG_SCREEN_UPDATE_DRIVER(f1gp_state, screen_update_f1gp)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", f1gp)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_f1gp)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -501,7 +501,7 @@ MACHINE_CONFIG_START(f1gp_state::f1gpb)
MCFG_SCREEN_UPDATE_DRIVER(f1gp_state, screen_update_f1gpb)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", f1gp)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_f1gp)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -527,7 +527,7 @@ MACHINE_CONFIG_START(f1gp_state::f1gp2)
MCFG_DEVICE_PROGRAM_MAP(f1gp2_cpu1_map)
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", f1gp2)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_f1gp2)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(f1gp_state, screen_update_f1gp2)
diff --git a/src/mame/drivers/fantland.cpp b/src/mame/drivers/fantland.cpp
index 2a4529959d6..07ebcc37039 100644
--- a/src/mame/drivers/fantland.cpp
+++ b/src/mame/drivers/fantland.cpp
@@ -817,7 +817,7 @@ static const gfx_layout layout16x16x6 =
16*16*6
};
-static GFXDECODE_START( fantland )
+static GFXDECODE_START( gfx_fantland )
GFXDECODE_ENTRY( "gfx1", 0, layout16x16x6, 0, 4 ) // [0] Sprites
GFXDECODE_END
@@ -875,7 +875,7 @@ MACHINE_CONFIG_START(fantland_state::fantland)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, fantland_state, fantland_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", fantland)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fantland)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -923,7 +923,7 @@ MACHINE_CONFIG_START(fantland_state::galaxygn)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, fantland_state, fantland_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", fantland)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fantland)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -1003,7 +1003,7 @@ MACHINE_CONFIG_START(fantland_state::borntofi)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, fantland_state, fantland_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", fantland)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fantland)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -1058,7 +1058,7 @@ MACHINE_CONFIG_START(fantland_state::wheelrun)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, fantland_state, fantland_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", fantland)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fantland)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp
index 601ad96dd39..8b0c2f545b2 100644
--- a/src/mame/drivers/fastfred.cpp
+++ b/src/mame/drivers/fastfred.cpp
@@ -603,17 +603,17 @@ static const gfx_layout imago_char_1bpp =
8*8
};
-static GFXDECODE_START( fastfred )
+static GFXDECODE_START( gfx_fastfred )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 32 )
GFXDECODE_END
-static GFXDECODE_START( jumpcoas )
+static GFXDECODE_START( gfx_jumpcoas )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 32 )
GFXDECODE_END
-static GFXDECODE_START( imago )
+static GFXDECODE_START( gfx_imago )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
GFXDECODE_ENTRY( nullptr, 0xb800, imago_spritelayout, 0, 32 )
GFXDECODE_ENTRY( "gfx3", 0, charlayout, 0, 32 )
@@ -663,7 +663,7 @@ MACHINE_CONFIG_START(fastfred_state::fastfred)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, fastfred_state, vblank_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", fastfred)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fastfred)
MCFG_PALETTE_ADD("palette", 32*8)
MCFG_PALETTE_INDIRECT_ENTRIES(256)
@@ -692,7 +692,7 @@ MACHINE_CONFIG_START(fastfred_state::jumpcoas)
MCFG_DEVICE_REMOVE("audiocpu")
/* video hardware */
- MCFG_GFXDECODE_MODIFY("gfxdecode", jumpcoas)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_jumpcoas)
/* sound hardware */
MCFG_DEVICE_REMOVE("soundlatch")
@@ -716,7 +716,7 @@ MACHINE_CONFIG_START(fastfred_state::imago)
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(256+64+2) /* 256 for characters, 64 for the stars and 2 for the web */
- MCFG_GFXDECODE_MODIFY("gfxdecode", imago)
+ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_imago)
MCFG_VIDEO_START_OVERRIDE(fastfred_state,imago)
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/fastinvaders.cpp b/src/mame/drivers/fastinvaders.cpp
index 6b016c7e51a..7f50948cb66 100644
--- a/src/mame/drivers/fastinvaders.cpp
+++ b/src/mame/drivers/fastinvaders.cpp
@@ -638,7 +638,7 @@ static const gfx_layout charlayout =
16*8
};
-static GFXDECODE_START( fastinvaders )
+static GFXDECODE_START( gfx_fastinvaders )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 )
GFXDECODE_END
@@ -674,7 +674,7 @@ MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", fastinvaders_state, scanline_timer,
MCFG_SCREEN_UPDATE_DRIVER(fastinvaders_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", fastinvaders)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fastinvaders)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* sound hardware */
diff --git a/src/mame/drivers/fastlane.cpp b/src/mame/drivers/fastlane.cpp
index df6423f255b..38039063592 100644
--- a/src/mame/drivers/fastlane.cpp
+++ b/src/mame/drivers/fastlane.cpp
@@ -170,7 +170,7 @@ static const gfx_layout gfxlayout =
32*8
};
-static GFXDECODE_START( fastlane )
+static GFXDECODE_START( gfx_fastlane )
GFXDECODE_ENTRY( "gfx1", 0, gfxlayout, 0, 64*16 )
GFXDECODE_END
@@ -217,7 +217,7 @@ MACHINE_CONFIG_START(fastlane_state::fastlane)
MCFG_SCREEN_UPDATE_DRIVER(fastlane_state, screen_update_fastlane)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", fastlane)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fastlane)
MCFG_PALETTE_ADD("palette", 1024*16)
MCFG_PALETTE_INDIRECT_ENTRIES(0x400)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp
index 9a118e24d33..3198f85814d 100644
--- a/src/mame/drivers/fc100.cpp
+++ b/src/mame/drivers/fc100.cpp
@@ -393,7 +393,7 @@ static const gfx_layout u53_charlayout =
8*16 /* every char takes 16 bytes */
};
-static GFXDECODE_START( fc100 )
+static GFXDECODE_START( gfx_fc100 )
GFXDECODE_ENTRY( "chargen", 0x0000, u53_charlayout, 0, 1 )
GFXDECODE_END
@@ -525,7 +525,7 @@ MACHINE_CONFIG_START(fc100_state::fc100)
// other lines not connected
MCFG_SCREEN_MC6847_NTSC_ADD("screen", "vdg")
- MCFG_GFXDECODE_ADD("gfxdecode", "f4palette", fc100)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "f4palette", gfx_fc100)
MCFG_PALETTE_ADD_MONOCHROME("f4palette")
/* sound hardware */
diff --git a/src/mame/drivers/fcombat.cpp b/src/mame/drivers/fcombat.cpp
index 344c338f2af..92042911038 100644
--- a/src/mame/drivers/fcombat.cpp
+++ b/src/mame/drivers/fcombat.cpp
@@ -250,7 +250,7 @@ static const gfx_layout spritelayout =
};
-static GFXDECODE_START( fcombat )
+static GFXDECODE_START( gfx_fcombat )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 64 )
GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 512, 64 )
@@ -304,7 +304,7 @@ MACHINE_CONFIG_START(fcombat_state::fcombat)
MCFG_SCREEN_UPDATE_DRIVER(fcombat_state, screen_update_fcombat)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", fcombat)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fcombat)
MCFG_PALETTE_ADD("palette", 256*3)
MCFG_PALETTE_INDIRECT_ENTRIES(32)
MCFG_PALETTE_INIT_OWNER(fcombat_state, fcombat)
diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp
index 8379b8178df..cad66bbc9a8 100644
--- a/src/mame/drivers/fcrash.cpp
+++ b/src/mame/drivers/fcrash.cpp
@@ -1639,7 +1639,7 @@ MACHINE_CONFIG_START(cps_state::fcrash)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_VIDEO_START_OVERRIDE(cps_state,cps1)
@@ -1704,7 +1704,7 @@ MACHINE_CONFIG_START(cps_state::kodb)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1)
MCFG_PALETTE_ADD("palette", 0xc00)
MCFG_VIDEO_START_OVERRIDE(cps_state,cps1)
@@ -1747,7 +1747,7 @@ MACHINE_CONFIG_START(cps_state::sf2mdt)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_VIDEO_START_OVERRIDE(cps_state,cps1)
@@ -1802,7 +1802,7 @@ MACHINE_CONFIG_START(cps_state::knightsb)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1)
MCFG_PALETTE_ADD("palette", 0xc00)
MCFG_VIDEO_START_OVERRIDE(cps_state,cps1)
@@ -2187,7 +2187,7 @@ MACHINE_CONFIG_START(cps_state::dinopic)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1)
MCFG_PALETTE_ADD("palette", 0xc00)
MCFG_VIDEO_START_OVERRIDE(cps_state,cps1)
@@ -2344,7 +2344,7 @@ MACHINE_CONFIG_START(cps_state::sgyxz)
MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
+ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1)
MCFG_PALETTE_ADD("palette", 0xc00)
MCFG_VIDEO_START_OVERRIDE(cps_state,cps1)