From 23325728009b85bad264dcc175c8f1b8c5e51678 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 15 May 2018 05:43:28 +1000 Subject: 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. --- src/devices/bus/apricot/keyboard/hle.h | 1 + src/devices/bus/c64/xl80.cpp | 4 +- src/devices/bus/comx35/clm.cpp | 4 +- src/devices/bus/einstein/pipe/tk02.cpp | 4 +- src/devices/bus/interpro/keyboard/hle.h | 1 + src/devices/bus/isa/mda.cpp | 8 +- src/devices/bus/isa/pgc.cpp | 4 +- src/devices/bus/isa/sblaster.h | 1 + src/devices/bus/nes_ctrl/miracle.h | 1 + src/devices/bus/rs232/null_modem.h | 1 + src/devices/bus/rs232/printer.h | 1 + src/devices/bus/rs232/pty.h | 1 + src/devices/bus/rs232/rs232.h | 2 + src/devices/bus/rs232/ser_mouse.h | 1 + src/devices/bus/rs232/xvd701.h | 5 +- src/devices/bus/snes_ctrl/miracle.h | 3 +- src/devices/bus/sunkbd/hlekbd.h | 1 + src/devices/bus/sunkbd/sunkbd.h | 1 + src/devices/bus/ti8x/graphlinkhle.h | 2 + src/devices/bus/vic20/videopak.cpp | 4 +- src/devices/imagedev/midiin.h | 7 +- src/devices/imagedev/midiout.h | 9 +- src/devices/machine/68561mpcc.h | 1 + src/devices/machine/i8251.h | 1 + src/devices/machine/ie15.cpp | 4 +- src/devices/machine/ie15.h | 1 + src/devices/machine/im6402.h | 1 + src/devices/machine/ins8250.h | 1 + src/devices/machine/mc2661.h | 2 +- src/devices/machine/mc6852.h | 3 +- src/devices/machine/mc68681.h | 1 + src/devices/machine/mc68901.h | 1 + src/devices/machine/microtch.h | 1 + src/devices/machine/scnxx562.h | 1 + src/devices/machine/tms5501.h | 1 + src/devices/machine/ym2148.h | 1 + src/devices/machine/ym3802.h | 9 +- src/devices/machine/z80dart.h | 1 + src/devices/machine/z80scc.h | 1 + src/devices/machine/z80sti.h | 1 + src/emu/digfx.cpp | 81 +++---- src/emu/digfx.h | 23 +- src/emu/diserial.cpp | 5 +- src/emu/diserial.h | 2 + src/emu/drawgfx.cpp | 3 - src/emu/drawgfx.h | 9 +- src/emu/emu.h | 1 - src/mame/drivers/1942.cpp | 8 +- src/mame/drivers/1943.cpp | 4 +- src/mame/drivers/1945kiii.cpp | 4 +- src/mame/drivers/2mindril.cpp | 4 +- src/mame/drivers/3x3puzzl.cpp | 4 +- src/mame/drivers/40love.cpp | 6 +- src/mame/drivers/4enraya.cpp | 4 +- src/mame/drivers/4roses.cpp | 4 +- src/mame/drivers/5clown.cpp | 4 +- src/mame/drivers/a5105.cpp | 4 +- src/mame/drivers/a51xx.cpp | 4 +- src/mame/drivers/ac1.cpp | 4 +- src/mame/drivers/ace.cpp | 4 +- src/mame/drivers/acefruit.cpp | 4 +- src/mame/drivers/acommand.cpp | 4 +- src/mame/drivers/actfancr.cpp | 8 +- src/mame/drivers/aeroboto.cpp | 4 +- src/mame/drivers/aerofgt.cpp | 46 ++-- src/mame/drivers/airbustr.cpp | 4 +- src/mame/drivers/albazc.cpp | 4 +- src/mame/drivers/albazg.cpp | 4 +- src/mame/drivers/alpha68k.cpp | 26 +-- src/mame/drivers/alphatpx.cpp | 6 +- src/mame/drivers/alphatro.cpp | 4 +- src/mame/drivers/amaticmg.cpp | 10 +- src/mame/drivers/ambush.cpp | 12 +- src/mame/drivers/ampoker2.cpp | 8 +- src/mame/drivers/amspdwy.cpp | 4 +- src/mame/drivers/amusco.cpp | 4 +- src/mame/drivers/amust.cpp | 4 +- src/mame/drivers/angelkds.cpp | 4 +- src/mame/drivers/anzterm.cpp | 4 +- src/mame/drivers/apc.cpp | 4 +- src/mame/drivers/apexc.cpp | 4 +- src/mame/drivers/apogee.cpp | 4 +- src/mame/drivers/apple2gs.cpp | 4 +- src/mame/drivers/appoooh.cpp | 8 +- src/mame/drivers/apricotf.cpp | 4 +- src/mame/drivers/apricotp.cpp | 4 +- src/mame/drivers/aquarium.cpp | 4 +- src/mame/drivers/aquarius.cpp | 4 +- src/mame/drivers/arcadecl.cpp | 4 +- src/mame/drivers/arcadia.cpp | 4 +- src/mame/drivers/argus.cpp | 12 +- src/mame/drivers/aristmk4.cpp | 4 +- src/mame/drivers/arkanoid.cpp | 10 +- src/mame/drivers/armedf.cpp | 18 +- src/mame/drivers/ashnojoe.cpp | 4 +- src/mame/drivers/astrcorp.cpp | 6 +- src/mame/drivers/asuka.cpp | 12 +- src/mame/drivers/atarifb.cpp | 8 +- src/mame/drivers/atarig1.cpp | 4 +- src/mame/drivers/atarig42.cpp | 4 +- src/mame/drivers/atarigt.cpp | 4 +- src/mame/drivers/atarigx2.cpp | 4 +- src/mame/drivers/atarisy1.cpp | 4 +- src/mame/drivers/atarisy2.cpp | 4 +- src/mame/drivers/atetris.cpp | 6 +- src/mame/drivers/atm.cpp | 8 +- src/mame/drivers/att4425.cpp | 4 +- src/mame/drivers/aussiebyte.cpp | 4 +- src/mame/drivers/avigo.cpp | 4 +- src/mame/drivers/avt.cpp | 4 +- src/mame/drivers/ax20.cpp | 4 +- src/mame/drivers/b16.cpp | 4 +- src/mame/drivers/backfire.cpp | 4 +- src/mame/drivers/badlands.cpp | 4 +- src/mame/drivers/badlandsbl.cpp | 4 +- src/mame/drivers/bagman.cpp | 10 +- src/mame/drivers/banctec.cpp | 4 +- src/mame/drivers/bankp.cpp | 4 +- src/mame/drivers/baraduke.cpp | 4 +- src/mame/drivers/batman.cpp | 4 +- src/mame/drivers/battlane.cpp | 4 +- src/mame/drivers/battlex.cpp | 4 +- src/mame/drivers/battlnts.cpp | 4 +- src/mame/drivers/bbusters.cpp | 8 +- src/mame/drivers/bcs3.cpp | 6 +- src/mame/drivers/bestleag.cpp | 4 +- src/mame/drivers/bigbord2.cpp | 4 +- src/mame/drivers/bigevglf.cpp | 4 +- src/mame/drivers/bigstrkb.cpp | 4 +- src/mame/drivers/binbug.cpp | 6 +- src/mame/drivers/bingoman.cpp | 4 +- src/mame/drivers/bingor.cpp | 4 +- src/mame/drivers/bionicc.cpp | 4 +- src/mame/drivers/bking.cpp | 4 +- src/mame/drivers/blackt96.cpp | 4 +- src/mame/drivers/bladestl.cpp | 4 +- src/mame/drivers/blktiger.cpp | 4 +- src/mame/drivers/blmbycar.cpp | 4 +- src/mame/drivers/blockade.cpp | 4 +- src/mame/drivers/bloodbro.cpp | 8 +- src/mame/drivers/blstroid.cpp | 4 +- src/mame/drivers/blueprnt.cpp | 4 +- src/mame/drivers/bmcpokr.cpp | 4 +- src/mame/drivers/bmjr.cpp | 4 +- src/mame/drivers/bnstars.cpp | 4 +- src/mame/drivers/bogeyman.cpp | 4 +- src/mame/drivers/bombjack.cpp | 4 +- src/mame/drivers/boogwing.cpp | 4 +- src/mame/drivers/boxer.cpp | 4 +- src/mame/drivers/brkthru.cpp | 6 +- src/mame/drivers/bsktball.cpp | 4 +- src/mame/drivers/btime.cpp | 26 +-- src/mame/drivers/bublbobl.cpp | 6 +- src/mame/drivers/buggychl.cpp | 4 +- src/mame/drivers/buster.cpp | 4 +- src/mame/drivers/bw12.cpp | 4 +- src/mame/drivers/bwing.cpp | 4 +- src/mame/drivers/c10.cpp | 4 +- src/mame/drivers/c128.cpp | 6 +- src/mame/drivers/c65.cpp | 4 +- src/mame/drivers/c900.cpp | 4 +- src/mame/drivers/cabal.cpp | 6 +- src/mame/drivers/cabaret.cpp | 4 +- src/mame/drivers/calomega.cpp | 8 +- src/mame/drivers/calorie.cpp | 4 +- src/mame/drivers/canyon.cpp | 4 +- src/mame/drivers/cardline.cpp | 4 +- src/mame/drivers/carjmbre.cpp | 4 +- src/mame/drivers/carpolo.cpp | 4 +- src/mame/drivers/carrera.cpp | 4 +- src/mame/drivers/casloopy.cpp | 2 +- src/mame/drivers/caswin.cpp | 4 +- src/mame/drivers/cave.cpp | 56 ++--- src/mame/drivers/cb2001.cpp | 4 +- src/mame/drivers/cball.cpp | 4 +- src/mame/drivers/cbasebal.cpp | 4 +- src/mame/drivers/cbuster.cpp | 4 +- src/mame/drivers/ccastles.cpp | 4 +- src/mame/drivers/cchance.cpp | 4 +- src/mame/drivers/cclimber.cpp | 16 +- src/mame/drivers/cd2650.cpp | 4 +- src/mame/drivers/cdc721.cpp | 4 +- src/mame/drivers/centiped.cpp | 14 +- src/mame/drivers/chaknpop.cpp | 4 +- src/mame/drivers/champbas.cpp | 14 +- src/mame/drivers/champbwl.cpp | 6 +- src/mame/drivers/chanbara.cpp | 4 +- src/mame/drivers/chance32.cpp | 4 +- src/mame/drivers/cheekyms.cpp | 4 +- src/mame/drivers/chinagat.cpp | 8 +- src/mame/drivers/chinsan.cpp | 4 +- src/mame/drivers/chsuper.cpp | 4 +- src/mame/drivers/circus.cpp | 12 +- src/mame/drivers/circusc.cpp | 4 +- src/mame/drivers/cischeat.cpp | 18 +- src/mame/drivers/citycon.cpp | 4 +- src/mame/drivers/cloak.cpp | 4 +- src/mame/drivers/cloud9.cpp | 4 +- src/mame/drivers/clpoker.cpp | 4 +- src/mame/drivers/clshroad.cpp | 8 +- src/mame/drivers/cmmb.cpp | 4 +- src/mame/drivers/cninja.cpp | 20 +- src/mame/drivers/cntsteer.cpp | 8 +- src/mame/drivers/coinmstr.cpp | 4 +- src/mame/drivers/coinmvga.cpp | 8 +- src/mame/drivers/combatsc.cpp | 8 +- src/mame/drivers/commando.cpp | 4 +- src/mame/drivers/compgolf.cpp | 4 +- src/mame/drivers/comquest.cpp | 4 +- src/mame/drivers/contra.cpp | 4 +- src/mame/drivers/coolridr.cpp | 4 +- src/mame/drivers/cop01.cpp | 6 +- src/mame/drivers/copsnrob.cpp | 4 +- src/mame/drivers/cosmic.cpp | 12 +- src/mame/drivers/cps1.cpp | 4 +- src/mame/drivers/cps2.cpp | 2 +- src/mame/drivers/cps3.cpp | 2 +- src/mame/drivers/crbaloon.cpp | 4 +- src/mame/drivers/crospang.cpp | 4 +- src/mame/drivers/crshrace.cpp | 4 +- src/mame/drivers/cswat.cpp | 4 +- src/mame/drivers/cultures.cpp | 4 +- src/mame/drivers/cvs.cpp | 4 +- src/mame/drivers/cyberbal.cpp | 8 +- src/mame/drivers/cybertnk.cpp | 4 +- src/mame/drivers/cybstorm.cpp | 4 +- src/mame/drivers/cyclemb.cpp | 4 +- src/mame/drivers/d9final.cpp | 4 +- src/mame/drivers/dacholer.cpp | 8 +- src/mame/drivers/dai.cpp | 4 +- src/mame/drivers/dambustr.cpp | 4 +- src/mame/drivers/darius.cpp | 4 +- src/mame/drivers/darkmist.cpp | 4 +- src/mame/drivers/darkseal.cpp | 21 +- src/mame/drivers/dassault.cpp | 4 +- src/mame/drivers/dblcrown.cpp | 4 +- src/mame/drivers/dblewing.cpp | 4 +- src/mame/drivers/dbz.cpp | 4 +- src/mame/drivers/dcon.cpp | 6 +- src/mame/drivers/dday.cpp | 4 +- src/mame/drivers/ddayjlc.cpp | 4 +- src/mame/drivers/ddealer.cpp | 4 +- src/mame/drivers/ddragon.cpp | 8 +- src/mame/drivers/ddragon3.cpp | 8 +- src/mame/drivers/ddribble.cpp | 4 +- src/mame/drivers/deadang.cpp | 8 +- src/mame/drivers/dec0.cpp | 16 +- src/mame/drivers/dec8.cpp | 30 +-- src/mame/drivers/deco156.cpp | 6 +- src/mame/drivers/deco32.cpp | 22 +- src/mame/drivers/deco_ld.cpp | 4 +- src/mame/drivers/deco_mlc.cpp | 14 +- src/mame/drivers/decocass.cpp | 4 +- src/mame/drivers/deniam.cpp | 6 +- src/mame/drivers/destroyr.cpp | 4 +- src/mame/drivers/dfruit.cpp | 4 +- src/mame/drivers/dgn_beta.cpp | 4 +- src/mame/drivers/dietgo.cpp | 4 +- src/mame/drivers/dim68k.cpp | 4 +- src/mame/drivers/discoboy.cpp | 4 +- src/mame/drivers/divebomb.cpp | 4 +- src/mame/drivers/diverboy.cpp | 4 +- src/mame/drivers/djboy.cpp | 4 +- src/mame/drivers/djmain.cpp | 4 +- src/mame/drivers/dkong.cpp | 6 +- src/mame/drivers/dlair.cpp | 4 +- src/mame/drivers/dlair2.cpp | 4 +- src/mame/drivers/dmndrby.cpp | 4 +- src/mame/drivers/dmv.cpp | 56 ++--- src/mame/drivers/docastle.cpp | 4 +- src/mame/drivers/dogfgt.cpp | 4 +- src/mame/drivers/dominob.cpp | 4 +- src/mame/drivers/dooyong.cpp | 28 +-- src/mame/drivers/dragrace.cpp | 4 +- src/mame/drivers/dreambal.cpp | 4 +- src/mame/drivers/dreamwld.cpp | 4 +- src/mame/drivers/drgnmst.cpp | 4 +- src/mame/drivers/drmicro.cpp | 4 +- src/mame/drivers/drtomy.cpp | 4 +- src/mame/drivers/drw80pkr.cpp | 4 +- src/mame/drivers/duet16.cpp | 4 +- src/mame/drivers/dunhuang.cpp | 4 +- src/mame/drivers/dvk_kcgd.cpp | 4 +- src/mame/drivers/dvk_ksm.cpp | 4 +- src/mame/drivers/dwarfd.cpp | 4 +- src/mame/drivers/dynadice.cpp | 4 +- src/mame/drivers/dynduke.cpp | 4 +- src/mame/drivers/ec65.cpp | 6 +- src/mame/drivers/egghunt.cpp | 4 +- src/mame/drivers/elwro800.cpp | 4 +- src/mame/drivers/eprom.cpp | 10 +- src/mame/drivers/equites.cpp | 8 +- src/mame/drivers/esd16.cpp | 20 +- src/mame/drivers/esh.cpp | 4 +- src/mame/drivers/espial.cpp | 4 +- src/mame/drivers/esprit.cpp | 4 +- src/mame/drivers/ettrivia.cpp | 4 +- src/mame/drivers/excali64.cpp | 4 +- src/mame/drivers/exedexes.cpp | 4 +- src/mame/drivers/exerion.cpp | 4 +- src/mame/drivers/exidy.cpp | 4 +- src/mame/drivers/expro02.cpp | 8 +- src/mame/drivers/exprraid.cpp | 4 +- src/mame/drivers/exzisus.cpp | 4 +- src/mame/drivers/f1gp.cpp | 10 +- src/mame/drivers/fantland.cpp | 10 +- src/mame/drivers/fastfred.cpp | 12 +- src/mame/drivers/fastinvaders.cpp | 4 +- src/mame/drivers/fastlane.cpp | 4 +- src/mame/drivers/fc100.cpp | 4 +- src/mame/drivers/fcombat.cpp | 4 +- src/mame/drivers/fcrash.cpp | 20 +- src/mame/drivers/feversoc.cpp | 4 +- src/mame/drivers/fgoal.cpp | 4 +- src/mame/drivers/finalizr.cpp | 4 +- src/mame/drivers/firefox.cpp | 4 +- src/mame/drivers/firetrap.cpp | 6 +- src/mame/drivers/firetrk.cpp | 12 +- src/mame/drivers/fitfight.cpp | 8 +- src/mame/drivers/flipjack.cpp | 4 +- src/mame/drivers/flkatck.cpp | 4 +- src/mame/drivers/flower.cpp | 4 +- src/mame/drivers/flstory.cpp | 10 +- src/mame/drivers/flyball.cpp | 4 +- src/mame/drivers/fmtowns.cpp | 4 +- src/mame/drivers/foodf.cpp | 4 +- src/mame/drivers/fortecar.cpp | 4 +- src/mame/drivers/fp1100.cpp | 4 +- src/mame/drivers/fp200.cpp | 4 +- src/mame/drivers/fp6000.cpp | 4 +- src/mame/drivers/freekick.cpp | 6 +- src/mame/drivers/fresh.cpp | 4 +- src/mame/drivers/fromanc2.cpp | 10 +- src/mame/drivers/fromance.cpp | 8 +- src/mame/drivers/funkybee.cpp | 4 +- src/mame/drivers/funkyjet.cpp | 4 +- src/mame/drivers/funtech.cpp | 4 +- src/mame/drivers/funworld.cpp | 12 +- src/mame/drivers/funybubl.cpp | 4 +- src/mame/drivers/fuukifg2.cpp | 4 +- src/mame/drivers/fuukifg3.cpp | 4 +- src/mame/drivers/gaelco.cpp | 10 +- src/mame/drivers/gaelco2.cpp | 18 +- src/mame/drivers/gaiden.cpp | 12 +- src/mame/drivers/gal3.cpp | 4 +- src/mame/drivers/galaga.cpp | 16 +- src/mame/drivers/galastrm.cpp | 4 +- src/mame/drivers/galaxi.cpp | 4 +- src/mame/drivers/galaxia.cpp | 8 +- src/mame/drivers/galaxian.cpp | 18 +- src/mame/drivers/galaxold.cpp | 24 +-- src/mame/drivers/galaxy.cpp | 4 +- src/mame/drivers/galeb.cpp | 4 +- src/mame/drivers/galivan.cpp | 6 +- src/mame/drivers/galpani2.cpp | 4 +- src/mame/drivers/galpanic.cpp | 4 +- src/mame/drivers/galspnbl.cpp | 4 +- src/mame/drivers/gamecstl.cpp | 4 +- src/mame/drivers/gaplus.cpp | 4 +- src/mame/drivers/gatron.cpp | 4 +- src/mame/drivers/gauntlet.cpp | 4 +- src/mame/drivers/gb.cpp | 10 +- src/mame/drivers/gberet.cpp | 8 +- src/mame/drivers/gcpinbal.cpp | 10 +- src/mame/drivers/ginganin.cpp | 4 +- src/mame/drivers/gkigt.cpp | 4 +- src/mame/drivers/gladiatr.cpp | 8 +- src/mame/drivers/glass.cpp | 4 +- src/mame/drivers/gluck2.cpp | 4 +- src/mame/drivers/gng.cpp | 4 +- src/mame/drivers/go2000.cpp | 4 +- src/mame/drivers/goal92.cpp | 4 +- src/mame/drivers/goindol.cpp | 4 +- src/mame/drivers/goldngam.cpp | 4 +- src/mame/drivers/goldnpkr.cpp | 14 +- src/mame/drivers/goldstar.cpp | 114 +++++----- src/mame/drivers/gomoku.cpp | 4 +- src/mame/drivers/good.cpp | 4 +- src/mame/drivers/goodejan.cpp | 4 +- src/mame/drivers/gotcha.cpp | 4 +- src/mame/drivers/gottlieb.cpp | 2 +- src/mame/drivers/gotya.cpp | 4 +- src/mame/drivers/gpworld.cpp | 4 +- src/mame/drivers/grchamp.cpp | 4 +- src/mame/drivers/groundfx.cpp | 4 +- src/mame/drivers/gstream.cpp | 8 +- src/mame/drivers/gstriker.cpp | 4 +- src/mame/drivers/gsword.cpp | 6 +- src/mame/drivers/gumbo.cpp | 4 +- src/mame/drivers/gunbustr.cpp | 4 +- src/mame/drivers/gundealr.cpp | 4 +- src/mame/drivers/gunsmoke.cpp | 4 +- src/mame/drivers/gyruss.cpp | 4 +- src/mame/drivers/h19.cpp | 4 +- src/mame/drivers/hanaawas.cpp | 4 +- src/mame/drivers/hazeltin.cpp | 4 +- src/mame/drivers/hcastle.cpp | 4 +- src/mame/drivers/headonb.cpp | 4 +- src/mame/drivers/hexion.cpp | 4 +- src/mame/drivers/hideseek.cpp | 4 +- src/mame/drivers/higemaru.cpp | 4 +- src/mame/drivers/himesiki.cpp | 4 +- src/mame/drivers/hitme.cpp | 8 +- src/mame/drivers/hitpoker.cpp | 4 +- src/mame/drivers/hng64.cpp | 4 +- src/mame/drivers/holeland.cpp | 8 +- src/mame/drivers/homedata.cpp | 20 +- src/mame/drivers/homelab.cpp | 8 +- src/mame/drivers/homerun.cpp | 4 +- src/mame/drivers/homez80.cpp | 4 +- src/mame/drivers/hp9k.cpp | 4 +- src/mame/drivers/hprot1.cpp | 4 +- src/mame/drivers/huebler.cpp | 4 +- src/mame/drivers/hvyunit.cpp | 4 +- src/mame/drivers/hyperspt.cpp | 8 +- src/mame/drivers/hyprduel.cpp | 4 +- src/mame/drivers/i7000.cpp | 14 +- src/mame/drivers/ibmpcjr.cpp | 8 +- src/mame/drivers/icatel.cpp | 4 +- src/mame/drivers/ichiban.cpp | 4 +- src/mame/drivers/igs009.cpp | 8 +- src/mame/drivers/igs011.cpp | 12 +- src/mame/drivers/igs_fear.cpp | 4 +- src/mame/drivers/igspoker.cpp | 8 +- src/mame/drivers/ikki.cpp | 4 +- src/mame/drivers/imds2.cpp | 4 +- src/mame/drivers/intrscti.cpp | 4 +- src/mame/drivers/intv.cpp | 4 +- src/mame/drivers/inufuku.cpp | 8 +- src/mame/drivers/ipds.cpp | 4 +- src/mame/drivers/iqblock.cpp | 4 +- src/mame/drivers/irisha.cpp | 4 +- src/mame/drivers/irobot.cpp | 4 +- src/mame/drivers/ironhors.cpp | 8 +- src/mame/drivers/isbc8010.cpp | 4 +- src/mame/drivers/istellar.cpp | 4 +- src/mame/drivers/istrebiteli.cpp | 4 +- src/mame/drivers/itgambl2.cpp | 4 +- src/mame/drivers/itgambl3.cpp | 4 +- src/mame/drivers/itgamble.cpp | 4 +- src/mame/drivers/itt3030.cpp | 4 +- src/mame/drivers/jack.cpp | 8 +- src/mame/drivers/jackal.cpp | 4 +- src/mame/drivers/jackie.cpp | 4 +- src/mame/drivers/jackpool.cpp | 4 +- src/mame/drivers/jailbrek.cpp | 4 +- src/mame/drivers/jalmah.cpp | 8 +- src/mame/drivers/jchan.cpp | 4 +- src/mame/drivers/jclub2.cpp | 4 +- src/mame/drivers/jokrwild.cpp | 4 +- src/mame/drivers/jollyjgr.cpp | 4 +- src/mame/drivers/jonos.cpp | 4 +- src/mame/drivers/joystand.cpp | 4 +- src/mame/drivers/jr100.cpp | 4 +- src/mame/drivers/jr200.cpp | 4 +- src/mame/drivers/jrpacman.cpp | 4 +- src/mame/drivers/jtc.cpp | 8 +- src/mame/drivers/jubilee.cpp | 4 +- src/mame/drivers/jungleyo.cpp | 4 +- src/mame/drivers/jupace.cpp | 4 +- src/mame/drivers/kaneko16.cpp | 20 +- src/mame/drivers/karnov.cpp | 6 +- src/mame/drivers/kaypro.cpp | 8 +- src/mame/drivers/kchamp.cpp | 6 +- src/mame/drivers/kickgoal.cpp | 8 +- src/mame/drivers/kingdrby.cpp | 8 +- src/mame/drivers/kingobox.cpp | 8 +- src/mame/drivers/klax.cpp | 8 +- src/mame/drivers/kncljoe.cpp | 4 +- src/mame/drivers/koftball.cpp | 4 +- src/mame/drivers/koikoi.cpp | 4 +- src/mame/drivers/konamigx.cpp | 16 +- src/mame/drivers/konblands.cpp | 4 +- src/mame/drivers/kopunch.cpp | 4 +- src/mame/drivers/kramermc.cpp | 4 +- src/mame/drivers/ksayakyu.cpp | 4 +- src/mame/drivers/kyugo.cpp | 4 +- src/mame/drivers/labyrunr.cpp | 4 +- src/mame/drivers/ladybug.cpp | 8 +- src/mame/drivers/ladyfrog.cpp | 4 +- src/mame/drivers/laserbat.cpp | 8 +- src/mame/drivers/lasso.cpp | 12 +- src/mame/drivers/lastbank.cpp | 4 +- src/mame/drivers/lastduel.cpp | 8 +- src/mame/drivers/lazercmd.cpp | 8 +- src/mame/drivers/lbeach.cpp | 4 +- src/mame/drivers/lcmate2.cpp | 4 +- src/mame/drivers/legionna.cpp | 20 +- src/mame/drivers/lemmings.cpp | 4 +- src/mame/drivers/lgp.cpp | 4 +- src/mame/drivers/liberate.cpp | 12 +- src/mame/drivers/limenko.cpp | 6 +- src/mame/drivers/lkage.cpp | 6 +- src/mame/drivers/llc.cpp | 8 +- src/mame/drivers/lockon.cpp | 4 +- src/mame/drivers/looping.cpp | 4 +- src/mame/drivers/lordgun.cpp | 6 +- src/mame/drivers/lsasquad.cpp | 6 +- src/mame/drivers/ltcasino.cpp | 4 +- src/mame/drivers/luckgrln.cpp | 4 +- src/mame/drivers/lucky74.cpp | 4 +- src/mame/drivers/lvcards.cpp | 4 +- src/mame/drivers/lwings.cpp | 10 +- src/mame/drivers/m10.cpp | 6 +- src/mame/drivers/m107.cpp | 10 +- src/mame/drivers/m14.cpp | 4 +- src/mame/drivers/m3.cpp | 4 +- src/mame/drivers/m52.cpp | 4 +- src/mame/drivers/m57.cpp | 4 +- src/mame/drivers/m58.cpp | 4 +- src/mame/drivers/m62.cpp | 44 ++-- src/mame/drivers/m63.cpp | 8 +- src/mame/drivers/m72.cpp | 16 +- src/mame/drivers/m79152pc.cpp | 4 +- src/mame/drivers/m90.cpp | 4 +- src/mame/drivers/m92.cpp | 14 +- src/mame/drivers/macrossp.cpp | 4 +- src/mame/drivers/madmotor.cpp | 4 +- src/mame/drivers/magic10.cpp | 4 +- src/mame/drivers/magicfly.cpp | 4 +- src/mame/drivers/magmax.cpp | 4 +- src/mame/drivers/magreel.cpp | 2 +- src/mame/drivers/mainsnk.cpp | 4 +- src/mame/drivers/majorpkr.cpp | 4 +- src/mame/drivers/malzak.cpp | 4 +- src/mame/drivers/mappy.cpp | 16 +- src/mame/drivers/marineb.cpp | 20 +- src/mame/drivers/marinedt.cpp | 4 +- src/mame/drivers/mario.cpp | 4 +- src/mame/drivers/markham.cpp | 4 +- src/mame/drivers/mastboy.cpp | 4 +- src/mame/drivers/mastboyo.cpp | 4 +- src/mame/drivers/matmania.cpp | 8 +- src/mame/drivers/mbc200.cpp | 4 +- src/mame/drivers/mbee.cpp | 12 +- src/mame/drivers/mcatadv.cpp | 4 +- src/mame/drivers/mcr.cpp | 4 +- src/mame/drivers/mcr3.cpp | 8 +- src/mame/drivers/mcr68.cpp | 4 +- src/mame/drivers/meadows.cpp | 10 +- src/mame/drivers/mediagx.cpp | 4 +- src/mame/drivers/megasys1.cpp | 12 +- src/mame/drivers/megazone.cpp | 4 +- src/mame/drivers/mermaid.cpp | 4 +- src/mame/drivers/metlclsh.cpp | 4 +- src/mame/drivers/metlfrzr.cpp | 4 +- src/mame/drivers/metro.cpp | 20 +- src/mame/drivers/mexico86.cpp | 4 +- src/mame/drivers/mgames.cpp | 4 +- src/mame/drivers/mgolf.cpp | 4 +- src/mame/drivers/micral.cpp | 2 +- src/mame/drivers/microtan.cpp | 4 +- src/mame/drivers/midas.cpp | 6 +- src/mame/drivers/mikie.cpp | 4 +- src/mame/drivers/mikro80.cpp | 4 +- src/mame/drivers/mikrosha.cpp | 4 +- src/mame/drivers/mil4000.cpp | 4 +- src/mame/drivers/miniboy7.cpp | 4 +- src/mame/drivers/mirage.cpp | 4 +- src/mame/drivers/mirax.cpp | 4 +- src/mame/drivers/missb2.cpp | 8 +- src/mame/drivers/mitchell.cpp | 24 +-- src/mame/drivers/mjkjidai.cpp | 4 +- src/mame/drivers/model3.cpp | 8 +- src/mame/drivers/modellot.cpp | 4 +- src/mame/drivers/mogura.cpp | 4 +- src/mame/drivers/mole.cpp | 4 +- src/mame/drivers/molecular.cpp | 4 +- src/mame/drivers/momoko.cpp | 4 +- src/mame/drivers/monzagp.cpp | 4 +- src/mame/drivers/mosaic.cpp | 4 +- src/mame/drivers/mouser.cpp | 4 +- src/mame/drivers/mpu12wbk.cpp | 4 +- src/mame/drivers/mpu4dealem.cpp | 4 +- src/mame/drivers/mpu4vid.cpp | 2 +- src/mame/drivers/mrdo.cpp | 4 +- src/mame/drivers/mrflea.cpp | 4 +- src/mame/drivers/mrgame.cpp | 4 +- src/mame/drivers/mrjong.cpp | 4 +- src/mame/drivers/ms32.cpp | 8 +- src/mame/drivers/ms6102.cpp | 4 +- src/mame/drivers/msisaac.cpp | 4 +- src/mame/drivers/mugsmash.cpp | 4 +- src/mame/drivers/multfish.cpp | 4 +- src/mame/drivers/multi8.cpp | 4 +- src/mame/drivers/munchmo.cpp | 4 +- src/mame/drivers/murogem.cpp | 4 +- src/mame/drivers/murogmbl.cpp | 9 +- src/mame/drivers/mustache.cpp | 4 +- src/mame/drivers/mwarr.cpp | 4 +- src/mame/drivers/mx2178.cpp | 4 +- src/mame/drivers/mycom.cpp | 4 +- src/mame/drivers/mystwarr.cpp | 8 +- src/mame/drivers/mz2000.cpp | 4 +- src/mame/drivers/mz2500.cpp | 4 +- src/mame/drivers/mz3500.cpp | 4 +- src/mame/drivers/mz700.cpp | 8 +- src/mame/drivers/mz80.cpp | 8 +- src/mame/drivers/nakajies.cpp | 16 +- src/mame/drivers/namcofl.cpp | 4 +- src/mame/drivers/namcona1.cpp | 4 +- src/mame/drivers/namconb1.cpp | 8 +- src/mame/drivers/namcos1.cpp | 4 +- src/mame/drivers/namcos2.cpp | 24 +-- src/mame/drivers/namcos21.cpp | 8 +- src/mame/drivers/namcos22.cpp | 8 +- src/mame/drivers/namcos23.cpp | 8 +- src/mame/drivers/namcos86.cpp | 4 +- src/mame/drivers/nanos.cpp | 8 +- src/mame/drivers/nascom1.cpp | 8 +- src/mame/drivers/naughtyb.cpp | 6 +- src/mame/drivers/nemesis.cpp | 22 +- src/mame/drivers/neoprint.cpp | 6 +- src/mame/drivers/neptunp2.cpp | 4 +- src/mame/drivers/nes_vt.cpp | 4 +- src/mame/drivers/news.cpp | 4 +- src/mame/drivers/nibble.cpp | 4 +- src/mame/drivers/ninjakd2.cpp | 8 +- src/mame/drivers/ninjaw.cpp | 6 +- src/mame/drivers/nitedrvr.cpp | 4 +- src/mame/drivers/nmg5.cpp | 10 +- src/mame/drivers/nmk16.cpp | 70 +++--- src/mame/drivers/norautp.cpp | 4 +- src/mame/drivers/nova2001.cpp | 16 +- src/mame/drivers/nsmpoker.cpp | 4 +- src/mame/drivers/nycaptor.cpp | 8 +- src/mame/drivers/odyssey2.cpp | 10 +- src/mame/drivers/offtwall.cpp | 4 +- src/mame/drivers/ohmygod.cpp | 4 +- src/mame/drivers/ojankohs.cpp | 8 +- src/mame/drivers/okean240.cpp | 8 +- src/mame/drivers/olibochu.cpp | 4 +- src/mame/drivers/oneshot.cpp | 4 +- src/mame/drivers/onetwo.cpp | 4 +- src/mame/drivers/opwolf.cpp | 8 +- src/mame/drivers/orbit.cpp | 4 +- src/mame/drivers/osborne1.cpp | 4 +- src/mame/drivers/osi.cpp | 8 +- src/mame/drivers/othunder.cpp | 4 +- src/mame/drivers/p2000t.cpp | 4 +- src/mame/drivers/pacland.cpp | 4 +- src/mame/drivers/pacman.cpp | 16 +- src/mame/drivers/pandoras.cpp | 4 +- src/mame/drivers/panicr.cpp | 4 +- src/mame/drivers/paradise.cpp | 12 +- src/mame/drivers/partner.cpp | 4 +- src/mame/drivers/paso1600.cpp | 4 +- src/mame/drivers/pasopia.cpp | 4 +- src/mame/drivers/pasopia7.cpp | 6 +- src/mame/drivers/pass.cpp | 4 +- src/mame/drivers/patapata.cpp | 4 +- src/mame/drivers/pb1000.cpp | 4 +- src/mame/drivers/pbaction.cpp | 4 +- src/mame/drivers/pc100.cpp | 4 +- src/mame/drivers/pc2000.cpp | 4 +- src/mame/drivers/pc4.cpp | 4 +- src/mame/drivers/pc6001.cpp | 6 +- src/mame/drivers/pc8801.cpp | 4 +- src/mame/drivers/pc88va.cpp | 4 +- src/mame/drivers/pc9801.cpp | 4 +- src/mame/drivers/pcktgal.cpp | 8 +- src/mame/drivers/pcm.cpp | 4 +- src/mame/drivers/pda600.cpp | 4 +- src/mame/drivers/pdp1.cpp | 4 +- src/mame/drivers/pegasus.cpp | 4 +- src/mame/drivers/pengo.cpp | 4 +- src/mame/drivers/pentagon.cpp | 4 +- src/mame/drivers/peoplepc.cpp | 2 +- src/mame/drivers/peplus.cpp | 6 +- src/mame/drivers/pgm.cpp | 4 +- src/mame/drivers/pgm2.cpp | 4 +- src/mame/drivers/phoenix.cpp | 10 +- src/mame/drivers/photoply.cpp | 4 +- src/mame/drivers/phunsy.cpp | 4 +- src/mame/drivers/pinball2k.cpp | 14 +- src/mame/drivers/pingpong.cpp | 4 +- src/mame/drivers/pinkiri8.cpp | 4 +- src/mame/drivers/pipedrm.cpp | 8 +- src/mame/drivers/pipeline.cpp | 4 +- src/mame/drivers/pirates.cpp | 4 +- src/mame/drivers/pitnrun.cpp | 4 +- src/mame/drivers/pk8020.cpp | 4 +- src/mame/drivers/pkscram.cpp | 4 +- src/mame/drivers/pktgaldx.cpp | 8 +- src/mame/drivers/plan80.cpp | 4 +- src/mame/drivers/playch10.cpp | 4 +- src/mame/drivers/playmark.cpp | 28 +-- src/mame/drivers/plygonet.cpp | 4 +- src/mame/drivers/pocketc.cpp | 8 +- src/mame/drivers/pofo.cpp | 4 +- src/mame/drivers/pokechmp.cpp | 4 +- src/mame/drivers/poker72.cpp | 4 +- src/mame/drivers/polepos.cpp | 6 +- src/mame/drivers/poly88.cpp | 4 +- src/mame/drivers/polyplay.cpp | 4 +- src/mame/drivers/poolshrk.cpp | 4 +- src/mame/drivers/pooyan.cpp | 4 +- src/mame/drivers/popeye.cpp | 4 +- src/mame/drivers/popobear.cpp | 4 +- src/mame/drivers/popper.cpp | 4 +- src/mame/drivers/portrait.cpp | 4 +- src/mame/drivers/powerbal.cpp | 6 +- src/mame/drivers/powerins.cpp | 4 +- src/mame/drivers/ppmast93.cpp | 4 +- src/mame/drivers/prehisle.cpp | 4 +- src/mame/drivers/progolf.cpp | 4 +- src/mame/drivers/proteus3.cpp | 4 +- src/mame/drivers/psikyo.cpp | 10 +- src/mame/drivers/psikyo4.cpp | 4 +- src/mame/drivers/psikyosh.cpp | 4 +- src/mame/drivers/psion.cpp | 4 +- src/mame/drivers/psychic5.cpp | 8 +- src/mame/drivers/ptcsol.cpp | 4 +- src/mame/drivers/pturn.cpp | 4 +- src/mame/drivers/punchout.cpp | 8 +- src/mame/drivers/pv1000.cpp | 4 +- src/mame/drivers/px4.cpp | 1 + src/mame/drivers/px8.cpp | 4 +- src/mame/drivers/pyl601.cpp | 8 +- src/mame/drivers/pzletime.cpp | 4 +- src/mame/drivers/quasar.cpp | 4 +- src/mame/drivers/quickpick5.cpp | 2 +- src/mame/drivers/quizdna.cpp | 4 +- src/mame/drivers/quizpani.cpp | 4 +- src/mame/drivers/quizpun2.cpp | 4 +- src/mame/drivers/quizshow.cpp | 4 +- src/mame/drivers/qx10.cpp | 4 +- src/mame/drivers/r2dx_v33.cpp | 6 +- src/mame/drivers/rabbit.cpp | 4 +- src/mame/drivers/rad_eu3a05.cpp | 4 +- src/mame/drivers/rad_eu3a14.cpp | 4 +- src/mame/drivers/radio86.cpp | 4 +- src/mame/drivers/raiden.cpp | 4 +- src/mame/drivers/raiden2.cpp | 6 +- src/mame/drivers/rainbow.cpp | 366 ++++++++++++++++---------------- src/mame/drivers/rallyx.cpp | 8 +- src/mame/drivers/rampart.cpp | 4 +- src/mame/drivers/rastan.cpp | 4 +- src/mame/drivers/rbisland.cpp | 8 +- src/mame/drivers/rbmk.cpp | 4 +- src/mame/drivers/rcorsair.cpp | 4 +- src/mame/drivers/rd100.cpp | 2 +- src/mame/drivers/realbrk.cpp | 8 +- src/mame/drivers/redclash.cpp | 6 +- src/mame/drivers/relief.cpp | 4 +- src/mame/drivers/renegade.cpp | 4 +- src/mame/drivers/replicator.cpp | 4 +- src/mame/drivers/retofinv.cpp | 4 +- src/mame/drivers/rex6000.cpp | 4 +- src/mame/drivers/rgum.cpp | 4 +- src/mame/drivers/rmhaihai.cpp | 10 +- src/mame/drivers/rockrage.cpp | 4 +- src/mame/drivers/rocnrope.cpp | 4 +- src/mame/drivers/rohga.cpp | 14 +- src/mame/drivers/rollrace.cpp | 4 +- src/mame/drivers/ron.cpp | 4 +- src/mame/drivers/rpunch.cpp | 8 +- src/mame/drivers/rt1715.cpp | 4 +- src/mame/drivers/runaway.cpp | 8 +- src/mame/drivers/rungun.cpp | 4 +- src/mame/drivers/rx78.cpp | 4 +- src/mame/drivers/safarir.cpp | 4 +- src/mame/drivers/sandscrp.cpp | 4 +- src/mame/drivers/sanremo.cpp | 4 +- src/mame/drivers/saturn.cpp | 2 +- src/mame/drivers/sauro.cpp | 8 +- src/mame/drivers/sbasketb.cpp | 4 +- src/mame/drivers/sbc6510.cpp | 4 +- src/mame/drivers/sbowling.cpp | 4 +- src/mame/drivers/sbrkout.cpp | 4 +- src/mame/drivers/sbugger.cpp | 4 +- src/mame/drivers/scobra.cpp | 6 +- src/mame/drivers/scopus.cpp | 4 +- src/mame/drivers/scorpion.cpp | 12 +- src/mame/drivers/scotrsht.cpp | 4 +- src/mame/drivers/scramble.cpp | 20 +- src/mame/drivers/scregg.cpp | 6 +- src/mame/drivers/scv.cpp | 4 +- src/mame/drivers/scyclone.cpp | 4 +- src/mame/drivers/sderby.cpp | 14 +- src/mame/drivers/sderby2.cpp | 4 +- src/mame/drivers/seabattl.cpp | 4 +- src/mame/drivers/sealy.cpp | 4 +- src/mame/drivers/segag80r.cpp | 16 +- src/mame/drivers/segahang.cpp | 4 +- src/mame/drivers/segald.cpp | 13 +- src/mame/drivers/segaorun.cpp | 4 +- src/mame/drivers/segas16a.cpp | 4 +- src/mame/drivers/segas16b.cpp | 8 +- src/mame/drivers/segas18.cpp | 4 +- src/mame/drivers/segas32.cpp | 6 +- src/mame/drivers/segaxbd.cpp | 4 +- src/mame/drivers/segaybd.cpp | 2 +- src/mame/drivers/seibucats.cpp | 4 +- src/mame/drivers/seibuspi.cpp | 10 +- src/mame/drivers/seicross.cpp | 4 +- src/mame/drivers/seicupbl.cpp | 30 +-- src/mame/drivers/sengokmj.cpp | 4 +- src/mame/drivers/senjyo.cpp | 4 +- src/mame/drivers/seta.cpp | 123 +++++------ src/mame/drivers/seta2.cpp | 16 +- src/mame/drivers/sf.cpp | 4 +- src/mame/drivers/sfbonus.cpp | 4 +- src/mame/drivers/shadfrce.cpp | 4 +- src/mame/drivers/shangha3.cpp | 8 +- src/mame/drivers/shangkid.cpp | 12 +- src/mame/drivers/shaolins.cpp | 4 +- src/mame/drivers/shisen.cpp | 4 +- src/mame/drivers/shootout.cpp | 6 +- src/mame/drivers/shuuz.cpp | 4 +- src/mame/drivers/sidearms.cpp | 10 +- src/mame/drivers/sidepckt.cpp | 4 +- src/mame/drivers/sigmab98.cpp | 10 +- src/mame/drivers/silkroad.cpp | 4 +- src/mame/drivers/silvmil.cpp | 4 +- src/mame/drivers/simpl156.cpp | 4 +- src/mame/drivers/skimaxx.cpp | 11 +- src/mame/drivers/skullxbo.cpp | 4 +- src/mame/drivers/skyarmy.cpp | 4 +- src/mame/drivers/skydiver.cpp | 4 +- src/mame/drivers/skyfox.cpp | 4 +- src/mame/drivers/skykid.cpp | 4 +- src/mame/drivers/skylncr.cpp | 16 +- src/mame/drivers/skyraid.cpp | 4 +- src/mame/drivers/slapfght.cpp | 10 +- src/mame/drivers/slapshot.cpp | 6 +- src/mame/drivers/slotcarn.cpp | 4 +- src/mame/drivers/sm1800.cpp | 4 +- src/mame/drivers/sm7238.cpp | 4 +- src/mame/drivers/smc777.cpp | 2 +- src/mame/drivers/snk.cpp | 22 +- src/mame/drivers/snk6502.cpp | 12 +- src/mame/drivers/snk68.cpp | 4 +- src/mame/drivers/snookr10.cpp | 4 +- src/mame/drivers/snowbros.cpp | 28 +-- src/mame/drivers/solomon.cpp | 4 +- src/mame/drivers/sonson.cpp | 4 +- src/mame/drivers/sorcerer.cpp | 4 +- src/mame/drivers/spartanxtec.cpp | 4 +- src/mame/drivers/spbactn.cpp | 8 +- src/mame/drivers/spcforce.cpp | 4 +- src/mame/drivers/spdodgeb.cpp | 4 +- src/mame/drivers/spectrum.cpp | 4 +- src/mame/drivers/speedatk.cpp | 4 +- src/mame/drivers/speedbal.cpp | 4 +- src/mame/drivers/speedspn.cpp | 4 +- src/mame/drivers/speglsht.cpp | 4 +- src/mame/drivers/splash.cpp | 8 +- src/mame/drivers/spoker.cpp | 8 +- src/mame/drivers/spool99.cpp | 4 +- src/mame/drivers/sprcros2.cpp | 4 +- src/mame/drivers/sprint2.cpp | 4 +- src/mame/drivers/sprint4.cpp | 4 +- src/mame/drivers/sprint8.cpp | 4 +- src/mame/drivers/spyhuntertec.cpp | 4 +- src/mame/drivers/srmp2.cpp | 10 +- src/mame/drivers/srmp5.cpp | 4 +- src/mame/drivers/srmp6.cpp | 2 +- src/mame/drivers/srumbler.cpp | 4 +- src/mame/drivers/sshangha.cpp | 4 +- src/mame/drivers/sshot.cpp | 4 +- src/mame/drivers/ssingles.cpp | 8 +- src/mame/drivers/sslam.cpp | 8 +- src/mame/drivers/ssozumo.cpp | 4 +- src/mame/drivers/sspeedr.cpp | 4 +- src/mame/drivers/ssrj.cpp | 4 +- src/mame/drivers/ssv.cpp | 12 +- src/mame/drivers/stadhero.cpp | 4 +- src/mame/drivers/starcrus.cpp | 4 +- src/mame/drivers/starshp1.cpp | 4 +- src/mame/drivers/statriv2.cpp | 8 +- src/mame/drivers/stlforce.cpp | 4 +- src/mame/drivers/strnskil.cpp | 4 +- src/mame/drivers/stuntair.cpp | 4 +- src/mame/drivers/stv.cpp | 2 +- src/mame/drivers/sub.cpp | 4 +- src/mame/drivers/subhuntr.cpp | 4 +- src/mame/drivers/subs.cpp | 4 +- src/mame/drivers/subsino.cpp | 10 +- src/mame/drivers/subsino2.cpp | 10 +- src/mame/drivers/summit.cpp | 4 +- src/mame/drivers/suna16.cpp | 12 +- src/mame/drivers/suna8.cpp | 14 +- src/mame/drivers/supbtime.cpp | 4 +- src/mame/drivers/supdrapo.cpp | 4 +- src/mame/drivers/supduck.cpp | 4 +- src/mame/drivers/super80.cpp | 20 +- src/mame/drivers/superchs.cpp | 4 +- src/mame/drivers/supercrd.cpp | 4 +- src/mame/drivers/superdq.cpp | 4 +- src/mame/drivers/superqix.cpp | 10 +- src/mame/drivers/superwng.cpp | 4 +- src/mame/drivers/supracan.cpp | 4 +- src/mame/drivers/suprgolf.cpp | 4 +- src/mame/drivers/suprloco.cpp | 4 +- src/mame/drivers/suprnova.cpp | 2 +- src/mame/drivers/suprridr.cpp | 4 +- src/mame/drivers/suprslam.cpp | 4 +- src/mame/drivers/sys9002.cpp | 2 +- src/mame/drivers/system1.cpp | 4 +- src/mame/drivers/system16.cpp | 12 +- src/mame/drivers/tagteam.cpp | 4 +- src/mame/drivers/tail2nos.cpp | 4 +- src/mame/drivers/taito_b.cpp | 38 ++-- src/mame/drivers/taito_f2.cpp | 52 ++--- src/mame/drivers/taito_f3.cpp | 8 +- src/mame/drivers/taito_h.cpp | 12 +- src/mame/drivers/taito_l.cpp | 2 +- src/mame/drivers/taito_o.cpp | 4 +- src/mame/drivers/taito_x.cpp | 12 +- src/mame/drivers/taito_z.cpp | 26 +-- src/mame/drivers/taitoair.cpp | 4 +- src/mame/drivers/taitojc.cpp | 2 +- src/mame/drivers/taitopjc.cpp | 2 +- src/mame/drivers/taitosj.cpp | 4 +- src/mame/drivers/tandy1t.cpp | 4 +- src/mame/drivers/tank8.cpp | 4 +- src/mame/drivers/tankbatt.cpp | 4 +- src/mame/drivers/tankbust.cpp | 4 +- src/mame/drivers/taotaido.cpp | 4 +- src/mame/drivers/targeth.cpp | 4 +- src/mame/drivers/tasman.cpp | 4 +- src/mame/drivers/tatsumi.cpp | 14 +- src/mame/drivers/tattack.cpp | 4 +- src/mame/drivers/taxidriv.cpp | 4 +- src/mame/drivers/tbowl.cpp | 4 +- src/mame/drivers/tceptor.cpp | 4 +- src/mame/drivers/tecmo.cpp | 4 +- src/mame/drivers/tecmo16.cpp | 4 +- src/mame/drivers/tecmosys.cpp | 4 +- src/mame/drivers/tehkanwc.cpp | 4 +- src/mame/drivers/tek410x.cpp | 4 +- src/mame/drivers/terracre.cpp | 4 +- src/mame/drivers/tetrisp2.cpp | 38 ++-- src/mame/drivers/thedealr.cpp | 4 +- src/mame/drivers/thedeep.cpp | 4 +- src/mame/drivers/thepit.cpp | 14 +- src/mame/drivers/thoop2.cpp | 4 +- src/mame/drivers/thunderj.cpp | 4 +- src/mame/drivers/ti630.cpp | 4 +- src/mame/drivers/tiamc1.cpp | 8 +- src/mame/drivers/tigeroad.cpp | 6 +- src/mame/drivers/tim100.cpp | 4 +- src/mame/drivers/timelimt.cpp | 4 +- src/mame/drivers/timeplt.cpp | 10 +- src/mame/drivers/timex.cpp | 4 +- src/mame/drivers/tk80bs.cpp | 4 +- src/mame/drivers/tmmjprd.cpp | 4 +- src/mame/drivers/tmnt.cpp | 6 +- src/mame/drivers/tmspoker.cpp | 4 +- src/mame/drivers/tnzs.cpp | 8 +- src/mame/drivers/toaplan1.cpp | 22 +- src/mame/drivers/toaplan2.cpp | 24 +-- src/mame/drivers/toki.cpp | 8 +- src/mame/drivers/toobin.cpp | 4 +- src/mame/drivers/topspeed.cpp | 4 +- src/mame/drivers/toypop.cpp | 4 +- src/mame/drivers/tp84.cpp | 4 +- src/mame/drivers/trackfld.cpp | 6 +- src/mame/drivers/travrusa.cpp | 10 +- src/mame/drivers/triplhnt.cpp | 4 +- src/mame/drivers/trs80.cpp | 24 +-- src/mame/drivers/trs80dt1.cpp | 4 +- src/mame/drivers/trucocl.cpp | 4 +- src/mame/drivers/trvmadns.cpp | 4 +- src/mame/drivers/tryout.cpp | 4 +- src/mame/drivers/tsamurai.cpp | 8 +- src/mame/drivers/tugboat.cpp | 4 +- src/mame/drivers/tumbleb.cpp | 20 +- src/mame/drivers/tunhunt.cpp | 4 +- src/mame/drivers/turbo.cpp | 8 +- src/mame/drivers/twin16.cpp | 8 +- src/mame/drivers/twincobr.cpp | 4 +- src/mame/drivers/tx0.cpp | 4 +- src/mame/drivers/ultratnk.cpp | 4 +- src/mame/drivers/umipoker.cpp | 4 +- src/mame/drivers/undrfire.cpp | 8 +- src/mame/drivers/unico.cpp | 8 +- src/mame/drivers/unior.cpp | 4 +- src/mame/drivers/unistar.cpp | 4 +- src/mame/drivers/univac.cpp | 4 +- src/mame/drivers/usgames.cpp | 4 +- src/mame/drivers/ut88.cpp | 4 +- src/mame/drivers/v6809.cpp | 4 +- src/mame/drivers/vamphalf.cpp | 6 +- src/mame/drivers/vaportra.cpp | 25 ++- src/mame/drivers/vastar.cpp | 4 +- src/mame/drivers/vball.cpp | 4 +- src/mame/drivers/vega.cpp | 4 +- src/mame/drivers/vg5k.cpp | 4 +- src/mame/drivers/videopin.cpp | 4 +- src/mame/drivers/videopkr.cpp | 10 +- src/mame/drivers/vigilant.cpp | 12 +- src/mame/drivers/vindictr.cpp | 4 +- src/mame/drivers/vlc.cpp | 4 +- src/mame/drivers/volfied.cpp | 4 +- src/mame/drivers/vpoker.cpp | 4 +- src/mame/drivers/vroulet.cpp | 4 +- src/mame/drivers/vt100.cpp | 4 +- src/mame/drivers/vt240.cpp | 4 +- src/mame/drivers/vta2000.cpp | 4 +- src/mame/drivers/vtech2.cpp | 4 +- src/mame/drivers/vulgus.cpp | 4 +- src/mame/drivers/wallc.cpp | 4 +- src/mame/drivers/wardner.cpp | 4 +- src/mame/drivers/warpsped.cpp | 4 +- src/mame/drivers/warpwarp.cpp | 14 +- src/mame/drivers/warriorb.cpp | 6 +- src/mame/drivers/wc90.cpp | 4 +- src/mame/drivers/wc90b.cpp | 4 +- src/mame/drivers/wecleman.cpp | 8 +- src/mame/drivers/welltris.cpp | 4 +- src/mame/drivers/wgp.cpp | 4 +- src/mame/drivers/williams.cpp | 4 +- src/mame/drivers/wink.cpp | 4 +- src/mame/drivers/wiping.cpp | 4 +- src/mame/drivers/witch.cpp | 8 +- src/mame/drivers/wiz.cpp | 8 +- src/mame/drivers/wms.cpp | 4 +- src/mame/drivers/wolfpack.cpp | 4 +- src/mame/drivers/wrally.cpp | 4 +- src/mame/drivers/wswan.cpp | 4 +- src/mame/drivers/wwfsstar.cpp | 4 +- src/mame/drivers/wyvernf0.cpp | 4 +- src/mame/drivers/x07.cpp | 4 +- src/mame/drivers/x1.cpp | 4 +- src/mame/drivers/x1twin.cpp | 4 +- src/mame/drivers/x68k.cpp | 2 +- src/mame/drivers/xain.cpp | 4 +- src/mame/drivers/xavix.cpp | 4 +- src/mame/drivers/xerox820.cpp | 8 +- src/mame/drivers/xorworld.cpp | 4 +- src/mame/drivers/xxmissio.cpp | 4 +- src/mame/drivers/xybots.cpp | 4 +- src/mame/drivers/xyonix.cpp | 4 +- src/mame/drivers/yiear.cpp | 4 +- src/mame/drivers/yunsun16.cpp | 6 +- src/mame/drivers/yunsung8.cpp | 4 +- src/mame/drivers/z1013.cpp | 4 +- src/mame/drivers/z9001.cpp | 4 +- src/mame/drivers/zac2650.cpp | 4 +- src/mame/drivers/zaccaria.cpp | 4 +- src/mame/drivers/zaxxon.cpp | 4 +- src/mame/drivers/zerozone.cpp | 4 +- src/mame/drivers/zodiack.cpp | 4 +- src/mame/drivers/zorba.cpp | 7 +- src/mame/drivers/zrt80.cpp | 4 +- src/mame/drivers/zwackery.cpp | 4 +- src/mame/etc/korgm1.cpp | 4 +- src/mame/etc/template_driver.cpp | 4 +- src/mame/includes/apollo.h | 3 +- src/mame/includes/cps1.h | 4 +- src/mame/includes/darkseal.h | 35 +-- src/mame/includes/pgm.h | 2 +- src/mame/includes/saturn.h | 8 +- src/mame/includes/stv.h | 8 +- src/mame/includes/vaportra.h | 8 +- src/mame/machine/apollo_kbd.h | 3 + src/mame/machine/cit101_kbd.h | 1 + src/mame/machine/dec_lk201.h | 3 + src/mame/machine/esqpanel.h | 2 + src/mame/machine/megacd.cpp | 4 +- src/mame/machine/midikbd.h | 2 + src/mame/machine/ms7004.h | 4 +- src/mame/machine/saturn.cpp | 2 +- src/mame/machine/wangpckb.h | 3 +- src/mame/machine/zx8302.h | 1 + src/mame/video/733_asr.cpp | 4 +- src/mame/video/911_vdt.cpp | 12 +- src/mame/video/abc80.cpp | 4 +- src/mame/video/airraid_dev.cpp | 4 +- src/mame/video/bfm_adr2.cpp | 4 +- src/mame/video/cgc7900.cpp | 4 +- src/mame/video/madalien.cpp | 4 +- src/mame/video/mikromik.cpp | 4 +- src/mame/video/mystston.cpp | 4 +- src/mame/video/newbrain.cpp | 4 +- src/mame/video/pcd.cpp | 4 +- src/mame/video/pcd.h | 3 + src/mame/video/stfight_dev.cpp | 12 +- src/mame/video/tmc600.cpp | 4 +- src/mame/video/ygv608.cpp | 4 +- 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(*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 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(*device).set_input_callback(DEVCB_##_devcb); @@ -76,4 +77,4 @@ DECLARE_DEVICE_TYPE(MIDIIN, midiin_device) // device iterator typedef device_type_iterator 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_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 +#include "diserial.h" +#include //************************************************************************** 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(*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 #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 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 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).set_palette(_palette_tag); #define MCFG_GFX_INFO(_info) \ - dynamic_cast(*device).set_info(GFXDECODE_NAME(_info)); + dynamic_cast(*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 void set_palette(T &&tag) { m_palette.set_tag(std::forward(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 m_palette; // configured tag for palette device std::unique_ptr 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 + // 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 + 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(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 m_maincpu; required_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) @@ -2472,7 +2472,7 @@ MACHINE_CONFIG_START(cps_state::punipic) 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) @@ -2663,7 +2663,7 @@ MACHINE_CONFIG_START(cps_state::sf2m1) 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) @@ -3045,7 +3045,7 @@ MACHINE_CONFIG_START(cps_state::slampic) 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) @@ -3146,7 +3146,7 @@ MACHINE_CONFIG_START(cps_state::varthb) 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/feversoc.cpp b/src/mame/drivers/feversoc.cpp index dc20cddadc8..ae4861309e2 100644 --- a/src/mame/drivers/feversoc.cpp +++ b/src/mame/drivers/feversoc.cpp @@ -228,7 +228,7 @@ static const gfx_layout spi_spritelayout = }; -static GFXDECODE_START( feversoc ) +static GFXDECODE_START( gfx_feversoc ) GFXDECODE_ENTRY( "gfx1", 0, spi_spritelayout, 0, 0x40 ) GFXDECODE_END @@ -300,7 +300,7 @@ MACHINE_CONFIG_START(feversoc_state::feversoc) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, feversoc_state, feversoc_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", feversoc) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_feversoc) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/fgoal.cpp b/src/mame/drivers/fgoal.cpp index 116dcfc44f0..a86b5e0904b 100644 --- a/src/mame/drivers/fgoal.cpp +++ b/src/mame/drivers/fgoal.cpp @@ -332,7 +332,7 @@ static const gfx_layout gfxlayout = }; -static GFXDECODE_START( fgoal ) +static GFXDECODE_START( gfx_fgoal ) GFXDECODE_ENTRY( "gfx1", 0, gfxlayout, 0x00, 8 ) /* foreground */ GFXDECODE_ENTRY( "gfx1", 0, gfxlayout, 0x80, 1 ) /* background */ GFXDECODE_END @@ -383,7 +383,7 @@ MACHINE_CONFIG_START(fgoal_state::fgoal) MCFG_SCREEN_UPDATE_DRIVER(fgoal_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fgoal) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fgoal) MCFG_PALETTE_ADD("palette", 128 + 16 + 1) MCFG_PALETTE_INIT_OWNER(fgoal_state, fgoal) diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp index 2e410cb4118..cc4c0a6f53e 100644 --- a/src/mame/drivers/finalizr.cpp +++ b/src/mame/drivers/finalizr.cpp @@ -238,7 +238,7 @@ static const gfx_layout spritelayout = 32*32 }; -static GFXDECODE_START( finalizr ) +static GFXDECODE_START( gfx_finalizr ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 16*16, 16 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 16*16, 16 ) /* to handle 8x8 sprites */ @@ -289,7 +289,7 @@ MACHINE_CONFIG_START(finalizr_state::finalizr) MCFG_SCREEN_UPDATE_DRIVER(finalizr_state, screen_update_finalizr) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", finalizr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_finalizr) MCFG_PALETTE_ADD("palette", 2*16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(finalizr_state, finalizr) diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp index b90412d9c62..462ef5d8e2a 100644 --- a/src/mame/drivers/firefox.cpp +++ b/src/mame/drivers/firefox.cpp @@ -634,7 +634,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( firefox ) +static GFXDECODE_START( gfx_firefox ) GFXDECODE_ENTRY("tiles", 0, tilelayout, 0, 1) GFXDECODE_ENTRY("sprites", 0, spritelayout, 256, 4) GFXDECODE_END @@ -688,7 +688,7 @@ MACHINE_CONFIG_START(firefox_state::firefox) MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(MASTER_XTAL/8/16/16/16/16)) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", firefox) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_firefox) MCFG_PALETTE_ADD("palette", 512) MCFG_LASERDISC_22VP931_ADD("laserdisc") diff --git a/src/mame/drivers/firetrap.cpp b/src/mame/drivers/firetrap.cpp index edc161cdd0d..c63962e76ca 100644 --- a/src/mame/drivers/firetrap.cpp +++ b/src/mame/drivers/firetrap.cpp @@ -558,7 +558,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( firetrap ) +static GFXDECODE_START( gfx_firetrap ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x00, 16 ) /* colors 0x00-0x3f */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0x80, 4 ) /* colors 0x80-0xbf */ GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0xc0, 4 ) /* colors 0xc0-0xff */ @@ -641,7 +641,7 @@ MACHINE_CONFIG_START(firetrap_state::firetrap) MCFG_SCREEN_UPDATE_DRIVER(firetrap_state, screen_update_firetrap) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", firetrap) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_firetrap) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(firetrap_state, firetrap) @@ -686,7 +686,7 @@ MACHINE_CONFIG_START(firetrap_state::firetrapbl) MCFG_SCREEN_UPDATE_DRIVER(firetrap_state, screen_update_firetrap) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", firetrap) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_firetrap) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(firetrap_state, firetrap) diff --git a/src/mame/drivers/firetrk.cpp b/src/mame/drivers/firetrk.cpp index 7ca1b427155..e36460d565c 100644 --- a/src/mame/drivers/firetrk.cpp +++ b/src/mame/drivers/firetrk.cpp @@ -825,7 +825,7 @@ static const gfx_layout firetrk_trailer_layout = }; -static GFXDECODE_START( firetrk ) +static GFXDECODE_START( gfx_firetrk ) GFXDECODE_ENTRY( "gfx1", 0, firetrk_text_layout, 26, 1 ) GFXDECODE_ENTRY( "gfx2", 0, firetrk_tile_layout, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0, firetrk_tile_layout, 16, 3 ) @@ -835,7 +835,7 @@ static GFXDECODE_START( firetrk ) GFXDECODE_END -static GFXDECODE_START( superbug ) +static GFXDECODE_START( gfx_superbug ) GFXDECODE_ENTRY( "gfx1", 0, superbug_text_layout, 26, 1 ) GFXDECODE_ENTRY( "gfx2", 0, superbug_tile_layout, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0, superbug_tile_layout, 16, 3 ) @@ -844,7 +844,7 @@ static GFXDECODE_START( superbug ) GFXDECODE_END -static GFXDECODE_START( montecar ) +static GFXDECODE_START( gfx_montecar ) GFXDECODE_ENTRY( "gfx1", 0, montecar_text_layout, 44, 1 ) GFXDECODE_ENTRY( "gfx2", 0, firetrk_tile_layout, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0, firetrk_tile_layout, 16, 4 ) @@ -873,7 +873,7 @@ MACHINE_CONFIG_START(firetrk_state::firetrk) MCFG_PALETTE_ADD("palette", 28) MCFG_PALETTE_INIT_OWNER(firetrk_state, firetrk) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", firetrk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_firetrk) /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -895,7 +895,7 @@ MACHINE_CONFIG_START(firetrk_state::superbug) MCFG_SCREEN_UPDATE_DRIVER(firetrk_state, screen_update_superbug) MCFG_VIDEO_START_OVERRIDE(firetrk_state,superbug) - MCFG_GFXDECODE_MODIFY("gfxdecode", superbug) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_superbug) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(28) @@ -919,7 +919,7 @@ MACHINE_CONFIG_START(firetrk_state::montecar) MCFG_SCREEN_UPDATE_DRIVER(firetrk_state, screen_update_montecar) MCFG_VIDEO_START_OVERRIDE(firetrk_state,montecar) - MCFG_GFXDECODE_MODIFY("gfxdecode", montecar) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_montecar) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(46) diff --git a/src/mame/drivers/fitfight.cpp b/src/mame/drivers/fitfight.cpp index 6972366f1b6..acecff7ad7b 100644 --- a/src/mame/drivers/fitfight.cpp +++ b/src/mame/drivers/fitfight.cpp @@ -698,7 +698,7 @@ static const gfx_layout bbprot_sprite_layout = 16*16 }; -static GFXDECODE_START( fitfight ) +static GFXDECODE_START( gfx_fitfight ) GFXDECODE_ENTRY( "gfx1", 0, fof_tile_layout, 0x000, 256 ) /* tx tiles */ GFXDECODE_ENTRY( "gfx1", 0, fof_tile_layout, 0x200, 256 ) /* mid tiles */ GFXDECODE_ENTRY( "gfx1", 0, fof_tile_layout, 0x400, 256 ) /* bg tiles */ @@ -706,7 +706,7 @@ static GFXDECODE_START( fitfight ) GFXDECODE_END -static GFXDECODE_START( prot ) +static GFXDECODE_START( gfx_prot ) GFXDECODE_ENTRY( "gfx1", 0, fof_tile_layout, 0x0000, 256 ) /* tx tiles */ GFXDECODE_ENTRY( "gfx1", 0, fof_tile_layout, 0x0800, 256 ) /* mid tiles */ GFXDECODE_ENTRY( "gfx1", 0, fof_tile_layout, 0x1000, 256 ) /* bg tiles */ @@ -741,7 +741,7 @@ MACHINE_CONFIG_START(fitfight_state::fitfight) MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, fitfight_state, snd_portc_w)) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fitfight_state, snd_irq) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fitfight) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fitfight) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -768,7 +768,7 @@ MACHINE_CONFIG_START(fitfight_state::bbprot) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fitfight_state, irq2_line_hold) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", prot) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_prot) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/flipjack.cpp b/src/mame/drivers/flipjack.cpp index f412d193c3c..37a4d3b0eb0 100644 --- a/src/mame/drivers/flipjack.cpp +++ b/src/mame/drivers/flipjack.cpp @@ -426,7 +426,7 @@ static const gfx_layout tilelayout = 8*8 }; -static GFXDECODE_START( flipjack ) +static GFXDECODE_START( gfx_flipjack ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 64 ) GFXDECODE_END @@ -472,7 +472,7 @@ MACHINE_CONFIG_START(flipjack_state::flipjack) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", flipjack) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_flipjack) MCFG_PALETTE_ADD("palette", 128+8) MCFG_PALETTE_INIT_OWNER(flipjack_state, flipjack) diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp index 972e10a596f..42463fd0c17 100644 --- a/src/mame/drivers/flkatck.cpp +++ b/src/mame/drivers/flkatck.cpp @@ -179,7 +179,7 @@ static const gfx_layout gfxlayout = 32*8 }; -static GFXDECODE_START( flkatck ) +static GFXDECODE_START( gfx_flkatck ) GFXDECODE_ENTRY( "gfx1", 0, gfxlayout, 0, 32 ) GFXDECODE_END @@ -233,7 +233,7 @@ MACHINE_CONFIG_START(flkatck_state::flkatck) MCFG_SCREEN_UPDATE_DRIVER(flkatck_state, screen_update_flkatck) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", flkatck) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_flkatck) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_LITTLE) diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp index 042e6db0abd..81153a88514 100644 --- a/src/mame/drivers/flower.cpp +++ b/src/mame/drivers/flower.cpp @@ -462,7 +462,7 @@ static const gfx_layout tilelayout = 16*16*2 }; -static GFXDECODE_START( flower ) +static GFXDECODE_START( gfx_flower ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0, 16 ) @@ -511,7 +511,7 @@ MACHINE_CONFIG_START(flower_state::flower) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3,384,0,288,264,16,240) // derived from Galaxian HW, 60.606060 MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", flower) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_flower) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_GENERIC_LATCH_8_ADD("soundlatch") diff --git a/src/mame/drivers/flstory.cpp b/src/mame/drivers/flstory.cpp index fa2f67f5093..d071134e2dd 100644 --- a/src/mame/drivers/flstory.cpp +++ b/src/mame/drivers/flstory.cpp @@ -689,7 +689,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( flstory ) +static GFXDECODE_START( gfx_flstory ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 256, 16 ) GFXDECODE_END @@ -762,7 +762,7 @@ MACHINE_CONFIG_START(flstory_state::flstory) MCFG_SCREEN_UPDATE_DRIVER(flstory_state, screen_update_flstory) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", flstory) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_flstory) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -831,7 +831,7 @@ MACHINE_CONFIG_START(flstory_state::onna34ro) MCFG_SCREEN_UPDATE_DRIVER(flstory_state, screen_update_flstory) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", flstory) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_flstory) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -911,7 +911,7 @@ MACHINE_CONFIG_START(flstory_state::victnine) MCFG_SCREEN_UPDATE_DRIVER(flstory_state, screen_update_victnine) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", flstory) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_flstory) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -984,7 +984,7 @@ MACHINE_CONFIG_START(flstory_state::rumba) MCFG_SCREEN_UPDATE_DRIVER(flstory_state, screen_update_rumba) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", flstory) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_flstory) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp index dd88ab34204..220a05a65ed 100644 --- a/src/mame/drivers/flyball.cpp +++ b/src/mame/drivers/flyball.cpp @@ -396,7 +396,7 @@ static const gfx_layout flyball_sprites_layout = 0x100 /* increment */ }; -static GFXDECODE_START( flyball ) +static GFXDECODE_START( gfx_flyball ) GFXDECODE_ENTRY( "gfx1", 0, flyball_tiles_layout, 0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, flyball_sprites_layout, 2, 2 ) GFXDECODE_END @@ -478,7 +478,7 @@ MACHINE_CONFIG_START(flyball_state::flyball) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", flyball) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_flyball) MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(flyball_state, flyball) diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp index fe685c35d7c..b02b1919ed6 100644 --- a/src/mame/drivers/fmtowns.cpp +++ b/src/mame/drivers/fmtowns.cpp @@ -2755,7 +2755,7 @@ static const gfx_layout text_chars = 8*16 }; -static GFXDECODE_START( towns ) +static GFXDECODE_START( gfx_towns ) GFXDECODE_ENTRY( "user", 0x180000 + 0x3d800, text_chars, 0, 16 ) GFXDECODE_ENTRY( "user", 0x180000, fnt_chars_16x16, 0, 16 ) GFXDECODE_END @@ -2777,7 +2777,7 @@ MACHINE_CONFIG_START(towns_state::towns_base) MCFG_SCREEN_VISIBLE_AREA(0, 768-1, 0, 512-1) MCFG_SCREEN_UPDATE_DRIVER(towns_state, screen_update) - MCFG_GFXDECODE_ADD("gfxdecode", "palette16_0", towns) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette16_0", gfx_towns) MCFG_PALETTE_ADD("palette256", 256) MCFG_PALETTE_ADD("palette16_0", 16) MCFG_PALETTE_ADD("palette16_1", 16) diff --git a/src/mame/drivers/foodf.cpp b/src/mame/drivers/foodf.cpp index f2c1fe1d0b6..9b39ca0cc8e 100644 --- a/src/mame/drivers/foodf.cpp +++ b/src/mame/drivers/foodf.cpp @@ -292,7 +292,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( foodf ) +static GFXDECODE_START( gfx_foodf ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 32 ) GFXDECODE_END @@ -336,7 +336,7 @@ MACHINE_CONFIG_START(foodf_state::foodf) MCFG_TIMER_DRIVER_ADD("scan_timer", foodf_state, scanline_update_timer) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", foodf) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_foodf) MCFG_PALETTE_ADD("palette", 256) MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("playfield", "gfxdecode", 2, foodf_state, get_playfield_tile_info, 8,8, SCAN_COLS, 32,32, 0) diff --git a/src/mame/drivers/fortecar.cpp b/src/mame/drivers/fortecar.cpp index c63fd4a7fd7..e4f7623677d 100644 --- a/src/mame/drivers/fortecar.cpp +++ b/src/mame/drivers/fortecar.cpp @@ -658,7 +658,7 @@ static const gfx_layout tiles8x8_layout_6bpp = * Graphics Decode Information * ****************************************/ -static GFXDECODE_START( fortecar ) +static GFXDECODE_START( gfx_fortecar ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout_3bpp, 0x000, 0x20 ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout_6bpp, 0x100, 0x04 ) GFXDECODE_END @@ -713,7 +713,7 @@ MACHINE_CONFIG_START(fortecar_state::fortecar) MCFG_V3021_ADD("rtc") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fortecar) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fortecar) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(fortecar_state, fortecar) diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp index 01372e58682..1362efb700c 100644 --- a/src/mame/drivers/fp1100.cpp +++ b/src/mame/drivers/fp1100.cpp @@ -557,7 +557,7 @@ static const gfx_layout chars_8x8 = 8*8 }; -static GFXDECODE_START( fp1100 ) +static GFXDECODE_START( gfx_fp1100 ) GFXDECODE_ENTRY( "sub_ipl", 0x2400, chars_8x8, 0, 1 ) GFXDECODE_END @@ -658,7 +658,7 @@ MACHINE_CONFIG_START(fp1100_state::fp1100) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DEVICE("crtc", h46505_device, screen_update) MCFG_PALETTE_ADD("palette", 8) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fp1100) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fp1100) /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/fp200.cpp b/src/mame/drivers/fp200.cpp index f8189ac1b00..121cac00a63 100644 --- a/src/mame/drivers/fp200.cpp +++ b/src/mame/drivers/fp200.cpp @@ -547,7 +547,7 @@ static const gfx_layout charlayout = 8*8 }; -static GFXDECODE_START( fp200 ) +static GFXDECODE_START( gfx_fp200 ) GFXDECODE_ENTRY( "chargen", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -602,7 +602,7 @@ MACHINE_CONFIG_START(fp200_state::fp200) MCFG_SCREEN_VISIBLE_AREA(0*8, 20*8-1, 0*8, 8*8-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fp200) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fp200) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(fp200_state, fp200) diff --git a/src/mame/drivers/fp6000.cpp b/src/mame/drivers/fp6000.cpp index 7a708c925eb..c57caacf626 100644 --- a/src/mame/drivers/fp6000.cpp +++ b/src/mame/drivers/fp6000.cpp @@ -280,7 +280,7 @@ static const gfx_layout fp6000_charlayout = 8*16 }; -static GFXDECODE_START( fp6000 ) +static GFXDECODE_START( gfx_fp6000 ) GFXDECODE_ENTRY( "pcg", 0x0000, fp6000_charlayout, 0, 1 ) GFXDECODE_END @@ -315,7 +315,7 @@ MACHINE_CONFIG_START(fp6000_state::fp6000) MCFG_PALETTE_ADD("palette", 8) // MCFG_PALETTE_INIT(black_and_white) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fp6000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fp6000) MACHINE_CONFIG_END diff --git a/src/mame/drivers/freekick.cpp b/src/mame/drivers/freekick.cpp index 960d9c537b7..506aeef3242 100644 --- a/src/mame/drivers/freekick.cpp +++ b/src/mame/drivers/freekick.cpp @@ -677,7 +677,7 @@ static const gfx_layout spritelayout = 16*16 }; -static GFXDECODE_START( freekick ) +static GFXDECODE_START( gfx_freekick ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x000, 32 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x100, 32 ) GFXDECODE_END @@ -752,7 +752,7 @@ MACHINE_CONFIG_START(freekick_state::omega) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, freekick_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", freekick) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_freekick) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x200) // sound hardware @@ -790,7 +790,7 @@ MACHINE_CONFIG_START(freekick_state::base) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, freekick_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", freekick) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_freekick) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x200) /* sound hardware */ diff --git a/src/mame/drivers/fresh.cpp b/src/mame/drivers/fresh.cpp index 7ea1a3dc201..dd9bcec0ebe 100644 --- a/src/mame/drivers/fresh.cpp +++ b/src/mame/drivers/fresh.cpp @@ -560,7 +560,7 @@ static const gfx_layout tiles8x8_layout = }; -static GFXDECODE_START( fresh ) +static GFXDECODE_START( gfx_fresh ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_END @@ -612,7 +612,7 @@ MACHINE_CONFIG_START(fresh_state::fresh) MCFG_PALETTE_ADD("palette", 0x1000) // or 0xc00 MCFG_PALETTE_FORMAT(XBGR) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fresh) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fresh) /* sound hw? */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/fromanc2.cpp b/src/mame/drivers/fromanc2.cpp index 1f38fe98695..dbc11f96a48 100644 --- a/src/mame/drivers/fromanc2.cpp +++ b/src/mame/drivers/fromanc2.cpp @@ -436,7 +436,7 @@ static const gfx_layout fromanc2_tilelayout = 32*8 }; -static GFXDECODE_START( fromanc2 ) +static GFXDECODE_START( gfx_fromanc2 ) GFXDECODE_ENTRY( "gfx1", 0, fromanc2_tilelayout, 0, 4 ) GFXDECODE_ENTRY( "gfx2", 0, fromanc2_tilelayout, 256, 4 ) GFXDECODE_ENTRY( "gfx3", 0, fromanc2_tilelayout, 512, 4 ) @@ -454,7 +454,7 @@ static const gfx_layout fromancr_tilelayout = 64*8 }; -static GFXDECODE_START( fromancr ) +static GFXDECODE_START( gfx_fromancr ) GFXDECODE_ENTRY( "gfx1", 0, fromancr_tilelayout, 512, 1 ) GFXDECODE_ENTRY( "gfx2", 0, fromancr_tilelayout, 256, 1 ) GFXDECODE_ENTRY( "gfx3", 0, fromancr_tilelayout, 0, 1 ) @@ -521,7 +521,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromanc2) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "lpalette", fromanc2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "lpalette", gfx_fromanc2) MCFG_PALETTE_ADD("lpalette", 2048) MCFG_PALETTE_FORMAT(GGGGGRRRRRBBBBBx) @@ -581,7 +581,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromancr) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "lpalette", fromancr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "lpalette", gfx_fromancr) MCFG_PALETTE_ADD("lpalette", 2048) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) @@ -642,7 +642,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromanc4) //MCFG_INS8250_OUT_RTS_CB(WRITELINE("link", rs232_port_device, write_rts)) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "lpalette", fromancr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "lpalette", gfx_fromancr) MCFG_PALETTE_ADD("lpalette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/fromance.cpp b/src/mame/drivers/fromance.cpp index 5bc471d2036..5303b683ad3 100644 --- a/src/mame/drivers/fromance.cpp +++ b/src/mame/drivers/fromance.cpp @@ -852,7 +852,7 @@ static const gfx_layout bglayout = }; -static GFXDECODE_START( fromance ) +static GFXDECODE_START( gfx_fromance ) GFXDECODE_ENTRY( "gfx1", 0, bglayout, 0, 128 ) GFXDECODE_ENTRY( "gfx2", 0, bglayout, 0, 128 ) GFXDECODE_END @@ -925,7 +925,7 @@ MACHINE_CONFIG_START(fromance_state::nekkyoku) MCFG_SCREEN_UPDATE_DRIVER(fromance_state, screen_update_fromance) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fromance) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fromance) MCFG_PALETTE_ADD("palette", 1024) MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 14318180 / 2) // clock not verified @@ -971,7 +971,7 @@ MACHINE_CONFIG_START(fromance_state::idolmj) MCFG_SCREEN_UPDATE_DRIVER(fromance_state, screen_update_fromance) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fromance) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fromance) MCFG_PALETTE_ADD("palette", 2048) MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified @@ -1017,7 +1017,7 @@ MACHINE_CONFIG_START(fromance_state::fromance) MCFG_SCREEN_UPDATE_DRIVER(fromance_state, screen_update_fromance) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fromance) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fromance) MCFG_PALETTE_ADD("palette", 2048) MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified diff --git a/src/mame/drivers/funkybee.cpp b/src/mame/drivers/funkybee.cpp index b0f3692e2a4..9361eb8455f 100644 --- a/src/mame/drivers/funkybee.cpp +++ b/src/mame/drivers/funkybee.cpp @@ -270,7 +270,7 @@ static const gfx_layout spritelayout = 4*16*8 }; -static GFXDECODE_START( funkybee ) +static GFXDECODE_START( gfx_funkybee ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 16, 4 ) @@ -310,7 +310,7 @@ MACHINE_CONFIG_START(funkybee_state::funkybee) MCFG_SCREEN_UPDATE_DRIVER(funkybee_state, screen_update_funkybee) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", funkybee) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_funkybee) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(funkybee_state, funkybee) diff --git a/src/mame/drivers/funkyjet.cpp b/src/mame/drivers/funkyjet.cpp index b4ebc87ee90..7a2a6c2b3eb 100644 --- a/src/mame/drivers/funkyjet.cpp +++ b/src/mame/drivers/funkyjet.cpp @@ -295,7 +295,7 @@ static const gfx_layout tile_layout = 64*8 }; -static GFXDECODE_START( funkyjet ) +static GFXDECODE_START( gfx_funkyjet ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 256, 32 ) /* Characters 8x8 */ GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 256, 32 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "gfx2", 0, tile_layout, 0, 16 ) /* Sprites 16x16 */ @@ -329,7 +329,7 @@ MACHINE_CONFIG_START(funkyjet_state::funkyjet) MCFG_DECO146_SOUNDLATCH_IRQ_CB(INPUTLINE("audiocpu", 0)) MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE - MCFG_GFXDECODE_ADD("gfxdecode", "palette", funkyjet) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_funkyjet) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/funtech.cpp b/src/mame/drivers/funtech.cpp index 67702449ccb..837aa2727fb 100644 --- a/src/mame/drivers/funtech.cpp +++ b/src/mame/drivers/funtech.cpp @@ -471,7 +471,7 @@ static const gfx_layout tiles8x8_layout = }; -static GFXDECODE_START( funtech ) +static GFXDECODE_START( gfx_funtech ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x32_layout, 0x100, 1 ) GFXDECODE_END @@ -502,7 +502,7 @@ MACHINE_CONFIG_START(fun_tech_corp_state::funtech) MCFG_SCREEN_UPDATE_DRIVER(fun_tech_corp_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", funtech) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_funtech) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp index 75c195b044e..438764a7fd1 100644 --- a/src/mame/drivers/funworld.cpp +++ b/src/mame/drivers/funworld.cpp @@ -2960,11 +2960,11 @@ static const gfx_layout charlayout = in the first and second half of the bipolar PROM. */ -static GFXDECODE_START( fw1stpal ) /* Adressing the first half of the palette */ +static GFXDECODE_START( gfx_fw1stpal ) /* Adressing the first half of the palette */ GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END -static GFXDECODE_START( fw2ndpal ) /* Adressing the second half of the palette */ +static GFXDECODE_START( gfx_fw2ndpal ) /* Adressing the second half of the palette */ GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x100, 16 ) GFXDECODE_END @@ -3090,7 +3090,7 @@ MACHINE_CONFIG_START(funworld_state::fw1stpal) MCFG_SCREEN_UPDATE_DRIVER(funworld_state, screen_update_funworld) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fw1stpal) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fw1stpal) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(funworld_state, funworld) @@ -3115,7 +3115,7 @@ MACHINE_CONFIG_START(funworld_state::fw2ndpal) fw1stpal(config); MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_DEVICE_PROGRAM_MAP(funworld_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", fw2ndpal) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_fw2ndpal) MACHINE_CONFIG_END @@ -3217,7 +3217,7 @@ MACHINE_CONFIG_START(funworld_state::intrgmes) fw1stpal(config); MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_DEVICE_PROGRAM_MAP(intergames_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", fw2ndpal) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_fw2ndpal) MACHINE_CONFIG_END @@ -3225,7 +3225,7 @@ MACHINE_CONFIG_START(funworld_state::fw_a7_11) fw1stpal(config); MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */ MCFG_DEVICE_PROGRAM_MAP(fw_a7_11_map) -// MCFG_GFXDECODE_MODIFY("gfxdecode", fw2ndpal) +// MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_fw2ndpal) MACHINE_CONFIG_END diff --git a/src/mame/drivers/funybubl.cpp b/src/mame/drivers/funybubl.cpp index 1dbcf2e487c..27e39a2d434 100644 --- a/src/mame/drivers/funybubl.cpp +++ b/src/mame/drivers/funybubl.cpp @@ -198,7 +198,7 @@ static const gfx_layout tiles16x16x8_2_layout = }; -static GFXDECODE_START( funybubl ) +static GFXDECODE_START( gfx_funybubl ) GFXDECODE_ENTRY( "gfx1", 0, tiles16x16x8_1_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles16x16x8_2_layout, 0, 16 ) GFXDECODE_END @@ -241,7 +241,7 @@ MACHINE_CONFIG_START(funybubl_state::funybubl) MCFG_SCREEN_UPDATE_DRIVER(funybubl_state, screen_update_funybubl) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", funybubl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_funybubl) MCFG_PALETTE_ADD("palette", 0x400) diff --git a/src/mame/drivers/fuukifg2.cpp b/src/mame/drivers/fuukifg2.cpp index af05ef2a401..9b95d99b465 100644 --- a/src/mame/drivers/fuukifg2.cpp +++ b/src/mame/drivers/fuukifg2.cpp @@ -372,7 +372,7 @@ static const gfx_layout layout_16x16x8 = 16*16*8 }; -static GFXDECODE_START( fuuki16 ) +static GFXDECODE_START( gfx_fuuki16 ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x400*2, 0x40 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x4, 0x400*0, 0x40 ) // [1] Layer 0 GFXDECODE_ENTRY( "gfx3", 0, layout_16x16x8, 0x400*1, 0x40 ) // [2] Layer 1 @@ -463,7 +463,7 @@ MACHINE_CONFIG_START(fuuki16_state::fuuki16) MCFG_SCREEN_UPDATE_DRIVER(fuuki16_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fuuki16) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fuuki16) MCFG_PALETTE_ADD("palette", 0x4000 / 2) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/fuukifg3.cpp b/src/mame/drivers/fuukifg3.cpp index 1272f18127c..86321eabf52 100644 --- a/src/mame/drivers/fuukifg3.cpp +++ b/src/mame/drivers/fuukifg3.cpp @@ -467,7 +467,7 @@ static const gfx_layout layout_16x16x8 = 16*16*8 }; -static GFXDECODE_START( fuuki32 ) +static GFXDECODE_START( gfx_fuuki32 ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x400*2, 0x40 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x8, 0x400*0, 0x40 ) // [1] Layer 1 GFXDECODE_ENTRY( "gfx3", 0, layout_16x16x8, 0x400*1, 0x40 ) // [2] Layer 2 @@ -549,7 +549,7 @@ MACHINE_CONFIG_START(fuuki32_state::fuuki32) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, fuuki32_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fuuki32) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fuuki32) MCFG_PALETTE_ADD("palette", 0x4000 / 2) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp index c28de1d54eb..431de80378e 100644 --- a/src/mame/drivers/gaelco.cpp +++ b/src/mame/drivers/gaelco.cpp @@ -600,7 +600,7 @@ INPUT_PORTS_END } #define GFXDECODEINFO(NUM,ENTRIES) \ -static GFXDECODE_START( NUM )\ +static GFXDECODE_START( gfx_##NUM )\ GFXDECODE_ENTRY( "gfx1", 0x000000, tilelayout8_##NUM,0, ENTRIES ) \ GFXDECODE_ENTRY( "gfx1", 0x000000, tilelayout16_##NUM,0, ENTRIES ) \ GFXDECODE_END @@ -651,7 +651,7 @@ MACHINE_CONFIG_START(gaelco_state::bigkarnk) MCFG_SCREEN_UPDATE_DRIVER(gaelco_state, screen_update_bigkarnk) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x100000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x100000) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -686,7 +686,7 @@ MACHINE_CONFIG_START(gaelco_state::maniacsq) MCFG_SCREEN_UPDATE_DRIVER(gaelco_state, screen_update_maniacsq) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x100000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x100000) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -725,7 +725,7 @@ MACHINE_CONFIG_START(gaelco_state::squash) MCFG_SCREEN_UPDATE_DRIVER(gaelco_state, screen_update_maniacsq) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x100000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x100000) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -764,7 +764,7 @@ MACHINE_CONFIG_START(gaelco_state::thoop) MCFG_SCREEN_UPDATE_DRIVER(gaelco_state, screen_update_maniacsq) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x100000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x100000) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp index 54a952965d7..9c00406019f 100644 --- a/src/mame/drivers/gaelco2.cpp +++ b/src/mame/drivers/gaelco2.cpp @@ -54,7 +54,7 @@ }; #define GFXDECODEINFO(NUM,ENTRIES) \ -static GFXDECODE_START( NUM )\ +static GFXDECODE_START( gfx_##NUM )\ GFXDECODE_ENTRY( "gfx1", 0x0000000, tilelayout16_##NUM,0, ENTRIES ) \ GFXDECODE_END @@ -195,7 +195,7 @@ MACHINE_CONFIG_START(gaelco2_state::maniacsq) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0080000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0080000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2) @@ -626,7 +626,7 @@ MACHINE_CONFIG_START(gaelco2_state::play2000) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0200000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0200000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2) @@ -731,7 +731,7 @@ MACHINE_CONFIG_START(bang_state::bang) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0200000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0200000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2) @@ -969,7 +969,7 @@ MACHINE_CONFIG_START(gaelco2_state::alighunt) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0400000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0400000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2) @@ -1264,7 +1264,7 @@ MACHINE_CONFIG_START(gaelco2_state::touchgo) /* video hardware */ MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0400000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0400000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_DEFAULT_LAYOUT(layout_dualhsxs) @@ -1581,7 +1581,7 @@ MACHINE_CONFIG_START(gaelco2_state::snowboar) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0400000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0400000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2) @@ -1624,7 +1624,7 @@ MACHINE_CONFIG_START(gaelco2_state::maniacsqs) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0080000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0080000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2) @@ -1860,7 +1860,7 @@ MACHINE_CONFIG_START(wrally2_state::wrally2) /* video hardware */ MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0200000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0200000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MCFG_DEFAULT_LAYOUT(layout_dualhsxs) diff --git a/src/mame/drivers/gaiden.cpp b/src/mame/drivers/gaiden.cpp index 33951f92464..29a077de85c 100644 --- a/src/mame/drivers/gaiden.cpp +++ b/src/mame/drivers/gaiden.cpp @@ -691,7 +691,7 @@ static const gfx_layout spritelayout = 16*8 /* offset to next sprite */ }; -static GFXDECODE_START( gaiden ) +static GFXDECODE_START( gfx_gaiden ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0x100, 16 ) /* tiles 8x8 */ GFXDECODE_ENTRY( "gfx2", 0, tile2layout, 0x000, 0x1000 ) /* tiles 16x16 */ GFXDECODE_ENTRY( "gfx3", 0, tile2layout, 0x000, 0x1000 ) /* tiles 16x16 (only colors 0x00-0x0f and 0x80-0x8f are used) */ @@ -720,7 +720,7 @@ static const gfx_layout mastninj_spritelayout = 32*8 /* offset to next tile */ }; -static GFXDECODE_START( mastninj ) +static GFXDECODE_START( gfx_mastninj ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0x000, 16 ) /* tiles 8x8 */ GFXDECODE_ENTRY( "gfx2", 0, mastninj_tile2layout, 0x300, 16 ) /* tiles 16x16 */ GFXDECODE_ENTRY( "gfx3", 0, mastninj_tile2layout, 0x200, 16 ) /* tiles 16x16 */ @@ -749,7 +749,7 @@ static const gfx_layout drgnbowl_spritelayout = 32*8 }; -static GFXDECODE_START( drgnbowl ) +static GFXDECODE_START( gfx_drgnbowl ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 16 ) /* tiles 8x8 */ GFXDECODE_ENTRY( "gfx2", 0x00000, drgnbowl_tile2layout, 0x300, 16 ) /* tiles 16x16 */ GFXDECODE_ENTRY( "gfx2", 0x20000, drgnbowl_tile2layout, 0x200, 16 ) /* tiles 16x16 */ @@ -778,7 +778,7 @@ MACHINE_CONFIG_START(gaiden_state::shadoww) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(gaiden_state, screen_update_gaiden) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gaiden) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gaiden) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -854,7 +854,7 @@ MACHINE_CONFIG_START(gaiden_state::drgnbowl) MCFG_SCREEN_UPDATE_DRIVER(gaiden_state, screen_update_drgnbowl) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", drgnbowl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_drgnbowl) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -1012,7 +1012,7 @@ MACHINE_CONFIG_START(gaiden_state::mastninj) MCFG_SCREEN_UPDATE_DRIVER(gaiden_state, screen_update_drgnbowl) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mastninj) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mastninj) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/gal3.cpp b/src/mame/drivers/gal3.cpp index 8b71ce33ad4..59e852f0029 100644 --- a/src/mame/drivers/gal3.cpp +++ b/src/mame/drivers/gal3.cpp @@ -600,7 +600,7 @@ static const gfx_layout tile_layout = 8*64 /* sprite offset */ }; -static GFXDECODE_START( namcos21 ) +static GFXDECODE_START( gfx_namcos21 ) GFXDECODE_ENTRY( "obj_board1", 0x000000, tile_layout, 0x000, 0x20 ) GFXDECODE_END @@ -647,7 +647,7 @@ MACHINE_CONFIG_START(gal3_state::gal3) MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 512-1) MCFG_SCREEN_UPDATE_DRIVER(gal3_state, screen_update_gal3) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos21) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos21) MCFG_PALETTE_ADD("palette", NAMCOS21_NUM_COLORS) MCFG_VIDEO_START_OVERRIDE(gal3_state,gal3) diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp index 669d4a3408d..114e4c24642 100644 --- a/src/mame/drivers/galaga.cpp +++ b/src/mame/drivers/galaga.cpp @@ -1518,24 +1518,24 @@ static const gfx_layout dotlayout = 16*8 }; -static GFXDECODE_START( bosco ) +static GFXDECODE_START( gfx_bosco ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_2bpp, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout_bosco, 64*4, 64 ) GFXDECODE_ENTRY( "gfx3", 0, dotlayout, 64*4+64*4, 1 ) GFXDECODE_END -static GFXDECODE_START( galaga ) +static GFXDECODE_START( gfx_galaga ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_2bpp, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout_galaga, 64*4, 64 ) GFXDECODE_END -static GFXDECODE_START( xevious ) +static GFXDECODE_START( gfx_xevious ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_xevious, 128*4+64*8, 64 ) GFXDECODE_ENTRY( "gfx2", 0, bgcharlayout, 0, 128 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout_xevious, 128*4, 64 ) GFXDECODE_END -static GFXDECODE_START( digdug ) +static GFXDECODE_START( gfx_digdug ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_digdug, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout_galaga, 16*2, 64 ) GFXDECODE_ENTRY( "gfx3", 0, charlayout_2bpp, 64*4 + 16*2, 64 ) @@ -1642,7 +1642,7 @@ MACHINE_CONFIG_START(bosco_state::bosco) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, galaga_state, vblank_irq)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", bosco) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bosco) MCFG_PALETTE_ADD("palette", 64*4+64*4+4+64) MCFG_PALETTE_INDIRECT_ENTRIES(32+64) MCFG_PALETTE_INIT_OWNER(bosco_state,bosco) @@ -1717,7 +1717,7 @@ MACHINE_CONFIG_START(galaga_state::galaga) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, galaga_state, vblank_irq)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaga) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galaga) MCFG_PALETTE_ADD("palette", 64*4+64*4+64) MCFG_PALETTE_INDIRECT_ENTRIES(32+64) MCFG_PALETTE_INIT_OWNER(galaga_state,galaga) @@ -1822,7 +1822,7 @@ MACHINE_CONFIG_START(xevious_state::xevious) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, galaga_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", xevious) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_xevious) MCFG_PALETTE_ADD("palette", 128*4+64*8+64*2) MCFG_PALETTE_INDIRECT_ENTRIES(128+1) MCFG_PALETTE_INIT_OWNER(xevious_state,xevious) @@ -1943,7 +1943,7 @@ MACHINE_CONFIG_START(digdug_state::digdug) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, galaga_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", digdug) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_digdug) MCFG_PALETTE_ADD("palette", 16*2+64*4+64*4) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(digdug_state,digdug) diff --git a/src/mame/drivers/galastrm.cpp b/src/mame/drivers/galastrm.cpp index 24845ad1704..c3b74d09250 100644 --- a/src/mame/drivers/galastrm.cpp +++ b/src/mame/drivers/galastrm.cpp @@ -188,7 +188,7 @@ static const gfx_layout charlayout = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( galastrm ) +static GFXDECODE_START( gfx_galastrm ) GFXDECODE_ENTRY( "gfx2", 0x0, tile16x16_layout, 0, 4096 ) GFXDECODE_ENTRY( "gfx1", 0x0, charlayout, 0, 4096 ) GFXDECODE_END @@ -231,7 +231,7 @@ MACHINE_CONFIG_START(galastrm_state::galastrm) MCFG_SCREEN_UPDATE_DRIVER(galastrm_state, screen_update_galastrm) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galastrm) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galastrm) MCFG_PALETTE_ADD("palette", 4096) MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0) diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp index c036e299119..435e99299e7 100644 --- a/src/mame/drivers/galaxi.cpp +++ b/src/mame/drivers/galaxi.cpp @@ -432,7 +432,7 @@ static const gfx_layout layout_16x16x4 = 16*16*4 }; -static GFXDECODE_START( galaxi ) +static GFXDECODE_START( gfx_galaxi ) GFXDECODE_ENTRY( "gfx1", 0x00000, layout_16x16x4, 0, 0x400/0x10 ) GFXDECODE_ENTRY( "gfx1", 0x80000, layout_8x8x4, 0, 0x400/0x10 ) GFXDECODE_END @@ -480,7 +480,7 @@ MACHINE_CONFIG_START(galaxi_state::galaxi) MCFG_SCREEN_UPDATE_DRIVER(galaxi_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaxi) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galaxi) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/galaxia.cpp b/src/mame/drivers/galaxia.cpp index e5eab8816a7..9ac5db7e13a 100644 --- a/src/mame/drivers/galaxia.cpp +++ b/src/mame/drivers/galaxia.cpp @@ -282,11 +282,11 @@ static const gfx_layout tiles8x8x2_layout = 8*8 }; -static GFXDECODE_START( galaxia ) +static GFXDECODE_START( gfx_galaxia ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x2_layout, 0, 4 ) GFXDECODE_END -static GFXDECODE_START( astrowar ) +static GFXDECODE_START( gfx_astrowar ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x1_layout, 0, 8 ) GFXDECODE_END @@ -312,7 +312,7 @@ MACHINE_CONFIG_START(galaxia_state::galaxia) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, galaxia_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaxia) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galaxia) MCFG_PALETTE_ADD("palette", 0x18+2) MCFG_PALETTE_INIT_OWNER(galaxia_state,galaxia) @@ -356,7 +356,7 @@ MACHINE_CONFIG_START(galaxia_state::astrowar) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, galaxia_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", astrowar) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_astrowar) MCFG_PALETTE_ADD("palette", 0x18+2) MCFG_PALETTE_INIT_OWNER(galaxia_state,astrowar) diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index 5a04fd66821..af674ad60e1 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -5693,23 +5693,23 @@ static const gfx_layout galaxian_spritelayout_0x80 = * *************************************/ -static GFXDECODE_START(galaxian) +static GFXDECODE_START(gfx_galaxian) GFXDECODE_SCALE("gfx1", 0x0000, galaxian_charlayout, 0, 8, GALAXIAN_XSCALE,1) GFXDECODE_SCALE("gfx1", 0x0000, galaxian_spritelayout, 0, 8, GALAXIAN_XSCALE,1) GFXDECODE_END -static GFXDECODE_START(gmgalax) +static GFXDECODE_START(gfx_gmgalax) GFXDECODE_SCALE("gfx1", 0x0000, galaxian_charlayout, 0, 16, GALAXIAN_XSCALE,1) GFXDECODE_SCALE("gfx1", 0x0000, galaxian_spritelayout, 0, 16, GALAXIAN_XSCALE,1) GFXDECODE_END /* separate character and sprite ROMs */ -static GFXDECODE_START(pacmanbl) +static GFXDECODE_START(gfx_pacmanbl) GFXDECODE_SCALE("gfx1", 0x0000, galaxian_charlayout, 0, 8, GALAXIAN_XSCALE,1) GFXDECODE_SCALE("gfx2", 0x0000, galaxian_spritelayout, 0, 8, GALAXIAN_XSCALE,1) GFXDECODE_END -static GFXDECODE_START(tenspot) +static GFXDECODE_START(gfx_tenspot) GFXDECODE_SCALE("gfx1", 0x0000, galaxian_charlayout_0x200, 0, 8, GALAXIAN_XSCALE,1) GFXDECODE_SCALE("gfx2", 0x0000, galaxian_spritelayout_0x80, 0, 8, GALAXIAN_XSCALE,1) GFXDECODE_END @@ -5789,7 +5789,7 @@ MACHINE_CONFIG_START(galaxian_state::galaxian_base) MCFG_WATCHDOG_VBLANK_INIT("screen", 8) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaxian) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galaxian) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(galaxian_state, galaxian) @@ -5909,7 +5909,7 @@ MACHINE_CONFIG_START(galaxian_state::pacmanbl) galaxian(config); /* separate tile/sprite ROMs */ - MCFG_GFXDECODE_MODIFY("gfxdecode", pacmanbl) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pacmanbl) MACHINE_CONFIG_END MACHINE_CONFIG_START(galaxian_state::tenspot) @@ -5924,14 +5924,14 @@ MACHINE_CONFIG_START(galaxian_state::tenspot) //MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse) /* separate tile/sprite ROMs */ - MCFG_GFXDECODE_MODIFY("gfxdecode", tenspot) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_tenspot) MACHINE_CONFIG_END MACHINE_CONFIG_START(galaxian_state::zigzag) galaxian_base(config); /* separate tile/sprite ROMs */ - MCFG_GFXDECODE_MODIFY("gfxdecode", pacmanbl) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pacmanbl) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") @@ -5947,7 +5947,7 @@ MACHINE_CONFIG_START(galaxian_state::gmgalax) galaxian(config); /* banked video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", gmgalax) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_gmgalax) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(64) MCFG_PALETTE_INIT_OWNER(galaxian_state, galaxian) diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp index 0e42aca14e8..fd2391d38f4 100644 --- a/src/mame/drivers/galaxold.cpp +++ b/src/mame/drivers/galaxold.cpp @@ -2220,23 +2220,23 @@ static const gfx_layout rockclim_charlayout = 8*8*2 }; -static GFXDECODE_START( rockclim ) +static GFXDECODE_START( gfx_rockclim ) GFXDECODE_ENTRY( "gfx1", 0x0000, galaxold_charlayout, 32, 8 ) GFXDECODE_ENTRY( "gfx1", 0x0000, galaxold_spritelayout, 32, 8 ) GFXDECODE_ENTRY( "gfx2", 0x0000, rockclim_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START( galaxian ) +static GFXDECODE_START( gfx_galaxian ) GFXDECODE_ENTRY( "gfx1", 0x0000, galaxold_charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0x0000, galaxold_spritelayout, 0, 8 ) GFXDECODE_END -static GFXDECODE_START( gmgalax ) +static GFXDECODE_START( gfx_gmgalax ) GFXDECODE_ENTRY( "gfx1", 0x0000, galaxold_charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0x0000, galaxold_spritelayout, 0, 16 ) GFXDECODE_END -static GFXDECODE_START( _4in1 ) +static GFXDECODE_START( gfx_4in1 ) GFXDECODE_ENTRY( "gfx1", 0x0000, _4in1_charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0x4000, _4in1_spritelayout, 0, 8 ) GFXDECODE_END @@ -2261,7 +2261,7 @@ MACHINE_CONFIG_START(galaxold_state::galaxold_base) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaxian) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galaxian) MCFG_PALETTE_ADD("palette", 32+2+64) /* 32 for the characters, 2 for the bullets, 64 for the stars */ MCFG_PALETTE_INIT_OWNER(galaxold_state,galaxold) @@ -2400,7 +2400,7 @@ MACHINE_CONFIG_START(galaxold_state::_4in1) MCFG_DEVICE_PROGRAM_MAP(_4in1_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", _4in1) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_4in1) MCFG_VIDEO_START_OVERRIDE(galaxold_state,pisces) MACHINE_CONFIG_END @@ -2447,7 +2447,7 @@ MACHINE_CONFIG_START(galaxold_state::rockclim) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(rockclim_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", rockclim) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_rockclim) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(galaxold_state,rockclim) @@ -2503,7 +2503,7 @@ MACHINE_CONFIG_START(galaxold_state::drivfrcg) MCFG_PALETTE_ADD("palette", 64) MCFG_PALETTE_INIT_OWNER(galaxold_state,rockclim) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gmgalax) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gmgalax) MCFG_VIDEO_START_OVERRIDE(galaxold_state,drivfrcg) @@ -2582,7 +2582,7 @@ MACHINE_CONFIG_START(galaxold_state::racknrol) MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT // ??? /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaxian) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galaxian) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(galaxold_state,rockclim) @@ -2610,7 +2610,7 @@ MACHINE_CONFIG_START(galaxold_state::hexpoola) MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT // ??? MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxold_state, hunchbks_vh_interrupt) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaxian) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galaxian) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(galaxold_state,rockclim) @@ -2635,7 +2635,7 @@ MACHINE_CONFIG_START(galaxold_state::ckongg) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(ckongg_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", gmgalax) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_gmgalax) MCFG_VIDEO_START_OVERRIDE(galaxold_state,ckongs) MACHINE_CONFIG_END @@ -2648,7 +2648,7 @@ MACHINE_CONFIG_START(galaxold_state::ckongmc) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(ckongmc_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", gmgalax) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_gmgalax) MCFG_VIDEO_START_OVERRIDE(galaxold_state,ckongs) MACHINE_CONFIG_END diff --git a/src/mame/drivers/galaxy.cpp b/src/mame/drivers/galaxy.cpp index a7cbc2463a8..0d5600fa09e 100644 --- a/src/mame/drivers/galaxy.cpp +++ b/src/mame/drivers/galaxy.cpp @@ -170,7 +170,7 @@ static const gfx_layout galaxy_charlayout = 8 /* every char takes 1 x 16 bytes */ }; -static GFXDECODE_START( galaxy ) +static GFXDECODE_START( gfx_galaxy ) GFXDECODE_ENTRY( "gfx1", 0x0000, galaxy_charlayout, 0, 1 ) GFXDECODE_END @@ -193,7 +193,7 @@ MACHINE_CONFIG_START(galaxy_state::galaxy) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 208-1) MCFG_SCREEN_UPDATE_DRIVER(galaxy_state, screen_update_galaxy) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaxy) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galaxy) MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/galeb.cpp b/src/mame/drivers/galeb.cpp index 1b5937e20dc..01a1f62298a 100644 --- a/src/mame/drivers/galeb.cpp +++ b/src/mame/drivers/galeb.cpp @@ -22,7 +22,7 @@ #include "speaker.h" -static GFXDECODE_START( galeb ) +static GFXDECODE_START( gfx_galeb ) GFXDECODE_ENTRY( "gfx1", 0x0000, galeb_charlayout, 0, 1 ) GFXDECODE_END @@ -178,7 +178,7 @@ MACHINE_CONFIG_START(galeb_state::galeb) MCFG_SCREEN_UPDATE_DRIVER(galeb_state, screen_update_galeb) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galeb ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galeb ) MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/galivan.cpp b/src/mame/drivers/galivan.cpp index 4bbcc06e823..2c44f41f01e 100644 --- a/src/mame/drivers/galivan.cpp +++ b/src/mame/drivers/galivan.cpp @@ -374,7 +374,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( galivan ) +static GFXDECODE_START( gfx_galivan ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 8*16, 16 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 8*16+16*16, 256 ) @@ -457,7 +457,7 @@ MACHINE_CONFIG_START(galivan_state::galivan) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galivan) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galivan) MCFG_PALETTE_ADD("palette", 8*16+16*16+256*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(galivan_state, galivan) @@ -517,7 +517,7 @@ MACHINE_CONFIG_START(galivan_state::ninjemak) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galivan) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galivan) MCFG_PALETTE_ADD("palette", 8*16+16*16+256*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(galivan_state, galivan) diff --git a/src/mame/drivers/galpani2.cpp b/src/mame/drivers/galpani2.cpp index 0c1b8b0e1fd..b5479cd56f4 100644 --- a/src/mame/drivers/galpani2.cpp +++ b/src/mame/drivers/galpani2.cpp @@ -574,7 +574,7 @@ static const gfx_layout layout_16x16x8 = 16*16*8 }; -static GFXDECODE_START( galpani2 ) +static GFXDECODE_START( gfx_galpani2 ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0, 0x40 ) // [0] Sprites GFXDECODE_END @@ -643,7 +643,7 @@ MACHINE_CONFIG_START(galpani2_state::galpani2) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1-16) MCFG_SCREEN_UPDATE_DRIVER(galpani2_state, screen_update_galpani2) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galpani2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galpani2) MCFG_PALETTE_ADD("palette", 0x4000) // sprites MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) diff --git a/src/mame/drivers/galpanic.cpp b/src/mame/drivers/galpanic.cpp index e7b4020df98..7d292f5837c 100644 --- a/src/mame/drivers/galpanic.cpp +++ b/src/mame/drivers/galpanic.cpp @@ -227,7 +227,7 @@ static const gfx_layout spritelayout = 128*8 }; -static GFXDECODE_START( galpanic ) +static GFXDECODE_START( gfx_galpanic ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 256, 16 ) GFXDECODE_END @@ -251,7 +251,7 @@ MACHINE_CONFIG_START(galpanic_state::galpanic) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, galpanic_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galpanic) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galpanic) MCFG_PALETTE_ADD("palette", 1024 + 32768) MCFG_PALETTE_FORMAT(GGGGGRRRRRBBBBBx) // fg palette ram, bit 0 seems to be a transparency flag for the front bitmap MCFG_PALETTE_INIT_OWNER(galpanic_state, galpanic) diff --git a/src/mame/drivers/galspnbl.cpp b/src/mame/drivers/galspnbl.cpp index 7257420ecfe..1fbaf92515f 100644 --- a/src/mame/drivers/galspnbl.cpp +++ b/src/mame/drivers/galspnbl.cpp @@ -204,7 +204,7 @@ static const gfx_layout spritelayout = 16*8 }; -static GFXDECODE_START( galspnbl ) +static GFXDECODE_START( gfx_galspnbl ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 512, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 16 ) GFXDECODE_END @@ -237,7 +237,7 @@ MACHINE_CONFIG_START(galspnbl_state::galspnbl) MCFG_VIDEO_START_OVERRIDE(galspnbl_state,galspnbl) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", galspnbl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galspnbl) MCFG_PALETTE_ADD("palette", 1024 + 32768) MCFG_PALETTE_INIT_OWNER(galspnbl_state, galspnbl) diff --git a/src/mame/drivers/gamecstl.cpp b/src/mame/drivers/gamecstl.cpp index 71cdd315ae1..f8212570fed 100644 --- a/src/mame/drivers/gamecstl.cpp +++ b/src/mame/drivers/gamecstl.cpp @@ -389,7 +389,7 @@ static const gfx_layout CGA_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( CGA ) +static GFXDECODE_START( gfx_cga ) /* Support up to four CGA fonts */ GFXDECODE_ENTRY( "gfx1", 0x0000, CGA_charlayout, 0, 256 ) /* Font 0 */ GFXDECODE_ENTRY( "gfx1", 0x0800, CGA_charlayout, 0, 256 ) /* Font 1 */ @@ -465,7 +465,7 @@ MACHINE_CONFIG_START(gamecstl_state::gamecstl) MCFG_SCREEN_UPDATE_DRIVER(gamecstl_state, screen_update_gamecstl) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", CGA) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cga) MCFG_PALETTE_ADD("palette", 16) diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp index cf33c6f11b5..e70ee5a8f85 100644 --- a/src/mame/drivers/gaplus.cpp +++ b/src/mame/drivers/gaplus.cpp @@ -466,7 +466,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( gaplus ) +static GFXDECODE_START( gfx_gaplus ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0x0000, spritelayout, 64*4, 64 ) GFXDECODE_END @@ -570,7 +570,7 @@ MACHINE_CONFIG_START(gaplus_state::gaplus) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, gaplus_state, vblank_irq)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gaplus) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gaplus) MCFG_PALETTE_ADD("palette", 64*4+64*8) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(gaplus_state, gaplus) diff --git a/src/mame/drivers/gatron.cpp b/src/mame/drivers/gatron.cpp index 5a2faf7371d..6b37b3eb701 100644 --- a/src/mame/drivers/gatron.cpp +++ b/src/mame/drivers/gatron.cpp @@ -556,7 +556,7 @@ static const gfx_layout charlayout = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( gat ) +static GFXDECODE_START( gfx_gat ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -589,7 +589,7 @@ MACHINE_CONFIG_START(gatron_state::gat) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gat) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gat) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(gatron_state, gatron) diff --git a/src/mame/drivers/gauntlet.cpp b/src/mame/drivers/gauntlet.cpp index 4c111b0eb42..004b4640d54 100644 --- a/src/mame/drivers/gauntlet.cpp +++ b/src/mame/drivers/gauntlet.cpp @@ -474,7 +474,7 @@ static const gfx_layout pfmolayout = }; -static GFXDECODE_START( gauntlet ) +static GFXDECODE_START( gfx_gauntlet ) GFXDECODE_ENTRY( "gfx2", 0, pfmolayout, 256, 32 ) GFXDECODE_ENTRY( "gfx1", 0, anlayout, 0, 64 ) GFXDECODE_END @@ -502,7 +502,7 @@ MACHINE_CONFIG_START(gauntlet_state::gauntlet_base) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gauntlet) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gauntlet) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(IIIIRRRRGGGGBBBB) diff --git a/src/mame/drivers/gb.cpp b/src/mame/drivers/gb.cpp index 4e690bd4637..5c75be8fe39 100644 --- a/src/mame/drivers/gb.cpp +++ b/src/mame/drivers/gb.cpp @@ -478,8 +478,6 @@ void megaduck_state::megaduck_map(address_map &map) map(0xffff, 0xffff).rw(this, FUNC(megaduck_state::gb_ie_r), FUNC(megaduck_state::gb_ie_w)); /* interrupt enable register */ } -static GFXDECODE_START( gb ) -GFXDECODE_END static INPUT_PORTS_START( gameboy ) PORT_START("INPUTS") @@ -630,7 +628,7 @@ MACHINE_CONFIG_START(gb_state::gameboy) MCFG_SCREEN_SIZE( 458, 154 ) MCFG_SCREEN_VISIBLE_AREA(0*8, 20*8-1, 0*8, 18*8-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(gb_state,gb) @@ -672,7 +670,7 @@ MACHINE_CONFIG_START(gb_state::supergb) MCFG_SCREEN_SIZE(32*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) MCFG_PALETTE_ADD("palette", 32768) MCFG_PALETTE_INIT_OWNER(gb_state,sgb) @@ -751,7 +749,7 @@ MACHINE_CONFIG_START(gb_state::gbcolor) MCFG_SCREEN_SIZE( 458, 154 ) MCFG_SCREEN_VISIBLE_AREA(0*8, 20*8-1, 0*8, 18*8-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) MCFG_PALETTE_ADD("palette", 32768) MCFG_PALETTE_INIT_OWNER(gb_state,gbc) @@ -798,7 +796,7 @@ MACHINE_CONFIG_START(megaduck_state::megaduck) MCFG_SCREEN_VISIBLE_AREA(0*8, 20*8-1, 0*8, 18*8-1) MCFG_DEFAULT_LAYOUT(layout_lcd) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(megaduck_state,megaduck) diff --git a/src/mame/drivers/gberet.cpp b/src/mame/drivers/gberet.cpp index 8cf8805d36a..e1fe2860c34 100644 --- a/src/mame/drivers/gberet.cpp +++ b/src/mame/drivers/gberet.cpp @@ -377,12 +377,12 @@ static const gfx_layout gberetb_spritelayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( gberet ) +static GFXDECODE_START( gfx_gberet ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 16*16, 16 ) GFXDECODE_END -static GFXDECODE_START( gberetb ) +static GFXDECODE_START( gfx_gberetb ) GFXDECODE_ENTRY( "gfx1", 0, gberetb_charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, gberetb_spritelayout, 16*16, 16 ) GFXDECODE_END @@ -428,7 +428,7 @@ MACHINE_CONFIG_START(gberet_state::gberet) MCFG_SCREEN_UPDATE_DRIVER(gberet_state, screen_update_gberet) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gberet) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gberet) MCFG_PALETTE_ADD("palette", 2*16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(gberet_state,gberet) @@ -469,7 +469,7 @@ MACHINE_CONFIG_START(gberet_state::gberetb) MCFG_SCREEN_UPDATE_DRIVER(gberet_state, screen_update_gberetb) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gberetb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gberetb) MCFG_PALETTE_ADD("palette", 2*16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(gberet_state,gberet) diff --git a/src/mame/drivers/gcpinbal.cpp b/src/mame/drivers/gcpinbal.cpp index bfa917d498c..b5fb2f3cff3 100644 --- a/src/mame/drivers/gcpinbal.cpp +++ b/src/mame/drivers/gcpinbal.cpp @@ -325,10 +325,10 @@ static const gfx_layout tilelayout = 16*16*4 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( gcpinbal ) - GFXDECODE_ENTRY( "sprite", 0, tilelayout, 0, 256 ) /* sprites & playfield */ - GFXDECODE_ENTRY( "bg0", 0, charlayout, 0, 256 ) /* sprites & playfield */ - GFXDECODE_ENTRY( "fg0", 0, char_8x8_layout, 0, 256 ) /* sprites & playfield */ +static GFXDECODE_START( gfx_gcpinbal ) + GFXDECODE_ENTRY( "sprite", 0, tilelayout, 0, 256 ) // sprites & playfield + GFXDECODE_ENTRY( "bg0", 0, charlayout, 0, 256 ) // sprites & playfield + GFXDECODE_ENTRY( "fg0", 0, char_8x8_layout, 0, 256 ) // sprites & playfield GFXDECODE_END @@ -382,7 +382,7 @@ MACHINE_CONFIG_START(gcpinbal_state::gcpinbal) MCFG_SCREEN_UPDATE_DRIVER(gcpinbal_state, screen_update_gcpinbal) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gcpinbal) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gcpinbal) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) diff --git a/src/mame/drivers/ginganin.cpp b/src/mame/drivers/ginganin.cpp index 1925e6fe456..eacbd4721ca 100644 --- a/src/mame/drivers/ginganin.cpp +++ b/src/mame/drivers/ginganin.cpp @@ -219,7 +219,7 @@ layout16x16(tilelayout, 0x20000) layout8x8 (txtlayout, 0x04000) layout16x16(spritelayout,0x50000) -static GFXDECODE_START( ginganin ) +static GFXDECODE_START( gfx_ginganin ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 256*3, 16 ) /* [0] bg */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 256*2, 16 ) /* [1] fg */ GFXDECODE_ENTRY( "gfx3", 0, txtlayout, 256*0, 16 ) /* [2] txt */ @@ -269,7 +269,7 @@ MACHINE_CONFIG_START(ginganin_state::ginganin) MCFG_SCREEN_UPDATE_DRIVER(ginganin_state, screen_update_ginganin) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ginganin) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ginganin) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp index 8233288586b..dd3e93e5591 100644 --- a/src/mame/drivers/gkigt.cpp +++ b/src/mame/drivers/gkigt.cpp @@ -567,7 +567,7 @@ static const gfx_layout igt_gameking_layout = }; -static GFXDECODE_START( igt_gameking ) +static GFXDECODE_START( gfx_igt_gameking ) GFXDECODE_ENTRY( "cg", 0, igt_gameking_layout, 0x0, 1 ) GFXDECODE_END @@ -621,7 +621,7 @@ MACHINE_CONFIG_START(igt_gameking_state::igt_gameking) MCFG_RS232_RXD_HANDLER(WRITELINE("quart1", sc28c94_device, rx_d_w)) MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", igt_gameking) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_igt_gameking) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index 7bb5155be82..fe1c88384ce 100644 --- a/src/mame/drivers/gladiatr.cpp +++ b/src/mame/drivers/gladiatr.cpp @@ -924,13 +924,13 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( ppking ) +static GFXDECODE_START( gfx_ppking ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 32 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x100, 32 ) GFXDECODE_END -static GFXDECODE_START( gladiatr ) +static GFXDECODE_START( gfx_gladiatr ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x200, 1 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0x000, 32 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x100, 32 ) @@ -978,7 +978,7 @@ MACHINE_CONFIG_START(ppking_state::ppking) MCFG_SCREEN_UPDATE_DRIVER(ppking_state, screen_update_ppking) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ppking) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ppking) MCFG_PALETTE_ADD("palette", 1024) MCFG_VIDEO_START_OVERRIDE(ppking_state, ppking) @@ -1070,7 +1070,7 @@ MACHINE_CONFIG_START(gladiatr_state::gladiatr) MCFG_SCREEN_UPDATE_DRIVER(gladiatr_state, screen_update_gladiatr) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gladiatr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gladiatr) MCFG_PALETTE_ADD("palette", 1024) MCFG_VIDEO_START_OVERRIDE(gladiatr_state,gladiatr) diff --git a/src/mame/drivers/glass.cpp b/src/mame/drivers/glass.cpp index 15ba1a8a7ce..6cf030cdb91 100644 --- a/src/mame/drivers/glass.cpp +++ b/src/mame/drivers/glass.cpp @@ -67,7 +67,7 @@ static const gfx_layout glass_tilelayout16 = 32*8 }; -static GFXDECODE_START( glass ) +static GFXDECODE_START( gfx_glass ) GFXDECODE_ENTRY( "gfx1", 0x000000, glass_tilelayout16, 0, 64 ) GFXDECODE_END @@ -254,7 +254,7 @@ MACHINE_CONFIG_START(glass_state::glass) MCFG_SCREEN_UPDATE_DRIVER(glass_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", glass) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_glass) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp index 07f42acb9d0..28c31d60c50 100644 --- a/src/mame/drivers/gluck2.cpp +++ b/src/mame/drivers/gluck2.cpp @@ -465,7 +465,7 @@ static const gfx_layout tilelayout = * Graphics Decode Information * **************************************************/ -static GFXDECODE_START( gluck2 ) +static GFXDECODE_START( gfx_gluck2 ) GFXDECODE_ENTRY( "gfx", 0x0000, tilelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx", 0x0800, tilelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx", 0x1000, tilelayout, 0, 16 ) @@ -501,7 +501,7 @@ MACHINE_CONFIG_START(gluck2_state::gluck2) MCFG_SCREEN_UPDATE_DRIVER(gluck2_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gluck2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gluck2) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK/16) /* guess */ diff --git a/src/mame/drivers/gng.cpp b/src/mame/drivers/gng.cpp index 3b02ffa444a..41a59fd6ac9 100644 --- a/src/mame/drivers/gng.cpp +++ b/src/mame/drivers/gng.cpp @@ -343,7 +343,7 @@ static const gfx_layout spritelayout = -static GFXDECODE_START( gng ) +static GFXDECODE_START( gfx_gng ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x80, 16 ) /* colors 0x80-0xbf */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0x00, 8 ) /* colors 0x00-0x3f */ GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x40, 4 ) /* colors 0x40-0x7f */ @@ -418,7 +418,7 @@ MACHINE_CONFIG_START(gng_state::gng) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gng) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gng) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) diff --git a/src/mame/drivers/go2000.cpp b/src/mame/drivers/go2000.cpp index 5743d2ad0fa..4c8a015b3ff 100644 --- a/src/mame/drivers/go2000.cpp +++ b/src/mame/drivers/go2000.cpp @@ -192,7 +192,7 @@ static const gfx_layout go2000_layout = 8*32 }; -static GFXDECODE_START( go2000 ) +static GFXDECODE_START( gfx_go2000 ) GFXDECODE_ENTRY( "gfx1", 0, go2000_layout, 0x0, 0x80 ) /* tiles */ GFXDECODE_END @@ -351,7 +351,7 @@ MACHINE_CONFIG_START(go2000_state::go2000) MCFG_DEVICE_IO_MAP(go2000_sound_io) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", go2000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_go2000) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/goal92.cpp b/src/mame/drivers/goal92.cpp index b0b78526e09..00a3b61dda3 100644 --- a/src/mame/drivers/goal92.cpp +++ b/src/mame/drivers/goal92.cpp @@ -268,7 +268,7 @@ static const gfx_layout layout_16x16x4_2 = }; #endif -static GFXDECODE_START( goal92 ) +static GFXDECODE_START( gfx_goal92 ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0*16, 8*16 ) // Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_8x8x4, 48*16, 16 ) // Text Layer GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x4, 0*16, 16 ) // BG Layer @@ -318,7 +318,7 @@ MACHINE_CONFIG_START(goal92_state::goal92) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, goal92_state, screen_vblank_goal92)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", goal92) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_goal92) MCFG_PALETTE_ADD("palette", 128*16) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/goindol.cpp b/src/mame/drivers/goindol.cpp index 27079b3177f..83adf775fff 100644 --- a/src/mame/drivers/goindol.cpp +++ b/src/mame/drivers/goindol.cpp @@ -212,7 +212,7 @@ static const gfx_layout charlayout = 8*8 }; -static GFXDECODE_START( goindol ) +static GFXDECODE_START( gfx_goindol ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 32 ) GFXDECODE_END @@ -256,7 +256,7 @@ MACHINE_CONFIG_START(goindol_state::goindol) MCFG_SCREEN_UPDATE_DRIVER(goindol_state, screen_update_goindol) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", goindol) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_goindol) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ diff --git a/src/mame/drivers/goldngam.cpp b/src/mame/drivers/goldngam.cpp index 0dba26ca17a..099e9b6688a 100644 --- a/src/mame/drivers/goldngam.cpp +++ b/src/mame/drivers/goldngam.cpp @@ -582,7 +582,7 @@ static const gfx_layout charlayout = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( goldngam ) +static GFXDECODE_START( gfx_goldngam ) GFXDECODE_ENTRY( "maincpu", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -613,7 +613,7 @@ MACHINE_CONFIG_START(goldngam_state::swisspkr) MCFG_SCREEN_UPDATE_DRIVER(goldngam_state, screen_update_goldngam) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", goldngam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_goldngam) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(goldngam_state, goldngam) diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp index ee5112faddc..69abf63ccc9 100644 --- a/src/mame/drivers/goldnpkr.cpp +++ b/src/mame/drivers/goldnpkr.cpp @@ -4110,12 +4110,12 @@ static const gfx_layout tilelayout = * Graphics Decode Information * **************************************************/ -static GFXDECODE_START( goldnpkr ) +static GFXDECODE_START( gfx_goldnpkr ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 16 ) GFXDECODE_END -static GFXDECODE_START( wcrdxtnd ) +static GFXDECODE_START( gfx_wcrdxtnd ) GFXDECODE_ENTRY( "gfx0", 0, tilelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 16 ) @@ -4323,7 +4323,7 @@ MACHINE_CONFIG_START(goldnpkr_state::goldnpkr_base) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", goldnpkr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_goldnpkr) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldnpkr_state, goldnpkr) MACHINE_CONFIG_END @@ -4415,7 +4415,7 @@ MACHINE_CONFIG_START(goldnpkr_state::wildcard) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, mux_port_w)) /* video hardware */ -// MCFG_GFXDECODE_MODIFY("gfxdecode", wildcard) +// MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_wildcard) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(goldnpkr_state, witchcrd) // MCFG_VIDEO_START_OVERRIDE(goldnpkr_state,wildcard) @@ -4439,7 +4439,7 @@ MACHINE_CONFIG_START(goldnpkr_state::wcrdxtnd) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, mux_port_w)) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", wcrdxtnd) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_wcrdxtnd) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(goldnpkr_state, wcrdxtnd) MCFG_VIDEO_START_OVERRIDE(goldnpkr_state, wcrdxtnd) @@ -4469,7 +4469,7 @@ MACHINE_CONFIG_START(goldnpkr_state::wildcrdb) MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, wcfalcon_snd_w)) /* video hardware */ -// MCFG_GFXDECODE_MODIFY("gfxdecode", wildcard) +// MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_wildcard) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(goldnpkr_state, witchcrd) // MCFG_VIDEO_START_OVERRIDE(goldnpkr_state,wildcard) @@ -4731,7 +4731,7 @@ MACHINE_CONFIG_START(blitz_state::megadpkr) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", 0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", goldnpkr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_goldnpkr) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldnpkr_state, witchcrd) diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index 9cb7eb1a6b3..8b004ea6d12 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -7813,93 +7813,93 @@ static const gfx_layout flam7_tw_tilelayout = // FIXME }; -static GFXDECODE_START( goldstar ) +static GFXDECODE_START( gfx_goldstar ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 128, 8 ) GFXDECODE_END -static GFXDECODE_START( bl ) +static GFXDECODE_START( gfx_bl ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayoutbl, 128, 8 ) GFXDECODE_END -static GFXDECODE_START( ml ) +static GFXDECODE_START( gfx_ml ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0x18000, tilelayout, 128, 8 ) GFXDECODE_END -static GFXDECODE_START( goldfrui ) +static GFXDECODE_START( gfx_goldfrui ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_goldfrui, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayoutbl, 128, 8 ) GFXDECODE_END -static GFXDECODE_START( chry10 ) +static GFXDECODE_START( gfx_chry10 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_chry10, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout_chry10, 128, 8 ) GFXDECODE_END -static GFXDECODE_START( cb3c ) +static GFXDECODE_START( gfx_cb3c ) GFXDECODE_ENTRY( "gfx1", 0, cb3c_tiles8x8_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, cb3c_tiles8x32_layout, 128, 8 ) GFXDECODE_END -static GFXDECODE_START( cb3e ) +static GFXDECODE_START( gfx_cb3e ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_cb3e, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout_cb3e, 128, 8 ) GFXDECODE_END -static GFXDECODE_START( ncb3 ) +static GFXDECODE_START( gfx_ncb3 ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x3_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x32x4_layout, 128, 4 ) GFXDECODE_END -static GFXDECODE_START( bingownga ) +static GFXDECODE_START( gfx_bingownga ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x3_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0x6000, tiles8x32x4_layout, 128, 4 ) GFXDECODE_END -static GFXDECODE_START( magodds ) +static GFXDECODE_START( gfx_magodds ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x3_layout, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x32x4_layout, 0, 16 ) GFXDECODE_END -static GFXDECODE_START( cm ) +static GFXDECODE_START( gfx_cm ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x3_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x32x4_layout, 128+64, 4 ) // or is there a register for the +64? GFXDECODE_END -static GFXDECODE_START( cmbitmap ) +static GFXDECODE_START( gfx_cmbitmap ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x3_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x32x4_layout, 128+64, 4 ) // or is there a register for the +64? GFXDECODE_ENTRY( "user1", 0, tiles128x128x4_layout, 128, 4 ) GFXDECODE_END -static GFXDECODE_START( cmasterc ) +static GFXDECODE_START( gfx_cmasterc ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x3_layout, 0, 16 ) GFXDECODE_ENTRY( "reels", 0, tiles8x32x4alt_layout, 128+64, 4 ) GFXDECODE_ENTRY( "user1", 0, tiles128x128x4_layout, 128, 4 ) GFXDECODE_END -static GFXDECODE_START( cmast91 ) +static GFXDECODE_START( gfx_cmast91 ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x3_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x32x4_layout, 128+64, 4 ) // or is there a register for the +64? GFXDECODE_ENTRY( "user1", 0, tiles256x128x4_layout, 128, 4 ) // wrong... FIXME. GFXDECODE_END #if 0 // decodes an extra plane for cmv4 / cmasterb, not sure if we need to -static GFXDECODE_START( cmasterb ) +static GFXDECODE_START( gfx_cmasterb ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x3_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x32x5_layout, 0, 4 ) GFXDECODE_END #endif -static GFXDECODE_START( megaline ) +static GFXDECODE_START( gfx_megaline ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x4_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x32x4_layout, 128, 8 ) GFXDECODE_END -static GFXDECODE_START( sangho ) +static GFXDECODE_START( gfx_sangho ) GFXDECODE_ENTRY( "gfx1", 0, sangho_charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, sangho_tilelayout, 128, 8 ) /* 7*16,16 title girl in 1st color @@ -7911,17 +7911,17 @@ static GFXDECODE_START( sangho ) */ GFXDECODE_END -static GFXDECODE_START( super9 ) +static GFXDECODE_START( gfx_super9 ) GFXDECODE_ENTRY( "gfx1", 0, super9_charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, super9_tilelayout, 128, 8 ) GFXDECODE_END -static GFXDECODE_START( flaming7 ) // gfx 2 still wrong... +static GFXDECODE_START( gfx_flaming7 ) // gfx 2 still wrong... GFXDECODE_ENTRY( "gfx1", 0, flaming7_charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, flaming7_tilelayout, 104, 8 ) GFXDECODE_END -static GFXDECODE_START( flam7_tw ) // gfx 2 still wrong... +static GFXDECODE_START( gfx_flam7_tw ) // gfx 2 still wrong... GFXDECODE_ENTRY( "gfx1", 0, flam7_tw_charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, flam7_tw_tilelayout, 104, 8 ) GFXDECODE_END @@ -7951,7 +7951,7 @@ static const gfx_layout tiles8x8_3bpp_layout = 8*8 }; -static GFXDECODE_START( nfm ) +static GFXDECODE_START( gfx_nfm ) GFXDECODE_ENTRY( "tilegfx", 0, tiles8x8_3bpp_layout, 0, 16 ) GFXDECODE_ENTRY( "reelgfx", 0, tiles8x32_4bpp_layout, 0, 16 ) GFXDECODE_END @@ -7991,7 +7991,7 @@ static const gfx_layout tiles8x32x4alt2_layout = }; -static GFXDECODE_START( unkch ) +static GFXDECODE_START( gfx_unkch ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x4alt_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x32x4alt2_layout, 0, 16 ) GFXDECODE_END @@ -8007,7 +8007,7 @@ static const gfx_layout tilescherrys_layout = 32*32 }; -static GFXDECODE_START(cherrys ) +static GFXDECODE_START( gfx_cherrys ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x3_miss1bpp_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilescherrys_layout, 128, 8 ) GFXDECODE_END @@ -8027,7 +8027,7 @@ static const gfx_layout tiles8x32x4pkr_layout = 8*32*4 /* every char takes 128 consecutive bytes */ }; -static GFXDECODE_START( pkrmast ) +static GFXDECODE_START( gfx_pkrmast ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x32x4pkr_layout, 128+64, 16 ) GFXDECODE_END @@ -8057,7 +8057,7 @@ static const gfx_layout cm97_layout32 = 32*32 }; -static GFXDECODE_START( cm97 ) +static GFXDECODE_START( gfx_cm97 ) GFXDECODE_ENTRY( "gfx", 0, cm97_layout, 0x0, 32 ) GFXDECODE_ENTRY( "gfx", 0, cm97_layout32, 0x0, 32 ) GFXDECODE_END @@ -8113,7 +8113,7 @@ MACHINE_CONFIG_START(goldstar_state::goldstar) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(HOLDLINE("maincpu", 0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", goldstar) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_goldstar) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(BBGGGRRR) MCFG_NVRAM_ADD_1FILL("nvram") @@ -8150,7 +8150,7 @@ MACHINE_CONFIG_START(goldstar_state::goldstbl) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(HOLDLINE("maincpu", 0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", bl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bl) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(BBGGGRRR) MCFG_NVRAM_ADD_1FILL("nvram") @@ -8170,12 +8170,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(goldstar_state::moonlght) goldstbl(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", ml) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_ml) MACHINE_CONFIG_END MACHINE_CONFIG_START(goldstar_state::goldfrui) goldstbl(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", goldfrui) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_goldfrui) MACHINE_CONFIG_END @@ -8199,7 +8199,7 @@ MACHINE_CONFIG_START(sanghopm_state::star100) MCFG_PALETTE_ADD("palette", 0x100) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sangho) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sangho) MCFG_NVRAM_ADD_1FILL("nvram") @@ -8237,7 +8237,7 @@ MACHINE_CONFIG_START(goldstar_state::super9) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(HOLDLINE("maincpu", 0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", super9) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_super9) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(BBGGGRRR) MCFG_NVRAM_ADD_1FILL("nvram") @@ -8345,7 +8345,7 @@ MACHINE_CONFIG_START(cb3_state::ncb3) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(HOLDLINE("maincpu", 0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ncb3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ncb3) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state, cm) @@ -8367,27 +8367,27 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cb3_state::cb3c) ncb3(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", cb3c) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_cb3c) MACHINE_CONFIG_END MACHINE_CONFIG_START(cb3_state::cb3e) ncb3(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", cb3e) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_cb3e) MACHINE_CONFIG_END MACHINE_CONFIG_START(cb3_state::chrygld) ncb3(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", chry10) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_chry10) MACHINE_CONFIG_END MACHINE_CONFIG_START(cb3_state::cherrys) ncb3(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", cherrys) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_cherrys) MACHINE_CONFIG_END MACHINE_CONFIG_START(cb3_state::cm97) ncb3(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", cm97) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_cm97) MACHINE_CONFIG_END @@ -8420,7 +8420,7 @@ MACHINE_CONFIG_START(goldstar_state::wcherry) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(HOLDLINE("maincpu", 0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cb3e) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cb3e) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state, cm) MCFG_NVRAM_ADD_1FILL("nvram") @@ -8467,7 +8467,7 @@ MACHINE_CONFIG_START(cmaster_state::cm) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(HOLDLINE("maincpu", 0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cmbitmap) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cmbitmap) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state,cm) MCFG_NVRAM_ADD_1FILL("nvram") @@ -8484,7 +8484,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cmaster_state::cmasterc) cm(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", cmasterc) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_cmasterc) MACHINE_CONFIG_END @@ -8515,7 +8515,7 @@ MACHINE_CONFIG_START(goldstar_state::cmast91) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(HOLDLINE("maincpu", 0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cmast91) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cmast91) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state, cmast91) MCFG_NVRAM_ADD_1FILL("nvram") @@ -8571,7 +8571,7 @@ MACHINE_CONFIG_START(wingco_state::lucky8) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, wingco_state, masked_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ncb3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ncb3) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(BBGGGRRR) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) @@ -8626,7 +8626,7 @@ MACHINE_CONFIG_START(wingco_state::bingowng) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, wingco_state, masked_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ncb3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ncb3) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) MCFG_NVRAM_ADD_1FILL("nvram") @@ -8649,7 +8649,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(wingco_state::bingownga) bingowng(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", bingownga) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_bingownga) MACHINE_CONFIG_END @@ -8671,7 +8671,7 @@ MACHINE_CONFIG_START(wingco_state::flaming7) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(flaming7_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", flaming7) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_flaming7) // to do serial protection. MCFG_DEVICE_MODIFY("ppi8255_0") @@ -8686,7 +8686,7 @@ MACHINE_CONFIG_START(wingco_state::flam7_tw) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(flaming7_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", flam7_tw) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_flam7_tw) // to do serial protection. MCFG_DEVICE_MODIFY("ppi8255_0") @@ -8753,7 +8753,7 @@ MACHINE_CONFIG_START(wingco_state::magodds) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, wingco_state, masked_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", magodds) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_magodds) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(wingco_state, magodds) MCFG_NVRAM_ADD_1FILL("nvram") @@ -8804,7 +8804,7 @@ MACHINE_CONFIG_START(goldstar_state::kkotnoli) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ncb3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ncb3) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) @@ -8844,7 +8844,7 @@ MACHINE_CONFIG_START(goldstar_state::ladylinr) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ncb3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ncb3) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) MCFG_NVRAM_ADD_1FILL("nvram") @@ -8895,7 +8895,7 @@ MACHINE_CONFIG_START(wingco_state::wcat3) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ncb3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ncb3) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) MCFG_NVRAM_ADD_1FILL("nvram") @@ -8946,7 +8946,7 @@ MACHINE_CONFIG_START(cmaster_state::amcoe1) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(HOLDLINE("maincpu", 0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cm) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cm) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state,cm) MCFG_NVRAM_ADD_1FILL("nvram") @@ -9003,7 +9003,7 @@ MACHINE_CONFIG_START(cmaster_state::amcoe2) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(HOLDLINE("maincpu", 0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cm) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cm) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state,cm) MCFG_NVRAM_ADD_1FILL("nvram") @@ -9025,7 +9025,7 @@ MACHINE_CONFIG_START(cmaster_state::nfm) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(nfm_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", nfm) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_nfm) MACHINE_CONFIG_END @@ -9054,7 +9054,7 @@ MACHINE_CONFIG_START(unkch_state::unkch) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, unkch_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", unkch) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_unkch) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -9091,7 +9091,7 @@ MACHINE_CONFIG_START(goldstar_state::pkrmast) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(HOLDLINE("maincpu", 0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pkrmast) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pkrmast) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state, cm) MCFG_NVRAM_ADD_1FILL("nvram") @@ -9128,7 +9128,7 @@ MACHINE_CONFIG_START(unkch_state::megaline) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", megaline) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_megaline) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) // MCFG_NVRAM_ADD_1FILL("nvram") @@ -9176,7 +9176,7 @@ MACHINE_CONFIG_START(unkch_state::bonusch) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", megaline) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_megaline) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(goldstar_state, lucky8) diff --git a/src/mame/drivers/gomoku.cpp b/src/mame/drivers/gomoku.cpp index 48ad4d9eb25..6e7b157f61a 100644 --- a/src/mame/drivers/gomoku.cpp +++ b/src/mame/drivers/gomoku.cpp @@ -117,7 +117,7 @@ static const gfx_layout charlayout = 16*8 /* every char takes 16 consecutive bytes */ }; -static GFXDECODE_START( gomoku ) +static GFXDECODE_START( gfx_gomoku ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) GFXDECODE_END @@ -142,7 +142,7 @@ MACHINE_CONFIG_START(gomoku_state::gomoku) MCFG_SCREEN_UPDATE_DRIVER(gomoku_state, screen_update_gomoku) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gomoku) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gomoku) MCFG_PALETTE_ADD("palette", 64) MCFG_PALETTE_INIT_OWNER(gomoku_state, gomoku) diff --git a/src/mame/drivers/good.cpp b/src/mame/drivers/good.cpp index 57ef268a59b..77a45f3826c 100644 --- a/src/mame/drivers/good.cpp +++ b/src/mame/drivers/good.cpp @@ -281,7 +281,7 @@ static const gfx_layout good_layout2 = }; -static GFXDECODE_START( good ) +static GFXDECODE_START( gfx_good ) GFXDECODE_ENTRY( "gfx1", 0, good_layout2, 0x100, 16 ) /* fg tiles */ GFXDECODE_ENTRY( "gfx1", 0, good_layout2, 0x200, 16 ) /* fg tiles */ GFXDECODE_END @@ -293,7 +293,7 @@ MACHINE_CONFIG_START(good_state::good) MCFG_DEVICE_PROGRAM_MAP(good_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", good_state, irq2_line_hold) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", good) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_good) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/goodejan.cpp b/src/mame/drivers/goodejan.cpp index c1286cc3c99..7e654567063 100644 --- a/src/mame/drivers/goodejan.cpp +++ b/src/mame/drivers/goodejan.cpp @@ -622,7 +622,7 @@ static const gfx_layout charlayout = 8*32 }; -static GFXDECODE_START( goodejan ) +static GFXDECODE_START( gfx_goodejan ) GFXDECODE_ENTRY( "spr_gfx", 0,tilelayout, 0x200, 0x40 ) /* Sprites */ GFXDECODE_ENTRY( "bg_gfx", 0, tilelayout, 0x000, 0x30 ) /* Tiles */ GFXDECODE_ENTRY( "md_gfx", 0, tilelayout, 0x300, 0x10 ) /* Text */ @@ -673,7 +673,7 @@ MACHINE_CONFIG_START(goodejan_state::goodejan) MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, goodejan_state, layer_en_w)) MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, goodejan_state, layer_scroll_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", goodejan) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_goodejan) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/gotcha.cpp b/src/mame/drivers/gotcha.cpp index 65c85d80f90..4328a8b8b53 100644 --- a/src/mame/drivers/gotcha.cpp +++ b/src/mame/drivers/gotcha.cpp @@ -227,7 +227,7 @@ static const gfx_layout spritelayout = 16*16 }; -static GFXDECODE_START( gotcha ) +static GFXDECODE_START( gfx_gotcha ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0x100, 32 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x000, 16 ) GFXDECODE_END @@ -279,7 +279,7 @@ MACHINE_CONFIG_START(gotcha_state::gotcha) MCFG_SCREEN_VBLANK_CALLBACK(HOLDLINE("maincpu", M68K_IRQ_6)) MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("audiocpu", INPUT_LINE_NMI)) // ? - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gotcha) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gotcha) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp index 45507fe6710..59922784dce 100644 --- a/src/mame/drivers/gottlieb.cpp +++ b/src/mame/drivers/gottlieb.cpp @@ -1783,7 +1783,7 @@ MACHINE_CONFIG_START(gottlieb_state::gottlieb_core) MCFG_SCREEN_RAW_PARAMS(SYSTEM_CLOCK/4, GOTTLIEB_VIDEO_HCOUNT, 0, GOTTLIEB_VIDEO_HBLANK, GOTTLIEB_VIDEO_VCOUNT, 0, GOTTLIEB_VIDEO_VBLANK) MCFG_SCREEN_UPDATE_DRIVER(gottlieb_state, screen_update_gottlieb) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gfxdecode) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode) MCFG_PALETTE_ADD("palette", 16) // basic speaker configuration diff --git a/src/mame/drivers/gotya.cpp b/src/mame/drivers/gotya.cpp index 9d7efc5a15a..d5d9c10503a 100644 --- a/src/mame/drivers/gotya.cpp +++ b/src/mame/drivers/gotya.cpp @@ -155,7 +155,7 @@ static const gfx_layout spritelayout = 64*8 /* every char takes 64 consecutive bytes */ }; -static GFXDECODE_START( gotya ) +static GFXDECODE_START( gfx_gotya ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 16 ) GFXDECODE_END @@ -227,7 +227,7 @@ MACHINE_CONFIG_START(gotya_state::gotya) MCFG_SCREEN_UPDATE_DRIVER(gotya_state, screen_update_gotya) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gotya) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gotya) MCFG_PALETTE_ADD("palette", 16*4) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(gotya_state, gotya) diff --git a/src/mame/drivers/gpworld.cpp b/src/mame/drivers/gpworld.cpp index e0dfbfb339b..fd7e0cebd1f 100644 --- a/src/mame/drivers/gpworld.cpp +++ b/src/mame/drivers/gpworld.cpp @@ -488,7 +488,7 @@ static const gfx_layout gpworld_tile_layout = 8*8 }; -static GFXDECODE_START( gpworld ) +static GFXDECODE_START( gfx_gpworld ) GFXDECODE_ENTRY("gfx1", 0, gpworld_tile_layout, 0x0, 0x100) GFXDECODE_END @@ -509,7 +509,7 @@ MACHINE_CONFIG_START(gpworld_state::gpworld) /* video hardware */ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gpworld) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gpworld) MCFG_PALETTE_ADD("palette", 1024) /* sound hardware */ diff --git a/src/mame/drivers/grchamp.cpp b/src/mame/drivers/grchamp.cpp index 957c8b79220..8223b48dfa4 100644 --- a/src/mame/drivers/grchamp.cpp +++ b/src/mame/drivers/grchamp.cpp @@ -528,7 +528,7 @@ static const gfx_layout tile_layout = 16*8 }; -static GFXDECODE_START( grchamp ) +static GFXDECODE_START( gfx_grchamp ) GFXDECODE_ENTRY( "gfx1", 0x0000, gfx_8x8x2_planar, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0x0000, tile_layout, 0, 2 ) GFXDECODE_ENTRY( "gfx3", 0x0000, tile_layout, 0, 2 ) @@ -760,7 +760,7 @@ MACHINE_CONFIG_START(grchamp_state::grchamp) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", grchamp) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_grchamp) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(grchamp_state, grchamp) diff --git a/src/mame/drivers/groundfx.cpp b/src/mame/drivers/groundfx.cpp index 7db844de78d..764ded874f2 100644 --- a/src/mame/drivers/groundfx.cpp +++ b/src/mame/drivers/groundfx.cpp @@ -218,7 +218,7 @@ static const gfx_layout scclayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( groundfx ) +static GFXDECODE_START( gfx_groundfx ) GFXDECODE_ENTRY( "gfx2", 0x0, tile16x16_layout, 4096, 512 ) GFXDECODE_ENTRY( "gfx1", 0x0, charlayout, 0, 512 ) GFXDECODE_ENTRY( "gfx3", 0x0, scclayout, 0, 512 ) @@ -270,7 +270,7 @@ MACHINE_CONFIG_START(groundfx_state::groundfx) MCFG_SCREEN_UPDATE_DRIVER(groundfx_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", groundfx) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_groundfx) MCFG_PALETTE_ADD("palette", 16384) MCFG_PALETTE_FORMAT(XRGB) diff --git a/src/mame/drivers/gstream.cpp b/src/mame/drivers/gstream.cpp index 54eacb8fff5..86e32de1f8b 100644 --- a/src/mame/drivers/gstream.cpp +++ b/src/mame/drivers/gstream.cpp @@ -544,7 +544,7 @@ static const gfx_layout layout32x32 = 32*32*8, }; -static GFXDECODE_START( gstream ) +static GFXDECODE_START( gfx_gstream ) GFXDECODE_ENTRY( "gfx2", 0, layout32x32, 0x1000, 4 ) GFXDECODE_ENTRY( "gfx3", 0, layout32x32, 0x1400, 4 ) GFXDECODE_ENTRY( "gfx4", 0, layout32x32, 0x1800, 4 ) @@ -552,7 +552,7 @@ static GFXDECODE_START( gstream ) GFXDECODE_END -static GFXDECODE_START( x2222 ) +static GFXDECODE_START( gfx_x2222 ) GFXDECODE_ENTRY( "gfx2", 0, layout32x32, 0, 0x80 ) GFXDECODE_ENTRY( "gfx3", 0, layout32x32, 0, 0x80 ) GFXDECODE_ENTRY( "gfx4", 0, layout32x32, 0, 0x80 ) @@ -845,7 +845,7 @@ MACHINE_CONFIG_START(gstream_state::gstream) MCFG_PALETTE_ADD("palette", 0x1000 + 0x400 + 0x400 + 0x400) // sprites + 3 bg layers MCFG_PALETTE_FORMAT(BBBBBGGGGGGRRRRR) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gstream) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gstream) SPEAKER(config, "mono").front_center(); @@ -876,7 +876,7 @@ MACHINE_CONFIG_START(gstream_state::x2222) MCFG_PALETTE_ADD_BBBBBGGGGGGRRRRR("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", x2222) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_x2222) // unknown sound hw (no sound roms dumped) diff --git a/src/mame/drivers/gstriker.cpp b/src/mame/drivers/gstriker.cpp index 4744425aa48..571f6d6f1c4 100644 --- a/src/mame/drivers/gstriker.cpp +++ b/src/mame/drivers/gstriker.cpp @@ -235,7 +235,7 @@ static const gfx_layout gs_16x16x4_layout = 16*64 }; -static GFXDECODE_START( gstriker ) +static GFXDECODE_START( gfx_gstriker ) GFXDECODE_ENTRY( "gfx1", 0, gs_8x8x4_layout, 0, 256 ) GFXDECODE_ENTRY( "gfx2", 0, gs_16x16x4_layout, 0, 256 ) GFXDECODE_ENTRY( "gfx3", 0, gs_16x16x4_layout, 0, 256 ) @@ -528,7 +528,7 @@ MACHINE_CONFIG_START(gstriker_state::gstriker) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, gstriker_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gstriker) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gstriker) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/gsword.cpp b/src/mame/drivers/gsword.cpp index 768fbeec364..afd1972ec9f 100644 --- a/src/mame/drivers/gsword.cpp +++ b/src/mame/drivers/gsword.cpp @@ -775,7 +775,7 @@ static const gfx_layout gsword_sprites2 = 64*8*4 /* every sprite takes (64*8=16x6)*4) bytes */ }; -static GFXDECODE_START( gsword ) +static GFXDECODE_START( gfx_gsword ) GFXDECODE_ENTRY( "gfx1", 0, gsword_text, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, gsword_sprites1, 64*4, 64 ) GFXDECODE_ENTRY( "gfx3", 0, gsword_sprites2, 64*4, 64 ) @@ -818,7 +818,7 @@ MACHINE_CONFIG_START(gsword_state::gsword) MCFG_SCREEN_UPDATE_DRIVER(gsword_state, screen_update_gsword) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gsword) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gsword) MCFG_PALETTE_ADD("palette", 64*4+64*4) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(gsword_state,gsword) @@ -886,7 +886,7 @@ MACHINE_CONFIG_START(josvolly_state::josvolly) MCFG_SCREEN_UPDATE_DRIVER(josvolly_state, screen_update_gsword) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gsword) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gsword) MCFG_PALETTE_ADD("palette", 64*4+64*4) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(josvolly_state, josvolly) diff --git a/src/mame/drivers/gumbo.cpp b/src/mame/drivers/gumbo.cpp index b51082fc7ba..6b7547989da 100644 --- a/src/mame/drivers/gumbo.cpp +++ b/src/mame/drivers/gumbo.cpp @@ -230,7 +230,7 @@ static const gfx_layout gumbo2_layout = 4*16 }; -static GFXDECODE_START( gumbo ) +static GFXDECODE_START( gfx_gumbo ) GFXDECODE_ENTRY( "gfx1", 0, gumbo_layout, 0x0, 2 ) /* bg tiles */ GFXDECODE_ENTRY( "gfx2", 0, gumbo2_layout, 0x0, 2 ) /* fg tiles */ GFXDECODE_END @@ -242,7 +242,7 @@ MACHINE_CONFIG_START(gumbo_state::gumbo) MCFG_DEVICE_PROGRAM_MAP(gumbo_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gumbo_state, irq1_line_hold) // all the same - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gumbo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gumbo) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/gunbustr.cpp b/src/mame/drivers/gunbustr.cpp index 4bd3405e5c3..89a3ca63a29 100644 --- a/src/mame/drivers/gunbustr.cpp +++ b/src/mame/drivers/gunbustr.cpp @@ -218,7 +218,7 @@ static const gfx_layout charlayout = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( gunbustr ) +static GFXDECODE_START( gfx_gunbustr ) GFXDECODE_ENTRY( "gfx2", 0x0, tile16x16_layout, 0, 256 ) GFXDECODE_ENTRY( "gfx1", 0x0, charlayout, 0, 256 ) GFXDECODE_END @@ -256,7 +256,7 @@ MACHINE_CONFIG_START(gunbustr_state::gunbustr) MCFG_SCREEN_UPDATE_DRIVER(gunbustr_state, screen_update_gunbustr) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gunbustr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gunbustr) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/gundealr.cpp b/src/mame/drivers/gundealr.cpp index 646170aa85c..250f5ee6cd0 100644 --- a/src/mame/drivers/gundealr.cpp +++ b/src/mame/drivers/gundealr.cpp @@ -405,7 +405,7 @@ static const gfx_layout layout16x16x4 = 16*16*4 }; -static GFXDECODE_START( gundealr ) +static GFXDECODE_START( gfx_gundealr ) GFXDECODE_ENTRY( "gfx1", 0, layout8x8x4, 0, 16 ) /* colors 0-255 */ GFXDECODE_ENTRY( "gfx2", 0, layout16x16x4, 256, 16 ) /* colors 256-511 */ GFXDECODE_END @@ -455,7 +455,7 @@ MACHINE_CONFIG_START(gundealr_state::gundealr) MCFG_SCREEN_UPDATE_DRIVER(gundealr_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gundealr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gundealr) MCFG_PALETTE_ADD("palette", 512) /* sound hardware */ diff --git a/src/mame/drivers/gunsmoke.cpp b/src/mame/drivers/gunsmoke.cpp index bc4b1909f25..548f8eef228 100644 --- a/src/mame/drivers/gunsmoke.cpp +++ b/src/mame/drivers/gunsmoke.cpp @@ -273,7 +273,7 @@ static const gfx_layout spritelayout = /* Graphics Decode Info */ -static GFXDECODE_START( gunsmoke ) +static GFXDECODE_START( gfx_gunsmoke ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 32*4, 16 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 32*4+16*16, 16 ) @@ -323,7 +323,7 @@ MACHINE_CONFIG_START(gunsmoke_state::gunsmoke) MCFG_SCREEN_UPDATE_DRIVER(gunsmoke_state, screen_update_gunsmoke) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gunsmoke) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gunsmoke) MCFG_PALETTE_ADD("palette", 32*4+16*16+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) diff --git a/src/mame/drivers/gyruss.cpp b/src/mame/drivers/gyruss.cpp index b19d956e281..251e092fa25 100644 --- a/src/mame/drivers/gyruss.cpp +++ b/src/mame/drivers/gyruss.cpp @@ -360,7 +360,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( gyruss ) +static GFXDECODE_START( gfx_gyruss ) GFXDECODE_ENTRY( "gfx1", 0x0000, spritelayout, 0, 16 ) /* upper half */ GFXDECODE_ENTRY( "gfx1", 0x0010, spritelayout, 0, 16 ) /* lower half */ GFXDECODE_ENTRY( "gfx2", 0x0000, charlayout, 16*16, 16 ) @@ -508,7 +508,7 @@ MACHINE_CONFIG_START(gyruss_state::gyruss) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, gyruss_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gyruss) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gyruss) MCFG_PALETTE_ADD("palette", 16*4+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(gyruss_state, gyruss) diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp index 32092203f10..c38b7a44a8b 100644 --- a/src/mame/drivers/h19.cpp +++ b/src/mame/drivers/h19.cpp @@ -513,7 +513,7 @@ static const gfx_layout h19_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( h19 ) +static GFXDECODE_START( gfx_h19 ) GFXDECODE_ENTRY( "chargen", 0x0000, h19_charlayout, 0, 1 ) GFXDECODE_END @@ -532,7 +532,7 @@ MACHINE_CONFIG_START(h19_state::h19) MCFG_SCREEN_SIZE(640, 250) MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 250 - 1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", h19) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_h19) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD("crtc", MC6845, "screen", MC6845_CLOCK) diff --git a/src/mame/drivers/hanaawas.cpp b/src/mame/drivers/hanaawas.cpp index 5057aa18455..5d62615fd89 100644 --- a/src/mame/drivers/hanaawas.cpp +++ b/src/mame/drivers/hanaawas.cpp @@ -197,7 +197,7 @@ static const gfx_layout name = \ GFX( charlayout_1bpp, 0x2000*8+4, 0x2000*8+4, 0x2000*8+4 ) GFX( charlayout_3bpp, 0x2000*8, 0, 4 ) -static GFXDECODE_START( hanaawas ) +static GFXDECODE_START( gfx_hanaawas ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_1bpp, 0, 32 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_3bpp, 0, 32 ) GFXDECODE_END @@ -233,7 +233,7 @@ MACHINE_CONFIG_START(hanaawas_state::hanaawas) MCFG_SCREEN_UPDATE_DRIVER(hanaawas_state, screen_update_hanaawas) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hanaawas) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hanaawas) MCFG_PALETTE_ADD("palette", 32*8) MCFG_PALETTE_INDIRECT_ENTRIES(16) MCFG_PALETTE_INIT_OWNER(hanaawas_state, hanaawas) diff --git a/src/mame/drivers/hazeltin.cpp b/src/mame/drivers/hazeltin.cpp index ecfc0819a6e..0eb983a8e97 100644 --- a/src/mame/drivers/hazeltin.cpp +++ b/src/mame/drivers/hazeltin.cpp @@ -686,7 +686,7 @@ static const gfx_layout hazl1500_charlayout = 8*16 }; -static GFXDECODE_START( hazl1500 ) +static GFXDECODE_START( gfx_hazl1500 ) GFXDECODE_ENTRY( CHAR_EPROM_TAG, 0x0000, hazl1500_charlayout, 0, 1 ) GFXDECODE_END @@ -711,7 +711,7 @@ MACHINE_CONFIG_START(hazl1500_state::hazl1500) SCREEN_VTOTAL, 0, SCREEN_VTOTAL); MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hazl1500) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hazl1500) MCFG_DEVICE_ADD(BAUDGEN_TAG, COM8116, XTAL(5'068'800)) MCFG_COM8116_FR_HANDLER(WRITELINE("uart", ay51013_device, write_tcp)) diff --git a/src/mame/drivers/hcastle.cpp b/src/mame/drivers/hcastle.cpp index 2a2905a9cc2..76d49f54a0e 100644 --- a/src/mame/drivers/hcastle.cpp +++ b/src/mame/drivers/hcastle.cpp @@ -151,7 +151,7 @@ static const gfx_layout charlayout = 32*8 }; -static GFXDECODE_START( hcastle ) +static GFXDECODE_START( gfx_hcastle ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8*16 ) /* 007121 #0 */ GFXDECODE_ENTRY( "gfx2", 0, charlayout, 8*16*16, 8*16 ) /* 007121 #1 */ GFXDECODE_END @@ -210,7 +210,7 @@ MACHINE_CONFIG_START(hcastle_state::hcastle) MCFG_SCREEN_UPDATE_DRIVER(hcastle_state, screen_update_hcastle) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hcastle) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hcastle) MCFG_PALETTE_ADD("palette", 2*8*16*16) MCFG_PALETTE_INDIRECT_ENTRIES(128) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/headonb.cpp b/src/mame/drivers/headonb.cpp index 5b5cd497b0a..528f7e4fce9 100644 --- a/src/mame/drivers/headonb.cpp +++ b/src/mame/drivers/headonb.cpp @@ -158,7 +158,7 @@ static const gfx_layout charlayout = 8*8 }; -static GFXDECODE_START( headonb ) +static GFXDECODE_START( gfx_headonb ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -179,7 +179,7 @@ MACHINE_CONFIG_START(headonb_state::headonb) MCFG_SCREEN_UPDATE_DRIVER(headonb_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", headonb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_headonb) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/hexion.cpp b/src/mame/drivers/hexion.cpp index bf4a8f3740e..4ee5a13f505 100644 --- a/src/mame/drivers/hexion.cpp +++ b/src/mame/drivers/hexion.cpp @@ -228,7 +228,7 @@ static const gfx_layout charlayout = 16*8 }; -static GFXDECODE_START( hexion ) +static GFXDECODE_START( gfx_hexion ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -274,7 +274,7 @@ MACHINE_CONFIG_START(hexion_state::hexion) MCFG_SCREEN_UPDATE_DRIVER(hexion_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hexion) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hexion) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ diff --git a/src/mame/drivers/hideseek.cpp b/src/mame/drivers/hideseek.cpp index feea71656f0..a67130aa9b9 100644 --- a/src/mame/drivers/hideseek.cpp +++ b/src/mame/drivers/hideseek.cpp @@ -84,7 +84,7 @@ INPUT_PORTS_END static GFXLAYOUT_RAW( hideseek, 2048, 1, 2048*8, 2048*8 ) -static GFXDECODE_START( hideseek ) +static GFXDECODE_START( gfx_hideseek ) GFXDECODE_ENTRY( "blit_data", 0, hideseek, 0x0000, 0x1 ) GFXDECODE_END @@ -117,7 +117,7 @@ MACHINE_CONFIG_START(hideseek_state::hideseek) MCFG_PALETTE_ADD("palette", 0x10000) MCFG_PALETTE_INIT_OWNER(hideseek_state, hideseek) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hideseek) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hideseek) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/higemaru.cpp b/src/mame/drivers/higemaru.cpp index a2008a2c09d..fb80b78ce31 100644 --- a/src/mame/drivers/higemaru.cpp +++ b/src/mame/drivers/higemaru.cpp @@ -157,7 +157,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( higemaru ) +static GFXDECODE_START( gfx_higemaru ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 32*4, 16 ) GFXDECODE_END @@ -179,7 +179,7 @@ MACHINE_CONFIG_START(higemaru_state::higemaru) MCFG_SCREEN_UPDATE_DRIVER(higemaru_state, screen_update_higemaru) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", higemaru) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_higemaru) MCFG_PALETTE_ADD("palette", 32*4+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) diff --git a/src/mame/drivers/himesiki.cpp b/src/mame/drivers/himesiki.cpp index 0ae9780cd4f..2533e56898d 100644 --- a/src/mame/drivers/himesiki.cpp +++ b/src/mame/drivers/himesiki.cpp @@ -397,7 +397,7 @@ static const gfx_layout layout_spr = 16*16*4 }; -static GFXDECODE_START( himesiki ) +static GFXDECODE_START( gfx_himesiki ) GFXDECODE_ENTRY( "bgtiles", 0, layout_bg, 0x000, 16 ) GFXDECODE_ENTRY( "sprites", 0, layout_spr, 0x200, 16 ) GFXDECODE_ENTRY( "spr_p103a", 0, layout_p103a, 0x200, 16 ) @@ -457,7 +457,7 @@ MACHINE_CONFIG_START(himesiki_state::himesiki) MCFG_SCREEN_UPDATE_DRIVER(himesiki_state, screen_update_himesiki) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", himesiki) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_himesiki) MCFG_PALETTE_ADD_INIT_BLACK("palette", 1024) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/hitme.cpp b/src/mame/drivers/hitme.cpp index 96923bf628b..7acef4835e5 100644 --- a/src/mame/drivers/hitme.cpp +++ b/src/mame/drivers/hitme.cpp @@ -274,7 +274,7 @@ static const gfx_layout hitme_charlayout = 8*8 }; -static GFXDECODE_START( hitme ) +static GFXDECODE_START( gfx_hitme ) GFXDECODE_ENTRY( "gfx1", 0, hitme_charlayout, 0, 2 ) GFXDECODE_END @@ -290,7 +290,7 @@ static const gfx_layout barricad_charlayout = 8*8 }; -static GFXDECODE_START( barricad ) +static GFXDECODE_START( gfx_barricad ) GFXDECODE_ENTRY( "gfx1", 0, barricad_charlayout, 0, 1 ) GFXDECODE_END @@ -330,7 +330,7 @@ MACHINE_CONFIG_START(hitme_state::hitme) MCFG_SCREEN_UPDATE_DRIVER(hitme_state, screen_update_hitme) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hitme) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hitme) MCFG_PALETTE_ADD_MONOCHROME("palette") @@ -358,7 +358,7 @@ MACHINE_CONFIG_START(hitme_state::barricad) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1) MCFG_SCREEN_UPDATE_DRIVER(hitme_state, screen_update_barricad) - MCFG_GFXDECODE_MODIFY("gfxdecode", barricad) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_barricad) MCFG_VIDEO_START_OVERRIDE(hitme_state,barricad) MACHINE_CONFIG_END diff --git a/src/mame/drivers/hitpoker.cpp b/src/mame/drivers/hitpoker.cpp index c02c8fac480..761c293d41d 100644 --- a/src/mame/drivers/hitpoker.cpp +++ b/src/mame/drivers/hitpoker.cpp @@ -453,7 +453,7 @@ static const gfx_layout hitpoker_layout_8bpp = 8*32 }; -static GFXDECODE_START( hitpoker ) +static GFXDECODE_START( gfx_hitpoker ) GFXDECODE_ENTRY( "gfx1", 0, hitpoker_layout_4bpp, 0, 0x100 ) GFXDECODE_ENTRY( "gfx1", 0, hitpoker_layout_8bpp, 0, 8 ) GFXDECODE_END @@ -480,7 +480,7 @@ MACHINE_CONFIG_START(hitpoker_state::hitpoker) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, hitpoker_state, hitpoker_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hitpoker) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hitpoker) MCFG_PALETTE_ADD("palette", 0x800) SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/hng64.cpp b/src/mame/drivers/hng64.cpp index 4093ca30668..a2fec81e91f 100644 --- a/src/mame/drivers/hng64.cpp +++ b/src/mame/drivers/hng64.cpp @@ -1357,7 +1357,7 @@ static const gfx_layout hng64_texlayout = texlayout_yoffset }; -static GFXDECODE_START( hng64 ) +static GFXDECODE_START( gfx_hng64 ) /* tilemap tiles */ GFXDECODE_ENTRY( "scrtile", 0, hng64_8x8x4_tilelayout, 0x0, 0x100 ) GFXDECODE_ENTRY( "scrtile", 0, hng64_8x8x8_tilelayout, 0x0, 0x10 ) @@ -1544,7 +1544,7 @@ MACHINE_CONFIG_START(hng64_state::hng64) MCFG_DEVICE_ADD("rtc", RTC62423, XTAL(32'768)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hng64) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hng64) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) diff --git a/src/mame/drivers/holeland.cpp b/src/mame/drivers/holeland.cpp index 2acd73c1027..f15efd7987e 100644 --- a/src/mame/drivers/holeland.cpp +++ b/src/mame/drivers/holeland.cpp @@ -263,12 +263,12 @@ static const gfx_layout crzrally_spritelayout = 8*16 }; -static GFXDECODE_START( holeland ) +static GFXDECODE_START( gfx_holeland ) GFXDECODE_ENTRY( "gfx1", 0, holeland_charlayout, 0, 256 ) GFXDECODE_ENTRY( "gfx2", 0, holeland_spritelayout, 0, 256 ) GFXDECODE_END -static GFXDECODE_START( crzrally ) +static GFXDECODE_START( gfx_crzrally ) GFXDECODE_ENTRY( "gfx1", 0, crzrally_charlayout, 0, 256 ) GFXDECODE_ENTRY( "gfx2", 0, crzrally_spritelayout, 0, 256 ) GFXDECODE_END @@ -299,7 +299,7 @@ MACHINE_CONFIG_START(holeland_state::holeland) MCFG_SCREEN_UPDATE_DRIVER(holeland_state, screen_update_holeland) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", holeland) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_holeland) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(holeland_state,holeland) @@ -380,7 +380,7 @@ MACHINE_CONFIG_START(holeland_state::crzrally) MCFG_SCREEN_UPDATE_DRIVER(holeland_state, screen_update_crzrally) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", crzrally) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_crzrally) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(holeland_state,crzrally) diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp index 1267738e918..efc1c99a5c2 100644 --- a/src/mame/drivers/homedata.cpp +++ b/src/mame/drivers/homedata.cpp @@ -1067,7 +1067,7 @@ static const gfx_layout char_layout = 32*8 }; -static GFXDECODE_START( mrokumei ) +static GFXDECODE_START( gfx_mrokumei ) GFXDECODE_ENTRY( "gfx1", 0, char_layout, 0x6000, 0x100 ) GFXDECODE_ENTRY( "gfx2", 0, char_layout, 0x7000, 0x100 ) GFXDECODE_END @@ -1083,14 +1083,14 @@ static const gfx_layout tile_layout = 64*8 }; -static GFXDECODE_START( reikaids ) +static GFXDECODE_START( gfx_reikaids ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0x6000, 0x20 ) GFXDECODE_ENTRY( "gfx2", 0, tile_layout, 0x4000, 0x20 ) GFXDECODE_ENTRY( "gfx3", 0, tile_layout, 0x2000, 0x20 ) GFXDECODE_ENTRY( "gfx4", 0, tile_layout, 0x0000, 0x20 ) GFXDECODE_END -static GFXDECODE_START( pteacher ) +static GFXDECODE_START( gfx_pteacher ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0x0000, 0x40 ) GFXDECODE_ENTRY( "gfx2", 0, tile_layout, 0x4000, 0x40 ) GFXDECODE_END @@ -1117,7 +1117,7 @@ static const gfx_layout tile_layout_4bpp_lo = 64*8 }; -static GFXDECODE_START( lemnangl ) +static GFXDECODE_START( gfx_lemnangl ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout_4bpp_hi, 0x0000, 0x200 ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout_4bpp_lo, 0x2000, 0x200 ) GFXDECODE_ENTRY( "gfx2", 0, tile_layout_4bpp_lo, 0x4000, 0x200 ) @@ -1243,7 +1243,7 @@ MACHINE_CONFIG_START(homedata_state::mrokumei) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, homedata_state, screen_vblank_homedata)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mrokumei) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mrokumei) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(homedata_state,mrokumei) @@ -1296,7 +1296,7 @@ MACHINE_CONFIG_START(homedata_state::reikaids) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, homedata_state, screen_vblank_homedata)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", reikaids) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_reikaids) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(homedata_state,reikaids) @@ -1354,7 +1354,7 @@ MACHINE_CONFIG_START(homedata_state::pteacher) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, homedata_state, screen_vblank_homedata)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pteacher) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pteacher) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(homedata_state,pteacher) @@ -1382,7 +1382,7 @@ MACHINE_CONFIG_START(homedata_state::lemnangl) pteacher(config); /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", lemnangl) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_lemnangl) MCFG_VIDEO_START_OVERRIDE(homedata_state,lemnangl) MACHINE_CONFIG_END @@ -1446,7 +1446,7 @@ static const gfx_layout mirderbychar_layout = 32*8 }; -static GFXDECODE_START( mirderby ) +static GFXDECODE_START( gfx_mirderby ) GFXDECODE_ENTRY( "gfx1", 0, mirderbychar_layout, 0x0000, 0x10 ) GFXDECODE_ENTRY( "gfx2", 0, mirderbychar_layout, 0x0000, 0x10 ) GFXDECODE_END @@ -1523,7 +1523,7 @@ MACHINE_CONFIG_START(homedata_state::mirderby) MCFG_SCREEN_UPDATE_DRIVER(homedata_state, screen_update_mirderby) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mirderby) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mirderby) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(homedata_state,mirderby) diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp index 654a2fd40e1..f2cafed0095 100644 --- a/src/mame/drivers/homelab.cpp +++ b/src/mame/drivers/homelab.cpp @@ -654,7 +654,7 @@ static const gfx_layout homelab_charlayout = 8 /* every char takes 8 x 1 bytes */ }; -static GFXDECODE_START( homelab ) +static GFXDECODE_START( gfx_homelab ) GFXDECODE_ENTRY( "chargen", 0x0000, homelab_charlayout, 0, 1 ) GFXDECODE_END @@ -761,7 +761,7 @@ MACHINE_CONFIG_START(homelab_state::homelab) MCFG_SCREEN_UPDATE_DRIVER(homelab_state, screen_update_homelab2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", homelab) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_homelab) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ @@ -793,7 +793,7 @@ MACHINE_CONFIG_START(homelab_state::homelab3) MCFG_SCREEN_UPDATE_DRIVER(homelab_state, screen_update_homelab3) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", homelab) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_homelab) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ @@ -825,7 +825,7 @@ MACHINE_CONFIG_START(homelab_state::brailab4) MCFG_SCREEN_UPDATE_DRIVER(homelab_state, screen_update_homelab3) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", homelab) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_homelab) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/homerun.cpp b/src/mame/drivers/homerun.cpp index 5b6aeb55fba..6019747e3ee 100644 --- a/src/mame/drivers/homerun.cpp +++ b/src/mame/drivers/homerun.cpp @@ -317,7 +317,7 @@ static const gfx_layout spritelayout = 8*8*2*4 }; -static GFXDECODE_START( homerun ) +static GFXDECODE_START( gfx_homerun ) GFXDECODE_ENTRY( "gfx1", 0, gfxlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 16 ) GFXDECODE_END @@ -372,7 +372,7 @@ MACHINE_CONFIG_START(homerun_state::dynashot) MCFG_SCREEN_UPDATE_DRIVER(homerun_state, screen_update_homerun) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", homerun) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_homerun) MCFG_PALETTE_ADD("palette", 16*4) /* sound hardware */ diff --git a/src/mame/drivers/homez80.cpp b/src/mame/drivers/homez80.cpp index f10ff074822..8a59195809b 100644 --- a/src/mame/drivers/homez80.cpp +++ b/src/mame/drivers/homez80.cpp @@ -272,7 +272,7 @@ const gfx_layout homez80_charlayout = 8*8 /* size of one char */ }; -static GFXDECODE_START( homez80 ) +static GFXDECODE_START( gfx_homez80 ) GFXDECODE_ENTRY( "chargen", 0x0000, homez80_charlayout, 0, 1 ) GFXDECODE_END @@ -300,7 +300,7 @@ MACHINE_CONFIG_START(homez80_state::homez80) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", homez80 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_homez80) MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/hp9k.cpp b/src/mame/drivers/hp9k.cpp index da7ac51e44a..ffb9813033d 100644 --- a/src/mame/drivers/hp9k.cpp +++ b/src/mame/drivers/hp9k.cpp @@ -348,7 +348,7 @@ static const gfx_layout hp9k_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( hp9k ) +static GFXDECODE_START( gfx_hp9k ) GFXDECODE_ENTRY( "bootrom", 0x2000, hp9k_charlayout, 0, 1 ) GFXDECODE_END @@ -410,7 +410,7 @@ MACHINE_CONFIG_START(hp9k_state::hp9k) MCFG_SCREEN_UPDATE_DRIVER(hp9k_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hp9k) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hp9k) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD("mc6845", MC6845, "screen", XTAL(16'000'000) / 16) diff --git a/src/mame/drivers/hprot1.cpp b/src/mame/drivers/hprot1.cpp index d3277707cdb..b0d59a3841a 100644 --- a/src/mame/drivers/hprot1.cpp +++ b/src/mame/drivers/hprot1.cpp @@ -223,7 +223,7 @@ static const gfx_layout henry_prot_charlayout = 8*8 /* 8 bytes */ }; -static GFXDECODE_START( hprot1 ) +static GFXDECODE_START( gfx_hprot1 ) GFXDECODE_ENTRY( "hd44780:cgrom", 0x0000, henry_prot_charlayout, 0, 1 ) GFXDECODE_END @@ -261,7 +261,7 @@ MACHINE_CONFIG_START(hprot1_state::hprot1) MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(hprot1_state, hprot1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hprot1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hprot1) MCFG_HD44780_ADD("hd44780") MCFG_HD44780_LCD_SIZE(2, 16) diff --git a/src/mame/drivers/huebler.cpp b/src/mame/drivers/huebler.cpp index 586385e6bdd..7484da8c2fc 100644 --- a/src/mame/drivers/huebler.cpp +++ b/src/mame/drivers/huebler.cpp @@ -306,7 +306,7 @@ static const gfx_layout amu880_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( amu880 ) +static GFXDECODE_START( gfx_amu880 ) GFXDECODE_ENTRY( "chargen", 0x0000, amu880_charlayout, 0, 1 ) GFXDECODE_END @@ -325,7 +325,7 @@ MACHINE_CONFIG_START(amu880_state::amu880) MCFG_SCREEN_UPDATE_DRIVER(amu880_state, screen_update) MCFG_SCREEN_RAW_PARAMS(9000000, 576, 0*6, 64*6, 320, 0*10, 24*10) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", amu880) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_amu880) MCFG_PALETTE_ADD_MONOCHROME("palette") /* devices */ diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp index c79ddc93fd4..f016a94d9de 100644 --- a/src/mame/drivers/hvyunit.cpp +++ b/src/mame/drivers/hvyunit.cpp @@ -584,7 +584,7 @@ static const gfx_layout tile_layout = 4*8*32 }; -static GFXDECODE_START( hvyunit ) +static GFXDECODE_START( gfx_hvyunit ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0x100, 16 ) /* sprite bank */ GFXDECODE_ENTRY( "gfx2", 0, tile_layout, 0x000, 16 ) /* background tiles */ GFXDECODE_END @@ -658,7 +658,7 @@ MACHINE_CONFIG_START(hvyunit_state::hvyunit) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, hvyunit_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hvyunit) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hvyunit) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) diff --git a/src/mame/drivers/hyperspt.cpp b/src/mame/drivers/hyperspt.cpp index 9deb9f490b7..b8773269f13 100644 --- a/src/mame/drivers/hyperspt.cpp +++ b/src/mame/drivers/hyperspt.cpp @@ -254,7 +254,7 @@ static const gfx_layout hyperspt_spritelayout = 64*8 /* every sprite takes 64 consecutive bytes */ }; -static GFXDECODE_START( hyperspt ) +static GFXDECODE_START( gfx_hyperspt ) GFXDECODE_ENTRY( "gfx1", 0, hyperspt_spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, hyperspt_charlayout, 16*16, 16 ) GFXDECODE_END @@ -284,7 +284,7 @@ static const gfx_layout roadf_spritelayout = 64*8 /* every sprite takes 64 consecutive bytes */ }; -static GFXDECODE_START( roadf ) +static GFXDECODE_START( gfx_roadf ) GFXDECODE_ENTRY( "gfx1", 0, roadf_spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, roadf_charlayout, 16*16, 16 ) GFXDECODE_END @@ -327,7 +327,7 @@ MACHINE_CONFIG_START(hyperspt_state::hyperspt) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, hyperspt_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hyperspt) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hyperspt) MCFG_PALETTE_ADD("palette", 16*16+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(hyperspt_state, hyperspt) @@ -400,7 +400,7 @@ MACHINE_CONFIG_START(hyperspt_state::roadf) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(roadf_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", roadf) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_roadf) MCFG_VIDEO_START_OVERRIDE(hyperspt_state,roadf) MCFG_DEVICE_MODIFY("audiocpu") diff --git a/src/mame/drivers/hyprduel.cpp b/src/mame/drivers/hyprduel.cpp index cc225a37f0c..ca7d3f92d79 100644 --- a/src/mame/drivers/hyprduel.cpp +++ b/src/mame/drivers/hyprduel.cpp @@ -440,7 +440,7 @@ static const gfx_layout layout_16x16x4 = /* 16x16x8 tiles for later games */ static GFXLAYOUT_RAW( layout_16x16x8, 16, 16, 16*8, 32*8 ) -static GFXDECODE_START( i4220 ) +static GFXDECODE_START( gfx_i4220 ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x4, 0x0, 0x100 ) // [0] 4 Bit Tiles GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x8, 0x0, 0x10 ) // [1] 8 Bit Tiles GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x0, 0x100 ) // [2] 4 Bit Tiles 16x16 @@ -487,7 +487,7 @@ MACHINE_CONFIG_START(hyprduel_state::i4220_config) MCFG_SCREEN_UPDATE_DEVICE("vdp", imagetek_i4100_device, screen_update) MCFG_SCREEN_PALETTE(":vdp:palette") - MCFG_GFXDECODE_ADD("gfxdecode", ":vdp:palette", i4220) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, ":vdp:palette", gfx_i4220) MACHINE_CONFIG_END MACHINE_CONFIG_START(hyprduel_state::hyprduel) diff --git a/src/mame/drivers/i7000.cpp b/src/mame/drivers/i7000.cpp index 054b55220ce..4d6abac2106 100644 --- a/src/mame/drivers/i7000.cpp +++ b/src/mame/drivers/i7000.cpp @@ -59,11 +59,11 @@ class i7000_state : public driver_device { public: i7000_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_card(*this, "cardslot"), - m_gfxdecode(*this, "gfxdecode"), - m_videoram(*this, "videoram") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_card(*this, "cardslot") + , m_gfxdecode(*this, "gfxdecode") + , m_videoram(*this, "videoram") { } void video_start() override; @@ -306,7 +306,7 @@ static const gfx_layout i7000_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( i7000 ) +static GFXDECODE_START( gfx_i7000 ) GFXDECODE_ENTRY( "gfx1", 0x0000, i7000_charlayout, 0, 8 ) GFXDECODE_END @@ -353,7 +353,7 @@ MACHINE_CONFIG_START(i7000_state::i7000) MCFG_SCREEN_UPDATE_DRIVER(i7000_state, screen_update_i7000) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", i7000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_i7000) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(i7000_state, i7000) diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp index e39eb0992b5..109f8606bb1 100644 --- a/src/mame/drivers/ibmpcjr.cpp +++ b/src/mame/drivers/ibmpcjr.cpp @@ -539,7 +539,7 @@ static const gfx_layout kanji_layout = 16*16 /* every char takes 8 bytes */ }; -static GFXDECODE_START( pcjr ) +static GFXDECODE_START( gfx_pcjr ) GFXDECODE_ENTRY( "gfx1", 0x0000, pc_8_charlayout, 3, 1 ) GFXDECODE_END @@ -631,7 +631,7 @@ MACHINE_CONFIG_START(pcjr_state::ibmpcjr) MCFG_PCVIDEO_PCJR_ADD("pcvideo_pcjr") MCFG_VIDEO_SET_SCREEN("pcvideo_pcjr:screen") - MCFG_GFXDECODE_ADD("gfxdecode", "pcvideo_pcjr:palette", pcjr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "pcvideo_pcjr:palette", gfx_pcjr) /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -677,7 +677,7 @@ MACHINE_CONFIG_START(pcjr_state::ibmpcjr) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("pc_list","ibm5150") MACHINE_CONFIG_END -static GFXDECODE_START( ibmpcjx ) +static GFXDECODE_START( gfx_ibmpcjx ) GFXDECODE_ENTRY( "gfx1", 0x0000, pc_8_charlayout, 3, 1 ) GFXDECODE_ENTRY( "kanji", 0x0000, kanji_layout, 3, 1 ) GFXDECODE_END @@ -694,7 +694,7 @@ MACHINE_CONFIG_START(pcjr_state::ibmpcjx) MCFG_FLOPPY_DRIVE_ADD("fdc:1", pcjr_floppies, "35dd", isa8_fdc_device::floppy_formats) MCFG_SLOT_FIXED(true) - MCFG_GFXDECODE_MODIFY("gfxdecode", ibmpcjx) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_ibmpcjx) /* internal ram */ MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("512K") diff --git a/src/mame/drivers/icatel.cpp b/src/mame/drivers/icatel.cpp index 9dd348805b3..2bed07c3f37 100644 --- a/src/mame/drivers/icatel.cpp +++ b/src/mame/drivers/icatel.cpp @@ -232,7 +232,7 @@ static const gfx_layout prot_charlayout = 8*8 /* 8 bytes */ }; -static GFXDECODE_START( icatel ) +static GFXDECODE_START( gfx_icatel ) GFXDECODE_ENTRY( "hd44780:cgrom", 0x0000, prot_charlayout, 0, 1 ) GFXDECODE_END @@ -272,7 +272,7 @@ MACHINE_CONFIG_START(icatel_state::icatel) MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(icatel_state, icatel) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", icatel) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_icatel) MCFG_HD44780_ADD("hd44780") MCFG_HD44780_LCD_SIZE(2, 16) diff --git a/src/mame/drivers/ichiban.cpp b/src/mame/drivers/ichiban.cpp index ddcfc118ba6..19d0edfa871 100644 --- a/src/mame/drivers/ichiban.cpp +++ b/src/mame/drivers/ichiban.cpp @@ -102,7 +102,7 @@ static const gfx_layout charlayout = 8*8*8 }; -static GFXDECODE_START( ichibanjyan ) +static GFXDECODE_START( gfx_ichibanjyan ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -136,7 +136,7 @@ MACHINE_CONFIG_START(ichibanjyan_state::ichibanjyan) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ichibanjyan) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ichibanjyan) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 512) diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp index ba27f66e06d..e3e5d7a036e 100644 --- a/src/mame/drivers/igs009.cpp +++ b/src/mame/drivers/igs009.cpp @@ -757,7 +757,7 @@ static const gfx_layout layout_8x32x6 = 8*32*2 }; -static GFXDECODE_START( jingbell ) +static GFXDECODE_START( gfx_jingbell ) GFXDECODE_ENTRY( "reels", 0, layout_8x32x6, 0, 16 ) GFXDECODE_ENTRY( "tiles", 0, layout_8x8x6, 0, 16 ) GFXDECODE_END @@ -784,7 +784,7 @@ static const gfx_layout tiles8x32_layout = 32*16 }; -static GFXDECODE_START( gp98 ) +static GFXDECODE_START( gfx_gp98 ) GFXDECODE_ENTRY( "reels", 0, tiles8x32_layout, 0, 16 ) GFXDECODE_ENTRY( "tiles", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_END @@ -844,7 +844,7 @@ MACHINE_CONFIG_START(igs009_state::jingbell) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, igs009_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jingbell) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jingbell) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -864,7 +864,7 @@ MACHINE_CONFIG_START(igs009_state::gp98) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(gp98_portmap) - MCFG_GFXDECODE_MODIFY("gfxdecode", gp98) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_gp98) MCFG_VIDEO_START_OVERRIDE(igs009_state,gp98) MACHINE_CONFIG_END diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp index f209b3abf03..52eea7d8a3b 100644 --- a/src/mame/drivers/igs011.cpp +++ b/src/mame/drivers/igs011.cpp @@ -4156,13 +4156,13 @@ static const gfx_layout layout_16x16x1 = 16*16*1 }; -static GFXDECODE_START( igs011 ) +static GFXDECODE_START( gfx_igs011 ) GFXDECODE_ENTRY( "blitter", 0, layout_8x8x4, 0, 0x80 ) GFXDECODE_ENTRY( "blitter", 0, layout_16x16x4, 0, 0x80 ) GFXDECODE_ENTRY( "blitter", 0, layout_8x8x8, 0, 0x08 ) GFXDECODE_ENTRY( "blitter", 0, layout_16x16x8, 0, 0x08 ) GFXDECODE_END -static GFXDECODE_START( igs011_hi ) +static GFXDECODE_START( gfx_igs011_hi ) GFXDECODE_ENTRY( "blitter", 0, layout_8x8x4, 0, 0x80 ) GFXDECODE_ENTRY( "blitter", 0, layout_16x16x4, 0, 0x80 ) GFXDECODE_ENTRY( "blitter", 0, layout_8x8x8, 0, 0x08 ) @@ -4186,7 +4186,7 @@ MACHINE_CONFIG_START(igs011_state::igs011_base) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 0x800) -// MCFG_GFXDECODE_ADD("gfxdecode", "palette", igs011) +// MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_igs011) /* sound hardware */ @@ -4280,7 +4280,7 @@ MACHINE_CONFIG_START(igs011_state::lhb2) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_irq", igs011_state, lev5_timer_irq_cb, attotime::from_hz(240)) // lev5 frequency drives the music tempo -// MCFG_GFXDECODE_ADD("gfxdecode", "palette", igs011_hi) +// MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_igs011_hi) MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) @@ -4297,7 +4297,7 @@ MACHINE_CONFIG_START(igs011_state::nkishusp) // VSync 60.0052Hz, HSync 15.620kHz -// MCFG_GFXDECODE_ADD("gfxdecode", "palette", igs011_hi) +// MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_igs011_hi) MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) @@ -4321,7 +4321,7 @@ MACHINE_CONFIG_START(igs011_state::vbowl) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, igs011_state, screen_vblank_vbowl)) -// MCFG_GFXDECODE_ADD("gfxdecode", "palette", igs011_hi) +// MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_igs011_hi) MCFG_DEVICE_REMOVE("oki") MCFG_ICS2115_ADD("ics", 0) diff --git a/src/mame/drivers/igs_fear.cpp b/src/mame/drivers/igs_fear.cpp index 7d402d75012..4b44ea36d8c 100644 --- a/src/mame/drivers/igs_fear.cpp +++ b/src/mame/drivers/igs_fear.cpp @@ -64,7 +64,7 @@ static const gfx_layout fearlayout = }; -static GFXDECODE_START( igs_fear ) +static GFXDECODE_START( gfx_igs_fear ) GFXDECODE_ENTRY( "gfx1", 0, fearlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, fearlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx3", 0, fearlayout, 0, 16 ) @@ -94,7 +94,7 @@ MACHINE_CONFIG_START(igs_fear_state::igs_fear) MCFG_PALETTE_ADD("palette", 0x200) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", igs_fear) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_igs_fear) /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp index 99de203006d..ee4b8732a24 100644 --- a/src/mame/drivers/igspoker.cpp +++ b/src/mame/drivers/igspoker.cpp @@ -1879,7 +1879,7 @@ static const gfx_layout charlayout2 = }; -static GFXDECODE_START( igspoker ) +static GFXDECODE_START( gfx_igspoker ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0x04000, charlayout2, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0x08000, charlayout2, 0, 16 ) @@ -1898,7 +1898,7 @@ static const gfx_layout charlayoutcpk = 64*8 }; -static GFXDECODE_START( cpokerpk ) +static GFXDECODE_START( gfx_cpokerpk ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayoutcpk, 0, 16 ) /* these not used? */ GFXDECODE_ENTRY( "gfx2", 0x04000, charlayout2, 0, 1 ) @@ -1929,7 +1929,7 @@ MACHINE_CONFIG_START(igspoker_state::igspoker) MCFG_SCREEN_UPDATE_DRIVER(igspoker_state, screen_update_igs_video) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", igspoker) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_igspoker) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1974,7 +1974,7 @@ MACHINE_CONFIG_START(igspoker_state::cpokerpk) number10(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(cpokerpk_io_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", cpokerpk) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_cpokerpk) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ikki.cpp b/src/mame/drivers/ikki.cpp index 9b65e068462..74d1f186ddb 100644 --- a/src/mame/drivers/ikki.cpp +++ b/src/mame/drivers/ikki.cpp @@ -201,7 +201,7 @@ static const gfx_layout spritelayout = 8*8*8 }; -static GFXDECODE_START( ikki ) +static GFXDECODE_START( gfx_ikki ) GFXDECODE_ENTRY( "gfx2", 0x0000, charlayout, 512, 64 ) GFXDECODE_ENTRY( "gfx1", 0x0000, spritelayout, 0, 64 ) GFXDECODE_END @@ -264,7 +264,7 @@ MACHINE_CONFIG_START(ikki_state::ikki) MCFG_SCREEN_UPDATE_DRIVER(ikki_state, screen_update_ikki) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ikki) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ikki) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_INDIRECT_ENTRIES(256+1) MCFG_PALETTE_INIT_OWNER(ikki_state, ikki) diff --git a/src/mame/drivers/imds2.cpp b/src/mame/drivers/imds2.cpp index 37712096cf2..91d1cd56c35 100644 --- a/src/mame/drivers/imds2.cpp +++ b/src/mame/drivers/imds2.cpp @@ -749,7 +749,7 @@ INPUT_PORTS_END static GFXLAYOUT_RAW(imds2_charlayout , 8 , 8 , 8 , 64) -static GFXDECODE_START(imds2) +static GFXDECODE_START(gfx_imds2) GFXDECODE_ENTRY("gfx1" , 0x0000 , imds2_charlayout , 0 , 1) GFXDECODE_END @@ -841,7 +841,7 @@ MACHINE_CONFIG_START(imds2_state::imds2) MCFG_SCREEN_ADD("screen" , RASTER) MCFG_SCREEN_UPDATE_DEVICE("ioccrtc" , i8275_device , screen_update) MCFG_SCREEN_REFRESH_RATE(50) - MCFG_GFXDECODE_ADD("gfxdecode" , "palette" , imds2) + MCFG_DEVICE_ADD("gfxdecode" , GFXDECODE, "palette" , gfx_imds2) MCFG_PALETTE_ADD_MONOCHROME("palette") SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/intrscti.cpp b/src/mame/drivers/intrscti.cpp index 5f282b79a3f..84e45f78eb3 100644 --- a/src/mame/drivers/intrscti.cpp +++ b/src/mame/drivers/intrscti.cpp @@ -180,7 +180,7 @@ static const gfx_layout tiles8x8_layout = 8*8 }; -static GFXDECODE_START( intrscti ) +static GFXDECODE_START( gfx_intrscti ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_END @@ -206,7 +206,7 @@ MACHINE_CONFIG_START(intrscti_state::intrscti) MCFG_SCREEN_UPDATE_DRIVER(intrscti_state, screen_update_intrscti) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", intrscti) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_intrscti) MCFG_PALETTE_ADD("palette", 0x100) MACHINE_CONFIG_END diff --git a/src/mame/drivers/intv.cpp b/src/mame/drivers/intv.cpp index 09181a29fa1..ff8943aebbd 100644 --- a/src/mame/drivers/intv.cpp +++ b/src/mame/drivers/intv.cpp @@ -136,7 +136,7 @@ static const gfx_layout intvkbd_charlayout = 8 * 8 }; -static GFXDECODE_START( intvkbd ) +static GFXDECODE_START( gfx_intvkbd ) GFXDECODE_ENTRY( "gfx1", 0x0000, intvkbd_charlayout, 0, 256 ) GFXDECODE_END @@ -551,7 +551,7 @@ MACHINE_CONFIG_START(intv_state::intvkbd) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", intvkbd) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_intvkbd) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(intv_state, intv) diff --git a/src/mame/drivers/inufuku.cpp b/src/mame/drivers/inufuku.cpp index 90f69de8091..dff3f5f3a39 100644 --- a/src/mame/drivers/inufuku.cpp +++ b/src/mame/drivers/inufuku.cpp @@ -287,13 +287,13 @@ static const gfx_layout spritelayout_alt = 128*8 }; -static GFXDECODE_START( inufuku ) +static GFXDECODE_START( gfx_inufuku ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 256*16 ) // bg GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 256*16 ) // text GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0, 256*16 ) // sprite GFXDECODE_END -static GFXDECODE_START( _3on3dunk ) +static GFXDECODE_START( gfx_3on3dunk ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 256*16 ) // bg GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 256*16 ) // text GFXDECODE_ENTRY( "gfx3", 0, spritelayout_alt, 0, 256*16 ) // sprite @@ -365,7 +365,7 @@ MACHINE_CONFIG_START(inufuku_state::inufuku) MCFG_VSYSTEM_SPR_SET_GFXREGION(2) MCFG_VSYSTEM_SPR_GFXDECODE("gfxdecode") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", inufuku) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_inufuku) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xGGGGGBBBBBRRRRR) @@ -386,7 +386,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(inufuku_state::_3on3dunk) inufuku(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", _3on3dunk) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_3on3dunk) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp index 6bdc29b2abf..60a68aa850b 100644 --- a/src/mame/drivers/ipds.cpp +++ b/src/mame/drivers/ipds.cpp @@ -121,7 +121,7 @@ static const gfx_layout ipds_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( ipds ) +static GFXDECODE_START( gfx_ipds ) GFXDECODE_ENTRY( "chargen", 0x0000, ipds_charlayout, 0, 1 ) GFXDECODE_END @@ -144,7 +144,7 @@ MACHINE_CONFIG_START(ipds_state::ipds) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ipds) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ipds) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD("i8275", I8275, XTAL(19'660'800) / 4) diff --git a/src/mame/drivers/iqblock.cpp b/src/mame/drivers/iqblock.cpp index ca4142d3551..2e6738aa644 100644 --- a/src/mame/drivers/iqblock.cpp +++ b/src/mame/drivers/iqblock.cpp @@ -332,7 +332,7 @@ static const gfx_layout tilelayout3 = }; #endif -static GFXDECODE_START( iqblock ) +static GFXDECODE_START( gfx_iqblock ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout1, 0, 16 ) /* only odd color codes are used */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout2, 0, 4 ) /* only color codes 0 and 3 used */ GFXDECODE_END @@ -362,7 +362,7 @@ MACHINE_CONFIG_START(iqblock_state::iqblock) MCFG_SCREEN_UPDATE_DRIVER(iqblock_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", iqblock) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_iqblock) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/irisha.cpp b/src/mame/drivers/irisha.cpp index 88893b097ba..a6506ac631f 100644 --- a/src/mame/drivers/irisha.cpp +++ b/src/mame/drivers/irisha.cpp @@ -239,7 +239,7 @@ static const gfx_layout irisha_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( irisha ) +static GFXDECODE_START( gfx_irisha ) GFXDECODE_ENTRY( "maincpu", 0x3800, irisha_charlayout, 0, 1 ) GFXDECODE_END @@ -377,7 +377,7 @@ MACHINE_CONFIG_START(irisha_state::irisha) MCFG_SCREEN_UPDATE_DRIVER(irisha_state, screen_update_irisha) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", irisha) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_irisha) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/irobot.cpp b/src/mame/drivers/irobot.cpp index 8a35992888d..ff6c82e9d72 100644 --- a/src/mame/drivers/irobot.cpp +++ b/src/mame/drivers/irobot.cpp @@ -284,7 +284,7 @@ static const gfx_layout charlayout = }; -static GFXDECODE_START( irobot ) +static GFXDECODE_START( gfx_irobot ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 64, 16 ) GFXDECODE_END @@ -316,7 +316,7 @@ MACHINE_CONFIG_START(irobot_state::irobot) MCFG_SCREEN_UPDATE_DRIVER(irobot_state, screen_update_irobot) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", irobot) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_irobot) MCFG_PALETTE_ADD("palette", 64 + 32) /* 64 for polygons, 32 for text */ MCFG_PALETTE_INIT_OWNER(irobot_state, irobot) diff --git a/src/mame/drivers/ironhors.cpp b/src/mame/drivers/ironhors.cpp index 30f1a4cb8cb..624a97dde3e 100644 --- a/src/mame/drivers/ironhors.cpp +++ b/src/mame/drivers/ironhors.cpp @@ -244,7 +244,7 @@ static const gfx_layout ironhors_spritelayout = 32*32 }; -static GFXDECODE_START( ironhors ) +static GFXDECODE_START( gfx_ironhors ) GFXDECODE_ENTRY( "gfx1", 0, ironhors_charlayout, 0, 16*8 ) GFXDECODE_ENTRY( "gfx1", 0, ironhors_spritelayout, 16*8*16, 16*8 ) GFXDECODE_ENTRY( "gfx1", 0, ironhors_charlayout, 16*8*16, 16*8 ) /* to handle 8x8 sprites */ @@ -286,7 +286,7 @@ static const gfx_layout farwest_spritelayout2 = 8*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( farwest ) +static GFXDECODE_START( gfx_farwest ) GFXDECODE_ENTRY( "gfx1", 0, farwest_charlayout, 0, 16*8 ) GFXDECODE_ENTRY( "gfx2", 0, farwest_spritelayout, 16*8*16, 16*8 ) GFXDECODE_ENTRY( "gfx2", 0, farwest_spritelayout2,16*8*16, 16*8 ) /* to handle 8x8 sprites */ @@ -400,7 +400,7 @@ MACHINE_CONFIG_START(ironhors_state::ironhors) MCFG_SCREEN_UPDATE_DRIVER(ironhors_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ironhors) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ironhors) MCFG_PALETTE_ADD("palette", 16*8*16+16*8*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(ironhors_state, ironhors) @@ -456,7 +456,7 @@ MACHINE_CONFIG_START(ironhors_state::farwest) MCFG_DEVICE_PROGRAM_MAP(farwest_slave_map) MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_IO) - MCFG_GFXDECODE_MODIFY("gfxdecode", farwest) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_farwest) MCFG_VIDEO_START_OVERRIDE(ironhors_state,farwest) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(ironhors_state, screen_update_farwest) diff --git a/src/mame/drivers/isbc8010.cpp b/src/mame/drivers/isbc8010.cpp index 84bfb6993b5..ea588ca59b7 100644 --- a/src/mame/drivers/isbc8010.cpp +++ b/src/mame/drivers/isbc8010.cpp @@ -137,7 +137,7 @@ const gfx_layout sdk80_charlayout = 8 * 8 /* 8 8-bit pixel rows per character */ }; -static GFXDECODE_START( isbc8010 ) +static GFXDECODE_START( gfx_isbc8010 ) GFXDECODE_ENTRY( "gfx1", 0x0000, sdk80_charlayout, 0, 1 ) GFXDECODE_END #endif @@ -211,7 +211,7 @@ MACHINE_CONFIG_START(isbc8010_state::isbc8010) // MCFG_SCREEN_UPDATE_DRIVER(sdk80_state, screen_update) // MCFG_SCREEN_PALETTE("palette") -// MCFG_GFXDECODE_ADD("gfxdecode", "palette", sdk80) +// MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sdk80) // MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/istellar.cpp b/src/mame/drivers/istellar.cpp index f1f11e142b1..7f6fe9b2f9e 100644 --- a/src/mame/drivers/istellar.cpp +++ b/src/mame/drivers/istellar.cpp @@ -254,7 +254,7 @@ static const gfx_layout istellar_gfx_layout = 8*8 }; -static GFXDECODE_START( istellar ) +static GFXDECODE_START( gfx_istellar ) GFXDECODE_ENTRY( "gfx1", 0, istellar_gfx_layout, 0x0, 0x20 ) GFXDECODE_END @@ -305,7 +305,7 @@ MACHINE_CONFIG_START(istellar_state::istellar) // Daphne says "TODO: get the real interstellar resistor values" MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", istellar) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_istellar) /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/istrebiteli.cpp b/src/mame/drivers/istrebiteli.cpp index 0b3e571b779..8ddfbbd222d 100644 --- a/src/mame/drivers/istrebiteli.cpp +++ b/src/mame/drivers/istrebiteli.cpp @@ -411,7 +411,7 @@ static const gfx_layout projectile_layout = 1 }; -static GFXDECODE_START( istrebiteli ) +static GFXDECODE_START( gfx_istrebiteli ) GFXDECODE_ENTRY( "chars", 0x0000, char_layout, 0, 2 ) GFXDECODE_ENTRY( "sprite", 0x0000, sprite_layout, 2, 2 ) GFXDECODE_ENTRY( "sprite", 0x0000, sprite_layout, 0, 2 ) @@ -440,7 +440,7 @@ MACHINE_CONFIG_START(istrebiteli_state::istreb) MCFG_SCREEN_UPDATE_DRIVER(istrebiteli_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", istrebiteli) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_istrebiteli) MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(istrebiteli_state, istrebiteli) diff --git a/src/mame/drivers/itgambl2.cpp b/src/mame/drivers/itgambl2.cpp index 18c0b85b79d..0b451afc8f9 100644 --- a/src/mame/drivers/itgambl2.cpp +++ b/src/mame/drivers/itgambl2.cpp @@ -240,7 +240,7 @@ static const gfx_layout gfxlayout_8x8x8 = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( itgambl2 ) +static GFXDECODE_START( gfx_itgambl2 ) GFXDECODE_ENTRY( "gfx1", 0, gfxlayout_8x8x8, 0, 16 ) GFXDECODE_END @@ -288,7 +288,7 @@ MACHINE_CONFIG_START(itgambl2_state::itgambl2) MCFG_SCREEN_UPDATE_DRIVER(itgambl2_state, screen_update_itgambl2) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", itgambl2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_itgambl2) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(itgambl2_state, itgambl2) diff --git a/src/mame/drivers/itgambl3.cpp b/src/mame/drivers/itgambl3.cpp index bec747b6a65..7b5d32cea7e 100644 --- a/src/mame/drivers/itgambl3.cpp +++ b/src/mame/drivers/itgambl3.cpp @@ -227,7 +227,7 @@ static const gfx_layout gfxlayout_8x8x8 = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( itgambl3 ) +static GFXDECODE_START( gfx_itgambl3 ) GFXDECODE_ENTRY( "gfx1", 0, gfxlayout_8x8x8, 0, 16 ) GFXDECODE_END @@ -276,7 +276,7 @@ MACHINE_CONFIG_START(itgambl3_state::itgambl3) MCFG_SCREEN_UPDATE_DRIVER(itgambl3_state, screen_update_itgambl3) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", itgambl3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_itgambl3) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(itgambl3_state, itgambl3) diff --git a/src/mame/drivers/itgamble.cpp b/src/mame/drivers/itgamble.cpp index f1090a56e33..2c767b629b7 100644 --- a/src/mame/drivers/itgamble.cpp +++ b/src/mame/drivers/itgamble.cpp @@ -192,7 +192,7 @@ static const gfx_layout gfxlayout_8x8x8 = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( itgamble ) +static GFXDECODE_START( gfx_itgamble ) GFXDECODE_ENTRY( "gfx1", 0, gfxlayout_8x8x8, 0, 16 ) GFXDECODE_END @@ -227,7 +227,7 @@ MACHINE_CONFIG_START(itgamble_state::itgamble) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", itgamble) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_itgamble) MCFG_PALETTE_ADD("palette", 0x200) /* sound hardware */ diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp index 0b6bd941aca..c060ed9c071 100644 --- a/src/mame/drivers/itt3030.cpp +++ b/src/mame/drivers/itt3030.cpp @@ -525,7 +525,7 @@ static const gfx_layout charlayout = 8*16 /* size of one char */ }; -static GFXDECODE_START( itt3030 ) +static GFXDECODE_START( gfx_itt3030 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -739,7 +739,7 @@ MACHINE_CONFIG_START(itt3030_state::itt3030) MCFG_FLOPPY_DRIVE_ADD("fdc:1", itt3030_floppies, "525qd", itt3030_state::itt3030_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:2", itt3030_floppies, "525qd", itt3030_state::itt3030_floppy_formats) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", itt3030) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_itt3030) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(itt3030_state, itt3030) diff --git a/src/mame/drivers/jack.cpp b/src/mame/drivers/jack.cpp index 22c5eeaed41..4b2fcd553fb 100644 --- a/src/mame/drivers/jack.cpp +++ b/src/mame/drivers/jack.cpp @@ -845,7 +845,7 @@ static const gfx_layout charlayout = 8*8 }; -static GFXDECODE_START( jack ) +static GFXDECODE_START( gfx_jack ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) GFXDECODE_END @@ -861,7 +861,7 @@ static const gfx_layout joinem_charlayout = 8*8 }; -static GFXDECODE_START( joinem ) +static GFXDECODE_START( gfx_joinem ) GFXDECODE_ENTRY( "gfx1", 0, joinem_charlayout, 0, 32 ) GFXDECODE_END @@ -931,7 +931,7 @@ MACHINE_CONFIG_START(jack_state::jack) MCFG_SCREEN_UPDATE_DRIVER(jack_state, screen_update_jack) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jack) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jack) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_FORMAT(BBGGGRRR_inverted) @@ -995,7 +995,7 @@ MACHINE_CONFIG_START(jack_state::joinem) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(jack_state, screen_update_joinem) - MCFG_GFXDECODE_MODIFY("gfxdecode", joinem) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_joinem) MCFG_DEVICE_REMOVE("palette") MCFG_PALETTE_ADD("palette", 64) diff --git a/src/mame/drivers/jackal.cpp b/src/mame/drivers/jackal.cpp index 0033717438f..0f6a9b6ca85 100644 --- a/src/mame/drivers/jackal.cpp +++ b/src/mame/drivers/jackal.cpp @@ -302,7 +302,7 @@ static const gfx_layout spritelayout8 = 32*8 }; -static GFXDECODE_START( jackal ) +static GFXDECODE_START( gfx_jackal ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 0, 1 ) // colors 256-511 without lookup GFXDECODE_ENTRY( "gfx1", 0x20000, spritelayout, 0x100, 16 ) // colors 0- 15 with lookup GFXDECODE_ENTRY( "gfx1", 0x20000, spritelayout8, 0x100, 16 ) // to handle 8x8 sprites @@ -380,7 +380,7 @@ MACHINE_CONFIG_START(jackal_state::jackal) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, jackal_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jackal) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jackal) MCFG_PALETTE_ADD("palette", 0x300) MCFG_PALETTE_INDIRECT_ENTRIES(0x200) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp index 14381edce46..f3bdf81bc59 100644 --- a/src/mame/drivers/jackie.cpp +++ b/src/mame/drivers/jackie.cpp @@ -564,7 +564,7 @@ static const gfx_layout layout_8x32x6 = 8*32*2 }; -static GFXDECODE_START( jackie ) +static GFXDECODE_START( gfx_jackie ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x6, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, layout_8x32x6, 0, 16 ) GFXDECODE_END @@ -626,7 +626,7 @@ MACHINE_CONFIG_START(jackie_state::jackie) MCFG_SCREEN_UPDATE_DRIVER(jackie_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jackie) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jackie) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/jackpool.cpp b/src/mame/drivers/jackpool.cpp index 054466bfc79..f72733550d5 100644 --- a/src/mame/drivers/jackpool.cpp +++ b/src/mame/drivers/jackpool.cpp @@ -214,7 +214,7 @@ static const gfx_layout tiles8x8_layout = 8*8 }; -static GFXDECODE_START( jackpool ) +static GFXDECODE_START( gfx_jackpool ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0x000, 0x20 ) /* sprites */ GFXDECODE_END @@ -231,7 +231,7 @@ MACHINE_CONFIG_START(jackpool_state::jackpool) MCFG_DEVICE_PROGRAM_MAP(jackpool_mem) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jackpool_state, jackpool_interrupt) // ? - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jackpool) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jackpool) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/jailbrek.cpp b/src/mame/drivers/jailbrek.cpp index d51494305ca..24e7a29585d 100644 --- a/src/mame/drivers/jailbrek.cpp +++ b/src/mame/drivers/jailbrek.cpp @@ -243,7 +243,7 @@ static const gfx_layout spritelayout = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( jailbrek ) +static GFXDECODE_START( gfx_jailbrek ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) /* characters */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 16*16, 16 ) /* sprites */ GFXDECODE_END @@ -271,7 +271,7 @@ MACHINE_CONFIG_START(jailbrek_state::jailbrek) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jailbrek) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jailbrek) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(jailbrek_state, jailbrek) diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp index 19e67ba2fd0..5c578686ae7 100644 --- a/src/mame/drivers/jalmah.cpp +++ b/src/mame/drivers/jalmah.cpp @@ -1388,7 +1388,7 @@ static const gfx_layout tilelayout = 32*32 }; -static GFXDECODE_START( jalmah ) +static GFXDECODE_START( gfx_jalmah ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x300, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0x200, 16 ) GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0x100, 16 ) @@ -1396,7 +1396,7 @@ static GFXDECODE_START( jalmah ) GFXDECODE_END /*different color offsets*/ -static GFXDECODE_START( urashima ) +static GFXDECODE_START( gfx_urashima ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x000, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0x100, 16 ) GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0x100, 16 ) @@ -1431,7 +1431,7 @@ MACHINE_CONFIG_START(jalmah_state::jalmah) //M50747 MCU - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jalmah) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jalmah) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1457,7 +1457,7 @@ MACHINE_CONFIG_START(jalmah_state::urashima) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(urashima) - MCFG_GFXDECODE_MODIFY("gfxdecode", urashima) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_urashima) MCFG_VIDEO_START_OVERRIDE(jalmah_state,urashima) MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/jchan.cpp b/src/mame/drivers/jchan.cpp index 42be491a958..0917ebdf2bd 100644 --- a/src/mame/drivers/jchan.cpp +++ b/src/mame/drivers/jchan.cpp @@ -509,7 +509,7 @@ static const gfx_layout tilelayout = // we don't decode the sprites, they are non-tile based and RLE encoded!, see suprnova.cpp */ -static GFXDECODE_START( jchan ) +static GFXDECODE_START( gfx_jchan ) GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0, 0x4000/16 ) GFXDECODE_END @@ -611,7 +611,7 @@ MACHINE_CONFIG_START(jchan_state::jchan) MCFG_WATCHDOG_ADD("watchdog") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jchan) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jchan) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp index 261abb0b00d..b849f97ba1b 100644 --- a/src/mame/drivers/jclub2.cpp +++ b/src/mame/drivers/jclub2.cpp @@ -1105,7 +1105,7 @@ static const gfx_layout layout_16x16x8 = 16*16*2 }; -static GFXDECODE_START( darkhors ) +static GFXDECODE_START( gfx_darkhors ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0, 0x10000/64 ) // color codes should be doubled GFXDECODE_END @@ -1228,7 +1228,7 @@ MACHINE_CONFIG_START(darkhors_state::darkhors) MCFG_PALETTE_ADD("palette", 0x10000) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", darkhors) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_darkhors) MCFG_VIDEO_START_OVERRIDE(darkhors_state, darkhors) // layout diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp index d4c753aa336..af7afd78370 100644 --- a/src/mame/drivers/jokrwild.cpp +++ b/src/mame/drivers/jokrwild.cpp @@ -381,7 +381,7 @@ static const gfx_layout charlayout = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( jokrwild ) +static GFXDECODE_START( gfx_jokrwild ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -432,7 +432,7 @@ MACHINE_CONFIG_START(jokrwild_state::jokrwild) MCFG_SCREEN_UPDATE_DRIVER(jokrwild_state, screen_update_jokrwild) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jokrwild) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jokrwild) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(jokrwild_state, jokrwild) diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp index d25afec878a..8546a8ed25a 100644 --- a/src/mame/drivers/jollyjgr.cpp +++ b/src/mame/drivers/jollyjgr.cpp @@ -640,7 +640,7 @@ static const gfx_layout jollyjgr_spritelayout = 32*8 }; -static GFXDECODE_START( jollyjgr ) +static GFXDECODE_START( gfx_jollyjgr ) GFXDECODE_ENTRY( "gfx1", 0, jollyjgr_charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0, jollyjgr_spritelayout, 0, 8 ) GFXDECODE_ENTRY( "gfx3", 0, jollyjgr_charlayout, 0, 8 ) @@ -693,7 +693,7 @@ MACHINE_CONFIG_START(jollyjgr_state::jollyjgr) MCFG_SCREEN_UPDATE_DRIVER(jollyjgr_state, screen_update_jollyjgr) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, jollyjgr_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jollyjgr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jollyjgr) MCFG_PALETTE_ADD("palette", 32) // tilemap and sprites MCFG_PALETTE_INIT_OWNER(jollyjgr_state, jollyjgr) MCFG_PALETTE_ADD_3BIT_RGB("bm_palette") // bitmap diff --git a/src/mame/drivers/jonos.cpp b/src/mame/drivers/jonos.cpp index 8aede40ba94..9cf14b1cd17 100644 --- a/src/mame/drivers/jonos.cpp +++ b/src/mame/drivers/jonos.cpp @@ -167,7 +167,7 @@ static const gfx_layout jonos_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( jonos ) +static GFXDECODE_START( gfx_jonos ) GFXDECODE_ENTRY( "chargen", 0x0000, jonos_charlayout, 0, 1 ) GFXDECODE_END @@ -186,7 +186,7 @@ MACHINE_CONFIG_START(jonos_state::jonos) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 287) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jonos) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jonos) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp index b38dda74b6c..1acba3dc91e 100644 --- a/src/mame/drivers/joystand.cpp +++ b/src/mame/drivers/joystand.cpp @@ -551,7 +551,7 @@ static const gfx_layout layout_16x16x8 = 16*16*8 }; -static GFXDECODE_START( joystand ) +static GFXDECODE_START( gfx_joystand ) GFXDECODE_ENTRY( "tiles", 0, layout_8x8x4, 0, 0x100 ) GFXDECODE_ENTRY( "cart.u5", 0, layout_16x16x8, 0, 0x10 ) GFXDECODE_ENTRY( "cart.u6", 0, layout_16x16x8, 0, 0x10 ) @@ -604,7 +604,7 @@ MACHINE_CONFIG_START(joystand_state::joystand) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", joystand) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_joystand) MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("bg15_palette") diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp index f8a4f1fdaea..f4e62befc94 100644 --- a/src/mame/drivers/jr100.cpp +++ b/src/mame/drivers/jr100.cpp @@ -262,7 +262,7 @@ static const gfx_layout tiles8x8_layout = 8*8 }; -static GFXDECODE_START( jr100 ) +static GFXDECODE_START( gfx_jr100 ) GFXDECODE_ENTRY( "maincpu", 0xe000, tiles8x8_layout, 0, 1 ) GFXDECODE_END @@ -383,7 +383,7 @@ MACHINE_CONFIG_START(jr100_state::jr100) MCFG_SCREEN_UPDATE_DRIVER(jr100_state, screen_update_jr100) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jr100) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jr100) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD("via", VIA6522, XTAL(14'318'181) / 16) diff --git a/src/mame/drivers/jr200.cpp b/src/mame/drivers/jr200.cpp index fa9e264d285..a70e203302b 100644 --- a/src/mame/drivers/jr200.cpp +++ b/src/mame/drivers/jr200.cpp @@ -510,7 +510,7 @@ static const gfx_layout tiles8x8_layout = 8*8 }; -static GFXDECODE_START( jr200 ) +static GFXDECODE_START( gfx_jr200 ) GFXDECODE_ENTRY( "gfx_ram", 0, tiles8x8_layout, 0, 1 ) GFXDECODE_ENTRY( "pcg", 0, tiles8x8_layout, 0, 1 ) GFXDECODE_END @@ -551,7 +551,7 @@ MACHINE_CONFIG_START(jr200_state::jr200) MCFG_SCREEN_UPDATE_DRIVER(jr200_state, screen_update_jr200) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jr200) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jr200) MCFG_PALETTE_ADD_3BIT_BRG("palette") SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/jrpacman.cpp b/src/mame/drivers/jrpacman.cpp index d83b1f0ff30..948b257c874 100644 --- a/src/mame/drivers/jrpacman.cpp +++ b/src/mame/drivers/jrpacman.cpp @@ -256,7 +256,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( jrpacman ) +static GFXDECODE_START( gfx_jrpacman ) GFXDECODE_ENTRY( "gfx1", 0x0000, tilelayout, 0, 128 ) GFXDECODE_ENTRY( "gfx1", 0x2000, spritelayout, 0, 128 ) GFXDECODE_END @@ -307,7 +307,7 @@ MACHINE_CONFIG_START(jrpacman_state::jrpacman) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, jrpacman_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jrpacman) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jrpacman) MCFG_PALETTE_ADD("palette", 128*4) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(jrpacman_state,pacman) diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp index 6063e9d3b27..ec22b523b76 100644 --- a/src/mame/drivers/jtc.cpp +++ b/src/mame/drivers/jtc.cpp @@ -717,11 +717,11 @@ static const gfx_layout jtces40_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( jtces23 ) +static GFXDECODE_START( gfx_jtces23 ) GFXDECODE_ENTRY( UB8830D_TAG, 0x1000, jtces23_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START( jtces40 ) +static GFXDECODE_START( gfx_jtces40 ) GFXDECODE_ENTRY( UB8830D_TAG, 0x1000, jtces40_charlayout, 0, 8 ) GFXDECODE_END @@ -792,7 +792,7 @@ MACHINE_CONFIG_START(jtces23_state::jtces23) MCFG_SCREEN_VISIBLE_AREA(0, 128-1, 0, 128-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jtces23) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jtces23) MCFG_PALETTE_ADD_MONOCHROME("palette") /* internal ram */ @@ -815,7 +815,7 @@ MACHINE_CONFIG_START(jtces40_state::jtces40) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 192-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jtces40) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jtces40) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(jtc_state,jtc_es40) diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp index 343ed223514..522674440b0 100644 --- a/src/mame/drivers/jubilee.cpp +++ b/src/mame/drivers/jubilee.cpp @@ -649,7 +649,7 @@ static const gfx_layout tilelayout = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( jubileep ) /* 4 different graphics banks */ +static GFXDECODE_START( gfx_jubileep ) /* 4 different graphics banks */ GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 1 ) GFXDECODE_ENTRY( "gfx1", 0x0800, tilelayout, 0, 1 ) GFXDECODE_ENTRY( "gfx1", 0x1000, tilelayout, 0, 1 ) @@ -678,7 +678,7 @@ MACHINE_CONFIG_START(jubilee_state::jubileep) MCFG_SCREEN_UPDATE_DRIVER(jubilee_state, screen_update_jubileep) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jubileep) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jubileep) MCFG_PALETTE_ADD("palette",8) MCFG_MC6845_ADD("crtc", MC6845, "screen", CRTC_CLOCK) diff --git a/src/mame/drivers/jungleyo.cpp b/src/mame/drivers/jungleyo.cpp index bf9cf0b488f..db435382dd7 100644 --- a/src/mame/drivers/jungleyo.cpp +++ b/src/mame/drivers/jungleyo.cpp @@ -111,7 +111,7 @@ static const gfx_layout jungleyo16_layout = }; -static GFXDECODE_START( jungleyo ) +static GFXDECODE_START( gfx_jungleyo ) GFXDECODE_ENTRY( "reelgfx", 0, jungleyo16_layout, 0x0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, jungleyo_layout, 0x0, 2 ) GFXDECODE_ENTRY( "gfx3", 0, jungleyo_layout, 0x0, 2 ) @@ -124,7 +124,7 @@ MACHINE_CONFIG_START(jungleyo_state::jungleyo) MCFG_DEVICE_PROGRAM_MAP(jungleyo_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jungleyo_state, irq1_line_hold) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jungleyo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jungleyo) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp index d10be48ccc1..a74e0bddb93 100644 --- a/src/mame/drivers/jupace.cpp +++ b/src/mame/drivers/jupace.cpp @@ -555,7 +555,7 @@ static const gfx_layout ace_charlayout = // GFXDECODE( ace ) //------------------------------------------------- -static GFXDECODE_START( ace ) +static GFXDECODE_START( gfx_ace ) GFXDECODE_ENTRY( Z80_TAG, 0xfc00, ace_charlayout, 0, 1 ) GFXDECODE_END @@ -769,7 +769,7 @@ MACHINE_CONFIG_START(ace_state::ace) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ace) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ace) // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp index 4308f096ea1..cda66326665 100644 --- a/src/mame/drivers/kaneko16.cpp +++ b/src/mame/drivers/kaneko16.cpp @@ -1719,16 +1719,16 @@ static const gfx_layout layout_16x16x8 = 16*16*8 }; -static GFXDECODE_START( 1x4bit_1x4bit ) +static GFXDECODE_START( gfx_1x4bit_1x4bit ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0, 0x40 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x4, 0x40 * 16, 0x40 ) // [1] Layers GFXDECODE_END -static GFXDECODE_START( 1x4bit_2x4bit ) +static GFXDECODE_START( gfx_1x4bit_2x4bit ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0, 0x40 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x4, 0x40 * 16, 0x40 ) // [1] Layers GFXDECODE_ENTRY( "gfx3", 0, layout_16x16x4, 0x40 * 16, 0x40 ) // [2] Layers GFXDECODE_END -static GFXDECODE_START( 1x8bit_2x4bit ) +static GFXDECODE_START( gfx_1x8bit_2x4bit ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0x40 * 256, 0x40 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x4, 0, 0x40 ) // [1] Layers GFXDECODE_ENTRY( "gfx3", 0, layout_16x16x4, 0, 0x40 ) // [2] Layers @@ -1793,7 +1793,7 @@ MACHINE_CONFIG_START(kaneko16_berlwall_state::berlwall) MCFG_SCREEN_UPDATE_DRIVER(kaneko16_berlwall_state, screen_update_berlwall) // MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1x4bit_1x4bit) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1x4bit_1x4bit) MCFG_PALETTE_ADD("palette", 2048 ) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) @@ -1862,7 +1862,7 @@ MACHINE_CONFIG_START(kaneko16_state::bakubrkr) MCFG_SCREEN_UPDATE_DRIVER(kaneko16_state, screen_update_kaneko16) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1x4bit_2x4bit) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1x4bit_2x4bit) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) @@ -1937,7 +1937,7 @@ MACHINE_CONFIG_START(kaneko16_state::blazeon) MCFG_SCREEN_UPDATE_DRIVER(kaneko16_state, screen_update_kaneko16) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1x4bit_1x4bit) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1x4bit_1x4bit) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) @@ -1993,7 +1993,7 @@ MACHINE_CONFIG_START(kaneko16_state::wingforc) MCFG_SCREEN_UPDATE_DRIVER(kaneko16_state, screen_update_kaneko16) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1x4bit_1x4bit) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1x4bit_1x4bit) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) @@ -2074,7 +2074,7 @@ MACHINE_CONFIG_START(kaneko16_gtmr_state::gtmr) MCFG_SCREEN_UPDATE_DRIVER(kaneko16_state, screen_update_kaneko16) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1x8bit_2x4bit) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1x8bit_2x4bit) MCFG_PALETTE_ADD("palette", 32768) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) @@ -2202,7 +2202,7 @@ MACHINE_CONFIG_START(kaneko16_state::mgcrystl) MCFG_SCREEN_UPDATE_DRIVER(kaneko16_state, screen_update_kaneko16) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1x4bit_2x4bit) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1x4bit_2x4bit) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) @@ -2324,7 +2324,7 @@ MACHINE_CONFIG_START(kaneko16_shogwarr_state::shogwarr) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1x4bit_1x4bit) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1x4bit_1x4bit) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) diff --git a/src/mame/drivers/karnov.cpp b/src/mame/drivers/karnov.cpp index 0a774999099..dcfee9c0010 100644 --- a/src/mame/drivers/karnov.cpp +++ b/src/mame/drivers/karnov.cpp @@ -728,7 +728,7 @@ static const gfx_layout tiles = 16*16 }; -static GFXDECODE_START( karnov ) +static GFXDECODE_START( gfx_karnov ) GFXDECODE_ENTRY( "gfx1", 0, chars, 0, 4 ) /* colors 0-31 */ GFXDECODE_ENTRY( "gfx2", 0, tiles, 512, 16 ) /* colors 512-767 */ GFXDECODE_ENTRY( "gfx3", 0, sprites, 256, 16 ) /* colors 256-511 */ @@ -831,7 +831,7 @@ MACHINE_CONFIG_START(karnov_state::karnov) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, karnov_state, vbint_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", karnov) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_karnov) MCFG_DECO_RMC3_ADD_PROMS("palette","proms",1024) // xxxxBBBBGGGGRRRR with custom weighting MCFG_DEVICE_ADD("spritegen", DECO_KARNOVSPRITES, 0) @@ -909,7 +909,7 @@ MACHINE_CONFIG_START(karnov_state::wndrplnt) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, karnov_state, vbint_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", karnov) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_karnov) MCFG_DECO_RMC3_ADD_PROMS("palette","proms",1024) // xxxxBBBBGGGGRRRR with custom weighting MCFG_DEVICE_ADD("spritegen", DECO_KARNOVSPRITES, 0) diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp index e484d6b8620..e5528315443 100644 --- a/src/mame/drivers/kaypro.cpp +++ b/src/mame/drivers/kaypro.cpp @@ -150,11 +150,11 @@ static const gfx_layout kaypro484_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( kayproii ) +static GFXDECODE_START( gfx_kayproii ) GFXDECODE_ENTRY( "chargen", 0x0000, kayproii_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START( kaypro484 ) +static GFXDECODE_START( gfx_kaypro484 ) GFXDECODE_ENTRY( "chargen", 0x0000, kaypro484_charlayout, 0, 1 ) GFXDECODE_END @@ -215,7 +215,7 @@ MACHINE_CONFIG_START(kaypro_state::kayproii) MCFG_SCREEN_UPDATE_DRIVER(kaypro_state, screen_update_kayproii) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", kayproii) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kayproii) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ @@ -305,7 +305,7 @@ MACHINE_CONFIG_START(kaypro_state::kaypro484) MCFG_VIDEO_START_OVERRIDE(kaypro_state, kaypro ) MCFG_SCREEN_UPDATE_DRIVER(kaypro_state, screen_update_kaypro484) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", kaypro484) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kaypro484) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(kaypro_state, kaypro) diff --git a/src/mame/drivers/kchamp.cpp b/src/mame/drivers/kchamp.cpp index d0196491318..79f04132c26 100644 --- a/src/mame/drivers/kchamp.cpp +++ b/src/mame/drivers/kchamp.cpp @@ -346,7 +346,7 @@ static const gfx_layout spritelayout = 16*8 /* ofset to next tile */ }; -static GFXDECODE_START( kchamp ) +static GFXDECODE_START( gfx_kchamp ) GFXDECODE_ENTRY( "gfx1", 0x00000, tilelayout, 32*4, 32 ) GFXDECODE_ENTRY( "gfx2", 0x08000, spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0x04000, spritelayout, 0, 16 ) @@ -433,7 +433,7 @@ MACHINE_CONFIG_START(kchamp_state::kchampvs) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, kchamp_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", kchamp) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kchamp) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(kchamp_state, kchamp) @@ -493,7 +493,7 @@ MACHINE_CONFIG_START(kchamp_state::kchamp) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, kchamp_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", kchamp) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kchamp) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(kchamp_state, kchamp) diff --git a/src/mame/drivers/kickgoal.cpp b/src/mame/drivers/kickgoal.cpp index d63089e4916..41e816814d3 100644 --- a/src/mame/drivers/kickgoal.cpp +++ b/src/mame/drivers/kickgoal.cpp @@ -587,13 +587,13 @@ static const gfx_layout bg3232_charlayout = 32*32, }; -static GFXDECODE_START( kickgoal ) +static GFXDECODE_START( gfx_kickgoal ) GFXDECODE_ENTRY( "gfx1", 0, fg88_charlayout, 0x000, 0x40 ) GFXDECODE_ENTRY( "gfx1", 0, bg1616_charlayout, 0x000, 0x40 ) GFXDECODE_ENTRY( "gfx1", 0, bg3232_charlayout, 0x000, 0x40 ) GFXDECODE_END -static GFXDECODE_START( actionhw ) +static GFXDECODE_START( gfx_actionhw ) GFXDECODE_ENTRY( "gfx1", 0, fg88_alt_charlayout, 0x000, 0x40 ) GFXDECODE_ENTRY( "gfx1", 0, bg1616_charlayout, 0x000, 0x40 ) GFXDECODE_END @@ -657,7 +657,7 @@ MACHINE_CONFIG_START(kickgoal_state::kickgoal) MCFG_SCREEN_UPDATE_DRIVER(kickgoal_state, screen_update_kickgoal) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", kickgoal) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kickgoal) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -696,7 +696,7 @@ MACHINE_CONFIG_START(kickgoal_state::actionhw) MCFG_SCREEN_UPDATE_DRIVER(kickgoal_state, screen_update_kickgoal) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", actionhw) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_actionhw) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/kingdrby.cpp b/src/mame/drivers/kingdrby.cpp index 9b509c421d3..2037e57d070 100644 --- a/src/mame/drivers/kingdrby.cpp +++ b/src/mame/drivers/kingdrby.cpp @@ -883,12 +883,12 @@ static const gfx_layout cowrace_layout16x16x2 = 16*16 }; -static GFXDECODE_START( kingdrby ) +static GFXDECODE_START( gfx_kingdrby ) GFXDECODE_ENTRY( "gfx1", 0x0000, layout16x16x2, 0x080, 0x10 ) GFXDECODE_ENTRY( "gfx2", 0x0000, layout8x8x2, 0x000, 0x80 ) GFXDECODE_END -static GFXDECODE_START( cowrace ) +static GFXDECODE_START( gfx_cowrace ) GFXDECODE_ENTRY( "gfx1", 0x000000, cowrace_layout16x16x2, 0x080, 0x10 ) GFXDECODE_ENTRY( "gfx2", 0x000000, layout8x8x2, 0x000, 0x80 ) GFXDECODE_END @@ -991,7 +991,7 @@ MACHINE_CONFIG_START(kingdrby_state::kingdrby) MCFG_I8255_IN_PORTC_CB(READ8(*this, kingdrby_state, input_mux_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, kingdrby_state, outport2_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", kingdrby) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kingdrby) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(kingdrby_state,kingdrby) MCFG_SCREEN_ADD("screen", RASTER) @@ -1044,7 +1044,7 @@ MACHINE_CONFIG_START(kingdrby_state::cowrace) MCFG_DEVICE_PROGRAM_MAP(cowrace_sound_map) MCFG_DEVICE_IO_MAP(cowrace_sound_io) - MCFG_GFXDECODE_MODIFY("gfxdecode", cowrace) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_cowrace) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(kingdrby_state,kingdrby) MCFG_DEVICE_ADD("oki", OKIM6295, 1056000, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified diff --git a/src/mame/drivers/kingobox.cpp b/src/mame/drivers/kingobox.cpp index c73098b924a..00941770e84 100644 --- a/src/mame/drivers/kingobox.cpp +++ b/src/mame/drivers/kingobox.cpp @@ -374,7 +374,7 @@ static const gfx_layout tilelayout = 16*8 }; -static GFXDECODE_START( kingobox ) +static GFXDECODE_START( gfx_kingobox ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 256, 8 ) /* characters */ GFXDECODE_ENTRY( "gfx1", 0x01000, charlayout, 256, 8 ) /* characters */ GFXDECODE_ENTRY( "gfx2", 0x00000, spritelayout, 0, 32 ) /* sprites */ @@ -444,7 +444,7 @@ static const gfx_layout rk_bglayout = }; -static GFXDECODE_START( rk ) +static GFXDECODE_START( gfx_rk ) GFXDECODE_ENTRY( "gfx1", 0x00000, rk_charlayout1, 256, 8 ) /* characters */ GFXDECODE_ENTRY( "gfx1", 0x00000, rk_charlayout2, 256, 8 ) /* characters */ GFXDECODE_ENTRY( "gfx2", 0x00000, rk_spritelayout, 0, 32 ) /* sprites */ @@ -499,7 +499,7 @@ MACHINE_CONFIG_START(kingofb_state::kingofb) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("nmigate", input_merger_device, in_w<0>)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", kingobox) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kingobox) MCFG_PALETTE_ADD("palette", 256+8*2) MCFG_PALETTE_INDIRECT_ENTRIES(256+8) MCFG_PALETTE_INIT_OWNER(kingofb_state,kingofb) @@ -558,7 +558,7 @@ MACHINE_CONFIG_START(kingofb_state::ringking) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("nmigate", input_merger_device, in_w<0>)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rk) MCFG_PALETTE_ADD("palette", 256+8*2) MCFG_PALETTE_INDIRECT_ENTRIES(256+8) MCFG_PALETTE_INIT_OWNER(kingofb_state,ringking) diff --git a/src/mame/drivers/klax.cpp b/src/mame/drivers/klax.cpp index 5368d603c41..98d4213c4b8 100644 --- a/src/mame/drivers/klax.cpp +++ b/src/mame/drivers/klax.cpp @@ -165,7 +165,7 @@ static const gfx_layout pfmolayout = }; -static GFXDECODE_START( klax ) +static GFXDECODE_START( gfx_klax ) GFXDECODE_ENTRY( "gfx1", 0, pfmolayout, 256, 16 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx2", 0, pfmolayout, 0, 16 ) /* sprites & playfield */ GFXDECODE_END @@ -181,7 +181,7 @@ static const gfx_layout bootleg_layout = 8*8 }; -static GFXDECODE_START( klax2bl ) +static GFXDECODE_START( gfx_klax2bl ) GFXDECODE_ENTRY( "gfx1", 0, bootleg_layout, 256, 16 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx2", 0, pfmolayout, 0, 16 ) /* sprites & playfield */ GFXDECODE_END @@ -205,7 +205,7 @@ MACHINE_CONFIG_START(klax_state::klax) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", klax) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_klax) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB) MCFG_PALETTE_MEMBITS(8) @@ -246,7 +246,7 @@ MACHINE_CONFIG_START(klax_state::klax2bl) MCFG_DEVICE_ADD("audiocpu", Z80, 6000000) /* ? */ MCFG_DEVICE_PROGRAM_MAP(bootleg_sound_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", klax2bl) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_klax2bl) // guess, probably something like this MCFG_DEVICE_ADD("msm", MSM5205, 375000) /* ? */ diff --git a/src/mame/drivers/kncljoe.cpp b/src/mame/drivers/kncljoe.cpp index 88a3d6e68f9..a0ec56e592b 100644 --- a/src/mame/drivers/kncljoe.cpp +++ b/src/mame/drivers/kncljoe.cpp @@ -225,7 +225,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( kncljoe ) +static GFXDECODE_START( gfx_kncljoe ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x00, 16 ) /* colors 0x00-0x7f direct mapped */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x80, 16 ) /* colors 0x80-0x8f with lookup table */ GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x80, 16 ) @@ -278,7 +278,7 @@ MACHINE_CONFIG_START(kncljoe_state::kncljoe) MCFG_SCREEN_UPDATE_DRIVER(kncljoe_state, screen_update_kncljoe) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", kncljoe) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kncljoe) MCFG_PALETTE_ADD("palette", 16*8+16*8) MCFG_PALETTE_INDIRECT_ENTRIES(128+16) MCFG_PALETTE_INIT_OWNER(kncljoe_state, kncljoe) diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp index 04478b5163c..6426ff949cf 100644 --- a/src/mame/drivers/koftball.cpp +++ b/src/mame/drivers/koftball.cpp @@ -229,7 +229,7 @@ static const gfx_layout tilelayout = 8*32 }; -static GFXDECODE_START( koftball ) +static GFXDECODE_START( gfx_koftball ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 1 ) GFXDECODE_END @@ -250,7 +250,7 @@ MACHINE_CONFIG_START(koftball_state::koftball) MCFG_PALETTE_ADD("palette", 256) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", koftball) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_koftball) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/koikoi.cpp b/src/mame/drivers/koikoi.cpp index dc43f86269c..8434d362c58 100644 --- a/src/mame/drivers/koikoi.cpp +++ b/src/mame/drivers/koikoi.cpp @@ -321,7 +321,7 @@ static const gfx_layout tilelayout = }; -static GFXDECODE_START( koikoi ) +static GFXDECODE_START( gfx_koikoi ) GFXDECODE_ENTRY( "gfx1", 0x0000, tilelayout, 0, 32 ) GFXDECODE_END @@ -370,7 +370,7 @@ MACHINE_CONFIG_START(koikoi_state::koikoi) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", koikoi) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_koikoi) MCFG_PALETTE_ADD("palette", 8*32) MCFG_PALETTE_INDIRECT_ENTRIES(16) MCFG_PALETTE_INIT_OWNER(koikoi_state, koikoi) diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp index 2437c5c4473..a34811342e4 100644 --- a/src/mame/drivers/konamigx.cpp +++ b/src/mame/drivers/konamigx.cpp @@ -1579,22 +1579,22 @@ static const gfx_layout t1_charlayout8 = }; /* type 1 (opengolf + racinfrc) use 6 and 8 bpp planar layouts for the 53936 */ -static GFXDECODE_START( opengolf ) +static GFXDECODE_START( gfx_opengolf ) GFXDECODE_ENTRY( "gfx3", 0, t1_charlayout8, 0x0000, 8 ) GFXDECODE_ENTRY( "gfx4", 0, t1_charlayout6, 0x0000, 8 ) GFXDECODE_END -static GFXDECODE_START( racinfrc ) +static GFXDECODE_START( gfx_racinfrc ) GFXDECODE_ENTRY( "gfx3", 0, t1_charlayout6, 0x0000, 8 ) GFXDECODE_ENTRY( "gfx4", 0, t1_charlayout6, 0x0000, 8 ) GFXDECODE_END /* type 3 & 4 games use a simple 8bpp decode for the 53936 */ -static GFXDECODE_START( type3 ) +static GFXDECODE_START( gfx_type3 ) GFXDECODE_ENTRY( "gfx3", 0, bglayout_8bpp, 0x1000, 8 ) GFXDECODE_END -static GFXDECODE_START( type4 ) +static GFXDECODE_START( gfx_type4 ) GFXDECODE_ENTRY( "gfx3", 0, bglayout_8bpp, 0x1800, 8 ) GFXDECODE_END @@ -1783,7 +1783,7 @@ MACHINE_CONFIG_START(konamigx_state::opengolf) MCFG_SCREEN_RAW_PARAMS(8000000, 384+24+64+40, 0, 383, 224+16+8+16, 0, 223) MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", opengolf) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_opengolf) MCFG_VIDEO_START_OVERRIDE(konamigx_state, opengolf) MCFG_DEVICE_MODIFY("k055673") @@ -1802,7 +1802,7 @@ MACHINE_CONFIG_START(konamigx_state::racinfrc) //MCFG_SCREEN_RAW_PARAMS(6000000, 384+24+64+40, 0, 383, 224+16+8+16, 0, 223) //MCFG_SCREEN_VISIBLE_AREA(32, 32+384-1, 16, 16+224-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", racinfrc) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_racinfrc) MCFG_VIDEO_START_OVERRIDE(konamigx_state, racinfrc) MCFG_DEVICE_MODIFY("k053252") @@ -1830,7 +1830,7 @@ MACHINE_CONFIG_START(konamigx_state::gxtype3) MCFG_DEFAULT_LAYOUT(layout_dualhsxs) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", type3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_type3) MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type3) MCFG_DEVICE_MODIFY("k053252") @@ -1889,7 +1889,7 @@ MACHINE_CONFIG_START(konamigx_state::gxtype4) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_ENABLE_HILIGHTS() - MCFG_GFXDECODE_ADD("gfxdecode", "palette", type4) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_type4) MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type4) MCFG_DEVICE_MODIFY("k053252") diff --git a/src/mame/drivers/konblands.cpp b/src/mame/drivers/konblands.cpp index 7e18f307865..7d71c4f8108 100644 --- a/src/mame/drivers/konblands.cpp +++ b/src/mame/drivers/konblands.cpp @@ -241,7 +241,7 @@ static const gfx_layout charlayout = 8*8*4 }; -static GFXDECODE_START( konblands ) +static GFXDECODE_START( gfx_konblands ) GFXDECODE_ENTRY( "gfx", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -293,7 +293,7 @@ MACHINE_CONFIG_START(konblands_state::konblands) /* video hardware */ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", konblands) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_konblands) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(konblands_state, konblands) diff --git a/src/mame/drivers/kopunch.cpp b/src/mame/drivers/kopunch.cpp index 519e2344a34..2055477e1a7 100644 --- a/src/mame/drivers/kopunch.cpp +++ b/src/mame/drivers/kopunch.cpp @@ -214,7 +214,7 @@ static const gfx_layout bg_layout = 8*8 }; -static GFXDECODE_START( kopunch ) +static GFXDECODE_START( gfx_kopunch ) GFXDECODE_ENTRY( "gfx1", 0, fg_layout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, bg_layout, 0, 1 ) GFXDECODE_END @@ -273,7 +273,7 @@ MACHINE_CONFIG_START(kopunch_state::kopunch) MCFG_SCREEN_UPDATE_DRIVER(kopunch_state, screen_update_kopunch) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", kopunch) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kopunch) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(kopunch_state, kopunch) diff --git a/src/mame/drivers/kramermc.cpp b/src/mame/drivers/kramermc.cpp index 90ad1807153..0d9337fe5fa 100644 --- a/src/mame/drivers/kramermc.cpp +++ b/src/mame/drivers/kramermc.cpp @@ -17,7 +17,7 @@ #include "screen.h" -static GFXDECODE_START( kramermc ) +static GFXDECODE_START( gfx_kramermc ) GFXDECODE_ENTRY( "gfx1", 0x0000, kramermc_charlayout, 0, 1 ) GFXDECODE_END @@ -131,7 +131,7 @@ MACHINE_CONFIG_START(kramermc_state::kramermc) MCFG_SCREEN_UPDATE_DRIVER(kramermc_state, screen_update_kramermc) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", kramermc ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kramermc) MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/ksayakyu.cpp b/src/mame/drivers/ksayakyu.cpp index eb1b2f0d1ed..e3fa2809942 100644 --- a/src/mame/drivers/ksayakyu.cpp +++ b/src/mame/drivers/ksayakyu.cpp @@ -233,7 +233,7 @@ static const gfx_layout spritelayout = 8*8*4 }; -static GFXDECODE_START( ksayakyu ) +static GFXDECODE_START( gfx_ksayakyu ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx3", 0, charlayout2, 0x80, 32 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 16 ) @@ -281,7 +281,7 @@ MACHINE_CONFIG_START(ksayakyu_state::ksayakyu) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(ASSERTLINE("maincpu", 0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ksayakyu) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ksayakyu) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(ksayakyu_state, ksayakyu) diff --git a/src/mame/drivers/kyugo.cpp b/src/mame/drivers/kyugo.cpp index ec7a8398eb5..e0bf87b96c6 100644 --- a/src/mame/drivers/kyugo.cpp +++ b/src/mame/drivers/kyugo.cpp @@ -481,7 +481,7 @@ static const gfx_layout spritelayout = 16*16 }; -static GFXDECODE_START( kyugo ) +static GFXDECODE_START( gfx_kyugo ) GFXDECODE_ENTRY( "gfx1", 0, fg_tilelayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, bg_tilelayout, 0, 32 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0, 32 ) @@ -548,7 +548,7 @@ MACHINE_CONFIG_START(kyugo_state::kyugo_base) MCFG_SCREEN_UPDATE_DRIVER(kyugo_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", kyugo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kyugo) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ diff --git a/src/mame/drivers/labyrunr.cpp b/src/mame/drivers/labyrunr.cpp index b1a47cabcbd..0fcfc09a5ca 100644 --- a/src/mame/drivers/labyrunr.cpp +++ b/src/mame/drivers/labyrunr.cpp @@ -147,7 +147,7 @@ static const gfx_layout gfxlayout = 32*8 }; -static GFXDECODE_START( labyrunr ) +static GFXDECODE_START( gfx_labyrunr ) GFXDECODE_ENTRY( "gfx1", 0, gfxlayout, 0, 8*16 ) GFXDECODE_END @@ -183,7 +183,7 @@ MACHINE_CONFIG_START(labyrunr_state::labyrunr) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, labyrunr_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", labyrunr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_labyrunr) MCFG_PALETTE_ADD("palette", 2*8*16*16) MCFG_PALETTE_INDIRECT_ENTRIES(128) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/ladybug.cpp b/src/mame/drivers/ladybug.cpp index c7505e989b8..a4165f13ec0 100644 --- a/src/mame/drivers/ladybug.cpp +++ b/src/mame/drivers/ladybug.cpp @@ -685,13 +685,13 @@ static const gfx_layout gridlayout2 = 8*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( ladybug ) +static GFXDECODE_START( gfx_ladybug ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 4*8, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout2, 4*8, 16 ) GFXDECODE_END -static GFXDECODE_START( sraider ) +static GFXDECODE_START( gfx_sraider ) GFXDECODE_ENTRY( "gfx1", 0, charlayout2, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 4*8, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout2, 4*8, 16 ) @@ -736,7 +736,7 @@ MACHINE_CONFIG_START(ladybug_state::ladybug) MCFG_SCREEN_UPDATE_DRIVER(ladybug_state, screen_update_ladybug) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ladybug) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ladybug) MCFG_PALETTE_ADD("palette", 4*8+4*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(ladybug_state,ladybug) @@ -786,7 +786,7 @@ MACHINE_CONFIG_START(sraider_state::sraider) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sraider_state, screen_vblank_sraider)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sraider) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sraider) MCFG_PALETTE_ADD("palette", 4*8+4*16+32+2) MCFG_PALETTE_INDIRECT_ENTRIES(32+32+1) MCFG_PALETTE_INIT_OWNER(sraider_state,sraider) diff --git a/src/mame/drivers/ladyfrog.cpp b/src/mame/drivers/ladyfrog.cpp index 3e2b4479d8b..917f124a246 100644 --- a/src/mame/drivers/ladyfrog.cpp +++ b/src/mame/drivers/ladyfrog.cpp @@ -262,7 +262,7 @@ static const gfx_layout spritelayout = -static GFXDECODE_START( ladyfrog ) +static GFXDECODE_START( gfx_ladyfrog ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 256, 16 ) GFXDECODE_END @@ -312,7 +312,7 @@ MACHINE_CONFIG_START(ladyfrog_state::ladyfrog) MCFG_SCREEN_UPDATE_DRIVER(ladyfrog_state, screen_update_ladyfrog) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ladyfrog) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ladyfrog) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/laserbat.cpp b/src/mame/drivers/laserbat.cpp index 90135a8fbb5..a292c98a586 100644 --- a/src/mame/drivers/laserbat.cpp +++ b/src/mame/drivers/laserbat.cpp @@ -402,9 +402,9 @@ static const gfx_layout sprites_layout = 32*32*2 }; -static GFXDECODE_START( laserbat ) - GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 256 ) /* Rom chars */ - GFXDECODE_ENTRY( "gfx2", 0x0000, sprites_layout, 0, 8 ) /* Sprites */ +static GFXDECODE_START( gfx_laserbat ) + GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 256 ) // ROM chars + GFXDECODE_ENTRY( "gfx2", 0x0000, sprites_layout, 0, 8 ) // sprites GFXDECODE_END @@ -492,7 +492,7 @@ MACHINE_CONFIG_START(laserbat_state_base::laserbat_base) MCFG_S2636_OFFSETS(-8, -16) MCFG_S2636_DIVIDER(3) - MCFG_GFXDECODE_ADD(m_gfxdecode, "palette", laserbat) + MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, "palette", gfx_laserbat) MACHINE_CONFIG_END diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp index 48a15605e29..25d9ed59b19 100644 --- a/src/mame/drivers/lasso.cpp +++ b/src/mame/drivers/lasso.cpp @@ -450,18 +450,18 @@ static const gfx_layout pinbo_spritelayout = }; -static GFXDECODE_START( lasso ) +static GFXDECODE_START( gfx_lasso ) GFXDECODE_ENTRY( "gfx1", 0, lasso_charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0, lasso_spritelayout, 0, 16 ) GFXDECODE_END -static GFXDECODE_START( wwjgtin ) +static GFXDECODE_START( gfx_wwjgtin ) GFXDECODE_ENTRY( "gfx1", 0, lasso_charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0, lasso_spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, wwjgtin_tracklayout, 4*16, 16 ) GFXDECODE_END -static GFXDECODE_START( pinbo ) +static GFXDECODE_START( gfx_pinbo ) GFXDECODE_ENTRY( "gfx1", 0, pinbo_charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0, pinbo_spritelayout, 0, 16 ) GFXDECODE_END @@ -512,7 +512,7 @@ MACHINE_CONFIG_START(lasso_state::base) MCFG_SCREEN_UPDATE_DRIVER(lasso_state, screen_update_lasso) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lasso) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lasso) /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -572,7 +572,7 @@ MACHINE_CONFIG_START(lasso_state::wwjgtin) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(lasso_state, screen_update_wwjgtin) - MCFG_GFXDECODE_MODIFY("gfxdecode", wwjgtin) // Has 1 additional layer + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_wwjgtin) // Has 1 additional layer MCFG_PALETTE_ADD("palette", 0x40 + 16*16) MCFG_PALETTE_INDIRECT_ENTRIES(64) @@ -598,7 +598,7 @@ MACHINE_CONFIG_START(lasso_state::pinbo) MCFG_DEVICE_IO_MAP(pinbo_audio_io_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", pinbo) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pinbo) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(lasso_state,pinbo) diff --git a/src/mame/drivers/lastbank.cpp b/src/mame/drivers/lastbank.cpp index 25d2abd527d..2a62c11077e 100644 --- a/src/mame/drivers/lastbank.cpp +++ b/src/mame/drivers/lastbank.cpp @@ -488,7 +488,7 @@ static const gfx_layout sp2_layout = #undef O2 -static GFXDECODE_START( lastbank ) +static GFXDECODE_START( gfx_lastbank ) GFXDECODE_ENTRY( "gfx1", 0, bg2_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0, sp2_layout, 0, 16 ) GFXDECODE_END @@ -537,7 +537,7 @@ MACHINE_CONFIG_START(lastbank_state::lastbank) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, lastbank_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastbank ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lastbank ) MCFG_PALETTE_ADD("palette", 0x100) MCFG_DEVICE_ADD("tc0091lvc", TC0091LVC, 0) diff --git a/src/mame/drivers/lastduel.cpp b/src/mame/drivers/lastduel.cpp index 8a1cade5d63..85373eee22a 100644 --- a/src/mame/drivers/lastduel.cpp +++ b/src/mame/drivers/lastduel.cpp @@ -436,14 +436,14 @@ static const gfx_layout madgear_tile2 = 64*16 }; -static GFXDECODE_START( lastduel ) +static GFXDECODE_START( gfx_lastduel ) GFXDECODE_ENTRY( "sprites", 0, sprite_layout, 0x200, 16 ) /* colors 0x200-0x2ff */ GFXDECODE_ENTRY( "gfx2", 0, text_layout, 0x300, 16 ) /* colors 0x300-0x33f */ GFXDECODE_ENTRY( "gfx3", 0, madgear_tile, 0x000, 16 ) /* colors 0x000-0x0ff */ GFXDECODE_ENTRY( "gfx4", 0, madgear_tile, 0x100, 16 ) /* colors 0x100-0x1ff */ GFXDECODE_END -static GFXDECODE_START( madgear ) +static GFXDECODE_START( gfx_madgear ) GFXDECODE_ENTRY( "sprites", 0, sprite_layout, 0x200, 16 ) /* colors 0x200-0x2ff */ GFXDECODE_ENTRY( "gfx2", 0, text_layout, 0x300, 16 ) /* colors 0x300-0x33f */ GFXDECODE_ENTRY( "gfx3", 0, madgear_tile, 0x000, 16 ) /* colors 0x000-0x0ff */ @@ -513,7 +513,7 @@ MACHINE_CONFIG_START(lastduel_state::lastduel) MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastduel) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lastduel) MCFG_PALETTE_ADD("palette", 1024) MCFG_VIDEO_START_OVERRIDE(lastduel_state,lastduel) @@ -558,7 +558,7 @@ MACHINE_CONFIG_START(lastduel_state::madgear) MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", madgear) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_madgear) MCFG_PALETTE_ADD("palette", 1024) MCFG_VIDEO_START_OVERRIDE(lastduel_state,madgear) diff --git a/src/mame/drivers/lazercmd.cpp b/src/mame/drivers/lazercmd.cpp index bffece6e8bb..40ccd93652b 100644 --- a/src/mame/drivers/lazercmd.cpp +++ b/src/mame/drivers/lazercmd.cpp @@ -591,7 +591,7 @@ static const gfx_layout charlayout = 10*8 /* every char takes 10 bytes */ }; -static GFXDECODE_START( lazercmd ) +static GFXDECODE_START( gfx_lazercmd ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 2 ) GFXDECODE_END @@ -647,7 +647,7 @@ MACHINE_CONFIG_START(lazercmd_state::lazercmd) MCFG_SCREEN_UPDATE_DRIVER(lazercmd_state, screen_update_lazercmd) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lazercmd) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lazercmd) MCFG_PALETTE_ADD("palette", 5) MCFG_PALETTE_INIT_OWNER(lazercmd_state, lazercmd) @@ -686,7 +686,7 @@ MACHINE_CONFIG_START(lazercmd_state::medlanes) MCFG_SCREEN_UPDATE_DRIVER(lazercmd_state, screen_update_lazercmd) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lazercmd) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lazercmd) MCFG_PALETTE_ADD("palette", 5) MCFG_PALETTE_INIT_OWNER(lazercmd_state, lazercmd) @@ -721,7 +721,7 @@ MACHINE_CONFIG_START(lazercmd_state::bbonk) MCFG_SCREEN_UPDATE_DRIVER(lazercmd_state, screen_update_lazercmd) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lazercmd) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lazercmd) MCFG_PALETTE_ADD("palette", 5) MCFG_PALETTE_INIT_OWNER(lazercmd_state, lazercmd) diff --git a/src/mame/drivers/lbeach.cpp b/src/mame/drivers/lbeach.cpp index f042c2afd14..769bf0ddf5d 100644 --- a/src/mame/drivers/lbeach.cpp +++ b/src/mame/drivers/lbeach.cpp @@ -310,7 +310,7 @@ static const gfx_layout tile_layout_16x16 = 16*16 }; -static GFXDECODE_START( lbeach ) +static GFXDECODE_START( gfx_lbeach ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout_16x8, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, tile_layout_16x16, 2, 4 ) GFXDECODE_ENTRY( "gfx3", 0, tile_layout_16x16, 10, 1 ) @@ -345,7 +345,7 @@ MACHINE_CONFIG_START(lbeach_state::lbeach) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lbeach) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lbeach) MCFG_PALETTE_ADD("palette", 2+8+2) MCFG_PALETTE_INIT_OWNER(lbeach_state, lbeach) /* sound hardware */ diff --git a/src/mame/drivers/lcmate2.cpp b/src/mame/drivers/lcmate2.cpp index 50d8fda371e..ccec345cf69 100644 --- a/src/mame/drivers/lcmate2.cpp +++ b/src/mame/drivers/lcmate2.cpp @@ -223,7 +223,7 @@ static const gfx_layout lcmate2_charlayout = 8*8 /* 8 bytes */ }; -static GFXDECODE_START( lcmate2 ) +static GFXDECODE_START( gfx_lcmate2 ) GFXDECODE_ENTRY( "hd44780:cgrom", 0x0000, lcmate2_charlayout, 0, 1 ) GFXDECODE_END @@ -246,7 +246,7 @@ MACHINE_CONFIG_START(lcmate2_state::lcmate2) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(lcmate2_state, lcmate2) MCFG_DEFAULT_LAYOUT(layout_lcd) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lcmate2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lcmate2) MCFG_HD44780_ADD("hd44780") MCFG_HD44780_LCD_SIZE(2, 20) diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp index c2c30205ea4..35982c419ee 100644 --- a/src/mame/drivers/legionna.cpp +++ b/src/mame/drivers/legionna.cpp @@ -1185,7 +1185,7 @@ static const gfx_layout legionna_spritelayout = 128*8 }; -static GFXDECODE_START( legionna ) +static GFXDECODE_START( gfx_legionna ) GFXDECODE_ENTRY( "char", 0, legionna_new_charlayout, 48*16, 16 ) GFXDECODE_ENTRY( "gfx3", 0, legionna_tilelayout, 0*16, 16 ) GFXDECODE_ENTRY( "gfx4", 0, legionna_tilelayout, 32*16, 16 ) @@ -1194,7 +1194,7 @@ static GFXDECODE_START( legionna ) GFXDECODE_ENTRY( "gfx6", 0, legionna_tilelayout, 16*16, 16 ) GFXDECODE_END -static GFXDECODE_START( heatbrl ) +static GFXDECODE_START( gfx_heatbrl ) GFXDECODE_ENTRY( "char", 0, legionna_new_charlayout, 48*16, 16 ) GFXDECODE_ENTRY( "gfx3", 0, legionna_tilelayout, 0*16, 16 ) GFXDECODE_ENTRY( "gfx4", 0, legionna_tilelayout, 32*16, 16 ) /* unused */ @@ -1203,7 +1203,7 @@ static GFXDECODE_START( heatbrl ) GFXDECODE_ENTRY( "gfx6", 0, legionna_tilelayout, 16*16, 16 ) GFXDECODE_END -static GFXDECODE_START( cupsoc ) +static GFXDECODE_START( gfx_cupsoc ) GFXDECODE_ENTRY( "char", 0, legionna_new_charlayout, 48*16, 16 ) GFXDECODE_ENTRY( "gfx3", 0, legionna_tilelayout, 0, 32 ) GFXDECODE_ENTRY( "gfx4", 0, legionna_tilelayout, 32*16, 16 ) /* unused */ @@ -1213,7 +1213,7 @@ static GFXDECODE_START( cupsoc ) GFXDECODE_END -static GFXDECODE_START( grainbow ) +static GFXDECODE_START( gfx_grainbow ) GFXDECODE_ENTRY( "char", 0, legionna_new_charlayout, 48*16, 16 ) GFXDECODE_ENTRY( "gfx3", 0, legionna_tilelayout, 0*16, 16 ) GFXDECODE_ENTRY( "gfx4", 0, legionna_tilelayout, 32*16, 16 ) /* unused */ @@ -1251,7 +1251,7 @@ MACHINE_CONFIG_START(legionna_state::legionna) MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w)) MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", legionna) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_legionna) MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1303,7 +1303,7 @@ MACHINE_CONFIG_START(legionna_state::heatbrl) MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", heatbrl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_heatbrl) MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1357,7 +1357,7 @@ MACHINE_CONFIG_START(legionna_state::godzilla) MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w)) MCFG_SEIBU_CRTC_LAYER_SCROLL_BASE_CB(WRITE16(*this, legionna_state, tile_scroll_base_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", heatbrl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_heatbrl) MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1404,7 +1404,7 @@ MACHINE_CONFIG_START(legionna_state::denjinmk) MCFG_SCREEN_UPDATE_DRIVER(legionna_state, screen_update_godzilla) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", heatbrl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_heatbrl) MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0) MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, legionna_state, tilemap_enable_w)) @@ -1463,7 +1463,7 @@ MACHINE_CONFIG_START(legionna_state::grainbow) MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", grainbow) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_grainbow) MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1517,7 +1517,7 @@ MACHINE_CONFIG_START(legionna_state::cupsoc) MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cupsoc) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cupsoc) MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/lemmings.cpp b/src/mame/drivers/lemmings.cpp index 65fb9457362..f94a8c731de 100644 --- a/src/mame/drivers/lemmings.cpp +++ b/src/mame/drivers/lemmings.cpp @@ -201,7 +201,7 @@ static const gfx_layout sprite_layout = 16*16*4 }; -static GFXDECODE_START( lemmings ) +static GFXDECODE_START( gfx_lemmings ) GFXDECODE_ENTRY( "gfx1", 0, sprite_layout, 512, 16 ) /* Sprites 16x16 */ GFXDECODE_ENTRY( "gfx2", 0, sprite_layout, 768, 16 ) /* Sprites 16x16 */ GFXDECODE_ENTRY( nullptr,0, charlayout, 0, 16 ) /* Dynamically modified */ @@ -235,7 +235,7 @@ MACHINE_CONFIG_START(lemmings_state::lemmings) MCFG_SCREEN_UPDATE_DRIVER(lemmings_state, screen_update_lemmings) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, lemmings_state, screen_vblank_lemmings)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lemmings) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lemmings) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(XBGR) diff --git a/src/mame/drivers/lgp.cpp b/src/mame/drivers/lgp.cpp index a88877bb7fc..f5bc6c7587e 100644 --- a/src/mame/drivers/lgp.cpp +++ b/src/mame/drivers/lgp.cpp @@ -346,7 +346,7 @@ static const gfx_layout lgp_gfx_layout_16x32 = 32*128 }; -static GFXDECODE_START( lgp ) +static GFXDECODE_START( gfx_lgp ) GFXDECODE_ENTRY("gfx1", 0, lgp_gfx_layout, 0x0, 0x100) GFXDECODE_ENTRY("gfx4", 0, lgp_gfx_layout_16x32, 0x0, 0x100) GFXDECODE_END @@ -430,7 +430,7 @@ MACHINE_CONFIG_START(lgp_state::lgp) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(lgp_state,lgp) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lgp) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lgp) /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/liberate.cpp b/src/mame/drivers/liberate.cpp index 7a9d66c02a3..dca2cb79432 100644 --- a/src/mame/drivers/liberate.cpp +++ b/src/mame/drivers/liberate.cpp @@ -655,14 +655,14 @@ static const gfx_layout pro_tiles = }; -static GFXDECODE_START( liberate ) +static GFXDECODE_START( gfx_liberate ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 0, 4 ) GFXDECODE_ENTRY( "gfx1", 0x00000, sprites, 0, 4 ) GFXDECODE_ENTRY( "gfx2", 0x00000, tiles1, 0, 4 ) GFXDECODE_ENTRY( "gfx2", 0x00000, tiles2, 0, 4 ) GFXDECODE_END -static GFXDECODE_START( prosport ) +static GFXDECODE_START( gfx_prosport ) GFXDECODE_ENTRY( "prosport_fg_gfx", 0x00000, charlayout, 0, 4 ) GFXDECODE_ENTRY( "protenns_fg_gfx", 0x00000, charlayout, 0, 4 ) GFXDECODE_ENTRY( "probowl_fg_gfx", 0x00000, charlayout, 0, 4 ) @@ -674,7 +674,7 @@ static GFXDECODE_START( prosport ) GFXDECODE_ENTRY( "gfx2", 0x00000, pro_tiles, 0, 4 ) //backgrounds GFXDECODE_END -static GFXDECODE_START( prosoccr ) +static GFXDECODE_START( gfx_prosoccr ) GFXDECODE_ENTRY( "fg_gfx", 0x00000, charlayout, 0, 4 ) GFXDECODE_ENTRY( "sp_gfx", 0x00000, sprites, 0, 4 ) GFXDECODE_ENTRY( "bg_gfx", 0x00000, prosoccr_bg_gfx, 8, 2 ) @@ -767,7 +767,7 @@ MACHINE_CONFIG_START(liberate_state::liberate_base) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, liberate_state, deco16_interrupt)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", liberate) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_liberate) MCFG_PALETTE_ADD("palette", 33) MCFG_PALETTE_INIT_OWNER(liberate_state,liberate) @@ -826,7 +826,7 @@ MACHINE_CONFIG_START(liberate_state::prosoccr) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(liberate_state, screen_update_prosoccr) - MCFG_GFXDECODE_MODIFY("gfxdecode", prosoccr) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_prosoccr) MCFG_VIDEO_START_OVERRIDE(liberate_state,prosoccr) MACHINE_CONFIG_END @@ -857,7 +857,7 @@ MACHINE_CONFIG_START(liberate_state::prosport) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, liberate_state, deco16_interrupt)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", prosport) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_prosport) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(BBGGGRRR_inverted) diff --git a/src/mame/drivers/limenko.cpp b/src/mame/drivers/limenko.cpp index b3c17e533bc..8fcfe9f12c8 100644 --- a/src/mame/drivers/limenko.cpp +++ b/src/mame/drivers/limenko.cpp @@ -692,7 +692,7 @@ static const gfx_layout tile_layout = 8*8*8, }; -static GFXDECODE_START( limenko ) +static GFXDECODE_START( gfx_limenko ) GFXDECODE_ENTRY( "gfx", 0, tile_layout, 0, 16 ) /* tiles */ GFXDECODE_END @@ -719,7 +719,7 @@ MACHINE_CONFIG_START(limenko_state::limenko) MCFG_SCREEN_UPDATE_DRIVER(limenko_state, screen_update_limenko) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", limenko) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_limenko) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -764,7 +764,7 @@ MACHINE_CONFIG_START(limenko_state::spotty) MCFG_SCREEN_UPDATE_DRIVER(limenko_state, screen_update_limenko) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", limenko) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_limenko) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/lkage.cpp b/src/mame/drivers/lkage.cpp index 03cc935a273..9833fb2d3be 100644 --- a/src/mame/drivers/lkage.cpp +++ b/src/mame/drivers/lkage.cpp @@ -459,7 +459,7 @@ static const gfx_layout sprite_layout = 32*8 }; -static GFXDECODE_START( lkage ) +static GFXDECODE_START( gfx_lkage ) GFXDECODE_ENTRY( "gfx1", 0x0000, tile_layout, /*128*/0, 64 ) GFXDECODE_ENTRY( "gfx1", 0x0000, sprite_layout, 0, 16 ) GFXDECODE_END @@ -511,7 +511,7 @@ MACHINE_CONFIG_START(lkage_state::lkage) MCFG_SCREEN_UPDATE_DRIVER(lkage_state, screen_update_lkage) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lkage) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lkage) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) @@ -562,7 +562,7 @@ MACHINE_CONFIG_START(lkage_state::lkageb) MCFG_SCREEN_UPDATE_DRIVER(lkage_state, screen_update_lkage) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lkage) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lkage) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp index e99185a38b4..78a3d41b02a 100644 --- a/src/mame/drivers/llc.cpp +++ b/src/mame/drivers/llc.cpp @@ -190,11 +190,11 @@ static const gfx_layout llc2_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( llc1 ) +static GFXDECODE_START( gfx_llc1 ) GFXDECODE_ENTRY( "chargen", 0x0000, llc1_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START( llc2 ) +static GFXDECODE_START( gfx_llc2 ) GFXDECODE_ENTRY( "chargen", 0x0000, llc2_charlayout, 0, 1 ) GFXDECODE_END @@ -218,7 +218,7 @@ MACHINE_CONFIG_START(llc_state::llc1) MCFG_SCREEN_UPDATE_DRIVER(llc_state, screen_update_llc1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", llc1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_llc1) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEFAULT_LAYOUT(layout_llc1) @@ -261,7 +261,7 @@ MACHINE_CONFIG_START(llc_state::llc2) MCFG_SCREEN_UPDATE_DRIVER(llc_state, screen_update_llc2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", llc2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_llc2) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp index 6125587c474..c30a45225af 100644 --- a/src/mame/drivers/lockon.cpp +++ b/src/mame/drivers/lockon.cpp @@ -349,7 +349,7 @@ static const gfx_layout char_layout = 8*8 }; -static GFXDECODE_START( lockon ) +static GFXDECODE_START( gfx_lockon ) GFXDECODE_ENTRY( "gfx1", 0, char_layout, 0, 128 ) GFXDECODE_END @@ -500,7 +500,7 @@ MACHINE_CONFIG_START(lockon_state::lockon) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, lockon_state, screen_vblank_lockon)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lockon) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lockon) MCFG_PALETTE_ADD("palette", 1024 + 2048) MCFG_PALETTE_INIT_OWNER(lockon_state, lockon) diff --git a/src/mame/drivers/looping.cpp b/src/mame/drivers/looping.cpp index cc4a57f37d0..f0affc26746 100644 --- a/src/mame/drivers/looping.cpp +++ b/src/mame/drivers/looping.cpp @@ -613,7 +613,7 @@ static const gfx_layout sprite_layout = }; -static GFXDECODE_START( looping ) +static GFXDECODE_START( gfx_looping ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x2_planar, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0, sprite_layout, 0, 8 ) GFXDECODE_END @@ -660,7 +660,7 @@ MACHINE_CONFIG_START(looping_state::looping) MCFG_SCREEN_UPDATE_DRIVER(looping_state, screen_update_looping) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", looping) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_looping) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(looping_state, looping) diff --git a/src/mame/drivers/lordgun.cpp b/src/mame/drivers/lordgun.cpp index ca5b2e1a50c..58c8b250119 100644 --- a/src/mame/drivers/lordgun.cpp +++ b/src/mame/drivers/lordgun.cpp @@ -431,7 +431,7 @@ static const gfx_layout lordgun_32x32x6_layout = 32*32*2 }; -static GFXDECODE_START( lordgun ) +static GFXDECODE_START( gfx_lordgun ) GFXDECODE_ENTRY( "tiles0", 0, lordgun_8x8x6_layout, 0x000, 0x800/0x40*8 ) // [0] Tilemap 0 GFXDECODE_ENTRY( "tiles1", 0, lordgun_16x16x6_layout, 0x000, 0x800/0x40*8 ) // [1] Tilemap 1 GFXDECODE_ENTRY( "tiles1", 0, lordgun_32x32x6_layout, 0x000, 0x800/0x40*8 ) // [2] Tilemap 2 @@ -672,7 +672,7 @@ MACHINE_CONFIG_START(lordgun_state::lordgun) MCFG_SCREEN_UPDATE_DRIVER(lordgun_state, screen_update_lordgun) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lordgun) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lordgun) MCFG_PALETTE_ADD("palette", 0x800 * 8) // 0x800 real colors, repeated per priority level // sound hardware @@ -724,7 +724,7 @@ MACHINE_CONFIG_START(lordgun_state::aliencha) MCFG_SCREEN_UPDATE_DRIVER(lordgun_state, screen_update_lordgun) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lordgun) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lordgun) MCFG_PALETTE_ADD("palette", 0x800 * 8) // 0x800 real colors, repeated per priority level // sound hardware diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp index 9f1494d1f90..efd8f870659 100644 --- a/src/mame/drivers/lsasquad.cpp +++ b/src/mame/drivers/lsasquad.cpp @@ -533,7 +533,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( lsasquad ) +static GFXDECODE_START( gfx_lsasquad ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 16 ) GFXDECODE_END @@ -592,7 +592,7 @@ MACHINE_CONFIG_START(lsasquad_state::lsasquad) MCFG_SCREEN_UPDATE_DRIVER(lsasquad_state, screen_update_lsasquad) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lsasquad) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lsasquad) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 512) /* sound hardware */ @@ -658,7 +658,7 @@ MACHINE_CONFIG_START(lsasquad_state::daikaiju) MCFG_SCREEN_UPDATE_DRIVER(lsasquad_state, screen_update_daikaiju) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lsasquad) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lsasquad) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 512) /* sound hardware */ diff --git a/src/mame/drivers/ltcasino.cpp b/src/mame/drivers/ltcasino.cpp index 0f8e047b982..f6eedc0384c 100644 --- a/src/mame/drivers/ltcasino.cpp +++ b/src/mame/drivers/ltcasino.cpp @@ -703,7 +703,7 @@ static const gfx_layout tiles8x8_layout = }; -static GFXDECODE_START( ltcasino ) +static GFXDECODE_START( gfx_ltcasino ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 64 ) GFXDECODE_END @@ -723,7 +723,7 @@ MACHINE_CONFIG_START(ltcasino_state::ltcasino) MCFG_SCREEN_UPDATE_DRIVER(ltcasino_state, screen_update_ltcasino) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ltcasino) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ltcasino) MCFG_PALETTE_ADD("palette", 2*64) MCFG_PALETTE_INIT_OWNER(ltcasino_state, ltcasino) diff --git a/src/mame/drivers/luckgrln.cpp b/src/mame/drivers/luckgrln.cpp index de72ec9db7f..ecd80c965b3 100644 --- a/src/mame/drivers/luckgrln.cpp +++ b/src/mame/drivers/luckgrln.cpp @@ -963,7 +963,7 @@ static const gfx_layout tiles8x32_layout = 32*8 }; -static GFXDECODE_START( luckgrln ) +static GFXDECODE_START( gfx_luckgrln ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout, 0x400, 64 ) GFXDECODE_ENTRY( "reels", 0, tiles8x32_layout, 0, 64 ) GFXDECODE_END @@ -994,7 +994,7 @@ MACHINE_CONFIG_START(luckgrln_state::luckgrln) MCFG_SCREEN_UPDATE_DRIVER(luckgrln_state, screen_update_luckgrln) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", luckgrln) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_luckgrln) MCFG_PALETTE_ADD("palette", 0x8000) SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp index 6007259f41c..b8fdc2d13b1 100644 --- a/src/mame/drivers/lucky74.cpp +++ b/src/mame/drivers/lucky74.cpp @@ -1390,7 +1390,7 @@ static const gfx_layout tilelayout = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( lucky74 ) +static GFXDECODE_START( gfx_lucky74 ) GFXDECODE_ENTRY( "fgtiles", 0, tilelayout, 0, 16 ) /* text, frames & cards */ GFXDECODE_ENTRY( "bgtiles", 0, tilelayout, 256, 16 ) /* title & whores */ GFXDECODE_END @@ -1503,7 +1503,7 @@ MACHINE_CONFIG_START(lucky74_state::lucky74) MCFG_SCREEN_UPDATE_DRIVER(lucky74_state, screen_update_lucky74) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lucky74) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lucky74) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(lucky74_state, lucky74) diff --git a/src/mame/drivers/lvcards.cpp b/src/mame/drivers/lvcards.cpp index 1dab4ad8596..907e1b08f57 100644 --- a/src/mame/drivers/lvcards.cpp +++ b/src/mame/drivers/lvcards.cpp @@ -449,7 +449,7 @@ static const gfx_layout charlayout = /* Graphics Decode Information */ -static GFXDECODE_START( lvcards ) +static GFXDECODE_START( gfx_lvcards ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -471,7 +471,7 @@ MACHINE_CONFIG_START(lvcards_state::lvcards) MCFG_SCREEN_UPDATE_DRIVER(lvcards_state, screen_update_lvcards) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lvcards) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lvcards) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(lvcards_state, lvcards) diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp index 4ca623226fb..06ec4209d51 100644 --- a/src/mame/drivers/lwings.cpp +++ b/src/mame/drivers/lwings.cpp @@ -833,13 +833,13 @@ static const gfx_layout bg2_tilelayout = }; -static GFXDECODE_START( lwings ) +static GFXDECODE_START( gfx_lwings ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 512, 16 ) /* colors 512-575 */ GFXDECODE_ENTRY( "gfx2", 0, bg1_tilelayout, 0, 8 ) /* colors 0-127 */ GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 384, 8 ) /* colors 384-511 */ GFXDECODE_END -static GFXDECODE_START( trojan ) +static GFXDECODE_START( gfx_trojan ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 768, 16 ) /* colors 768-831 */ GFXDECODE_ENTRY( "gfx2", 0, bg1_tilelayout, 256, 8 ) /* colors 256-383 */ GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 640, 8 ) /* colors 640-767 */ @@ -951,7 +951,7 @@ MACHINE_CONFIG_START(lwings_state::lwings) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lwings) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lwings) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -1001,7 +1001,7 @@ MACHINE_CONFIG_START(lwings_state::fball) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lwings) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lwings) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -1035,7 +1035,7 @@ MACHINE_CONFIG_START(lwings_state::trojan) MCFG_DEVICE_PERIODIC_INT_DRIVER(lwings_state, irq0_line_hold, 4000) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", trojan) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_trojan) MCFG_VIDEO_START_OVERRIDE(lwings_state,trojan) MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/m10.cpp b/src/mame/drivers/m10.cpp index 77d9ff60330..933c2599b65 100644 --- a/src/mame/drivers/m10.cpp +++ b/src/mame/drivers/m10.cpp @@ -780,7 +780,7 @@ static const gfx_layout charlayout = }; -static GFXDECODE_START( m10 ) +static GFXDECODE_START( gfx_m10 ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 8 ) GFXDECODE_END @@ -829,7 +829,7 @@ MACHINE_CONFIG_START(m10_state::m10) MCFG_SCREEN_UPDATE_DRIVER(m10_state, screen_update_m10) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", m10) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_m10) MCFG_PALETTE_ADD("palette", 2*8) MCFG_PALETTE_INIT_OWNER(m10_state,m10) @@ -893,7 +893,7 @@ MACHINE_CONFIG_START(m10_state::m15) MCFG_SCREEN_UPDATE_DRIVER(m10_state, screen_update_m15) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) MCFG_PALETTE_ADD("palette", 2*8) MCFG_PALETTE_INIT_OWNER(m10_state,m10) diff --git a/src/mame/drivers/m107.cpp b/src/mame/drivers/m107.cpp index 4f01af4bf3c..81d64447175 100644 --- a/src/mame/drivers/m107.cpp +++ b/src/mame/drivers/m107.cpp @@ -705,12 +705,12 @@ static const gfx_layout spritelayout2 = 32*8 }; -static GFXDECODE_START( m107 ) +static GFXDECODE_START( gfx_m107 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 128 ) GFXDECODE_END -static GFXDECODE_START( firebarr ) +static GFXDECODE_START( gfx_firebarr ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout2,0, 128 ) GFXDECODE_END @@ -743,7 +743,7 @@ MACHINE_CONFIG_START(m107_state::firebarr) MCFG_SCREEN_UPDATE_DRIVER(m107_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", firebarr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_firebarr) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -781,7 +781,7 @@ MACHINE_CONFIG_START(m107_state::dsoccr94) MCFG_V25_CONFIG(dsoccr94_decryption_table) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", m107) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_m107) MACHINE_CONFIG_END @@ -797,7 +797,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(m107_state::airass) firebarr(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", m107) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_m107) MCFG_DEVICE_MODIFY("soundcpu") MCFG_V25_CONFIG(gunforce_decryption_table) diff --git a/src/mame/drivers/m14.cpp b/src/mame/drivers/m14.cpp index 4c2e53a329f..28f17866fd6 100644 --- a/src/mame/drivers/m14.cpp +++ b/src/mame/drivers/m14.cpp @@ -405,7 +405,7 @@ static const gfx_layout charlayout = 8*8 }; -static GFXDECODE_START( m14 ) +static GFXDECODE_START( gfx_m14 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 0x10 ) GFXDECODE_END @@ -446,7 +446,7 @@ MACHINE_CONFIG_START(m14_state::m14) MCFG_SCREEN_UPDATE_DRIVER(m14_state, screen_update_m14) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", m14) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_m14) MCFG_PALETTE_ADD("palette", 0x20) MCFG_PALETTE_INIT_OWNER(m14_state, m14) diff --git a/src/mame/drivers/m3.cpp b/src/mame/drivers/m3.cpp index 74e1d4271f4..1bc918fe29a 100644 --- a/src/mame/drivers/m3.cpp +++ b/src/mame/drivers/m3.cpp @@ -103,7 +103,7 @@ static const gfx_layout charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( f4disp ) +static GFXDECODE_START( gfx_f4disp ) GFXDECODE_ENTRY( "chargen", 0x0000, charlayout, 0, 1 ) GFXDECODE_END @@ -124,7 +124,7 @@ MACHINE_CONFIG_START(m3_state::m3) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", f4disp) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_f4disp) MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ diff --git a/src/mame/drivers/m52.cpp b/src/mame/drivers/m52.cpp index abaa99ba04b..d52ff7a61f1 100644 --- a/src/mame/drivers/m52.cpp +++ b/src/mame/drivers/m52.cpp @@ -370,7 +370,7 @@ static const gfx_layout bgcharlayout = }; -static GFXDECODE_START( m52 ) +static GFXDECODE_START( gfx_m52 ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 128 ) GFXDECODE_ENTRY( "gfx2", 0x0000, spritelayout, 128*4, 16 ) GFXDECODE_ENTRY( "gfx3", 0x0000, bgcharlayout, 128*4+16*4+0*4, 1 ) @@ -404,7 +404,7 @@ MACHINE_CONFIG_START(m52_state::m52) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m52_state, irq0_line_hold) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", m52) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_m52) MCFG_PALETTE_ADD("palette", 128*4+16*4+3*4) MCFG_PALETTE_INDIRECT_ENTRIES(512+32+32) MCFG_PALETTE_INIT_OWNER(m52_state, m52) diff --git a/src/mame/drivers/m57.cpp b/src/mame/drivers/m57.cpp index e9c24bb4509..8bf296803b9 100644 --- a/src/mame/drivers/m57.cpp +++ b/src/mame/drivers/m57.cpp @@ -213,7 +213,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( m57 ) +static GFXDECODE_START( gfx_m57 ) GFXDECODE_ENTRY( "gfx1", 0x0000, gfx_8x8x3_planar, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0x0000, spritelayout, 32*8, 32 ) GFXDECODE_ENTRY( "gfx2", 0x1000, spritelayout, 32*8, 32 ) @@ -247,7 +247,7 @@ MACHINE_CONFIG_START(m57_state::m57) MCFG_SCREEN_UPDATE_DRIVER(m57_state, screen_update_m57) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", m57) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_m57) MCFG_PALETTE_ADD("palette", 32*8+32*8) MCFG_PALETTE_INDIRECT_ENTRIES(256+16) MCFG_PALETTE_INIT_OWNER(m57_state, m57) diff --git a/src/mame/drivers/m58.cpp b/src/mame/drivers/m58.cpp index 55a050eb29f..c02a78ac596 100644 --- a/src/mame/drivers/m58.cpp +++ b/src/mame/drivers/m58.cpp @@ -179,7 +179,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( yard ) +static GFXDECODE_START( gfx_yard ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x3_planar, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 512, 32 ) GFXDECODE_END @@ -200,7 +200,7 @@ MACHINE_CONFIG_START(m58_state::yard) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m58_state, irq0_line_hold) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", yard) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_yard) MCFG_PALETTE_ADD("palette", 256+256+256) MCFG_PALETTE_INDIRECT_ENTRIES(256+256+16) MCFG_PALETTE_INIT_OWNER(m58_state, m58) diff --git a/src/mame/drivers/m62.cpp b/src/mame/drivers/m62.cpp index 5417cbf35c3..0c207e09c98 100644 --- a/src/mame/drivers/m62.cpp +++ b/src/mame/drivers/m62.cpp @@ -883,51 +883,51 @@ static const gfx_layout spritelayout = /* standard decodes */ -static GFXDECODE_START( m62_sprites ) +static GFXDECODE_START( gfx_m62_sprites ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 32 ) GFXDECODE_END -static GFXDECODE_START( m62_tiles ) +static GFXDECODE_START( gfx_m62_tiles ) GFXDECODE_ENTRY( "gfx1", 0, tile_charlayout, 0, 32 ) GFXDECODE_END /* per game modified decodes */ -static GFXDECODE_START( m62_tiles_lotlot ) +static GFXDECODE_START( gfx_m62_tiles_lotlot ) GFXDECODE_ENTRY( "gfx1", 0, lotlot_charlayout, 0, 32 ) GFXDECODE_END -static GFXDECODE_START( m62_tiles_spelunk2 ) +static GFXDECODE_START( gfx_m62_tiles_spelunk2 ) GFXDECODE_ENTRY( "gfx1", 0, tile_charlayout, 0, 64 ) GFXDECODE_END -static GFXDECODE_START( m62_tiles_youjyudn ) +static GFXDECODE_START( gfx_m62_tiles_youjyudn ) GFXDECODE_ENTRY( "gfx1", 0, youjyudn_tilelayout, 0, 32 ) GFXDECODE_END /* Games with FG layers */ -static GFXDECODE_START( m62_fg_battroad ) +static GFXDECODE_START( gfx_m62_fg_battroad ) GFXDECODE_ENTRY( "gfx3", 0, battroad_charlayout, 0, 32 ) GFXDECODE_END -static GFXDECODE_START( m62_fg_lotlot ) +static GFXDECODE_START( gfx_m62_fg_lotlot ) GFXDECODE_ENTRY( "gfx3", 0, lotlot_charlayout, 0, 32 ) GFXDECODE_END -static GFXDECODE_START( m62_fg_kidniki ) +static GFXDECODE_START( gfx_m62_fg_kidniki ) GFXDECODE_ENTRY( "gfx3", 0, kidniki_charlayout, 0, 32 ) GFXDECODE_END -static GFXDECODE_START( m62_fg_spelunkr ) +static GFXDECODE_START( gfx_m62_fg_spelunkr ) GFXDECODE_ENTRY( "gfx3", 0, spelunk2_charlayout, 0, 32 ) GFXDECODE_END -static GFXDECODE_START( m62_fg_spelunk2 ) +static GFXDECODE_START( gfx_m62_fg_spelunk2 ) GFXDECODE_ENTRY( "gfx3", 0, spelunk2_charlayout, 0, 64 ) GFXDECODE_END -static GFXDECODE_START( m62_fg_youjyudn ) +static GFXDECODE_START( gfx_m62_fg_youjyudn ) GFXDECODE_ENTRY( "gfx3", 0, kidniki_charlayout, 128, 16 ) GFXDECODE_END @@ -982,8 +982,8 @@ MACHINE_CONFIG_START(m62_state::ldrun) MCFG_SCREEN_VISIBLE_AREA((64*8-384)/2, 64*8-(64*8-384)/2-1, 0*8, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(m62_state, screen_update_ldrun) - MCFG_GFXDECODE_ADD("spr_decode", "spr_palette", m62_sprites) - MCFG_GFXDECODE_ADD("chr_decode", "chr_palette", m62_tiles) + MCFG_DEVICE_ADD("spr_decode", GFXDECODE, "spr_palette", gfx_m62_sprites) + MCFG_DEVICE_ADD("chr_decode", GFXDECODE, "chr_palette", gfx_m62_tiles) MCFG_PALETTE_ADD("chr_palette", 256) MCFG_PALETTE_INIT_OWNER(m62_state,m62_chr) @@ -1032,7 +1032,7 @@ MACHINE_CONFIG_START(m62_state::battroad) MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(m62_state, screen_update_battroad) - MCFG_GFXDECODE_ADD("fg_decode", "fg_palette", m62_fg_battroad) + MCFG_DEVICE_ADD("fg_decode", GFXDECODE, "fg_palette", gfx_m62_fg_battroad) MCFG_PALETTE_ADD("fg_palette", 32) MCFG_PALETTE_INIT_OWNER(m62_state,m62_battroad_fg) @@ -1094,8 +1094,8 @@ MACHINE_CONFIG_START(m62_state::lotlot) /* video hardware */ - MCFG_GFXDECODE_ADD("fg_decode", "fg_palette", m62_fg_lotlot) - MCFG_GFXDECODE_MODIFY("chr_decode", m62_tiles_lotlot) + MCFG_DEVICE_ADD("fg_decode", GFXDECODE, "fg_palette", gfx_m62_fg_lotlot) + MCFG_GFXDECODE_MODIFY("chr_decode", gfx_m62_tiles_lotlot) MCFG_PALETTE_ADD("fg_palette", 256) MCFG_PALETTE_INIT_OWNER(m62_state,m62_lotlot_fg) @@ -1116,7 +1116,7 @@ MACHINE_CONFIG_START(m62_state::kidniki) MCFG_DEVICE_IO_MAP(kidniki_io_map) /* video hardware */ - MCFG_GFXDECODE_ADD("fg_decode", "chr_palette", m62_fg_kidniki) + MCFG_DEVICE_ADD("fg_decode", GFXDECODE, "chr_palette", gfx_m62_fg_kidniki) MCFG_VIDEO_START_OVERRIDE(m62_state,kidniki) MCFG_SCREEN_MODIFY("screen") @@ -1132,7 +1132,7 @@ MACHINE_CONFIG_START(m62_state::spelunkr) MCFG_DEVICE_PROGRAM_MAP(spelunkr_map) /* video hardware */ - MCFG_GFXDECODE_ADD("fg_decode", "chr_palette", m62_fg_spelunkr) + MCFG_DEVICE_ADD("fg_decode", GFXDECODE, "chr_palette", gfx_m62_fg_spelunkr) MCFG_VIDEO_START_OVERRIDE(m62_state,spelunkr) MCFG_SCREEN_MODIFY("screen") @@ -1149,8 +1149,8 @@ MACHINE_CONFIG_START(m62_state::spelunk2) /* video hardware */ - MCFG_GFXDECODE_MODIFY("chr_decode", m62_tiles_spelunk2) - MCFG_GFXDECODE_ADD("fg_decode", "chr_palette", m62_fg_spelunk2) + MCFG_GFXDECODE_MODIFY("chr_decode", gfx_m62_tiles_spelunk2) + MCFG_DEVICE_ADD("fg_decode", GFXDECODE, "chr_palette", gfx_m62_fg_spelunk2) MCFG_PALETTE_MODIFY("chr_palette") MCFG_PALETTE_ENTRIES(512) @@ -1176,8 +1176,8 @@ MACHINE_CONFIG_START(m62_state::youjyudn) MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(m62_state, screen_update_youjyudn) - MCFG_GFXDECODE_MODIFY("chr_decode", m62_tiles_youjyudn) - MCFG_GFXDECODE_ADD("fg_decode", "chr_palette", m62_fg_youjyudn) + MCFG_GFXDECODE_MODIFY("chr_decode", gfx_m62_tiles_youjyudn) + MCFG_DEVICE_ADD("fg_decode", GFXDECODE, "chr_palette", gfx_m62_fg_youjyudn) MCFG_VIDEO_START_OVERRIDE(m62_state,youjyudn) MACHINE_CONFIG_END diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp index 8a4fb6a12df..66c2556fae9 100644 --- a/src/mame/drivers/m63.cpp +++ b/src/mame/drivers/m63.cpp @@ -692,13 +692,13 @@ static const gfx_layout spritelayout = 16*8 }; -static GFXDECODE_START( m63 ) +static GFXDECODE_START( gfx_m63 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 256, 1 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 32 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0, 32 ) GFXDECODE_END -static GFXDECODE_START( fghtbskt ) +static GFXDECODE_START( gfx_fghtbskt ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 16, 1 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 32 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0, 32 ) @@ -786,7 +786,7 @@ MACHINE_CONFIG_START(m63_state::m63) MCFG_SCREEN_UPDATE_DRIVER(m63_state, screen_update_m63) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", m63) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_m63) MCFG_PALETTE_ADD("palette", 256+4) MCFG_PALETTE_INIT_OWNER(m63_state,m63) @@ -839,7 +839,7 @@ MACHINE_CONFIG_START(m63_state::fghtbskt) MCFG_SCREEN_UPDATE_DRIVER(m63_state, screen_update_m63) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fghtbskt) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fghtbskt) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(m63_state,m63) diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp index 5ca2fe05a2d..030e082e482 100644 --- a/src/mame/drivers/m72.cpp +++ b/src/mame/drivers/m72.cpp @@ -1836,18 +1836,18 @@ static const gfx_layout spritelayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( m72 ) +static GFXDECODE_START( gfx_m72 ) GFXDECODE_ENTRY( "sprites", 0, spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 256, 16 ) GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 256, 16 ) GFXDECODE_END -static GFXDECODE_START( rtype2 ) +static GFXDECODE_START( gfx_rtype2 ) GFXDECODE_ENTRY( "sprites", 0, spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 256, 16 ) GFXDECODE_END -static GFXDECODE_START( majtitle ) +static GFXDECODE_START( gfx_majtitle ) GFXDECODE_ENTRY( "sprites", 0, spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 256, 16 ) GFXDECODE_ENTRY( "sprites2", 0, spritelayout, 0, 16 ) @@ -1894,7 +1894,7 @@ MACHINE_CONFIG_START(m72_state::m72_base) MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0)) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", m72) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_m72) MCFG_PALETTE_ADD("palette", 512) MCFG_SCREEN_ADD("screen", RASTER) @@ -2019,7 +2019,7 @@ MACHINE_CONFIG_START(m72_state::rtype2) MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0)) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rtype2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rtype2) MCFG_PALETTE_ADD("palette", 512) MCFG_SCREEN_ADD("screen", RASTER) @@ -2064,7 +2064,7 @@ MACHINE_CONFIG_START(m72_state::cosmccop) // upd71059c isn't needed beacuse the V35 has its own IRQ controller /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rtype2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rtype2) MCFG_PALETTE_ADD("palette", 512) MCFG_SCREEN_ADD("screen", RASTER) @@ -2109,7 +2109,7 @@ MACHINE_CONFIG_START(m72_state::m82) MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0)) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", majtitle) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_majtitle) MCFG_PALETTE_ADD("palette", 512) MCFG_SCREEN_ADD("screen", RASTER) @@ -2152,7 +2152,7 @@ MACHINE_CONFIG_START(m72_state::poundfor) MCFG_UPD4701_PORTY("TRACK1_Y") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rtype2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rtype2) MCFG_PALETTE_ADD("palette", 512) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/m79152pc.cpp b/src/mame/drivers/m79152pc.cpp index 50b702ef095..4ef5c7439d0 100644 --- a/src/mame/drivers/m79152pc.cpp +++ b/src/mame/drivers/m79152pc.cpp @@ -120,7 +120,7 @@ static const gfx_layout m79152pc_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( m79152pc ) +static GFXDECODE_START( gfx_m79152pc ) GFXDECODE_ENTRY( "chargen", 0x0000, m79152pc_charlayout, 0, 1 ) GFXDECODE_END @@ -138,7 +138,7 @@ MACHINE_CONFIG_START(m79152pc_state::m79152pc) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 300-1) MCFG_SCREEN_UPDATE_DRIVER(m79152pc_state, screen_update_m79152pc) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", m79152pc) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_m79152pc) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600) diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp index 580aaa6af0a..570cc02e6ec 100644 --- a/src/mame/drivers/m90.cpp +++ b/src/mame/drivers/m90.cpp @@ -693,7 +693,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( m90 ) +static GFXDECODE_START( gfx_m90 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 256, 16 ) GFXDECODE_END @@ -753,7 +753,7 @@ MACHINE_CONFIG_START(m90_state::m90) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", NEC_INPUT_LINE_INTP0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", m90) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_m90) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp index f88d89b709d..0af2c443394 100644 --- a/src/mame/drivers/m92.cpp +++ b/src/mame/drivers/m92.cpp @@ -849,12 +849,12 @@ static const gfx_layout spritelayout2 = 32*8 }; -static GFXDECODE_START( m92 ) +static GFXDECODE_START( gfx_m92 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 128 ) GFXDECODE_END -static GFXDECODE_START( psoldier ) +static GFXDECODE_START( gfx_psoldier ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout2, 0, 128 ) GFXDECODE_END @@ -882,7 +882,7 @@ static const gfx_layout bootleg_spritelayout = }; -static GFXDECODE_START( bootleg ) +static GFXDECODE_START( gfx_bootleg ) GFXDECODE_ENTRY( "gfx1", 0, bootleg_charlayout, 0x400, 128 ) GFXDECODE_ENTRY( "gfx2", 0, bootleg_spritelayout, 0x400, 128 ) GFXDECODE_END @@ -920,7 +920,7 @@ MACHINE_CONFIG_START(m92_state::m92) MCFG_SCREEN_UPDATE_DRIVER(m92_state, screen_update_m92) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", m92) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_m92) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1036,7 +1036,7 @@ MACHINE_CONFIG_START(m92_state::nbbatman2bl) MCFG_DEVICE_REMOVE("ymsnd") MCFG_DEVICE_REMOVE("irem") - MCFG_GFXDECODE_MODIFY("gfxdecode", bootleg) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_bootleg) /* 8951 MCU as sound CPU */ /* OKI6295 (AD-65) as sound */ @@ -1050,7 +1050,7 @@ MACHINE_CONFIG_START(m92_state::psoldier) MCFG_DEVICE_MODIFY("soundcpu") MCFG_V25_CONFIG(psoldier_decryption_table) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", psoldier) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_psoldier) MACHINE_CONFIG_END MACHINE_CONFIG_START(m92_state::dsoccr94j) @@ -1058,7 +1058,7 @@ MACHINE_CONFIG_START(m92_state::dsoccr94j) MCFG_DEVICE_MODIFY("soundcpu") MCFG_V25_CONFIG(dsoccr94_decryption_table) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", psoldier) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_psoldier) MACHINE_CONFIG_END MACHINE_CONFIG_START(m92_state::gunforc2) diff --git a/src/mame/drivers/macrossp.cpp b/src/mame/drivers/macrossp.cpp index 07f7a6ba2b4..42f66522208 100644 --- a/src/mame/drivers/macrossp.cpp +++ b/src/mame/drivers/macrossp.cpp @@ -510,7 +510,7 @@ static const gfx_layout macrossp_char16x16x8layout = 16*128 }; -static GFXDECODE_START( macrossp ) +static GFXDECODE_START( gfx_macrossp ) GFXDECODE_ENTRY( "gfx1", 0, macrossp_char16x16x8layout, 0x000, 0x20 ) /* 8bpp but 6bpp granularity */ GFXDECODE_ENTRY( "gfx2", 0, macrossp_char16x16x8layout, 0x800, 0x20 ) /* 8bpp but 6bpp granularity */ GFXDECODE_ENTRY( "gfx3", 0, macrossp_char16x16x8layout, 0x800, 0x20 ) /* 8bpp but 6bpp granularity */ @@ -561,7 +561,7 @@ MACHINE_CONFIG_START(macrossp_state::macrossp) MCFG_SCREEN_UPDATE_DRIVER(macrossp_state, screen_update_macrossp) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, macrossp_state, screen_vblank_macrossp)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macrossp) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macrossp) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RGBX) diff --git a/src/mame/drivers/madmotor.cpp b/src/mame/drivers/madmotor.cpp index d438b1ac2ff..2f62c1958fd 100644 --- a/src/mame/drivers/madmotor.cpp +++ b/src/mame/drivers/madmotor.cpp @@ -233,7 +233,7 @@ static const gfx_layout spritelayout = 16*16 }; -static GFXDECODE_START( madmotor ) +static GFXDECODE_START( gfx_madmotor ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) /* Characters 8x8 */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 512, 16 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "gfx3", 0, tilelayout2, 768, 16 ) /* Tiles 16x16 */ @@ -279,7 +279,7 @@ MACHINE_CONFIG_START(madmotor_state::madmotor) MCFG_SCREEN_UPDATE_DRIVER(madmotor_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", madmotor) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_madmotor) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp index cd23c52f777..fe9fe162930 100644 --- a/src/mame/drivers/magic10.cpp +++ b/src/mame/drivers/magic10.cpp @@ -685,7 +685,7 @@ static const gfx_layout tiles16x16_layout = * Graphics Decode * ****************************/ -static GFXDECODE_START( magic10 ) +static GFXDECODE_START( gfx_magic10 ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0, tiles16x16_layout, 0, 16 ) GFXDECODE_END @@ -715,7 +715,7 @@ MACHINE_CONFIG_START(magic10_state::magic10) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", magic10) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_magic10) /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp index 9311baee9d9..8aad5870620 100644 --- a/src/mame/drivers/magicfly.cpp +++ b/src/mame/drivers/magicfly.cpp @@ -927,7 +927,7 @@ static const gfx_layout charlayout = * Graphics Decode Information * **************************************************/ -static GFXDECODE_START( magicfly ) +static GFXDECODE_START( gfx_magicfly ) GFXDECODE_ENTRY( "gfxbnk1", 0, tilelayout, 16, 1 ) GFXDECODE_ENTRY( "gfxbnk0", 0, charlayout, 0, 8 ) GFXDECODE_END @@ -954,7 +954,7 @@ MACHINE_CONFIG_START(magicfly_state::magicfly) MCFG_SCREEN_UPDATE_DRIVER(magicfly_state, screen_update_magicfly) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", magicfly) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_magicfly) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(magicfly_state, magicfly) diff --git a/src/mame/drivers/magmax.cpp b/src/mame/drivers/magmax.cpp index 1c92779f1eb..033dfca8eb4 100644 --- a/src/mame/drivers/magmax.cpp +++ b/src/mame/drivers/magmax.cpp @@ -322,7 +322,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( magmax ) +static GFXDECODE_START( gfx_magmax ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) /*no color codes*/ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 1*16, 16 ) /*16 color codes*/ GFXDECODE_END @@ -350,7 +350,7 @@ MACHINE_CONFIG_START(magmax_state::magmax) MCFG_SCREEN_UPDATE_DRIVER(magmax_state, screen_update_magmax) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", magmax) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_magmax) MCFG_PALETTE_ADD("palette", 1*16 + 16*16 + 256) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(magmax_state, magmax) diff --git a/src/mame/drivers/magreel.cpp b/src/mame/drivers/magreel.cpp index df11866ce77..3203c1be13e 100644 --- a/src/mame/drivers/magreel.cpp +++ b/src/mame/drivers/magreel.cpp @@ -134,7 +134,7 @@ MACHINE_CONFIG_START(magreel_state::magreel) // MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 442, 0, 320, 264, 0, 240) /* generic NTSC video timing at 320x240 */ // MCFG_SCREEN_PALETTE("palette") -// MCFG_GFXDECODE_ADD("gfxdecode", "palette", magreel) +// MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_magreel) // MCFG_PALETTE_ADD("palette", 8) // MCFG_PALETTE_INIT_OWNER(magreel_state, magreel) diff --git a/src/mame/drivers/mainsnk.cpp b/src/mame/drivers/mainsnk.cpp index 39f72905f61..3afe337182b 100644 --- a/src/mame/drivers/mainsnk.cpp +++ b/src/mame/drivers/mainsnk.cpp @@ -368,7 +368,7 @@ static const gfx_layout sprite_layout = }; -static GFXDECODE_START( mainsnk ) +static GFXDECODE_START( gfx_mainsnk ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0x100, 0x080>>4 ) GFXDECODE_ENTRY( "gfx2", 0, sprite_layout, 0x000, 0x080>>3 ) GFXDECODE_END @@ -394,7 +394,7 @@ MACHINE_CONFIG_START(mainsnk_state::mainsnk) MCFG_SCREEN_UPDATE_DRIVER(mainsnk_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mainsnk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mainsnk) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_INIT_OWNER(mainsnk_state, mainsnk) MCFG_PALETTE_ENABLE_SHADOWS() diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp index 2913071661d..dc3f819b01a 100644 --- a/src/mame/drivers/majorpkr.cpp +++ b/src/mame/drivers/majorpkr.cpp @@ -984,7 +984,7 @@ static const gfx_layout tilelayout = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( majorpkr ) +static GFXDECODE_START( gfx_majorpkr ) GFXDECODE_ENTRY( "bg_gfx", 0, tilelayout, 8*256, 8 ) GFXDECODE_ENTRY( "fg_gfx", 0, tilelayout, 0, 8 ) GFXDECODE_END @@ -1023,7 +1023,7 @@ MACHINE_CONFIG_START(majorpkr_state::majorpkr) MCFG_SCREEN_UPDATE_DRIVER(majorpkr_state, screen_update_majorpkr) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", majorpkr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_majorpkr) MCFG_PALETTE_ADD("palette", 0x100 * 16) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) diff --git a/src/mame/drivers/malzak.cpp b/src/mame/drivers/malzak.cpp index 17f9c98ebe4..cf82cac7b81 100644 --- a/src/mame/drivers/malzak.cpp +++ b/src/mame/drivers/malzak.cpp @@ -258,7 +258,7 @@ static const gfx_layout charlayout = }; -static GFXDECODE_START( malzak ) +static GFXDECODE_START( gfx_malzak ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 16 ) GFXDECODE_END @@ -316,7 +316,7 @@ MACHINE_CONFIG_START(malzak_state::malzak) MCFG_SCREEN_VISIBLE_AREA(0, 479, 0, 479) MCFG_SCREEN_UPDATE_DRIVER(malzak_state, screen_update_malzak) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", malzak) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_malzak) MCFG_PALETTE_ADD("palette", 128) MCFG_PALETTE_INIT_OWNER(malzak_state, malzak) diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp index 738e6b11667..d2b013fe385 100644 --- a/src/mame/drivers/mappy.cpp +++ b/src/mame/drivers/mappy.cpp @@ -1273,22 +1273,22 @@ static const gfx_layout spritelayout_4bpp = -static GFXDECODE_START( superpac ) +static GFXDECODE_START( gfx_superpac ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout_2bpp, 64*4, 64 ) GFXDECODE_END -static GFXDECODE_START( phozon ) +static GFXDECODE_START( gfx_phozon ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout_8x8, 64*4, 64 ) GFXDECODE_END -static GFXDECODE_START( mappy ) +static GFXDECODE_START( gfx_mappy ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout_4bpp, 64*4, 16 ) GFXDECODE_END -static GFXDECODE_START( todruaga ) +static GFXDECODE_START( gfx_todruaga ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout_4bpp, 64*4, 64 ) GFXDECODE_END @@ -1343,7 +1343,7 @@ MACHINE_CONFIG_START(mappy_state::superpac_common) MCFG_74157_B_IN_CB(IOPORT("DSW2")) MCFG_DEVCB_RSHIFT(4) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", superpac) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_superpac) MCFG_PALETTE_ADD("palette", 64*4+64*4) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(mappy_state,superpac) @@ -1471,7 +1471,7 @@ MACHINE_CONFIG_START(mappy_state::phozon) MCFG_74157_B_IN_CB(IOPORT("DSW2")) MCFG_DEVCB_RSHIFT(4) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", phozon) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_phozon) MCFG_PALETTE_ADD("palette", 64*4+64*4) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(mappy_state,phozon) @@ -1521,7 +1521,7 @@ MACHINE_CONFIG_START(mappy_state::mappy_common) MCFG_74157_B_IN_CB(IOPORT("DSW2")) MCFG_DEVCB_RSHIFT(4) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mappy) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mappy) MCFG_PALETTE_ADD("palette", 64*4+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(mappy_state,mappy) @@ -1585,7 +1585,7 @@ MACHINE_CONFIG_START(mappy_state::todruaga) digdug2(config); /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", todruaga) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_todruaga) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(64*4+64*16) MACHINE_CONFIG_END diff --git a/src/mame/drivers/marineb.cpp b/src/mame/drivers/marineb.cpp index 9a6f60cddf3..ea3c9ffaeec 100644 --- a/src/mame/drivers/marineb.cpp +++ b/src/mame/drivers/marineb.cpp @@ -497,30 +497,30 @@ static const gfx_layout changes_big_spritelayout = }; -static GFXDECODE_START( marineb ) +static GFXDECODE_START( gfx_marineb ) GFXDECODE_ENTRY( "gfx1", 0x0000, marineb_charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0x0000, marineb_small_spritelayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0x0000, marineb_big_spritelayout, 0, 64 ) GFXDECODE_END -static GFXDECODE_START( wanted ) +static GFXDECODE_START( gfx_wanted ) GFXDECODE_ENTRY( "gfx1", 0x0000, wanted_charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0x0000, marineb_small_spritelayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0x0000, marineb_big_spritelayout, 0, 64 ) GFXDECODE_END -static GFXDECODE_START( changes ) +static GFXDECODE_START( gfx_changes ) GFXDECODE_ENTRY( "gfx1", 0x0000, marineb_charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0x0000, changes_small_spritelayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0x1000, changes_big_spritelayout, 0, 64 ) GFXDECODE_END -static GFXDECODE_START( hoccer ) +static GFXDECODE_START( gfx_hoccer ) GFXDECODE_ENTRY( "gfx1", 0x0000, marineb_charlayout, 0, 16 ) /* no palette banks */ GFXDECODE_ENTRY( "gfx2", 0x0000, changes_small_spritelayout, 0, 16 ) /* no palette banks */ GFXDECODE_END -static GFXDECODE_START( hopprobo ) +static GFXDECODE_START( gfx_hopprobo ) GFXDECODE_ENTRY( "gfx1", 0x0000, hopprobo_charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0x0000, marineb_small_spritelayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0x0000, marineb_big_spritelayout, 0, 64 ) @@ -561,7 +561,7 @@ MACHINE_CONFIG_START(marineb_state::marineb) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, marineb_state, marineb_vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", marineb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_marineb) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(marineb_state, marineb) @@ -578,7 +578,7 @@ MACHINE_CONFIG_START(marineb_state::changes) /* basic machine hardware */ /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", changes) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_changes) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(marineb_state, screen_update_changes) MACHINE_CONFIG_END @@ -604,7 +604,7 @@ MACHINE_CONFIG_START(marineb_state::hoccer) /* basic machine hardware */ /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", hoccer) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_hoccer) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(marineb_state, screen_update_hoccer) MACHINE_CONFIG_END @@ -621,7 +621,7 @@ MACHINE_CONFIG_START(marineb_state::wanted) MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, marineb_state, irq_mask_w)) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", wanted) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_wanted) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(marineb_state, screen_update_springer) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, marineb_state, wanted_vblank_irq)) @@ -641,7 +641,7 @@ MACHINE_CONFIG_START(marineb_state::hopprobo) /* basic machine hardware */ /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", hopprobo) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_hopprobo) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(marineb_state, screen_update_hopprobo) MACHINE_CONFIG_END diff --git a/src/mame/drivers/marinedt.cpp b/src/mame/drivers/marinedt.cpp index 07a94018b9e..b9935ecf1fa 100644 --- a/src/mame/drivers/marinedt.cpp +++ b/src/mame/drivers/marinedt.cpp @@ -568,7 +568,7 @@ static const gfx_layout objlayout = 32*32*2 }; -static GFXDECODE_START( marinedt ) +static GFXDECODE_START( gfx_marinedt ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 4 ) GFXDECODE_ENTRY( "gfx2", 0, objlayout, 48, 4 ) GFXDECODE_ENTRY( "gfx3", 0, objlayout, 32, 4 ) @@ -640,7 +640,7 @@ MACHINE_CONFIG_START(marinedt_state::marinedt) MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 328, 0, 256, 263, 32, 256) // template to get ~60 fps MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", marinedt) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_marinedt) MCFG_PALETTE_ADD("palette", 64+64) MCFG_PALETTE_INIT_OWNER(marinedt_state, marinedt) diff --git a/src/mame/drivers/mario.cpp b/src/mame/drivers/mario.cpp index 325d8a21a4e..e1c2a574357 100644 --- a/src/mame/drivers/mario.cpp +++ b/src/mame/drivers/mario.cpp @@ -317,7 +317,7 @@ static const gfx_layout spritelayout = 16*8 /* every sprite takes 16 consecutive bytes */ }; -static GFXDECODE_START( mario ) +static GFXDECODE_START( gfx_mario ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 32 ) GFXDECODE_END @@ -365,7 +365,7 @@ MACHINE_CONFIG_START(mario_state::mario_base) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mario_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mario) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mario) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(mario_state, mario) diff --git a/src/mame/drivers/markham.cpp b/src/mame/drivers/markham.cpp index 1c1636002fc..63b21464925 100644 --- a/src/mame/drivers/markham.cpp +++ b/src/mame/drivers/markham.cpp @@ -173,7 +173,7 @@ static const gfx_layout spritelayout = 8*8*4 }; -static GFXDECODE_START( markham ) +static GFXDECODE_START( gfx_markham ) GFXDECODE_ENTRY( "gfx2", 0x0000, charlayout, 512, 64 ) GFXDECODE_ENTRY( "gfx1", 0x0000, spritelayout, 0, 64 ) GFXDECODE_END @@ -201,7 +201,7 @@ MACHINE_CONFIG_START(markham_state::markham) MCFG_SCREEN_UPDATE_DRIVER(markham_state, screen_update_markham) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", markham) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_markham) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(markham_state, markham) diff --git a/src/mame/drivers/mastboy.cpp b/src/mame/drivers/mastboy.cpp index a536770e682..ffd9b143e06 100644 --- a/src/mame/drivers/mastboy.cpp +++ b/src/mame/drivers/mastboy.cpp @@ -782,7 +782,7 @@ static const gfx_layout tiles8x8_layout_2 = }; -static GFXDECODE_START( mastboy ) +static GFXDECODE_START( gfx_mastboy ) GFXDECODE_RAM( "vram", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_ENTRY( "vrom", 0, tiles8x8_layout_2, 0, 16 ) GFXDECODE_END @@ -838,7 +838,7 @@ MACHINE_CONFIG_START(mastboy_state::mastboy) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mastboy_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mastboy) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mastboy) MCFG_PALETTE_ADD("palette", 0x100) // sound hardware diff --git a/src/mame/drivers/mastboyo.cpp b/src/mame/drivers/mastboyo.cpp index 41d49ecc69c..d5af2d4f4c2 100644 --- a/src/mame/drivers/mastboyo.cpp +++ b/src/mame/drivers/mastboyo.cpp @@ -160,7 +160,7 @@ static const gfx_layout tiles8x8_layout = 32*8 }; -static GFXDECODE_START( mastboyo ) +static GFXDECODE_START( gfx_mastboyo ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_END @@ -202,7 +202,7 @@ MACHINE_CONFIG_START(mastboyo_state::mastboyo) MCFG_SCREEN_UPDATE_DRIVER(mastboyo_state, screen_update_mastboyo) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mastboyo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mastboyo) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(mastboyo_state, mastboyo) diff --git a/src/mame/drivers/matmania.cpp b/src/mame/drivers/matmania.cpp index 915dd3fd184..441841e92bd 100644 --- a/src/mame/drivers/matmania.cpp +++ b/src/mame/drivers/matmania.cpp @@ -279,13 +279,13 @@ static const gfx_layout maniach_tilelayout = 32*8 /* every tile takes 16 consecutive bytes */ }; -static GFXDECODE_START( matmania ) +static GFXDECODE_START( gfx_matmania ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 4 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 4*8, 4 ) GFXDECODE_ENTRY( "gfx3", 0, matmania_spritelayout, 8*8, 2 ) GFXDECODE_END -static GFXDECODE_START( maniach ) +static GFXDECODE_START( gfx_maniach ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 4 ) GFXDECODE_ENTRY( "gfx2", 0, maniach_tilelayout, 4*8, 4 ) GFXDECODE_ENTRY( "gfx3", 0, maniach_spritelayout, 8*8, 2 ) @@ -321,7 +321,7 @@ MACHINE_CONFIG_START(matmania_state::matmania) MCFG_SCREEN_UPDATE_DRIVER(matmania_state, screen_update_matmania) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", matmania) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_matmania) MCFG_PALETTE_ADD("palette", 64+16) MCFG_PALETTE_INIT_OWNER(matmania_state, matmania) @@ -365,7 +365,7 @@ MACHINE_CONFIG_START(matmania_state::maniach) MCFG_SCREEN_UPDATE_DRIVER(matmania_state, screen_update_maniach) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", maniach) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_maniach) MCFG_PALETTE_ADD("palette", 64+16) MCFG_PALETTE_INIT_OWNER(matmania_state, matmania) diff --git a/src/mame/drivers/mbc200.cpp b/src/mame/drivers/mbc200.cpp index a48402f1a2f..06c2c5e5a56 100644 --- a/src/mame/drivers/mbc200.cpp +++ b/src/mame/drivers/mbc200.cpp @@ -295,7 +295,7 @@ static const gfx_layout mbc200_chars_8x8 = 8*8 }; -static GFXDECODE_START( mbc200 ) +static GFXDECODE_START( gfx_mbc200 ) GFXDECODE_ENTRY( "subcpu", 0x1800, mbc200_chars_8x8, 0, 1 ) GFXDECODE_END @@ -317,7 +317,7 @@ MACHINE_CONFIG_START(mbc200_state::mbc200) MCFG_SCREEN_SIZE(640, 400) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1) MCFG_SCREEN_UPDATE_DEVICE("crtc", h46505_device, screen_update) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mbc200) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mbc200) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(8'000'000) / 4) // HD46505SP diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp index 1dd58c8ba8c..ad60406944f 100644 --- a/src/mame/drivers/mbee.cpp +++ b/src/mame/drivers/mbee.cpp @@ -626,15 +626,15 @@ static const gfx_layout mbee_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( mono ) +static GFXDECODE_START( gfx_mono ) GFXDECODE_ENTRY( "gfx", 0x0000, mbee_charlayout, 96, 1 ) GFXDECODE_END -static GFXDECODE_START( standard ) +static GFXDECODE_START( gfx_standard ) GFXDECODE_ENTRY( "gfx", 0x0000, mbee_charlayout, 0, 48 ) GFXDECODE_END -static GFXDECODE_START( premium ) +static GFXDECODE_START( gfx_premium ) GFXDECODE_ENTRY( "gfx", 0x0000, mbee_charlayout, 0, 8 ) GFXDECODE_END @@ -668,7 +668,7 @@ MACHINE_CONFIG_START(mbee_state::mbee) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0, 19*16-1) MCFG_SCREEN_UPDATE_DRIVER(mbee_state, screen_update_mbee) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mono) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mono) MCFG_PALETTE_ADD("palette", 100) MCFG_PALETTE_INIT_OWNER(mbee_state, standard) @@ -725,7 +725,7 @@ MACHINE_CONFIG_START(mbee_state::mbeeic) MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 19*16-1) MCFG_SCREEN_UPDATE_DRIVER(mbee_state, screen_update_mbee) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", standard) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_standard) MCFG_PALETTE_ADD("palette", 100) MCFG_PALETTE_INIT_OWNER(mbee_state, standard) @@ -771,7 +771,7 @@ MACHINE_CONFIG_START(mbee_state::mbeeppc) MCFG_DEVICE_PROGRAM_MAP(mbeeppc_mem) MCFG_DEVICE_IO_MAP(mbeeppc_io) MCFG_VIDEO_START_OVERRIDE(mbee_state, premium) - MCFG_GFXDECODE_MODIFY("gfxdecode", premium) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_premium) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(mbee_state, premium) MCFG_MC146818_ADD( "rtc", XTAL(32'768) ) diff --git a/src/mame/drivers/mcatadv.cpp b/src/mame/drivers/mcatadv.cpp index e6bc1db30a0..972b657f216 100644 --- a/src/mame/drivers/mcatadv.cpp +++ b/src/mame/drivers/mcatadv.cpp @@ -418,7 +418,7 @@ static const gfx_layout layout_16x16x4 = 16*16*4 }; -static GFXDECODE_START( mcatadv ) +static GFXDECODE_START( gfx_mcatadv ) GFXDECODE_ENTRY( "bg0", 0, layout_16x16x4, 0, 0x200 ) GFXDECODE_ENTRY( "bg1", 0, layout_16x16x4, 0, 0x200 ) GFXDECODE_END @@ -456,7 +456,7 @@ MACHINE_CONFIG_START(mcatadv_state::mcatadv) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mcatadv_state, screen_vblank_mcatadv)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mcatadv) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mcatadv) MCFG_PALETTE_ADD("palette", 0x2000/2) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp index e53aa955ddd..bbc42c002e1 100644 --- a/src/mame/drivers/mcr.cpp +++ b/src/mame/drivers/mcr.cpp @@ -1714,7 +1714,7 @@ INPUT_PORTS_END * *************************************/ -static GFXDECODE_START( mcr ) +static GFXDECODE_START( gfx_mcr ) GFXDECODE_SCALE( "gfx1", 0, mcr_bg_layout, 0, 4, 2, 2 ) /* colors 0-15, 2x2 */ GFXDECODE_ENTRY( "gfx2", 0, mcr_sprite_layout, 0, 4 ) /* colors 16-31 */ GFXDECODE_END @@ -1777,7 +1777,7 @@ MACHINE_CONFIG_START(mcr_state::mcr_90009) MCFG_SCREEN_UPDATE_DRIVER(mcr_state, screen_update_mcr) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mcr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mcr) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_FORMAT(xxxxRRRRBBBBGGGG) diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp index 1d18d9de339..3af3f26e2ef 100644 --- a/src/mame/drivers/mcr3.cpp +++ b/src/mame/drivers/mcr3.cpp @@ -1058,13 +1058,13 @@ static const gfx_layout spyhunt_alphalayout = }; -static GFXDECODE_START( mcr3 ) +static GFXDECODE_START( gfx_mcr3 ) GFXDECODE_SCALE( "gfx1", 0, mcr_bg_layout, 0, 4, 2, 2 ) GFXDECODE_ENTRY( "gfx2", 0, mcr_sprite_layout, 0, 4 ) GFXDECODE_END -static GFXDECODE_START( spyhunt ) +static GFXDECODE_START( gfx_spyhunt ) GFXDECODE_ENTRY( "gfx1", 0, spyhunt_charlayout, 3*16, 1 ) GFXDECODE_ENTRY( "gfx2", 0, mcr_sprite_layout, 0*16, 4 ) GFXDECODE_ENTRY( "gfx3", 0, spyhunt_alphalayout, 4*16, 1 ) @@ -1110,7 +1110,7 @@ MACHINE_CONFIG_START(mcr3_state::mcrmono) MCFG_SCREEN_UPDATE_DRIVER(mcr3_state, screen_update_mcr3) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mcr3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mcr3) MCFG_PALETTE_ADD("palette", 64) MACHINE_CONFIG_END @@ -1170,7 +1170,7 @@ MACHINE_CONFIG_START(mcr3_state::mcrscroll) MCFG_SCREEN_SIZE(30*16, 30*16) MCFG_SCREEN_VISIBLE_AREA(0, 30*16-1, 0, 30*16-1) MCFG_SCREEN_UPDATE_DRIVER(mcr3_state, screen_update_spyhunt) - MCFG_GFXDECODE_MODIFY("gfxdecode", spyhunt) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_spyhunt) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(64+4) diff --git a/src/mame/drivers/mcr68.cpp b/src/mame/drivers/mcr68.cpp index 66887f18624..362d4cec05a 100644 --- a/src/mame/drivers/mcr68.cpp +++ b/src/mame/drivers/mcr68.cpp @@ -855,7 +855,7 @@ static const gfx_layout mcr68_sprite_layout = 32*32 }; -static GFXDECODE_START( mcr68 ) +static GFXDECODE_START( gfx_mcr68 ) GFXDECODE_SCALE( "gfx1", 0, mcr68_bg_layout, 0, 4, 2, 2 ) GFXDECODE_ENTRY( "gfx2", 0, mcr68_sprite_layout, 0, 4 ) GFXDECODE_END @@ -920,7 +920,7 @@ MACHINE_CONFIG_START(mcr68_state::mcr68) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mcr68_state, scanline_cb, "screen", 0, 1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mcr68) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mcr68) MCFG_PALETTE_ADD("palette", 64) MCFG_PALETTE_FORMAT(xxxxxxxRRRBBBGGG) diff --git a/src/mame/drivers/meadows.cpp b/src/mame/drivers/meadows.cpp index 79268ac50dc..a28d966de48 100644 --- a/src/mame/drivers/meadows.cpp +++ b/src/mame/drivers/meadows.cpp @@ -582,7 +582,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( meadows ) +static GFXDECODE_START( gfx_meadows ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) /* character generator */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 1 ) /* sprite prom 1 */ GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0, 1 ) /* sprite prom 2 */ @@ -591,7 +591,7 @@ static GFXDECODE_START( meadows ) GFXDECODE_END -static GFXDECODE_START( minferno ) +static GFXDECODE_START( gfx_minferno ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 4 ) GFXDECODE_END @@ -642,7 +642,7 @@ MACHINE_CONFIG_START(meadows_state::meadows) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, meadows_state, meadows_vblank_irq)) // one interrupt per frame!? - MCFG_GFXDECODE_ADD("gfxdecode", "palette", meadows) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_meadows) MCFG_PALETTE_ADD_MONOCHROME("palette") /* audio hardware */ @@ -674,7 +674,7 @@ MACHINE_CONFIG_START(meadows_state::minferno) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, meadows_state, minferno_vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", minferno) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_minferno) MCFG_PALETTE_ADD_MONOCHROME("palette") /* audio hardware */ @@ -703,7 +703,7 @@ MACHINE_CONFIG_START(meadows_state::bowl3d) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, meadows_state, meadows_vblank_irq)) // one interrupt per frame!? - MCFG_GFXDECODE_ADD("gfxdecode", "palette", meadows) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_meadows) MCFG_PALETTE_ADD_MONOCHROME("palette") /* audio hardware */ diff --git a/src/mame/drivers/mediagx.cpp b/src/mame/drivers/mediagx.cpp index 69f284f6f75..863fbe98a03 100644 --- a/src/mame/drivers/mediagx.cpp +++ b/src/mame/drivers/mediagx.cpp @@ -791,7 +791,7 @@ static const gfx_layout CGA_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( CGA ) +static GFXDECODE_START( gfx_cga ) /* Support up to four CGA fonts */ GFXDECODE_ENTRY( "gfx1", 0x0000, CGA_charlayout, 0, 256 ) /* Font 0 */ GFXDECODE_ENTRY( "gfx1", 0x0800, CGA_charlayout, 0, 256 ) /* Font 1 */ @@ -907,7 +907,7 @@ MACHINE_CONFIG_START(mediagx_state::mediagx) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(mediagx_state, screen_update_mediagx) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", CGA) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cga) MCFG_PALETTE_ADD("palette", 256) diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp index 7e9c66ceb6d..b341c618d01 100644 --- a/src/mame/drivers/megasys1.cpp +++ b/src/mame/drivers/megasys1.cpp @@ -1652,13 +1652,13 @@ static const gfx_layout spritelayout = 16*16*4 }; -static GFXDECODE_START( Z ) +static GFXDECODE_START( gfx_z ) //GFXDECODE_ENTRY( "scroll0", 0, tilelayout, 256*0, 16 ) // [0] Scroll 0 //GFXDECODE_ENTRY( "scroll1", 0, tilelayout, 256*2, 16 ) // [1] Scroll 1 GFXDECODE_ENTRY( "sprites", 0, spritelayout, 256*1, 16 ) // [2] Sprites GFXDECODE_END -static GFXDECODE_START( ABC ) +static GFXDECODE_START( gfx_abc ) //GFXDECODE_ENTRY( "scroll0", 0, tilelayout, 256*0, 16 ) // [0] Scroll 0 //GFXDECODE_ENTRY( "scroll1", 0, tilelayout, 256*1, 16 ) // [1] Scroll 1 //GFXDECODE_ENTRY( "scroll2", 0, tilelayout, 256*2, 16 ) // [2] Scroll 2 (unused in system D) @@ -1705,7 +1705,7 @@ MACHINE_CONFIG_START(megasys1_state::system_A) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ABC) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_abc) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) MCFG_PALETTE_INIT_OWNER(megasys1_state,megasys1) @@ -1810,7 +1810,7 @@ MACHINE_CONFIG_START(megasys1_state::system_Bbl) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ABC) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_abc) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) MCFG_PALETTE_INIT_OWNER(megasys1_state,megasys1) @@ -1890,7 +1890,7 @@ MACHINE_CONFIG_START(megasys1_state::system_D) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, megasys1_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ABC) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_abc) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) MCFG_PALETTE_INIT_OWNER(megasys1_state,megasys1) @@ -1941,7 +1941,7 @@ MACHINE_CONFIG_START(megasys1_state::system_Z) MCFG_SCREEN_UPDATE_DRIVER(megasys1_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", Z) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_z) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) diff --git a/src/mame/drivers/megazone.cpp b/src/mame/drivers/megazone.cpp index 94980a18b60..df23564e5d1 100644 --- a/src/mame/drivers/megazone.cpp +++ b/src/mame/drivers/megazone.cpp @@ -271,7 +271,7 @@ static const gfx_layout spritelayout = 64*8 /* every sprite takes 64 consecutive bytes */ }; -static GFXDECODE_START( megazone ) +static GFXDECODE_START( gfx_megazone ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 16*16, 16 ) GFXDECODE_END @@ -334,7 +334,7 @@ MACHINE_CONFIG_START(megazone_state::megazone) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, megazone_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", megazone) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_megazone) MCFG_PALETTE_ADD("palette", 16*16+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(megazone_state, megazone) diff --git a/src/mame/drivers/mermaid.cpp b/src/mame/drivers/mermaid.cpp index cd64dc8d349..2eb1fbfb680 100644 --- a/src/mame/drivers/mermaid.cpp +++ b/src/mame/drivers/mermaid.cpp @@ -349,7 +349,7 @@ static const gfx_layout spritelayout = /* Graphics Decode Information */ -static GFXDECODE_START( mermaid ) +static GFXDECODE_START( gfx_mermaid ) GFXDECODE_ENTRY( "gfx1", 0, foreground_charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, background_charlayout, 4*16, 2 ) @@ -450,7 +450,7 @@ MACHINE_CONFIG_START(mermaid_state::mermaid) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mermaid_state, screen_vblank_mermaid)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mermaid) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mermaid) MCFG_PALETTE_ADD("palette", 4*16+2*2) MCFG_PALETTE_INDIRECT_ENTRIES(64+1) MCFG_PALETTE_INIT_OWNER(mermaid_state, mermaid) diff --git a/src/mame/drivers/metlclsh.cpp b/src/mame/drivers/metlclsh.cpp index 66c355836de..94e8b35a328 100644 --- a/src/mame/drivers/metlclsh.cpp +++ b/src/mame/drivers/metlclsh.cpp @@ -248,7 +248,7 @@ static const gfx_layout tilelayout8 = 8*8 }; -static GFXDECODE_START( metlclsh ) +static GFXDECODE_START( gfx_metlclsh ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0x00, 2 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, tilelayout16, 0x10, 1 ) // [1] Background GFXDECODE_ENTRY( "gfx3", 0, tilelayout8, 0x20, 4 ) // [2] Foreground @@ -296,7 +296,7 @@ MACHINE_CONFIG_START(metlclsh_state::metlclsh) MCFG_SCREEN_UPDATE_DRIVER(metlclsh_state, screen_update_metlclsh) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", metlclsh) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_metlclsh) MCFG_PALETTE_ADD("palette", 3 * 16) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/metlfrzr.cpp b/src/mame/drivers/metlfrzr.cpp index a215b22f615..55f2a2a0227 100644 --- a/src/mame/drivers/metlfrzr.cpp +++ b/src/mame/drivers/metlfrzr.cpp @@ -343,7 +343,7 @@ static const gfx_layout sprite_layout = }; -static GFXDECODE_START(metlfrzr) +static GFXDECODE_START(gfx_metlfrzr) GFXDECODE_ENTRY("gfx1", 0, tile_layout, 0x100, 16) GFXDECODE_ENTRY("gfx2", 0, tile_layout, 0x100, 16) GFXDECODE_ENTRY("gfx3", 0, sprite_layout, 0, 16) @@ -376,7 +376,7 @@ MACHINE_CONFIG_START(metlfrzr_state::metlfrzr) MCFG_PALETTE_INDIRECT_ENTRIES(256*2) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", metlfrzr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_metlfrzr) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index 5a580f47897..ece5421b8ac 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -2997,18 +2997,18 @@ static const gfx_layout layout_053936_16 = 8*8*8*4 }; -static GFXDECODE_START( i4100 ) +static GFXDECODE_START( gfx_i4100 ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x4, 0x0, 0x100 ) // [0] 4 Bit Tiles GFXDECODE_END -static GFXDECODE_START( i4220 ) +static GFXDECODE_START( gfx_i4220 ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x4, 0x0, 0x100 ) // [0] 4 Bit Tiles GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x8, 0x0, 0x10 ) // [1] 8 Bit Tiles GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x0, 0x100 ) // [2] 4 Bit Tiles 16x16 GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0x0, 0x10 ) // [3] 8 Bit Tiles 16x16 GFXDECODE_END -static GFXDECODE_START( blzntrnd ) +static GFXDECODE_START( gfx_blzntrnd ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x4, 0x0, 0x100 ) // [0] 4 Bit Tiles GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x8, 0x0, 0x10 ) // [1] 8 Bit Tiles GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x0, 0x100 ) // [2] 4 Bit Tiles 16x16 @@ -3016,7 +3016,7 @@ static GFXDECODE_START( blzntrnd ) GFXDECODE_ENTRY( "gfx2", 0, layout_053936, 0x0, 0x10 ) // [4] 053936 Tiles GFXDECODE_END -static GFXDECODE_START( gstrik2 ) +static GFXDECODE_START( gfx_gstrik2 ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x4, 0x0, 0x100 ) // [0] 4 Bit Tiles GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x8, 0x0, 0x10 ) // [1] 8 Bit Tiles GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x0, 0x100 ) // [2] 4 Bit Tiles 16x16 @@ -3025,7 +3025,7 @@ static GFXDECODE_START( gstrik2 ) GFXDECODE_END // same as i4220: -static GFXDECODE_START( i4300 ) +static GFXDECODE_START( gfx_i4300 ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x4, 0x0, 0x100 ) // [0] 4 Bit Tiles GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x8, 0x0, 0x10 ) // [1] 8 Bit Tiles GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x0, 0x100 ) // [2] 4 Bit Tiles 16x16 @@ -3067,7 +3067,7 @@ MACHINE_CONFIG_START(metro_state::i4100_config) MCFG_SCREEN_UPDATE_DEVICE("vdp", imagetek_i4100_device, screen_update) MCFG_SCREEN_PALETTE("vdp:palette") - MCFG_GFXDECODE_ADD("gfxdecode", "vdp:palette", i4100) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "vdp:palette", gfx_i4100) MACHINE_CONFIG_END MACHINE_CONFIG_START(metro_state::i4220_config) @@ -3083,7 +3083,7 @@ MACHINE_CONFIG_START(metro_state::i4220_config) MCFG_SCREEN_UPDATE_DEVICE("vdp2", imagetek_i4100_device, screen_update) MCFG_SCREEN_PALETTE("vdp2:palette") - MCFG_GFXDECODE_ADD("gfxdecode", "vdp2:palette", i4220) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "vdp2:palette", gfx_i4220) MACHINE_CONFIG_END MACHINE_CONFIG_START(metro_state::i4300_config) @@ -3099,7 +3099,7 @@ MACHINE_CONFIG_START(metro_state::i4300_config) MCFG_SCREEN_UPDATE_DEVICE("vdp3", imagetek_i4100_device, screen_update) MCFG_SCREEN_PALETTE("vdp3:palette") - MCFG_GFXDECODE_ADD("gfxdecode", "vdp3:palette", i4300) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "vdp3:palette", gfx_i4300) MACHINE_CONFIG_END // TODO: these comes from the CRTC inside the i4100 @@ -3750,7 +3750,7 @@ MACHINE_CONFIG_START(metro_state::blzntrnd) MCFG_VIDEO_START_OVERRIDE(metro_state,blzntrnd) - MCFG_GFXDECODE_ADD("gfxdecode", "vdp2:palette", blzntrnd) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "vdp2:palette", gfx_blzntrnd) MCFG_DEVICE_ADD("k053936", K053936, 0) MCFG_K053936_OFFSETS(-77, -21) @@ -3773,7 +3773,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(metro_state::gstrik2) blzntrnd(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", gstrik2) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_gstrik2) MCFG_VIDEO_START_OVERRIDE(metro_state,gstrik2) MCFG_DEVICE_MODIFY("k053936") diff --git a/src/mame/drivers/mexico86.cpp b/src/mame/drivers/mexico86.cpp index b417aa38bad..ebdfca246c2 100644 --- a/src/mame/drivers/mexico86.cpp +++ b/src/mame/drivers/mexico86.cpp @@ -373,7 +373,7 @@ static const gfx_layout charlayout = 16*8 }; -static GFXDECODE_START( mexico86 ) +static GFXDECODE_START( gfx_mexico86 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -456,7 +456,7 @@ MACHINE_CONFIG_START(mexico86_state::mexico86) MCFG_SCREEN_UPDATE_DRIVER(mexico86_state, screen_update_mexico86) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mexico86) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mexico86) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp index 79172ea909d..88cbab619ae 100644 --- a/src/mame/drivers/mgames.cpp +++ b/src/mame/drivers/mgames.cpp @@ -630,7 +630,7 @@ static const gfx_layout tiles16x16_layout = 16*16 }; -static GFXDECODE_START( mgames ) +static GFXDECODE_START( gfx_mgames ) GFXDECODE_ENTRY( "gfx1", 0, tiles16x16_layout, 0, 0x100 ) GFXDECODE_END @@ -652,7 +652,7 @@ MACHINE_CONFIG_START(mgames_state::mgames) MCFG_SCREEN_UPDATE_DRIVER(mgames_state, screen_update_mgames) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mgames) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mgames) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(mgames_state, mgames) diff --git a/src/mame/drivers/mgolf.cpp b/src/mame/drivers/mgolf.cpp index 91b11af46e5..81de74c27cd 100644 --- a/src/mame/drivers/mgolf.cpp +++ b/src/mame/drivers/mgolf.cpp @@ -343,7 +343,7 @@ static const gfx_layout sprite_layout = }; -static GFXDECODE_START( mgolf ) +static GFXDECODE_START( gfx_mgolf ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, sprite_layout, 0, 2 ) GFXDECODE_END @@ -383,7 +383,7 @@ MACHINE_CONFIG_START(mgolf_state::mgolf) MCFG_SCREEN_UPDATE_DRIVER(mgolf_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mgolf) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mgolf) MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(mgolf_state, mgolf) diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp index 1e37ae934be..227c3ed9d2a 100644 --- a/src/mame/drivers/micral.cpp +++ b/src/mame/drivers/micral.cpp @@ -393,7 +393,7 @@ MACHINE_CONFIG_START(micral_state::micral) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD_MONOCHROME("palette") - //MCFG_GFXDECODE_ADD("gfxdecode", "palette", micral) + //MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_micral) MCFG_DEVICE_ADD("crtc", CRT5037, 4000000 / 8) // xtal freq unknown MCFG_TMS9927_CHAR_WIDTH(8) // unknown diff --git a/src/mame/drivers/microtan.cpp b/src/mame/drivers/microtan.cpp index 67b03b48cf6..1281c1bfa83 100644 --- a/src/mame/drivers/microtan.cpp +++ b/src/mame/drivers/microtan.cpp @@ -204,7 +204,7 @@ static const gfx_layout chunky_layout = 8 * 16 /* code takes 8 times 16 bits */ }; -static GFXDECODE_START( microtan ) +static GFXDECODE_START( gfx_microtan ) GFXDECODE_ENTRY( "gfx1", 0, char_layout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, chunky_layout, 0, 1 ) GFXDECODE_END @@ -226,7 +226,7 @@ MACHINE_CONFIG_START(microtan_state::microtan) MCFG_SCREEN_UPDATE_DRIVER(microtan_state, screen_update_microtan) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", microtan) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_microtan) MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/midas.cpp b/src/mame/drivers/midas.cpp index 26d267e117d..a9175b6a004 100644 --- a/src/mame/drivers/midas.cpp +++ b/src/mame/drivers/midas.cpp @@ -329,7 +329,7 @@ static const gfx_layout layout8x8x8_2 = 32*8*2 }; -static GFXDECODE_START( midas ) +static GFXDECODE_START( gfx_midas ) GFXDECODE_ENTRY( "sprites", 0, layout16x16x8, 0, 0x100 ) GFXDECODE_ENTRY( "tiles", 0, layout8x8x8_2, 0, 0x80 ) GFXDECODE_END @@ -645,7 +645,7 @@ MACHINE_CONFIG_START(midas_state::livequiz) MCFG_DEVICE_ADD("spritegen", NEOGEO_SPRITE_MIDAS, 0) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", midas) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_midas) MCFG_PALETTE_ADD("palette", 0x10000) MCFG_PALETTE_FORMAT(XRGB) @@ -678,7 +678,7 @@ MACHINE_CONFIG_START(midas_state::hammer) MCFG_DEVICE_ADD("spritegen", NEOGEO_SPRITE_MIDAS, 0) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", midas) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_midas) MCFG_PALETTE_ADD("palette", 0x10000) MCFG_PALETTE_FORMAT(XRGB) diff --git a/src/mame/drivers/mikie.cpp b/src/mame/drivers/mikie.cpp index b8875922b5d..1a88b0acbef 100644 --- a/src/mame/drivers/mikie.cpp +++ b/src/mame/drivers/mikie.cpp @@ -228,7 +228,7 @@ static const gfx_layout spritelayout = 128*8 /* every sprite takes 64 bytes */ }; -static GFXDECODE_START( mikie ) +static GFXDECODE_START( gfx_mikie ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 16*8 ) GFXDECODE_ENTRY( "gfx2", 0x0000, spritelayout, 16*8*16, 16*8 ) GFXDECODE_ENTRY( "gfx2", 0x0001, spritelayout, 16*8*16, 16*8 ) @@ -287,7 +287,7 @@ MACHINE_CONFIG_START(mikie_state::mikie) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mikie_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mikie) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mikie) MCFG_PALETTE_ADD("palette", 16*8*16+16*8*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(mikie_state, mikie) diff --git a/src/mame/drivers/mikro80.cpp b/src/mame/drivers/mikro80.cpp index 94fdda391aa..e0df45768fd 100644 --- a/src/mame/drivers/mikro80.cpp +++ b/src/mame/drivers/mikro80.cpp @@ -160,7 +160,7 @@ static const gfx_layout mikro80_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( mikro80 ) +static GFXDECODE_START( gfx_mikro80 ) GFXDECODE_ENTRY( "gfx1", 0x0000, mikro80_charlayout, 0, 1 ) GFXDECODE_END @@ -184,7 +184,7 @@ MACHINE_CONFIG_START(mikro80_state::mikro80) MCFG_SCREEN_UPDATE_DRIVER(mikro80_state, screen_update_mikro80) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mikro80) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mikro80) MCFG_PALETTE_ADD_MONOCHROME("palette") SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/mikrosha.cpp b/src/mame/drivers/mikrosha.cpp index d15ed7f5a55..2b578241d3c 100644 --- a/src/mame/drivers/mikrosha.cpp +++ b/src/mame/drivers/mikrosha.cpp @@ -201,7 +201,7 @@ static const gfx_layout mikrosha_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( mikrosha ) +static GFXDECODE_START( gfx_mikrosha ) GFXDECODE_ENTRY( "gfx1", 0x0000, mikrosha_charlayout, 0, 1 ) GFXDECODE_END @@ -240,7 +240,7 @@ MACHINE_CONFIG_START(mikrosha_state::mikrosha) MCFG_SCREEN_SIZE(78*6, 30*10) MCFG_SCREEN_VISIBLE_AREA(0, 78*6-1, 0, 30*10-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mikrosha) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mikrosha) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(mikrosha_state,radio86) diff --git a/src/mame/drivers/mil4000.cpp b/src/mame/drivers/mil4000.cpp index 0159fb64b95..78315a91980 100644 --- a/src/mame/drivers/mil4000.cpp +++ b/src/mame/drivers/mil4000.cpp @@ -554,7 +554,7 @@ static const gfx_layout tilelayout = }; -static GFXDECODE_START( mil4000 ) +static GFXDECODE_START( gfx_mil4000 ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 0x800/32 ) GFXDECODE_END @@ -578,7 +578,7 @@ MACHINE_CONFIG_START(mil4000_state::mil4000) MCFG_PALETTE_ADD_INIT_BLACK("palette", 0x800) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mil4000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mil4000) SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("oki", OKIM6295, 1000000, okim6295_device::PIN7_HIGH) // frequency from 1000 kHz resonator. pin 7 high not verified. diff --git a/src/mame/drivers/miniboy7.cpp b/src/mame/drivers/miniboy7.cpp index d0084485777..e1c066f0a89 100644 --- a/src/mame/drivers/miniboy7.cpp +++ b/src/mame/drivers/miniboy7.cpp @@ -489,7 +489,7 @@ static const gfx_layout tilelayout = * Graphics Decode Information * ****************************************/ -static GFXDECODE_START( miniboy7 ) +static GFXDECODE_START( gfx_miniboy7 ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 128 ) /* text layer */ /* 0x000 cards @@ -527,7 +527,7 @@ MACHINE_CONFIG_START(miniboy7_state::miniboy7) MCFG_SCREEN_VISIBLE_AREA(0*8, 37*8-1, 0*8, 37*8-1) /* Taken from MC6845, registers 01 & 06 */ MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", miniboy7) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_miniboy7) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(miniboy7_state, miniboy7) diff --git a/src/mame/drivers/mirage.cpp b/src/mame/drivers/mirage.cpp index cead6f66e70..96b11738e82 100644 --- a/src/mame/drivers/mirage.cpp +++ b/src/mame/drivers/mirage.cpp @@ -266,7 +266,7 @@ static const gfx_layout spritelayout = 32*32 }; -static GFXDECODE_START( mirage ) +static GFXDECODE_START( gfx_mirage ) 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) */ @@ -309,7 +309,7 @@ MACHINE_CONFIG_START(miragemj_state::mirage) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mirage) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mirage) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/mirax.cpp b/src/mame/drivers/mirax.cpp index 52fc3f69234..881ebfa5716 100644 --- a/src/mame/drivers/mirax.cpp +++ b/src/mame/drivers/mirax.cpp @@ -466,7 +466,7 @@ static const gfx_layout layout8 = 8*8 }; -static GFXDECODE_START( mirax ) +static GFXDECODE_START( gfx_mirax ) GFXDECODE_ENTRY( "gfx1", 0, layout8, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0, layout16, 0, 8 ) GFXDECODE_END @@ -507,7 +507,7 @@ MACHINE_CONFIG_START(mirax_state::mirax) MCFG_PALETTE_ADD("palette", 0x40) MCFG_PALETTE_INIT_OWNER(mirax_state, mirax) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mirax) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mirax) SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/missb2.cpp b/src/mame/drivers/missb2.cpp index 043e299eb10..3d6b1a6ed22 100644 --- a/src/mame/drivers/missb2.cpp +++ b/src/mame/drivers/missb2.cpp @@ -420,12 +420,12 @@ static const gfx_layout bglayout_alt = /* Graphics Decode Information */ -static GFXDECODE_START( missb2 ) +static GFXDECODE_START( gfx_missb2 ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0x00000, bglayout, 0, 2 ) GFXDECODE_END -static GFXDECODE_START( bublpong ) +static GFXDECODE_START( gfx_bublpong ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0x00000, bglayout_alt, 0, 2 ) GFXDECODE_END @@ -492,7 +492,7 @@ MACHINE_CONFIG_START(missb2_state::missb2) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(missb2_state, screen_update_missb2) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", missb2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_missb2) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) @@ -522,7 +522,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(missb2_state::bublpong) missb2(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", bublpong) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_bublpong) MACHINE_CONFIG_END /* ROMs */ diff --git a/src/mame/drivers/mitchell.cpp b/src/mame/drivers/mitchell.cpp index 8e9e21fdd95..05dd1a796e3 100644 --- a/src/mame/drivers/mitchell.cpp +++ b/src/mame/drivers/mitchell.cpp @@ -1062,22 +1062,22 @@ static const gfx_layout spritelayout = 64*8 /* every sprite takes 64 consecutive bytes */ }; -static GFXDECODE_START( mgakuen ) +static GFXDECODE_START( gfx_mgakuen ) GFXDECODE_ENTRY( "gfx1", 0, marukin_charlayout, 0, 64 ) /* colors 0-1023 */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 16 ) /* colors 0- 255 */ GFXDECODE_END -static GFXDECODE_START( marukin ) +static GFXDECODE_START( gfx_marukin ) GFXDECODE_ENTRY( "gfx1", 0, marukin_charlayout, 0, 128 ) /* colors 0-2047 */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 16 ) /* colors 0- 255 */ GFXDECODE_END -static GFXDECODE_START( pkladiesbl ) +static GFXDECODE_START( gfx_pkladiesbl ) GFXDECODE_ENTRY( "gfx1", 0, pkladiesbl_charlayout, 0, 128 ) /* colors 0-2047 */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 16 ) /* colors 0- 255 */ GFXDECODE_END -static GFXDECODE_START( mitchell ) +static GFXDECODE_START( gfx_mitchell ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) /* colors 0-2047 */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 16 ) /* colors 0- 255 */ GFXDECODE_END @@ -1108,7 +1108,7 @@ static const gfx_layout mstworld_spritelayout = }; -static GFXDECODE_START( mstworld ) +static GFXDECODE_START( gfx_mstworld ) GFXDECODE_ENTRY( "gfx1", 0, mstworld_charlayout, 0x000, 0x40 ) GFXDECODE_ENTRY( "gfx2", 0, mstworld_spritelayout, 0x000, 0x40 ) GFXDECODE_END @@ -1183,7 +1183,7 @@ MACHINE_CONFIG_START(mitchell_state::mgakuen) MCFG_SCREEN_UPDATE_DRIVER(mitchell_state, screen_update_pang) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mgakuen) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mgakuen) MCFG_PALETTE_ADD("palette", 1024) /* less colors than the others */ MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) @@ -1224,7 +1224,7 @@ MACHINE_CONFIG_START(mitchell_state::pang) MCFG_SCREEN_UPDATE_DRIVER(mitchell_state, screen_update_pang) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mitchell) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mitchell) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) @@ -1259,7 +1259,7 @@ static const gfx_layout blcharlayout = }; -static GFXDECODE_START( spangbl ) +static GFXDECODE_START( gfx_spangbl ) GFXDECODE_ENTRY( "gfx1", 0, blcharlayout, 0, 128 ) /* colors 0-2047 */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 16 ) /* colors 0- 255 */ GFXDECODE_END @@ -1291,7 +1291,7 @@ MACHINE_CONFIG_START(mitchell_state::spangbl) MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) // Z80A CPU; clock unknown MCFG_DEVICE_PROGRAM_MAP(spangbl_sound_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", spangbl) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_spangbl) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) @@ -1342,7 +1342,7 @@ MACHINE_CONFIG_START(mitchell_state::mstworld) MCFG_SCREEN_UPDATE_DRIVER(mitchell_state, screen_update_pang) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mstworld) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mstworld) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) @@ -1379,7 +1379,7 @@ MACHINE_CONFIG_START(mitchell_state::marukin) MCFG_SCREEN_UPDATE_DRIVER(mitchell_state, screen_update_pang) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", marukin) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_marukin) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) @@ -1434,7 +1434,7 @@ MACHINE_CONFIG_START(mitchell_state::pkladiesbl) MCFG_SCREEN_UPDATE_DRIVER(mitchell_state, screen_update_pang) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pkladiesbl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pkladiesbl) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) diff --git a/src/mame/drivers/mjkjidai.cpp b/src/mame/drivers/mjkjidai.cpp index 8b5c8430abd..fde45199a2f 100644 --- a/src/mame/drivers/mjkjidai.cpp +++ b/src/mame/drivers/mjkjidai.cpp @@ -269,7 +269,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( mjkjidai ) +static GFXDECODE_START( gfx_mjkjidai ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 16 ) GFXDECODE_END @@ -326,7 +326,7 @@ MACHINE_CONFIG_START(mjkjidai_state::mjkjidai) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mjkjidai_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mjkjidai) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mjkjidai) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x100) /* sound hardware */ diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp index 61a664a27d3..9b2e6202b40 100644 --- a/src/mame/drivers/model3.cpp +++ b/src/mame/drivers/model3.cpp @@ -5771,7 +5771,7 @@ MACHINE_CONFIG_START(model3_state::model3_10) MCFG_SCREEN_UPDATE_DRIVER(model3_state, screen_update_model3) MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) SPEAKER(config, "lspeaker").front_left(); @@ -5818,7 +5818,7 @@ MACHINE_CONFIG_START(model3_state::model3_15) MCFG_SCREEN_UPDATE_DRIVER(model3_state, screen_update_model3) MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) SPEAKER(config, "lspeaker").front_left(); @@ -5881,7 +5881,7 @@ MACHINE_CONFIG_START(model3_state::model3_20) MCFG_SCREEN_UPDATE_DRIVER(model3_state, screen_update_model3) MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) SPEAKER(config, "lspeaker").front_left(); @@ -5947,7 +5947,7 @@ MACHINE_CONFIG_START(model3_state::model3_21) MCFG_SCREEN_UPDATE_DRIVER(model3_state, screen_update_model3) MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp index 047a395952a..a1f7a9b5a93 100644 --- a/src/mame/drivers/modellot.cpp +++ b/src/mame/drivers/modellot.cpp @@ -126,7 +126,7 @@ const gfx_layout modellot_charlayout = 8*8 /* space between characters */ }; -static GFXDECODE_START( modellot ) +static GFXDECODE_START( gfx_modellot ) GFXDECODE_ENTRY( "chargen", 0x0000, modellot_charlayout, 0, 1 ) GFXDECODE_END @@ -190,7 +190,7 @@ MACHINE_CONFIG_START(modellot_state::modellot) MCFG_SCREEN_UPDATE_DRIVER(modellot_state, screen_update_modellot) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", modellot ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_modellot) MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ diff --git a/src/mame/drivers/mogura.cpp b/src/mame/drivers/mogura.cpp index f23c432a697..959f23dd91a 100644 --- a/src/mame/drivers/mogura.cpp +++ b/src/mame/drivers/mogura.cpp @@ -199,7 +199,7 @@ static const gfx_layout tiles8x8_layout = 16*8 }; -static GFXDECODE_START( mogura ) +static GFXDECODE_START( gfx_mogura ) GFXDECODE_ENTRY( nullptr, 0, tiles8x8_layout, 0, 8 ) GFXDECODE_END @@ -224,7 +224,7 @@ MACHINE_CONFIG_START(mogura_state::mogura) MCFG_SCREEN_UPDATE_DRIVER(mogura_state, screen_update_mogura) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mogura) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mogura) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(mogura_state, mogura) diff --git a/src/mame/drivers/mole.cpp b/src/mame/drivers/mole.cpp index 394302061a0..aec16782820 100644 --- a/src/mame/drivers/mole.cpp +++ b/src/mame/drivers/mole.cpp @@ -298,7 +298,7 @@ static const gfx_layout tile_layout = }; -static GFXDECODE_START( mole ) +static GFXDECODE_START( gfx_mole ) GFXDECODE_ENTRY( "gfx1", 0x0000, tile_layout, 0x00, 1 ) GFXDECODE_ENTRY( "gfx1", 0x3000, tile_layout, 0x00, 1 ) GFXDECODE_END @@ -336,7 +336,7 @@ MACHINE_CONFIG_START(mole_state::mole) MCFG_SCREEN_UPDATE_DRIVER(mole_state, screen_update_mole) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mole) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mole) MCFG_PALETTE_ADD_3BIT_RBG("palette") /* sound hardware */ diff --git a/src/mame/drivers/molecular.cpp b/src/mame/drivers/molecular.cpp index b334c04bf3c..50f24b6d8aa 100644 --- a/src/mame/drivers/molecular.cpp +++ b/src/mame/drivers/molecular.cpp @@ -268,7 +268,7 @@ static const gfx_layout charlayout = }; #endif -static GFXDECODE_START( molecula ) +static GFXDECODE_START( gfx_molecula ) // GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -319,7 +319,7 @@ MACHINE_CONFIG_START(molecula_state::molecula) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", molecula) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_molecula) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(molecula_state, molecula) diff --git a/src/mame/drivers/momoko.cpp b/src/mame/drivers/momoko.cpp index 09e24cf2987..c7fac8657be 100644 --- a/src/mame/drivers/momoko.cpp +++ b/src/mame/drivers/momoko.cpp @@ -214,7 +214,7 @@ static const gfx_layout charlayout1 = 8*1 }; -static GFXDECODE_START( momoko ) +static GFXDECODE_START( gfx_momoko ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout1, 0, 24 ) /* TEXT */ GFXDECODE_ENTRY( "gfx2", 0x0000, tilelayout, 256, 16 ) /* BG */ GFXDECODE_ENTRY( "gfx3", 0x0000, charlayout, 0, 1 ) /* FG */ @@ -276,7 +276,7 @@ MACHINE_CONFIG_START(momoko_state::momoko) MCFG_SCREEN_UPDATE_DRIVER(momoko_state, screen_update_momoko) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", momoko) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_momoko) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) diff --git a/src/mame/drivers/monzagp.cpp b/src/mame/drivers/monzagp.cpp index c2a4f9469a5..295e72991cc 100644 --- a/src/mame/drivers/monzagp.cpp +++ b/src/mame/drivers/monzagp.cpp @@ -487,7 +487,7 @@ static const gfx_layout sprite_layout = }; -static GFXDECODE_START( monzagp ) +static GFXDECODE_START( gfx_monzagp ) GFXDECODE_ENTRY( "gfx1", 0x0000, char_layout, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0x0000, sprite_layout, 0, 8 ) GFXDECODE_ENTRY( "gfx3", 0x0000, tile_layout, 0, 8 ) @@ -516,7 +516,7 @@ MACHINE_CONFIG_START(monzagp_state::monzagp) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(monzagp_state, monzagp) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", monzagp) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_monzagp) MCFG_TIMER_DRIVER_ADD_PERIODIC("time_tick_timer", monzagp_state, time_tick_timer, attotime::from_hz(4)) diff --git a/src/mame/drivers/mosaic.cpp b/src/mame/drivers/mosaic.cpp index b69ebbfd6d7..ea08be7f338 100644 --- a/src/mame/drivers/mosaic.cpp +++ b/src/mame/drivers/mosaic.cpp @@ -261,7 +261,7 @@ static const gfx_layout charlayout = 16*8 }; -static GFXDECODE_START( mosaic ) +static GFXDECODE_START( gfx_mosaic ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -294,7 +294,7 @@ MACHINE_CONFIG_START(mosaic_state::mosaic) MCFG_SCREEN_UPDATE_DRIVER(mosaic_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mosaic) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mosaic) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/mouser.cpp b/src/mame/drivers/mouser.cpp index d1e1115b491..b205fe4a15c 100644 --- a/src/mame/drivers/mouser.cpp +++ b/src/mame/drivers/mouser.cpp @@ -174,7 +174,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( mouser ) +static GFXDECODE_START( gfx_mouser ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0x1000, spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0x1800, spritelayout, 0, 16 ) @@ -220,7 +220,7 @@ MACHINE_CONFIG_START(mouser_state::mouser) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mouser_state, mouser_nmi_interrupt)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mouser) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mouser) MCFG_PALETTE_ADD("palette", 64) MCFG_PALETTE_INIT_OWNER(mouser_state, mouser) diff --git a/src/mame/drivers/mpu12wbk.cpp b/src/mame/drivers/mpu12wbk.cpp index 0286fb23ad3..c168253dce2 100644 --- a/src/mame/drivers/mpu12wbk.cpp +++ b/src/mame/drivers/mpu12wbk.cpp @@ -478,7 +478,7 @@ static const gfx_layout charlayout = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( mpu12wbk ) +static GFXDECODE_START( gfx_mpu12wbk ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -503,7 +503,7 @@ MACHINE_CONFIG_START(mpu12wbk_state::mpu12wbk) MCFG_SCREEN_UPDATE_DRIVER(mpu12wbk_state, screen_update_mpu12wbk) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mpu12wbk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mpu12wbk) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(mpu12wbk_state, mpu12wbk) diff --git a/src/mame/drivers/mpu4dealem.cpp b/src/mame/drivers/mpu4dealem.cpp index f2f8d1be22b..c94bb1f8aa7 100644 --- a/src/mame/drivers/mpu4dealem.cpp +++ b/src/mame/drivers/mpu4dealem.cpp @@ -56,7 +56,7 @@ static const gfx_layout dealemcharlayout = }; -static GFXDECODE_START( dealem ) +static GFXDECODE_START( gfx_dealem ) GFXDECODE_ENTRY( "gfx1", 0x0000, dealemcharlayout, 0, 32 ) GFXDECODE_END @@ -222,7 +222,7 @@ MACHINE_CONFIG_START(mpu4dealem_state::dealem) MCFG_SCREEN_UPDATE_DRIVER(mpu4dealem_state, screen_update_dealem) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", dealem) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dealem) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(mpu4dealem_state,dealem) diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp index a50c2cfee72..d91c223a8f0 100644 --- a/src/mame/drivers/mpu4vid.cpp +++ b/src/mame/drivers/mpu4vid.cpp @@ -1290,7 +1290,7 @@ MACHINE_CONFIG_START(mpu4vid_state::mpu4_vid) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_UPDATE_DEVICE("scn2674_vid", scn2674_device, screen_update) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) MCFG_DEVICE_ADD("scn2674_vid", SCN2674, 0) MCFG_SCN2674_INTR_CALLBACK(INPUTLINE("video", M68K_IRQ_3)) diff --git a/src/mame/drivers/mrdo.cpp b/src/mame/drivers/mrdo.cpp index 66ade9ae4aa..6da5d3ca08b 100644 --- a/src/mame/drivers/mrdo.cpp +++ b/src/mame/drivers/mrdo.cpp @@ -164,7 +164,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( mrdo ) +static GFXDECODE_START( gfx_mrdo ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) /* colors 0-255 directly mapped */ GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 4*64, 16 ) @@ -184,7 +184,7 @@ MACHINE_CONFIG_START(mrdo_state::mrdo) MCFG_SCREEN_UPDATE_DRIVER(mrdo_state, screen_update_mrdo) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mrdo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mrdo) MCFG_PALETTE_ADD("palette", 64*4+16*4) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(mrdo_state, mrdo) diff --git a/src/mame/drivers/mrflea.cpp b/src/mame/drivers/mrflea.cpp index 86d11f02eb0..0676f37085d 100644 --- a/src/mame/drivers/mrflea.cpp +++ b/src/mame/drivers/mrflea.cpp @@ -234,7 +234,7 @@ static const gfx_layout sprite_layout = { 16*16 }; -static GFXDECODE_START( mrflea ) +static GFXDECODE_START( gfx_mrflea ) GFXDECODE_ENTRY( "gfx1", 0, sprite_layout, 0x10, 1 ) GFXDECODE_ENTRY( "gfx2", 0, tile_layout, 0x00, 1 ) GFXDECODE_END @@ -293,7 +293,7 @@ MACHINE_CONFIG_START(mrflea_state::mrflea) MCFG_SCREEN_UPDATE_DRIVER(mrflea_state, screen_update_mrflea) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mrflea) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mrflea) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) diff --git a/src/mame/drivers/mrgame.cpp b/src/mame/drivers/mrgame.cpp index 9b94fa0673d..0872b32efc3 100644 --- a/src/mame/drivers/mrgame.cpp +++ b/src/mame/drivers/mrgame.cpp @@ -379,7 +379,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( mrgame ) +static GFXDECODE_START( gfx_mrgame ) GFXDECODE_ENTRY( "chargen", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "chargen", 0, spritelayout, 0, 16 ) GFXDECODE_END @@ -500,7 +500,7 @@ MACHINE_CONFIG_START(mrgame_state::mrgame) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 64) MCFG_PALETTE_INIT_OWNER(mrgame_state, mrgame) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mrgame) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mrgame) /* Sound */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/mrjong.cpp b/src/mame/drivers/mrjong.cpp index e1b9bb47a78..4fe53a3542f 100644 --- a/src/mame/drivers/mrjong.cpp +++ b/src/mame/drivers/mrjong.cpp @@ -173,7 +173,7 @@ static const gfx_layout spritelayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( mrjong ) +static GFXDECODE_START( gfx_mrjong ) GFXDECODE_ENTRY( "gfx1", 0x0000, tilelayout, 0, 32 ) GFXDECODE_ENTRY( "gfx1", 0x0000, spritelayout, 0, 32 ) GFXDECODE_END @@ -202,7 +202,7 @@ MACHINE_CONFIG_START(mrjong_state::mrjong) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mrjong) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mrjong) MCFG_PALETTE_ADD("palette", 4*32) MCFG_PALETTE_INDIRECT_ENTRIES(16) MCFG_PALETTE_INIT_OWNER(mrjong_state, mrjong) diff --git a/src/mame/drivers/ms32.cpp b/src/mame/drivers/ms32.cpp index 1df9db9366d..bc8d75ee1ee 100644 --- a/src/mame/drivers/ms32.cpp +++ b/src/mame/drivers/ms32.cpp @@ -1566,14 +1566,14 @@ static GFXLAYOUT_RAW( txlayout, 8, 8, 8*8, 8*8*8 ) static GFXLAYOUT_RAW( f1layout, 2048, 1, 2048*8, 2048*8 ) -static GFXDECODE_START( ms32 ) +static GFXDECODE_START( gfx_ms32 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0x0000, 0x10 ) GFXDECODE_ENTRY( "gfx2", 0, bglayout, 0x2000, 0x10 ) GFXDECODE_ENTRY( "gfx3", 0, bglayout, 0x1000, 0x10 ) GFXDECODE_ENTRY( "gfx4", 0, txlayout, 0x6000, 0x10 ) GFXDECODE_END -static GFXDECODE_START( f1superb ) +static GFXDECODE_START( gfx_f1superb ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0x0000, 0x10 ) GFXDECODE_ENTRY( "gfx2", 0, bglayout, 0x2000, 0x10 ) GFXDECODE_ENTRY( "gfx3", 0, bglayout, 0x1000, 0x10 ) @@ -1723,7 +1723,7 @@ MACHINE_CONFIG_START(ms32_state::ms32) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) MCFG_SCREEN_UPDATE_DRIVER(ms32_state, screen_update_ms32) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ms32) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ms32) MCFG_PALETTE_ADD("palette", 0x10000) @@ -1748,7 +1748,7 @@ MACHINE_CONFIG_START(ms32_state::f1superb) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(f1superb_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", f1superb) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_f1superb) MCFG_VIDEO_START_OVERRIDE(ms32_state,f1superb) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ms6102.cpp b/src/mame/drivers/ms6102.cpp index df28f2651ce..ba5bedd6800 100644 --- a/src/mame/drivers/ms6102.cpp +++ b/src/mame/drivers/ms6102.cpp @@ -156,7 +156,7 @@ static const gfx_layout ms6102_charlayout = 16*8 }; -static GFXDECODE_START(ms6102) +static GFXDECODE_START(gfx_ms6102) GFXDECODE_ENTRY("chargen", 0x0000, ms6102_charlayout, 0, 1) GFXDECODE_END @@ -320,7 +320,7 @@ MACHINE_CONFIG_START(ms6102_state::ms6102) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_UPDATE_DEVICE("i8275_1", i8275_device, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL(16'400'000), 784, 0, 80*8, 375, 0, 25*12) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ms6102) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ms6102) MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") MCFG_DEVICE_ADD("dma8257", I8257, XTAL(18'432'000) / 9) diff --git a/src/mame/drivers/msisaac.cpp b/src/mame/drivers/msisaac.cpp index 05bea959ce4..da5a749b4e5 100644 --- a/src/mame/drivers/msisaac.cpp +++ b/src/mame/drivers/msisaac.cpp @@ -399,7 +399,7 @@ static const gfx_layout tile_layout = 32*8 }; -static GFXDECODE_START( msisaac ) +static GFXDECODE_START( gfx_msisaac ) GFXDECODE_ENTRY( "gfx1", 0, char_layout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, char_layout, 0, 64 ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0, 64 ) @@ -473,7 +473,7 @@ MACHINE_CONFIG_START(msisaac_state::msisaac) MCFG_SCREEN_UPDATE_DRIVER(msisaac_state, screen_update_msisaac) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", msisaac) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msisaac) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) diff --git a/src/mame/drivers/mugsmash.cpp b/src/mame/drivers/mugsmash.cpp index b69f2c508a0..7ed0c770fd3 100644 --- a/src/mame/drivers/mugsmash.cpp +++ b/src/mame/drivers/mugsmash.cpp @@ -389,7 +389,7 @@ static const gfx_layout mugsmash2_layout = 32*8 }; -static GFXDECODE_START( mugsmash ) +static GFXDECODE_START( gfx_mugsmash ) GFXDECODE_ENTRY( "gfx1", 0, mugsmash_layout, 0x00, 16 ) /* sprites */ GFXDECODE_ENTRY( "gfx2", 0, mugsmash2_layout, 0x100, 256 ) /* bg tiles */ GFXDECODE_END @@ -416,7 +416,7 @@ MACHINE_CONFIG_START(mugsmash_state::mugsmash) MCFG_SCREEN_UPDATE_DRIVER(mugsmash_state, screen_update_mugsmash) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mugsmash) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mugsmash) MCFG_PALETTE_ADD("palette", 0x300) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp index fdad21d13a3..33301361e23 100644 --- a/src/mame/drivers/multfish.cpp +++ b/src/mame/drivers/multfish.cpp @@ -1004,7 +1004,7 @@ static const gfx_layout tiles16x16_layout = }; -static GFXDECODE_START( igrosoft_gamble ) +static GFXDECODE_START( gfx_igrosoft_gamble ) GFXDECODE_ENTRY( "gfx", 0, tiles16x16_layout, 0, 16 ) GFXDECODE_END @@ -1041,7 +1041,7 @@ MACHINE_CONFIG_START(igrosoft_gamble_state::igrosoft_gamble) MCFG_SCREEN_UPDATE_DRIVER(igrosoft_gamble_state, screen_update_igrosoft_gamble) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", igrosoft_gamble) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_igrosoft_gamble) MCFG_PALETTE_ADD("palette", 0x1000) diff --git a/src/mame/drivers/multi8.cpp b/src/mame/drivers/multi8.cpp index 689d81060ff..00e70768f0b 100644 --- a/src/mame/drivers/multi8.cpp +++ b/src/mame/drivers/multi8.cpp @@ -504,7 +504,7 @@ static const gfx_layout multi8_kanjilayout = 16*16 }; -static GFXDECODE_START( multi8 ) +static GFXDECODE_START( gfx_multi8 ) GFXDECODE_ENTRY( "chargen", 0x0000, multi8_charlayout, 0, 1 ) GFXDECODE_ENTRY( "kanji", 0x0000, multi8_kanjilayout, 0, 1 ) GFXDECODE_END @@ -579,7 +579,7 @@ MACHINE_CONFIG_START(multi8_state::multi8) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) MCFG_PALETTE_ADD_3BIT_BRG("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", multi8) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_multi8) /* Audio */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/munchmo.cpp b/src/mame/drivers/munchmo.cpp index eb4694ae432..f015fa453cd 100644 --- a/src/mame/drivers/munchmo.cpp +++ b/src/mame/drivers/munchmo.cpp @@ -297,7 +297,7 @@ static const gfx_layout sprite_layout2 = 256 }; -static GFXDECODE_START( mnchmobl ) +static GFXDECODE_START( gfx_mnchmobl ) GFXDECODE_ENTRY( "gfx1", 0, char_layout, 0, 4 ) /* colors 0- 63 */ GFXDECODE_ENTRY( "gfx2", 0x1000, tile_layout, 64, 4 ) /* colors 64-127 */ GFXDECODE_ENTRY( "gfx3", 0, sprite_layout1, 128, 16 ) /* colors 128-255 */ @@ -347,7 +347,7 @@ MACHINE_CONFIG_START(munchmo_state::mnchmobl) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, munchmo_state, vblank_irq)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mnchmobl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mnchmobl) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(munchmo_state, munchmo) diff --git a/src/mame/drivers/murogem.cpp b/src/mame/drivers/murogem.cpp index f13a885ce98..1f8a66c43e0 100644 --- a/src/mame/drivers/murogem.cpp +++ b/src/mame/drivers/murogem.cpp @@ -214,7 +214,7 @@ static const gfx_layout tiles8x8_layout = 8*8 }; -static GFXDECODE_START( murogem ) +static GFXDECODE_START( gfx_murogem ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_END @@ -263,7 +263,7 @@ MACHINE_CONFIG_START(murogem_state::murogem) MCFG_SCREEN_UPDATE_DRIVER(murogem_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", murogem) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_murogem) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_INIT_OWNER(murogem_state, murogem) diff --git a/src/mame/drivers/murogmbl.cpp b/src/mame/drivers/murogmbl.cpp index 9a7635f131c..3f53a474d97 100644 --- a/src/mame/drivers/murogmbl.cpp +++ b/src/mame/drivers/murogmbl.cpp @@ -327,11 +327,11 @@ static const gfx_layout layout8x8x2 = 8*8 }; -static GFXDECODE_START( murogmbl ) +static GFXDECODE_START( gfx_murogmbl ) GFXDECODE_ENTRY( "gfx1", 0, layout8x8x2, 0x0, 1 ) GFXDECODE_END -static GFXDECODE_START( slotunbl ) +static GFXDECODE_START( gfx_slotunbl ) GFXDECODE_ENTRY( "gfx1", 0, layout8x8x2, 0x0, 1 ) GFXDECODE_END @@ -340,8 +340,7 @@ MACHINE_CONFIG_START(murogmbl_state::murogmbl) MCFG_DEVICE_ADD("maincpu", Z80, 1000000) /* Z80? */ MCFG_DEVICE_PROGRAM_MAP(murogmbl_map) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", murogmbl) - + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_murogmbl) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -366,7 +365,7 @@ MACHINE_CONFIG_START(slotunbl_state::slotunbl) MCFG_DEVICE_ADD("maincpu", Z80, 1000000) /* Z80? */ MCFG_DEVICE_PROGRAM_MAP(slotunbl_map) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", slotunbl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_slotunbl) /* video hardware */ diff --git a/src/mame/drivers/mustache.cpp b/src/mame/drivers/mustache.cpp index 246f5107c6c..40017afcf62 100644 --- a/src/mame/drivers/mustache.cpp +++ b/src/mame/drivers/mustache.cpp @@ -161,7 +161,7 @@ static const gfx_layout spritelayout = 16*16 }; -static GFXDECODE_START( mustache ) +static GFXDECODE_START( gfx_mustache ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x00, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x80, 8 ) GFXDECODE_END @@ -201,7 +201,7 @@ MACHINE_CONFIG_START(mustache_state::mustache) MCFG_SCREEN_UPDATE_DRIVER(mustache_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mustache) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mustache) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ diff --git a/src/mame/drivers/mwarr.cpp b/src/mame/drivers/mwarr.cpp index 0cbda80d1c3..0f377e90c82 100644 --- a/src/mame/drivers/mwarr.cpp +++ b/src/mame/drivers/mwarr.cpp @@ -365,7 +365,7 @@ static const gfx_layout mwarr_6bpp_sprites = 32*8 }; -static GFXDECODE_START( mwarr ) +static GFXDECODE_START( gfx_mwarr ) GFXDECODE_ENTRY( "gfx1", 0, mwarr_6bpp_sprites, 1024, 16 ) GFXDECODE_ENTRY( "gfx2", 0, mwarr_tile8_layout, 384, 8 ) GFXDECODE_ENTRY( "gfx3", 0, mwarr_tile16_layout, 256, 8 ) @@ -584,7 +584,7 @@ MACHINE_CONFIG_START(mwarr_state::mwarr) MCFG_SCREEN_UPDATE_DRIVER(mwarr_state, screen_update_mwarr) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mwarr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mwarr) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/mx2178.cpp b/src/mame/drivers/mx2178.cpp index c3c0b0ae96c..c451f221225 100644 --- a/src/mame/drivers/mx2178.cpp +++ b/src/mame/drivers/mx2178.cpp @@ -120,7 +120,7 @@ static const gfx_layout mx2178_charlayout = 8*16 /* every char takes 8 bytes */ }; -static GFXDECODE_START( mx2178 ) +static GFXDECODE_START( gfx_mx2178 ) GFXDECODE_ENTRY( "chargen", 0x0000, mx2178_charlayout, 0, 1 ) GFXDECODE_END @@ -141,7 +141,7 @@ MACHINE_CONFIG_START(mx2178_state::mx2178) 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", mx2178) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mx2178) MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp index 3680c4247c8..71c0054deb7 100644 --- a/src/mame/drivers/mycom.cpp +++ b/src/mame/drivers/mycom.cpp @@ -336,7 +336,7 @@ static const gfx_layout mycom_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( mycom ) +static GFXDECODE_START( gfx_mycom ) GFXDECODE_ENTRY( "chargen", 0x0000, mycom_charlayout, 0, 1 ) GFXDECODE_END @@ -532,7 +532,7 @@ MACHINE_CONFIG_START(mycom_state::mycom) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 192-1) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mycom) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mycom) /* Manual states clock is 1.008mhz for 40 cols, and 2.016 mhz for 80 cols. The CRTC is a HD46505S - same as a 6845. The start registers need to be readable. */ diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp index 62a3cdb38f2..e1b526456f7 100644 --- a/src/mame/drivers/mystwarr.cpp +++ b/src/mame/drivers/mystwarr.cpp @@ -851,11 +851,11 @@ static const gfx_layout bglayout_8bpp = 16*128 }; -static GFXDECODE_START( gaiapols ) +static GFXDECODE_START( gfx_gaiapols ) GFXDECODE_ENTRY( "gfx3", 0, bglayout_4bpp, 0x0000, 128 ) GFXDECODE_END -static GFXDECODE_START( dadandrn ) +static GFXDECODE_START( gfx_dadandrn ) GFXDECODE_ENTRY( "gfx3", 0, bglayout_8bpp, 0x0000, 8 ) GFXDECODE_END @@ -1091,7 +1091,7 @@ MACHINE_CONFIG_START(mystwarr_state::dadandrn) MCFG_DEVICE_MODIFY("k053252") MCFG_K053252_OFFSETS(24, 16+1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", dadandrn) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dadandrn) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(mystwarr_state, dadandrn) @@ -1127,7 +1127,7 @@ MACHINE_CONFIG_START(mystwarr_state::gaiapols) MCFG_K054000_ADD("k054000") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gaiapols) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gaiapols) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(mystwarr_state, gaiapols) diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp index 39e08b74317..aa7e9062b39 100644 --- a/src/mame/drivers/mz2000.cpp +++ b/src/mame/drivers/mz2000.cpp @@ -693,7 +693,7 @@ static const gfx_layout mz2000_charlayout_16 = 8*16 }; -static GFXDECODE_START( mz2000 ) +static GFXDECODE_START( gfx_mz2000 ) GFXDECODE_ENTRY( "chargen", 0x0000, mz2000_charlayout_8, 0, 1 ) GFXDECODE_ENTRY( "chargen", 0x0800, mz2000_charlayout_16, 0, 1 ) GFXDECODE_END @@ -922,7 +922,7 @@ MACHINE_CONFIG_START(mz2000_state::mz2000) MCFG_SCREEN_UPDATE_DRIVER(mz2000_state, screen_update_mz2000) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mz2000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mz2000) MCFG_PALETTE_ADD_3BIT_BRG("palette") SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp index cc70f18825d..3775cb9155b 100644 --- a/src/mame/drivers/mz2500.cpp +++ b/src/mame/drivers/mz2500.cpp @@ -1856,7 +1856,7 @@ static const gfx_layout mz2500_16_layout = }; /* these are just for viewer sake, actually they aren't used in drawing routines */ -static GFXDECODE_START( mz2500 ) +static GFXDECODE_START( gfx_mz2500 ) GFXDECODE_ENTRY("kanji", 0, mz2500_cg_layout, 0, 256) GFXDECODE_ENTRY("kanji", 0x4400, mz2500_8_layout, 0, 256) GFXDECODE_ENTRY("kanji", 0, mz2500_16_layout, 0, 256) @@ -2136,7 +2136,7 @@ MACHINE_CONFIG_START(mz2500_state::mz2500) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(mz2500_state, mz2500) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mz2500) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mz2500) SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp index c7eec006554..75b484c6dbb 100644 --- a/src/mame/drivers/mz3500.cpp +++ b/src/mame/drivers/mz3500.cpp @@ -743,7 +743,7 @@ static const gfx_layout charlayout_8x16 = 8*16 }; -static GFXDECODE_START( mz3500 ) +static GFXDECODE_START( gfx_mz3500 ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout_8x8, 0, 1 ) GFXDECODE_ENTRY( "gfx1", 0x0008, charlayout_8x8, 0, 1 ) GFXDECODE_ENTRY( "gfx1", 0x1000, charlayout_8x16, 0, 1 ) @@ -856,7 +856,7 @@ MACHINE_CONFIG_START(mz3500_state::mz3500) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mz3500) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mz3500) MCFG_PALETTE_ADD_3BIT_BRG("palette") diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp index 88944989744..aa49256728b 100644 --- a/src/mame/drivers/mz700.cpp +++ b/src/mame/drivers/mz700.cpp @@ -360,11 +360,11 @@ static const gfx_layout mz700_layout = 8 * 8 /* code takes 8 times 8 bits */ }; -static GFXDECODE_START( mz700 ) +static GFXDECODE_START( gfx_mz700 ) GFXDECODE_ENTRY("cgrom", 0, mz700_layout, 0, 4) GFXDECODE_END -static GFXDECODE_START( mz800 ) +static GFXDECODE_START( gfx_mz800 ) GFXDECODE_ENTRY("monitor", 0x1000, mz700_layout, 0, 4) // for mz800 viewer only GFXDECODE_END @@ -394,7 +394,7 @@ MACHINE_CONFIG_START(mz_state::mz700) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD_3BIT_RGB("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mz700) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mz700) /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -451,7 +451,7 @@ MACHINE_CONFIG_START(mz_state::mz800) MCFG_ADDRESS_MAP_BANK_STRIDE(0x2000) MCFG_MACHINE_RESET_OVERRIDE(mz_state, mz800) - MCFG_GFXDECODE_MODIFY("gfxdecode",mz800) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_mz800) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(mz_state, screen_update_mz800) diff --git a/src/mame/drivers/mz80.cpp b/src/mame/drivers/mz80.cpp index 61d5bbc9aac..50c884e0e50 100644 --- a/src/mame/drivers/mz80.cpp +++ b/src/mame/drivers/mz80.cpp @@ -263,11 +263,11 @@ void mz80_state::mz80k_io(address_map &map) map.unmap_value_high(); } -static GFXDECODE_START( mz80k ) +static GFXDECODE_START( gfx_mz80k ) GFXDECODE_ENTRY( "chargen", 0x0000, mz80k_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START( mz80kj ) +static GFXDECODE_START( gfx_mz80kj ) GFXDECODE_ENTRY( "chargen", 0x0000, mz80kj_charlayout, 0, 1 ) GFXDECODE_END @@ -293,7 +293,7 @@ MACHINE_CONFIG_START(mz80_state::mz80k) MCFG_SCREEN_UPDATE_DRIVER(mz80_state, screen_update_mz80k) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mz80k) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mz80k) MCFG_PALETTE_ADD_MONOCHROME("palette") /* Audio */ @@ -326,7 +326,7 @@ MACHINE_CONFIG_START(mz80_state::mz80kj) mz80k(config); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(mz80_state, screen_update_mz80kj) - MCFG_GFXDECODE_MODIFY("gfxdecode", mz80kj) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_mz80kj) MACHINE_CONFIG_END MACHINE_CONFIG_START(mz80_state::mz80a) diff --git a/src/mame/drivers/nakajies.cpp b/src/mame/drivers/nakajies.cpp index aa7d8150224..1bebeefcdd7 100644 --- a/src/mame/drivers/nakajies.cpp +++ b/src/mame/drivers/nakajies.cpp @@ -729,19 +729,19 @@ static const gfx_layout nakajies_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( wales210 ) +static GFXDECODE_START( gfx_wales210 ) GFXDECODE_ENTRY( "bios", 0x55043, nakajies_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START( dator3k ) +static GFXDECODE_START( gfx_dator3k ) GFXDECODE_ENTRY( "bios", 0x54fb1, nakajies_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START( drwrt200 ) +static GFXDECODE_START( gfx_drwrt200 ) GFXDECODE_ENTRY( "bios", 0xdbbeb, nakajies_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START( drwrt400 ) +static GFXDECODE_START( gfx_drwrt400 ) GFXDECODE_ENTRY( "bios", 0x580b6, nakajies_charlayout, 0, 1 ) GFXDECODE_END @@ -757,7 +757,7 @@ MACHINE_CONFIG_START(nakajies_state::nakajies210) MCFG_SCREEN_VISIBLE_AREA( 0, 6 * 80 - 1, 0, 8 * 8 - 1 ) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wales210) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wales210) MCFG_PALETTE_ADD( "palette", 2 ) MCFG_PALETTE_INIT_OWNER(nakajies_state, nakajies) MCFG_DEFAULT_LAYOUT(layout_lcd) @@ -775,12 +775,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(nakajies_state::dator3k) nakajies210(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", dator3k) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_dator3k) MACHINE_CONFIG_END MACHINE_CONFIG_START(nakajies_state::nakajies220) nakajies210(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", drwrt400) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_drwrt400) MACHINE_CONFIG_END MACHINE_CONFIG_START(nakajies_state::nakajies250) @@ -788,7 +788,7 @@ MACHINE_CONFIG_START(nakajies_state::nakajies250) MCFG_SCREEN_MODIFY( "screen" ) MCFG_SCREEN_SIZE( 80 * 6, 16 * 8 ) MCFG_SCREEN_VISIBLE_AREA( 0, 6 * 80 - 1, 0, 16 * 8 - 1 ) - MCFG_GFXDECODE_MODIFY("gfxdecode", drwrt200) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_drwrt200) MACHINE_CONFIG_END diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp index aa7a6ee102d..285cc731d61 100644 --- a/src/mame/drivers/namcofl.cpp +++ b/src/mame/drivers/namcofl.cpp @@ -508,7 +508,7 @@ static const gfx_layout roz_layout = 16*128 }; -static GFXDECODE_START( 2 ) +static GFXDECODE_START( gfx_2 ) GFXDECODE_ENTRY( NAMCOFL_TILEGFXREGION, 0, tile_layout, 0x1000, 0x08 ) GFXDECODE_ENTRY( NAMCOFL_SPRITEGFXREGION, 0, obj_layout, 0x0000, 0x10 ) GFXDECODE_ENTRY( NAMCOFL_ROTGFXREGION, 0, roz_layout, 0x1800, 0x08 ) @@ -605,7 +605,7 @@ MACHINE_CONFIG_START(namcofl_state::namcofl) MCFG_PALETTE_ADD("palette", 8192) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_2) MCFG_DEVICE_ADD("c116", NAMCO_C116, 0) MCFG_GFX_PALETTE("palette") diff --git a/src/mame/drivers/namcona1.cpp b/src/mame/drivers/namcona1.cpp index c6a8a1ae881..d57cd1cb22a 100644 --- a/src/mame/drivers/namcona1.cpp +++ b/src/mame/drivers/namcona1.cpp @@ -916,7 +916,7 @@ static const gfx_layout shape_layout = 8*8 }; -static GFXDECODE_START( namcona1 ) +static GFXDECODE_START( gfx_namcona1 ) GFXDECODE_RAM( "cgram", 0, cg_layout_8bpp, 0, 0x2000/256 ) GFXDECODE_RAM( "cgram", 0, cg_layout_4bpp, 0, 0x2000/16 ) GFXDECODE_RAM( nullptr, 0, shape_layout, 0, 0x2000/2 ) @@ -985,7 +985,7 @@ MACHINE_CONFIG_START(namcona1_state::namcona1) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() - MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcona1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcona1) /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp index 3f7e4f03cbc..1ec49d25dd6 100644 --- a/src/mame/drivers/namconb1.cpp +++ b/src/mame/drivers/namconb1.cpp @@ -1044,12 +1044,12 @@ static const gfx_layout roz_layout = 16*128 }; /* roz_layout */ -static GFXDECODE_START( namconb1 ) +static GFXDECODE_START( gfx_namconb1 ) GFXDECODE_ENTRY( NAMCONB1_TILEGFXREGION, 0, tile_layout, 0x1000, 0x10 ) GFXDECODE_ENTRY( NAMCONB1_SPRITEGFXREGION, 0, obj_layout, 0x0000, 0x10 ) GFXDECODE_END /* gfxdecodeinfo */ -static GFXDECODE_START( 2 ) +static GFXDECODE_START( gfx_2 ) GFXDECODE_ENTRY( NAMCONB1_TILEGFXREGION, 0, tile_layout, 0x1000, 0x08 ) GFXDECODE_ENTRY( NAMCONB1_SPRITEGFXREGION, 0, obj_layout, 0x0000, 0x10 ) GFXDECODE_ENTRY( NAMCONB1_ROTGFXREGION, 0, roz_layout, 0x1800, 0x08 ) @@ -1093,7 +1093,7 @@ MACHINE_CONFIG_START(namconb1_state::namconb1) MCFG_SCREEN_UPDATE_DRIVER(namconb1_state, screen_update_namconb1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", namconb1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namconb1) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() @@ -1134,7 +1134,7 @@ MACHINE_CONFIG_START(namconb1_state::namconb2) MCFG_SCREEN_UPDATE_DRIVER(namconb1_state, screen_update_namconb2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_2) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp index b1562a19a76..c1f73178718 100644 --- a/src/mame/drivers/namcos1.cpp +++ b/src/mame/drivers/namcos1.cpp @@ -1015,7 +1015,7 @@ static const gfx_layout spritelayout = 32*32*4 }; -static GFXDECODE_START( namcos1 ) +static GFXDECODE_START( gfx_namcos1 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0x0800, 8 ) /* characters */ GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x0000, 128 ) /* sprites 32/16/8/4 dots */ GFXDECODE_END @@ -1067,7 +1067,7 @@ MACHINE_CONFIG_START(namcos1_state::ns1) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, namcos1_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos1) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp index a5f66405b59..7c78344c051 100644 --- a/src/mame/drivers/namcos2.cpp +++ b/src/mame/drivers/namcos2.cpp @@ -1637,32 +1637,32 @@ static const gfx_layout metlhawk_sprite_layout = { 32*32*8 }; -static GFXDECODE_START( metlhawk ) +static GFXDECODE_START( gfx_metlhawk ) GFXDECODE_ENTRY( "gfx1", 0x000000, metlhawk_sprite_layout, 0*256, 16 ) GFXDECODE_ENTRY( "gfx3", 0x000000, luckywld_roz_layout, 0*256, 16 ) GFXDECODE_ENTRY( "gfx2", 0x000000, chr_layout, 16*256, 16 ) GFXDECODE_END -static GFXDECODE_START( namcos2 ) +static GFXDECODE_START( gfx_namcos2 ) GFXDECODE_ENTRY( "gfx1", 0x000000, obj_layout, 0*256, 16 ) GFXDECODE_ENTRY( "gfx1", 0x200000, obj_layout, 0*256, 16 ) GFXDECODE_ENTRY( "gfx2", 0x000000, chr_layout, 16*256, 16 ) GFXDECODE_ENTRY( "gfx3", 0x000000, roz_layout, 0*256, 16 ) GFXDECODE_END -static GFXDECODE_START( finallap ) +static GFXDECODE_START( gfx_finallap ) GFXDECODE_ENTRY( "gfx1", 0x000000, obj_layout, 0*256, 16 ) GFXDECODE_ENTRY( "gfx1", 0x200000, obj_layout, 0*256, 16 ) GFXDECODE_ENTRY( "gfx2", 0x000000, chr_layout, 16*256, 16 ) GFXDECODE_END -static GFXDECODE_START( sgunner ) +static GFXDECODE_START( gfx_sgunner ) GFXDECODE_ENTRY( "gfx1", 0x000000, luckywld_sprite_layout, 0*256, 16 ) GFXDECODE_ENTRY( "gfx3", 0x000000, luckywld_roz_layout, 0*256, 16 ) GFXDECODE_ENTRY( "gfx2", 0x000000, chr_layout, 16*256, 16 ) GFXDECODE_END -static GFXDECODE_START( luckywld ) +static GFXDECODE_START( gfx_luckywld ) GFXDECODE_ENTRY( "gfx1", 0x000000, luckywld_sprite_layout, 0*256, 16 ) GFXDECODE_ENTRY( "gfx3", 0x000000, luckywld_roz_layout, 0*256, 16 ) GFXDECODE_ENTRY( "gfx2", 0x000000, chr_layout, 16*256, 16 ) @@ -1765,7 +1765,7 @@ MACHINE_CONFIG_START(namcos2_state::base) MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos2) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() @@ -1846,7 +1846,7 @@ MACHINE_CONFIG_START(namcos2_state::gollygho) MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos2) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() @@ -1897,7 +1897,7 @@ MACHINE_CONFIG_START(namcos2_state::finallap) MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_finallap) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", finallap) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_finallap) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() @@ -1953,7 +1953,7 @@ MACHINE_CONFIG_START(namcos2_state::sgunner) MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_sgunner) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sgunner) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sgunner) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() @@ -2011,7 +2011,7 @@ MACHINE_CONFIG_START(namcos2_state::sgunner2) MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_sgunner) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sgunner) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sgunner) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() @@ -2064,7 +2064,7 @@ MACHINE_CONFIG_START(namcos2_state::luckywld) MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_luckywld) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", luckywld) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_luckywld) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() @@ -2120,7 +2120,7 @@ MACHINE_CONFIG_START(namcos2_state::metlhawk) MCFG_SCREEN_UPDATE_DRIVER(namcos2_state, screen_update_metlhawk) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", metlhawk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_metlhawk) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_PALETTE_ENABLE_SHADOWS() diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp index e7439600669..2256fca5db3 100644 --- a/src/mame/drivers/namcos21.cpp +++ b/src/mame/drivers/namcos21.cpp @@ -1871,7 +1871,7 @@ static const gfx_layout tile_layout = 8*64 /* sprite offset */ }; -static GFXDECODE_START( namcos21 ) +static GFXDECODE_START( gfx_namcos21 ) GFXDECODE_ENTRY( "gfx1", 0x000000, tile_layout, 0x1000, 0x10 ) GFXDECODE_END @@ -1960,7 +1960,7 @@ MACHINE_CONFIG_START(namcos21_state::namcos21) configure_c148_standard(config); MCFG_NAMCO_C139_ADD("sci") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos21) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos21) MCFG_PALETTE_ADD("palette", NAMCOS21_NUM_COLORS) MCFG_PALETTE_FORMAT(XBRG) @@ -2022,7 +2022,7 @@ MACHINE_CONFIG_START(namcos21_state::driveyes) MCFG_SCREEN_UPDATE_DRIVER(namcos21_state, screen_update_driveyes) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos21) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos21) MCFG_PALETTE_ADD("palette", NAMCOS21_NUM_COLORS) MCFG_PALETTE_FORMAT(XBRG) @@ -2085,7 +2085,7 @@ MACHINE_CONFIG_START(namcos21_state::winrun) MCFG_SCREEN_UPDATE_DRIVER(namcos21_state, screen_update_winrun) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) MCFG_PALETTE_ADD("palette", NAMCOS21_NUM_COLORS) MCFG_PALETTE_FORMAT(XBRG) diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp index 7ec290747e8..75c5578da43 100644 --- a/src/mame/drivers/namcos22.cpp +++ b/src/mame/drivers/namcos22.cpp @@ -3721,12 +3721,12 @@ static const gfx_layout namcos22_cg_layout = #undef XOR -static GFXDECODE_START( namcos22 ) +static GFXDECODE_START( gfx_namcos22 ) GFXDECODE_ENTRY( nullptr, 0, namcos22_cg_layout, 0, 0x800 ) GFXDECODE_ENTRY( "textile", 0, texture_tile_layout, 0, 0x80 ) GFXDECODE_END -static GFXDECODE_START( super ) +static GFXDECODE_START( gfx_super ) GFXDECODE_ENTRY( nullptr, 0, namcos22_cg_layout, 0, 0x800 ) GFXDECODE_ENTRY( "textile", 0, texture_tile_layout, 0, 0x80 ) GFXDECODE_ENTRY( "sprite", 0, sprite_layout, 0, 0x80 ) @@ -3796,7 +3796,7 @@ MACHINE_CONFIG_START(namcos22_state::namcos22) MCFG_SCREEN_UPDATE_DRIVER(namcos22_state, screen_update_namcos22) MCFG_PALETTE_ADD("palette", 0x8000) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos22) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos22) /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); @@ -3864,7 +3864,7 @@ MACHINE_CONFIG_START(namcos22_state::namcos22s) MCFG_SCREEN_UPDATE_DRIVER(namcos22_state, screen_update_namcos22s) MCFG_PALETTE_ADD("palette", 0x8000) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", super) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_super) /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp index 4fd3e1d1202..e95bdcca138 100644 --- a/src/mame/drivers/namcos23.cpp +++ b/src/mame/drivers/namcos23.cpp @@ -3556,7 +3556,7 @@ static const gfx_layout namcos23_cg_layout = 64*16 }; /* cg_layout */ -static GFXDECODE_START( namcos23 ) +static GFXDECODE_START( gfx_namcos23 ) GFXDECODE_ENTRY( nullptr, 0, namcos23_cg_layout, 0, 0x800 ) GFXDECODE_END @@ -3612,7 +3612,7 @@ MACHINE_CONFIG_START(namcos23_state::gorgon) MCFG_PALETTE_ADD("palette", 0x8000) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos23) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos23) MCFG_VIDEO_START_OVERRIDE(namcos23_state,s23) @@ -3679,7 +3679,7 @@ MACHINE_CONFIG_START(namcos23_state::s23) MCFG_PALETTE_ADD("palette", 0x8000) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos23) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos23) MCFG_VIDEO_START_OVERRIDE(namcos23_state,s23) @@ -3759,7 +3759,7 @@ MACHINE_CONFIG_START(namcos23_state::ss23) MCFG_PALETTE_ADD("palette", 0x8000) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos23) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos23) MCFG_VIDEO_START_OVERRIDE(namcos23_state,s23) diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp index bba01bd66c2..e51cdb787f5 100644 --- a/src/mame/drivers/namcos86.cpp +++ b/src/mame/drivers/namcos86.cpp @@ -1052,7 +1052,7 @@ static const gfx_layout spritelayout = 64*64 }; -static GFXDECODE_START( namcos86 ) +static GFXDECODE_START( gfx_namcos86 ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 2048*0, 256 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 2048*0, 256 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 2048*1, 128 ) @@ -1087,7 +1087,7 @@ MACHINE_CONFIG_START(namcos86_state::hopmappy) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, namcos86_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos86) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_namcos86) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_INIT_OWNER(namcos86_state, namcos86) diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp index 23edd890ad3..ef7dfd2b1c9 100644 --- a/src/mame/drivers/nanos.cpp +++ b/src/mame/drivers/nanos.cpp @@ -45,9 +45,9 @@ public: , m_bank1(*this, "bank1") , m_bank2(*this, "bank2") , m_bank3(*this, "bank3") - , m_lines(*this, {"LINE0", "LINE1", "LINE2", "LINE3", "LINE4", "LINE5", "LINE6"}) + , m_lines(*this, "LINE%u", 0U) , m_linec(*this, "LINEC") - { } + { } DECLARE_WRITE8_MEMBER( nanos_tc_w ); DECLARE_WRITE_LINE_MEMBER( ctc_z0_w ); @@ -456,7 +456,7 @@ static const gfx_layout nanos_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( nanos ) +static GFXDECODE_START( gfx_nanos ) GFXDECODE_ENTRY( "chargen", 0x0000, nanos_charlayout, 0, 1 ) GFXDECODE_END @@ -476,7 +476,7 @@ MACHINE_CONFIG_START(nanos_state::nanos) MCFG_SCREEN_VISIBLE_AREA(0,80*8-1,0,25*10-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nanos) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nanos) MCFG_PALETTE_ADD_MONOCHROME("palette") /* devices */ diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp index 36f736ca27e..b2179163082 100644 --- a/src/mame/drivers/nascom1.cpp +++ b/src/mame/drivers/nascom1.cpp @@ -420,7 +420,7 @@ static const gfx_layout nascom1_charlayout = 8 * 16 }; -static GFXDECODE_START( nascom1 ) +static GFXDECODE_START( gfx_nascom1 ) GFXDECODE_ENTRY("gfx1", 0x0000, nascom1_charlayout, 0, 1) GFXDECODE_END @@ -442,7 +442,7 @@ static const gfx_layout nascom2_charlayout = 8 * 16 }; -static GFXDECODE_START( nascom2 ) +static GFXDECODE_START( gfx_nascom2 ) GFXDECODE_ENTRY("gfx1", 0x0000, nascom2_charlayout, 0, 1) GFXDECODE_END @@ -668,7 +668,7 @@ MACHINE_CONFIG_START(nascom_state::nascom) MCFG_SCREEN_UPDATE_DRIVER(nascom1_state, screen_update_nascom) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nascom1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nascom1) MCFG_PALETTE_ADD_MONOCHROME("palette") // uart @@ -712,7 +712,7 @@ MACHINE_CONFIG_START(nascom2_state::nascom2) MCFG_SCREEN_VISIBLE_AREA(0, 48 * 8 - 1, 0, 16 * 14 - 1) MCFG_SCREEN_UPDATE_DRIVER(nascom2_state, screen_update_nascom) - MCFG_GFXDECODE_MODIFY("gfxdecode", nascom2) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_nascom2) // generic sockets for ram/rom (todo: support ram here) MCFG_GENERIC_SOCKET_ADD("socket1", generic_plain_slot, "nascom_socket") diff --git a/src/mame/drivers/naughtyb.cpp b/src/mame/drivers/naughtyb.cpp index dd6d6760af2..ebcbc4083eb 100644 --- a/src/mame/drivers/naughtyb.cpp +++ b/src/mame/drivers/naughtyb.cpp @@ -402,7 +402,7 @@ static const gfx_layout charlayout = -static GFXDECODE_START( naughtyb ) +static GFXDECODE_START( gfx_naughtyb ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 32*4, 32 ) GFXDECODE_END @@ -423,7 +423,7 @@ MACHINE_CONFIG_START(naughtyb_state::naughtyb) MCFG_SCREEN_UPDATE_DRIVER(naughtyb_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", naughtyb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_naughtyb) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(naughtyb_state, naughtyb) @@ -460,7 +460,7 @@ MACHINE_CONFIG_START(naughtyb_state::popflame) MCFG_SCREEN_UPDATE_DRIVER(naughtyb_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", naughtyb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_naughtyb) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(naughtyb_state, naughtyb) diff --git a/src/mame/drivers/nemesis.cpp b/src/mame/drivers/nemesis.cpp index 5907a117015..b6ca6849937 100644 --- a/src/mame/drivers/nemesis.cpp +++ b/src/mame/drivers/nemesis.cpp @@ -1410,7 +1410,7 @@ static const gfx_layout spritelayout6464 = spritelayout6464_yoffset }; -static GFXDECODE_START( nemesis ) +static GFXDECODE_START( gfx_nemesis ) GFXDECODE_RAM( "charram", 0x0, charlayout, 0, 0x80 ) GFXDECODE_RAM( "charram", 0x0, spritelayout, 0, 0x80 ) GFXDECODE_RAM( "charram", 0x0, spritelayout3216, 0, 0x80 ) @@ -1490,7 +1490,7 @@ MACHINE_CONFIG_START(nemesis_state::nemesis) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, nemesis_state, nemesis_vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nemesis) MCFG_PALETTE_ADD("palette", 2048) @@ -1559,7 +1559,7 @@ MACHINE_CONFIG_START(nemesis_state::gx400) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nemesis) MCFG_PALETTE_ADD("palette", 2048) @@ -1630,7 +1630,7 @@ MACHINE_CONFIG_START(nemesis_state::konamigt) MCFG_SCREEN_UPDATE_DRIVER(nemesis_state, screen_update_nemesis) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nemesis) MCFG_PALETTE_ADD("palette", 2048) @@ -1699,7 +1699,7 @@ MACHINE_CONFIG_START(nemesis_state::rf2_gx400) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nemesis) MCFG_PALETTE_ADD("palette", 2048) @@ -1760,7 +1760,7 @@ MACHINE_CONFIG_START(nemesis_state::salamand) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, nemesis_state, nemesis_vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nemesis) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_PALETTE_MEMBITS(8) @@ -1812,7 +1812,7 @@ MACHINE_CONFIG_START(nemesis_state::blkpnthr) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, nemesis_state, blkpnthr_vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nemesis) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_PALETTE_MEMBITS(8) @@ -1859,7 +1859,7 @@ MACHINE_CONFIG_START(nemesis_state::citybomb) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, nemesis_state, nemesis_vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nemesis) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_PALETTE_MEMBITS(8) @@ -1910,7 +1910,7 @@ MACHINE_CONFIG_START(nemesis_state::nyanpani) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, nemesis_state, nemesis_vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nemesis) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_PALETTE_MEMBITS(8) @@ -1965,7 +1965,7 @@ MACHINE_CONFIG_START(nemesis_state::hcrash) MCFG_SCREEN_UPDATE_DRIVER(nemesis_state, screen_update_nemesis) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nemesis) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_PALETTE_MEMBITS(8) @@ -2728,7 +2728,7 @@ MACHINE_CONFIG_START(nemesis_state::bubsys) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nemesis) MCFG_PALETTE_ADD("palette", 2048) diff --git a/src/mame/drivers/neoprint.cpp b/src/mame/drivers/neoprint.cpp index df42daa5a76..4a9affd20f4 100644 --- a/src/mame/drivers/neoprint.cpp +++ b/src/mame/drivers/neoprint.cpp @@ -481,7 +481,7 @@ static const gfx_layout neoprint_layout = 32*64, }; -static GFXDECODE_START( neoprint ) +static GFXDECODE_START( gfx_neoprint ) GFXDECODE_ENTRY( "gfx1", 0, neoprint_layout, 0x0, 0x1000 ) GFXDECODE_END @@ -508,7 +508,7 @@ MACHINE_CONFIG_START(neoprint_state::neoprint) MCFG_UPD4990A_ADD("upd4990a", XTAL(32'768), NOOP, NOOP) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", neoprint) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_neoprint) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -552,7 +552,7 @@ MACHINE_CONFIG_START(neoprint_state::nprsp) MCFG_UPD4990A_ADD("upd4990a", XTAL(32'768), NOOP, NOOP) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", neoprint) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_neoprint) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/neptunp2.cpp b/src/mame/drivers/neptunp2.cpp index fe1c021b1c2..3bedc3dc613 100644 --- a/src/mame/drivers/neptunp2.cpp +++ b/src/mame/drivers/neptunp2.cpp @@ -93,7 +93,7 @@ static const gfx_layout charlayout = }; #endif -static GFXDECODE_START( neptunp2 ) +static GFXDECODE_START( gfx_neptunp2 ) // GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) GFXDECODE_END @@ -114,7 +114,7 @@ MACHINE_CONFIG_START(neptunp2_state::neptunp2) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", neptunp2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_neptunp2) MCFG_PALETTE_ADD("palette", 512) /* sound hardware */ diff --git a/src/mame/drivers/nes_vt.cpp b/src/mame/drivers/nes_vt.cpp index 1a8791d921f..32f343592db 100644 --- a/src/mame/drivers/nes_vt.cpp +++ b/src/mame/drivers/nes_vt.cpp @@ -1335,7 +1335,7 @@ static const gfx_layout helper2_layout = -static GFXDECODE_START( vt03_helper ) +static GFXDECODE_START( vt03_gfx_helper ) GFXDECODE_ENTRY( "mainrom", 0, helper_layout, 0x0, 2 ) GFXDECODE_ENTRY( "mainrom", 0, helper2_layout, 0x0, 2 ) GFXDECODE_END @@ -1361,7 +1361,7 @@ MACHINE_CONFIG_START(nes_vt_state::nes_vt) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) MCFG_SCREEN_UPDATE_DEVICE("ppu", ppu2c0x_device, screen_update) - MCFG_GFXDECODE_ADD("gfxdecode", "ppu", vt03_helper) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "ppu", vt03_gfx_helper) MCFG_PPU_VT03_ADD("ppu") MCFG_PPU2C0X_CPU("maincpu") diff --git a/src/mame/drivers/news.cpp b/src/mame/drivers/news.cpp index 77a52cf94ba..cb5afd3a2ad 100644 --- a/src/mame/drivers/news.cpp +++ b/src/mame/drivers/news.cpp @@ -113,7 +113,7 @@ static const gfx_layout tiles8x8_layout = 32*8 }; -static GFXDECODE_START( news ) +static GFXDECODE_START( gfx_news ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_END @@ -146,7 +146,7 @@ MACHINE_CONFIG_START(news_state::news) MCFG_SCREEN_UPDATE_DRIVER(news_state, screen_update_news) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", news) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_news) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) diff --git a/src/mame/drivers/nibble.cpp b/src/mame/drivers/nibble.cpp index 06cf475bfe7..2119ef6ca95 100644 --- a/src/mame/drivers/nibble.cpp +++ b/src/mame/drivers/nibble.cpp @@ -297,7 +297,7 @@ static const gfx_layout charlayout = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( nibble ) +static GFXDECODE_START( gfx_nibble ) GFXDECODE_ENTRY( "gfx", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -320,7 +320,7 @@ MACHINE_CONFIG_START(nibble_state::nibble) MCFG_SCREEN_UPDATE_DRIVER(nibble_state, screen_update_nibble) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nibble) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nibble) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(nibble_state, nibble) diff --git a/src/mame/drivers/ninjakd2.cpp b/src/mame/drivers/ninjakd2.cpp index 0d6f1836932..c6d3302ba6d 100644 --- a/src/mame/drivers/ninjakd2.cpp +++ b/src/mame/drivers/ninjakd2.cpp @@ -879,13 +879,13 @@ static const gfx_layout robokid_layout16x16 = 128*8 }; -static GFXDECODE_START( ninjakd2 ) +static GFXDECODE_START( gfx_ninjakd2 ) GFXDECODE_ENTRY( "gfx1", 0, layout8x8, 0x200, 16) // fg GFXDECODE_ENTRY( "gfx2", 0, layout16x16, 0x100, 16) // sprites GFXDECODE_ENTRY( "gfx3", 0, layout16x16, 0x000, 16) // bg GFXDECODE_END -static GFXDECODE_START( robokid ) +static GFXDECODE_START( gfx_robokid ) GFXDECODE_ENTRY( "gfx1", 0, layout8x8, 0x300, 16) // fg GFXDECODE_ENTRY( "gfx2", 0, robokid_layout16x16, 0x200, 16) // sprites GFXDECODE_ENTRY( "gfx3", 0, robokid_layout16x16, 0x000, 16) // bg0 @@ -949,7 +949,7 @@ MACHINE_CONFIG_START(ninjakd2_state::ninjakd2_core) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ninjakd2_state, screen_vblank_ninjakd2)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ninjakd2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ninjakd2) MCFG_PALETTE_ADD("palette", 0x300) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) @@ -1037,7 +1037,7 @@ MACHINE_CONFIG_START(ninjakd2_state::robokid) MCFG_DEVICE_PROGRAM_MAP(ninjakid_nopcm_sound_cpu) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", robokid) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_robokid) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(0x400) // RAM is this large, but still only 0x300 colors used MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) diff --git a/src/mame/drivers/ninjaw.cpp b/src/mame/drivers/ninjaw.cpp index 5aa6754dd6d..526097f6cbd 100644 --- a/src/mame/drivers/ninjaw.cpp +++ b/src/mame/drivers/ninjaw.cpp @@ -629,7 +629,7 @@ static const gfx_layout charlayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( ninjaw ) +static GFXDECODE_START( gfx_ninjaw ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 256 ) /* sprites */ GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) /* scr tiles (screen 1) */ GFXDECODE_ENTRY( "gfx3", 0, charlayout, 0, 256 ) /* scr tiles (screens 2+) */ @@ -762,7 +762,7 @@ MACHINE_CONFIG_START(ninjaw_state::ninjaw) MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ninjaw) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ninjaw) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_ADD("palette2", 4096) MCFG_PALETTE_ADD("palette3", 4096) @@ -881,7 +881,7 @@ MACHINE_CONFIG_START(ninjaw_state::darius2) MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ninjaw) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ninjaw) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_ADD("palette2", 4096) MCFG_PALETTE_ADD("palette3", 4096) diff --git a/src/mame/drivers/nitedrvr.cpp b/src/mame/drivers/nitedrvr.cpp index 83a918e9c99..8c462419ba2 100644 --- a/src/mame/drivers/nitedrvr.cpp +++ b/src/mame/drivers/nitedrvr.cpp @@ -134,7 +134,7 @@ static const gfx_layout charlayout = /* Graphics Decode Information */ -static GFXDECODE_START( nitedrvr ) +static GFXDECODE_START( gfx_nitedrvr ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -161,7 +161,7 @@ MACHINE_CONFIG_START(nitedrvr_state::nitedrvr) MCFG_SCREEN_UPDATE_DRIVER(nitedrvr_state, screen_update_nitedrvr) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nitedrvr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nitedrvr) MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/nmg5.cpp b/src/mame/drivers/nmg5.cpp index 6d08ac08bfb..839837a9003 100644 --- a/src/mame/drivers/nmg5.cpp +++ b/src/mame/drivers/nmg5.cpp @@ -962,12 +962,12 @@ static const gfx_layout layout_16x16x5 = 32*8 }; -static GFXDECODE_START( nmg5 ) +static GFXDECODE_START( gfx_nmg5 ) GFXDECODE_ENTRY( "gfx1", 0, nmg5_layout_8x8x8, 0x000, 2 ) GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x5, 0x200, 16 ) GFXDECODE_END -static GFXDECODE_START( pclubys ) +static GFXDECODE_START( gfx_pclubys ) GFXDECODE_ENTRY( "gfx1", 0, pclubys_layout_8x8x8, 0x000, 2 ) GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x5, 0x200, 16 ) GFXDECODE_END @@ -1010,7 +1010,7 @@ MACHINE_CONFIG_START(nmg5_state::nmg5) MCFG_SCREEN_UPDATE_DRIVER(nmg5_state, screen_update_nmg5) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nmg5) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nmg5) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1059,7 +1059,7 @@ MACHINE_CONFIG_START(nmg5_state::pclubys) MCFG_DEVICE_MODIFY("soundcpu") MCFG_DEVICE_PROGRAM_MAP(pclubys_sound_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", pclubys) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pclubys) MACHINE_CONFIG_END MACHINE_CONFIG_START(nmg5_state::searchp2) @@ -1070,7 +1070,7 @@ MACHINE_CONFIG_START(nmg5_state::searchp2) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE(55) // ! - MCFG_GFXDECODE_MODIFY("gfxdecode", pclubys) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pclubys) MACHINE_CONFIG_END MACHINE_CONFIG_START(nmg5_state::_7ordi) diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp index d4c53f5ecb3..29447b50129 100644 --- a/src/mame/drivers/nmk16.cpp +++ b/src/mame/drivers/nmk16.cpp @@ -3717,25 +3717,25 @@ static const gfx_layout tilelayout = 32*32 }; -static GFXDECODE_START( tharrier ) +static GFXDECODE_START( gfx_tharrier ) GFXDECODE_ENTRY( "fgtile", 0, charlayout, 0x000, 16 ) /* color 0x200-0x2ff */ GFXDECODE_ENTRY( "bgtile", 0, tilelayout, 0x000, 16 ) /* color 0x000-0x0ff */ GFXDECODE_ENTRY( "sprites", 0, tilelayout, 0x100, 16 ) /* color 0x100-0x1ff */ GFXDECODE_END -static GFXDECODE_START( macross ) +static GFXDECODE_START( gfx_macross ) GFXDECODE_ENTRY( "fgtile", 0, charlayout, 0x200, 16 ) /* color 0x200-0x2ff */ GFXDECODE_ENTRY( "bgtile", 0, tilelayout, 0x000, 16 ) /* color 0x000-0x0ff */ GFXDECODE_ENTRY( "sprites", 0, tilelayout, 0x100, 16 ) /* color 0x100-0x1ff */ GFXDECODE_END -static GFXDECODE_START( macross2 ) +static GFXDECODE_START( gfx_macross2 ) GFXDECODE_ENTRY( "fgtile", 0, charlayout, 0x300, 16 ) /* color 0x300-0x3ff */ GFXDECODE_ENTRY( "bgtile", 0, tilelayout, 0x000, 16 ) /* color 0x000-0x0ff */ GFXDECODE_ENTRY( "sprites", 0, tilelayout, 0x100, 32 ) /* color 0x100-0x2ff */ GFXDECODE_END -static GFXDECODE_START( bjtwin ) +static GFXDECODE_START( gfx_bjtwin ) GFXDECODE_ENTRY( "fgtile", 0, charlayout, 0x000, 16 ) /* color 0x000-0x0ff */ GFXDECODE_ENTRY( "bgtile", 0, charlayout, 0x000, 16 ) /* color 0x000-0x0ff */ GFXDECODE_ENTRY( "sprites", 0, tilelayout, 0x100, 16 ) /* color 0x100-0x1ff */ @@ -3744,14 +3744,14 @@ GFXDECODE_END -static GFXDECODE_START( bioship ) +static GFXDECODE_START( gfx_bioship ) GFXDECODE_ENTRY( "fgtile", 0, charlayout, 0x300, 16 ) /* color 0x300-0x3ff */ GFXDECODE_ENTRY( "bgtile", 0, tilelayout, 0x100, 16 ) /* color 0x100-0x1ff */ GFXDECODE_ENTRY( "sprites", 0, tilelayout, 0x200, 16 ) /* color 0x200-0x2ff */ GFXDECODE_ENTRY( "gfx4", 0, tilelayout, 0x000, 16 ) /* color 0x000-0x0ff */ GFXDECODE_END -static GFXDECODE_START( strahl ) +static GFXDECODE_START( gfx_strahl ) GFXDECODE_ENTRY( "fgtile", 0, charlayout, 0x000, 16 ) /* color 0x000-0x0ff */ GFXDECODE_ENTRY( "bgtile", 0, tilelayout, 0x300, 16 ) /* color 0x300-0x3ff */ GFXDECODE_ENTRY( "sprites", 0, tilelayout, 0x100, 16 ) /* color 0x100-0x1ff */ @@ -3858,7 +3858,7 @@ MACHINE_CONFIG_START(nmk16_state::tharrier) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_tharrier) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tharrier) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tharrier) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) MCFG_VIDEO_START_OVERRIDE(nmk16_state,macross) @@ -3897,7 +3897,7 @@ MACHINE_CONFIG_START(nmk16_state::mustang) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -3940,7 +3940,7 @@ MACHINE_CONFIG_START(nmk16_state::mustangb) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -3978,7 +3978,7 @@ MACHINE_CONFIG_START(nmk16_state::bioship) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_bioship) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", bioship) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bioship) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4018,7 +4018,7 @@ MACHINE_CONFIG_START(nmk16_state::vandyke) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4061,7 +4061,7 @@ MACHINE_CONFIG_START(nmk16_state::vandykeb) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4087,7 +4087,7 @@ MACHINE_CONFIG_START(nmk16_state::acrobatm) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -4131,7 +4131,7 @@ MACHINE_CONFIG_START(nmk16_state::tdragonb) /* bootleg using Raiden sound har MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4166,7 +4166,7 @@ MACHINE_CONFIG_START(nmk16_state::tdragon) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4214,7 +4214,7 @@ MACHINE_CONFIG_START(nmk16_state::ssmissin) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4243,7 +4243,7 @@ MACHINE_CONFIG_START(nmk16_state::strahl) NMK_HACKY_SCREEN_LOWRES MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_strahl) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", strahl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_strahl) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -4283,7 +4283,7 @@ MACHINE_CONFIG_START(nmk16_state::hachamf) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4329,7 +4329,7 @@ MACHINE_CONFIG_START(nmk16_state::macross) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4369,7 +4369,7 @@ MACHINE_CONFIG_START(nmk16_state::blkheart) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4408,7 +4408,7 @@ MACHINE_CONFIG_START(nmk16_state::gunnail) NMK_HACKY_SCREEN_HIRES MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_gunnail) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4452,7 +4452,7 @@ MACHINE_CONFIG_START(nmk16_state::macross2) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_gunnail) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross2) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4498,7 +4498,7 @@ MACHINE_CONFIG_START(nmk16_state::tdragon2) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_tdragon2) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross2) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4551,7 +4551,7 @@ MACHINE_CONFIG_START(nmk16_state::raphero) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_tdragon2) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross2) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4593,7 +4593,7 @@ MACHINE_CONFIG_START(nmk16_state::bjtwin) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_bjtwin) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", bjtwin) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bjtwin) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -4655,7 +4655,7 @@ MACHINE_CONFIG_START(nmk16_state::manybloc) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tharrier) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tharrier) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -5125,19 +5125,19 @@ static const gfx_layout layout_16x16x4_swapped = 16*16*4 }; -static GFXDECODE_START( grdnstrm ) +static GFXDECODE_START( gfx_grdnstrm ) GFXDECODE_ENTRY( "fgtile", 0, layout_8x8x4, 256*2, 16 ) // [2] Layer 1 GFXDECODE_ENTRY( "bgtile", 0, layout_16x16x8, 256*0, 1 ) // [1] Layer 0 GFXDECODE_ENTRY( "sprites", 0, layout_16x16x4, 256*1, 16 ) // [0] Sprites GFXDECODE_END -static GFXDECODE_START( stagger1 ) +static GFXDECODE_START( gfx_stagger1 ) GFXDECODE_ENTRY( "fgtile", 0, layout_8x8x4, 256*2, 16 ) // [2] Layer 1 GFXDECODE_ENTRY( "bgtile", 0, layout_16x16x4, 256*0, 16 ) // [1] Layer 0 GFXDECODE_ENTRY( "sprites", 0, layout_16x16x4, 256*1, 16 ) // [0] Sprites GFXDECODE_END -static GFXDECODE_START( redhawkb ) +static GFXDECODE_START( gfx_redhawkb ) GFXDECODE_ENTRY( "fgtile", 0, layout_8x8x4, 256*2, 16 ) // [2] Layer 1 GFXDECODE_ENTRY( "bgtile", 0, layout_16x16x4_swapped, 256*0, 16 ) // [1] Layer 0 GFXDECODE_ENTRY( "sprites", 0, layout_16x16x4_swapped, 256*1, 16 ) // [0] Sprites @@ -5167,7 +5167,7 @@ MACHINE_CONFIG_START(nmk16_state::stagger1) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_afega) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", stagger1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_stagger1) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -5204,7 +5204,7 @@ MACHINE_CONFIG_START(nmk16_state::redhawkb) /* basic machine hardware */ /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", redhawkb) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_redhawkb) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_redhawkb) MACHINE_CONFIG_END @@ -5215,7 +5215,7 @@ MACHINE_CONFIG_START(nmk16_state::grdnstrm) /* basic machine hardware */ /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", grdnstrm) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_grdnstrm) MCFG_VIDEO_START_OVERRIDE(nmk16_state,firehawk) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_firehawk) @@ -5229,7 +5229,7 @@ MACHINE_CONFIG_START(nmk16_state::grdnstrmk) /* Side by side with PCB, the music /* video hardware */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE(57) /* Side by side with PCB, MAME is too fast at 56 */ - MCFG_GFXDECODE_MODIFY("gfxdecode", grdnstrm) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_grdnstrm) MCFG_VIDEO_START_OVERRIDE(nmk16_state,grdnstrm) MACHINE_CONFIG_END @@ -5258,7 +5258,7 @@ MACHINE_CONFIG_START(nmk16_state::firehawk) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_firehawk) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", grdnstrm) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_grdnstrm) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -5299,7 +5299,7 @@ MACHINE_CONFIG_START(nmk16_state::twinactn) MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_macross) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", macross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_macross) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) diff --git a/src/mame/drivers/norautp.cpp b/src/mame/drivers/norautp.cpp index c2407da3192..0b924dede14 100644 --- a/src/mame/drivers/norautp.cpp +++ b/src/mame/drivers/norautp.cpp @@ -1230,7 +1230,7 @@ static const gfx_layout charlayout32x32 = ******************************/ /* GFX are stored in the 2nd half... Maybe the HW could handle 2 bitplanes? */ -static GFXDECODE_START( norautp ) +static GFXDECODE_START( gfx_norautp ) GFXDECODE_ENTRY( "gfx", 0x800, charlayout, 0, 4 ) GFXDECODE_ENTRY( "gfx", 0x800, charlayout32x32, 0, 4 ) GFXDECODE_END @@ -1279,7 +1279,7 @@ MACHINE_CONFIG_START(norautp_state::noraut_base) MCFG_SCREEN_UPDATE_DRIVER(norautp_state, screen_update_norautp) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", norautp) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_norautp) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(norautp_state, norautp) diff --git a/src/mame/drivers/nova2001.cpp b/src/mame/drivers/nova2001.cpp index dfdc5a3c447..3108cc31c94 100644 --- a/src/mame/drivers/nova2001.cpp +++ b/src/mame/drivers/nova2001.cpp @@ -616,24 +616,24 @@ static const gfx_layout layout16x16 = 128*8 }; -static GFXDECODE_START( nova2001 ) +static GFXDECODE_START( gfx_nova2001 ) GFXDECODE_ENTRY( "gfx1", 0x0000, layout16x16, 0x000, 16 ) // sprites GFXDECODE_ENTRY( "gfx1", 0x0000, layout8x8_part, 0x000, 16 ) // fg tiles (using only 1/4th of the ROM space) GFXDECODE_ENTRY( "gfx1", 0x4000, layout8x8_part, 0x100, 16 ) // bg tiles (using only 1/4th of the ROM space) GFXDECODE_END -static GFXDECODE_START( ninjakun ) +static GFXDECODE_START( gfx_ninjakun ) GFXDECODE_ENTRY( "gfx1", 0, layout16x16, 0x200, 16 ) // sprites GFXDECODE_ENTRY( "gfx1", 0, layout8x8, 0x000, 16 ) // fg tiles GFXDECODE_ENTRY( "gfx2", 0, layout8x8, 0x100, 16 ) // bg tiles GFXDECODE_END -static GFXDECODE_START( pkunwar ) +static GFXDECODE_START( gfx_pkunwar ) GFXDECODE_ENTRY( "gfx1", 0, layout16x16, 0x000, 16 ) // sprites GFXDECODE_ENTRY( "gfx1", 0, layout8x8, 0x100, 16 ) // bg tiles GFXDECODE_END -static GFXDECODE_START( raiders5 ) +static GFXDECODE_START( gfx_raiders5 ) GFXDECODE_ENTRY( "gfx1", 0, layout16x16, 0x200, 16 ) // sprites GFXDECODE_ENTRY( "gfx1", 0, layout8x8_part, 0x000, 16 ) // fg tiles (using only 1/4th of the ROM space) GFXDECODE_ENTRY( "gfx2", 0, layout8x8, 0x100, 16 ) // bg tiles @@ -663,7 +663,7 @@ MACHINE_CONFIG_START(nova2001_state::nova2001) MCFG_SCREEN_UPDATE_DRIVER(nova2001_state, screen_update_nova2001) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nova2001) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nova2001) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT_CLASS(1, nova2001_state, BBGGRRII) @@ -708,7 +708,7 @@ MACHINE_CONFIG_START(nova2001_state::ninjakun) MCFG_SCREEN_UPDATE_DRIVER(nova2001_state, screen_update_ninjakun) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ninjakun) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ninjakun) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT_CLASS(1, nova2001_state, BBGGRRII) @@ -744,7 +744,7 @@ MACHINE_CONFIG_START(nova2001_state::pkunwar) MCFG_SCREEN_UPDATE_DRIVER(nova2001_state, screen_update_pkunwar) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pkunwar) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pkunwar) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT_CLASS(1, nova2001_state, BBGGRRII) @@ -787,7 +787,7 @@ MACHINE_CONFIG_START(nova2001_state::raiders5) MCFG_SCREEN_UPDATE_DRIVER(nova2001_state, screen_update_raiders5) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", raiders5) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_raiders5) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT_CLASS(1, nova2001_state, BBGGRRII) diff --git a/src/mame/drivers/nsmpoker.cpp b/src/mame/drivers/nsmpoker.cpp index cdf83143303..d0d73e0a17b 100644 --- a/src/mame/drivers/nsmpoker.cpp +++ b/src/mame/drivers/nsmpoker.cpp @@ -396,7 +396,7 @@ static const gfx_layout tilelayout = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( nsmpoker ) +static GFXDECODE_START( gfx_nsmpoker ) GFXDECODE_ENTRY( "maincpu", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "maincpu", 0, tilelayout, 0, 16 ) GFXDECODE_END @@ -429,7 +429,7 @@ MACHINE_CONFIG_START(nsmpoker_state::nsmpoker) MCFG_SCREEN_UPDATE_DRIVER(nsmpoker_state, screen_update_nsmpoker) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nsmpoker) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nsmpoker) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(nsmpoker_state, nsmpoker) diff --git a/src/mame/drivers/nycaptor.cpp b/src/mame/drivers/nycaptor.cpp index 96d214ac72b..bd6fc1d5de3 100644 --- a/src/mame/drivers/nycaptor.cpp +++ b/src/mame/drivers/nycaptor.cpp @@ -699,7 +699,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( nycaptor ) +static GFXDECODE_START( gfx_nycaptor ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 )//16 colors GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 256, 16 )//palette 2, 16 colors GFXDECODE_END @@ -761,7 +761,7 @@ MACHINE_CONFIG_START(nycaptor_state::nycaptor) MCFG_SCREEN_UPDATE_DRIVER(nycaptor_state, screen_update_nycaptor) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nycaptor) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nycaptor) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -836,7 +836,7 @@ MACHINE_CONFIG_START(nycaptor_state::cyclshtg) MCFG_SCREEN_UPDATE_DRIVER(nycaptor_state, screen_update_nycaptor) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nycaptor) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nycaptor) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -906,7 +906,7 @@ MACHINE_CONFIG_START(nycaptor_state::bronx) MCFG_SCREEN_UPDATE_DRIVER(nycaptor_state, screen_update_nycaptor) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nycaptor) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nycaptor) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp index 12029657c26..623dd9d4451 100644 --- a/src/mame/drivers/odyssey2.cpp +++ b/src/mame/drivers/odyssey2.cpp @@ -654,7 +654,7 @@ static const gfx_layout odyssey2_spritelayout = }; -static GFXDECODE_START( odyssey2 ) +static GFXDECODE_START( gfx_odyssey2 ) GFXDECODE_ENTRY( "gfx1", 0x0000, odyssey2_graphicslayout, 0, 2 ) GFXDECODE_ENTRY( "gfx1", 0x0000, odyssey2_spritelayout, 0, 2 ) GFXDECODE_END @@ -689,7 +689,7 @@ MACHINE_CONFIG_START(odyssey2_state::odyssey2) MCFG_SCREEN_UPDATE_DRIVER(odyssey2_state, screen_update_odyssey2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", odyssey2 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_odyssey2) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(odyssey2_state, odyssey2) @@ -715,7 +715,7 @@ MACHINE_CONFIG_START(odyssey2_state::videopac) MCFG_SCREEN_UPDATE_DRIVER(odyssey2_state, screen_update_odyssey2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", odyssey2 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_odyssey2) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(odyssey2_state, odyssey2) @@ -750,7 +750,7 @@ MACHINE_CONFIG_START(g7400_state::g7400) MCFG_SCREEN_UPDATE_DRIVER(odyssey2_state, screen_update_odyssey2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", odyssey2 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_odyssey2) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(g7400_state, g7400) @@ -791,7 +791,7 @@ MACHINE_CONFIG_START(g7400_state::odyssey3) MCFG_SCREEN_UPDATE_DRIVER(odyssey2_state, screen_update_odyssey2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", odyssey2 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_odyssey2) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(g7400_state, g7400) diff --git a/src/mame/drivers/offtwall.cpp b/src/mame/drivers/offtwall.cpp index ad6192b9a7e..2479e0bc624 100644 --- a/src/mame/drivers/offtwall.cpp +++ b/src/mame/drivers/offtwall.cpp @@ -323,7 +323,7 @@ static const gfx_layout pfmolayout = }; -static GFXDECODE_START( offtwall ) +static GFXDECODE_START( gfx_offtwall ) GFXDECODE_ENTRY( "gfx1", 0, pfmolayout, 256, 32 ) /* sprites & playfield */ GFXDECODE_END @@ -347,7 +347,7 @@ MACHINE_CONFIG_START(offtwall_state::offtwall) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", offtwall) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_offtwall) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/ohmygod.cpp b/src/mame/drivers/ohmygod.cpp index 86c19ab3e1c..f10890a534d 100644 --- a/src/mame/drivers/ohmygod.cpp +++ b/src/mame/drivers/ohmygod.cpp @@ -295,7 +295,7 @@ static const gfx_layout spritelayout = 128*8 }; -static GFXDECODE_START( ohmygod ) +static GFXDECODE_START( gfx_ohmygod ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) /* colors 0-255 */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 512, 16 ) /* colors 512-767 */ GFXDECODE_END @@ -340,7 +340,7 @@ MACHINE_CONFIG_START(ohmygod_state::ohmygod) MCFG_SCREEN_UPDATE_DRIVER(ohmygod_state, screen_update_ohmygod) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ohmygod) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ohmygod) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) diff --git a/src/mame/drivers/ojankohs.cpp b/src/mame/drivers/ojankohs.cpp index 5f3de44a61a..ee2dcb778b1 100644 --- a/src/mame/drivers/ojankohs.cpp +++ b/src/mame/drivers/ojankohs.cpp @@ -651,7 +651,7 @@ static const gfx_layout ojankohs_bglayout = 16*8 }; -static GFXDECODE_START( ojankohs ) +static GFXDECODE_START( gfx_ojankohs ) GFXDECODE_ENTRY( "gfx1", 0, ojankohs_bglayout, 0, 64 ) GFXDECODE_END @@ -732,7 +732,7 @@ MACHINE_CONFIG_START(ojankohs_state::ojankohs) MCFG_SCREEN_UPDATE_DRIVER(ojankohs_state, screen_update_ojankohs) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ojankohs) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ojankohs) MCFG_PALETTE_ADD("palette", 1024) MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(13'333'000)/2) // divider not verified @@ -773,7 +773,7 @@ MACHINE_CONFIG_START(ojankohs_state::ojankoy) MCFG_SCREEN_UPDATE_DRIVER(ojankohs_state, screen_update_ojankohs) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ojankohs) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ojankohs) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_INIT_OWNER(ojankohs_state,ojankoy) @@ -813,7 +813,7 @@ MACHINE_CONFIG_START(ojankohs_state::ccasino) MCFG_SCREEN_UPDATE_DRIVER(ojankohs_state, screen_update_ojankohs) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ojankohs) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ojankohs) MCFG_PALETTE_ADD("palette", 1024) MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(13'333'000)/2) // divider not verified diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp index 9ea77d25a2e..8ff0410f0c0 100644 --- a/src/mame/drivers/okean240.cpp +++ b/src/mame/drivers/okean240.cpp @@ -494,11 +494,11 @@ static const gfx_layout okean240_charlayout = 8*7 /* every char takes 7 bytes */ }; -static GFXDECODE_START( okean240 ) +static GFXDECODE_START( gfx_okean240 ) GFXDECODE_ENTRY( "maincpu", 0xec08, okean240_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START( okean240a ) +static GFXDECODE_START( gfx_okean240a ) GFXDECODE_ENTRY( "maincpu", 0xef63, okean240_charlayout, 0, 1 ) GFXDECODE_END @@ -552,7 +552,7 @@ MACHINE_CONFIG_START(okean240_state::okean240a) okean240t(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(okean240a_io) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", okean240a) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_okean240a) MCFG_DEVICE_REMOVE("rs232") MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard") MCFG_RS232_RXD_HANDLER(WRITELINE("uart", i8251_device, write_rxd)) @@ -572,7 +572,7 @@ MACHINE_CONFIG_START(okean240_state::okean240) okean240t(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(okean240_io) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", okean240) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_okean240) MCFG_DEVICE_REMOVE("uart") MCFG_DEVICE_REMOVE("rs232") MCFG_DEVICE_MODIFY("pit") diff --git a/src/mame/drivers/olibochu.cpp b/src/mame/drivers/olibochu.cpp index e1bd61916e6..6dc4d20da9f 100644 --- a/src/mame/drivers/olibochu.cpp +++ b/src/mame/drivers/olibochu.cpp @@ -433,7 +433,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( olibochu ) +static GFXDECODE_START( gfx_olibochu ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 64 ) GFXDECODE_END @@ -485,7 +485,7 @@ MACHINE_CONFIG_START(olibochu_state::olibochu) MCFG_SCREEN_UPDATE_DRIVER(olibochu_state, screen_update_olibochu) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", olibochu) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_olibochu) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(olibochu_state, olibochu) diff --git a/src/mame/drivers/oneshot.cpp b/src/mame/drivers/oneshot.cpp index 2a0473f7d8f..8b752b1f620 100644 --- a/src/mame/drivers/oneshot.cpp +++ b/src/mame/drivers/oneshot.cpp @@ -335,7 +335,7 @@ static const gfx_layout oneshot8x8_layout = }; -static GFXDECODE_START( oneshot ) +static GFXDECODE_START( gfx_oneshot ) GFXDECODE_ENTRY( "gfx1", 0, oneshot16x16_layout, 0x00, 4 ) /* sprites */ GFXDECODE_ENTRY( "gfx1", 0, oneshot8x8_layout, 0x00, 4 ) /* sprites */ GFXDECODE_END @@ -382,7 +382,7 @@ MACHINE_CONFIG_START(oneshot_state::oneshot) MCFG_SCREEN_UPDATE_DRIVER(oneshot_state, screen_update_oneshot) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", oneshot) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_oneshot) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/onetwo.cpp b/src/mame/drivers/onetwo.cpp index 0c37f05b32d..8ab90715e53 100644 --- a/src/mame/drivers/onetwo.cpp +++ b/src/mame/drivers/onetwo.cpp @@ -338,7 +338,7 @@ static const gfx_layout tiles8x8x6_layout = 16*8 }; -static GFXDECODE_START( onetwo ) +static GFXDECODE_START( gfx_onetwo ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x6_layout, 0, 2 ) GFXDECODE_END @@ -380,7 +380,7 @@ MACHINE_CONFIG_START(onetwo_state::onetwo) MCFG_SCREEN_UPDATE_DRIVER(onetwo_state, screen_update_onetwo) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", onetwo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_onetwo) MCFG_PALETTE_ADD("palette", 0x80) diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp index aa09f248cb7..7c4122f9529 100644 --- a/src/mame/drivers/opwolf.cpp +++ b/src/mame/drivers/opwolf.cpp @@ -767,12 +767,12 @@ static const gfx_layout tilelayout_b = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( opwolf ) +static GFXDECODE_START( gfx_opwolf ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 128 ) /* sprites */ GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) /* scr tiles */ GFXDECODE_END -static GFXDECODE_START( opwolfb ) +static GFXDECODE_START( gfx_opwolfb ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout_b, 0, 128 ) /* sprites */ GFXDECODE_ENTRY( "gfx1", 0, charlayout_b, 0, 128 ) /* scr tiles */ GFXDECODE_END @@ -807,7 +807,7 @@ MACHINE_CONFIG_START(opwolf_state::opwolf) MCFG_SCREEN_UPDATE_DRIVER(opwolf_state, screen_update_opwolf) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", opwolf) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_opwolf) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) @@ -885,7 +885,7 @@ MACHINE_CONFIG_START(opwolf_state::opwolfb) /* OSC clocks unknown for the bootle MCFG_SCREEN_UPDATE_DRIVER(opwolf_state, screen_update_opwolf) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", opwolfb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_opwolfb) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) diff --git a/src/mame/drivers/orbit.cpp b/src/mame/drivers/orbit.cpp index 17339f9d195..0e27449024f 100644 --- a/src/mame/drivers/orbit.cpp +++ b/src/mame/drivers/orbit.cpp @@ -232,7 +232,7 @@ static const gfx_layout orbit_tile_layout = }; -static GFXDECODE_START( orbit ) +static GFXDECODE_START( gfx_orbit ) GFXDECODE_ENTRY( "gfx1", 0, orbit_full_sprite_layout, 0, 1 ) GFXDECODE_ENTRY( "gfx1", 0, orbit_upper_sprite_layout, 0, 1 ) GFXDECODE_ENTRY( "gfx1", 0, orbit_lower_sprite_layout, 0, 1 ) @@ -295,7 +295,7 @@ MACHINE_CONFIG_START(orbit_state::orbit) MCFG_SCREEN_UPDATE_DRIVER(orbit_state, screen_update_orbit) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", orbit) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_orbit) MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/osborne1.cpp b/src/mame/drivers/osborne1.cpp index 570e41a3108..64b3d1e50b6 100644 --- a/src/mame/drivers/osborne1.cpp +++ b/src/mame/drivers/osborne1.cpp @@ -278,7 +278,7 @@ static const gfx_layout osborne1_charlayout = 8 // every char takes 16 x 1 bytes }; -static GFXDECODE_START( osborne1 ) +static GFXDECODE_START( gfx_osborne1 ) GFXDECODE_ENTRY("chargen", 0x0000, osborne1_charlayout, 0, 1) GFXDECODE_END @@ -294,7 +294,7 @@ MACHINE_CONFIG_START(osborne1_state::osborne1) MCFG_SCREEN_UPDATE_DRIVER(osborne1_state, screen_update) MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK, 1024, 0, 104*8, 260, 0, 24*10) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD(m_gfxdecode, "palette", osborne1) + MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, "palette", gfx_osborne1) MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/osi.cpp b/src/mame/drivers/osi.cpp index 242f9212f80..886766c98f6 100644 --- a/src/mame/drivers/osi.cpp +++ b/src/mame/drivers/osi.cpp @@ -705,7 +705,7 @@ static const gfx_layout osi_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( osi ) +static GFXDECODE_START( gfx_osi ) GFXDECODE_ENTRY( "chargen", 0x0000, osi_charlayout, 0, 1 ) GFXDECODE_END @@ -718,7 +718,7 @@ MACHINE_CONFIG_START(sb2m600_state::osi600) /* video hardware */ osi600_video(config); - MCFG_GFXDECODE_ADD("gfxdecode", "palette", osi) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_osi) /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -749,7 +749,7 @@ MACHINE_CONFIG_START(uk101_state::uk101) /* video hardware */ uk101_video(config); - MCFG_GFXDECODE_ADD("gfxdecode", "palette", osi) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_osi) /* cassette ACIA */ MCFG_DEVICE_ADD("acia_0", ACIA6850, 0) @@ -774,7 +774,7 @@ MACHINE_CONFIG_START(c1p_state::c1p) /* video hardware */ osi630_video(config); - MCFG_GFXDECODE_ADD("gfxdecode", "palette", osi) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_osi) /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/othunder.cpp b/src/mame/drivers/othunder.cpp index e731126c24b..897b69412df 100644 --- a/src/mame/drivers/othunder.cpp +++ b/src/mame/drivers/othunder.cpp @@ -587,7 +587,7 @@ static const gfx_layout charlayout = 32*8 }; -static GFXDECODE_START( othunder ) +static GFXDECODE_START( gfx_othunder ) GFXDECODE_ENTRY( "gfx2", 0, tile16x8_layout, 0, 256 ) /* sprite parts */ GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_END @@ -641,7 +641,7 @@ MACHINE_CONFIG_START(othunder_state::othunder) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, othunder_state, vblank_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", othunder) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_othunder) MCFG_PALETTE_ADD("palette", 4096) MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0) diff --git a/src/mame/drivers/p2000t.cpp b/src/mame/drivers/p2000t.cpp index cd247eb0e5c..64dc9dbb213 100644 --- a/src/mame/drivers/p2000t.cpp +++ b/src/mame/drivers/p2000t.cpp @@ -91,7 +91,7 @@ PALETTE_INIT_MEMBER(p2000m_state,p2000m) palette.set_pen_color(3,rgb_t::white()); /* white */ } -static GFXDECODE_START( p2000m ) +static GFXDECODE_START( gfx_p2000m ) GFXDECODE_ENTRY( "gfx1", 0x0000, p2000m_charlayout, 0, 2 ) GFXDECODE_END @@ -265,7 +265,7 @@ MACHINE_CONFIG_START(p2000m_state::p2000m) MCFG_SCREEN_UPDATE_DRIVER(p2000m_state, screen_update_p2000m) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", p2000m) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_p2000m) MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(p2000m_state,p2000m) diff --git a/src/mame/drivers/pacland.cpp b/src/mame/drivers/pacland.cpp index 363b320ea52..2e5d474c1e1 100644 --- a/src/mame/drivers/pacland.cpp +++ b/src/mame/drivers/pacland.cpp @@ -409,7 +409,7 @@ static const gfx_layout charlayout = 16*8 }; -static GFXDECODE_START( pacland ) +static GFXDECODE_START( gfx_pacland ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 256*4, 256 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 256*4+256*4, 64 ) @@ -446,7 +446,7 @@ MACHINE_CONFIG_START(pacland_state::pacland) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pacland_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pacland) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pacland) MCFG_PALETTE_ADD("palette", 256*4+256*4+64*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(pacland_state, pacland) diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp index f8b9027f70c..091fee90b95 100644 --- a/src/mame/drivers/pacman.cpp +++ b/src/mame/drivers/pacman.cpp @@ -3489,25 +3489,25 @@ static const gfx_layout crush4_spritelayout = }; -static GFXDECODE_START( pacman ) +static GFXDECODE_START( gfx_pacman ) GFXDECODE_ENTRY( "gfx1", 0x0000, tilelayout, 0, 128 ) GFXDECODE_ENTRY( "gfx1", 0x1000, spritelayout, 0, 128 ) GFXDECODE_END -static GFXDECODE_START( s2650games ) +static GFXDECODE_START( gfx_s2650games ) GFXDECODE_ENTRY( "gfx1", 0x0000, tilelayout, 0, 128 ) GFXDECODE_ENTRY( "gfx1", 0x4000, spritelayout, 0, 128 ) GFXDECODE_END -static GFXDECODE_START( superabc ) +static GFXDECODE_START( gfx_superabc ) GFXDECODE_ENTRY( "gfx1", 0x0000, tilelayout, 0, 128 ) GFXDECODE_ENTRY( "gfx1", 0x8000, spritelayout, 0, 128 ) GFXDECODE_END -static GFXDECODE_START( crush4 ) +static GFXDECODE_START( gfx_crush4 ) GFXDECODE_ENTRY( "gfx1", 0x0000, crush4_tilelayout, 0, 128 ) GFXDECODE_ENTRY( "gfx1", 0x1000, crush4_spritelayout, 0, 128 ) GFXDECODE_END @@ -3541,7 +3541,7 @@ MACHINE_CONFIG_START(pacman_state::pacman) MCFG_WATCHDOG_VBLANK_INIT("screen", 16) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pacman) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pacman) MCFG_PALETTE_ADD("palette", 128*4) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(pacman_state,pacman) @@ -3796,7 +3796,7 @@ MACHINE_CONFIG_START(pacman_state::s2650games) MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, pacman_state, coin_counter_w)) - MCFG_GFXDECODE_MODIFY("gfxdecode", s2650games) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_s2650games) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(32*8, 32*8) @@ -3878,7 +3878,7 @@ MACHINE_CONFIG_START(pacman_state::superabc) MCFG_MACHINE_RESET_OVERRIDE(pacman_state,superabc) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", superabc) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_superabc) MACHINE_CONFIG_END @@ -3886,7 +3886,7 @@ MACHINE_CONFIG_START(pacman_state::crush4) mschamp(config); /* basic machine hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", crush4) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_crush4) MACHINE_CONFIG_END MACHINE_CONFIG_START(pacman_state::crushs) diff --git a/src/mame/drivers/pandoras.cpp b/src/mame/drivers/pandoras.cpp index dca34df1546..2fb6288419a 100644 --- a/src/mame/drivers/pandoras.cpp +++ b/src/mame/drivers/pandoras.cpp @@ -269,7 +269,7 @@ static const gfx_layout spritelayout = 32*4*8 }; -static GFXDECODE_START( pandoras ) +static GFXDECODE_START( gfx_pandoras ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 16*16, 16 ) GFXDECODE_END @@ -347,7 +347,7 @@ MACHINE_CONFIG_START(pandoras_state::pandoras) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pandoras_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pandoras) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pandoras) MCFG_PALETTE_ADD("palette", 16*16+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(pandoras_state, pandoras) diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp index d0d0e9adc69..0eaad7b155a 100644 --- a/src/mame/drivers/panicr.cpp +++ b/src/mame/drivers/panicr.cpp @@ -589,7 +589,7 @@ static const gfx_layout spritelayout = 32*16 }; -static GFXDECODE_START( panicr ) +static GFXDECODE_START( gfx_panicr ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x000, 8 ) GFXDECODE_ENTRY( "gfx2", 0, bgtilelayout, 0x200, 32 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x100, 16 ) @@ -626,7 +626,7 @@ MACHINE_CONFIG_START(panicr_state::panicr) MCFG_SCREEN_UPDATE_DRIVER(panicr_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", panicr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_panicr) MCFG_PALETTE_ADD("palette", 256*4) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(panicr_state, panicr) diff --git a/src/mame/drivers/paradise.cpp b/src/mame/drivers/paradise.cpp index 030c5b35cb5..8392f49b05a 100644 --- a/src/mame/drivers/paradise.cpp +++ b/src/mame/drivers/paradise.cpp @@ -678,21 +678,21 @@ static const gfx_layout torus_layout_16x16x8 = 128*8 }; -static GFXDECODE_START( paradise ) +static GFXDECODE_START( gfx_paradise ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0x100, 1 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_8x8x4, 0x400, 16 ) // [1] Background GFXDECODE_ENTRY( "gfx3", 0, layout_8x8x8, 0x300, 1 ) // [2] Midground GFXDECODE_ENTRY( "gfx4", 0, layout_8x8x8, 0x000, 1 ) // [3] Foreground GFXDECODE_END -static GFXDECODE_START( torus ) +static GFXDECODE_START( gfx_torus ) GFXDECODE_ENTRY( "gfx1", 0, torus_layout_16x16x8, 0x100, 1 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_8x8x4, 0x400, 16 ) // [1] Background GFXDECODE_ENTRY( "gfx3", 0, layout_8x8x8, 0x300, 1 ) // [2] Midground GFXDECODE_ENTRY( "gfx4", 0, layout_8x8x8, 0x000, 1 ) // [3] Foreground GFXDECODE_END -static GFXDECODE_START( madball ) +static GFXDECODE_START( gfx_madball ) GFXDECODE_ENTRY( "gfx1", 0, torus_layout_16x16x8, 0x500, 1 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_8x8x4, 0x400, 16 ) // [1] Background GFXDECODE_ENTRY( "gfx3", 0, layout_8x8x8, 0x300, 1 ) // [2] Midground @@ -749,7 +749,7 @@ MACHINE_CONFIG_START(paradise_state::paradise) MCFG_SCREEN_UPDATE_DRIVER(paradise_state, screen_update_paradise) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", paradise) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_paradise) MCFG_PALETTE_ADD("palette", 0x800 + 16) @@ -779,7 +779,7 @@ MACHINE_CONFIG_START(paradise_state::torus) MCFG_DEVICE_PROGRAM_MAP(torus_map) MCFG_DEVICE_IO_MAP(torus_io_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", torus) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_torus) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(paradise_state, screen_update_torus) @@ -789,7 +789,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(paradise_state::madball) torus(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", madball) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_madball) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(paradise_state, screen_update_madball) diff --git a/src/mame/drivers/partner.cpp b/src/mame/drivers/partner.cpp index a5d60acfdcf..b3213d3c8fc 100644 --- a/src/mame/drivers/partner.cpp +++ b/src/mame/drivers/partner.cpp @@ -164,7 +164,7 @@ static const gfx_layout partner_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( partner ) +static GFXDECODE_START( gfx_partner ) GFXDECODE_ENTRY( "gfx1", 0x0000, partner_charlayout, 0, 1 ) GFXDECODE_END @@ -194,7 +194,7 @@ MACHINE_CONFIG_START(partner_state::partner) MCFG_SCREEN_SIZE(78*6, 30*10) MCFG_SCREEN_VISIBLE_AREA(0, 78*6-1, 0, 30*10-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", partner) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_partner) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(partner_state,radio86) diff --git a/src/mame/drivers/paso1600.cpp b/src/mame/drivers/paso1600.cpp index 01589d4cfad..06779ebbd74 100644 --- a/src/mame/drivers/paso1600.cpp +++ b/src/mame/drivers/paso1600.cpp @@ -269,7 +269,7 @@ static const gfx_layout paso1600_charlayout = 8*8 }; -static GFXDECODE_START( paso1600 ) +static GFXDECODE_START( gfx_paso1600 ) GFXDECODE_ENTRY( "pcg", 0x0000, paso1600_charlayout, 0, 4 ) GFXDECODE_ENTRY( "chargen", 0x0000, paso1600_charlayout, 0, 4 ) GFXDECODE_END @@ -317,7 +317,7 @@ MACHINE_CONFIG_START(paso1600_state::paso1600) MCFG_SCREEN_UPDATE_DRIVER(paso1600_state, screen_update_paso1600) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", paso1600) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_paso1600) MCFG_PALETTE_ADD("palette", 8) // MCFG_PALETTE_INIT(black_and_white) diff --git a/src/mame/drivers/pasopia.cpp b/src/mame/drivers/pasopia.cpp index 69711fb33cc..1031f4ddecb 100644 --- a/src/mame/drivers/pasopia.cpp +++ b/src/mame/drivers/pasopia.cpp @@ -254,7 +254,7 @@ static const gfx_layout p7_chars_8x8 = 8*8 }; -static GFXDECODE_START( pasopia ) +static GFXDECODE_START( gfx_pasopia ) GFXDECODE_ENTRY( "chargen", 0x0000, p7_chars_8x8, 0, 4 ) GFXDECODE_END @@ -296,7 +296,7 @@ MACHINE_CONFIG_START(pasopia_state::pasopia) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DEVICE("crtc", h46505_device, screen_update) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pasopia) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pasopia) MCFG_PALETTE_ADD("palette", 8) /* Devices */ diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp index cd0a2c96f31..085775a906a 100644 --- a/src/mame/drivers/pasopia7.cpp +++ b/src/mame/drivers/pasopia7.cpp @@ -743,7 +743,7 @@ static const gfx_layout p7_chars_16x16 = 16*16 }; -static GFXDECODE_START( pasopia7 ) +static GFXDECODE_START( gfx_pasopia7 ) GFXDECODE_ENTRY( "font", 0x00000, p7_chars_8x8, 0, 0x10 ) GFXDECODE_ENTRY( "kanji", 0x00000, p7_chars_16x16, 0, 0x10 ) GFXDECODE_END @@ -981,7 +981,7 @@ MACHINE_CONFIG_START(pasopia7_state::p7_raster) MCFG_VIDEO_START_OVERRIDE(pasopia7_state,pasopia7) MCFG_SCREEN_UPDATE_DRIVER(pasopia7_state, screen_update_pasopia7) MCFG_PALETTE_ADD_3BIT_BRG("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pasopia7 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pasopia7) MCFG_MC6845_ADD("crtc", H46505, "screen", VDP_CLOCK) /* unknown clock, hand tuned to get ~60 fps */ MCFG_MC6845_SHOW_BORDER_AREA(false) @@ -1002,7 +1002,7 @@ MACHINE_CONFIG_START(pasopia7_state::p7_lcd) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(pasopia7_state,p7_lcd) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pasopia7 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pasopia7) MCFG_MC6845_ADD("crtc", H46505, "screen", LCD_CLOCK) /* unknown clock, hand tuned to get ~60 fps */ MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/drivers/pass.cpp b/src/mame/drivers/pass.cpp index ae66048ad69..bce0f3c5ccc 100644 --- a/src/mame/drivers/pass.cpp +++ b/src/mame/drivers/pass.cpp @@ -234,7 +234,7 @@ static const gfx_layout tiles4x4_fg_layout = 4*32 }; -static GFXDECODE_START( pass ) +static GFXDECODE_START( gfx_pass ) GFXDECODE_ENTRY( "gfx1", 0, tiles4x4_fg_layout, 256, 2 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout, 0, 2 ) GFXDECODE_END @@ -263,7 +263,7 @@ MACHINE_CONFIG_START(pass_state::pass) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pass) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pass) /* sound hardware */ diff --git a/src/mame/drivers/patapata.cpp b/src/mame/drivers/patapata.cpp index 33088492c58..2614763c62d 100644 --- a/src/mame/drivers/patapata.cpp +++ b/src/mame/drivers/patapata.cpp @@ -273,7 +273,7 @@ static const gfx_layout tilelayout = 32*32 }; -static GFXDECODE_START( patapata ) +static GFXDECODE_START( gfx_patapata ) GFXDECODE_ENTRY( "tilesa", 0, tilelayout, 0x000, 16 ) GFXDECODE_ENTRY( "tilesb", 0, tilelayout, 0x100, 16 ) GFXDECODE_END @@ -291,7 +291,7 @@ MACHINE_CONFIG_START(patapata_state::patapata) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", patapata_state, irq4_line_hold) // 1 + 4 valid? (4 main VBL) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", patapata_state, scanline, "screen", 0, 1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", patapata) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_patapata) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/pb1000.cpp b/src/mame/drivers/pb1000.cpp index 0cc0cb9fc81..a932eda7bc2 100644 --- a/src/mame/drivers/pb1000.cpp +++ b/src/mame/drivers/pb1000.cpp @@ -324,7 +324,7 @@ static const gfx_layout pb1000_charlayout = 8*8 /* 8 bytes */ }; -static GFXDECODE_START( pb1000 ) +static GFXDECODE_START( gfx_pb1000 ) GFXDECODE_ENTRY( "hd44352", 0x0000, pb1000_charlayout, 0, 1 ) GFXDECODE_END @@ -504,7 +504,7 @@ MACHINE_CONFIG_START(pb1000_state::pb1000) MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pb1000_state, pb1000) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pb1000 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pb1000) MCFG_DEVICE_ADD("hd44352", HD44352, 910000) MCFG_HD44352_ON_CB(INPUTLINE("maincpu", HD61700_ON_INT)) diff --git a/src/mame/drivers/pbaction.cpp b/src/mame/drivers/pbaction.cpp index a1de765deb6..82eb009b072 100644 --- a/src/mame/drivers/pbaction.cpp +++ b/src/mame/drivers/pbaction.cpp @@ -282,7 +282,7 @@ static const gfx_layout spritelayout2 = -static GFXDECODE_START( pbaction ) +static GFXDECODE_START( gfx_pbaction ) GFXDECODE_ENTRY( "fgchars", 0x00000, charlayout1, 0, 16 ) /* 0-127 characters */ GFXDECODE_ENTRY( "bgchars", 0x00000, charlayout2, 128, 8 ) /* 128-255 background */ GFXDECODE_ENTRY( "sprites", 0x00000, spritelayout1, 0, 16 ) /* 0-127 normal sprites */ @@ -345,7 +345,7 @@ MACHINE_CONFIG_START(pbaction_state::pbaction) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pbaction_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pbaction) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pbaction) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/pc100.cpp b/src/mame/drivers/pc100.cpp index f52f9330170..821b6fdb4be 100644 --- a/src/mame/drivers/pc100.cpp +++ b/src/mame/drivers/pc100.cpp @@ -378,7 +378,7 @@ static const gfx_layout kanji_layout = 16*16 }; -static GFXDECODE_START( pc100 ) +static GFXDECODE_START( gfx_pc100 ) GFXDECODE_ENTRY( "kanji", 0x0000, kanji_layout, 8, 1 ) GFXDECODE_END @@ -550,7 +550,7 @@ MACHINE_CONFIG_START(pc100_state::pc100) MCFG_SCREEN_UPDATE_DRIVER(pc100_state, screen_update_pc100) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc100) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pc100) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_FORMAT(xxxxxxxBBBGGGRRR) diff --git a/src/mame/drivers/pc2000.cpp b/src/mame/drivers/pc2000.cpp index f78045d179e..f18b91172fe 100644 --- a/src/mame/drivers/pc2000.cpp +++ b/src/mame/drivers/pc2000.cpp @@ -861,7 +861,7 @@ static const gfx_layout hd44780_charlayout = 8*8 /* 8 bytes */ }; -static GFXDECODE_START( pc2000 ) +static GFXDECODE_START( gfx_pc2000 ) GFXDECODE_ENTRY( "hd44780:cgrom", 0x0000, hd44780_charlayout, 0, 1 ) GFXDECODE_END @@ -896,7 +896,7 @@ MACHINE_CONFIG_START(pc2000_state::pc2000) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pc2000_state, pc2000) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc2000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pc2000) MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_HD44780_ADD("hd44780") diff --git a/src/mame/drivers/pc4.cpp b/src/mame/drivers/pc4.cpp index dc3ac3923db..2861fd41fd5 100644 --- a/src/mame/drivers/pc4.cpp +++ b/src/mame/drivers/pc4.cpp @@ -184,7 +184,7 @@ static const gfx_layout pc4_charlayout = 8*8 /* 8 bytes */ }; -static GFXDECODE_START( pc4 ) +static GFXDECODE_START( gfx_pc4 ) GFXDECODE_ENTRY( "charset", 0x0000, pc4_charlayout, 0, 1 ) GFXDECODE_END @@ -235,7 +235,7 @@ MACHINE_CONFIG_START(pc4_state::pc4) MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pc4_state, pc4) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc4) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pc4) /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp index 0235fb569b5..c0a993bc393 100644 --- a/src/mame/drivers/pc6001.cpp +++ b/src/mame/drivers/pc6001.cpp @@ -1477,7 +1477,7 @@ static const gfx_layout kanji_layout = 8*16 }; -static GFXDECODE_START( pc6001m2 ) +static GFXDECODE_START( gfx_pc6001m2 ) GFXDECODE_ENTRY( "gfx1", 0x0000, char_layout, 2, 1 ) GFXDECODE_ENTRY( "gfx2", 0x0000, kanji_layout, 2, 1 ) GFXDECODE_END @@ -1494,7 +1494,7 @@ MACHINE_CONFIG_START(pc6001_state::pc6001) // MCFG_DEVICE_ADD("subcpu", I8049, 7987200) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc6001m2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pc6001m2) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1554,7 +1554,7 @@ MACHINE_CONFIG_START(pc6001mk2_state::pc6001mk2) MCFG_PALETTE_ENTRIES(16+16) MCFG_PALETTE_INIT_OWNER(pc6001mk2_state,pc6001mk2) - MCFG_GFXDECODE_MODIFY("gfxdecode", pc6001m2) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pc6001m2) MCFG_DEVICE_ADD("upd7752", UPD7752, PC6001_MAIN_CLOCK/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp index 407bd02ed1a..429b02c6e02 100644 --- a/src/mame/drivers/pc8801.cpp +++ b/src/mame/drivers/pc8801.cpp @@ -2239,7 +2239,7 @@ static const gfx_layout kanji_layout = }; /* debugging only */ -static GFXDECODE_START( pc8801 ) +static GFXDECODE_START( gfx_pc8801 ) GFXDECODE_ENTRY( "cgrom", 0, char_layout, 0, 8 ) GFXDECODE_ENTRY( "kanji", 0, kanji_layout, 0, 8 ) GFXDECODE_END @@ -2635,7 +2635,7 @@ MACHINE_CONFIG_START(pc8801_state::pc8801) MCFG_SCREEN_UPDATE_DRIVER(pc8801_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc8801 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pc8801) MCFG_PALETTE_ADD("palette", 0x10) MCFG_PALETTE_INIT_OWNER(pc8801_state, pc8801) diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp index 2eca2b48b7b..0c0a93584ae 100644 --- a/src/mame/drivers/pc88va.cpp +++ b/src/mame/drivers/pc88va.cpp @@ -1581,7 +1581,7 @@ static const gfx_layout pc88va_chars_16x16 = }; /* decoded for debugging purpose, this will be nuked in the end... */ -static GFXDECODE_START( pc88va ) +static GFXDECODE_START( gfx_pc88va ) GFXDECODE_ENTRY( "kanji", 0x00000, pc88va_chars_8x8, 0, 1 ) GFXDECODE_ENTRY( "kanji", 0x00000, pc88va_chars_16x16, 0, 1 ) GFXDECODE_END @@ -1815,7 +1815,7 @@ MACHINE_CONFIG_START(pc88va_state::pc88va) MCFG_PALETTE_ADD("palette", 32) // MCFG_PALETTE_INIT_OWNER(pc88va_state, pc8801 ) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc88va ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pc88va) MCFG_DEVICE_ADD("d8255_2", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8("d8255_2s", i8255_device, pb_r)) diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index 3650bd595e6..a4bd94cb1db 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -1743,7 +1743,7 @@ static const gfx_layout charset_16x16 = 16*16 }; -static GFXDECODE_START( pc9801 ) +static GFXDECODE_START( gfx_pc9801 ) GFXDECODE_ENTRY( "chargen", 0x00000, charset_8x8, 0x000, 0x01 ) GFXDECODE_ENTRY( "chargen", 0x00800, charset_8x16, 0x000, 0x01 ) GFXDECODE_ENTRY( "kanji", 0x00000, charset_16x16, 0x000, 0x01 ) @@ -2380,7 +2380,7 @@ MACHINE_CONFIG_START(pc9801_state::pc9801_common) MCFG_DEVICE_ADD("beeper", BEEP, 2400) MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc9801) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pc9801) MACHINE_CONFIG_END MACHINE_CONFIG_START(pc9801_state::pc9801) diff --git a/src/mame/drivers/pcktgal.cpp b/src/mame/drivers/pcktgal.cpp index b8fbec5a844..b7741b94436 100644 --- a/src/mame/drivers/pcktgal.cpp +++ b/src/mame/drivers/pcktgal.cpp @@ -199,12 +199,12 @@ static const gfx_layout bootleg_spritelayout = 32*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( pcktgal ) +static GFXDECODE_START( gfx_pcktgal ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 256, 16 ) /* chars */ GFXDECODE_ENTRY( "gfx2", 0x00000, spritelayout, 0, 8 ) /* sprites */ GFXDECODE_END -static GFXDECODE_START( bootleg ) +static GFXDECODE_START( gfx_bootleg ) GFXDECODE_ENTRY( "gfx1", 0x00000, bootleg_charlayout, 256, 16 ) /* chars */ GFXDECODE_ENTRY( "gfx2", 0x00000, bootleg_spritelayout, 0, 8 ) /* sprites */ GFXDECODE_END @@ -244,7 +244,7 @@ MACHINE_CONFIG_START(pcktgal_state::pcktgal) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pcktgal) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pcktgal) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(pcktgal_state, pcktgal) @@ -273,7 +273,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(pcktgal_state::bootleg) pcktgal(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", bootleg) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_bootleg) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(pcktgal_state, screen_update_pcktgalb) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp index 26a04ecd0ef..29a9347d4be 100644 --- a/src/mame/drivers/pcm.cpp +++ b/src/mame/drivers/pcm.cpp @@ -249,7 +249,7 @@ static const gfx_layout pcm_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( pcm ) +static GFXDECODE_START( gfx_pcm ) GFXDECODE_ENTRY( "chargen", 0x0000, pcm_charlayout, 0, 1 ) GFXDECODE_END @@ -269,7 +269,7 @@ MACHINE_CONFIG_START(pcm_state::pcm) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*8-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pcm) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pcm) MCFG_PALETTE_ADD_MONOCHROME("palette") /* Sound */ diff --git a/src/mame/drivers/pda600.cpp b/src/mame/drivers/pda600.cpp index fda98b8a34f..47cb67039be 100644 --- a/src/mame/drivers/pda600.cpp +++ b/src/mame/drivers/pda600.cpp @@ -192,7 +192,7 @@ static const gfx_layout pda600_charlayout_19a = 8*19 }; -static GFXDECODE_START( pda600 ) +static GFXDECODE_START( gfx_pda600 ) GFXDECODE_ENTRY( "maincpu", 0x45cd, pda600_charlayout_19, 0, 1 ) GFXDECODE_ENTRY( "maincpu", 0x4892, pda600_charlayout_19a, 0, 1 ) GFXDECODE_ENTRY( "maincpu", 0x4d73, pda600_charlayout_8, 0, 1 ) @@ -216,7 +216,7 @@ MACHINE_CONFIG_START(pda600_state::pda600) MCFG_SCREEN_UPDATE_DRIVER( pda600_state, screen_update ) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pda600) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pda600) MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/pdp1.cpp b/src/mame/drivers/pdp1.cpp index 4d992f130b9..f3b7470534d 100644 --- a/src/mame/drivers/pdp1.cpp +++ b/src/mame/drivers/pdp1.cpp @@ -300,7 +300,7 @@ static const uint8_t pdp1_palette[] = static const uint8_t total_colors_needed = pen_crt_num_levels + sizeof(pdp1_colors) / 3; -static GFXDECODE_START( pdp1 ) +static GFXDECODE_START( gfx_pdp1 ) GFXDECODE_ENTRY( "gfx1", 0, fontlayout, pen_crt_num_levels + sizeof(pdp1_colors) / 3, 3 ) GFXDECODE_END @@ -1947,7 +1947,7 @@ MACHINE_CONFIG_START(pdp1_state::pdp1) MCFG_DEVICE_ADD("typewriter", PDP1_PRINTER, 0) MCFG_DEVICE_ADD("drum", PDP1_CYLINDER, 0) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pdp1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pdp1) MCFG_PALETTE_ADD("palette", total_colors_needed + sizeof(pdp1_palette)) MCFG_PALETTE_INDIRECT_ENTRIES(total_colors_needed) MCFG_PALETTE_INIT_OWNER(pdp1_state, pdp1) diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp index 5e939ede069..cf538cb054b 100644 --- a/src/mame/drivers/pegasus.cpp +++ b/src/mame/drivers/pegasus.cpp @@ -383,7 +383,7 @@ static const gfx_layout pegasus_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( pegasus ) +static GFXDECODE_START( gfx_pegasus ) GFXDECODE_ENTRY( "chargen", 0x0000, pegasus_charlayout, 0, 1 ) GFXDECODE_ENTRY( "pcg", 0x0000, pegasus_charlayout, 0, 1 ) GFXDECODE_END @@ -499,7 +499,7 @@ MACHINE_CONFIG_START(pegasus_state::pegasus) MCFG_SCREEN_SIZE(32*8, 16*16) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 16*16-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pegasus) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pegasus) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/pengo.cpp b/src/mame/drivers/pengo.cpp index b63661d11d3..a85dc5d6200 100644 --- a/src/mame/drivers/pengo.cpp +++ b/src/mame/drivers/pengo.cpp @@ -357,7 +357,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( pengo ) +static GFXDECODE_START( gfx_pengo ) GFXDECODE_ENTRY( "gfx1", 0x0000, tilelayout, 0, 128 ) GFXDECODE_ENTRY( "gfx1", 0x2000, spritelayout, 0, 128 ) GFXDECODE_END @@ -396,7 +396,7 @@ MACHINE_CONFIG_START(pengo_state::pengo) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pengo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pengo) MCFG_PALETTE_ADD("palette", 128*4) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(pengo_state,pacman) diff --git a/src/mame/drivers/pentagon.cpp b/src/mame/drivers/pentagon.cpp index 6462a1dbd10..b0c0456dbaa 100644 --- a/src/mame/drivers/pentagon.cpp +++ b/src/mame/drivers/pentagon.cpp @@ -267,7 +267,7 @@ static const gfx_layout spectrum_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( pentagon ) +static GFXDECODE_START( gfx_pentagon ) GFXDECODE_ENTRY( "maincpu", 0x17d00, spectrum_charlayout, 0, 8 ) GFXDECODE_END @@ -289,7 +289,7 @@ MACHINE_CONFIG_START(pentagon_state::pentagon) MCFG_VIDEO_START_OVERRIDE(pentagon_state, pentagon ) MCFG_BETA_DISK_ADD(BETA_DISK_TAG) - MCFG_GFXDECODE_MODIFY("gfxdecode", pentagon) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pentagon) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp index db3a5b3cec9..eb54fbc9a2a 100644 --- a/src/mame/drivers/peoplepc.cpp +++ b/src/mame/drivers/peoplepc.cpp @@ -270,7 +270,7 @@ MACHINE_CONFIG_START(peoplepc_state::olypeopl) MCFG_SCREEN_RAW_PARAMS(XTAL(22'000'000),640,0,640,475,0,475) MCFG_SCREEN_UPDATE_DEVICE( "h46505", mc6845_device, screen_update ) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD("h46505", H46505, "screen", XTAL(22'000'000)/8) diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp index d458047e3d9..f80cc85f106 100644 --- a/src/mame/drivers/peplus.cpp +++ b/src/mame/drivers/peplus.cpp @@ -1002,8 +1002,8 @@ PALETTE_INIT_MEMBER(peplus_state, peplus) * Graphics Decode Information * ******************************/ -static GFXDECODE_START( peplus ) - GFXDECODE_ENTRY( "gfx1", 0x00000, gfx_8x8x4_planar, 0, 32 ) +static GFXDECODE_START( gfx_peplus ) + GFXDECODE_ENTRY( "gfx1", 0x00000, gfx_8x8x4_planar, 0, 32 ) GFXDECODE_END @@ -1357,7 +1357,7 @@ MACHINE_CONFIG_START(peplus_state::peplus) MCFG_SCREEN_UPDATE_DRIVER(peplus_state, screen_update_peplus) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", peplus) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_peplus) MCFG_PALETTE_ADD("palette", 16*16*2) MCFG_PALETTE_INIT_OWNER(peplus_state, peplus) diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp index 2fafd07e4ba..1f20b8eca9c 100644 --- a/src/mame/drivers/pgm.cpp +++ b/src/mame/drivers/pgm.cpp @@ -477,7 +477,7 @@ static const gfx_layout pgm32_charlayout = 32*160 }; -GFXDECODE_START( pgm ) +GFXDECODE_START( gfx_pgm ) GFXDECODE_REVERSEBITS( "tiles", 0, pgm8_charlayout, 0x800, 32 ) /* 8x8x4 Tiles */ GFXDECODE_REVERSEBITS( "tiles", 0, pgm32_charlayout, 0x400, 32 ) /* 32x32x5 Tiles */ GFXDECODE_END @@ -535,7 +535,7 @@ MACHINE_CONFIG_START(pgm_state::pgmbase) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pgm_state, screen_vblank_pgm)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pgm) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pgm) MCFG_PALETTE_ADD("palette", 0x1200/2) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp index a608b0ce3c5..a11ab7c3a6c 100644 --- a/src/mame/drivers/pgm2.cpp +++ b/src/mame/drivers/pgm2.cpp @@ -791,9 +791,9 @@ MACHINE_CONFIG_START(pgm2_state::pgm2) MCFG_SCREEN_UPDATE_DRIVER(pgm2_state, screen_update_pgm2) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pgm2_state, screen_vblank_pgm2)) - MCFG_GFXDECODE_ADD("gfxdecode2", "tx_palette", pgm2_tx) + MCFG_DEVICE_ADD("gfxdecode2", GFXDECODE, "tx_palette", pgm2_tx) - MCFG_GFXDECODE_ADD("gfxdecode3", "bg_palette", pgm2_bg) + MCFG_DEVICE_ADD("gfxdecode3", GFXDECODE, "bg_palette", pgm2_bg) MCFG_PALETTE_ADD("sp_palette", 0x4000/4) // sprites MCFG_PALETTE_FORMAT(XRGB) diff --git a/src/mame/drivers/phoenix.cpp b/src/mame/drivers/phoenix.cpp index d2c457d4db5..6e8977f58b7 100644 --- a/src/mame/drivers/phoenix.cpp +++ b/src/mame/drivers/phoenix.cpp @@ -423,12 +423,12 @@ static const gfx_layout charlayout = 8*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( phoenix ) +static GFXDECODE_START( gfx_phoenix ) GFXDECODE_ENTRY( "bgtiles", 0, charlayout, 0, 32 ) GFXDECODE_ENTRY( "fgtiles", 0, charlayout, 0, 32 ) GFXDECODE_END -static GFXDECODE_START( pleiads ) +static GFXDECODE_START( gfx_pleiads ) GFXDECODE_ENTRY( "bgtiles", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "fgtiles", 0, charlayout, 0, 64 ) GFXDECODE_END @@ -454,7 +454,7 @@ MACHINE_CONFIG_START(phoenix_state::phoenix) MCFG_SCREEN_UPDATE_DRIVER(phoenix_state, screen_update_phoenix) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", phoenix) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_phoenix) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(phoenix_state,phoenix) @@ -485,7 +485,7 @@ MACHINE_CONFIG_START(phoenix_state::pleiads) MCFG_DEVICE_PROGRAM_MAP(pleiads_memory_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", pleiads) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pleiads) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(phoenix_state,pleiads) @@ -528,7 +528,7 @@ MACHINE_CONFIG_START(phoenix_state::survival) MCFG_SCREEN_UPDATE_DRIVER(phoenix_state, screen_update_phoenix) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", phoenix) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_phoenix) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(phoenix_state,survival) diff --git a/src/mame/drivers/photoply.cpp b/src/mame/drivers/photoply.cpp index d98bfc6ea79..fd8e1793dda 100644 --- a/src/mame/drivers/photoply.cpp +++ b/src/mame/drivers/photoply.cpp @@ -293,7 +293,7 @@ static const gfx_layout CGA_charlayout = 8*8 }; -static GFXDECODE_START( photoply ) +static GFXDECODE_START( gfx_photoply ) GFXDECODE_ENTRY( "video_bios", 0x6000+0xa5*8+7, CGA_charlayout, 0, 256 ) //there's also a 8x16 entry (just after the 8x8) GFXDECODE_END @@ -307,7 +307,7 @@ MACHINE_CONFIG_START(photoply_state::photoply) pcat_common(config); - MCFG_GFXDECODE_ADD("gfxdecode", "vga", photoply ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "vga", gfx_photoply) MCFG_IDE_CONTROLLER_32_ADD("ide", ata_devices, "hdd", nullptr, true) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w)) diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp index 685cca95c8f..20056694e24 100644 --- a/src/mame/drivers/phunsy.cpp +++ b/src/mame/drivers/phunsy.cpp @@ -277,7 +277,7 @@ static const gfx_layout phunsy_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( phunsy ) +static GFXDECODE_START( gfx_phunsy ) GFXDECODE_ENTRY( "chargen", 0x0000, phunsy_charlayout, 1, 3 ) GFXDECODE_END @@ -358,7 +358,7 @@ MACHINE_CONFIG_START(phunsy_state::phunsy) MCFG_SCREEN_UPDATE_DRIVER(phunsy_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", phunsy) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_phunsy) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(phunsy_state, phunsy) diff --git a/src/mame/drivers/pinball2k.cpp b/src/mame/drivers/pinball2k.cpp index 7f1b26786b7..b7819d525db 100644 --- a/src/mame/drivers/pinball2k.cpp +++ b/src/mame/drivers/pinball2k.cpp @@ -516,12 +516,12 @@ static const gfx_layout CGA_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( CGA ) -/* Support up to four CGA fonts */ - GFXDECODE_ENTRY( "gfx1", 0x0000, CGA_charlayout, 0, 256 ) /* Font 0 */ - GFXDECODE_ENTRY( "gfx1", 0x0800, CGA_charlayout, 0, 256 ) /* Font 1 */ - GFXDECODE_ENTRY( "gfx1", 0x1000, CGA_charlayout, 0, 256 ) /* Font 2 */ - GFXDECODE_ENTRY( "gfx1", 0x1800, CGA_charlayout, 0, 256 ) /* Font 3*/ +static GFXDECODE_START( gfx_cga ) + // Support up to four CGA fonts + GFXDECODE_ENTRY( "gfx1", 0x0000, CGA_charlayout, 0, 256 ) // Font 0 + GFXDECODE_ENTRY( "gfx1", 0x0800, CGA_charlayout, 0, 256 ) // Font 1 + GFXDECODE_ENTRY( "gfx1", 0x1000, CGA_charlayout, 0, 256 ) // Font 2 + GFXDECODE_ENTRY( "gfx1", 0x1800, CGA_charlayout, 0, 256 ) // Font 3 GFXDECODE_END static INPUT_PORTS_START(mediagx) @@ -622,7 +622,7 @@ MACHINE_CONFIG_START(pinball2k_state::mediagx) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(pinball2k_state, screen_update_mediagx) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", CGA) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cga) MCFG_PALETTE_ADD("palette", 256) /* sound hardware */ diff --git a/src/mame/drivers/pingpong.cpp b/src/mame/drivers/pingpong.cpp index 8e6150f3d2e..25d41aa794e 100644 --- a/src/mame/drivers/pingpong.cpp +++ b/src/mame/drivers/pingpong.cpp @@ -442,7 +442,7 @@ static const gfx_layout spritelayout = 64*8 /* every char takes 64 consecutive bytes */ }; -static GFXDECODE_START( pingpong ) +static GFXDECODE_START( gfx_pingpong ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 64*4, 64 ) GFXDECODE_END @@ -465,7 +465,7 @@ MACHINE_CONFIG_START(pingpong_state::pingpong) MCFG_SCREEN_UPDATE_DRIVER(pingpong_state, screen_update_pingpong) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pingpong) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pingpong) MCFG_PALETTE_ADD("palette", 64*4+64*4) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(pingpong_state, pingpong) diff --git a/src/mame/drivers/pinkiri8.cpp b/src/mame/drivers/pinkiri8.cpp index 09b75f9af39..b53bdf965d4 100644 --- a/src/mame/drivers/pinkiri8.cpp +++ b/src/mame/drivers/pinkiri8.cpp @@ -1099,7 +1099,7 @@ static const gfx_layout charlayout = 8*16 }; -static GFXDECODE_START( pinkiri8 ) +static GFXDECODE_START( gfx_pinkiri8 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 0x100 ) GFXDECODE_END @@ -1117,7 +1117,7 @@ MACHINE_CONFIG_START(pinkiri8_state::pinkiri8) MCFG_SCREEN_UPDATE_DRIVER(pinkiri8_state, screen_update_pinkiri8) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pinkiri8) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pinkiri8) MCFG_PALETTE_ADD("palette", 0x2000) diff --git a/src/mame/drivers/pipedrm.cpp b/src/mame/drivers/pipedrm.cpp index 21a2480ca0b..9fe9e395da6 100644 --- a/src/mame/drivers/pipedrm.cpp +++ b/src/mame/drivers/pipedrm.cpp @@ -529,14 +529,14 @@ static const gfx_layout splayout = }; -static GFXDECODE_START( pipedrm ) +static GFXDECODE_START( gfx_pipedrm ) GFXDECODE_ENTRY( "gfx1", 0, bglayout, 0, 128 ) GFXDECODE_ENTRY( "gfx2", 0, bglayout, 0, 128 ) GFXDECODE_ENTRY( "gfx3", 0, splayout, 1024, 32 ) GFXDECODE_END -static GFXDECODE_START( hatris ) +static GFXDECODE_START( gfx_hatris ) GFXDECODE_ENTRY( "gfx1", 0, bglayout, 0, 128 ) GFXDECODE_ENTRY( "gfx2", 0, bglayout, 0, 128 ) GFXDECODE_END @@ -600,7 +600,7 @@ MACHINE_CONFIG_START(pipedrm_state::pipedrm) MCFG_SCREEN_UPDATE_DRIVER(pipedrm_state, screen_update_pipedrm) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pipedrm) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pipedrm) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -655,7 +655,7 @@ MACHINE_CONFIG_START(pipedrm_state::hatris) MCFG_SCREEN_UPDATE_DRIVER(pipedrm_state, screen_update_fromance) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hatris) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hatris) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp index 2332cd4ca87..be7c78008f2 100644 --- a/src/mame/drivers/pipeline.cpp +++ b/src/mame/drivers/pipeline.cpp @@ -326,7 +326,7 @@ static const gfx_layout layout_8x8x3 = 8*8 }; -static GFXDECODE_START( pipeline ) +static GFXDECODE_START( gfx_pipeline ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x8, 0x000, 1 ) // 8bpp tiles GFXDECODE_ENTRY( "gfx2", 0, layout_8x8x3, 0x100, 32 ) // 3bpp tiles GFXDECODE_END @@ -396,7 +396,7 @@ MACHINE_CONFIG_START(pipeline_state::pipeline) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pipeline) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pipeline) MCFG_PALETTE_ADD("palette", 0x100+0x100) MCFG_PALETTE_INIT_OWNER(pipeline_state, pipeline) diff --git a/src/mame/drivers/pirates.cpp b/src/mame/drivers/pirates.cpp index 4d2829d3520..53f08d7aa38 100644 --- a/src/mame/drivers/pirates.cpp +++ b/src/mame/drivers/pirates.cpp @@ -242,7 +242,7 @@ static const gfx_layout spritelayout = 16*16 }; -static GFXDECODE_START( pirates ) +static GFXDECODE_START( gfx_pirates ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x0000, 3*128 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x1800, 128 ) @@ -259,7 +259,7 @@ MACHINE_CONFIG_START(pirates_state::pirates) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pirates) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pirates) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/pitnrun.cpp b/src/mame/drivers/pitnrun.cpp index ff2c6bc8b4c..2b3f2742bbb 100644 --- a/src/mame/drivers/pitnrun.cpp +++ b/src/mame/drivers/pitnrun.cpp @@ -272,7 +272,7 @@ static const gfx_layout charlayout = 8*8*2 }; -static GFXDECODE_START( pitnrun ) +static GFXDECODE_START( gfx_pitnrun ) GFXDECODE_ENTRY( "gfx3", 0, charlayout, 64, 2 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 32, 2 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 4 ) @@ -309,7 +309,7 @@ MACHINE_CONFIG_START(pitnrun_state::pitnrun) MCFG_SCREEN_UPDATE_DRIVER(pitnrun_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pitnrun) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pitnrun) MCFG_PALETTE_ADD("palette", 32*3) MCFG_PALETTE_INIT_OWNER(pitnrun_state, pitnrun) diff --git a/src/mame/drivers/pk8020.cpp b/src/mame/drivers/pk8020.cpp index c87e7ecc65e..2ca2c9852b1 100644 --- a/src/mame/drivers/pk8020.cpp +++ b/src/mame/drivers/pk8020.cpp @@ -163,7 +163,7 @@ static const gfx_layout pk8020_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( pk8020 ) +static GFXDECODE_START( gfx_pk8020 ) GFXDECODE_ENTRY( "gfx1", 0x0000, pk8020_charlayout, 0, 4 ) GFXDECODE_END @@ -207,7 +207,7 @@ MACHINE_CONFIG_START(pk8020_state::pk8020) MCFG_SCREEN_UPDATE_DRIVER(pk8020_state, screen_update_pk8020) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pk8020) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pk8020) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(pk8020_state, pk8020) diff --git a/src/mame/drivers/pkscram.cpp b/src/mame/drivers/pkscram.cpp index 8bf8db6082b..6a9fd617f3e 100644 --- a/src/mame/drivers/pkscram.cpp +++ b/src/mame/drivers/pkscram.cpp @@ -279,7 +279,7 @@ static const gfx_layout tiles8x8_layout = }; -static GFXDECODE_START( pkscram ) +static GFXDECODE_START( gfx_pkscram ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 0x80 ) GFXDECODE_END @@ -325,7 +325,7 @@ MACHINE_CONFIG_START(pkscram_state::pkscramble) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pkscram) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pkscram) /* sound hardware */ diff --git a/src/mame/drivers/pktgaldx.cpp b/src/mame/drivers/pktgaldx.cpp index d5ff1c1518a..27285030b29 100644 --- a/src/mame/drivers/pktgaldx.cpp +++ b/src/mame/drivers/pktgaldx.cpp @@ -303,7 +303,7 @@ static const gfx_layout spritelayout = 32*32 }; -static GFXDECODE_START( pktgaldx ) +static GFXDECODE_START( gfx_pktgaldx ) 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, 32 ) /* Sprites (16x16) */ @@ -321,7 +321,7 @@ static const gfx_layout bootleg_spritelayout = 16*64 }; -static GFXDECODE_START( bootleg ) +static GFXDECODE_START( gfx_bootleg ) GFXDECODE_ENTRY( "gfx1", 0, bootleg_spritelayout, 0, 64 ) GFXDECODE_END @@ -356,7 +356,7 @@ MACHINE_CONFIG_START(pktgaldx_state::pktgaldx) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(XBGR) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pktgaldx) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pktgaldx) MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) MCFG_DECO16IC_SPLIT(0) @@ -417,7 +417,7 @@ MACHINE_CONFIG_START(pktgaldx_state::pktgaldb) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(XBGR) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", bootleg) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bootleg) /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/plan80.cpp b/src/mame/drivers/plan80.cpp index c0073a2ada3..ff23f38f95d 100644 --- a/src/mame/drivers/plan80.cpp +++ b/src/mame/drivers/plan80.cpp @@ -224,7 +224,7 @@ static const gfx_layout plan80_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( plan80 ) +static GFXDECODE_START( gfx_plan80 ) GFXDECODE_ENTRY( "chargen", 0x0000, plan80_charlayout, 0, 1 ) GFXDECODE_END @@ -244,7 +244,7 @@ MACHINE_CONFIG_START(plan80_state::plan80) MCFG_SCREEN_VISIBLE_AREA(0, 48*6-1, 0, 32*8-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", plan80) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_plan80) MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp index ef8a38077b5..235b73b9e70 100644 --- a/src/mame/drivers/playch10.cpp +++ b/src/mame/drivers/playch10.cpp @@ -628,7 +628,7 @@ static const gfx_layout bios_charlayout = 8*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( playch10 ) +static GFXDECODE_START( gfx_playch10 ) GFXDECODE_ENTRY( "gfx1", 0, bios_charlayout, 0, 32 ) GFXDECODE_END @@ -669,7 +669,7 @@ MACHINE_CONFIG_START(playch10_state::playch10) MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, playch10_state, cart_sel_w)) MCFG_DEVCB_MASK(0x78) MCFG_DEVCB_RSHIFT(-3) // video hardware - MCFG_GFXDECODE_ADD("gfxdecode", "palette", playch10) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_playch10) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(playch10_state, playch10) MCFG_DEFAULT_LAYOUT(layout_playch10) diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp index e8b9fbded60..9bcdf106d5a 100644 --- a/src/mame/drivers/playmark.cpp +++ b/src/mame/drivers/playmark.cpp @@ -853,7 +853,7 @@ static const gfx_layout spritelayout = 128*8 }; -static GFXDECODE_START( bigtwin ) +static GFXDECODE_START( gfx_bigtwin ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x200, 16 ) /* colors 0x200-0x2ff */ GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0x000, 8 ) /* colors 0x000-0x07f */ GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x080, 8 ) /* colors 0x080-0x0ff */ @@ -899,13 +899,13 @@ static const gfx_layout wspritelayout = 32*8 }; -static GFXDECODE_START( wbeachvl ) +static GFXDECODE_START( gfx_wbeachvl ) GFXDECODE_ENTRY( "gfx1", 0, wspritelayout, 0x600, 16 ) /* colors 0x600-0x7ff */ GFXDECODE_ENTRY( "gfx1", 0, wtilelayout, 0x000, 16 ) /* colors 0x000-0x3ff */ GFXDECODE_ENTRY( "gfx1", 0, wcharlayout, 0x400, 8 ) /* colors 0x400-0x5ff */ GFXDECODE_END -static GFXDECODE_START( excelsr ) +static GFXDECODE_START( gfx_excelsr ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0x200, 16 ) /* colors 0x200-0x2ff */ GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0x000, 8 ) /* colors 0x000-0x07f */ GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0x080, 8 ) /* colors 0x080-0x0ff */ @@ -961,28 +961,28 @@ static const gfx_layout hotmind_charlayout = }; -static GFXDECODE_START( hrdtimes ) +static GFXDECODE_START( gfx_hrdtimes ) GFXDECODE_ENTRY( "gfx2", 0, hrdtimes_full_layout, 0x200, 32 ) /* colors 0x200-0x2ff - Sprites */ GFXDECODE_ENTRY( "gfx1", 0, hrdtimes_tilelayout, 0x000, 16 ) /* colors 0x000-0x0ff - BG */ GFXDECODE_ENTRY( "gfx1", 0x80000, hrdtimes_tilelayout, 0x000, 16 ) /* colors 0x000-0x0ff - FG */ GFXDECODE_ENTRY( "gfx1", 0xfc000, hrdtimes_charlayout, 0x100, 8 ) /* colors 0x100-0x17f - Text */ GFXDECODE_END -static GFXDECODE_START( hotmind ) +static GFXDECODE_START( gfx_hotmind ) GFXDECODE_ENTRY( "gfx2", 0, hrdtimes_full_layout, 0x200, 32 ) /* colors 0x200-0x2ff */ GFXDECODE_ENTRY( "gfx1", 0, hrdtimes_tilelayout, 0x000, 16 ) /* colors 0x000-0x0ff */ GFXDECODE_ENTRY( "gfx1", 0x20000, hrdtimes_tilelayout, 0x000, 16 ) /* colors 0x000-0x0ff */ GFXDECODE_ENTRY( "gfx1", 0x30000, hotmind_charlayout, 0x100, 8 ) /* colors 0x100-0x17f */ GFXDECODE_END -static GFXDECODE_START( luckboomh ) +static GFXDECODE_START( gfx_luckboomh ) GFXDECODE_ENTRY( "gfx2", 0, hrdtimes_full_layout, 0x200, 32 ) /* colors 0x200-0x2ff */ GFXDECODE_ENTRY( "gfx1", 0, hrdtimes_full_layout, 0x000, 16 ) /* colors 0x000-0x0ff */ GFXDECODE_ENTRY( "gfx1", 0, hrdtimes_full_layout, 0x000, 16 ) /* colors 0x000-0x0ff */ GFXDECODE_ENTRY( "gfx1", 0x30000, hotmind_charlayout, 0x100, 8 ) /* colors 0x100-0x17f */ GFXDECODE_END -static GFXDECODE_START( bigtwinb ) +static GFXDECODE_START( gfx_bigtwinb ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x300, 16 ) /* colors 0x300-0x3ff */ GFXDECODE_ENTRY( "gfx1", 0, hrdtimes_tilelayout, 0x000, 16 ) /* colors 0x000-0x0ff */ GFXDECODE_ENTRY( "gfx1", 0x40000, hrdtimes_tilelayout, 0x000, 16 ) /* colors 0x000-0x0ff */ @@ -1067,7 +1067,7 @@ MACHINE_CONFIG_START(playmark_state::bigtwin) MCFG_SCREEN_UPDATE_DRIVER(playmark_state, screen_update_bigtwin) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", bigtwin) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bigtwin) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -1107,7 +1107,7 @@ MACHINE_CONFIG_START(playmark_state::bigtwinb) MCFG_SCREEN_UPDATE_DRIVER(playmark_state, screen_update_bigtwinb) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", bigtwinb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bigtwinb) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -1151,7 +1151,7 @@ MACHINE_CONFIG_START(playmark_state::wbeachvl) MCFG_SCREEN_UPDATE_DRIVER(playmark_state, screen_update_wbeachvl) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wbeachvl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wbeachvl) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) @@ -1191,7 +1191,7 @@ MACHINE_CONFIG_START(playmark_state::excelsr) MCFG_SCREEN_UPDATE_DRIVER(playmark_state, screen_update_excelsr) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", excelsr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_excelsr) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -1232,7 +1232,7 @@ MACHINE_CONFIG_START(playmark_state::hrdtimes) MCFG_SCREEN_UPDATE_DRIVER(playmark_state, screen_update_hrdtimes) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hrdtimes) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hrdtimes) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -1275,7 +1275,7 @@ MACHINE_CONFIG_START(playmark_state::hotmind) MCFG_SCREEN_UPDATE_DRIVER(playmark_state, screen_update_hrdtimes) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hotmind) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hotmind) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -1320,7 +1320,7 @@ MACHINE_CONFIG_START(playmark_state::luckboomh) MCFG_SCREEN_UPDATE_DRIVER(playmark_state, screen_update_hrdtimes) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", luckboomh) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_luckboomh) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) diff --git a/src/mame/drivers/plygonet.cpp b/src/mame/drivers/plygonet.cpp index c8f9225a389..40e0ce1edcc 100644 --- a/src/mame/drivers/plygonet.cpp +++ b/src/mame/drivers/plygonet.cpp @@ -504,7 +504,7 @@ static const gfx_layout bglayout = 128*8 }; -static GFXDECODE_START( plygonet ) +static GFXDECODE_START( gfx_plygonet ) GFXDECODE_ENTRY( "gfx2", 0, bglayout, 0x0000, 64 ) GFXDECODE_END @@ -571,7 +571,7 @@ MACHINE_CONFIG_START(polygonet_state::plygonet) MCFG_WATCHDOG_ADD("watchdog") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", plygonet) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_plygonet) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/pocketc.cpp b/src/mame/drivers/pocketc.cpp index 6c64c6d1db1..241a59c2f66 100644 --- a/src/mame/drivers/pocketc.cpp +++ b/src/mame/drivers/pocketc.cpp @@ -716,11 +716,11 @@ static const gfx_layout pc1251_charlayout = 1*8 }; -static GFXDECODE_START( pc1401 ) +static GFXDECODE_START( gfx_pc1401 ) GFXDECODE_ENTRY( "gfx1", 0x0000, pc1401_charlayout, 0, 8 ) GFXDECODE_END -static GFXDECODE_START( pc1251 ) +static GFXDECODE_START( gfx_pc1251 ) GFXDECODE_ENTRY( "gfx1", 0x0000, pc1251_charlayout, 0, 8 ) GFXDECODE_END @@ -745,7 +745,7 @@ MACHINE_CONFIG_START(pocketc_state::pocketc) // MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 273-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc1401 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pc1401) MCFG_PALETTE_ADD("palette", 8*2) MCFG_PALETTE_INDIRECT_ENTRIES(6) MCFG_PALETTE_INIT_OWNER( pocketc_state, pocketc ) @@ -792,7 +792,7 @@ MACHINE_CONFIG_START(pc1251_state::pc1250) MCFG_SCREEN_SIZE(608, 300) MCFG_SCREEN_VISIBLE_AREA(0, 608-1, 0, 300-1) MCFG_SCREEN_UPDATE_DRIVER(pc1251_state, screen_update_pc1251) - MCFG_GFXDECODE_MODIFY("gfxdecode", pc1251 ) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pc1251) MACHINE_CONFIG_END MACHINE_CONFIG_START(pc1251_state::pc1251) diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp index a183f6118e8..0bfd8eb7733 100644 --- a/src/mame/drivers/pofo.cpp +++ b/src/mame/drivers/pofo.cpp @@ -968,7 +968,7 @@ static const gfx_layout charlayout = // GFXDECODE( portfolio ) //------------------------------------------------- -static GFXDECODE_START( portfolio ) +static GFXDECODE_START( gfx_portfolio ) GFXDECODE_ENTRY( HD61830_TAG, 0, charlayout, 0, 2 ) GFXDECODE_END @@ -1036,7 +1036,7 @@ MACHINE_CONFIG_START(portfolio_state::portfolio) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(portfolio_state, portfolio) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", portfolio) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_portfolio) MCFG_DEVICE_ADD(HD61830_TAG, HD61830, XTAL(4'915'200)/2/2) MCFG_DEVICE_ADDRESS_MAP(0, portfolio_lcdc) diff --git a/src/mame/drivers/pokechmp.cpp b/src/mame/drivers/pokechmp.cpp index dfa366aa90a..8b8e78bec4a 100644 --- a/src/mame/drivers/pokechmp.cpp +++ b/src/mame/drivers/pokechmp.cpp @@ -201,7 +201,7 @@ static const gfx_layout pokechmp_spritelayout = }; -static GFXDECODE_START( pokechmp ) +static GFXDECODE_START( gfx_pokechmp ) GFXDECODE_ENTRY( "bgs", 0x00000, pokechmp_charlayout, 0x100, 4 ) /* chars */ GFXDECODE_ENTRY( "sprites", 0x00000, pokechmp_spritelayout, 0, 32 ) /* sprites */ GFXDECODE_END @@ -246,7 +246,7 @@ MACHINE_CONFIG_START(pokechmp_state::pokechmp) MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, pokechmp_state, sound_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pokechmp) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pokechmp) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/poker72.cpp b/src/mame/drivers/poker72.cpp index 7a0f7312c02..25708b004c1 100644 --- a/src/mame/drivers/poker72.cpp +++ b/src/mame/drivers/poker72.cpp @@ -343,7 +343,7 @@ static const gfx_layout tiles8x8_layout = -static GFXDECODE_START( poker72 ) +static GFXDECODE_START( gfx_poker72 ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_END @@ -384,7 +384,7 @@ MACHINE_CONFIG_START(poker72_state::poker72) MCFG_SCREEN_UPDATE_DRIVER(poker72_state, screen_update_poker72) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", poker72) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_poker72) MCFG_PALETTE_ADD("palette", 0xe00) MCFG_PALETTE_INIT_OWNER(poker72_state, poker72) diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp index dd9af4d5de5..7dbaa289564 100644 --- a/src/mame/drivers/polepos.cpp +++ b/src/mame/drivers/polepos.cpp @@ -827,7 +827,7 @@ static const gfx_layout smallspritelayout = 16*32 }; -static GFXDECODE_START( polepos ) +static GFXDECODE_START( gfx_polepos ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_2bpp, 0x0000, 128 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout_2bpp, 0x0200, 64 ) GFXDECODE_ENTRY( "gfx3", 0, smallspritelayout, 0x0300, 128 ) @@ -914,7 +914,7 @@ MACHINE_CONFIG_START(polepos_state::polepos) MCFG_SCREEN_UPDATE_DRIVER(polepos_state, screen_update_polepos) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", polepos) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_polepos) MCFG_PALETTE_ADD("palette", 0x0f00) MCFG_PALETTE_INDIRECT_ENTRIES(128) MCFG_DEFAULT_LAYOUT(layout_polepos) @@ -1027,7 +1027,7 @@ MACHINE_CONFIG_START(polepos_state::topracern) MCFG_SCREEN_UPDATE_DRIVER(polepos_state, screen_update_polepos) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", polepos) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_polepos) MCFG_PALETTE_ADD("palette", 0x0f00) MCFG_PALETTE_INDIRECT_ENTRIES(128) MCFG_DEFAULT_LAYOUT(layout_topracer) diff --git a/src/mame/drivers/poly88.cpp b/src/mame/drivers/poly88.cpp index 4bb9956ae62..e4c2462be4e 100644 --- a/src/mame/drivers/poly88.cpp +++ b/src/mame/drivers/poly88.cpp @@ -191,7 +191,7 @@ static const gfx_layout poly88_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( poly88 ) +static GFXDECODE_START( gfx_poly88 ) GFXDECODE_ENTRY( "chargen", 0x0000, poly88_charlayout, 0, 1 ) GFXDECODE_END @@ -212,7 +212,7 @@ MACHINE_CONFIG_START(poly88_state::poly88) MCFG_SCREEN_UPDATE_DRIVER(poly88_state, screen_update_poly88) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", poly88) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_poly88) MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/polyplay.cpp b/src/mame/drivers/polyplay.cpp index e5af988bfa4..9f494c62735 100644 --- a/src/mame/drivers/polyplay.cpp +++ b/src/mame/drivers/polyplay.cpp @@ -305,7 +305,7 @@ static const gfx_layout charlayout_3_bit = 8*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( polyplay ) +static GFXDECODE_START( gfx_polyplay ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout_1_bit, 0, 1 ) GFXDECODE_ENTRY( nullptr, 0xec00, charlayout_3_bit, 2, 1 ) GFXDECODE_END @@ -342,7 +342,7 @@ MACHINE_CONFIG_START(polyplay_state::polyplay_zre) MCFG_SCREEN_UPDATE_DRIVER(polyplay_state, screen_update_polyplay) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", polyplay) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_polyplay) MCFG_PALETTE_ADD("palette", 10) MCFG_PALETTE_INIT_OWNER(polyplay_state, polyplay) diff --git a/src/mame/drivers/poolshrk.cpp b/src/mame/drivers/poolshrk.cpp index f861944321d..7b1902b9cc4 100644 --- a/src/mame/drivers/poolshrk.cpp +++ b/src/mame/drivers/poolshrk.cpp @@ -201,7 +201,7 @@ static const gfx_layout poolshrk_tile_layout = }; -static GFXDECODE_START( poolshrk ) +static GFXDECODE_START( gfx_poolshrk ) GFXDECODE_ENTRY( "gfx1", 0, poolshrk_sprite_layout, 0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, poolshrk_tile_layout, 0, 1 ) GFXDECODE_END @@ -233,7 +233,7 @@ MACHINE_CONFIG_START(poolshrk_state::poolshrk) MCFG_SCREEN_UPDATE_DRIVER(poolshrk_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", poolshrk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_poolshrk) MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(poolshrk_state, poolshrk) diff --git a/src/mame/drivers/pooyan.cpp b/src/mame/drivers/pooyan.cpp index dd02cdcda3b..055843ca021 100644 --- a/src/mame/drivers/pooyan.cpp +++ b/src/mame/drivers/pooyan.cpp @@ -174,7 +174,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( pooyan ) +static GFXDECODE_START( gfx_pooyan ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 16*16, 16 ) GFXDECODE_END @@ -219,7 +219,7 @@ MACHINE_CONFIG_START(pooyan_state::pooyan) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pooyan_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pooyan) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pooyan) MCFG_PALETTE_ADD("palette", 16*16+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(pooyan_state, pooyan) diff --git a/src/mame/drivers/popeye.cpp b/src/mame/drivers/popeye.cpp index 8a29c5840d1..7fe5aeac515 100644 --- a/src/mame/drivers/popeye.cpp +++ b/src/mame/drivers/popeye.cpp @@ -569,7 +569,7 @@ static const gfx_layout spritelayout = 16*8 }; -static GFXDECODE_START( popeye ) +static GFXDECODE_START( gfx_popeye ) GFXDECODE_SCALE( "gfx1", 0, charlayout, 16, 16, 2, 2 ) /* chars */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 16+16*2, 8 ) /* sprites */ GFXDECODE_END @@ -603,7 +603,7 @@ MACHINE_CONFIG_START(tnx1_state::config) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tnx1_state, screen_vblank)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", popeye) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_popeye) MCFG_PALETTE_ADD("palette", 16+16*2+8*4) MCFG_PALETTE_INIT_OWNER(tnx1_state, palette_init) diff --git a/src/mame/drivers/popobear.cpp b/src/mame/drivers/popobear.cpp index ef31bef96f9..5bd8c69091e 100644 --- a/src/mame/drivers/popobear.cpp +++ b/src/mame/drivers/popobear.cpp @@ -174,7 +174,7 @@ static const gfx_layout char_layout = 8*64 }; -GFXDECODE_START(popobear) +GFXDECODE_START(gfx_popobear) GFXDECODE_RAM( "vram", 0, char_layout, 0, 1 ) GFXDECODE_END @@ -661,7 +661,7 @@ MACHINE_CONFIG_START(popobear_state::popobear) SPEAKER(config, "mono").front_center(); - MCFG_GFXDECODE_ADD("gfxdecode", "palette", popobear) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_popobear) MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(42'000'000)/16) // XTAL CORRECT, DIVISOR GUESSED MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/popper.cpp b/src/mame/drivers/popper.cpp index c6adef6f74a..45c84b7f6b1 100644 --- a/src/mame/drivers/popper.cpp +++ b/src/mame/drivers/popper.cpp @@ -414,7 +414,7 @@ static const gfx_layout spritelayout = 16*2*8 }; -static GFXDECODE_START( popper ) +static GFXDECODE_START( gfx_popper ) GFXDECODE_ENTRY("tiles", 0, layer0_charlayout, 0, 32) GFXDECODE_ENTRY("tiles", 0, layer1_charlayout, 0, 16) GFXDECODE_ENTRY("sprites", 0, spritelayout, 0, 16) @@ -548,7 +548,7 @@ MACHINE_CONFIG_START(popper_state::popper) MCFG_SCREEN_UPDATE_DRIVER(popper_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", popper) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_popper) MCFG_PALETTE_ADD("palette", 64) MCFG_PALETTE_INIT_OWNER(popper_state, popper) diff --git a/src/mame/drivers/portrait.cpp b/src/mame/drivers/portrait.cpp index b008d2cea9b..e5489f87faa 100644 --- a/src/mame/drivers/portrait.cpp +++ b/src/mame/drivers/portrait.cpp @@ -244,7 +244,7 @@ static const gfx_layout tile_layout = 8*16 /* character offset */ }; -static GFXDECODE_START( portrait ) +static GFXDECODE_START( gfx_portrait ) GFXDECODE_ENTRY( "gfx1", 0x00000, tile_layout, 0, 0x800/8 ) GFXDECODE_END @@ -268,7 +268,7 @@ MACHINE_CONFIG_START(portrait_state::portrait) MCFG_SCREEN_UPDATE_DRIVER(portrait_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", portrait) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_portrait) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_INDIRECT_ENTRIES(0x40) MCFG_PALETTE_INIT_OWNER(portrait_state, portrait) diff --git a/src/mame/drivers/powerbal.cpp b/src/mame/drivers/powerbal.cpp index 92ca21ae42e..46b92ae4347 100644 --- a/src/mame/drivers/powerbal.cpp +++ b/src/mame/drivers/powerbal.cpp @@ -607,7 +607,7 @@ static const gfx_layout tilelayout = -static GFXDECODE_START( powerbal ) +static GFXDECODE_START( gfx_powerbal ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0x100, 16 ) /* colors 0x100-0x1ff */ GFXDECODE_ENTRY( "gfx1", 0, magicstk_charlayout, 0x000, 16 ) /* colors 0x000-0x0ff */ GFXDECODE_END @@ -644,7 +644,7 @@ MACHINE_CONFIG_START(powerbal_state::powerbal) MCFG_SCREEN_UPDATE_DRIVER(powerbal_state, screen_update_powerbal) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", powerbal) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_powerbal) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -680,7 +680,7 @@ MACHINE_CONFIG_START(powerbal_state::magicstk) MCFG_SCREEN_UPDATE_DRIVER(powerbal_state, screen_update_powerbal) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", powerbal) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_powerbal) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) diff --git a/src/mame/drivers/powerins.cpp b/src/mame/drivers/powerins.cpp index a9aee914907..007e48b3274 100644 --- a/src/mame/drivers/powerins.cpp +++ b/src/mame/drivers/powerins.cpp @@ -279,7 +279,7 @@ static const gfx_layout layout_16x16x4_swap = }; -static GFXDECODE_START( powerins ) +static GFXDECODE_START( gfx_powerins ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x000, 0x20 ) // [0] Tiles GFXDECODE_ENTRY( "gfx2", 0, layout_8x8x4, 0x200, 0x10 ) // [1] Tiles GFXDECODE_ENTRY( "gfx3", 0, layout_16x16x4_swap, 0x400, 0x40 ) // [2] Sprites @@ -322,7 +322,7 @@ MACHINE_CONFIG_START(powerins_state::powerins) MCFG_SCREEN_UPDATE_DRIVER(powerins_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", powerins) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_powerins) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) diff --git a/src/mame/drivers/ppmast93.cpp b/src/mame/drivers/ppmast93.cpp index 2f85f6499cf..64a4a4f602d 100644 --- a/src/mame/drivers/ppmast93.cpp +++ b/src/mame/drivers/ppmast93.cpp @@ -332,7 +332,7 @@ static const gfx_layout tiles8x8_layout = 32*8 }; -static GFXDECODE_START( ppmast93 ) +static GFXDECODE_START( gfx_ppmast93 ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_END @@ -390,7 +390,7 @@ MACHINE_CONFIG_START(ppmast93_state::ppmast93) MCFG_SCREEN_UPDATE_DRIVER(ppmast93_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ppmast93) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ppmast93) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x100) diff --git a/src/mame/drivers/prehisle.cpp b/src/mame/drivers/prehisle.cpp index 990e30084a1..f2f7a58a51a 100644 --- a/src/mame/drivers/prehisle.cpp +++ b/src/mame/drivers/prehisle.cpp @@ -190,7 +190,7 @@ static const gfx_layout spritelayout = 128*8 /* every sprite takes 64 consecutive bytes */ }; -static GFXDECODE_START( prehisle ) +static GFXDECODE_START( gfx_prehisle ) GFXDECODE_ENTRY( "chars", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "bgtiles", 0, tilelayout, 768, 16 ) GFXDECODE_ENTRY( "fgtiles", 0, tilelayout, 512, 16 ) @@ -219,7 +219,7 @@ MACHINE_CONFIG_START(prehisle_state::prehisle) MCFG_SCREEN_UPDATE_DRIVER(prehisle_state, screen_update_prehisle) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", prehisle) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_prehisle) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) diff --git a/src/mame/drivers/progolf.cpp b/src/mame/drivers/progolf.cpp index 396c134d303..01f10ddc29a 100644 --- a/src/mame/drivers/progolf.cpp +++ b/src/mame/drivers/progolf.cpp @@ -381,7 +381,7 @@ static const gfx_layout charlayout = 8*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( progolf ) +static GFXDECODE_START( gfx_progolf ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 8 ) /* sprites */ GFXDECODE_END @@ -438,7 +438,7 @@ MACHINE_CONFIG_START(progolf_state::progolf) MCFG_SCREEN_UPDATE_DRIVER(progolf_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", progolf) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_progolf) MCFG_PALETTE_ADD("palette", 32*3) MCFG_PALETTE_INIT_OWNER(progolf_state, progolf) diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp index 61a4ae6c3b9..23afc7b69f5 100644 --- a/src/mame/drivers/proteus3.cpp +++ b/src/mame/drivers/proteus3.cpp @@ -349,7 +349,7 @@ static const gfx_layout charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( proteus3 ) +static GFXDECODE_START( gfx_proteus3 ) GFXDECODE_ENTRY( "chargen", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -390,7 +390,7 @@ MACHINE_CONFIG_START(proteus3_state::proteus3) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*12-1) MCFG_SCREEN_UPDATE_DRIVER(proteus3_state, screen_update_proteus3) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", proteus3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_proteus3) MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ diff --git a/src/mame/drivers/psikyo.cpp b/src/mame/drivers/psikyo.cpp index 17aff425928..389b268074e 100644 --- a/src/mame/drivers/psikyo.cpp +++ b/src/mame/drivers/psikyo.cpp @@ -991,7 +991,7 @@ static const gfx_layout layout_16x16x4 = 16*16*4 }; -static GFXDECODE_START( psikyo ) +static GFXDECODE_START( gfx_psikyo ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x000, 0x20 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x4, 0x800, 0x48 ) // [1] Layer 0 + 1 GFXDECODE_END @@ -1044,7 +1044,7 @@ MACHINE_CONFIG_START(psikyo_state::sngkace) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, psikyo_state, screen_vblank_psikyo)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", psikyo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_psikyo) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -1090,7 +1090,7 @@ MACHINE_CONFIG_START(psikyo_state::gunbird) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, psikyo_state, screen_vblank_psikyo)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", psikyo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_psikyo) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -1131,7 +1131,7 @@ MACHINE_CONFIG_START(psikyo_state::s1945bl) /* Bootleg hardware based on the unp MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, psikyo_state, screen_vblank_psikyo)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", psikyo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_psikyo) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -1176,7 +1176,7 @@ MACHINE_CONFIG_START(psikyo_state::s1945) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, psikyo_state, screen_vblank_psikyo)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", psikyo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_psikyo) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/psikyo4.cpp b/src/mame/drivers/psikyo4.cpp index b7d45a8a001..0953865b6e6 100644 --- a/src/mame/drivers/psikyo4.cpp +++ b/src/mame/drivers/psikyo4.cpp @@ -138,7 +138,7 @@ ROMs - static GFXLAYOUT_RAW( layout_16x16x8, 16, 16, 16*8, 16*16*8 ) -static GFXDECODE_START( ps4 ) +static GFXDECODE_START( gfx_ps4 ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0x000, 0x40 ) // 8bpp tiles GFXDECODE_END @@ -663,7 +663,7 @@ MACHINE_CONFIG_START(psikyo4_state::ps4big) MCFG_EEPROM_SERIAL_DEFAULT_VALUE(0) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "lpalette", ps4) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "lpalette", gfx_ps4) MCFG_PALETTE_ADD("lpalette", (0x2000/4) + 1) /* palette + clear colour */ MCFG_PALETTE_ADD("rpalette", (0x2000/4) + 1) diff --git a/src/mame/drivers/psikyosh.cpp b/src/mame/drivers/psikyosh.cpp index 874a26cadcb..02edd3e74ab 100644 --- a/src/mame/drivers/psikyosh.cpp +++ b/src/mame/drivers/psikyosh.cpp @@ -305,7 +305,7 @@ static const gfx_layout layout_16x16x8 = 16*16*8 }; -static GFXDECODE_START( psikyosh ) +static GFXDECODE_START( gfx_psikyosh ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x000, 0x100 ) // 4bpp tiles GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0x000, 0x100 ) // 8bpp tiles GFXDECODE_END @@ -799,7 +799,7 @@ MACHINE_CONFIG_START(psikyosh_state::psikyo3v1) MCFG_SCREEN_UPDATE_DRIVER(psikyosh_state, screen_update_psikyosh) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram32_device, vblank_copy_rising)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", psikyosh) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_psikyosh) MCFG_PALETTE_ADD("palette", 0x5000/4) MCFG_PALETTE_FORMAT(RGBX) diff --git a/src/mame/drivers/psion.cpp b/src/mame/drivers/psion.cpp index ee27c1653a7..75a4d96a852 100644 --- a/src/mame/drivers/psion.cpp +++ b/src/mame/drivers/psion.cpp @@ -565,7 +565,7 @@ static const gfx_layout psion_charlayout = 8*8 /* 8 bytes */ }; -static GFXDECODE_START( psion ) +static GFXDECODE_START( gfx_psion ) GFXDECODE_ENTRY( "hd44780:cgrom", 0x0000, psion_charlayout, 0, 1 ) GFXDECODE_END @@ -586,7 +586,7 @@ MACHINE_CONFIG_START(psion_state::psion_2lines) MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(psion_state, psion) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", psion) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_psion) MCFG_HD44780_ADD("hd44780") MCFG_HD44780_LCD_SIZE(2, 16) diff --git a/src/mame/drivers/psychic5.cpp b/src/mame/drivers/psychic5.cpp index 2a0aa9497ba..e80b5b709dd 100644 --- a/src/mame/drivers/psychic5.cpp +++ b/src/mame/drivers/psychic5.cpp @@ -707,13 +707,13 @@ static const gfx_layout spritelayout = 128*8 /* every char takes 128 consecutive bytes */ }; -static GFXDECODE_START( psychic5 ) +static GFXDECODE_START( gfx_psychic5 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0*16, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 16*16, 16 ) GFXDECODE_ENTRY( "gfx3", 0, charlayout, 32*16, 16 ) GFXDECODE_END -static GFXDECODE_START( bombsa ) +static GFXDECODE_START( gfx_bombsa ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 32*16, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0*16, 16 ) GFXDECODE_ENTRY( "gfx3", 0, charlayout, 16*16, 16 ) @@ -747,7 +747,7 @@ MACHINE_CONFIG_START(psychic5_state::psychic5) MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2,394, 0, 256, 282, 16, 240) // was 53.8 Hz before, assume same as Bombs Away MCFG_SCREEN_UPDATE_DRIVER(psychic5_state, screen_update_psychic5) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", psychic5) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_psychic5) MCFG_PALETTE_ADD("palette", 768) MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0) @@ -801,7 +801,7 @@ MACHINE_CONFIG_START(psychic5_state::bombsa) MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2,394, 0, 256, 282, 16, 240) /* Guru says : VSync - 54Hz . HSync - 15.25kHz */ MCFG_SCREEN_UPDATE_DRIVER(psychic5_state, screen_update_bombsa) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", bombsa) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bombsa) MCFG_PALETTE_ADD("palette", 768) MCFG_VIDEO_START_OVERRIDE(psychic5_state,bombsa) diff --git a/src/mame/drivers/ptcsol.cpp b/src/mame/drivers/ptcsol.cpp index 5595d3446e5..71bdd153601 100644 --- a/src/mame/drivers/ptcsol.cpp +++ b/src/mame/drivers/ptcsol.cpp @@ -699,7 +699,7 @@ static const gfx_layout sol20_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( sol20 ) +static GFXDECODE_START( gfx_sol20 ) GFXDECODE_ENTRY( "chargen", 0x0000, sol20_charlayout, 0, 1 ) GFXDECODE_END @@ -728,7 +728,7 @@ MACHINE_CONFIG_START(sol20_state::sol20) MCFG_SCREEN_VISIBLE_AREA(0, 575, 0, 207) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sol20) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sol20) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/pturn.cpp b/src/mame/drivers/pturn.cpp index 09a0f6c716c..01f173c92da 100644 --- a/src/mame/drivers/pturn.cpp +++ b/src/mame/drivers/pturn.cpp @@ -409,7 +409,7 @@ static const gfx_layout spritelayout = 128*8 }; -static GFXDECODE_START( pturn ) +static GFXDECODE_START( gfx_pturn ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x000, 32 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0x000, 32 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x000, 32 ) @@ -540,7 +540,7 @@ MACHINE_CONFIG_START(pturn_state::pturn) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x100) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pturn) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pturn) /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp index cc2d50e0fc1..3feeffa8e4c 100644 --- a/src/mame/drivers/punchout.cpp +++ b/src/mame/drivers/punchout.cpp @@ -594,14 +594,14 @@ static const gfx_layout charlayout_3bpp = 8*8 }; -static GFXDECODE_START( punchout ) +static GFXDECODE_START( gfx_punchout ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_2bpp, 0x000, 0x100/4 ) // bg chars (top monitor only) GFXDECODE_ENTRY( "gfx2", 0, charlayout_2bpp, 0x100, 0x100/4 ) // bg chars (bottom monitor only) GFXDECODE_ENTRY( "gfx3", 0, charlayout_3bpp, 0x000, 0x200/8 ) // big sprite #1 (top and bottom monitor) GFXDECODE_ENTRY( "gfx4", 0, charlayout_2bpp, 0x100, 0x100/4 ) // big sprite #2 (bottom monitor only) GFXDECODE_END -static GFXDECODE_START( armwrest ) +static GFXDECODE_START( gfx_armwrest ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_2bpp, 0x000, 0x200/4 ) // bg chars (top and bottom monitor) GFXDECODE_ENTRY( "gfx2", 0, charlayout_3bpp, 0x100, 0x100/8 ) // fg chars (bottom monitor only) GFXDECODE_ENTRY( "gfx3", 0, charlayout_3bpp, 0x000, 0x200/8 ) // big sprite #1 (top and bottom monitor) @@ -645,7 +645,7 @@ MACHINE_CONFIG_START(punchout_state::punchout) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // enable NVRAM? /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", punchout) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_punchout) MCFG_PALETTE_ADD("palette", 0x200) MCFG_DEFAULT_LAYOUT(layout_dualhovu) @@ -704,7 +704,7 @@ MACHINE_CONFIG_START(punchout_state::armwrest) MCFG_DEVICE_PROGRAM_MAP(armwrest_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", armwrest) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_armwrest) MCFG_VIDEO_START_OVERRIDE(punchout_state, armwrest) MCFG_SCREEN_MODIFY("top") diff --git a/src/mame/drivers/pv1000.cpp b/src/mame/drivers/pv1000.cpp index cd98f71fae2..347ee0f9e8c 100644 --- a/src/mame/drivers/pv1000.cpp +++ b/src/mame/drivers/pv1000.cpp @@ -431,7 +431,7 @@ static const gfx_layout pv1000_3bpp_gfx = }; -static GFXDECODE_START( pv1000 ) +static GFXDECODE_START( gfx_pv1000 ) GFXDECODE_ENTRY( "gfxrom", 8, pv1000_3bpp_gfx, 0, 8 ) GFXDECODE_ENTRY( "gfxram", 8, pv1000_3bpp_gfx, 0, 8 ) GFXDECODE_END @@ -452,7 +452,7 @@ MACHINE_CONFIG_START(pv1000_state::pv1000) MCFG_PALETTE_ADD_3BIT_BGR("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pv1000 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pv1000 ) SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD( "pv1000_sound", PV1000, 17897725 ) diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp index 4d722a33246..d80c102dfd0 100644 --- a/src/mame/drivers/px4.cpp +++ b/src/mame/drivers/px4.cpp @@ -23,6 +23,7 @@ #include "machine/timer.h" #include "sound/spkrdev.h" +#include "diserial.h" #include "screen.h" #include "softlist.h" #include "speaker.h" diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp index 5925ab4ea77..27c61cc0424 100644 --- a/src/mame/drivers/px8.cpp +++ b/src/mame/drivers/px8.cpp @@ -712,7 +712,7 @@ static const gfx_layout px8_charlayout = GFXDECODE( px8 ) -------------------------------------------------*/ -static GFXDECODE_START( px8 ) +static GFXDECODE_START( gfx_px8 ) GFXDECODE_ENTRY( SED1320_TAG, 0x0000, px8_charlayout, 0, 1 ) GFXDECODE_END @@ -774,7 +774,7 @@ MACHINE_CONFIG_START(px8_state::px8) MCFG_SCREEN_VISIBLE_AREA(0, 479, 0, 63) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", px8) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_px8) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(px8_state, px8) diff --git a/src/mame/drivers/pyl601.cpp b/src/mame/drivers/pyl601.cpp index b61788e2c0b..6005c714c2c 100644 --- a/src/mame/drivers/pyl601.cpp +++ b/src/mame/drivers/pyl601.cpp @@ -526,11 +526,11 @@ static const gfx_layout pyl601a_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( pyl601 ) +static GFXDECODE_START( gfx_pyl601 ) GFXDECODE_ENTRY( "chargen", 0x0000, pyl601_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START( pyl601a ) +static GFXDECODE_START( gfx_pyl601a ) GFXDECODE_ENTRY( "chargen", 0x0000, pyl601a_charlayout, 0, 1 ) GFXDECODE_END @@ -547,7 +547,7 @@ MACHINE_CONFIG_START(pyl601_state::pyl601) MCFG_SCREEN_SIZE(640, 200) MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 200 - 1) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pyl601) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pyl601) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ @@ -576,7 +576,7 @@ MACHINE_CONFIG_START(pyl601_state::pyl601a) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK( XTAL(2'000'000)) - MCFG_GFXDECODE_MODIFY("gfxdecode", pyl601a) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pyl601a) MCFG_DEVICE_REMOVE("crtc") MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(2'000'000)) diff --git a/src/mame/drivers/pzletime.cpp b/src/mame/drivers/pzletime.cpp index 1e555f68a56..9cecd0cca9e 100644 --- a/src/mame/drivers/pzletime.cpp +++ b/src/mame/drivers/pzletime.cpp @@ -304,7 +304,7 @@ static const gfx_layout layout16x16 = 32*32 }; -static GFXDECODE_START( pzletime ) +static GFXDECODE_START( gfx_pzletime ) GFXDECODE_ENTRY( "gfx1", 0, layout8x8, 0x100, 0x10 ) GFXDECODE_ENTRY( "gfx2", 0, layout16x16, 0x200, 0x10 ) GFXDECODE_ENTRY( "gfx3", 0, layout16x16, 0x000, 0x10 ) @@ -348,7 +348,7 @@ MACHINE_CONFIG_START(pzletime_state::pzletime) MCFG_SCREEN_UPDATE_DRIVER(pzletime_state, screen_update_pzletime) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pzletime) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pzletime) MCFG_PALETTE_ADD("palette", 0x300 + 32768) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) MCFG_PALETTE_INIT_OWNER(pzletime_state, pzletime) diff --git a/src/mame/drivers/quasar.cpp b/src/mame/drivers/quasar.cpp index 65a45310d98..350d5e08657 100644 --- a/src/mame/drivers/quasar.cpp +++ b/src/mame/drivers/quasar.cpp @@ -266,7 +266,7 @@ static const gfx_layout charlayout = /* S2636 Mappings */ -static GFXDECODE_START( quasar ) +static GFXDECODE_START( gfx_quasar ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 64+1 ) /* ROM chars */ GFXDECODE_END @@ -328,7 +328,7 @@ MACHINE_CONFIG_START(quasar_state::quasar) MCFG_SCREEN_UPDATE_DRIVER(quasar_state, screen_update_quasar) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", quasar) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_quasar) MCFG_PALETTE_ADD("palette", (64+1)*8+(4*256)) MCFG_PALETTE_INDIRECT_ENTRIES(0x500) MCFG_PALETTE_INIT_OWNER(quasar_state,quasar) diff --git a/src/mame/drivers/quickpick5.cpp b/src/mame/drivers/quickpick5.cpp index bf8698b0a3f..256627518b1 100644 --- a/src/mame/drivers/quickpick5.cpp +++ b/src/mame/drivers/quickpick5.cpp @@ -427,7 +427,7 @@ MACHINE_CONFIG_START(quickpick5_state::quickpick5) MCFG_K05324X_OFFSETS(-(44+80), 20) MCFG_K05324X_CB(quickpick5_state, sprite_callback) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mame/drivers/quizdna.cpp b/src/mame/drivers/quizdna.cpp index 494fe6a8fe6..b9da8785682 100644 --- a/src/mame/drivers/quizdna.cpp +++ b/src/mame/drivers/quizdna.cpp @@ -428,7 +428,7 @@ static const gfx_layout objlayout = 16*16*4 }; -static GFXDECODE_START( quizdna ) +static GFXDECODE_START( gfx_quizdna ) GFXDECODE_ENTRY( "gfx1", 0x0000, fglayout, 0x7e0, 16 ) GFXDECODE_ENTRY( "gfx2", 0x0000, bglayout, 0x000, 128 ) GFXDECODE_ENTRY( "gfx3", 0x0000, objlayout, 0x600, 32 ) @@ -457,7 +457,7 @@ MACHINE_CONFIG_START(quizdna_state::quizdna) MCFG_SCREEN_UPDATE_DRIVER(quizdna_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", quizdna) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_quizdna) MCFG_PALETTE_ADD("palette", 2048) diff --git a/src/mame/drivers/quizpani.cpp b/src/mame/drivers/quizpani.cpp index 6a5a423c6ff..3776b18d165 100644 --- a/src/mame/drivers/quizpani.cpp +++ b/src/mame/drivers/quizpani.cpp @@ -188,7 +188,7 @@ static const gfx_layout tilelayout = 32*32 }; -static GFXDECODE_START( quizpani ) +static GFXDECODE_START( gfx_quizpani ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0x100, 16 ) /* Background */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0x000, 16 ) /* Text */ GFXDECODE_END @@ -200,7 +200,7 @@ MACHINE_CONFIG_START(quizpani_state::quizpani) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", quizpani_state, irq4_line_hold) MCFG_DEVICE_PERIODIC_INT_DRIVER(quizpani_state, irq1_line_hold, 164) // music tempo - MCFG_GFXDECODE_ADD("gfxdecode", "palette", quizpani) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_quizpani) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp index aea70eb92f5..34694684ee9 100644 --- a/src/mame/drivers/quizpun2.cpp +++ b/src/mame/drivers/quizpun2.cpp @@ -560,7 +560,7 @@ static const gfx_layout layout_16x16x1 = 16*16*1 }; -static GFXDECODE_START( quizpun2 ) +static GFXDECODE_START( gfx_quizpun2 ) GFXDECODE_ENTRY( "bg", 0, layout_16x16x4, 0, 256/16 ) GFXDECODE_ENTRY( "fg", 0, layout_16x16x1, 0x100, 256/2 ) GFXDECODE_ENTRY( "fg2", 0, layout_16x16x1, 0x100, 256/2 ) @@ -606,7 +606,7 @@ MACHINE_CONFIG_START(quizpun2_state::quizpun2) MCFG_SCREEN_UPDATE_DRIVER(quizpun2_state, screen_update_quizpun2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", quizpun2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_quizpun2) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp index 39de1dd696e..4c736e2cf87 100644 --- a/src/mame/drivers/quizshow.cpp +++ b/src/mame/drivers/quizshow.cpp @@ -363,7 +363,7 @@ static const gfx_layout tile_layout = 8*16 }; -static GFXDECODE_START( quizshow ) +static GFXDECODE_START( gfx_quizshow ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0, 4 ) GFXDECODE_END @@ -401,7 +401,7 @@ MACHINE_CONFIG_START(quizshow_state::quizshow) MCFG_SCREEN_UPDATE_DRIVER(quizshow_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", quizshow) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_quizshow) MCFG_PALETTE_ADD("palette", 8*2) MCFG_PALETTE_INDIRECT_ENTRIES(2) MCFG_PALETTE_INIT_OWNER(quizshow_state, quizshow) diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp index 6656051b91a..8bf3f1cafb8 100644 --- a/src/mame/drivers/qx10.cpp +++ b/src/mame/drivers/qx10.cpp @@ -677,7 +677,7 @@ static const gfx_layout qx10_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( qx10 ) +static GFXDECODE_START( gfx_qx10 ) GFXDECODE_ENTRY( "chargen", 0x0000, qx10_charlayout, 1, 1 ) GFXDECODE_END @@ -741,7 +741,7 @@ MACHINE_CONFIG_START(qx10_state::qx10) MCFG_SCREEN_UPDATE_DRIVER(qx10_state, screen_update) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", qx10) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_qx10) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(qx10_state, qx10) diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp index 7b1e519874b..0fc49f6fea4 100644 --- a/src/mame/drivers/r2dx_v33.cpp +++ b/src/mame/drivers/r2dx_v33.cpp @@ -585,7 +585,7 @@ static const gfx_layout rdx_v33_spritelayout = 16*16*4 }; -static GFXDECODE_START( rdx_v33 ) +static GFXDECODE_START( gfx_rdx_v33 ) GFXDECODE_ENTRY( "gfx1", 0x00000, rdx_v33_charlayout, 0x700, 128 ) GFXDECODE_ENTRY( "gfx2", 0x00000, rdx_v33_tilelayout, 0x400, 128 ) GFXDECODE_ENTRY( "gfx3", 0x00000, rdx_v33_spritelayout, 0x000, 4096 ) @@ -803,7 +803,7 @@ MACHINE_CONFIG_START(r2dx_v33_state::rdx_v33) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(raiden2_state, screen_update_raiden2) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rdx_v33) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rdx_v33) MCFG_PALETTE_ADD("palette", 2048) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -841,7 +841,7 @@ MACHINE_CONFIG_START(r2dx_v33_state::nzerotea) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(raiden2_state, screen_update_raiden2) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rdx_v33) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rdx_v33) MCFG_PALETTE_ADD("palette", 2048) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp index fbe41c6e0f1..ef1fda0e115 100644 --- a/src/mame/drivers/rabbit.cpp +++ b/src/mame/drivers/rabbit.cpp @@ -873,7 +873,7 @@ static const gfx_layout _16x16x8_layout = -static GFXDECODE_START( rabbit ) +static GFXDECODE_START( gfx_rabbit ) /* this seems to be sprites */ GFXDECODE_ENTRY( "gfx1", 0, sprite_8x8x4_layout, 0x0, 0x1000 ) GFXDECODE_ENTRY( "gfx1", 0, sprite_16x16x4_layout, 0x0, 0x1000 ) @@ -907,7 +907,7 @@ MACHINE_CONFIG_START(rabbit_state::rabbit) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rabbit) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rabbit) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/rad_eu3a05.cpp b/src/mame/drivers/rad_eu3a05.cpp index da86785a6a1..78c130473c7 100644 --- a/src/mame/drivers/rad_eu3a05.cpp +++ b/src/mame/drivers/rad_eu3a05.cpp @@ -1125,7 +1125,7 @@ static const gfx_layout texture_helper_4bpp_layout = texlayout_yoffset_4bpp }; -static GFXDECODE_START( radicasi_fake ) +static GFXDECODE_START( gfx_radicasi_fake ) GFXDECODE_ENTRY( "maincpu", 0, helper_4bpp_8_layout, 0x0, 1 ) GFXDECODE_ENTRY( "maincpu", 0, texture_helper_4bpp_layout, 0x0, 1 ) GFXDECODE_ENTRY( "maincpu", 0, helper_8bpp_8_layout, 0x0, 1 ) @@ -1171,7 +1171,7 @@ MACHINE_CONFIG_START(radica_eu3a05_state::radicasi) MCFG_PALETTE_ADD("palette", 256) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", radicasi_fake) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_radicasi_fake) MCFG_DEVICE_ADD("gpio", RADICA6502_GPIO, 0) MCFG_RADICA6502_GPIO_READ_PORT0_CB(IOPORT("IN0")) diff --git a/src/mame/drivers/rad_eu3a14.cpp b/src/mame/drivers/rad_eu3a14.cpp index 20460e8f940..57f0180788d 100644 --- a/src/mame/drivers/rad_eu3a14.cpp +++ b/src/mame/drivers/rad_eu3a14.cpp @@ -763,7 +763,7 @@ static const gfx_layout helper8x8x4_layout = }; -static GFXDECODE_START( helper ) +static GFXDECODE_START( gfx_helper ) GFXDECODE_ENTRY( "maincpu", 0, helper8x1x2_layout, 0x0, 128 ) GFXDECODE_ENTRY( "maincpu", 0, helper8x1x4_layout, 0x0, 32 ) GFXDECODE_ENTRY( "maincpu", 0, helper8x1x8_layout, 0x0, 2 ) @@ -787,7 +787,7 @@ MACHINE_CONFIG_START(radica_eu3a14_state::radica_eu3a14) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(24) MCFG_ADDRESS_MAP_BANK_STRIDE(0x8000) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", helper) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_helper) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/radio86.cpp b/src/mame/drivers/radio86.cpp index 31ed5b808ea..36395c72287 100644 --- a/src/mame/drivers/radio86.cpp +++ b/src/mame/drivers/radio86.cpp @@ -345,7 +345,7 @@ static const gfx_layout radio86_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( radio86 ) +static GFXDECODE_START( gfx_radio86 ) GFXDECODE_ENTRY( "gfx1", 0x0000, radio86_charlayout, 0, 1 ) GFXDECODE_END @@ -373,7 +373,7 @@ MACHINE_CONFIG_START(radio86_state::radio86) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_UPDATE_DEVICE("i8275", i8275_device, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000) / 2, 516, 0, 78*6, 310, 0, 30*10) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", radio86) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_radio86) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(radio86_state,radio86) diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp index 2d3cffde2b5..4f1f5be3340 100644 --- a/src/mame/drivers/raiden.cpp +++ b/src/mame/drivers/raiden.cpp @@ -315,7 +315,7 @@ static const gfx_layout raiden_spritelayout = 1024 }; -static GFXDECODE_START( raiden ) +static GFXDECODE_START( gfx_raiden ) GFXDECODE_ENTRY( "gfx1", 0, raiden_charlayout, 768, 16 ) GFXDECODE_ENTRY( "gfx2", 0, raiden_spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx3", 0, raiden_spritelayout, 256, 16 ) @@ -361,7 +361,7 @@ MACHINE_CONFIG_START(raiden_state::raiden) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, raiden_state, vblank_irq)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", raiden) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_raiden) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp index a7445ed5910..c1d61acb00b 100644 --- a/src/mame/drivers/raiden2.cpp +++ b/src/mame/drivers/raiden2.cpp @@ -1421,7 +1421,7 @@ static const gfx_layout raiden2_spritelayout = 16*16*4 }; -static GFXDECODE_START( raiden2 ) +static GFXDECODE_START( gfx_raiden2 ) GFXDECODE_ENTRY( "gfx1", 0x00000, raiden2_charlayout, 0x700, 128 ) GFXDECODE_ENTRY( "gfx2", 0x00000, raiden2_tilelayout, 0x400, 128 ) GFXDECODE_ENTRY( "gfx3", 0x00000, raiden2_spritelayout, 0x000, 4096 ) // really 128, but using the top bits for priority @@ -1448,7 +1448,7 @@ MACHINE_CONFIG_START(raiden2_state::raiden2) MCFG_SCREEN_RAW_PARAMS(XTAL(32'000'000)/4,512,0,40*8,282,0,30*8) /* hand-tuned to match ~55.47 */ MCFG_SCREEN_UPDATE_DRIVER(raiden2_state, screen_update_raiden2) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", raiden2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_raiden2) MCFG_PALETTE_ADD("palette", 2048) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1522,7 +1522,7 @@ MACHINE_CONFIG_START(raiden2_state::zeroteam) MCFG_SCREEN_RAW_PARAMS(XTAL(32'000'000)/4,512,0,40*8,282,0,32*8) /* hand-tuned to match ~55.47 */ MCFG_SCREEN_UPDATE_DRIVER(raiden2_state, screen_update_raiden2) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", raiden2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_raiden2) MCFG_PALETTE_ADD("palette", 2048) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index af97a98bccd..4cb768fdd90 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -3200,8 +3200,8 @@ static const gfx_layout rainbow_charlayout = 8 * 16 /* every char takes 16 bytes */ }; -static GFXDECODE_START(rainbow) -GFXDECODE_ENTRY("chargen", 0x0000, rainbow_charlayout, 0, 1) +static GFXDECODE_START(gfx_rainbow) + GFXDECODE_ENTRY("chargen", 0x0000, rainbow_charlayout, 0, 1) GFXDECODE_END // Allocate 512 K (4 x 64 K x 16 bit) of memory (GDC-NEW): @@ -3211,144 +3211,144 @@ void rainbow_state::upd7220_map(address_map &map) } MACHINE_CONFIG_START(rainbow_state::rainbow) -MCFG_DEFAULT_LAYOUT(layout_rainbow) - -/* basic machine hardware */ -MCFG_DEVICE_ADD("maincpu", I8088, XTAL(24'073'400) / 5) // approximately 4.815 MHz -MCFG_DEVICE_PROGRAM_MAP(rainbow8088_map) -MCFG_DEVICE_IO_MAP(rainbow8088_io) -MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(rainbow_state, irq_callback) - -MCFG_DEVICE_ADD("subcpu", Z80, XTAL(24'073'400) / 6) -MCFG_DEVICE_PROGRAM_MAP(rainbowz80_mem) -MCFG_DEVICE_IO_MAP(rainbowz80_io) - -/* video hardware */ -MCFG_SCREEN_ADD("screen", RASTER) -MCFG_SCREEN_RAW_PARAMS(XTAL(24'073'400) / 6, 442, 0, 400, 264, 0, 240) // ~NTSC compatible video timing (?) - -MCFG_SCREEN_UPDATE_DRIVER(rainbow_state, screen_update_rainbow) -MCFG_SCREEN_PALETTE("vt100_video:palette") -MCFG_GFXDECODE_ADD("gfxdecode", "vt100_video:palette", rainbow) - -MCFG_DEVICE_ADD("vt100_video", RAINBOW_VIDEO, XTAL(24'073'400)) - -MCFG_VT_SET_SCREEN("screen") -MCFG_VT_CHARGEN("chargen") -MCFG_VT_VIDEO_RAM_CALLBACK(READ8(*this, rainbow_state, read_video_ram_r)) -MCFG_VT_VIDEO_VERT_FREQ_INTR_CALLBACK(WRITELINE(*this, rainbow_state, video_interrupt)) - -// *************************** COLOR GRAPHICS (OPTION) ************************************** -// While the OSC frequency is confirmed, the divider is not (refresh rate is ~60 Hz with 32). -MCFG_DEVICE_ADD("upd7220", UPD7220, 31188000 / 32) // Duell schematics shows a 31.188 Mhz oscillator (confirmed by RFKA). -MCFG_UPD7220_VSYNC_CALLBACK(WRITELINE(*this, rainbow_state, GDC_vblank_irq)) // "The vsync callback line needs to be below the 7220 DEVICE_ADD line." - -MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map) -MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(rainbow_state, hgdc_display_pixels) -MCFG_VIDEO_SET_SCREEN("screen2") // SET_SCREEN needs to be added after 7720 device in the machine config, not after the screen. -MCFG_PALETTE_ADD("palette2", 32) - -MCFG_SCREEN_ADD("screen2", RASTER) -MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK | VIDEO_ALWAYS_UPDATE) - -// VR241 color monitor is specified for 20 MHz bandwidth ( 60 Hz / 15.72 kHz horizontal rate ) -// - sufficient for 800 x 240 non-interlaced at 60 Hz (non interlaced). -//MCFG_SCREEN_RAW_PARAMS(31188000 / 2 , 992, 0, 800, 262, 0, 240) - -// Alternate configuration: -MCFG_SCREEN_RAW_PARAMS(31188000 / 4 , 496, 0, 400, 262, 0, 240) - -MCFG_SCREEN_UPDATE_DEVICE("upd7220", upd7220_device, screen_update) - -MCFG_FD1793_ADD(FD1793_TAG, XTAL(24'073'400) / 24) // no separate 1 Mhz quartz -MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":0", rainbow_floppies, "525qd", rainbow_state::floppy_formats) -MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":1", rainbow_floppies, "525qd", rainbow_state::floppy_formats) -//MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":2", rainbow_floppies, "525qd", rainbow_state::floppy_formats) -//MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":3", rainbow_floppies, "525qd", rainbow_state::floppy_formats) -MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":2", rainbow_floppies, "525dd", rainbow_state::floppy_formats) -MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":3", rainbow_floppies, "35dd", rainbow_state::floppy_formats) -MCFG_SOFTWARE_LIST_ADD("flop_list", "rainbow") - -/// ********************************* HARD DISK CONTROLLER ***************************************** -MCFG_DEVICE_ADD("hdc", WD2010, 5000000) // 10 Mhz quartz on controller (divided by 2 for WCLK) -MCFG_WD2010_OUT_INTRQ_CB(WRITELINE(*this, rainbow_state, bundle_irq)) // FIRST IRQ SOURCE (OR'ed with DRQ) -MCFG_WD2010_OUT_BDRQ_CB(WRITELINE(*this, rainbow_state, hdc_bdrq)) // BUFFER DATA REQUEST - -// SIGNALS -FROM- WD CONTROLLER: -MCFG_WD2010_OUT_BCS_CB(WRITELINE(*this, rainbow_state, hdc_read_sector)) // Problem: OUT_BCS_CB = WRITE8 ... (!) -MCFG_WD2010_OUT_BCR_CB(WRITELINE(*this, rainbow_state, hdc_bcr)) // BUFFER COUNTER RESET (pulses) - -MCFG_WD2010_OUT_WG_CB(WRITELINE(*this, rainbow_state, hdc_write_sector)) // WRITE GATE -MCFG_WD2010_OUT_STEP_CB(WRITELINE(*this, rainbow_state, hdc_step)) // STEP PULSE -MCFG_WD2010_OUT_DIRIN_CB(WRITELINE(*this, rainbow_state, hdc_direction)) - -MCFG_WD2010_IN_WF_CB(READLINE(*this, rainbow_state, hdc_write_fault)) // WRITE FAULT (set to GND if not serviced) - -MCFG_WD2010_IN_DRDY_CB(READLINE(*this, rainbow_state, hdc_drive_ready)) // DRIVE_READY (set to VCC if not serviced) -MCFG_WD2010_IN_SC_CB(VCC) // SEEK COMPLETE (set to VCC if not serviced) - -MCFG_WD2010_IN_TK000_CB(VCC) // CURRENTLY NOT EVALUATED WITHIN 'WD2010' -MCFG_WD2010_IN_INDEX_CB(VCC) // " - -MCFG_HARDDISK_ADD("decharddisk1") -/// ******************************** / HARD DISK CONTROLLER **************************************** - -MCFG_DEVICE_ADD("corvus", CORVUS_HDC, 0) -MCFG_HARDDISK_ADD("harddisk1") -MCFG_HARDDISK_INTERFACE("corvus_hdd") -MCFG_HARDDISK_ADD("harddisk2") -MCFG_HARDDISK_INTERFACE("corvus_hdd") -MCFG_HARDDISK_ADD("harddisk3") -MCFG_HARDDISK_INTERFACE("corvus_hdd") -MCFG_HARDDISK_ADD("harddisk4") -MCFG_HARDDISK_INTERFACE("corvus_hdd") - -MCFG_DS1315_ADD("rtc") // DS1315 (ClikClok for DEC-100 B) * OPTIONAL * - -MCFG_DEVICE_ADD("dbrg", COM8116_003, XTAL(24'073'400) / 4) // 6.01835 MHz (nominally 6 MHz) -MCFG_COM8116_FR_HANDLER(WRITELINE(*this, rainbow_state, dbrg_fr_w)) -MCFG_COM8116_FT_HANDLER(WRITELINE(*this, rainbow_state, dbrg_ft_w)) - -MCFG_DEVICE_ADD("mpsc", UPD7201_NEW, XTAL(24'073'400) / 5 / 2) // 2.4073 MHz (nominally 2.5 MHz) -MCFG_Z80SIO_OUT_INT_CB(WRITELINE(*this, rainbow_state, mpsc_irq)) -MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("comm", rs232_port_device, write_txd)) -MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("printer", rs232_port_device, write_txd)) -// RTS and DTR outputs are not connected - -MCFG_DEVICE_ADD("comm", RS232_PORT, default_rs232_devices, nullptr) -MCFG_RS232_RXD_HANDLER(WRITELINE("mpsc", upd7201_new_device, rxa_w)) -MCFG_RS232_CTS_HANDLER(WRITELINE("mpsc", upd7201_new_device, ctsa_w)) -MCFG_RS232_DCD_HANDLER(WRITELINE("mpsc", upd7201_new_device, dcda_w)) - -MCFG_DEVICE_ADD("printer", RS232_PORT, default_rs232_devices, nullptr) -MCFG_RS232_RXD_HANDLER(WRITELINE("mpsc", upd7201_new_device, rxb_w)) -MCFG_RS232_DCD_HANDLER(WRITELINE("mpsc", upd7201_new_device, ctsb_w)) // actually DTR - -MCFG_DEVICE_MODIFY("comm") -MCFG_SLOT_OPTION_ADD("microsoft_mouse", MSFT_SERIAL_MOUSE) -MCFG_SLOT_OPTION_ADD("mouse_systems_mouse", MSYSTEM_SERIAL_MOUSE) -MCFG_SLOT_DEFAULT_OPTION("microsoft_mouse") - -MCFG_DEVICE_MODIFY("printer") -MCFG_SLOT_DEFAULT_OPTION("printer") - -MCFG_DEVICE_ADD("kbdser", I8251, XTAL(24'073'400) / 5 / 2) -MCFG_I8251_TXD_HANDLER(WRITELINE(*this, rainbow_state, kbd_tx)) -MCFG_I8251_DTR_HANDLER(WRITELINE(*this, rainbow_state, irq_hi_w)) -MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, rainbow_state, kbd_rxready_w)) -MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, rainbow_state, kbd_txready_w)) - -MCFG_DEVICE_ADD(LK201_TAG, LK201, 0) -MCFG_LK201_TX_HANDLER(WRITELINE("kbdser", i8251_device, write_rxd)) - -MCFG_DEVICE_ADD("prtbrg", RIPPLE_COUNTER, XTAL(24'073'400) / 6 / 13) // 74LS393 at E17 (both halves) -// divided clock should ideally be 307.2 kHz, but is actually approximately 308.6333 kHz -MCFG_RIPPLE_COUNTER_STAGES(8) -MCFG_RIPPLE_COUNTER_COUNT_OUT_CB(WRITE8(*this, rainbow_state, bitrate_counter_w)) - -MCFG_TIMER_DRIVER_ADD_PERIODIC("motor", rainbow_state, hd_motor_tick, attotime::from_hz(60)) + MCFG_DEFAULT_LAYOUT(layout_rainbow) + + /* basic machine hardware */ + MCFG_DEVICE_ADD("maincpu", I8088, XTAL(24'073'400) / 5) // approximately 4.815 MHz + MCFG_DEVICE_PROGRAM_MAP(rainbow8088_map) + MCFG_DEVICE_IO_MAP(rainbow8088_io) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(rainbow_state, irq_callback) + + MCFG_DEVICE_ADD("subcpu", Z80, XTAL(24'073'400) / 6) + MCFG_DEVICE_PROGRAM_MAP(rainbowz80_mem) + MCFG_DEVICE_IO_MAP(rainbowz80_io) + + /* video hardware */ + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_RAW_PARAMS(XTAL(24'073'400) / 6, 442, 0, 400, 264, 0, 240) // ~NTSC compatible video timing (?) + + MCFG_SCREEN_UPDATE_DRIVER(rainbow_state, screen_update_rainbow) + MCFG_SCREEN_PALETTE("vt100_video:palette") + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "vt100_video:palette", gfx_rainbow) + + MCFG_DEVICE_ADD("vt100_video", RAINBOW_VIDEO, XTAL(24'073'400)) + + MCFG_VT_SET_SCREEN("screen") + MCFG_VT_CHARGEN("chargen") + MCFG_VT_VIDEO_RAM_CALLBACK(READ8(*this, rainbow_state, read_video_ram_r)) + MCFG_VT_VIDEO_VERT_FREQ_INTR_CALLBACK(WRITELINE(*this, rainbow_state, video_interrupt)) + + // *************************** COLOR GRAPHICS (OPTION) ************************************** + // While the OSC frequency is confirmed, the divider is not (refresh rate is ~60 Hz with 32). + MCFG_DEVICE_ADD("upd7220", UPD7220, 31188000 / 32) // Duell schematics shows a 31.188 Mhz oscillator (confirmed by RFKA). + MCFG_UPD7220_VSYNC_CALLBACK(WRITELINE(*this, rainbow_state, GDC_vblank_irq)) // "The vsync callback line needs to be below the 7220 DEVICE_ADD line." + + MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map) + MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(rainbow_state, hgdc_display_pixels) + MCFG_VIDEO_SET_SCREEN("screen2") // SET_SCREEN needs to be added after 7720 device in the machine config, not after the screen. + MCFG_PALETTE_ADD("palette2", 32) + + MCFG_SCREEN_ADD("screen2", RASTER) + MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK | VIDEO_ALWAYS_UPDATE) + + // VR241 color monitor is specified for 20 MHz bandwidth ( 60 Hz / 15.72 kHz horizontal rate ) + // - sufficient for 800 x 240 non-interlaced at 60 Hz (non interlaced). + //MCFG_SCREEN_RAW_PARAMS(31188000 / 2 , 992, 0, 800, 262, 0, 240) + + // Alternate configuration: + MCFG_SCREEN_RAW_PARAMS(31188000 / 4 , 496, 0, 400, 262, 0, 240) + + MCFG_SCREEN_UPDATE_DEVICE("upd7220", upd7220_device, screen_update) + + MCFG_FD1793_ADD(FD1793_TAG, XTAL(24'073'400) / 24) // no separate 1 Mhz quartz + MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":0", rainbow_floppies, "525qd", rainbow_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":1", rainbow_floppies, "525qd", rainbow_state::floppy_formats) + //MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":2", rainbow_floppies, "525qd", rainbow_state::floppy_formats) + //MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":3", rainbow_floppies, "525qd", rainbow_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":2", rainbow_floppies, "525dd", rainbow_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":3", rainbow_floppies, "35dd", rainbow_state::floppy_formats) + MCFG_SOFTWARE_LIST_ADD("flop_list", "rainbow") + + /// ********************************* HARD DISK CONTROLLER ***************************************** + MCFG_DEVICE_ADD("hdc", WD2010, 5000000) // 10 Mhz quartz on controller (divided by 2 for WCLK) + MCFG_WD2010_OUT_INTRQ_CB(WRITELINE(*this, rainbow_state, bundle_irq)) // FIRST IRQ SOURCE (OR'ed with DRQ) + MCFG_WD2010_OUT_BDRQ_CB(WRITELINE(*this, rainbow_state, hdc_bdrq)) // BUFFER DATA REQUEST + + // SIGNALS -FROM- WD CONTROLLER: + MCFG_WD2010_OUT_BCS_CB(WRITELINE(*this, rainbow_state, hdc_read_sector)) // Problem: OUT_BCS_CB = WRITE8 ... (!) + MCFG_WD2010_OUT_BCR_CB(WRITELINE(*this, rainbow_state, hdc_bcr)) // BUFFER COUNTER RESET (pulses) + + MCFG_WD2010_OUT_WG_CB(WRITELINE(*this, rainbow_state, hdc_write_sector)) // WRITE GATE + MCFG_WD2010_OUT_STEP_CB(WRITELINE(*this, rainbow_state, hdc_step)) // STEP PULSE + MCFG_WD2010_OUT_DIRIN_CB(WRITELINE(*this, rainbow_state, hdc_direction)) + + MCFG_WD2010_IN_WF_CB(READLINE(*this, rainbow_state, hdc_write_fault)) // WRITE FAULT (set to GND if not serviced) + + MCFG_WD2010_IN_DRDY_CB(READLINE(*this, rainbow_state, hdc_drive_ready)) // DRIVE_READY (set to VCC if not serviced) + MCFG_WD2010_IN_SC_CB(VCC) // SEEK COMPLETE (set to VCC if not serviced) + + MCFG_WD2010_IN_TK000_CB(VCC) // CURRENTLY NOT EVALUATED WITHIN 'WD2010' + MCFG_WD2010_IN_INDEX_CB(VCC) // " + + MCFG_HARDDISK_ADD("decharddisk1") + /// ******************************** / HARD DISK CONTROLLER **************************************** + + MCFG_DEVICE_ADD("corvus", CORVUS_HDC, 0) + MCFG_HARDDISK_ADD("harddisk1") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk2") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk3") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk4") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + + MCFG_DS1315_ADD("rtc") // DS1315 (ClikClok for DEC-100 B) * OPTIONAL * + + MCFG_DEVICE_ADD("dbrg", COM8116_003, XTAL(24'073'400) / 4) // 6.01835 MHz (nominally 6 MHz) + MCFG_COM8116_FR_HANDLER(WRITELINE(*this, rainbow_state, dbrg_fr_w)) + MCFG_COM8116_FT_HANDLER(WRITELINE(*this, rainbow_state, dbrg_ft_w)) + + MCFG_DEVICE_ADD("mpsc", UPD7201_NEW, XTAL(24'073'400) / 5 / 2) // 2.4073 MHz (nominally 2.5 MHz) + MCFG_Z80SIO_OUT_INT_CB(WRITELINE(*this, rainbow_state, mpsc_irq)) + MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("comm", rs232_port_device, write_txd)) + MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("printer", rs232_port_device, write_txd)) + // RTS and DTR outputs are not connected + + MCFG_DEVICE_ADD("comm", RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE("mpsc", upd7201_new_device, rxa_w)) + MCFG_RS232_CTS_HANDLER(WRITELINE("mpsc", upd7201_new_device, ctsa_w)) + MCFG_RS232_DCD_HANDLER(WRITELINE("mpsc", upd7201_new_device, dcda_w)) + + MCFG_DEVICE_ADD("printer", RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE("mpsc", upd7201_new_device, rxb_w)) + MCFG_RS232_DCD_HANDLER(WRITELINE("mpsc", upd7201_new_device, ctsb_w)) // actually DTR + + MCFG_DEVICE_MODIFY("comm") + MCFG_SLOT_OPTION_ADD("microsoft_mouse", MSFT_SERIAL_MOUSE) + MCFG_SLOT_OPTION_ADD("mouse_systems_mouse", MSYSTEM_SERIAL_MOUSE) + MCFG_SLOT_DEFAULT_OPTION("microsoft_mouse") + + MCFG_DEVICE_MODIFY("printer") + MCFG_SLOT_DEFAULT_OPTION("printer") + + MCFG_DEVICE_ADD("kbdser", I8251, XTAL(24'073'400) / 5 / 2) + MCFG_I8251_TXD_HANDLER(WRITELINE(*this, rainbow_state, kbd_tx)) + MCFG_I8251_DTR_HANDLER(WRITELINE(*this, rainbow_state, irq_hi_w)) + MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, rainbow_state, kbd_rxready_w)) + MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, rainbow_state, kbd_txready_w)) + + MCFG_DEVICE_ADD(LK201_TAG, LK201, 0) + MCFG_LK201_TX_HANDLER(WRITELINE("kbdser", i8251_device, write_rxd)) + + MCFG_DEVICE_ADD("prtbrg", RIPPLE_COUNTER, XTAL(24'073'400) / 6 / 13) // 74LS393 at E17 (both halves) + // divided clock should ideally be 307.2 kHz, but is actually approximately 308.6333 kHz + MCFG_RIPPLE_COUNTER_STAGES(8) + MCFG_RIPPLE_COUNTER_COUNT_OUT_CB(WRITE8(*this, rainbow_state, bitrate_counter_w)) + + MCFG_TIMER_DRIVER_ADD_PERIODIC("motor", rainbow_state, hd_motor_tick, attotime::from_hz(60)) -MCFG_NVRAM_ADD_0FILL("nvram") + MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END //---------------------------------------------------------------------------------------- @@ -3374,22 +3374,22 @@ MACHINE_CONFIG_END // - smaller ROMs (3 x 2764) with fewer routines (no documented way to beep...) // - socketed NVRAM chip: X2212D 8238AES ROM_START(rainbow100a) -ROM_REGION(0x100000, "maincpu", 0) + ROM_REGION(0x100000, "maincpu", 0) -ROM_LOAD("23-176e4-00.bin", 0xFA000, 0x2000, NO_DUMP) // ROM (FA000-FBFFF) (E89) 8 K -ROM_LOAD("23-177e4-00.bin", 0xFC000, 0x2000, NO_DUMP) // ROM (FC000-FDFFF) (E90) 8 K + ROM_LOAD("23-176e4-00.bin", 0xFA000, 0x2000, NO_DUMP) // ROM (FA000-FBFFF) (E89) 8 K + ROM_LOAD("23-177e4-00.bin", 0xFC000, 0x2000, NO_DUMP) // ROM (FC000-FDFFF) (E90) 8 K -// SOCKETED LANGUAGE ROM (E91) with 1 single localization per ROM - -ROM_LOAD("23-092e4-00.bin", 0xFE000, 0x2000, NO_DUMP) // ROM (FE000-FFFFF) (E91) 8 K - English (?) -// See also MP-01491-00 - PC100A FIELD MAINTENANCE SET. Appendix A of EK-RB100 Rainbow -// Technical Manual Addendum f.100A and 100B (Dec.84) lists 15 localizations / part numbers + // SOCKETED LANGUAGE ROM (E91) with 1 single localization per ROM - + ROM_LOAD("23-092e4-00.bin", 0xFE000, 0x2000, NO_DUMP) // ROM (FE000-FFFFF) (E91) 8 K - English (?) + // See also MP-01491-00 - PC100A FIELD MAINTENANCE SET. Appendix A of EK-RB100 Rainbow + // Technical Manual Addendum f.100A and 100B (Dec.84) lists 15 localizations / part numbers -ROM_REGION(0x1000, "chargen", 0) // [E98] 2732 (4 K) EPROM -ROM_LOAD("23-020e3-00.bin", 0x0000, 0x1000, CRC(1685e452) SHA1(bc299ff1cb74afcededf1a7beb9001188fdcf02f)) + ROM_REGION(0x1000, "chargen", 0) // [E98] 2732 (4 K) EPROM + ROM_LOAD("23-020e3-00.bin", 0x0000, 0x1000, CRC(1685e452) SHA1(bc299ff1cb74afcededf1a7beb9001188fdcf02f)) -// Z80 ARBITRATION PROM -ROM_REGION(0x100, "prom", 0) -ROM_LOAD("23-090b1.mmi6308-ij.e11", 0x0000, 0x0100, CRC(cac3a7e3) SHA1(2d0468cda36fa287f705364c56dbf62f548d2e4c) ) // MMI 6308-IJ; Silkscreen stamp: "LM8413 // 090B1"; 256x8 Open Collector prom @E11, same prom is @E13 on 100-B + // Z80 ARBITRATION PROM + ROM_REGION(0x100, "prom", 0) + ROM_LOAD("23-090b1.mmi6308-ij.e11", 0x0000, 0x0100, CRC(cac3a7e3) SHA1(2d0468cda36fa287f705364c56dbf62f548d2e4c) ) // MMI 6308-IJ; Silkscreen stamp: "LM8413 // 090B1"; 256x8 Open Collector prom @E11, same prom is @E13 on 100-B ROM_END //---------------------------------------------------------------------------------------- @@ -3398,32 +3398,32 @@ ROM_END // - 32 K ROM (version 5.03) // - 128 K base and 896 K max. mem. ROM_START(rainbow) -ROM_REGION(0x100000, "maincpu", 0) + ROM_REGION(0x100000, "maincpu", 0) -// Note that the 'Field Maintenance Print Set 1984' also lists alternate revision 'A1' with -// 23-063e3-00 (for chargen) and '23-074e5-00' / '23-073e5-00' for E5-01 / E5-02. + // Note that the 'Field Maintenance Print Set 1984' also lists alternate revision 'A1' with + // 23-063e3-00 (for chargen) and '23-074e5-00' / '23-073e5-00' for E5-01 / E5-02. -// Part numbers 22E5, 20E5 and 37E3 verified to match revision "B" (FCC ID : A0994Q - PC100 - B). + // Part numbers 22E5, 20E5 and 37E3 verified to match revision "B" (FCC ID : A0994Q - PC100 - B). -// BOOT ROM -ROM_LOAD("23-022e5-00.bin", 0xf0000, 0x4000, CRC(9d1332b4) SHA1(736306d2a36bd44f95a39b36ebbab211cc8fea6e)) -ROM_RELOAD(0xf4000, 0x4000) + // BOOT ROM + ROM_LOAD("23-022e5-00.bin", 0xf0000, 0x4000, CRC(9d1332b4) SHA1(736306d2a36bd44f95a39b36ebbab211cc8fea6e)) + ROM_RELOAD(0xf4000, 0x4000) -// LANGUAGE ROM -ROM_LOAD("23-020e5-00.bin", 0xf8000, 0x4000, CRC(8638712f) SHA1(8269b0d95dc6efbe67d500dac3999df4838625d8)) // German, French, English -//ROM_LOAD( "23-015e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Dutch, French, English -//ROM_LOAD( "23-016e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Finish, Swedish, English -//ROM_LOAD( "23-017e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Danish, Norwegian, English -//ROM_LOAD( "23-018e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Spanish, Italian, English -ROM_RELOAD(0xfc000, 0x4000) + // LANGUAGE ROM + ROM_LOAD("23-020e5-00.bin", 0xf8000, 0x4000, CRC(8638712f) SHA1(8269b0d95dc6efbe67d500dac3999df4838625d8)) // German, French, English + //ROM_LOAD( "23-015e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Dutch, French, English + //ROM_LOAD( "23-016e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Finish, Swedish, English + //ROM_LOAD( "23-017e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Danish, Norwegian, English + //ROM_LOAD( "23-018e5-00.bin", 0xf8000, 0x4000, NO_DUMP) // Spanish, Italian, English + ROM_RELOAD(0xfc000, 0x4000) -// CHARACTER GENERATOR (E3-03) -ROM_REGION(0x1000, "chargen", 0) -ROM_LOAD("23-037e3.bin", 0x0000, 0x1000, CRC(1685e452) SHA1(bc299ff1cb74afcededf1a7beb9001188fdcf02f)) + // CHARACTER GENERATOR (E3-03) + ROM_REGION(0x1000, "chargen", 0) + ROM_LOAD("23-037e3.bin", 0x0000, 0x1000, CRC(1685e452) SHA1(bc299ff1cb74afcededf1a7beb9001188fdcf02f)) -// Z80 ARBITRATION PROM -ROM_REGION(0x100, "prom", 0) -ROM_LOAD("23-090b1.mmi6308-ij.e13", 0x0000, 0x0100, CRC(cac3a7e3) SHA1(2d0468cda36fa287f705364c56dbf62f548d2e4c) ) // MMI 6308-IJ; Silkscreen stamp: "LM8413 // 090B1"; 256x8 Open Collector prom @E13, same prom is @E11 on 100-A + // Z80 ARBITRATION PROM + ROM_REGION(0x100, "prom", 0) + ROM_LOAD("23-090b1.mmi6308-ij.e13", 0x0000, 0x0100, CRC(cac3a7e3) SHA1(2d0468cda36fa287f705364c56dbf62f548d2e4c) ) // MMI 6308-IJ; Silkscreen stamp: "LM8413 // 090B1"; 256x8 Open Collector prom @E13, same prom is @E11 on 100-A ROM_END //---------------------------------------------------------------------------------------- @@ -3438,18 +3438,18 @@ ROM_END // It is *likely* that the sole differences between 5.05 and 5.03 affect terminal emulation. ROM_START(rainbow190) -ROM_REGION(0x100000, "maincpu", 0) -ROM_LOAD("dec190rom0.bin", 0xf0000, 0x4000, CRC(fac191d2) SHA1(4aff5b1e031d3b5eafc568b23e68235270bb34de)) //FIXME: need correct rom name -ROM_RELOAD(0xf4000, 0x4000) -ROM_LOAD("dec190rom1.bin", 0xf8000, 0x4000, CRC(5ce59632) SHA1(d29793f7014c57a4e7cb77bbf6e84f9113635ed2)) //FIXME: need correct rom name - -ROM_RELOAD(0xfc000, 0x4000) -ROM_REGION(0x1000, "chargen", 0) -ROM_LOAD("23-037e3.bin", 0x0000, 0x1000, CRC(1685e452) SHA1(bc299ff1cb74afcededf1a7beb9001188fdcf02f)) - -// Z80 ARBITRATION PROM -ROM_REGION(0x100, "prom", 0) -ROM_LOAD("23-090b1.mmi6308-ij.e13", 0x0000, 0x0100, CRC(cac3a7e3) SHA1(2d0468cda36fa287f705364c56dbf62f548d2e4c) ) // MMI 6308-IJ; Silkscreen stamp: "LM8413 // 090B1"; 256x8 Open Collector prom @E13, same prom is @E11 on 100-A + ROM_REGION(0x100000, "maincpu", 0) + ROM_LOAD("dec190rom0.bin", 0xf0000, 0x4000, CRC(fac191d2) SHA1(4aff5b1e031d3b5eafc568b23e68235270bb34de)) //FIXME: need correct rom name + ROM_RELOAD(0xf4000, 0x4000) + ROM_LOAD("dec190rom1.bin", 0xf8000, 0x4000, CRC(5ce59632) SHA1(d29793f7014c57a4e7cb77bbf6e84f9113635ed2)) //FIXME: need correct rom name + + ROM_RELOAD(0xfc000, 0x4000) + ROM_REGION(0x1000, "chargen", 0) + ROM_LOAD("23-037e3.bin", 0x0000, 0x1000, CRC(1685e452) SHA1(bc299ff1cb74afcededf1a7beb9001188fdcf02f)) + + // Z80 ARBITRATION PROM + ROM_REGION(0x100, "prom", 0) + ROM_LOAD("23-090b1.mmi6308-ij.e13", 0x0000, 0x0100, CRC(cac3a7e3) SHA1(2d0468cda36fa287f705364c56dbf62f548d2e4c) ) // MMI 6308-IJ; Silkscreen stamp: "LM8413 // 090B1"; 256x8 Open Collector prom @E13, same prom is @E11 on 100-A ROM_END //---------------------------------------------------------------------------------------- diff --git a/src/mame/drivers/rallyx.cpp b/src/mame/drivers/rallyx.cpp index ae9356b67f1..2f469c09906 100644 --- a/src/mame/drivers/rallyx.cpp +++ b/src/mame/drivers/rallyx.cpp @@ -763,13 +763,13 @@ static const gfx_layout dotlayout = 16*8 }; -static GFXDECODE_START( rallyx ) +static GFXDECODE_START( gfx_rallyx ) GFXDECODE_ENTRY( "gfx1", 0, rallyx_charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx1", 0, rallyx_spritelayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, dotlayout, 64*4, 1 ) GFXDECODE_END -static GFXDECODE_START( jungler ) +static GFXDECODE_START( gfx_jungler ) GFXDECODE_ENTRY( "gfx1", 0, jungler_charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx1", 0, jungler_spritelayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, dotlayout, 64*4, 1 ) @@ -845,7 +845,7 @@ MACHINE_CONFIG_START(rallyx_state::rallyx) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, rallyx_state, rallyx_vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rallyx) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rallyx) MCFG_PALETTE_ADD("palette", 64*4+4) MCFG_PALETTE_INDIRECT_ENTRIES(32) @@ -897,7 +897,7 @@ MACHINE_CONFIG_START(rallyx_state::jungler) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, rallyx_state, jungler_vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jungler) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jungler) MCFG_PALETTE_ADD("palette", 64*4+4+64) MCFG_PALETTE_INDIRECT_ENTRIES(32+64) diff --git a/src/mame/drivers/rampart.cpp b/src/mame/drivers/rampart.cpp index bc2d64650ee..95f4192c817 100644 --- a/src/mame/drivers/rampart.cpp +++ b/src/mame/drivers/rampart.cpp @@ -325,7 +325,7 @@ static const gfx_layout molayout = }; -static GFXDECODE_START( rampart ) +static GFXDECODE_START( gfx_rampart ) GFXDECODE_ENTRY( "gfx1", 0, molayout, 256, 16 ) GFXDECODE_END @@ -352,7 +352,7 @@ MACHINE_CONFIG_START(rampart_state::rampart) MCFG_WATCHDOG_VBLANK_INIT("screen", 8) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rampart) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rampart) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB) MCFG_PALETTE_MEMBITS(8) diff --git a/src/mame/drivers/rastan.cpp b/src/mame/drivers/rastan.cpp index ebb161a3ba2..87eeed36af3 100644 --- a/src/mame/drivers/rastan.cpp +++ b/src/mame/drivers/rastan.cpp @@ -339,7 +339,7 @@ static const gfx_layout spritelayout = 32*16 }; -static GFXDECODE_START( rastan ) +static GFXDECODE_START( gfx_rastan ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 0x80 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 0x80 ) GFXDECODE_END @@ -388,7 +388,7 @@ MACHINE_CONFIG_START(rastan_state::rastan) MCFG_SCREEN_UPDATE_DRIVER(rastan_state, screen_update_rastan) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rastan) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rastan) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/rbisland.cpp b/src/mame/drivers/rbisland.cpp index c2f4514c739..cdc848fb709 100644 --- a/src/mame/drivers/rbisland.cpp +++ b/src/mame/drivers/rbisland.cpp @@ -591,7 +591,7 @@ static const gfx_layout spritelayout = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( rbisland ) +static GFXDECODE_START( gfx_rbisland ) GFXDECODE_ENTRY( "gfx2", 0x000000, spritelayout, 0, 0x80 ) /* OBJ 16x16 */ GFXDECODE_ENTRY( "gfx1", 0x000000, tilelayout, 0, 0x80 ) /* SCR 8x8 */ GFXDECODE_END @@ -619,7 +619,7 @@ static const gfx_layout jumping_spritelayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( jumping ) +static GFXDECODE_START( gfx_jumping ) GFXDECODE_ENTRY( "gfx2", 0, jumping_spritelayout, 0, 0x80 ) /* OBJ 16x16 */ GFXDECODE_ENTRY( "gfx1", 0, jumping_tilelayout, 0, 0x80 ) /* SCR 8x8 */ GFXDECODE_END @@ -683,7 +683,7 @@ MACHINE_CONFIG_START(rbisland_state::rbisland) MCFG_SCREEN_UPDATE_DRIVER(rbisland_state, screen_update_rainbow) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rbisland) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rbisland) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -733,7 +733,7 @@ MACHINE_CONFIG_START(rbisland_state::jumping) MCFG_SCREEN_UPDATE_DRIVER(rbisland_state, screen_update_jumping) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jumping) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jumping) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/rbmk.cpp b/src/mame/drivers/rbmk.cpp index 7f13ab722b1..00ef653133a 100644 --- a/src/mame/drivers/rbmk.cpp +++ b/src/mame/drivers/rbmk.cpp @@ -520,7 +520,7 @@ static const gfx_layout rbmk8_layout = }; -static GFXDECODE_START( rbmk ) +static GFXDECODE_START( gfx_rbmk ) GFXDECODE_ENTRY( "gfx1", 0, rbmk32_layout, 0x0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, rbmk8_layout, 0x100, 16 ) GFXDECODE_END @@ -577,7 +577,7 @@ MACHINE_CONFIG_START(rbmk_state::rbmk) MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, rbmk_state, mcu_io_mux_w)) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rbmk_state, mcu_irq) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rbmk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rbmk) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(58) diff --git a/src/mame/drivers/rcorsair.cpp b/src/mame/drivers/rcorsair.cpp index 0536b28d361..3e5219c9229 100644 --- a/src/mame/drivers/rcorsair.cpp +++ b/src/mame/drivers/rcorsair.cpp @@ -141,7 +141,7 @@ static const gfx_layout tiles8x8_layout = 8*8 }; -static GFXDECODE_START( rcorsair ) +static GFXDECODE_START( gfx_rcorsair ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_END @@ -175,7 +175,7 @@ MACHINE_CONFIG_START(rcorsair_state::rcorsair) MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rcorsair) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rcorsair) MCFG_PALETTE_ADD("palette", 0x100) MACHINE_CONFIG_END diff --git a/src/mame/drivers/rd100.cpp b/src/mame/drivers/rd100.cpp index c4512c8a075..01f7fd0a265 100644 --- a/src/mame/drivers/rd100.cpp +++ b/src/mame/drivers/rd100.cpp @@ -116,7 +116,7 @@ MACHINE_CONFIG_START(rd100_state::rd100) MCFG_SCREEN_SIZE(64*6, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 64*6-1, 0, 32*8-1) MCFG_PALETTE_ADD_MONOCHROME("palette") - //MCFG_GFXDECODE_ADD("gfxdecode", "palette", rd100) + //MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rd100) MACHINE_CONFIG_END ROM_START( rd100 ) diff --git a/src/mame/drivers/realbrk.cpp b/src/mame/drivers/realbrk.cpp index cf8c41deb67..ed072a23e4f 100644 --- a/src/mame/drivers/realbrk.cpp +++ b/src/mame/drivers/realbrk.cpp @@ -729,14 +729,14 @@ static const gfx_layout layout_16x16x8 = 16*16*8 }; -static GFXDECODE_START( realbrk ) +static GFXDECODE_START( gfx_realbrk ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0, 0x80 ) // [0] Backgrounds GFXDECODE_ENTRY( "gfx2", 0, layout_8x8x4, 0, 0x800 ) // [1] Text GFXDECODE_ENTRY( "gfx3", 0, layout_16x16x8, 0, 0x80 ) // [2] Sprites (256 colors) GFXDECODE_ENTRY( "gfx4", 0, layout_16x16x4, 0, 0x800 ) // [3] Sprites (16 colors) GFXDECODE_END -static GFXDECODE_START( dai2kaku ) +static GFXDECODE_START( gfx_dai2kaku ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0, 0x80 ) // [0] Backgrounds GFXDECODE_ENTRY( "gfx2", 0, layout_8x8x4, 0, 0x800 ) // [1] Text GFXDECODE_ENTRY( "gfx3", 0, layout_16x16x8, 0, 0x80 ) // [2] Sprites (256 colors) @@ -781,7 +781,7 @@ MACHINE_CONFIG_START(realbrk_state::realbrk) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, realbrk_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", realbrk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_realbrk) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -818,7 +818,7 @@ MACHINE_CONFIG_START(realbrk_state::dai2kaku) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(dai2kaku_mem) - MCFG_GFXDECODE_MODIFY("gfxdecode", dai2kaku) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_dai2kaku) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(realbrk_state, screen_update_dai2kaku) MACHINE_CONFIG_END diff --git a/src/mame/drivers/redclash.cpp b/src/mame/drivers/redclash.cpp index 999f8a51117..38ab186ff5c 100644 --- a/src/mame/drivers/redclash.cpp +++ b/src/mame/drivers/redclash.cpp @@ -325,7 +325,7 @@ static const gfx_layout spritelayout16x16bis = 32*32 }; -static GFXDECODE_START( redclash ) +static GFXDECODE_START( gfx_redclash ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx3", 0x0000, spritelayout8x8, 4*8, 16 ) GFXDECODE_ENTRY( "gfx2", 0x0000, spritelayout16x16, 4*8, 16 ) @@ -361,7 +361,7 @@ MACHINE_CONFIG_START(redclash_state::zerohour) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, redclash_state, screen_vblank_redclash)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", redclash) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_redclash) MCFG_PALETTE_ADD("palette", 4*8+4*16+32) MCFG_PALETTE_INDIRECT_ENTRIES(32+32) MCFG_PALETTE_INIT_OWNER(redclash_state,redclash) @@ -388,7 +388,7 @@ MACHINE_CONFIG_START(redclash_state::redclash) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, redclash_state, screen_vblank_redclash)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", redclash) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_redclash) MCFG_PALETTE_ADD("palette", 4*8+4*16+32) MCFG_PALETTE_INDIRECT_ENTRIES(32+32) MCFG_PALETTE_INIT_OWNER(redclash_state,redclash) diff --git a/src/mame/drivers/relief.cpp b/src/mame/drivers/relief.cpp index 2646bdfae38..f2399c26dc0 100644 --- a/src/mame/drivers/relief.cpp +++ b/src/mame/drivers/relief.cpp @@ -256,7 +256,7 @@ static const gfx_layout molayout = }; -static GFXDECODE_START( relief ) +static GFXDECODE_START( gfx_relief ) GFXDECODE_ENTRY( "gfx1", 0, pflayout, 0, 64 ) /* alpha & playfield */ GFXDECODE_ENTRY( "gfx1", 1, molayout, 256, 16 ) /* sprites */ GFXDECODE_END @@ -281,7 +281,7 @@ MACHINE_CONFIG_START(relief_state::relief) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", relief) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_relief) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/renegade.cpp b/src/mame/drivers/renegade.cpp index b7757f46db7..7da3ad6770a 100644 --- a/src/mame/drivers/renegade.cpp +++ b/src/mame/drivers/renegade.cpp @@ -420,7 +420,7 @@ static const gfx_layout tileslayout4 = 64*8 /* offset to next tile */ }; -static GFXDECODE_START( renegade ) +static GFXDECODE_START( gfx_renegade ) /* 8x8 text, 8 colors */ GFXDECODE_ENTRY( "chars", 0x00000, charlayout, 0, 4 ) /* colors 0- 32 */ @@ -487,7 +487,7 @@ MACHINE_CONFIG_START(renegade_state::renegade) MCFG_SCREEN_UPDATE_DRIVER(renegade_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", renegade) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_renegade) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/replicator.cpp b/src/mame/drivers/replicator.cpp index 4b00efce7c1..92abab269c7 100644 --- a/src/mame/drivers/replicator.cpp +++ b/src/mame/drivers/replicator.cpp @@ -602,7 +602,7 @@ static const gfx_layout hd44780_charlayout = 8*8 /* 8 bytes */ }; -static GFXDECODE_START( replicator ) +static GFXDECODE_START( gfx_replicator ) GFXDECODE_ENTRY( "hd44780:cgrom", 0x0000, hd44780_charlayout, 0, 1 ) GFXDECODE_END @@ -632,7 +632,7 @@ MACHINE_CONFIG_START(replicator_state::replicator) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(replicator_state, replicator) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", replicator) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_replicator) MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_HD44780_ADD("hd44780") diff --git a/src/mame/drivers/retofinv.cpp b/src/mame/drivers/retofinv.cpp index c0c390478cb..49cd11d43f8 100644 --- a/src/mame/drivers/retofinv.cpp +++ b/src/mame/drivers/retofinv.cpp @@ -394,7 +394,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( retofinv ) +static GFXDECODE_START( gfx_retofinv ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256*2, 64 ) GFXDECODE_ENTRY( "gfx3", 0, bglayout, 64*16+256*2, 64 ) @@ -451,7 +451,7 @@ MACHINE_CONFIG_START(retofinv_state::retofinv) MCFG_SCREEN_UPDATE_DRIVER(retofinv_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", retofinv) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_retofinv) MCFG_PALETTE_ADD("palette", 256*2+64*16+64*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(retofinv_state, retofinv) diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp index ebf0afee9a5..942db9925b5 100644 --- a/src/mame/drivers/rex6000.cpp +++ b/src/mame/drivers/rex6000.cpp @@ -875,7 +875,7 @@ static const gfx_layout rex6000_graph_charlayout = 8*28 /* every char takes 28 bytes, first 2 bytes are used for the char size */ }; -static GFXDECODE_START( rex6000 ) +static GFXDECODE_START( gfx_rex6000 ) GFXDECODE_ENTRY( "flash0a", 0x0f0000, rex6000_bold_charlayout, 0, 0 ) //normal GFXDECODE_ENTRY( "flash0a", 0x0f2000, rex6000_bold_charlayout, 0, 0 ) //bold GFXDECODE_ENTRY( "flash0a", 0x0f4000, rex6000_tiny_charlayout, 0, 0 ) //tiny @@ -905,7 +905,7 @@ MACHINE_CONFIG_START(rex6000_state::rex6000) MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(rex6000_state, rex6000) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rex6000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rex6000) MCFG_DEVICE_ADD("bank0", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(rex6000_banked_map) diff --git a/src/mame/drivers/rgum.cpp b/src/mame/drivers/rgum.cpp index 1505051e14e..5e7d7895702 100644 --- a/src/mame/drivers/rgum.cpp +++ b/src/mame/drivers/rgum.cpp @@ -236,7 +236,7 @@ static const gfx_layout tiles8x8_layout = 8*8 }; -static GFXDECODE_START( rgum ) +static GFXDECODE_START( gfx_rgum ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_END @@ -265,7 +265,7 @@ MACHINE_CONFIG_START(rgum_state::rgum) MCFG_I8255_IN_PORTB_CB(IOPORT("IN1")) MCFG_I8255_IN_PORTC_CB(IOPORT("IN2")) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rgum) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rgum) MCFG_PALETTE_ADD("palette", 0x100) SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp index b44eecd4d64..f01e3ee78d1 100644 --- a/src/mame/drivers/rmhaihai.cpp +++ b/src/mame/drivers/rmhaihai.cpp @@ -493,11 +493,11 @@ static const gfx_layout charlayout = 16*8 }; -static GFXDECODE_START( rmhaihai ) +static GFXDECODE_START( gfx_rmhaihai ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) GFXDECODE_END -static GFXDECODE_START( themj ) +static GFXDECODE_START( gfx_themj ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_END @@ -521,7 +521,7 @@ MACHINE_CONFIG_START(rmhaihai_state::rmhaihai) MCFG_SCREEN_UPDATE_DRIVER(rmhaihai_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rmhaihai) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rmhaihai) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x100) @@ -544,7 +544,7 @@ MACHINE_CONFIG_START(rmhaisei_state::rmhaisei) /* basic machine hardware */ /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", themj) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_themj) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(0x200) MACHINE_CONFIG_END @@ -561,7 +561,7 @@ MACHINE_CONFIG_START(themj_state::themj) MCFG_DEVICE_REMOVE("nvram") /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", themj) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_themj) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(0x200) MACHINE_CONFIG_END diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp index 444b86c0f9e..1d1f896bb80 100644 --- a/src/mame/drivers/rockrage.cpp +++ b/src/mame/drivers/rockrage.cpp @@ -223,7 +223,7 @@ static const gfx_layout spritelayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( rockrage ) +static GFXDECODE_START( gfx_rockrage ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) /* colors 00..31, using 2 lookup tables */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 512, 16 ) /* colors 32..47, using lookup table */ GFXDECODE_END @@ -279,7 +279,7 @@ MACHINE_CONFIG_START(rockrage_state::rockrage) MCFG_K007420_CALLBACK_OWNER(rockrage_state, rockrage_sprite_callback) MCFG_K007420_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rockrage) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rockrage) MCFG_PALETTE_ADD("palette", 16*16*3) MCFG_PALETTE_INDIRECT_ENTRIES(64) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/rocnrope.cpp b/src/mame/drivers/rocnrope.cpp index 194d2c4b19b..f530306f958 100644 --- a/src/mame/drivers/rocnrope.cpp +++ b/src/mame/drivers/rocnrope.cpp @@ -187,7 +187,7 @@ static const gfx_layout spritelayout = 64*8 /* every sprite takes 64 consecutive bytes */ }; -static GFXDECODE_START( rocnrope ) +static GFXDECODE_START( gfx_rocnrope ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 16*16, 16 ) GFXDECODE_END @@ -232,7 +232,7 @@ MACHINE_CONFIG_START(rocnrope_state::rocnrope) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, rocnrope_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rocnrope) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rocnrope) MCFG_PALETTE_ADD("palette", 16*16+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(rocnrope_state, rocnrope) diff --git a/src/mame/drivers/rohga.cpp b/src/mame/drivers/rohga.cpp index 4a25e5bd69e..840e11ecc85 100644 --- a/src/mame/drivers/rohga.cpp +++ b/src/mame/drivers/rohga.cpp @@ -809,14 +809,14 @@ static const gfx_layout tilelayout = 16*16*2 }; -static GFXDECODE_START( rohga ) +static GFXDECODE_START( gfx_rohga ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) /* Characters 8x8 */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 32 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 512, 32 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "gfx4", 0, spritelayout_6bpp,1024, 16 ) /* Sprites 16x16 */ GFXDECODE_END -static GFXDECODE_START( wizdfire ) +static GFXDECODE_START( gfx_wizdfire ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) /* Gfx chip 1 as 8x8 */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 32 ) /* Gfx chip 1 as 16x16 */ GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 512, 32 ) /* Gfx chip 2 as 16x16 */ @@ -824,7 +824,7 @@ static GFXDECODE_START( wizdfire ) GFXDECODE_ENTRY( "gfx5", 0, spritelayout, 0/*1536*/, 128 ) GFXDECODE_END -static GFXDECODE_START( schmeisr ) +static GFXDECODE_START( gfx_schmeisr ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) /* Characters 8x8 */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 32 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 512, 32 ) /* Tiles 16x16 */ @@ -894,7 +894,7 @@ MACHINE_CONFIG_START(rohga_state::rohga) MCFG_SCREEN_UPDATE_DRIVER(rohga_state, screen_update_rohga) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rohga) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rohga) MCFG_PALETTE_ADD("palette", 2048) MCFG_DECOCOMN_ADD("deco_common") @@ -984,7 +984,7 @@ MACHINE_CONFIG_START(rohga_state::wizdfire) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) MCFG_SCREEN_UPDATE_DRIVER(rohga_state, screen_update_wizdfire) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wizdfire) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wizdfire) MCFG_PALETTE_ADD("palette", 2048) MCFG_DECOCOMN_ADD("deco_common") @@ -1079,7 +1079,7 @@ MACHINE_CONFIG_START(rohga_state::nitrobal) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) MCFG_SCREEN_UPDATE_DRIVER(rohga_state, screen_update_nitrobal) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wizdfire) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wizdfire) MCFG_PALETTE_ADD("palette", 2048) MCFG_DECOCOMN_ADD("deco_common") @@ -1175,7 +1175,7 @@ MACHINE_CONFIG_START(rohga_state::schmeisr) MCFG_SCREEN_UPDATE_DRIVER(rohga_state, screen_update_rohga) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", schmeisr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_schmeisr) MCFG_PALETTE_ADD("palette", 2048) MCFG_DECOCOMN_ADD("deco_common") diff --git a/src/mame/drivers/rollrace.cpp b/src/mame/drivers/rollrace.cpp index e8b6f05298c..74f7d9bab0c 100644 --- a/src/mame/drivers/rollrace.cpp +++ b/src/mame/drivers/rollrace.cpp @@ -226,7 +226,7 @@ static const gfx_layout spritelayout = 32*32 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( rollrace ) +static GFXDECODE_START( gfx_rollrace ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 32 ) /* foreground */ GFXDECODE_ENTRY( "gfx1", 0x0800, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx1", 0x1000, charlayout, 0, 32 ) @@ -278,7 +278,7 @@ MACHINE_CONFIG_START(rollrace_state::rollrace) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, rollrace_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rollrace) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rollrace) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(rollrace_state, rollrace) diff --git a/src/mame/drivers/ron.cpp b/src/mame/drivers/ron.cpp index c13b129b147..c075f087833 100644 --- a/src/mame/drivers/ron.cpp +++ b/src/mame/drivers/ron.cpp @@ -397,7 +397,7 @@ static const gfx_layout charlayout_2bpp = 8*8 }; -static GFXDECODE_START( ron ) +static GFXDECODE_START( gfx_ron ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_1bpp, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout_2bpp, 4, 1 ) GFXDECODE_END @@ -506,7 +506,7 @@ MACHINE_CONFIG_START(ron_state::ron) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ron_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ron) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ron) MCFG_PALETTE_ADD("palette", 8) //MCFG_PALETTE_ADD("palette", 512) diff --git a/src/mame/drivers/rpunch.cpp b/src/mame/drivers/rpunch.cpp index 64a6db837ca..8d70ef8e0db 100644 --- a/src/mame/drivers/rpunch.cpp +++ b/src/mame/drivers/rpunch.cpp @@ -415,7 +415,7 @@ static const gfx_layout splayout = }; -static GFXDECODE_START( rpunch ) +static GFXDECODE_START( gfx_rpunch ) GFXDECODE_ENTRY( "gfx1", 0, bglayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, bglayout, 256, 16 ) GFXDECODE_ENTRY( "sprites", 0, splayout, 0, 16*4 ) @@ -444,7 +444,7 @@ static const gfx_layout bootleg_sprite_layout = 32*32*2, }; -static GFXDECODE_START( svolleybl ) +static GFXDECODE_START( gfx_svolleybl ) GFXDECODE_ENTRY( "gfx1", 0, bootleg_tile_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, bootleg_tile_layout, 256, 16 ) GFXDECODE_ENTRY( "sprites", 0, bootleg_sprite_layout, 0, 16*4 ) @@ -480,7 +480,7 @@ MACHINE_CONFIG_START(rpunch_state::rpunch) MCFG_SCREEN_UPDATE_DRIVER(rpunch_state, screen_update_rpunch) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rpunch) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rpunch) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -531,7 +531,7 @@ MACHINE_CONFIG_START(rpunch_state::svolleybl) MCFG_SCREEN_UPDATE_DRIVER(rpunch_state, screen_update_rpunch) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", svolleybl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_svolleybl) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/rt1715.cpp b/src/mame/drivers/rt1715.cpp index ce570f1c6c4..ae0abfabad7 100644 --- a/src/mame/drivers/rt1715.cpp +++ b/src/mame/drivers/rt1715.cpp @@ -167,7 +167,7 @@ static const gfx_layout rt1715_charlayout = 8 /* every char takes 1 x 16 bytes */ }; -static GFXDECODE_START( rt1715 ) +static GFXDECODE_START( gfx_rt1715 ) GFXDECODE_ENTRY("gfx", 0x0000, rt1715_charlayout, 0, 1) GFXDECODE_ENTRY("gfx", 0x0800, rt1715_charlayout, 0, 1) GFXDECODE_END @@ -303,7 +303,7 @@ MACHINE_CONFIG_START(rt1715_state::rt1715) MCFG_SCREEN_SIZE(78*6, 30*10) MCFG_SCREEN_VISIBLE_AREA(0, 78*6-1, 0, 30*10-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rt1715) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rt1715) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(rt1715_state, rt1715) diff --git a/src/mame/drivers/runaway.cpp b/src/mame/drivers/runaway.cpp index 32b9b3ceb14..09a2551944f 100644 --- a/src/mame/drivers/runaway.cpp +++ b/src/mame/drivers/runaway.cpp @@ -316,13 +316,13 @@ static const gfx_layout qwak_sprite_layout = }; -static GFXDECODE_START( runaway ) +static GFXDECODE_START( gfx_runaway ) GFXDECODE_ENTRY( "gfx1", 0x000, runaway_tile_layout, 0, 1 ) GFXDECODE_ENTRY( "gfx1", 0x800, runaway_sprite_layout, 8, 1 ) GFXDECODE_END -static GFXDECODE_START( qwak ) +static GFXDECODE_START( gfx_qwak ) GFXDECODE_ENTRY( "gfx1", 0x800, qwak_tile_layout, 0, 1 ) GFXDECODE_ENTRY( "gfx1", 0x000, qwak_sprite_layout, 0, 1 ) GFXDECODE_END @@ -345,7 +345,7 @@ MACHINE_CONFIG_START(runaway_state::runaway) MCFG_SCREEN_UPDATE_DRIVER(runaway_state, screen_update_runaway) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", runaway) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_runaway) MCFG_PALETTE_ADD("palette", 16) @@ -375,7 +375,7 @@ MACHINE_CONFIG_START(runaway_state::qwak) /* basic machine hardware */ /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", qwak) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_qwak) MCFG_VIDEO_START_OVERRIDE(runaway_state,qwak) MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/rungun.cpp b/src/mame/drivers/rungun.cpp index 8992556eb65..43fd8c63380 100644 --- a/src/mame/drivers/rungun.cpp +++ b/src/mame/drivers/rungun.cpp @@ -358,7 +358,7 @@ static const gfx_layout bglayout = 128*8 }; -static GFXDECODE_START( rungun ) +static GFXDECODE_START( gfx_rungun ) GFXDECODE_ENTRY( "gfx1", 0, bglayout, 0x0000, 64 ) GFXDECODE_END @@ -404,7 +404,7 @@ MACHINE_CONFIG_START(rungun_state::rng) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // higher if sound stutters - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rungun) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rungun) MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom") diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp index 3ddb1dacc0d..763c9f41886 100644 --- a/src/mame/drivers/rx78.cpp +++ b/src/mame/drivers/rx78.cpp @@ -465,7 +465,7 @@ static const gfx_layout rx78_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( rx78 ) +static GFXDECODE_START( gfx_rx78 ) GFXDECODE_ENTRY( "roms", 0x1a27, rx78_charlayout, 0, 8 ) GFXDECODE_END @@ -490,7 +490,7 @@ MACHINE_CONFIG_START(rx78_state::rx78) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 16+1) //+1 for the background color - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rx78) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rx78) MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "rx78_cart") MCFG_GENERIC_EXTENSIONS("bin,rom") diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp index de6b72af2b1..1c696e35067 100644 --- a/src/mame/drivers/safarir.cpp +++ b/src/mame/drivers/safarir.cpp @@ -147,7 +147,7 @@ static const gfx_layout charlayout = }; -static GFXDECODE_START( safarir ) +static GFXDECODE_START( gfx_safarir ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 8 ) GFXDECODE_END @@ -413,7 +413,7 @@ MACHINE_CONFIG_START(safarir_state::safarir) MCFG_PALETTE_ADD("palette", 2*8) MCFG_PALETTE_INIT_OWNER(safarir_state, safarir) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", safarir) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_safarir) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_SIZE(32*8, 32*8) diff --git a/src/mame/drivers/sandscrp.cpp b/src/mame/drivers/sandscrp.cpp index b478234dae1..4a61962e41c 100644 --- a/src/mame/drivers/sandscrp.cpp +++ b/src/mame/drivers/sandscrp.cpp @@ -452,7 +452,7 @@ static const gfx_layout layout_16x16x4 = }; -static GFXDECODE_START( sandscrp ) +static GFXDECODE_START( gfx_sandscrp ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x4, 0x000, 0x10 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x4_2, 0x400, 0x40 ) // [1] Layers GFXDECODE_END @@ -488,7 +488,7 @@ MACHINE_CONFIG_START(sandscrp_state::sandscrp) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sandscrp_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sandscrp) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sandscrp) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) diff --git a/src/mame/drivers/sanremo.cpp b/src/mame/drivers/sanremo.cpp index abe13589702..fdaf06e836a 100644 --- a/src/mame/drivers/sanremo.cpp +++ b/src/mame/drivers/sanremo.cpp @@ -344,7 +344,7 @@ static const gfx_layout tilelayout = * Graphics Decode Information * **************************************************/ -static GFXDECODE_START( sanremo ) +static GFXDECODE_START( gfx_sanremo ) GFXDECODE_ENTRY( "gfx", 0, tilelayout, 0, 1 ) GFXDECODE_END @@ -380,7 +380,7 @@ MACHINE_CONFIG_START(sanremo_state::sanremo) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sanremo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sanremo) MCFG_PALETTE_ADD("palette", 0x10) MCFG_PALETTE_INIT_OWNER(sanremo_state, sanremo) diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp index 373b2a2bbc8..07a3a76d090 100644 --- a/src/mame/drivers/saturn.cpp +++ b/src/mame/drivers/saturn.cpp @@ -832,7 +832,7 @@ MACHINE_CONFIG_START(sat_console_state::saturn) MCFG_SCREEN_UPDATE_DRIVER(sat_console_state, screen_update_stv_vdp2) MCFG_PALETTE_ADD("palette", 2048+(2048*2))//standard palette + extra memory for rgb brightness. - MCFG_GFXDECODE_ADD("gfxdecode", "palette", stv) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_stv) MCFG_VIDEO_START_OVERRIDE(sat_console_state,stv_vdp2) diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp index d413ea60937..f239cd1f5f5 100644 --- a/src/mame/drivers/sauro.cpp +++ b/src/mame/drivers/sauro.cpp @@ -435,13 +435,13 @@ static const gfx_layout sauro_spritelayout = 16*16 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( sauro ) +static GFXDECODE_START( gfx_sauro ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx3", 0, sauro_spritelayout, 0, 64 ) GFXDECODE_END -static GFXDECODE_START( trckydoc ) +static GFXDECODE_START( gfx_trckydoc ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, trckydoc_spritelayout, 0, 64 ) GFXDECODE_END @@ -489,7 +489,7 @@ MACHINE_CONFIG_START(sauro_state::trckydoc) MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, sauro_state, coin1_w)) MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, sauro_state, coin2_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", trckydoc) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_trckydoc) MCFG_VIDEO_START_OVERRIDE(sauro_state,trckydoc) MCFG_SCREEN_MODIFY("screen") @@ -516,7 +516,7 @@ MACHINE_CONFIG_START(sauro_state::sauro) MCFG_DEVICE_PROGRAM_MAP(sauro_sound_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(sauro_state, irq0_line_hold, 8*60) // ? - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sauro) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sauro) MCFG_VIDEO_START_OVERRIDE(sauro_state,sauro) MCFG_SCREEN_MODIFY("screen") diff --git a/src/mame/drivers/sbasketb.cpp b/src/mame/drivers/sbasketb.cpp index 6f0413d743e..6ee0656f01c 100644 --- a/src/mame/drivers/sbasketb.cpp +++ b/src/mame/drivers/sbasketb.cpp @@ -183,7 +183,7 @@ static const gfx_layout spritelayout = -static GFXDECODE_START( sbasketb ) +static GFXDECODE_START( gfx_sbasketb ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 16*16, 16*16 ) GFXDECODE_END @@ -224,7 +224,7 @@ MACHINE_CONFIG_START(sbasketb_state::sbasketb) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sbasketb_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sbasketb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sbasketb) MCFG_PALETTE_ADD("palette", 16*16+16*16*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(sbasketb_state, sbasketb) diff --git a/src/mame/drivers/sbc6510.cpp b/src/mame/drivers/sbc6510.cpp index f7332004b39..8cad8f9c9de 100644 --- a/src/mame/drivers/sbc6510.cpp +++ b/src/mame/drivers/sbc6510.cpp @@ -268,7 +268,7 @@ static const gfx_layout charset_8x16 = }; -static GFXDECODE_START( sbc6510 ) +static GFXDECODE_START( gfx_sbc6510 ) GFXDECODE_ENTRY( "videocpu", 0x1500, charset_8x16, 0, 128 ) GFXDECODE_END @@ -286,7 +286,7 @@ MACHINE_CONFIG_START(sbc6510_state::sbc6510) MCFG_CPU_AVR8_EEPROM("eeprom") MCFG_PALETTE_ADD_MONOCHROME("palette") // for F4 displayer only - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sbc6510) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sbc6510) /* video hardware */ MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0) diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp index 6ce4d26fd43..d3bc30d264c 100644 --- a/src/mame/drivers/sbowling.cpp +++ b/src/mame/drivers/sbowling.cpp @@ -363,7 +363,7 @@ static const gfx_layout charlayout = 8*8 }; -static GFXDECODE_START( sbowling ) +static GFXDECODE_START( gfx_sbowling ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x18, 1 ) GFXDECODE_END @@ -423,7 +423,7 @@ MACHINE_CONFIG_START(sbowling_state::sbowling) MCFG_SCREEN_UPDATE_DRIVER(sbowling_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sbowling) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sbowling) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_INIT_OWNER(sbowling_state, sbowling) diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp index aacae66adc5..6a83b071342 100644 --- a/src/mame/drivers/sbrkout.cpp +++ b/src/mame/drivers/sbrkout.cpp @@ -543,7 +543,7 @@ static const gfx_layout balllayout = }; -static GFXDECODE_START( sbrkout ) +static GFXDECODE_START( gfx_sbrkout ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, balllayout, 0, 1 ) GFXDECODE_END @@ -577,7 +577,7 @@ MACHINE_CONFIG_START(sbrkout_state::sbrkout) MCFG_WATCHDOG_VBLANK_INIT("screen", 8) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sbrkout) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sbrkout) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 384, 0, 256, 262, 0, 224) diff --git a/src/mame/drivers/sbugger.cpp b/src/mame/drivers/sbugger.cpp index 236d1a386f7..a5135dde331 100644 --- a/src/mame/drivers/sbugger.cpp +++ b/src/mame/drivers/sbugger.cpp @@ -143,7 +143,7 @@ static const gfx_layout char16layout = 16*8 }; -static GFXDECODE_START( sbugger ) +static GFXDECODE_START( gfx_sbugger ) GFXDECODE_ENTRY( "gfx1", 0, char16layout, 0, 256 ) GFXDECODE_END @@ -226,7 +226,7 @@ MACHINE_CONFIG_START(sbugger_state::sbugger) MCFG_I8155_IN_PORTC_CB(IOPORT("DSW2")) MCFG_I8155_OUT_TIMEROUT_CB(INPUTLINE("maincpu", I8085_RST75_LINE)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sbugger) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sbugger) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/scobra.cpp b/src/mame/drivers/scobra.cpp index ee820e10866..2284f8b413c 100644 --- a/src/mame/drivers/scobra.cpp +++ b/src/mame/drivers/scobra.cpp @@ -122,7 +122,7 @@ static const gfx_layout scobra_spritelayout = }; -static GFXDECODE_START( scobra ) +static GFXDECODE_START( gfx_scobra ) GFXDECODE_ENTRY( "gfx1", 0x0000, scobra_charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0x0000, scobra_spritelayout, 0, 8 ) GFXDECODE_END @@ -906,7 +906,7 @@ MACHINE_CONFIG_START(scobra_state::type1) MCFG_SCREEN_UPDATE_DRIVER(scobra_state, screen_update_galaxold) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", scobra) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_scobra) MCFG_PALETTE_ADD("palette", 32+64+2+1) /* 32 for characters, 64 for stars, 2 for bullets, 1 for background */ MCFG_PALETTE_INIT_OWNER(scobra_state,scrambold) @@ -1086,7 +1086,7 @@ MACHINE_CONFIG_START(scobra_state::hustler) MCFG_SCREEN_UPDATE_DRIVER(scobra_state, screen_update_galaxold) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", scobra) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_scobra) MCFG_PALETTE_ADD("palette", 32+64+2) /* 32 for characters, 64 for stars, 2 for bullets */ MCFG_PALETTE_INIT_OWNER(scobra_state,galaxold) diff --git a/src/mame/drivers/scopus.cpp b/src/mame/drivers/scopus.cpp index 0c60c03d096..b2446767f66 100644 --- a/src/mame/drivers/scopus.cpp +++ b/src/mame/drivers/scopus.cpp @@ -84,7 +84,7 @@ const gfx_layout sagitta180_charlayout = 8*16 /* space between characters */ }; -static GFXDECODE_START( sagitta180 ) +static GFXDECODE_START( gfx_sagitta180 ) GFXDECODE_ENTRY( "chargen", 0x0000, sagitta180_charlayout, 0, 1 ) GFXDECODE_END @@ -209,7 +209,7 @@ MACHINE_CONFIG_START(sagitta180_state::sagitta180) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(80*5, 25*8) MCFG_SCREEN_VISIBLE_AREA(0, 80*5-1, 0, 25*8-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sagitta180 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sagitta180 ) MCFG_DEVICE_ADD("crtc", I8275, 12480000 / 8) /* guessed xtal */ MCFG_I8275_CHARACTER_WIDTH(8) diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp index aff88b8b992..be9647505ab 100644 --- a/src/mame/drivers/scorpion.cpp +++ b/src/mame/drivers/scorpion.cpp @@ -275,17 +275,17 @@ static const gfx_layout profi_8_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( scorpion ) +static GFXDECODE_START( gfx_scorpion ) GFXDECODE_ENTRY( "maincpu", 0x17d00, spectrum_charlayout, 0, 8 ) GFXDECODE_END -static GFXDECODE_START( profi ) +static GFXDECODE_START( gfx_profi ) GFXDECODE_ENTRY( "maincpu", 0x17d00, spectrum_charlayout, 0, 8 ) GFXDECODE_ENTRY( "maincpu", 0x1abfc, profi_8_charlayout, 0, 8 ) /* There are more characters after this, that haven't been decoded */ GFXDECODE_END -static GFXDECODE_START( quorum ) +static GFXDECODE_START( gfx_quorum ) GFXDECODE_ENTRY( "maincpu", 0x1fb00, quorum_charlayout, 0, 8 ) GFXDECODE_END @@ -298,7 +298,7 @@ MACHINE_CONFIG_START(scorpion_state::scorpion) MCFG_MACHINE_START_OVERRIDE(scorpion_state, scorpion ) MCFG_MACHINE_RESET_OVERRIDE(scorpion_state, scorpion ) - MCFG_GFXDECODE_MODIFY("gfxdecode", scorpion) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_scorpion) MCFG_BETA_DISK_ADD(BETA_DISK_TAG) @@ -313,12 +313,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(scorpion_state::profi) scorpion(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", profi) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_profi) MACHINE_CONFIG_END MACHINE_CONFIG_START(scorpion_state::quorum) scorpion(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", quorum) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_quorum) MACHINE_CONFIG_END diff --git a/src/mame/drivers/scotrsht.cpp b/src/mame/drivers/scotrsht.cpp index bf4c8919b0a..6b8f76ced5e 100644 --- a/src/mame/drivers/scotrsht.cpp +++ b/src/mame/drivers/scotrsht.cpp @@ -182,7 +182,7 @@ static const gfx_layout spritelayout = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( scotrsht ) +static GFXDECODE_START( gfx_scotrsht ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16*8 ) /* characters */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 16*16*8, 16*8 ) /* sprites */ GFXDECODE_END @@ -209,7 +209,7 @@ MACHINE_CONFIG_START(scotrsht_state::scotrsht) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, scotrsht_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", scotrsht) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_scotrsht) MCFG_PALETTE_ADD("palette", 16*8*16+16*8*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(scotrsht_state, scotrsht) diff --git a/src/mame/drivers/scramble.cpp b/src/mame/drivers/scramble.cpp index 4e57fe854af..62433f71fd8 100644 --- a/src/mame/drivers/scramble.cpp +++ b/src/mame/drivers/scramble.cpp @@ -1274,27 +1274,27 @@ static const gfx_layout ad2083_spritelayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( scramble ) +static GFXDECODE_START( gfx_scramble ) GFXDECODE_ENTRY( "gfx1", 0x0000, scramble_charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0x0000, scramble_spritelayout, 0, 8 ) GFXDECODE_END -static GFXDECODE_START( devilfsh ) +static GFXDECODE_START( gfx_devilfsh ) GFXDECODE_ENTRY( "gfx1", 0x0000, devilfsh_charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0x0800, devilfsh_spritelayout, 0, 8 ) GFXDECODE_END -static GFXDECODE_START( newsin7 ) +static GFXDECODE_START( gfx_newsin7 ) GFXDECODE_ENTRY( "gfx1", 0x0000, newsin7_charlayout, 0, 4 ) GFXDECODE_ENTRY( "gfx1", 0x0800, newsin7_spritelayout, 0, 4 ) GFXDECODE_END -static GFXDECODE_START( mrkougar ) +static GFXDECODE_START( gfx_mrkougar ) GFXDECODE_ENTRY( "gfx1", 0x0000, mrkougar_charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0x0000, mrkougar_spritelayout, 0, 8 ) GFXDECODE_END -static GFXDECODE_START( ad2083 ) +static GFXDECODE_START( gfx_ad2083 ) GFXDECODE_ENTRY( "gfx1", 0x0000, ad2083_charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0x0000, ad2083_spritelayout, 0, 8 ) GFXDECODE_END @@ -1346,7 +1346,7 @@ MACHINE_CONFIG_START(scramble_state::scramble) MCFG_SCREEN_UPDATE_DRIVER(scramble_state, screen_update_galaxold) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", scramble) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_scramble) MCFG_PALETTE_ADD("palette", 32+64+2+1) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */ MCFG_PALETTE_INIT_OWNER(scramble_state,scrambold) @@ -1393,7 +1393,7 @@ MACHINE_CONFIG_START(scramble_state::devilfsh) MCFG_DEVICE_PROGRAM_MAP(mars_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", devilfsh) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_devilfsh) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */ MCFG_PALETTE_INIT_OWNER(scramble_state,galaxold) @@ -1408,7 +1408,7 @@ MACHINE_CONFIG_START(scramble_state::newsin7) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", scramble_state, irq0_line_hold) // newsin7a has a corrupt opcode at 0x67, the irq routine instead of NMI avoids it by jumping to 0x68 after doing some other things, probably intentional. newsin7 has this fixed, maybe a bootleg? /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", newsin7) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_newsin7) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */ MCFG_PALETTE_INIT_OWNER(scramble_state,galaxold) @@ -1437,7 +1437,7 @@ MACHINE_CONFIG_START(scramble_state::mrkougar) mrkougb(config); /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", mrkougar) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_mrkougar) MACHINE_CONFIG_END MACHINE_CONFIG_START(scramble_state::ckongs) @@ -1611,7 +1611,7 @@ MACHINE_CONFIG_START(scramble_state::ad2083) MCFG_SCREEN_UPDATE_DRIVER(scramble_state, screen_update_galaxold) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ad2083) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ad2083) MCFG_PALETTE_ADD("palette", 32+64+2+8) /* 32 for characters, 64 for stars, 2 for bullets, 8 for background */ MCFG_PALETTE_INIT_OWNER(scramble_state,turtles) diff --git a/src/mame/drivers/scregg.cpp b/src/mame/drivers/scregg.cpp index 57651da4563..4b0294cf114 100644 --- a/src/mame/drivers/scregg.cpp +++ b/src/mame/drivers/scregg.cpp @@ -238,7 +238,7 @@ static const gfx_layout spritelayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( scregg ) +static GFXDECODE_START( gfx_scregg ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) /* char set #1 */ GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 1 ) /* sprites */ GFXDECODE_END @@ -280,7 +280,7 @@ MACHINE_CONFIG_START(scregg_state::dommy) MCFG_SCREEN_UPDATE_DRIVER(scregg_state, screen_update_eggs) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", scregg) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_scregg) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(scregg_state,btime) @@ -312,7 +312,7 @@ MACHINE_CONFIG_START(scregg_state::scregg) MCFG_SCREEN_UPDATE_DRIVER(scregg_state, screen_update_eggs) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", scregg) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_scregg) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(scregg_state,btime) diff --git a/src/mame/drivers/scv.cpp b/src/mame/drivers/scv.cpp index 00f5d6cf6df..e854a1d9fb2 100644 --- a/src/mame/drivers/scv.cpp +++ b/src/mame/drivers/scv.cpp @@ -642,7 +642,7 @@ static const gfx_layout scv_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( scv ) +static GFXDECODE_START( gfx_scv ) GFXDECODE_ENTRY( "charrom", 0x0000, scv_charlayout, 0, 8 ) GFXDECODE_END @@ -673,7 +673,7 @@ MACHINE_CONFIG_START(scv_state::scv) MCFG_SCREEN_UPDATE_DRIVER(scv_state, screen_update_scv) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", scv) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_scv) MCFG_PALETTE_ADD( "palette", 16 ) MCFG_PALETTE_INIT_OWNER(scv_state, scv) diff --git a/src/mame/drivers/scyclone.cpp b/src/mame/drivers/scyclone.cpp index 8babf6972da..031bf5747a4 100644 --- a/src/mame/drivers/scyclone.cpp +++ b/src/mame/drivers/scyclone.cpp @@ -563,7 +563,7 @@ static const gfx_layout tiles32x32_layout = 8*32*8 }; -static GFXDECODE_START( scyclone ) +static GFXDECODE_START( gfx_scyclone ) GFXDECODE_ENTRY( "gfx1", 0, tiles32x32_layout, 8, 4 ) GFXDECODE_END @@ -633,7 +633,7 @@ MACHINE_CONFIG_START(scyclone_state::scyclone) MCFG_SCREEN_UPDATE_DRIVER(scyclone_state, screen_update_scyclone) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) // due to hw collisions - MCFG_GFXDECODE_ADD("gfxdecode", "palette", scyclone) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_scyclone) MCFG_PALETTE_ADD("palette", 8 + 4*4) /* sound hardware */ diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp index d07dc36a27e..7cb8d6d5cc3 100644 --- a/src/mame/drivers/sderby.cpp +++ b/src/mame/drivers/sderby.cpp @@ -589,7 +589,7 @@ static const gfx_layout tiles16x16_layout = * Graphics Decode * ****************************/ -static GFXDECODE_START( sderby ) +static GFXDECODE_START( gfx_sderby ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0x000, 256 ) /* sprites */ GFXDECODE_ENTRY( "gfx1", 0, tiles16x16_layout, 0x000, 256 ) /* sprites */ GFXDECODE_END @@ -615,7 +615,7 @@ MACHINE_CONFIG_START(sderby_state::sderby) MCFG_SCREEN_UPDATE_DRIVER(sderby_state, screen_update_sderby) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sderby) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sderby) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) @@ -640,7 +640,7 @@ MACHINE_CONFIG_START(sderby_state::sderbya) MCFG_SCREEN_UPDATE_DRIVER(sderby_state, screen_update_sderby) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sderby) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sderby) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) @@ -665,7 +665,7 @@ MACHINE_CONFIG_START(sderby_state::luckboom) MCFG_SCREEN_UPDATE_DRIVER(sderby_state, screen_update_sderby) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sderby) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sderby) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) @@ -690,7 +690,7 @@ MACHINE_CONFIG_START(sderby_state::spacewin) MCFG_SCREEN_UPDATE_DRIVER(sderby_state, screen_update_pmroulet) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sderby) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sderby) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) @@ -715,7 +715,7 @@ MACHINE_CONFIG_START(sderby_state::shinygld) MCFG_SCREEN_UPDATE_DRIVER(sderby_state, screen_update_sderby) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sderby) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sderby) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) @@ -740,7 +740,7 @@ MACHINE_CONFIG_START(sderby_state::pmroulet) MCFG_SCREEN_UPDATE_DRIVER(sderby_state, screen_update_pmroulet) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sderby) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sderby) MCFG_PALETTE_ADD("palette", 0x1000) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) diff --git a/src/mame/drivers/sderby2.cpp b/src/mame/drivers/sderby2.cpp index 1c5b3ffe083..ac54e2f6b63 100644 --- a/src/mame/drivers/sderby2.cpp +++ b/src/mame/drivers/sderby2.cpp @@ -271,7 +271,7 @@ static const gfx_layout charlayout = 8*8 }; -static GFXDECODE_START( sderby2 ) +static GFXDECODE_START( gfx_sderby2 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1024 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 1024 ) GFXDECODE_END @@ -316,7 +316,7 @@ MACHINE_CONFIG_START(sderby2_state::sderby2) MCFG_PALETTE_ADD("palette", 256+256*3) MCFG_PALETTE_INIT_OWNER(sderby2_state,sderby2) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sderby2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sderby2) // sound hardware MACHINE_CONFIG_END diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp index 179deac5fe7..d36f801a8ab 100644 --- a/src/mame/drivers/seabattl.cpp +++ b/src/mame/drivers/seabattl.cpp @@ -466,7 +466,7 @@ static const gfx_layout tiles8x8_layout = 8*8 }; -static GFXDECODE_START( seabattl ) +static GFXDECODE_START( gfx_seabattl ) GFXDECODE_ENTRY( "gfx1", 0, tiles32x16x3_layout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout, 8, 8 ) GFXDECODE_ENTRY( "gfx3", 0, tiles8x8_layout, 24, 1 ) @@ -508,7 +508,7 @@ MACHINE_CONFIG_START(seabattl_state::seabattl) MCFG_SCREEN_UPDATE_DRIVER(seabattl_state, screen_update_seabattl) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", seabattl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_seabattl) MCFG_PALETTE_ADD("palette", 26) MCFG_PALETTE_INIT_OWNER(seabattl_state, seabattl) diff --git a/src/mame/drivers/sealy.cpp b/src/mame/drivers/sealy.cpp index 84dc884b54d..0ca328c0136 100644 --- a/src/mame/drivers/sealy.cpp +++ b/src/mame/drivers/sealy.cpp @@ -92,7 +92,7 @@ static const gfx_layout gfxlayout_8x8x16 = }; -static GFXDECODE_START( sealy ) +static GFXDECODE_START( gfx_sealy ) GFXDECODE_ENTRY( "gfx1", 0, gfxlayout_8x8x16, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, gfxlayout_8x8x16, 0, 1 ) GFXDECODE_END @@ -112,7 +112,7 @@ MACHINE_CONFIG_START(sealy_state::sealy) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) MCFG_SCREEN_UPDATE_DRIVER(sealy_state, screen_update_sealy) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sealy) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sealy) MCFG_PALETTE_ADD("palette", 32768) MCFG_PALETTE_INIT_OWNER(sealy_state, sealy) diff --git a/src/mame/drivers/segag80r.cpp b/src/mame/drivers/segag80r.cpp index 7b7a4e334dc..be37f361ced 100644 --- a/src/mame/drivers/segag80r.cpp +++ b/src/mame/drivers/segag80r.cpp @@ -814,18 +814,18 @@ static const gfx_layout charlayout = }; -static GFXDECODE_START( segag80r ) +static GFXDECODE_START( gfx_segag80r ) GFXDECODE_ENTRY( nullptr, 0x0000, charlayout, 0, 16 ) GFXDECODE_END -static GFXDECODE_START( spaceod ) +static GFXDECODE_START( gfx_spaceod ) GFXDECODE_ENTRY( nullptr, 0x0000, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0x0000, gfx_8x8x6_planar, 64, 1 ) GFXDECODE_END -static GFXDECODE_START( monsterb ) +static GFXDECODE_START( gfx_monsterb ) GFXDECODE_ENTRY( nullptr, 0x0000, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0x0000, gfx_8x8x2_planar, 64, 16 ) GFXDECODE_END @@ -848,7 +848,7 @@ MACHINE_CONFIG_START(segag80r_state::g80r_base) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(segag80r_state, segag80r_irq_ack) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", segag80r) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_segag80r) MCFG_PALETTE_ADD("palette", 64) MCFG_SCREEN_ADD("screen", RASTER) @@ -893,7 +893,7 @@ MACHINE_CONFIG_START(segag80r_state::spaceod) /* background board changes */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) - MCFG_GFXDECODE_MODIFY("gfxdecode", spaceod) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_spaceod) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(64+64) @@ -911,7 +911,7 @@ MACHINE_CONFIG_START(segag80r_state::monsterb) MCFG_DEVICE_IO_MAP(main_ppi8255_portmap) /* background board changes */ - MCFG_GFXDECODE_MODIFY("gfxdecode", monsterb) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_monsterb) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(64+64) @@ -936,7 +936,7 @@ MACHINE_CONFIG_START(segag80r_state::pignewt) /* basic machine hardware */ /* background board changes */ - MCFG_GFXDECODE_MODIFY("gfxdecode", monsterb) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_monsterb) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(64+64) @@ -961,7 +961,7 @@ MACHINE_CONFIG_START(segag80r_state::sindbadm) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, segag80r_state, sindbadm_misc_w)) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", monsterb) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_monsterb) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(64+64) diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp index aa8efba61c4..ccf5a7c8932 100644 --- a/src/mame/drivers/segahang.cpp +++ b/src/mame/drivers/segahang.cpp @@ -747,7 +747,7 @@ INPUT_PORTS_END // GRAPHICS DECODING //************************************************************************** -static GFXDECODE_START( segahang ) +static GFXDECODE_START( gfx_segahang ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x3_planar, 0, 1024 ) GFXDECODE_END @@ -783,7 +783,7 @@ MACHINE_CONFIG_START(segahang_state::shared_base) MCFG_SEGAIC16_ROAD_ADD("segaic16road") // video hardware - MCFG_GFXDECODE_ADD("gfxdecode", "palette", segahang) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_segahang) MCFG_PALETTE_ADD("palette", 2048*3) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/segald.cpp b/src/mame/drivers/segald.cpp index 0bfd670ee41..2ed018576e2 100644 --- a/src/mame/drivers/segald.cpp +++ b/src/mame/drivers/segald.cpp @@ -29,16 +29,17 @@ Todo: class segald_state : public driver_device { public: - segald_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_laserdisc(*this, "laserdisc") , + segald_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_laserdisc(*this, "laserdisc"), m_obj_ram(*this, "obj_ram"), m_out_ram(*this, "out_ram"), m_color_ram(*this, "color_ram"), m_fix_ram(*this, "fix_ram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } uint8_t m_nmi_enable; @@ -360,7 +361,7 @@ static INPUT_PORTS_START( astron ) PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* SW15 = nonJAMMA pin W = unused? */ INPUT_PORTS_END -static GFXDECODE_START( segald ) +static GFXDECODE_START( gfx_segald ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x1, 0, 1 ) /* CHARACTERS */ /* SPRITES are apparently non-uniform in width - not straightforward to decode */ GFXDECODE_END @@ -388,7 +389,7 @@ MACHINE_CONFIG_START(segald_state::astron) /* video hardware */ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", segald) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_segald) MCFG_PALETTE_ADD("palette", 256) /* sound hardare */ diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp index 895b3912440..6bbaf7a90b4 100644 --- a/src/mame/drivers/segaorun.cpp +++ b/src/mame/drivers/segaorun.cpp @@ -1134,7 +1134,7 @@ INPUT_PORTS_END // GRAPHICS DEFINITIONS //************************************************************************** -static GFXDECODE_START( segaorun ) +static GFXDECODE_START( gfx_segaorun ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x3_planar, 0, 1024 ) GFXDECODE_END @@ -1175,7 +1175,7 @@ MACHINE_CONFIG_START(segaorun_state::outrun_base) MCFG_SEGA_315_5195_PBF_CALLBACK(INPUTLINE("soundcpu", INPUT_LINE_NMI)) // video hardware - MCFG_GFXDECODE_ADD("gfxdecode", "palette", segaorun) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_segaorun) MCFG_PALETTE_ADD("palette", 4096*3) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp index 2bba23ff1bf..801fcb80b0e 100644 --- a/src/mame/drivers/segas16a.cpp +++ b/src/mame/drivers/segas16a.cpp @@ -1952,7 +1952,7 @@ INPUT_PORTS_END // GRAPHICS DECODING //************************************************************************** -static GFXDECODE_START( segas16a ) +static GFXDECODE_START( gfx_segas16a ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x3_planar, 0, 1024 ) GFXDECODE_END @@ -2004,7 +2004,7 @@ MACHINE_CONFIG_START(segas16a_state::system16a) MCFG_SEGAIC16VID_ADD("segaic16vid") MCFG_SEGAIC16VID_GFXDECODE("gfxdecode") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", segas16a) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_segas16a) MCFG_PALETTE_ADD("palette", 2048*3) // sound hardware diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index 790f86a20ec..6c4a88a3ff3 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -3703,11 +3703,11 @@ INPUT_PORTS_END // GRAPHICS DECODING //************************************************************************** -static GFXDECODE_START( segas16b ) +static GFXDECODE_START( gfx_segas16b ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x3_planar, 0, 1024 ) GFXDECODE_END -static GFXDECODE_START( lockonph ) +static GFXDECODE_START( gfx_lockonph ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_planar, 0, 1024 ) GFXDECODE_END @@ -3734,7 +3734,7 @@ MACHINE_CONFIG_START(segas16b_state::system16b) MCFG_SEGA_315_5195_PBF_CALLBACK(INPUTLINE("soundcpu", 0)) // video hardware - MCFG_GFXDECODE_ADD("gfxdecode", "palette", segas16b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_segas16b) MCFG_PALETTE_ADD("palette", 2048*3) MCFG_SCREEN_ADD("screen", RASTER) @@ -3930,7 +3930,7 @@ MACHINE_CONFIG_START(segas16b_state::lockonph) MCFG_NVRAM_ADD_0FILL("nvram") // video hardware - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lockonph) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lockonph) MCFG_PALETTE_ADD("palette", 0x2000*4) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp index 2bb91c982f6..422f24cf847 100644 --- a/src/mame/drivers/segas18.cpp +++ b/src/mame/drivers/segas18.cpp @@ -1282,7 +1282,7 @@ static const gfx_layout charlayout = }; -static GFXDECODE_START( segas18 ) +static GFXDECODE_START( gfx_segas18 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1024 ) GFXDECODE_END @@ -1356,7 +1356,7 @@ MACHINE_CONFIG_START(segas18_state::system18) MCFG_SCREEN_UPDATE_DRIVER(segas18_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", segas18) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_segas18) MCFG_PALETTE_ADD("palette", 2048*3+2048 + 64*3) MCFG_SEGA_SYS16B_SPRITES_ADD("sprites") diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp index a144c044d64..7bae5b81b88 100644 --- a/src/mame/drivers/segas32.cpp +++ b/src/mame/drivers/segas32.cpp @@ -2184,7 +2184,7 @@ static const gfx_layout bgcharlayout = }; -static GFXDECODE_START( segas32 ) +static GFXDECODE_START( gfx_segas32 ) GFXDECODE_ENTRY( "gfx1", 0, bgcharlayout, 0x00, 0x3ff ) GFXDECODE_END @@ -2231,7 +2231,7 @@ MACHINE_CONFIG_START(segas32_state::device_add_mconfig) MCFG_TIMER_DRIVER_ADD("v60_irq1", segas32_state, signal_v60_irq_callback) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", segas32) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_segas32) MCFG_PALETTE_ADD("palette", 0x4000) MCFG_SCREEN_ADD("screen", RASTER) @@ -2553,7 +2553,7 @@ MACHINE_CONFIG_START(sega_multi32_state::device_add_mconfig) MCFG_TIMER_DRIVER_ADD("v60_irq1", segas32_state, signal_v60_irq_callback) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", segas32) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_segas32) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_DEFAULT_LAYOUT(layout_dualhsxs) diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index d01e203570c..1c243ca9a26 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -1691,7 +1691,7 @@ INPUT_PORTS_END // GRAPHICS DEFINITIONS //************************************************************************** -static GFXDECODE_START( segaxbd ) +static GFXDECODE_START( gfx_segaxbd ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x3_planar, 0, 1024 ) GFXDECODE_END @@ -1744,7 +1744,7 @@ MACHINE_CONFIG_START(segaxbd_state::xboard_base_mconfig ) MCFG_CXD1095_IN_PORTD_CB(IOPORT("IO1PORTD")) // video hardware - MCFG_GFXDECODE_ADD("gfxdecode", "palette", segaxbd) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_segaxbd) MCFG_PALETTE_ADD("palette", 8192*3) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp index 5407e35ff58..0329667c1ff 100644 --- a/src/mame/drivers/segaybd.cpp +++ b/src/mame/drivers/segaybd.cpp @@ -1324,7 +1324,7 @@ MACHINE_CONFIG_START(segaybd_state::yboard) MCFG_SCREEN_UPDATE_DRIVER(segaybd_state,screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) MCFG_SEGA_SYS16B_SPRITES_ADD("bsprites") MCFG_SEGA_YBOARD_SPRITES_ADD("ysprites") diff --git a/src/mame/drivers/seibucats.cpp b/src/mame/drivers/seibucats.cpp index 5c0c6448d1f..282b7545ce6 100644 --- a/src/mame/drivers/seibucats.cpp +++ b/src/mame/drivers/seibucats.cpp @@ -265,7 +265,7 @@ static const gfx_layout sys386f_spritelayout = }; -static GFXDECODE_START( seibucats ) +static GFXDECODE_START( gfx_seibucats ) GFXDECODE_ENTRY( "gfx1", 0, sys386f_spritelayout, 5632, 16 ) // Not used, legacy charlayout GFXDECODE_ENTRY( "gfx2", 0, sys386f_spritelayout, 4096, 24 ) // Not used, legacy tilelayout GFXDECODE_ENTRY( "gfx3", 0, sys386f_spritelayout, 0, 96 ) @@ -315,7 +315,7 @@ MACHINE_CONFIG_START(seibucats_state::seibucats) MCFG_SCREEN_UPDATE_DRIVER(seibuspi_state, screen_update_sys386f) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, SPI_HTOTAL, SPI_HBEND, SPI_HBSTART, SPI_VTOTAL, SPI_VBEND, SPI_VBSTART) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", seibucats) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_seibucats) MCFG_PALETTE_ADD_INIT_BLACK("palette", 8192) // MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp index 8aa86de4210..aa04e9014b4 100644 --- a/src/mame/drivers/seibuspi.cpp +++ b/src/mame/drivers/seibuspi.cpp @@ -1756,7 +1756,7 @@ static const gfx_layout spi_spritelayout5 = }; #endif -static GFXDECODE_START( spi ) +static GFXDECODE_START( gfx_spi ) GFXDECODE_ENTRY( "gfx1", 0, spi_charlayout, 5632, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spi_tilelayout, 4096, 24 ) GFXDECODE_ENTRY( "gfx3", 0, spi_spritelayout, 0, 96 ) @@ -1801,7 +1801,7 @@ static const gfx_layout sys386f_spritelayout = 16*32 }; -static GFXDECODE_START( sys386f ) +static GFXDECODE_START( gfx_sys386f ) GFXDECODE_ENTRY( "gfx1", 0, spi_charlayout, 5632, 16 ) // Not used GFXDECODE_ENTRY( "gfx2", 0, spi_tilelayout, 4096, 24 ) // Not used GFXDECODE_ENTRY( "gfx3", 0, sys386f_spritelayout, 0, 96 ) @@ -1888,7 +1888,7 @@ MACHINE_CONFIG_START(seibuspi_state::spi) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, SPI_HTOTAL, SPI_HBEND, SPI_HBSTART, SPI_VTOTAL, SPI_VBEND, SPI_VBSTART) MCFG_SCREEN_UPDATE_DRIVER(seibuspi_state, screen_update_spi) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", spi) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spi) MCFG_PALETTE_ADD_INIT_BLACK("palette", 6144) @@ -2014,7 +2014,7 @@ MACHINE_CONFIG_START(seibuspi_state::sys386i) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, SPI_HTOTAL, SPI_HBEND, SPI_HBSTART, SPI_VTOTAL, SPI_VBEND, SPI_VBSTART) MCFG_SCREEN_UPDATE_DRIVER(seibuspi_state, screen_update_spi) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", spi) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spi) MCFG_PALETTE_ADD_INIT_BLACK("palette", 6144) @@ -2073,7 +2073,7 @@ MACHINE_CONFIG_START(seibuspi_state::sys386f) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(seibuspi_state, screen_update_sys386f) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sys386f) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sys386f) MCFG_PALETTE_ADD_INIT_BLACK("palette", 8192) diff --git a/src/mame/drivers/seicross.cpp b/src/mame/drivers/seicross.cpp index 83c9d0b37a4..d7fbb93b285 100644 --- a/src/mame/drivers/seicross.cpp +++ b/src/mame/drivers/seicross.cpp @@ -381,7 +381,7 @@ static const gfx_layout spritelayout = -static GFXDECODE_START( seicross ) +static GFXDECODE_START( gfx_seicross ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 16 ) GFXDECODE_END @@ -420,7 +420,7 @@ MACHINE_CONFIG_START(seicross_state::no_nvram) MCFG_SCREEN_UPDATE_DRIVER(seicross_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", seicross) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_seicross) MCFG_PALETTE_ADD("palette", 64) MCFG_PALETTE_INIT_OWNER(seicross_state, seicross) diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp index 99e88e725cc..84faf648ba9 100644 --- a/src/mame/drivers/seicupbl.cpp +++ b/src/mame/drivers/seicupbl.cpp @@ -30,19 +30,19 @@ class seicupbl_state : public driver_device { public: seicupbl_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"), - m_back_data(*this, "back_data"), - m_fore_data(*this, "fore_data"), - m_mid_data(*this, "mid_data"), - m_textram(*this, "textram"), - m_spriteram(*this, "spriteram"), - m_vregs(*this, "vregs"), - m_oki(*this, "oki"), - m_soundlatch(*this, "soundlatch"), - m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_audiocpu(*this, "audiocpu") + , m_back_data(*this, "back_data") + , m_fore_data(*this, "fore_data") + , m_mid_data(*this, "mid_data") + , m_textram(*this, "textram") + , m_spriteram(*this, "spriteram") + , m_vregs(*this, "vregs") + , m_oki(*this, "oki") + , m_soundlatch(*this, "soundlatch") + , m_gfxdecode(*this, "gfxdecode") + , m_palette(*this, "palette") { } // devices @@ -539,7 +539,7 @@ static const gfx_layout cupsocsb_tilelayout = }; -static GFXDECODE_START( seicupbl_csb ) +static GFXDECODE_START( gfx_seicupbl_csb ) GFXDECODE_ENTRY( "char", 0, cupsocsb_8x8_tilelayout, 48*16, 16 ) GFXDECODE_ENTRY( "gfx3", 0, cupsocsb_tilelayout, 0*16, 32 ) GFXDECODE_ENTRY( "gfx4", 0, cupsocsb_tilelayout, 32*16, 16 ) /* unused */ @@ -577,7 +577,7 @@ MACHINE_CONFIG_START(seicupbl_state::cupsocbl) //MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, seicupbl_state, tile_scroll_w)) //MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, seicupbl_state, tile_vreg_1a_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", seicupbl_csb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_seicupbl_csb) MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp index f1bba9483df..1007f7f3049 100644 --- a/src/mame/drivers/sengokmj.cpp +++ b/src/mame/drivers/sengokmj.cpp @@ -547,7 +547,7 @@ static const gfx_layout charlayout = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( sengokmj ) +static GFXDECODE_START( gfx_sengokmj ) GFXDECODE_ENTRY( "spr_gfx",0, tilelayout, 0x000, 0x40 ) /* Sprites */ GFXDECODE_ENTRY( "bg_gfx", 0, tilelayout, 0x400, 0x10 ) /* Tiles */ GFXDECODE_ENTRY( "md_gfx", 0, tilelayout, 0x500, 0x10 ) /* Tiles */ @@ -598,7 +598,7 @@ MACHINE_CONFIG_START(sengokmj_state::sengokmj) MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, sengokmj_state, layer_en_w)) MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, sengokmj_state, layer_scroll_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sengokmj) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sengokmj) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp index b9e6d493bdf..923709d13e3 100644 --- a/src/mame/drivers/senjyo.cpp +++ b/src/mame/drivers/senjyo.cpp @@ -537,7 +537,7 @@ static const gfx_layout spritelayout2 = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( senjyo ) +static GFXDECODE_START( gfx_senjyo ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) /* 0- 63 characters */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 64, 8 ) /* 64-127 background #1 */ GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 128, 8 ) /* 128-191 background #2 */ @@ -577,7 +577,7 @@ MACHINE_CONFIG_START(senjyo_state::senjyo) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(senjyo_state, screen_update) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", senjyo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_senjyo) MCFG_PALETTE_ADD_INIT_BLACK("palette", 512) MCFG_PALETTE_FORMAT_CLASS(1, senjyo_state, IIBBGGRR) diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index b3da8e9d05c..06a360aa8cb 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -1386,6 +1386,7 @@ Note: on screen copyright is (c)1998 Coinmaster. #include "sound/okim6295.h" #include "sound/ym2151.h" +#include "diserial.h" #include "screen.h" #include "speaker.h" @@ -7538,7 +7539,7 @@ static const gfx_layout layout_packed_6bits_2roms = Blandia ***************************************************************************/ -static GFXDECODE_START( blandia ) +static GFXDECODE_START( gfx_blandia ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes_2roms, 0, 32 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_packed_6bits_3roms, 16*32+64*32*1, 32 ) // [1] Layer 1 GFXDECODE_ENTRY( "gfx3", 0, layout_packed_6bits_3roms, 16*32+64*32*0, 32 ) // [2] Layer 2 @@ -7550,7 +7551,7 @@ GFXDECODE_END DownTown ***************************************************************************/ -static GFXDECODE_START( downtown ) +static GFXDECODE_START( gfx_downtown ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes_2roms, 512*0, 32 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_planes_2roms_split, 512*0, 32 ) // [1] Layer 1 GFXDECODE_END @@ -7559,7 +7560,7 @@ GFXDECODE_END The Roulette ***************************************************************************/ -static GFXDECODE_START( setaroul ) +static GFXDECODE_START( gfx_setaroul ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes_2roms, 0x100, 16 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_8bpp, 512*0, 32 ) // [1] Layer 1 GFXDECODE_END @@ -7568,7 +7569,7 @@ GFXDECODE_END J.J.Squawkers ***************************************************************************/ -static GFXDECODE_START( jjsquawk ) +static GFXDECODE_START( gfx_jjsquawk ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes_2roms, 0, 32 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_packed_6bits_2roms, 16*32+64*32*0, 32 ) // [1] Layer 1 GFXDECODE_ENTRY( "gfx3", 0, layout_packed_6bits_2roms, 16*32+64*32*1, 32 ) // [2] Layer 2 @@ -7580,7 +7581,7 @@ GFXDECODE_END Mobile Suit Gundam ***************************************************************************/ -static GFXDECODE_START( msgundam ) +static GFXDECODE_START( gfx_msgundam ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes_2roms, 512*0, 32 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_packed, 512*2, 32 ) // [1] Layer 1 GFXDECODE_ENTRY( "gfx3", 0, layout_packed, 512*1, 32 ) // [2] Layer 2 @@ -7590,7 +7591,7 @@ GFXDECODE_END Daioh (prototype) ***************************************************************************/ -static GFXDECODE_START( daiohp ) +static GFXDECODE_START( gfx_daiohp ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes, 512*0, 32 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_planes_2roms_split, 512*2, 32 ) // [1] Layer 1 GFXDECODE_ENTRY( "gfx3", 0, layout_planes_2roms_split, 512*1, 32 ) // [2] Layer 2 @@ -7600,7 +7601,7 @@ GFXDECODE_END Quiz Kokology 2 ***************************************************************************/ -static GFXDECODE_START( qzkklgy2 ) +static GFXDECODE_START( gfx_qzkklgy2 ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes_2roms, 512*0, 32 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_packed, 512*0, 32 ) // [1] Layer 1 GFXDECODE_END @@ -7609,13 +7610,13 @@ GFXDECODE_END Thundercade ***************************************************************************/ -static GFXDECODE_START( tndrcade ) +static GFXDECODE_START( gfx_tndrcade ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes_2roms, 512*0, 32 ) // [0] Sprites GFXDECODE_END // TODO: pairlove sets up two identical palette banks at 0-1ff and 0x200-0x3ff in-game, 0x200-0x3ff only in service mode. // Maybe there's a color offset register to somewhere? -static GFXDECODE_START( pairlove ) +static GFXDECODE_START( gfx_pairlove ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes_2roms, 512*1, 32 ) // [0] Sprites GFXDECODE_END @@ -7623,7 +7624,7 @@ GFXDECODE_END Orbs ***************************************************************************/ -static GFXDECODE_START( orbs ) +static GFXDECODE_START( gfx_orbs ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes, 512*0, 32 ) // [0] Sprites GFXDECODE_END @@ -7651,7 +7652,7 @@ static const gfx_layout wiggie_layout = }; -static GFXDECODE_START( wiggie ) +static GFXDECODE_START( gfx_wiggie ) GFXDECODE_ENTRY( "gfx1", 0, wiggie_layout, 0x0, 32 ) /* bg tiles */ GFXDECODE_END @@ -7671,7 +7672,7 @@ static const gfx_layout superbar_layout = }; -static GFXDECODE_START( superbar ) +static GFXDECODE_START( gfx_superbar ) GFXDECODE_ENTRY( "gfx1", 0, superbar_layout, 0x0, 32 ) /* bg tiles */ GFXDECODE_END @@ -7679,7 +7680,7 @@ GFXDECODE_END U.S. Classic ***************************************************************************/ -static GFXDECODE_START( usclssic ) +static GFXDECODE_START( gfx_usclssic ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes_2roms, 0, 32 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_packed_6bits_3roms, 512+64*32*0, 32 ) // [1] Layer 1 GFXDECODE_ENTRY( "gfx2", 0, layout_packed_6bits_3roms, 512+64*32*1, 32 ) // [2] Layer 1 @@ -7690,7 +7691,7 @@ GFXDECODE_END Zing Zing Zip ***************************************************************************/ -static GFXDECODE_START( zingzip ) +static GFXDECODE_START( gfx_zingzip ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes_2roms, 16*32*0, 32 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_packed_6bits_2roms, 16*32*2, 32 ) // [1] Layer 1 GFXDECODE_ENTRY( "gfx3", 0, layout_packed, 16*32*1, 32 ) // [2] Layer 2 @@ -7726,7 +7727,7 @@ static const gfx_layout layout_zzbl_6bpp = -static GFXDECODE_START( zingzipbl ) +static GFXDECODE_START( gfx_zingzipbl ) GFXDECODE_ENTRY( "gfx1", 0, layout_zzbl, 16*32*0, 32 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_zzbl_6bpp, 16*32*2, 32 ) // [1] Layer 1 GFXDECODE_ENTRY( "gfx3", 0, layout_zzbl, 16*32*1, 32 ) // [2] Layer 2 @@ -7738,7 +7739,7 @@ GFXDECODE_END Crazy Fight ***************************************************************************/ -static GFXDECODE_START( crazyfgt ) +static GFXDECODE_START( gfx_crazyfgt ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes, 0, 32 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_packed_6bits_3roms, 16*32+64*32*1, 32 ) // [1] Layer 1 GFXDECODE_ENTRY( "gfx3", 0, layout_packed_6bits_3roms, 16*32+64*32*0, 32 ) // [2] Layer 2 @@ -7750,7 +7751,7 @@ GFXDECODE_END Jockey Club ***************************************************************************/ -static GFXDECODE_START( jockeyc ) +static GFXDECODE_START( gfx_jockeyc ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes, 0, 32 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_planes_2roms_split, 16*32*0, 32 ) // [1] Layer 1 GFXDECODE_END @@ -7835,7 +7836,7 @@ MACHINE_CONFIG_START(seta_state::tndrcade) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tndrcade) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) @@ -7890,7 +7891,7 @@ MACHINE_CONFIG_START(seta_state::twineagl) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", downtown) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_downtown) MCFG_PALETTE_ADD("palette", 512) MCFG_VIDEO_START_OVERRIDE(seta_state,twineagl_1_layer) @@ -7936,7 +7937,7 @@ MACHINE_CONFIG_START(seta_state::downtown) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", downtown) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_downtown) MCFG_PALETTE_ADD("palette", 512) MCFG_VIDEO_START_OVERRIDE(seta_state,seta_1_layer) @@ -8017,7 +8018,7 @@ MACHINE_CONFIG_START(seta_state::usclssic) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_usclssic) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", usclssic) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_usclssic) MCFG_PALETTE_ADD("palette", 16*32 + 64*32*2) /* sprites, layer */ MCFG_PALETTE_INDIRECT_ENTRIES(0x400) @@ -8078,7 +8079,7 @@ MACHINE_CONFIG_START(seta_state::calibr50) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", downtown) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_downtown) MCFG_PALETTE_ADD("palette", 512) MCFG_VIDEO_START_OVERRIDE(seta_state,seta_1_layer) @@ -8128,7 +8129,7 @@ MACHINE_CONFIG_START(seta_state::metafox) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", downtown) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_downtown) MCFG_PALETTE_ADD("palette", 512) MCFG_VIDEO_START_OVERRIDE(seta_state,seta_1_layer) @@ -8168,7 +8169,7 @@ MACHINE_CONFIG_START(seta_state::atehate) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tndrcade) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) @@ -8213,7 +8214,7 @@ MACHINE_CONFIG_START(seta_state::blandia) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta_state, screen_vblank_seta_buffer_sprites)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", blandia) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_blandia) MCFG_PALETTE_ADD("palette", (16*32+64*32*4)*2) /* sprites, layer1, layer2, palette effect */ MCFG_PALETTE_INDIRECT_ENTRIES(0x600*2) @@ -8250,7 +8251,7 @@ MACHINE_CONFIG_START(seta_state::blandiap) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta_state, screen_vblank_seta_buffer_sprites)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", blandia) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_blandia) MCFG_PALETTE_ADD("palette", (16*32+64*32*4)*2) /* sprites, layer1, layer2, palette effect */ MCFG_PALETTE_INDIRECT_ENTRIES(0x600*2) @@ -8290,7 +8291,7 @@ MACHINE_CONFIG_START(seta_state::blockcar) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tndrcade) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) @@ -8364,7 +8365,7 @@ MACHINE_CONFIG_START(seta_state::daioh) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", msgundam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer1, layer2 */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) @@ -8401,7 +8402,7 @@ MACHINE_CONFIG_START(seta_state::daiohp) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", daiohp) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_daiohp) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer1, layer2 */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) @@ -8444,7 +8445,7 @@ MACHINE_CONFIG_START(seta_state::drgnunit) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta_state, screen_vblank_seta_buffer_sprites)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", downtown) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_downtown) MCFG_PALETTE_ADD("palette", 512) MCFG_VIDEO_START_OVERRIDE(seta_state,seta_1_layer) @@ -8480,7 +8481,7 @@ MACHINE_CONFIG_START(seta_state::qzkklgy2) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta_state, screen_vblank_seta_buffer_sprites)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", qzkklgy2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_qzkklgy2) MCFG_PALETTE_ADD("palette", 512) MCFG_VIDEO_START_OVERRIDE(seta_state,seta_1_layer) @@ -8542,7 +8543,7 @@ MACHINE_CONFIG_START(setaroul_state::setaroul) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, setaroul_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", setaroul) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_setaroul) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(setaroul_state,setaroul) @@ -8586,7 +8587,7 @@ MACHINE_CONFIG_START(seta_state::eightfrc) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", msgundam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer1, layer2 */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) @@ -8629,7 +8630,7 @@ MACHINE_CONFIG_START(seta_state::extdwnhl) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", zingzip) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_zingzip) MCFG_PALETTE_ADD("palette", 16*32+16*32+64*32*2) /* sprites, layer2, layer1 */ MCFG_PALETTE_INDIRECT_ENTRIES(0x600) @@ -8697,7 +8698,7 @@ MACHINE_CONFIG_START(seta_state::gundhara) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jjsquawk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jjsquawk) MCFG_PALETTE_ADD("palette", 16*32+64*32*4) /* sprites, layer2, layer1 */ MCFG_PALETTE_INDIRECT_ENTRIES(0x600) @@ -8758,7 +8759,7 @@ MACHINE_CONFIG_START(seta_state::jjsquawk) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jjsquawk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jjsquawk) MCFG_PALETTE_ADD("palette", 16*32+64*32*4) /* sprites, layer2, layer1 */ MCFG_PALETTE_INDIRECT_ENTRIES(0x600) @@ -8793,7 +8794,7 @@ MACHINE_CONFIG_START(seta_state::jjsquawb) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jjsquawk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jjsquawk) MCFG_PALETTE_ADD("palette", 16*32+64*32*4) /* sprites, layer2, layer1 */ MCFG_PALETTE_INDIRECT_ENTRIES(0x600) @@ -8838,7 +8839,7 @@ MACHINE_CONFIG_START(seta_state::kamenrid) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", msgundam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer2, layer1 */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) @@ -8876,7 +8877,7 @@ MACHINE_CONFIG_START(seta_state::orbs) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", orbs) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_orbs) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) @@ -8919,7 +8920,7 @@ MACHINE_CONFIG_START(seta_state::keroppij) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", orbs) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_orbs) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) @@ -8935,7 +8936,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(seta_state::keroppi) keroppij(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", tndrcade) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_tndrcade) MACHINE_CONFIG_END /*************************************************************************** @@ -8970,7 +8971,7 @@ MACHINE_CONFIG_START(seta_state::krzybowl) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tndrcade) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) @@ -9014,7 +9015,7 @@ MACHINE_CONFIG_START(seta_state::madshark) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jjsquawk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jjsquawk) MCFG_PALETTE_ADD("palette", 16*32+64*32*4) /* sprites, layer2, layer1 */ MCFG_PALETTE_INDIRECT_ENTRIES(0x600) @@ -9060,7 +9061,7 @@ MACHINE_CONFIG_START(seta_state::magspeed) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", msgundam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer2, layer1 */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) @@ -9104,7 +9105,7 @@ MACHINE_CONFIG_START(seta_state::msgundam) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta_state, screen_vblank_seta_buffer_sprites)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", msgundam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer2, layer1 */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) @@ -9142,7 +9143,7 @@ MACHINE_CONFIG_START(seta_state::oisipuzl) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", msgundam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer2, layer1 */ MCFG_VIDEO_START_OVERRIDE(seta_state,oisipuzl_2_layers) // flip is inverted for the tilemaps @@ -9182,7 +9183,7 @@ MACHINE_CONFIG_START(seta_state::triplfun) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", msgundam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer2, layer1 */ MCFG_VIDEO_START_OVERRIDE(seta_state,oisipuzl_2_layers) // flip is inverted for the tilemaps @@ -9226,7 +9227,7 @@ MACHINE_CONFIG_START(seta_state::kiwame) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tndrcade) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) @@ -9269,7 +9270,7 @@ MACHINE_CONFIG_START(seta_state::rezon) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", msgundam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer1, layer2 */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) @@ -9309,7 +9310,7 @@ MACHINE_CONFIG_START(seta_state::thunderl) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tndrcade) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) @@ -9385,7 +9386,7 @@ MACHINE_CONFIG_START(seta_state::wiggie) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wiggie) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wiggie) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) @@ -9403,7 +9404,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(seta_state::superbar) wiggie(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", superbar) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_superbar) MACHINE_CONFIG_END MACHINE_CONFIG_START(seta_state::wits) @@ -9426,7 +9427,7 @@ MACHINE_CONFIG_START(seta_state::wits) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tndrcade) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) @@ -9463,7 +9464,7 @@ MACHINE_CONFIG_START(seta_state::umanclub) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tndrcade) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tndrcade) MCFG_PALETTE_ADD("palette", 512) MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) @@ -9504,7 +9505,7 @@ MACHINE_CONFIG_START(seta_state::utoukond) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", msgundam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer2, layer1 */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) @@ -9562,7 +9563,7 @@ MACHINE_CONFIG_START(seta_state::wrofaero) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", msgundam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_msgundam) MCFG_PALETTE_ADD("palette", 512 * 3) /* sprites, layer1, layer2 */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_2_layers) @@ -9608,7 +9609,7 @@ MACHINE_CONFIG_START(seta_state::zingzip) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", zingzip) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_zingzip) MCFG_PALETTE_ADD("palette", 16*32+16*32+64*32*2) /* sprites, layer2, layer1 */ MCFG_PALETTE_INDIRECT_ENTRIES(0x600) @@ -9626,7 +9627,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(seta_state::zingzipbl) zingzip(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", zingzipbl) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_zingzipbl) MCFG_DEVICE_REMOVE("maincpu") @@ -9664,7 +9665,7 @@ MACHINE_CONFIG_START(seta_state::pairlove) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pairlove) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pairlove) MCFG_PALETTE_ADD("palette", 2048) /* sprites only */ MCFG_VIDEO_START_OVERRIDE(seta_state,seta_no_layers) @@ -9712,7 +9713,7 @@ MACHINE_CONFIG_START(seta_state::crazyfgt) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", crazyfgt) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_crazyfgt) MCFG_PALETTE_ADD("palette", 16*32+64*32*4) /* sprites, layer1, layer2 */ MCFG_PALETTE_INDIRECT_ENTRIES(0x600) @@ -9783,7 +9784,7 @@ MACHINE_CONFIG_START(jockeyc_state::jockeyc) MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", jockeyc) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jockeyc) MCFG_PALETTE_ADD("palette", 512 * 1) MCFG_PALETTE_INIT_OWNER(seta_state,palette_init_RRRRRGGGGGBBBBB_proms) diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp index 5c3e05a56c4..94775441662 100644 --- a/src/mame/drivers/seta2.cpp +++ b/src/mame/drivers/seta2.cpp @@ -117,6 +117,8 @@ reelquak: #include "machine/nvram.h" #include "machine/ticket.h" #include "machine/watchdog.h" + +#include "diserial.h" #include "speaker.h" @@ -2376,7 +2378,7 @@ static const gfx_layout layout_2bpp_hi = /* Tiles are 8bpp, but the hardware is additionally able to discard some bitplanes and use the low 4 bits only, or the high 4 bits only */ -static GFXDECODE_START( seta2 ) +static GFXDECODE_START( gfx_seta2 ) GFXDECODE_ENTRY( "sprites", 0, layout_4bpp_lo, 0, 0x8000/16 ) GFXDECODE_ENTRY( "sprites", 0, layout_4bpp_hi, 0, 0x8000/16 ) GFXDECODE_ENTRY( "sprites", 0, layout_6bpp, 0, 0x8000/16 ) // 6bpp, but 4bpp color granularity @@ -2458,7 +2460,7 @@ static const gfx_layout funcube_layout_2bpp_hi = /* Tiles are 8bpp, but the hardware is additionally able to discard some bitplanes and use the low 4 bits only, or the high 4 bits only */ -static GFXDECODE_START( funcube ) +static GFXDECODE_START( gfx_funcube ) GFXDECODE_ENTRY( "sprites", 0, funcube_layout_4bpp_lo, 0, 0x8000/16 ) GFXDECODE_ENTRY( "sprites", 0, funcube_layout_4bpp_hi, 0, 0x8000/16 ) GFXDECODE_ENTRY( "sprites", 0, funcube_layout_6bpp, 0, 0x8000/16 ) // 6bpp, but 4bpp color granularity @@ -2495,7 +2497,7 @@ static const gfx_layout staraudi_layout_6bpp = /* Tiles are 8bpp, but the hardware is additionally able to discard some bitplanes and use the low 4 bits only, or the high 4 bits only */ -static GFXDECODE_START( staraudi ) +static GFXDECODE_START( gfx_staraudi ) GFXDECODE_ENTRY( "sprites", 0, staraudi_layout_4bpp_lo, 0, 0x8000/16 ) GFXDECODE_ENTRY( "sprites", 0, funcube_layout_4bpp_hi, 0, 0x8000/16 ) GFXDECODE_ENTRY( "sprites", 0, staraudi_layout_6bpp, 0, 0x8000/16 ) // 6bpp, but 4bpp color granularity @@ -2543,7 +2545,7 @@ MACHINE_CONFIG_START(seta2_state::seta2) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta2_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", seta2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_seta2) MCFG_PALETTE_ADD("palette", 0x8000+0xf0) // extra 0xf0 because we might draw 256-color object with 16-color granularity MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -2695,7 +2697,7 @@ MACHINE_CONFIG_START(staraudi_state::staraudi) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate MCFG_SCREEN_VISIBLE_AREA(0x10, 0x150-1, 0x100, 0x1f0-1) - MCFG_GFXDECODE_MODIFY("gfxdecode", staraudi) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_staraudi) MACHINE_CONFIG_END @@ -2778,7 +2780,7 @@ MACHINE_CONFIG_START(seta2_state::funcube) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta2_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", funcube) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_funcube) MCFG_PALETTE_ADD("palette", 0x8000+0xf0) // extra 0xf0 because we might draw 256-color object with 16-color granularity MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -2833,7 +2835,7 @@ MACHINE_CONFIG_START(seta2_state::namcostr) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta2_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", funcube) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_funcube) MCFG_PALETTE_ADD("palette", 0x8000+0xf0) // extra 0xf0 because we might draw 256-color object with 16-color granularity MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp index 054acb350a9..f58350c62c7 100644 --- a/src/mame/drivers/sf.cpp +++ b/src/mame/drivers/sf.cpp @@ -516,7 +516,7 @@ static const gfx_layout sprite_layout = }; -static GFXDECODE_START( sf ) +static GFXDECODE_START( gfx_sf ) GFXDECODE_ENTRY( "gfx1", 0, sprite_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, sprite_layout, 256, 16 ) GFXDECODE_ENTRY( "gfx3", 0, sprite_layout, 512, 16 ) @@ -564,7 +564,7 @@ MACHINE_CONFIG_START(sf_state::sfan) MCFG_SCREEN_UPDATE_DRIVER(sf_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sf) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sf) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp index 168de421468..65ac67f2b56 100644 --- a/src/mame/drivers/sfbonus.cpp +++ b/src/mame/drivers/sfbonus.cpp @@ -1347,7 +1347,7 @@ static const gfx_layout sfbonus32_layout = -static GFXDECODE_START( sfbonus ) +static GFXDECODE_START( gfx_sfbonus ) GFXDECODE_ENTRY( "gfx1", 0, sfbonus_layout, 0x0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, sfbonus32_layout, 0x0, 2 ) GFXDECODE_END @@ -1377,7 +1377,7 @@ MACHINE_CONFIG_START(sfbonus_state::sfbonus) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sfbonus) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sfbonus) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/shadfrce.cpp b/src/mame/drivers/shadfrce.cpp index 75c7f4c8f71..3ef37faaa33 100644 --- a/src/mame/drivers/shadfrce.cpp +++ b/src/mame/drivers/shadfrce.cpp @@ -527,7 +527,7 @@ static const gfx_layout bg16x16x6_layout = 2*16*16 }; -static GFXDECODE_START( shadfrce ) +static GFXDECODE_START( gfx_shadfrce ) GFXDECODE_ENTRY( "chars", 0, fg8x8x4_layout, 0x0000, 256 ) GFXDECODE_ENTRY( "sprites", 0, sp16x16x5_layout, 0x1000, 128 ) GFXDECODE_ENTRY( "tiles", 0, bg16x16x6_layout, 0x2000, 128 ) @@ -552,7 +552,7 @@ MACHINE_CONFIG_START(shadfrce_state::shadfrce) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, shadfrce_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", shadfrce) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_shadfrce) MCFG_PALETTE_ADD("palette", 0x4000) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/shangha3.cpp b/src/mame/drivers/shangha3.cpp index 26d252ee0af..096c22175d0 100644 --- a/src/mame/drivers/shangha3.cpp +++ b/src/mame/drivers/shangha3.cpp @@ -443,7 +443,7 @@ static const gfx_layout charlayout = 128*8 }; -static GFXDECODE_START( shangha3 ) +static GFXDECODE_START( gfx_shangha3 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) GFXDECODE_END @@ -466,7 +466,7 @@ MACHINE_CONFIG_START(shangha3_state::shangha3) MCFG_SCREEN_UPDATE_DRIVER(shangha3_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", shangha3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_shangha3) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) @@ -507,7 +507,7 @@ MACHINE_CONFIG_START(shangha3_state::heberpop) MCFG_SCREEN_UPDATE_DRIVER(shangha3_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", shangha3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_shangha3) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) @@ -551,7 +551,7 @@ MACHINE_CONFIG_START(shangha3_state::blocken) MCFG_SCREEN_UPDATE_DRIVER(shangha3_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", shangha3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_shangha3) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp index 0a579f17fdc..de83c1c82f1 100644 --- a/src/mame/drivers/shangkid.cpp +++ b/src/mame/drivers/shangkid.cpp @@ -256,7 +256,7 @@ static const gfx_layout chinhero_sprite_layout2 = { 8*0x40 }; -static GFXDECODE_START( chinhero ) +static GFXDECODE_START( gfx_chinhero ) GFXDECODE_ENTRY( "gfx1", 0, shangkid_char_layout, 0, 0x40 ) GFXDECODE_ENTRY( "gfx2", 0, chinhero_sprite_layout1, 0, 0x20 ) GFXDECODE_ENTRY( "gfx2", 0, chinhero_sprite_layout2, 0, 0x20 ) @@ -264,12 +264,12 @@ static GFXDECODE_START( chinhero ) GFXDECODE_ENTRY( "gfx3", 0, chinhero_sprite_layout2, 0, 0x20 ) GFXDECODE_END -static GFXDECODE_START( shangkid ) +static GFXDECODE_START( gfx_shangkid ) GFXDECODE_ENTRY( "gfx1", 0, shangkid_char_layout, 0, 0x40 ) GFXDECODE_ENTRY( "gfx2", 0, shangkid_sprite_layout, 0, 0x40 ) GFXDECODE_END -static GFXDECODE_START( dynamski ) +static GFXDECODE_START( gfx_dynamski ) GFXDECODE_ENTRY( "gfx1", 0, shangkid_char_layout, 0, 0x10 ) GFXDECODE_ENTRY( "gfx2", 0, shangkid_sprite_layout, 0x40, 0x10 ) GFXDECODE_END @@ -413,7 +413,7 @@ MACHINE_CONFIG_START(shangkid_state::chinhero) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, shangkid_state, irq_1_w)) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, shangkid_state, irq_2_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", chinhero) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_chinhero) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(shangkid_state,shangkid) @@ -453,7 +453,7 @@ MACHINE_CONFIG_START(shangkid_state::shangkid) MCFG_MACHINE_RESET_OVERRIDE(shangkid_state,shangkid) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", shangkid) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_shangkid) MCFG_DEVICE_MODIFY("aysnd") MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, shangkid_state, shangkid_ay8910_porta_w)) @@ -506,7 +506,7 @@ MACHINE_CONFIG_START(shangkid_state::dynamski) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, shangkid_state, irq_1_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", dynamski) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dynamski) MCFG_PALETTE_ADD("palette", 16*4+16*4) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(shangkid_state,dynamski) diff --git a/src/mame/drivers/shaolins.cpp b/src/mame/drivers/shaolins.cpp index 57d2dc55da0..713de8cd929 100644 --- a/src/mame/drivers/shaolins.cpp +++ b/src/mame/drivers/shaolins.cpp @@ -187,7 +187,7 @@ static const gfx_layout spritelayout = 64*8 /* every sprite takes 64 consecutive bytes */ }; -static GFXDECODE_START( shaolins ) +static GFXDECODE_START( gfx_shaolins ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16*8 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 16*8*16, 16*8 ) GFXDECODE_END @@ -210,7 +210,7 @@ MACHINE_CONFIG_START(shaolins_state::shaolins) MCFG_SCREEN_UPDATE_DRIVER(shaolins_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", shaolins) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_shaolins) MCFG_PALETTE_ADD("palette", 16*8*16+16*8*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(shaolins_state, shaolins) diff --git a/src/mame/drivers/shisen.cpp b/src/mame/drivers/shisen.cpp index 32b00909e93..4270d476250 100644 --- a/src/mame/drivers/shisen.cpp +++ b/src/mame/drivers/shisen.cpp @@ -207,7 +207,7 @@ static const gfx_layout charlayout = }; -static GFXDECODE_START( shisen ) +static GFXDECODE_START( gfx_shisen ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 0, 16 ) GFXDECODE_END @@ -237,7 +237,7 @@ MACHINE_CONFIG_START(shisen_state::shisen) MCFG_SCREEN_UPDATE_DRIVER(shisen_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", shisen) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_shisen) MCFG_PALETTE_ADD("palette", 256) diff --git a/src/mame/drivers/shootout.cpp b/src/mame/drivers/shootout.cpp index c38d8ff06b6..3830ab961fd 100644 --- a/src/mame/drivers/shootout.cpp +++ b/src/mame/drivers/shootout.cpp @@ -265,7 +265,7 @@ static const gfx_layout tile_layout = 8*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( shootout ) +static GFXDECODE_START( gfx_shootout ) GFXDECODE_ENTRY( "gfx1", 0, char_layout, 16*4+8*8, 16 ) /* characters */ GFXDECODE_ENTRY( "gfx2", 0, sprite_layout, 16*4, 8 ) /* sprites */ GFXDECODE_ENTRY( "gfx3", 0, tile_layout, 0, 16 ) /* tiles */ @@ -294,7 +294,7 @@ MACHINE_CONFIG_START(shootout_state::shootout) MCFG_SCREEN_UPDATE_DRIVER(shootout_state, screen_update_shootout) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", shootout) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_shootout) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(shootout_state, shootout) @@ -324,7 +324,7 @@ MACHINE_CONFIG_START(shootout_state::shootouj) MCFG_SCREEN_UPDATE_DRIVER(shootout_state, screen_update_shootouj) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", shootout) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_shootout) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(shootout_state, shootout) diff --git a/src/mame/drivers/shuuz.cpp b/src/mame/drivers/shuuz.cpp index 74da389cf00..28378d462a7 100644 --- a/src/mame/drivers/shuuz.cpp +++ b/src/mame/drivers/shuuz.cpp @@ -219,7 +219,7 @@ static const gfx_layout pfmolayout = }; -static GFXDECODE_START( shuuz ) +static GFXDECODE_START( gfx_shuuz ) GFXDECODE_ENTRY( "gfx1", 0, pfmolayout, 256, 16 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx2", 0, pfmolayout, 0, 16 ) /* sprites & playfield */ GFXDECODE_END @@ -244,7 +244,7 @@ MACHINE_CONFIG_START(shuuz_state::shuuz) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", shuuz) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_shuuz) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/sidearms.cpp b/src/mame/drivers/sidearms.cpp index 6994a8c6bec..7beffb0b641 100644 --- a/src/mame/drivers/sidearms.cpp +++ b/src/mame/drivers/sidearms.cpp @@ -563,7 +563,7 @@ static const gfx_layout tilelayout = 256*8 /* every tile takes 256 consecutive bytes */ }; -static GFXDECODE_START( sidearms ) +static GFXDECODE_START( gfx_sidearms ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 768, 64 ) /* colors 768-1023 */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 32 ) /* colors 0-511 */ GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 512, 16 ) /* colors 512-767 */ @@ -592,7 +592,7 @@ static const gfx_layout turtship_tilelayout = 256*8 /* every tile takes 256 consecutive bytes */ }; -static GFXDECODE_START( turtship ) +static GFXDECODE_START( gfx_turtship ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 768, 64 ) /* colors 768-1023 */ GFXDECODE_ENTRY( "gfx2", 0, turtship_tilelayout, 0, 32 ) /* colors 0-511 */ GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 512, 16 ) /* colors 512-767 */ @@ -623,7 +623,7 @@ MACHINE_CONFIG_START(sidearms_state::sidearms) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sidearms) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sidearms) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG) @@ -672,7 +672,7 @@ MACHINE_CONFIG_START(sidearms_state::turtship) MCFG_SCREEN_UPDATE_DRIVER(sidearms_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", turtship) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_turtship) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG) @@ -724,7 +724,7 @@ MACHINE_CONFIG_START(sidearms_state::whizz) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", turtship) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_turtship) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG) diff --git a/src/mame/drivers/sidepckt.cpp b/src/mame/drivers/sidepckt.cpp index 78b68f7ce84..e60b78b0860 100644 --- a/src/mame/drivers/sidepckt.cpp +++ b/src/mame/drivers/sidepckt.cpp @@ -353,7 +353,7 @@ static const gfx_layout spritelayout = 32*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( sidepckt ) +static GFXDECODE_START( gfx_sidepckt ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 128, 4 ) /* colors 128-159 */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 16 ) /* colors 0-127 */ GFXDECODE_END @@ -388,7 +388,7 @@ MACHINE_CONFIG_START(sidepckt_state::sidepckt) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sidepckt) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sidepckt) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(sidepckt_state, sidepckt) diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp index 6177901977b..7ce5e6f91a0 100644 --- a/src/mame/drivers/sigmab98.cpp +++ b/src/mame/drivers/sigmab98.cpp @@ -2566,13 +2566,13 @@ static const gfx_layout sigmab98_16x16x8_layout = 16*16*8 }; -static GFXDECODE_START( sigmab98 ) +static GFXDECODE_START( gfx_sigmab98 ) GFXDECODE_ENTRY( "sprites", 0, sigmab98_16x16x4_layout, 0, 0x100/16 ) GFXDECODE_ENTRY( "sprites", 0, sigmab98_16x16x8_layout, 0, 0x100/256 ) GFXDECODE_END // Larger palette -static GFXDECODE_START( lufykzku ) +static GFXDECODE_START( gfx_lufykzku ) GFXDECODE_ENTRY( "sprites", 0, sigmab98_16x16x4_layout, 0, 0x1000/16 ) GFXDECODE_ENTRY( "sprites", 0, sigmab98_16x16x8_layout, 0, 0x1000/16 ) GFXDECODE_END @@ -2855,7 +2855,7 @@ MACHINE_CONFIG_START(sigmab98_state::sigmab98) MCFG_SCREEN_UPDATE_DRIVER(sigmab98_state, screen_update_sigmab98) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sigmab98) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sigmab98) MCFG_PALETTE_ADD("palette", 0x1000 + 1) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) @@ -2949,7 +2949,7 @@ MACHINE_CONFIG_START(lufykzku_state::lufykzku) MCFG_SCREEN_UPDATE_DRIVER(sigmab98_state, screen_update_sigmab98) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", lufykzku) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lufykzku) MCFG_PALETTE_ADD("palette", 0x1000 + 1) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) @@ -3013,7 +3013,7 @@ MACHINE_CONFIG_START(sigmab98_state::sammymdl) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sigmab98_state, screen_vblank_sammymdl)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sigmab98) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sigmab98) MCFG_PALETTE_ADD("palette", 0x1000 + 1) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) diff --git a/src/mame/drivers/silkroad.cpp b/src/mame/drivers/silkroad.cpp index f82c64f04bb..9aaf1ef7fe9 100644 --- a/src/mame/drivers/silkroad.cpp +++ b/src/mame/drivers/silkroad.cpp @@ -270,7 +270,7 @@ static const gfx_layout tiles16x16x6_layout = 16*32 }; -static GFXDECODE_START( silkroad ) +static GFXDECODE_START( gfx_silkroad ) GFXDECODE_ENTRY( "gfx1", 0, tiles16x16x6_layout, 0x0000, 256 ) GFXDECODE_END @@ -290,7 +290,7 @@ MACHINE_CONFIG_START(silkroad_state::silkroad) MCFG_SCREEN_UPDATE_DRIVER(silkroad_state, screen_update_silkroad) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", silkroad) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_silkroad) MCFG_PALETTE_ADD("palette", 0x2000) diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp index 6d309320ca8..eae26e47a57 100644 --- a/src/mame/drivers/silvmil.cpp +++ b/src/mame/drivers/silvmil.cpp @@ -369,7 +369,7 @@ static const gfx_layout tlayout = }; -static GFXDECODE_START( silvmil ) +static GFXDECODE_START( gfx_silvmil ) GFXDECODE_ENTRY( "gfx2", 0, tlayout, 0, 64 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "gfx1", 0, tlayout, 0, 64 ) /* Sprites 16x16 */ GFXDECODE_END @@ -424,7 +424,7 @@ MACHINE_CONFIG_START(silvmil_state::silvmil) MCFG_PALETTE_ADD("palette", 0x300) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", silvmil) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_silvmil) MCFG_DEVICE_ADD("spritegen", DECO_SPRITE, 0) diff --git a/src/mame/drivers/simpl156.cpp b/src/mame/drivers/simpl156.cpp index 7eb29c2a574..3b0fac1d6c2 100644 --- a/src/mame/drivers/simpl156.cpp +++ b/src/mame/drivers/simpl156.cpp @@ -369,7 +369,7 @@ static const gfx_layout spritelayout = 32*32 }; -static GFXDECODE_START( simpl156 ) +static GFXDECODE_START( gfx_simpl156 ) 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, 0x200, 32) /* Sprites (16x16) */ @@ -423,7 +423,7 @@ MACHINE_CONFIG_START(simpl156_state::chainrec) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_PALETTE_MEMBITS(16) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", simpl156) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_simpl156) MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) MCFG_DECO16IC_SPLIT(0) diff --git a/src/mame/drivers/skimaxx.cpp b/src/mame/drivers/skimaxx.cpp index f2e1a47d65f..822d516f28f 100644 --- a/src/mame/drivers/skimaxx.cpp +++ b/src/mame/drivers/skimaxx.cpp @@ -47,14 +47,15 @@ class skimaxx_state : public driver_device { public: - skimaxx_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + skimaxx_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "subcpu"), m_tms(*this, "tms"), m_blitter_regs(*this, "blitter_regs"), m_fpga_ctrl(*this, "fpga_ctrl"), - m_fg_buffer(*this, "fg_buffer") { } + m_fg_buffer(*this, "fg_buffer") + { } required_device m_maincpu; required_device m_subcpu; @@ -412,7 +413,7 @@ static const gfx_layout texlayout = texlayout_yoffset }; -static GFXDECODE_START( skimaxx ) +static GFXDECODE_START( gfx_skimaxx ) GFXDECODE_ENTRY( "blitter", 0, texlayout, 0, 1 ) GFXDECODE_END @@ -528,7 +529,7 @@ MACHINE_CONFIG_START(skimaxx_state::skimaxx) MCFG_SCREEN_UPDATE_DEVICE("tms", tms34010_device, tms340x0_ind16) MCFG_SCREEN_PALETTE("palette") -// MCFG_GFXDECODE_ADD("gfxdecode", "palette", skimaxx ) +// MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_skimaxx) MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette") diff --git a/src/mame/drivers/skullxbo.cpp b/src/mame/drivers/skullxbo.cpp index 711c454781a..700428ba0df 100644 --- a/src/mame/drivers/skullxbo.cpp +++ b/src/mame/drivers/skullxbo.cpp @@ -211,7 +211,7 @@ static const gfx_layout molayout = }; -static GFXDECODE_START( skullxbo ) +static GFXDECODE_START( gfx_skullxbo ) GFXDECODE_ENTRY( "gfx1", 0, molayout, 0x000, 32 ) GFXDECODE_ENTRY( "gfx2", 0, pflayout, 0x200, 16 ) GFXDECODE_ENTRY( "gfx3", 0, anlayout, 0x300, 16 ) @@ -239,7 +239,7 @@ MACHINE_CONFIG_START(skullxbo_state::skullxbo) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", skullxbo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_skullxbo) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/skyarmy.cpp b/src/mame/drivers/skyarmy.cpp index 16bdc359744..2cf21ded4f3 100644 --- a/src/mame/drivers/skyarmy.cpp +++ b/src/mame/drivers/skyarmy.cpp @@ -315,7 +315,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( skyarmy ) +static GFXDECODE_START( gfx_skyarmy ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 8 ) GFXDECODE_END @@ -344,7 +344,7 @@ MACHINE_CONFIG_START(skyarmy_state::skyarmy) MCFG_SCREEN_UPDATE_DRIVER(skyarmy_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", skyarmy) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_skyarmy) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(skyarmy_state, skyarmy) diff --git a/src/mame/drivers/skydiver.cpp b/src/mame/drivers/skydiver.cpp index c6a0d4e43c2..42093745d5b 100644 --- a/src/mame/drivers/skydiver.cpp +++ b/src/mame/drivers/skydiver.cpp @@ -334,7 +334,7 @@ static const gfx_layout motion_layout = }; -static GFXDECODE_START( skydiver ) +static GFXDECODE_START( gfx_skydiver ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 4 ) GFXDECODE_ENTRY( "gfx2", 0, motion_layout, 0, 4 ) GFXDECODE_END @@ -391,7 +391,7 @@ MACHINE_CONFIG_START(skydiver_state::skydiver) MCFG_SCREEN_UPDATE_DRIVER(skydiver_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", skydiver) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_skydiver) MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(colortable_source)) MCFG_PALETTE_INIT_OWNER(skydiver_state, skydiver) diff --git a/src/mame/drivers/skyfox.cpp b/src/mame/drivers/skyfox.cpp index dbf9f97f957..fd480ea2f85 100644 --- a/src/mame/drivers/skyfox.cpp +++ b/src/mame/drivers/skyfox.cpp @@ -191,7 +191,7 @@ static const gfx_layout layout_8x8x8 = 8*8*8 }; -static GFXDECODE_START( skyfox ) +static GFXDECODE_START( gfx_skyfox ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x8, 0, 1 ) // [0] Sprites GFXDECODE_END @@ -241,7 +241,7 @@ MACHINE_CONFIG_START(skyfox_state::skyfox) MCFG_SCREEN_UPDATE_DRIVER(skyfox_state, screen_update_skyfox) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", skyfox) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_skyfox) MCFG_PALETTE_ADD("palette", 256+256) /* 256 static colors (+256 for the background??) */ MCFG_PALETTE_INIT_OWNER(skyfox_state, skyfox) diff --git a/src/mame/drivers/skykid.cpp b/src/mame/drivers/skykid.cpp index 01006ec7010..ff7e35f3386 100644 --- a/src/mame/drivers/skykid.cpp +++ b/src/mame/drivers/skykid.cpp @@ -416,7 +416,7 @@ static const gfx_layout sprite_layout = 64*8 }; -static GFXDECODE_START( skykid ) +static GFXDECODE_START( gfx_skykid ) GFXDECODE_ENTRY( "gfx1", 0, text_layout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, tile_layout, 64*4, 128 ) GFXDECODE_ENTRY( "gfx3", 0, sprite_layout, 64*4+128*4, 64 ) @@ -457,7 +457,7 @@ MACHINE_CONFIG_START(skykid_state::skykid) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, skykid_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", skykid) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_skykid) MCFG_PALETTE_ADD("palette", 64*4+128*4+64*8) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(skykid_state, skykid) diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp index d9e9c6f7780..2812e715fbc 100644 --- a/src/mame/drivers/skylncr.cpp +++ b/src/mame/drivers/skylncr.cpp @@ -719,25 +719,25 @@ static const gfx_layout layout8x32x8_bdream97 = /* for bdream97 */ * Graphics Decode * **************************************/ -static GFXDECODE_START( skylncr ) +static GFXDECODE_START( gfx_skylncr ) GFXDECODE_ENTRY( "gfx1", 0, layout8x8x8, 0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, layout8x32x8, 0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, layout8x32x8_rot, 0, 2 ) GFXDECODE_END -static GFXDECODE_START( neraidou ) +static GFXDECODE_START( gfx_neraidou ) GFXDECODE_ENTRY( "gfx1", 0, layout8x8x8_alt, 0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, layout8x32x8_alt2, 0, 2 ) // GFXDECODE_ENTRY( "gfx2", 0, layout8x32x8_alt, 0x100, 1 ) GFXDECODE_END -static GFXDECODE_START( sstar97 ) +static GFXDECODE_START( gfx_sstar97 ) GFXDECODE_ENTRY( "gfx1", 0, layout8x8x8_alt, 0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, layout8x32x8_alt, 0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, layout8x32x8_alt, 0x100, 1 ) GFXDECODE_END -static GFXDECODE_START( bdream97 ) +static GFXDECODE_START( gfx_bdream97 ) GFXDECODE_ENTRY( "gfx1", 0, layout8x8x8_bdream97, 0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, layout8x32x8_bdream97, 0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, layout8x32x8_bdream97, 0x100, 1 ) @@ -1666,7 +1666,7 @@ MACHINE_CONFIG_START(skylncr_state::skylncr) MCFG_SCREEN_UPDATE_DRIVER(skylncr_state, screen_update_skylncr) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", skylncr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_skylncr) MCFG_PALETTE_ADD("palette", 0x200) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") @@ -1697,7 +1697,7 @@ MACHINE_CONFIG_START(skylncr_state::neraidou) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") - MCFG_GFXDECODE_MODIFY("gfxdecode", neraidou) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_neraidou) MACHINE_CONFIG_END @@ -1706,7 +1706,7 @@ MACHINE_CONFIG_START(skylncr_state::sstar97) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") - MCFG_GFXDECODE_MODIFY("gfxdecode", sstar97) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_sstar97) MACHINE_CONFIG_END @@ -1717,7 +1717,7 @@ MACHINE_CONFIG_START(skylncr_state::bdream97) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_OPCODES_MAP(bdream97_opcode_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", bdream97) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_bdream97) MACHINE_CONFIG_END diff --git a/src/mame/drivers/skyraid.cpp b/src/mame/drivers/skyraid.cpp index b3ffdea46ff..e0b6eaf7aff 100644 --- a/src/mame/drivers/skyraid.cpp +++ b/src/mame/drivers/skyraid.cpp @@ -215,7 +215,7 @@ static const gfx_layout skyraid_missile_layout = }; -static GFXDECODE_START( skyraid ) +static GFXDECODE_START( gfx_skyraid ) GFXDECODE_ENTRY( "gfx1", 0, skyraid_text_layout, 18, 1 ) GFXDECODE_ENTRY( "gfx2", 0, skyraid_sprite_layout, 8, 2 ) GFXDECODE_ENTRY( "gfx3", 0, skyraid_missile_layout, 16, 1 ) @@ -241,7 +241,7 @@ MACHINE_CONFIG_START(skyraid_state::skyraid) MCFG_SCREEN_UPDATE_DRIVER(skyraid_state, screen_update_skyraid) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", skyraid) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_skyraid) MCFG_PALETTE_ADD("palette", 20) MCFG_PALETTE_INIT_OWNER(skyraid_state, skyraid) diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp index 9495a58ded5..cdceb753451 100644 --- a/src/mame/drivers/slapfght.cpp +++ b/src/mame/drivers/slapfght.cpp @@ -870,12 +870,12 @@ static const gfx_layout perfrman_spritelayout = }; -static GFXDECODE_START( perfrman ) +static GFXDECODE_START( gfx_perfrman ) GFXDECODE_ENTRY( "gfx1", 0, perfrman_charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, perfrman_spritelayout, 128, 16 ) GFXDECODE_END -static GFXDECODE_START( slapfght ) +static GFXDECODE_START( gfx_slapfght ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0, 16 ) @@ -921,7 +921,7 @@ MACHINE_CONFIG_START(slapfght_state::perfrman) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, slapfght_state, vblank_irq)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", perfrman) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_perfrman) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(slapfght_state, perfrman) @@ -973,7 +973,7 @@ MACHINE_CONFIG_START(slapfght_state::tigerh) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, slapfght_state, vblank_irq)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", slapfght) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_slapfght) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(slapfght_state, slapfight) @@ -1046,7 +1046,7 @@ MACHINE_CONFIG_START(slapfght_state::slapfigh) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, slapfght_state, vblank_irq)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", slapfght) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_slapfght) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(slapfght_state, slapfight) diff --git a/src/mame/drivers/slapshot.cpp b/src/mame/drivers/slapshot.cpp index aa97babd360..80b35d9e3f0 100644 --- a/src/mame/drivers/slapshot.cpp +++ b/src/mame/drivers/slapshot.cpp @@ -423,7 +423,7 @@ static const gfx_layout slapshot_charlayout = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( slapshot ) +static GFXDECODE_START( gfx_slapshot ) GFXDECODE_ENTRY( "gfx2", 0x0, tilelayout, 0, 256 ) /* sprite parts */ GFXDECODE_ENTRY( "gfx1", 0x0, slapshot_charlayout, 4096, 256 ) /* sprites & playfield */ GFXDECODE_END @@ -470,7 +470,7 @@ MACHINE_CONFIG_START(slapshot_state::slapshot) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, slapshot_state, screen_vblank_taito_no_buffer)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", slapshot) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_slapshot) MCFG_PALETTE_ADD("palette", 8192) MCFG_PALETTE_FORMAT(XRGB) @@ -539,7 +539,7 @@ MACHINE_CONFIG_START(slapshot_state::opwolf3) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, slapshot_state, screen_vblank_taito_no_buffer)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", slapshot) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_slapshot) MCFG_PALETTE_ADD("palette", 8192) MCFG_PALETTE_FORMAT(XRGB) diff --git a/src/mame/drivers/slotcarn.cpp b/src/mame/drivers/slotcarn.cpp index e65a9347be7..fbf205396c6 100644 --- a/src/mame/drivers/slotcarn.cpp +++ b/src/mame/drivers/slotcarn.cpp @@ -521,7 +521,7 @@ static const gfx_layout slotcarntiles8x8x1_layout = * Graphics Decode * ************************************/ -static GFXDECODE_START( slotcarn ) +static GFXDECODE_START( gfx_slotcarn ) GFXDECODE_ENTRY( "gfx1", 0, slotcarntiles8x8x3_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 8, slotcarntiles8x8x3_layout, 0, 16 ) // flipped GFXDECODE_ENTRY( "gfx2", 0, slotcarntiles8x8x1_layout, 0, 4 ) @@ -572,7 +572,7 @@ MACHINE_CONFIG_START(slotcarn_state::slotcarn) MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, slotcarn_state, hsync_changed)) MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", 0)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", slotcarn) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_slotcarn) MCFG_PALETTE_ADD("palette", 0x400) /* sound hardware */ diff --git a/src/mame/drivers/sm1800.cpp b/src/mame/drivers/sm1800.cpp index 7e6cfa6400b..59c18de25c0 100644 --- a/src/mame/drivers/sm1800.cpp +++ b/src/mame/drivers/sm1800.cpp @@ -153,7 +153,7 @@ static const gfx_layout sm1800_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( sm1800 ) +static GFXDECODE_START( gfx_sm1800 ) GFXDECODE_ENTRY( "chargen", 0x0000, sm1800_charlayout, 0, 1 ) GFXDECODE_END @@ -176,7 +176,7 @@ MACHINE_CONFIG_START(sm1800_state::sm1800) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(sm1800_state, sm1800) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sm1800) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sm1800) /* Devices */ MCFG_DEVICE_ADD("i8255", I8255, 0) diff --git a/src/mame/drivers/sm7238.cpp b/src/mame/drivers/sm7238.cpp index ae891d9d543..3d63364b67e 100644 --- a/src/mame/drivers/sm7238.cpp +++ b/src/mame/drivers/sm7238.cpp @@ -349,7 +349,7 @@ static const gfx_layout sm7238_charlayout = 16*8 /* every char takes 16 bytes */ }; -static GFXDECODE_START( sm7238 ) +static GFXDECODE_START( gfx_sm7238 ) GFXDECODE_ENTRY("chargen", 0x0000, sm7238_charlayout, 0, 1) GFXDECODE_END @@ -382,7 +382,7 @@ MACHINE_CONFIG_START(sm7238_state::sm7238) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(sm7238_state, sm7238) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sm7238) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sm7238) MCFG_DEVICE_ADD("pic8259", PIC8259, 0) MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0)) diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp index 942328a614b..81f62afad98 100644 --- a/src/mame/drivers/smc777.cpp +++ b/src/mame/drivers/smc777.cpp @@ -1041,7 +1041,7 @@ MACHINE_CONFIG_START(smc777_state::smc777) MCFG_PALETTE_ADD("palette", 0x20) // 16 + 8 colors (SMC-777 + SMC-70) + 8 empty entries (SMC-70) MCFG_PALETTE_INIT_OWNER(smc777_state, smc777) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) MCFG_MC6845_ADD("crtc", H46505, "screen", MASTER_CLOCK/2) /* unknown clock, hand tuned to get ~60 fps */ MCFG_MC6845_SHOW_BORDER_AREA(true) diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp index e94ed783e04..4e0e22b5339 100644 --- a/src/mame/drivers/snk.cpp +++ b/src/mame/drivers/snk.cpp @@ -3608,7 +3608,7 @@ static const gfx_layout bigspritelayout_4bpp = /*********************************************************************/ -static GFXDECODE_START( marvins ) +static GFXDECODE_START( gfx_marvins ) GFXDECODE_ENTRY( "tx_tiles", 0, charlayout_4bpp, 0x180, 0x080>>4 ) GFXDECODE_ENTRY( "fg_tiles", 0, charlayout_4bpp, 0x080, 0x080>>4 ) GFXDECODE_ENTRY( "bg_tiles", 0, charlayout_4bpp, 0x100, 0x080>>4 ) @@ -3616,14 +3616,14 @@ static GFXDECODE_START( marvins ) /* colors 0x200-0x3ff contain shadows */ GFXDECODE_END -static GFXDECODE_START( tnk3 ) +static GFXDECODE_START( gfx_tnk3 ) GFXDECODE_ENTRY( "tx_tiles", 0, charlayout_4bpp, 0x180, 0x080>>4 ) GFXDECODE_ENTRY( "bg_tiles", 0, charlayout_4bpp, 0x080, 0x100>>4 ) GFXDECODE_ENTRY( "sp16_tiles", 0, spritelayout_3bpp, 0x000, 0x080>>3 ) /* colors 0x200-0x3ff contain shadows */ GFXDECODE_END -static GFXDECODE_START( ikari ) +static GFXDECODE_START( gfx_ikari ) GFXDECODE_ENTRY( "tx_tiles", 0, charlayout_4bpp, 0x180, 0x080>>4 ) GFXDECODE_ENTRY( "bg_tiles", 0, tilelayout_4bpp, 0x100, 0x080>>4 ) GFXDECODE_ENTRY( "sp16_tiles", 0, spritelayout_3bpp, 0x000, 0x080>>3 ) @@ -3631,14 +3631,14 @@ static GFXDECODE_START( ikari ) /* colors 0x200-0x3ff contain shadows */ GFXDECODE_END -static GFXDECODE_START( gwar ) +static GFXDECODE_START( gfx_gwar ) GFXDECODE_ENTRY( "tx_tiles", 0, charlayout_4bpp, 0x000, 0x100>>4 ) GFXDECODE_ENTRY( "bg_tiles", 0, tilelayout_4bpp, 0x300, 0x100>>4 ) GFXDECODE_ENTRY( "sp16_tiles", 0, spritelayout_4bpp, 0x100, 0x100>>4 ) GFXDECODE_ENTRY( "sp32_tiles", 0, bigspritelayout_4bpp, 0x200, 0x100>>4 ) GFXDECODE_END -static GFXDECODE_START( tdfever ) +static GFXDECODE_START( gfx_tdfever ) GFXDECODE_ENTRY( "tx_tiles", 0, charlayout_4bpp, 0x000, 0x100>>4 ) GFXDECODE_ENTRY( "bg_tiles", 0, tilelayout_4bpp, 0x200, 0x100>>4 ) GFXDECODE_ENTRY( "sp32_tiles", 0, bigspritelayout_4bpp, 0x100, 0x100>>4 ) @@ -3673,7 +3673,7 @@ MACHINE_CONFIG_START(snk_state::marvins) MCFG_SCREEN_UPDATE_DRIVER(snk_state, screen_update_marvins) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", marvins) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_marvins) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_ENABLE_SHADOWS() @@ -3747,7 +3747,7 @@ MACHINE_CONFIG_START(snk_state::jcross) MCFG_SCREEN_UPDATE_DRIVER(snk_state, screen_update_tnk3) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tnk3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tnk3) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_ENABLE_SHADOWS() @@ -3830,7 +3830,7 @@ MACHINE_CONFIG_START(snk_state::tnk3) MCFG_SCREEN_UPDATE_DRIVER(snk_state, screen_update_tnk3) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tnk3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tnk3) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_ENABLE_SHADOWS() @@ -3926,7 +3926,7 @@ MACHINE_CONFIG_START(snk_state::ikari) MCFG_SCREEN_UPDATE_DRIVER(snk_state, screen_update_ikari) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ikari) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ikari) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x400) MCFG_PALETTE_ENABLE_SHADOWS() @@ -3987,7 +3987,7 @@ MACHINE_CONFIG_START(snk_state::bermudat) MCFG_SCREEN_UPDATE_DRIVER(snk_state, screen_update_gwar) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", gwar) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gwar) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x400) MCFG_VIDEO_START_OVERRIDE(snk_state,gwar) @@ -4089,7 +4089,7 @@ MACHINE_CONFIG_START(snk_state::tdfever) MCFG_SCREEN_UPDATE_DRIVER(snk_state, screen_update_tdfever) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tdfever) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tdfever) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x400) MCFG_PALETTE_ENABLE_SHADOWS() diff --git a/src/mame/drivers/snk6502.cpp b/src/mame/drivers/snk6502.cpp index 490f7379c05..a37d836fcfa 100644 --- a/src/mame/drivers/snk6502.cpp +++ b/src/mame/drivers/snk6502.cpp @@ -755,17 +755,17 @@ static const gfx_layout charlayout_memory = }; -static GFXDECODE_START( sasuke ) +static GFXDECODE_START( gfx_sasuke ) GFXDECODE_ENTRY( nullptr, 0x1000, swapcharlayout, 0, 4 ) /* the game dynamically modifies this */ GFXDECODE_ENTRY( "gfx1", 0x0000, swapcharlayout, 4*4, 4 ) GFXDECODE_END -static GFXDECODE_START( satansat ) +static GFXDECODE_START( gfx_satansat ) GFXDECODE_ENTRY( nullptr, 0x1000, charlayout_memory, 0, 4 ) /* the game dynamically modifies this */ GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 4*4, 4 ) GFXDECODE_END -static GFXDECODE_START( vanguard ) +static GFXDECODE_START( gfx_vanguard ) GFXDECODE_ENTRY( nullptr, 0x1000, charlayout_memory, 0, 8 ) /* the game dynamically modifies this */ GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 8*4, 8 ) GFXDECODE_END @@ -852,7 +852,7 @@ MACHINE_CONFIG_START(snk6502_state::sasuke) MCFG_SCREEN_UPDATE_DRIVER(snk6502_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sasuke) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sasuke) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(snk6502_state,satansat) @@ -937,7 +937,7 @@ MACHINE_CONFIG_START(snk6502_state::satansat) MCFG_MACHINE_RESET_OVERRIDE(snk6502_state,satansat) // video hardware - MCFG_GFXDECODE_MODIFY("gfxdecode", satansat) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_satansat) // sound hardware MCFG_DEVICE_MODIFY("samples") @@ -986,7 +986,7 @@ MACHINE_CONFIG_START(snk6502_state::vanguard) MCFG_SCREEN_UPDATE_DRIVER(snk6502_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vanguard) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vanguard) MCFG_PALETTE_ADD("palette", 64) MCFG_PALETTE_INIT_OWNER(snk6502_state,snk6502) diff --git a/src/mame/drivers/snk68.cpp b/src/mame/drivers/snk68.cpp index a16b524f67f..23cec980956 100644 --- a/src/mame/drivers/snk68.cpp +++ b/src/mame/drivers/snk68.cpp @@ -558,7 +558,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( pow ) +static GFXDECODE_START( gfx_pow ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 0x80>>4 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 0x800>>4 ) GFXDECODE_END @@ -612,7 +612,7 @@ MACHINE_CONFIG_START(snk68_state::pow) MCFG_SCREEN_UPDATE_DRIVER(snk68_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pow) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pow) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_FORMAT(xRGBRRRRGGGGBBBB_bit0) diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp index 9dd64babf28..d61b2e2dd92 100644 --- a/src/mame/drivers/snookr10.cpp +++ b/src/mame/drivers/snookr10.cpp @@ -1031,7 +1031,7 @@ static const gfx_layout charlayout = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( snookr10 ) +static GFXDECODE_START( gfx_snookr10 ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 16 ) GFXDECODE_END @@ -1059,7 +1059,7 @@ MACHINE_CONFIG_START(snookr10_state::snookr10) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", snookr10) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_snookr10) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(snookr10_state, snookr10) diff --git a/src/mame/drivers/snowbros.cpp b/src/mame/drivers/snowbros.cpp index ebc336f96ff..c5f036ac5a3 100644 --- a/src/mame/drivers/snowbros.cpp +++ b/src/mame/drivers/snowbros.cpp @@ -1623,7 +1623,7 @@ static const gfx_layout tilelayout = 32*32 }; -static GFXDECODE_START( snowbros ) +static GFXDECODE_START( gfx_snowbros ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 16 ) GFXDECODE_END @@ -1640,13 +1640,13 @@ static const gfx_layout honeydol_tilelayout8bpp = 32*32 }; -static GFXDECODE_START( honeydol ) +static GFXDECODE_START( gfx_honeydol ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 64 ) // how does it use 0-15 GFXDECODE_ENTRY( "gfx2", 0, honeydol_tilelayout8bpp, 0, 4 ) GFXDECODE_END -static GFXDECODE_START( twinadv ) +static GFXDECODE_START( gfx_twinadv ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 64 ) GFXDECODE_END @@ -1663,7 +1663,7 @@ static const gfx_layout tilelayout_wb = 16*64 }; -static GFXDECODE_START( wb ) +static GFXDECODE_START( gfx_wb ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout_wb, 0, 16 ) GFXDECODE_END @@ -1697,12 +1697,12 @@ static const gfx_layout sb3_tilebglayout = }; -static GFXDECODE_START( sb3 ) +static GFXDECODE_START( gfx_sb3 ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, sb3_tilebglayout, 0, 2 ) GFXDECODE_END -static GFXDECODE_START( hyperpac ) +static GFXDECODE_START( gfx_hyperpac ) GFXDECODE_ENTRY( "gfx1", 0, hyperpac_tilelayout, 0, 16 ) GFXDECODE_END @@ -1746,7 +1746,7 @@ MACHINE_CONFIG_START(snowbros_state::snowbros) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, snowbros_state, screen_vblank_snowbros)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", snowbros) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_snowbros) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1778,7 +1778,7 @@ MACHINE_CONFIG_START(snowbros_state::wintbob) MCFG_DEVICE_REMOVE("pandora") /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", wb) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_wb) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(snowbros_state, screen_update_wintbob) MCFG_SCREEN_VBLANK_CALLBACK(NOOP) @@ -1798,7 +1798,7 @@ MACHINE_CONFIG_START(snowbros_state::semicom) MCFG_DEVICE_PROGRAM_MAP(hyperpac_sound_map) MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_IO) - MCFG_GFXDECODE_MODIFY("gfxdecode", hyperpac) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_hyperpac) MCFG_DEVICE_MODIFY("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(NOOP) @@ -1854,7 +1854,7 @@ MACHINE_CONFIG_START(snowbros_state::honeydol) MCFG_SCREEN_UPDATE_DRIVER(snowbros_state, screen_update_honeydol) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", honeydol) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_honeydol) MCFG_PALETTE_ADD("palette", 0x800/2) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1895,7 +1895,7 @@ MACHINE_CONFIG_START(snowbros_state::twinadv) MCFG_SCREEN_UPDATE_DRIVER(snowbros_state, screen_update_twinadv) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", twinadv) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_twinadv) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1957,7 +1957,7 @@ MACHINE_CONFIG_START(snowbros_state::_4in1) semicom(config); /* basic machine hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", snowbros) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_snowbros) MACHINE_CONFIG_END MACHINE_CONFIG_START(snowbros_state::snowbro3) /* PCB has 16MHz & 12MHz OSCs */ @@ -1977,7 +1977,7 @@ MACHINE_CONFIG_START(snowbros_state::snowbro3) /* PCB has 16MHz & 12MHz OSCs */ MCFG_SCREEN_UPDATE_DRIVER(snowbros_state, screen_update_snowbro3) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sb3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sb3) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -2009,7 +2009,7 @@ MACHINE_CONFIG_START(snowbros_state::yutnori) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, snowbros_state, screen_vblank_snowbros)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hyperpac) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hyperpac) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/solomon.cpp b/src/mame/drivers/solomon.cpp index 011d42a5c06..9f3c5d9e3ab 100644 --- a/src/mame/drivers/solomon.cpp +++ b/src/mame/drivers/solomon.cpp @@ -195,7 +195,7 @@ static const gfx_layout spritelayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( solomon ) +static GFXDECODE_START( gfx_solomon ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) /* colors 0-127 */ GFXDECODE_ENTRY( "gfx2", 0, charlayout, 128, 8 ) /* colors 128-255 */ GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0, 8 ) /* colors 0-127 */ @@ -231,7 +231,7 @@ MACHINE_CONFIG_START(solomon_state::solomon) MCFG_SCREEN_UPDATE_DRIVER(solomon_state, screen_update_solomon) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", solomon) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_solomon) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/sonson.cpp b/src/mame/drivers/sonson.cpp index 88df1cb0a71..2e34bda9fc3 100644 --- a/src/mame/drivers/sonson.cpp +++ b/src/mame/drivers/sonson.cpp @@ -217,7 +217,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( sonson ) +static GFXDECODE_START( gfx_sonson ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 64*4, 32 ) GFXDECODE_END @@ -250,7 +250,7 @@ MACHINE_CONFIG_START(sonson_state::sonson) MCFG_SCREEN_UPDATE_DRIVER(sonson_state, screen_update_sonson) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sonson) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sonson) MCFG_PALETTE_ADD("palette", 64*4+32*8) MCFG_PALETTE_INDIRECT_ENTRIES(32) diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp index 17aefb4c578..11356065706 100644 --- a/src/mame/drivers/sorcerer.cpp +++ b/src/mame/drivers/sorcerer.cpp @@ -353,7 +353,7 @@ static const gfx_layout sorcerer_charlayout = }; /* This will show the 128 characters in the ROM + whatever happens to be in the PCG */ -static GFXDECODE_START( sorcerer ) +static GFXDECODE_START( gfx_sorcerer ) GFXDECODE_ENTRY( "maincpu", 0xf800, sorcerer_charlayout, 0, 1 ) GFXDECODE_END @@ -431,7 +431,7 @@ MACHINE_CONFIG_START(sorcerer_state::sorcerer) MCFG_SCREEN_UPDATE_DRIVER(sorcerer_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sorcerer) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sorcerer) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp index 2006fffb251..8851965dfc7 100644 --- a/src/mame/drivers/spartanxtec.cpp +++ b/src/mame/drivers/spartanxtec.cpp @@ -328,7 +328,7 @@ static const gfx_layout tiles16x16_layout = }; -static GFXDECODE_START( news ) +static GFXDECODE_START( gfx_news ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0x100, 32 ) GFXDECODE_ENTRY( "gfx2", 0, tiles16x16_layout, 0, 32 ) GFXDECODE_END @@ -387,7 +387,7 @@ MACHINE_CONFIG_START(spartanxtec_state::spartanxtec) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(spartanxtec_state,spartanxtec) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", news) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_news) /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/spbactn.cpp b/src/mame/drivers/spbactn.cpp index 3ab5ccd06d7..97b2af00d96 100644 --- a/src/mame/drivers/spbactn.cpp +++ b/src/mame/drivers/spbactn.cpp @@ -364,7 +364,7 @@ static const gfx_layout spritelayout = 16*8 }; -static GFXDECODE_START( spbactn ) +static GFXDECODE_START( gfx_spbactn ) GFXDECODE_ENTRY( "gfx1", 0, fgtilelayout, 0x0200, 16 + 240 ) GFXDECODE_ENTRY( "gfx2", 0, bgtilelayout, 0x0300, 16 + 128 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x0000, 0x1000 ) @@ -396,7 +396,7 @@ static const gfx_layout proto_spr_layout = }; -static GFXDECODE_START( spbactnp ) +static GFXDECODE_START( gfx_spbactnp ) GFXDECODE_ENTRY( "gfx1", 0, proto_fgtilelayout, 0x0200, 16 + 240 ) GFXDECODE_ENTRY( "gfx2", 0, proto_fgtilelayout, 0x0300, 16 + 128 ) // wrong GFXDECODE_ENTRY( "gfx3", 0, proto_spr_layout, 0x0000, 16 + 384 ) @@ -431,7 +431,7 @@ MACHINE_CONFIG_START(spbactn_state::spbactn) MCFG_VIDEO_START_OVERRIDE(spbactn_state,spbactn) MCFG_SCREEN_UPDATE_DRIVER(spbactn_state, screen_update_spbactn) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", spbactn) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spbactn) MCFG_PALETTE_ADD("palette", 0x2800/2) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -485,7 +485,7 @@ MACHINE_CONFIG_START(spbactn_state::spbactnp) MCFG_VIDEO_START_OVERRIDE(spbactn_state,spbactnp) MCFG_SCREEN_UPDATE_DRIVER(spbactn_state, screen_update_spbactnp) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", spbactnp) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spbactnp) MCFG_PALETTE_ADD("palette", 0x2800/2) MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG) diff --git a/src/mame/drivers/spcforce.cpp b/src/mame/drivers/spcforce.cpp index dc980a8fb4e..32176f944c8 100644 --- a/src/mame/drivers/spcforce.cpp +++ b/src/mame/drivers/spcforce.cpp @@ -243,7 +243,7 @@ static const gfx_layout charlayout = }; -static GFXDECODE_START( spcforce ) +static GFXDECODE_START( gfx_spcforce ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) GFXDECODE_END @@ -311,7 +311,7 @@ MACHINE_CONFIG_START(spcforce_state::spcforce) MCFG_SCREEN_UPDATE_DRIVER(spcforce_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", spcforce) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spcforce) MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(colortable_source)) MCFG_PALETTE_INIT_OWNER(spcforce_state, spcforce) diff --git a/src/mame/drivers/spdodgeb.cpp b/src/mame/drivers/spdodgeb.cpp index ca1caa6ee49..4028caca25c 100644 --- a/src/mame/drivers/spdodgeb.cpp +++ b/src/mame/drivers/spdodgeb.cpp @@ -371,7 +371,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( spdodgeb ) +static GFXDECODE_START( gfx_spdodgeb ) GFXDECODE_ENTRY( "text", 0, charlayout, 0x000, 32 ) /* colors 0x000-0x1ff */ GFXDECODE_ENTRY( "sprites", 0, spritelayout, 0x200, 32 ) /* colors 0x200-0x3ff */ GFXDECODE_END @@ -421,7 +421,7 @@ MACHINE_CONFIG_START(spdodgeb_state::spdodgeb) MCFG_SCREEN_UPDATE_DRIVER(spdodgeb_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", spdodgeb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spdodgeb) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_INIT_OWNER(spdodgeb_state, spdodgeb) diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp index 2d672f2da2d..82a6110c36f 100644 --- a/src/mame/drivers/spectrum.cpp +++ b/src/mame/drivers/spectrum.cpp @@ -639,7 +639,7 @@ static const gfx_layout spectrum_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( spectrum ) +static GFXDECODE_START( gfx_spectrum ) GFXDECODE_ENTRY( "maincpu", 0x3d00, spectrum_charlayout, 0, 8 ) GFXDECODE_END @@ -688,7 +688,7 @@ MACHINE_CONFIG_START(spectrum_state::spectrum_common) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(spectrum_state, spectrum ) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", spectrum) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spectrum) MCFG_VIDEO_START_OVERRIDE(spectrum_state, spectrum ) /* sound hardware */ diff --git a/src/mame/drivers/speedatk.cpp b/src/mame/drivers/speedatk.cpp index cf723a66f97..4a110026b3a 100644 --- a/src/mame/drivers/speedatk.cpp +++ b/src/mame/drivers/speedatk.cpp @@ -293,7 +293,7 @@ static const gfx_layout charlayout_3bpp = }; -static GFXDECODE_START( speedatk ) +static GFXDECODE_START( gfx_speedatk ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_1bpp, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout_3bpp, 0, 32 ) GFXDECODE_END @@ -329,7 +329,7 @@ MACHINE_CONFIG_START(speedatk_state::speedatk) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", speedatk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_speedatk) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_INDIRECT_ENTRIES(16) MCFG_PALETTE_INIT_OWNER(speedatk_state, speedatk) diff --git a/src/mame/drivers/speedbal.cpp b/src/mame/drivers/speedbal.cpp index 69d78e39710..72c1d60198a 100644 --- a/src/mame/drivers/speedbal.cpp +++ b/src/mame/drivers/speedbal.cpp @@ -255,7 +255,7 @@ static const gfx_layout spritelayout = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( speedbal ) +static GFXDECODE_START( gfx_speedbal ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 256, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 512, 16 ) GFXDECODE_ENTRY( "sprites", 0, spritelayout, 0, 16 ) @@ -285,7 +285,7 @@ MACHINE_CONFIG_START(speedbal_state::speedbal) MCFG_SCREEN_UPDATE_DRIVER(speedbal_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", speedbal) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_speedbal) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) diff --git a/src/mame/drivers/speedspn.cpp b/src/mame/drivers/speedspn.cpp index e4cab4c290f..feb2cce13ca 100644 --- a/src/mame/drivers/speedspn.cpp +++ b/src/mame/drivers/speedspn.cpp @@ -254,7 +254,7 @@ static const gfx_layout speedspn_spritelayout = }; -static GFXDECODE_START( speedspn ) +static GFXDECODE_START( gfx_speedspn ) GFXDECODE_ENTRY( "gfx1", 0, speedspn_charlayout, 0x000, 0x40 ) GFXDECODE_ENTRY( "gfx2", 0, speedspn_spritelayout, 0x000, 0x40 ) GFXDECODE_END @@ -301,7 +301,7 @@ MACHINE_CONFIG_START(speedspn_state::speedspn) MCFG_SCREEN_UPDATE_DRIVER(speedspn_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", speedspn) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_speedspn) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) diff --git a/src/mame/drivers/speglsht.cpp b/src/mame/drivers/speglsht.cpp index c3a81ac6ef8..d581cae6fb2 100644 --- a/src/mame/drivers/speglsht.cpp +++ b/src/mame/drivers/speglsht.cpp @@ -352,7 +352,7 @@ static INPUT_PORTS_START( speglsht ) PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) INPUT_PORTS_END -static GFXDECODE_START( speglsht ) +static GFXDECODE_START( gfx_speglsht ) GFXDECODE_END @@ -432,7 +432,7 @@ MACHINE_CONFIG_START(speglsht_state::speglsht) MCFG_SCREEN_VISIBLE_AREA(0, 319, 8, 239-8) MCFG_SCREEN_UPDATE_DRIVER(speglsht_state, screen_update_speglsht) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", speglsht) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_speglsht) MCFG_PALETTE_ADD("palette", 16*16*4+1) MCFG_VIDEO_START_OVERRIDE(speglsht_state,speglsht) diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp index 4c820c69bf6..93dceb955fd 100644 --- a/src/mame/drivers/splash.cpp +++ b/src/mame/drivers/splash.cpp @@ -468,7 +468,7 @@ static const gfx_layout tilelayout16 = 32*8 }; -static GFXDECODE_START( splash ) +static GFXDECODE_START( gfx_splash ) GFXDECODE_ENTRY( "gfx1", 0x000000, tilelayout8 ,0,128 ) GFXDECODE_ENTRY( "gfx1", 0x000000, tilelayout16,0,128 ) GFXDECODE_END @@ -511,7 +511,7 @@ MACHINE_CONFIG_START(splash_state::splash) MCFG_SCREEN_UPDATE_DRIVER(splash_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", splash) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_splash) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -574,7 +574,7 @@ MACHINE_CONFIG_START(splash_state::roldfrog) MCFG_SCREEN_UPDATE_DRIVER(splash_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", splash) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_splash) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -663,7 +663,7 @@ MACHINE_CONFIG_START(funystrp_state::funystrp) MCFG_SCREEN_UPDATE_DRIVER(funystrp_state, screen_update_funystrp) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", splash) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_splash) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp index 7e065d2673e..c891c5dbbe7 100644 --- a/src/mame/drivers/spoker.cpp +++ b/src/mame/drivers/spoker.cpp @@ -555,7 +555,7 @@ static const gfx_layout layout3s8_8x8x6 = 16*8 }; -static GFXDECODE_START( spoker ) +static GFXDECODE_START( gfx_spoker ) GFXDECODE_ENTRY( "gfx1", 0x00000, layout_8x8x6, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0x04000, layout_8x32x6, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0x08000, layout_8x32x6, 0, 16 ) @@ -563,7 +563,7 @@ static GFXDECODE_START( spoker ) GFXDECODE_ENTRY( "gfx2", 0x00000, layout_8x32x6, 0, 16 ) GFXDECODE_END -static GFXDECODE_START( 3super8 ) +static GFXDECODE_START( gfx_3super8 ) GFXDECODE_ENTRY( "gfx1", 0x00000, layout3s8_8x8x6, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0x04000, layout_8x32x6, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0x08000, layout_8x32x6, 0, 16 ) @@ -626,7 +626,7 @@ MACHINE_CONFIG_START(spoker_state::spoker) MCFG_SCREEN_UPDATE_DRIVER(spoker_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", spoker) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spoker) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -653,7 +653,7 @@ MACHINE_CONFIG_START(spoker_state::_3super8) MCFG_DEVICE_REMOVE("ppi8255_0") MCFG_DEVICE_REMOVE("ppi8255_1") - MCFG_GFXDECODE_MODIFY("gfxdecode", 3super8) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_3super8) MCFG_DEVICE_REMOVE("ymsnd") MACHINE_CONFIG_END diff --git a/src/mame/drivers/spool99.cpp b/src/mame/drivers/spool99.cpp index c74320c2b94..fd30bf607be 100644 --- a/src/mame/drivers/spool99.cpp +++ b/src/mame/drivers/spool99.cpp @@ -307,7 +307,7 @@ static const gfx_layout spool99_layout = 8*32 }; -static GFXDECODE_START( spool99 ) +static GFXDECODE_START( gfx_spool99 ) GFXDECODE_ENTRY( "gfx", 0, spool99_layout, 0x00, 0x20 ) GFXDECODE_END @@ -367,7 +367,7 @@ MACHINE_CONFIG_START(spool99_state::spool99) MCFG_DEVICE_PROGRAM_MAP(spool99_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spool99_state, irq0_line_hold) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", spool99) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spool99) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/sprcros2.cpp b/src/mame/drivers/sprcros2.cpp index 6098ad4b985..8e4f387fd56 100644 --- a/src/mame/drivers/sprcros2.cpp +++ b/src/mame/drivers/sprcros2.cpp @@ -358,7 +358,7 @@ static const gfx_layout fg_layout = 8*8*2 }; -static GFXDECODE_START( sprcros2 ) +static GFXDECODE_START( gfx_sprcros2 ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x3_planar, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, sprite_layout, 256, 32 ) GFXDECODE_ENTRY( "gfx3", 0, fg_layout, 512, 64 ) @@ -473,7 +473,7 @@ MACHINE_CONFIG_START(sprcros2_state::sprcros2) MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 343, 8, 256-8, 262, 16, 240) // TODO: Wrong screen parameters MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sprcros2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sprcros2) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_INDIRECT_ENTRIES(32) diff --git a/src/mame/drivers/sprint2.cpp b/src/mame/drivers/sprint2.cpp index 386df896eef..efcfeeb5e2d 100644 --- a/src/mame/drivers/sprint2.cpp +++ b/src/mame/drivers/sprint2.cpp @@ -484,7 +484,7 @@ static const gfx_layout car_layout = }; -static GFXDECODE_START( sprint2 ) +static GFXDECODE_START( gfx_sprint2 ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, car_layout, 4, 4 ) GFXDECODE_END @@ -509,7 +509,7 @@ MACHINE_CONFIG_START(sprint2_state::sprint2) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sprint2_state, screen_vblank_sprint2)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sprint2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sprint2) MCFG_PALETTE_ADD("palette", 12) MCFG_PALETTE_INDIRECT_ENTRIES(4) MCFG_PALETTE_INIT_OWNER(sprint2_state, sprint2) diff --git a/src/mame/drivers/sprint4.cpp b/src/mame/drivers/sprint4.cpp index b26a73bf4f1..6d1fb1d6fca 100644 --- a/src/mame/drivers/sprint4.cpp +++ b/src/mame/drivers/sprint4.cpp @@ -373,7 +373,7 @@ static const gfx_layout car_layout = }; -static GFXDECODE_START( sprint4 ) +static GFXDECODE_START( gfx_sprint4 ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x1, 0, 5 ) GFXDECODE_ENTRY( "gfx2", 0, car_layout, 0, 5 ) GFXDECODE_END @@ -395,7 +395,7 @@ MACHINE_CONFIG_START(sprint4_state::sprint4) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sprint4_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sprint4) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sprint4) MCFG_PALETTE_ADD("palette", 10) MCFG_PALETTE_INDIRECT_ENTRIES(6) MCFG_PALETTE_INIT_OWNER(sprint4_state, sprint4) diff --git a/src/mame/drivers/sprint8.cpp b/src/mame/drivers/sprint8.cpp index a6e79b03253..a1dd5e84d53 100644 --- a/src/mame/drivers/sprint8.cpp +++ b/src/mame/drivers/sprint8.cpp @@ -448,7 +448,7 @@ static const gfx_layout car_layout = }; -static GFXDECODE_START( sprint8 ) +static GFXDECODE_START( gfx_sprint8 ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout_1, 0, 18 ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout_2, 0, 18 ) GFXDECODE_ENTRY( "gfx2", 0, car_layout, 0, 16 ) @@ -473,7 +473,7 @@ MACHINE_CONFIG_START(sprint8_state::sprint8) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sprint8_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sprint8) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sprint8) MCFG_PALETTE_ADD("palette", 36) MCFG_PALETTE_INDIRECT_ENTRIES(18) MCFG_PALETTE_INIT_OWNER(sprint8_state, sprint8) diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp index 722df0fe8b4..e13065ecab7 100644 --- a/src/mame/drivers/spyhuntertec.cpp +++ b/src/mame/drivers/spyhuntertec.cpp @@ -647,7 +647,7 @@ static const gfx_layout spyhuntertec_charlayout = }; -static GFXDECODE_START( spyhuntertec ) +static GFXDECODE_START( gfx_spyhuntertec ) GFXDECODE_ENTRY( "gfx1", 0, spyhuntertec_charlayout, 3*16, 1 ) GFXDECODE_ENTRY( "gfx2", 0, spyhuntertec_sprite_layout, 0*16, 4 ) GFXDECODE_ENTRY( "gfx3", 0, spyhuntertec_alphalayout, 4*16, 1 ) @@ -689,7 +689,7 @@ MACHINE_CONFIG_START(spyhuntertec_state::spyhuntertec) MCFG_SCREEN_UPDATE_DRIVER(spyhuntertec_state, screen_update_spyhuntertec) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", spyhuntertec) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_spyhuntertec) MCFG_PALETTE_ADD("palette", 64+4) // MCFG_PALETTE_INIT_OWNER(spyhuntertec_state,spyhunt) diff --git a/src/mame/drivers/srmp2.cpp b/src/mame/drivers/srmp2.cpp index 379e3cd66f1..3efffe5bfdd 100644 --- a/src/mame/drivers/srmp2.cpp +++ b/src/mame/drivers/srmp2.cpp @@ -1132,11 +1132,11 @@ static const gfx_layout charlayout = 16*16*2 }; -static GFXDECODE_START( srmp2 ) +static GFXDECODE_START( gfx_srmp2 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_END -static GFXDECODE_START( srmp3 ) +static GFXDECODE_START( gfx_srmp3 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) GFXDECODE_END @@ -1164,7 +1164,7 @@ MACHINE_CONFIG_START(srmp2_state::srmp2) MCFG_SCREEN_UPDATE_DRIVER(srmp2_state, screen_update_srmp2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", srmp2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_srmp2) MCFG_PALETTE_ADD("palette", 1024) /* sprites only */ MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -1211,7 +1211,7 @@ MACHINE_CONFIG_START(srmp2_state::srmp3) MCFG_SCREEN_UPDATE_DRIVER(srmp2_state, screen_update_srmp3) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", srmp3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_srmp3) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -1266,7 +1266,7 @@ MACHINE_CONFIG_START(srmp2_state::mjyuugi) MCFG_SCREEN_UPDATE_DRIVER(srmp2_state, screen_update_mjyuugi) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", srmp3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_srmp3) MCFG_PALETTE_ADD("palette", 512) /* sprites only */ MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/srmp5.cpp b/src/mame/drivers/srmp5.cpp index a3f4cb89e0b..2b7b63fffeb 100644 --- a/src/mame/drivers/srmp5.cpp +++ b/src/mame/drivers/srmp5.cpp @@ -557,7 +557,7 @@ static const gfx_layout tile_16x16x8_layout = }; #endif -static GFXDECODE_START( srmp5 ) +static GFXDECODE_START( gfx_srmp5 ) GFXDECODE_ENTRY( "gfx1", 0, tile_16x8x8_layout, 0x0, 0x800 ) //GFXDECODE_ENTRY( "gfx1", 0, tile_16x16x8_layout, 0x0, 0x800 ) GFXDECODE_END @@ -589,7 +589,7 @@ MACHINE_CONFIG_START(srmp5_state::srmp5) MCFG_PALETTE_MEMBITS(16) #ifdef DEBUG_CHAR - MCFG_GFXDECODE_ADD("gfxdecode", "palette", srmp5 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_srmp5) #endif MACHINE_CONFIG_END diff --git a/src/mame/drivers/srmp6.cpp b/src/mame/drivers/srmp6.cpp index 68bba03a107..158dc4ca000 100644 --- a/src/mame/drivers/srmp6.cpp +++ b/src/mame/drivers/srmp6.cpp @@ -695,7 +695,7 @@ MACHINE_CONFIG_START(srmp6_state::srmp6) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - 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/srumbler.cpp b/src/mame/drivers/srumbler.cpp index f76a99d1e41..504a69192d2 100644 --- a/src/mame/drivers/srumbler.cpp +++ b/src/mame/drivers/srumbler.cpp @@ -237,7 +237,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( srumbler ) +static GFXDECODE_START( gfx_srumbler ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 448, 16 ) /* colors 448 - 511 */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 128, 8 ) /* colors 128 - 255 */ GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 256, 8 ) /* colors 256 - 383 */ @@ -269,7 +269,7 @@ MACHINE_CONFIG_START(srumbler_state::srumbler) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", srumbler) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_srumbler) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) diff --git a/src/mame/drivers/sshangha.cpp b/src/mame/drivers/sshangha.cpp index e03f879a209..d7a79a9df40 100644 --- a/src/mame/drivers/sshangha.cpp +++ b/src/mame/drivers/sshangha.cpp @@ -368,7 +368,7 @@ static const gfx_layout tilelayout = 64*8 }; -static GFXDECODE_START( sshangha ) +static GFXDECODE_START( gfx_sshangha ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x200, 64 ) /* Characters 8x8 */ GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0x200, 64 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 64 ) /* Sprites 16x16 */ @@ -401,7 +401,7 @@ MACHINE_CONFIG_START(sshangha_state::sshangha) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) MCFG_SCREEN_UPDATE_DRIVER(sshangha_state, screen_update_sshangha) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sshangha) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sshangha) MCFG_PALETTE_ADD("palette", 0x4000) MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) diff --git a/src/mame/drivers/sshot.cpp b/src/mame/drivers/sshot.cpp index dcec2c3f005..be1bbf0e708 100644 --- a/src/mame/drivers/sshot.cpp +++ b/src/mame/drivers/sshot.cpp @@ -336,7 +336,7 @@ static const gfx_layout supershot_charlayout = 8*8 }; -static GFXDECODE_START( supershot ) +static GFXDECODE_START( gfx_supershot ) GFXDECODE_ENTRY( "gfx", 0, supershot_charlayout, 0, 1 ) GFXDECODE_END @@ -355,7 +355,7 @@ MACHINE_CONFIG_START(supershot_state::supershot) MCFG_SCREEN_UPDATE_DRIVER(supershot_state, screen_update_supershot) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", supershot) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_supershot) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/ssingles.cpp b/src/mame/drivers/ssingles.cpp index 42ce5d94020..7c26793268b 100644 --- a/src/mame/drivers/ssingles.cpp +++ b/src/mame/drivers/ssingles.cpp @@ -535,11 +535,11 @@ static const gfx_layout layout_8x16 = 8*8 }; -static GFXDECODE_START( ssingles ) +static GFXDECODE_START( gfx_ssingles ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8, 0, 8 ) GFXDECODE_END -static GFXDECODE_START( atamanot ) +static GFXDECODE_START( gfx_atamanot ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8, 0, 8 ) GFXDECODE_ENTRY( "kanji", 0, layout_16x16, 0, 8 ) GFXDECODE_ENTRY( "kanji_uc", 0, layout_8x16, 0, 8 ) @@ -558,7 +558,7 @@ MACHINE_CONFIG_START(ssingles_state::ssingles) MCFG_PALETTE_ADD("palette", 4) //guess - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ssingles) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ssingles) MCFG_MC6845_ADD("crtc", MC6845, "screen", 1000000 /* ? MHz */) MCFG_MC6845_SHOW_BORDER_AREA(false) @@ -596,7 +596,7 @@ MACHINE_CONFIG_START(ssingles_state::atamanot) MCFG_MC6845_UPDATE_ROW_CB(ssingles_state, atamanot_update_row) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, ssingles_state, atamanot_irq)) - MCFG_GFXDECODE_MODIFY("gfxdecode", atamanot) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_atamanot) MACHINE_CONFIG_END ROM_START( ssingles ) diff --git a/src/mame/drivers/sslam.cpp b/src/mame/drivers/sslam.cpp index a9974b466f2..f4ebd420f20 100644 --- a/src/mame/drivers/sslam.cpp +++ b/src/mame/drivers/sslam.cpp @@ -676,14 +676,14 @@ static const gfx_layout tiles16x16_layout = 16*16 }; -static GFXDECODE_START( sslam ) +static GFXDECODE_START( gfx_sslam ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout, 0x300, 16 ) /* spr */ GFXDECODE_ENTRY( "gfx1", 0, tiles16x16_layout, 0, 16 ) /* bg */ GFXDECODE_ENTRY( "gfx1", 0, tiles16x16_layout, 0x100, 16 ) /* mid */ GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0x200, 16 ) /* tx */ GFXDECODE_END -static GFXDECODE_START( powerbls ) +static GFXDECODE_START( gfx_powerbls ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout, 0x100, 16 ) /* spr */ GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) /* bg */ GFXDECODE_END @@ -710,7 +710,7 @@ MACHINE_CONFIG_START(sslam_state::sslam) MCFG_SCREEN_UPDATE_DRIVER(sslam_state, screen_update_sslam) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sslam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sslam) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -744,7 +744,7 @@ MACHINE_CONFIG_START(sslam_state::powerbls) MCFG_SCREEN_UPDATE_DRIVER(sslam_state, screen_update_powerbls) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", powerbls) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_powerbls) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) diff --git a/src/mame/drivers/ssozumo.cpp b/src/mame/drivers/ssozumo.cpp index fe5305edaf0..867aa91bef3 100644 --- a/src/mame/drivers/ssozumo.cpp +++ b/src/mame/drivers/ssozumo.cpp @@ -182,7 +182,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( ssozumo ) +static GFXDECODE_START( gfx_ssozumo ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 4 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 4*8, 4 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 8*8, 2 ) @@ -216,7 +216,7 @@ MACHINE_CONFIG_START(ssozumo_state::ssozumo) MCFG_SCREEN_UPDATE_DRIVER(ssozumo_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ssozumo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ssozumo) MCFG_PALETTE_ADD("palette", 64 + 16) MCFG_PALETTE_INIT_OWNER(ssozumo_state, ssozumo) diff --git a/src/mame/drivers/sspeedr.cpp b/src/mame/drivers/sspeedr.cpp index 9d53bdb9883..a8b86553b22 100644 --- a/src/mame/drivers/sspeedr.cpp +++ b/src/mame/drivers/sspeedr.cpp @@ -184,7 +184,7 @@ static const gfx_layout car_layout = }; -static GFXDECODE_START( sspeedr ) +static GFXDECODE_START( gfx_sspeedr ) GFXDECODE_ENTRY( "gfx1", 0, car_layout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, car_layout, 0, 1 ) GFXDECODE_END @@ -210,7 +210,7 @@ MACHINE_CONFIG_START(sspeedr_state::sspeedr) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sspeedr_state, screen_vblank_sspeedr)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sspeedr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sspeedr) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(sspeedr_state, sspeedr) diff --git a/src/mame/drivers/ssrj.cpp b/src/mame/drivers/ssrj.cpp index 7407a3fa0fc..3b7528c767c 100644 --- a/src/mame/drivers/ssrj.cpp +++ b/src/mame/drivers/ssrj.cpp @@ -136,7 +136,7 @@ static const gfx_layout charlayout = 8*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( ssrj ) +static GFXDECODE_START( gfx_ssrj ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 0x10 ) GFXDECODE_END @@ -157,7 +157,7 @@ MACHINE_CONFIG_START(ssrj_state::ssrj) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ssrj_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ssrj) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ssrj) MCFG_PALETTE_ADD("palette", 128) MCFG_PALETTE_INIT_OWNER(ssrj_state, ssrj) diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp index d72350ca7ed..59dbabfcedb 100644 --- a/src/mame/drivers/ssv.cpp +++ b/src/mame/drivers/ssv.cpp @@ -2413,7 +2413,7 @@ static const gfx_layout layout_16x8x6 = 16*8*2 }; -static GFXDECODE_START( ssv ) +static GFXDECODE_START( gfx_ssv ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x8x8, 0, 0x8000/64 ) // [0] Sprites (256 colors) GFXDECODE_ENTRY( "gfx1", 0, layout_16x8x6, 0, 0x8000/64 ) // [1] Sprites (64 colors) GFXDECODE_END @@ -2440,7 +2440,7 @@ static const gfx_layout layout_16x8x6_ram = 16*8*8 }; -static GFXDECODE_START( eaglshot ) +static GFXDECODE_START( gfx_eaglshot ) GFXDECODE_ENTRY( nullptr, 0, layout_16x8x8_ram, 0, 0x8000/64 ) // [0] Sprites (256 colors, decoded from ram) GFXDECODE_ENTRY( nullptr, 0, layout_16x8x6_ram, 0, 0x8000/64 ) // [1] Sprites (64 colors, decoded from ram) GFXDECODE_END @@ -2456,7 +2456,7 @@ static const gfx_layout layout_16x16x8 = 16*16*8 }; -static GFXDECODE_START( gdfs ) +static GFXDECODE_START( gfx_gdfs ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x8x8, 0, 0x8000/64 ) // [0] Sprites (256 colors) GFXDECODE_ENTRY( "gfx1", 0, layout_16x8x6, 0, 0x8000/64 ) // [1] Sprites (64 colors) GFXDECODE_ENTRY( "gfx3", 0, layout_16x16x8, 0, 0x8000/256 ) // [3] Tilemap @@ -2559,7 +2559,7 @@ MACHINE_CONFIG_START(ssv_state::ssv) MCFG_SCREEN_UPDATE_DRIVER(ssv_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ssv) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ssv) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_FORMAT(XRGB) @@ -2623,7 +2623,7 @@ MACHINE_CONFIG_START(ssv_state::gdfs) MCFG_DEVICE_ADD("st0020_spr", ST0020_SPRITES, 0) MCFG_ST0020_SPRITES_PALETTE("palette") - MCFG_GFXDECODE_MODIFY("gfxdecode", gdfs) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_gdfs) MCFG_VIDEO_START_OVERRIDE(ssv_state,gdfs) MACHINE_CONFIG_END @@ -2838,7 +2838,7 @@ MACHINE_CONFIG_START(ssv_state::eaglshot) MCFG_SCREEN_VISIBLE_AREA(0, (0xca - 0x2a)*2-1, 0, (0xf6 - 0x16)-1) MCFG_SCREEN_UPDATE_DRIVER(ssv_state, screen_update_eaglshot) - MCFG_GFXDECODE_MODIFY("gfxdecode", eaglshot) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_eaglshot) MCFG_VIDEO_START_OVERRIDE(ssv_state,eaglshot) MACHINE_CONFIG_END diff --git a/src/mame/drivers/stadhero.cpp b/src/mame/drivers/stadhero.cpp index 5707620a327..99c4e069bc7 100644 --- a/src/mame/drivers/stadhero.cpp +++ b/src/mame/drivers/stadhero.cpp @@ -193,7 +193,7 @@ static const gfx_layout spritelayout = 16*16 }; -static GFXDECODE_START( stadhero ) +static GFXDECODE_START( gfx_stadhero ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) /* Characters 8x8 */ GFXDECODE_ENTRY( "gfx2", 0, tile_3bpp, 512, 16 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 256, 16 ) /* Sprites 16x16 */ @@ -220,7 +220,7 @@ MACHINE_CONFIG_START(stadhero_state::stadhero) MCFG_SCREEN_UPDATE_DRIVER(stadhero_state, screen_update_stadhero) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", stadhero) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_stadhero) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/starcrus.cpp b/src/mame/drivers/starcrus.cpp index 5836047a0d2..4df6ca05d52 100644 --- a/src/mame/drivers/starcrus.cpp +++ b/src/mame/drivers/starcrus.cpp @@ -113,7 +113,7 @@ static const gfx_layout spritelayout2 = 1 /* every sprite takes 1 consecutive bytes */ }; -static GFXDECODE_START( starcrus ) +static GFXDECODE_START( gfx_starcrus ) GFXDECODE_ENTRY( "gfx1", 0x0000, spritelayout1, 0, 1 ) GFXDECODE_ENTRY( "gfx1", 0x0040, spritelayout1, 0, 1 ) GFXDECODE_ENTRY( "gfx1", 0x0080, spritelayout1, 0, 1 ) @@ -157,7 +157,7 @@ MACHINE_CONFIG_START(starcrus_state::starcrus) MCFG_SCREEN_UPDATE_DRIVER(starcrus_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", starcrus) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_starcrus) MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/starshp1.cpp b/src/mame/drivers/starshp1.cpp index ba760bd69e2..cf2521bcf32 100644 --- a/src/mame/drivers/starshp1.cpp +++ b/src/mame/drivers/starshp1.cpp @@ -281,7 +281,7 @@ static const gfx_layout shiplayout = }; -static GFXDECODE_START( starshp1 ) +static GFXDECODE_START( gfx_starshp1 ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 2, 2 ) GFXDECODE_ENTRY( "gfx3", 0, shiplayout, 6, 2 ) @@ -315,7 +315,7 @@ MACHINE_CONFIG_START(starshp1_state::starshp1) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, starshp1_state, screen_vblank_starshp1)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", starshp1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_starshp1) MCFG_PALETTE_ADD("palette", 19) MCFG_PALETTE_INDIRECT_ENTRIES(8) MCFG_PALETTE_INIT_OWNER(starshp1_state, starshp1) diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp index 23ab4279024..3cdfd56a8ab 100644 --- a/src/mame/drivers/statriv2.cpp +++ b/src/mame/drivers/statriv2.cpp @@ -570,7 +570,7 @@ static const gfx_layout horizontal_tiles_layout = 16*8 }; -static GFXDECODE_START( horizontal ) +static GFXDECODE_START( gfx_horizontal ) GFXDECODE_ENTRY( "tiles", 0, horizontal_tiles_layout, 0, 64 ) GFXDECODE_END @@ -586,7 +586,7 @@ static const gfx_layout vertical_tiles_layout = 8*8 }; -static GFXDECODE_START( vertical ) +static GFXDECODE_START( gfx_vertical ) GFXDECODE_ENTRY( "tiles", 0, vertical_tiles_layout, 0, 64 ) GFXDECODE_END @@ -625,7 +625,7 @@ MACHINE_CONFIG_START(statriv2_state::statriv2) MCFG_DEVICE_ADD("tms", TMS9927, MASTER_CLOCK/2/8) MCFG_TMS9927_CHAR_WIDTH(8) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", horizontal) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_horizontal) MCFG_PALETTE_ADD("palette", 2*64) MCFG_PALETTE_INIT_OWNER(statriv2_state, statriv2) @@ -645,7 +645,7 @@ MACHINE_CONFIG_START(statriv2_state::statriv2v) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 392, 0, 256, 262, 0, 256) MCFG_VIDEO_START_OVERRIDE(statriv2_state, vertical) - MCFG_GFXDECODE_MODIFY("gfxdecode", vertical) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_vertical) MACHINE_CONFIG_END MACHINE_CONFIG_START(statriv2_state::funcsino) diff --git a/src/mame/drivers/stlforce.cpp b/src/mame/drivers/stlforce.cpp index 1947cdbaa4b..85d96d72b15 100644 --- a/src/mame/drivers/stlforce.cpp +++ b/src/mame/drivers/stlforce.cpp @@ -186,7 +186,7 @@ static const gfx_layout stlforce_splayout = 32*8 }; -static GFXDECODE_START( stlforce ) +static GFXDECODE_START( gfx_stlforce ) GFXDECODE_ENTRY( "gfx1", 0, stlforce_bglayout, 0, 256 ) GFXDECODE_ENTRY( "gfx1", 0, stlforce_txlayout, 0, 256 ) GFXDECODE_ENTRY( "gfx2", 0, stlforce_splayout, 0, 256 ) @@ -211,7 +211,7 @@ MACHINE_CONFIG_START(stlforce_state::stlforce) MCFG_SCREEN_UPDATE_DRIVER(stlforce_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", stlforce) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_stlforce) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/strnskil.cpp b/src/mame/drivers/strnskil.cpp index 35f3e90a6cb..af4e852b06f 100644 --- a/src/mame/drivers/strnskil.cpp +++ b/src/mame/drivers/strnskil.cpp @@ -326,7 +326,7 @@ static const gfx_layout spritelayout = 8*8*4 }; -static GFXDECODE_START( strnskil ) +static GFXDECODE_START( gfx_strnskil ) GFXDECODE_ENTRY( "gfx2", 0x0000, charlayout, 512, 64 ) GFXDECODE_ENTRY( "gfx1", 0x0000, spritelayout, 0, 64 ) GFXDECODE_END @@ -368,7 +368,7 @@ MACHINE_CONFIG_START(strnskil_state::strnskil) MCFG_SCREEN_UPDATE_DRIVER(strnskil_state, screen_update_strnskil) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", strnskil) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_strnskil) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(strnskil_state, strnskil) diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp index 0dc8ffa534e..90f15446543 100644 --- a/src/mame/drivers/stuntair.cpp +++ b/src/mame/drivers/stuntair.cpp @@ -463,7 +463,7 @@ static const gfx_layout tiles16x8x2_layout = }; -static GFXDECODE_START( stuntair ) +static GFXDECODE_START( gfx_stuntair ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0x100, 1 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x8x2_layout, 0xe0, 8 ) GFXDECODE_ENTRY( "gfx3", 0, tiles16x8x2_layout, 0xe0, 8 ) @@ -548,7 +548,7 @@ MACHINE_CONFIG_START(stuntair_state::stuntair) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, stuntair_state, stuntair_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", stuntair) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_stuntair) MCFG_PALETTE_ADD("palette", 0x100+2) MCFG_PALETTE_INIT_OWNER(stuntair_state, stuntair) diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 65c4793b3b2..6fe65d4c1bb 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -1109,7 +1109,7 @@ MACHINE_CONFIG_START(stv_state::stv) MCFG_SCREEN_UPDATE_DRIVER(stv_state, screen_update_stv_vdp2) MCFG_PALETTE_ADD("palette", 2048+(2048*2))//standard palette + extra memory for rgb brightness. - MCFG_GFXDECODE_ADD("gfxdecode", "palette", stv) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_stv) MCFG_VIDEO_START_OVERRIDE(stv_state,stv_vdp2) diff --git a/src/mame/drivers/sub.cpp b/src/mame/drivers/sub.cpp index e36ee9f5624..37cde369e04 100644 --- a/src/mame/drivers/sub.cpp +++ b/src/mame/drivers/sub.cpp @@ -280,7 +280,7 @@ static const gfx_layout tiles16x32_layout = 64*8 }; -static GFXDECODE_START( sub ) +static GFXDECODE_START( gfx_sub ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 0x80 ) GFXDECODE_ENTRY( "gfx2", 0, tiles16x32_layout, 0, 0x80 ) GFXDECODE_END @@ -334,7 +334,7 @@ MACHINE_CONFIG_START(sub_state::sub) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sub_state, main_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sub) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sub) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_INDIRECT_ENTRIES(0x100) MCFG_PALETTE_INIT_OWNER(sub_state, sub) diff --git a/src/mame/drivers/subhuntr.cpp b/src/mame/drivers/subhuntr.cpp index 653225a792c..00bfbbe6719 100644 --- a/src/mame/drivers/subhuntr.cpp +++ b/src/mame/drivers/subhuntr.cpp @@ -136,7 +136,7 @@ static const gfx_layout tiles8x8_layout = 8*8 }; -static GFXDECODE_START( subhuntr ) +static GFXDECODE_START( gfx_subhuntr ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 1 ) GFXDECODE_END @@ -166,7 +166,7 @@ MACHINE_CONFIG_START(subhuntr_state::subhuntr) MCFG_SCREEN_UPDATE_DRIVER(subhuntr_state, screen_update_subhuntr) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", subhuntr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_subhuntr) MCFG_PALETTE_ADD("palette", 26) MCFG_PALETTE_INIT_OWNER(subhuntr_state, subhuntr) diff --git a/src/mame/drivers/subs.cpp b/src/mame/drivers/subs.cpp index 5fa192c5f96..0154634419f 100644 --- a/src/mame/drivers/subs.cpp +++ b/src/mame/drivers/subs.cpp @@ -161,7 +161,7 @@ static const gfx_layout motion_layout = }; -static GFXDECODE_START( subs ) +static GFXDECODE_START( gfx_subs ) GFXDECODE_ENTRY( "gfx1", 0, playfield_layout, 0, 2 ) /* playfield graphics */ GFXDECODE_ENTRY( "gfx2", 0, motion_layout, 0, 2 ) /* motion graphics */ GFXDECODE_END @@ -182,7 +182,7 @@ MACHINE_CONFIG_START(subs_state::subs) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", subs) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_subs) MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(subs_state, subs) diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp index 5ea6a5b969a..e840760a910 100644 --- a/src/mame/drivers/subsino.cpp +++ b/src/mame/drivers/subsino.cpp @@ -2726,7 +2726,7 @@ MACHINE_CONFIG_START(subsino_state::victor21) MCFG_SCREEN_UPDATE_DRIVER(subsino_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", subsino_depth3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", subsino_depth3) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_INIT_OWNER(subsino_state, _2proms) @@ -2770,7 +2770,7 @@ MACHINE_CONFIG_START(subsino_state::crsbingo) MCFG_SCREEN_UPDATE_DRIVER(subsino_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", subsino_depth4) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", subsino_depth4) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_INIT_OWNER(subsino_state, _2proms) @@ -2812,7 +2812,7 @@ MACHINE_CONFIG_START(subsino_state::srider) MCFG_SCREEN_UPDATE_DRIVER(subsino_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", subsino_depth4) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", subsino_depth4) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_INIT_OWNER(subsino_state, _3proms) @@ -2865,7 +2865,7 @@ MACHINE_CONFIG_START(subsino_state::tisub) MCFG_SCREEN_UPDATE_DRIVER(subsino_state, screen_update_reels) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", subsino_depth4_reels) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", subsino_depth4_reels) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_INIT_OWNER(subsino_state, _3proms) @@ -2906,7 +2906,7 @@ MACHINE_CONFIG_START(subsino_state::stbsub) MCFG_SCREEN_UPDATE_DRIVER(subsino_state, screen_update_stbsub_reels) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", subsino_stbsub) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", subsino_stbsub) MCFG_PALETTE_ADD("palette", 0x100) //MCFG_PALETTE_INIT_OWNER(subsino_state, _3proms) diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp index 07919c7c126..a3894fad3c8 100644 --- a/src/mame/drivers/subsino2.cpp +++ b/src/mame/drivers/subsino2.cpp @@ -1535,7 +1535,7 @@ static const gfx_layout ss9601_8x8_layout = 8*8*8 }; -static GFXDECODE_START( ss9601 ) +static GFXDECODE_START( gfx_ss9601 ) GFXDECODE_ENTRY( "tilemap", 0, ss9601_8x8_layout, 0, 1 ) GFXDECODE_END @@ -2382,7 +2382,7 @@ MACHINE_CONFIG_START(subsino2_state::bishjan) MCFG_SCREEN_UPDATE_DRIVER(subsino2_state, screen_update_subsino2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ss9601 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ss9601) MCFG_PALETTE_ADD( "palette", 256 ) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC @@ -2433,7 +2433,7 @@ MACHINE_CONFIG_START(subsino2_state::mtrain) MCFG_SCREEN_UPDATE_DRIVER(subsino2_state, screen_update_subsino2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ss9601 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ss9601) MCFG_PALETTE_ADD( "palette", 256 ) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC @@ -2467,7 +2467,7 @@ MACHINE_CONFIG_START(subsino2_state::saklove) MCFG_SCREEN_UPDATE_DRIVER(subsino2_state, screen_update_subsino2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ss9601 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ss9601) MCFG_PALETTE_ADD( "palette", 256 ) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC @@ -2505,7 +2505,7 @@ MACHINE_CONFIG_START(subsino2_state::xplan) MCFG_SCREEN_UPDATE_DRIVER(subsino2_state, screen_update_subsino2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ss9601 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ss9601) MCFG_PALETTE_ADD( "palette", 256 ) MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HMC HM86171 VGA 256 colour RAMDAC diff --git a/src/mame/drivers/summit.cpp b/src/mame/drivers/summit.cpp index 5d1b036695e..ca547470489 100644 --- a/src/mame/drivers/summit.cpp +++ b/src/mame/drivers/summit.cpp @@ -299,7 +299,7 @@ static const gfx_layout tiles8x8_layout = 8*8 }; -static GFXDECODE_START( summit ) +static GFXDECODE_START( gfx_summit ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 1 ) GFXDECODE_END @@ -322,7 +322,7 @@ MACHINE_CONFIG_START(summit_state::summit) MCFG_SCREEN_UPDATE_DRIVER(summit_state, screen_update_summit) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", summit) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_summit) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(summit_state, summit) diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp index d498260a993..7b7a83ab1d8 100644 --- a/src/mame/drivers/suna16.cpp +++ b/src/mame/drivers/suna16.cpp @@ -776,12 +776,12 @@ static const gfx_layout layout_8x8x4 = 8*8*4 }; -static GFXDECODE_START( suna16 ) +static GFXDECODE_START( gfx_suna16 ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x4, 0, 16*2 ) // [0] Sprites GFXDECODE_END // Two sprites chips -static GFXDECODE_START( bestbest ) +static GFXDECODE_START( gfx_bestbest ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x4, 0, 256*8/16 ) // [0] Sprites (Chip 1) GFXDECODE_ENTRY( "gfx2", 0, layout_8x8x4, 0, 256*8/16 ) // [1] Sprites (Chip 2) GFXDECODE_END @@ -843,7 +843,7 @@ MACHINE_CONFIG_START(suna16_state::bssoccer) MCFG_SCREEN_UPDATE_DRIVER(suna16_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", suna16) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_suna16) MCFG_PALETTE_ADD("palette", 512) @@ -906,7 +906,7 @@ MACHINE_CONFIG_START(suna16_state::uballoon) MCFG_SCREEN_UPDATE_DRIVER(suna16_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", suna16) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_suna16) MCFG_PALETTE_ADD("palette", 512) @@ -963,7 +963,7 @@ MACHINE_CONFIG_START(suna16_state::sunaq) MCFG_SCREEN_UPDATE_DRIVER(suna16_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", suna16) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_suna16) MCFG_PALETTE_ADD("palette", 512) @@ -1023,7 +1023,7 @@ MACHINE_CONFIG_START(suna16_state::bestbest) MCFG_SCREEN_UPDATE_DRIVER(suna16_state, screen_update_bestbest) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", bestbest) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bestbest) MCFG_PALETTE_ADD("palette", 256*8) diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp index e98b9af4049..29c70849241 100644 --- a/src/mame/drivers/suna8.cpp +++ b/src/mame/drivers/suna8.cpp @@ -1847,11 +1847,11 @@ static const gfx_layout layout_8x8x4 = 8*8*2 }; -static GFXDECODE_START( suna8 ) +static GFXDECODE_START( gfx_suna8 ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x4, 0, 16*2 ) // [0] Sprites (brickzn has 2 palette RAMs) GFXDECODE_END -static GFXDECODE_START( suna8_x2 ) +static GFXDECODE_START( gfx_suna8_x2 ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x4, 0, 16*2 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_8x8x4, 0, 16*2 ) // [1] Sprites (sparkman has 2 sprite "chips") GFXDECODE_END @@ -1899,7 +1899,7 @@ MACHINE_CONFIG_START(suna8_state::hardhead) MCFG_SCREEN_UPDATE_DRIVER(suna8_state, screen_update_suna8) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", suna8) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_suna8) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) @@ -1958,7 +1958,7 @@ MACHINE_CONFIG_START(suna8_state::rranger) MCFG_SCREEN_UPDATE_DRIVER(suna8_state, screen_update_suna8) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", suna8) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_suna8) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) @@ -2027,7 +2027,7 @@ MACHINE_CONFIG_START(suna8_state::brickzn11) MCFG_SCREEN_UPDATE_DRIVER(suna8_state, screen_update_suna8) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", suna8) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_suna8) MCFG_PALETTE_ADD("palette", 256 * 2) // 2 x Palette RAM MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) @@ -2141,7 +2141,7 @@ MACHINE_CONFIG_START(suna8_state::starfigh) MCFG_SCREEN_UPDATE_DRIVER(suna8_state, screen_update_suna8) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", suna8) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_suna8) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) @@ -2195,7 +2195,7 @@ MACHINE_CONFIG_START(suna8_state::sparkman) MCFG_SCREEN_UPDATE_DRIVER(suna8_state, screen_update_suna8) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", suna8_x2) // 2 sprite "chips" + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_suna8_x2) // 2 sprite "chips" MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) diff --git a/src/mame/drivers/supbtime.cpp b/src/mame/drivers/supbtime.cpp index 788ef55dd2b..f44de172d3c 100644 --- a/src/mame/drivers/supbtime.cpp +++ b/src/mame/drivers/supbtime.cpp @@ -327,7 +327,7 @@ static const gfx_layout spritelayout = 32*32 }; -static GFXDECODE_START( supbtime ) +static GFXDECODE_START( gfx_supbtime ) GFXDECODE_ENTRY( "tiles", 0, tile_8x8_layout, 256, 32 ) // 8x8 GFXDECODE_ENTRY( "tiles", 0, tile_16x16_layout, 256, 32 ) // 16x16 GFXDECODE_ENTRY( "sprites", 0, spritelayout, 0, 16 ) // 16x16 @@ -352,7 +352,7 @@ MACHINE_CONFIG_START(supbtime_state::supbtime) MCFG_SCREEN_UPDATE_DRIVER(supbtime_state, screen_update_supbtime) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", supbtime) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_supbtime) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/supdrapo.cpp b/src/mame/drivers/supdrapo.cpp index 39eb082c45a..4f18ae4d47a 100644 --- a/src/mame/drivers/supdrapo.cpp +++ b/src/mame/drivers/supdrapo.cpp @@ -428,7 +428,7 @@ static const gfx_layout charlayout = 8*8 }; -static GFXDECODE_START( supdrapo ) +static GFXDECODE_START( gfx_supdrapo ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -471,7 +471,7 @@ MACHINE_CONFIG_START(supdrapo_state::supdrapo) MCFG_SCREEN_UPDATE_DRIVER(supdrapo_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", supdrapo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_supdrapo) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_INIT_OWNER(supdrapo_state, supdrapo) diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp index 4253f251854..625a4229bcf 100644 --- a/src/mame/drivers/supduck.cpp +++ b/src/mame/drivers/supduck.cpp @@ -420,7 +420,7 @@ static const gfx_layout tile_layout = -static GFXDECODE_START( supduck ) +static GFXDECODE_START( gfx_supduck ) GFXDECODE_ENTRY( "gfx1", 0, vramlayout_bionicc, 768, 64 ) /* colors 768-1023 */ GFXDECODE_ENTRY( "gfx2", 0, tile_layout, 0, 16 ) /* colors 0- 63 */ GFXDECODE_ENTRY( "gfx3", 0, tile_layout, 256, 16 ) /* colors 256- 319 */ @@ -462,7 +462,7 @@ MACHINE_CONFIG_START(supduck_state::supduck) MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", supduck) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_supduck) MCFG_DEVICE_ADD("spritegen", TIGEROAD_SPRITE, 0) diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp index ad942de6e4a..f6acb3ea1f4 100644 --- a/src/mame/drivers/super80.cpp +++ b/src/mame/drivers/super80.cpp @@ -616,25 +616,25 @@ static const gfx_layout super80v_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( super80 ) +static GFXDECODE_START( gfx_super80 ) GFXDECODE_ENTRY( "chargen", 0x0000, super80_charlayout, 16, 1 ) GFXDECODE_END -static GFXDECODE_START( super80d ) +static GFXDECODE_START( gfx_super80d ) GFXDECODE_ENTRY( "chargen", 0x0000, super80d_charlayout, 16, 1 ) GFXDECODE_END -static GFXDECODE_START( super80e ) +static GFXDECODE_START( gfx_super80e ) GFXDECODE_ENTRY( "chargen", 0x0000, super80e_charlayout, 16, 1 ) GFXDECODE_END -static GFXDECODE_START( super80m ) +static GFXDECODE_START( gfx_super80m ) GFXDECODE_ENTRY( "chargen", 0x0000, super80e_charlayout, 2, 6 ) GFXDECODE_ENTRY( "chargen", 0x1000, super80d_charlayout, 2, 6 ) GFXDECODE_END /* This will show the 128 characters in the ROM + whatever happens to be in the PCG */ -static GFXDECODE_START( super80v ) +static GFXDECODE_START( gfx_super80v ) GFXDECODE_ENTRY( "maincpu", 0xf000, super80v_charlayout, 2, 6 ) GFXDECODE_END @@ -727,7 +727,7 @@ MACHINE_CONFIG_START(super80_state::super80) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(super80_state,super80m) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", super80) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_super80) MCFG_DEFAULT_LAYOUT( layout_super80 ) MCFG_VIDEO_START_OVERRIDE(super80_state,super80) @@ -766,7 +766,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(super80_state::super80d) super80(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", super80d) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_super80d) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80d) MACHINE_CONFIG_END @@ -775,7 +775,7 @@ MACHINE_CONFIG_START(super80_state::super80e) super80(config); MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_IO_MAP(super80e_io) - MCFG_GFXDECODE_MODIFY("gfxdecode", super80e) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_super80e) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80e) MACHINE_CONFIG_END @@ -785,7 +785,7 @@ MACHINE_CONFIG_START(super80_state::super80m) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(super80m_map) - MCFG_GFXDECODE_MODIFY("gfxdecode", super80m) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_super80m) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80m) @@ -820,7 +820,7 @@ MACHINE_CONFIG_START(super80_state::super80v) MCFG_MC6845_CHAR_WIDTH(SUPER80V_DOTS) MCFG_MC6845_UPDATE_ROW_CB(super80_state, crtc_update_row) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", super80v) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_super80v) MCFG_DEFAULT_LAYOUT( layout_super80 ) /* sound hardware */ diff --git a/src/mame/drivers/superchs.cpp b/src/mame/drivers/superchs.cpp index 0002a52ae78..24c287eed56 100644 --- a/src/mame/drivers/superchs.cpp +++ b/src/mame/drivers/superchs.cpp @@ -213,7 +213,7 @@ static const gfx_layout charlayout = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( superchs ) +static GFXDECODE_START( gfx_superchs ) GFXDECODE_ENTRY( "gfx2", 0x0, tile16x16_layout, 0, 512 ) GFXDECODE_ENTRY( "gfx1", 0x0, charlayout, 0, 512 ) GFXDECODE_END @@ -263,7 +263,7 @@ MACHINE_CONFIG_START(superchs_state::superchs) MCFG_SCREEN_UPDATE_DRIVER(superchs_state, screen_update_superchs) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", superchs) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_superchs) MCFG_PALETTE_ADD("palette", 8192) MCFG_PALETTE_FORMAT(XRGB) diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp index e5e6c18fd11..38f4f61defb 100644 --- a/src/mame/drivers/supercrd.cpp +++ b/src/mame/drivers/supercrd.cpp @@ -406,7 +406,7 @@ static const gfx_layout charlayout = in the first and second half of the bipolar PROM. */ -static GFXDECODE_START( supercrd ) /* Adressing the first half of the palette */ +static GFXDECODE_START( gfx_supercrd ) /* Adressing the first half of the palette */ GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -435,7 +435,7 @@ MACHINE_CONFIG_START(supercrd_state::supercrd) MCFG_SCREEN_UPDATE_DRIVER(supercrd_state, screen_update_supercrd) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", supercrd) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_supercrd) MCFG_PALETTE_ADD("palette", 0x200) MCFG_PALETTE_INIT_OWNER(supercrd_state, supercrd) diff --git a/src/mame/drivers/superdq.cpp b/src/mame/drivers/superdq.cpp index ff0692fdead..391497e0511 100644 --- a/src/mame/drivers/superdq.cpp +++ b/src/mame/drivers/superdq.cpp @@ -314,7 +314,7 @@ static const gfx_layout charlayout = }; -static GFXDECODE_START( superdq ) +static GFXDECODE_START( gfx_superdq ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 2 ) GFXDECODE_END @@ -346,7 +346,7 @@ MACHINE_CONFIG_START(superdq_state::superdq) /* video hardware */ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", superdq) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_superdq) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(superdq_state, superdq) diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp index c9c8a23bb8e..fee953cae2e 100644 --- a/src/mame/drivers/superqix.cpp +++ b/src/mame/drivers/superqix.cpp @@ -1325,12 +1325,12 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( pbillian ) +static GFXDECODE_START( gfx_pbillian ) GFXDECODE_ENTRY( "gfx1", 0, pbillian_charlayout, 16*16, 16 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 16 ) GFXDECODE_END -static GFXDECODE_START( sqix ) +static GFXDECODE_START( gfx_sqix ) GFXDECODE_ENTRY( "gfx1", 0x00000, sqix_charlayout, 0, 16 ) /* Chars */ GFXDECODE_ENTRY( "gfx2", 0x00000, sqix_charlayout, 0, 16 ) /* Background tiles */ GFXDECODE_ENTRY( "gfx3", 0x00000, spritelayout, 0, 16 ) /* Sprites */ @@ -1374,7 +1374,7 @@ MACHINE_CONFIG_START(hotsmash_state::pbillian) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, hotsmash_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pbillian) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pbillian) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT_CLASS(1, superqix_state, BBGGRRII) @@ -1419,7 +1419,7 @@ MACHINE_CONFIG_START(superqix_state::sqix) MCFG_SCREEN_UPDATE_DRIVER(superqix_state, screen_update_superqix) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sqix) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sqix) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT_CLASS(1, superqix_state, BBGGRRII) @@ -1472,7 +1472,7 @@ MACHINE_CONFIG_START(superqix_state::sqix_nomcu) MCFG_SCREEN_UPDATE_DRIVER(superqix_state, screen_update_superqix) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sqix) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sqix) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT_CLASS(1, superqix_state, BBGGRRII) diff --git a/src/mame/drivers/superwng.cpp b/src/mame/drivers/superwng.cpp index c9a3a8bb556..7c58ce104fb 100644 --- a/src/mame/drivers/superwng.cpp +++ b/src/mame/drivers/superwng.cpp @@ -456,7 +456,7 @@ static const gfx_layout spritelayout = 16*8*4 }; -static GFXDECODE_START( superwng ) +static GFXDECODE_START( gfx_superwng ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0x0000, spritelayout, 0, 16 ) GFXDECODE_END @@ -496,7 +496,7 @@ MACHINE_CONFIG_START(superwng_state::superwng) MCFG_SCREEN_UPDATE_DRIVER(superwng_state, screen_update_superwng) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", superwng) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_superwng) MCFG_PALETTE_ADD("palette", 0x40) MCFG_PALETTE_INIT_OWNER(superwng_state, superwng) diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp index 7f9b3ddeef5..8e125b0b5d3 100644 --- a/src/mame/drivers/supracan.cpp +++ b/src/mame/drivers/supracan.cpp @@ -1850,7 +1850,7 @@ static const gfx_layout supracan_gfx1bpp_alt = }; -static GFXDECODE_START( supracan ) +static GFXDECODE_START( gfx_supracan ) GFXDECODE_RAM( "vram", 0, supracan_gfx8bpp, 0, 1 ) GFXDECODE_RAM( "vram", 0, supracan_gfx4bpp, 0, 0x10 ) GFXDECODE_RAM( "vram", 0, supracan_gfx2bpp, 0, 0x40 ) @@ -1907,7 +1907,7 @@ MACHINE_CONFIG_START(supracan_state::supracan) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_PALETTE_INIT_OWNER(supracan_state, supracan) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", supracan) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_supracan) MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "supracan_cart") MCFG_GENERIC_WIDTH(GENERIC_ROM16_WIDTH) diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp index 72d43660a53..a6cce013f48 100644 --- a/src/mame/drivers/suprgolf.cpp +++ b/src/mame/drivers/suprgolf.cpp @@ -480,7 +480,7 @@ static const gfx_layout gfxlayout = 8*8*4 }; -static GFXDECODE_START( suprgolf ) +static GFXDECODE_START( gfx_suprgolf ) GFXDECODE_ENTRY( "gfx1", 0, gfxlayout, 0, 0x80 ) GFXDECODE_END @@ -520,7 +520,7 @@ MACHINE_CONFIG_START(suprgolf_state::suprgolf) MCFG_SCREEN_UPDATE_DRIVER(suprgolf_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", suprgolf) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_suprgolf) MCFG_PALETTE_ADD("palette", 0x800) /* sound hardware */ diff --git a/src/mame/drivers/suprloco.cpp b/src/mame/drivers/suprloco.cpp index 978bb569601..f29199c59c1 100644 --- a/src/mame/drivers/suprloco.cpp +++ b/src/mame/drivers/suprloco.cpp @@ -164,7 +164,7 @@ static const gfx_layout charlayout = }; -static GFXDECODE_START( suprloco ) +static GFXDECODE_START( gfx_suprloco ) /* sprites use colors 256-511 + 512-767 */ GFXDECODE_ENTRY( "gfx1", 0x6000, charlayout, 0, 16 ) GFXDECODE_END @@ -198,7 +198,7 @@ MACHINE_CONFIG_START(suprloco_state::suprloco) MCFG_SCREEN_UPDATE_DRIVER(suprloco_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", suprloco) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_suprloco) MCFG_PALETTE_ADD("palette", 512+256) MCFG_PALETTE_INIT_OWNER(suprloco_state, suprloco) diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp index 54c20a73901..fd34849a11c 100644 --- a/src/mame/drivers/suprnova.cpp +++ b/src/mame/drivers/suprnova.cpp @@ -812,7 +812,7 @@ MACHINE_CONFIG_START(skns_state::skns) MCFG_SCREEN_UPDATE_DRIVER(skns_state, screen_update) MCFG_PALETTE_ADD("palette", 32768) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", skns_bg) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", skns_bg) MCFG_DEVICE_ADD("spritegen", SKNS_SPRITE, 0) diff --git a/src/mame/drivers/suprridr.cpp b/src/mame/drivers/suprridr.cpp index 128cc428aee..69ac5814f97 100644 --- a/src/mame/drivers/suprridr.cpp +++ b/src/mame/drivers/suprridr.cpp @@ -308,7 +308,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( suprridr ) +static GFXDECODE_START( gfx_suprridr ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 32, 2 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 64, 2 ) @@ -344,7 +344,7 @@ MACHINE_CONFIG_START(suprridr_state::suprridr) MCFG_SCREEN_UPDATE_DRIVER(suprridr_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", suprridr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_suprridr) MCFG_PALETTE_ADD("palette", 96) MCFG_PALETTE_INIT_OWNER(suprridr_state, suprridr) diff --git a/src/mame/drivers/suprslam.cpp b/src/mame/drivers/suprslam.cpp index e067f10a80b..f9c41d7e3e2 100644 --- a/src/mame/drivers/suprslam.cpp +++ b/src/mame/drivers/suprslam.cpp @@ -244,7 +244,7 @@ static const gfx_layout suprslam_16x16x4_layout = 16*64 }; -static GFXDECODE_START( suprslam ) +static GFXDECODE_START( gfx_suprslam ) GFXDECODE_ENTRY( "gfx1", 0, suprslam_8x8x4_layout, 0x000, 16 ) GFXDECODE_ENTRY( "gfx2", 0, suprslam_16x16x4_layout, 0x200, 16 ) GFXDECODE_ENTRY( "gfx3", 0, suprslam_16x16x4_layout, 0x100, 16 ) @@ -286,7 +286,7 @@ MACHINE_CONFIG_START(suprslam_state::suprslam) MCFG_VS9209_IN_PORTE_CB(IOPORT("DSW2")) MCFG_VS9209_OUT_PORTG_CB(WRITE8(*this, suprslam_state, spr_ctrl_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", suprslam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_suprslam) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) diff --git a/src/mame/drivers/sys9002.cpp b/src/mame/drivers/sys9002.cpp index 24b9053f068..0c482477845 100644 --- a/src/mame/drivers/sys9002.cpp +++ b/src/mame/drivers/sys9002.cpp @@ -133,7 +133,7 @@ MACHINE_CONFIG_START(sys9002_state::sys9002) 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", mx2178) + //MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mx2178) MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp index db41535c8a6..7c14f8f0a1c 100644 --- a/src/mame/drivers/system1.cpp +++ b/src/mame/drivers/system1.cpp @@ -2143,7 +2143,7 @@ static const gfx_layout charlayout = 8*8 }; -static GFXDECODE_START( system1 ) +static GFXDECODE_START( gfx_system1 ) GFXDECODE_ENTRY( "tiles", 0, charlayout, 0, 256 ) GFXDECODE_END @@ -2181,7 +2181,7 @@ MACHINE_CONFIG_START(system1_state::sys1ppi) MCFG_SCREEN_UPDATE_DRIVER(system1_state, screen_update_system1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", system1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_system1) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(BBGGGRRR) diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index 1229e1b988b..933b76ed934 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -2048,7 +2048,7 @@ static const gfx_layout charlayout = 8*8 }; -GFXDECODE_START( sys16 ) +GFXDECODE_START( gfx_sys16 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1024 ) GFXDECODE_END @@ -2176,7 +2176,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::system16_base) MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_system16) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sys16) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sys16) MCFG_PALETTE_ADD("palette", 2048*SHADOW_COLORS_MULTIPLIER) MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state,system16) @@ -2280,7 +2280,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::goldnaxeb_base) MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_system16) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sys16) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sys16) MCFG_PALETTE_ADD_INIT_BLACK("palette", 2048*SHADOW_COLORS_MULTIPLIER) @@ -2445,7 +2445,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::system18) MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_system18old) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sys16) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sys16) MCFG_PALETTE_ADD("palette", (2048+2048)*SHADOW_COLORS_MULTIPLIER) // 64 extra colours for vdp (but we use 2048 so shadow mask works) MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state,system18old) @@ -2501,7 +2501,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::astormb2) MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_system18old) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sys16) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sys16) MCFG_PALETTE_ADD("palette", (2048+2048)*SHADOW_COLORS_MULTIPLIER) // 64 extra colours for vdp (but we use 2048 so shadow mask works) MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state,system18old) @@ -2596,7 +2596,7 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::ddcrewbl) MCFG_SCREEN_UPDATE_DRIVER(segas1x_bootleg_state, screen_update_system18old) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", sys16) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sys16) MCFG_PALETTE_ADD("palette", (2048+2048)*SHADOW_COLORS_MULTIPLIER) MCFG_VIDEO_START_OVERRIDE(segas1x_bootleg_state,system18old) diff --git a/src/mame/drivers/tagteam.cpp b/src/mame/drivers/tagteam.cpp index 9edf28fdbba..8a96d2f74f1 100644 --- a/src/mame/drivers/tagteam.cpp +++ b/src/mame/drivers/tagteam.cpp @@ -196,7 +196,7 @@ static const gfx_layout spritelayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( tagteam ) +static GFXDECODE_START( gfx_tagteam ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 4 ) /* chars */ GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 4 ) /* sprites */ GFXDECODE_END @@ -229,7 +229,7 @@ MACHINE_CONFIG_START(tagteam_state::tagteam) MCFG_SCREEN_UPDATE_DRIVER(tagteam_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tagteam) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tagteam) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(tagteam_state, tagteam) diff --git a/src/mame/drivers/tail2nos.cpp b/src/mame/drivers/tail2nos.cpp index 64ddbc21478..25b1c365249 100644 --- a/src/mame/drivers/tail2nos.cpp +++ b/src/mame/drivers/tail2nos.cpp @@ -201,7 +201,7 @@ static const gfx_layout tail2nos_spritelayout = 128*8 }; -static GFXDECODE_START( tail2nos ) +static GFXDECODE_START( gfx_tail2nos ) GFXDECODE_ENTRY( "gfx1", 0, tail2nos_charlayout, 0, 128 ) GFXDECODE_ENTRY( "gfx2", 0, tail2nos_spritelayout, 0, 128 ) GFXDECODE_END @@ -258,7 +258,7 @@ MACHINE_CONFIG_START(tail2nos_state::tail2nos) MCFG_SCREEN_UPDATE_DRIVER(tail2nos_state, screen_update_tail2nos) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tail2nos) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tail2nos) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp index 530dbafeb20..7364faa6a2c 100644 --- a/src/mame/drivers/taito_b.cpp +++ b/src/mame/drivers/taito_b.cpp @@ -1870,7 +1870,7 @@ static const gfx_layout tilelayout = 64*8 }; -static GFXDECODE_START( taito_b ) +static GFXDECODE_START( gfx_taito_b ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) /* text */ GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_END @@ -1898,7 +1898,7 @@ static const gfx_layout rambo3_tilelayout = 32*8 }; -static GFXDECODE_START( rambo3 ) +static GFXDECODE_START( gfx_rambo3 ) GFXDECODE_ENTRY( "gfx1", 0, rambo3_charlayout, 0, 256 ) /* text */ GFXDECODE_ENTRY( "gfx1", 0, rambo3_tilelayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_END @@ -1974,7 +1974,7 @@ MACHINE_CONFIG_START(taitob_state::rastsag2) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -2031,7 +2031,7 @@ MACHINE_CONFIG_START(taitob_state::masterw) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -2109,7 +2109,7 @@ MACHINE_CONFIG_START(taitob_state::ashura) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -2166,7 +2166,7 @@ MACHINE_CONFIG_START(taitob_state::crimec) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -2224,7 +2224,7 @@ MACHINE_CONFIG_START(taitob_state::hitice) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -2287,7 +2287,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3p) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rambo3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rambo3) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -2345,7 +2345,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -2408,7 +2408,7 @@ MACHINE_CONFIG_START(taitob_state::pbobble) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -2471,7 +2471,7 @@ MACHINE_CONFIG_START(taitob_state::spacedx) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -2528,7 +2528,7 @@ MACHINE_CONFIG_START(taitob_state::spacedxo) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -2591,7 +2591,7 @@ MACHINE_CONFIG_START(taitob_state::qzshowby) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -2648,7 +2648,7 @@ MACHINE_CONFIG_START(taitob_state::viofight) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -2710,7 +2710,7 @@ MACHINE_CONFIG_START(taitob_state::silentd) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -2767,7 +2767,7 @@ MACHINE_CONFIG_START(taitob_state::selfeena) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -2833,7 +2833,7 @@ MACHINE_CONFIG_START(taitob_state::ryujin) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -2897,7 +2897,7 @@ MACHINE_CONFIG_START(taitob_state::sbm) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -2952,7 +2952,7 @@ MACHINE_CONFIG_START(taitob_c_state::realpunc) MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_realpunc) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_b) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp index d464955e21e..db3619182e5 100644 --- a/src/mame/drivers/taito_f2.cpp +++ b/src/mame/drivers/taito_f2.cpp @@ -2756,28 +2756,28 @@ static const gfx_layout pivotlayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( finalb ) +static GFXDECODE_START( gfx_finalb ) GFXDECODE_ENTRY( "gfx2", 0, finalb_tilelayout, 0, 64 ) /* sprites & playfield, 6-bit deep */ GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_END -static GFXDECODE_START( taitof2 ) +static GFXDECODE_START( gfx_taitof2 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_END -static GFXDECODE_START( pivot ) +static GFXDECODE_START( gfx_pivot ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx3", 0, pivotlayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_END -static GFXDECODE_START( yuyugogo ) +static GFXDECODE_START( gfx_yuyugogo ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx1", 0, yuyugogo_charlayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_END -static GFXDECODE_START( thundfox ) +static GFXDECODE_START( gfx_thundfox ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) /* TC0100SCN #1 */ GFXDECODE_ENTRY( "gfx3", 0, charlayout, 0, 256 ) /* TC0100SCN #2 */ @@ -2794,7 +2794,7 @@ static const gfx_layout deadconx_charlayout = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( deadconx ) +static GFXDECODE_START( gfx_deadconx ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx1", 0, deadconx_charlayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_END @@ -2821,7 +2821,7 @@ static const gfx_layout footchmpbl_charlayout = 8*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( footchmpbl ) +static GFXDECODE_START( gfx_footchmpbl ) GFXDECODE_ENTRY( "gfx2", 0, footchmpbl_tilelayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx1", 0, footchmpbl_tilelayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx3", 0, footchmpbl_charlayout, 0, 256 ) // gets wiped out by the dynamic decode atm @@ -2872,7 +2872,7 @@ MACHINE_CONFIG_START(taitof2_state::taito_f2) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_no_buffer)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taitof2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taitof2) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -2946,7 +2946,7 @@ MACHINE_CONFIG_START(taitof2_state::finalb) MCFG_DEVICE_PROGRAM_MAP(finalb_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", finalb) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_finalb) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_finalb) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed)) @@ -2971,7 +2971,7 @@ MACHINE_CONFIG_START(taitof2_state::dondokod) MCFG_DEVICE_PROGRAM_MAP(dondokod_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", pivot) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pivot) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_dondokod) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed)) @@ -3029,7 +3029,7 @@ MACHINE_CONFIG_START(taitof2_state::thundfox) MCFG_DEVICE_PROGRAM_MAP(thundfox_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", thundfox) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_thundfox) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_thundfox) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_thundfox) @@ -3067,7 +3067,7 @@ MACHINE_CONFIG_START(taitof2_state::cameltry) MCFG_DEVICE_PROGRAM_MAP(cameltry_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", pivot) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pivot) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_dondokod) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri_roz) @@ -3095,7 +3095,7 @@ MACHINE_CONFIG_START(taitof2_state::qtorimon) MCFG_DEVICE_PROGRAM_MAP(qtorimon_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", yuyugogo) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_yuyugogo) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed)) @@ -3142,7 +3142,7 @@ MACHINE_CONFIG_START(taitof2_state::quizhq) MCFG_DEVICE_PROGRAM_MAP(quizhq_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", yuyugogo) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_yuyugogo) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed)) @@ -3264,7 +3264,7 @@ MACHINE_CONFIG_START(taitof2_state::footchmp) MCFG_DEVICE_PROGRAM_MAP(footchmp_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_deadconx) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_footchmp) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_deadconx) @@ -3285,7 +3285,7 @@ MACHINE_CONFIG_START(taitof2_state::footchmpbl) footchmp(config); /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", footchmpbl) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_footchmpbl) MACHINE_CONFIG_END @@ -3297,7 +3297,7 @@ MACHINE_CONFIG_START(taitof2_state::hthero) MCFG_DEVICE_PROGRAM_MAP(footchmp_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_deadconx) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_hthero) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_deadconx) @@ -3353,7 +3353,7 @@ MACHINE_CONFIG_START(taitof2_state::yuyugogo) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", yuyugogo) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_yuyugogo) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_yuyugogo) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_yesnoj) @@ -3452,7 +3452,7 @@ MACHINE_CONFIG_START(taitof2_state::pulirula) MCFG_DEVICE_PROGRAM_MAP(pulirula_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", pivot) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pivot) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_pulirula) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri_roz) @@ -3480,7 +3480,7 @@ MACHINE_CONFIG_START(taitof2_state::metalb) MCFG_DEVICE_PROGRAM_MAP(metalb_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_deadconx) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(8192) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -3533,7 +3533,7 @@ MACHINE_CONFIG_START(taitof2_state::yesnoj) MCFG_DEVICE_PROGRAM_MAP(yesnoj_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", yuyugogo) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_yuyugogo) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -3560,7 +3560,7 @@ MACHINE_CONFIG_START(taitof2_state::deadconx) MCFG_DEVICE_PROGRAM_MAP(deadconx_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_deadconx) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) @@ -3588,7 +3588,7 @@ MACHINE_CONFIG_START(taitof2_state::deadconxj) MCFG_DEVICE_PROGRAM_MAP(deadconx_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_deadconx) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_deadconxj) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_deadconx) @@ -3717,7 +3717,7 @@ MACHINE_CONFIG_START(taitof2_state::driftout) MCFG_DEVICE_PROGRAM_MAP(driftout_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", pivot) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pivot) MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_driftout) MCFG_SCREEN_MODIFY("screen") @@ -3768,7 +3768,7 @@ MACHINE_CONFIG_START(taitof2_state::cameltrya) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_no_buffer)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pivot) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pivot) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) @@ -3837,7 +3837,7 @@ MACHINE_CONFIG_START(taitof2_state::driveout) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_no_buffer)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", pivot) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pivot) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp index 2fc2d95ed59..2b2ab0fb6a2 100644 --- a/src/mame/drivers/taito_f3.cpp +++ b/src/mame/drivers/taito_f3.cpp @@ -406,7 +406,7 @@ static const gfx_layout tile_layout = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( taito_f3 ) +static GFXDECODE_START( gfx_taito_f3 ) 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 */ @@ -479,7 +479,7 @@ MACHINE_CONFIG_START(taito_f3_state::f3) MCFG_SCREEN_UPDATE_DRIVER(taito_f3_state, screen_update_f3) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taito_f3_state, screen_vblank_f3)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_f3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taito_f3) MCFG_PALETTE_ADD("palette", 0x2000) MCFG_VIDEO_START_OVERRIDE(taito_f3_state,f3) @@ -551,7 +551,7 @@ static const gfx_layout bubsympb_tile_layout = }; -static GFXDECODE_START( bubsympb ) +static GFXDECODE_START( gfx_bubsympb ) GFXDECODE_ENTRY( nullptr, 0x000000, charlayout, 0, 64 ) /* Dynamically modified */ GFXDECODE_ENTRY( "gfx2", 0x000000, bubsympb_tile_layout, 0, 512 ) /* Tiles area */ GFXDECODE_ENTRY( "gfx1", 0x000000, bubsympb_sprite_layout, 4096, 256 ) /* Sprites area */ @@ -577,7 +577,7 @@ MACHINE_CONFIG_START(taito_f3_state::bubsympb) MCFG_SCREEN_UPDATE_DRIVER(taito_f3_state, screen_update_f3) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taito_f3_state, screen_vblank_f3)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", bubsympb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bubsympb) MCFG_PALETTE_ADD("palette", 8192) MCFG_VIDEO_START_OVERRIDE(taito_f3_state,f3) diff --git a/src/mame/drivers/taito_h.cpp b/src/mame/drivers/taito_h.cpp index be7fca62610..b62b85aa650 100644 --- a/src/mame/drivers/taito_h.cpp +++ b/src/mame/drivers/taito_h.cpp @@ -621,15 +621,15 @@ static const gfx_layout charlayout = #endif -static GFXDECODE_START( syvalion ) +static GFXDECODE_START( gfx_syvalion ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 32 ) GFXDECODE_END -static GFXDECODE_START( recordbr ) +static GFXDECODE_START( gfx_recordbr ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 32 ) GFXDECODE_END -static GFXDECODE_START( dleague ) +static GFXDECODE_START( gfx_dleague ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 32 ) GFXDECODE_END @@ -674,7 +674,7 @@ MACHINE_CONFIG_START(taitoh_state::syvalion) MCFG_SCREEN_UPDATE_DRIVER(taitoh_state, screen_update_syvalion) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", syvalion) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_syvalion) MCFG_PALETTE_ADD("palette", 33*16) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -730,7 +730,7 @@ MACHINE_CONFIG_START(taitoh_state::recordbr) MCFG_SCREEN_UPDATE_DRIVER(taitoh_state, screen_update_recordbr) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", recordbr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_recordbr) MCFG_PALETTE_ADD("palette", 32*16) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -795,7 +795,7 @@ MACHINE_CONFIG_START(taitoh_state::dleague) MCFG_SCREEN_UPDATE_DRIVER(taitoh_state, screen_update_dleague) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", dleague) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dleague) MCFG_PALETTE_ADD("palette", 33*16) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index b4fac4dddae..65ab91263ca 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -1475,7 +1475,7 @@ MACHINE_CONFIG_START(taitol_state::l_system_video) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitol_state, screen_vblank_taitol)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_l) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", taito_l) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/taito_o.cpp b/src/mame/drivers/taito_o.cpp index 53b6f59ec2a..9403d02138b 100644 --- a/src/mame/drivers/taito_o.cpp +++ b/src/mame/drivers/taito_o.cpp @@ -213,7 +213,7 @@ static const gfx_layout parentj_layout = 1*128 }; -static GFXDECODE_START( parentj ) +static GFXDECODE_START( gfx_parentj ) GFXDECODE_ENTRY( "gfx1", 0, parentj_layout, 0x0, 0x400/16 ) GFXDECODE_END @@ -249,7 +249,7 @@ MACHINE_CONFIG_START(taitoo_state::parentj) MCFG_SCREEN_UPDATE_DRIVER(taitoo_state, screen_update_parentj) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", parentj) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_parentj) MCFG_PALETTE_ADD("palette", 33*16) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp index 90536dadef5..459ea330c7b 100644 --- a/src/mame/drivers/taito_x.cpp +++ b/src/mame/drivers/taito_x.cpp @@ -788,11 +788,11 @@ static const gfx_layout ballbros_tilelayout = 32*8 /* every sprite takes 64 consecutive bytes */ }; -static GFXDECODE_START( superman ) +static GFXDECODE_START( gfx_superman ) GFXDECODE_ENTRY( "gfx1", 0x000000, tilelayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_END -static GFXDECODE_START( ballbros ) +static GFXDECODE_START( gfx_ballbros ) GFXDECODE_ENTRY( "gfx1", 0x000000, ballbros_tilelayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_END @@ -855,7 +855,7 @@ MACHINE_CONFIG_START(taitox_state::superman) MCFG_SCREEN_UPDATE_DRIVER(taitox_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", superman) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_superman) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -903,7 +903,7 @@ MACHINE_CONFIG_START(taitox_state::daisenpu) MCFG_SCREEN_UPDATE_DRIVER(taitox_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", superman) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_superman) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -949,7 +949,7 @@ MACHINE_CONFIG_START(taitox_state::gigandes) MCFG_SCREEN_UPDATE_DRIVER(taitox_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", superman) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_superman) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -997,7 +997,7 @@ MACHINE_CONFIG_START(taitox_state::ballbros) MCFG_SCREEN_UPDATE_DRIVER(taitox_state, screen_update_seta_no_layers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ballbros) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ballbros) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp index 68f2af8b7c3..a31f050cf1e 100644 --- a/src/mame/drivers/taito_z.cpp +++ b/src/mame/drivers/taito_z.cpp @@ -3092,7 +3092,7 @@ static const gfx_layout dblaxle_charlayout = 128*8 /* every sprite takes 128 consecutive bytes */ }; -static GFXDECODE_START( taitoz ) +static GFXDECODE_START( gfx_taitoz ) GFXDECODE_ENTRY( "gfx2", 0x0, tile16x8_layout, 0, 256 ) /* sprite parts */ GFXDECODE_ENTRY( "gfx1", 0x0, charlayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_END @@ -3100,13 +3100,13 @@ GFXDECODE_END /* taitoic.c TC0100SCN routines expect scr stuff to be in second gfx slot, so 2nd batch of obj must be placed third */ -static GFXDECODE_START( chasehq ) +static GFXDECODE_START( gfx_chasehq ) GFXDECODE_ENTRY( "gfx2", 0x0, tile16x16_layout, 0, 256 ) /* sprite parts */ GFXDECODE_ENTRY( "gfx1", 0x0, charlayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx4", 0x0, tile16x16_layout, 0, 256 ) /* sprite parts */ GFXDECODE_END -static GFXDECODE_START( dblaxle ) +static GFXDECODE_START( gfx_dblaxle ) GFXDECODE_ENTRY( "gfx2", 0x0, tile16x8_layout, 0, 256 ) /* sprite parts */ GFXDECODE_ENTRY( "gfx1", 0x0, dblaxle_charlayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_END @@ -3209,7 +3209,7 @@ MACHINE_CONFIG_START(taitoz_state::contcirc) MCFG_SCREEN_UPDATE_DRIVER(taitoz_state, screen_update_contcirc) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taitoz) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taitoz) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -3284,7 +3284,7 @@ MACHINE_CONFIG_START(taitoz_state::chasehq) MCFG_SCREEN_UPDATE_DRIVER(taitoz_state, screen_update_chasehq) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", chasehq) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_chasehq) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -3361,7 +3361,7 @@ MACHINE_CONFIG_START(taitoz_state::enforce) MCFG_SCREEN_UPDATE_DRIVER(taitoz_state, screen_update_contcirc) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taitoz) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taitoz) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -3442,7 +3442,7 @@ MACHINE_CONFIG_START(taitoz_state::bshark) MCFG_SCREEN_UPDATE_DRIVER(taitoz_state, screen_update_bshark) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taitoz) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taitoz) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -3523,7 +3523,7 @@ MACHINE_CONFIG_START(taitoz_state::sci) MCFG_SCREEN_UPDATE_DRIVER(taitoz_state, screen_update_sci) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taitoz) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taitoz) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -3604,7 +3604,7 @@ MACHINE_CONFIG_START(taitoz_state::nightstr) MCFG_SCREEN_UPDATE_DRIVER(taitoz_state, screen_update_chasehq) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", chasehq) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_chasehq) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -3681,7 +3681,7 @@ MACHINE_CONFIG_START(taitoz_state::aquajack) MCFG_SCREEN_UPDATE_DRIVER(taitoz_state, screen_update_aquajack) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taitoz) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taitoz) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -3764,7 +3764,7 @@ MACHINE_CONFIG_START(taitoz_state::spacegun) MCFG_SCREEN_UPDATE_DRIVER(taitoz_state, screen_update_spacegun) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taitoz) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taitoz) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -3835,7 +3835,7 @@ MACHINE_CONFIG_START(taitoz_state::dblaxle) MCFG_SCREEN_UPDATE_DRIVER(taitoz_state, screen_update_dblaxle) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", dblaxle) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dblaxle) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -3909,7 +3909,7 @@ MACHINE_CONFIG_START(taitoz_state::racingb) MCFG_SCREEN_UPDATE_DRIVER(taitoz_state, screen_update_racingb) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", dblaxle) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dblaxle) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_VIDEO_START_OVERRIDE(taitoz_state,taitoz) diff --git a/src/mame/drivers/taitoair.cpp b/src/mame/drivers/taitoair.cpp index 0903323b159..5a3b418b78f 100644 --- a/src/mame/drivers/taitoair.cpp +++ b/src/mame/drivers/taitoair.cpp @@ -666,7 +666,7 @@ static const gfx_layout tilelayout = 16*16 }; -static GFXDECODE_START( airsys ) +static GFXDECODE_START( gfx_airsys ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 32*16 ) GFXDECODE_END @@ -741,7 +741,7 @@ MACHINE_CONFIG_START(taitoair_state::airsys) MCFG_SCREEN_UPDATE_DRIVER(taitoair_state, screen_update_taitoair) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", airsys) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_airsys) MCFG_PALETTE_ADD_INIT_BLACK("palette", 512*16+512*16) diff --git a/src/mame/drivers/taitojc.cpp b/src/mame/drivers/taitojc.cpp index e90c59b47a8..47a36331094 100644 --- a/src/mame/drivers/taitojc.cpp +++ b/src/mame/drivers/taitojc.cpp @@ -1105,7 +1105,7 @@ MACHINE_CONFIG_START(taitojc_state::taitojc) MCFG_TC0640FIO_WRITE_4_CB(WRITE8(*this, taitojc_state, coin_control_w)) MCFG_TC0640FIO_READ_7_CB(IOPORT("BUTTONS")) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp index 227eb2251f5..67bda373929 100644 --- a/src/mame/drivers/taitopjc.cpp +++ b/src/mame/drivers/taitopjc.cpp @@ -805,7 +805,7 @@ MACHINE_CONFIG_START(taitopjc_state::taitopjc) MCFG_PALETTE_ADD("palette", 32768) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) MCFG_DEVICE_ADD("tc0780fpa", TC0780FPA, 0) diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp index 405c3adbbb6..d38234f4746 100644 --- a/src/mame/drivers/taitosj.cpp +++ b/src/mame/drivers/taitosj.cpp @@ -1728,7 +1728,7 @@ static const gfx_layout spritelayout = -static GFXDECODE_START( taitosj ) +static GFXDECODE_START( gfx_taitosj ) GFXDECODE_ENTRY( nullptr, 0x9000, charlayout, 0, 8 ) /* the game dynamically modifies this */ GFXDECODE_ENTRY( nullptr, 0x9000, spritelayout, 0, 8 ) /* the game dynamically modifies this */ GFXDECODE_ENTRY( nullptr, 0xa800, charlayout, 0, 8 ) /* the game dynamically modifies this */ @@ -1781,7 +1781,7 @@ MACHINE_CONFIG_START(taitosj_state::nomcu) MCFG_SCREEN_UPDATE_DRIVER(taitosj_state, screen_update_taitosj) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taitosj) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taitosj) MCFG_PALETTE_ADD("palette", 64) diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp index 92999350977..d9bf6c9bf88 100644 --- a/src/mame/drivers/tandy1t.cpp +++ b/src/mame/drivers/tandy1t.cpp @@ -642,7 +642,7 @@ void tandy1000_state::cfg_fdc_525(device_t *device) dynamic_cast(*device->subdevice("fdc:1")).set_default_option(""); } -static GFXDECODE_START( t1000 ) +static GFXDECODE_START( gfx_t1000 ) GFXDECODE_ENTRY( "gfx1", 0x0000, t1000_charlayout, 3, 1 ) GFXDECODE_END @@ -653,7 +653,7 @@ MACHINE_CONFIG_START(tandy1000_state::tandy1000_common) /* video hardware */ MCFG_PCVIDEO_T1000_ADD("pcvideo_t1000") MCFG_VIDEO_SET_SCREEN("pcvideo_t1000:screen") - MCFG_GFXDECODE_ADD("gfxdecode", "pcvideo_t1000:palette", t1000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "pcvideo_t1000:palette", gfx_t1000) /* sound hardware */ MCFG_DEVICE_ADD("sn76496", NCR7496, XTAL(14'318'181)/4) diff --git a/src/mame/drivers/tank8.cpp b/src/mame/drivers/tank8.cpp index 8be18130aaf..2c6fe90b0ed 100644 --- a/src/mame/drivers/tank8.cpp +++ b/src/mame/drivers/tank8.cpp @@ -319,7 +319,7 @@ static const gfx_layout tank_layout = }; -static GFXDECODE_START( tank8 ) +static GFXDECODE_START( gfx_tank8 ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout_1, 0, 10 ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout_2, 0, 10 ) GFXDECODE_ENTRY( "gfx2", 0, tank_layout, 0, 8 ) @@ -345,7 +345,7 @@ MACHINE_CONFIG_START(tank8_state::tank8) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tank8_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tank8) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tank8) MCFG_PALETTE_ADD("palette", 20) MCFG_PALETTE_INDIRECT_ENTRIES(10) MCFG_PALETTE_INIT_OWNER(tank8_state, tank8) diff --git a/src/mame/drivers/tankbatt.cpp b/src/mame/drivers/tankbatt.cpp index f850883de41..09bd44658fb 100644 --- a/src/mame/drivers/tankbatt.cpp +++ b/src/mame/drivers/tankbatt.cpp @@ -251,7 +251,7 @@ static const gfx_layout bulletlayout = }; -static GFXDECODE_START( tankbatt ) +static GFXDECODE_START( gfx_tankbatt ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) GFXDECODE_ENTRY( "gfx1", 0, bulletlayout, 0, 256 ) GFXDECODE_END @@ -300,7 +300,7 @@ MACHINE_CONFIG_START(tankbatt_state::tankbatt) MCFG_SCREEN_UPDATE_DRIVER(tankbatt_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tankbatt) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tankbatt) MCFG_PALETTE_ADD("palette", 256*2) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(tankbatt_state, tankbatt) diff --git a/src/mame/drivers/tankbust.cpp b/src/mame/drivers/tankbust.cpp index 4f5350863ed..c6efd1883ee 100644 --- a/src/mame/drivers/tankbust.cpp +++ b/src/mame/drivers/tankbust.cpp @@ -316,7 +316,7 @@ static const gfx_layout charlayout2 = 8*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( tankbust ) +static GFXDECODE_START( gfx_tankbust ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0x00, 2 ) /* sprites 32x32 (2 * 16 colors) */ GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0x20, 8 ) /* bg tilemap characters */ GFXDECODE_ENTRY( "gfx3", 0, charlayout2, 0x60, 16 ) /* txt tilemap characters*/ @@ -358,7 +358,7 @@ MACHINE_CONFIG_START(tankbust_state::tankbust) MCFG_SCREEN_UPDATE_DRIVER(tankbust_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tankbust ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tankbust) MCFG_PALETTE_ADD( "palette", 128 ) MCFG_PALETTE_INIT_OWNER(tankbust_state, tankbust) diff --git a/src/mame/drivers/taotaido.cpp b/src/mame/drivers/taotaido.cpp index b458a85247e..6d9b80b9875 100644 --- a/src/mame/drivers/taotaido.cpp +++ b/src/mame/drivers/taotaido.cpp @@ -340,7 +340,7 @@ static const gfx_layout layout = 128*8 }; -static GFXDECODE_START( taotaido ) +static GFXDECODE_START( gfx_taotaido ) GFXDECODE_ENTRY( "gfx1", 0, layout, 0x000, 256 ) /* sprites */ GFXDECODE_ENTRY( "gfx2", 0, layout, 0x300, 256 ) /* bg tiles */ GFXDECODE_END @@ -373,7 +373,7 @@ MACHINE_CONFIG_START(taotaido_state::taotaido) MCFG_DEVICE_ADD("watchdog", MB3773, 0) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taotaido) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taotaido) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/targeth.cpp b/src/mame/drivers/targeth.cpp index 3a358d01a8e..f2c22f3099d 100644 --- a/src/mame/drivers/targeth.cpp +++ b/src/mame/drivers/targeth.cpp @@ -85,7 +85,7 @@ static const gfx_layout tilelayout16_0x080000 = 32*8 }; -static GFXDECODE_START( 0x080000 ) +static GFXDECODE_START( gfx_0x080000 ) GFXDECODE_ENTRY( "gfx1", 0x000000, tilelayout16_0x080000, 0, 64 ) GFXDECODE_END @@ -294,7 +294,7 @@ MACHINE_CONFIG_START(targeth_state::targeth) MCFG_SCREEN_UPDATE_DRIVER(targeth_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x080000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x080000) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp index 167897ed166..4aa1a1d4175 100644 --- a/src/mame/drivers/tasman.cpp +++ b/src/mame/drivers/tasman.cpp @@ -605,7 +605,7 @@ static const gfx_layout charlayout8_tasman = 8*64 }; -static GFXDECODE_START( tasman ) +static GFXDECODE_START( gfx_tasman ) GFXDECODE_ENTRY( "gfx1", 0, charlayout8_tasman, 0, 0x8000/(1 << 8) ) GFXDECODE_END @@ -674,7 +674,7 @@ MACHINE_CONFIG_START(kongambl_state::kongambl) MCFG_K055673_PALETTE("palette") #if CUSTOM_DRAW - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tasman) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tasman) #endif MCFG_DEVICE_ADD("k056832", K056832, 0) diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp index 63b4d70b4aa..9ed8a453c93 100644 --- a/src/mame/drivers/tatsumi.cpp +++ b/src/mame/drivers/tatsumi.cpp @@ -821,17 +821,17 @@ static const gfx_layout roundup5_vramlayout = 8*16 }; -static GFXDECODE_START( apache3 ) +static GFXDECODE_START( gfx_apache3 ) GFXDECODE_ENTRY( "sprites", 0, spritelayout, 1024, 128) GFXDECODE_ENTRY( "text", 0, gfx_8x8x3_planar, 768, 16) GFXDECODE_END -static GFXDECODE_START( roundup5 ) +static GFXDECODE_START( gfx_roundup5 ) GFXDECODE_ENTRY( "sprites", 0, spritelayout, 1024, 256) GFXDECODE_ENTRY( nullptr, 0, roundup5_vramlayout, 0, 16) GFXDECODE_END -static GFXDECODE_START( cyclwarr ) +static GFXDECODE_START( gfx_cyclwarr ) GFXDECODE_ENTRY( "sprites", 0, spritelayout, 8192, 512) GFXDECODE_ENTRY( "tilerom", 0, gfx_8x8x3_planar, 0, 16) GFXDECODE_END @@ -895,7 +895,7 @@ MACHINE_CONFIG_START(apache3_state::apache3) MCFG_SCREEN_RAW_PARAMS(CLOCK_2 / 8, 400, 0, 320, 280, 0, 240) // TODO: Hook up CRTC MCFG_SCREEN_UPDATE_DRIVER(apache3_state, screen_update_apache3) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", apache3) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_apache3) MCFG_PALETTE_ADD("palette", 1024 + 4096) /* 1024 real colours, and 4096 arranged as series of cluts */ MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -950,7 +950,7 @@ MACHINE_CONFIG_START(roundup5_state::roundup5) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(roundup5_state, screen_update_roundup5) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", roundup5) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_roundup5) MCFG_PALETTE_ADD("palette", 1024 + 4096) /* 1024 real colours, and 4096 arranged as series of cluts */ MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) MCFG_PALETTE_MEMBITS(8) @@ -1009,7 +1009,7 @@ MACHINE_CONFIG_START(cyclwarr_state::cyclwarr) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(cyclwarr_state, screen_update_cyclwarr) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cyclwarr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cyclwarr) MCFG_PALETTE_ADD("palette", 8192 + 8192) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -1069,7 +1069,7 @@ MACHINE_CONFIG_START(cyclwarr_state::bigfight) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(cyclwarr_state, screen_update_bigfight) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cyclwarr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cyclwarr) MCFG_PALETTE_ADD("palette", 8192 + 8192) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/tattack.cpp b/src/mame/drivers/tattack.cpp index 5cde48733b0..e1e207d4cb1 100644 --- a/src/mame/drivers/tattack.cpp +++ b/src/mame/drivers/tattack.cpp @@ -367,7 +367,7 @@ static const gfx_layout charlayout = -static GFXDECODE_START( tattack ) +static GFXDECODE_START( gfx_tattack ) GFXDECODE_ENTRY( "gfx1", 0 , charlayout, 0, 8 ) GFXDECODE_END @@ -416,7 +416,7 @@ MACHINE_CONFIG_START(tattack_state::tattack) MCFG_SCREEN_UPDATE_DRIVER(tattack_state, screen_update_tattack) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tattack) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tattack) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(tattack_state, tattack) diff --git a/src/mame/drivers/taxidriv.cpp b/src/mame/drivers/taxidriv.cpp index 371d5dad414..ca42ade7369 100644 --- a/src/mame/drivers/taxidriv.cpp +++ b/src/mame/drivers/taxidriv.cpp @@ -301,7 +301,7 @@ static const gfx_layout charlayout2 = }; -static GFXDECODE_START( taxidriv ) +static GFXDECODE_START( gfx_taxidriv ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 1 ) GFXDECODE_ENTRY( "gfx3", 0, charlayout, 0, 1 ) @@ -389,7 +389,7 @@ MACHINE_CONFIG_START(taxidriv_state::taxidriv) MCFG_SCREEN_UPDATE_DRIVER(taxidriv_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", taxidriv) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_taxidriv) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(taxidriv_state, taxidriv) diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp index de0a7349089..8dde5977e19 100644 --- a/src/mame/drivers/tbowl.cpp +++ b/src/mame/drivers/tbowl.cpp @@ -390,7 +390,7 @@ static const gfx_layout sprite8layout = 8*32 /* offset to next tile */ }; -static GFXDECODE_START( tbowl ) +static GFXDECODE_START( gfx_tbowl ) GFXDECODE_ENTRY( "characters", 0, charlayout, 256, 16 ) GFXDECODE_ENTRY( "bg_tiles", 0, bgtilelayout, 768, 16 ) GFXDECODE_ENTRY( "bg_tiles", 0, bgtilelayout, 512, 16 ) @@ -449,7 +449,7 @@ MACHINE_CONFIG_START(tbowl_state::tbowl) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tbowl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tbowl) MCFG_PALETTE_ADD("palette", 1024*2) MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) diff --git a/src/mame/drivers/tceptor.cpp b/src/mame/drivers/tceptor.cpp index 695de582954..53cbde29c35 100644 --- a/src/mame/drivers/tceptor.cpp +++ b/src/mame/drivers/tceptor.cpp @@ -289,7 +289,7 @@ static const gfx_layout tile_layout = 2*8*8 }; -static GFXDECODE_START( tceptor ) +static GFXDECODE_START( gfx_tceptor ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0, 256 ) /* decode in video_start */ @@ -352,7 +352,7 @@ MACHINE_CONFIG_START(tceptor_state::tceptor) MCFG_ADC0808_IN3_CB(IOPORT("STICKY")) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tceptor) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tceptor) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_INDIRECT_ENTRIES(1024) MCFG_PALETTE_INIT_OWNER(tceptor_state, tceptor) diff --git a/src/mame/drivers/tecmo.cpp b/src/mame/drivers/tecmo.cpp index c14018005f1..ec9f27de6ea 100644 --- a/src/mame/drivers/tecmo.cpp +++ b/src/mame/drivers/tecmo.cpp @@ -690,7 +690,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( tecmo ) +static GFXDECODE_START( gfx_tecmo ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 256, 16 ) /* colors 256 - 511 */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 16 ) /* colors 0 - 255 */ GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 512, 16 ) /* colors 512 - 767 */ @@ -732,7 +732,7 @@ MACHINE_CONFIG_START(tecmo_state::rygar) MCFG_SCREEN_UPDATE_DRIVER(tecmo_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tecmo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tecmo) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) diff --git a/src/mame/drivers/tecmo16.cpp b/src/mame/drivers/tecmo16.cpp index 1d4a4dff2f4..d8fc26b9d47 100644 --- a/src/mame/drivers/tecmo16.cpp +++ b/src/mame/drivers/tecmo16.cpp @@ -351,7 +351,7 @@ static const gfx_layout spritelayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( tecmo16 ) +static GFXDECODE_START( gfx_tecmo16 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 1*16*16, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 0x1000 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0, 0x1000 ) @@ -382,7 +382,7 @@ MACHINE_CONFIG_START(tecmo16_state::fstarfrc) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(tecmo16_state, screen_update) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tecmo16) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tecmo16) MCFG_PALETTE_ADD_INIT_BLACK("palette", 4096) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/tecmosys.cpp b/src/mame/drivers/tecmosys.cpp index a8f32b09295..904f1e4d884 100644 --- a/src/mame/drivers/tecmosys.cpp +++ b/src/mame/drivers/tecmosys.cpp @@ -435,7 +435,7 @@ static const gfx_layout gfxlayout2 = 16*16*4 }; -static GFXDECODE_START( tecmosys ) +static GFXDECODE_START( gfx_tecmosys ) GFXDECODE_ENTRY( "layer0", 0, gfxlayout, 0x4400, 0x40 ) GFXDECODE_ENTRY( "layer1", 0, gfxlayout2, 0x4000, 0x40 ) GFXDECODE_ENTRY( "layer2", 0, gfxlayout2, 0x4000, 0x40 ) @@ -466,7 +466,7 @@ MACHINE_CONFIG_START(tecmosys_state::tecmosys) MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_DEVICE_IO_MAP(io_map) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tecmosys) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tecmosys) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_EEPROM_SERIAL_ENABLE_STREAMING() diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp index 0c790782d88..c1fb82d723a 100644 --- a/src/mame/drivers/tehkanwc.cpp +++ b/src/mame/drivers/tehkanwc.cpp @@ -658,7 +658,7 @@ static const gfx_layout tilelayout = 64*8 /* every char takes 64 consecutive bytes */ }; -static GFXDECODE_START( tehkanwc ) +static GFXDECODE_START( gfx_tehkanwc ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) /* Colors 0 - 255 */ GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 8 ) /* Colors 256 - 383 */ GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 512, 16 ) /* Colors 512 - 767 */ @@ -694,7 +694,7 @@ MACHINE_CONFIG_START(tehkanwc_state::tehkanwc) MCFG_SCREEN_UPDATE_DRIVER(tehkanwc_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tehkanwc) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tehkanwc) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) diff --git a/src/mame/drivers/tek410x.cpp b/src/mame/drivers/tek410x.cpp index ef4ee414f7f..6ba4107428d 100644 --- a/src/mame/drivers/tek410x.cpp +++ b/src/mame/drivers/tek410x.cpp @@ -80,7 +80,7 @@ static const gfx_layout tek4107a_charlayout = 16*8 }; -static GFXDECODE_START( tek4107a ) +static GFXDECODE_START( gfx_tek4107a ) GFXDECODE_ENTRY( "chargen", 0x0000, tek4107a_charlayout, 0, 1 ) GFXDECODE_END @@ -107,7 +107,7 @@ MACHINE_CONFIG_START(tek4107a_state::tek4107a) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_PALETTE_ADD("palette", 64) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tek4107a) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tek4107a) MACHINE_CONFIG_END MACHINE_CONFIG_START(tek4107a_state::tek4109a) diff --git a/src/mame/drivers/terracre.cpp b/src/mame/drivers/terracre.cpp index 07fe4708c9c..2d6453c895f 100644 --- a/src/mame/drivers/terracre.cpp +++ b/src/mame/drivers/terracre.cpp @@ -447,7 +447,7 @@ static const gfx_layout sprite_layout = 32*16 }; -static GFXDECODE_START( terracre ) +static GFXDECODE_START( gfx_terracre ) GFXDECODE_ENTRY( "gfx1", 0, char_layout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, tile_layout, 1*16, 16 ) GFXDECODE_ENTRY( "gfx3", 0, sprite_layout, 1*16+16*16, 256 ) @@ -475,7 +475,7 @@ MACHINE_CONFIG_START(terracre_state::ym3526) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", terracre) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_terracre) MCFG_PALETTE_ADD("palette", 1*16+16*16+16*256) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(terracre_state, terracre) diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp index 350da2cb6fa..7e7fa8a0777 100644 --- a/src/mame/drivers/tetrisp2.cpp +++ b/src/mame/drivers/tetrisp2.cpp @@ -1577,29 +1577,29 @@ static const gfx_layout layout_16x16x8 = static GFXLAYOUT_RAW( spritelayout, 256, 256, 256*8, 256*256*8 ) -static GFXDECODE_START( tetrisp2 ) +static GFXDECODE_START( gfx_tetrisp2 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0x0000, 0x10 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x8, 0x1000, 0x10 ) // [1] Background GFXDECODE_ENTRY( "gfx3", 0, layout_16x16x8, 0x2000, 0x10 ) // [2] Rotation GFXDECODE_ENTRY( "gfx4", 0, layout_8x8x8, 0x6000, 0x10 ) // [3] Foreground GFXDECODE_END -static GFXDECODE_START( rocknms_sub ) +static GFXDECODE_START( gfx_rocknms_sub ) GFXDECODE_ENTRY( "gfx5", 0, spritelayout, 0x0000, 0x10 ) // [0] Sprites GFXDECODE_ENTRY( "gfx6", 0, layout_16x16x8, 0x1000, 0x10 ) // [1] Background GFXDECODE_ENTRY( "gfx7", 0, layout_16x16x8, 0x2000, 0x10 ) // [2] Rotation GFXDECODE_ENTRY( "gfx8", 0, layout_8x8x8, 0x6000, 0x10 ) // [3] Foreground GFXDECODE_END -static GFXDECODE_START( vj_lscreen ) +static GFXDECODE_START( gfx_vj_lscreen ) GFXDECODE_ENTRY( "sprites_left", 0, spritelayout, 0x0000, 0x80 ) // [0] Sprites (left screen, vertical in stepping stage) GFXDECODE_END -static GFXDECODE_START( vj_mscreen ) +static GFXDECODE_START( gfx_vj_mscreen ) GFXDECODE_ENTRY( "sprites_mid", 0, spritelayout, 0x0000, 0x80 ) // [0] Sprites (mid screen, horizontal) GFXDECODE_END -static GFXDECODE_START( vj_rscreen ) +static GFXDECODE_START( gfx_vj_rscreen ) GFXDECODE_ENTRY( "sprites_right", 0, spritelayout, 0x0000, 0x80 ) // [0] Sprites (right screens, vertical in stepping stage) GFXDECODE_END @@ -1713,7 +1713,7 @@ MACHINE_CONFIG_START(tetrisp2_state::tetrisp2) MCFG_SCREEN_UPDATE_DRIVER(tetrisp2_state, screen_update_tetrisp2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tetrisp2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_VIDEO_START_OVERRIDE(tetrisp2_state,tetrisp2) @@ -1748,7 +1748,7 @@ MACHINE_CONFIG_START(tetrisp2_state::nndmseal) MCFG_SCREEN_UPDATE_DRIVER(tetrisp2_state, screen_update_tetrisp2) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tetrisp2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_VIDEO_START_OVERRIDE(tetrisp2_state,nndmseal) // bg layer offset @@ -1781,7 +1781,7 @@ MACHINE_CONFIG_START(tetrisp2_state::rockn) MCFG_SCREEN_UPDATE_DRIVER(tetrisp2_state, screen_update_rockntread) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tetrisp2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_VIDEO_START_OVERRIDE(tetrisp2_state,rockntread) @@ -1816,7 +1816,7 @@ MACHINE_CONFIG_START(tetrisp2_state::rockn2) MCFG_SCREEN_UPDATE_DRIVER(tetrisp2_state, screen_update_rockntread) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tetrisp2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_VIDEO_START_OVERRIDE(tetrisp2_state,rockntread) @@ -1848,10 +1848,10 @@ MACHINE_CONFIG_START(tetrisp2_state::rocknms) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tetrisp2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2) MCFG_PALETTE_ADD("palette", 0x8000) - MCFG_GFXDECODE_ADD("sub_gfxdecode", "sub_palette", rocknms_sub) + MCFG_DEVICE_ADD("sub_gfxdecode", GFXDECODE, "sub_palette", gfx_rocknms_sub) MCFG_PALETTE_ADD("sub_palette", 0x8000) MCFG_DEFAULT_LAYOUT(layout_rocknms) @@ -1922,16 +1922,16 @@ MACHINE_CONFIG_START(stepstag_state::stepstag) MCFG_SCREEN_PALETTE("rpalette") MCFG_VIDEO_START_OVERRIDE(stepstag_state, stepstag ) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tetrisp2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2) MCFG_PALETTE_ADD("palette", 0x8000) - MCFG_GFXDECODE_ADD("gfxdecode_l", "lpalette", vj_lscreen) + MCFG_DEVICE_ADD("gfxdecode_l", GFXDECODE, "lpalette", gfx_vj_lscreen) MCFG_PALETTE_ADD("lpalette", 0x8000) - MCFG_GFXDECODE_ADD("gfxdecode_m", "mpalette", vj_mscreen) + MCFG_DEVICE_ADD("gfxdecode_m", GFXDECODE, "mpalette", gfx_vj_mscreen) MCFG_PALETTE_ADD("mpalette", 0x8000) - MCFG_GFXDECODE_ADD("gfxdecode_r", "rpalette", vj_rscreen) + MCFG_DEVICE_ADD("gfxdecode_r", GFXDECODE, "rpalette", gfx_vj_rscreen) MCFG_PALETTE_ADD("rpalette", 0x8000) MCFG_DEFAULT_LAYOUT(layout_stepstag) @@ -1995,16 +1995,16 @@ MACHINE_CONFIG_START(stepstag_state::vjdash) // 4 Screens MCFG_SCREEN_PALETTE("rpalette") MCFG_VIDEO_START_OVERRIDE(stepstag_state, stepstag ) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tetrisp2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2) MCFG_PALETTE_ADD("palette", 0x8000) - MCFG_GFXDECODE_ADD("gfxdecode_l", "lpalette", vj_lscreen) + MCFG_DEVICE_ADD("gfxdecode_l", GFXDECODE, "lpalette", gfx_vj_lscreen) MCFG_PALETTE_ADD("lpalette", 0x8000) - MCFG_GFXDECODE_ADD("gfxdecode_m", "mpalette", vj_mscreen) + MCFG_DEVICE_ADD("gfxdecode_m", GFXDECODE, "mpalette", gfx_vj_mscreen) MCFG_PALETTE_ADD("mpalette", 0x8000) - MCFG_GFXDECODE_ADD("gfxdecode_r", "rpalette", vj_rscreen) + MCFG_DEVICE_ADD("gfxdecode_r", GFXDECODE, "rpalette", gfx_vj_rscreen) MCFG_PALETTE_ADD("rpalette", 0x8000) MCFG_DEFAULT_LAYOUT(layout_vjdash) diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp index 365c138f4a6..a1b7bd1b582 100644 --- a/src/mame/drivers/thedealr.cpp +++ b/src/mame/drivers/thedealr.cpp @@ -496,7 +496,7 @@ static const gfx_layout layout_planes_2roms = 16*16*2 }; -static GFXDECODE_START( thedealr ) +static GFXDECODE_START( gfx_thedealr ) GFXDECODE_ENTRY( "gfx1", 0, layout_planes_2roms, 0, 32 ) GFXDECODE_END @@ -560,7 +560,7 @@ MACHINE_CONFIG_START(thedealr_state::thedealr) MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("subcpu", INPUT_LINE_NMI)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", thedealr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_thedealr) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(thedealr_state,thedealr) diff --git a/src/mame/drivers/thedeep.cpp b/src/mame/drivers/thedeep.cpp index 8177245dfa8..142d5f06395 100644 --- a/src/mame/drivers/thedeep.cpp +++ b/src/mame/drivers/thedeep.cpp @@ -355,7 +355,7 @@ static const gfx_layout layout_16x16x4 = 16*16 }; -static GFXDECODE_START( thedeep ) +static GFXDECODE_START( gfx_thedeep ) GFXDECODE_ENTRY( "sprites", 0, layout_16x16x4, 0x080, 8 ) // [0] Sprites GFXDECODE_ENTRY( "bg_gfx", 0, layout_16x16x4, 0x100, 16 ) // [1] Background Layer GFXDECODE_ENTRY( "text", 0, layout_8x8x2, 0x000, 16 ) // [2] Text Layer @@ -432,7 +432,7 @@ MACHINE_CONFIG_START(thedeep_state::thedeep) MCFG_SCREEN_UPDATE_DRIVER(thedeep_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", thedeep) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_thedeep) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(thedeep_state, thedeep) diff --git a/src/mame/drivers/thepit.cpp b/src/mame/drivers/thepit.cpp index 711ff1cecbd..dcbf7ae3a22 100644 --- a/src/mame/drivers/thepit.cpp +++ b/src/mame/drivers/thepit.cpp @@ -692,19 +692,19 @@ static const gfx_layout suprmous_spritelayout = }; -static GFXDECODE_START( thepit ) +static GFXDECODE_START( gfx_thepit ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 8 ) GFXDECODE_END -static GFXDECODE_START( intrepid ) +static GFXDECODE_START( gfx_intrepid ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0x0000, spritelayout, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0x0800, charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx1", 0x0800, spritelayout, 0, 8 ) GFXDECODE_END -static GFXDECODE_START( suprmous ) +static GFXDECODE_START( gfx_suprmous ) GFXDECODE_ENTRY( "gfx1", 0x0000, suprmous_charlayout, 0, 4 ) GFXDECODE_ENTRY( "gfx1", 0x0800, suprmous_spritelayout, 0, 4 ) GFXDECODE_END @@ -738,7 +738,7 @@ MACHINE_CONFIG_START(thepit_state::thepit) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", thepit) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_thepit) MCFG_PALETTE_ADD("palette", 32+8) MCFG_PALETTE_INIT_OWNER(thepit_state, thepit) @@ -777,7 +777,7 @@ MACHINE_CONFIG_START(thepit_state::desertdn) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(thepit_state, screen_update_desertdan) - MCFG_GFXDECODE_MODIFY("gfxdecode", intrepid) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_intrepid) MACHINE_CONFIG_END MACHINE_CONFIG_START(thepit_state::intrepid) @@ -791,7 +791,7 @@ MACHINE_CONFIG_START(thepit_state::intrepid) MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, thepit_state, intrepid_graphics_bank_w)) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", intrepid) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_intrepid) MACHINE_CONFIG_END @@ -803,7 +803,7 @@ MACHINE_CONFIG_START(thepit_state::suprmous) /* video hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(thepit_state,suprmous) - MCFG_GFXDECODE_MODIFY("gfxdecode", suprmous) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_suprmous) MACHINE_CONFIG_END diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp index 25133aaed9b..7b94e59ca85 100644 --- a/src/mame/drivers/thoop2.cpp +++ b/src/mame/drivers/thoop2.cpp @@ -259,7 +259,7 @@ static const gfx_layout thoop2_tilelayout_16 = }; -static GFXDECODE_START( thoop2 ) +static GFXDECODE_START( gfx_thoop2 ) GFXDECODE_ENTRY( "gfx1", 0x000000, thoop2_tilelayout, 0, 64 ) GFXDECODE_ENTRY( "gfx1", 0x000000, thoop2_tilelayout_16, 0, 64 ) GFXDECODE_END @@ -294,7 +294,7 @@ MACHINE_CONFIG_START(thoop2_state::thoop2) MCFG_SCREEN_UPDATE_DRIVER(thoop2_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", thoop2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_thoop2) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/thunderj.cpp b/src/mame/drivers/thunderj.cpp index 580c6837978..f3a40a73ef9 100644 --- a/src/mame/drivers/thunderj.cpp +++ b/src/mame/drivers/thunderj.cpp @@ -226,7 +226,7 @@ static const gfx_layout pfmolayout = }; -static GFXDECODE_START( thunderj ) +static GFXDECODE_START( gfx_thunderj ) GFXDECODE_ENTRY( "gfx1", 0, pfmolayout, 512, 96 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx2", 0, pfmolayout, 256, 112 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx3", 0, anlayout, 0, 512 ) /* characters 8x8 */ @@ -258,7 +258,7 @@ MACHINE_CONFIG_START(thunderj_state::thunderj) MCFG_QUANTUM_PERFECT_CPU("maincpu") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", thunderj) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_thunderj) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/ti630.cpp b/src/mame/drivers/ti630.cpp index c939d6a8a68..893838ff8b7 100644 --- a/src/mame/drivers/ti630.cpp +++ b/src/mame/drivers/ti630.cpp @@ -130,7 +130,7 @@ static const gfx_layout ti630_charlayout = 8*8 /* 8 bytes */ }; -static GFXDECODE_START( ti630 ) +static GFXDECODE_START( gfx_ti630 ) GFXDECODE_ENTRY( "hd44780:cgrom", 0x0000, ti630_charlayout, 0, 1 ) GFXDECODE_END @@ -155,7 +155,7 @@ MACHINE_CONFIG_START(ti630_state::ti630) MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(ti630_state, ti630) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ti630) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ti630) MCFG_HD44780_ADD("hd44780") MCFG_HD44780_LCD_SIZE(2, 16) diff --git a/src/mame/drivers/tiamc1.cpp b/src/mame/drivers/tiamc1.cpp index 869a6586492..43ac507d597 100644 --- a/src/mame/drivers/tiamc1.cpp +++ b/src/mame/drivers/tiamc1.cpp @@ -316,12 +316,12 @@ static const gfx_layout char_rom_layout = 8*8 }; -static GFXDECODE_START( tiamc1 ) +static GFXDECODE_START( gfx_tiamc1 ) GFXDECODE_ENTRY( nullptr, 0x0000, char_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0x0000, sprites16x16_layout, 0, 16 ) GFXDECODE_END -static GFXDECODE_START( kot ) +static GFXDECODE_START( gfx_kot ) GFXDECODE_ENTRY( nullptr, 0x0000, char_rom_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0x0000, sprites16x16_layout, 0, 16 ) GFXDECODE_END @@ -345,7 +345,7 @@ MACHINE_CONFIG_START(tiamc1_state::tiamc1) MCFG_SCREEN_UPDATE_DRIVER(tiamc1_state, screen_update_tiamc1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tiamc1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tiamc1) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(tiamc1_state, tiamc1) @@ -366,7 +366,7 @@ MACHINE_CONFIG_START(tiamc1_state::kot) MCFG_VIDEO_START_OVERRIDE(tiamc1_state, kot) MCFG_SCREEN_UPDATE_DRIVER(tiamc1_state, screen_update_kot) - MCFG_GFXDECODE_MODIFY("gfxdecode", kot) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_kot) MCFG_DEVICE_REMOVE("2x8253") MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) diff --git a/src/mame/drivers/tigeroad.cpp b/src/mame/drivers/tigeroad.cpp index 053bd5c5dff..ba2c6561526 100644 --- a/src/mame/drivers/tigeroad.cpp +++ b/src/mame/drivers/tigeroad.cpp @@ -642,7 +642,7 @@ static const gfx_layout sprite_layout = }; -static GFXDECODE_START( tigeroad ) +static GFXDECODE_START( gfx_tigeroad ) GFXDECODE_ENTRY( "text", 0, text_layout, 0x300, 16 ) GFXDECODE_ENTRY( "tiles", 0, tile_layout, 0x100, 16 ) GFXDECODE_ENTRY( "sprites", 0, sprite_layout, 0x200, 16 ) @@ -673,7 +673,7 @@ MACHINE_CONFIG_START(tigeroad_state::tigeroad) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tigeroad) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tigeroad) MCFG_DEVICE_ADD("spritegen", TIGEROAD_SPRITE, 0) @@ -751,7 +751,7 @@ MACHINE_CONFIG_START(tigeroad_state::f1dream_comad) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tigeroad) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tigeroad) MCFG_DEVICE_ADD("spritegen", TIGEROAD_SPRITE, 0) diff --git a/src/mame/drivers/tim100.cpp b/src/mame/drivers/tim100.cpp index a4e7fe73359..25882212ce9 100644 --- a/src/mame/drivers/tim100.cpp +++ b/src/mame/drivers/tim100.cpp @@ -108,7 +108,7 @@ const gfx_layout tim100_charlayout = 8*16 /* space between characters */ }; -static GFXDECODE_START( tim100 ) +static GFXDECODE_START( gfx_tim100 ) GFXDECODE_ENTRY( "chargen", 0x0000, tim100_charlayout, 0, 1 ) GFXDECODE_END @@ -173,7 +173,7 @@ MACHINE_CONFIG_START(tim100_state::tim100) MCFG_SCREEN_SIZE(600, 352) MCFG_SCREEN_VISIBLE_AREA(0, 40*12-1, 0, 16*16-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tim100 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tim100 ) MCFG_DEVICE_ADD("crtc", I8275, XTAL(4'915'200)) MCFG_I8275_CHARACTER_WIDTH(12) diff --git a/src/mame/drivers/timelimt.cpp b/src/mame/drivers/timelimt.cpp index a0fc6041394..0fecfe16f8b 100644 --- a/src/mame/drivers/timelimt.cpp +++ b/src/mame/drivers/timelimt.cpp @@ -206,7 +206,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( timelimt ) +static GFXDECODE_START( gfx_timelimt ) GFXDECODE_ENTRY( "tiles_1", 0, charlayout, 32, 1 ) /* seems correct */ GFXDECODE_ENTRY( "tiles_2", 0, charlayout, 0, 1 ) /* seems correct */ GFXDECODE_ENTRY( "sprites", 0, spritelayout, 64, 4 ) /* seems correct */ @@ -255,7 +255,7 @@ MACHINE_CONFIG_START(timelimt_state::timelimt) MCFG_SCREEN_UPDATE_DRIVER(timelimt_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", timelimt) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_timelimt) MCFG_PALETTE_ADD("palette", 64+32) MCFG_PALETTE_INIT_OWNER(timelimt_state, timelimt) diff --git a/src/mame/drivers/timeplt.cpp b/src/mame/drivers/timeplt.cpp index 54c82909149..9239fec90bc 100644 --- a/src/mame/drivers/timeplt.cpp +++ b/src/mame/drivers/timeplt.cpp @@ -389,7 +389,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( timeplt ) +static GFXDECODE_START( gfx_timeplt ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 32*4, 64 ) GFXDECODE_END @@ -405,7 +405,7 @@ static const gfx_layout chkun_spritelayout = 64*8 }; -static GFXDECODE_START( chkun ) +static GFXDECODE_START( gfx_chkun ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0, chkun_spritelayout, 32*4, 64 ) GFXDECODE_END @@ -453,7 +453,7 @@ MACHINE_CONFIG_START(timeplt_state::timeplt) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, timeplt_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", timeplt) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_timeplt) MCFG_PALETTE_ADD("palette", 32*4+64*4) MCFG_PALETTE_INIT_OWNER(timeplt_state, timeplt) @@ -485,7 +485,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(timeplt_state::bikkuric) timeplt(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", chkun) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_chkun) /* basic machine hardware */ MCFG_DEVICE_MODIFY("maincpu") @@ -497,7 +497,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(timeplt_state::chkun) bikkuric(config); - MCFG_GFXDECODE_MODIFY("gfxdecode", chkun) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_chkun) /* sound hardware */ MCFG_DEVICE_MODIFY("timeplt_audio:ay2") diff --git a/src/mame/drivers/timex.cpp b/src/mame/drivers/timex.cpp index cfaef788f70..d5d1b78716f 100644 --- a/src/mame/drivers/timex.cpp +++ b/src/mame/drivers/timex.cpp @@ -682,7 +682,7 @@ static const gfx_layout ts2068_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( ts2068 ) +static GFXDECODE_START( gfx_ts2068 ) GFXDECODE_ENTRY( "maincpu", 0x13d00, ts2068_charlayout, 0, 8 ) GFXDECODE_END @@ -704,7 +704,7 @@ MACHINE_CONFIG_START(spectrum_state::ts2068) MCFG_SCREEN_UPDATE_DRIVER(spectrum_state, screen_update_ts2068) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, spectrum_state, screen_vblank_timex)) - MCFG_GFXDECODE_MODIFY("gfxdecode", ts2068) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_ts2068) MCFG_VIDEO_START_OVERRIDE(spectrum_state, ts2068 ) diff --git a/src/mame/drivers/tk80bs.cpp b/src/mame/drivers/tk80bs.cpp index f9e90a70bd8..6f98e53a44d 100644 --- a/src/mame/drivers/tk80bs.cpp +++ b/src/mame/drivers/tk80bs.cpp @@ -164,7 +164,7 @@ static const gfx_layout tk80bs_charlayout = 8*8 }; -static GFXDECODE_START( tk80bs ) +static GFXDECODE_START( gfx_tk80bs ) GFXDECODE_ENTRY( "chargen", 0x0000, tk80bs_charlayout, 0, 1 ) GFXDECODE_END @@ -184,7 +184,7 @@ MACHINE_CONFIG_START(tk80bs_state::tk80bs) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tk80bs) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tk80bs) /* Devices */ MCFG_DEVICE_ADD("ppi", I8255, 0) diff --git a/src/mame/drivers/tmmjprd.cpp b/src/mame/drivers/tmmjprd.cpp index bcd2d181e36..01415f5c0b4 100644 --- a/src/mame/drivers/tmmjprd.cpp +++ b/src/mame/drivers/tmmjprd.cpp @@ -747,7 +747,7 @@ static const gfx_layout sprite_16x16x8_layout = // gfx decoding is ugly.. 16*16 tiles can start at varying different offsets.. -static GFXDECODE_START( tmmjprd ) +static GFXDECODE_START( gfx_tmmjprd ) /* this seems to be sprites */ // GFXDECODE_ENTRY( "gfx1", 0, sprite_8x8x4_layout, 0x0, 0x1000 ) // GFXDECODE_ENTRY( "gfx1", 0, sprite_16x16x4_layout, 0x0, 0x1000 ) @@ -776,7 +776,7 @@ MACHINE_CONFIG_START(tmmjprd_state::tmmjprd) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MCFG_EEPROM_SERIAL_ENABLE_STREAMING() - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tmmjprd) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tmmjprd) // MCFG_SCREEN_ADD("screen", RASTER) // MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp index c68c160bfea..122eac1cd11 100644 --- a/src/mame/drivers/tmnt.cpp +++ b/src/mame/drivers/tmnt.cpp @@ -2280,7 +2280,7 @@ static const gfx_layout zoomlayout = 8*64, 9*64, 10*64, 11*64, 12*64, 13*64, 14*64, 15*64 }, 16*64 }; -static GFXDECODE_START( glfgreat ) +static GFXDECODE_START( gfx_glfgreat ) GFXDECODE_ENTRY( "zoom", 0, zoomlayout, 0x400, 16 ) GFXDECODE_END @@ -2310,7 +2310,7 @@ MACHINE_CONFIG_START(tmnt_state::glfgreat) MCFG_SCREEN_UPDATE_DRIVER(tmnt_state, screen_update_glfgreat) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", glfgreat) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_glfgreat) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -2379,7 +2379,7 @@ MACHINE_CONFIG_START(tmnt_state::prmrsocr) MCFG_SCREEN_UPDATE_DRIVER(tmnt_state, screen_update_glfgreat) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", glfgreat) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_glfgreat) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/tmspoker.cpp b/src/mame/drivers/tmspoker.cpp index c37dd439114..bdae17e3420 100644 --- a/src/mame/drivers/tmspoker.cpp +++ b/src/mame/drivers/tmspoker.cpp @@ -546,7 +546,7 @@ static const gfx_layout charlayout = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( tmspoker ) +static GFXDECODE_START( gfx_tmspoker ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -570,7 +570,7 @@ MACHINE_CONFIG_START(tmspoker_state::tmspoker) MCFG_SCREEN_UPDATE_DRIVER(tmspoker_state, screen_update_tmspoker) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tmspoker) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tmspoker) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(tmspoker_state, tmspoker) diff --git a/src/mame/drivers/tnzs.cpp b/src/mame/drivers/tnzs.cpp index 8d027370c15..8ac6afbdc03 100644 --- a/src/mame/drivers/tnzs.cpp +++ b/src/mame/drivers/tnzs.cpp @@ -1525,11 +1525,11 @@ static const gfx_layout insectx_charlayout = 64*8 }; -static GFXDECODE_START( tnzs ) +static GFXDECODE_START( gfx_tnzs ) GFXDECODE_ENTRY( "gfx1", 0, tnzs_charlayout, 0, 32 ) GFXDECODE_END -static GFXDECODE_START( insectx ) +static GFXDECODE_START( gfx_insectx ) GFXDECODE_ENTRY( "gfx1", 0, insectx_charlayout, 0, 32 ) GFXDECODE_END @@ -1560,7 +1560,7 @@ MACHINE_CONFIG_START(tnzs_base_state::tnzs_base) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tnzs_base_state, screen_vblank_tnzs)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tnzs) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tnzs) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -1634,7 +1634,7 @@ MACHINE_CONFIG_START(insectx_state::insectx) MCFG_DEVICE_PROGRAM_MAP(insectx_sub_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", insectx) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_insectx) /* sound hardware */ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */ diff --git a/src/mame/drivers/toaplan1.cpp b/src/mame/drivers/toaplan1.cpp index 76146661132..6cde6c5486b 100644 --- a/src/mame/drivers/toaplan1.cpp +++ b/src/mame/drivers/toaplan1.cpp @@ -1883,12 +1883,12 @@ static const gfx_layout tilelayout = }; -static GFXDECODE_START( toaplan1 ) +static GFXDECODE_START( gfx_toaplan1 ) GFXDECODE_ENTRY( "gfx1", 0x00000, tilelayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0x00000, tilelayout, 64*16, 64 ) GFXDECODE_END -static GFXDECODE_START( rallybik ) +static GFXDECODE_START( gfx_rallybik ) GFXDECODE_ENTRY( "gfx1", 0x00000, tilelayout, 0, 64 ) GFXDECODE_END @@ -1939,7 +1939,7 @@ MACHINE_CONFIG_START(toaplan1_rallybik_state::rallybik) MCFG_TOAPLAN_SCU_ADD("scu", "palette", 31, 15) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", rallybik) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rallybik) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1976,7 +1976,7 @@ MACHINE_CONFIG_START(toaplan1_state::truxton) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_toaplan1) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -2013,7 +2013,7 @@ MACHINE_CONFIG_START(toaplan1_state::hellfire) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_toaplan1) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -2050,7 +2050,7 @@ MACHINE_CONFIG_START(toaplan1_state::zerowing) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_toaplan1) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -2092,7 +2092,7 @@ MACHINE_CONFIG_START(toaplan1_state::demonwld) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_toaplan1) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -2129,7 +2129,7 @@ MACHINE_CONFIG_START(toaplan1_state::samesame) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_samesame)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_toaplan1) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -2166,7 +2166,7 @@ MACHINE_CONFIG_START(toaplan1_state::outzone) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_toaplan1) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -2203,7 +2203,7 @@ MACHINE_CONFIG_START(toaplan1_state::outzonecv) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_toaplan1) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -2240,7 +2240,7 @@ MACHINE_CONFIG_START(toaplan1_state::vimana) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_toaplan1) MCFG_PALETTE_ADD("palette", (64*16)+(64*16)) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp index 73fd8666346..b099bad81bc 100644 --- a/src/mame/drivers/toaplan2.cpp +++ b/src/mame/drivers/toaplan2.cpp @@ -3220,19 +3220,19 @@ static const gfx_layout fixeightblayout = 8*8*4 }; -static GFXDECODE_START( truxton2 ) +static GFXDECODE_START( gfx_truxton2 ) GFXDECODE_ENTRY( nullptr, 0, truxton2_tx_tilelayout, 64*16, 64 ) GFXDECODE_END -static GFXDECODE_START( raizing ) +static GFXDECODE_START( gfx_raizing ) GFXDECODE_ENTRY( "text", 0, raizing_textlayout, 64*16, 64 ) GFXDECODE_END -static GFXDECODE_START( batrider ) +static GFXDECODE_START( gfx_batrider ) GFXDECODE_ENTRY( nullptr, 0, batrider_tx_tilelayout, 64*16, 64 ) GFXDECODE_END -static GFXDECODE_START( fixeightbl ) +static GFXDECODE_START( gfx_fixeightbl ) GFXDECODE_ENTRY( "text", 0, fixeightblayout, 64*16, 64 ) GFXDECODE_END @@ -3513,7 +3513,7 @@ MACHINE_CONFIG_START(toaplan2_state::truxton2) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", truxton2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_truxton2) MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -3692,7 +3692,7 @@ MACHINE_CONFIG_START(toaplan2_state::fixeight) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", truxton2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_truxton2) MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -3731,7 +3731,7 @@ MACHINE_CONFIG_START(toaplan2_state::fixeightbl) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fixeightbl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fixeightbl) MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -3999,7 +3999,7 @@ MACHINE_CONFIG_START(toaplan2_state::mahoudai) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", raizing) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_raizing) MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -4044,7 +4044,7 @@ MACHINE_CONFIG_START(toaplan2_state::shippumd) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", raizing) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_raizing) MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -4088,7 +4088,7 @@ MACHINE_CONFIG_START(toaplan2_state::bgaregga) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", raizing) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_raizing) MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -4149,7 +4149,7 @@ MACHINE_CONFIG_START(toaplan2_state::batrider) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", batrider) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_batrider) MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -4210,7 +4210,7 @@ MACHINE_CONFIG_START(toaplan2_state::bbakraid) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", batrider) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_batrider) MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp index 26c25a8bfa5..d928fff8414 100644 --- a/src/mame/drivers/toki.cpp +++ b/src/mame/drivers/toki.cpp @@ -447,7 +447,7 @@ static const gfx_layout toki_tilelayout = 128*8 }; -static GFXDECODE_START( toki ) +static GFXDECODE_START( gfx_toki ) GFXDECODE_ENTRY( "gfx1", 0, toki_charlayout, 16*16, 16 ) GFXDECODE_ENTRY( "gfx2", 0, toki_tilelayout, 0*16, 16 ) GFXDECODE_ENTRY( "gfx3", 0, toki_tilelayout, 32*16, 16 ) @@ -482,7 +482,7 @@ static const gfx_layout tokib_spriteslayout = 16*16 }; -static GFXDECODE_START( tokib ) +static GFXDECODE_START( gfx_tokib ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_planar, 16*16, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tokib_spriteslayout, 0*16, 16 ) GFXDECODE_ENTRY( "gfx3", 0, tokib_tilelayout, 32*16, 16 ) @@ -517,7 +517,7 @@ MACHINE_CONFIG_START(toki_state::toki) /* KOYO 20.000MHz near the cpu */ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", toki) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_toki) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -570,7 +570,7 @@ MACHINE_CONFIG_START(toki_state::tokib) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tokib) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tokib) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/toobin.cpp b/src/mame/drivers/toobin.cpp index fd134537d94..e5ab53aebea 100644 --- a/src/mame/drivers/toobin.cpp +++ b/src/mame/drivers/toobin.cpp @@ -189,7 +189,7 @@ static const gfx_layout molayout = }; -static GFXDECODE_START( toobin ) +static GFXDECODE_START( gfx_toobin ) GFXDECODE_ENTRY( "gfx1", 0, pflayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, molayout, 256, 16 ) GFXDECODE_ENTRY( "gfx3", 0, anlayout, 512, 64 ) @@ -226,7 +226,7 @@ MACHINE_CONFIG_START(toobin_state::toobin) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 640, 0, 512, 416, 0, 384) MCFG_SCREEN_UPDATE_DRIVER(toobin_state, screen_update) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", toobin) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_toobin) MCFG_PALETTE_ADD("palette", 1024) /* sound hardware */ diff --git a/src/mame/drivers/topspeed.cpp b/src/mame/drivers/topspeed.cpp index bedceed22af..6fa1208cbd9 100644 --- a/src/mame/drivers/topspeed.cpp +++ b/src/mame/drivers/topspeed.cpp @@ -527,7 +527,7 @@ static const gfx_layout charlayout = 8*8*4 // every sprite takes 32 consecutive bytes }; -static GFXDECODE_START( topspeed ) +static GFXDECODE_START( gfx_topspeed ) GFXDECODE_ENTRY( "gfx2", 0x0, tile16x8_layout, 0, 256 ) // Sprite parts GFXDECODE_ENTRY( "gfx1", 0x0, charlayout, 0, 512 ) // Sprites & playfield // Road Lines gfxdecodable ? @@ -615,7 +615,7 @@ MACHINE_CONFIG_START(topspeed_state::topspeed) MCFG_SCREEN_UPDATE_DRIVER(topspeed_state, screen_update_topspeed) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", topspeed) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_topspeed) MCFG_PALETTE_ADD("palette", 8192) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/toypop.cpp b/src/mame/drivers/toypop.cpp index 30bc5723152..98e97c944ed 100644 --- a/src/mame/drivers/toypop.cpp +++ b/src/mame/drivers/toypop.cpp @@ -624,7 +624,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( toypop ) +static GFXDECODE_START( gfx_toypop ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 128 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 128*4, 64 ) GFXDECODE_END @@ -701,7 +701,7 @@ MACHINE_CONFIG_START(namcos16_state::liblrabl) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, namcos16_state, slave_vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", toypop) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_toypop) MCFG_PALETTE_ADD("palette", 128*4+64*4+16*2) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(namcos16_state, toypop) diff --git a/src/mame/drivers/tp84.cpp b/src/mame/drivers/tp84.cpp index 2b727b28bda..804786fc8a5 100644 --- a/src/mame/drivers/tp84.cpp +++ b/src/mame/drivers/tp84.cpp @@ -324,7 +324,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( tp84 ) +static GFXDECODE_START( gfx_tp84 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64*8 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 64*4*8, 16*8 ) GFXDECODE_END @@ -364,7 +364,7 @@ MACHINE_CONFIG_START(tp84_state::tp84) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tp84_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tp84) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tp84) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(tp84_state, tp84) diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp index ae68374359f..a4d10a3ebbc 100644 --- a/src/mame/drivers/trackfld.cpp +++ b/src/mame/drivers/trackfld.cpp @@ -862,7 +862,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( trackfld ) +static GFXDECODE_START( gfx_trackfld ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 16*16, 16 ) GFXDECODE_END @@ -937,7 +937,7 @@ MACHINE_CONFIG_START(trackfld_state::trackfld) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, trackfld_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", trackfld) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_trackfld) MCFG_PALETTE_ADD("palette", 16*16+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(trackfld_state,trackfld) @@ -1013,7 +1013,7 @@ MACHINE_CONFIG_START(trackfld_state::yieartf) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, trackfld_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", trackfld) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_trackfld) MCFG_PALETTE_ADD("palette", 16*16+16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(trackfld_state,trackfld) diff --git a/src/mame/drivers/travrusa.cpp b/src/mame/drivers/travrusa.cpp index 39e781d45de..8e44d6944de 100644 --- a/src/mame/drivers/travrusa.cpp +++ b/src/mame/drivers/travrusa.cpp @@ -288,12 +288,12 @@ static const gfx_layout shtrider_spritelayout = 32*8 }; -static GFXDECODE_START( travrusa ) +static GFXDECODE_START( gfx_travrusa ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 16*8, 16 ) GFXDECODE_END -static GFXDECODE_START( shtrider ) +static GFXDECODE_START( gfx_shtrider ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, shtrider_spritelayout, 16*8, 16 ) GFXDECODE_END @@ -323,7 +323,7 @@ MACHINE_CONFIG_START(travrusa_state::travrusa) MCFG_SCREEN_UPDATE_DRIVER(travrusa_state, screen_update_travrusa) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", travrusa) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_travrusa) MCFG_PALETTE_ADD("palette", 16*8+16*8) MCFG_PALETTE_INDIRECT_ENTRIES(128+16) @@ -339,7 +339,7 @@ MACHINE_CONFIG_START(travrusa_state::shtrider) travrusa(config); /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", shtrider) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_shtrider) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(travrusa_state,shtrider) MACHINE_CONFIG_END @@ -348,7 +348,7 @@ MACHINE_CONFIG_START(travrusa_state::shtriderb) travrusa(config); /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", shtrider) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_shtrider) MACHINE_CONFIG_END /*************************************************************************** diff --git a/src/mame/drivers/triplhnt.cpp b/src/mame/drivers/triplhnt.cpp index b6da3a518ef..77e69d755ed 100644 --- a/src/mame/drivers/triplhnt.cpp +++ b/src/mame/drivers/triplhnt.cpp @@ -270,7 +270,7 @@ static const gfx_layout triplhnt_tile_layout = }; -static GFXDECODE_START( triplhnt ) +static GFXDECODE_START( gfx_triplhnt ) GFXDECODE_ENTRY( "gfx1", 0, triplhnt_small_sprite_layout, 0, 1 ) GFXDECODE_ENTRY( "gfx1", 0, triplhnt_large_sprite_layout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, triplhnt_tile_layout, 4, 2 ) @@ -321,7 +321,7 @@ MACHINE_CONFIG_START(triplhnt_state::triplhnt) MCFG_SCREEN_UPDATE_DRIVER(triplhnt_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", triplhnt) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_triplhnt) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(triplhnt_state, triplhnt) diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp index d395ad2fe7e..b9e3d5c7c06 100644 --- a/src/mame/drivers/trs80.cpp +++ b/src/mame/drivers/trs80.cpp @@ -570,27 +570,27 @@ static const gfx_layout meritum_charlayout = 8*16 /* every char takes 16 bytes (unused scanlines are blank) */ }; -static GFXDECODE_START(trs80) +static GFXDECODE_START(gfx_trs80) GFXDECODE_ENTRY( "chargen", 0, trs80_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START(ht1080z) +static GFXDECODE_START(gfx_ht1080z) GFXDECODE_ENTRY( "chargen", 0, ht1080z_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START(trs80m4) +static GFXDECODE_START(gfx_trs80m4) GFXDECODE_ENTRY( "chargen", 0, trs80m4_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START(lnw80) +static GFXDECODE_START(gfx_lnw80) GFXDECODE_ENTRY( "chargen", 0, lnw80_charlayout, 0, 4 ) GFXDECODE_END -static GFXDECODE_START(radionic) +static GFXDECODE_START(gfx_radionic) GFXDECODE_ENTRY( "chargen", 0, radionic_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START(meritum) +static GFXDECODE_START(gfx_meritum) GFXDECODE_ENTRY( "chargen", 0, meritum_charlayout, 0, 1 ) GFXDECODE_END @@ -619,7 +619,7 @@ MACHINE_CONFIG_START(trs80_state::trs80) // the original model I, level I, MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_trs80) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", trs80) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_trs80) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ @@ -681,7 +681,7 @@ MACHINE_CONFIG_START(trs80_state::model3) MCFG_MACHINE_RESET_OVERRIDE(trs80_state, trs80m4) - MCFG_GFXDECODE_MODIFY("gfxdecode", trs80m4) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_trs80m4) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_trs80m4) @@ -710,7 +710,7 @@ MACHINE_CONFIG_START(trs80_state::ht1080z) sys80(config); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_ht1080z) - MCFG_GFXDECODE_MODIFY("gfxdecode", ht1080z) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_ht1080z) MACHINE_CONFIG_END MACHINE_CONFIG_START(trs80_state::lnw80) @@ -721,7 +721,7 @@ MACHINE_CONFIG_START(trs80_state::lnw80) MCFG_DEVICE_IO_MAP(lnw80_io) MCFG_MACHINE_RESET_OVERRIDE(trs80_state, lnw80) - MCFG_GFXDECODE_MODIFY("gfxdecode",lnw80) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_lnw80) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(8) @@ -744,7 +744,7 @@ MACHINE_CONFIG_START(trs80_state::radionic) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_RAW_PARAMS(12_MHz_XTAL, 768, 0, 512, 312, 0, 256) MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_radionic) - MCFG_GFXDECODE_MODIFY("gfxdecode", radionic) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_radionic) MACHINE_CONFIG_END MACHINE_CONFIG_START(trs80_state::meritum) @@ -754,7 +754,7 @@ MACHINE_CONFIG_START(trs80_state::meritum) MCFG_DEVICE_IO_MAP(meritum_io) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_meritum) - MCFG_GFXDECODE_MODIFY("gfxdecode", meritum) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_meritum) MACHINE_CONFIG_END MACHINE_CONFIG_START(trs80_state::cp500) diff --git a/src/mame/drivers/trs80dt1.cpp b/src/mame/drivers/trs80dt1.cpp index e662394d95a..1b6e796d086 100644 --- a/src/mame/drivers/trs80dt1.cpp +++ b/src/mame/drivers/trs80dt1.cpp @@ -281,7 +281,7 @@ const gfx_layout trs80dt1_charlayout = 8*16 /* space between characters */ }; -static GFXDECODE_START( trs80dt1 ) +static GFXDECODE_START( gfx_trs80dt1 ) GFXDECODE_ENTRY( "chargen", 0x0000, trs80dt1_charlayout, 0, 1 ) GFXDECODE_END @@ -322,7 +322,7 @@ MACHINE_CONFIG_START(trs80dt1_state::trs80dt1) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(40*12, 16*16) MCFG_SCREEN_VISIBLE_AREA(0, 40*12-1, 0, 16*16-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", trs80dt1 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_trs80dt1 ) MCFG_DEVICE_ADD("crtc", I8275, 12480000 / 8) MCFG_I8275_CHARACTER_WIDTH(8) diff --git a/src/mame/drivers/trucocl.cpp b/src/mame/drivers/trucocl.cpp index 9e9bedd374f..7d27cdc51ae 100644 --- a/src/mame/drivers/trucocl.cpp +++ b/src/mame/drivers/trucocl.cpp @@ -131,7 +131,7 @@ static const gfx_layout tilelayout = -static GFXDECODE_START( trucocl ) +static GFXDECODE_START( gfx_trucocl ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 2 ) GFXDECODE_ENTRY( "gfx1", 0x10000, tilelayout, 0, 2 ) GFXDECODE_END @@ -160,7 +160,7 @@ MACHINE_CONFIG_START(trucocl_state::trucocl) MCFG_SCREEN_UPDATE_DRIVER(trucocl_state, screen_update_trucocl) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", trucocl) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_trucocl) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(trucocl_state, trucocl) diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp index 42926ccdf70..f9e0eab8b74 100644 --- a/src/mame/drivers/trvmadns.cpp +++ b/src/mame/drivers/trvmadns.cpp @@ -300,7 +300,7 @@ static const gfx_layout charlayout = 8*16 }; -static GFXDECODE_START( trvmadns ) +static GFXDECODE_START( gfx_trvmadns ) GFXDECODE_ENTRY( nullptr, 0x6000, charlayout, 0, 4 ) // doesn't matter where we point this, all the tiles are decoded while the game runs GFXDECODE_END @@ -400,7 +400,7 @@ MACHINE_CONFIG_START(trvmadns_state::trvmadns) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", trvmadns) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_trvmadns) MCFG_PALETTE_ADD("palette", 16) diff --git a/src/mame/drivers/tryout.cpp b/src/mame/drivers/tryout.cpp index e48a0207d6e..a3d423a22d4 100644 --- a/src/mame/drivers/tryout.cpp +++ b/src/mame/drivers/tryout.cpp @@ -185,7 +185,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( tryout ) +static GFXDECODE_START( gfx_tryout ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 4 ) GFXDECODE_ENTRY( nullptr, 0, vramlayout, 0, 4 ) @@ -209,7 +209,7 @@ MACHINE_CONFIG_START(tryout_state::tryout) MCFG_SCREEN_UPDATE_DRIVER(tryout_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tryout) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tryout) MCFG_PALETTE_ADD("palette", 0x20) MCFG_PALETTE_INIT_OWNER(tryout_state, tryout) diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp index d48b75f2538..b7181baf540 100644 --- a/src/mame/drivers/tsamurai.cpp +++ b/src/mame/drivers/tsamurai.cpp @@ -707,7 +707,7 @@ static const gfx_layout tile_layout = 8*8 }; -static GFXDECODE_START( tsamurai ) +static GFXDECODE_START( gfx_tsamurai ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0, char_layout, 0, 32 ) GFXDECODE_ENTRY( "gfx3", 0, sprite_layout, 0, 32 ) @@ -748,7 +748,7 @@ MACHINE_CONFIG_START(tsamurai_state::tsamurai) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tsamurai_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tsamurai) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tsamurai) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(tsamurai_state,tsamurai) @@ -796,7 +796,7 @@ MACHINE_CONFIG_START(tsamurai_state::vsgongf) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tsamurai_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tsamurai) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tsamurai) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(tsamurai_state,vsgongf) @@ -852,7 +852,7 @@ MACHINE_CONFIG_START(tsamurai_state::m660) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tsamurai_state, vblank_irq)) MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("audio3", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tsamurai) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tsamurai) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) MCFG_VIDEO_START_OVERRIDE(tsamurai_state,m660) diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp index 79185b6209e..49d5d01a260 100644 --- a/src/mame/drivers/tugboat.cpp +++ b/src/mame/drivers/tugboat.cpp @@ -353,7 +353,7 @@ static const gfx_layout tilelayout = 8*8 }; -static GFXDECODE_START( tugboat ) +static GFXDECODE_START( gfx_tugboat ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x80, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0x80, 16 ) GFXDECODE_ENTRY( "gfx3", 0, charlayout, 0x00, 16 ) @@ -380,7 +380,7 @@ MACHINE_CONFIG_START(tugboat_state::tugboat) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tugboat) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tugboat) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(tugboat_state, tugboat) diff --git a/src/mame/drivers/tumbleb.cpp b/src/mame/drivers/tumbleb.cpp index e9107e03306..48c79922795 100644 --- a/src/mame/drivers/tumbleb.cpp +++ b/src/mame/drivers/tumbleb.cpp @@ -1976,21 +1976,21 @@ static const gfx_layout suprtrio_tlayout = }; -static GFXDECODE_START( tumbleb ) +static GFXDECODE_START( gfx_tumbleb ) GFXDECODE_ENTRY( "tilegfx", 0, tcharlayout, 256, 16 ) /* Characters 8x8 */ GFXDECODE_ENTRY( "tilegfx", 0, tlayout, 512, 16 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "tilegfx", 0, tlayout, 256, 16 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "sprgfx", 0, tlayout, 0, 16 ) /* Sprites 16x16 */ GFXDECODE_END -static GFXDECODE_START( suprtrio ) +static GFXDECODE_START( gfx_suprtrio ) GFXDECODE_ENTRY( "tilegfx", 0, tcharlayout, 256, 16 ) /* Characters 8x8 */ GFXDECODE_ENTRY( "tilegfx", 0, suprtrio_tlayout, 512, 16 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "tilegfx", 0, suprtrio_tlayout, 256, 16 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "sprgfx", 0, tlayout, 0, 16 ) /* Sprites 16x16 */ GFXDECODE_END -static GFXDECODE_START( fncywld ) +static GFXDECODE_START( gfx_fncywld ) GFXDECODE_ENTRY( "tilegfx", 0, tcharlayout, 0x400, 0x40 ) /* Characters 8x8 */ GFXDECODE_ENTRY( "tilegfx", 0, tlayout, 0x400, 0x40 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "tilegfx", 0, tlayout, 0x200, 0x40 ) /* Tiles 16x16 */ @@ -2043,7 +2043,7 @@ MACHINE_CONFIG_START(tumbleb_state::tumblepb) MCFG_DECO_SPRITE_ISBOOTLEG(true) MCFG_DECO_SPRITE_GFXDECODE("gfxdecode") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tumbleb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tumbleb) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -2081,7 +2081,7 @@ MACHINE_CONFIG_START(tumbleb_state::tumbleb2) MCFG_DECO_SPRITE_ISBOOTLEG(true) MCFG_DECO_SPRITE_GFXDECODE("gfxdecode") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tumbleb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tumbleb) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -2122,7 +2122,7 @@ MACHINE_CONFIG_START(tumbleb_state::jumpkids) MCFG_DECO_SPRITE_ISBOOTLEG(true) MCFG_DECO_SPRITE_GFXDECODE("gfxdecode") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tumbleb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tumbleb) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) @@ -2162,7 +2162,7 @@ MACHINE_CONFIG_START(tumbleb_state::fncywld) MCFG_DECO_SPRITE_TRANSPEN(15) MCFG_DECO_SPRITE_GFXDECODE("gfxdecode") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fncywld) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fncywld) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) @@ -2222,7 +2222,7 @@ MACHINE_CONFIG_START(tumbleb_state::htchctch) MCFG_DECO_SPRITE_ISBOOTLEG(true) MCFG_DECO_SPRITE_GFXDECODE("gfxdecode") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tumbleb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tumbleb) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -2336,7 +2336,7 @@ MACHINE_CONFIG_START(tumbleb_state::suprtrio) MCFG_DECO_SPRITE_ISBOOTLEG(true) MCFG_DECO_SPRITE_GFXDECODE("gfxdecode") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", suprtrio) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_suprtrio) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -2375,7 +2375,7 @@ MACHINE_CONFIG_START(tumbleb_state::pangpang) MCFG_DECO_SPRITE_ISBOOTLEG(true) MCFG_DECO_SPRITE_GFXDECODE("gfxdecode") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tumbleb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tumbleb) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/tunhunt.cpp b/src/mame/drivers/tunhunt.cpp index 98c9b1d56ca..86c8f90952e 100644 --- a/src/mame/drivers/tunhunt.cpp +++ b/src/mame/drivers/tunhunt.cpp @@ -256,7 +256,7 @@ static const gfx_layout obj_layout = }; -static GFXDECODE_START( tunhunt ) +static GFXDECODE_START( gfx_tunhunt ) GFXDECODE_ENTRY( "gfx1", 0x000, alpha_layout, 0x10, 4 ) GFXDECODE_ENTRY( "gfx2", 0x200, obj_layout, 0x18, 1 ) GFXDECODE_ENTRY( "gfx2", 0x000, obj_layout, 0x18, 1 ) /* second bank, or second bitplane? */ @@ -285,7 +285,7 @@ MACHINE_CONFIG_START(tunhunt_state::tunhunt) MCFG_SCREEN_UPDATE_DRIVER(tunhunt_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tunhunt) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tunhunt) MCFG_PALETTE_ADD("palette", 0x1a) MCFG_PALETTE_INDIRECT_ENTRIES(16) MCFG_PALETTE_INIT_OWNER(tunhunt_state, tunhunt) diff --git a/src/mame/drivers/turbo.cpp b/src/mame/drivers/turbo.cpp index b657e1e1837..ef175948410 100644 --- a/src/mame/drivers/turbo.cpp +++ b/src/mame/drivers/turbo.cpp @@ -831,7 +831,7 @@ INPUT_PORTS_END * *************************************/ -static GFXDECODE_START( turbo ) +static GFXDECODE_START( gfx_turbo ) GFXDECODE_ENTRY( "fgtiles", 0, gfx_8x8x2_planar, 0, 64 ) GFXDECODE_END @@ -881,7 +881,7 @@ MACHINE_CONFIG_START(turbo_state::turbo) MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, turbo_state, start_lamp_w)) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", turbo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_turbo) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(turbo_state,turbo) @@ -921,7 +921,7 @@ MACHINE_CONFIG_START(turbo_state::subroc3d) MCFG_I8279_IN_RL_CB(IOPORT("DSW1")) // kbd RL lines /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", turbo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_turbo) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(turbo_state,subroc3d) @@ -969,7 +969,7 @@ MACHINE_CONFIG_START(turbo_state::buckrog) MCFG_I8279_IN_RL_CB(IOPORT("DSW1")) // kbd RL lines /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", turbo) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_turbo) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_INIT_OWNER(turbo_state,buckrog) diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp index 5416624b78e..8fd100efbd7 100644 --- a/src/mame/drivers/twin16.cpp +++ b/src/mame/drivers/twin16.cpp @@ -616,12 +616,12 @@ static const gfx_layout tile_layout = /* Graphics Decode Info */ -static GFXDECODE_START( twin16 ) +static GFXDECODE_START( gfx_twin16 ) GFXDECODE_ENTRY( "fixed", 0, tile_layout, 0, 16 ) GFXDECODE_RAM( "zipram", 0, tile_layout, 512, 16 ) GFXDECODE_END -static GFXDECODE_START( fround ) +static GFXDECODE_START( gfx_fround ) GFXDECODE_ENTRY( "fixed", 0, tile_layout, 0, 16 ) GFXDECODE_ENTRY( "tiles", 0, tile_layout, 512, 16 ) GFXDECODE_END @@ -673,7 +673,7 @@ MACHINE_CONFIG_START(twin16_state::twin16) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, twin16_state, screen_vblank_twin16)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", twin16) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_twin16) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -728,7 +728,7 @@ MACHINE_CONFIG_START(fround_state::fround) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, twin16_state, screen_vblank_twin16)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", fround) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_fround) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/twincobr.cpp b/src/mame/drivers/twincobr.cpp index 351f3e2bea7..97679afc645 100644 --- a/src/mame/drivers/twincobr.cpp +++ b/src/mame/drivers/twincobr.cpp @@ -644,7 +644,7 @@ static const gfx_layout tilelayout = 8*8 /* every tile takes 8 consecutive bytes */ }; -static GFXDECODE_START( twincobr ) +static GFXDECODE_START( gfx_twincobr ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 1536, 32 ) /* colors 1536-1791 */ GFXDECODE_ENTRY( "gfx2", 0x00000, tilelayout, 1280, 16 ) /* colors 1280-1535 */ GFXDECODE_ENTRY( "gfx3", 0x00000, tilelayout, 1024, 16 ) /* colors 1024-1079 */ @@ -702,7 +702,7 @@ MACHINE_CONFIG_START(twincobr_state::twincobr) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, twincobr_state, twincobr_vblank_irq)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", twincobr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_twincobr) MCFG_PALETTE_ADD("palette", 1792) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/tx0.cpp b/src/mame/drivers/tx0.cpp index ef5f5c52046..5df826286c0 100644 --- a/src/mame/drivers/tx0.cpp +++ b/src/mame/drivers/tx0.cpp @@ -225,7 +225,7 @@ static const uint8_t tx0_palette[] = static const uint8_t total_colors_needed = pen_crt_num_levels + sizeof(tx0_colors) / 3; -static GFXDECODE_START( tx0 ) +static GFXDECODE_START( gfx_tx0 ) GFXDECODE_ENTRY( "gfx1", 0, fontlayout, pen_crt_num_levels + sizeof(tx0_colors) / 3, 3 ) GFXDECODE_END @@ -1577,7 +1577,7 @@ MACHINE_CONFIG_START(tx0_state::tx0_64kw) MCFG_DEVICE_ADD("typewriter", TX0_PRINTER, 0) MCFG_DEVICE_ADD("magtape", TX0_MAGTAPE, 0) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tx0) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tx0) MCFG_PALETTE_ADD("palette", total_colors_needed + sizeof(tx0_palette)) MCFG_PALETTE_INDIRECT_ENTRIES(total_colors_needed) MCFG_PALETTE_INIT_OWNER(tx0_state, tx0) diff --git a/src/mame/drivers/ultratnk.cpp b/src/mame/drivers/ultratnk.cpp index 83791424610..de3c53d888a 100644 --- a/src/mame/drivers/ultratnk.cpp +++ b/src/mame/drivers/ultratnk.cpp @@ -283,7 +283,7 @@ static const gfx_layout motion_layout = }; -static GFXDECODE_START( ultratnk ) +static GFXDECODE_START( gfx_ultratnk ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x1, 0, 5 ) GFXDECODE_ENTRY( "gfx2", 0, motion_layout, 0, 5 ) GFXDECODE_END @@ -312,7 +312,7 @@ MACHINE_CONFIG_START(ultratnk_state::ultratnk) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ultratnk_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ultratnk) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ultratnk) MCFG_PALETTE_ADD("palette", 10) MCFG_PALETTE_INDIRECT_ENTRIES(4) MCFG_PALETTE_INIT_OWNER(ultratnk_state, ultratnk) diff --git a/src/mame/drivers/umipoker.cpp b/src/mame/drivers/umipoker.cpp index 49b4910d99c..742b02e33b3 100644 --- a/src/mame/drivers/umipoker.cpp +++ b/src/mame/drivers/umipoker.cpp @@ -682,7 +682,7 @@ static const gfx_layout layout_8x8x4 = 8*8 }; -static GFXDECODE_START( umipoker ) +static GFXDECODE_START( gfx_umipoker ) GFXDECODE_ENTRY( "gfx1", 0, layout_8x8x4, 0, 0x40) GFXDECODE_END @@ -715,7 +715,7 @@ MACHINE_CONFIG_START(umipoker_state::umipoker) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(ASSERTLINE("maincpu", 6)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", umipoker) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_umipoker) MCFG_PALETTE_ADD("palette", 0x400) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/undrfire.cpp b/src/mame/drivers/undrfire.cpp index 454c79fc982..33aeb62c5d0 100644 --- a/src/mame/drivers/undrfire.cpp +++ b/src/mame/drivers/undrfire.cpp @@ -542,13 +542,13 @@ static const gfx_layout scclayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( undrfire ) +static GFXDECODE_START( gfx_undrfire ) GFXDECODE_ENTRY( "gfx2", 0x0, tile16x16_layout, 0, 512 ) GFXDECODE_ENTRY( "gfx1", 0x0, charlayout, 0, 512 ) GFXDECODE_ENTRY( "gfx3", 0x0, scclayout, 0, 512 ) GFXDECODE_END -static GFXDECODE_START( cbombers ) +static GFXDECODE_START( gfx_cbombers ) GFXDECODE_ENTRY( "gfx2", 0x0, tile16x16_layout, 0, 512 ) GFXDECODE_ENTRY( "gfx1", 0x0, charlayout, 0x1000, 512 ) GFXDECODE_ENTRY( "gfx3", 0x0, scclayout, 0, 512 ) @@ -594,7 +594,7 @@ MACHINE_CONFIG_START(undrfire_state::undrfire) MCFG_SCREEN_UPDATE_DRIVER(undrfire_state, screen_update_undrfire) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", undrfire) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_undrfire) MCFG_PALETTE_ADD("palette", 16384) MCFG_PALETTE_FORMAT(XRGB) @@ -657,7 +657,7 @@ MACHINE_CONFIG_START(undrfire_state::cbombers) MCFG_SCREEN_UPDATE_DRIVER(undrfire_state, screen_update_cbombers) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cbombers) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cbombers) MCFG_PALETTE_ADD("palette", 16384) MCFG_PALETTE_FORMAT(XRGB) diff --git a/src/mame/drivers/unico.cpp b/src/mame/drivers/unico.cpp index 511477d418c..21cb34f7419 100644 --- a/src/mame/drivers/unico.cpp +++ b/src/mame/drivers/unico.cpp @@ -549,7 +549,7 @@ static const gfx_layout layout_16x16x8 = 16*16*2 }; -static GFXDECODE_START( unico ) +static GFXDECODE_START( gfx_unico ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0x0, 0x20 ) // [0] Sprites GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x8, 0x0, 0x20 ) // [1] Layers GFXDECODE_END @@ -585,7 +585,7 @@ MACHINE_CONFIG_START(unico_state::burglarx) MCFG_SCREEN_UPDATE_DRIVER(unico_state, screen_update_unico) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", unico) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_unico) MCFG_PALETTE_ADD("palette", 8192) /* sound hardware */ @@ -623,7 +623,7 @@ MACHINE_CONFIG_START(zeropnt_state::zeropnt) MCFG_SCREEN_UPDATE_DRIVER(zeropnt_state, screen_update_unico) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", unico) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_unico) MCFG_PALETTE_ADD("palette", 8192) /* sound hardware */ @@ -663,7 +663,7 @@ MACHINE_CONFIG_START(zeropnt2_state::zeropnt2) MCFG_SCREEN_UPDATE_DRIVER(zeropnt2_state, screen_update_unico) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", unico) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_unico) MCFG_PALETTE_ADD("palette", 8192) /* sound hardware */ diff --git a/src/mame/drivers/unior.cpp b/src/mame/drivers/unior.cpp index a37028f638f..6ac1a62d3ac 100644 --- a/src/mame/drivers/unior.cpp +++ b/src/mame/drivers/unior.cpp @@ -245,7 +245,7 @@ static const gfx_layout unior_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( unior ) +static GFXDECODE_START( gfx_unior ) GFXDECODE_ENTRY( "chargen", 0x0000, unior_charlayout, 0, 1 ) GFXDECODE_END @@ -390,7 +390,7 @@ MACHINE_CONFIG_START(unior_state::unior) MCFG_SCREEN_SIZE(640, 200) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1) MCFG_SCREEN_UPDATE_DEVICE("crtc", i8275_device, screen_update) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", unior) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_unior) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(unior_state,unior) diff --git a/src/mame/drivers/unistar.cpp b/src/mame/drivers/unistar.cpp index 70ce2f26703..45b37342e33 100644 --- a/src/mame/drivers/unistar.cpp +++ b/src/mame/drivers/unistar.cpp @@ -91,7 +91,7 @@ static const gfx_layout unistar_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( unistar ) +static GFXDECODE_START( gfx_unistar ) GFXDECODE_ENTRY( "chargen", 0x0000, unistar_charlayout, 0, 1 ) GFXDECODE_END @@ -115,7 +115,7 @@ MACHINE_CONFIG_START(unistar_state::unistar) MCFG_SCREEN_UPDATE_DRIVER(unistar_state, screen_update_unistar) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", unistar) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_unistar) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(unistar_state, unistar) MACHINE_CONFIG_END diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp index f073a872312..b6af5a4d1ab 100644 --- a/src/mame/drivers/univac.cpp +++ b/src/mame/drivers/univac.cpp @@ -300,7 +300,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 @@ -327,7 +327,7 @@ MACHINE_CONFIG_START(univac_state::uts20) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", c10) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_c10) MCFG_NVRAM_ADD_1FILL("nvram") diff --git a/src/mame/drivers/usgames.cpp b/src/mame/drivers/usgames.cpp index 3942058d247..838b010cb1c 100644 --- a/src/mame/drivers/usgames.cpp +++ b/src/mame/drivers/usgames.cpp @@ -213,7 +213,7 @@ static const gfx_layout charlayout = 8*8 }; -static GFXDECODE_START( usgames ) +static GFXDECODE_START( gfx_usgames ) GFXDECODE_ENTRY( nullptr, 0x2800, charlayout, 0, 256 ) GFXDECODE_END @@ -236,7 +236,7 @@ MACHINE_CONFIG_START(usgames_state::usg32) MCFG_SCREEN_UPDATE_DRIVER(usgames_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", usgames) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_usgames) MCFG_PALETTE_ADD("palette", 2*256) MCFG_PALETTE_INIT_OWNER(usgames_state, usgames) diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp index 378be07442d..ac1a43070f7 100644 --- a/src/mame/drivers/ut88.cpp +++ b/src/mame/drivers/ut88.cpp @@ -33,7 +33,7 @@ Paste facility was tested but doesn't work, so all code remnants removed. #include "speaker.h" -static GFXDECODE_START( ut88 ) +static GFXDECODE_START( gfx_ut88 ) GFXDECODE_ENTRY( "chargen", 0x0000, ut88_charlayout, 0, 1 ) GFXDECODE_END @@ -205,7 +205,7 @@ MACHINE_CONFIG_START(ut88_state::ut88) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", ut88 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ut88) /* audio hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp index a6389a10937..adbb53f0897 100644 --- a/src/mame/drivers/v6809.cpp +++ b/src/mame/drivers/v6809.cpp @@ -157,7 +157,7 @@ static const gfx_layout v6809_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( v6809 ) +static GFXDECODE_START( gfx_v6809 ) GFXDECODE_ENTRY( "chargen", 0x0000, v6809_charlayout, 0, 1 ) GFXDECODE_END @@ -292,7 +292,7 @@ MACHINE_CONFIG_START(v6809_state::v6809) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DEVICE("crtc", sy6545_1_device, screen_update) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", v6809) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_v6809) /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp index 8d0bd038f46..ccb7b9c6ea6 100644 --- a/src/mame/drivers/vamphalf.cpp +++ b/src/mame/drivers/vamphalf.cpp @@ -1033,7 +1033,7 @@ static const gfx_layout sprites_layout = 16*16*8, }; -static GFXDECODE_START( vamphalf ) +static GFXDECODE_START( gfx_vamphalf ) GFXDECODE_ENTRY( "gfx", 0, sprites_layout, 0, 0x80 ) GFXDECODE_END @@ -1059,7 +1059,7 @@ MACHINE_CONFIG_START(vamphalf_state::common) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vamphalf) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vamphalf) MACHINE_CONFIG_END MACHINE_CONFIG_START(vamphalf_state::sound_ym_oki) @@ -1237,7 +1237,7 @@ MACHINE_CONFIG_START(vamphalf_state::aoh) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vamphalf) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vamphalf) /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/vaportra.cpp b/src/mame/drivers/vaportra.cpp index cd40a37db5e..03e76e0c7c0 100644 --- a/src/mame/drivers/vaportra.cpp +++ b/src/mame/drivers/vaportra.cpp @@ -183,7 +183,7 @@ static const gfx_layout tilelayout = 32*16 }; -static GFXDECODE_START( vaportra ) +static GFXDECODE_START( gfx_vaportra ) GFXDECODE_ENTRY( "gfx1", 0x000000, charlayout, 0x000, 0x500 ) /* Characters 8x8 */ GFXDECODE_ENTRY( "gfx1", 0x000000, tilelayout, 0x000, 0x500 ) /* Tiles 16x16 */ GFXDECODE_ENTRY( "gfx2", 0x000000, charlayout, 0x000, 0x500 ) /* Characters 8x8 */ @@ -212,16 +212,16 @@ void vaportra_state::machine_reset() MACHINE_CONFIG_START(vaportra_state::vaportra) /* 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(main_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vaportra_state, irq6_line_assert) - MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(24'000'000)/4) /* Custom chip 45; Audio section crystal is 32.220 MHz but CPU clock is confirmed as coming from the 24MHz crystal (6Mhz exactly on the CPU) */ + MCFG_DEVICE_ADD(m_audiocpu, H6280, XTAL(24'000'000)/4) /* Custom chip 45; Audio section crystal is 32.220 MHz but CPU clock is confirmed as coming from the 24MHz crystal (6Mhz exactly on the CPU) */ MCFG_DEVICE_PROGRAM_MAP(sound_map) /* video hardware */ - MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) + MCFG_DEVICE_ADD(m_spriteram, BUFFERED_SPRITERAM16) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(58) @@ -229,13 +229,12 @@ MACHINE_CONFIG_START(vaportra_state::vaportra) 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(vaportra_state, screen_update) - MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_PALETTE("colors") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vaportra) - MCFG_PALETTE_ADD("palette", 1280) - MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, m_palette, gfx_vaportra) + MCFG_PALETTE_ADD(m_palette, 1280) - MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0) + MCFG_DEVICE_ADD(m_tilegen[0], DECO16IC, 0) MCFG_DECO16IC_SPLIT(0) MCFG_DECO16IC_PF1_SIZE(DECO_64x32) MCFG_DECO16IC_PF2_SIZE(DECO_64x32) @@ -251,7 +250,7 @@ MACHINE_CONFIG_START(vaportra_state::vaportra) MCFG_DECO16IC_PF12_16X16_BANK(1) MCFG_DECO16IC_GFXDECODE("gfxdecode") - MCFG_DEVICE_ADD("tilegen2", DECO16IC, 0) + MCFG_DEVICE_ADD(m_tilegen[1], DECO16IC, 0) MCFG_DECO16IC_SPLIT(0) MCFG_DECO16IC_PF1_SIZE(DECO_64x32) MCFG_DECO16IC_PF2_SIZE(DECO_64x32) @@ -267,15 +266,15 @@ MACHINE_CONFIG_START(vaportra_state::vaportra) MCFG_DECO16IC_PF12_16X16_BANK(3) MCFG_DECO16IC_GFXDECODE("gfxdecode") - MCFG_DEVICE_ADD("spritegen", DECO_MXC06, 0) + MCFG_DEVICE_ADD(m_spritegen, DECO_MXC06, 0) MCFG_DECO_MXC06_GFX_REGION(4) MCFG_DECO_MXC06_GFXDECODE("gfxdecode") /* 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.60) diff --git a/src/mame/drivers/vastar.cpp b/src/mame/drivers/vastar.cpp index 2892fd12ff5..ca13edab91b 100644 --- a/src/mame/drivers/vastar.cpp +++ b/src/mame/drivers/vastar.cpp @@ -402,7 +402,7 @@ static const gfx_layout spritelayoutdw = 128*8 }; -static GFXDECODE_START( vastar ) +static GFXDECODE_START( gfx_vastar ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayoutdw, 0, 64 ) @@ -448,7 +448,7 @@ MACHINE_CONFIG_START(vastar_state::vastar) MCFG_SCREEN_UPDATE_DRIVER(vastar_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vastar) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vastar) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) /* sound hardware */ diff --git a/src/mame/drivers/vball.cpp b/src/mame/drivers/vball.cpp index 662629bc893..67c1322689e 100644 --- a/src/mame/drivers/vball.cpp +++ b/src/mame/drivers/vball.cpp @@ -390,7 +390,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( vb ) +static GFXDECODE_START( gfx_vb ) GFXDECODE_ENTRY( "fg_tiles", 0, charlayout, 0, 8 ) /* 8x8 chars */ GFXDECODE_ENTRY( "sprites", 0, spritelayout, 128, 8 ) /* 16x16 sprites */ GFXDECODE_END @@ -413,7 +413,7 @@ MACHINE_CONFIG_START(vball_state::vball) MCFG_SCREEN_UPDATE_DRIVER(vball_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vb) MCFG_PALETTE_ADD("palette", 256) diff --git a/src/mame/drivers/vega.cpp b/src/mame/drivers/vega.cpp index e4adf2da11d..eded77fb00f 100644 --- a/src/mame/drivers/vega.cpp +++ b/src/mame/drivers/vega.cpp @@ -696,7 +696,7 @@ static const gfx_layout tile_layout3 = }; -static GFXDECODE_START( test_decode ) +static GFXDECODE_START( gfx_test_decode ) GFXDECODE_ENTRY( "gfx1", 0, text_charlayout, 0, 8 ) GFXDECODE_ENTRY( "gfx2", 0, tile_layout2, 16, 1 ) GFXDECODE_ENTRY( "gfx3", 0, tile_layout3, 16, 1 ) @@ -832,7 +832,7 @@ MACHINE_CONFIG_START(vega_state::vega) MCFG_PALETTE_ADD("palette", 0x100) MCFG_PALETTE_INIT_OWNER(vega_state, vega) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", test_decode) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_test_decode) /* sound hardware */ diff --git a/src/mame/drivers/vg5k.cpp b/src/mame/drivers/vg5k.cpp index eaa77703409..dd5be91ec87 100644 --- a/src/mame/drivers/vg5k.cpp +++ b/src/mame/drivers/vg5k.cpp @@ -336,7 +336,7 @@ static const gfx_layout vg5k_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( vg5k ) +static GFXDECODE_START( gfx_vg5k ) GFXDECODE_ENTRY( "ef9345", 0x2000, vg5k_charlayout, 0, 4 ) GFXDECODE_END @@ -385,7 +385,7 @@ MACHINE_CONFIG_START(vg5k_state::vg5k) MCFG_SCREEN_SIZE(336, 300) MCFG_SCREEN_VISIBLE_AREA(00, 336-1, 00, 270-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vg5k) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vg5k) MCFG_PALETTE_ADD("palette", 8) /* sound hardware */ diff --git a/src/mame/drivers/videopin.cpp b/src/mame/drivers/videopin.cpp index 3d7fbf85188..efcbc042a82 100644 --- a/src/mame/drivers/videopin.cpp +++ b/src/mame/drivers/videopin.cpp @@ -346,7 +346,7 @@ static const gfx_layout ball_layout = }; -static GFXDECODE_START( videopin ) +static GFXDECODE_START( gfx_videopin ) GFXDECODE_ENTRY( "gfx1", 0x0000, tile_layout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0x0000, ball_layout, 0, 1 ) GFXDECODE_END @@ -375,7 +375,7 @@ MACHINE_CONFIG_START(videopin_state::videopin) MCFG_SCREEN_UPDATE_DRIVER(videopin_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", videopin) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_videopin) MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp index 15576d57e59..6d91c5ca464 100644 --- a/src/mame/drivers/videopkr.cpp +++ b/src/mame/drivers/videopkr.cpp @@ -1228,12 +1228,12 @@ static const gfx_layout tilelayout_8 = * Graphics Decode Information * ******************************/ -static GFXDECODE_START( videopkr ) +static GFXDECODE_START( gfx_videopkr ) GFXDECODE_ENTRY( "tiles", 0, tilelayout_8, 0, 64 ) GFXDECODE_END -static GFXDECODE_START( videodad ) +static GFXDECODE_START( gfx_videodad ) GFXDECODE_ENTRY( "tiles", 0, tilelayout_16, 0, 64 ) GFXDECODE_END @@ -1296,7 +1296,7 @@ MACHINE_CONFIG_START(videopkr_state::videopkr) MCFG_SCREEN_UPDATE_DRIVER(videopkr_state, screen_update_videopkr) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", videopkr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_videopkr) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(videopkr_state, videopkr) @@ -1332,7 +1332,7 @@ MACHINE_CONFIG_START(videopkr_state::videodad) MCFG_SCREEN_SIZE(32*16, 32*8) MCFG_SCREEN_VISIBLE_AREA(4*16, 31*16-1, 2*8, 30*8-1) - MCFG_GFXDECODE_MODIFY("gfxdecode", videodad) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_videodad) MCFG_VIDEO_START_OVERRIDE(videopkr_state,vidadcba) MACHINE_CONFIG_END @@ -1363,7 +1363,7 @@ MACHINE_CONFIG_START(videopkr_state::babypkr) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(videopkr_state,babypkr) - MCFG_GFXDECODE_MODIFY("gfxdecode", videodad) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_videodad) MCFG_VIDEO_START_OVERRIDE(videopkr_state,vidadcba) MCFG_DEVICE_ADD("aysnd", AY8910, CPU_CLOCK / 6) /* no ports used */ diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp index 0c44bd9a749..88d2060ae60 100644 --- a/src/mame/drivers/vigilant.cpp +++ b/src/mame/drivers/vigilant.cpp @@ -458,7 +458,7 @@ static const gfx_layout buccaneer_back_layout = 16*8 }; -static GFXDECODE_START( vigilant ) +static GFXDECODE_START( gfx_vigilant ) GFXDECODE_ENTRY( "gfx1", 0, text_layout, 256, 16 ) /* colors 256-511 */ GFXDECODE_ENTRY( "gfx2", 0, sprite_layout, 0, 16 ) /* colors 0-255 */ GFXDECODE_ENTRY( "gfx3", 0, back_layout, 512, 2 ) /* actually the background uses colors */ @@ -466,7 +466,7 @@ static GFXDECODE_START( vigilant ) /* pens we can handle it more easily. */ GFXDECODE_END -static GFXDECODE_START( buccanrs ) +static GFXDECODE_START( gfx_buccanrs ) GFXDECODE_ENTRY( "gfx1", 0, text_layout, 256, 16 ) /* colors 256-511 */ GFXDECODE_ENTRY( "gfx2", 0, sprite_layout_buccanrs, 0, 16 ) /* colors 0-255 */ GFXDECODE_ENTRY( "gfx3", 0, buccaneer_back_layout, 512, 2 ) /* actually the background uses colors */ @@ -474,7 +474,7 @@ static GFXDECODE_START( buccanrs ) /* pens we can handle it more easily. */ GFXDECODE_END -static GFXDECODE_START( kikcubic ) +static GFXDECODE_START( gfx_kikcubic ) GFXDECODE_ENTRY( "gfx1", 0, text_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, sprite_layout, 0, 16 ) GFXDECODE_END @@ -504,7 +504,7 @@ MACHINE_CONFIG_START(vigilant_state::vigilant) MCFG_SCREEN_UPDATE_DRIVER(vigilant_state, screen_update_vigilant) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vigilant) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vigilant) MCFG_PALETTE_ADD("palette", 512+32) /* 512 real palette, 32 virtual palette */ @@ -555,7 +555,7 @@ MACHINE_CONFIG_START(vigilant_state::buccanrs) MCFG_SCREEN_UPDATE_DRIVER(vigilant_state, screen_update_vigilant) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", buccanrs) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_buccanrs) MCFG_PALETTE_ADD("palette", 512+32) /* 512 real palette, 32 virtual palette */ @@ -622,7 +622,7 @@ MACHINE_CONFIG_START(vigilant_state::kikcubic) MCFG_SCREEN_UPDATE_DRIVER(vigilant_state, screen_update_kikcubic) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", kikcubic) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_kikcubic) MCFG_PALETTE_ADD("palette", 256) diff --git a/src/mame/drivers/vindictr.cpp b/src/mame/drivers/vindictr.cpp index 7f8d5b825aa..7a4b78e1ff7 100644 --- a/src/mame/drivers/vindictr.cpp +++ b/src/mame/drivers/vindictr.cpp @@ -169,7 +169,7 @@ static const gfx_layout pfmolayout = }; -static GFXDECODE_START( vindictr ) +static GFXDECODE_START( gfx_vindictr ) GFXDECODE_ENTRY( "gfx1", 0, pfmolayout, 256, 32 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx2", 0, anlayout, 0, 64 ) /* characters 8x8 */ GFXDECODE_END @@ -194,7 +194,7 @@ MACHINE_CONFIG_START(vindictr_state::vindictr) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vindictr) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vindictr) MCFG_PALETTE_ADD("palette", 2048*8) MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 2, vindictr_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,64) diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp index 321465c3e92..9b84ef57280 100644 --- a/src/mame/drivers/vlc.cpp +++ b/src/mame/drivers/vlc.cpp @@ -272,7 +272,7 @@ WRITE16_MEMBER( nevada_state::vram_w ) } /***************************************************************************/ -static GFXDECODE_START( nevada ) +static GFXDECODE_START( gfx_nevada ) /* Todo , just for sample */ GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 8 ) GFXDECODE_END @@ -602,7 +602,7 @@ MACHINE_CONFIG_START(nevada_state::nevada) MCFG_SCREEN_UPDATE_DRIVER(nevada_state, screen_update_nevada) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", nevada) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nevada) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(nevada_state, nevada) diff --git a/src/mame/drivers/volfied.cpp b/src/mame/drivers/volfied.cpp index 80b7a6052ca..d87c6549d0a 100644 --- a/src/mame/drivers/volfied.cpp +++ b/src/mame/drivers/volfied.cpp @@ -201,7 +201,7 @@ static const gfx_layout tilelayout = 128*8 }; -static GFXDECODE_START( volfied ) +static GFXDECODE_START( gfx_volfied ) GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 4096, 256 ) GFXDECODE_END @@ -269,7 +269,7 @@ MACHINE_CONFIG_START(volfied_state::volfied) MCFG_SCREEN_UPDATE_DRIVER(volfied_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", volfied) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_volfied) MCFG_PALETTE_ADD("palette", 8192) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/vpoker.cpp b/src/mame/drivers/vpoker.cpp index 466c0bdafb5..f157a580fad 100644 --- a/src/mame/drivers/vpoker.cpp +++ b/src/mame/drivers/vpoker.cpp @@ -621,7 +621,7 @@ static const gfx_layout charlayout = 16*16 }; -static GFXDECODE_START( vpoker ) +static GFXDECODE_START( gfx_vpoker ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -647,7 +647,7 @@ MACHINE_CONFIG_START(vpoker_state::vpoker) MCFG_SCREEN_UPDATE_DRIVER(vpoker_state, screen_update_vpoker) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vpoker) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vpoker) MCFG_PALETTE_ADD_3BIT_GBR("palette") diff --git a/src/mame/drivers/vroulet.cpp b/src/mame/drivers/vroulet.cpp index 560e5a7f223..1234fed2828 100644 --- a/src/mame/drivers/vroulet.cpp +++ b/src/mame/drivers/vroulet.cpp @@ -264,7 +264,7 @@ static const gfx_layout charlayout = /* Graphics Decode Information */ -static GFXDECODE_START( vroulet ) +static GFXDECODE_START( gfx_vroulet ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 32 ) GFXDECODE_END @@ -304,7 +304,7 @@ MACHINE_CONFIG_START(vroulet_state::vroulet) MCFG_SCREEN_UPDATE_DRIVER(vroulet_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vroulet) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vroulet) MCFG_PALETTE_ADD("palette", 128*4) // sound hardware diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp index 4cfefac381e..0e1a0c2b4a5 100644 --- a/src/mame/drivers/vt100.cpp +++ b/src/mame/drivers/vt100.cpp @@ -316,7 +316,7 @@ static const gfx_layout vt100_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( vt100 ) +static GFXDECODE_START( gfx_vt100 ) GFXDECODE_ENTRY( "chargen", 0x0000, vt100_charlayout, 0, 1 ) GFXDECODE_END @@ -334,7 +334,7 @@ MACHINE_CONFIG_START(vt100_state::vt100) MCFG_SCREEN_UPDATE_DRIVER(vt100_state, screen_update_vt100) MCFG_SCREEN_PALETTE("vt100_video:palette") - MCFG_GFXDECODE_ADD("gfxdecode", "vt100_video:palette", vt100) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "vt100_video:palette", gfx_vt100) // MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEFAULT_LAYOUT( layout_vt100 ) diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp index b60918acb03..73915a2e9a6 100644 --- a/src/mame/drivers/vt240.cpp +++ b/src/mame/drivers/vt240.cpp @@ -639,7 +639,7 @@ static const gfx_layout vt240_chars_8x10 = 8*10 }; -static GFXDECODE_START( vt240 ) +static GFXDECODE_START( gfx_vt240 ) GFXDECODE_ENTRY( "charcpu", 0x338*10-3, vt240_chars_8x10, 0, 8 ) GFXDECODE_END @@ -673,7 +673,7 @@ MACHINE_CONFIG_START(vt240_state::vt240) MCFG_SCREEN_RAW_PARAMS(XTAL(16'097'280), 1024, 0, 800, 629, 0, 480) MCFG_SCREEN_UPDATE_DEVICE("upd7220", upd7220_device, screen_update) MCFG_PALETTE_ADD("palette", 32) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vt240) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vt240) MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL(16'097'280) / 16) // actually /8? MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map) diff --git a/src/mame/drivers/vta2000.cpp b/src/mame/drivers/vta2000.cpp index 29f82b98082..d2ca506d271 100644 --- a/src/mame/drivers/vta2000.cpp +++ b/src/mame/drivers/vta2000.cpp @@ -148,7 +148,7 @@ static const gfx_layout vta2000_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( vta2000 ) +static GFXDECODE_START( gfx_vta2000 ) GFXDECODE_ENTRY( "chargen", 0x0000, vta2000_charlayout, 0, 1 ) GFXDECODE_END @@ -176,7 +176,7 @@ MACHINE_CONFIG_START(vta2000_state::vta2000) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(vta2000_state, vta2000) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vta2000) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vta2000) MACHINE_CONFIG_END diff --git a/src/mame/drivers/vtech2.cpp b/src/mame/drivers/vtech2.cpp index 64d98419e10..a6e044ee83f 100644 --- a/src/mame/drivers/vtech2.cpp +++ b/src/mame/drivers/vtech2.cpp @@ -353,7 +353,7 @@ static const gfx_layout gfxlayout_4bpp_dh = 2*4 /* one byte per code */ }; -static GFXDECODE_START( vtech2 ) +static GFXDECODE_START( gfx_vtech2 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_80, 0, 256 ) GFXDECODE_ENTRY( "gfx1", 0, charlayout_40, 0, 256 ) GFXDECODE_ENTRY( "gfx2", 0, gfxlayout_1bpp, 0, 256 ) @@ -432,7 +432,7 @@ MACHINE_CONFIG_START(vtech2_state::laser350) MCFG_SCREEN_UPDATE_DRIVER(vtech2_state, screen_update_laser) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vtech2 ) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vtech2) MCFG_PALETTE_ADD("palette", 512+16) MCFG_PALETTE_INDIRECT_ENTRIES(16) MCFG_PALETTE_INIT_OWNER(vtech2_state, vtech2) diff --git a/src/mame/drivers/vulgus.cpp b/src/mame/drivers/vulgus.cpp index 351effdce3c..abe8168a0a0 100644 --- a/src/mame/drivers/vulgus.cpp +++ b/src/mame/drivers/vulgus.cpp @@ -207,7 +207,7 @@ static const gfx_layout spritelayout = -static GFXDECODE_START( vulgus ) +static GFXDECODE_START( gfx_vulgus ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 64*4+16*16, 32*4 ) GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 64*4, 16 ) @@ -236,7 +236,7 @@ MACHINE_CONFIG_START(vulgus_state::vulgus) MCFG_SCREEN_UPDATE_DRIVER(vulgus_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", vulgus) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_vulgus) MCFG_PALETTE_ADD("palette", 64*4+16*16+4*32*8) MCFG_PALETTE_INDIRECT_ENTRIES(256) diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp index e0dc0a90a42..ce3780b746b 100644 --- a/src/mame/drivers/wallc.cpp +++ b/src/mame/drivers/wallc.cpp @@ -468,7 +468,7 @@ static const gfx_layout charlayout = 8*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( wallc ) +static GFXDECODE_START( gfx_wallc ) GFXDECODE_ENTRY( "gfx1", 0 , charlayout, 0, 4 ) GFXDECODE_END @@ -523,7 +523,7 @@ MACHINE_CONFIG_START(wallc_state::wallc) MCFG_SCREEN_UPDATE_DRIVER(wallc_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wallc) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wallc) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(wallc_state, wallc) diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp index be7f912df85..4ac08f52c56 100644 --- a/src/mame/drivers/wardner.cpp +++ b/src/mame/drivers/wardner.cpp @@ -355,7 +355,7 @@ static const gfx_layout tilelayout = }; -static GFXDECODE_START( wardner ) +static GFXDECODE_START( gfx_wardner ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 1536, 32 ) /* colors 1536-1791 */ GFXDECODE_ENTRY( "gfx2", 0x00000, tilelayout, 1280, 16 ) /* colors 1280-1535 */ GFXDECODE_ENTRY( "gfx3", 0x00000, tilelayout, 1024, 16 ) /* colors 1024-1079 */ @@ -432,7 +432,7 @@ MACHINE_CONFIG_START(wardner_state::wardner) MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, wardner_state, wardner_vblank_irq)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wardner) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wardner) MCFG_PALETTE_ADD("palette", 1792) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) diff --git a/src/mame/drivers/warpsped.cpp b/src/mame/drivers/warpsped.cpp index b4cb264b693..ddd90430b32 100644 --- a/src/mame/drivers/warpsped.cpp +++ b/src/mame/drivers/warpsped.cpp @@ -302,7 +302,7 @@ static const gfx_layout charlayout = 8*8 }; -static GFXDECODE_START( warpspeed ) +static GFXDECODE_START( gfx_warpspeed ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_ENTRY( "gfx2", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -337,7 +337,7 @@ MACHINE_CONFIG_START(warpspeed_state::warpspeed) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_UPDATE_DRIVER(warpspeed_state, screen_update) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", warpspeed) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_warpspeed) MCFG_PALETTE_ADD("palette", 2+8) MCFG_PALETTE_INIT_OWNER(warpspeed_state, warpspeed) MACHINE_CONFIG_END diff --git a/src/mame/drivers/warpwarp.cpp b/src/mame/drivers/warpwarp.cpp index 5587be2f53b..97585d47c62 100644 --- a/src/mame/drivers/warpwarp.cpp +++ b/src/mame/drivers/warpwarp.cpp @@ -699,15 +699,15 @@ static const gfx_layout charlayout = 8*8 }; -static GFXDECODE_START( 1k ) +static GFXDECODE_START( gfx_1k ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 4 ) GFXDECODE_END -static GFXDECODE_START( 2k ) +static GFXDECODE_START( gfx_2k ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 2 ) GFXDECODE_END -static GFXDECODE_START( color ) +static GFXDECODE_START( gfx_color ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 256 ) GFXDECODE_END @@ -737,7 +737,7 @@ MACHINE_CONFIG_START(warpwarp_state::geebee) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, warpwarp_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1k) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_1k) MCFG_PALETTE_ADD("palette", 4*2) MCFG_PALETTE_INIT_OWNER(warpwarp_state,geebee) @@ -760,7 +760,7 @@ MACHINE_CONFIG_START(warpwarp_state::navarone) geebee(config); /* basic machine hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", 2k) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_2k) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(2*2) @@ -772,7 +772,7 @@ MACHINE_CONFIG_START(warpwarp_state::kaitei) geebee(config); /* basic machine hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", 1k) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_1k) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_ENTRIES(4*2+1) @@ -805,7 +805,7 @@ MACHINE_CONFIG_START(warpwarp_state::bombbee) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, warpwarp_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", color) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_color) MCFG_PALETTE_ADD("palette", 2*256+1) MCFG_PALETTE_INIT_OWNER(warpwarp_state,warpwarp) diff --git a/src/mame/drivers/warriorb.cpp b/src/mame/drivers/warriorb.cpp index 28669f73686..daec2f97f0e 100644 --- a/src/mame/drivers/warriorb.cpp +++ b/src/mame/drivers/warriorb.cpp @@ -412,7 +412,7 @@ static const gfx_layout charlayout = 32*8 /* every sprite takes 32 consecutive bytes */ }; -static GFXDECODE_START( warriorb ) +static GFXDECODE_START( gfx_warriorb ) GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 256 ) /* sprites */ GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) /* scr tiles (screen 1) */ GFXDECODE_ENTRY( "gfx3", 0, charlayout, 0, 256 ) /* scr tiles (screen 2) */ @@ -454,7 +454,7 @@ MACHINE_CONFIG_START(warriorb_state::darius2d) MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2")) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", warriorb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_warriorb) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_ADD("palette2", 4096) @@ -540,7 +540,7 @@ MACHINE_CONFIG_START(warriorb_state::warriorb) MCFG_TC0510NIO_READ_7_CB(IOPORT("IN2")) /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", warriorb) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_warriorb) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_ADD("palette2", 4096) diff --git a/src/mame/drivers/wc90.cpp b/src/mame/drivers/wc90.cpp index 72e0004fdcc..494636bccc3 100644 --- a/src/mame/drivers/wc90.cpp +++ b/src/mame/drivers/wc90.cpp @@ -331,7 +331,7 @@ static const gfx_layout spritelayout8 = }; -static GFXDECODE_START( wc90 ) +static GFXDECODE_START( gfx_wc90 ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 1*16*16, 16*16 ) GFXDECODE_ENTRY( "gfx2", 0x00000, tilelayout, 2*16*16, 16*16 ) GFXDECODE_ENTRY( "gfx3", 0x00000, tilelayout, 3*16*16, 16*16 ) @@ -372,7 +372,7 @@ MACHINE_CONFIG_START(wc90_state::wc90) MCFG_SCREEN_UPDATE_DRIVER(wc90_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wc90) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wc90) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) diff --git a/src/mame/drivers/wc90b.cpp b/src/mame/drivers/wc90b.cpp index bae5a52357b..d61bb8fb6ef 100644 --- a/src/mame/drivers/wc90b.cpp +++ b/src/mame/drivers/wc90b.cpp @@ -307,7 +307,7 @@ static const gfx_layout spritelayout = 32*8 /* every char takes 128 consecutive bytes */ }; -static GFXDECODE_START( wc90b ) +static GFXDECODE_START( gfx_wc90b ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 0x100, 0x10 ) GFXDECODE_ENTRY( "gfx2", 0x00000, tilelayout, 0x200, 0x10 ) GFXDECODE_ENTRY( "gfx2", 0x02000, tilelayout, 0x200, 0x10 ) @@ -377,7 +377,7 @@ MACHINE_CONFIG_START(wc90b_state::wc90b) MCFG_SCREEN_UPDATE_DRIVER(wc90b_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wc90b) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wc90b) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp index 3be1b590052..ca577f2f5f1 100644 --- a/src/mame/drivers/wecleman.cpp +++ b/src/mame/drivers/wecleman.cpp @@ -967,7 +967,7 @@ static const gfx_layout wecleman_road_layout = nullptr }; -static GFXDECODE_START( wecleman ) +static GFXDECODE_START( gfx_wecleman ) // "sprites" holds sprite, which are not decoded here GFXDECODE_ENTRY( "layers", 0, wecleman_bg_layout, 0, 2048/8 ) // [0] bg + fg + txt GFXDECODE_ENTRY( "road", 0, wecleman_road_layout, 0, 2048/8 ) // [1] road @@ -1001,7 +1001,7 @@ static const gfx_layout hotchase_road_layout = nullptr }; -static GFXDECODE_START( hotchase ) +static GFXDECODE_START( gfx_hotchase ) // "sprites" holds sprite, which are not decoded here GFXDECODE_ENTRY( "road", 0, hotchase_road_layout, 0x70*16, 16 ) // road GFXDECODE_END @@ -1067,7 +1067,7 @@ MACHINE_CONFIG_START(wecleman_state::wecleman) MCFG_SCREEN_VISIBLE_AREA(0 +8, 320-1 +8, 0 +8, 224-1 +8) MCFG_SCREEN_UPDATE_DRIVER(wecleman_state, screen_update_wecleman) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wecleman) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wecleman) MCFG_PALETTE_ADD("palette", 2048) @@ -1146,7 +1146,7 @@ MACHINE_CONFIG_START(wecleman_state::hotchase) MCFG_SCREEN_UPDATE_DRIVER(wecleman_state, screen_update_hotchase) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", hotchase) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hotchase) MCFG_PALETTE_ADD("palette", 2048*2) MCFG_VIDEO_START_OVERRIDE(wecleman_state, hotchase) diff --git a/src/mame/drivers/welltris.cpp b/src/mame/drivers/welltris.cpp index 6d0c89fe9b7..04e3c555f65 100644 --- a/src/mame/drivers/welltris.cpp +++ b/src/mame/drivers/welltris.cpp @@ -649,7 +649,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( welltris ) +static GFXDECODE_START( gfx_welltris ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 16* 0, 4*16 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 16*96, 2*16 ) GFXDECODE_END @@ -690,7 +690,7 @@ MACHINE_CONFIG_START(welltris_state::welltris) MCFG_SCREEN_UPDATE_DRIVER(welltris_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", welltris) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_welltris) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/wgp.cpp b/src/mame/drivers/wgp.cpp index bd6abfa453d..5e3e61e2210 100644 --- a/src/mame/drivers/wgp.cpp +++ b/src/mame/drivers/wgp.cpp @@ -857,7 +857,7 @@ static const gfx_layout charlayout = }; /* taitoic.c TC0100SCN routines expect scr stuff to be in second gfx slot */ -static GFXDECODE_START( wgp ) +static GFXDECODE_START( gfx_wgp ) GFXDECODE_ENTRY( "gfx3", 0x0, wgp_tilelayout, 0, 256 ) /* sprites */ GFXDECODE_ENTRY( "gfx1", 0x0, charlayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_ENTRY( "gfx2", 0x0, wgp_tile2layout, 0, 256 ) /* piv */ @@ -939,7 +939,7 @@ MACHINE_CONFIG_START(wgp_state::wgp) MCFG_SCREEN_UPDATE_DRIVER(wgp_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wgp) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wgp) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx) diff --git a/src/mame/drivers/williams.cpp b/src/mame/drivers/williams.cpp index 68c51884043..085bad25a8c 100644 --- a/src/mame/drivers/williams.cpp +++ b/src/mame/drivers/williams.cpp @@ -1450,7 +1450,7 @@ static const gfx_layout williams2_layout = }; -static GFXDECODE_START( williams2 ) +static GFXDECODE_START( gfx_williams2 ) GFXDECODE_ENTRY( "gfx1", 0, williams2_layout, 0, 8 ) GFXDECODE_END @@ -1744,7 +1744,7 @@ MACHINE_CONFIG_START(williams2_state::williams2) /* video hardware */ MCFG_PALETTE_ADD("palette", 1024) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", williams2) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_williams2) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE | VIDEO_ALWAYS_UPDATE) diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp index 2f4c8082f34..0952d07e566 100644 --- a/src/mame/drivers/wink.cpp +++ b/src/mame/drivers/wink.cpp @@ -351,7 +351,7 @@ static const gfx_layout charlayout = 8*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( wink ) +static GFXDECODE_START( gfx_wink ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 4 ) GFXDECODE_END @@ -411,7 +411,7 @@ MACHINE_CONFIG_START(wink_state::wink) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, wink_state, nmi_clock_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wink) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wink) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG) diff --git a/src/mame/drivers/wiping.cpp b/src/mame/drivers/wiping.cpp index abd567325af..a66155545fc 100644 --- a/src/mame/drivers/wiping.cpp +++ b/src/mame/drivers/wiping.cpp @@ -266,7 +266,7 @@ static const gfx_layout spritelayout = 64*8 /* every sprite takes 64 consecutive bytes */ }; -static GFXDECODE_START( wiping ) +static GFXDECODE_START( gfx_wiping ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 64*4, 64 ) GFXDECODE_END @@ -313,7 +313,7 @@ MACHINE_CONFIG_START(wiping_state::wiping) MCFG_SCREEN_UPDATE_DRIVER(wiping_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wiping) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wiping) MCFG_PALETTE_ADD("palette", 64*4+64*4) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(wiping_state, wiping) diff --git a/src/mame/drivers/witch.cpp b/src/mame/drivers/witch.cpp index f13cc562899..c7548f3089e 100644 --- a/src/mame/drivers/witch.cpp +++ b/src/mame/drivers/witch.cpp @@ -932,12 +932,12 @@ static const gfx_layout tiles8x8_layout = 16*8 }; -static GFXDECODE_START( witch ) +static GFXDECODE_START( gfx_witch ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_END -static GFXDECODE_START( keirinou ) +static GFXDECODE_START( gfx_keirinou ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, tiles8x8_layout, 0x200, 8 ) @@ -986,7 +986,7 @@ MACHINE_CONFIG_START(witch_state::witch) MCFG_SCREEN_UPDATE_DRIVER(witch_state, screen_update_witch) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", witch) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_witch) MCFG_PALETTE_ADD("palette", 0x800) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) @@ -1024,7 +1024,7 @@ MACHINE_CONFIG_START(keirinou_state::keirinou) MCFG_DEVICE_REMOVE("palette") MCFG_PALETTE_ADD("palette", 0x200+0x80) - MCFG_GFXDECODE_MODIFY("gfxdecode", keirinou) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_keirinou) // MCFG_PALETTE_FORMAT(IIBBGGRR) diff --git a/src/mame/drivers/wiz.cpp b/src/mame/drivers/wiz.cpp index a9b92f77938..ae792d87832 100644 --- a/src/mame/drivers/wiz.cpp +++ b/src/mame/drivers/wiz.cpp @@ -723,7 +723,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( wiz ) +static GFXDECODE_START( gfx_wiz ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx1", 0x0800, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0x6000, charlayout, 0, 32 ) @@ -735,7 +735,7 @@ static GFXDECODE_START( wiz ) GFXDECODE_ENTRY( "gfx2", 0x6000, spritelayout, 0, 32 ) GFXDECODE_END -static GFXDECODE_START( stinger ) +static GFXDECODE_START( gfx_stinger ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx1", 0x0800, charlayout, 0, 32 ) GFXDECODE_ENTRY( "gfx2", 0x0000, charlayout, 0, 32 ) @@ -810,7 +810,7 @@ MACHINE_CONFIG_START(wiz_state::kungfut) MCFG_SCREEN_UPDATE_DRIVER(wiz_state, screen_update_kungfut) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", stinger) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_stinger) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(wiz_state, wiz) @@ -837,7 +837,7 @@ MACHINE_CONFIG_START(wiz_state::wiz) MCFG_DEVICE_PROGRAM_MAP(wiz_main_map) /* video hardware */ - MCFG_GFXDECODE_MODIFY("gfxdecode", wiz) + MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_wiz) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(wiz_state, screen_update_wiz) MACHINE_CONFIG_END diff --git a/src/mame/drivers/wms.cpp b/src/mame/drivers/wms.cpp index 46f7a53ccce..d922e7a765d 100644 --- a/src/mame/drivers/wms.cpp +++ b/src/mame/drivers/wms.cpp @@ -172,7 +172,7 @@ static const gfx_layout gfxlayout = 8*8 }; -static GFXDECODE_START( wms ) +static GFXDECODE_START( gfx_wms ) GFXDECODE_ENTRY( "maincpu", 0x00000, gfxlayout, 0, 1 ) GFXDECODE_END @@ -196,7 +196,7 @@ MACHINE_CONFIG_START(wms_state::wms) MCFG_SCREEN_UPDATE_DRIVER(wms_state, screen_update_wms) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wms) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wms) MCFG_PALETTE_ADD("palette", 0x100) MACHINE_CONFIG_END diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp index bdc5f629ea0..1016b8f3e85 100644 --- a/src/mame/drivers/wolfpack.cpp +++ b/src/mame/drivers/wolfpack.cpp @@ -297,7 +297,7 @@ static const gfx_layout torpedo_layout = }; -static GFXDECODE_START( wolfpack ) +static GFXDECODE_START( gfx_wolfpack ) GFXDECODE_ENTRY( "gfx1", 0, tile_layout, 0, 2 ) GFXDECODE_ENTRY( "gfx2", 0, ship_layout, 6, 1 ) GFXDECODE_ENTRY( "gfx3", 0, pt_layout, 0, 1 ) @@ -322,7 +322,7 @@ MACHINE_CONFIG_START(wolfpack_state::wolfpack) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, wolfpack_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wolfpack) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wolfpack) MCFG_PALETTE_ADD("palette", 12) MCFG_PALETTE_INDIRECT_ENTRIES(8) MCFG_PALETTE_INIT_OWNER(wolfpack_state, wolfpack) diff --git a/src/mame/drivers/wrally.cpp b/src/mame/drivers/wrally.cpp index b82482a3b2c..d798ee5641d 100644 --- a/src/mame/drivers/wrally.cpp +++ b/src/mame/drivers/wrally.cpp @@ -260,7 +260,7 @@ static const gfx_layout wrally_tilelayout16 = 64*8 }; -static GFXDECODE_START( wrally ) +static GFXDECODE_START( gfx_wrally ) GFXDECODE_ENTRY( "gfx1", 0x000000, wrally_tilelayout16, 0, 64*8 ) GFXDECODE_END @@ -283,7 +283,7 @@ MACHINE_CONFIG_START(wrally_state::wrally) MCFG_SCREEN_UPDATE_DRIVER(wrally_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wrally) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wrally) MCFG_PALETTE_ADD("palette", 1024*8) MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG) diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp index c26bff55960..9711f01b462 100644 --- a/src/mame/drivers/wswan.cpp +++ b/src/mame/drivers/wswan.cpp @@ -81,7 +81,7 @@ static INPUT_PORTS_START( wswan ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Y2 - Right") PORT_CODE(KEYCODE_D) INPUT_PORTS_END -static GFXDECODE_START( wswan ) +static GFXDECODE_START( gfx_wswan ) GFXDECODE_END /* WonderSwan can display 16 shades of grey */ @@ -138,7 +138,7 @@ MACHINE_CONFIG_START(wswan_state::wswan) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wswan) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wswan) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(wswan_state, wswan) diff --git a/src/mame/drivers/wwfsstar.cpp b/src/mame/drivers/wwfsstar.cpp index 02b2ca23e4d..46ff4ece461 100644 --- a/src/mame/drivers/wwfsstar.cpp +++ b/src/mame/drivers/wwfsstar.cpp @@ -402,7 +402,7 @@ static const gfx_layout tiles16x16_layout = 64*8 }; -static GFXDECODE_START( wwfsstar ) +static GFXDECODE_START( gfx_wwfsstar ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0, 16 ) /* colors 0-255 */ GFXDECODE_ENTRY( "gfx2", 0, tiles16x16_layout, 128, 16 ) /* colors 128-383 */ GFXDECODE_ENTRY( "gfx3", 0, tiles16x16_layout, 256, 8 ) /* colors 256-383 */ @@ -429,7 +429,7 @@ MACHINE_CONFIG_START(wwfsstar_state::wwfsstar) MCFG_SCREEN_UPDATE_DRIVER(wwfsstar_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wwfsstar) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wwfsstar) MCFG_PALETTE_ADD("palette", 384) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp index c0d49b03086..646063e60a9 100644 --- a/src/mame/drivers/wyvernf0.cpp +++ b/src/mame/drivers/wyvernf0.cpp @@ -601,7 +601,7 @@ static const gfx_layout layout_8x8x4 = 8*8 }; -static GFXDECODE_START( wyvernf0 ) +static GFXDECODE_START( gfx_wyvernf0 ) GFXDECODE_ENTRY( "sprites", 0, layout_8x8x4, 0, 32 ) // [0] sprites GFXDECODE_ENTRY( "tiles", 0, layout_8x8x4, 0, 32 ) // [1] tilemaps GFXDECODE_END @@ -668,7 +668,7 @@ MACHINE_CONFIG_START(wyvernf0_state::wyvernf0) MCFG_SCREEN_UPDATE_DRIVER(wyvernf0_state, screen_update_wyvernf0) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wyvernf0) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wyvernf0) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxRRRRGGGGBBBB) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp index 2858fa7edf9..06a5322b1cd 100644 --- a/src/mame/drivers/x07.cpp +++ b/src/mame/drivers/x07.cpp @@ -1371,7 +1371,7 @@ static const gfx_layout x07_charlayout = 8*8 /* 8 bytes */ }; -static GFXDECODE_START( x07 ) +static GFXDECODE_START( gfx_x07 ) GFXDECODE_ENTRY( "gfx1", 0x0000, x07_charlayout, 0, 1 ) GFXDECODE_END @@ -1498,7 +1498,7 @@ MACHINE_CONFIG_START(x07_state::x07) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(x07_state, x07) MCFG_DEFAULT_LAYOUT(layout_lcd) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", x07) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_x07) /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index 93727b1e538..c2cd9f511df 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -1982,7 +1982,7 @@ static const gfx_layout x1_chars_16x16 = }; /* decoded for debugging purpose, this will be nuked in the end... */ -static GFXDECODE_START( x1 ) +static GFXDECODE_START( gfx_x1 ) GFXDECODE_ENTRY( "cgrom", 0x00000, x1_chars_8x8, 0, 1 ) GFXDECODE_ENTRY( "font", 0x00000, x1_chars_8x16, 0, 1 ) GFXDECODE_ENTRY( "kanji", 0x00000, x1_chars_16x16, 0, 1 ) @@ -2247,7 +2247,7 @@ MACHINE_CONFIG_START(x1_state::x1) MCFG_PALETTE_ADD("palette", 0x10+0x1000) MCFG_PALETTE_INIT_OWNER(x1_state,x1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", x1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_x1) MCFG_VIDEO_START_OVERRIDE(x1_state,x1) diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp index edb83a7efaf..2ac2ae944a9 100644 --- a/src/mame/drivers/x1twin.cpp +++ b/src/mame/drivers/x1twin.cpp @@ -392,7 +392,7 @@ static const gfx_layout x1_chars_16x16 = }; /* decoded for debugging purpose, this will be nuked in the end... */ -static GFXDECODE_START( x1 ) +static GFXDECODE_START( gfx_x1 ) GFXDECODE_ENTRY( "cgrom", 0x00000, x1_chars_8x8, 0, 1 ) GFXDECODE_ENTRY( "pcg", 0x00000, x1_pcg_8x8, 0, 1 ) GFXDECODE_ENTRY( "font", 0x00000, x1_chars_8x16, 0, 1 ) @@ -473,7 +473,7 @@ MACHINE_CONFIG_START(x1twin_state::x1twin) MCFG_PALETTE_ADD("palette", 0x10+0x1000) MCFG_PALETTE_INIT_OWNER(x1twin_state,x1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", x1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_x1) MCFG_VIDEO_START_OVERRIDE(x1twin_state,x1) diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index 90073ef8040..149a2b0937f 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -1682,7 +1682,7 @@ MACHINE_CONFIG_START(x68k_state::x68000) MCFG_SCREEN_VISIBLE_AREA(0, 767, 0, 511) MCFG_SCREEN_UPDATE_DRIVER(x68k_state, screen_update_x68000) - MCFG_GFXDECODE_ADD("gfxdecode", "pcgpalette", empty) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "pcgpalette", gfxdecode_device::empty) MCFG_PALETTE_ADD("gfxpalette", 256) MCFG_PALETTE_FORMAT_CLASS(2, x68k_state, GGGGGRRRRRBBBBBI) diff --git a/src/mame/drivers/xain.cpp b/src/mame/drivers/xain.cpp index 9887de346ef..0e2c0cfeccf 100644 --- a/src/mame/drivers/xain.cpp +++ b/src/mame/drivers/xain.cpp @@ -434,7 +434,7 @@ static const gfx_layout tilelayout = 64*8 }; -static GFXDECODE_START( xain ) +static GFXDECODE_START( gfx_xain ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 ) /* 8x8 text */ GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 256, 8 ) /* 16x16 Background */ GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 384, 8 ) /* 16x16 Background */ @@ -475,7 +475,7 @@ MACHINE_CONFIG_START(xain_state::xsleena) MCFG_SCREEN_UPDATE_DRIVER(xain_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", xain) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_xain) MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp index 8e4f5e156a4..a8dfd9f3828 100644 --- a/src/mame/drivers/xavix.cpp +++ b/src/mame/drivers/xavix.cpp @@ -619,7 +619,7 @@ static const gfx_layout char16layout8bpp = 16*16*8 }; -static GFXDECODE_START( xavix ) +static GFXDECODE_START( gfx_xavix ) GFXDECODE_ENTRY( "bios", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "bios", 0, char16layout, 0, 16 ) GFXDECODE_ENTRY( "bios", 0, charlayout8bpp, 0, 1 ) @@ -655,7 +655,7 @@ MACHINE_CONFIG_START(xavix_state::xavix) MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 28*8-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", xavix) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_xavix) MCFG_PALETTE_ADD("palette", 256) diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp index e7750f79c55..ec2ca34bd70 100644 --- a/src/mame/drivers/xerox820.cpp +++ b/src/mame/drivers/xerox820.cpp @@ -592,11 +592,11 @@ static const gfx_layout xerox820_gfxlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( xerox820 ) +static GFXDECODE_START( gfx_xerox820 ) GFXDECODE_ENTRY( "chargen", 0x0000, xerox820_charlayout, 0, 1 ) GFXDECODE_END -static GFXDECODE_START( xerox820ii ) +static GFXDECODE_START( gfx_xerox820ii ) GFXDECODE_ENTRY( "chargen", 0x0000, xerox820_charlayout, 0, 1 ) GFXDECODE_ENTRY( "chargen", 0x0800, xerox820_gfxlayout, 0, 1 ) GFXDECODE_END @@ -615,7 +615,7 @@ MACHINE_CONFIG_START(xerox820_state::xerox820) MCFG_SCREEN_UPDATE_DRIVER(xerox820_state, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL(10'694'250), 700, 0, 560, 260, 0, 240) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", xerox820) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_xerox820) MCFG_PALETTE_ADD_MONOCHROME("palette") /* devices */ @@ -691,7 +691,7 @@ MACHINE_CONFIG_START(xerox820ii_state::xerox820ii) MCFG_SCREEN_UPDATE_DRIVER(xerox820ii_state, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL(10'694'250), 700, 0, 560, 260, 0, 240) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", xerox820ii) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_xerox820ii) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/xorworld.cpp b/src/mame/drivers/xorworld.cpp index 8f2fc6e59cc..514577c69a7 100644 --- a/src/mame/drivers/xorworld.cpp +++ b/src/mame/drivers/xorworld.cpp @@ -146,7 +146,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( xorworld ) +static GFXDECODE_START( gfx_xorworld ) GFXDECODE_ENTRY( "gfx1", 0x000000, tilelayout, 0, 64 ) GFXDECODE_ENTRY( "gfx1", 0x000000, spritelayout, 0, 64 ) GFXDECODE_END @@ -180,7 +180,7 @@ MACHINE_CONFIG_START(xorworld_state::xorworld) MCFG_SCREEN_UPDATE_DRIVER(xorworld_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", xorworld) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_xorworld) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(xorworld_state, xorworld) diff --git a/src/mame/drivers/xxmissio.cpp b/src/mame/drivers/xxmissio.cpp index 29d9e37b9d2..22d6fc01770 100644 --- a/src/mame/drivers/xxmissio.cpp +++ b/src/mame/drivers/xxmissio.cpp @@ -257,7 +257,7 @@ static const gfx_layout bglayout = 64*8 }; -static GFXDECODE_START( xxmissio ) +static GFXDECODE_START( gfx_xxmissio ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 256, 8 ) /* FG */ GFXDECODE_ENTRY( "gfx1", 0x0000, spritelayout, 0, 8 ) /* sprite */ GFXDECODE_ENTRY( "gfx2", 0x0000, bglayout, 512, 16 ) /* BG */ @@ -287,7 +287,7 @@ MACHINE_CONFIG_START(xxmissio_state::xxmissio) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, xxmissio_state, interrupt_m)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", xxmissio) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_xxmissio) MCFG_PALETTE_ADD("palette", 768) MCFG_PALETTE_FORMAT_CLASS(1, xxmissio_state, BBGGRRII) diff --git a/src/mame/drivers/xybots.cpp b/src/mame/drivers/xybots.cpp index 8cc8f4a6060..9fdda2fbc70 100644 --- a/src/mame/drivers/xybots.cpp +++ b/src/mame/drivers/xybots.cpp @@ -160,7 +160,7 @@ static const gfx_layout pfmolayout = }; -static GFXDECODE_START( xybots ) +static GFXDECODE_START( gfx_xybots ) GFXDECODE_ENTRY( "gfx1", 0, pfmolayout, 512, 16 ) /* playfield */ GFXDECODE_ENTRY( "gfx2", 0, pfmolayout, 256, 48 ) /* sprites */ GFXDECODE_ENTRY( "gfx3", 0, anlayout, 0, 64 ) /* characters 8x8 */ @@ -188,7 +188,7 @@ MACHINE_CONFIG_START(xybots_state::xybots) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", xybots) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_xybots) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(IIIIRRRRGGGGBBBB) diff --git a/src/mame/drivers/xyonix.cpp b/src/mame/drivers/xyonix.cpp index faf29ca5adf..f8d43a9b88b 100644 --- a/src/mame/drivers/xyonix.cpp +++ b/src/mame/drivers/xyonix.cpp @@ -238,7 +238,7 @@ static const gfx_layout charlayout = 4*16 }; -static GFXDECODE_START( xyonix ) +static GFXDECODE_START( gfx_xyonix ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -263,7 +263,7 @@ MACHINE_CONFIG_START(xyonix_state::xyonix) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, xyonix_state, nmiclk_w)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", xyonix) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_xyonix) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(xyonix_state, xyonix) diff --git a/src/mame/drivers/yiear.cpp b/src/mame/drivers/yiear.cpp index 33578a6abe7..5bf488dafa3 100644 --- a/src/mame/drivers/yiear.cpp +++ b/src/mame/drivers/yiear.cpp @@ -263,7 +263,7 @@ static const gfx_layout spritelayout = 64*8 }; -static GFXDECODE_START( yiear ) +static GFXDECODE_START( gfx_yiear ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 16, 1 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 1 ) GFXDECODE_END @@ -299,7 +299,7 @@ MACHINE_CONFIG_START(yiear_state::yiear) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, yiear_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", yiear) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_yiear) MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_INIT_OWNER(yiear_state, yiear) diff --git a/src/mame/drivers/yunsun16.cpp b/src/mame/drivers/yunsun16.cpp index d8d3bf4889d..963b0989b6b 100644 --- a/src/mame/drivers/yunsun16.cpp +++ b/src/mame/drivers/yunsun16.cpp @@ -547,7 +547,7 @@ static const gfx_layout layout_16x16x8 = }; -static GFXDECODE_START( yunsun16 ) +static GFXDECODE_START( gfx_yunsun16 ) GFXDECODE_ENTRY( "gfx1", 0, layout_16x16x8, 0x1000, 0x10 ) // [0] Layers GFXDECODE_ENTRY( "gfx2", 0, layout_16x16x4, 0x0000, 0x20 ) // [1] Sprites GFXDECODE_END @@ -608,7 +608,7 @@ MACHINE_CONFIG_START(yunsun16_state::magicbub) MCFG_SCREEN_UPDATE_DRIVER(yunsun16_state, screen_update_yunsun16) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", yunsun16) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_yunsun16) MCFG_PALETTE_ADD("palette", 8192) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) @@ -650,7 +650,7 @@ MACHINE_CONFIG_START(yunsun16_state::shocking) MCFG_SCREEN_UPDATE_DRIVER(yunsun16_state, screen_update_yunsun16) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", yunsun16) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_yunsun16) MCFG_PALETTE_ADD("palette", 8192) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) diff --git a/src/mame/drivers/yunsung8.cpp b/src/mame/drivers/yunsung8.cpp index 350bd6f0a15..3f787976f8b 100644 --- a/src/mame/drivers/yunsung8.cpp +++ b/src/mame/drivers/yunsung8.cpp @@ -293,7 +293,7 @@ static const gfx_layout layout_8x8x8 = 8*8*8/4 }; -static GFXDECODE_START( yunsung8 ) +static GFXDECODE_START( gfx_yunsung8 ) GFXDECODE_ENTRY( "bgfx", 0, layout_8x8x8, 0, 0x08 ) // [0] Tiles (Background) GFXDECODE_ENTRY( "text", 0, layout_8x8x4, 0, 0x40 ) // [1] Tiles (Text) GFXDECODE_END @@ -358,7 +358,7 @@ MACHINE_CONFIG_START(yunsung8_state::yunsung8) MCFG_SCREEN_UPDATE_DRIVER(yunsung8_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", yunsung8) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_yunsung8) MCFG_PALETTE_ADD("palette", 2048) diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp index 6e0e76c6b4d..e696a9625a7 100644 --- a/src/mame/drivers/z1013.cpp +++ b/src/mame/drivers/z1013.cpp @@ -363,7 +363,7 @@ static const gfx_layout z1013_charlayout = 8*8 /* every char takes 8 bytes */ }; -static GFXDECODE_START( z1013 ) +static GFXDECODE_START( gfx_z1013 ) GFXDECODE_ENTRY( "chargen", 0x0000, z1013_charlayout, 0, 1 ) GFXDECODE_END @@ -383,7 +383,7 @@ MACHINE_CONFIG_START(z1013_state::z1013) MCFG_SCREEN_UPDATE_DRIVER(z1013_state, screen_update_z1013) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", z1013) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_z1013) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp index 7f9febaa2fb..66014e4c59d 100644 --- a/src/mame/drivers/z9001.cpp +++ b/src/mame/drivers/z9001.cpp @@ -198,7 +198,7 @@ void z9001_state::kbd_put(u8 data) m_maincpu->space(AS_PROGRAM).write_byte(0x0025, data); } -static GFXDECODE_START( z9001 ) +static GFXDECODE_START( gfx_z9001 ) GFXDECODE_ENTRY( "chargen", 0x0000, z9001_charlayout, 0, 1 ) GFXDECODE_END @@ -219,7 +219,7 @@ MACHINE_CONFIG_START(z9001_state::z9001) MCFG_SCREEN_UPDATE_DRIVER(z9001_state, screen_update_z9001) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", z9001) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_z9001) MCFG_PALETTE_ADD("palette", 16) /* Sound */ diff --git a/src/mame/drivers/zac2650.cpp b/src/mame/drivers/zac2650.cpp index 21fdef95b38..63d17defdd8 100644 --- a/src/mame/drivers/zac2650.cpp +++ b/src/mame/drivers/zac2650.cpp @@ -224,7 +224,7 @@ static const gfx_layout s2636_character = 8*8 }; -static GFXDECODE_START( tinvader ) +static GFXDECODE_START( gfx_tinvader ) GFXDECODE_SCALE( "gfx1", 0, tinvader_character, 0, 2, 3, 3 ) GFXDECODE_SCALE( nullptr, 0x1F00, s2636_character, 0, 2, 4, 3 ) /* dynamic */ GFXDECODE_SCALE( nullptr, 0x1F00, s2636_character, 0, 2, 8, 6 ) /* dynamic */ @@ -246,7 +246,7 @@ MACHINE_CONFIG_START(zac2650_state::tinvader) MCFG_SCREEN_UPDATE_DRIVER(zac2650_state, screen_update_tinvader) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", tinvader) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tinvader) MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(zac2650_state, zac2650) diff --git a/src/mame/drivers/zaccaria.cpp b/src/mame/drivers/zaccaria.cpp index 9d372cef0c0..0fe660aca14 100644 --- a/src/mame/drivers/zaccaria.cpp +++ b/src/mame/drivers/zaccaria.cpp @@ -318,7 +318,7 @@ static const gfx_layout spritelayout = 32*8 }; -static GFXDECODE_START( zaccaria ) +static GFXDECODE_START( gfx_zaccaria ) GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x3_planar, 0, 32 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 32*8, 32 ) GFXDECODE_END @@ -364,7 +364,7 @@ MACHINE_CONFIG_START(zaccaria_state::zaccaria) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, zaccaria_state, vblank_irq)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", zaccaria) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_zaccaria) MCFG_PALETTE_ADD("palette", 32*8+32*8) MCFG_PALETTE_INDIRECT_ENTRIES(512) MCFG_PALETTE_INIT_OWNER(zaccaria_state, zaccaria) diff --git a/src/mame/drivers/zaxxon.cpp b/src/mame/drivers/zaxxon.cpp index d4b9a7edce7..e7c6a29648e 100644 --- a/src/mame/drivers/zaxxon.cpp +++ b/src/mame/drivers/zaxxon.cpp @@ -902,7 +902,7 @@ static const gfx_layout zaxxon_spritelayout = }; -static GFXDECODE_START( zaxxon ) +static GFXDECODE_START( gfx_zaxxon ) GFXDECODE_ENTRY( "gfx_tx", 0, gfx_8x8x2_planar, 0, 64*2 ) /* characters */ GFXDECODE_ENTRY( "gfx_bg", 0, gfx_8x8x3_planar, 0, 32*2 ) /* background tiles */ GFXDECODE_ENTRY( "gfx_spr", 0, zaxxon_spritelayout, 0, 32*2 ) /* sprites */ @@ -941,7 +941,7 @@ MACHINE_CONFIG_START(zaxxon_state::root) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, zaxxon_state, bg_enable_w)) // BEN /* video hardware */ - MCFG_GFXDECODE_ADD("gfxdecode", "palette", zaxxon) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_zaxxon) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(zaxxon_state, zaxxon) diff --git a/src/mame/drivers/zerozone.cpp b/src/mame/drivers/zerozone.cpp index 7226092a47d..b2ef34d5802 100644 --- a/src/mame/drivers/zerozone.cpp +++ b/src/mame/drivers/zerozone.cpp @@ -155,7 +155,7 @@ static const gfx_layout charlayout = }; -static GFXDECODE_START( zerozone ) +static GFXDECODE_START( gfx_zerozone ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) /* sprites & playfield */ GFXDECODE_END @@ -191,7 +191,7 @@ MACHINE_CONFIG_START(zerozone_state::zerozone) MCFG_SCREEN_VISIBLE_AREA(1*8, 47*8-1, 2*8, 30*8-1) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", zerozone) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_zerozone) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx) diff --git a/src/mame/drivers/zodiack.cpp b/src/mame/drivers/zodiack.cpp index bdaba6cd46b..308d4ff5a29 100644 --- a/src/mame/drivers/zodiack.cpp +++ b/src/mame/drivers/zodiack.cpp @@ -545,7 +545,7 @@ static const gfx_layout bulletlayout = 0 /* no use */ }; -static GFXDECODE_START( zodiack ) +static GFXDECODE_START( gfx_zodiack ) GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 8*4 , 8 ) GFXDECODE_ENTRY( "gfx1", 0x0800, spritelayout, 0 , 8 ) GFXDECODE_ENTRY( "gfx1", 0x0000, bulletlayout, 8*4+8*2, 1 ) @@ -587,7 +587,7 @@ MACHINE_CONFIG_START(zodiack_state::zodiack) MCFG_SCREEN_UPDATE_DRIVER(zodiack_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", zodiack) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_zodiack) MCFG_PALETTE_ADD("palette", 4*8+2*8+2*1) MCFG_PALETTE_INDIRECT_ENTRIES(48+1) MCFG_PALETTE_INIT_OWNER(zodiack_state,zodiack) diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index 979925eb621..2d4e52bbedb 100644 --- a/src/mame/drivers/zorba.cpp +++ b/src/mame/drivers/zorba.cpp @@ -128,7 +128,7 @@ const gfx_layout u5_charlayout = 8*16 // every char takes 16 bytes }; -GFXDECODE_START( zorba ) +GFXDECODE_START( gfx_zorba ) GFXDECODE_ENTRY( "chargen", 0x0000, u5_charlayout, 0, 1 ) GFXDECODE_END @@ -145,13 +145,12 @@ MACHINE_CONFIG_START(zorba_state::zorba) MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_UPDATE_DEVICE("crtc", i8275_device, screen_update) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", zorba) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, m_palette, gfx_zorba) MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT(m_palette) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD(m_beep, BEEP, 800) // should be horizontal frequency / 16, so depends on CRTC parameters - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) + BEEP(config, m_beep, 800).add_route(ALL_OUTPUTS, "mono", 1.00); // should be horizontal frequency / 16, so depends on CRTC parameters MCFG_INPUT_MERGER_ANY_HIGH("irq0") MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, zorba_state, irq_w<0>)) diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp index 1f892e348ff..f4c389930d2 100644 --- a/src/mame/drivers/zrt80.cpp +++ b/src/mame/drivers/zrt80.cpp @@ -268,7 +268,7 @@ static const gfx_layout zrt80_charlayout = 8*16 /* every char takes 16 bytes */ }; -static GFXDECODE_START( zrt80 ) +static GFXDECODE_START( gfx_zrt80 ) GFXDECODE_ENTRY( "chargen", 0x0000, zrt80_charlayout, 0, 1 ) GFXDECODE_END @@ -285,7 +285,7 @@ MACHINE_CONFIG_START(zrt80_state::zrt80) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) MCFG_SCREEN_SIZE(640, 200) MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 200 - 1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", zrt80) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_zrt80) MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp index c0b66b74264..cd5782a773c 100644 --- a/src/mame/drivers/zwackery.cpp +++ b/src/mame/drivers/zwackery.cpp @@ -397,7 +397,7 @@ static const gfx_layout mcr68_sprite_layout = 32*32 }; -static GFXDECODE_START( zwackery ) +static GFXDECODE_START( gfx_zwackery ) GFXDECODE_ENTRY( "gfx1", 0, zwackery_layout, 0, 16 ) GFXDECODE_ENTRY( "sprites", 0, mcr68_sprite_layout, 0x800, 32 ) GFXDECODE_ENTRY( "gfx1", 0, zwackery_layout, 0, 16 ) // yes, an extra copy @@ -529,7 +529,7 @@ MACHINE_CONFIG_START(zwackery_state::zwackery) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", zwackery_state, scanline_cb, "screen", 0, 1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", zwackery) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_zwackery) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_FORMAT(xRRRRRBBBBBGGGGG_inverted) diff --git a/src/mame/etc/korgm1.cpp b/src/mame/etc/korgm1.cpp index 2b14e5ffc23..b116030ebaf 100644 --- a/src/mame/etc/korgm1.cpp +++ b/src/mame/etc/korgm1.cpp @@ -148,7 +148,7 @@ static const gfx_layout charlayout = }; #endif -static GFXDECODE_START( korgm1 ) +static GFXDECODE_START( gfx_korgm1 ) // GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -184,7 +184,7 @@ MACHINE_CONFIG_START(korgm1_state::korgm1) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", korgm1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_korgm1) MCFG_PALETTE_ADD("palette", 8) diff --git a/src/mame/etc/template_driver.cpp b/src/mame/etc/template_driver.cpp index 8478ab06b01..f2a1dbb2f23 100644 --- a/src/mame/etc/template_driver.cpp +++ b/src/mame/etc/template_driver.cpp @@ -129,7 +129,7 @@ static const gfx_layout charlayout = 8*8 }; -static GFXDECODE_START( xxx ) +static GFXDECODE_START( gfx_xxx ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -165,7 +165,7 @@ MACHINE_CONFIG_START(xxx_state::xxx) //MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2, 384, 0, 256, 264, 16, 240) /* generic NTSC video timing at 256x224 */ MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", xxx) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_xxx) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(xxx_state, xxx) diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h index 79f19e24ea7..382cafb91bf 100644 --- a/src/mame/includes/apollo.h +++ b/src/mame/includes/apollo.h @@ -32,9 +32,10 @@ #include "bus/isa/isa_cards.h" #include "bus/isa/3c505.h" - #include "bus/rs232/rs232.h" +#include "diserial.h" + #ifndef VERBOSE #define VERBOSE 0 #endif diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 7d4fb593d3a..51ec10adafb 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -467,7 +467,7 @@ public: /*----------- defined in drivers/cps1.c -----------*/ -GFXDECODE_EXTERN( cps1 ); +extern gfx_decode_entry const gfx_cps1[]; INPUT_PORTS_EXTERN( dino ); INPUT_PORTS_EXTERN( knights ); @@ -477,4 +477,4 @@ INPUT_PORTS_EXTERN( slammast ); INPUT_PORTS_EXTERN( varth ); -#endif +#endif // MAME_INCLUDES_CPS1_H diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h index 3189d0b2353..e0e4c1be5f5 100644 --- a/src/mame/includes/darkseal.h +++ b/src/mame/includes/darkseal.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail +#ifndef MAME_INCLUDES_DARKSEAL_H +#define MAME_INCLUDES_DARKSEAL_H + +#pragma once #include "machine/gen_latch.h" #include "cpu/h6280/h6280.h" @@ -14,7 +18,7 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_audiocpu(*this, "audiocpu") - , m_palette(*this, "palette") + , m_palette(*this, "colors") , m_deco_tilegen(*this, "tilegen%u", 1U) , m_sprgen(*this, "spritegen") , m_spriteram(*this, "spriteram") @@ -25,6 +29,21 @@ public: , m_paletteram_ext(*this, "palette_ext") { } + void init_darkseal(); + + void darkseal(machine_config &config); + +protected: + DECLARE_WRITE16_MEMBER(irq_ack_w); + DECLARE_WRITE16_MEMBER(palette_w); + DECLARE_WRITE16_MEMBER(palette_ext_w); + + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void update_palette(int offset); + void darkseal_map(address_map &map); + void sound_map(address_map &map); + +private: required_device m_maincpu; required_device m_audiocpu; required_device m_palette; @@ -39,16 +58,6 @@ public: //uint16_t *m_pf4_rowscroll; required_shared_ptr m_paletteram; required_shared_ptr m_paletteram_ext; - - DECLARE_WRITE16_MEMBER(irq_ack_w); - DECLARE_WRITE16_MEMBER(palette_w); - DECLARE_WRITE16_MEMBER(palette_ext_w); - - void init_darkseal(); - - uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void update_palette(int offset); - void darkseal(machine_config &config); - void darkseal_map(address_map &map); - void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_DARKSEAL_H diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index 37b8de4155a..117f67a16f6 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -129,6 +129,6 @@ public: INPUT_PORTS_EXTERN( pgm ); -GFXDECODE_EXTERN( pgm ); +extern gfx_decode_entry const gfx_pgm[]; #endif // MAME_INCLUDES_PGM_H diff --git a/src/mame/includes/saturn.h b/src/mame/includes/saturn.h index 4167f573f13..bc5bed44f73 100644 --- a/src/mame/includes/saturn.h +++ b/src/mame/includes/saturn.h @@ -1,5 +1,9 @@ // license:LGPL-2.1+ // copyright-holders:David Haywood, Angelo Salese, Olivier Galibert, Mariusz Wojcieszek, R. Belmont +#ifndef MAME_INCLUDES_SATURN_H +#define MAME_INCLUDES_SATURN_H + +#pragma once #include "machine/timer.h" #include "cpu/m68000/m68000.h" @@ -450,4 +454,6 @@ public: #define STV_VDP1_TVM ((STV_VDP1_TVMR & 0x0007) >> 0) -GFXDECODE_EXTERN( stv ); +extern gfx_decode_entry const gfx_stv[]; + +#endif // MAME_INCLUDES_SATURN_H diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index 94c7c3eedae..8379c27af97 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -1,5 +1,9 @@ // license:LGPL-2.1+ // copyright-holders:David Haywood, Angelo Salese, Olivier Galibert, Mariusz Wojcieszek, R. Belmont +#ifndef MAME_INCLUDES_STV_H +#define MAME_INCLUDES_STV_H + +#pragma once #include "includes/saturn.h" #include "audio/rax.h" @@ -170,4 +174,6 @@ public: #define STV_VDP1_VBE ((STV_VDP1_TVMR & 0x0008) >> 3) #define STV_VDP1_TVM ((STV_VDP1_TVMR & 0x0007) >> 0) -GFXDECODE_EXTERN( stv ); +extern gfx_decode_entry const gfx_stv[]; + +#endif // MAME_INCLUDES_STV_H diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index 4cc0f4d09d1..8970c96ad40 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -5,6 +5,10 @@ Vapor Trail *************************************************************************/ +#ifndef MAME_INCLUDES_VAPORTRA_H +#define MAME_INCLUDES_VAPORTRA_H + +#pragma once #include "cpu/h6280/h6280.h" #include "machine/gen_latch.h" @@ -22,7 +26,7 @@ public: , m_deco_tilegen(*this, "tilegen%u", 1U) , m_spritegen(*this, "spritegen") , m_spriteram(*this, "spriteram") - , m_palette(*this, "palette") + , m_palette(*this, "colors") , m_soundlatch(*this, "soundlatch") , m_paletteram(*this, "palette") , m_paletteram_ext(*this, "palette_ext") @@ -61,3 +65,5 @@ public: void main_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_VAPORTRA_H diff --git a/src/mame/machine/apollo_kbd.h b/src/mame/machine/apollo_kbd.h index 096a1be7710..aba8281ba3a 100644 --- a/src/mame/machine/apollo_kbd.h +++ b/src/mame/machine/apollo_kbd.h @@ -15,6 +15,9 @@ #include "sound/beep.h" +#include "diserial.h" + + // BSD-derived systems get very sad when you party with system reserved names. #ifdef getchar #undef getchar diff --git a/src/mame/machine/cit101_kbd.h b/src/mame/machine/cit101_kbd.h index 5818c4c6033..9404d0ea4a6 100644 --- a/src/mame/machine/cit101_kbd.h +++ b/src/mame/machine/cit101_kbd.h @@ -13,6 +13,7 @@ #include "machine/keyboard.h" #include "sound/beep.h" +#include "diserial.h" //************************************************************************** diff --git a/src/mame/machine/dec_lk201.h b/src/mame/machine/dec_lk201.h index 48cc32bb73f..06c0d29beef 100644 --- a/src/mame/machine/dec_lk201.h +++ b/src/mame/machine/dec_lk201.h @@ -7,6 +7,9 @@ #include "sound/beep.h" +#include "diserial.h" + + //************************************************************************** // MACROS / CONSTANTS //************************************************************************** diff --git a/src/mame/machine/esqpanel.h b/src/mame/machine/esqpanel.h index 3cd91a86fdc..730a46b2bc8 100644 --- a/src/mame/machine/esqpanel.h +++ b/src/mame/machine/esqpanel.h @@ -8,6 +8,8 @@ #include "machine/esqvfd.h" #include "machine/esqlcd.h" +#include "diserial.h" + #include //************************************************************************** diff --git a/src/mame/machine/megacd.cpp b/src/mame/machine/megacd.cpp index 593e4de3e25..c9a0291e37f 100644 --- a/src/mame/machine/megacd.cpp +++ b/src/mame/machine/megacd.cpp @@ -272,7 +272,7 @@ _32x32_START _32x32_SEQUENCE_1_FLIP _32x32_END -static GFXDECODE_START( segacd ) +static GFXDECODE_START( gfx_segacd ) GFXDECODE_DEVICE_RAM( "dataram", 0, sega_16x16_r00_f0_layout, 0, 0 ) GFXDECODE_DEVICE_RAM( "dataram", 0, sega_16x16_r01_f0_layout, 0, 0 ) GFXDECODE_DEVICE_RAM( "dataram", 0, sega_16x16_r10_f0_layout, 0, 0 ) @@ -324,7 +324,7 @@ MACHINE_CONFIG_END sega_segacd_device::sega_segacd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, type, tag, owner, clock), - device_gfx_interface(mconfig, *this, GFXDECODE_NAME( segacd )), + device_gfx_interface(mconfig, *this, gfx_segacd), m_scdcpu(*this, "segacd_68k"), m_rfsnd(*this, "rfsnd"), m_lc89510_temp(*this, "tempcdc"), diff --git a/src/mame/machine/midikbd.h b/src/mame/machine/midikbd.h index ea7c69f9cef..993003cbd80 100644 --- a/src/mame/machine/midikbd.h +++ b/src/mame/machine/midikbd.h @@ -5,6 +5,8 @@ #pragma once +#include "diserial.h" + #define MCFG_MIDI_KBD_ADD(_tag, _devcb, _clock) \ MCFG_DEVICE_ADD(_tag, MIDI_KBD, _clock) \ diff --git a/src/mame/machine/ms7004.h b/src/mame/machine/ms7004.h index 78452904777..608ba702723 100644 --- a/src/mame/machine/ms7004.h +++ b/src/mame/machine/ms7004.h @@ -9,9 +9,7 @@ #include "machine/i8243.h" #include "sound/beep.h" -//************************************************************************** -// MACROS / CONSTANTS -//************************************************************************** +#include "diserial.h" //************************************************************************** diff --git a/src/mame/machine/saturn.cpp b/src/mame/machine/saturn.cpp index 6483bd5b8a3..2fbc430a1f7 100644 --- a/src/mame/machine/saturn.cpp +++ b/src/mame/machine/saturn.cpp @@ -319,7 +319,7 @@ static const gfx_layout tiles16x16x8_layout = -GFXDECODE_START( stv ) +GFXDECODE_START( gfx_stv ) GFXDECODE_ENTRY( nullptr, 0, tiles8x8x4_layout, 0x00, (0x80*(2+1)) ) GFXDECODE_ENTRY( nullptr, 0, tiles16x16x4_layout, 0x00, (0x80*(2+1)) ) GFXDECODE_ENTRY( nullptr, 0, tiles8x8x8_layout, 0x00, (0x08*(2+1)) ) diff --git a/src/mame/machine/wangpckb.h b/src/mame/machine/wangpckb.h index b9cb4e927b4..02a4e803896 100644 --- a/src/mame/machine/wangpckb.h +++ b/src/mame/machine/wangpckb.h @@ -11,10 +11,11 @@ #pragma once - #include "cpu/mcs51/mcs51.h" + #include "sound/sn76496.h" +#include "diserial.h" //************************************************************************** diff --git a/src/mame/machine/zx8302.h b/src/mame/machine/zx8302.h index d3a78401f62..f49bfddd72e 100644 --- a/src/mame/machine/zx8302.h +++ b/src/mame/machine/zx8302.h @@ -34,6 +34,7 @@ #pragma once +#include "diserial.h" ///************************************************************************* diff --git a/src/mame/video/733_asr.cpp b/src/mame/video/733_asr.cpp index dd275049b64..64a50935497 100644 --- a/src/mame/video/733_asr.cpp +++ b/src/mame/video/733_asr.cpp @@ -67,7 +67,7 @@ static const gfx_layout fontlayout = 8*8 /* every char takes 8 consecutive bytes */ }; -static GFXDECODE_START( asr733 ) +static GFXDECODE_START( gfx_asr733 ) GFXDECODE_ENTRY( asr733_chr_region, 0, fontlayout, 0, 1 ) GFXDECODE_END @@ -82,7 +82,7 @@ DEFINE_DEVICE_TYPE(ASR733, asr733_device, "asr733", "733 ASR") asr733_device::asr733_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ASR733, tag, owner, clock) - , device_gfx_interface(mconfig, *this, GFXDECODE_NAME(asr733), "palette") + , device_gfx_interface(mconfig, *this, gfx_asr733, "palette") , m_screen(*this, "screen") , m_keyint_line(*this) , m_lineint_line(*this) diff --git a/src/mame/video/911_vdt.cpp b/src/mame/video/911_vdt.cpp index 56d450c5d77..81391c9f515 100644 --- a/src/mame/video/911_vdt.cpp +++ b/src/mame/video/911_vdt.cpp @@ -45,7 +45,7 @@ static const gfx_layout fontlayout_8bit = 10*8 /* every char takes 10 consecutive bytes */ }; -static GFXDECODE_START( vdt911 ) +static GFXDECODE_START( gfx_vdt911 ) // Caution: Array must use same order as vdt911_model_t // US GFXDECODE_ENTRY( vdt911_chr_region, vdt911_device::US_chr_offset, fontlayout_7bit, 0, 4 ) @@ -148,11 +148,11 @@ static void apply_char_overrides(int nb_char_overrides, const char_override_t ch DEFINE_DEVICE_TYPE(VDT911, vdt911_device, "vdt911", "911 VDT") vdt911_device::vdt911_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, VDT911, tag, owner, clock), - device_gfx_interface(mconfig, *this, GFXDECODE_NAME(vdt911), "palette"), - m_beeper(*this, "beeper"), - m_keyint_line(*this), - m_lineint_line(*this) + : device_t(mconfig, VDT911, tag, owner, clock) + , device_gfx_interface(mconfig, *this, gfx_vdt911, "palette") + , m_beeper(*this, "beeper") + , m_keyint_line(*this) + , m_lineint_line(*this) { } diff --git a/src/mame/video/abc80.cpp b/src/mame/video/abc80.cpp index e5ec8065269..af1a5b6e166 100644 --- a/src/mame/video/abc80.cpp +++ b/src/mame/video/abc80.cpp @@ -32,7 +32,7 @@ static const gfx_layout charlayout = // GFXDECODE( abc80 ) //------------------------------------------------- -static GFXDECODE_START( abc80 ) +static GFXDECODE_START( gfx_abc80 ) GFXDECODE_ENTRY( "chargen", 0, charlayout, 0, 1 ) // normal characters GFXDECODE_ENTRY( "chargen", 0x500, charlayout, 0, 1 ) // graphics characters GFXDECODE_END @@ -198,6 +198,6 @@ MACHINE_CONFIG_START(abc80_state::abc80_video) MCFG_SCREEN_RAW_PARAMS(XTAL(11'980'800)/2, ABC80_HTOTAL, ABC80_HBEND, ABC80_HBSTART, ABC80_VTOTAL, ABC80_VBEND, ABC80_VBSTART) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", abc80) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_abc80) MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/video/airraid_dev.cpp b/src/mame/video/airraid_dev.cpp index ec591372908..e68717671be 100644 --- a/src/mame/video/airraid_dev.cpp +++ b/src/mame/video/airraid_dev.cpp @@ -51,7 +51,7 @@ static const gfx_layout char16layout = 32*32 }; -static GFXDECODE_START( cshooter ) +static GFXDECODE_START( gfx_cshooter ) GFXDECODE_ENTRY( "tx_gfx", 0, charlayout, 0, 16 ) GFXDECODE_ENTRY( "spr_gfx", 0, char16layout, 0, 16 ) GFXDECODE_ENTRY( "bg_gfx", 0, char16layout, 0, 16 ) @@ -69,7 +69,7 @@ MACHINE_CONFIG_START(airraid_video_device::device_add_mconfig) MCFG_SCREEN_UPDATE_DRIVER(airraid_video_device, screen_update_airraid) MCFG_SCREEN_PALETTE("^palette") - MCFG_GFXDECODE_ADD("gfxdecode", "^palette", cshooter) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "^palette", gfx_cshooter) MACHINE_CONFIG_END diff --git a/src/mame/video/bfm_adr2.cpp b/src/mame/video/bfm_adr2.cpp index 8ccf9b54a58..e9eec8e5a0d 100644 --- a/src/mame/video/bfm_adr2.cpp +++ b/src/mame/video/bfm_adr2.cpp @@ -133,7 +133,7 @@ static const gfx_layout charlayout = // characters are grouped by 64 (512 pixels) // there are max 128 of these groups -static GFXDECODE_START( adder2 ) +static GFXDECODE_START( gfx_adder2 ) GFXDECODE_ENTRY( ":gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -141,7 +141,7 @@ DEFINE_DEVICE_TYPE(BFM_ADDER2, bfm_adder2_device, "bfm_adder2", "BFM ADDER2") bfm_adder2_device::bfm_adder2_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) : device_t(mconfig, BFM_ADDER2, tag, owner, clock) - , device_gfx_interface(mconfig, *this, GFXDECODE_NAME(adder2), "palette") + , device_gfx_interface(mconfig, *this, gfx_adder2, "palette") , m_cpu(*this, "adder2") { } diff --git a/src/mame/video/cgc7900.cpp b/src/mame/video/cgc7900.cpp index 05a06916fd3..ef37b82ea70 100644 --- a/src/mame/video/cgc7900.cpp +++ b/src/mame/video/cgc7900.cpp @@ -215,7 +215,7 @@ static const gfx_layout cgc7900_charlayout = GFXDECODE( cgc7900 ) -------------------------------------------------*/ -static GFXDECODE_START( cgc7900 ) +static GFXDECODE_START( gfx_cgc7900 ) GFXDECODE_ENTRY( "gfx1", 0x0000, cgc7900_charlayout, 0, 1 ) GFXDECODE_END @@ -236,7 +236,7 @@ MACHINE_CONFIG_START(cgc7900_state::cgc7900_video) MCFG_SCREEN_VISIBLE_AREA(0, 1024-1, 0, 768-1) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cgc7900_state, irq<0xc>)) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", cgc7900) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cgc7900) MCFG_PALETTE_ADD("palette", 8) MCFG_PALETTE_INIT_OWNER(cgc7900_state, cgc7900) diff --git a/src/mame/video/madalien.cpp b/src/mame/video/madalien.cpp index ef244bf8c32..f07b9badfcf 100644 --- a/src/mame/video/madalien.cpp +++ b/src/mame/video/madalien.cpp @@ -361,7 +361,7 @@ static const gfx_layout tilelayout = }; -static GFXDECODE_START( madalien ) +static GFXDECODE_START( gfx_madalien ) GFXDECODE_ENTRY( nullptr, 0, charlayout, 0x20, 2 ) /* foreground characters, stored in RAM */ GFXDECODE_ENTRY( "gfx1", 0, tilelayout, 0, 4 ) GFXDECODE_ENTRY( "gfx2", 0, headlightlayout, 0, 1 ) @@ -374,7 +374,7 @@ MACHINE_CONFIG_START(madalien_state::madalien_video) MCFG_SCREEN_UPDATE_DRIVER(madalien_state, screen_update_madalien) MCFG_SCREEN_PALETTE("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", madalien) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_madalien) MCFG_PALETTE_ADD("palette", 0x30) MCFG_PALETTE_INDIRECT_ENTRIES(0x20) MCFG_PALETTE_INIT_OWNER(madalien_state,madalien) diff --git a/src/mame/video/mikromik.cpp b/src/mame/video/mikromik.cpp index 45c7d8a2c81..1497636e6fc 100644 --- a/src/mame/video/mikromik.cpp +++ b/src/mame/video/mikromik.cpp @@ -113,7 +113,7 @@ static const gfx_layout charlayout = // GFXDECODE( mm1 ) //------------------------------------------------- -static GFXDECODE_START( mm1 ) +static GFXDECODE_START( gfx_mm1 ) GFXDECODE_ENTRY( "chargen", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -137,7 +137,7 @@ MACHINE_CONFIG_START(mm1_state::mm1m6_video) MCFG_SCREEN_VISIBLE_AREA( 0, 800-1, 0, 375-1 ) //MCFG_SCREEN_RAW_PARAMS(XTAL(18'720'000), ...) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mm1) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mm1) MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(mm1_state, mm1) diff --git a/src/mame/video/mystston.cpp b/src/mame/video/mystston.cpp index ef9c26677bf..564b9ca6ce0 100644 --- a/src/mame/video/mystston.cpp +++ b/src/mame/video/mystston.cpp @@ -296,7 +296,7 @@ static const gfx_layout spritelayout = }; -static GFXDECODE_START( mystston ) +static GFXDECODE_START( gfx_mystston ) GFXDECODE_ENTRY( "gfx1", 0, charlayout, 4*8, 4 ) GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 2*8, 1 ) GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0*8, 2 ) @@ -314,7 +314,7 @@ MACHINE_CONFIG_START(mystston_state::mystston_video) MCFG_VIDEO_START_OVERRIDE(mystston_state,mystston) MCFG_VIDEO_RESET_OVERRIDE(mystston_state,mystston) - MCFG_GFXDECODE_ADD("gfxdecode", "palette", mystston) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mystston) MCFG_PALETTE_ADD("palette", 0x40) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/video/newbrain.cpp b/src/mame/video/newbrain.cpp index a491be10577..a24bd35f6f9 100644 --- a/src/mame/video/newbrain.cpp +++ b/src/mame/video/newbrain.cpp @@ -180,7 +180,7 @@ static const gfx_layout newbrain_charlayout = 8 /* every char takes 16 x 1 bytes */ }; -static GFXDECODE_START( newbrain ) +static GFXDECODE_START( gfx_newbrain ) GFXDECODE_ENTRY( "chargen", 0x0000, newbrain_charlayout, 0, 1 ) GFXDECODE_END @@ -195,5 +195,5 @@ MACHINE_CONFIG_START(newbrain_state::newbrain_video) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", newbrain) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_newbrain) MACHINE_CONFIG_END diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp index 9de0fea491c..b7d0891fd9f 100644 --- a/src/mame/video/pcd.cpp +++ b/src/mame/video/pcd.cpp @@ -78,7 +78,7 @@ static const gfx_layout pcd_charlayout = 8*16 }; -static GFXDECODE_START( pcx ) +static GFXDECODE_START( gfx_pcx ) GFXDECODE_DEVICE( "char", 0x0000, pcd_charlayout, 0, 1 ) GFXDECODE_END @@ -445,7 +445,7 @@ void pcx_video_device::device_start() set_data_frame(1, 8, PARITY_NONE, STOP_BITS_1); set_rate(600*2); // FIXME: fix the keyboard when the mc2661 baud rate calc is fixed - decode_gfx(GFXDECODE_NAME(pcx)); + decode_gfx(gfx_pcx); } void pcx_video_device::device_reset() diff --git a/src/mame/video/pcd.h b/src/mame/video/pcd.h index 1e057bd169c..0680f24fe0a 100644 --- a/src/mame/video/pcd.h +++ b/src/mame/video/pcd.h @@ -10,6 +10,9 @@ #include "machine/timer.h" #include "video/scn2674.h" +#include "diserial.h" + + #define MCFG_PCX_VIDEO_TXD_HANDLER(_devcb) \ devcb = &downcast(*device).set_txd_handler(DEVCB_##_devcb); diff --git a/src/mame/video/stfight_dev.cpp b/src/mame/video/stfight_dev.cpp index c4aa3273952..d558473f77f 100644 --- a/src/mame/video/stfight_dev.cpp +++ b/src/mame/video/stfight_dev.cpp @@ -101,11 +101,11 @@ static const gfx_layout spritelayout = 64*8 /* every sprite takes 64 consecutive bytes */ }; -static GFXDECODE_START( stfight ) - GFXDECODE_ENTRY( "tx_gfx", 0x0000, charlayout, 0, 16 ) - GFXDECODE_ENTRY( "fg_gfx", 0x0000, fglayout, 0, 16 ) - GFXDECODE_ENTRY( "bg_gfx", 0x0000, bglayout, 0, 16 ) - GFXDECODE_ENTRY( "bg_gfx", 0x0020, bglayout, 0, 16 ) +static GFXDECODE_START( gfx_stfight ) + GFXDECODE_ENTRY( "tx_gfx", 0x0000, charlayout, 0, 16 ) + GFXDECODE_ENTRY( "fg_gfx", 0x0000, fglayout, 0, 16 ) + GFXDECODE_ENTRY( "bg_gfx", 0x0000, bglayout, 0, 16 ) + GFXDECODE_ENTRY( "bg_gfx", 0x0020, bglayout, 0, 16 ) GFXDECODE_ENTRY( "spr_gfx", 0x0000, spritelayout, 0, 32 ) GFXDECODE_END @@ -119,7 +119,7 @@ MACHINE_CONFIG_START(stfight_video_device::device_add_mconfig) MCFG_SCREEN_UPDATE_DRIVER(stfight_video_device, screen_update_stfight) MCFG_SCREEN_PALETTE("^palette") - MCFG_GFXDECODE_ADD("gfxdecode", "^palette", stfight) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "^palette", gfx_stfight) MACHINE_CONFIG_END /* diff --git a/src/mame/video/tmc600.cpp b/src/mame/video/tmc600.cpp index 580f34e51f4..8071f0d8445 100644 --- a/src/mame/video/tmc600.cpp +++ b/src/mame/video/tmc600.cpp @@ -112,7 +112,7 @@ static const gfx_layout tmc600_charlayout = 8*8 // every char takes 8 x 8 bytes }; -static GFXDECODE_START( tmc600 ) +static GFXDECODE_START( gfx_tmc600 ) GFXDECODE_ENTRY( "chargen", 0x0000, tmc600_charlayout, 0, 36 ) GFXDECODE_END @@ -120,7 +120,7 @@ MACHINE_CONFIG_START(tmc600_state::tmc600_video) // video hardware MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL) - MCFG_GFXDECODE_ADD("gfxdecode", CDP1869_TAG":palette", tmc600) + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, CDP1869_TAG":palette", gfx_tmc600) // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/video/ygv608.cpp b/src/mame/video/ygv608.cpp index 027ffa62fef..6eab5d8013a 100644 --- a/src/mame/video/ygv608.cpp +++ b/src/mame/video/ygv608.cpp @@ -228,7 +228,7 @@ static const gfx_layout pts_16x16_8bits_layout = 16*16*8 }; -static GFXDECODE_START( ygv608 ) +static GFXDECODE_START( gfx_ygv608 ) GFXDECODE_DEVICE( DEVICE_SELF, 0x00000000, pts_8x8_4bits_layout, 0, 16 ) GFXDECODE_DEVICE( DEVICE_SELF, 0x00000000, pts_16x16_4bits_layout, 0, 16 ) GFXDECODE_DEVICE( DEVICE_SELF, 0x00000000, pts_32x32_4bits_layout, 0, 16 ) @@ -316,7 +316,7 @@ void ygv608_device::port_map(address_map &map) ygv608_device::ygv608_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) : device_t(mconfig, YGV608, tag, owner, clock), - device_gfx_interface(mconfig, *this, GFXDECODE_NAME(ygv608)), + device_gfx_interface(mconfig, *this, gfx_ygv608), device_memory_interface(mconfig, *this), device_video_interface(mconfig, *this), m_io_space_config("io", ENDIANNESS_BIG, 8, 6, 0, address_map_constructor(FUNC(ygv608_device::regs_map), this)), -- cgit v1.2.3