summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-04-06 14:29:31 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-04-06 14:29:31 +0000
commit3541b5c3513664684e43577fb9c5a4ae6177d600 (patch)
treeff0676de43d473f4ba5b5ecd7b3f92a84d70f448
parent7818ba99ea894304b5c6e804c3e1f87327f21fcd (diff)
MAME going modern part 7 (no whatsnew)
-rw-r--r--src/mame/audio/mcr.c3
-rw-r--r--src/mame/audio/snk6502.c4
-rw-r--r--src/mame/drivers/1942.c10
-rw-r--r--src/mame/drivers/1943.c8
-rw-r--r--src/mame/drivers/2mindril.c16
-rw-r--r--src/mame/drivers/3do.c10
-rw-r--r--src/mame/drivers/40love.c16
-rw-r--r--src/mame/drivers/4enraya.c8
-rw-r--r--src/mame/drivers/4roses.c4
-rw-r--r--src/mame/drivers/aeroboto.c6
-rw-r--r--src/mame/drivers/aerofgt.c122
-rw-r--r--src/mame/drivers/airbustr.c10
-rw-r--r--src/mame/drivers/ajax.c4
-rw-r--r--src/mame/drivers/alpha68k.c12
-rw-r--r--src/mame/drivers/ampoker2.c2
-rw-r--r--src/mame/drivers/amspdwy.c8
-rw-r--r--src/mame/drivers/angelkds.c20
-rw-r--r--src/mame/drivers/appoooh.c12
-rw-r--r--src/mame/drivers/aquarium.c10
-rw-r--r--src/mame/drivers/arabian.c4
-rw-r--r--src/mame/drivers/argus.c40
-rw-r--r--src/mame/drivers/arkanoid.c38
-rw-r--r--src/mame/drivers/armedf.c74
-rw-r--r--src/mame/drivers/artmagic.c4
-rw-r--r--src/mame/drivers/ashnojoe.c18
-rw-r--r--src/mame/drivers/asterix.c2
-rw-r--r--src/mame/drivers/asteroid.c25
-rw-r--r--src/mame/drivers/astrocde.c50
-rw-r--r--src/mame/drivers/asuka.c8
-rw-r--r--src/mame/drivers/atarifb.c62
-rw-r--r--src/mame/drivers/ataxx.c29
-rw-r--r--src/mame/drivers/atetris.c4
-rw-r--r--src/mame/drivers/aztarac.c2
-rw-r--r--src/mame/drivers/bagman.c16
-rw-r--r--src/mame/drivers/balsente.c63
-rw-r--r--src/mame/drivers/bankp.c12
-rw-r--r--src/mame/drivers/baraduke.c10
-rw-r--r--src/mame/drivers/battlane.c14
-rw-r--r--src/mame/drivers/battlera.c12
-rw-r--r--src/mame/drivers/battlex.c12
-rw-r--r--src/mame/drivers/battlnts.c2
-rw-r--r--src/mame/drivers/bbusters.c12
-rw-r--r--src/mame/drivers/beezer.c2
-rw-r--r--src/mame/drivers/bigevglf.c26
-rw-r--r--src/mame/drivers/bigstrkb.c6
-rw-r--r--src/mame/drivers/bionicc.c12
-rw-r--r--src/mame/drivers/bking.c50
-rw-r--r--src/mame/drivers/blktiger.c28
-rw-r--r--src/mame/drivers/blmbycar.c16
-rw-r--r--src/mame/drivers/blockade.c2
-rw-r--r--src/mame/drivers/blockout.c12
-rw-r--r--src/mame/drivers/bloodbro.c12
-rw-r--r--src/mame/drivers/blueprnt.c6
-rw-r--r--src/mame/drivers/bogeyman.c10
-rw-r--r--src/mame/drivers/bombjack.c8
-rw-r--r--src/mame/drivers/brkthru.c12
-rw-r--r--src/mame/drivers/bsktball.c14
-rw-r--r--src/mame/drivers/btime.c122
-rw-r--r--src/mame/drivers/bublbobl.c65
-rw-r--r--src/mame/drivers/buggychl.c10
-rw-r--r--src/mame/drivers/bwing.c10
-rw-r--r--src/mame/drivers/cabal.c12
-rw-r--r--src/mame/drivers/calomega.c16
-rw-r--r--src/mame/drivers/canyon.c2
-rw-r--r--src/mame/drivers/capbowl.c6
-rw-r--r--src/mame/drivers/carjmbre.c8
-rw-r--r--src/mame/drivers/carpolo.c28
-rw-r--r--src/mame/drivers/cave.c76
-rw-r--r--src/mame/drivers/cbasebal.c14
-rw-r--r--src/mame/drivers/cbuster.c4
-rw-r--r--src/mame/drivers/ccastles.c20
-rw-r--r--src/mame/drivers/cchasm.c4
-rw-r--r--src/mame/drivers/cclimber.c10
-rw-r--r--src/mame/drivers/centiped.c36
-rw-r--r--src/mame/drivers/chaknpop.c12
-rw-r--r--src/mame/drivers/champbas.c24
-rw-r--r--src/mame/drivers/changela.c10
-rw-r--r--src/mame/drivers/cheekyms.c4
-rw-r--r--src/mame/drivers/chinagat.c4
-rw-r--r--src/mame/drivers/cinemat.c2
-rw-r--r--src/mame/drivers/circus.c6
-rw-r--r--src/mame/drivers/circusc.c6
-rw-r--r--src/mame/drivers/cischeat.c47
-rw-r--r--src/mame/drivers/citycon.c6
-rw-r--r--src/mame/drivers/cloak.c10
-rw-r--r--src/mame/drivers/cloud9.c10
-rw-r--r--src/mame/drivers/clshroad.c6
-rw-r--r--src/mame/drivers/combatsc.c8
-rw-r--r--src/mame/drivers/commando.c14
-rw-r--r--src/mame/drivers/compgolf.c4
-rw-r--r--src/mame/drivers/contra.c16
-rw-r--r--src/mame/drivers/cop01.c8
-rw-r--r--src/mame/drivers/cosmic.c13
-rw-r--r--src/mame/drivers/cps1.c18
-rw-r--r--src/mame/drivers/cps2.c44
-rw-r--r--src/mame/drivers/crbaloon.c4
-rw-r--r--src/mame/drivers/crgolf.c2
-rw-r--r--src/mame/drivers/crospang.c26
-rw-r--r--src/mame/drivers/crshrace.c8
-rw-r--r--src/mame/drivers/cvs.c6
-rw-r--r--src/mame/drivers/dambustr.c20
-rw-r--r--src/mame/drivers/darius.c4
-rw-r--r--src/mame/drivers/darkhors.c8
-rw-r--r--src/mame/drivers/darkseal.c4
-rw-r--r--src/mame/drivers/dbz.c4
-rw-r--r--src/mame/drivers/dcheese.c10
-rw-r--r--src/mame/drivers/dcon.c12
-rw-r--r--src/mame/drivers/dday.c12
-rw-r--r--src/mame/drivers/ddragon.c8
-rw-r--r--src/mame/drivers/ddragon3.c18
-rw-r--r--src/mame/drivers/ddribble.c8
-rw-r--r--src/mame/drivers/deadang.c6
-rw-r--r--src/mame/drivers/dec0.c36
-rw-r--r--src/mame/drivers/dec8.c68
-rw-r--r--src/mame/drivers/deco32.c48
-rw-r--r--src/mame/drivers/deniam.c16
-rw-r--r--src/mame/drivers/djboy.c8
-rw-r--r--src/mame/drivers/dkong.c40
-rw-r--r--src/mame/drivers/docastle.c44
-rw-r--r--src/mame/drivers/dogfgt.c10
-rw-r--r--src/mame/drivers/dooyong.c80
-rw-r--r--src/mame/drivers/drgnmst.c14
-rw-r--r--src/mame/drivers/dribling.c2
-rw-r--r--src/mame/drivers/drmicro.c2
-rw-r--r--src/mame/drivers/dynax.c314
-rw-r--r--src/mame/drivers/dynduke.c16
-rw-r--r--src/mame/drivers/eolith.c2
-rw-r--r--src/mame/drivers/epos.c2
-rw-r--r--src/mame/drivers/equites.c28
-rw-r--r--src/mame/drivers/esd16.c30
-rw-r--r--src/mame/drivers/espial.c20
-rw-r--r--src/mame/drivers/esripsys.c2
-rw-r--r--src/mame/drivers/exedexes.c8
-rw-r--r--src/mame/drivers/exerion.c6
-rw-r--r--src/mame/drivers/exidy.c4
-rw-r--r--src/mame/drivers/exidy440.c12
-rw-r--r--src/mame/drivers/expro02.c22
-rw-r--r--src/mame/drivers/exprraid.c12
-rw-r--r--src/mame/drivers/exzisus.c12
-rw-r--r--src/mame/drivers/f1gp.c36
-rw-r--r--src/mame/drivers/fastlane.c4
-rw-r--r--src/mame/drivers/fcombat.c2
-rw-r--r--src/mame/drivers/fcrash.c10
-rw-r--r--src/mame/drivers/fgoal.c6
-rw-r--r--src/mame/drivers/finalizr.c2
-rw-r--r--src/mame/drivers/firetrap.c28
-rw-r--r--src/mame/drivers/fitfight.c12
-rw-r--r--src/mame/drivers/flkatck.c4
-rw-r--r--src/mame/drivers/flower.c8
-rw-r--r--src/mame/drivers/flstory.c56
-rw-r--r--src/mame/drivers/freekick.c6
-rw-r--r--src/mame/drivers/fromanc2.c54
-rw-r--r--src/mame/drivers/fromance.c32
-rw-r--r--src/mame/drivers/funkybee.c10
-rw-r--r--src/mame/drivers/funworld.c24
-rw-r--r--src/mame/drivers/funybubl.c2
-rw-r--r--src/mame/drivers/fuukifg2.c8
-rw-r--r--src/mame/drivers/fuukifg3.c8
-rw-r--r--src/mame/drivers/gaelco.c4
-rw-r--r--src/mame/drivers/gaelco2.c44
-rw-r--r--src/mame/drivers/gaelco3d.c6
-rw-r--r--src/mame/drivers/gaiden.c62
-rw-r--r--src/mame/drivers/galaga.c5
-rw-r--r--src/mame/drivers/galaxian.c184
-rw-r--r--src/mame/drivers/galaxold.c256
-rw-r--r--src/mame/drivers/galivan.c12
-rw-r--r--src/mame/drivers/galpani2.c2
-rw-r--r--src/mame/drivers/galpanic.c2
-rw-r--r--src/mame/drivers/gaplus.c14
-rw-r--r--src/mame/drivers/gatron.c2
-rw-r--r--src/mame/drivers/gberet.c22
-rw-r--r--src/mame/drivers/gcpinbal.c6
-rw-r--r--src/mame/drivers/ginganin.c6
-rw-r--r--src/mame/drivers/gladiatr.c26
-rw-r--r--src/mame/drivers/glass.c4
-rw-r--r--src/mame/drivers/gng.c10
-rw-r--r--src/mame/drivers/goal92.c8
-rw-r--r--src/mame/drivers/goindol.c4
-rw-r--r--src/mame/drivers/goldstar.c128
-rw-r--r--src/mame/drivers/gomoku.c10
-rw-r--r--src/mame/drivers/gotcha.c10
-rw-r--r--src/mame/drivers/gottlieb.c20
-rw-r--r--src/mame/drivers/gotya.c6
-rw-r--r--src/mame/drivers/gradius3.c6
-rw-r--r--src/mame/drivers/grchamp.c6
-rw-r--r--src/mame/drivers/gridlee.c6
-rw-r--r--src/mame/drivers/gstriker.c12
-rw-r--r--src/mame/drivers/gsword.c8
-rw-r--r--src/mame/drivers/gumbo.c12
-rw-r--r--src/mame/drivers/gundealr.c12
-rw-r--r--src/mame/drivers/gunsmoke.c8
-rw-r--r--src/mame/drivers/gyruss.c4
-rw-r--r--src/mame/drivers/hanaawas.c4
-rw-r--r--src/mame/drivers/hcastle.c10
-rw-r--r--src/mame/drivers/hexion.c8
-rw-r--r--src/mame/drivers/higemaru.c6
-rw-r--r--src/mame/drivers/himesiki.c6
-rw-r--r--src/mame/drivers/hnayayoi.c24
-rw-r--r--src/mame/drivers/hng64.c2
-rw-r--r--src/mame/drivers/holeland.c16
-rw-r--r--src/mame/drivers/homedata.c35
-rw-r--r--src/mame/drivers/homerun.c4
-rw-r--r--src/mame/drivers/hyhoo.c4
-rw-r--r--src/mame/drivers/hyperspt.c12
-rw-r--r--src/mame/drivers/hyprduel.c36
-rw-r--r--src/mame/drivers/ikki.c2
-rw-r--r--src/mame/drivers/inufuku.c8
-rw-r--r--src/mame/drivers/iqblock.c8
-rw-r--r--src/mame/drivers/irobot.c16
-rw-r--r--src/mame/drivers/ironhors.c24
-rw-r--r--src/mame/drivers/itech32.c46
-rw-r--r--src/mame/drivers/itech8.c41
-rw-r--r--src/mame/drivers/jack.c14
-rw-r--r--src/mame/drivers/jailbrek.c4
-rw-r--r--src/mame/drivers/jchan.c6
-rw-r--r--src/mame/drivers/jedi.c4
-rw-r--r--src/mame/drivers/jpmimpct.c4
-rw-r--r--src/mame/drivers/jrpacman.c16
-rw-r--r--src/mame/drivers/junofrst.c5
-rw-r--r--src/mame/drivers/kaneko16.c176
-rw-r--r--src/mame/drivers/kangaroo.c4
-rw-r--r--src/mame/drivers/karnov.c6
-rw-r--r--src/mame/drivers/kchamp.c12
-rw-r--r--src/mame/drivers/kickgoal.c6
-rw-r--r--src/mame/drivers/kingobox.c20
-rw-r--r--src/mame/drivers/kncljoe.c6
-rw-r--r--src/mame/drivers/konamigx.c24
-rw-r--r--src/mame/drivers/kongambl.c6
-rw-r--r--src/mame/drivers/kopunch.c10
-rw-r--r--src/mame/drivers/ksayakyu.c4
-rw-r--r--src/mame/drivers/kyugo.c16
-rw-r--r--src/mame/drivers/labyrunr.c4
-rw-r--r--src/mame/drivers/ladybug.c12
-rw-r--r--src/mame/drivers/ladyfrog.c12
-rw-r--r--src/mame/drivers/lasso.c24
-rw-r--r--src/mame/drivers/lastduel.c24
-rw-r--r--src/mame/drivers/legionna.c64
-rw-r--r--src/mame/drivers/leland.c73
-rw-r--r--src/mame/drivers/lemmings.c6
-rw-r--r--src/mame/drivers/lethal.c2
-rw-r--r--src/mame/drivers/lethalj.c4
-rw-r--r--src/mame/drivers/liberate.c28
-rw-r--r--src/mame/drivers/lkage.c18
-rw-r--r--src/mame/drivers/lockon.c18
-rw-r--r--src/mame/drivers/lordgun.c20
-rw-r--r--src/mame/drivers/lsasquad.c42
-rw-r--r--src/mame/drivers/lucky74.c8
-rw-r--r--src/mame/drivers/lvcards.c12
-rw-r--r--src/mame/drivers/lwings.c32
-rw-r--r--src/mame/drivers/m10.c10
-rw-r--r--src/mame/drivers/m107.c6
-rw-r--r--src/mame/drivers/m52.c26
-rw-r--r--src/mame/drivers/m57.c4
-rw-r--r--src/mame/drivers/m58.c6
-rw-r--r--src/mame/drivers/m62.c100
-rw-r--r--src/mame/drivers/m72.c150
-rw-r--r--src/mame/drivers/m90.c10
-rw-r--r--src/mame/drivers/m92.c32
-rw-r--r--src/mame/drivers/macrossp.c8
-rw-r--r--src/mame/drivers/macs.c22
-rw-r--r--src/mame/drivers/madalien.c4
-rw-r--r--src/mame/drivers/mainsnk.c6
-rw-r--r--src/mame/drivers/malzak.c4
-rw-r--r--src/mame/drivers/mappy.c12
-rw-r--r--src/mame/drivers/marineb.c14
-rw-r--r--src/mame/drivers/mario.c20
-rw-r--r--src/mame/drivers/markham.c4
-rw-r--r--src/mame/drivers/matmania.c4
-rw-r--r--src/mame/drivers/mcatadv.c4
-rw-r--r--src/mame/drivers/mcr.c16
-rw-r--r--src/mame/drivers/mcr3.c12
-rw-r--r--src/mame/drivers/mcr68.c32
-rw-r--r--src/mame/drivers/meadows.c10
-rw-r--r--src/mame/drivers/megasys1.c32
-rw-r--r--src/mame/drivers/megazone.c2
-rw-r--r--src/mame/drivers/mermaid.c20
-rw-r--r--src/mame/drivers/metlclsh.c8
-rw-r--r--src/mame/drivers/metro.c194
-rw-r--r--src/mame/drivers/mexico86.c12
-rw-r--r--src/mame/drivers/mhavoc.c28
-rw-r--r--src/mame/drivers/micro3d.c38
-rw-r--r--src/mame/drivers/midtunit.c24
-rw-r--r--src/mame/drivers/midvunit.c36
-rw-r--r--src/mame/drivers/midwunit.c20
-rw-r--r--src/mame/drivers/midxunit.c26
-rw-r--r--src/mame/drivers/midyunit.c18
-rw-r--r--src/mame/drivers/midzeus.c2
-rw-r--r--src/mame/drivers/mikie.c8
-rw-r--r--src/mame/drivers/missb2.c8
-rw-r--r--src/mame/drivers/mitchell.c32
-rw-r--r--src/mame/drivers/mjkjidai.c4
-rw-r--r--src/mame/drivers/model1.c26
-rw-r--r--src/mame/drivers/model3.c24
-rw-r--r--src/mame/drivers/momoko.c20
-rw-r--r--src/mame/drivers/mosaic.c8
-rw-r--r--src/mame/drivers/mouser.c4
-rw-r--r--src/mame/drivers/mrdo.c10
-rw-r--r--src/mame/drivers/mrflea.c6
-rw-r--r--src/mame/drivers/mrjong.c6
-rw-r--r--src/mame/drivers/ms32.c4
-rw-r--r--src/mame/drivers/msisaac.c20
-rw-r--r--src/mame/drivers/mugsmash.c6
-rw-r--r--src/mame/drivers/munchmo.c4
-rw-r--r--src/mame/drivers/mustache.c6
-rw-r--r--src/mame/drivers/mystston.c2
-rw-r--r--src/mame/drivers/mystwarr.c26
-rw-r--r--src/mame/drivers/n8080.c2
-rw-r--r--src/mame/drivers/namcofl.c2
-rw-r--r--src/mame/drivers/namcona1.c18
-rw-r--r--src/mame/drivers/namcond1.c4
-rw-r--r--src/mame/drivers/namcos1.c20
-rw-r--r--src/mame/drivers/namcos21.c6
-rw-r--r--src/mame/drivers/namcos22.c34
-rw-r--r--src/mame/drivers/namcos86.c24
-rw-r--r--src/mame/drivers/naughtyb.c4
-rw-r--r--src/mame/drivers/nbmj8688.c112
-rw-r--r--src/mame/drivers/nbmj8891.c160
-rw-r--r--src/mame/drivers/nbmj8900.c18
-rw-r--r--src/mame/drivers/nbmj8991.c44
-rw-r--r--src/mame/drivers/nbmj9195.c258
-rw-r--r--src/mame/drivers/nemesis.c134
-rw-r--r--src/mame/drivers/neogeo.c6
-rw-r--r--src/mame/drivers/news.c6
-rw-r--r--src/mame/drivers/ninjakd2.c60
-rw-r--r--src/mame/drivers/nitedrvr.c14
-rw-r--r--src/mame/drivers/niyanpai.c78
-rw-r--r--src/mame/drivers/nmk16.c188
-rw-r--r--src/mame/drivers/nova2001.c48
-rw-r--r--src/mame/drivers/nycaptor.c78
-rw-r--r--src/mame/drivers/ohmygod.c8
-rw-r--r--src/mame/drivers/ojankohs.c24
-rw-r--r--src/mame/drivers/oneshot.c6
-rw-r--r--src/mame/drivers/opwolf.c14
-rw-r--r--src/mame/drivers/orbit.c2
-rw-r--r--src/mame/drivers/othldrby.c8
-rw-r--r--src/mame/drivers/pacland.c10
-rw-r--r--src/mame/drivers/pacman.c76
-rw-r--r--src/mame/drivers/pandoras.c12
-rw-r--r--src/mame/drivers/paradise.c28
-rw-r--r--src/mame/drivers/pass.c4
-rw-r--r--src/mame/drivers/pastelg.c16
-rw-r--r--src/mame/drivers/pbaction.c12
-rw-r--r--src/mame/drivers/pengo.c28
-rw-r--r--src/mame/drivers/pgm.c4
-rw-r--r--src/mame/drivers/phoenix.c20
-rw-r--r--src/mame/drivers/pingpong.c8
-rw-r--r--src/mame/drivers/pipedrm.c14
-rw-r--r--src/mame/drivers/pirates.c6
-rw-r--r--src/mame/drivers/pitnrun.c28
-rw-r--r--src/mame/drivers/playch10.c28
-rw-r--r--src/mame/drivers/playmark.c60
-rw-r--r--src/mame/drivers/plygonet.c4
-rw-r--r--src/mame/drivers/pokechmp.c4
-rw-r--r--src/mame/drivers/polepos.c22
-rw-r--r--src/mame/drivers/policetr.c16
-rw-r--r--src/mame/drivers/polyplay.c2
-rw-r--r--src/mame/drivers/pooyan.c6
-rw-r--r--src/mame/drivers/popeye.c18
-rw-r--r--src/mame/drivers/popper.c14
-rw-r--r--src/mame/drivers/portrait.c4
-rw-r--r--src/mame/drivers/powerbal.c4
-rw-r--r--src/mame/drivers/powerins.c24
-rw-r--r--src/mame/drivers/prehisle.c8
-rw-r--r--src/mame/drivers/psikyo.c12
-rw-r--r--src/mame/drivers/psychic5.c12
-rw-r--r--src/mame/drivers/punchout.c18
-rw-r--r--src/mame/drivers/pushman.c8
-rw-r--r--src/mame/drivers/qix.c14
-rw-r--r--src/mame/drivers/quasar.c4
-rw-r--r--src/mame/drivers/quizdna.c30
-rw-r--r--src/mame/drivers/quizpani.c6
-rw-r--r--src/mame/drivers/raiden.c20
-rw-r--r--src/mame/drivers/rainbow.c10
-rw-r--r--src/mame/drivers/rallyx.c14
-rw-r--r--src/mame/drivers/rastan.c2
-rw-r--r--src/mame/drivers/realbrk.c12
-rw-r--r--src/mame/drivers/redalert.c8
-rw-r--r--src/mame/drivers/renegade.c10
-rw-r--r--src/mame/drivers/retofinv.c28
-rw-r--r--src/mame/drivers/rltennis.c2
-rw-r--r--src/mame/drivers/rockrage.c2
-rw-r--r--src/mame/drivers/rocnrope.c6
-rw-r--r--src/mame/drivers/rohga.c4
-rw-r--r--src/mame/drivers/rollrace.c14
-rw-r--r--src/mame/drivers/route16.c20
-rw-r--r--src/mame/drivers/rpunch.c12
-rw-r--r--src/mame/drivers/runaway.c6
-rw-r--r--src/mame/drivers/rungun.c4
-rw-r--r--src/mame/drivers/sandscrp.c8
-rw-r--r--src/mame/drivers/sauro.c20
-rw-r--r--src/mame/drivers/sbasketb.c6
-rw-r--r--src/mame/drivers/sbugger.c4
-rw-r--r--src/mame/drivers/scobra.c70
-rw-r--r--src/mame/drivers/scotrsht.c8
-rw-r--r--src/mame/drivers/scramble.c156
-rw-r--r--src/mame/drivers/scregg.c10
-rw-r--r--src/mame/drivers/sderby.c32
-rw-r--r--src/mame/drivers/segag80r.c28
-rw-r--r--src/mame/drivers/segas32.c49
-rw-r--r--src/mame/drivers/seibuspi.c40
-rw-r--r--src/mame/drivers/seicross.c4
-rw-r--r--src/mame/drivers/senjyo.c24
-rw-r--r--src/mame/drivers/seta.c115
-rw-r--r--src/mame/drivers/seta2.c22
-rw-r--r--src/mame/drivers/sf.c30
-rw-r--r--src/mame/drivers/shadfrce.c14
-rw-r--r--src/mame/drivers/shangha3.c18
-rw-r--r--src/mame/drivers/shangkid.c8
-rw-r--r--src/mame/drivers/shaolins.c10
-rw-r--r--src/mame/drivers/shisen.c6
-rw-r--r--src/mame/drivers/shootout.c8
-rw-r--r--src/mame/drivers/sidearms.c36
-rw-r--r--src/mame/drivers/sidepckt.c6
-rw-r--r--src/mame/drivers/silkroad.c6
-rw-r--r--src/mame/drivers/simpsons.c6
-rw-r--r--src/mame/drivers/skydiver.c22
-rw-r--r--src/mame/drivers/skyfox.c4
-rw-r--r--src/mame/drivers/skykid.c10
-rw-r--r--src/mame/drivers/slapfght.c117
-rw-r--r--src/mame/drivers/snk.c416
-rw-r--r--src/mame/drivers/snk6502.c62
-rw-r--r--src/mame/drivers/snk68.c16
-rw-r--r--src/mame/drivers/snookr10.c8
-rw-r--r--src/mame/drivers/solomon.c10
-rw-r--r--src/mame/drivers/sonson.c8
-rw-r--r--src/mame/drivers/spacefb.c9
-rw-r--r--src/mame/drivers/spcforce.c2
-rw-r--r--src/mame/drivers/spdodgeb.c6
-rw-r--r--src/mame/drivers/speedatk.c6
-rw-r--r--src/mame/drivers/speedbal.c4
-rw-r--r--src/mame/drivers/speedspn.c8
-rw-r--r--src/mame/drivers/speglsht.c22
-rw-r--r--src/mame/drivers/splash.c6
-rw-r--r--src/mame/drivers/sprcros2.c8
-rw-r--r--src/mame/drivers/sprint2.c10
-rw-r--r--src/mame/drivers/sprint4.c2
-rw-r--r--src/mame/drivers/sprint8.c2
-rw-r--r--src/mame/drivers/srmp5.c10
-rw-r--r--src/mame/drivers/srumbler.c8
-rw-r--r--src/mame/drivers/sshangha.c4
-rw-r--r--src/mame/drivers/sslam.c16
-rw-r--r--src/mame/drivers/ssozumo.c14
-rw-r--r--src/mame/drivers/sspeedr.c24
-rw-r--r--src/mame/drivers/ssrj.c6
-rw-r--r--src/mame/drivers/ssv.c8
-rw-r--r--src/mame/drivers/st0016.c28
-rw-r--r--src/mame/drivers/stactics.c8
-rw-r--r--src/mame/drivers/stadhero.c2
-rw-r--r--src/mame/drivers/starcrus.c24
-rw-r--r--src/mame/drivers/starfire.c4
-rw-r--r--src/mame/drivers/starshp1.c8
-rw-r--r--src/mame/drivers/starwars.c18
-rw-r--r--src/mame/drivers/stepstag.c10
-rw-r--r--src/mame/drivers/stfight.c20
-rw-r--r--src/mame/drivers/stlforce.c8
-rw-r--r--src/mame/drivers/strnskil.c4
-rw-r--r--src/mame/drivers/subs.c16
-rw-r--r--src/mame/drivers/suna16.c16
-rw-r--r--src/mame/drivers/suna8.c12
-rw-r--r--src/mame/drivers/superqix.c18
-rw-r--r--src/mame/drivers/suprloco.c6
-rw-r--r--src/mame/drivers/suprnova.c10
-rw-r--r--src/mame/drivers/suprridr.c14
-rw-r--r--src/mame/drivers/suprslam.c6
-rw-r--r--src/mame/drivers/system1.c26
-rw-r--r--src/mame/drivers/system16.c96
-rw-r--r--src/mame/drivers/tagteam.c12
-rw-r--r--src/mame/drivers/tail2nos.c6
-rw-r--r--src/mame/drivers/taito_b.c8
-rw-r--r--src/mame/drivers/taito_f2.c24
-rw-r--r--src/mame/drivers/taito_f3.c22
-rw-r--r--src/mame/drivers/taito_l.c6
-rw-r--r--src/mame/drivers/taito_z.c8
-rw-r--r--src/mame/drivers/taitoair.c18
-rw-r--r--src/mame/drivers/taitojc.c4
-rw-r--r--src/mame/drivers/taitosj.c58
-rw-r--r--src/mame/drivers/tank8.c2
-rw-r--r--src/mame/drivers/tankbatt.c2
-rw-r--r--src/mame/drivers/tankbust.c10
-rw-r--r--src/mame/drivers/taotaido.c6
-rw-r--r--src/mame/drivers/targeth.c2
-rw-r--r--src/mame/drivers/tatsumi.c76
-rw-r--r--src/mame/drivers/tbowl.c22
-rw-r--r--src/mame/drivers/tceptor.c8
-rw-r--r--src/mame/drivers/tecmo.c36
-rw-r--r--src/mame/drivers/tecmo16.c46
-rw-r--r--src/mame/drivers/tecmosys.c22
-rw-r--r--src/mame/drivers/tehkanwc.c28
-rw-r--r--src/mame/drivers/terracre.c20
-rw-r--r--src/mame/drivers/tetrisp2.c66
-rw-r--r--src/mame/drivers/thedeep.c4
-rw-r--r--src/mame/drivers/thepit.c24
-rw-r--r--src/mame/drivers/thief.c18
-rw-r--r--src/mame/drivers/thoop2.c2
-rw-r--r--src/mame/drivers/tiamc1.c21
-rw-r--r--src/mame/drivers/tigeroad.c6
-rw-r--r--src/mame/drivers/timelimt.c10
-rw-r--r--src/mame/drivers/timeplt.c24
-rw-r--r--src/mame/drivers/tmnt.c48
-rw-r--r--src/mame/drivers/tnzs.c24
-rw-r--r--src/mame/drivers/toaplan1.c264
-rw-r--r--src/mame/drivers/toaplan2.c64
-rw-r--r--src/mame/drivers/toki.c14
-rw-r--r--src/mame/drivers/toypop.c12
-rw-r--r--src/mame/drivers/tp84.c4
-rw-r--r--src/mame/drivers/trackfld.c33
-rw-r--r--src/mame/drivers/travrusa.c8
-rw-r--r--src/mame/drivers/trucocl.c4
-rw-r--r--src/mame/drivers/tryout.c8
-rw-r--r--src/mame/drivers/tsamurai.c36
-rw-r--r--src/mame/drivers/tubep.c18
-rw-r--r--src/mame/drivers/tumbleb.c50
-rw-r--r--src/mame/drivers/tunhunt.c2
-rw-r--r--src/mame/drivers/turbo.c8
-rw-r--r--src/mame/drivers/tutankhm.c4
-rw-r--r--src/mame/drivers/twin16.c18
-rw-r--r--src/mame/drivers/twincobr.c38
-rw-r--r--src/mame/drivers/tx1.c42
-rw-r--r--src/mame/drivers/ultraman.c2
-rw-r--r--src/mame/drivers/ultratnk.c2
-rw-r--r--src/mame/drivers/unico.c12
-rw-r--r--src/mame/drivers/usgames.c8
-rw-r--r--src/mame/drivers/vaportra.c6
-rw-r--r--src/mame/drivers/vastar.c10
-rw-r--r--src/mame/drivers/vball.c4
-rw-r--r--src/mame/drivers/vectrex.c8
-rw-r--r--src/mame/drivers/vertigo.c14
-rw-r--r--src/mame/drivers/vicdual.c30
-rw-r--r--src/mame/drivers/victory.c6
-rw-r--r--src/mame/drivers/videopin.c4
-rw-r--r--src/mame/drivers/vigilant.c10
-rw-r--r--src/mame/drivers/volfied.c14
-rw-r--r--src/mame/drivers/vsnes.c8
-rw-r--r--src/mame/drivers/vulgus.c8
-rw-r--r--src/mame/drivers/wardner.c32
-rw-r--r--src/mame/drivers/warpwarp.c6
-rw-r--r--src/mame/drivers/wc90.c6
-rw-r--r--src/mame/drivers/wc90b.c6
-rw-r--r--src/mame/drivers/wecleman.c12
-rw-r--r--src/mame/drivers/welltris.c10
-rw-r--r--src/mame/drivers/wgp.c4
-rw-r--r--src/mame/drivers/williams.c103
-rw-r--r--src/mame/drivers/wiping.c2
-rw-r--r--src/mame/drivers/wiz.c10
-rw-r--r--src/mame/drivers/wolfpack.c24
-rw-r--r--src/mame/drivers/wrally.c10
-rw-r--r--src/mame/drivers/wwfsstar.c4
-rw-r--r--src/mame/drivers/wwfwfest.c6
-rw-r--r--src/mame/drivers/xain.c16
-rw-r--r--src/mame/drivers/xorworld.c2
-rw-r--r--src/mame/drivers/xxmissio.c12
-rw-r--r--src/mame/drivers/xyonix.c2
-rw-r--r--src/mame/drivers/yiear.c4
-rw-r--r--src/mame/drivers/yunsun16.c4
-rw-r--r--src/mame/drivers/yunsung8.c6
-rw-r--r--src/mame/drivers/zac2650.c6
-rw-r--r--src/mame/drivers/zaccaria.c8
-rw-r--r--src/mame/drivers/zaxxon.c32
-rw-r--r--src/mame/includes/1942.h10
-rw-r--r--src/mame/includes/1943.h8
-rw-r--r--src/mame/includes/3do.h20
-rw-r--r--src/mame/includes/40love.h14
-rw-r--r--src/mame/includes/4enraya.h2
-rw-r--r--src/mame/includes/aeroboto.h8
-rw-r--r--src/mame/includes/aerofgt.h30
-rw-r--r--src/mame/includes/airbustr.h10
-rw-r--r--src/mame/includes/ajax.h8
-rw-r--r--src/mame/includes/alpha68k.h8
-rw-r--r--src/mame/includes/ampoker2.h2
-rw-r--r--src/mame/includes/amspdwy.h8
-rw-r--r--src/mame/includes/angelkds.h20
-rw-r--r--src/mame/includes/appoooh.h12
-rw-r--r--src/mame/includes/aquarium.h6
-rw-r--r--src/mame/includes/arabian.h4
-rw-r--r--src/mame/includes/argus.h42
-rw-r--r--src/mame/includes/arkanoid.h33
-rw-r--r--src/mame/includes/armedf.h26
-rw-r--r--src/mame/includes/artmagic.h4
-rw-r--r--src/mame/includes/ashnojoe.h18
-rw-r--r--src/mame/includes/asterix.h2
-rw-r--r--src/mame/includes/asteroid.h14
-rw-r--r--src/mame/includes/astrocde.h18
-rw-r--r--src/mame/includes/asuka.h2
-rw-r--r--src/mame/includes/atarifb.h28
-rw-r--r--src/mame/includes/atetris.h2
-rw-r--r--src/mame/includes/aztarac.h2
-rw-r--r--src/mame/includes/bagman.h11
-rw-r--r--src/mame/includes/balsente.h64
-rw-r--r--src/mame/includes/bankp.h12
-rw-r--r--src/mame/includes/baraduke.h16
-rw-r--r--src/mame/includes/battlane.h14
-rw-r--r--src/mame/includes/battlera.h14
-rw-r--r--src/mame/includes/battlex.h12
-rw-r--r--src/mame/includes/battlnts.h2
-rw-r--r--src/mame/includes/bbusters.h6
-rw-r--r--src/mame/includes/beezer.h6
-rw-r--r--src/mame/includes/bigevglf.h34
-rw-r--r--src/mame/includes/bigstrkb.h6
-rw-r--r--src/mame/includes/bionicc.h12
-rw-r--r--src/mame/includes/bking.h30
-rw-r--r--src/mame/includes/blktiger.h18
-rw-r--r--src/mame/includes/blmbycar.h6
-rw-r--r--src/mame/includes/blockade.h2
-rw-r--r--src/mame/includes/blockout.h6
-rw-r--r--src/mame/includes/bloodbro.h6
-rw-r--r--src/mame/includes/blueprnt.h6
-rw-r--r--src/mame/includes/bogeyman.h10
-rw-r--r--src/mame/includes/bombjack.h8
-rw-r--r--src/mame/includes/brkthru.h6
-rw-r--r--src/mame/includes/bsktball.h14
-rw-r--r--src/mame/includes/btime.h36
-rw-r--r--src/mame/includes/bublbobl.h76
-rw-r--r--src/mame/includes/buggychl.h10
-rw-r--r--src/mame/includes/bwing.h12
-rw-r--r--src/mame/includes/cabal.h6
-rw-r--r--src/mame/includes/calomega.h4
-rw-r--r--src/mame/includes/canyon.h2
-rw-r--r--src/mame/includes/capbowl.h8
-rw-r--r--src/mame/includes/carjmbre.h8
-rw-r--r--src/mame/includes/carpolo.h28
-rw-r--r--src/mame/includes/cave.h16
-rw-r--r--src/mame/includes/cbasebal.h14
-rw-r--r--src/mame/includes/cbuster.h4
-rw-r--r--src/mame/includes/ccastles.h16
-rw-r--r--src/mame/includes/cchasm.h4
-rw-r--r--src/mame/includes/cclimber.h4
-rw-r--r--src/mame/includes/centiped.h14
-rw-r--r--src/mame/includes/chaknpop.h20
-rw-r--r--src/mame/includes/champbas.h8
-rw-r--r--src/mame/includes/changela.h12
-rw-r--r--src/mame/includes/cheekyms.h4
-rw-r--r--src/mame/includes/cinemat.h2
-rw-r--r--src/mame/includes/circus.h6
-rw-r--r--src/mame/includes/circusc.h6
-rw-r--r--src/mame/includes/cischeat.h27
-rw-r--r--src/mame/includes/citycon.h6
-rw-r--r--src/mame/includes/cloak.h14
-rw-r--r--src/mame/includes/cloud9.h12
-rw-r--r--src/mame/includes/clshroad.h6
-rw-r--r--src/mame/includes/combatsc.h10
-rw-r--r--src/mame/includes/commando.h14
-rw-r--r--src/mame/includes/compgolf.h4
-rw-r--r--src/mame/includes/contra.h16
-rw-r--r--src/mame/includes/cop01.h6
-rw-r--r--src/mame/includes/cosmic.h4
-rw-r--r--src/mame/includes/cps1.h18
-rw-r--r--src/mame/includes/crbaloon.h4
-rw-r--r--src/mame/includes/crgolf.h4
-rw-r--r--src/mame/includes/crospang.h22
-rw-r--r--src/mame/includes/crshrace.h8
-rw-r--r--src/mame/includes/cvs.h8
-rw-r--r--src/mame/includes/darius.h2
-rw-r--r--src/mame/includes/darkseal.h4
-rw-r--r--src/mame/includes/dbz.h4
-rw-r--r--src/mame/includes/dcheese.h12
-rw-r--r--src/mame/includes/dcon.h14
-rw-r--r--src/mame/includes/dday.h16
-rw-r--r--src/mame/includes/ddragon.h4
-rw-r--r--src/mame/includes/ddragon3.h8
-rw-r--r--src/mame/includes/ddribble.h8
-rw-r--r--src/mame/includes/deadang.h6
-rw-r--r--src/mame/includes/dec0.h31
-rw-r--r--src/mame/includes/dec8.h22
-rw-r--r--src/mame/includes/deco32.h14
-rw-r--r--src/mame/includes/deniam.h10
-rw-r--r--src/mame/includes/djboy.h8
-rw-r--r--src/mame/includes/dkong.h16
-rw-r--r--src/mame/includes/docastle.h22
-rw-r--r--src/mame/includes/dogfgt.h13
-rw-r--r--src/mame/includes/dooyong.h29
-rw-r--r--src/mame/includes/drgnmst.h6
-rw-r--r--src/mame/includes/dribling.h2
-rw-r--r--src/mame/includes/drmicro.h2
-rw-r--r--src/mame/includes/dynax.h77
-rw-r--r--src/mame/includes/dynduke.h12
-rw-r--r--src/mame/includes/eolith.h4
-rw-r--r--src/mame/includes/epos.h2
-rw-r--r--src/mame/includes/equites.h26
-rw-r--r--src/mame/includes/esd16.h6
-rw-r--r--src/mame/includes/espial.h10
-rw-r--r--src/mame/includes/esripsys.h2
-rw-r--r--src/mame/includes/exedexes.h8
-rw-r--r--src/mame/includes/exerion.h6
-rw-r--r--src/mame/includes/exidy.h2
-rw-r--r--src/mame/includes/exidy440.h18
-rw-r--r--src/mame/includes/exprraid.h12
-rw-r--r--src/mame/includes/exzisus.h16
-rw-r--r--src/mame/includes/f1gp.h16
-rw-r--r--src/mame/includes/fastlane.h4
-rw-r--r--src/mame/includes/fcombat.h2
-rw-r--r--src/mame/includes/fgoal.h6
-rw-r--r--src/mame/includes/finalizr.h2
-rw-r--r--src/mame/includes/firetrap.h14
-rw-r--r--src/mame/includes/fitfight.h6
-rw-r--r--src/mame/includes/flkatck.h4
-rw-r--r--src/mame/includes/flower.h8
-rw-r--r--src/mame/includes/flstory.h50
-rw-r--r--src/mame/includes/freekick.h2
-rw-r--r--src/mame/includes/fromanc2.h66
-rw-r--r--src/mame/includes/fromance.h16
-rw-r--r--src/mame/includes/funkybee.h10
-rw-r--r--src/mame/includes/funworld.h4
-rw-r--r--src/mame/includes/funybubl.h2
-rw-r--r--src/mame/includes/fuukifg2.h8
-rw-r--r--src/mame/includes/fuukifg3.h8
-rw-r--r--src/mame/includes/gaelco.h2
-rw-r--r--src/mame/includes/gaelco2.h22
-rw-r--r--src/mame/includes/gaelco3d.h6
-rw-r--r--src/mame/includes/gaiden.h32
-rw-r--r--src/mame/includes/galaga.h4
-rw-r--r--src/mame/includes/galaxian.h22
-rw-r--r--src/mame/includes/galaxold.h63
-rw-r--r--src/mame/includes/galivan.h10
-rw-r--r--src/mame/includes/gaplus.h10
-rw-r--r--src/mame/includes/gatron.h2
-rw-r--r--src/mame/includes/gberet.h10
-rw-r--r--src/mame/includes/gcpinbal.h6
-rw-r--r--src/mame/includes/ginganin.h6
-rw-r--r--src/mame/includes/gladiatr.h16
-rw-r--r--src/mame/includes/glass.h4
-rw-r--r--src/mame/includes/gng.h10
-rw-r--r--src/mame/includes/goal92.h10
-rw-r--r--src/mame/includes/goindol.h4
-rw-r--r--src/mame/includes/goldstar.h24
-rw-r--r--src/mame/includes/gomoku.h10
-rw-r--r--src/mame/includes/gotcha.h10
-rw-r--r--src/mame/includes/gottlieb.h10
-rw-r--r--src/mame/includes/gotya.h6
-rw-r--r--src/mame/includes/gradius3.h4
-rw-r--r--src/mame/includes/grchamp.h6
-rw-r--r--src/mame/includes/gridlee.h6
-rw-r--r--src/mame/includes/gstriker.h14
-rw-r--r--src/mame/includes/gsword.h8
-rw-r--r--src/mame/includes/gumbo.h4
-rw-r--r--src/mame/includes/gundealr.h12
-rw-r--r--src/mame/includes/gunsmoke.h8
-rw-r--r--src/mame/includes/gyruss.h4
-rw-r--r--src/mame/includes/hanaawas.h4
-rw-r--r--src/mame/includes/hcastle.h12
-rw-r--r--src/mame/includes/hexion.h10
-rw-r--r--src/mame/includes/higemaru.h6
-rw-r--r--src/mame/includes/himesiki.h6
-rw-r--r--src/mame/includes/hnayayoi.h8
-rw-r--r--src/mame/includes/hng64.h2
-rw-r--r--src/mame/includes/holeland.h10
-rw-r--r--src/mame/includes/homedata.h22
-rw-r--r--src/mame/includes/homerun.h4
-rw-r--r--src/mame/includes/hyhoo.h4
-rw-r--r--src/mame/includes/hyperspt.h6
-rw-r--r--src/mame/includes/hyprduel.h15
-rw-r--r--src/mame/includes/ikki.h2
-rw-r--r--src/mame/includes/inufuku.h12
-rw-r--r--src/mame/includes/iqblock.h8
-rw-r--r--src/mame/includes/irobot.h18
-rw-r--r--src/mame/includes/ironhors.h10
-rw-r--r--src/mame/includes/itech32.h42
-rw-r--r--src/mame/includes/itech8.h16
-rw-r--r--src/mame/includes/jack.h10
-rw-r--r--src/mame/includes/jailbrek.h4
-rw-r--r--src/mame/includes/jedi.h4
-rw-r--r--src/mame/includes/jpmimpct.h4
-rw-r--r--src/mame/includes/kaneko16.h58
-rw-r--r--src/mame/includes/kangaroo.h4
-rw-r--r--src/mame/includes/karnov.h4
-rw-r--r--src/mame/includes/kchamp.h6
-rw-r--r--src/mame/includes/kickgoal.h6
-rw-r--r--src/mame/includes/kingobox.h10
-rw-r--r--src/mame/includes/kncljoe.h6
-rw-r--r--src/mame/includes/konamigx.h23
-rw-r--r--src/mame/includes/kopunch.h10
-rw-r--r--src/mame/includes/ksayakyu.h4
-rw-r--r--src/mame/includes/kyugo.h16
-rw-r--r--src/mame/includes/labyrunr.h4
-rw-r--r--src/mame/includes/ladybug.h8
-rw-r--r--src/mame/includes/ladyfrog.h23
-rw-r--r--src/mame/includes/lasso.h11
-rw-r--r--src/mame/includes/lastduel.h16
-rw-r--r--src/mame/includes/legionna.h8
-rw-r--r--src/mame/includes/leland.h90
-rw-r--r--src/mame/includes/lemmings.h6
-rw-r--r--src/mame/includes/lethal.h2
-rw-r--r--src/mame/includes/lethalj.h5
-rw-r--r--src/mame/includes/liberate.h14
-rw-r--r--src/mame/includes/lkage.h26
-rw-r--r--src/mame/includes/lockon.h24
-rw-r--r--src/mame/includes/lordgun.h10
-rw-r--r--src/mame/includes/lsasquad.h38
-rw-r--r--src/mame/includes/lucky74.h8
-rw-r--r--src/mame/includes/lvcards.h4
-rw-r--r--src/mame/includes/lwings.h12
-rw-r--r--src/mame/includes/m10.h6
-rw-r--r--src/mame/includes/m107.h6
-rw-r--r--src/mame/includes/m52.h22
-rw-r--r--src/mame/includes/m57.h4
-rw-r--r--src/mame/includes/m58.h6
-rw-r--r--src/mame/includes/m62.h30
-rw-r--r--src/mame/includes/m72.h30
-rw-r--r--src/mame/includes/m90.h4
-rw-r--r--src/mame/includes/m92.h18
-rw-r--r--src/mame/includes/macrossp.h8
-rw-r--r--src/mame/includes/madalien.h4
-rw-r--r--src/mame/includes/mainsnk.h6
-rw-r--r--src/mame/includes/malzak.h2
-rw-r--r--src/mame/includes/mappy.h10
-rw-r--r--src/mame/includes/marineb.h14
-rw-r--r--src/mame/includes/mario.h10
-rw-r--r--src/mame/includes/markham.h4
-rw-r--r--src/mame/includes/matmania.h2
-rw-r--r--src/mame/includes/mcatadv.h4
-rw-r--r--src/mame/includes/mcr.h20
-rw-r--r--src/mame/includes/mcr3.h10
-rw-r--r--src/mame/includes/mcr68.h22
-rw-r--r--src/mame/includes/meadows.h4
-rw-r--r--src/mame/includes/megasys1.h15
-rw-r--r--src/mame/includes/megazone.h2
-rw-r--r--src/mame/includes/mermaid.h20
-rw-r--r--src/mame/includes/metlclsh.h8
-rw-r--r--src/mame/includes/metro.h11
-rw-r--r--src/mame/includes/mexico86.h16
-rw-r--r--src/mame/includes/mhavoc.h24
-rw-r--r--src/mame/includes/micro3d.h54
-rw-r--r--src/mame/includes/midtunit.h58
-rw-r--r--src/mame/includes/midvunit.h24
-rw-r--r--src/mame/includes/midwunit.h25
-rw-r--r--src/mame/includes/midxunit.h35
-rw-r--r--src/mame/includes/midyunit.h34
-rw-r--r--src/mame/includes/midzeus.h4
-rw-r--r--src/mame/includes/mikie.h8
-rw-r--r--src/mame/includes/mitchell.h34
-rw-r--r--src/mame/includes/mjkjidai.h4
-rw-r--r--src/mame/includes/model1.h30
-rw-r--r--src/mame/includes/model3.h26
-rw-r--r--src/mame/includes/momoko.h20
-rw-r--r--src/mame/includes/mosaic.h4
-rw-r--r--src/mame/includes/mouser.h4
-rw-r--r--src/mame/includes/mrdo.h10
-rw-r--r--src/mame/includes/mrflea.h6
-rw-r--r--src/mame/includes/mrjong.h6
-rw-r--r--src/mame/includes/ms32.h4
-rw-r--r--src/mame/includes/msisaac.h21
-rw-r--r--src/mame/includes/mugsmash.h6
-rw-r--r--src/mame/includes/munchmo.h4
-rw-r--r--src/mame/includes/mustache.h6
-rw-r--r--src/mame/includes/mystston.h2
-rw-r--r--src/mame/includes/mystwarr.h19
-rw-r--r--src/mame/includes/n8080.h2
-rw-r--r--src/mame/includes/namcofl.h2
-rw-r--r--src/mame/includes/namcona1.h12
-rw-r--r--src/mame/includes/namcond1.h8
-rw-r--r--src/mame/includes/namcos1.h14
-rw-r--r--src/mame/includes/namcos21.h12
-rw-r--r--src/mame/includes/namcos22.h42
-rw-r--r--src/mame/includes/namcos86.h24
-rw-r--r--src/mame/includes/naughtyb.h4
-rw-r--r--src/mame/includes/nbmj8688.h30
-rw-r--r--src/mame/includes/nbmj8891.h34
-rw-r--r--src/mame/includes/nbmj8900.h22
-rw-r--r--src/mame/includes/nbmj8991.h12
-rw-r--r--src/mame/includes/nbmj9195.h20
-rw-r--r--src/mame/includes/nemesis.h20
-rw-r--r--src/mame/includes/neogeo.h8
-rw-r--r--src/mame/includes/news.h6
-rw-r--r--src/mame/includes/ninjakd2.h32
-rw-r--r--src/mame/includes/nitedrvr.h16
-rw-r--r--src/mame/includes/niyanpai.h28
-rw-r--r--src/mame/includes/nmk16.h34
-rw-r--r--src/mame/includes/nova2001.h18
-rw-r--r--src/mame/includes/nycaptor.h46
-rw-r--r--src/mame/includes/ohmygod.h8
-rw-r--r--src/mame/includes/ojankohs.h16
-rw-r--r--src/mame/includes/oneshot.h6
-rw-r--r--src/mame/includes/opwolf.h12
-rw-r--r--src/mame/includes/orbit.h2
-rw-r--r--src/mame/includes/othldrby.h10
-rw-r--r--src/mame/includes/pacland.h10
-rw-r--r--src/mame/includes/pacman.h30
-rw-r--r--src/mame/includes/pandoras.h8
-rw-r--r--src/mame/includes/paradise.h18
-rw-r--r--src/mame/includes/pass.h4
-rw-r--r--src/mame/includes/pastelg.h12
-rw-r--r--src/mame/includes/pbaction.h12
-rw-r--r--src/mame/includes/pgm.h4
-rw-r--r--src/mame/includes/phoenix.h10
-rw-r--r--src/mame/includes/pingpong.h4
-rw-r--r--src/mame/includes/pirates.h6
-rw-r--r--src/mame/includes/pitnrun.h32
-rw-r--r--src/mame/includes/playch10.h47
-rw-r--r--src/mame/includes/playmark.h22
-rw-r--r--src/mame/includes/plygonet.h8
-rw-r--r--src/mame/includes/pokechmp.h4
-rw-r--r--src/mame/includes/polepos.h40
-rw-r--r--src/mame/includes/policetr.h8
-rw-r--r--src/mame/includes/polyplay.h2
-rw-r--r--src/mame/includes/pooyan.h6
-rw-r--r--src/mame/includes/popeye.h8
-rw-r--r--src/mame/includes/popper.h14
-rw-r--r--src/mame/includes/portrait.h4
-rw-r--r--src/mame/includes/powerins.h10
-rw-r--r--src/mame/includes/prehisle.h8
-rw-r--r--src/mame/includes/psikyo.h4
-rw-r--r--src/mame/includes/psychic5.h14
-rw-r--r--src/mame/includes/punchout.h10
-rw-r--r--src/mame/includes/pushman.h4
-rw-r--r--src/mame/includes/qix.h39
-rw-r--r--src/mame/includes/quizdna.h12
-rw-r--r--src/mame/includes/quizpani.h6
-rw-r--r--src/mame/includes/raiden.h10
-rw-r--r--src/mame/includes/rainbow.h14
-rw-r--r--src/mame/includes/rallyx.h8
-rw-r--r--src/mame/includes/rastan.h2
-rw-r--r--src/mame/includes/realbrk.h12
-rw-r--r--src/mame/includes/redalert.h2
-rw-r--r--src/mame/includes/renegade.h10
-rw-r--r--src/mame/includes/retofinv.h30
-rw-r--r--src/mame/includes/rltennis.h2
-rw-r--r--src/mame/includes/rockrage.h2
-rw-r--r--src/mame/includes/rocnrope.h6
-rw-r--r--src/mame/includes/rohga.h2
-rw-r--r--src/mame/includes/rollrace.h14
-rw-r--r--src/mame/includes/route16.h4
-rw-r--r--src/mame/includes/rpunch.h12
-rw-r--r--src/mame/includes/runaway.h6
-rw-r--r--src/mame/includes/rungun.h6
-rw-r--r--src/mame/includes/sauro.h14
-rw-r--r--src/mame/includes/sbasketb.h6
-rw-r--r--src/mame/includes/sbugger.h4
-rw-r--r--src/mame/includes/scotrsht.h8
-rw-r--r--src/mame/includes/sderby.h8
-rw-r--r--src/mame/includes/segag80r.h24
-rw-r--r--src/mame/includes/segas32.h84
-rw-r--r--src/mame/includes/seibuspi.h17
-rw-r--r--src/mame/includes/seicross.h4
-rw-r--r--src/mame/includes/senjyo.h12
-rw-r--r--src/mame/includes/seta.h8
-rw-r--r--src/mame/includes/seta2.h2
-rw-r--r--src/mame/includes/sf.h8
-rw-r--r--src/mame/includes/shadfrce.h14
-rw-r--r--src/mame/includes/shangha3.h6
-rw-r--r--src/mame/includes/shangkid.h2
-rw-r--r--src/mame/includes/shaolins.h10
-rw-r--r--src/mame/includes/shisen.h6
-rw-r--r--src/mame/includes/shootout.h4
-rw-r--r--src/mame/includes/sidearms.h12
-rw-r--r--src/mame/includes/sidepckt.h6
-rw-r--r--src/mame/includes/silkroad.h6
-rw-r--r--src/mame/includes/simpsons.h10
-rw-r--r--src/mame/includes/skydiver.h24
-rw-r--r--src/mame/includes/skyfox.h3
-rw-r--r--src/mame/includes/skykid.h14
-rw-r--r--src/mame/includes/slapfght.h113
-rw-r--r--src/mame/includes/snk.h68
-rw-r--r--src/mame/includes/snk6502.h18
-rw-r--r--src/mame/includes/snk68.h16
-rw-r--r--src/mame/includes/snookr10.h4
-rw-r--r--src/mame/includes/solomon.h10
-rw-r--r--src/mame/includes/sonson.h8
-rw-r--r--src/mame/includes/spacefb.h4
-rw-r--r--src/mame/includes/spcforce.h2
-rw-r--r--src/mame/includes/spdodgeb.h6
-rw-r--r--src/mame/includes/speedatk.h6
-rw-r--r--src/mame/includes/speedbal.h4
-rw-r--r--src/mame/includes/speedspn.h10
-rw-r--r--src/mame/includes/splash.h2
-rw-r--r--src/mame/includes/sprcros2.h8
-rw-r--r--src/mame/includes/sprint2.h10
-rw-r--r--src/mame/includes/sprint4.h2
-rw-r--r--src/mame/includes/sprint8.h2
-rw-r--r--src/mame/includes/srumbler.h8
-rw-r--r--src/mame/includes/sshangha.h2
-rw-r--r--src/mame/includes/sslam.h10
-rw-r--r--src/mame/includes/ssozumo.h14
-rw-r--r--src/mame/includes/sspeedr.h24
-rw-r--r--src/mame/includes/ssrj.h6
-rw-r--r--src/mame/includes/ssv.h8
-rw-r--r--src/mame/includes/st0016.h28
-rw-r--r--src/mame/includes/stactics.h8
-rw-r--r--src/mame/includes/stadhero.h2
-rw-r--r--src/mame/includes/starcrus.h26
-rw-r--r--src/mame/includes/starfire.h8
-rw-r--r--src/mame/includes/starshp1.h8
-rw-r--r--src/mame/includes/starwars.h16
-rw-r--r--src/mame/includes/stfight.h21
-rw-r--r--src/mame/includes/stlforce.h8
-rw-r--r--src/mame/includes/strnskil.h4
-rw-r--r--src/mame/includes/subs.h16
-rw-r--r--src/mame/includes/suna16.h8
-rw-r--r--src/mame/includes/suna8.h6
-rw-r--r--src/mame/includes/superqix.h10
-rw-r--r--src/mame/includes/suprloco.h8
-rw-r--r--src/mame/includes/suprnova.h10
-rw-r--r--src/mame/includes/suprridr.h14
-rw-r--r--src/mame/includes/suprslam.h6
-rw-r--r--src/mame/includes/system1.h20
-rw-r--r--src/mame/includes/system16.h15
-rw-r--r--src/mame/includes/tagteam.h16
-rw-r--r--src/mame/includes/tail2nos.h8
-rw-r--r--src/mame/includes/taito_b.h10
-rw-r--r--src/mame/includes/taito_f2.h6
-rw-r--r--src/mame/includes/taito_f3.h30
-rw-r--r--src/mame/includes/taito_l.h10
-rw-r--r--src/mame/includes/taito_z.h6
-rw-r--r--src/mame/includes/taitoair.h18
-rw-r--r--src/mame/includes/taitojc.h8
-rw-r--r--src/mame/includes/taitosj.h40
-rw-r--r--src/mame/includes/tank8.h2
-rw-r--r--src/mame/includes/tankbatt.h2
-rw-r--r--src/mame/includes/tankbust.h16
-rw-r--r--src/mame/includes/taotaido.h6
-rw-r--r--src/mame/includes/targeth.h2
-rw-r--r--src/mame/includes/tatsumi.h64
-rw-r--r--src/mame/includes/tbowl.h22
-rw-r--r--src/mame/includes/tceptor.h9
-rw-r--r--src/mame/includes/tecmo.h12
-rw-r--r--src/mame/includes/tecmo16.h24
-rw-r--r--src/mame/includes/tecmosys.h24
-rw-r--r--src/mame/includes/tehkanwc.h18
-rw-r--r--src/mame/includes/terracre.h10
-rw-r--r--src/mame/includes/tetrisp2.h26
-rw-r--r--src/mame/includes/thedeep.h4
-rw-r--r--src/mame/includes/thepit.h12
-rw-r--r--src/mame/includes/thief.h22
-rw-r--r--src/mame/includes/thoop2.h2
-rw-r--r--src/mame/includes/tiamc1.h18
-rw-r--r--src/mame/includes/tigeroad.h6
-rw-r--r--src/mame/includes/timelimt.h10
-rw-r--r--src/mame/includes/timeplt.h8
-rw-r--r--src/mame/includes/tmnt.h26
-rw-r--r--src/mame/includes/tnzs.h23
-rw-r--r--src/mame/includes/toaplan1.h86
-rw-r--r--src/mame/includes/toaplan2.h16
-rw-r--r--src/mame/includes/toki.h8
-rw-r--r--src/mame/includes/toypop.h10
-rw-r--r--src/mame/includes/tp84.h4
-rw-r--r--src/mame/includes/trackfld.h8
-rw-r--r--src/mame/includes/travrusa.h8
-rw-r--r--src/mame/includes/trucocl.h4
-rw-r--r--src/mame/includes/tryout.h10
-rw-r--r--src/mame/includes/tsamurai.h18
-rw-r--r--src/mame/includes/tubep.h16
-rw-r--r--src/mame/includes/tumbleb.h22
-rw-r--r--src/mame/includes/tunhunt.h2
-rw-r--r--src/mame/includes/turbo.h4
-rw-r--r--src/mame/includes/tutankhm.h4
-rw-r--r--src/mame/includes/twin16.h10
-rw-r--r--src/mame/includes/twincobr.h82
-rw-r--r--src/mame/includes/tx1.h40
-rw-r--r--src/mame/includes/ultraman.h2
-rw-r--r--src/mame/includes/ultratnk.h2
-rw-r--r--src/mame/includes/unico.h8
-rw-r--r--src/mame/includes/usgames.h4
-rw-r--r--src/mame/includes/vaportra.h6
-rw-r--r--src/mame/includes/vastar.h10
-rw-r--r--src/mame/includes/vball.h5
-rw-r--r--src/mame/includes/vectrex.h8
-rw-r--r--src/mame/includes/vertigo.h14
-rw-r--r--src/mame/includes/vicdual.h2
-rw-r--r--src/mame/includes/victory.h6
-rw-r--r--src/mame/includes/videopin.h4
-rw-r--r--src/mame/includes/vigilant.h8
-rw-r--r--src/mame/includes/volfied.h22
-rw-r--r--src/mame/includes/vsnes.h35
-rw-r--r--src/mame/includes/vulgus.h8
-rw-r--r--src/mame/includes/warpwarp.h4
-rw-r--r--src/mame/includes/wc90.h6
-rw-r--r--src/mame/includes/wc90b.h6
-rw-r--r--src/mame/includes/wecleman.h10
-rw-r--r--src/mame/includes/welltris.h13
-rw-r--r--src/mame/includes/wgp.h8
-rw-r--r--src/mame/includes/williams.h50
-rw-r--r--src/mame/includes/wiping.h2
-rw-r--r--src/mame/includes/wiz.h10
-rw-r--r--src/mame/includes/wolfpack.h24
-rw-r--r--src/mame/includes/wrally.h10
-rw-r--r--src/mame/includes/wwfsstar.h4
-rw-r--r--src/mame/includes/wwfwfest.h6
-rw-r--r--src/mame/includes/xain.h16
-rw-r--r--src/mame/includes/xorworld.h2
-rw-r--r--src/mame/includes/xxmissio.h8
-rw-r--r--src/mame/includes/xyonix.h2
-rw-r--r--src/mame/includes/yiear.h4
-rw-r--r--src/mame/includes/yunsun16.h4
-rw-r--r--src/mame/includes/yunsung8.h8
-rw-r--r--src/mame/includes/zac2650.h8
-rw-r--r--src/mame/includes/zaccaria.h8
-rw-r--r--src/mame/includes/zaxxon.h20
-rw-r--r--src/mame/machine/3do.c460
-rw-r--r--src/mame/machine/ajax.c67
-rw-r--r--src/mame/machine/arkanoid.c326
-rw-r--r--src/mame/machine/asteroid.c49
-rw-r--r--src/mame/machine/atarifb.c229
-rw-r--r--src/mame/machine/bagman.c116
-rw-r--r--src/mame/machine/balsente.c346
-rw-r--r--src/mame/machine/beezer.c19
-rw-r--r--src/mame/machine/bigevglf.c90
-rw-r--r--src/mame/machine/bsktball.c114
-rw-r--r--src/mame/machine/btime.c32
-rw-r--r--src/mame/machine/bublbobl.c355
-rw-r--r--src/mame/machine/carpolo.c82
-rw-r--r--src/mame/machine/cchasm.c2
-rw-r--r--src/mame/machine/chaknpop.c60
-rw-r--r--src/mame/machine/dec0.c127
-rw-r--r--src/mame/machine/docastle.c45
-rw-r--r--src/mame/machine/flstory.c164
-rw-r--r--src/mame/machine/gaelco2.c62
-rw-r--r--src/mame/machine/galaxold.c74
-rw-r--r--src/mame/machine/gaplus.c20
-rw-r--r--src/mame/machine/irobot.c141
-rw-r--r--src/mame/machine/kaneko16.c109
-rw-r--r--src/mame/machine/konamigx.c73
-rw-r--r--src/mame/machine/leland.c314
-rw-r--r--src/mame/machine/lkage.c114
-rw-r--r--src/mame/machine/lsasquad.c177
-rw-r--r--src/mame/machine/mcr.c16
-rw-r--r--src/mame/machine/mcr68.c84
-rw-r--r--src/mame/machine/mexico86.c91
-rw-r--r--src/mame/machine/mhavoc.c118
-rw-r--r--src/mame/machine/micro3d.c195
-rw-r--r--src/mame/machine/midtunit.c118
-rw-r--r--src/mame/machine/midwunit.c137
-rw-r--r--src/mame/machine/midxunit.c110
-rw-r--r--src/mame/machine/midyunit.c175
-rw-r--r--src/mame/machine/model1.c126
-rw-r--r--src/mame/machine/model3.c6
-rw-r--r--src/mame/machine/namcond1.c23
-rw-r--r--src/mame/machine/namcos1.c73
-rw-r--r--src/mame/machine/nitedrvr.c86
-rw-r--r--src/mame/machine/nycaptor.c97
-rw-r--r--src/mame/machine/opwolf.c80
-rw-r--r--src/mame/machine/pitnrun.c56
-rw-r--r--src/mame/machine/playch10.c358
-rw-r--r--src/mame/machine/qix.c82
-rw-r--r--src/mame/machine/rainbow.c19
-rw-r--r--src/mame/machine/retofinv.c108
-rw-r--r--src/mame/machine/scramble.c26
-rw-r--r--src/mame/machine/segas32.c95
-rw-r--r--src/mame/machine/simpsons.c27
-rw-r--r--src/mame/machine/slapfght.c609
-rw-r--r--src/mame/machine/starwars.c96
-rw-r--r--src/mame/machine/stfight.c50
-rw-r--r--src/mame/machine/subs.c35
-rw-r--r--src/mame/machine/taitosj.c146
-rw-r--r--src/mame/machine/tatsumi.c204
-rw-r--r--src/mame/machine/tecmosys.c60
-rw-r--r--src/mame/machine/tnzs.c272
-rw-r--r--src/mame/machine/toaplan1.c212
-rw-r--r--src/mame/machine/twincobr.c150
-rw-r--r--src/mame/machine/tx1.c110
-rw-r--r--src/mame/machine/vectrex.c31
-rw-r--r--src/mame/machine/vertigo.c39
-rw-r--r--src/mame/machine/volfied.c73
-rw-r--r--src/mame/machine/vsnes.c386
-rw-r--r--src/mame/machine/williams.c124
-rw-r--r--src/mame/machine/wrally.c25
-rw-r--r--src/mame/video/1942.c39
-rw-r--r--src/mame/video/1943.c36
-rw-r--r--src/mame/video/40love.c63
-rw-r--r--src/mame/video/4enraya.c9
-rw-r--r--src/mame/video/aeroboto.c33
-rw-r--r--src/mame/video/aerofgt.c111
-rw-r--r--src/mame/video/airbustr.c51
-rw-r--r--src/mame/video/alpha68k.c47
-rw-r--r--src/mame/video/ampoker2.c7
-rw-r--r--src/mame/video/amspdwy.c26
-rw-r--r--src/mame/video/angelkds.c70
-rw-r--r--src/mame/video/appoooh.c46
-rw-r--r--src/mame/video/aquarium.c21
-rw-r--r--src/mame/video/arabian.c32
-rw-r--r--src/mame/video/argus.c173
-rw-r--r--src/mame/video/arkanoid.c100
-rw-r--r--src/mame/video/armedf.c89
-rw-r--r--src/mame/video/artmagic.c16
-rw-r--r--src/mame/video/ashnojoe.c79
-rw-r--r--src/mame/video/asterix.c7
-rw-r--r--src/mame/video/astrocde.c219
-rw-r--r--src/mame/video/asuka.c5
-rw-r--r--src/mame/video/atarifb.c21
-rw-r--r--src/mame/video/atetris.c7
-rw-r--r--src/mame/video/aztarac.c15
-rw-r--r--src/mame/video/bagman.c23
-rw-r--r--src/mame/video/balsente.c42
-rw-r--r--src/mame/video/bankp.c42
-rw-r--r--src/mame/video/baraduke.c44
-rw-r--r--src/mame/video/battlane.c43
-rw-r--r--src/mame/video/battlera.c117
-rw-r--r--src/mame/video/battlex.c34
-rw-r--r--src/mame/video/battlnts.c5
-rw-r--r--src/mame/video/bbusters.c21
-rw-r--r--src/mame/video/beezer.c10
-rw-r--r--src/mame/video/bigevglf.c35
-rw-r--r--src/mame/video/bigstrkb.c21
-rw-r--r--src/mame/video/bionicc.c54
-rw-r--r--src/mame/video/bking.c105
-rw-r--r--src/mame/video/blktiger.c79
-rw-r--r--src/mame/video/blmbycar.c21
-rw-r--r--src/mame/video/blockade.c13
-rw-r--r--src/mame/video/blockout.c21
-rw-r--r--src/mame/video/bloodbro.c21
-rw-r--r--src/mame/video/blueprnt.c25
-rw-r--r--src/mame/video/bogeyman.c33
-rw-r--r--src/mame/video/bombjack.c31
-rw-r--r--src/mame/video/brkthru.c37
-rw-r--r--src/mame/video/bsktball.c7
-rw-r--r--src/mame/video/btime.c86
-rw-r--r--src/mame/video/buggychl.c41
-rw-r--r--src/mame/video/bwing.c66
-rw-r--r--src/mame/video/cabal.c23
-rw-r--r--src/mame/video/calomega.c14
-rw-r--r--src/mame/video/canyon.c7
-rw-r--r--src/mame/video/capbowl.c30
-rw-r--r--src/mame/video/carjmbre.c27
-rw-r--r--src/mame/video/cave.c18
-rw-r--r--src/mame/video/cbasebal.c59
-rw-r--r--src/mame/video/cbuster.c14
-rw-r--r--src/mame/video/ccastles.c57
-rw-r--r--src/mame/video/cchasm.c6
-rw-r--r--src/mame/video/cclimber.c14
-rw-r--r--src/mame/video/centiped.c51
-rw-r--r--src/mame/video/chaknpop.c40
-rw-r--r--src/mame/video/champbas.c27
-rw-r--r--src/mame/video/changela.c41
-rw-r--r--src/mame/video/cheekyms.c12
-rw-r--r--src/mame/video/cinemat.c37
-rw-r--r--src/mame/video/circus.c17
-rw-r--r--src/mame/video/circusc.c18
-rw-r--r--src/mame/video/cischeat.c238
-rw-r--r--src/mame/video/citycon.c23
-rw-r--r--src/mame/video/cloak.c69
-rw-r--r--src/mame/video/cloud9.c45
-rw-r--r--src/mame/video/clshroad.c20
-rw-r--r--src/mame/video/combatsc.c41
-rw-r--r--src/mame/video/commando.c53
-rw-r--r--src/mame/video/compgolf.c14
-rw-r--r--src/mame/video/contra.c72
-rw-r--r--src/mame/video/cop01.c25
-rw-r--r--src/mame/video/cosmic.c10
-rw-r--r--src/mame/video/cps1.c155
-rw-r--r--src/mame/video/crbaloon.c14
-rw-r--r--src/mame/video/crgolf.c18
-rw-r--r--src/mame/video/crospang.c63
-rw-r--r--src/mame/video/crshrace.c30
-rw-r--r--src/mame/video/cvs.c26
-rw-r--r--src/mame/video/darius.c7
-rw-r--r--src/mame/video/darkseal.c14
-rw-r--r--src/mame/video/dbz.c14
-rw-r--r--src/mame/video/dcheese.c40
-rw-r--r--src/mame/video/dcon.c63
-rw-r--r--src/mame/video/dday.c66
-rw-r--r--src/mame/video/ddragon.c14
-rw-r--r--src/mame/video/ddragon3.c48
-rw-r--r--src/mame/video/ddribble.c40
-rw-r--r--src/mame/video/deadang.c25
-rw-r--r--src/mame/video/dec0.c24
-rw-r--r--src/mame/video/dec8.c83
-rw-r--r--src/mame/video/deco32.c67
-rw-r--r--src/mame/video/deniam.c41
-rw-r--r--src/mame/video/djboy.c26
-rw-r--r--src/mame/video/dkong.c60
-rw-r--r--src/mame/video/docastle.c42
-rw-r--r--src/mame/video/dogfgt.c67
-rw-r--r--src/mame/video/dooyong.c98
-rw-r--r--src/mame/video/drgnmst.c21
-rw-r--r--src/mame/video/dribling.c5
-rw-r--r--src/mame/video/drmicro.c9
-rw-r--r--src/mame/video/dynax.c253
-rw-r--r--src/mame/video/dynduke.c62
-rw-r--r--src/mame/video/eolith.c10
-rw-r--r--src/mame/video/epos.c11
-rw-r--r--src/mame/video/equites.c78
-rw-r--r--src/mame/video/esd16.c27
-rw-r--r--src/mame/video/espial.c35
-rw-r--r--src/mame/video/esripsys.c5
-rw-r--r--src/mame/video/exedexes.c36
-rw-r--r--src/mame/video/exerion.c28
-rw-r--r--src/mame/video/exidy.c7
-rw-r--r--src/mame/video/exidy440.c80
-rw-r--r--src/mame/video/exprraid.c41
-rw-r--r--src/mame/video/exzisus.c40
-rw-r--r--src/mame/video/f1gp.c60
-rw-r--r--src/mame/video/fastlane.c14
-rw-r--r--src/mame/video/fcombat.c11
-rw-r--r--src/mame/video/fgoal.c15
-rw-r--r--src/mame/video/finalizr.c7
-rw-r--r--src/mame/video/firetrap.c49
-rw-r--r--src/mame/video/fitfight.c21
-rw-r--r--src/mame/video/flkatck.c24
-rw-r--r--src/mame/video/flower.c27
-rw-r--r--src/mame/video/flstory.c69
-rw-r--r--src/mame/video/freekick.c7
-rw-r--r--src/mame/video/fromanc2.c253
-rw-r--r--src/mame/video/fromance.c84
-rw-r--r--src/mame/video/funkybee.c32
-rw-r--r--src/mame/video/funworld.c14
-rw-r--r--src/mame/video/funybubl.c11
-rw-r--r--src/mame/video/fuukifg2.c8
-rw-r--r--src/mame/video/fuukifg3.c8
-rw-r--r--src/mame/video/gaelco.c7
-rw-r--r--src/mame/video/gaelco2.c24
-rw-r--r--src/mame/video/gaelco3d.c41
-rw-r--r--src/mame/video/gaiden.c103
-rw-r--r--src/mame/video/galaga.c14
-rw-r--r--src/mame/video/galaxian.c114
-rw-r--r--src/mame/video/galaxold.c142
-rw-r--r--src/mame/video/galivan.c59
-rw-r--r--src/mame/video/gaplus.c17
-rw-r--r--src/mame/video/gatron.c7
-rw-r--r--src/mame/video/gberet.c33
-rw-r--r--src/mame/video/gcpinbal.c20
-rw-r--r--src/mame/video/ginganin.c41
-rw-r--r--src/mame/video/gladiatr.c94
-rw-r--r--src/mame/video/glass.c38
-rw-r--r--src/mame/video/gng.c32
-rw-r--r--src/mame/video/goal92.c33
-rw-r--r--src/mame/video/goindol.c14
-rw-r--r--src/mame/video/goldstar.c98
-rw-r--r--src/mame/video/gomoku.c29
-rw-r--r--src/mame/video/gotcha.c41
-rw-r--r--src/mame/video/gottlieb.c71
-rw-r--r--src/mame/video/gotya.c25
-rw-r--r--src/mame/video/gradius3.c15
-rw-r--r--src/mame/video/grchamp.c21
-rw-r--r--src/mame/video/gridlee.c21
-rw-r--r--src/mame/video/gstriker.c56
-rw-r--r--src/mame/video/gsword.c36
-rw-r--r--src/mame/video/gumbo.c14
-rw-r--r--src/mame/video/gundealr.c50
-rw-r--r--src/mame/video/gunsmoke.c36
-rw-r--r--src/mame/video/gyruss.c11
-rw-r--r--src/mame/video/hanaawas.c16
-rw-r--r--src/mame/video/hcastle.c46
-rw-r--r--src/mame/video/hexion.c81
-rw-r--r--src/mame/video/higemaru.c27
-rw-r--r--src/mame/video/himesiki.c19
-rw-r--r--src/mame/video/hnayayoi.c68
-rw-r--r--src/mame/video/hng64.c7
-rw-r--r--src/mame/video/holeland.c36
-rw-r--r--src/mame/video/homedata.c93
-rw-r--r--src/mame/video/homerun.c11
-rw-r--r--src/mame/video/hyhoo.c44
-rw-r--r--src/mame/video/hyperspt.c22
-rw-r--r--src/mame/video/hyprduel.c57
-rw-r--r--src/mame/video/ikki.c5
-rw-r--r--src/mame/video/inufuku.c48
-rw-r--r--src/mame/video/iqblock.c24
-rw-r--r--src/mame/video/irobot.c4
-rw-r--r--src/mame/video/ironhors.c46
-rw-r--r--src/mame/video/itech32.c573
-rw-r--r--src/mame/video/itech8.c63
-rw-r--r--src/mame/video/jack.c27
-rw-r--r--src/mame/video/jailbrek.c14
-rw-r--r--src/mame/video/jedi.c10
-rw-r--r--src/mame/video/jpmimpct.c21
-rw-r--r--src/mame/video/kaneko16.c65
-rw-r--r--src/mame/video/kangaroo.c14
-rw-r--r--src/mame/video/karnov.c12
-rw-r--r--src/mame/video/kchamp.c18
-rw-r--r--src/mame/video/kickgoal.c21
-rw-r--r--src/mame/video/kingobox.c45
-rw-r--r--src/mame/video/kncljoe.c45
-rw-r--r--src/mame/video/konamigx.c42
-rw-r--r--src/mame/video/kopunch.c35
-rw-r--r--src/mame/video/ksayakyu.c26
-rw-r--r--src/mame/video/kyugo.c62
-rw-r--r--src/mame/video/labyrunr.c14
-rw-r--r--src/mame/video/ladybug.c37
-rw-r--r--src/mame/video/ladyfrog.c62
-rw-r--r--src/mame/video/lasso.c47
-rw-r--r--src/mame/video/lastduel.c69
-rw-r--r--src/mame/video/legionna.c28
-rw-r--r--src/mame/video/leland.c55
-rw-r--r--src/mame/video/lemmings.c33
-rw-r--r--src/mame/video/lethal.c21
-rw-r--r--src/mame/video/lethalj.c54
-rw-r--r--src/mame/video/liberate.c83
-rw-r--r--src/mame/video/lkage.c11
-rw-r--r--src/mame/video/lockon.c74
-rw-r--r--src/mame/video/lordgun.c15
-rw-r--r--src/mame/video/lucky74.c28
-rw-r--r--src/mame/video/lvcards.c14
-rw-r--r--src/mame/video/lwings.c42
-rw-r--r--src/mame/video/m10.c27
-rw-r--r--src/mame/video/m107.c39
-rw-r--r--src/mame/video/m52.c69
-rw-r--r--src/mame/video/m57.c18
-rw-r--r--src/mame/video/m58.c20
-rw-r--r--src/mame/video/m62.c109
-rw-r--r--src/mame/video/m72.c113
-rw-r--r--src/mame/video/m90.c18
-rw-r--r--src/mame/video/m92.c87
-rw-r--r--src/mame/video/macrossp.c28
-rw-r--r--src/mame/video/madalien.c14
-rw-r--r--src/mame/video/mainsnk.c31
-rw-r--r--src/mame/video/malzak.c11
-rw-r--r--src/mame/video/mappy.c27
-rw-r--r--src/mame/video/marineb.c55
-rw-r--r--src/mame/video/mario.c45
-rw-r--r--src/mame/video/markham.c15
-rw-r--r--src/mame/video/matmania.c13
-rw-r--r--src/mame/video/mcatadv.c14
-rw-r--r--src/mame/video/mcr.c38
-rw-r--r--src/mame/video/mcr3.c39
-rw-r--r--src/mame/video/mcr68.c41
-rw-r--r--src/mame/video/meadows.c14
-rw-r--r--src/mame/video/megasys1.c142
-rw-r--r--src/mame/video/megazone.c5
-rw-r--r--src/mame/video/mermaid.c66
-rw-r--r--src/mame/video/metlclsh.c40
-rw-r--r--src/mame/video/metro.c18
-rw-r--r--src/mame/video/mexico86.c7
-rw-r--r--src/mame/video/micro3d.c91
-rw-r--r--src/mame/video/midtunit.c48
-rw-r--r--src/mame/video/midvunit.c104
-rw-r--r--src/mame/video/midyunit.c99
-rw-r--r--src/mame/video/midzeus.c24
-rw-r--r--src/mame/video/mikie.c31
-rw-r--r--src/mame/video/mitchell.c131
-rw-r--r--src/mame/video/mjkjidai.c26
-rw-r--r--src/mame/video/model1.c14
-rw-r--r--src/mame/video/model3.c82
-rw-r--r--src/mame/video/momoko.c54
-rw-r--r--src/mame/video/mosaic.c14
-rw-r--r--src/mame/video/mouser.c8
-rw-r--r--src/mame/video/mrdo.c35
-rw-r--r--src/mame/video/mrflea.c19
-rw-r--r--src/mame/video/mrjong.c22
-rw-r--r--src/mame/video/ms32.c30
-rw-r--r--src/mame/video/msisaac.c62
-rw-r--r--src/mame/video/mugsmash.c27
-rw-r--r--src/mame/video/munchmo.c10
-rw-r--r--src/mame/video/mustache.c33
-rw-r--r--src/mame/video/mystston.c9
-rw-r--r--src/mame/video/mystwarr.c54
-rw-r--r--src/mame/video/n8080.c9
-rw-r--r--src/mame/video/namcofl.c5
-rw-r--r--src/mame/video/namcona1.c62
-rw-r--r--src/mame/video/namcos21.c30
-rw-r--r--src/mame/video/namcos22.c151
-rw-r--r--src/mame/video/namcos86.c68
-rw-r--r--src/mame/video/naughtyb.c26
-rw-r--r--src/mame/video/nbmj8688.c140
-rw-r--r--src/mame/video/nbmj8891.c238
-rw-r--r--src/mame/video/nbmj8900.c117
-rw-r--r--src/mame/video/nbmj8991.c98
-rw-r--r--src/mame/video/nbmj9195.c48
-rw-r--r--src/mame/video/nemesis.c110
-rw-r--r--src/mame/video/neogeo.c39
-rw-r--r--src/mame/video/news.c23
-rw-r--r--src/mame/video/ninjakd2.c96
-rw-r--r--src/mame/video/nitedrvr.c14
-rw-r--r--src/mame/video/niyanpai.c54
-rw-r--r--src/mame/video/nmk16.c138
-rw-r--r--src/mame/video/nova2001.c61
-rw-r--r--src/mame/video/nycaptor.c70
-rw-r--r--src/mame/video/ohmygod.c26
-rw-r--r--src/mame/video/ojankohs.c106
-rw-r--r--src/mame/video/oneshot.c21
-rw-r--r--src/mame/video/opwolf.c5
-rw-r--r--src/mame/video/orbit.c7
-rw-r--r--src/mame/video/othldrby.c41
-rw-r--r--src/mame/video/pacland.c37
-rw-r--r--src/mame/video/pacman.c107
-rw-r--r--src/mame/video/pandoras.c26
-rw-r--r--src/mame/video/paradise.c67
-rw-r--r--src/mame/video/pass.c14
-rw-r--r--src/mame/video/pastelg.c64
-rw-r--r--src/mame/video/pbaction.c45
-rw-r--r--src/mame/video/pgm.c14
-rw-r--r--src/mame/video/phoenix.c99
-rw-r--r--src/mame/video/pingpong.c14
-rw-r--r--src/mame/video/pirates.c21
-rw-r--r--src/mame/video/pitnrun.c52
-rw-r--r--src/mame/video/playch10.c9
-rw-r--r--src/mame/video/playmark.c129
-rw-r--r--src/mame/video/plygonet.c28
-rw-r--r--src/mame/video/pokechmp.c15
-rw-r--r--src/mame/video/polepos.c109
-rw-r--r--src/mame/video/policetr.c86
-rw-r--r--src/mame/video/polyplay.c9
-rw-r--r--src/mame/video/pooyan.c18
-rw-r--r--src/mame/video/popeye.c33
-rw-r--r--src/mame/video/popper.c63
-rw-r--r--src/mame/video/portrait.c14
-rw-r--r--src/mame/video/powerins.c34
-rw-r--r--src/mame/video/prehisle.c46
-rw-r--r--src/mame/video/psikyo.c42
-rw-r--r--src/mame/video/psychic5.c87
-rw-r--r--src/mame/video/punchout.c39
-rw-r--r--src/mame/video/pushman.c12
-rw-r--r--src/mame/video/qix.c110
-rw-r--r--src/mame/video/quizdna.c58
-rw-r--r--src/mame/video/quizpani.c29
-rw-r--r--src/mame/video/raiden.c35
-rw-r--r--src/mame/video/rainbow.c10
-rw-r--r--src/mame/video/rallyx.c24
-rw-r--r--src/mame/video/rastan.c13
-rw-r--r--src/mame/video/realbrk.c46
-rw-r--r--src/mame/video/redalert.c7
-rw-r--r--src/mame/video/renegade.c28
-rw-r--r--src/mame/video/retofinv.c31
-rw-r--r--src/mame/video/rltennis.c53
-rw-r--r--src/mame/video/rockrage.c9
-rw-r--r--src/mame/video/rocnrope.c22
-rw-r--r--src/mame/video/rohga.c5
-rw-r--r--src/mame/video/rollrace.c39
-rw-r--r--src/mame/video/route16.c14
-rw-r--r--src/mame/video/rpunch.c56
-rw-r--r--src/mame/video/runaway.c20
-rw-r--r--src/mame/video/rungun.c17
-rw-r--r--src/mame/video/sauro.c47
-rw-r--r--src/mame/video/sbasketb.c22
-rw-r--r--src/mame/video/sbugger.c14
-rw-r--r--src/mame/video/scotrsht.c36
-rw-r--r--src/mame/video/sderby.c38
-rw-r--r--src/mame/video/segag80r.c154
-rw-r--r--src/mame/video/segas32.c139
-rw-r--r--src/mame/video/seibuspi.c169
-rw-r--r--src/mame/video/seicross.c18
-rw-r--r--src/mame/video/senjyo.c40
-rw-r--r--src/mame/video/seta.c50
-rw-r--r--src/mame/video/seta2.c25
-rw-r--r--src/mame/video/sf.c34
-rw-r--r--src/mame/video/shadfrce.c41
-rw-r--r--src/mame/video/shangha3.c32
-rw-r--r--src/mame/video/shangkid.c7
-rw-r--r--src/mame/video/shaolins.c39
-rw-r--r--src/mame/video/shisen.c27
-rw-r--r--src/mame/video/shootout.c14
-rw-r--r--src/mame/video/sidearms.c78
-rw-r--r--src/mame/video/sidepckt.c18
-rw-r--r--src/mame/video/silkroad.c21
-rw-r--r--src/mame/video/simpsons.c30
-rw-r--r--src/mame/video/skydiver.c66
-rw-r--r--src/mame/video/skyfox.c14
-rw-r--r--src/mame/video/skykid.c41
-rw-r--r--src/mame/video/slapfght.c40
-rw-r--r--src/mame/video/snk.c273
-rw-r--r--src/mame/video/snk6502.c83
-rw-r--r--src/mame/video/snk68.c68
-rw-r--r--src/mame/video/snookr10.c14
-rw-r--r--src/mame/video/solomon.c36
-rw-r--r--src/mame/video/sonson.c23
-rw-r--r--src/mame/video/spacefb.c14
-rw-r--r--src/mame/video/spcforce.c4
-rw-r--r--src/mame/video/spdodgeb.c31
-rw-r--r--src/mame/video/speedatk.c21
-rw-r--r--src/mame/video/speedbal.c14
-rw-r--r--src/mame/video/speedspn.c33
-rw-r--r--src/mame/video/splash.c7
-rw-r--r--src/mame/video/sprcros2.c28
-rw-r--r--src/mame/video/sprint2.c27
-rw-r--r--src/mame/video/sprint4.c7
-rw-r--r--src/mame/video/sprint8.c9
-rw-r--r--src/mame/video/srumbler.c31
-rw-r--r--src/mame/video/sshangha.c5
-rw-r--r--src/mame/video/sslam.c37
-rw-r--r--src/mame/video/ssozumo.c50
-rw-r--r--src/mame/video/sspeedr.c60
-rw-r--r--src/mame/video/ssrj.c21
-rw-r--r--src/mame/video/ssv.c27
-rw-r--r--src/mame/video/st0016.c42
-rw-r--r--src/mame/video/stactics.c24
-rw-r--r--src/mame/video/stadhero.c7
-rw-r--r--src/mame/video/starcrus.c121
-rw-r--r--src/mame/video/starfire.c74
-rw-r--r--src/mame/video/starshp1.c38
-rw-r--r--src/mame/video/stfight.c48
-rw-r--r--src/mame/video/stlforce.c28
-rw-r--r--src/mame/video/strnskil.c18
-rw-r--r--src/mame/video/subs.c20
-rw-r--r--src/mame/video/suna16.c31
-rw-r--r--src/mame/video/suna8.c23
-rw-r--r--src/mame/video/superqix.c57
-rw-r--r--src/mame/video/suprloco.c34
-rw-r--r--src/mame/video/suprnova.c133
-rw-r--r--src/mame/video/suprridr.c45
-rw-r--r--src/mame/video/suprslam.c33
-rw-r--r--src/mame/video/system1.c82
-rw-r--r--src/mame/video/system16.c108
-rw-r--r--src/mame/video/tagteam.c45
-rw-r--r--src/mame/video/tail2nos.c40
-rw-r--r--src/mame/video/taito_b.c34
-rw-r--r--src/mame/video/taito_f2.c35
-rw-r--r--src/mame/video/taito_f3.c163
-rw-r--r--src/mame/video/taito_l.c47
-rw-r--r--src/mame/video/taito_z.c17
-rw-r--r--src/mame/video/taitoair.c74
-rw-r--r--src/mame/video/taitojc.c24
-rw-r--r--src/mame/video/taitosj.c39
-rw-r--r--src/mame/video/tank8.c7
-rw-r--r--src/mame/video/tankbatt.c7
-rw-r--r--src/mame/video/tankbust.c62
-rw-r--r--src/mame/video/taotaido.c23
-rw-r--r--src/mame/video/targeth.c7
-rw-r--r--src/mame/video/tatsumi.c99
-rw-r--r--src/mame/video/tbowl.c61
-rw-r--r--src/mame/video/tceptor.c54
-rw-r--r--src/mame/video/tecmo.c43
-rw-r--r--src/mame/video/tecmo16.c84
-rw-r--r--src/mame/video/tecmosys.c52
-rw-r--r--src/mame/video/tehkanwc.c49
-rw-r--r--src/mame/video/terracre.c36
-rw-r--r--src/mame/video/tetrisp2.c81
-rw-r--r--src/mame/video/thedeep.c14
-rw-r--r--src/mame/video/thepit.c60
-rw-r--r--src/mame/video/thief.c86
-rw-r--r--src/mame/video/thoop2.c7
-rw-r--r--src/mame/video/tiamc1.c79
-rw-r--r--src/mame/video/tigeroad.c37
-rw-r--r--src/mame/video/timelimt.c33
-rw-r--r--src/mame/video/timeplt.c22
-rw-r--r--src/mame/video/tmnt.c159
-rw-r--r--src/mame/video/toaplan1.c293
-rw-r--r--src/mame/video/toaplan2.c80
-rw-r--r--src/mame/video/toki.c28
-rw-r--r--src/mame/video/toypop.c35
-rw-r--r--src/mame/video/tp84.c11
-rw-r--r--src/mame/video/trackfld.c63
-rw-r--r--src/mame/video/travrusa.c31
-rw-r--r--src/mame/video/trucocl.c14
-rw-r--r--src/mame/video/tryout.c58
-rw-r--r--src/mame/video/tsamurai.c65
-rw-r--r--src/mame/video/tubep.c76
-rw-r--r--src/mame/video/tumbleb.c105
-rw-r--r--src/mame/video/tunhunt.c7
-rw-r--r--src/mame/video/turbo.c14
-rw-r--r--src/mame/video/tutankhm.c10
-rw-r--r--src/mame/video/twin16.c47
-rw-r--r--src/mame/video/twincobr.c120
-rw-r--r--src/mame/video/tx1.c48
-rw-r--r--src/mame/video/ultraman.c31
-rw-r--r--src/mame/video/ultratnk.c7
-rw-r--r--src/mame/video/unico.c32
-rw-r--r--src/mame/video/usgames.c14
-rw-r--r--src/mame/video/vaportra.c19
-rw-r--r--src/mame/video/vastar.c31
-rw-r--r--src/mame/video/vball.c19
-rw-r--r--src/mame/video/vectrex.c29
-rw-r--r--src/mame/video/vicdual.c7
-rw-r--r--src/mame/video/victory.c103
-rw-r--r--src/mame/video/videopin.c14
-rw-r--r--src/mame/video/vigilant.c34
-rw-r--r--src/mame/video/volfied.c29
-rw-r--r--src/mame/video/vulgus.c31
-rw-r--r--src/mame/video/warpwarp.c14
-rw-r--r--src/mame/video/wc90.c21
-rw-r--r--src/mame/video/wc90b.c21
-rw-r--r--src/mame/video/wecleman.c81
-rw-r--r--src/mame/video/welltris.c59
-rw-r--r--src/mame/video/wgp.c46
-rw-r--r--src/mame/video/williams.c98
-rw-r--r--src/mame/video/wiping.c5
-rw-r--r--src/mame/video/wiz.c27
-rw-r--r--src/mame/video/wolfpack.c60
-rw-r--r--src/mame/video/wwfsstar.c14
-rw-r--r--src/mame/video/wwfwfest.c25
-rw-r--r--src/mame/video/xain.c53
-rw-r--r--src/mame/video/xorworld.c7
-rw-r--r--src/mame/video/xxmissio.c24
-rw-r--r--src/mame/video/xyonix.c7
-rw-r--r--src/mame/video/yiear.c24
-rw-r--r--src/mame/video/yunsun16.c14
-rw-r--r--src/mame/video/yunsung8.c41
-rw-r--r--src/mame/video/zac2650.c30
-rw-r--r--src/mame/video/zaccaria.c26
-rw-r--r--src/mame/video/zaxxon.c82
1664 files changed, 23997 insertions, 26748 deletions
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c
index be8025b4ae2..1059cef65a5 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -398,9 +398,10 @@ READ8_HANDLER( ssio_input_port_r )
WRITE8_HANDLER( ssio_output_port_w )
{
+ mcr_state *state = space->machine().driver_data<mcr_state>();
int which = offset >> 2;
if (which == 0)
- mcr_control_port_w(space, offset, data);
+ state->mcr_control_port_w(*space, offset, data);
if (ssio_custom_output[which])
(*ssio_custom_output[which])(space, offset, data & ssio_custom_output_mask[which]);
}
diff --git a/src/mame/audio/snk6502.c b/src/mame/audio/snk6502.c
index ebefd7d1eae..365477c80c8 100644
--- a/src/mame/audio/snk6502.c
+++ b/src/mame/audio/snk6502.c
@@ -1038,8 +1038,8 @@ WRITE8_HANDLER( fantasy_sound_w )
/* select tune in ROM based on sound command byte */
tone_channels[2].base = 0x1000 + ((data & 0x70) << 4);
tone_channels[2].mask = 0xff;
-
- snk6502_flipscreen_w(space, 0, data);
+ snk6502_state *state = space->machine().driver_data<snk6502_state>();
+ state->snk6502_flipscreen_w(*space, 0, data);
break;
}
}
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c
index a4eaf319b3a..86767c51700 100644
--- a/src/mame/drivers/1942.c
+++ b/src/mame/drivers/1942.c
@@ -95,13 +95,13 @@ static ADDRESS_MAP_START( c1942_map, AS_PROGRAM, 8, _1942_state )
AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSWA")
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSWB")
AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w)
- AM_RANGE(0xc802, 0xc803) AM_WRITE_LEGACY(c1942_scroll_w)
- AM_RANGE(0xc804, 0xc804) AM_WRITE_LEGACY(c1942_c804_w)
- AM_RANGE(0xc805, 0xc805) AM_WRITE_LEGACY(c1942_palette_bank_w)
+ AM_RANGE(0xc802, 0xc803) AM_WRITE(c1942_scroll_w)
+ AM_RANGE(0xc804, 0xc804) AM_WRITE(c1942_c804_w)
+ AM_RANGE(0xc805, 0xc805) AM_WRITE(c1942_palette_bank_w)
AM_RANGE(0xc806, 0xc806) AM_WRITE(c1942_bankswitch_w)
AM_RANGE(0xcc00, 0xcc7f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(c1942_fgvideoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE_LEGACY(c1942_bgvideoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(c1942_fgvideoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(c1942_bgvideoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c
index 3d5fe94f2c5..af7f52c12ba 100644
--- a/src/mame/drivers/1943.c
+++ b/src/mame/drivers/1943.c
@@ -60,15 +60,15 @@ static ADDRESS_MAP_START( c1943_map, AS_PROGRAM, 8, _1943_state )
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSWB")
AM_RANGE(0xc007, 0xc007) AM_READ(c1943_protection_r)
AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w)
- AM_RANGE(0xc804, 0xc804) AM_WRITE_LEGACY(c1943_c804_w) // ROM bank switch, screen flip
+ AM_RANGE(0xc804, 0xc804) AM_WRITE(c1943_c804_w) // ROM bank switch, screen flip
AM_RANGE(0xc806, 0xc806) AM_WRITE(watchdog_reset_w)
AM_RANGE(0xc807, 0xc807) AM_WRITENOP // ???
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(c1943_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE_LEGACY(c1943_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(c1943_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(c1943_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xd800, 0xd801) AM_RAM AM_BASE(m_scrollx)
AM_RANGE(0xd802, 0xd802) AM_RAM AM_BASE(m_scrolly)
AM_RANGE(0xd803, 0xd804) AM_RAM AM_BASE(m_bgscrollx)
- AM_RANGE(0xd806, 0xd806) AM_WRITE_LEGACY(c1943_d806_w) // sprites, bg1, bg2 enable
+ AM_RANGE(0xd806, 0xd806) AM_WRITE(c1943_d806_w) // sprites, bg1, bg2 enable
AM_RANGE(0xd808, 0xd808) AM_WRITENOP // ???
AM_RANGE(0xd868, 0xd868) AM_WRITENOP // ???
AM_RANGE(0xd888, 0xd888) AM_WRITENOP // ???
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index 607626d6b3e..ef03577b736 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -194,14 +194,14 @@ static ADDRESS_MAP_START( drill_map, AS_PROGRAM, 16, _2mindril_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x300000, 0x3000ff) AM_RAM
- AM_RANGE(0x400000, 0x40ffff) AM_READWRITE_LEGACY(f3_spriteram_r,f3_spriteram_w)
- AM_RANGE(0x410000, 0x41bfff) AM_READWRITE_LEGACY(f3_pf_data_r,f3_pf_data_w)
- AM_RANGE(0x41c000, 0x41dfff) AM_READWRITE_LEGACY(f3_videoram_r,f3_videoram_w)
- AM_RANGE(0x41e000, 0x41ffff) AM_READWRITE_LEGACY(f3_vram_r,f3_vram_w)
- AM_RANGE(0x420000, 0x42ffff) AM_READWRITE_LEGACY(f3_lineram_r,f3_lineram_w)
- AM_RANGE(0x430000, 0x43ffff) AM_READWRITE_LEGACY(f3_pivot_r,f3_pivot_w)
- AM_RANGE(0x460000, 0x46000f) AM_WRITE_LEGACY(f3_control_0_w)
- AM_RANGE(0x460010, 0x46001f) AM_WRITE_LEGACY(f3_control_1_w)
+ AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(f3_spriteram_r,f3_spriteram_w)
+ AM_RANGE(0x410000, 0x41bfff) AM_READWRITE(f3_pf_data_r,f3_pf_data_w)
+ AM_RANGE(0x41c000, 0x41dfff) AM_READWRITE(f3_videoram_r,f3_videoram_w)
+ AM_RANGE(0x41e000, 0x41ffff) AM_READWRITE(f3_vram_r,f3_vram_w)
+ AM_RANGE(0x420000, 0x42ffff) AM_READWRITE(f3_lineram_r,f3_lineram_w)
+ AM_RANGE(0x430000, 0x43ffff) AM_READWRITE(f3_pivot_r,f3_pivot_w)
+ AM_RANGE(0x460000, 0x46000f) AM_WRITE(f3_control_0_w)
+ AM_RANGE(0x460010, 0x46001f) AM_WRITE(f3_control_1_w)
AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x502022, 0x502023) AM_WRITENOP //countinously switches between 0 and 2
AM_RANGE(0x600000, 0x600007) AM_DEVREADWRITE8_LEGACY("ymsnd", ym2610_r, ym2610_w, 0x00ff)
diff --git a/src/mame/drivers/3do.c b/src/mame/drivers/3do.c
index 53b3b57b4ad..11f43ce6fd5 100644
--- a/src/mame/drivers/3do.c
+++ b/src/mame/drivers/3do.c
@@ -108,11 +108,11 @@ static ADDRESS_MAP_START( 3do_mem, AS_PROGRAM, 32, _3do_state )
AM_RANGE(0x00200000, 0x003FFFFF) AM_RAM AM_BASE(m_vram) /* VRAM */
AM_RANGE(0x03000000, 0x030FFFFF) AM_ROMBANK("bank2") /* BIOS */
AM_RANGE(0x03100000, 0x0313FFFF) AM_RAM /* Brooktree? */
- AM_RANGE(0x03140000, 0x0315FFFF) AM_READWRITE_LEGACY(_3do_nvarea_r, _3do_nvarea_w) /* NVRAM */
- AM_RANGE(0x03180000, 0x031BFFFF) AM_READWRITE_LEGACY(_3do_slow2_r, _3do_slow2_w) /* Slow bus - additional expansion */
- AM_RANGE(0x03200000, 0x0320FFFF) AM_READWRITE_LEGACY(_3do_svf_r, _3do_svf_w) /* special vram access1 */
- AM_RANGE(0x03300000, 0x033FFFFF) AM_READWRITE_LEGACY(_3do_madam_r, _3do_madam_w) /* address decoder */
- AM_RANGE(0x03400000, 0x034FFFFF) AM_READWRITE_LEGACY(_3do_clio_r, _3do_clio_w) /* io controller */
+ AM_RANGE(0x03140000, 0x0315FFFF) AM_READWRITE(_3do_nvarea_r, _3do_nvarea_w) /* NVRAM */
+ AM_RANGE(0x03180000, 0x031BFFFF) AM_READWRITE(_3do_slow2_r, _3do_slow2_w) /* Slow bus - additional expansion */
+ AM_RANGE(0x03200000, 0x0320FFFF) AM_READWRITE(_3do_svf_r, _3do_svf_w) /* special vram access1 */
+ AM_RANGE(0x03300000, 0x033FFFFF) AM_READWRITE(_3do_madam_r, _3do_madam_w) /* address decoder */
+ AM_RANGE(0x03400000, 0x034FFFFF) AM_READWRITE(_3do_clio_r, _3do_clio_w) /* io controller */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index 1a5a72ce51c..1c4cf391c82 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -634,15 +634,15 @@ static ADDRESS_MAP_START( 40love_map, AS_PROGRAM, 8, fortyl_state )
AM_RANGE(0x8809, 0x8809) AM_READ_PORT("P1")
AM_RANGE(0x880a, 0x880a) AM_READ_PORT("SYSTEM")
AM_RANGE(0x880b, 0x880b) AM_READ_PORT("P2")
- AM_RANGE(0x880c, 0x880c) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(fortyl_pixram_sel_w) /* pixram bank select */
+ AM_RANGE(0x880c, 0x880c) AM_READ_PORT("DSW1") AM_WRITE(fortyl_pixram_sel_w) /* pixram bank select */
AM_RANGE(0x880d, 0x880d) AM_READ_PORT("DSW2") AM_WRITENOP /* unknown */
- AM_RANGE(0x9000, 0x97ff) AM_READWRITE_LEGACY(fortyl_bg_videoram_r, fortyl_bg_videoram_w) AM_BASE(m_videoram) /* #1 M5517P on video board */
+ AM_RANGE(0x9000, 0x97ff) AM_READWRITE(fortyl_bg_videoram_r, fortyl_bg_videoram_w) AM_BASE(m_videoram) /* #1 M5517P on video board */
AM_RANGE(0x9800, 0x983f) AM_RAM AM_BASE(m_video_ctrl) /* video control area */
AM_RANGE(0x9840, 0x987f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* sprites part 1 */
- AM_RANGE(0x9880, 0x98bf) AM_READWRITE_LEGACY(fortyl_bg_colorram_r, fortyl_bg_colorram_w) AM_BASE(m_colorram) /* background attributes (2 bytes per line) */
+ AM_RANGE(0x9880, 0x98bf) AM_READWRITE(fortyl_bg_colorram_r, fortyl_bg_colorram_w) AM_BASE(m_colorram) /* background attributes (2 bytes per line) */
AM_RANGE(0x98c0, 0x98ff) AM_RAM AM_BASE_SIZE(m_spriteram2, m_spriteram2_size)/* sprites part 2 */
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xffff) AM_READWRITE_LEGACY(fortyl_pixram_r, fortyl_pixram_w) /* banked pixel layer */
+ AM_RANGE(0xc000, 0xffff) AM_READWRITE(fortyl_pixram_r, fortyl_pixram_w) /* banked pixel layer */
ADDRESS_MAP_END
static ADDRESS_MAP_START( undoukai_map, AS_PROGRAM, 8, fortyl_state )
@@ -660,14 +660,14 @@ static ADDRESS_MAP_START( undoukai_map, AS_PROGRAM, 8, fortyl_state )
AM_RANGE(0xa809, 0xa809) AM_READ_PORT("P1")
AM_RANGE(0xa80a, 0xa80a) AM_READ_PORT("SYSTEM")
AM_RANGE(0xa80b, 0xa80b) AM_READ_PORT("P2")
- AM_RANGE(0xa80c, 0xa80c) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(fortyl_pixram_sel_w) /* pixram bank select */
+ AM_RANGE(0xa80c, 0xa80c) AM_READ_PORT("DSW1") AM_WRITE(fortyl_pixram_sel_w) /* pixram bank select */
AM_RANGE(0xa80d, 0xa80d) AM_READ_PORT("DSW2") AM_WRITENOP /* unknown */
- AM_RANGE(0xb000, 0xb7ff) AM_READWRITE_LEGACY(fortyl_bg_videoram_r, fortyl_bg_videoram_w) AM_BASE(m_videoram) /* #1 M5517P on video board */
+ AM_RANGE(0xb000, 0xb7ff) AM_READWRITE(fortyl_bg_videoram_r, fortyl_bg_videoram_w) AM_BASE(m_videoram) /* #1 M5517P on video board */
AM_RANGE(0xb800, 0xb83f) AM_RAM AM_BASE(m_video_ctrl) /* video control area */
AM_RANGE(0xb840, 0xb87f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* sprites part 1 */
- AM_RANGE(0xb880, 0xb8bf) AM_READWRITE_LEGACY(fortyl_bg_colorram_r, fortyl_bg_colorram_w) AM_BASE(m_colorram) /* background attributes (2 bytes per line) */
+ AM_RANGE(0xb880, 0xb8bf) AM_READWRITE(fortyl_bg_colorram_r, fortyl_bg_colorram_w) AM_BASE(m_colorram) /* background attributes (2 bytes per line) */
AM_RANGE(0xb8e0, 0xb8ff) AM_RAM AM_BASE_SIZE(m_spriteram2, m_spriteram2_size) /* sprites part 2 */
- AM_RANGE(0xc000, 0xffff) AM_READWRITE_LEGACY(fortyl_pixram_r, fortyl_pixram_w)
+ AM_RANGE(0xc000, 0xffff) AM_READWRITE(fortyl_pixram_r, fortyl_pixram_w)
ADDRESS_MAP_END
static MACHINE_RESET( ta7630 )
diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c
index 19d8c7de8ac..96d34db6726 100644
--- a/src/mame/drivers/4enraya.c
+++ b/src/mame/drivers/4enraya.c
@@ -132,7 +132,7 @@ WRITE8_MEMBER(_4enraya_state::fenraya_custom_map_w)
if(prom_routing & 8) //gfx control / RAM wait
{
- fenraya_videoram_w(&space,offset & 0xfff,data);
+ fenraya_videoram_w(space,offset & 0xfff,data);
}
}
@@ -141,8 +141,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, _4enraya_state )
#if 0
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
- AM_RANGE(0xd000, 0xdfff) AM_WRITE_LEGACY(fenraya_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0xe000, 0xefff) AM_WRITE_LEGACY(fenraya_videoram_w)
+ AM_RANGE(0xd000, 0xdfff) AM_WRITE(fenraya_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xe000, 0xefff) AM_WRITE(fenraya_videoram_w)
AM_RANGE(0xf000, 0xffff) AM_NOP
#endif
ADDRESS_MAP_END
@@ -159,7 +159,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( unkpacg_main_map, AS_PROGRAM, 8, _4enraya_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x7000, 0x7fff) AM_WRITE_LEGACY(fenraya_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x7000, 0x7fff) AM_WRITE(fenraya_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x8000, 0x9fff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/4roses.c b/src/mame/drivers/4roses.c
index cf8480e4799..f2dee0dbd14 100644
--- a/src/mame/drivers/4roses.c
+++ b/src/mame/drivers/4roses.c
@@ -201,8 +201,8 @@ public:
static ADDRESS_MAP_START( 4roses_map, AS_PROGRAM, 8, _4roses_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM // AM_SHARE("nvram")
- AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE_LEGACY(funworld_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE_LEGACY(funworld_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE(funworld_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c
index 77a7b80bcf8..ce07673fefd 100644
--- a/src/mame/drivers/aeroboto.c
+++ b/src/mame/drivers/aeroboto.c
@@ -75,14 +75,14 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, aeroboto_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(m_mainram) // main RAM
AM_RANGE(0x0800, 0x08ff) AM_RAM // tile color buffer; copied to 0x2000
AM_RANGE(0x0900, 0x09ff) AM_WRITEONLY // a backup of default tile colors
- AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE_LEGACY(aeroboto_videoram_w) AM_BASE(m_videoram) // tile RAM
+ AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE(aeroboto_videoram_w) AM_BASE(m_videoram) // tile RAM
AM_RANGE(0x1800, 0x183f) AM_RAM AM_BASE(m_hscroll) // horizontal scroll regs
- AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE_LEGACY(aeroboto_tilecolor_w) AM_BASE(m_tilecolor) // tile color RAM
+ AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(aeroboto_tilecolor_w) AM_BASE(m_tilecolor) // tile color RAM
AM_RANGE(0x1840, 0x27ff) AM_WRITENOP // cleared during custom LSI test
AM_RANGE(0x2800, 0x28ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // sprite RAM
AM_RANGE(0x2900, 0x2fff) AM_WRITENOP // cleared along with sprite RAM
AM_RANGE(0x2973, 0x2973) AM_READ(aeroboto_2973_r) // protection read
- AM_RANGE(0x3000, 0x3000) AM_READWRITE_LEGACY(aeroboto_in0_r, aeroboto_3000_w)
+ AM_RANGE(0x3000, 0x3000) AM_READWRITE(aeroboto_in0_r, aeroboto_3000_w)
AM_RANGE(0x3001, 0x3001) AM_READ_PORT("DSW1") AM_WRITE(soundlatch_w)
AM_RANGE(0x3002, 0x3002) AM_READ_PORT("DSW2") AM_WRITE(soundlatch2_w)
AM_RANGE(0x3003, 0x3003) AM_WRITEONLY AM_BASE(m_vscroll)
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index ea76585aeb9..3d6feeddce3 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -139,13 +139,13 @@ static ADDRESS_MAP_START( pspikes_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */
AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE_SIZE(m_spriteram1, m_spriteram1_size)
- AM_RANGE(0xff8000, 0xff8fff) AM_RAM_WRITE_LEGACY(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0xff8000, 0xff8fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
AM_RANGE(0xffc000, 0xffc3ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_WRITE_LEGACY(pspikes_palette_bank_w)
- AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE_LEGACY(pspikes_gfxbank_w)
- AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE_LEGACY(aerofgt_bg1scrolly_w)
+ AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_WRITE(pspikes_palette_bank_w)
+ AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE(pspikes_gfxbank_w)
+ AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg1scrolly_w)
AM_RANGE(0xfff006, 0xfff007) AM_READWRITE(pending_command_r, sound_command_w)
ADDRESS_MAP_END
@@ -154,14 +154,14 @@ static ADDRESS_MAP_START( pspikesb_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */
AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE_SIZE(m_spriteram1, m_spriteram1_size)
AM_RANGE(0xc04000, 0xc04001) AM_WRITENOP
- AM_RANGE(0xff8000, 0xff8fff) AM_RAM_WRITE_LEGACY(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0xff8000, 0xff8fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
AM_RANGE(0xffc000, 0xffcbff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
- AM_RANGE(0xffd200, 0xffd201) AM_WRITE_LEGACY(pspikesb_gfxbank_w)
+ AM_RANGE(0xffd200, 0xffd201) AM_WRITE(pspikesb_gfxbank_w)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0")
AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1")
- AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE_LEGACY(aerofgt_bg1scrolly_w)
+ AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg1scrolly_w)
AM_RANGE(0xfff006, 0xfff007) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0xfff008, 0xfff009) AM_DEVWRITE_LEGACY("oki", pspikesb_oki_banking_w)
ADDRESS_MAP_END
@@ -171,41 +171,41 @@ static ADDRESS_MAP_START( spikes91_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */
AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE_SIZE(m_spriteram1, m_spriteram1_size)
AM_RANGE(0xc04000, 0xc04001) AM_WRITENOP
- AM_RANGE(0xff8000, 0xff8fff) AM_RAM_WRITE_LEGACY(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0xff8000, 0xff8fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
AM_RANGE(0xffa000, 0xffbfff) AM_RAM AM_BASE(m_tx_tilemap_ram)
AM_RANGE(0xffc000, 0xffcfff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
- //AM_RANGE(0xffd200, 0xffd201) AM_WRITE_LEGACY(pspikesb_gfxbank_w)
+ //AM_RANGE(0xffd200, 0xffd201) AM_WRITE(pspikesb_gfxbank_w)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0")
- AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE_LEGACY(pspikes_gfxbank_w)
- AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE_LEGACY(aerofgt_bg1scrolly_w)
+ AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE(pspikes_gfxbank_w)
+ AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg1scrolly_w)
AM_RANGE(0xfff006, 0xfff007) AM_NOP
- AM_RANGE(0xfff008, 0xfff009) AM_WRITE_LEGACY(spikes91_lookup_w)
+ AM_RANGE(0xfff008, 0xfff009) AM_WRITE(spikes91_lookup_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( pspikesc_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */
AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE_SIZE(m_spriteram1, m_spriteram1_size)
- AM_RANGE(0xff8000, 0xff8fff) AM_RAM_WRITE_LEGACY(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0xff8000, 0xff8fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
AM_RANGE(0xffc000, 0xffcbff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_WRITE_LEGACY(pspikes_palette_bank_w)
- AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE_LEGACY(pspikes_gfxbank_w)
+ AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_WRITE(pspikes_palette_bank_w)
+ AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE(pspikes_gfxbank_w)
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW")
- AM_RANGE(0xfff004, 0xfff005) AM_WRITE_LEGACY(aerofgt_bg1scrolly_w)
+ AM_RANGE(0xfff004, 0xfff005) AM_WRITE(aerofgt_bg1scrolly_w)
AM_RANGE(0xfff006, 0xfff007) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
ADDRESS_MAP_END
static ADDRESS_MAP_START( karatblz_map, AS_PROGRAM, 16, aerofgt_state )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x080000, 0x081fff) AM_RAM_WRITE_LEGACY(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
- AM_RANGE(0x082000, 0x083fff) AM_RAM_WRITE_LEGACY(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
+ AM_RANGE(0x080000, 0x081fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0x082000, 0x083fff) AM_RAM_WRITE(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
AM_RANGE(0x0a0000, 0x0affff) AM_RAM AM_BASE_SIZE(m_spriteram1, m_spriteram1_size)
AM_RANGE(0x0b0000, 0x0bffff) AM_RAM AM_BASE_SIZE(m_spriteram2, m_spriteram2_size)
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */
@@ -213,25 +213,25 @@ static ADDRESS_MAP_START( karatblz_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x0fc000, 0x0fc7ff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
AM_RANGE(0x0fe000, 0x0fe7ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0ff000, 0x0ff001) AM_READ_PORT("IN0")
- AM_RANGE(0x0ff002, 0x0ff003) AM_READ_PORT("IN1") AM_WRITE_LEGACY(karatblz_gfxbank_w)
+ AM_RANGE(0x0ff002, 0x0ff003) AM_READ_PORT("IN1") AM_WRITE(karatblz_gfxbank_w)
AM_RANGE(0x0ff004, 0x0ff005) AM_READ_PORT("IN2")
AM_RANGE(0x0ff006, 0x0ff007) AM_READ_PORT("IN3") AM_WRITE(sound_command_w)
- AM_RANGE(0x0ff008, 0x0ff009) AM_READ_PORT("DSW") AM_WRITE_LEGACY(aerofgt_bg1scrollx_w)
- AM_RANGE(0x0ff00a, 0x0ff00b) AM_READ(pending_command_r) AM_WRITE_LEGACY(aerofgt_bg1scrolly_w)
- AM_RANGE(0x0ff00c, 0x0ff00d) AM_WRITE_LEGACY(aerofgt_bg2scrollx_w)
- AM_RANGE(0x0ff00e, 0x0ff00f) AM_WRITE_LEGACY(aerofgt_bg2scrolly_w)
+ AM_RANGE(0x0ff008, 0x0ff009) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg1scrollx_w)
+ AM_RANGE(0x0ff00a, 0x0ff00b) AM_READ(pending_command_r) AM_WRITE(aerofgt_bg1scrolly_w)
+ AM_RANGE(0x0ff00c, 0x0ff00d) AM_WRITE(aerofgt_bg2scrollx_w)
+ AM_RANGE(0x0ff00e, 0x0ff00f) AM_WRITE(aerofgt_bg2scrolly_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( spinlbrk_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE_LEGACY(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
- AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE_LEGACY(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
AM_RANGE(0xff8000, 0xffbfff) AM_RAM /* work RAM */
AM_RANGE(0xffc000, 0xffc7ff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
AM_RANGE(0xffd000, 0xffd1ff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
AM_RANGE(0xffe000, 0xffe7ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_WRITE_LEGACY(spinlbrk_gfxbank_w)
- AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE_LEGACY(aerofgt_bg2scrollx_w)
+ AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_WRITE(spinlbrk_gfxbank_w)
+ AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE(aerofgt_bg2scrollx_w)
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW")
AM_RANGE(0xfff006, 0xfff007) AM_WRITE(sound_command_w)
ADDRESS_MAP_END
@@ -240,8 +240,8 @@ static ADDRESS_MAP_START( turbofrc_map, AS_PROGRAM, 16, aerofgt_state )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */
- AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE_LEGACY(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
- AM_RANGE(0x0d2000, 0x0d3fff) AM_RAM_WRITE_LEGACY(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
+ AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0x0d2000, 0x0d3fff) AM_RAM_WRITE(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
AM_RANGE(0x0e0000, 0x0e3fff) AM_RAM AM_BASE_SIZE(m_spriteram1, m_spriteram1_size)
AM_RANGE(0x0e4000, 0x0e7fff) AM_RAM AM_BASE_SIZE(m_spriteram2, m_spriteram2_size)
AM_RANGE(0x0f8000, 0x0fbfff) AM_RAM /* work RAM */
@@ -249,11 +249,11 @@ static ADDRESS_MAP_START( turbofrc_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x0fd000, 0x0fdfff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
AM_RANGE(0x0fe000, 0x0fe7ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0ff000, 0x0ff001) AM_READ_PORT("IN0")
- AM_RANGE(0x0ff002, 0x0ff003) AM_READ_PORT("IN1") AM_WRITE_LEGACY(aerofgt_bg1scrolly_w)
- AM_RANGE(0x0ff004, 0x0ff005) AM_READ_PORT("DSW") AM_WRITE_LEGACY(aerofgt_bg2scrollx_w)
- AM_RANGE(0x0ff006, 0x0ff007) AM_READ(pending_command_r) AM_WRITE_LEGACY(aerofgt_bg2scrolly_w)
+ AM_RANGE(0x0ff002, 0x0ff003) AM_READ_PORT("IN1") AM_WRITE(aerofgt_bg1scrolly_w)
+ AM_RANGE(0x0ff004, 0x0ff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg2scrollx_w)
+ AM_RANGE(0x0ff006, 0x0ff007) AM_READ(pending_command_r) AM_WRITE(aerofgt_bg2scrolly_w)
AM_RANGE(0x0ff008, 0x0ff009) AM_READ_PORT("IN2")
- AM_RANGE(0x0ff008, 0x0ff00b) AM_WRITE_LEGACY(turbofrc_gfxbank_w)
+ AM_RANGE(0x0ff008, 0x0ff00b) AM_WRITE(turbofrc_gfxbank_w)
AM_RANGE(0x0ff00c, 0x0ff00d) AM_WRITENOP /* related to bg2 (written together with the scroll registers) */
AM_RANGE(0x0ff00e, 0x0ff00f) AM_WRITE(turbofrc_sound_command_w)
ADDRESS_MAP_END
@@ -261,19 +261,19 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( aerofgtb_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */
- AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE_LEGACY(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
- AM_RANGE(0x0d2000, 0x0d3fff) AM_RAM_WRITE_LEGACY(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
+ AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0x0d2000, 0x0d3fff) AM_RAM_WRITE(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
AM_RANGE(0x0e0000, 0x0e3fff) AM_RAM AM_BASE_SIZE(m_spriteram1, m_spriteram1_size)
AM_RANGE(0x0e4000, 0x0e7fff) AM_RAM AM_BASE_SIZE(m_spriteram2, m_spriteram2_size)
AM_RANGE(0x0f8000, 0x0fbfff) AM_RAM /* work RAM */
AM_RANGE(0x0fc000, 0x0fc7ff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
AM_RANGE(0x0fd000, 0x0fd7ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0fe000, 0x0fe001) AM_READ_PORT("IN0")
- AM_RANGE(0x0fe002, 0x0fe003) AM_READ_PORT("IN1") AM_WRITE_LEGACY(aerofgt_bg1scrolly_w)
- AM_RANGE(0x0fe004, 0x0fe005) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(aerofgt_bg2scrollx_w)
- AM_RANGE(0x0fe006, 0x0fe007) AM_READ(pending_command_r) AM_WRITE_LEGACY(aerofgt_bg2scrolly_w)
+ AM_RANGE(0x0fe002, 0x0fe003) AM_READ_PORT("IN1") AM_WRITE(aerofgt_bg1scrolly_w)
+ AM_RANGE(0x0fe004, 0x0fe005) AM_READ_PORT("DSW1") AM_WRITE(aerofgt_bg2scrollx_w)
+ AM_RANGE(0x0fe006, 0x0fe007) AM_READ(pending_command_r) AM_WRITE(aerofgt_bg2scrolly_w)
AM_RANGE(0x0fe008, 0x0fe009) AM_READ_PORT("DSW2")
- AM_RANGE(0x0fe008, 0x0fe00b) AM_WRITE_LEGACY(turbofrc_gfxbank_w)
+ AM_RANGE(0x0fe008, 0x0fe00b) AM_WRITE(turbofrc_gfxbank_w)
AM_RANGE(0x0fe00e, 0x0fe00f) AM_WRITE(turbofrc_sound_command_w)
AM_RANGE(0x0ff000, 0x0fffff) AM_RAM AM_BASE(m_rasterram) /* used only for the scroll registers */
ADDRESS_MAP_END
@@ -284,15 +284,15 @@ static ADDRESS_MAP_START( aerofgt_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x1b0000, 0x1b07ff) AM_RAM AM_BASE(m_rasterram) /* used only for the scroll registers */
AM_RANGE(0x1b0800, 0x1b0801) AM_NOP /* ??? */
AM_RANGE(0x1b0ff0, 0x1b0fff) AM_RAM /* stack area during boot */
- AM_RANGE(0x1b2000, 0x1b3fff) AM_RAM_WRITE_LEGACY(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
- AM_RANGE(0x1b4000, 0x1b5fff) AM_RAM_WRITE_LEGACY(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
+ AM_RANGE(0x1b2000, 0x1b3fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0x1b4000, 0x1b5fff) AM_RAM_WRITE(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM AM_BASE_SIZE(m_spriteram1, m_spriteram1_size)
AM_RANGE(0x1c4000, 0x1c7fff) AM_RAM AM_BASE_SIZE(m_spriteram2, m_spriteram2_size)
AM_RANGE(0x1d0000, 0x1d1fff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
AM_RANGE(0xfef000, 0xffefff) AM_RAM /* work RAM */
- AM_RANGE(0xffff80, 0xffff87) AM_WRITE_LEGACY(aerofgt_gfxbank_w)
- AM_RANGE(0xffff88, 0xffff89) AM_WRITE_LEGACY(aerofgt_bg1scrolly_w) /* + something else in the top byte */
- AM_RANGE(0xffff90, 0xffff91) AM_WRITE_LEGACY(aerofgt_bg2scrolly_w) /* + something else in the top byte */
+ AM_RANGE(0xffff80, 0xffff87) AM_WRITE(aerofgt_gfxbank_w)
+ AM_RANGE(0xffff88, 0xffff89) AM_WRITE(aerofgt_bg1scrolly_w) /* + something else in the top byte */
+ AM_RANGE(0xffff90, 0xffff91) AM_WRITE(aerofgt_bg2scrolly_w) /* + something else in the top byte */
AM_RANGE(0xffffa0, 0xffffa1) AM_READ_PORT("P1")
AM_RANGE(0xffffa2, 0xffffa3) AM_READ_PORT("P2")
AM_RANGE(0xffffa4, 0xffffa5) AM_READ_PORT("SYSTEM")
@@ -306,8 +306,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( aerfboot_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */
- AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE_LEGACY(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
- AM_RANGE(0x0d2000, 0x0d3fff) AM_RAM_WRITE_LEGACY(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
+ AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0x0d2000, 0x0d3fff) AM_RAM_WRITE(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
AM_RANGE(0x0e0000, 0x0e3fff) AM_RAM AM_BASE_SIZE(m_spriteram1, m_spriteram1_size)
AM_RANGE(0x0e4000, 0x0e7fff) AM_RAM AM_BASE_SIZE(m_spriteram2, m_spriteram2_size)
AM_RANGE(0x0f8000, 0x0fbfff) AM_RAM /* work RAM */
@@ -317,10 +317,10 @@ static ADDRESS_MAP_START( aerfboot_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x0fe002, 0x0fe003) AM_READ_PORT("IN1")
AM_RANGE(0x0fe004, 0x0fe005) AM_READ_PORT("DSW1")
AM_RANGE(0x0fe008, 0x0fe009) AM_READ_PORT("DSW2")
- AM_RANGE(0x0fe002, 0x0fe003) AM_WRITE_LEGACY(aerofgt_bg1scrolly_w)
- AM_RANGE(0x0fe004, 0x0fe005) AM_WRITE_LEGACY(aerofgt_bg2scrollx_w)
- AM_RANGE(0x0fe006, 0x0fe007) AM_WRITE_LEGACY(aerofgt_bg2scrolly_w)
- AM_RANGE(0x0fe008, 0x0fe00b) AM_WRITE_LEGACY(turbofrc_gfxbank_w)
+ AM_RANGE(0x0fe002, 0x0fe003) AM_WRITE(aerofgt_bg1scrolly_w)
+ AM_RANGE(0x0fe004, 0x0fe005) AM_WRITE(aerofgt_bg2scrollx_w)
+ AM_RANGE(0x0fe006, 0x0fe007) AM_WRITE(aerofgt_bg2scrolly_w)
+ AM_RANGE(0x0fe008, 0x0fe00b) AM_WRITE(turbofrc_gfxbank_w)
AM_RANGE(0x0fe00e, 0x0fe00f) AM_WRITE(aerfboot_soundlatch_w)
AM_RANGE(0x0fe010, 0x0fe011) AM_WRITENOP
AM_RANGE(0x0fe012, 0x0fe013) AM_WRITENOP
@@ -335,8 +335,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( aerfboo2_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */
- AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE_LEGACY(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
- AM_RANGE(0x0d2000, 0x0d3fff) AM_RAM_WRITE_LEGACY(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
+ AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0x0d2000, 0x0d3fff) AM_RAM_WRITE(aerofgt_bg2videoram_w) AM_BASE(m_bg2videoram)
AM_RANGE(0x0e0000, 0x0e3fff) AM_RAM AM_BASE_SIZE(m_spriteram1, m_spriteram1_size)
AM_RANGE(0x0e4000, 0x0e7fff) AM_RAM AM_BASE_SIZE(m_spriteram2, m_spriteram2_size)
AM_RANGE(0x0f8000, 0x0fbfff) AM_RAM /* work RAM */
@@ -346,10 +346,10 @@ static ADDRESS_MAP_START( aerfboo2_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x0fe002, 0x0fe003) AM_READ_PORT("IN1")
AM_RANGE(0x0fe004, 0x0fe005) AM_READ_PORT("DSW1")
AM_RANGE(0x0fe008, 0x0fe009) AM_READ_PORT("DSW2")
- AM_RANGE(0x0fe002, 0x0fe003) AM_WRITE_LEGACY(aerofgt_bg1scrolly_w)
- AM_RANGE(0x0fe004, 0x0fe005) AM_WRITE_LEGACY(aerofgt_bg2scrollx_w)
- AM_RANGE(0x0fe006, 0x0fe007) AM_WRITE_LEGACY(aerofgt_bg2scrolly_w)
- AM_RANGE(0x0fe008, 0x0fe00b) AM_WRITE_LEGACY(turbofrc_gfxbank_w)
+ AM_RANGE(0x0fe002, 0x0fe003) AM_WRITE(aerofgt_bg1scrolly_w)
+ AM_RANGE(0x0fe004, 0x0fe005) AM_WRITE(aerofgt_bg2scrollx_w)
+ AM_RANGE(0x0fe006, 0x0fe007) AM_WRITE(aerofgt_bg2scrolly_w)
+ AM_RANGE(0x0fe008, 0x0fe00b) AM_WRITE(turbofrc_gfxbank_w)
AM_RANGE(0x0fe006, 0x0fe007) AM_DEVREAD8("oki", okim6295_device, read, 0xff00)
AM_RANGE(0x0fe00e, 0x0fe00f) AM_DEVWRITE8("oki", okim6295_device, write, 0xff00)
AM_RANGE(0x0fe01e, 0x0fe01f) AM_DEVWRITE_LEGACY("oki", aerfboo2_okim6295_banking_w)
@@ -365,15 +365,15 @@ static ADDRESS_MAP_START( wbbc97_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x500000, 0x50ffff) AM_RAM /* work RAM */
AM_RANGE(0x600000, 0x605fff) AM_RAM AM_BASE_SIZE(m_spriteram1, m_spriteram1_size)
AM_RANGE(0xa00000, 0xa3ffff) AM_RAM AM_BASE(m_bitmapram)
- AM_RANGE(0xff8000, 0xff8fff) AM_RAM_WRITE_LEGACY(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0xff8000, 0xff8fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
AM_RANGE(0xffc000, 0xffc3ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_WRITE_LEGACY(pspikes_palette_bank_w)
- AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE_LEGACY(pspikes_gfxbank_w)
- AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE_LEGACY(aerofgt_bg1scrolly_w)
+ AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_WRITE(pspikes_palette_bank_w)
+ AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE(pspikes_gfxbank_w)
+ AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg1scrolly_w)
AM_RANGE(0xfff006, 0xfff007) AM_READNOP AM_WRITE(sound_command_w)
- AM_RANGE(0xfff00e, 0xfff00f) AM_WRITE_LEGACY(wbbc97_bitmap_enable_w)
+ AM_RANGE(0xfff00e, 0xfff00f) AM_WRITE(wbbc97_bitmap_enable_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, aerofgt_state )
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 01fa6125313..5572285c643 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -359,10 +359,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8, airbustr_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
- AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE_LEGACY(airbustr_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE_LEGACY(airbustr_colorram2_w) AM_BASE(m_colorram2)
- AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE_LEGACY(airbustr_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE_LEGACY(airbustr_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(airbustr_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(airbustr_colorram2_w) AM_BASE(m_colorram2)
+ AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE(airbustr_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(airbustr_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xd000, 0xd5ff) AM_RAM_WRITE(airbustr_paletteram_w) AM_BASE(m_paletteram)
AM_RANGE(0xd600, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xefff) AM_RAM
@@ -373,7 +373,7 @@ static ADDRESS_MAP_START( slave_io_map, AS_IO, 8, airbustr_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(slave_bankswitch_w)
AM_RANGE(0x02, 0x02) AM_READWRITE(soundcommand2_r, soundcommand_w)
- AM_RANGE(0x04, 0x0c) AM_WRITE_LEGACY(airbustr_scrollregs_w)
+ AM_RANGE(0x04, 0x0c) AM_WRITE(airbustr_scrollregs_w)
AM_RANGE(0x0e, 0x0e) AM_READ(soundcommand_status_r)
AM_RANGE(0x20, 0x20) AM_READ_PORT("P1")
AM_RANGE(0x22, 0x22) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index 079e3f5c6d0..9d0cd9237e2 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -26,7 +26,7 @@ static WRITE8_DEVICE_HANDLER( k007232_extvol_w );
/****************************************************************************/
static ADDRESS_MAP_START( ajax_main_map, AS_PROGRAM, 8, ajax_state )
- AM_RANGE(0x0000, 0x01c0) AM_READWRITE_LEGACY(ajax_ls138_f10_r, ajax_ls138_f10_w) /* bankswitch + sound command + FIRQ command */
+ AM_RANGE(0x0000, 0x01c0) AM_READWRITE(ajax_ls138_f10_r, ajax_ls138_f10_w) /* bankswitch + sound command + FIRQ command */
AM_RANGE(0x0800, 0x0807) AM_DEVREADWRITE_LEGACY("k051960", k051937_r, k051937_w) /* sprite control registers */
AM_RANGE(0x0c00, 0x0fff) AM_DEVREADWRITE_LEGACY("k051960", k051960_r, k051960_w) /* sprite RAM 2128SL at J7 */
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_SHARE("paletteram")/* palette */
@@ -40,7 +40,7 @@ static ADDRESS_MAP_START( ajax_sub_map, AS_PROGRAM, 8, ajax_state )
AM_RANGE(0x0000, 0x07ff) AM_DEVREADWRITE_LEGACY("k051316", k051316_r, k051316_w) /* 051316 zoom/rotation layer */
AM_RANGE(0x0800, 0x080f) AM_DEVWRITE_LEGACY("k051316", k051316_ctrl_w) /* 051316 control registers */
AM_RANGE(0x1000, 0x17ff) AM_DEVREAD_LEGACY("k051316", k051316_rom_r) /* 051316 (ROM test) */
- AM_RANGE(0x1800, 0x1800) AM_WRITE_LEGACY(ajax_bankswitch_2_w) /* bankswitch control */
+ AM_RANGE(0x1800, 0x1800) AM_WRITE(ajax_bankswitch_2_w) /* bankswitch control */
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("share1") /* shared RAM with the 052001 */
AM_RANGE(0x4000, 0x7fff) AM_DEVREADWRITE_LEGACY("k052109", k052109_r, k052109_w) /* video RAM + color RAM + video registers */
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") /* banked ROM */
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index 7b8a460883b..e1992ba67fd 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -683,16 +683,16 @@ static ADDRESS_MAP_START( alpha68k_II_map, AS_PROGRAM, 16, alpha68k_state )
AM_RANGE(0x080000, 0x080001) AM_READ(control_1_r) /* Joysticks */
AM_RANGE(0x080000, 0x080001) AM_WRITE(alpha68k_II_sound_w)
AM_RANGE(0x0c0000, 0x0c0001) AM_READ(control_2_r) /* CN1 & Dip 1 */
- AM_RANGE(0x0c0000, 0x0c00ff) AM_WRITE_LEGACY(alpha68k_II_video_bank_w)
+ AM_RANGE(0x0c0000, 0x0c00ff) AM_WRITE(alpha68k_II_video_bank_w)
AM_RANGE(0x0c8000, 0x0c8001) AM_READ(control_3_r) /* Bottom of CN2 */
AM_RANGE(0x0d0000, 0x0d0001) AM_READ(control_4_r) /* Top of CN1 & CN2 */
AM_RANGE(0x0d8000, 0x0d8001) AM_READNOP /* IRQ ack? */
AM_RANGE(0x0e0000, 0x0e0001) AM_READNOP /* IRQ ack? */
AM_RANGE(0x0e8000, 0x0e8001) AM_READNOP /* watchdog? */
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE_LEGACY(alpha68k_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(alpha68k_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x200000, 0x207fff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x300000, 0x3001ff) AM_READWRITE(alpha_II_trigger_r, alpha_microcontroller_w)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE_LEGACY(alpha68k_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(alpha68k_paletteram_w) AM_BASE(m_paletteram)
AM_RANGE(0x800000, 0x83ffff) AM_ROMBANK("bank8")
ADDRESS_MAP_END
@@ -701,16 +701,16 @@ static ADDRESS_MAP_START( alpha68k_V_map, AS_PROGRAM, 16, alpha68k_state )
AM_RANGE(0x040000, 0x043fff) AM_RAM AM_BASE(m_shared_ram)
AM_RANGE(0x080000, 0x080001) AM_READWRITE(control_1_r, alpha68k_V_sound_w) /* Joysticks */
AM_RANGE(0x0c0000, 0x0c0001) AM_READ(control_2_V_r) /* Dip 2 */
- AM_RANGE(0x0c0000, 0x0c00ff) AM_WRITE_LEGACY(alpha68k_V_video_control_w)
+ AM_RANGE(0x0c0000, 0x0c00ff) AM_WRITE(alpha68k_V_video_control_w)
AM_RANGE(0x0d8000, 0x0d8001) AM_READNOP /* IRQ ack? */
AM_RANGE(0x0e0000, 0x0e0001) AM_READNOP /* IRQ ack? */
AM_RANGE(0x0e8000, 0x0e8001) AM_READNOP /* watchdog? */
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE_LEGACY(alpha68k_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(alpha68k_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x200000, 0x207fff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x300000, 0x303fff) AM_READ(alpha_V_trigger_r)
AM_RANGE(0x300000, 0x3001ff) AM_WRITE(alpha_microcontroller_w)
AM_RANGE(0x303e00, 0x303fff) AM_WRITE(alpha_microcontroller_w) /* Gang Wars mirror */
- AM_RANGE(0x400000, 0x401fff) AM_RAM_WRITE_LEGACY(alpha68k_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x400000, 0x401fff) AM_RAM_WRITE(alpha68k_paletteram_w) AM_BASE(m_paletteram)
AM_RANGE(0x800000, 0x83ffff) AM_ROMBANK("bank8")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index 44e23793d27..d6fa57e44b0 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -605,7 +605,7 @@ WRITE8_MEMBER(ampoker2_state::ampoker2_watchdog_reset_w)
static ADDRESS_MAP_START( ampoker2_map, AS_PROGRAM, 8, ampoker2_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE_LEGACY(ampoker2_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(ampoker2_videoram_w) AM_BASE(m_videoram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( ampoker2_io_map, AS_IO, 8, ampoker2_state )
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index 074045791c3..a3a8201b511 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -75,13 +75,13 @@ WRITE8_MEMBER(amspdwy_state::amspdwy_sound_w)
static ADDRESS_MAP_START( amspdwy_map, AS_PROGRAM, 8, amspdwy_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
- AM_RANGE(0x8000, 0x801f) AM_WRITE_LEGACY(amspdwy_paletteram_w) AM_SHARE("paletteram")// Palette
- AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(amspdwy_videoram_w) AM_BASE(m_videoram) // Layer, mirrored?
- AM_RANGE(0x9800, 0x9bff) AM_RAM_WRITE_LEGACY(amspdwy_colorram_w) AM_BASE(m_colorram) // Layer
+ AM_RANGE(0x8000, 0x801f) AM_WRITE(amspdwy_paletteram_w) AM_SHARE("paletteram")// Palette
+ AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_RAM_WRITE(amspdwy_videoram_w) AM_BASE(m_videoram) // Layer, mirrored?
+ AM_RANGE(0x9800, 0x9bff) AM_RAM_WRITE(amspdwy_colorram_w) AM_BASE(m_colorram) // Layer
AM_RANGE(0x9c00, 0x9fff) AM_RAM // Unused?
// AM_RANGE(0xa000, 0xa000) AM_WRITENOP // ?
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("DSW1")
- AM_RANGE(0xa400, 0xa400) AM_READ_PORT("DSW2") AM_WRITE_LEGACY(amspdwy_flipscreen_w) // DSW 2 + Toggle Flip Screen?
+ AM_RANGE(0xa400, 0xa400) AM_READ_PORT("DSW2") AM_WRITE(amspdwy_flipscreen_w) // DSW 2 + Toggle Flip Screen?
AM_RANGE(0xa800, 0xa800) AM_READ(amspdwy_wheel_0_r) // Player 1
AM_RANGE(0xac00, 0xac00) AM_READ(amspdwy_wheel_1_r) // Player 2
AM_RANGE(0xb000, 0xb000) AM_WRITENOP // ? Exiting IRQ
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index 9f6069f89c0..0251f23da04 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -196,18 +196,18 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, angelkds_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE_LEGACY(angelkds_bgtopvideoram_w) AM_BASE(m_bgtopvideoram) /* Top Half of Screen */
- AM_RANGE(0xe400, 0xe7ff) AM_RAM_WRITE_LEGACY(angelkds_bgbotvideoram_w) AM_BASE(m_bgbotvideoram) /* Bottom Half of Screen */
- AM_RANGE(0xe800, 0xebff) AM_RAM_WRITE_LEGACY(angelkds_txvideoram_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(angelkds_bgtopvideoram_w) AM_BASE(m_bgtopvideoram) /* Top Half of Screen */
+ AM_RANGE(0xe400, 0xe7ff) AM_RAM_WRITE(angelkds_bgbotvideoram_w) AM_BASE(m_bgbotvideoram) /* Bottom Half of Screen */
+ AM_RANGE(0xe800, 0xebff) AM_RAM_WRITE(angelkds_txvideoram_w) AM_BASE(m_txvideoram)
AM_RANGE(0xec00, 0xecff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0xed00, 0xeeff) AM_RAM_WRITE_LEGACY(angelkds_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0xed00, 0xeeff) AM_RAM_WRITE(angelkds_paletteram_w) AM_BASE(m_paletteram)
AM_RANGE(0xef00, 0xefff) AM_RAM
- AM_RANGE(0xf000, 0xf000) AM_WRITE_LEGACY(angelkds_bgtopbank_write)
- AM_RANGE(0xf001, 0xf001) AM_WRITE_LEGACY(angelkds_bgtopscroll_write)
- AM_RANGE(0xf002, 0xf002) AM_WRITE_LEGACY(angelkds_bgbotbank_write)
- AM_RANGE(0xf003, 0xf003) AM_WRITE_LEGACY(angelkds_bgbotscroll_write)
- AM_RANGE(0xf004, 0xf004) AM_WRITE_LEGACY(angelkds_txbank_write)
- AM_RANGE(0xf005, 0xf005) AM_WRITE_LEGACY(angelkds_layer_ctrl_write)
+ AM_RANGE(0xf000, 0xf000) AM_WRITE(angelkds_bgtopbank_write)
+ AM_RANGE(0xf001, 0xf001) AM_WRITE(angelkds_bgtopscroll_write)
+ AM_RANGE(0xf002, 0xf002) AM_WRITE(angelkds_bgbotbank_write)
+ AM_RANGE(0xf003, 0xf003) AM_WRITE(angelkds_bgbotscroll_write)
+ AM_RANGE(0xf004, 0xf004) AM_WRITE(angelkds_txbank_write)
+ AM_RANGE(0xf005, 0xf005) AM_WRITE(angelkds_layer_ctrl_write)
ADDRESS_MAP_END
static ADDRESS_MAP_START( main_portmap, AS_IO, 8, angelkds_state )
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index 20178f6692d..73ebd319905 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -220,11 +220,11 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, appoooh_state )
AM_RANGE(0xe800, 0xefff) AM_RAM /* RAM ? */
AM_RANGE(0xf000, 0xf01f) AM_BASE(m_spriteram)
- AM_RANGE(0xf020, 0xf3ff) AM_WRITE_LEGACY(appoooh_fg_videoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0xf420, 0xf7ff) AM_WRITE_LEGACY(appoooh_fg_colorram_w) AM_BASE(m_fg_colorram)
+ AM_RANGE(0xf020, 0xf3ff) AM_WRITE(appoooh_fg_videoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0xf420, 0xf7ff) AM_WRITE(appoooh_fg_colorram_w) AM_BASE(m_fg_colorram)
AM_RANGE(0xf800, 0xf81f) AM_BASE(m_spriteram_2)
- AM_RANGE(0xf820, 0xfbff) AM_WRITE_LEGACY(appoooh_bg_videoram_w) AM_BASE(m_bg_videoram)
- AM_RANGE(0xfc20, 0xffff) AM_WRITE_LEGACY(appoooh_bg_colorram_w) AM_BASE(m_bg_colorram)
+ AM_RANGE(0xf820, 0xfbff) AM_WRITE(appoooh_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0xfc20, 0xffff) AM_WRITE(appoooh_bg_colorram_w) AM_BASE(m_bg_colorram)
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -234,8 +234,8 @@ static ADDRESS_MAP_START( main_portmap, AS_IO, 8, appoooh_state )
AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE_LEGACY("sn2", sn76496_w)
AM_RANGE(0x02, 0x02) AM_DEVWRITE_LEGACY("sn3", sn76496_w)
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1") AM_WRITE(appoooh_adpcm_w)
- AM_RANGE(0x04, 0x04) AM_READ_PORT("BUTTON3") AM_WRITE_LEGACY(appoooh_out_w)
- AM_RANGE(0x05, 0x05) AM_WRITE_LEGACY(appoooh_scroll_w) /* unknown */
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("BUTTON3") AM_WRITE(appoooh_out_w)
+ AM_RANGE(0x05, 0x05) AM_WRITE(appoooh_scroll_w) /* unknown */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index b34eae32ded..8de6833e196 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -90,14 +90,14 @@ static UINT8 aquarium_snd_bitswap( UINT8 scrambled_data )
READ8_MEMBER(aquarium_state::aquarium_oki_r)
{
okim6295_device *oki = machine().device<okim6295_device>("oki");
- return aquarium_snd_bitswap(oki->read(*&space, offset));
+ return aquarium_snd_bitswap(oki->read(space, offset));
}
WRITE8_MEMBER(aquarium_state::aquarium_oki_w)
{
logerror("%s:Writing %04x to the OKI M6295\n", machine().describe_context(), aquarium_snd_bitswap(data));
okim6295_device *oki = machine().device<okim6295_device>("oki");
- oki->write(*&space, offset, (aquarium_snd_bitswap(data)));
+ oki->write(space, offset, (aquarium_snd_bitswap(data)));
}
@@ -105,9 +105,9 @@ WRITE8_MEMBER(aquarium_state::aquarium_oki_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, aquarium_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0xc00000, 0xc00fff) AM_RAM_WRITE_LEGACY(aquarium_mid_videoram_w) AM_BASE(m_mid_videoram)
- AM_RANGE(0xc01000, 0xc01fff) AM_RAM_WRITE_LEGACY(aquarium_bak_videoram_w) AM_BASE(m_bak_videoram)
- AM_RANGE(0xc02000, 0xc03fff) AM_RAM_WRITE_LEGACY(aquarium_txt_videoram_w) AM_BASE(m_txt_videoram)
+ AM_RANGE(0xc00000, 0xc00fff) AM_RAM_WRITE(aquarium_mid_videoram_w) AM_BASE(m_mid_videoram)
+ AM_RANGE(0xc01000, 0xc01fff) AM_RAM_WRITE(aquarium_bak_videoram_w) AM_BASE(m_bak_videoram)
+ AM_RANGE(0xc02000, 0xc03fff) AM_RAM_WRITE(aquarium_txt_videoram_w) AM_BASE(m_txt_videoram)
AM_RANGE(0xc80000, 0xc81fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd00000, 0xd00fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0xd80014, 0xd8001f) AM_WRITEONLY AM_BASE(m_scroll)
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index 41b94c5cac3..f1c78dfec30 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -179,11 +179,11 @@ WRITE8_MEMBER(arabian_state::mcu_port_p_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, arabian_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0xbfff) AM_WRITE_LEGACY(arabian_videoram_w)
+ AM_RANGE(0x8000, 0xbfff) AM_WRITE(arabian_videoram_w)
AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x01ff) AM_READ_PORT("IN0")
AM_RANGE(0xc200, 0xc200) AM_MIRROR(0x01ff) AM_READ_PORT("DSW1")
AM_RANGE(0xd000, 0xd7ff) AM_MIRROR(0x0800) AM_RAM AM_BASE(m_custom_cpu_ram)
- AM_RANGE(0xe000, 0xe007) AM_MIRROR(0x0ff8) AM_WRITE_LEGACY(arabian_blitter_w) AM_BASE(m_blitter)
+ AM_RANGE(0xe000, 0xe007) AM_MIRROR(0x0ff8) AM_WRITE(arabian_blitter_w) AM_BASE(m_blitter)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index aea4b330571..796c9159468 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -199,16 +199,16 @@ static ADDRESS_MAP_START( argus_map, AS_PROGRAM, 8, argus_state )
AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW1")
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSW2")
AM_RANGE(0xc200, 0xc200) AM_WRITE(soundlatch_w)
- AM_RANGE(0xc201, 0xc201) AM_WRITE_LEGACY(argus_flipscreen_w)
+ AM_RANGE(0xc201, 0xc201) AM_WRITE(argus_flipscreen_w)
AM_RANGE(0xc202, 0xc202) AM_WRITE(argus_bankselect_w)
AM_RANGE(0xc300, 0xc301) AM_RAM AM_BASE(m_bg0_scrollx)
AM_RANGE(0xc302, 0xc303) AM_RAM AM_BASE(m_bg0_scrolly)
AM_RANGE(0xc308, 0xc309) AM_RAM AM_BASE(m_bg1_scrollx)
AM_RANGE(0xc30a, 0xc30b) AM_RAM AM_BASE(m_bg1_scrolly)
- AM_RANGE(0xc30c, 0xc30c) AM_WRITE_LEGACY(argus_bg_status_w)
- AM_RANGE(0xc400, 0xcfff) AM_READWRITE_LEGACY(argus_paletteram_r, argus_paletteram_w) AM_BASE(m_paletteram)
- AM_RANGE(0xd000, 0xd7ff) AM_READWRITE_LEGACY(argus_txram_r, argus_txram_w) AM_BASE(m_txram)
- AM_RANGE(0xd800, 0xdfff) AM_READWRITE_LEGACY(argus_bg1ram_r, argus_bg1ram_w) AM_BASE(m_bg1ram)
+ AM_RANGE(0xc30c, 0xc30c) AM_WRITE(argus_bg_status_w)
+ AM_RANGE(0xc400, 0xcfff) AM_READWRITE(argus_paletteram_r, argus_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(argus_txram_r, argus_txram_w) AM_BASE(m_txram)
+ AM_RANGE(0xd800, 0xdfff) AM_READWRITE(argus_bg1ram_r, argus_bg1ram_w) AM_BASE(m_bg1ram)
AM_RANGE(0xe000, 0xf1ff) AM_RAM
AM_RANGE(0xf200, 0xf7ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xf800, 0xffff) AM_RAM
@@ -223,16 +223,16 @@ static ADDRESS_MAP_START( valtric_map, AS_PROGRAM, 8, argus_state )
AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW1")
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSW2")
AM_RANGE(0xc200, 0xc200) AM_WRITE(soundlatch_w)
- AM_RANGE(0xc201, 0xc201) AM_WRITE_LEGACY(argus_flipscreen_w)
+ AM_RANGE(0xc201, 0xc201) AM_WRITE(argus_flipscreen_w)
AM_RANGE(0xc202, 0xc202) AM_WRITE(argus_bankselect_w)
- AM_RANGE(0xc300, 0xc300) AM_WRITE_LEGACY(valtric_unknown_w)
+ AM_RANGE(0xc300, 0xc300) AM_WRITE(valtric_unknown_w)
AM_RANGE(0xc308, 0xc309) AM_RAM AM_BASE(m_bg1_scrollx)
AM_RANGE(0xc30a, 0xc30b) AM_RAM AM_BASE(m_bg1_scrolly)
- AM_RANGE(0xc30c, 0xc30c) AM_WRITE_LEGACY(valtric_bg_status_w)
- AM_RANGE(0xc30d, 0xc30d) AM_WRITE_LEGACY(valtric_mosaic_w)
- AM_RANGE(0xc400, 0xcfff) AM_READWRITE_LEGACY(argus_paletteram_r, valtric_paletteram_w) AM_BASE(m_paletteram)
- AM_RANGE(0xd000, 0xd7ff) AM_READWRITE_LEGACY(argus_txram_r, argus_txram_w) AM_BASE(m_txram)
- AM_RANGE(0xd800, 0xdfff) AM_READWRITE_LEGACY(argus_bg1ram_r, argus_bg1ram_w) AM_BASE(m_bg1ram)
+ AM_RANGE(0xc30c, 0xc30c) AM_WRITE(valtric_bg_status_w)
+ AM_RANGE(0xc30d, 0xc30d) AM_WRITE(valtric_mosaic_w)
+ AM_RANGE(0xc400, 0xcfff) AM_READWRITE(argus_paletteram_r, valtric_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(argus_txram_r, argus_txram_w) AM_BASE(m_txram)
+ AM_RANGE(0xd800, 0xdfff) AM_READWRITE(argus_bg1ram_r, argus_bg1ram_w) AM_BASE(m_bg1ram)
AM_RANGE(0xe000, 0xf1ff) AM_RAM
AM_RANGE(0xf200, 0xf7ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xf800, 0xffff) AM_RAM
@@ -246,20 +246,20 @@ static ADDRESS_MAP_START( butasan_map, AS_PROGRAM, 8, argus_state )
AM_RANGE(0xc002, 0xc002) AM_READ_PORT("P2")
AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW1")
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSW2")
- AM_RANGE(0xc100, 0xc100) AM_WRITE_LEGACY(butasan_unknown_w)
+ AM_RANGE(0xc100, 0xc100) AM_WRITE(butasan_unknown_w)
AM_RANGE(0xc200, 0xc200) AM_WRITE(soundlatch_w)
- AM_RANGE(0xc201, 0xc201) AM_WRITE_LEGACY(argus_flipscreen_w)
+ AM_RANGE(0xc201, 0xc201) AM_WRITE(argus_flipscreen_w)
AM_RANGE(0xc202, 0xc202) AM_WRITE(argus_bankselect_w)
- AM_RANGE(0xc203, 0xc203) AM_WRITE_LEGACY(butasan_pageselect_w)
+ AM_RANGE(0xc203, 0xc203) AM_WRITE(butasan_pageselect_w)
AM_RANGE(0xc300, 0xc301) AM_RAM AM_BASE(m_bg0_scrollx)
AM_RANGE(0xc302, 0xc303) AM_RAM AM_BASE(m_bg0_scrolly)
- AM_RANGE(0xc304, 0xc304) AM_WRITE_LEGACY(butasan_bg0_status_w)
+ AM_RANGE(0xc304, 0xc304) AM_WRITE(butasan_bg0_status_w)
AM_RANGE(0xc308, 0xc309) AM_RAM AM_BASE(m_bg1_scrollx)
AM_RANGE(0xc30a, 0xc30b) AM_RAM AM_BASE(m_bg1_scrolly)
- AM_RANGE(0xc30c, 0xc30c) AM_WRITE_LEGACY(butasan_bg1_status_w)
- AM_RANGE(0xc400, 0xc7ff) AM_READWRITE_LEGACY(butasan_bg1ram_r, butasan_bg1ram_w) AM_BASE(m_butasan_bg1ram)
- AM_RANGE(0xc800, 0xcfff) AM_READWRITE_LEGACY(argus_paletteram_r, butasan_paletteram_w) AM_BASE(m_paletteram)
- AM_RANGE(0xd000, 0xdfff) AM_READWRITE_LEGACY(butasan_pagedram_r, butasan_pagedram_w)
+ AM_RANGE(0xc30c, 0xc30c) AM_WRITE(butasan_bg1_status_w)
+ AM_RANGE(0xc400, 0xc7ff) AM_READWRITE(butasan_bg1ram_r, butasan_bg1ram_w) AM_BASE(m_butasan_bg1ram)
+ AM_RANGE(0xc800, 0xcfff) AM_READWRITE(argus_paletteram_r, butasan_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0xd000, 0xdfff) AM_READWRITE(butasan_pagedram_r, butasan_pagedram_w)
AM_RANGE(0xe000, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xf67f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xf680, 0xffff) AM_RAM
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index b98ee3e7f9a..ef748e7995a 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -559,11 +559,11 @@ static ADDRESS_MAP_START( arkanoid_map, AS_PROGRAM, 8, arkanoid_state )
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd000, 0xd001) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_data_w)
AM_RANGE(0xd001, 0xd001) AM_DEVREAD_LEGACY("aysnd", ay8910_r)
- AM_RANGE(0xd008, 0xd008) AM_WRITE_LEGACY(arkanoid_d008_w) /* gfx bank, flip screen etc. */
+ AM_RANGE(0xd008, 0xd008) AM_WRITE(arkanoid_d008_w) /* gfx bank, flip screen etc. */
AM_RANGE(0xd00c, 0xd00c) AM_READ_PORT("SYSTEM") /* 2 bits from the 68705 */
AM_RANGE(0xd010, 0xd010) AM_READ_PORT("BUTTONS") AM_WRITE(watchdog_reset_w)
- AM_RANGE(0xd018, 0xd018) AM_READWRITE_LEGACY(arkanoid_Z80_mcu_r, arkanoid_Z80_mcu_w) /* input from the 68705 */
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(arkanoid_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd018, 0xd018) AM_READWRITE(arkanoid_Z80_mcu_r, arkanoid_Z80_mcu_w) /* input from the 68705 */
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(arkanoid_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xe800, 0xe83f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe840, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xffff) AM_READNOP /* fixes instant death in final level */
@@ -574,11 +574,11 @@ static ADDRESS_MAP_START( bootleg_map, AS_PROGRAM, 8, arkanoid_state )
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd000, 0xd000) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w)
AM_RANGE(0xd001, 0xd001) AM_DEVREADWRITE_LEGACY("aysnd", ay8910_r, ay8910_data_w)
- AM_RANGE(0xd008, 0xd008) AM_WRITE_LEGACY(arkanoid_d008_w) /* gfx bank, flip screen etc. */
+ AM_RANGE(0xd008, 0xd008) AM_WRITE(arkanoid_d008_w) /* gfx bank, flip screen etc. */
AM_RANGE(0xd00c, 0xd00c) AM_READ_PORT("SYSTEM")
AM_RANGE(0xd010, 0xd010) AM_READ_PORT("BUTTONS") AM_WRITE(watchdog_reset_w)
AM_RANGE(0xd018, 0xd018) AM_READ_PORT("MUX") AM_WRITENOP
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(arkanoid_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(arkanoid_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xe800, 0xe83f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe840, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xffff) AM_READNOP /* fixes instant death in final level */
@@ -590,9 +590,9 @@ static ADDRESS_MAP_START( hexa_map, AS_PROGRAM, 8, arkanoid_state )
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd001, 0xd001) AM_DEVREAD_LEGACY("aysnd", ay8910_r)
AM_RANGE(0xd000, 0xd001) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_data_w)
- AM_RANGE(0xd008, 0xd008) AM_WRITE_LEGACY(hexa_d008_w)
+ AM_RANGE(0xd008, 0xd008) AM_WRITE(hexa_d008_w)
AM_RANGE(0xd010, 0xd010) AM_WRITE(watchdog_reset_w) /* or IRQ acknowledge, or both */
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(arkanoid_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(arkanoid_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
ADDRESS_MAP_END
static ADDRESS_MAP_START( brixian_map, AS_PROGRAM, 8, arkanoid_state )
@@ -600,11 +600,11 @@ static ADDRESS_MAP_START( brixian_map, AS_PROGRAM, 8, arkanoid_state )
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd000, 0xd000) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w)
AM_RANGE(0xd001, 0xd001) AM_DEVREADWRITE_LEGACY("aysnd", ay8910_r, ay8910_data_w)
- AM_RANGE(0xd008, 0xd008) AM_WRITE_LEGACY(arkanoid_d008_w) /* gfx bank, flip screen etc. */
+ AM_RANGE(0xd008, 0xd008) AM_WRITE(arkanoid_d008_w) /* gfx bank, flip screen etc. */
AM_RANGE(0xd00c, 0xd00c) AM_READ_PORT("SYSTEM")
AM_RANGE(0xd010, 0xd010) AM_READ_PORT("BUTTONS") AM_WRITE(watchdog_reset_w)
AM_RANGE(0xd018, 0xd018) AM_READ_PORT("MUX") AM_WRITENOP
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(arkanoid_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(arkanoid_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xe800, 0xe83f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe840, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xffff) AM_READNOP /* fixes instant death in final level */
@@ -616,11 +616,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8, arkanoid_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(arkanoid_68705_port_a_r, arkanoid_68705_port_a_w)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(arkanoid_68705_port_a_r, arkanoid_68705_port_a_w)
AM_RANGE(0x0001, 0x0001) AM_READ_PORT("MUX")
- AM_RANGE(0x0002, 0x0002) AM_READWRITE_LEGACY(arkanoid_68705_port_c_r, arkanoid_68705_port_c_w)
- AM_RANGE(0x0004, 0x0004) AM_WRITE_LEGACY(arkanoid_68705_ddr_a_w)
- AM_RANGE(0x0006, 0x0006) AM_WRITE_LEGACY(arkanoid_68705_ddr_c_w)
+ AM_RANGE(0x0002, 0x0002) AM_READWRITE(arkanoid_68705_port_c_r, arkanoid_68705_port_c_w)
+ AM_RANGE(0x0004, 0x0004) AM_WRITE(arkanoid_68705_ddr_a_w)
+ AM_RANGE(0x0006, 0x0006) AM_WRITE(arkanoid_68705_ddr_c_w)
AM_RANGE(0x0010, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
@@ -1554,10 +1554,11 @@ ROM_END
static void arkanoid_bootleg_init( running_machine &machine )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xf000, 0xf000, FUNC(arkanoid_bootleg_f000_r) );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xf002, 0xf002, FUNC(arkanoid_bootleg_f002_r) );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xd018, 0xd018, FUNC(arkanoid_bootleg_d018_w) );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xd008, 0xd008, FUNC(arkanoid_bootleg_d008_r) );
+ arkanoid_state *state = machine.driver_data<arkanoid_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xf000, 0xf000, read8_delegate(FUNC(arkanoid_state::arkanoid_bootleg_f000_r),state) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xf002, 0xf002, read8_delegate(FUNC(arkanoid_state::arkanoid_bootleg_f002_r),state) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xd018, 0xd018, write8_delegate(FUNC(arkanoid_state::arkanoid_bootleg_d018_w),state) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd008, 0xd008, read8_delegate(FUNC(arkanoid_state::arkanoid_bootleg_d008_r),state) );
}
static DRIVER_INIT( arkangc )
@@ -1641,6 +1642,7 @@ static DRIVER_INIT( paddle2 )
static DRIVER_INIT( tetrsark )
{
+ arkanoid_state *state = machine.driver_data<arkanoid_state>();
UINT8 *ROM = machine.region("maincpu")->base();
int x;
@@ -1649,7 +1651,7 @@ static DRIVER_INIT( tetrsark )
ROM[x] = ROM[x] ^ 0x94;
}
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xd008, 0xd008, FUNC(tetrsark_d008_w) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xd008, 0xd008, write8_delegate(FUNC(arkanoid_state::tetrsark_d008_w),state));
}
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index 371ecc252a3..51aa3bd526c 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -393,18 +393,18 @@ static ADDRESS_MAP_START( terraf_map, AS_PROGRAM, 16, armedf_state )
AM_RANGE(0x060000, 0x0603ff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x060400, 0x063fff) AM_RAM
AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x068000, 0x069fff) AM_READWRITE8_LEGACY(nb1414m4_text_videoram_r,nb1414m4_text_videoram_w,0x00ff)
+ AM_RANGE(0x068000, 0x069fff) AM_READWRITE8(nb1414m4_text_videoram_r,nb1414m4_text_videoram_w,0x00ff)
AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
AM_RANGE(0x06c000, 0x06cfff) AM_RAM AM_BASE(m_spr_pal_clut)
- AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE_LEGACY(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE_LEGACY(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x078000, 0x078001) AM_READ_PORT("P1")
AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
AM_RANGE(0x078006, 0x078007) AM_READ_PORT("DSW2")
// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(terraf_io_w) handled in DRIVER_INIT
- AM_RANGE(0x07c002, 0x07c003) AM_WRITE_LEGACY(armedf_bg_scrollx_w)
- AM_RANGE(0x07c004, 0x07c005) AM_WRITE_LEGACY(armedf_bg_scrolly_w)
+ AM_RANGE(0x07c002, 0x07c003) AM_WRITE(armedf_bg_scrollx_w)
+ AM_RANGE(0x07c004, 0x07c005) AM_WRITE(armedf_bg_scrolly_w)
AM_RANGE(0x07c00a, 0x07c00b) AM_WRITE(sound_command_w)
AM_RANGE(0x07c00c, 0x07c00d) AM_WRITENOP /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */
AM_RANGE(0x07c00e, 0x07c00f) AM_WRITE(irq_lv1_ack_w)
@@ -424,18 +424,18 @@ static ADDRESS_MAP_START( cclimbr2_map, AS_PROGRAM, 16, armedf_state )
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x061000, 0x063fff) AM_RAM
AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x068000, 0x069fff) AM_READWRITE8_LEGACY(nb1414m4_text_videoram_r,nb1414m4_text_videoram_w,0x00ff)
+ AM_RANGE(0x068000, 0x069fff) AM_READWRITE8(nb1414m4_text_videoram_r,nb1414m4_text_videoram_w,0x00ff)
AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
AM_RANGE(0x06c000, 0x06cfff) AM_RAM AM_BASE(m_spr_pal_clut)
- AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE_LEGACY(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE_LEGACY(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x078000, 0x078001) AM_READ_PORT("P1")
AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
AM_RANGE(0x078006, 0x078007) AM_READ_PORT("DSW2")
// AM_RANGE(0x07c000, 0x07c001) AM_WRITE_LEGACY(io_w)
- AM_RANGE(0x07c002, 0x07c003) AM_WRITE_LEGACY(armedf_bg_scrollx_w)
- AM_RANGE(0x07c004, 0x07c005) AM_WRITE_LEGACY(armedf_bg_scrolly_w)
+ AM_RANGE(0x07c002, 0x07c003) AM_WRITE(armedf_bg_scrollx_w)
+ AM_RANGE(0x07c004, 0x07c005) AM_WRITE(armedf_bg_scrolly_w)
AM_RANGE(0x07c00a, 0x07c00b) AM_WRITE(sound_command_w)
AM_RANGE(0x07c00c, 0x07c00d) AM_WRITENOP /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */
AM_RANGE(0x07c00e, 0x07c00f) AM_WRITE(irq_lv2_ack_w)
@@ -446,18 +446,18 @@ static ADDRESS_MAP_START( legion_map, AS_PROGRAM, 16, armedf_state )
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x061000, 0x063fff) AM_RAM
AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x068000, 0x069fff) AM_READWRITE8_LEGACY(nb1414m4_text_videoram_r,nb1414m4_text_videoram_w,0x00ff)
+ AM_RANGE(0x068000, 0x069fff) AM_READWRITE8(nb1414m4_text_videoram_r,nb1414m4_text_videoram_w,0x00ff)
AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
AM_RANGE(0x06c000, 0x06cfff) AM_RAM AM_BASE(m_spr_pal_clut)
- AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE_LEGACY(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE_LEGACY(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x078000, 0x078001) AM_READ_PORT("P1")
AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
AM_RANGE(0x078006, 0x078007) AM_READ_PORT("DSW2")
// AM_RANGE(0x07c000, 0x07c001) AM_WRITE_LEGACY(legion_io_w)
- AM_RANGE(0x07c002, 0x07c003) AM_WRITE_LEGACY(armedf_bg_scrollx_w)
- AM_RANGE(0x07c004, 0x07c005) AM_WRITE_LEGACY(armedf_bg_scrolly_w)
+ AM_RANGE(0x07c002, 0x07c003) AM_WRITE(armedf_bg_scrollx_w)
+ AM_RANGE(0x07c004, 0x07c005) AM_WRITE(armedf_bg_scrolly_w)
AM_RANGE(0x07c00a, 0x07c00b) AM_WRITE(sound_command_w)
AM_RANGE(0x07c00c, 0x07c00d) AM_WRITENOP /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */
AM_RANGE(0x07c00e, 0x07c00f) AM_WRITE(irq_lv2_ack_w)
@@ -479,18 +479,18 @@ static ADDRESS_MAP_START( legiono_map, AS_PROGRAM, 16, armedf_state )
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x061000, 0x063fff) AM_RAM
AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x068000, 0x069fff) AM_READWRITE8_LEGACY(nb1414m4_text_videoram_r,nb1414m4_text_videoram_w,0x00ff)
+ AM_RANGE(0x068000, 0x069fff) AM_READWRITE8(nb1414m4_text_videoram_r,nb1414m4_text_videoram_w,0x00ff)
AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
AM_RANGE(0x06c000, 0x06cfff) AM_RAM AM_BASE(m_spr_pal_clut)
- AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE_LEGACY(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE_LEGACY(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0x074000, 0x074fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x078000, 0x078001) AM_READ_PORT("P1")
AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
AM_RANGE(0x078006, 0x078007) AM_READ_PORT("DSW2")
// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(bootleg_io_w)
- AM_RANGE(0x07c002, 0x07c003) AM_WRITE_LEGACY(armedf_bg_scrollx_w)
- AM_RANGE(0x07c004, 0x07c005) AM_WRITE_LEGACY(armedf_bg_scrolly_w)
+ AM_RANGE(0x07c002, 0x07c003) AM_WRITE(armedf_bg_scrollx_w)
+ AM_RANGE(0x07c004, 0x07c005) AM_WRITE(armedf_bg_scrolly_w)
AM_RANGE(0x07c00a, 0x07c00b) AM_WRITE(sound_command_w)
AM_RANGE(0x07c00c, 0x07c00d) AM_WRITENOP /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */
AM_RANGE(0x07c00e, 0x07c00f) AM_WRITE(irq_lv2_ack_w)
@@ -500,9 +500,9 @@ static ADDRESS_MAP_START( armedf_map, AS_PROGRAM, 16, armedf_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x061000, 0x065fff) AM_RAM
- AM_RANGE(0x066000, 0x066fff) AM_RAM_WRITE_LEGACY(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
- AM_RANGE(0x067000, 0x067fff) AM_RAM_WRITE_LEGACY(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0x068000, 0x069fff) AM_READWRITE8_LEGACY(armedf_text_videoram_r,armedf_text_videoram_w,0x00ff)
+ AM_RANGE(0x066000, 0x066fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x067000, 0x067fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0x068000, 0x069fff) AM_READWRITE8(armedf_text_videoram_r,armedf_text_videoram_w,0x00ff)
AM_RANGE(0x06a000, 0x06afff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x06b000, 0x06bfff) AM_RAM AM_BASE(m_spr_pal_clut)
AM_RANGE(0x06c000, 0x06c001) AM_READ_PORT("P1")
@@ -511,10 +511,10 @@ static ADDRESS_MAP_START( armedf_map, AS_PROGRAM, 16, armedf_state )
AM_RANGE(0x06c006, 0x06c007) AM_READ_PORT("DSW2")
AM_RANGE(0x06c000, 0x06c7ff) AM_RAM
AM_RANGE(0x06d000, 0x06d001) AM_WRITE(terraf_io_w)
- AM_RANGE(0x06d002, 0x06d003) AM_WRITE_LEGACY(armedf_bg_scrollx_w)
- AM_RANGE(0x06d004, 0x06d005) AM_WRITE_LEGACY(armedf_bg_scrolly_w)
- AM_RANGE(0x06d006, 0x06d007) AM_WRITE_LEGACY(armedf_fg_scrollx_w)
- AM_RANGE(0x06d008, 0x06d009) AM_WRITE_LEGACY(armedf_fg_scrolly_w)
+ AM_RANGE(0x06d002, 0x06d003) AM_WRITE(armedf_bg_scrollx_w)
+ AM_RANGE(0x06d004, 0x06d005) AM_WRITE(armedf_bg_scrolly_w)
+ AM_RANGE(0x06d006, 0x06d007) AM_WRITE(armedf_fg_scrollx_w)
+ AM_RANGE(0x06d008, 0x06d009) AM_WRITE(armedf_fg_scrolly_w)
AM_RANGE(0x06d00a, 0x06d00b) AM_WRITE(sound_command_w)
AM_RANGE(0x06d00c, 0x06d00d) AM_WRITENOP //watchdog
AM_RANGE(0x06d00e, 0x06d00f) AM_WRITE(irq_lv1_ack_w)
@@ -675,9 +675,9 @@ static ADDRESS_MAP_START( bigfghtr_map, AS_PROGRAM, 16, bigfghtr_state )
AM_RANGE(0x080000, 0x0805ff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x080600, 0x083fff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(m_sharedram)
AM_RANGE(0x084000, 0x085fff) AM_RAM //work ram
- AM_RANGE(0x086000, 0x086fff) AM_RAM_WRITE_LEGACY(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
- AM_RANGE(0x087000, 0x087fff) AM_RAM_WRITE_LEGACY(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0x088000, 0x089fff) AM_READWRITE8_LEGACY(armedf_text_videoram_r,armedf_text_videoram_w,0x00ff)
+ AM_RANGE(0x086000, 0x086fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x087000, 0x087fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0x088000, 0x089fff) AM_READWRITE8(armedf_text_videoram_r,armedf_text_videoram_w,0x00ff)
AM_RANGE(0x08a000, 0x08afff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08b000, 0x08bfff) AM_RAM AM_BASE(m_spr_pal_clut)
AM_RANGE(0x08c000, 0x08c001) AM_READ_PORT("P1")
@@ -685,10 +685,10 @@ static ADDRESS_MAP_START( bigfghtr_map, AS_PROGRAM, 16, bigfghtr_state )
AM_RANGE(0x08c004, 0x08c005) AM_READ_PORT("DSW0")
AM_RANGE(0x08c006, 0x08c007) AM_READ_PORT("DSW1")
AM_RANGE(0x08d000, 0x08d001) AM_WRITE(terraf_io_w) //807b0
- AM_RANGE(0x08d002, 0x08d003) AM_WRITE_LEGACY(armedf_bg_scrollx_w)
- AM_RANGE(0x08d004, 0x08d005) AM_WRITE_LEGACY(armedf_bg_scrolly_w)
- AM_RANGE(0x08d006, 0x08d007) AM_WRITE_LEGACY(armedf_fg_scrollx_w)
- AM_RANGE(0x08d008, 0x08d009) AM_WRITE_LEGACY(armedf_fg_scrolly_w)
+ AM_RANGE(0x08d002, 0x08d003) AM_WRITE(armedf_bg_scrollx_w)
+ AM_RANGE(0x08d004, 0x08d005) AM_WRITE(armedf_bg_scrolly_w)
+ AM_RANGE(0x08d006, 0x08d007) AM_WRITE(armedf_fg_scrollx_w)
+ AM_RANGE(0x08d008, 0x08d009) AM_WRITE(armedf_fg_scrolly_w)
AM_RANGE(0x08d00a, 0x08d00b) AM_WRITE(sound_command_w)
AM_RANGE(0x08d00c, 0x08d00d) AM_WRITENOP //watchdog
AM_RANGE(0x08d00e, 0x08d00f) AM_WRITE(irq_lv1_ack_w)
@@ -2042,9 +2042,9 @@ static DRIVER_INIT( terraf )
state->m_scroll_type = 0;
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::bootleg_io_w),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x07c006, 0x07c007, FUNC(terraf_fg_scrolly_w) );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x07c008, 0x07c009, FUNC(terraf_fg_scrollx_w) );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x0c0000, 0x0c0001, FUNC(terraf_fg_scroll_msb_arm_w) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07c006, 0x07c007, write16_delegate(FUNC(armedf_state::terraf_fg_scrolly_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07c008, 0x07c009, write16_delegate(FUNC(armedf_state::terraf_fg_scrollx_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0c0000, 0x0c0001, write16_delegate(FUNC(armedf_state::terraf_fg_scroll_msb_arm_w),state));
}
static DRIVER_INIT( terrafu )
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index b229ac8a842..8614dd0657a 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -506,7 +506,7 @@ static const tms34010_config tms_config =
static ADDRESS_MAP_START( tms_map, AS_PROGRAM, 16, artmagic_state )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_BASE(m_vram0)
AM_RANGE(0x00400000, 0x005fffff) AM_RAM AM_BASE(m_vram1)
- AM_RANGE(0x00800000, 0x0080007f) AM_READWRITE_LEGACY(artmagic_blitter_r, artmagic_blitter_w)
+ AM_RANGE(0x00800000, 0x0080007f) AM_READWRITE(artmagic_blitter_r, artmagic_blitter_w)
AM_RANGE(0x00c00000, 0x00c000ff) AM_DEVREADWRITE8_LEGACY("tlc34076", tlc34076_r, tlc34076_w, 0x00ff)
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE_LEGACY(tms34010_io_register_r, tms34010_io_register_w)
AM_RANGE(0xffe00000, 0xffffffff) AM_RAM
@@ -516,7 +516,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( stonebal_tms_map, AS_PROGRAM, 16, artmagic_state )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_BASE(m_vram0)
AM_RANGE(0x00400000, 0x005fffff) AM_RAM AM_BASE(m_vram1)
- AM_RANGE(0x00800000, 0x0080007f) AM_READWRITE_LEGACY(artmagic_blitter_r, artmagic_blitter_w)
+ AM_RANGE(0x00800000, 0x0080007f) AM_READWRITE(artmagic_blitter_r, artmagic_blitter_w)
AM_RANGE(0x00c00000, 0x00c000ff) AM_DEVREADWRITE8_LEGACY("tlc34076", tlc34076_r, tlc34076_w, 0x00ff)
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE_LEGACY(tms34010_io_register_r, tms34010_io_register_w)
AM_RANGE(0xffc00000, 0xffffffff) AM_RAM
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index 8da2718cb5a..2584bf3fcde 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -97,13 +97,13 @@ WRITE16_MEMBER(ashnojoe_state::ashnojoe_soundlatch_w)
static ADDRESS_MAP_START( ashnojoe_map, AS_PROGRAM, 16, ashnojoe_state )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
- AM_RANGE(0x040000, 0x041fff) AM_RAM_WRITE_LEGACY(ashnojoe_tileram3_w) AM_BASE(m_tileram_3)
- AM_RANGE(0x042000, 0x043fff) AM_RAM_WRITE_LEGACY(ashnojoe_tileram4_w) AM_BASE(m_tileram_4)
- AM_RANGE(0x044000, 0x044fff) AM_RAM_WRITE_LEGACY(ashnojoe_tileram5_w) AM_BASE(m_tileram_5)
- AM_RANGE(0x045000, 0x045fff) AM_RAM_WRITE_LEGACY(ashnojoe_tileram2_w) AM_BASE(m_tileram_2)
- AM_RANGE(0x046000, 0x046fff) AM_RAM_WRITE_LEGACY(ashnojoe_tileram6_w) AM_BASE(m_tileram_6)
- AM_RANGE(0x047000, 0x047fff) AM_RAM_WRITE_LEGACY(ashnojoe_tileram7_w) AM_BASE(m_tileram_7)
- AM_RANGE(0x048000, 0x048fff) AM_RAM_WRITE_LEGACY(ashnojoe_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x040000, 0x041fff) AM_RAM_WRITE(ashnojoe_tileram3_w) AM_BASE(m_tileram_3)
+ AM_RANGE(0x042000, 0x043fff) AM_RAM_WRITE(ashnojoe_tileram4_w) AM_BASE(m_tileram_4)
+ AM_RANGE(0x044000, 0x044fff) AM_RAM_WRITE(ashnojoe_tileram5_w) AM_BASE(m_tileram_5)
+ AM_RANGE(0x045000, 0x045fff) AM_RAM_WRITE(ashnojoe_tileram2_w) AM_BASE(m_tileram_2)
+ AM_RANGE(0x046000, 0x046fff) AM_RAM_WRITE(ashnojoe_tileram6_w) AM_BASE(m_tileram_6)
+ AM_RANGE(0x047000, 0x047fff) AM_RAM_WRITE(ashnojoe_tileram7_w) AM_BASE(m_tileram_7)
+ AM_RANGE(0x048000, 0x048fff) AM_RAM_WRITE(ashnojoe_tileram_w) AM_BASE(m_tileram)
AM_RANGE(0x049000, 0x049fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x04a000, 0x04a001) AM_READ_PORT("P1")
AM_RANGE(0x04a002, 0x04a003) AM_READ_PORT("P2")
@@ -111,8 +111,8 @@ static ADDRESS_MAP_START( ashnojoe_map, AS_PROGRAM, 16, ashnojoe_state )
AM_RANGE(0x04a006, 0x04a007) AM_WRITEONLY AM_BASE(m_tilemap_reg)
AM_RANGE(0x04a008, 0x04a009) AM_WRITE(ashnojoe_soundlatch_w)
AM_RANGE(0x04a00a, 0x04a00b) AM_READ(fake_4a00a_r) // ??
- AM_RANGE(0x04a010, 0x04a019) AM_WRITE_LEGACY(joe_tilemaps_xscroll_w)
- AM_RANGE(0x04a020, 0x04a029) AM_WRITE_LEGACY(joe_tilemaps_yscroll_w)
+ AM_RANGE(0x04a010, 0x04a019) AM_WRITE(joe_tilemaps_xscroll_w)
+ AM_RANGE(0x04a020, 0x04a029) AM_WRITE(joe_tilemaps_yscroll_w)
AM_RANGE(0x04c000, 0x04ffff) AM_RAM
AM_RANGE(0x080000, 0x0bffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 10a63d640a8..0fb0aab6ced 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -181,7 +181,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, asterix_state )
AM_RANGE(0x380100, 0x380101) AM_WRITE(control2_w)
AM_RANGE(0x380200, 0x380203) AM_DEVREADWRITE8_LEGACY("k053260", asterix_sound_r, k053260_w, 0x00ff)
AM_RANGE(0x380300, 0x380301) AM_WRITE(sound_irq_w)
- AM_RANGE(0x380400, 0x380401) AM_WRITE_LEGACY(asterix_spritebank_w)
+ AM_RANGE(0x380400, 0x380401) AM_WRITE(asterix_spritebank_w)
AM_RANGE(0x380500, 0x38051f) AM_DEVWRITE_LEGACY("k053251", k053251_lsb_w)
AM_RANGE(0x380600, 0x380601) AM_NOP // Watchdog
AM_RANGE(0x380700, 0x380707) AM_DEVWRITE_LEGACY("k056832", k056832_b_word_w)
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index dc99cfc04ba..d42716a3827 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -239,11 +239,11 @@ static ADDRESS_MAP_START( asteroid_map, AS_PROGRAM, 8, asteroid_state )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x02ff) AM_RAMBANK("bank1") AM_BASE(m_ram1)
AM_RANGE(0x0300, 0x03ff) AM_RAMBANK("bank2") AM_BASE(m_ram2)
- AM_RANGE(0x2000, 0x2007) AM_READ_LEGACY(asteroid_IN0_r) /* IN0 */
- AM_RANGE(0x2400, 0x2407) AM_READ_LEGACY(asteroid_IN1_r) /* IN1 */
- AM_RANGE(0x2800, 0x2803) AM_READ_LEGACY(asteroid_DSW1_r) /* DSW1 */
+ AM_RANGE(0x2000, 0x2007) AM_READ(asteroid_IN0_r) /* IN0 */
+ AM_RANGE(0x2400, 0x2407) AM_READ(asteroid_IN1_r) /* IN1 */
+ AM_RANGE(0x2800, 0x2803) AM_READ(asteroid_DSW1_r) /* DSW1 */
AM_RANGE(0x3000, 0x3000) AM_WRITE_LEGACY(avgdvg_go_w)
- AM_RANGE(0x3200, 0x3200) AM_WRITE_LEGACY(asteroid_bank_switch_w)
+ AM_RANGE(0x3200, 0x3200) AM_WRITE(asteroid_bank_switch_w)
AM_RANGE(0x3400, 0x3400) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x3600, 0x3600) AM_DEVWRITE_LEGACY("discrete", asteroid_explode_w)
AM_RANGE(0x3a00, 0x3a00) AM_DEVWRITE_LEGACY("discrete", asteroid_thump_w)
@@ -260,9 +260,9 @@ static ADDRESS_MAP_START( astdelux_map, AS_PROGRAM, 8, asteroid_state )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x02ff) AM_RAMBANK("bank1") AM_BASE(m_ram1)
AM_RANGE(0x0300, 0x03ff) AM_RAMBANK("bank2") AM_BASE(m_ram2)
- AM_RANGE(0x2000, 0x2007) AM_READ_LEGACY(asteroid_IN0_r) /* IN0 */
- AM_RANGE(0x2400, 0x2407) AM_READ_LEGACY(asteroid_IN1_r) /* IN1 */
- AM_RANGE(0x2800, 0x2803) AM_READ_LEGACY(asteroid_DSW1_r) /* DSW1 */
+ AM_RANGE(0x2000, 0x2007) AM_READ(asteroid_IN0_r) /* IN0 */
+ AM_RANGE(0x2400, 0x2407) AM_READ(asteroid_IN1_r) /* IN1 */
+ AM_RANGE(0x2800, 0x2803) AM_READ(asteroid_DSW1_r) /* DSW1 */
AM_RANGE(0x2c00, 0x2c0f) AM_DEVREADWRITE_LEGACY("pokey", pokey_r, pokey_w)
AM_RANGE(0x2c40, 0x2c7f) AM_DEVREAD("earom", atari_vg_earom_device, read)
AM_RANGE(0x3000, 0x3000) AM_WRITE_LEGACY(avgdvg_go_w)
@@ -270,9 +270,9 @@ static ADDRESS_MAP_START( astdelux_map, AS_PROGRAM, 8, asteroid_state )
AM_RANGE(0x3400, 0x3400) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x3600, 0x3600) AM_DEVWRITE_LEGACY("discrete", asteroid_explode_w)
AM_RANGE(0x3a00, 0x3a00) AM_DEVWRITE("earom", atari_vg_earom_device, ctrl_w)
- AM_RANGE(0x3c00, 0x3c01) AM_WRITE_LEGACY(astdelux_led_w)
+ AM_RANGE(0x3c00, 0x3c01) AM_WRITE(astdelux_led_w)
AM_RANGE(0x3c03, 0x3c03) AM_DEVWRITE_LEGACY("discrete", astdelux_sounds_w)
- AM_RANGE(0x3c04, 0x3c04) AM_WRITE_LEGACY(astdelux_bank_switch_w)
+ AM_RANGE(0x3c04, 0x3c04) AM_WRITE(astdelux_bank_switch_w)
AM_RANGE(0x3c05, 0x3c07) AM_WRITE(astdelux_coin_counter_w)
AM_RANGE(0x3e00, 0x3e00) AM_DEVWRITE_LEGACY("discrete", asteroid_noise_reset_w)
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("maincpu", 0x4000)
@@ -285,8 +285,8 @@ static ADDRESS_MAP_START( llander_map, AS_PROGRAM, 8, asteroid_state )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x00ff) AM_RAM AM_MIRROR(0x1f00)
AM_RANGE(0x2000, 0x2000) AM_READ_PORT("IN0")
- AM_RANGE(0x2400, 0x2407) AM_READ_LEGACY(asteroid_IN1_r) /* IN1 */
- AM_RANGE(0x2800, 0x2803) AM_READ_LEGACY(asteroid_DSW1_r) /* DSW1 */
+ AM_RANGE(0x2400, 0x2407) AM_READ(asteroid_IN1_r) /* IN1 */
+ AM_RANGE(0x2800, 0x2803) AM_READ(asteroid_DSW1_r) /* DSW1 */
AM_RANGE(0x2c00, 0x2c00) AM_READ_PORT("THRUST")
AM_RANGE(0x3000, 0x3000) AM_WRITE_LEGACY(avgdvg_go_w)
AM_RANGE(0x3200, 0x3200) AM_WRITE(llander_led_w)
@@ -941,7 +941,8 @@ static DRIVER_INIT( asteroidb )
static DRIVER_INIT( asterock )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x2000, 0x2007, FUNC(asterock_IN0_r));
+ asteroid_state *state = machine.driver_data<asteroid_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x2000, 0x2007, read8_delegate(FUNC(asteroid_state::asterock_IN0_r),state));
}
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index 40378622c76..7e3d64a352c 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -433,7 +433,7 @@ WRITE8_MEMBER(astrocde_state::profpac_banksw_w)
/* bank 0 reads video RAM in the 4000-7FFF range */
if (bank == 0)
- prog_space->install_legacy_read_handler(0x4000, 0x7fff, FUNC(profpac_videoram_r));
+ prog_space->install_read_handler(0x4000, 0x7fff, read8_delegate(FUNC(astrocde_state::profpac_videoram_r),this));
/* if we have a 640k EPROM board, map that on top of the 4000-7FFF range if specified */
if ((data & 0x80) && machine().region("user2")->base() != NULL)
@@ -584,7 +584,7 @@ WRITE8_MEMBER(astrocde_state::tenpindx_lights_w)
static ADDRESS_MAP_START( seawolf2_map, AS_PROGRAM, 8, astrocde_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x0000, 0x3fff) AM_WRITE_LEGACY(astrocade_funcgen_w)
+ AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0xc000, 0xc3ff) AM_RAM
ADDRESS_MAP_END
@@ -592,14 +592,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ebases_map, AS_PROGRAM, 8, astrocde_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x0000, 0x3fff) AM_WRITE_LEGACY(astrocade_funcgen_w)
+ AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE(m_videoram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( spacezap_map, AS_PROGRAM, 8, astrocde_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x0000, 0x3fff) AM_WRITE_LEGACY(astrocade_funcgen_w)
+ AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0xd000, 0xd03f) AM_READWRITE(protected_ram_r, protected_ram_w) AM_BASE(m_protected_ram)
AM_RANGE(0xd040, 0xd7ff) AM_RAM
@@ -608,7 +608,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( wow_map, AS_PROGRAM, 8, astrocde_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x0000, 0x3fff) AM_WRITE_LEGACY(astrocade_funcgen_w)
+ AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0x8000, 0xcfff) AM_ROM
AM_RANGE(0xd000, 0xd03f) AM_READWRITE(protected_ram_r, protected_ram_w) AM_BASE(m_protected_ram)
@@ -618,7 +618,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( robby_map, AS_PROGRAM, 8, astrocde_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x0000, 0x3fff) AM_WRITE_LEGACY(astrocade_funcgen_w)
+ AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0x8000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe1ff) AM_READWRITE(protected_ram_r, protected_ram_w) AM_BASE(m_protected_ram)
@@ -629,8 +629,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( profpac_map, AS_PROGRAM, 8, astrocde_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x0000, 0x3fff) AM_WRITE_LEGACY(astrocade_funcgen_w)
- AM_RANGE(0x4000, 0x7fff) AM_READWRITE_LEGACY(profpac_videoram_r, profpac_videoram_w)
+ AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
+ AM_RANGE(0x4000, 0x7fff) AM_READWRITE(profpac_videoram_r, profpac_videoram_w)
AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe1ff) AM_READWRITE(protected_ram_r, protected_ram_w) AM_BASE(m_protected_ram)
@@ -641,8 +641,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( demndrgn_map, AS_PROGRAM, 8, astrocde_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x0000, 0x3fff) AM_WRITE_LEGACY(astrocade_funcgen_w)
- AM_RANGE(0x4000, 0x7fff) AM_READWRITE_LEGACY(profpac_videoram_r, profpac_videoram_w)
+ AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
+ AM_RANGE(0x4000, 0x7fff) AM_READWRITE(profpac_videoram_r, profpac_videoram_w)
AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("nvram")
@@ -665,43 +665,43 @@ ADDRESS_MAP_END
*************************************/
static ADDRESS_MAP_START( port_map, AS_IO, 8, astrocde_state )
- AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE_LEGACY(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
+ AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( port_map_mono_pattern, AS_IO, 8, astrocde_state )
- AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE_LEGACY(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
- AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE_LEGACY(astrocade_pattern_board_w)
+ AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
+ AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w)
AM_RANGE(0xa55b, 0xa55b) AM_WRITE(protected_ram_enable_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( port_map_stereo_pattern, AS_IO, 8, astrocde_state )
- AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE_LEGACY(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
+ AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
AM_RANGE(0x0050, 0x0058) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_DEVWRITE_LEGACY("astrocade2", astrocade_sound_w)
- AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE_LEGACY(astrocade_pattern_board_w)
+ AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w)
AM_RANGE(0xa55b, 0xa55b) AM_WRITE(protected_ram_enable_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( port_map_16col_pattern, AS_IO, 8, astrocde_state )
- AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE_LEGACY(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
+ AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
AM_RANGE(0x0050, 0x0058) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_DEVWRITE_LEGACY("astrocade2", astrocade_sound_w)
- AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE_LEGACY(astrocade_pattern_board_w)
- AM_RANGE(0x00bf, 0x00bf) AM_MIRROR(0xff00) AM_WRITE_LEGACY(profpac_page_select_w)
- AM_RANGE(0x00c3, 0x00c3) AM_MIRROR(0xff00) AM_READ_LEGACY(profpac_intercept_r)
- AM_RANGE(0x00c0, 0x00c5) AM_MIRROR(0xff00) AM_WRITE_LEGACY(profpac_screenram_ctrl_w)
+ AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w)
+ AM_RANGE(0x00bf, 0x00bf) AM_MIRROR(0xff00) AM_WRITE(profpac_page_select_w)
+ AM_RANGE(0x00c3, 0x00c3) AM_MIRROR(0xff00) AM_READ(profpac_intercept_r)
+ AM_RANGE(0x00c0, 0x00c5) AM_MIRROR(0xff00) AM_WRITE(profpac_screenram_ctrl_w)
AM_RANGE(0x00f3, 0x00f3) AM_MIRROR(0xff00) AM_WRITE(profpac_banksw_w)
AM_RANGE(0xa55b, 0xa55b) AM_WRITE(protected_ram_enable_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( port_map_16col_pattern_nosound, AS_IO, 8, astrocde_state )
- AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE_LEGACY(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
- AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE_LEGACY(astrocade_pattern_board_w)
- AM_RANGE(0x00bf, 0x00bf) AM_MIRROR(0xff00) AM_WRITE_LEGACY(profpac_page_select_w)
- AM_RANGE(0x00c3, 0x00c3) AM_MIRROR(0xff00) AM_READ_LEGACY(profpac_intercept_r)
- AM_RANGE(0x00c0, 0x00c5) AM_MIRROR(0xff00) AM_WRITE_LEGACY(profpac_screenram_ctrl_w)
+ AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
+ AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w)
+ AM_RANGE(0x00bf, 0x00bf) AM_MIRROR(0xff00) AM_WRITE(profpac_page_select_w)
+ AM_RANGE(0x00c3, 0x00c3) AM_MIRROR(0xff00) AM_READ(profpac_intercept_r)
+ AM_RANGE(0x00c0, 0x00c5) AM_MIRROR(0xff00) AM_WRITE(profpac_screenram_ctrl_w)
AM_RANGE(0x00f3, 0x00f3) AM_MIRROR(0xff00) AM_WRITE(profpac_banksw_w)
AM_RANGE(0xa55b, 0xa55b) AM_WRITE(protected_ram_enable_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index f4e97a37e59..2a01885d721 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -316,7 +316,7 @@ static ADDRESS_MAP_START( bonzeadv_map, AS_PROGRAM, 16, asuka_state )
AM_RANGE(0x10c000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x200007) AM_DEVREADWRITE_LEGACY("tc0110pcr", tc0110pcr_word_r, tc0110pcr_step1_word_w)
AM_RANGE(0x390000, 0x390001) AM_READ_PORT("DSWA")
- AM_RANGE(0x3a0000, 0x3a0001) AM_WRITE_LEGACY(asuka_spritectrl_w)
+ AM_RANGE(0x3a0000, 0x3a0001) AM_WRITE(asuka_spritectrl_w)
AM_RANGE(0x3b0000, 0x3b0001) AM_READ_PORT("DSWB")
AM_RANGE(0x3c0000, 0x3c0001) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x3d0000, 0x3d0001) AM_READNOP
@@ -335,7 +335,7 @@ static ADDRESS_MAP_START( asuka_map, AS_PROGRAM, 16, asuka_state )
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x1076f0, 0x1076f1) AM_READNOP /* Mofflott init does dummy reads here */
AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE_LEGACY("tc0110pcr", tc0110pcr_word_r, tc0110pcr_step1_word_w)
- AM_RANGE(0x3a0000, 0x3a0003) AM_WRITE_LEGACY(asuka_spritectrl_w)
+ AM_RANGE(0x3a0000, 0x3a0003) AM_WRITE(asuka_spritectrl_w)
AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
AM_RANGE(0x400000, 0x40000f) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0x00ff)
@@ -347,7 +347,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cadash_map, AS_PROGRAM, 16, asuka_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x080000, 0x080003) AM_WRITE_LEGACY(asuka_spritectrl_w)
+ AM_RANGE(0x080000, 0x080003) AM_WRITE(asuka_spritectrl_w)
AM_RANGE(0x0c0000, 0x0c0001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x0c0002, 0x0c0003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
AM_RANGE(0x100000, 0x107fff) AM_RAM
@@ -365,7 +365,7 @@ static ADDRESS_MAP_START( eto_map, AS_PROGRAM, 16 /* N.B. tc100scn mirror overl
AM_RANGE(0x200000, 0x203fff) AM_RAM
AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0x00ff)
AM_RANGE(0x400000, 0x40000f) AM_DEVREAD8_LEGACY("tc0220ioc", tc0220ioc_r, 0x00ff) /* service mode mirror */
- AM_RANGE(0x4a0000, 0x4a0003) AM_WRITE_LEGACY(asuka_spritectrl_w)
+ AM_RANGE(0x4a0000, 0x4a0003) AM_WRITE(asuka_spritectrl_w)
AM_RANGE(0x4e0000, 0x4e0001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x4e0002, 0x4e0003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE_LEGACY("pc090oj", pc090oj_word_r, pc090oj_word_w) /* sprite ram */
diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c
index f1b033652f1..3594f0be035 100644
--- a/src/mame/drivers/atarifb.c
+++ b/src/mame/drivers/atarifb.c
@@ -149,18 +149,18 @@ static PALETTE_INIT( atarifb )
static ADDRESS_MAP_START( atarifb_map, AS_PROGRAM, 8, atarifb_state )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM
- AM_RANGE(0x0200, 0x025f) AM_RAM_WRITE_LEGACY(atarifb_alpha1_videoram_w) AM_BASE(m_alphap1_videoram)
+ AM_RANGE(0x0200, 0x025f) AM_RAM_WRITE(atarifb_alpha1_videoram_w) AM_BASE(m_alphap1_videoram)
AM_RANGE(0x0260, 0x039f) AM_RAM
- AM_RANGE(0x03a0, 0x03ff) AM_RAM_WRITE_LEGACY(atarifb_alpha2_videoram_w) AM_BASE(m_alphap2_videoram)
- AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE_LEGACY(atarifb_field_videoram_w) AM_BASE(m_field_videoram)
+ AM_RANGE(0x03a0, 0x03ff) AM_RAM_WRITE(atarifb_alpha2_videoram_w) AM_BASE(m_alphap2_videoram)
+ AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE(atarifb_field_videoram_w) AM_BASE(m_field_videoram)
AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x2000, 0x2000) AM_WRITEONLY AM_BASE(m_scroll_register) /* OUT 0 */
- AM_RANGE(0x2001, 0x2001) AM_WRITE_LEGACY(atarifb_out1_w) /* OUT 1 */
- AM_RANGE(0x2002, 0x2002) AM_WRITE_LEGACY(atarifb_out2_w) /* OUT 2 */
- AM_RANGE(0x2003, 0x2003) AM_WRITE_LEGACY(atarifb_out3_w) /* OUT 3 */
+ AM_RANGE(0x2001, 0x2001) AM_WRITE(atarifb_out1_w) /* OUT 1 */
+ AM_RANGE(0x2002, 0x2002) AM_WRITE(atarifb_out2_w) /* OUT 2 */
+ AM_RANGE(0x2003, 0x2003) AM_WRITE(atarifb_out3_w) /* OUT 3 */
AM_RANGE(0x3000, 0x3000) AM_NOP /* Interrupt Acknowledge */
- AM_RANGE(0x4000, 0x4000) AM_READ_LEGACY(atarifb_in0_r)
- AM_RANGE(0x4002, 0x4002) AM_READ_LEGACY(atarifb_in2_r)
+ AM_RANGE(0x4000, 0x4000) AM_READ(atarifb_in0_r)
+ AM_RANGE(0x4002, 0x4002) AM_READ(atarifb_in2_r)
AM_RANGE(0x5000, 0x5000) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x6000, 0x7fff) AM_ROM
ADDRESS_MAP_END
@@ -169,19 +169,19 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( atarifb4_map, AS_PROGRAM, 8, atarifb_state )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM
- AM_RANGE(0x0200, 0x025f) AM_RAM_WRITE_LEGACY(atarifb_alpha1_videoram_w) AM_BASE(m_alphap1_videoram)
+ AM_RANGE(0x0200, 0x025f) AM_RAM_WRITE(atarifb_alpha1_videoram_w) AM_BASE(m_alphap1_videoram)
AM_RANGE(0x0260, 0x039f) AM_RAM
- AM_RANGE(0x03a0, 0x03ff) AM_RAM_WRITE_LEGACY(atarifb_alpha2_videoram_w) AM_BASE(m_alphap2_videoram)
- AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE_LEGACY(atarifb_field_videoram_w) AM_BASE(m_field_videoram)
+ AM_RANGE(0x03a0, 0x03ff) AM_RAM_WRITE(atarifb_alpha2_videoram_w) AM_BASE(m_alphap2_videoram)
+ AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE(atarifb_field_videoram_w) AM_BASE(m_field_videoram)
AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x2000, 0x2000) AM_WRITEONLY AM_BASE(m_scroll_register) /* OUT 0 */
- AM_RANGE(0x2001, 0x2001) AM_WRITE_LEGACY(atarifb4_out1_w) /* OUT 1 */
- AM_RANGE(0x2002, 0x2002) AM_WRITE_LEGACY(atarifb_out2_w) /* OUT 2 */
- AM_RANGE(0x2003, 0x2003) AM_WRITE_LEGACY(atarifb_out3_w) /* OUT 3 */
+ AM_RANGE(0x2001, 0x2001) AM_WRITE(atarifb4_out1_w) /* OUT 1 */
+ AM_RANGE(0x2002, 0x2002) AM_WRITE(atarifb_out2_w) /* OUT 2 */
+ AM_RANGE(0x2003, 0x2003) AM_WRITE(atarifb_out3_w) /* OUT 3 */
AM_RANGE(0x3000, 0x3000) AM_NOP /* Interrupt Acknowledge */
- AM_RANGE(0x4000, 0x4000) AM_READ_LEGACY(atarifb4_in0_r)
+ AM_RANGE(0x4000, 0x4000) AM_READ(atarifb4_in0_r)
AM_RANGE(0x4001, 0x4001) AM_READ_PORT("EXTRA")
- AM_RANGE(0x4002, 0x4002) AM_READ_LEGACY(atarifb4_in2_r)
+ AM_RANGE(0x4002, 0x4002) AM_READ(atarifb4_in2_r)
AM_RANGE(0x5000, 0x5000) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x6000, 0x7fff) AM_ROM
ADDRESS_MAP_END
@@ -190,18 +190,18 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( abaseb_map, AS_PROGRAM, 8, atarifb_state )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM
- AM_RANGE(0x0200, 0x025f) AM_RAM_WRITE_LEGACY(atarifb_alpha1_videoram_w) AM_BASE(m_alphap1_videoram)
+ AM_RANGE(0x0200, 0x025f) AM_RAM_WRITE(atarifb_alpha1_videoram_w) AM_BASE(m_alphap1_videoram)
AM_RANGE(0x0260, 0x039f) AM_RAM
- AM_RANGE(0x03a0, 0x03ff) AM_RAM_WRITE_LEGACY(atarifb_alpha2_videoram_w) AM_BASE(m_alphap2_videoram)
- AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE_LEGACY(atarifb_field_videoram_w) AM_BASE(m_field_videoram)
+ AM_RANGE(0x03a0, 0x03ff) AM_RAM_WRITE(atarifb_alpha2_videoram_w) AM_BASE(m_alphap2_videoram)
+ AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE(atarifb_field_videoram_w) AM_BASE(m_field_videoram)
AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x2000, 0x2000) AM_WRITEONLY AM_BASE(m_scroll_register) /* OUT 0 */
- AM_RANGE(0x2001, 0x2001) AM_WRITE_LEGACY(abaseb_out1_w) /* OUT 1 */
- AM_RANGE(0x2002, 0x2002) AM_WRITE_LEGACY(atarifb_out2_w) /* OUT 2 */
- AM_RANGE(0x2003, 0x2003) AM_WRITE_LEGACY(atarifb_out3_w) /* OUT 3 */
+ AM_RANGE(0x2001, 0x2001) AM_WRITE(abaseb_out1_w) /* OUT 1 */
+ AM_RANGE(0x2002, 0x2002) AM_WRITE(atarifb_out2_w) /* OUT 2 */
+ AM_RANGE(0x2003, 0x2003) AM_WRITE(atarifb_out3_w) /* OUT 3 */
AM_RANGE(0x3000, 0x3000) AM_NOP /* Interrupt Acknowledge */
- AM_RANGE(0x4000, 0x4000) AM_READ_LEGACY(atarifb_in0_r)
- AM_RANGE(0x4002, 0x4002) AM_READ_LEGACY(atarifb_in2_r)
+ AM_RANGE(0x4000, 0x4000) AM_READ(atarifb_in0_r)
+ AM_RANGE(0x4002, 0x4002) AM_READ(atarifb_in2_r)
AM_RANGE(0x5000, 0x5000) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x6000, 0x7fff) AM_ROM
ADDRESS_MAP_END
@@ -210,19 +210,19 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( soccer_map, AS_PROGRAM, 8, atarifb_state )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM
- AM_RANGE(0x0200, 0x025f) AM_RAM_WRITE_LEGACY(atarifb_alpha1_videoram_w) AM_BASE(m_alphap1_videoram)
+ AM_RANGE(0x0200, 0x025f) AM_RAM_WRITE(atarifb_alpha1_videoram_w) AM_BASE(m_alphap1_videoram)
AM_RANGE(0x0260, 0x039f) AM_RAM
- AM_RANGE(0x03a0, 0x03ff) AM_RAM_WRITE_LEGACY(atarifb_alpha2_videoram_w) AM_BASE(m_alphap2_videoram)
- AM_RANGE(0x0800, 0x0bbf) AM_RAM_WRITE_LEGACY(atarifb_field_videoram_w) AM_BASE(m_field_videoram)
+ AM_RANGE(0x03a0, 0x03ff) AM_RAM_WRITE(atarifb_alpha2_videoram_w) AM_BASE(m_alphap2_videoram)
+ AM_RANGE(0x0800, 0x0bbf) AM_RAM_WRITE(atarifb_field_videoram_w) AM_BASE(m_field_videoram)
AM_RANGE(0x0bc0, 0x0bff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x1000, 0x1000) AM_WRITEONLY AM_BASE(m_scroll_register) /* OUT 0 */
- AM_RANGE(0x1001, 0x1001) AM_WRITE_LEGACY(soccer_out1_w) /* OUT 1 */
- AM_RANGE(0x1002, 0x1002) AM_WRITE_LEGACY(soccer_out2_w) /* OUT 2 */
+ AM_RANGE(0x1001, 0x1001) AM_WRITE(soccer_out1_w) /* OUT 1 */
+ AM_RANGE(0x1002, 0x1002) AM_WRITE(soccer_out2_w) /* OUT 2 */
AM_RANGE(0x1004, 0x1004) AM_WRITENOP /* Interrupt Acknowledge */
AM_RANGE(0x1005, 0x1005) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x1800, 0x1800) AM_READ_LEGACY(atarifb4_in0_r)
+ AM_RANGE(0x1800, 0x1800) AM_READ(atarifb4_in0_r)
AM_RANGE(0x1801, 0x1801) AM_READ_PORT("EXTRA")
- AM_RANGE(0x1802, 0x1802) AM_READ_LEGACY(atarifb4_in2_r)
+ AM_RANGE(0x1802, 0x1802) AM_READ(atarifb4_in2_r)
AM_RANGE(0x1803, 0x1803) AM_READ_PORT("DSW1")
AM_RANGE(0x2000, 0x3fff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index d3b23c0f0c3..6a834f10a01 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -48,9 +48,9 @@
static ADDRESS_MAP_START( master_map_program, AS_PROGRAM, 8, leland_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x9fff) AM_ROMBANK("bank1")
- AM_RANGE(0xa000, 0xdfff) AM_ROMBANK("bank2") AM_WRITE_LEGACY(ataxx_battery_ram_w) AM_SHARE("battery")
+ AM_RANGE(0xa000, 0xdfff) AM_ROMBANK("bank2") AM_WRITE(ataxx_battery_ram_w) AM_SHARE("battery")
AM_RANGE(0xe000, 0xf7ff) AM_RAM
- AM_RANGE(0xf800, 0xffff) AM_READWRITE_LEGACY(ataxx_paletteram_and_misc_r, ataxx_paletteram_and_misc_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf800, 0xffff) AM_READWRITE(ataxx_paletteram_and_misc_r, ataxx_paletteram_and_misc_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
@@ -61,8 +61,8 @@ static ADDRESS_MAP_START( master_map_io, AS_IO, 8, leland_state )
AM_RANGE(0x06, 0x06) AM_DEVWRITE_LEGACY("custom", leland_80186_command_lo_w)
AM_RANGE(0x0c, 0x0c) AM_DEVWRITE_LEGACY("custom", ataxx_80186_control_w)
AM_RANGE(0x20, 0x20) AM_DEVREADWRITE_LEGACY("eeprom", ataxx_eeprom_r, ataxx_eeprom_w)
- AM_RANGE(0xd0, 0xef) AM_READWRITE_LEGACY(ataxx_mvram_port_r, ataxx_mvram_port_w)
- AM_RANGE(0xf0, 0xff) AM_READWRITE_LEGACY(ataxx_master_input_r, ataxx_master_output_w)
+ AM_RANGE(0xd0, 0xef) AM_READWRITE(ataxx_mvram_port_r, ataxx_mvram_port_w)
+ AM_RANGE(0xf0, 0xff) AM_READWRITE(ataxx_master_input_r, ataxx_master_output_w)
ADDRESS_MAP_END
@@ -79,15 +79,15 @@ static ADDRESS_MAP_START( slave_map_program, AS_PROGRAM, 8, leland_state )
AM_RANGE(0x2000, 0x9fff) AM_ROMBANK("bank3")
AM_RANGE(0xa000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xefff) AM_RAM
- AM_RANGE(0xfffc, 0xfffd) AM_WRITE_LEGACY(leland_slave_video_addr_w)
- AM_RANGE(0xfffe, 0xfffe) AM_READ_LEGACY(leland_raster_r)
- AM_RANGE(0xffff, 0xffff) AM_WRITE_LEGACY(ataxx_slave_banksw_w)
+ AM_RANGE(0xfffc, 0xfffd) AM_WRITE(leland_slave_video_addr_w)
+ AM_RANGE(0xfffe, 0xfffe) AM_READ(leland_raster_r)
+ AM_RANGE(0xffff, 0xffff) AM_WRITE(ataxx_slave_banksw_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( slave_map_io, AS_IO, 8, leland_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x60, 0x7f) AM_READWRITE_LEGACY(ataxx_svram_port_r, ataxx_svram_port_w)
+ AM_RANGE(0x60, 0x7f) AM_READWRITE(ataxx_svram_port_r, ataxx_svram_port_w)
ADDRESS_MAP_END
@@ -711,7 +711,8 @@ static DRIVER_INIT( ataxx )
leland_rotate_memory(machine, "slave");
/* set up additional input ports */
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0x00, 0x03, FUNC(ataxx_trackball_r));
+ leland_state *state = machine.driver_data<leland_state>();
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0x00, 0x03, read8_delegate(FUNC(leland_state::ataxx_trackball_r),state));
}
@@ -721,7 +722,8 @@ static DRIVER_INIT( ataxxj )
leland_rotate_memory(machine, "slave");
/* set up additional input ports */
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0x00, 0x03, FUNC(ataxx_trackball_r));
+ leland_state *state = machine.driver_data<leland_state>();
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0x00, 0x03, read8_delegate(FUNC(leland_state::ataxx_trackball_r),state));
}
@@ -743,14 +745,15 @@ static DRIVER_INIT( indyheat )
leland_rotate_memory(machine, "slave");
/* set up additional input ports */
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0x00, 0x02, FUNC(indyheat_wheel_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0x08, 0x0b, FUNC(indyheat_analog_r));
+ leland_state *state = machine.driver_data<leland_state>();
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0x00, 0x02, read8_delegate(FUNC(leland_state::indyheat_wheel_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0x08, 0x0b, read8_delegate(FUNC(leland_state::indyheat_analog_r),state));
machine.device("master")->memory().space(AS_IO)->install_read_port(0x0d, 0x0d, "P1");
machine.device("master")->memory().space(AS_IO)->install_read_port(0x0e, 0x0e, "P2");
machine.device("master")->memory().space(AS_IO)->install_read_port(0x0f, 0x0f, "P3");
/* set up additional output ports */
- machine.device("master")->memory().space(AS_IO)->install_legacy_write_handler(0x08, 0x0b, FUNC(indyheat_analog_w));
+ machine.device("master")->memory().space(AS_IO)->install_write_handler(0x08, 0x0b, write8_delegate(FUNC(leland_state::indyheat_analog_w),state));
}
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index 68cc55d8850..fe40c2c68e2 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -200,7 +200,7 @@ WRITE8_MEMBER(atetris_state::nvram_enable_w)
/* full address map derived from schematics */
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, atetris_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
- AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE_LEGACY(atetris_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(atetris_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x2000, 0x20ff) AM_MIRROR(0x0300) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_SHARE("paletteram")
AM_RANGE(0x2400, 0x25ff) AM_MIRROR(0x0200) AM_RAM_WRITE(nvram_w) AM_SHARE("nvram")
AM_RANGE(0x2800, 0x280f) AM_MIRROR(0x03e0) AM_DEVREADWRITE_LEGACY("pokey1", pokey_r, pokey_w)
@@ -217,7 +217,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( atetrisb2_map, AS_PROGRAM, 8, atetris_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
- AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE_LEGACY(atetris_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(atetris_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_SHARE("paletteram")
AM_RANGE(0x2400, 0x25ff) AM_RAM_WRITE(nvram_w) AM_SHARE("nvram")
AM_RANGE(0x2802, 0x2802) AM_DEVWRITE_LEGACY("sn1", sn76496_w)
diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c
index 282b4d6f192..924be34df9e 100644
--- a/src/mame/drivers/aztarac.c
+++ b/src/mame/drivers/aztarac.c
@@ -84,7 +84,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, aztarac_state )
AM_RANGE(0x02700c, 0x02700d) AM_READ_PORT("DIAL")
AM_RANGE(0x02700e, 0x02700f) AM_READ(watchdog_reset16_r)
AM_RANGE(0xff8000, 0xffafff) AM_RAM AM_BASE(m_vectorram)
- AM_RANGE(0xffb000, 0xffb001) AM_WRITE_LEGACY(aztarac_ubr_w)
+ AM_RANGE(0xffb000, 0xffb001) AM_WRITE(aztarac_ubr_w)
AM_RANGE(0xffe000, 0xffffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index 4f8ad08633b..7113d8c2092 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -71,7 +71,7 @@ static WRITE8_DEVICE_HANDLER( bagman_ls259_w )
{
bagman_state *state = device->machine().driver_data<bagman_state>();
address_space *space = device->machine().device("maincpu")->memory().space(AS_PROGRAM);
- bagman_pal16r6_w(space, offset,data); /*this is just a simulation*/
+ state->bagman_pal16r6_w(*space, offset,data); /*this is just a simulation*/
if (state->m_ls259_buf[offset] != (data&1) )
{
@@ -111,13 +111,13 @@ WRITE8_MEMBER(bagman_state::irq_mask_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, bagman_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(bagman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9800, 0x9bff) AM_RAM_WRITE_LEGACY(bagman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(bagman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9800, 0x9bff) AM_RAM_WRITE(bagman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x9c00, 0x9fff) AM_WRITENOP /* written to, but unused */
- AM_RANGE(0xa000, 0xa000) AM_READ_LEGACY(bagman_pal16r6_r)
+ AM_RANGE(0xa000, 0xa000) AM_READ(bagman_pal16r6_r)
//AM_RANGE(0xa800, 0xa805) AM_READ_LEGACY(bagman_ls259_r) /*just for debugging purposes*/
AM_RANGE(0xa000, 0xa000) AM_WRITE(irq_mask_w)
- AM_RANGE(0xa001, 0xa002) AM_WRITE_LEGACY(bagman_flipscreen_w)
+ AM_RANGE(0xa001, 0xa002) AM_WRITE(bagman_flipscreen_w)
AM_RANGE(0xa003, 0xa003) AM_WRITEONLY AM_BASE(m_video_enable)
AM_RANGE(0xc000, 0xffff) AM_ROM /* Super Bagman only */
AM_RANGE(0x9800, 0x981f) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* hidden portion of color RAM */
@@ -140,14 +140,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pickin_map, AS_PROGRAM, 8, bagman_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x7000, 0x77ff) AM_RAM
- AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE_LEGACY(bagman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9800, 0x9bff) AM_RAM_WRITE_LEGACY(bagman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(bagman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9800, 0x9bff) AM_RAM_WRITE(bagman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x9800, 0x981f) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* hidden portion of color RAM */
/* here only to initialize the pointer, */
/* writes are handled by bagman_colorram_w */
AM_RANGE(0x9c00, 0x9fff) AM_WRITENOP /* written to, but unused */
AM_RANGE(0xa000, 0xa000) AM_WRITE(irq_mask_w)
- AM_RANGE(0xa001, 0xa002) AM_WRITE_LEGACY(bagman_flipscreen_w)
+ AM_RANGE(0xa001, 0xa002) AM_WRITE(bagman_flipscreen_w)
AM_RANGE(0xa003, 0xa003) AM_WRITEONLY AM_BASE(m_video_enable)
AM_RANGE(0xa004, 0xa004) AM_WRITE(bagman_coin_counter_w)
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("DSW")
diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c
index 8db7ecd92b1..1648261704e 100644
--- a/src/mame/drivers/balsente.c
+++ b/src/mame/drivers/balsente.c
@@ -244,21 +244,21 @@ DIP locations verified for:
static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8, balsente_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x0800, 0x7fff) AM_RAM_WRITE_LEGACY(balsente_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE_LEGACY(balsente_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0x9000, 0x9007) AM_WRITE_LEGACY(balsente_adc_select_w)
- AM_RANGE(0x9400, 0x9401) AM_READ_LEGACY(balsente_adc_data_r)
- AM_RANGE(0x9800, 0x987f) AM_WRITE_LEGACY(balsente_misc_output_w)
- AM_RANGE(0x9880, 0x989f) AM_WRITE_LEGACY(balsente_random_reset_w)
- AM_RANGE(0x98a0, 0x98bf) AM_WRITE_LEGACY(balsente_rombank_select_w)
- AM_RANGE(0x98c0, 0x98df) AM_WRITE_LEGACY(balsente_palette_select_w)
+ AM_RANGE(0x0800, 0x7fff) AM_RAM_WRITE(balsente_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(balsente_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x9000, 0x9007) AM_WRITE(balsente_adc_select_w)
+ AM_RANGE(0x9400, 0x9401) AM_READ(balsente_adc_data_r)
+ AM_RANGE(0x9800, 0x987f) AM_WRITE(balsente_misc_output_w)
+ AM_RANGE(0x9880, 0x989f) AM_WRITE(balsente_random_reset_w)
+ AM_RANGE(0x98a0, 0x98bf) AM_WRITE(balsente_rombank_select_w)
+ AM_RANGE(0x98c0, 0x98df) AM_WRITE(balsente_palette_select_w)
AM_RANGE(0x98e0, 0x98ff) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x9900, 0x9900) AM_READ_PORT("SWH")
AM_RANGE(0x9901, 0x9901) AM_READ_PORT("SWG")
AM_RANGE(0x9902, 0x9902) AM_READ_PORT("IN0")
AM_RANGE(0x9903, 0x9903) AM_READ_PORT("IN1") AM_WRITENOP
- AM_RANGE(0x9a00, 0x9a03) AM_READ_LEGACY(balsente_random_num_r)
- AM_RANGE(0x9a04, 0x9a05) AM_READWRITE_LEGACY(balsente_m6850_r, balsente_m6850_w)
+ AM_RANGE(0x9a00, 0x9a03) AM_READ(balsente_random_num_r)
+ AM_RANGE(0x9a04, 0x9a05) AM_READWRITE(balsente_m6850_r, balsente_m6850_w)
AM_RANGE(0x9b00, 0x9cff) AM_RAM AM_SHARE("nvram") /* system+cart NOVRAM */
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank2")
@@ -275,19 +275,19 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8, balsente_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x5fff) AM_RAM
- AM_RANGE(0x6000, 0x7fff) AM_WRITE_LEGACY(balsente_m6850_sound_w)
- AM_RANGE(0xe000, 0xffff) AM_READ_LEGACY(balsente_m6850_sound_r)
+ AM_RANGE(0x6000, 0x7fff) AM_WRITE(balsente_m6850_sound_w)
+ AM_RANGE(0xe000, 0xffff) AM_READ(balsente_m6850_sound_r)
ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu2_io_map, AS_IO, 8, balsente_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x03) AM_READWRITE_LEGACY(balsente_counter_8253_r, balsente_counter_8253_w)
- AM_RANGE(0x08, 0x0f) AM_READ_LEGACY(balsente_counter_state_r)
- AM_RANGE(0x08, 0x09) AM_WRITE_LEGACY(balsente_counter_control_w)
- AM_RANGE(0x0a, 0x0b) AM_WRITE_LEGACY(balsente_dac_data_w)
- AM_RANGE(0x0c, 0x0d) AM_WRITE_LEGACY(balsente_register_addr_w)
- AM_RANGE(0x0e, 0x0f) AM_WRITE_LEGACY(balsente_chip_select_w)
+ AM_RANGE(0x00, 0x03) AM_READWRITE(balsente_counter_8253_r, balsente_counter_8253_w)
+ AM_RANGE(0x08, 0x0f) AM_READ(balsente_counter_state_r)
+ AM_RANGE(0x08, 0x09) AM_WRITE(balsente_counter_control_w)
+ AM_RANGE(0x0a, 0x0b) AM_WRITE(balsente_dac_data_w)
+ AM_RANGE(0x0c, 0x0d) AM_WRITE(balsente_register_addr_w)
+ AM_RANGE(0x0e, 0x0f) AM_WRITE(balsente_chip_select_w)
ADDRESS_MAP_END
@@ -2166,48 +2166,55 @@ static DRIVER_INIT( minigolf2 ) { expand_roms(machine, 0x0c); config_shoo
static DRIVER_INIT( toggle ) { expand_roms(machine, EXPAND_ALL); config_shooter_adc(machine, FALSE, 0 /* noanalog */); }
static DRIVER_INIT( nametune )
{
+ balsente_state *state = machine.driver_data<balsente_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- space->install_legacy_write_handler(0x9f00, 0x9f00, FUNC(balsente_rombank2_select_w));
+ space->install_write_handler(0x9f00, 0x9f00, write8_delegate(FUNC(balsente_state::balsente_rombank2_select_w),state));
expand_roms(machine, EXPAND_NONE | SWAP_HALVES); config_shooter_adc(machine, FALSE, 0 /* noanalog */);
}
static DRIVER_INIT( nstocker )
{
+ balsente_state *state = machine.driver_data<balsente_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- space->install_legacy_write_handler(0x9f00, 0x9f00, FUNC(balsente_rombank2_select_w));
+ space->install_write_handler(0x9f00, 0x9f00, write8_delegate(FUNC(balsente_state::balsente_rombank2_select_w),state));
expand_roms(machine, EXPAND_NONE | SWAP_HALVES); config_shooter_adc(machine, TRUE, 1);
}
static DRIVER_INIT( sfootbal )
{
+ balsente_state *state = machine.driver_data<balsente_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- space->install_legacy_write_handler(0x9f00, 0x9f00, FUNC(balsente_rombank2_select_w));
+ space->install_write_handler(0x9f00, 0x9f00, write8_delegate(FUNC(balsente_state::balsente_rombank2_select_w),state));
expand_roms(machine, EXPAND_ALL | SWAP_HALVES); config_shooter_adc(machine, FALSE, 0);
}
static DRIVER_INIT( spiker )
{
+ balsente_state *state = machine.driver_data<balsente_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- space->install_legacy_readwrite_handler(0x9f80, 0x9f8f, FUNC(spiker_expand_r), FUNC(spiker_expand_w));
- space->install_legacy_write_handler(0x9f00, 0x9f00, FUNC(balsente_rombank2_select_w));
+ space->install_readwrite_handler(0x9f80, 0x9f8f, read8_delegate(FUNC(balsente_state::spiker_expand_r),state), write8_delegate(FUNC(balsente_state::spiker_expand_w),state));
+ space->install_write_handler(0x9f00, 0x9f00, write8_delegate(FUNC(balsente_state::balsente_rombank2_select_w),state));
expand_roms(machine, EXPAND_ALL | SWAP_HALVES); config_shooter_adc(machine, FALSE, 1);
}
static DRIVER_INIT( stompin )
{
+ balsente_state *state = machine.driver_data<balsente_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- space->install_legacy_write_handler(0x9f00, 0x9f00, FUNC(balsente_rombank2_select_w));
+ space->install_write_handler(0x9f00, 0x9f00, write8_delegate(FUNC(balsente_state::balsente_rombank2_select_w),state));
expand_roms(machine, 0x0c | SWAP_HALVES); config_shooter_adc(machine, FALSE, 32);
}
static DRIVER_INIT( rescraid ) { expand_roms(machine, EXPAND_NONE); config_shooter_adc(machine, FALSE, 0 /* noanalog */); }
static DRIVER_INIT( grudge )
{
+ balsente_state *state = machine.driver_data<balsente_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- space->install_legacy_read_handler(0x9400, 0x9400, FUNC(grudge_steering_r));
+ space->install_read_handler(0x9400, 0x9400, read8_delegate(FUNC(balsente_state::grudge_steering_r),state));
expand_roms(machine, EXPAND_NONE); config_shooter_adc(machine, FALSE, 0);
}
static DRIVER_INIT( shrike )
{
+ balsente_state *state = machine.driver_data<balsente_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- space->install_legacy_readwrite_handler(0x9e00, 0x9fff, FUNC(shrike_shared_6809_r), FUNC(shrike_shared_6809_w));
- space->install_legacy_write_handler(0x9e01, 0x9e01, FUNC(shrike_sprite_select_w) );
- machine.device("68k")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x10000, 0x1001f, FUNC(shrike_io_68k_r), FUNC(shrike_io_68k_w));
+ space->install_readwrite_handler(0x9e00, 0x9fff, read8_delegate(FUNC(balsente_state::shrike_shared_6809_r),state), write8_delegate(FUNC(balsente_state::shrike_shared_6809_w),state));
+ space->install_write_handler(0x9e01, 0x9e01, write8_delegate(FUNC(balsente_state::shrike_sprite_select_w),state));
+ machine.device("68k")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x10000, 0x1001f, read16_delegate(FUNC(balsente_state::shrike_io_68k_r),state), write16_delegate(FUNC(balsente_state::shrike_io_68k_w),state));
expand_roms(machine, EXPAND_ALL); config_shooter_adc(machine, FALSE, 32);
}
diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c
index f89afa89989..7f799561531 100644
--- a/src/mame/drivers/bankp.c
+++ b/src/mame/drivers/bankp.c
@@ -106,10 +106,10 @@
static ADDRESS_MAP_START( bankp_map, AS_PROGRAM, 8, bankp_state )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xefff) AM_RAM
- AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE_LEGACY(bankp_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE_LEGACY(bankp_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xf800, 0xfbff) AM_RAM_WRITE_LEGACY(bankp_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0xfc00, 0xffff) AM_RAM_WRITE_LEGACY(bankp_colorram2_w) AM_BASE(m_colorram2)
+ AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(bankp_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(bankp_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xf800, 0xfbff) AM_RAM_WRITE(bankp_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xfc00, 0xffff) AM_RAM_WRITE(bankp_colorram2_w) AM_BASE(m_colorram2)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bankp_io_map, AS_IO, 8, bankp_state )
@@ -118,8 +118,8 @@ static ADDRESS_MAP_START( bankp_io_map, AS_IO, 8, bankp_state )
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_DEVWRITE_LEGACY("sn2", sn76496_w)
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE_LEGACY("sn3", sn76496_w)
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW1")
- AM_RANGE(0x05, 0x05) AM_WRITE_LEGACY(bankp_scroll_w)
- AM_RANGE(0x07, 0x07) AM_WRITE_LEGACY(bankp_out_w)
+ AM_RANGE(0x05, 0x05) AM_WRITE(bankp_scroll_w)
+ AM_RANGE(0x07, 0x07) AM_WRITE(bankp_out_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index a392352ad37..e1beb974b43 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -161,14 +161,14 @@ WRITE8_MEMBER(baraduke_state::baraduke_irq_ack_w)
static ADDRESS_MAP_START( baraduke_map, AS_PROGRAM, 8, baraduke_state )
- AM_RANGE(0x0000, 0x1fff) AM_READWRITE_LEGACY(baraduke_spriteram_r,baraduke_spriteram_w) AM_BASE(m_spriteram) /* Sprite RAM */
- AM_RANGE(0x2000, 0x3fff) AM_READWRITE_LEGACY(baraduke_videoram_r,baraduke_videoram_w) AM_BASE(m_videoram) /* Video RAM */
+ AM_RANGE(0x0000, 0x1fff) AM_READWRITE(baraduke_spriteram_r,baraduke_spriteram_w) AM_BASE(m_spriteram) /* Sprite RAM */
+ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(baraduke_videoram_r,baraduke_videoram_w) AM_BASE(m_videoram) /* Video RAM */
AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE_LEGACY("namco", namcos1_cus30_r,namcos1_cus30_w) /* PSG device, shared RAM */
- AM_RANGE(0x4800, 0x4fff) AM_READWRITE_LEGACY(baraduke_textram_r,baraduke_textram_w) AM_BASE(m_textram)/* video RAM (text layer) */
+ AM_RANGE(0x4800, 0x4fff) AM_READWRITE(baraduke_textram_r,baraduke_textram_w) AM_BASE(m_textram)/* video RAM (text layer) */
AM_RANGE(0x8000, 0x8000) AM_WRITE(watchdog_reset_w) /* watchdog reset */
AM_RANGE(0x8800, 0x8800) AM_WRITE(baraduke_irq_ack_w) /* irq acknowledge */
- AM_RANGE(0xb000, 0xb002) AM_WRITE_LEGACY(baraduke_scroll0_w) /* scroll (layer 0) */
- AM_RANGE(0xb004, 0xb006) AM_WRITE_LEGACY(baraduke_scroll1_w) /* scroll (layer 1) */
+ AM_RANGE(0xb000, 0xb002) AM_WRITE(baraduke_scroll0_w) /* scroll (layer 0) */
+ AM_RANGE(0xb004, 0xb006) AM_WRITE(baraduke_scroll1_w) /* scroll (layer 1) */
AM_RANGE(0x6000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index 6e5edfbc66e..b1d5e6dd6be 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -99,15 +99,15 @@ static INTERRUPT_GEN( battlane_cpu1_interrupt )
static ADDRESS_MAP_START( battlane_map, AS_PROGRAM, 8, battlane_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE_LEGACY(battlane_tileram_w) AM_SHARE("share2") AM_BASE(m_tileram)
- AM_RANGE(0x1800, 0x18ff) AM_RAM_WRITE_LEGACY(battlane_spriteram_w) AM_SHARE("share3") AM_BASE(m_spriteram)
- AM_RANGE(0x1c00, 0x1c00) AM_READ_PORT("P1") AM_WRITE_LEGACY(battlane_video_ctrl_w)
- AM_RANGE(0x1c01, 0x1c01) AM_READ_PORT("P2") AM_WRITE_LEGACY(battlane_scrollx_w)
- AM_RANGE(0x1c02, 0x1c02) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(battlane_scrolly_w)
+ AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE(battlane_tileram_w) AM_SHARE("share2") AM_BASE(m_tileram)
+ AM_RANGE(0x1800, 0x18ff) AM_RAM_WRITE(battlane_spriteram_w) AM_SHARE("share3") AM_BASE(m_spriteram)
+ AM_RANGE(0x1c00, 0x1c00) AM_READ_PORT("P1") AM_WRITE(battlane_video_ctrl_w)
+ AM_RANGE(0x1c01, 0x1c01) AM_READ_PORT("P2") AM_WRITE(battlane_scrollx_w)
+ AM_RANGE(0x1c02, 0x1c02) AM_READ_PORT("DSW1") AM_WRITE(battlane_scrolly_w)
AM_RANGE(0x1c03, 0x1c03) AM_READ_PORT("DSW2") AM_WRITE(battlane_cpu_command_w)
AM_RANGE(0x1c04, 0x1c05) AM_DEVREADWRITE_LEGACY("ymsnd", ym3526_r, ym3526_w)
- AM_RANGE(0x1e00, 0x1e3f) AM_WRITE_LEGACY(battlane_palette_w)
- AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE_LEGACY(battlane_bitmap_w) AM_SHARE("share4")
+ AM_RANGE(0x1e00, 0x1e3f) AM_WRITE(battlane_palette_w)
+ AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(battlane_bitmap_w) AM_SHARE("share4")
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c
index bfffcc46843..bbd5f7f3072 100644
--- a/src/mame/drivers/battlera.c
+++ b/src/mame/drivers/battlera.c
@@ -65,19 +65,19 @@ READ8_MEMBER(battlera_state::control_data_r)
static ADDRESS_MAP_START( battlera_map, AS_PROGRAM, 8, battlera_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
- AM_RANGE(0x100000, 0x10ffff) AM_READWRITE_LEGACY(HuC6270_debug_r, HuC6270_debug_w) /* Cheat to edit vram data */
+ AM_RANGE(0x100000, 0x10ffff) AM_READWRITE(HuC6270_debug_r, HuC6270_debug_w) /* Cheat to edit vram data */
AM_RANGE(0x1e0800, 0x1e0801) AM_WRITE(battlera_sound_w)
- AM_RANGE(0x1e1000, 0x1e13ff) AM_WRITE_LEGACY(battlera_palette_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1e1000, 0x1e13ff) AM_WRITE(battlera_palette_w) AM_SHARE("paletteram")
AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") /* Main ram */
- AM_RANGE(0x1fe000, 0x1fe001) AM_READWRITE_LEGACY(HuC6270_register_r, HuC6270_register_w)
- AM_RANGE(0x1fe002, 0x1fe003) AM_WRITE_LEGACY(HuC6270_data_w)
+ AM_RANGE(0x1fe000, 0x1fe001) AM_READWRITE(HuC6270_register_r, HuC6270_register_w)
+ AM_RANGE(0x1fe002, 0x1fe003) AM_WRITE(HuC6270_data_w)
AM_RANGE(0x1ff000, 0x1ff001) AM_READWRITE(control_data_r, control_data_w)
AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE_LEGACY(h6280_irq_status_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( battlera_portmap, AS_IO, 8, battlera_state )
- AM_RANGE(0x00, 0x01) AM_WRITE_LEGACY(HuC6270_register_w)
- AM_RANGE(0x02, 0x03) AM_WRITE_LEGACY(HuC6270_data_w)
+ AM_RANGE(0x00, 0x01) AM_WRITE(HuC6270_register_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(HuC6270_data_w)
ADDRESS_MAP_END
/******************************************************************************/
diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c
index 89a1ebaeb83..fa4254ebf2a 100644
--- a/src/mame/drivers/battlex.c
+++ b/src/mame/drivers/battlex.c
@@ -77,10 +77,10 @@ static CUSTOM_INPUT( battlex_in0_b4_r )
static ADDRESS_MAP_START( battlex_map, AS_PROGRAM, 8, battlex_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
- AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE_LEGACY(battlex_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(battlex_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x9000, 0x91ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xa000, 0xa3ff) AM_RAM
- AM_RANGE(0xe000, 0xe03f) AM_RAM_WRITE_LEGACY(battlex_palette_w)
+ AM_RANGE(0xe000, 0xe03f) AM_RAM_WRITE(battlex_palette_w)
ADDRESS_MAP_END
@@ -90,13 +90,13 @@ static ADDRESS_MAP_START( io_map, AS_IO, 8, battlex_state )
AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM")
AM_RANGE(0x02, 0x02) AM_READ_PORT("INPUTS")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW2")
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(battlex_flipscreen_w)
+ AM_RANGE(0x10, 0x10) AM_WRITE(battlex_flipscreen_w)
/* verify all of these */
AM_RANGE(0x22, 0x23) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
- AM_RANGE(0x30, 0x30) AM_WRITE_LEGACY(battlex_scroll_starfield_w)
- AM_RANGE(0x32, 0x32) AM_WRITE_LEGACY(battlex_scroll_x_lsb_w)
- AM_RANGE(0x33, 0x33) AM_WRITE_LEGACY(battlex_scroll_x_msb_w)
+ AM_RANGE(0x30, 0x30) AM_WRITE(battlex_scroll_starfield_w)
+ AM_RANGE(0x32, 0x32) AM_WRITE(battlex_scroll_x_lsb_w)
+ AM_RANGE(0x33, 0x33) AM_WRITE(battlex_scroll_x_msb_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c
index 775a5277d72..216cac6f552 100644
--- a/src/mame/drivers/battlnts.c
+++ b/src/mame/drivers/battlnts.c
@@ -68,7 +68,7 @@ static ADDRESS_MAP_START( battlnts_map, AS_PROGRAM, 8, battlnts_state )
AM_RANGE(0x2e03, 0x2e03) AM_READ_PORT("DSW3") /* coinsw, testsw, startsw */
AM_RANGE(0x2e04, 0x2e04) AM_READ_PORT("DSW2")
AM_RANGE(0x2e08, 0x2e08) AM_WRITE(battlnts_bankswitch_w) /* bankswitch control */
- AM_RANGE(0x2e0c, 0x2e0c) AM_WRITE_LEGACY(battlnts_spritebank_w) /* sprite bank select */
+ AM_RANGE(0x2e0c, 0x2e0c) AM_WRITE(battlnts_spritebank_w) /* sprite bank select */
AM_RANGE(0x2e10, 0x2e10) AM_WRITE(watchdog_reset_w) /* watchdog reset */
AM_RANGE(0x2e14, 0x2e14) AM_WRITE(soundlatch_w) /* sound code # */
AM_RANGE(0x2e18, 0x2e18) AM_WRITE(battlnts_sh_irqtrigger_w) /* cause interrupt on audio CPU */
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index 1c23b5be366..6a1d144f528 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -325,13 +325,13 @@ READ16_MEMBER(bbusters_state::mechatt_gun_r)
static ADDRESS_MAP_START( bbusters_map, AS_PROGRAM, 16, bbusters_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM AM_BASE(m_ram)
- AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE_LEGACY(bbusters_video_w) AM_BASE(m_videoram)
+ AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE(bbusters_video_w) AM_BASE(m_videoram)
AM_RANGE(0x0a0000, 0x0a0fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x0a1000, 0x0a7fff) AM_RAM /* service mode */
AM_RANGE(0x0a8000, 0x0a8fff) AM_RAM AM_SHARE("spriteram2")
AM_RANGE(0x0a9000, 0x0affff) AM_RAM /* service mode */
- AM_RANGE(0x0b0000, 0x0b1fff) AM_RAM_WRITE_LEGACY(bbusters_pf1_w) AM_BASE(m_pf1_data)
- AM_RANGE(0x0b2000, 0x0b3fff) AM_RAM_WRITE_LEGACY(bbusters_pf2_w) AM_BASE(m_pf2_data)
+ AM_RANGE(0x0b0000, 0x0b1fff) AM_RAM_WRITE(bbusters_pf1_w) AM_BASE(m_pf1_data)
+ AM_RANGE(0x0b2000, 0x0b3fff) AM_RAM_WRITE(bbusters_pf2_w) AM_BASE(m_pf2_data)
AM_RANGE(0x0b4000, 0x0b5fff) AM_RAM /* service mode */
AM_RANGE(0x0b8000, 0x0b8003) AM_WRITEONLY AM_BASE(m_pf1_scroll_data)
AM_RANGE(0x0b8008, 0x0b800b) AM_WRITEONLY AM_BASE(m_pf2_scroll_data)
@@ -355,12 +355,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mechatt_map, AS_PROGRAM, 16, bbusters_state )
AM_RANGE(0x000000, 0x06ffff) AM_ROM
AM_RANGE(0x070000, 0x07ffff) AM_RAM AM_BASE(m_ram)
- AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE_LEGACY(bbusters_video_w) AM_BASE(m_videoram)
+ AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE(bbusters_video_w) AM_BASE(m_videoram)
AM_RANGE(0x0a0000, 0x0a0fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x0a1000, 0x0a7fff) AM_WRITENOP
- AM_RANGE(0x0b0000, 0x0b3fff) AM_RAM_WRITE_LEGACY(bbusters_pf1_w) AM_BASE(m_pf1_data)
+ AM_RANGE(0x0b0000, 0x0b3fff) AM_RAM_WRITE(bbusters_pf1_w) AM_BASE(m_pf1_data)
AM_RANGE(0x0b8000, 0x0b8003) AM_WRITEONLY AM_BASE(m_pf1_scroll_data)
- AM_RANGE(0x0c0000, 0x0c3fff) AM_RAM_WRITE_LEGACY(bbusters_pf2_w) AM_BASE(m_pf2_data)
+ AM_RANGE(0x0c0000, 0x0c3fff) AM_RAM_WRITE(bbusters_pf2_w) AM_BASE(m_pf2_data)
AM_RANGE(0x0c8000, 0x0c8003) AM_WRITEONLY AM_BASE(m_pf2_scroll_data)
AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0e0000, 0x0e0001) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c
index 8a5a8b5b66f..4ac38f931c0 100644
--- a/src/mame/drivers/beezer.c
+++ b/src/mame/drivers/beezer.c
@@ -18,7 +18,7 @@
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, beezer_state )
AM_RANGE(0x0000, 0xbfff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0xc000, 0xcfff) AM_ROMBANK("bank1")
- AM_RANGE(0xd000, 0xdfff) AM_ROM AM_WRITE_LEGACY(beezer_bankswitch_w) // ROM at G1, bankswitch
+ AM_RANGE(0xd000, 0xdfff) AM_ROM AM_WRITE(beezer_bankswitch_w) // ROM at G1, bankswitch
AM_RANGE(0xe000, 0xffff) AM_ROM // ROMS at G3, G5
ADDRESS_MAP_END
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index 823542f00a1..b133ea871f1 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -299,20 +299,20 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, bigevglf_state )
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd7ff) AM_ROMBANK("bank1")
AM_RANGE(0xd800, 0xdbff) AM_RAM AM_SHARE("share1") /* only half of the RAM is accessible, line a10 of IC73 (6116) is GNDed */
- AM_RANGE(0xe000, 0xe7ff) AM_WRITE_LEGACY(bigevglf_palette_w) AM_BASE(m_paletteram)
+ AM_RANGE(0xe000, 0xe7ff) AM_WRITE(bigevglf_palette_w) AM_BASE(m_paletteram)
AM_RANGE(0xe800, 0xefff) AM_WRITEONLY AM_BASE(m_spriteram1) /* sprite 'templates' */
- AM_RANGE(0xf000, 0xf0ff) AM_READWRITE_LEGACY(bigevglf_vidram_r, bigevglf_vidram_w) /* 41464 (64kB * 8 chips), addressed using ports 1 and 5 */
+ AM_RANGE(0xf000, 0xf0ff) AM_READWRITE(bigevglf_vidram_r, bigevglf_vidram_w) /* 41464 (64kB * 8 chips), addressed using ports 1 and 5 */
AM_RANGE(0xf840, 0xf8ff) AM_RAM AM_BASE(m_spriteram2) /* spriteram (x,y,offset in spriteram1,palette) */
ADDRESS_MAP_END
static ADDRESS_MAP_START( bigevglf_portmap, AS_IO, 8, bigevglf_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP /* video ram enable ???*/
- AM_RANGE(0x01, 0x01) AM_WRITE_LEGACY(bigevglf_gfxcontrol_w) /* plane select */
+ AM_RANGE(0x01, 0x01) AM_WRITE(bigevglf_gfxcontrol_w) /* plane select */
AM_RANGE(0x02, 0x02) AM_WRITE(beg_banking_w)
AM_RANGE(0x03, 0x03) AM_WRITE(beg13_a_set_w)
AM_RANGE(0x04, 0x04) AM_WRITE(beg13_b_clr_w)
- AM_RANGE(0x05, 0x05) AM_WRITE_LEGACY(bigevglf_vidram_addr_w) /* video banking (256 banks) for f000-f0ff area */
+ AM_RANGE(0x05, 0x05) AM_WRITE(bigevglf_vidram_addr_w) /* video banking (256 banks) for f000-f0ff area */
AM_RANGE(0x06, 0x06) AM_READ(beg_status_r)
ADDRESS_MAP_END
@@ -336,7 +336,7 @@ READ8_MEMBER(bigevglf_state::sub_cpu_mcu_coin_port_r)
*/
m_mcu_coin_bit5 ^= 0x20;
- return bigevglf_mcu_status_r(&space, 0) | (input_port_read(machine(), "PORT04") & 3) | m_mcu_coin_bit5; /* bit 0 and bit 1 - coin inputs */
+ return bigevglf_mcu_status_r(space, 0) | (input_port_read(machine(), "PORT04") & 3) | m_mcu_coin_bit5; /* bit 0 and bit 1 - coin inputs */
}
static ADDRESS_MAP_START( bigevglf_sub_portmap, AS_IO, 8, bigevglf_state )
@@ -350,8 +350,8 @@ static ADDRESS_MAP_START( bigevglf_sub_portmap, AS_IO, 8, bigevglf_state )
AM_RANGE(0x06, 0x06) AM_READ_PORT("DSW2")
AM_RANGE(0x07, 0x07) AM_READNOP
AM_RANGE(0x08, 0x08) AM_WRITE(beg_port08_w) /* muxed port select + other unknown stuff */
- AM_RANGE(0x0b, 0x0b) AM_READ_LEGACY(bigevglf_mcu_r)
- AM_RANGE(0x0c, 0x0c) AM_WRITE_LEGACY(bigevglf_mcu_w)
+ AM_RANGE(0x0b, 0x0b) AM_READ(bigevglf_mcu_r)
+ AM_RANGE(0x0c, 0x0c) AM_WRITE(bigevglf_mcu_w)
AM_RANGE(0x0e, 0x0e) AM_WRITENOP /* 0-enable MCU, 1-keep reset line ASSERTED; D0 goes to the input of ls74 and the /Q of this ls74 goes to reset line on 68705 */
AM_RANGE(0x10, 0x17) AM_WRITE(beg13_a_clr_w)
AM_RANGE(0x18, 0x1f) AM_WRITE(beg13_b_set_w)
@@ -385,12 +385,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( m68705_map, AS_PROGRAM, 8, bigevglf_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(bigevglf_68705_port_a_r, bigevglf_68705_port_a_w)
- AM_RANGE(0x0001, 0x0001) AM_READWRITE_LEGACY(bigevglf_68705_port_b_r, bigevglf_68705_port_b_w)
- AM_RANGE(0x0002, 0x0002) AM_READWRITE_LEGACY(bigevglf_68705_port_c_r, bigevglf_68705_port_c_w)
- AM_RANGE(0x0004, 0x0004) AM_WRITE_LEGACY(bigevglf_68705_ddr_a_w)
- AM_RANGE(0x0005, 0x0005) AM_WRITE_LEGACY(bigevglf_68705_ddr_b_w)
- AM_RANGE(0x0006, 0x0006) AM_WRITE_LEGACY(bigevglf_68705_ddr_c_w)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(bigevglf_68705_port_a_r, bigevglf_68705_port_a_w)
+ AM_RANGE(0x0001, 0x0001) AM_READWRITE(bigevglf_68705_port_b_r, bigevglf_68705_port_b_w)
+ AM_RANGE(0x0002, 0x0002) AM_READWRITE(bigevglf_68705_port_c_r, bigevglf_68705_port_c_w)
+ AM_RANGE(0x0004, 0x0004) AM_WRITE(bigevglf_68705_ddr_a_w)
+ AM_RANGE(0x0005, 0x0005) AM_WRITE(bigevglf_68705_ddr_b_w)
+ AM_RANGE(0x0006, 0x0006) AM_WRITE(bigevglf_68705_ddr_c_w)
AM_RANGE(0x0010, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c
index 14029de75ec..6a94a49f8a6 100644
--- a/src/mame/drivers/bigstrkb.c
+++ b/src/mame/drivers/bigstrkb.c
@@ -48,9 +48,9 @@ static ADDRESS_MAP_START( bigstrkb_map, AS_PROGRAM, 16, bigstrkb_state )
AM_RANGE(0x0D0000, 0x0dffff) AM_RAM // 0xd2000 - 0xd3fff? 0xd8000?
- AM_RANGE(0x0e0000, 0x0e3fff) AM_RAM_WRITE_LEGACY(bsb_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x0e8000, 0x0ebfff) AM_RAM_WRITE_LEGACY(bsb_videoram3_w) AM_BASE(m_videoram3)
- AM_RANGE(0x0ec000, 0x0effff) AM_RAM_WRITE_LEGACY(bsb_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0e0000, 0x0e3fff) AM_RAM_WRITE(bsb_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x0e8000, 0x0ebfff) AM_RAM_WRITE(bsb_videoram3_w) AM_BASE(m_videoram3)
+ AM_RANGE(0x0ec000, 0x0effff) AM_RAM_WRITE(bsb_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x0f0000, 0x0f7fff) AM_RAM
AM_RANGE(0x0f8000, 0x0f87ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index 71d7776002c..cb658e70f21 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -146,15 +146,15 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, bionicc_state )
AM_RANGE(0xfe0000, 0xfe07ff) AM_RAM /* RAM? */
AM_RANGE(0xfe0800, 0xfe0cff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xfe0d00, 0xfe3fff) AM_RAM /* RAM? */
- AM_RANGE(0xfe4000, 0xfe4001) AM_WRITE_LEGACY(bionicc_gfxctrl_w) /* + coin counters */
+ AM_RANGE(0xfe4000, 0xfe4001) AM_WRITE(bionicc_gfxctrl_w) /* + coin counters */
AM_RANGE(0xfe4000, 0xfe4001) AM_READ_PORT("SYSTEM")
AM_RANGE(0xfe4002, 0xfe4003) AM_READ_PORT("DSW")
- AM_RANGE(0xfe8010, 0xfe8017) AM_WRITE_LEGACY(bionicc_scroll_w)
+ AM_RANGE(0xfe8010, 0xfe8017) AM_WRITE(bionicc_scroll_w)
AM_RANGE(0xfe801a, 0xfe801b) AM_WRITE(bionicc_mpu_trigger_w) /* ??? not sure, but looks like it */
- AM_RANGE(0xfec000, 0xfecfff) AM_RAM_WRITE_LEGACY(bionicc_txvideoram_w) AM_BASE(m_txvideoram)
- AM_RANGE(0xff0000, 0xff3fff) AM_RAM_WRITE_LEGACY(bionicc_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0xff4000, 0xff7fff) AM_RAM_WRITE_LEGACY(bionicc_bgvideoram_w) AM_BASE(m_bgvideoram)
- AM_RANGE(0xff8000, 0xff87ff) AM_RAM_WRITE_LEGACY(bionicc_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0xfec000, 0xfecfff) AM_RAM_WRITE(bionicc_txvideoram_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xff0000, 0xff3fff) AM_RAM_WRITE(bionicc_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xff4000, 0xff7fff) AM_RAM_WRITE(bionicc_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0xff8000, 0xff87ff) AM_RAM_WRITE(bionicc_paletteram_w) AM_BASE(m_paletteram)
AM_RANGE(0xffc000, 0xfffff7) AM_RAM /* working RAM */
AM_RANGE(0xfffff8, 0xfffff9) AM_READWRITE(hacked_soundcommand_r, hacked_soundcommand_w) /* hack */
AM_RANGE(0xfffffa, 0xffffff) AM_READWRITE(hacked_controls_r, hacked_controls_w) /* hack */
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index f66d8c46f7b..e975477ed8f 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -79,45 +79,45 @@ READ8_MEMBER(bking_state::bking3_ext_check_r)
static ADDRESS_MAP_START( bking_map, AS_PROGRAM, 8, bking_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(bking_playfield_w) AM_BASE(m_playfield_ram)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(bking_playfield_w) AM_BASE(m_playfield_ram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bking_io_map, AS_IO, 8, bking_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE_LEGACY(bking_xld1_w)
- AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE_LEGACY(bking_yld1_w)
- AM_RANGE(0x02, 0x02) AM_READ_PORT("DSWA") AM_WRITE_LEGACY(bking_xld2_w)
- AM_RANGE(0x03, 0x03) AM_READ_PORT("DSWB") AM_WRITE_LEGACY(bking_yld2_w)
- AM_RANGE(0x04, 0x04) AM_READ_PORT("DSWC") AM_WRITE_LEGACY(bking_xld3_w)
- AM_RANGE(0x05, 0x05) AM_READWRITE_LEGACY(bking_input_port_5_r, bking_yld3_w)
- AM_RANGE(0x06, 0x06) AM_READWRITE_LEGACY(bking_input_port_6_r, bking_msk_w)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(bking_xld1_w)
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(bking_yld1_w)
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("DSWA") AM_WRITE(bking_xld2_w)
+ AM_RANGE(0x03, 0x03) AM_READ_PORT("DSWB") AM_WRITE(bking_yld2_w)
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("DSWC") AM_WRITE(bking_xld3_w)
+ AM_RANGE(0x05, 0x05) AM_READWRITE(bking_input_port_5_r, bking_yld3_w)
+ AM_RANGE(0x06, 0x06) AM_READWRITE(bking_input_port_6_r, bking_msk_w)
AM_RANGE(0x07, 0x07) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x08, 0x08) AM_WRITE_LEGACY(bking_cont1_w)
- AM_RANGE(0x09, 0x09) AM_WRITE_LEGACY(bking_cont2_w)
- AM_RANGE(0x0a, 0x0a) AM_WRITE_LEGACY(bking_cont3_w)
+ AM_RANGE(0x08, 0x08) AM_WRITE(bking_cont1_w)
+ AM_RANGE(0x09, 0x09) AM_WRITE(bking_cont2_w)
+ AM_RANGE(0x0a, 0x0a) AM_WRITE(bking_cont3_w)
AM_RANGE(0x0b, 0x0b) AM_WRITE(bking_soundlatch_w)
// AM_RANGE(0x0c, 0x0c) AM_WRITE_LEGACY(bking_eport2_w) this is not shown to be connected anywhere
- AM_RANGE(0x0d, 0x0d) AM_WRITE_LEGACY(bking_hitclr_w)
- AM_RANGE(0x07, 0x1f) AM_READ_LEGACY(bking_pos_r)
+ AM_RANGE(0x0d, 0x0d) AM_WRITE(bking_hitclr_w)
+ AM_RANGE(0x07, 0x1f) AM_READ(bking_pos_r)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bking3_io_map, AS_IO, 8, bking_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE_LEGACY(bking_xld1_w)
- AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE_LEGACY(bking_yld1_w)
- AM_RANGE(0x02, 0x02) AM_READ_PORT("DSWA") AM_WRITE_LEGACY(bking_xld2_w)
- AM_RANGE(0x03, 0x03) AM_READ_PORT("DSWB") AM_WRITE_LEGACY(bking_yld2_w)
- AM_RANGE(0x04, 0x04) AM_READ_PORT("DSWC") AM_WRITE_LEGACY(bking_xld3_w)
- AM_RANGE(0x05, 0x05) AM_READWRITE_LEGACY(bking_input_port_5_r, bking_yld3_w)
- AM_RANGE(0x06, 0x06) AM_READWRITE_LEGACY(bking_input_port_6_r, bking_msk_w)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(bking_xld1_w)
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(bking_yld1_w)
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("DSWA") AM_WRITE(bking_xld2_w)
+ AM_RANGE(0x03, 0x03) AM_READ_PORT("DSWB") AM_WRITE(bking_yld2_w)
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("DSWC") AM_WRITE(bking_xld3_w)
+ AM_RANGE(0x05, 0x05) AM_READWRITE(bking_input_port_5_r, bking_yld3_w)
+ AM_RANGE(0x06, 0x06) AM_READWRITE(bking_input_port_6_r, bking_msk_w)
AM_RANGE(0x07, 0x07) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x08, 0x08) AM_WRITE_LEGACY(bking_cont1_w)
- AM_RANGE(0x09, 0x09) AM_WRITE_LEGACY(bking_cont2_w)
- AM_RANGE(0x0a, 0x0a) AM_WRITE_LEGACY(bking_cont3_w)
+ AM_RANGE(0x08, 0x08) AM_WRITE(bking_cont1_w)
+ AM_RANGE(0x09, 0x09) AM_WRITE(bking_cont2_w)
+ AM_RANGE(0x0a, 0x0a) AM_WRITE(bking_cont3_w)
AM_RANGE(0x0b, 0x0b) AM_WRITE(bking_soundlatch_w)
// AM_RANGE(0x0c, 0x0c) AM_WRITE_LEGACY(bking_eport2_w) this is not shown to be connected anywhere
- AM_RANGE(0x0d, 0x0d) AM_WRITE_LEGACY(bking_hitclr_w)
- AM_RANGE(0x07, 0x1f) AM_READ_LEGACY(bking_pos_r)
+ AM_RANGE(0x0d, 0x0d) AM_WRITE(bking_hitclr_w)
+ AM_RANGE(0x07, 0x1f) AM_READ(bking_pos_r)
AM_RANGE(0x2f, 0x2f) AM_DEVREADWRITE_LEGACY("bmcu", buggychl_mcu_r, buggychl_mcu_w)
AM_RANGE(0x4f, 0x4f) AM_DEVREADWRITE_LEGACY("bmcu", buggychl_mcu_status_r, unk_w)
AM_RANGE(0x60, 0x60) AM_READ(bking3_extrarom_r)
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index 5d5eddb83bd..22c795a2c4a 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -70,8 +70,8 @@ WRITE8_MEMBER(blktiger_state::blktiger_coinlockout_w)
static ADDRESS_MAP_START( blktiger_map, AS_PROGRAM, 8, blktiger_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xcfff) AM_READWRITE_LEGACY(blktiger_bgvideoram_r, blktiger_bgvideoram_w)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(blktiger_txvideoram_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xc000, 0xcfff) AM_READWRITE(blktiger_bgvideoram_r, blktiger_bgvideoram_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(blktiger_txvideoram_w) AM_BASE(m_txvideoram)
AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_SHARE("paletteram")
AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_SHARE("paletteram2")
AM_RANGE(0xe000, 0xfdff) AM_RAM
@@ -84,15 +84,15 @@ static ADDRESS_MAP_START( blktiger_io_map, AS_IO, 8, blktiger_state )
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(blktiger_bankswitch_w)
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW0") AM_WRITE(blktiger_coinlockout_w)
- AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(blktiger_video_control_w)
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW1") AM_WRITE(blktiger_video_control_w)
AM_RANGE(0x05, 0x05) AM_READ_PORT("FREEZE")
AM_RANGE(0x06, 0x06) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x07, 0x07) AM_READWRITE(blktiger_from_mcu_r,blktiger_to_mcu_w) /* Software protection (7) */
- AM_RANGE(0x08, 0x09) AM_WRITE_LEGACY(blktiger_scrollx_w)
- AM_RANGE(0x0a, 0x0b) AM_WRITE_LEGACY(blktiger_scrolly_w)
- AM_RANGE(0x0c, 0x0c) AM_WRITE_LEGACY(blktiger_video_enable_w)
- AM_RANGE(0x0d, 0x0d) AM_WRITE_LEGACY(blktiger_bgvideoram_bank_w)
- AM_RANGE(0x0e, 0x0e) AM_WRITE_LEGACY(blktiger_screen_layout_w)
+ AM_RANGE(0x08, 0x09) AM_WRITE(blktiger_scrollx_w)
+ AM_RANGE(0x0a, 0x0b) AM_WRITE(blktiger_scrolly_w)
+ AM_RANGE(0x0c, 0x0c) AM_WRITE(blktiger_video_enable_w)
+ AM_RANGE(0x0d, 0x0d) AM_WRITE(blktiger_bgvideoram_bank_w)
+ AM_RANGE(0x0e, 0x0e) AM_WRITE(blktiger_screen_layout_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( blktigerbl_io_map, AS_IO, 8, blktiger_state )
@@ -101,15 +101,15 @@ static ADDRESS_MAP_START( blktigerbl_io_map, AS_IO, 8, blktiger_state )
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(blktiger_bankswitch_w)
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW0") AM_WRITE(blktiger_coinlockout_w)
- AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(blktiger_video_control_w)
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW1") AM_WRITE(blktiger_video_control_w)
AM_RANGE(0x05, 0x05) AM_READ_PORT("FREEZE")
AM_RANGE(0x06, 0x06) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x07, 0x07) AM_NOP /* Software protection (7) */
- AM_RANGE(0x08, 0x09) AM_WRITE_LEGACY(blktiger_scrollx_w)
- AM_RANGE(0x0a, 0x0b) AM_WRITE_LEGACY(blktiger_scrolly_w)
- AM_RANGE(0x0c, 0x0c) AM_WRITE_LEGACY(blktiger_video_enable_w)
- AM_RANGE(0x0d, 0x0d) AM_WRITE_LEGACY(blktiger_bgvideoram_bank_w)
- AM_RANGE(0x0e, 0x0e) AM_WRITE_LEGACY(blktiger_screen_layout_w)
+ AM_RANGE(0x08, 0x09) AM_WRITE(blktiger_scrollx_w)
+ AM_RANGE(0x0a, 0x0b) AM_WRITE(blktiger_scrolly_w)
+ AM_RANGE(0x0c, 0x0c) AM_WRITE(blktiger_video_enable_w)
+ AM_RANGE(0x0d, 0x0d) AM_WRITE(blktiger_bgvideoram_bank_w)
+ AM_RANGE(0x0e, 0x0e) AM_WRITE(blktiger_screen_layout_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( blktiger_sound_map, AS_PROGRAM, 8, blktiger_state )
diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c
index 92c0f43732b..46d679a70ed 100644
--- a/src/mame/drivers/blmbycar.c
+++ b/src/mame/drivers/blmbycar.c
@@ -102,14 +102,14 @@ static ADDRESS_MAP_START( blmbycar_map, AS_PROGRAM, 16, blmbycar_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0xfec000, 0xfeffff) AM_RAM
AM_RANGE(0x100000, 0x103fff) AM_WRITEONLY // ???
- AM_RANGE(0x104000, 0x105fff) AM_RAM_WRITE_LEGACY(blmbycar_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x106000, 0x107fff) AM_RAM_WRITE_LEGACY(blmbycar_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x104000, 0x105fff) AM_RAM_WRITE(blmbycar_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x106000, 0x107fff) AM_RAM_WRITE(blmbycar_vram_0_w) AM_BASE(m_vram_0) // Layer 0
AM_RANGE(0x108000, 0x10bfff) AM_WRITEONLY // ???
AM_RANGE(0x10c000, 0x10c003) AM_WRITEONLY AM_BASE(m_scroll_1) // Scroll 1
AM_RANGE(0x10c004, 0x10c007) AM_WRITEONLY AM_BASE(m_scroll_0) // Scroll 0
- AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE_LEGACY(blmbycar_palette_w) // Palette
+ AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(blmbycar_palette_w) // Palette
AM_RANGE(0x200600, 0x203fff) AM_RAM
- AM_RANGE(0x204000, 0x2045ff) AM_RAM_WRITE_LEGACY(blmbycar_palette_w) AM_BASE(m_paletteram) // Palette
+ AM_RANGE(0x204000, 0x2045ff) AM_RAM_WRITE(blmbycar_palette_w) AM_BASE(m_paletteram) // Palette
AM_RANGE(0x204600, 0x207fff) AM_RAM
AM_RANGE(0x440000, 0x441fff) AM_RAM
AM_RANGE(0x444000, 0x445fff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)// Sprites (size?)
@@ -136,14 +136,14 @@ static ADDRESS_MAP_START( watrball_map, AS_PROGRAM, 16, blmbycar_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0xfec000, 0xfeffff) AM_RAM
AM_RANGE(0x100000, 0x103fff) AM_WRITEONLY // ???
- AM_RANGE(0x104000, 0x105fff) AM_RAM_WRITE_LEGACY(blmbycar_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x106000, 0x107fff) AM_RAM_WRITE_LEGACY(blmbycar_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x104000, 0x105fff) AM_RAM_WRITE(blmbycar_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x106000, 0x107fff) AM_RAM_WRITE(blmbycar_vram_0_w) AM_BASE(m_vram_0) // Layer 0
AM_RANGE(0x108000, 0x10bfff) AM_WRITEONLY // ???
AM_RANGE(0x10c000, 0x10c003) AM_WRITEONLY AM_BASE(m_scroll_1) // Scroll 1
AM_RANGE(0x10c004, 0x10c007) AM_WRITEONLY AM_BASE(m_scroll_0) // Scroll 0
- AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE_LEGACY(blmbycar_palette_w) // Palette
+ AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(blmbycar_palette_w) // Palette
AM_RANGE(0x200600, 0x203fff) AM_RAM
- AM_RANGE(0x204000, 0x2045ff) AM_RAM_WRITE_LEGACY(blmbycar_palette_w) AM_BASE(m_paletteram) // Palette
+ AM_RANGE(0x204000, 0x2045ff) AM_RAM_WRITE(blmbycar_palette_w) AM_BASE(m_paletteram) // Palette
AM_RANGE(0x204600, 0x207fff) AM_RAM
AM_RANGE(0x440000, 0x441fff) AM_RAM
AM_RANGE(0x444000, 0x445fff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)// Sprites (size?)
diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c
index a34acebbb54..f4a48c54722 100644
--- a/src/mame/drivers/blockade.c
+++ b/src/mame/drivers/blockade.c
@@ -120,7 +120,7 @@ WRITE8_MEMBER(blockade_state::blockade_coin_latch_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, blockade_state )
AM_RANGE(0x0000, 0x07ff) AM_ROM AM_MIRROR(0x6000)
- AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE_LEGACY(blockade_videoram_w) AM_BASE(m_videoram) AM_MIRROR(0x6c00)
+ AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(blockade_videoram_w) AM_BASE(m_videoram) AM_MIRROR(0x6c00)
AM_RANGE(0x9000, 0x90ff) AM_RAM AM_MIRROR(0x6f00)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index 1a41b27a961..107f854b085 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -113,13 +113,13 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, blockout_state )
AM_RANGE(0x100012, 0x100013) AM_WRITE(blockout_irq5_ack_w)
AM_RANGE(0x100014, 0x100015) AM_WRITE(blockout_sound_command_w)
AM_RANGE(0x100016, 0x100017) AM_WRITENOP /* don't know, maybe reset sound CPU */
- AM_RANGE(0x180000, 0x1bffff) AM_RAM_WRITE_LEGACY(blockout_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x180000, 0x1bffff) AM_RAM_WRITE(blockout_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1d4000, 0x1dffff) AM_RAM /* work RAM */
AM_RANGE(0x1f4000, 0x1fffff) AM_RAM /* work RAM */
AM_RANGE(0x200000, 0x207fff) AM_RAM AM_BASE(m_frontvideoram)
AM_RANGE(0x208000, 0x21ffff) AM_RAM /* ??? */
- AM_RANGE(0x280002, 0x280003) AM_WRITE_LEGACY(blockout_frontcolor_w)
- AM_RANGE(0x280200, 0x2805ff) AM_RAM_WRITE_LEGACY(blockout_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x280002, 0x280003) AM_WRITE(blockout_frontcolor_w)
+ AM_RANGE(0x280200, 0x2805ff) AM_RAM_WRITE(blockout_paletteram_w) AM_BASE(m_paletteram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( agress_map, AS_PROGRAM, 16, blockout_state )
@@ -133,13 +133,13 @@ static ADDRESS_MAP_START( agress_map, AS_PROGRAM, 16, blockout_state )
AM_RANGE(0x100012, 0x100013) AM_WRITE(blockout_irq5_ack_w)
AM_RANGE(0x100014, 0x100015) AM_WRITE(blockout_sound_command_w)
AM_RANGE(0x100016, 0x100017) AM_WRITENOP /* don't know, maybe reset sound CPU */
- AM_RANGE(0x180000, 0x1bffff) AM_RAM_WRITE_LEGACY(blockout_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x180000, 0x1bffff) AM_RAM_WRITE(blockout_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1d4000, 0x1dffff) AM_RAM /* work RAM */
AM_RANGE(0x1f4000, 0x1fffff) AM_RAM /* work RAM */
AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE(m_frontvideoram) AM_MIRROR(0x004000) // agress checks at F3A that this is mirrored, blockout glitches if you do it to it
AM_RANGE(0x208000, 0x21ffff) AM_RAM /* ??? */
- AM_RANGE(0x280002, 0x280003) AM_WRITE_LEGACY(blockout_frontcolor_w)
- AM_RANGE(0x280200, 0x2805ff) AM_RAM_WRITE_LEGACY(blockout_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x280002, 0x280003) AM_WRITE(blockout_frontcolor_w)
+ AM_RANGE(0x280200, 0x2805ff) AM_RAM_WRITE(blockout_paletteram_w) AM_BASE(m_paletteram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8, blockout_state )
diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c
index cd1de81e05c..c2c0d368ac9 100644
--- a/src/mame/drivers/bloodbro.c
+++ b/src/mame/drivers/bloodbro.c
@@ -119,11 +119,11 @@ static ADDRESS_MAP_START( bloodbro_map, AS_PROGRAM, 16, bloodbro_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x08afff) AM_RAM
AM_RANGE(0x08b000, 0x08bfff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x08c000, 0x08c3ff) AM_RAM_WRITE_LEGACY(bloodbro_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x08c000, 0x08c3ff) AM_RAM_WRITE(bloodbro_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0x08c400, 0x08cfff) AM_RAM
- AM_RANGE(0x08d000, 0x08d3ff) AM_RAM_WRITE_LEGACY(bloodbro_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x08d000, 0x08d3ff) AM_RAM_WRITE(bloodbro_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0x08d400, 0x08d7ff) AM_RAM
- AM_RANGE(0x08d800, 0x08dfff) AM_RAM_WRITE_LEGACY(bloodbro_txvideoram_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0x08d800, 0x08dfff) AM_RAM_WRITE(bloodbro_txvideoram_w) AM_BASE(m_txvideoram)
AM_RANGE(0x08e000, 0x08e7ff) AM_RAM
AM_RANGE(0x08e800, 0x08f7ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08f800, 0x08ffff) AM_RAM
@@ -141,11 +141,11 @@ static ADDRESS_MAP_START( weststry_map, AS_PROGRAM, 16, bloodbro_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x08afff) AM_RAM
AM_RANGE(0x08b000, 0x08bfff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x08c000, 0x08c3ff) AM_RAM_WRITE_LEGACY(bloodbro_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x08c000, 0x08c3ff) AM_RAM_WRITE(bloodbro_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0x08c400, 0x08cfff) AM_RAM
- AM_RANGE(0x08d000, 0x08d3ff) AM_RAM_WRITE_LEGACY(bloodbro_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x08d000, 0x08d3ff) AM_RAM_WRITE(bloodbro_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0x08d400, 0x08d7ff) AM_RAM
- AM_RANGE(0x08d800, 0x08dfff) AM_RAM_WRITE_LEGACY(bloodbro_txvideoram_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0x08d800, 0x08dfff) AM_RAM_WRITE(bloodbro_txvideoram_w) AM_BASE(m_txvideoram)
AM_RANGE(0x08e000, 0x08ffff) AM_RAM
AM_RANGE(0x0c1000, 0x0c1001) AM_READ_PORT("DSW")
AM_RANGE(0x0c1002, 0x0c1003) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index ec1eb8a43ff..4ceed521a55 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -89,15 +89,15 @@ WRITE8_MEMBER(blueprnt_state::blueprnt_coin_counter_w)
static ADDRESS_MAP_START( blueprnt_map, AS_PROGRAM, 8, blueprnt_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM // service mode checks for 8 chips = 64K
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(blueprnt_videoram_w) AM_MIRROR(0x400) AM_BASE(m_videoram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(blueprnt_videoram_w) AM_MIRROR(0x400) AM_BASE(m_videoram)
AM_RANGE(0xa000, 0xa0ff) AM_RAM AM_BASE(m_scrollram)
AM_RANGE(0xb000, 0xb0ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P1") AM_WRITE(blueprnt_coin_counter_w)
AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P2")
AM_RANGE(0xc003, 0xc003) AM_READ(blueprnt_sh_dipsw_r)
AM_RANGE(0xd000, 0xd000) AM_WRITE(blueprnt_sound_command_w)
- AM_RANGE(0xe000, 0xe000) AM_READ(watchdog_reset_r) AM_WRITE_LEGACY(blueprnt_flipscreen_w)
- AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE_LEGACY(blueprnt_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xe000, 0xe000) AM_READ(watchdog_reset_r) AM_WRITE(blueprnt_flipscreen_w)
+ AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(blueprnt_colorram_w) AM_BASE(m_colorram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, blueprnt_state )
diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c
index 8690b45b63f..788056c8b63 100644
--- a/src/mame/drivers/bogeyman.c
+++ b/src/mame/drivers/bogeyman.c
@@ -47,12 +47,12 @@ WRITE8_MEMBER(bogeyman_state::bogeyman_8910_control_w)
static ADDRESS_MAP_START( bogeyman_map, AS_PROGRAM, 8, bogeyman_state )
AM_RANGE(0x0000, 0x17ff) AM_RAM
- AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE_LEGACY(bogeyman_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE_LEGACY(bogeyman_colorram2_w) AM_BASE(m_colorram2)
- AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE_LEGACY(bogeyman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x2100, 0x21ff) AM_RAM_WRITE_LEGACY(bogeyman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(bogeyman_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(bogeyman_colorram2_w) AM_BASE(m_colorram2)
+ AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(bogeyman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2100, 0x21ff) AM_RAM_WRITE(bogeyman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x2800, 0x2bff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x3000, 0x300f) AM_RAM_WRITE_LEGACY(bogeyman_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x3000, 0x300f) AM_RAM_WRITE(bogeyman_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x3800, 0x3800) AM_READ_PORT("P1") AM_WRITE(bogeyman_8910_control_w)
AM_RANGE(0x3801, 0x3801) AM_READ_PORT("P2") AM_WRITE(bogeyman_8910_latch_w)
AM_RANGE(0x3802, 0x3802) AM_READ_PORT("DSW1")
diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c
index e5f8db072e3..f66bd5815d5 100644
--- a/src/mame/drivers/bombjack.c
+++ b/src/mame/drivers/bombjack.c
@@ -138,19 +138,19 @@ WRITE8_MEMBER(bombjack_state::irq_mask_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, bombjack_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(bombjack_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE_LEGACY(bombjack_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(bombjack_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE(bombjack_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x9820, 0x987f) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x9a00, 0x9a00) AM_WRITENOP
AM_RANGE(0x9c00, 0x9cff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_SHARE("paletteram")
- AM_RANGE(0x9e00, 0x9e00) AM_WRITE_LEGACY(bombjack_background_w)
+ AM_RANGE(0x9e00, 0x9e00) AM_WRITE(bombjack_background_w)
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("P1")
AM_RANGE(0xb000, 0xb000) AM_WRITE(irq_mask_w)
AM_RANGE(0xb001, 0xb001) AM_READ_PORT("P2")
AM_RANGE(0xb002, 0xb002) AM_READ_PORT("SYSTEM")
AM_RANGE(0xb003, 0xb003) AM_READNOP /* watchdog reset? */
AM_RANGE(0xb004, 0xb004) AM_READ_PORT("DSW1")
- AM_RANGE(0xb004, 0xb004) AM_WRITE_LEGACY(bombjack_flipscreen_w)
+ AM_RANGE(0xb004, 0xb004) AM_WRITE(bombjack_flipscreen_w)
AM_RANGE(0xb005, 0xb005) AM_READ_PORT("DSW2")
AM_RANGE(0xb800, 0xb800) AM_WRITE(bombjack_soundlatch_w)
AM_RANGE(0xc000, 0xdfff) AM_ROM
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index dbeae3a290e..ce5b9cf1ba5 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -113,16 +113,16 @@ static INPUT_CHANGED( coin_inserted )
*************************************/
static ADDRESS_MAP_START( brkthru_map, AS_PROGRAM, 8, brkthru_state )
- AM_RANGE(0x0000, 0x03ff) AM_RAM_WRITE_LEGACY(brkthru_fgram_w) AM_BASE_SIZE(m_fg_videoram, m_fg_videoram_size)
+ AM_RANGE(0x0000, 0x03ff) AM_RAM_WRITE(brkthru_fgram_w) AM_BASE_SIZE(m_fg_videoram, m_fg_videoram_size)
AM_RANGE(0x0400, 0x0bff) AM_RAM
- AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE_LEGACY(brkthru_bgram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(brkthru_bgram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x1000, 0x10ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x1100, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x1800) AM_READ_PORT("P1")
AM_RANGE(0x1801, 0x1801) AM_READ_PORT("P2")
AM_RANGE(0x1802, 0x1802) AM_READ_PORT("DSW1")
AM_RANGE(0x1803, 0x1803) AM_READ_PORT("DSW2/COIN")
- AM_RANGE(0x1800, 0x1801) AM_WRITE_LEGACY(brkthru_1800_w) /* bg scroll and color, ROM bank selection, flip screen */
+ AM_RANGE(0x1800, 0x1801) AM_WRITE(brkthru_1800_w) /* bg scroll and color, ROM bank selection, flip screen */
AM_RANGE(0x1802, 0x1802) AM_WRITE(brkthru_soundlatch_w)
AM_RANGE(0x1803, 0x1803) AM_WRITE(brkthru_1803_w) /* NMI enable, + ? */
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1")
@@ -131,16 +131,16 @@ ADDRESS_MAP_END
/* same as brktrhu, but xor 0x1000 below 8k */
static ADDRESS_MAP_START( darwin_map, AS_PROGRAM, 8, brkthru_state )
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE_LEGACY(brkthru_fgram_w) AM_BASE_SIZE(m_fg_videoram, m_fg_videoram_size)
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(brkthru_fgram_w) AM_BASE_SIZE(m_fg_videoram, m_fg_videoram_size)
AM_RANGE(0x1400, 0x1bff) AM_RAM
- AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE_LEGACY(brkthru_bgram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(brkthru_bgram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x0000, 0x00ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x0100, 0x01ff) AM_WRITENOP /*tidyup, nothing really here?*/
AM_RANGE(0x0800, 0x0800) AM_READ_PORT("P1")
AM_RANGE(0x0801, 0x0801) AM_READ_PORT("P2")
AM_RANGE(0x0802, 0x0802) AM_READ_PORT("DSW1")
AM_RANGE(0x0803, 0x0803) AM_READ_PORT("DSW2/COIN")
- AM_RANGE(0x0800, 0x0801) AM_WRITE_LEGACY(brkthru_1800_w) /* bg scroll and color, ROM bank selection, flip screen */
+ AM_RANGE(0x0800, 0x0801) AM_WRITE(brkthru_1800_w) /* bg scroll and color, ROM bank selection, flip screen */
AM_RANGE(0x0802, 0x0802) AM_WRITE(brkthru_soundlatch_w)
AM_RANGE(0x0803, 0x0803) AM_WRITE(darwin_0803_w) /* NMI enable, + ? */
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1")
diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c
index 3476df8c08a..3c73cce4ec2 100644
--- a/src/mame/drivers/bsktball.c
+++ b/src/mame/drivers/bsktball.c
@@ -76,20 +76,20 @@ static PALETTE_INIT( bsktball )
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, bsktball_state )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM /* Zero Page RAM */
- AM_RANGE(0x0800, 0x0800) AM_READ_LEGACY(bsktball_in0_r)
+ AM_RANGE(0x0800, 0x0800) AM_READ(bsktball_in0_r)
AM_RANGE(0x0802, 0x0802) AM_READ_PORT("IN1")
AM_RANGE(0x0803, 0x0803) AM_READ_PORT("DSW")
AM_RANGE(0x1000, 0x1000) AM_WRITENOP /* Timer Reset */
AM_RANGE(0x1010, 0x1010) AM_DEVWRITE_LEGACY("discrete", bsktball_bounce_w) /* Crowd Amp / Bounce */
AM_RANGE(0x1022, 0x1023) AM_WRITENOP /* Coin Counter */
- AM_RANGE(0x1024, 0x1025) AM_WRITE_LEGACY(bsktball_led1_w) /* LED 1 */
- AM_RANGE(0x1026, 0x1027) AM_WRITE_LEGACY(bsktball_led2_w) /* LED 2 */
- AM_RANGE(0x1028, 0x1029) AM_WRITE_LEGACY(bsktball_ld1_w) /* LD 1 */
- AM_RANGE(0x102a, 0x102b) AM_WRITE_LEGACY(bsktball_ld2_w) /* LD 2 */
+ AM_RANGE(0x1024, 0x1025) AM_WRITE(bsktball_led1_w) /* LED 1 */
+ AM_RANGE(0x1026, 0x1027) AM_WRITE(bsktball_led2_w) /* LED 2 */
+ AM_RANGE(0x1028, 0x1029) AM_WRITE(bsktball_ld1_w) /* LD 1 */
+ AM_RANGE(0x102a, 0x102b) AM_WRITE(bsktball_ld2_w) /* LD 2 */
AM_RANGE(0x102c, 0x102d) AM_DEVWRITE_LEGACY("discrete", bsktball_noise_reset_w) /* Noise Reset */
- AM_RANGE(0x102e, 0x102f) AM_WRITE_LEGACY(bsktball_nmion_w) /* NMI On */
+ AM_RANGE(0x102e, 0x102f) AM_WRITE(bsktball_nmion_w) /* NMI On */
AM_RANGE(0x1030, 0x1030) AM_DEVWRITE_LEGACY("discrete", bsktball_note_w) /* Music Ckt Note Dvsr */
- AM_RANGE(0x1800, 0x1bbf) AM_RAM_WRITE_LEGACY(bsktball_videoram_w) AM_BASE(m_videoram) /* DISPLAY */
+ AM_RANGE(0x1800, 0x1bbf) AM_RAM_WRITE(bsktball_videoram_w) AM_BASE(m_videoram) /* DISPLAY */
AM_RANGE(0x1bc0, 0x1bff) AM_RAM AM_BASE(m_motion)
AM_RANGE(0x1c00, 0x1cff) AM_RAM
AM_RANGE(0x2000, 0x3fff) AM_ROM /* PROGRAM */
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index 795e3d58d5b..71884c82beb 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -240,10 +240,10 @@ WRITE8_MEMBER(btime_state::lnc_w)
{
if (offset <= 0x3bff) ;
- else if (offset >= 0x3c00 && offset <= 0x3fff) { lnc_videoram_w(&space, offset - 0x3c00, data); return; }
- else if (offset >= 0x7c00 && offset <= 0x7fff) { lnc_mirrorvideoram_w(&space, offset - 0x7c00, data); return; }
+ else if (offset >= 0x3c00 && offset <= 0x3fff) { lnc_videoram_w(space, offset - 0x3c00, data); return; }
+ else if (offset >= 0x7c00 && offset <= 0x7fff) { lnc_mirrorvideoram_w(space, offset - 0x7c00, data); return; }
else if (offset == 0x8000) { return; } /* AM_NOP */
- else if (offset == 0x8001) { bnj_video_control_w(&space, 0, data); return; }
+ else if (offset == 0x8001) { bnj_video_control_w(space, 0, data); return; }
else if (offset == 0x8003) ;
else if (offset == 0x9000) { return; } /* AM_NOP */
else if (offset == 0x9002) { audio_command_w(space, 0, data); return; }
@@ -260,13 +260,13 @@ WRITE8_MEMBER(btime_state::mmonkey_w)
{
if (offset <= 0x3bff) ;
- else if (offset >= 0x3c00 && offset <= 0x3fff) { lnc_videoram_w(&space, offset - 0x3c00, data); return; }
- else if (offset >= 0x7c00 && offset <= 0x7fff) { lnc_mirrorvideoram_w(&space, offset - 0x7c00, data); return; }
- else if (offset == 0x8001) { bnj_video_control_w(&space, 0, data); return; }
+ else if (offset >= 0x3c00 && offset <= 0x3fff) { lnc_videoram_w(space, offset - 0x3c00, data); return; }
+ else if (offset >= 0x7c00 && offset <= 0x7fff) { lnc_mirrorvideoram_w(space, offset - 0x7c00, data); return; }
+ else if (offset == 0x8001) { bnj_video_control_w(space, 0, data); return; }
else if (offset == 0x8003) ;
else if (offset == 0x9000) { return; } /* AM_NOP */
else if (offset == 0x9002) { audio_command_w(space, 0, data); return; }
- else if (offset >= 0xb000 && offset <= 0xbfff) { mmonkey_protection_w(&space, offset - 0xb000, data); return; }
+ else if (offset >= 0xb000 && offset <= 0xbfff) { mmonkey_protection_w(space, offset - 0xb000, data); return; }
else logerror("CPU '%s' PC %04x: warning - write %02x to unmapped memory address %04x\n", space.device().tag(), cpu_get_pc(&space.device()), data, offset);
m_rambase[offset] = data;
@@ -279,13 +279,13 @@ WRITE8_MEMBER(btime_state::btime_w)
{
if (offset <= 0x07ff) ;
- else if (offset >= 0x0c00 && offset <= 0x0c0f) btime_paletteram_w(&space, offset - 0x0c00, data);
+ else if (offset >= 0x0c00 && offset <= 0x0c0f) btime_paletteram_w(space, offset - 0x0c00, data);
else if (offset >= 0x1000 && offset <= 0x17ff) ;
- else if (offset >= 0x1800 && offset <= 0x1bff) btime_mirrorvideoram_w(&space, offset - 0x1800, data);
- else if (offset >= 0x1c00 && offset <= 0x1fff) btime_mirrorcolorram_w(&space, offset - 0x1c00, data);
- else if (offset == 0x4002) btime_video_control_w(&space, 0, data);
+ else if (offset >= 0x1800 && offset <= 0x1bff) btime_mirrorvideoram_w(space, offset - 0x1800, data);
+ else if (offset >= 0x1c00 && offset <= 0x1fff) btime_mirrorcolorram_w(space, offset - 0x1c00, data);
+ else if (offset == 0x4002) btime_video_control_w(space, 0, data);
else if (offset == 0x4003) audio_command_w(space, 0, data);
- else if (offset == 0x4004) bnj_scroll1_w(&space, 0, data);
+ else if (offset == 0x4004) bnj_scroll1_w(space, 0, data);
else logerror("CPU '%s' PC %04x: warning - write %02x to unmapped memory address %04x\n", space.device().tag(), cpu_get_pc(&space.device()), data, offset);
m_rambase[offset] = data;
@@ -297,15 +297,15 @@ WRITE8_MEMBER(btime_state::tisland_w)
{
if (offset <= 0x07ff) ;
- else if (offset >= 0x0c00 && offset <= 0x0c0f) btime_paletteram_w(&space, offset - 0x0c00, data);
+ else if (offset >= 0x0c00 && offset <= 0x0c0f) btime_paletteram_w(space, offset - 0x0c00, data);
else if (offset >= 0x1000 && offset <= 0x17ff) ;
- else if (offset >= 0x1800 && offset <= 0x1bff) btime_mirrorvideoram_w(&space, offset - 0x1800, data);
- else if (offset >= 0x1c00 && offset <= 0x1fff) btime_mirrorcolorram_w(&space, offset - 0x1c00, data);
- else if (offset == 0x4002) btime_video_control_w(&space, 0, data);
+ else if (offset >= 0x1800 && offset <= 0x1bff) btime_mirrorvideoram_w(space, offset - 0x1800, data);
+ else if (offset >= 0x1c00 && offset <= 0x1fff) btime_mirrorcolorram_w(space, offset - 0x1c00, data);
+ else if (offset == 0x4002) btime_video_control_w(space, 0, data);
else if (offset == 0x4003) audio_command_w(space, 0, data);
- else if (offset == 0x4004) bnj_scroll1_w(&space, 0, data);
- else if (offset == 0x4005) bnj_scroll2_w(&space, 0, data);
-// else if (offset == 0x8000) btime_video_control_w(&space,0,data);
+ else if (offset == 0x4004) bnj_scroll1_w(space, 0, data);
+ else if (offset == 0x4005) bnj_scroll2_w(space, 0, data);
+// else if (offset == 0x8000) btime_video_control_w(space,0,data);
else logerror("CPU '%s' PC %04x: warning - write %02x to unmapped memory address %04x\n", space.device().tag(), cpu_get_pc(&space.device()), data, offset);
m_rambase[offset] = data;
@@ -318,12 +318,12 @@ WRITE8_MEMBER(btime_state::zoar_w)
if (offset <= 0x07ff) ;
else if (offset >= 0x8000 && offset <= 0x87ff) ;
- else if (offset >= 0x8800 && offset <= 0x8bff) btime_mirrorvideoram_w(&space, offset - 0x8800, data);
- else if (offset >= 0x8c00 && offset <= 0x8fff) btime_mirrorcolorram_w(&space, offset - 0x8c00, data);
- else if (offset == 0x9000) zoar_video_control_w(&space, 0, data);
+ else if (offset >= 0x8800 && offset <= 0x8bff) btime_mirrorvideoram_w(space, offset - 0x8800, data);
+ else if (offset >= 0x8c00 && offset <= 0x8fff) btime_mirrorcolorram_w(space, offset - 0x8c00, data);
+ else if (offset == 0x9000) zoar_video_control_w(space, 0, data);
else if (offset >= 0x9800 && offset <= 0x9803) ;
- else if (offset == 0x9804) bnj_scroll2_w(&space, 0, data);
- else if (offset == 0x9805) bnj_scroll1_w(&space, 0, data);
+ else if (offset == 0x9804) bnj_scroll2_w(space, 0, data);
+ else if (offset == 0x9805) bnj_scroll1_w(space, 0, data);
else if (offset == 0x9806) audio_command_w(space, 0, data);
else logerror("CPU '%s' PC %04x: warning - write %02x to unmapped memory address %04x\n", space.device().tag(), cpu_get_pc(&space.device()), data, offset);
@@ -336,10 +336,10 @@ WRITE8_MEMBER(btime_state::disco_w)
{
if (offset <= 0x04ff) ;
- else if (offset >= 0x2000 && offset <= 0x7fff) deco_charram_w(&space, offset - 0x2000, data);
+ else if (offset >= 0x2000 && offset <= 0x7fff) deco_charram_w(space, offset - 0x2000, data);
else if (offset >= 0x8000 && offset <= 0x881f) ;
else if (offset == 0x9a00) audio_command_w(space, 0, data);
- else if (offset == 0x9c00) disco_video_control_w(&space, 0, data);
+ else if (offset == 0x9c00) disco_video_control_w(space, 0, data);
else logerror("CPU '%s' PC %04x: warning - write %02x to unmapped memory address %04x\n", space.device().tag(), cpu_get_pc(&space.device()), data, offset);
m_rambase[offset] = data;
@@ -352,16 +352,16 @@ static ADDRESS_MAP_START( btime_map, AS_PROGRAM, 8, btime_state )
AM_RANGE(0x0000, 0xffff) AM_WRITE(btime_w) /* override the following entries to */
/* support ROM decryption */
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(m_rambase)
- AM_RANGE(0x0c00, 0x0c0f) AM_WRITE_LEGACY(btime_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c00, 0x0c0f) AM_WRITE(btime_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x1000, 0x13ff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x1400, 0x17ff) AM_RAM AM_BASE(m_colorram)
- AM_RANGE(0x1800, 0x1bff) AM_READWRITE_LEGACY(btime_mirrorvideoram_r, btime_mirrorvideoram_w)
- AM_RANGE(0x1c00, 0x1fff) AM_READWRITE_LEGACY(btime_mirrorcolorram_r, btime_mirrorcolorram_w)
+ AM_RANGE(0x1800, 0x1bff) AM_READWRITE(btime_mirrorvideoram_r, btime_mirrorvideoram_w)
+ AM_RANGE(0x1c00, 0x1fff) AM_READWRITE(btime_mirrorcolorram_r, btime_mirrorcolorram_w)
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("P1") AM_WRITENOP
AM_RANGE(0x4001, 0x4001) AM_READ_PORT("P2")
- AM_RANGE(0x4002, 0x4002) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(btime_video_control_w)
+ AM_RANGE(0x4002, 0x4002) AM_READ_PORT("SYSTEM") AM_WRITE(btime_video_control_w)
AM_RANGE(0x4003, 0x4003) AM_READ_PORT("DSW1") AM_WRITE(audio_command_w)
- AM_RANGE(0x4004, 0x4004) AM_READ_PORT("DSW2") AM_WRITE_LEGACY(bnj_scroll1_w)
+ AM_RANGE(0x4004, 0x4004) AM_READ_PORT("DSW2") AM_WRITE(bnj_scroll1_w)
AM_RANGE(0xb000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -370,12 +370,12 @@ static ADDRESS_MAP_START( cookrace_map, AS_PROGRAM, 8, btime_state )
AM_RANGE(0x0500, 0x3fff) AM_ROM
AM_RANGE(0xc000, 0xc3ff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xc400, 0xc7ff) AM_RAM AM_BASE(m_colorram)
- AM_RANGE(0xc800, 0xcbff) AM_READWRITE_LEGACY(btime_mirrorvideoram_r, btime_mirrorvideoram_w)
- AM_RANGE(0xcc00, 0xcfff) AM_READWRITE_LEGACY(btime_mirrorcolorram_r, btime_mirrorcolorram_w)
+ AM_RANGE(0xc800, 0xcbff) AM_READWRITE(btime_mirrorvideoram_r, btime_mirrorvideoram_w)
+ AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(btime_mirrorcolorram_r, btime_mirrorcolorram_w)
AM_RANGE(0xd000, 0xd0ff) AM_RAM /* background? */
AM_RANGE(0xd100, 0xd3ff) AM_RAM /* ? */
AM_RANGE(0xd400, 0xd7ff) AM_RAM AM_BASE_SIZE(m_bnj_backgroundram, m_bnj_backgroundram_size)
- AM_RANGE(0xe000, 0xe000) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(bnj_video_control_w)
+ AM_RANGE(0xe000, 0xe000) AM_READ_PORT("DSW1") AM_WRITE(bnj_video_control_w)
AM_RANGE(0xe300, 0xe300) AM_READ_PORT("DSW1") /* mirror address used on high score name entry */
/* screen */
AM_RANGE(0xe001, 0xe001) AM_READ_PORT("DSW2") AM_WRITE(audio_command_w)
@@ -389,17 +389,17 @@ static ADDRESS_MAP_START( tisland_map, AS_PROGRAM, 8, btime_state )
AM_RANGE(0x0000, 0xffff) AM_WRITE(tisland_w) /* override the following entries to */
/* support ROM decryption */
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(m_rambase)
- AM_RANGE(0x0c00, 0x0c0f) AM_WRITE_LEGACY(btime_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c00, 0x0c0f) AM_WRITE(btime_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x1000, 0x13ff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x1400, 0x17ff) AM_RAM AM_BASE(m_colorram)
- AM_RANGE(0x1800, 0x1bff) AM_READWRITE_LEGACY(btime_mirrorvideoram_r, btime_mirrorvideoram_w)
- AM_RANGE(0x1c00, 0x1fff) AM_READWRITE_LEGACY(btime_mirrorcolorram_r, btime_mirrorcolorram_w)
+ AM_RANGE(0x1800, 0x1bff) AM_READWRITE(btime_mirrorvideoram_r, btime_mirrorvideoram_w)
+ AM_RANGE(0x1c00, 0x1fff) AM_READWRITE(btime_mirrorcolorram_r, btime_mirrorcolorram_w)
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("P1") AM_WRITENOP
AM_RANGE(0x4001, 0x4001) AM_READ_PORT("P2")
- AM_RANGE(0x4002, 0x4002) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(btime_video_control_w)
+ AM_RANGE(0x4002, 0x4002) AM_READ_PORT("SYSTEM") AM_WRITE(btime_video_control_w)
AM_RANGE(0x4003, 0x4003) AM_READ_PORT("DSW1") AM_WRITE(audio_command_w)
- AM_RANGE(0x4004, 0x4004) AM_READ_PORT("DSW2") AM_WRITE_LEGACY(bnj_scroll1_w)
- AM_RANGE(0x4005, 0x4005) AM_WRITE_LEGACY(bnj_scroll2_w)
+ AM_RANGE(0x4004, 0x4004) AM_READ_PORT("DSW2") AM_WRITE(bnj_scroll1_w)
+ AM_RANGE(0x4005, 0x4005) AM_WRITE(bnj_scroll2_w)
AM_RANGE(0x9000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -409,16 +409,16 @@ static ADDRESS_MAP_START( zoar_map, AS_PROGRAM, 8, btime_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(m_rambase)
AM_RANGE(0x8000, 0x83ff) AM_WRITEONLY AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x8400, 0x87ff) AM_WRITEONLY AM_BASE(m_colorram)
- AM_RANGE(0x8800, 0x8bff) AM_WRITE_LEGACY(btime_mirrorvideoram_w)
- AM_RANGE(0x8c00, 0x8fff) AM_WRITE_LEGACY(btime_mirrorcolorram_w)
- AM_RANGE(0x9000, 0x9000) AM_WRITE_LEGACY(zoar_video_control_w)
+ AM_RANGE(0x8800, 0x8bff) AM_WRITE(btime_mirrorvideoram_w)
+ AM_RANGE(0x8c00, 0x8fff) AM_WRITE(btime_mirrorcolorram_w)
+ AM_RANGE(0x9000, 0x9000) AM_WRITE(zoar_video_control_w)
AM_RANGE(0x9800, 0x9800) AM_READ(zoar_dsw1_read)
AM_RANGE(0x9801, 0x9801) AM_READ_PORT("DSW2")
AM_RANGE(0x9802, 0x9802) AM_READ_PORT("P1")
AM_RANGE(0x9803, 0x9803) AM_READ_PORT("P2")
AM_RANGE(0x9800, 0x9803) AM_WRITEONLY AM_BASE(m_zoar_scrollram)
- AM_RANGE(0x9804, 0x9804) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(bnj_scroll2_w)
- AM_RANGE(0x9805, 0x9805) AM_WRITE_LEGACY(bnj_scroll1_w)
+ AM_RANGE(0x9804, 0x9804) AM_READ_PORT("SYSTEM") AM_WRITE(bnj_scroll2_w)
+ AM_RANGE(0x9805, 0x9805) AM_WRITE(bnj_scroll1_w)
AM_RANGE(0x9806, 0x9806) AM_WRITE(audio_command_w)
AM_RANGE(0xd000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -427,11 +427,11 @@ static ADDRESS_MAP_START( lnc_map, AS_PROGRAM, 8, btime_state )
AM_RANGE(0x0000, 0xffff) AM_WRITE(lnc_w) /* override the following entries to */
/* support ROM decryption */
AM_RANGE(0x0000, 0x3bff) AM_RAM AM_BASE(m_rambase)
- AM_RANGE(0x3c00, 0x3fff) AM_RAM_WRITE_LEGACY(lnc_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x3c00, 0x3fff) AM_RAM_WRITE(lnc_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x7800, 0x7bff) AM_WRITEONLY AM_BASE(m_colorram) /* this is just here to initialize the pointer */
- AM_RANGE(0x7c00, 0x7fff) AM_READWRITE_LEGACY(btime_mirrorvideoram_r, lnc_mirrorvideoram_w)
+ AM_RANGE(0x7c00, 0x7fff) AM_READWRITE(btime_mirrorvideoram_r, lnc_mirrorvideoram_w)
AM_RANGE(0x8000, 0x8000) AM_READ_PORT("DSW1") AM_WRITENOP /* ??? */
- AM_RANGE(0x8001, 0x8001) AM_READ_PORT("DSW2") AM_WRITE_LEGACY(bnj_video_control_w)
+ AM_RANGE(0x8001, 0x8001) AM_READ_PORT("DSW2") AM_WRITE(bnj_video_control_w)
AM_RANGE(0x8003, 0x8003) AM_WRITEONLY AM_BASE(m_lnc_charbank)
AM_RANGE(0x9000, 0x9000) AM_READ_PORT("P1") AM_WRITENOP /* IRQ ack??? */
AM_RANGE(0x9001, 0x9001) AM_READ_PORT("P2")
@@ -444,34 +444,34 @@ static ADDRESS_MAP_START( mmonkey_map, AS_PROGRAM, 8, btime_state )
AM_RANGE(0x0000, 0xffff) AM_WRITE(mmonkey_w) /* override the following entries to */
/* support ROM decryption */
AM_RANGE(0x0000, 0x3bff) AM_RAM AM_BASE(m_rambase)
- AM_RANGE(0x3c00, 0x3fff) AM_RAM_WRITE_LEGACY(lnc_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x3c00, 0x3fff) AM_RAM_WRITE(lnc_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x7800, 0x7bff) AM_WRITEONLY AM_BASE(m_colorram) /* this is just here to initialize the pointer */
- AM_RANGE(0x7c00, 0x7fff) AM_READWRITE_LEGACY(btime_mirrorvideoram_r, lnc_mirrorvideoram_w)
+ AM_RANGE(0x7c00, 0x7fff) AM_READWRITE(btime_mirrorvideoram_r, lnc_mirrorvideoram_w)
AM_RANGE(0x8000, 0x8000) AM_READ_PORT("DSW1")
- AM_RANGE(0x8001, 0x8001) AM_READ_PORT("DSW2") AM_WRITE_LEGACY(bnj_video_control_w)
+ AM_RANGE(0x8001, 0x8001) AM_READ_PORT("DSW2") AM_WRITE(bnj_video_control_w)
AM_RANGE(0x8003, 0x8003) AM_WRITEONLY AM_BASE(m_lnc_charbank)
AM_RANGE(0x9000, 0x9000) AM_READ_PORT("P1") AM_WRITENOP /* IRQ ack??? */
AM_RANGE(0x9001, 0x9001) AM_READ_PORT("P2")
AM_RANGE(0x9002, 0x9002) AM_READ_PORT("SYSTEM") AM_WRITE(audio_command_w)
- AM_RANGE(0xb000, 0xbfff) AM_READWRITE_LEGACY(mmonkey_protection_r, mmonkey_protection_w)
+ AM_RANGE(0xb000, 0xbfff) AM_READWRITE(mmonkey_protection_r, mmonkey_protection_w)
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( bnj_map, AS_PROGRAM, 8, btime_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(m_rambase)
AM_RANGE(0x1000, 0x1000) AM_READ_PORT("DSW1")
- AM_RANGE(0x1001, 0x1001) AM_READ_PORT("DSW2") AM_WRITE_LEGACY(bnj_video_control_w)
+ AM_RANGE(0x1001, 0x1001) AM_READ_PORT("DSW2") AM_WRITE(bnj_video_control_w)
AM_RANGE(0x1002, 0x1002) AM_READ_PORT("P1") AM_WRITE(audio_command_w)
AM_RANGE(0x1003, 0x1003) AM_READ_PORT("P2")
AM_RANGE(0x1004, 0x1004) AM_READ_PORT("SYSTEM")
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x4400, 0x47ff) AM_RAM AM_BASE(m_colorram)
- AM_RANGE(0x4800, 0x4bff) AM_READWRITE_LEGACY(btime_mirrorvideoram_r, btime_mirrorvideoram_w)
- AM_RANGE(0x4c00, 0x4fff) AM_READWRITE_LEGACY(btime_mirrorcolorram_r, btime_mirrorcolorram_w)
- AM_RANGE(0x5000, 0x51ff) AM_WRITE_LEGACY(bnj_background_w) AM_BASE_SIZE(m_bnj_backgroundram, m_bnj_backgroundram_size)
- AM_RANGE(0x5400, 0x5400) AM_WRITE_LEGACY(bnj_scroll1_w)
- AM_RANGE(0x5800, 0x5800) AM_WRITE_LEGACY(bnj_scroll2_w)
- AM_RANGE(0x5c00, 0x5c0f) AM_WRITE_LEGACY(btime_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x4800, 0x4bff) AM_READWRITE(btime_mirrorvideoram_r, btime_mirrorvideoram_w)
+ AM_RANGE(0x4c00, 0x4fff) AM_READWRITE(btime_mirrorcolorram_r, btime_mirrorcolorram_w)
+ AM_RANGE(0x5000, 0x51ff) AM_WRITE(bnj_background_w) AM_BASE_SIZE(m_bnj_backgroundram, m_bnj_backgroundram_size)
+ AM_RANGE(0x5400, 0x5400) AM_WRITE(bnj_scroll1_w)
+ AM_RANGE(0x5800, 0x5800) AM_WRITE(bnj_scroll2_w)
+ AM_RANGE(0x5c00, 0x5c0f) AM_WRITE(btime_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0xa000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -479,7 +479,7 @@ static ADDRESS_MAP_START( disco_map, AS_PROGRAM, 8, btime_state )
AM_RANGE(0x0000, 0xffff) AM_WRITE(disco_w) /* override the following entries to */
/* support ROM decryption */
AM_RANGE(0x0000, 0x04ff) AM_RAM AM_BASE(m_rambase)
- AM_RANGE(0x2000, 0x7fff) AM_RAM_WRITE_LEGACY(deco_charram_w) AM_BASE(m_deco_charram)
+ AM_RANGE(0x2000, 0x7fff) AM_RAM_WRITE(deco_charram_w) AM_BASE(m_deco_charram)
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x8400, 0x87ff) AM_RAM AM_BASE(m_colorram)
AM_RANGE(0x8800, 0x881f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
@@ -488,7 +488,7 @@ static ADDRESS_MAP_START( disco_map, AS_PROGRAM, 8, btime_state )
AM_RANGE(0x9400, 0x9400) AM_READ_PORT("P2")
AM_RANGE(0x9800, 0x9800) AM_READ_PORT("DSW1")
AM_RANGE(0x9a00, 0x9a00) AM_READ_PORT("DSW2") AM_WRITE(audio_command_w)
- AM_RANGE(0x9c00, 0x9c00) AM_READ_PORT("VBLANK") AM_WRITE_LEGACY(disco_video_control_w)
+ AM_RANGE(0x9c00, 0x9c00) AM_READ_PORT("VBLANK") AM_WRITE(disco_video_control_w)
AM_RANGE(0xa000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index 47d43cb2a3c..84b7e9a0cbf 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -291,10 +291,10 @@ static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8, bublbobl_state )
AM_RANGE(0xdd00, 0xdfff) AM_RAM AM_BASE_SIZE(m_objectram, m_objectram_size)
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xf800, 0xf9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
- AM_RANGE(0xfa00, 0xfa00) AM_READWRITE_LEGACY(bublbobl_sound_status_r, bublbobl_sound_command_w)
- AM_RANGE(0xfa03, 0xfa03) AM_WRITE_LEGACY(bublbobl_soundcpu_reset_w)
+ AM_RANGE(0xfa00, 0xfa00) AM_READWRITE(bublbobl_sound_status_r, bublbobl_sound_command_w)
+ AM_RANGE(0xfa03, 0xfa03) AM_WRITE(bublbobl_soundcpu_reset_w)
AM_RANGE(0xfa80, 0xfa80) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0xfb40, 0xfb40) AM_WRITE_LEGACY(bublbobl_bankswitch_w)
+ AM_RANGE(0xfb40, 0xfb40) AM_WRITE(bublbobl_bankswitch_w)
AM_RANGE(0xfc00, 0xffff) AM_RAM AM_BASE(m_mcu_sharedram)
ADDRESS_MAP_END
@@ -308,21 +308,21 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, bublbobl_state )
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ym2", ym3526_r, ym3526_w)
- AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r) AM_WRITE_LEGACY(bublbobl_sound_status_w)
- AM_RANGE(0xb001, 0xb001) AM_WRITE_LEGACY(bublbobl_sh_nmi_enable_w) AM_READNOP
- AM_RANGE(0xb002, 0xb002) AM_WRITE_LEGACY(bublbobl_sh_nmi_disable_w)
+ AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r) AM_WRITE(bublbobl_sound_status_w)
+ AM_RANGE(0xb001, 0xb001) AM_WRITE(bublbobl_sh_nmi_enable_w) AM_READNOP
+ AM_RANGE(0xb002, 0xb002) AM_WRITE(bublbobl_sh_nmi_disable_w)
AM_RANGE(0xe000, 0xffff) AM_ROM // space for diagnostic ROM?
ADDRESS_MAP_END
static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8, bublbobl_state )
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(bublbobl_mcu_ddr1_r, bublbobl_mcu_ddr1_w)
- AM_RANGE(0x0001, 0x0001) AM_READWRITE_LEGACY(bublbobl_mcu_ddr2_r, bublbobl_mcu_ddr2_w)
- AM_RANGE(0x0002, 0x0002) AM_READWRITE_LEGACY(bublbobl_mcu_port1_r, bublbobl_mcu_port1_w)
- AM_RANGE(0x0003, 0x0003) AM_READWRITE_LEGACY(bublbobl_mcu_port2_r, bublbobl_mcu_port2_w)
- AM_RANGE(0x0004, 0x0004) AM_READWRITE_LEGACY(bublbobl_mcu_ddr3_r, bublbobl_mcu_ddr3_w)
- AM_RANGE(0x0005, 0x0005) AM_READWRITE_LEGACY(bublbobl_mcu_ddr4_r, bublbobl_mcu_ddr4_w)
- AM_RANGE(0x0006, 0x0006) AM_READWRITE_LEGACY(bublbobl_mcu_port3_r, bublbobl_mcu_port3_w)
- AM_RANGE(0x0007, 0x0007) AM_READWRITE_LEGACY(bublbobl_mcu_port4_r, bublbobl_mcu_port4_w)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(bublbobl_mcu_ddr1_r, bublbobl_mcu_ddr1_w)
+ AM_RANGE(0x0001, 0x0001) AM_READWRITE(bublbobl_mcu_ddr2_r, bublbobl_mcu_ddr2_w)
+ AM_RANGE(0x0002, 0x0002) AM_READWRITE(bublbobl_mcu_port1_r, bublbobl_mcu_port1_w)
+ AM_RANGE(0x0003, 0x0003) AM_READWRITE(bublbobl_mcu_port2_r, bublbobl_mcu_port2_w)
+ AM_RANGE(0x0004, 0x0004) AM_READWRITE(bublbobl_mcu_ddr3_r, bublbobl_mcu_ddr3_w)
+ AM_RANGE(0x0005, 0x0005) AM_READWRITE(bublbobl_mcu_ddr4_r, bublbobl_mcu_ddr4_w)
+ AM_RANGE(0x0006, 0x0006) AM_READWRITE(bublbobl_mcu_port3_r, bublbobl_mcu_port3_w)
+ AM_RANGE(0x0007, 0x0007) AM_READWRITE(bublbobl_mcu_port4_r, bublbobl_mcu_port4_w)
AM_RANGE(0x0040, 0x00ff) AM_RAM
AM_RANGE(0xf000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -330,11 +330,11 @@ ADDRESS_MAP_END
// The 68705 is from a bootleg, the original MCU is a 6801U4
static ADDRESS_MAP_START( bootlegmcu_map, AS_PROGRAM, 8, bublbobl_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x000, 0x000) AM_READWRITE_LEGACY(bublbobl_68705_port_a_r, bublbobl_68705_port_a_w)
- AM_RANGE(0x001, 0x001) AM_READWRITE_LEGACY(bublbobl_68705_port_b_r, bublbobl_68705_port_b_w)
+ AM_RANGE(0x000, 0x000) AM_READWRITE(bublbobl_68705_port_a_r, bublbobl_68705_port_a_w)
+ AM_RANGE(0x001, 0x001) AM_READWRITE(bublbobl_68705_port_b_r, bublbobl_68705_port_b_w)
AM_RANGE(0x002, 0x002) AM_READ_PORT("IN0") // COIN
- AM_RANGE(0x004, 0x004) AM_WRITE_LEGACY(bublbobl_68705_ddr_a_w)
- AM_RANGE(0x005, 0x005) AM_WRITE_LEGACY(bublbobl_68705_ddr_b_w)
+ AM_RANGE(0x004, 0x004) AM_WRITE(bublbobl_68705_ddr_a_w)
+ AM_RANGE(0x005, 0x005) AM_WRITE(bublbobl_68705_ddr_b_w)
AM_RANGE(0x006, 0x006) AM_WRITENOP // ???
AM_RANGE(0x010, 0x07f) AM_RAM
AM_RANGE(0x080, 0x7ff) AM_ROM
@@ -347,14 +347,14 @@ static ADDRESS_MAP_START( bootleg_map, AS_PROGRAM, 8, bublbobl_state )
AM_RANGE(0xdd00, 0xdfff) AM_RAM AM_BASE_SIZE(m_objectram, m_objectram_size)
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xf800, 0xf9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
- AM_RANGE(0xfa00, 0xfa00) AM_READWRITE_LEGACY(bublbobl_sound_status_r, bublbobl_sound_command_w)
- AM_RANGE(0xfa03, 0xfa03) AM_WRITE_LEGACY(bublbobl_soundcpu_reset_w)
+ AM_RANGE(0xfa00, 0xfa00) AM_READWRITE(bublbobl_sound_status_r, bublbobl_sound_command_w)
+ AM_RANGE(0xfa03, 0xfa03) AM_WRITE(bublbobl_soundcpu_reset_w)
AM_RANGE(0xfa80, 0xfa80) AM_WRITENOP // ???
- AM_RANGE(0xfb40, 0xfb40) AM_WRITE_LEGACY(bublbobl_bankswitch_w)
+ AM_RANGE(0xfb40, 0xfb40) AM_WRITE(bublbobl_bankswitch_w)
AM_RANGE(0xfc00, 0xfcff) AM_RAM
AM_RANGE(0xfd00, 0xfdff) AM_RAM
- AM_RANGE(0xfe00, 0xfe03) AM_READWRITE_LEGACY(boblbobl_ic43_a_r, boblbobl_ic43_a_w)
- AM_RANGE(0xfe80, 0xfe83) AM_READWRITE_LEGACY(boblbobl_ic43_b_r, boblbobl_ic43_b_w)
+ AM_RANGE(0xfe00, 0xfe03) AM_READWRITE(boblbobl_ic43_a_r, boblbobl_ic43_a_w)
+ AM_RANGE(0xfe80, 0xfe83) AM_READWRITE(boblbobl_ic43_b_r, boblbobl_ic43_b_w)
AM_RANGE(0xff00, 0xff00) AM_READ_PORT("DSW0")
AM_RANGE(0xff01, 0xff01) AM_READ_PORT("DSW1")
AM_RANGE(0xff02, 0xff02) AM_READ_PORT("IN0")
@@ -377,11 +377,11 @@ static ADDRESS_MAP_START( tokio_map, AS_PROGRAM, 8, bublbobl_state )
AM_RANGE(0xfa05, 0xfa05) AM_READ_PORT("IN0")
AM_RANGE(0xfa06, 0xfa06) AM_READ_PORT("IN1")
AM_RANGE(0xfa07, 0xfa07) AM_READ_PORT("IN2")
- AM_RANGE(0xfa80, 0xfa80) AM_WRITE_LEGACY(tokio_bankswitch_w)
- AM_RANGE(0xfb00, 0xfb00) AM_WRITE_LEGACY(tokio_videoctrl_w)
- AM_RANGE(0xfb80, 0xfb80) AM_WRITE_LEGACY(bublbobl_nmitrigger_w)
- AM_RANGE(0xfc00, 0xfc00) AM_READWRITE_LEGACY(bublbobl_sound_status_r, bublbobl_sound_command_w)
- AM_RANGE(0xfe00, 0xfe00) AM_READ_LEGACY(tokio_mcu_r) AM_WRITENOP // ???
+ AM_RANGE(0xfa80, 0xfa80) AM_WRITE(tokio_bankswitch_w)
+ AM_RANGE(0xfb00, 0xfb00) AM_WRITE(tokio_videoctrl_w)
+ AM_RANGE(0xfb80, 0xfb80) AM_WRITE(bublbobl_nmitrigger_w)
+ AM_RANGE(0xfc00, 0xfc00) AM_READWRITE(bublbobl_sound_status_r, bublbobl_sound_command_w)
+ AM_RANGE(0xfe00, 0xfe00) AM_READ(tokio_mcu_r) AM_WRITENOP // ???
ADDRESS_MAP_END
static ADDRESS_MAP_START( tokio_slave_map, AS_PROGRAM, 8, bublbobl_state )
@@ -392,10 +392,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( tokio_sound_map, AS_PROGRAM, 8, bublbobl_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
- AM_RANGE(0x9000, 0x9000) AM_READ(soundlatch_r) AM_WRITE_LEGACY(bublbobl_sound_status_w)
+ AM_RANGE(0x9000, 0x9000) AM_READ(soundlatch_r) AM_WRITE(bublbobl_sound_status_w)
AM_RANGE(0x9800, 0x9800) AM_READNOP // ???
- AM_RANGE(0xa000, 0xa000) AM_WRITE_LEGACY(bublbobl_sh_nmi_disable_w)
- AM_RANGE(0xa800, 0xa800) AM_WRITE_LEGACY(bublbobl_sh_nmi_enable_w)
+ AM_RANGE(0xa000, 0xa000) AM_WRITE(bublbobl_sh_nmi_disable_w)
+ AM_RANGE(0xa800, 0xa800) AM_WRITE(bublbobl_sh_nmi_enable_w)
AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xe000, 0xffff) AM_ROM // space for diagnostic ROM?
ADDRESS_MAP_END
@@ -1578,9 +1578,10 @@ static DRIVER_INIT( tokio )
static DRIVER_INIT( tokiob )
{
+ bublbobl_state *state = machine.driver_data<bublbobl_state>();
DRIVER_INIT_CALL(tokio);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xfe00, 0xfe00, FUNC(tokiob_mcu_r) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xfe00, 0xfe00, read8_delegate(FUNC(bublbobl_state::tokiob_mcu_r),state) );
}
static DRIVER_INIT( dland )
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index d0c808193cf..6beebc40f18 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -134,13 +134,13 @@ static ADDRESS_MAP_START( buggychl_map, AS_PROGRAM, 8, buggychl_state )
AM_RANGE(0x4000, 0x7fff) AM_ROM /* A22-05 (22) */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* 6116 SRAM (36) */
AM_RANGE(0x8800, 0x8fff) AM_RAM /* 6116 SRAM (35) */
- AM_RANGE(0x9000, 0x9fff) AM_WRITE_LEGACY(buggychl_sprite_lookup_w)
- AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1") AM_WRITE_LEGACY(buggychl_chargen_w) AM_BASE(m_charram)
+ AM_RANGE(0x9000, 0x9fff) AM_WRITE(buggychl_sprite_lookup_w)
+ AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1") AM_WRITE(buggychl_chargen_w) AM_BASE(m_charram)
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0xd100, 0xd100) AM_WRITE_LEGACY(buggychl_ctrl_w)
+ AM_RANGE(0xd100, 0xd100) AM_WRITE(buggychl_ctrl_w)
AM_RANGE(0xd200, 0xd200) AM_WRITE(bankswitch_w)
AM_RANGE(0xd300, 0xd300) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0xd303, 0xd303) AM_WRITE_LEGACY(buggychl_sprite_lookup_bank_w)
+ AM_RANGE(0xd303, 0xd303) AM_WRITE(buggychl_sprite_lookup_bank_w)
AM_RANGE(0xd400, 0xd400) AM_DEVREADWRITE_LEGACY("bmcu", buggychl_mcu_r, buggychl_mcu_w)
AM_RANGE(0xd401, 0xd401) AM_DEVREAD_LEGACY("bmcu", buggychl_mcu_status_r)
AM_RANGE(0xd500, 0xd57f) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
@@ -158,7 +158,7 @@ static ADDRESS_MAP_START( buggychl_map, AS_PROGRAM, 8, buggychl_state )
AM_RANGE(0xd840, 0xd85f) AM_WRITEONLY AM_BASE(m_scrollv)
AM_RANGE(0xdb00, 0xdbff) AM_WRITEONLY AM_BASE(m_scrollh)
AM_RANGE(0xdc04, 0xdc04) AM_WRITEONLY /* should be fg scroll */
- AM_RANGE(0xdc06, 0xdc06) AM_WRITE_LEGACY(buggychl_bg_scrollx_w)
+ AM_RANGE(0xdc06, 0xdc06) AM_WRITE(buggychl_bg_scrollx_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, buggychl_state )
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index f3dcb395395..2ce3a20bf24 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -149,13 +149,13 @@ static ADDRESS_MAP_START( bwp1_map, AS_PROGRAM, 8, bwing_state )
AM_RANGE(0x1b00, 0x1b07) AM_READ(bwp1_io_r)
AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(bwp12_sharedram1_w) AM_BASE(m_bwp1_sharedram1)
AM_RANGE(0x0800, 0x0fff) AM_RAM
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE_LEGACY(bwing_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(bwing_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1400, 0x17ff) AM_RAM
- AM_RANGE(0x1800, 0x19ff) AM_RAM_WRITE_LEGACY(bwing_spriteram_w) AM_BASE(m_spriteram)
- AM_RANGE(0x1a00, 0x1aff) AM_RAM_WRITE_LEGACY(bwing_paletteram_w) AM_BASE(m_paletteram)
- AM_RANGE(0x1b00, 0x1b07) AM_RAM_WRITE_LEGACY(bwing_scrollreg_w)
+ AM_RANGE(0x1800, 0x19ff) AM_RAM_WRITE(bwing_spriteram_w) AM_BASE(m_spriteram)
+ AM_RANGE(0x1a00, 0x1aff) AM_RAM_WRITE(bwing_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x1b00, 0x1b07) AM_RAM_WRITE(bwing_scrollreg_w)
AM_RANGE(0x1c00, 0x1c07) AM_RAM_WRITE(bwp1_ctrl_w)
- AM_RANGE(0x2000, 0x3fff) AM_READWRITE_LEGACY(bwing_scrollram_r, bwing_scrollram_w)
+ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(bwing_scrollram_r, bwing_scrollram_w)
AM_RANGE(0x4000, 0xffff) AM_ROM // "B-Wings US" writes to 9631-9632(debug?)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index ab80c997e11..292fee1a3f3 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -121,15 +121,15 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, cabal_state )
AM_RANGE(0x40000, 0x437ff) AM_RAM
AM_RANGE(0x43800, 0x43fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x44000, 0x4ffff) AM_RAM
- AM_RANGE(0x60000, 0x607ff) AM_RAM_WRITE_LEGACY(cabal_text_videoram16_w) AM_BASE(m_colorram)
- AM_RANGE(0x80000, 0x801ff) AM_RAM_WRITE_LEGACY(cabal_background_videoram16_w) AM_BASE(m_videoram)
+ AM_RANGE(0x60000, 0x607ff) AM_RAM_WRITE(cabal_text_videoram16_w) AM_BASE(m_colorram)
+ AM_RANGE(0x80000, 0x801ff) AM_RAM_WRITE(cabal_background_videoram16_w) AM_BASE(m_videoram)
AM_RANGE(0x80200, 0x803ff) AM_RAM
AM_RANGE(0xa0000, 0xa0001) AM_READ_PORT("DSW")
AM_RANGE(0xa0008, 0xa000f) AM_READ(track_r)
AM_RANGE(0xa0010, 0xa0011) AM_READ_PORT("INPUTS")
AM_RANGE(0xc0000, 0xc0001) AM_WRITE(track_reset_w)
AM_RANGE(0xc0040, 0xc0041) AM_WRITENOP /* ??? */
- AM_RANGE(0xc0080, 0xc0081) AM_WRITE_LEGACY(cabal_flipscreen_w)
+ AM_RANGE(0xc0080, 0xc0081) AM_WRITE(cabal_flipscreen_w)
AM_RANGE(0xe0000, 0xe07ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xe8008, 0xe8009) AM_WRITE(cabal_sound_irq_trigger_word_w) // fix coin insertion
AM_RANGE(0xe8000, 0xe800d) AM_READWRITE_LEGACY(seibu_main_word_r, seibu_main_word_w)
@@ -140,14 +140,14 @@ static ADDRESS_MAP_START( cabalbl_main_map, AS_PROGRAM, 16, cabal_state )
AM_RANGE(0x40000, 0x437ff) AM_RAM
AM_RANGE(0x43800, 0x43fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x44000, 0x4ffff) AM_RAM
- AM_RANGE(0x60000, 0x607ff) AM_RAM_WRITE_LEGACY(cabal_text_videoram16_w) AM_BASE(m_colorram)
- AM_RANGE(0x80000, 0x801ff) AM_RAM_WRITE_LEGACY(cabal_background_videoram16_w) AM_BASE(m_videoram)
+ AM_RANGE(0x60000, 0x607ff) AM_RAM_WRITE(cabal_text_videoram16_w) AM_BASE(m_colorram)
+ AM_RANGE(0x80000, 0x801ff) AM_RAM_WRITE(cabal_background_videoram16_w) AM_BASE(m_videoram)
AM_RANGE(0x80200, 0x803ff) AM_RAM
AM_RANGE(0xa0000, 0xa0001) AM_READ_PORT("DSW")
AM_RANGE(0xa0008, 0xa0009) AM_READ_PORT("JOY")
AM_RANGE(0xa0010, 0xa0011) AM_READ_PORT("INPUTS")
AM_RANGE(0xc0040, 0xc0041) AM_WRITENOP /* ??? */
- AM_RANGE(0xc0080, 0xc0081) AM_WRITE_LEGACY(cabal_flipscreen_w)
+ AM_RANGE(0xc0080, 0xc0081) AM_WRITE(cabal_flipscreen_w)
AM_RANGE(0xe0000, 0xe07ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xe8000, 0xe8003) AM_WRITE(cabalbl_sndcmd_w)
AM_RANGE(0xe8004, 0xe8005) AM_READ(soundlatch2_word_r)
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index 9a6b2341364..9970511a05b 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -845,8 +845,8 @@ static ADDRESS_MAP_START( sys903_map, AS_PROGRAM, 8, calomega_state )
AM_RANGE(0x08c8, 0x08cb) AM_DEVREADWRITE("pia1", pia6821_device, read, write)
AM_RANGE(0x08d0, 0x08d0) AM_DEVREADWRITE("acia6850_0", acia6850_device, status_read, control_write)
AM_RANGE(0x08d1, 0x08d1) AM_DEVREADWRITE("acia6850_0", acia6850_device, data_read, data_write)
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE_LEGACY(calomega_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE_LEGACY(calomega_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(calomega_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(calomega_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x1800, 0x3fff) AM_ROM
ADDRESS_MAP_END
@@ -858,8 +858,8 @@ static ADDRESS_MAP_START( s903mod_map, AS_PROGRAM, 8, calomega_state )
AM_RANGE(0x0881, 0x0881) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
AM_RANGE(0x08c4, 0x08c7) AM_DEVREADWRITE("pia0", pia6821_device, read, write)
AM_RANGE(0x08c8, 0x08cb) AM_DEVREADWRITE("pia1", pia6821_device, read, write)
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE_LEGACY(calomega_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE_LEGACY(calomega_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(calomega_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(calomega_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x1800, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -871,8 +871,8 @@ static ADDRESS_MAP_START( sys905_map, AS_PROGRAM, 8, calomega_state )
AM_RANGE(0x1081, 0x1081) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
AM_RANGE(0x10c4, 0x10c7) AM_DEVREADWRITE("pia0", pia6821_device, read, write)
AM_RANGE(0x10c8, 0x10cb) AM_DEVREADWRITE("pia1", pia6821_device, read, write)
- AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE_LEGACY(calomega_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x2400, 0x27ff) AM_RAM_WRITE_LEGACY(calomega_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(calomega_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2400, 0x27ff) AM_RAM_WRITE(calomega_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x2800, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -883,8 +883,8 @@ static ADDRESS_MAP_START( sys906_map, AS_PROGRAM, 8, calomega_state )
AM_RANGE(0x2c04, 0x2c04) AM_DEVWRITE("crtc", mc6845_device, address_w)
AM_RANGE(0x2c05, 0x2c05) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
AM_RANGE(0x2c08, 0x2c09) AM_DEVREADWRITE_LEGACY("ay8912", ay8910_r, ay8910_address_data_w)
- AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE_LEGACY(calomega_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x2400, 0x27ff) AM_RAM_WRITE_LEGACY(calomega_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(calomega_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2400, 0x27ff) AM_RAM_WRITE(calomega_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c
index 26b6537f075..5ffb1e47b2c 100644
--- a/src/mame/drivers/canyon.c
+++ b/src/mame/drivers/canyon.c
@@ -114,7 +114,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, canyon_state )
AM_RANGE(0x0600, 0x0603) AM_DEVWRITE_LEGACY("discrete", canyon_whistle_w)
AM_RANGE(0x0680, 0x0683) AM_WRITE(canyon_led_w)
AM_RANGE(0x0700, 0x0703) AM_DEVWRITE_LEGACY("discrete", canyon_attract_w)
- AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE_LEGACY(canyon_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(canyon_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1000, 0x17ff) AM_READ(canyon_switches_r) AM_WRITENOP /* sloppy code writes here */
AM_RANGE(0x1800, 0x1fff) AM_READ(canyon_options_r)
AM_RANGE(0x2000, 0x3fff) AM_ROM
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index aa08c83de9f..7250855a916 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -230,7 +230,7 @@ static ADDRESS_MAP_START( capbowl_map, AS_PROGRAM, 8, capbowl_state )
AM_RANGE(0x4000, 0x4000) AM_WRITEONLY AM_BASE(m_rowaddress)
AM_RANGE(0x4800, 0x4800) AM_WRITE(capbowl_rom_select_w)
AM_RANGE(0x5000, 0x57ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x5800, 0x5fff) AM_READWRITE_LEGACY(capbowl_tms34061_r, capbowl_tms34061_w)
+ AM_RANGE(0x5800, 0x5fff) AM_READWRITE(capbowl_tms34061_r, capbowl_tms34061_w)
AM_RANGE(0x6000, 0x6000) AM_WRITE(capbowl_sndcmd_w)
AM_RANGE(0x6800, 0x6800) AM_WRITE(track_reset_w) /* + watchdog */
AM_RANGE(0x7000, 0x7000) AM_READ(track_0_r) /* + other inputs */
@@ -240,10 +240,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bowlrama_map, AS_PROGRAM, 8, capbowl_state )
- AM_RANGE(0x0000, 0x001f) AM_READWRITE_LEGACY(bowlrama_blitter_r, bowlrama_blitter_w)
+ AM_RANGE(0x0000, 0x001f) AM_READWRITE(bowlrama_blitter_r, bowlrama_blitter_w)
AM_RANGE(0x4000, 0x4000) AM_WRITEONLY AM_BASE(m_rowaddress)
AM_RANGE(0x5000, 0x57ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x5800, 0x5fff) AM_READWRITE_LEGACY(capbowl_tms34061_r, capbowl_tms34061_w)
+ AM_RANGE(0x5800, 0x5fff) AM_READWRITE(capbowl_tms34061_r, capbowl_tms34061_w)
AM_RANGE(0x6000, 0x6000) AM_WRITE(capbowl_sndcmd_w)
AM_RANGE(0x6800, 0x6800) AM_WRITE(track_reset_w) /* + watchdog */
AM_RANGE(0x7000, 0x7000) AM_READ(track_0_r) /* + other inputs */
diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c
index 244d4407636..77774f2f537 100644
--- a/src/mame/drivers/carjmbre.c
+++ b/src/mame/drivers/carjmbre.c
@@ -62,12 +62,12 @@ static ADDRESS_MAP_START( carjmbre_map, AS_PROGRAM, 8, carjmbre_state )
AM_RANGE(0x8000, 0x87ff) AM_RAM
// AM_RANGE(0x8800, 0x8800) AM_READNOP // watchdog?
AM_RANGE(0x8803, 0x8803) AM_WRITE(nmi_mask_w)
- AM_RANGE(0x8805, 0x8805) AM_WRITE_LEGACY(carjmbre_bgcolor_w) // guessed
- AM_RANGE(0x8806, 0x8806) AM_WRITE_LEGACY(carjmbre_8806_w) // video related?
- AM_RANGE(0x8807, 0x8807) AM_WRITE_LEGACY(carjmbre_flipscreen_w)
+ AM_RANGE(0x8805, 0x8805) AM_WRITE(carjmbre_bgcolor_w) // guessed
+ AM_RANGE(0x8806, 0x8806) AM_WRITE(carjmbre_8806_w) // video related?
+ AM_RANGE(0x8807, 0x8807) AM_WRITE(carjmbre_flipscreen_w)
// AM_RANGE(0x8fc1, 0x8fc1) AM_WRITENOP // overrun during initial screen clear
// AM_RANGE(0x8fe1, 0x8fe1) AM_WRITENOP // overrun during initial screen clear
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(carjmbre_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(carjmbre_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x9800, 0x985f) AM_MIRROR(0x80) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1")
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c
index 5d1b66d387a..ac93d2f8c63 100644
--- a/src/mame/drivers/carpolo.c
+++ b/src/mame/drivers/carpolo.c
@@ -38,21 +38,21 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, carpolo_state )
AM_RANGE(0x4000, 0x400f) AM_WRITEONLY AM_BASE(m_spriteram)
AM_RANGE(0x5400, 0x5403) AM_DEVREADWRITE("pia0", pia6821_device, read, write)
AM_RANGE(0x5800, 0x5803) AM_DEVREADWRITE("pia1", pia6821_device, read, write)
- AM_RANGE(0xa000, 0xa000) AM_READ_LEGACY(carpolo_ball_screen_collision_cause_r)
- AM_RANGE(0xa001, 0xa001) AM_READ_LEGACY(carpolo_car_ball_collision_x_r)
- AM_RANGE(0xa002, 0xa002) AM_READ_LEGACY(carpolo_car_ball_collision_y_r)
- AM_RANGE(0xa003, 0xa003) AM_READ_LEGACY(carpolo_car_car_collision_cause_r)
- AM_RANGE(0xa004, 0xa004) AM_READ_LEGACY(carpolo_car_border_collision_cause_r)
- AM_RANGE(0xa005, 0xa005) AM_READ_LEGACY(carpolo_car_ball_collision_cause_r)
- AM_RANGE(0xa006, 0xa006) AM_READ_LEGACY(carpolo_car_goal_collision_cause_r)
+ AM_RANGE(0xa000, 0xa000) AM_READ(carpolo_ball_screen_collision_cause_r)
+ AM_RANGE(0xa001, 0xa001) AM_READ(carpolo_car_ball_collision_x_r)
+ AM_RANGE(0xa002, 0xa002) AM_READ(carpolo_car_ball_collision_y_r)
+ AM_RANGE(0xa003, 0xa003) AM_READ(carpolo_car_car_collision_cause_r)
+ AM_RANGE(0xa004, 0xa004) AM_READ(carpolo_car_border_collision_cause_r)
+ AM_RANGE(0xa005, 0xa005) AM_READ(carpolo_car_ball_collision_cause_r)
+ AM_RANGE(0xa006, 0xa006) AM_READ(carpolo_car_goal_collision_cause_r)
AM_RANGE(0xa007, 0xa007) AM_READ_PORT("IN1")
- AM_RANGE(0xb000, 0xb000) AM_WRITE_LEGACY(carpolo_ball_screen_interrupt_clear_w)
- AM_RANGE(0xb001, 0xb001) AM_WRITE_LEGACY(carpolo_timer_interrupt_clear_w)
- AM_RANGE(0xb003, 0xb003) AM_WRITE_LEGACY(carpolo_car_car_interrupt_clear_w)
- AM_RANGE(0xb004, 0xb004) AM_WRITE_LEGACY(carpolo_car_border_interrupt_clear_w)
- AM_RANGE(0xb005, 0xb005) AM_WRITE_LEGACY(carpolo_car_ball_interrupt_clear_w)
- AM_RANGE(0xb006, 0xb006) AM_WRITE_LEGACY(carpolo_car_goal_interrupt_clear_w)
- AM_RANGE(0xc000, 0xc000) AM_READ_LEGACY(carpolo_interrupt_cause_r)
+ AM_RANGE(0xb000, 0xb000) AM_WRITE(carpolo_ball_screen_interrupt_clear_w)
+ AM_RANGE(0xb001, 0xb001) AM_WRITE(carpolo_timer_interrupt_clear_w)
+ AM_RANGE(0xb003, 0xb003) AM_WRITE(carpolo_car_car_interrupt_clear_w)
+ AM_RANGE(0xb004, 0xb004) AM_WRITE(carpolo_car_border_interrupt_clear_w)
+ AM_RANGE(0xb005, 0xb005) AM_WRITE(carpolo_car_ball_interrupt_clear_w)
+ AM_RANGE(0xb006, 0xb006) AM_WRITE(carpolo_car_goal_interrupt_clear_w)
+ AM_RANGE(0xc000, 0xc000) AM_READ(carpolo_interrupt_cause_r)
AM_RANGE(0xf000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index 06399dd3cc0..fed75190048 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -434,8 +434,8 @@ static ADDRESS_MAP_START( dfeveron_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x300000, 0x300003) AM_DEVREADWRITE8_LEGACY("ymz", ymz280b_r, ymz280b_w, 0x00ff) // YMZ280
/**/AM_RANGE(0x400000, 0x407fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
/**/AM_RANGE(0x408000, 0x40ffff) AM_RAM AM_BASE(m_spriteram_2) // Sprites?
-/**/AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
-/**/AM_RANGE(0x600000, 0x607fff) AM_RAM_WRITE_LEGACY(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
+/**/AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+/**/AM_RANGE(0x600000, 0x607fff) AM_RAM_WRITE(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
/**/AM_RANGE(0x708000, 0x708fff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
/**/AM_RANGE(0x710000, 0x710bff) AM_READONLY // ?
AM_RANGE(0x710c00, 0x710fff) AM_RAM // ?
@@ -459,9 +459,9 @@ static ADDRESS_MAP_START( ddonpach_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x300000, 0x300003) AM_DEVREADWRITE8_LEGACY("ymz", ymz280b_r, ymz280b_w, 0x00ff) // YMZ280
/**/AM_RANGE(0x400000, 0x407fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
/**/AM_RANGE(0x408000, 0x40ffff) AM_RAM AM_BASE(m_spriteram_2) // Sprites?
-/**/AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
-/**/AM_RANGE(0x600000, 0x607fff) AM_RAM_WRITE_LEGACY(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
-/**/AM_RANGE(0x700000, 0x70ffff) AM_RAM_WRITE_LEGACY(cave_vram_2_8x8_w) AM_BASE(m_vram[2]) // Layer 2
+/**/AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+/**/AM_RANGE(0x600000, 0x607fff) AM_RAM_WRITE(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
+/**/AM_RANGE(0x700000, 0x70ffff) AM_RAM_WRITE(cave_vram_2_8x8_w) AM_BASE(m_vram[2]) // Layer 2
AM_RANGE(0x800000, 0x800007) AM_READ(cave_irq_cause_r) // IRQ Cause
AM_RANGE(0x800000, 0x80007f) AM_WRITEONLY AM_BASE(m_videoregs) // Video Regs
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(m_vctrl[0]) // Layer 0 Control
@@ -506,9 +506,9 @@ WRITE16_MEMBER(cave_state::donpachi_videoregs_w)
static ADDRESS_MAP_START( donpachi_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
- AM_RANGE(0x200000, 0x207fff) AM_RAM_WRITE_LEGACY(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
- AM_RANGE(0x300000, 0x307fff) AM_RAM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
- AM_RANGE(0x400000, 0x407fff) AM_RAM_WRITE_LEGACY(cave_vram_2_8x8_w) AM_BASE(m_vram[2]) // Layer 2
+ AM_RANGE(0x200000, 0x207fff) AM_RAM_WRITE(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
+ AM_RANGE(0x300000, 0x307fff) AM_RAM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+ AM_RANGE(0x400000, 0x407fff) AM_RAM_WRITE(cave_vram_2_8x8_w) AM_BASE(m_vram[2]) // Layer 2
AM_RANGE(0x500000, 0x507fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x508000, 0x50ffff) AM_RAM AM_BASE(m_spriteram_2) // Sprites?
/**/AM_RANGE(0x600000, 0x600005) AM_RAM AM_BASE(m_vctrl[1]) // Layer 1 Control
@@ -535,9 +535,9 @@ static ADDRESS_MAP_START( esprade_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x300000, 0x300003) AM_DEVREADWRITE8_LEGACY("ymz", ymz280b_r, ymz280b_w, 0x00ff) // YMZ280
/**/AM_RANGE(0x400000, 0x407fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
/**/AM_RANGE(0x408000, 0x40ffff) AM_RAM AM_BASE(m_spriteram_2) // Sprites?
-/**/AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
-/**/AM_RANGE(0x600000, 0x607fff) AM_RAM_WRITE_LEGACY(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
-/**/AM_RANGE(0x700000, 0x707fff) AM_RAM_WRITE_LEGACY(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
+/**/AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+/**/AM_RANGE(0x600000, 0x607fff) AM_RAM_WRITE(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
+/**/AM_RANGE(0x700000, 0x707fff) AM_RAM_WRITE(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
AM_RANGE(0x800000, 0x800007) AM_READ(cave_irq_cause_r) // IRQ Cause
AM_RANGE(0x800000, 0x80007f) AM_WRITEONLY AM_BASE(m_videoregs) // Video Regs
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(m_vctrl[0]) // Layer 0 Control
@@ -560,11 +560,11 @@ static ADDRESS_MAP_START( gaia_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x300000, 0x300003) AM_DEVREADWRITE8_LEGACY("ymz", ymz280b_r, ymz280b_w, 0x00ff) // YMZ280
AM_RANGE(0x400000, 0x407fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprite bank 1
AM_RANGE(0x408000, 0x40ffff) AM_RAM AM_BASE(m_spriteram_2) // Sprite bank 2
- AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+ AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
AM_RANGE(0x508000, 0x50ffff) AM_RAM // More Layer 0, Tested but not used?
- AM_RANGE(0x600000, 0x607fff) AM_RAM_WRITE_LEGACY(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
+ AM_RANGE(0x600000, 0x607fff) AM_RAM_WRITE(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
AM_RANGE(0x608000, 0x60ffff) AM_RAM // More Layer 1, Tested but not used?
- AM_RANGE(0x700000, 0x707fff) AM_RAM_WRITE_LEGACY(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
+ AM_RANGE(0x700000, 0x707fff) AM_RAM_WRITE(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
AM_RANGE(0x708000, 0x70ffff) AM_RAM // More Layer 2, Tested but not used?
AM_RANGE(0x800000, 0x800007) AM_READ(cave_irq_cause_r) // IRQ Cause
AM_RANGE(0x800000, 0x80007f) AM_WRITEONLY AM_BASE(m_videoregs) // Video Regs
@@ -591,9 +591,9 @@ static ADDRESS_MAP_START( guwange_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x300000, 0x30007f) AM_WRITEONLY AM_BASE(m_videoregs) // Video Regs
/**/AM_RANGE(0x400000, 0x407fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
/**/AM_RANGE(0x408000, 0x40ffff) AM_RAM AM_BASE(m_spriteram_2) // Sprites?
-/**/AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
-/**/AM_RANGE(0x600000, 0x607fff) AM_RAM_WRITE_LEGACY(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
-/**/AM_RANGE(0x700000, 0x707fff) AM_RAM_WRITE_LEGACY(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
+/**/AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+/**/AM_RANGE(0x600000, 0x607fff) AM_RAM_WRITE(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
+/**/AM_RANGE(0x700000, 0x707fff) AM_RAM_WRITE(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
AM_RANGE(0x800000, 0x800003) AM_DEVREADWRITE8_LEGACY("ymz", ymz280b_r, ymz280b_w, 0x00ff) // YMZ280
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(m_vctrl[0]) // Layer 0 Control
/**/AM_RANGE(0xa00000, 0xa00005) AM_RAM AM_BASE(m_vctrl[1]) // Layer 1 Control
@@ -615,9 +615,9 @@ static ADDRESS_MAP_START( hotdogst_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x300000, 0x30ffff) AM_RAM // RAM
/**/AM_RANGE(0x408000, 0x408fff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
-/**/AM_RANGE(0x880000, 0x887fff) AM_RAM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
-/**/AM_RANGE(0x900000, 0x907fff) AM_RAM_WRITE_LEGACY(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
-/**/AM_RANGE(0x980000, 0x987fff) AM_RAM_WRITE_LEGACY(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
+/**/AM_RANGE(0x880000, 0x887fff) AM_RAM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+/**/AM_RANGE(0x900000, 0x907fff) AM_RAM_WRITE(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
+/**/AM_RANGE(0x980000, 0x987fff) AM_RAM_WRITE(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
AM_RANGE(0xa80000, 0xa80007) AM_READ(cave_irq_cause_r) // IRQ Cause
// AM_RANGE(0xa8006e, 0xa8006f) AM_READ(soundlatch_ack_r) // From Sound CPU
AM_RANGE(0xa8006e, 0xa8006f) AM_WRITE(sound_cmd_w) // To Sound CPU
@@ -705,7 +705,7 @@ static CUSTOM_INPUT( korokoro_hopper_r )
static ADDRESS_MAP_START( korokoro_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
- AM_RANGE(0x100000, 0x107fff) AM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+ AM_RANGE(0x100000, 0x107fff) AM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
AM_RANGE(0x140000, 0x140005) AM_WRITEONLY AM_BASE(m_vctrl[0]) // Layer 0 Control
AM_RANGE(0x180000, 0x187fff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x1c0000, 0x1c0007) AM_READ(cave_irq_cause_r) // IRQ Cause
@@ -723,7 +723,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( crusherm_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
- AM_RANGE(0x100000, 0x107fff) AM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+ AM_RANGE(0x100000, 0x107fff) AM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
AM_RANGE(0x140000, 0x140005) AM_WRITEONLY AM_BASE(m_vctrl[0]) // Layer 0 Control
AM_RANGE(0x180000, 0x187fff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x200000, 0x207fff) AM_WRITEONLY AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
@@ -751,8 +751,8 @@ static ADDRESS_MAP_START( mazinger_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x300068, 0x300069) AM_WRITE(watchdog_reset16_w) // Watchdog
AM_RANGE(0x30006e, 0x30006f) AM_READWRITE(soundlatch_ack_r, sound_cmd_w) // From Sound CPU
AM_RANGE(0x300000, 0x30007f) AM_WRITEONLY AM_BASE(m_videoregs) // Video Regs
- AM_RANGE(0x400000, 0x407fff) AM_RAM_WRITE_LEGACY(cave_vram_1_8x8_w) AM_BASE(m_vram[1]) // Layer 1
-/**/AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE_LEGACY(cave_vram_0_8x8_w) AM_BASE(m_vram[0]) // Layer 0
+ AM_RANGE(0x400000, 0x407fff) AM_RAM_WRITE(cave_vram_1_8x8_w) AM_BASE(m_vram[1]) // Layer 1
+/**/AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE(cave_vram_0_8x8_w) AM_BASE(m_vram[0]) // Layer 0
/**/AM_RANGE(0x600000, 0x600005) AM_RAM AM_BASE(m_vctrl[1]) // Layer 1 Control
/**/AM_RANGE(0x700000, 0x700005) AM_RAM AM_BASE(m_vctrl[0]) // Layer 0 Control
AM_RANGE(0x800000, 0x800001) AM_READ_PORT("IN0") // Inputs
@@ -773,11 +773,11 @@ static ADDRESS_MAP_START( metmqstr_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x200000, 0x27ffff) AM_ROM // ROM
AM_RANGE(0x408000, 0x408fff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0x600000, 0x600001) AM_READ(watchdog_reset16_r) // Watchdog?
- AM_RANGE(0x880000, 0x887fff) AM_RAM_WRITE_LEGACY(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
+ AM_RANGE(0x880000, 0x887fff) AM_RAM_WRITE(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
AM_RANGE(0x888000, 0x88ffff) AM_RAM //
- AM_RANGE(0x900000, 0x907fff) AM_RAM_WRITE_LEGACY(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
+ AM_RANGE(0x900000, 0x907fff) AM_RAM_WRITE(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
AM_RANGE(0x908000, 0x90ffff) AM_RAM //
- AM_RANGE(0x980000, 0x987fff) AM_RAM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+ AM_RANGE(0x980000, 0x987fff) AM_RAM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
AM_RANGE(0x988000, 0x98ffff) AM_RAM //
AM_RANGE(0xa80000, 0xa80007) AM_READ(cave_irq_cause_r) // IRQ Cause
AM_RANGE(0xa80068, 0xa80069) AM_WRITE(watchdog_reset16_w) // Watchdog?
@@ -834,10 +834,10 @@ static ADDRESS_MAP_START( pwrinst2_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("IN1") //
AM_RANGE(0x600000, 0x6fffff) AM_ROM AM_REGION("user1", 0) // extra data ROM space
AM_RANGE(0x700000, 0x700001) AM_DEVWRITE_LEGACY("eeprom", cave_eeprom_msb_w) // EEPROM
- AM_RANGE(0x800000, 0x807fff) AM_RAM_WRITE_LEGACY(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
- AM_RANGE(0x880000, 0x887fff) AM_RAM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
- AM_RANGE(0x900000, 0x907fff) AM_RAM_WRITE_LEGACY(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
- AM_RANGE(0x980000, 0x987fff) AM_RAM_WRITE_LEGACY(cave_vram_3_8x8_w) AM_BASE(m_vram[3]) // Layer 3
+ AM_RANGE(0x800000, 0x807fff) AM_RAM_WRITE(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
+ AM_RANGE(0x880000, 0x887fff) AM_RAM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+ AM_RANGE(0x900000, 0x907fff) AM_RAM_WRITE(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
+ AM_RANGE(0x980000, 0x987fff) AM_RAM_WRITE(cave_vram_3_8x8_w) AM_BASE(m_vram[3]) // Layer 3
AM_RANGE(0xa00000, 0xa07fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xa08000, 0xa0ffff) AM_RAM AM_BASE(m_spriteram_2) // Sprites?
AM_RANGE(0xa10000, 0xa1ffff) AM_RAM // Sprites?
@@ -878,9 +878,9 @@ static ADDRESS_MAP_START( sailormn_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x600000, 0x600001) AM_READ(sailormn_input0_r) // Inputs + Watchdog!
AM_RANGE(0x600002, 0x600003) AM_READ_PORT("IN1") // Inputs + EEPROM
AM_RANGE(0x700000, 0x700001) AM_DEVWRITE_LEGACY("eeprom", sailormn_eeprom_msb_w) // EEPROM
- AM_RANGE(0x800000, 0x807fff) AM_RAM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
- AM_RANGE(0x880000, 0x887fff) AM_RAM_WRITE_LEGACY(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
- AM_RANGE(0x900000, 0x907fff) AM_RAM_WRITE_LEGACY(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
+ AM_RANGE(0x800000, 0x807fff) AM_RAM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+ AM_RANGE(0x880000, 0x887fff) AM_RAM_WRITE(cave_vram_1_w) AM_BASE(m_vram[1]) // Layer 1
+ AM_RANGE(0x900000, 0x907fff) AM_RAM_WRITE(cave_vram_2_w) AM_BASE(m_vram[2]) // Layer 2
AM_RANGE(0x908000, 0x908001) AM_RAM // (agallet)
/**/AM_RANGE(0xa00000, 0xa00005) AM_RAM AM_BASE(m_vctrl[0]) // Layer 0 Control
/**/AM_RANGE(0xa80000, 0xa80005) AM_RAM AM_BASE(m_vctrl[1]) // Layer 1 Control
@@ -944,8 +944,8 @@ static ADDRESS_MAP_START( tjumpman_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_SHARE("nvram") // RAM
AM_RANGE(0x200000, 0x207fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x208000, 0x20ffff) AM_RAM AM_BASE(m_spriteram_2) // Sprite bank 2
- AM_RANGE(0x304000, 0x307fff) AM_WRITE_LEGACY(cave_vram_0_w) // Layer 0 - 16x16 tiles mapped here
- AM_RANGE(0x300000, 0x307fff) AM_RAM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+ AM_RANGE(0x304000, 0x307fff) AM_WRITE(cave_vram_0_w) // Layer 0 - 16x16 tiles mapped here
+ AM_RANGE(0x300000, 0x307fff) AM_RAM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
AM_RANGE(0x400000, 0x400005) AM_WRITEONLY AM_BASE(m_vctrl[0]) // Layer 0 Control
AM_RANGE(0x500000, 0x50ffff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0x600000, 0x600001) AM_READ_PORT("IN0") // Inputs + EEPROM + Hopper
@@ -984,7 +984,7 @@ static ADDRESS_MAP_START( pacslot_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_SHARE("nvram") // RAM
AM_RANGE(0x200000, 0x207fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x208000, 0x20ffff) AM_RAM AM_BASE(m_spriteram_2) // Sprite bank 2
- AM_RANGE(0x300000, 0x307fff) AM_RAM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+ AM_RANGE(0x300000, 0x307fff) AM_RAM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
AM_RANGE(0x400000, 0x400007) AM_READ(cave_irq_cause_r) // IRQ Cause
AM_RANGE(0x400068, 0x400069) AM_WRITE(watchdog_reset16_w) // Watchdog
AM_RANGE(0x400000, 0x40007f) AM_WRITEONLY AM_BASE(m_videoregs) // Video Regs
@@ -1008,7 +1008,7 @@ static ADDRESS_MAP_START( uopoko_map, AS_PROGRAM, 16, cave_state )
AM_RANGE(0x300000, 0x300003) AM_DEVREADWRITE8_LEGACY("ymz", ymz280b_r, ymz280b_w, 0x00ff) // YMZ280
/**/AM_RANGE(0x400000, 0x407fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
/**/AM_RANGE(0x408000, 0x40ffff) AM_RAM AM_BASE(m_spriteram_2) // Sprites?
-/**/AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE_LEGACY(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
+/**/AM_RANGE(0x500000, 0x507fff) AM_RAM_WRITE(cave_vram_0_w) AM_BASE(m_vram[0]) // Layer 0
AM_RANGE(0x600000, 0x600007) AM_READ(cave_irq_cause_r) // IRQ Cause
AM_RANGE(0x600000, 0x60007f) AM_WRITEONLY AM_BASE(m_videoregs) // Video Regs
/**/AM_RANGE(0x700000, 0x700005) AM_RAM AM_BASE(m_vctrl[0]) // Layer 0 Control
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index b0e3c0d99a6..a83cb2f112f 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -47,7 +47,7 @@ READ8_MEMBER(cbasebal_state::bankedram_r)
switch (m_rambank)
{
case 2:
- return cbasebal_textram_r(&space, offset); /* VRAM */
+ return cbasebal_textram_r(space, offset); /* VRAM */
case 1:
if (offset < 0x800)
return m_generic_paletteram_8[offset];
@@ -55,7 +55,7 @@ READ8_MEMBER(cbasebal_state::bankedram_r)
return 0;
break;
default:
- return cbasebal_scrollram_r(&space, offset); /* SCROLL */
+ return cbasebal_scrollram_r(space, offset); /* SCROLL */
}
}
@@ -65,14 +65,14 @@ WRITE8_MEMBER(cbasebal_state::bankedram_w)
switch (m_rambank)
{
case 2:
- cbasebal_textram_w(&space, offset, data);
+ cbasebal_textram_w(space, offset, data);
break;
case 1:
if (offset < 0x800)
paletteram_xxxxBBBBRRRRGGGG_le_w(space, offset, data);
break;
default:
- cbasebal_scrollram_w(&space, offset, data);
+ cbasebal_scrollram_w(space, offset, data);
break;
}
}
@@ -124,12 +124,12 @@ static ADDRESS_MAP_START( cbasebal_portmap, AS_IO, 8, cbasebal_state )
AM_RANGE(0x03, 0x03) AM_WRITE_PORT("IO_03")
AM_RANGE(0x05, 0x05) AM_DEVWRITE("oki", okim6295_device, write)
AM_RANGE(0x06, 0x07) AM_DEVWRITE_LEGACY("ymsnd", ym2413_w)
- AM_RANGE(0x08, 0x09) AM_WRITE_LEGACY(cbasebal_scrollx_w)
- AM_RANGE(0x0a, 0x0b) AM_WRITE_LEGACY(cbasebal_scrolly_w)
+ AM_RANGE(0x08, 0x09) AM_WRITE(cbasebal_scrollx_w)
+ AM_RANGE(0x0a, 0x0b) AM_WRITE(cbasebal_scrolly_w)
AM_RANGE(0x10, 0x10) AM_READ_PORT("P1")
AM_RANGE(0x11, 0x11) AM_READ_PORT("P2")
AM_RANGE(0x12, 0x12) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x13, 0x13) AM_WRITE_LEGACY(cbasebal_gfxctrl_w)
+ AM_RANGE(0x13, 0x13) AM_WRITE(cbasebal_gfxctrl_w)
AM_RANGE(0x14, 0x14) AM_WRITE(cbasebal_coinctrl_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index 5dd73fca2ad..a7f5a9a9047 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -120,8 +120,8 @@ static ADDRESS_MAP_START( twocrude_map, AS_PROGRAM, 16, cbuster_state )
AM_RANGE(0x0b4000, 0x0b4001) AM_WRITENOP
AM_RANGE(0x0b5000, 0x0b500f) AM_DEVWRITE_LEGACY("tilegen1", deco16ic_pf_control_w)
AM_RANGE(0x0b6000, 0x0b600f) AM_DEVWRITE_LEGACY("tilegen2", deco16ic_pf_control_w)
- AM_RANGE(0x0b8000, 0x0b8fff) AM_RAM_WRITE_LEGACY(twocrude_palette_24bit_rg_w) AM_SHARE("paletteram")
- AM_RANGE(0x0b9000, 0x0b9fff) AM_RAM_WRITE_LEGACY(twocrude_palette_24bit_b_w) AM_SHARE("paletteram2")
+ AM_RANGE(0x0b8000, 0x0b8fff) AM_RAM_WRITE(twocrude_palette_24bit_rg_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0b9000, 0x0b9fff) AM_RAM_WRITE(twocrude_palette_24bit_b_w) AM_SHARE("paletteram2")
AM_RANGE(0x0bc000, 0x0bc00f) AM_READWRITE(twocrude_control_r, twocrude_control_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c
index 941f83b3619..bf446250410 100644
--- a/src/mame/drivers/ccastles.c
+++ b/src/mame/drivers/ccastles.c
@@ -306,14 +306,14 @@ WRITE8_MEMBER(ccastles_state::nvram_store_w)
READ8_MEMBER(ccastles_state::nvram_r)
{
- return (m_nvram_4b->read(*&space, offset) & 0x0f) | (m_nvram_4a->read(*&space, offset) << 4);
+ return (m_nvram_4b->read(space, offset) & 0x0f) | (m_nvram_4a->read(space, offset) << 4);
}
WRITE8_MEMBER(ccastles_state::nvram_w)
{
- m_nvram_4b->write(*&space, offset, data);
- m_nvram_4a->write(*&space, offset, data >> 4);
+ m_nvram_4b->write(space, offset, data);
+ m_nvram_4a->write(space, offset, data >> 4);
}
@@ -326,9 +326,9 @@ WRITE8_MEMBER(ccastles_state::nvram_w)
/* complete memory map derived from schematics */
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, ccastles_state )
- AM_RANGE(0x0000, 0x0001) AM_WRITE_LEGACY(ccastles_bitmode_addr_w)
- AM_RANGE(0x0002, 0x0002) AM_READWRITE_LEGACY(ccastles_bitmode_r, ccastles_bitmode_w)
- AM_RANGE(0x0000, 0x7fff) AM_RAM_WRITE_LEGACY(ccastles_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0000, 0x0001) AM_WRITE(ccastles_bitmode_addr_w)
+ AM_RANGE(0x0002, 0x0002) AM_READWRITE(ccastles_bitmode_r, ccastles_bitmode_w)
+ AM_RANGE(0x0000, 0x7fff) AM_RAM_WRITE(ccastles_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x8e00, 0x8fff) AM_BASE(m_spriteram)
AM_RANGE(0x9000, 0x90ff) AM_MIRROR(0x0300) AM_READWRITE(nvram_r, nvram_w)
@@ -337,16 +337,16 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, ccastles_state )
AM_RANGE(0x9800, 0x980f) AM_MIRROR(0x01f0) AM_DEVREADWRITE_LEGACY("pokey1", pokey_r, pokey_w)
AM_RANGE(0x9a00, 0x9a0f) AM_MIRROR(0x01f0) AM_DEVREADWRITE_LEGACY("pokey2", pokey_r, pokey_w)
AM_RANGE(0x9c00, 0x9c7f) AM_WRITE(nvram_recall_w)
- AM_RANGE(0x9c80, 0x9cff) AM_WRITE_LEGACY(ccastles_hscroll_w)
- AM_RANGE(0x9d00, 0x9d7f) AM_WRITE_LEGACY(ccastles_vscroll_w)
+ AM_RANGE(0x9c80, 0x9cff) AM_WRITE(ccastles_hscroll_w)
+ AM_RANGE(0x9d00, 0x9d7f) AM_WRITE(ccastles_vscroll_w)
AM_RANGE(0x9d80, 0x9dff) AM_WRITE(irq_ack_w)
AM_RANGE(0x9e00, 0x9e7f) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x9e80, 0x9e81) AM_MIRROR(0x0078) AM_WRITE(led_w)
AM_RANGE(0x9e82, 0x9e83) AM_MIRROR(0x0078) AM_WRITE(nvram_store_w)
AM_RANGE(0x9e85, 0x9e86) AM_MIRROR(0x0078) AM_WRITE(ccounter_w)
AM_RANGE(0x9e87, 0x9e87) AM_MIRROR(0x0078) AM_WRITE(bankswitch_w)
- AM_RANGE(0x9f00, 0x9f07) AM_MIRROR(0x0078) AM_WRITE_LEGACY(ccastles_video_control_w)
- AM_RANGE(0x9f80, 0x9fbf) AM_MIRROR(0x0040) AM_WRITE_LEGACY(ccastles_paletteram_w)
+ AM_RANGE(0x9f00, 0x9f07) AM_MIRROR(0x0078) AM_WRITE(ccastles_video_control_w)
+ AM_RANGE(0x9f80, 0x9fbf) AM_MIRROR(0x0040) AM_WRITE(ccastles_paletteram_w)
AM_RANGE(0xa000, 0xdfff) AM_ROMBANK("bank1")
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c
index 4545bbbccd6..404ed55461e 100644
--- a/src/mame/drivers/cchasm.c
+++ b/src/mame/drivers/cchasm.c
@@ -34,8 +34,8 @@
static ADDRESS_MAP_START( memmap, AS_PROGRAM, 16, cchasm_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x04000f) AM_DEVREADWRITE8("6840ptm", ptm6840_device, read, write, 0xff)
- AM_RANGE(0x050000, 0x050001) AM_WRITE_LEGACY(cchasm_refresh_control_w)
- AM_RANGE(0x060000, 0x060001) AM_READ_PORT("DSW") AM_WRITE_LEGACY(cchasm_led_w)
+ AM_RANGE(0x050000, 0x050001) AM_WRITE(cchasm_refresh_control_w)
+ AM_RANGE(0x060000, 0x060001) AM_READ_PORT("DSW") AM_WRITE(cchasm_led_w)
AM_RANGE(0x070000, 0x070001) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0xf80000, 0xf800ff) AM_READWRITE_LEGACY(cchasm_io_r,cchasm_io_w)
AM_RANGE(0xffb000, 0xffffff) AM_RAM AM_BASE(m_ram)
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c
index ecfcb23d9f8..385635c61e1 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -285,7 +285,7 @@ static ADDRESS_MAP_START( cclimber_map, AS_PROGRAM, 8, cclimber_state )
AM_RANGE(0x9880, 0x989f) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x98dc, 0x98df) AM_RAM AM_BASE(m_bigsprite_control)
AM_RANGE(0x9800, 0x9bff) AM_RAM /* not used, but initialized */
- AM_RANGE(0x9c00, 0x9fff) AM_RAM_WRITE_LEGACY(cclimber_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x9c00, 0x9fff) AM_RAM_WRITE(cclimber_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1") AM_WRITE(nmi_mask_w)
AM_RANGE(0xa001, 0xa002) AM_WRITEONLY AM_BASE(m_flip_screen)
AM_RANGE(0xa003, 0xa003) AM_WRITE(nmi_mask_w) //used by Crazy Kong Bootleg with alt levels and speed up
@@ -309,9 +309,9 @@ static ADDRESS_MAP_START( cannonb_map, AS_PROGRAM, 8, cclimber_state )
AM_RANGE(0x9880, 0x989f) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x98dc, 0x98df) AM_RAM AM_BASE(m_bigsprite_control)
AM_RANGE(0x9800, 0x9bff) AM_RAM /* not used, but initialized */
- AM_RANGE(0x9c00, 0x9fff) AM_RAM_WRITE_LEGACY(cclimber_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x9c00, 0x9fff) AM_RAM_WRITE(cclimber_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1") AM_WRITE(nmi_mask_w)
- AM_RANGE(0xa001, 0xa002) AM_WRITE_LEGACY(cannonb_flip_screen_w) AM_BASE(m_flip_screen)
+ AM_RANGE(0xa001, 0xa002) AM_WRITE(cannonb_flip_screen_w) AM_BASE(m_flip_screen)
AM_RANGE(0xa004, 0xa004) AM_WRITE_LEGACY(cclimber_sample_trigger_w)
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("P2") AM_WRITE_LEGACY(cclimber_sample_rate_w)
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW") AM_WRITE_LEGACY(cclimber_sample_volume_w)
@@ -326,7 +326,7 @@ static ADDRESS_MAP_START( swimmer_map, AS_PROGRAM, 8, cclimber_state )
AM_RANGE(0x9800, 0x981f) AM_WRITEONLY AM_BASE(m_column_scroll)
AM_RANGE(0x9880, 0x989f) AM_WRITEONLY AM_BASE(m_spriteram)
AM_RANGE(0x98fc, 0x98ff) AM_WRITEONLY AM_BASE(m_bigsprite_control)
- AM_RANGE(0x9c00, 0x9fff) AM_RAM_WRITE_LEGACY(cclimber_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x9c00, 0x9fff) AM_RAM_WRITE(cclimber_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P2") AM_WRITE(nmi_mask_w)
AM_RANGE(0xa001, 0xa002) AM_WRITEONLY AM_BASE(m_flip_screen)
AM_RANGE(0xa003, 0xa003) AM_WRITEONLY AM_BASE(m_swimmer_side_background_enabled)
@@ -352,7 +352,7 @@ static ADDRESS_MAP_START( yamato_map, AS_PROGRAM, 8, cclimber_state )
AM_RANGE(0x9880, 0x989f) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x98dc, 0x98df) AM_RAM AM_BASE(m_bigsprite_control)
AM_RANGE(0x9800, 0x9bff) AM_RAM /* not used, but initialized */
- AM_RANGE(0x9c00, 0x9fff) AM_RAM_WRITE_LEGACY(cclimber_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x9c00, 0x9fff) AM_RAM_WRITE(cclimber_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1") AM_WRITE(nmi_mask_w)
AM_RANGE(0xa001, 0xa002) AM_WRITEONLY AM_BASE(m_flip_screen)
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index c5044899953..da69bb366a6 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -684,7 +684,7 @@ static READ8_DEVICE_HANDLER( caterplr_AY8910_r )
static ADDRESS_MAP_START( centiped_map, AS_PROGRAM, 8, centiped_state )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE(m_rambase)
- AM_RANGE(0x0400, 0x07bf) AM_RAM_WRITE_LEGACY(centiped_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0400, 0x07bf) AM_RAM_WRITE(centiped_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x07c0, 0x07ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x0800, 0x0800) AM_READ_PORT("DSW1") /* DSW1 */
AM_RANGE(0x0801, 0x0801) AM_READ_PORT("DSW2") /* DSW2 */
@@ -693,14 +693,14 @@ static ADDRESS_MAP_START( centiped_map, AS_PROGRAM, 8, centiped_state )
AM_RANGE(0x0c02, 0x0c02) AM_READ(centiped_IN2_r) /* IN2 */
AM_RANGE(0x0c03, 0x0c03) AM_READ_PORT("IN3") /* IN3 */
AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE_LEGACY("pokey", pokey_r, pokey_w)
- AM_RANGE(0x1400, 0x140f) AM_WRITE_LEGACY(centiped_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1400, 0x140f) AM_WRITE(centiped_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x1600, 0x163f) AM_DEVWRITE("earom",atari_vg_earom_device, write)
AM_RANGE(0x1680, 0x1680) AM_DEVWRITE("earom", atari_vg_earom_device, ctrl_w)
AM_RANGE(0x1700, 0x173f) AM_DEVREAD("earom", atari_vg_earom_device, read)
AM_RANGE(0x1800, 0x1800) AM_WRITE(irq_ack_w)
AM_RANGE(0x1c00, 0x1c02) AM_WRITE(coin_count_w)
AM_RANGE(0x1c03, 0x1c04) AM_WRITE(led_w)
- AM_RANGE(0x1c07, 0x1c07) AM_WRITE_LEGACY(centiped_flip_screen_w)
+ AM_RANGE(0x1c07, 0x1c07) AM_WRITE(centiped_flip_screen_w)
AM_RANGE(0x2000, 0x2000) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x2000, 0x3fff) AM_ROM
ADDRESS_MAP_END
@@ -709,7 +709,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( centipdb_map, AS_PROGRAM, 8, centiped_state )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x4000) AM_RAM
- AM_RANGE(0x0400, 0x07bf) AM_MIRROR(0x4000) AM_RAM_WRITE_LEGACY(centiped_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0400, 0x07bf) AM_MIRROR(0x4000) AM_RAM_WRITE(centiped_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x07c0, 0x07ff) AM_MIRROR(0x4000) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x0800, 0x0800) AM_MIRROR(0x4000) AM_READ_PORT("DSW1") /* DSW1 */
AM_RANGE(0x0801, 0x0801) AM_MIRROR(0x4000) AM_READ_PORT("DSW2") /* DSW2 */
@@ -719,14 +719,14 @@ static ADDRESS_MAP_START( centipdb_map, AS_PROGRAM, 8, centiped_state )
AM_RANGE(0x0c03, 0x0c03) AM_MIRROR(0x4000) AM_READ_PORT("IN3") /* IN3 */
AM_RANGE(0x1000, 0x1001) AM_MIRROR(0x4000) AM_DEVWRITE_LEGACY("pokey", ay8910_data_address_w)
AM_RANGE(0x1001, 0x1001) AM_MIRROR(0x4000) AM_DEVREAD_LEGACY("pokey", ay8910_r)
- AM_RANGE(0x1400, 0x140f) AM_MIRROR(0x4000) AM_WRITE_LEGACY(centiped_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1400, 0x140f) AM_MIRROR(0x4000) AM_WRITE(centiped_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x1600, 0x163f) AM_MIRROR(0x4000) AM_DEVWRITE("earom", atari_vg_earom_device, write)
AM_RANGE(0x1680, 0x1680) AM_MIRROR(0x4000) AM_DEVWRITE("earom", atari_vg_earom_device, ctrl_w)
AM_RANGE(0x1700, 0x173f) AM_MIRROR(0x4000) AM_DEVREAD("earom", atari_vg_earom_device, read)
AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x4000) AM_WRITE(irq_ack_w)
AM_RANGE(0x1c00, 0x1c02) AM_MIRROR(0x4000) AM_WRITE(coin_count_w)
AM_RANGE(0x1c03, 0x1c04) AM_MIRROR(0x4000) AM_WRITE(led_w)
- AM_RANGE(0x1c07, 0x1c07) AM_MIRROR(0x4000) AM_WRITE_LEGACY(centiped_flip_screen_w)
+ AM_RANGE(0x1c07, 0x1c07) AM_MIRROR(0x4000) AM_WRITE(centiped_flip_screen_w)
AM_RANGE(0x2000, 0x27ff) AM_ROM
AM_RANGE(0x2800, 0x3fff) AM_MIRROR(0x4000) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_ROM
@@ -745,18 +745,18 @@ static ADDRESS_MAP_START( milliped_map, AS_PROGRAM, 8, centiped_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x040f) AM_DEVREADWRITE_LEGACY("pokey", pokey_r, pokey_w)
AM_RANGE(0x0800, 0x080f) AM_DEVREADWRITE_LEGACY("pokey2", pokey_r, pokey_w)
- AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE_LEGACY(centiped_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE(centiped_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x2000, 0x2000) AM_READ(centiped_IN0_r)
AM_RANGE(0x2001, 0x2001) AM_READ(milliped_IN1_r)
AM_RANGE(0x2010, 0x2010) AM_READ(milliped_IN2_r)
AM_RANGE(0x2011, 0x2011) AM_READ_PORT("IN3")
AM_RANGE(0x2030, 0x2030) AM_DEVREAD("earom", atari_vg_earom_device, read)
- AM_RANGE(0x2480, 0x249f) AM_WRITE_LEGACY(milliped_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x2480, 0x249f) AM_WRITE(milliped_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x2500, 0x2502) AM_WRITE(coin_count_w)
AM_RANGE(0x2503, 0x2504) AM_WRITE(led_w)
AM_RANGE(0x2505, 0x2505) AM_WRITE(input_select_w) /* TBEN */
- AM_RANGE(0x2506, 0x2506) AM_WRITE_LEGACY(centiped_flip_screen_w)
+ AM_RANGE(0x2506, 0x2506) AM_WRITE(centiped_flip_screen_w)
AM_RANGE(0x2507, 0x2507) AM_WRITE(control_select_w) /* CNTRLSEL */
AM_RANGE(0x2600, 0x2600) AM_WRITE(irq_ack_w)
AM_RANGE(0x2680, 0x2680) AM_WRITE(watchdog_reset_w)
@@ -776,7 +776,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( warlords_map, AS_PROGRAM, 8, centiped_state )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x03ff) AM_RAM
- AM_RANGE(0x0400, 0x07bf) AM_RAM_WRITE_LEGACY(centiped_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0400, 0x07bf) AM_RAM_WRITE(centiped_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x07c0, 0x07ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x0800, 0x0800) AM_READ_PORT("DSW1") /* DSW1 */
AM_RANGE(0x0801, 0x0801) AM_READ_PORT("DSW2") /* DSW2 */
@@ -803,7 +803,7 @@ static ADDRESS_MAP_START( mazeinv_map, AS_PROGRAM, 8, centiped_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x040f) AM_DEVREADWRITE_LEGACY("pokey", pokey_r, pokey_w)
AM_RANGE(0x0800, 0x080f) AM_DEVREADWRITE_LEGACY("pokey2", pokey_r, pokey_w)
- AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE_LEGACY(centiped_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE(centiped_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x2000, 0x2000) AM_READ_PORT("IN0")
AM_RANGE(0x2001, 0x2001) AM_READ_PORT("IN1")
@@ -811,11 +811,11 @@ static ADDRESS_MAP_START( mazeinv_map, AS_PROGRAM, 8, centiped_state )
AM_RANGE(0x2011, 0x2011) AM_READ_PORT("IN3")
AM_RANGE(0x2020, 0x2020) AM_READ(mazeinv_input_r)
AM_RANGE(0x2030, 0x2030) AM_DEVREAD("earom", atari_vg_earom_device, read)
- AM_RANGE(0x2480, 0x249f) AM_WRITE_LEGACY(mazeinv_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x2480, 0x249f) AM_WRITE(mazeinv_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x2500, 0x2502) AM_WRITE(coin_count_w)
AM_RANGE(0x2503, 0x2504) AM_WRITE(led_w)
AM_RANGE(0x2505, 0x2505) AM_WRITE(input_select_w)
- AM_RANGE(0x2506, 0x2506) AM_WRITE_LEGACY(centiped_flip_screen_w)
+ AM_RANGE(0x2506, 0x2506) AM_WRITE(centiped_flip_screen_w)
AM_RANGE(0x2580, 0x2583) AM_WRITE(mazeinv_input_select_w)
AM_RANGE(0x2600, 0x2600) AM_WRITE(irq_ack_w)
AM_RANGE(0x2680, 0x2680) AM_WRITE(watchdog_reset_w)
@@ -841,13 +841,13 @@ static ADDRESS_MAP_START( bullsdrt_map, AS_PROGRAM, 8, centiped_state )
AM_RANGE(0x1200, 0x123f) AM_MIRROR(0x6000) AM_DEVREADWRITE("earom",atari_vg_earom_device, read, write)
AM_RANGE(0x1280, 0x1280) AM_MIRROR(0x6000) AM_DEVWRITE("earom", atari_vg_earom_device, ctrl_w)
AM_RANGE(0x1300, 0x1300) AM_MIRROR(0x6000) AM_READ_PORT("DSW2")
- AM_RANGE(0x1400, 0x140f) AM_MIRROR(0x6000) AM_WRITE_LEGACY(centiped_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1400, 0x140f) AM_MIRROR(0x6000) AM_WRITE(centiped_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x1481, 0x1481) AM_MIRROR(0x6000) AM_WRITE(bullsdrt_coin_count_w)
AM_RANGE(0x1483, 0x1484) AM_MIRROR(0x6000) AM_WRITE(led_w)
- AM_RANGE(0x1487, 0x1487) AM_MIRROR(0x6000) AM_WRITE_LEGACY(centiped_flip_screen_w)
+ AM_RANGE(0x1487, 0x1487) AM_MIRROR(0x6000) AM_WRITE(centiped_flip_screen_w)
AM_RANGE(0x1500, 0x1500) AM_MIRROR(0x6000) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x1580, 0x1580) AM_MIRROR(0x6000) AM_NOP
- AM_RANGE(0x1800, 0x1bbf) AM_MIRROR(0x6000) AM_WRITE_LEGACY(centiped_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1800, 0x1bbf) AM_MIRROR(0x6000) AM_WRITE(centiped_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1bc0, 0x1bff) AM_MIRROR(0x6000) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x1c00, 0x1fff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x2000, 0x2fff) AM_ROM
@@ -856,8 +856,8 @@ static ADDRESS_MAP_START( bullsdrt_map, AS_PROGRAM, 8, centiped_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( bullsdrt_port_map, AS_IO, 8, centiped_state )
- AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(bullsdrt_sprites_bank_w)
- AM_RANGE(0x20, 0x3f) AM_WRITE_LEGACY(bullsdrt_tilesbank_w) AM_BASE(m_bullsdrt_tiles_bankram)
+ AM_RANGE(0x00, 0x00) AM_WRITE(bullsdrt_sprites_bank_w)
+ AM_RANGE(0x20, 0x3f) AM_WRITE(bullsdrt_tilesbank_w) AM_BASE(m_bullsdrt_tiles_bankram)
AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(bullsdrt_data_port_r) AM_DEVWRITE_LEGACY("snsnd", sn76496_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c
index 62a4630efc6..03688c9eb37 100644
--- a/src/mame/drivers/chaknpop.c
+++ b/src/mame/drivers/chaknpop.c
@@ -143,19 +143,19 @@ WRITE8_MEMBER(chaknpop_state::coinlock_w)
static ADDRESS_MAP_START( chaknpop_map, AS_PROGRAM, 8, chaknpop_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(m_mcu_ram)
- AM_RANGE(0x8800, 0x8800) AM_READWRITE_LEGACY(chaknpop_mcu_port_a_r, chaknpop_mcu_port_a_w)
- AM_RANGE(0x8801, 0x8801) AM_READWRITE_LEGACY(chaknpop_mcu_port_b_r, chaknpop_mcu_port_b_w)
- AM_RANGE(0x8802, 0x8802) AM_READWRITE_LEGACY(chaknpop_mcu_port_c_r, chaknpop_mcu_port_c_w)
+ AM_RANGE(0x8800, 0x8800) AM_READWRITE(chaknpop_mcu_port_a_r, chaknpop_mcu_port_a_w)
+ AM_RANGE(0x8801, 0x8801) AM_READWRITE(chaknpop_mcu_port_b_r, chaknpop_mcu_port_b_w)
+ AM_RANGE(0x8802, 0x8802) AM_READWRITE(chaknpop_mcu_port_c_r, chaknpop_mcu_port_c_w)
AM_RANGE(0x8804, 0x8805) AM_DEVREADWRITE_LEGACY("ay1", ay8910_r, ay8910_address_data_w)
AM_RANGE(0x8806, 0x8807) AM_DEVREADWRITE_LEGACY("ay2", ay8910_r, ay8910_address_data_w)
AM_RANGE(0x8808, 0x8808) AM_READ_PORT("DSWC")
AM_RANGE(0x8809, 0x8809) AM_READ_PORT("P1")
AM_RANGE(0x880a, 0x880a) AM_READ_PORT("SYSTEM")
AM_RANGE(0x880b, 0x880b) AM_READ_PORT("P2")
- AM_RANGE(0x880c, 0x880c) AM_READWRITE_LEGACY(chaknpop_gfxmode_r, chaknpop_gfxmode_w)
+ AM_RANGE(0x880c, 0x880c) AM_READWRITE(chaknpop_gfxmode_r, chaknpop_gfxmode_w)
AM_RANGE(0x880d, 0x880d) AM_WRITE(coinlock_w) // coin lock out
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(chaknpop_txram_w) AM_BASE(m_tx_ram) // TX tilemap
- AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE_LEGACY(chaknpop_attrram_w) AM_BASE(m_attr_ram) // Color attribute
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(chaknpop_txram_w) AM_BASE(m_tx_ram) // TX tilemap
+ AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE(chaknpop_attrram_w) AM_BASE(m_attr_ram) // Color attribute
AM_RANGE(0x9840, 0x98ff) AM_RAM AM_BASE_SIZE(m_spr_ram, m_spr_ram_size) // sprite
AM_RANGE(0xa000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xffff) AM_RAMBANK("bank1") // bitmap plane 1-4
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index 7c72f6247d6..71285e63cc6 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -218,7 +218,7 @@ static ADDRESS_MAP_START( talbot_map, AS_PROGRAM, 8, champbas_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE("share1") /* MCU shared RAM */
AM_RANGE(0x7000, 0x7001) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(champbas_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x8800, 0x8fef) AM_RAM
AM_RANGE(0x8ff0, 0x8fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
@@ -230,7 +230,7 @@ static ADDRESS_MAP_START( talbot_map, AS_PROGRAM, 8, champbas_state )
AM_RANGE(0xa000, 0xa000) AM_WRITE(irq_enable_w)
AM_RANGE(0xa001, 0xa001) AM_WRITENOP // !WORK board output (no use?)
AM_RANGE(0xa002, 0xa002) AM_WRITENOP
- AM_RANGE(0xa003, 0xa003) AM_WRITE_LEGACY(champbas_flipscreen_w)
+ AM_RANGE(0xa003, 0xa003) AM_WRITE(champbas_flipscreen_w)
AM_RANGE(0xa004, 0xa004) AM_WRITENOP
AM_RANGE(0xa005, 0xa005) AM_WRITENOP
AM_RANGE(0xa006, 0xa006) AM_WRITE(champbas_mcu_halt_w)
@@ -246,7 +246,7 @@ static ADDRESS_MAP_START( champbas_main_map, AS_PROGRAM, 8, champbas_state )
AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x7000, 0x7001) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
AM_RANGE(0x7800, 0x7fff) AM_ROM // champbb2 only
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(champbas_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x8800, 0x8fef) AM_RAM
AM_RANGE(0x8ff0, 0x8fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
@@ -257,9 +257,9 @@ static ADDRESS_MAP_START( champbas_main_map, AS_PROGRAM, 8, champbas_state )
AM_RANGE(0xa000, 0xa000) AM_WRITE(irq_enable_w)
AM_RANGE(0xa001, 0xa001) AM_WRITENOP // !WORK board output (no use?)
- AM_RANGE(0xa002, 0xa002) AM_WRITE_LEGACY(champbas_gfxbank_w)
- AM_RANGE(0xa003, 0xa003) AM_WRITE_LEGACY(champbas_flipscreen_w)
- AM_RANGE(0xa004, 0xa004) AM_WRITE_LEGACY(champbas_palette_bank_w)
+ AM_RANGE(0xa002, 0xa002) AM_WRITE(champbas_gfxbank_w)
+ AM_RANGE(0xa003, 0xa003) AM_WRITE(champbas_flipscreen_w)
+ AM_RANGE(0xa004, 0xa004) AM_WRITE(champbas_palette_bank_w)
AM_RANGE(0xa005, 0xa005) AM_WRITENOP // n.c.
AM_RANGE(0xa006, 0xa006) AM_WRITE(champbas_mcu_halt_w) // MCU not present/not used in champbas
AM_RANGE(0xa007, 0xa007) AM_WRITE(champbas_mcu_switch_w) // MCU not present/not used in champbas
@@ -278,7 +278,7 @@ static ADDRESS_MAP_START( exctsccrb_main_map, AS_PROGRAM, 8, champbas_state )
// AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE("share1") // MCU not used (though it's present on the board)
AM_RANGE(0x7000, 0x7001) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
// AM_RANGE(0x7800, 0x7fff) AM_ROM // champbb2 only
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(champbas_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x8800, 0x8fff) AM_RAM AM_BASE(m_spriteram_2) /* ??? */
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1")
@@ -288,8 +288,8 @@ static ADDRESS_MAP_START( exctsccrb_main_map, AS_PROGRAM, 8, champbas_state )
AM_RANGE(0xa000, 0xa000) AM_WRITE(irq_enable_w)
AM_RANGE(0xa001, 0xa001) AM_WRITENOP /* ??? */
- AM_RANGE(0xa002, 0xa002) AM_WRITE_LEGACY(champbas_gfxbank_w)
- AM_RANGE(0xa003, 0xa003) AM_WRITE_LEGACY(champbas_flipscreen_w)
+ AM_RANGE(0xa002, 0xa002) AM_WRITE(champbas_gfxbank_w)
+ AM_RANGE(0xa003, 0xa003) AM_WRITE(champbas_flipscreen_w)
AM_RANGE(0xa006, 0xa006) AM_WRITENOP /* MCU is not used, but some leftover code still writes here */
AM_RANGE(0xa007, 0xa007) AM_WRITENOP /* MCU is not used, but some leftover code still writes here */
@@ -303,7 +303,7 @@ static ADDRESS_MAP_START( exctsccr_main_map, AS_PROGRAM, 8, champbas_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x7c00, 0x7fff) AM_RAM
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(champbas_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x8800, 0x8bff) AM_RAM AM_BASE(m_spriteram_2) /* ??? */
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1")
@@ -313,8 +313,8 @@ static ADDRESS_MAP_START( exctsccr_main_map, AS_PROGRAM, 8, champbas_state )
AM_RANGE(0xa000, 0xa000) AM_WRITE(irq_enable_w)
// AM_RANGE(0xa001, 0xa001) AM_WRITENOP /* ??? */
- AM_RANGE(0xa002, 0xa002) AM_WRITE_LEGACY(champbas_gfxbank_w)
- AM_RANGE(0xa003, 0xa003) AM_WRITE_LEGACY(champbas_flipscreen_w)
+ AM_RANGE(0xa002, 0xa002) AM_WRITE(champbas_gfxbank_w)
+ AM_RANGE(0xa003, 0xa003) AM_WRITE(champbas_flipscreen_w)
AM_RANGE(0xa006, 0xa006) AM_WRITE(champbas_mcu_halt_w)
AM_RANGE(0xa007, 0xa007) AM_WRITENOP /* This is also MCU control, but i dont need it */
diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c
index 35f2ac18177..c74d87901c2 100644
--- a/src/mame/drivers/changela.c
+++ b/src/mame/drivers/changela.c
@@ -205,16 +205,16 @@ static ADDRESS_MAP_START( changela_map, AS_PROGRAM, 8, changela_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_BASE(m_spriteram) /* OBJ0 RAM */
AM_RANGE(0x9000, 0x97ff) AM_RAM AM_BASE(m_videoram) /* OBJ1 RAM */
- AM_RANGE(0xa000, 0xa07f) AM_WRITE_LEGACY(changela_colors_w) AM_BASE(m_colorram) /* Color 93419 RAM 64x9(nine!!!) bits A0-used as the 8-th bit data input (d0-d7->normal, a0->d8) */
+ AM_RANGE(0xa000, 0xa07f) AM_WRITE(changela_colors_w) AM_BASE(m_colorram) /* Color 93419 RAM 64x9(nine!!!) bits A0-used as the 8-th bit data input (d0-d7->normal, a0->d8) */
AM_RANGE(0xb000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_READWRITE_LEGACY(changela_mem_device_r, changela_mem_device_w) /* RAM4 (River Bed RAM); RAM5 (Tree RAM) */
+ AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(changela_mem_device_r, changela_mem_device_w) /* RAM4 (River Bed RAM); RAM5 (Tree RAM) */
/* LS138 - U16 */
AM_RANGE(0xc800, 0xc800) AM_WRITENOP /* not connected */
- AM_RANGE(0xc900, 0xc900) AM_WRITE_LEGACY(changela_mem_device_select_w) /* selects the memory device to be accessible at 0xc000-0xc7ff */
- AM_RANGE(0xca00, 0xca00) AM_WRITE_LEGACY(changela_slope_rom_addr_hi_w)
- AM_RANGE(0xcb00, 0xcb00) AM_WRITE_LEGACY(changela_slope_rom_addr_lo_w)
+ AM_RANGE(0xc900, 0xc900) AM_WRITE(changela_mem_device_select_w) /* selects the memory device to be accessible at 0xc000-0xc7ff */
+ AM_RANGE(0xca00, 0xca00) AM_WRITE(changela_slope_rom_addr_hi_w)
+ AM_RANGE(0xcb00, 0xcb00) AM_WRITE(changela_slope_rom_addr_lo_w)
AM_RANGE(0xd000, 0xd001) AM_DEVREADWRITE_LEGACY("ay1", ay8910_r, ay8910_address_data_w)
AM_RANGE(0xd010, 0xd011) AM_DEVREADWRITE_LEGACY("ay2", ay8910_r, ay8910_address_data_w)
diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c
index 6347d72795a..2e4ad138484 100644
--- a/src/mame/drivers/cheekyms.c
+++ b/src/mame/drivers/cheekyms.c
@@ -33,8 +33,8 @@ static ADDRESS_MAP_START( io_map, AS_IO, 8, cheekyms_state )
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW")
AM_RANGE(0x01, 0x01) AM_READ_PORT("INPUTS")
AM_RANGE(0x20, 0x3f) AM_WRITEONLY AM_BASE(m_spriteram)
- AM_RANGE(0x40, 0x40) AM_WRITE_LEGACY(cheekyms_port_40_w)
- AM_RANGE(0x80, 0x80) AM_WRITE_LEGACY(cheekyms_port_80_w) AM_BASE(m_port_80)
+ AM_RANGE(0x40, 0x40) AM_WRITE(cheekyms_port_40_w)
+ AM_RANGE(0x80, 0x80) AM_WRITE(cheekyms_port_80_w) AM_BASE(m_port_80)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index f43e426044e..2a7a1900609 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -307,8 +307,8 @@ static void saiyugoub1_m5205_irq_w( device_t *device )
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, ddragon_state )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(ddragon_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE_LEGACY(ddragon_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(ddragon_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(ddragon_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0x3000, 0x317f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
AM_RANGE(0x3400, 0x357f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
AM_RANGE(0x3800, 0x397f) AM_WRITE_BANK("bank3") AM_BASE_SIZE(m_spriteram, m_spriteram_size)
diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c
index ff05f5ed12c..58690d875c0 100644
--- a/src/mame/drivers/cinemat.c
+++ b/src/mame/drivers/cinemat.c
@@ -322,7 +322,7 @@ static ADDRESS_MAP_START( io_map, AS_IO, 8, cinemat_state )
AM_RANGE(0x17, 0x17) AM_READ(coin_input_r)
AM_RANGE(0x05, 0x05) AM_WRITE(coin_reset_w)
- AM_RANGE(0x06, 0x06) AM_WRITE_LEGACY(cinemat_vector_control_w)
+ AM_RANGE(0x06, 0x06) AM_WRITE(cinemat_vector_control_w)
AM_RANGE(0x00, 0x07) AM_WRITE_LEGACY(cinemat_sound_control_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c
index 7e6e8c12537..f50dc358071 100644
--- a/src/mame/drivers/circus.c
+++ b/src/mame/drivers/circus.c
@@ -60,9 +60,9 @@ READ8_MEMBER(circus_state::circus_paddle_r)
static ADDRESS_MAP_START( circus_map, AS_PROGRAM, 8, circus_state )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_ROM
- AM_RANGE(0x2000, 0x2000) AM_WRITE_LEGACY(circus_clown_x_w)
- AM_RANGE(0x3000, 0x3000) AM_WRITE_LEGACY(circus_clown_y_w)
- AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE_LEGACY(circus_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2000, 0x2000) AM_WRITE(circus_clown_x_w)
+ AM_RANGE(0x3000, 0x3000) AM_WRITE(circus_clown_y_w)
+ AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(circus_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x8000, 0x8000) AM_RAM_WRITE_LEGACY(circus_clown_z_w)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("INPUTS")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSW")
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index 42cec63a83f..20a526b0930 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -147,7 +147,7 @@ WRITE8_MEMBER(circusc_state::irq_mask_w)
}
static ADDRESS_MAP_START( circusc_map, AS_PROGRAM, 8, circusc_state )
- AM_RANGE(0x0000, 0x0000) AM_MIRROR(0x03f8) AM_WRITE_LEGACY(circusc_flipscreen_w) /* FLIP */
+ AM_RANGE(0x0000, 0x0000) AM_MIRROR(0x03f8) AM_WRITE(circusc_flipscreen_w) /* FLIP */
AM_RANGE(0x0001, 0x0001) AM_MIRROR(0x03f8) AM_WRITE(irq_mask_w) /* INTST */
// AM_RANGE(0x0002, 0x0002) AM_MIRROR(0x03f8) AM_WRITENOP /* MUT - not used /*
AM_RANGE(0x0003, 0x0004) AM_MIRROR(0x03f8) AM_WRITE(circusc_coin_counter_w) /* COIN1, COIN2 */
@@ -163,8 +163,8 @@ static ADDRESS_MAP_START( circusc_map, AS_PROGRAM, 8, circusc_state )
AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x03ff) AM_READ_PORT("DSW2")
AM_RANGE(0x1c00, 0x1c00) AM_MIRROR(0x03ff) AM_WRITEONLY AM_BASE(m_scroll) /* VGAP */
AM_RANGE(0x2000, 0x2fff) AM_RAM
- AM_RANGE(0x3000, 0x33ff) AM_RAM_WRITE_LEGACY(circusc_colorram_w) AM_BASE(m_colorram) /* colorram */
- AM_RANGE(0x3400, 0x37ff) AM_RAM_WRITE_LEGACY(circusc_videoram_w) AM_BASE(m_videoram) /* videoram */
+ AM_RANGE(0x3000, 0x33ff) AM_RAM_WRITE(circusc_colorram_w) AM_BASE(m_colorram) /* colorram */
+ AM_RANGE(0x3400, 0x37ff) AM_RAM_WRITE(circusc_videoram_w) AM_BASE(m_videoram) /* videoram */
AM_RANGE(0x3800, 0x38ff) AM_RAM AM_BASE(m_spriteram_2) /* spriteram2 */
AM_RANGE(0x3900, 0x39ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* spriteram */
AM_RANGE(0x3a00, 0x3fff) AM_RAM
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index 9790a9386b2..77ac587349b 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -213,16 +213,16 @@ WRITE16_MEMBER(cischeat_state::bigrun_paletteram16_w)
static ADDRESS_MAP_START( bigrun_map, AS_PROGRAM, 16, cischeat_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
- AM_RANGE(0x080000, 0x083fff) AM_READWRITE_LEGACY(bigrun_vregs_r, bigrun_vregs_w) AM_BASE(m_vregs) // Vregs
+ AM_RANGE(0x080000, 0x083fff) AM_READWRITE(bigrun_vregs_r, bigrun_vregs_w) AM_BASE(m_vregs) // Vregs
AM_RANGE(0x084000, 0x087fff) AM_RAM // Linking with other units
AM_RANGE(0x088000, 0x08bfff) AM_RAM AM_SHARE("share2") // Sharedram with sub CPU#2
AM_RANGE(0x08c000, 0x08ffff) AM_RAM AM_SHARE("share1") // Sharedram with sub CPU#1
/* Only writes to the first 0x40000 bytes affect the tilemaps: */
/* either these games support larger tilemaps or have more ram than needed */
- AM_RANGE(0x090000, 0x093fff) AM_WRITE_LEGACY(cischeat_scrollram_0_w) AM_BASE(m_scrollram[0]) // Scroll ram 0
- AM_RANGE(0x094000, 0x097fff) AM_WRITE_LEGACY(cischeat_scrollram_1_w) AM_BASE(m_scrollram[1]) // Scroll ram 1
- AM_RANGE(0x098000, 0x09bfff) AM_WRITE_LEGACY(cischeat_scrollram_2_w) AM_BASE(m_scrollram[2]) // Scroll ram 2
+ AM_RANGE(0x090000, 0x093fff) AM_WRITE(cischeat_scrollram_0_w) AM_BASE(m_scrollram[0]) // Scroll ram 0
+ AM_RANGE(0x094000, 0x097fff) AM_WRITE(cischeat_scrollram_1_w) AM_BASE(m_scrollram[1]) // Scroll ram 1
+ AM_RANGE(0x098000, 0x09bfff) AM_WRITE(cischeat_scrollram_2_w) AM_BASE(m_scrollram[2]) // Scroll ram 2
AM_RANGE(0x09c000, 0x09ffff) AM_WRITE(bigrun_paletteram16_w) AM_SHARE("paletteram") // Palettes
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(m_ram) // RAM
@@ -266,7 +266,7 @@ WRITE16_MEMBER(cischeat_state::cischeat_paletteram16_w)
static ADDRESS_MAP_START( cischeat_map, AS_PROGRAM, 16, cischeat_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
- AM_RANGE(0x080000, 0x087fff) AM_READWRITE_LEGACY(cischeat_vregs_r, cischeat_vregs_w) AM_BASE(m_vregs) // Vregs
+ AM_RANGE(0x080000, 0x087fff) AM_READWRITE(cischeat_vregs_r, cischeat_vregs_w) AM_BASE(m_vregs) // Vregs
AM_RANGE(0x088000, 0x088fff) AM_RAM // Linking with other units
/* Only the first 0x800 bytes are tested but:
@@ -280,9 +280,9 @@ static ADDRESS_MAP_START( cischeat_map, AS_PROGRAM, 16, cischeat_state )
/* Only writes to the first 0x40000 bytes affect the tilemaps: */
/* either these games support larger tilemaps or have more ram than needed */
- AM_RANGE(0x0a0000, 0x0a7fff) AM_RAM_WRITE_LEGACY(cischeat_scrollram_0_w) AM_BASE(m_scrollram[0]) // Scroll ram 0
- AM_RANGE(0x0a8000, 0x0affff) AM_RAM_WRITE_LEGACY(cischeat_scrollram_1_w) AM_BASE(m_scrollram[1]) // Scroll ram 1
- AM_RANGE(0x0b0000, 0x0b7fff) AM_RAM_WRITE_LEGACY(cischeat_scrollram_2_w) AM_BASE(m_scrollram[2]) // Scroll ram 2
+ AM_RANGE(0x0a0000, 0x0a7fff) AM_RAM_WRITE(cischeat_scrollram_0_w) AM_BASE(m_scrollram[0]) // Scroll ram 0
+ AM_RANGE(0x0a8000, 0x0affff) AM_RAM_WRITE(cischeat_scrollram_1_w) AM_BASE(m_scrollram[1]) // Scroll ram 1
+ AM_RANGE(0x0b0000, 0x0b7fff) AM_RAM_WRITE(cischeat_scrollram_2_w) AM_BASE(m_scrollram[2]) // Scroll ram 2
AM_RANGE(0x0b8000, 0x0bffff) AM_RAM_WRITE(cischeat_paletteram16_w) AM_SHARE("paletteram") // Palettes
@@ -326,7 +326,7 @@ WRITE16_MEMBER(cischeat_state::f1gpstar_paletteram16_w)
static ADDRESS_MAP_START( f1gpstar_map, AS_PROGRAM, 16, cischeat_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
- AM_RANGE(0x080000, 0x087fff) AM_READWRITE_LEGACY(f1gpstar_vregs_r, f1gpstar_vregs_w) AM_BASE(m_vregs) // Vregs
+ AM_RANGE(0x080000, 0x087fff) AM_READWRITE(f1gpstar_vregs_r, f1gpstar_vregs_w) AM_BASE(m_vregs) // Vregs
AM_RANGE(0x088000, 0x088fff) AM_RAM // Linking with other units
AM_RANGE(0x090000, 0x097fff) AM_RAM AM_SHARE("share2") // Sharedram with sub CPU#2
@@ -334,9 +334,9 @@ static ADDRESS_MAP_START( f1gpstar_map, AS_PROGRAM, 16, cischeat_state )
/* Only writes to the first 0x40000 bytes affect the tilemaps: */
/* either these games support larger tilemaps or have more ram than needed */
- AM_RANGE(0x0a0000, 0x0a7fff) AM_RAM_WRITE_LEGACY(cischeat_scrollram_0_w) AM_BASE(m_scrollram[0]) // Scroll ram 0
- AM_RANGE(0x0a8000, 0x0affff) AM_RAM_WRITE_LEGACY(cischeat_scrollram_1_w) AM_BASE(m_scrollram[1]) // Scroll ram 1
- AM_RANGE(0x0b0000, 0x0b7fff) AM_RAM_WRITE_LEGACY(cischeat_scrollram_2_w) AM_BASE(m_scrollram[2]) // Scroll ram 2
+ AM_RANGE(0x0a0000, 0x0a7fff) AM_RAM_WRITE(cischeat_scrollram_0_w) AM_BASE(m_scrollram[0]) // Scroll ram 0
+ AM_RANGE(0x0a8000, 0x0affff) AM_RAM_WRITE(cischeat_scrollram_1_w) AM_BASE(m_scrollram[1]) // Scroll ram 1
+ AM_RANGE(0x0b0000, 0x0b7fff) AM_RAM_WRITE(cischeat_scrollram_2_w) AM_BASE(m_scrollram[2]) // Scroll ram 2
AM_RANGE(0x0b8000, 0x0bffff) AM_RAM_WRITE(f1gpstar_paletteram16_w) AM_SHARE("paletteram") // Palettes
@@ -352,7 +352,7 @@ ADDRESS_MAP_END
// Same as f1gpstar, but vregs are slightly different:
static ADDRESS_MAP_START( f1gpstr2_map, AS_PROGRAM, 16, cischeat_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
- AM_RANGE(0x080000, 0x087fff) AM_READWRITE_LEGACY(f1gpstr2_vregs_r, f1gpstr2_vregs_w) AM_BASE(m_vregs) // Vregs (slightly different from f1gpstar)
+ AM_RANGE(0x080000, 0x087fff) AM_READWRITE(f1gpstr2_vregs_r, f1gpstr2_vregs_w) AM_BASE(m_vregs) // Vregs (slightly different from f1gpstar)
AM_RANGE(0x088000, 0x088fff) AM_RAM // Linking with other units
AM_RANGE(0x090000, 0x097fff) AM_RAM AM_SHARE("share2") // Sharedram with sub CPU#2
@@ -360,9 +360,9 @@ static ADDRESS_MAP_START( f1gpstr2_map, AS_PROGRAM, 16, cischeat_state )
/* Only writes to the first 0x40000 bytes affect the tilemaps: */
/* either these games support larger tilemaps or have more ram than needed */
- AM_RANGE(0x0a0000, 0x0a7fff) AM_RAM_WRITE_LEGACY(cischeat_scrollram_0_w) AM_BASE(m_scrollram[0]) // Scroll ram 0
- AM_RANGE(0x0a8000, 0x0affff) AM_RAM_WRITE_LEGACY(cischeat_scrollram_1_w) AM_BASE(m_scrollram[1]) // Scroll ram 1
- AM_RANGE(0x0b0000, 0x0b7fff) AM_RAM_WRITE_LEGACY(cischeat_scrollram_2_w) AM_BASE(m_scrollram[2]) // Scroll ram 2
+ AM_RANGE(0x0a0000, 0x0a7fff) AM_RAM_WRITE(cischeat_scrollram_0_w) AM_BASE(m_scrollram[0]) // Scroll ram 0
+ AM_RANGE(0x0a8000, 0x0affff) AM_RAM_WRITE(cischeat_scrollram_1_w) AM_BASE(m_scrollram[1]) // Scroll ram 1
+ AM_RANGE(0x0b0000, 0x0b7fff) AM_RAM_WRITE(cischeat_scrollram_2_w) AM_BASE(m_scrollram[2]) // Scroll ram 2
AM_RANGE(0x0b8000, 0x0bffff) AM_RAM_WRITE(f1gpstar_paletteram16_w) AM_SHARE("paletteram") // Palettes
@@ -492,9 +492,9 @@ WRITE16_MEMBER(cischeat_state::scudhamm_oki_bank_w)
static ADDRESS_MAP_START( scudhamm_map, AS_PROGRAM, 16, cischeat_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
- AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE_LEGACY(scudhamm_vregs_w) AM_BASE(m_vregs) // Video Registers + RAM
- AM_RANGE(0x0a0000, 0x0a3fff) AM_RAM_WRITE_LEGACY(cischeat_scrollram_0_w) AM_BASE(m_scrollram[0]) // Scroll RAM 0
- AM_RANGE(0x0b0000, 0x0b3fff) AM_RAM_WRITE_LEGACY(cischeat_scrollram_2_w) AM_BASE(m_scrollram[2]) // Scroll RAM 2
+ AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE(scudhamm_vregs_w) AM_BASE(m_vregs) // Video Registers + RAM
+ AM_RANGE(0x0a0000, 0x0a3fff) AM_RAM_WRITE(cischeat_scrollram_0_w) AM_BASE(m_scrollram[0]) // Scroll RAM 0
+ AM_RANGE(0x0b0000, 0x0b3fff) AM_RAM_WRITE(cischeat_scrollram_2_w) AM_BASE(m_scrollram[2]) // Scroll RAM 2
AM_RANGE(0x0b8000, 0x0bffff) AM_RAM_WRITE(scudhamm_paletteram16_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(m_ram) // Work RAM + Spriteram
AM_RANGE(0x100000, 0x100001) AM_WRITE(scudhamm_oki_bank_w) // Sound
@@ -573,9 +573,9 @@ WRITE16_MEMBER(cischeat_state::armchmp2_leds_w)
static ADDRESS_MAP_START( armchmp2_map, AS_PROGRAM, 16, cischeat_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
- AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE_LEGACY(scudhamm_vregs_w) AM_BASE(m_vregs) // Video Registers + RAM
- AM_RANGE(0x0a0000, 0x0a3fff) AM_RAM_WRITE_LEGACY(cischeat_scrollram_0_w) AM_BASE(m_scrollram[0]) // Scroll RAM 0
- AM_RANGE(0x0b0000, 0x0b3fff) AM_RAM_WRITE_LEGACY(cischeat_scrollram_2_w) AM_BASE(m_scrollram[2]) // Scroll RAM 2
+ AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE(scudhamm_vregs_w) AM_BASE(m_vregs) // Video Registers + RAM
+ AM_RANGE(0x0a0000, 0x0a3fff) AM_RAM_WRITE(cischeat_scrollram_0_w) AM_BASE(m_scrollram[0]) // Scroll RAM 0
+ AM_RANGE(0x0b0000, 0x0b3fff) AM_RAM_WRITE(cischeat_scrollram_2_w) AM_BASE(m_scrollram[2]) // Scroll RAM 2
AM_RANGE(0x0b8000, 0x0bffff) AM_RAM_WRITE(scudhamm_paletteram16_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(m_ram) // Work RAM + Spriteram
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("IN2") AM_WRITE(scudhamm_oki_bank_w) // DSW + Sound
@@ -2474,7 +2474,8 @@ ROM_END
static DRIVER_INIT( wildplt )
{
- machine.device("cpu1")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x080000, 0x087fff, FUNC(wildplt_vregs_r) );
+ cischeat_state *state = machine.driver_data<cischeat_state>();
+ machine.device("cpu1")->memory().space(AS_PROGRAM)->install_read_handler(0x080000, 0x087fff, read16_delegate(FUNC(cischeat_state::wildplt_vregs_r),state));
DRIVER_INIT_CALL(f1gpstar);
}
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index e6535fc4c77..0d8a8773a29 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -28,11 +28,11 @@ READ8_MEMBER(citycon_state::citycon_irq_ack_r)
static ADDRESS_MAP_START( citycon_map, AS_PROGRAM, 8, citycon_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
- AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE_LEGACY(citycon_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE_LEGACY(citycon_linecolor_w) AM_BASE(m_linecolor)
+ AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(citycon_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(citycon_linecolor_w) AM_BASE(m_linecolor)
AM_RANGE(0x2800, 0x28ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x2800, 0x2fff) AM_NOP //0x2900-0x2fff cleared at post but unused
- AM_RANGE(0x3000, 0x3000) AM_READ(citycon_in_r) AM_WRITE_LEGACY(citycon_background_w) /* player 1 & 2 inputs multiplexed */
+ AM_RANGE(0x3000, 0x3000) AM_READ(citycon_in_r) AM_WRITE(citycon_background_w) /* player 1 & 2 inputs multiplexed */
AM_RANGE(0x3001, 0x3001) AM_READ_PORT("DSW1") AM_WRITE(soundlatch_w)
AM_RANGE(0x3002, 0x3002) AM_READ_PORT("DSW2") AM_WRITE(soundlatch2_w)
AM_RANGE(0x3004, 0x3005) AM_READNOP AM_WRITEONLY AM_BASE(m_scroll)
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index 24397654acd..11113c6fa8e 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -165,7 +165,7 @@ WRITE8_MEMBER(cloak_state::cloak_nvram_enable_w)
static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8, cloak_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM
- AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE_LEGACY(cloak_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(cloak_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x0800, 0x0fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE_LEGACY("pokey1", pokey_r, pokey_w) /* DSW0 also */
AM_RANGE(0x1800, 0x180f) AM_DEVREADWRITE_LEGACY("pokey2", pokey_r, pokey_w) /* DSW1 also */
@@ -176,9 +176,9 @@ static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8, cloak_state )
AM_RANGE(0x2800, 0x29ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x2f00, 0x2fff) AM_NOP
AM_RANGE(0x3000, 0x30ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x3200, 0x327f) AM_WRITE_LEGACY(cloak_paletteram_w)
+ AM_RANGE(0x3200, 0x327f) AM_WRITE(cloak_paletteram_w)
AM_RANGE(0x3800, 0x3801) AM_WRITE(cloak_coin_counter_w)
- AM_RANGE(0x3803, 0x3803) AM_WRITE_LEGACY(cloak_flipscreen_w)
+ AM_RANGE(0x3803, 0x3803) AM_WRITE(cloak_flipscreen_w)
AM_RANGE(0x3805, 0x3805) AM_WRITENOP // ???
AM_RANGE(0x3806, 0x3807) AM_WRITE(cloak_led_w)
AM_RANGE(0x3a00, 0x3a00) AM_WRITE(watchdog_reset_w)
@@ -196,11 +196,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8, cloak_state )
AM_RANGE(0x0000, 0x0007) AM_RAM
- AM_RANGE(0x0008, 0x000f) AM_READWRITE_LEGACY(graph_processor_r, graph_processor_w)
+ AM_RANGE(0x0008, 0x000f) AM_READWRITE(graph_processor_r, graph_processor_w)
AM_RANGE(0x0010, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1000, 0x1000) AM_WRITE(cloak_irq_reset_1_w)
- AM_RANGE(0x1200, 0x1200) AM_WRITE_LEGACY(cloak_clearbmp_w)
+ AM_RANGE(0x1200, 0x1200) AM_WRITE(cloak_clearbmp_w)
AM_RANGE(0x1400, 0x1400) AM_WRITE(cloak_custom_w)
AM_RANGE(0x2000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c
index e296bc00605..8d3c670f8ac 100644
--- a/src/mame/drivers/cloud9.c
+++ b/src/mame/drivers/cloud9.c
@@ -266,14 +266,14 @@ WRITE8_MEMBER(cloud9_state::nvram_store_w)
*************************************/
static ADDRESS_MAP_START( cloud9_map, AS_PROGRAM, 8, cloud9_state )
- AM_RANGE(0x0000, 0x0001) AM_WRITE_LEGACY(cloud9_bitmode_addr_w)
- AM_RANGE(0x0002, 0x0002) AM_READWRITE_LEGACY(cloud9_bitmode_r, cloud9_bitmode_w)
- AM_RANGE(0x0000, 0x4fff) AM_ROMBANK("bank1") AM_WRITE_LEGACY(cloud9_videoram_w)
+ AM_RANGE(0x0000, 0x0001) AM_WRITE(cloud9_bitmode_addr_w)
+ AM_RANGE(0x0002, 0x0002) AM_READWRITE(cloud9_bitmode_r, cloud9_bitmode_w)
+ AM_RANGE(0x0000, 0x4fff) AM_ROMBANK("bank1") AM_WRITE(cloud9_videoram_w)
AM_RANGE(0x5000, 0x53ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x5400, 0x547f) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x5480, 0x54ff) AM_WRITE(irq_ack_w)
- AM_RANGE(0x5500, 0x557f) AM_RAM_WRITE_LEGACY(cloud9_paletteram_w) AM_BASE(m_paletteram)
- AM_RANGE(0x5580, 0x5587) AM_MIRROR(0x0078) AM_WRITE_LEGACY(cloud9_video_control_w)
+ AM_RANGE(0x5500, 0x557f) AM_RAM_WRITE(cloud9_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x5580, 0x5587) AM_MIRROR(0x0078) AM_WRITE(cloud9_video_control_w)
AM_RANGE(0x5600, 0x5601) AM_MIRROR(0x0078) AM_WRITE(cloud9_coin_counter_w)
AM_RANGE(0x5602, 0x5603) AM_MIRROR(0x0078) AM_WRITE(cloud9_led_w)
AM_RANGE(0x5680, 0x56ff) AM_WRITE(nvram_store_w)
diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c
index 1fbd8cded7b..75a3ea47bf5 100644
--- a/src/mame/drivers/clshroad.c
+++ b/src/mame/drivers/clshroad.c
@@ -44,11 +44,11 @@ static ADDRESS_MAP_START( clshroad_map, AS_PROGRAM, 8, clshroad_state )
AM_RANGE(0x9800, 0x9dff) AM_RAM
AM_RANGE(0x9e00, 0x9fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xa001, 0xa001) AM_WRITENOP // ? Interrupt related
- AM_RANGE(0xa004, 0xa004) AM_WRITE_LEGACY(clshroad_flipscreen_w)
+ AM_RANGE(0xa004, 0xa004) AM_WRITE(clshroad_flipscreen_w)
AM_RANGE(0xa100, 0xa107) AM_READ(clshroad_input_r)
- AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE_LEGACY(clshroad_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE(clshroad_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0xb000, 0xb003) AM_WRITEONLY AM_BASE(m_vregs) // Scroll
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(clshroad_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(clshroad_vram_0_w) AM_BASE(m_vram_0) // Layer 0
ADDRESS_MAP_END
static ADDRESS_MAP_START( clshroad_sound_map, AS_PROGRAM, 8, clshroad_state )
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index e37637961fb..819b74154f4 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -374,8 +374,8 @@ static READ8_DEVICE_HANDLER ( combatsc_ym2203_r )
*************************************/
static ADDRESS_MAP_START( combatsc_map, AS_PROGRAM, 8, combatsc_state )
- AM_RANGE(0x0000, 0x0007) AM_WRITE_LEGACY(combatsc_pf_control_w)
- AM_RANGE(0x0020, 0x005f) AM_READWRITE_LEGACY(combatsc_scrollram_r, combatsc_scrollram_w)
+ AM_RANGE(0x0000, 0x0007) AM_WRITE(combatsc_pf_control_w)
+ AM_RANGE(0x0020, 0x005f) AM_READWRITE(combatsc_scrollram_r, combatsc_scrollram_w)
// AM_RANGE(0x0060, 0x00ff) AM_WRITEONLY /* RAM */
AM_RANGE(0x0200, 0x0201) AM_READWRITE(protection_r, protection_w)
@@ -395,7 +395,7 @@ static ADDRESS_MAP_START( combatsc_map, AS_PROGRAM, 8, combatsc_state )
AM_RANGE(0x0600, 0x06ff) AM_RAM AM_BASE(m_paletteram) /* palette */
AM_RANGE(0x0800, 0x1fff) AM_RAM /* RAM */
- AM_RANGE(0x2000, 0x3fff) AM_READWRITE_LEGACY(combatsc_video_r, combatsc_video_w)
+ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(combatsc_video_r, combatsc_video_w)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM area */
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
@@ -405,7 +405,7 @@ static ADDRESS_MAP_START( combatscb_map, AS_PROGRAM, 8, combatsc_state )
AM_RANGE(0x0500, 0x0500) AM_WRITE(combatscb_bankselect_w)
AM_RANGE(0x0600, 0x06ff) AM_RAM AM_BASE(m_paletteram) /* palette */
AM_RANGE(0x0800, 0x1fff) AM_RAM
- AM_RANGE(0x2000, 0x3fff) AM_READWRITE_LEGACY(combatsc_video_r, combatsc_video_w)
+ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(combatsc_video_r, combatsc_video_w)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM/RAM area */
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index 890909d2445..d5db0318f72 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -58,13 +58,13 @@ static ADDRESS_MAP_START( commando_map, AS_PROGRAM, 8, commando_state )
AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW1")
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSW2")
AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w)
- AM_RANGE(0xc804, 0xc804) AM_WRITE_LEGACY(commando_c804_w)
- AM_RANGE(0xc808, 0xc809) AM_WRITE_LEGACY(commando_scrollx_w)
- AM_RANGE(0xc80a, 0xc80b) AM_WRITE_LEGACY(commando_scrolly_w)
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(commando_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE_LEGACY(commando_colorram2_w) AM_BASE(m_colorram2)
- AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE_LEGACY(commando_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE_LEGACY(commando_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xc804, 0xc804) AM_WRITE(commando_c804_w)
+ AM_RANGE(0xc808, 0xc809) AM_WRITE(commando_scrollx_w)
+ AM_RANGE(0xc80a, 0xc80b) AM_WRITE(commando_scrolly_w)
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(commando_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(commando_colorram2_w) AM_BASE(m_colorram2)
+ AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(commando_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(commando_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xe000, 0xfdff) AM_RAM
AM_RANGE(0xfe00, 0xff7f) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xff80, 0xffff) AM_RAM
diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c
index 9ffcff784f5..398721f4f4c 100644
--- a/src/mame/drivers/compgolf.c
+++ b/src/mame/drivers/compgolf.c
@@ -60,8 +60,8 @@ WRITE8_MEMBER(compgolf_state::compgolf_ctrl_w)
static ADDRESS_MAP_START( compgolf_map, AS_PROGRAM, 8, compgolf_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
- AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE_LEGACY(compgolf_video_w) AM_BASE(m_videoram)
- AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE_LEGACY(compgolf_back_w) AM_BASE(m_bg_ram)
+ AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE(compgolf_video_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(compgolf_back_w) AM_BASE(m_bg_ram)
AM_RANGE(0x2000, 0x2060) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x2061, 0x2061) AM_WRITENOP
AM_RANGE(0x3000, 0x3000) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index 9cd85cbac6d..9451d815346 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -59,7 +59,7 @@ WRITE8_MEMBER(contra_state::cpu_sound_command_w)
static ADDRESS_MAP_START( contra_map, AS_PROGRAM, 8, contra_state )
- AM_RANGE(0x0000, 0x0007) AM_WRITE_LEGACY(contra_K007121_ctrl_0_w)
+ AM_RANGE(0x0000, 0x0007) AM_WRITE(contra_K007121_ctrl_0_w)
AM_RANGE(0x0010, 0x0010) AM_READ_PORT("SYSTEM")
AM_RANGE(0x0011, 0x0011) AM_READ_PORT("P1")
AM_RANGE(0x0012, 0x0012) AM_READ_PORT("P2")
@@ -72,21 +72,21 @@ static ADDRESS_MAP_START( contra_map, AS_PROGRAM, 8, contra_state )
AM_RANGE(0x001a, 0x001a) AM_WRITE(contra_sh_irqtrigger_w)
AM_RANGE(0x001c, 0x001c) AM_WRITE(cpu_sound_command_w)
AM_RANGE(0x001e, 0x001e) AM_WRITENOP /* ? */
- AM_RANGE(0x0060, 0x0067) AM_WRITE_LEGACY(contra_K007121_ctrl_1_w)
+ AM_RANGE(0x0060, 0x0067) AM_WRITE(contra_K007121_ctrl_1_w)
AM_RANGE(0x0c00, 0x0cff) AM_RAM AM_BASE(m_paletteram)
AM_RANGE(0x1000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x5fff) AM_READONLY
- AM_RANGE(0x2000, 0x23ff) AM_WRITE_LEGACY(contra_fg_cram_w) AM_BASE(m_fg_cram)
- AM_RANGE(0x2400, 0x27ff) AM_WRITE_LEGACY(contra_fg_vram_w) AM_BASE(m_fg_vram)
- AM_RANGE(0x2800, 0x2bff) AM_WRITE_LEGACY(contra_text_cram_w) AM_BASE(m_tx_cram)
- AM_RANGE(0x2c00, 0x2fff) AM_WRITE_LEGACY(contra_text_vram_w) AM_BASE(m_tx_vram)
+ AM_RANGE(0x2000, 0x23ff) AM_WRITE(contra_fg_cram_w) AM_BASE(m_fg_cram)
+ AM_RANGE(0x2400, 0x27ff) AM_WRITE(contra_fg_vram_w) AM_BASE(m_fg_vram)
+ AM_RANGE(0x2800, 0x2bff) AM_WRITE(contra_text_cram_w) AM_BASE(m_tx_cram)
+ AM_RANGE(0x2c00, 0x2fff) AM_WRITE(contra_text_vram_w) AM_BASE(m_tx_vram)
AM_RANGE(0x3000, 0x37ff) AM_WRITEONLY AM_BASE(m_spriteram)/* 2nd bank is at 0x5000 */
AM_RANGE(0x3800, 0x3fff) AM_WRITEONLY // second sprite buffer
- AM_RANGE(0x4000, 0x43ff) AM_WRITE_LEGACY(contra_bg_cram_w) AM_BASE(m_bg_cram)
- AM_RANGE(0x4400, 0x47ff) AM_WRITE_LEGACY(contra_bg_vram_w) AM_BASE(m_bg_vram)
+ AM_RANGE(0x4000, 0x43ff) AM_WRITE(contra_bg_cram_w) AM_BASE(m_bg_cram)
+ AM_RANGE(0x4400, 0x47ff) AM_WRITE(contra_bg_vram_w) AM_BASE(m_bg_vram)
AM_RANGE(0x4800, 0x5fff) AM_WRITEONLY
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1")
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index cfc22cfed0a..30636d49eea 100644
--- a/src/mame/drivers/cop01.c
+++ b/src/mame/drivers/cop01.c
@@ -123,9 +123,9 @@ READ8_MEMBER(cop01_state::cop01_sound_irq_ack_w)
static ADDRESS_MAP_START( cop01_map, AS_PROGRAM, 8, cop01_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM /* c000-c7ff in cop01 */
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(cop01_background_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(cop01_background_w) AM_BASE(m_bgvideoram)
AM_RANGE(0xe000, 0xe0ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xf000, 0xf3ff) AM_WRITE_LEGACY(cop01_foreground_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xf000, 0xf3ff) AM_WRITE(cop01_foreground_w) AM_BASE(m_fgvideoram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( io_map, AS_IO, 8, cop01_state )
@@ -135,7 +135,7 @@ static ADDRESS_MAP_START( io_map, AS_IO, 8, cop01_state )
AM_RANGE(0x02, 0x02) AM_READ_PORT("SYSTEM")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
- AM_RANGE(0x40, 0x43) AM_WRITE_LEGACY(cop01_vreg_w)
+ AM_RANGE(0x40, 0x43) AM_WRITE(cop01_vreg_w)
AM_RANGE(0x44, 0x44) AM_WRITE(cop01_sound_command_w)
AM_RANGE(0x45, 0x45) AM_WRITE(cop01_irq_ack_w) /* ? */
ADDRESS_MAP_END
@@ -147,7 +147,7 @@ static ADDRESS_MAP_START( mightguy_io_map, AS_IO, 8, cop01_state )
AM_RANGE(0x02, 0x02) AM_READ_PORT("SYSTEM")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
- AM_RANGE(0x40, 0x43) AM_WRITE_LEGACY(cop01_vreg_w)
+ AM_RANGE(0x40, 0x43) AM_WRITE(cop01_vreg_w)
AM_RANGE(0x44, 0x44) AM_WRITE(cop01_sound_command_w)
AM_RANGE(0x45, 0x45) AM_WRITE(cop01_irq_ack_w) /* ? */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index f2fe1e3da26..75d601594d6 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -360,7 +360,7 @@ static ADDRESS_MAP_START( panic_map, AS_PROGRAM, 8, cosmic_state )
AM_RANGE(0x6802, 0x6802) AM_READ_PORT("DSW")
AM_RANGE(0x6803, 0x6803) AM_READ_PORT("SYSTEM")
AM_RANGE(0x7000, 0x700b) AM_WRITE(panic_sound_output_w)
- AM_RANGE(0x700c, 0x700e) AM_WRITE_LEGACY(cosmic_color_register_w)
+ AM_RANGE(0x700c, 0x700e) AM_WRITE(cosmic_color_register_w)
AM_RANGE(0x700f, 0x700f) AM_WRITE(flip_screen_w)
AM_RANGE(0x7800, 0x7801) AM_WRITE(panic_sound_output2_w)
ADDRESS_MAP_END
@@ -375,7 +375,7 @@ static ADDRESS_MAP_START( cosmica_map, AS_PROGRAM, 8, cosmic_state )
AM_RANGE(0x6802, 0x6802) AM_READ_PORT("DSW")
AM_RANGE(0x6803, 0x6803) AM_READ(cosmica_pixel_clock_r)
AM_RANGE(0x7000, 0x700b) AM_WRITE(cosmica_sound_output_w)
- AM_RANGE(0x700c, 0x700d) AM_WRITE_LEGACY(cosmic_color_register_w)
+ AM_RANGE(0x700c, 0x700d) AM_WRITE(cosmic_color_register_w)
AM_RANGE(0x700f, 0x700f) AM_WRITE(flip_screen_w)
ADDRESS_MAP_END
@@ -389,7 +389,7 @@ static ADDRESS_MAP_START( cosmicg_io_map, AS_IO, 8, cosmic_state )
AM_RANGE(0x00, 0x00) AM_READ(cosmicg_port_0_r)
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x00, 0x15) AM_WRITE(cosmicg_output_w)
- AM_RANGE(0x16, 0x17) AM_WRITE_LEGACY(cosmic_color_register_w)
+ AM_RANGE(0x16, 0x17) AM_WRITE(cosmic_color_register_w)
ADDRESS_MAP_END
@@ -398,7 +398,7 @@ static ADDRESS_MAP_START( magspot_map, AS_PROGRAM, 8, cosmic_state )
AM_RANGE(0x3800, 0x3807) AM_READ(magspot_coinage_dip_r)
AM_RANGE(0x4000, 0x401f) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x4800, 0x4800) AM_DEVWRITE_LEGACY("dac", dac_w)
- AM_RANGE(0x480c, 0x480d) AM_WRITE_LEGACY(cosmic_color_register_w)
+ AM_RANGE(0x480c, 0x480d) AM_WRITE(cosmic_color_register_w)
AM_RANGE(0x480f, 0x480f) AM_WRITE(flip_screen_w)
AM_RANGE(0x5000, 0x5000) AM_READ_PORT("IN0")
AM_RANGE(0x5001, 0x5001) AM_READ_PORT("IN1")
@@ -1543,7 +1543,8 @@ static DRIVER_INIT( cosmica )
static DRIVER_INIT( devzone )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x4807, 0x4807, FUNC(cosmic_background_enable_w));
+ cosmic_state *state = machine.driver_data<cosmic_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x4807, 0x4807,write8_delegate(FUNC(cosmic_state::cosmic_background_enable_w),state));
}
@@ -1553,7 +1554,7 @@ static DRIVER_INIT( nomnlnd )
device_t *dac = machine.device("dac");
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x5000, 0x5001, read8_delegate(FUNC(cosmic_state::nomnlnd_port_0_1_r),state));
machine.device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x4800, 0x4800);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x4807, 0x4807, FUNC(cosmic_background_enable_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x4807, 0x4807, write8_delegate(FUNC(cosmic_state::cosmic_background_enable_w),state));
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(*dac, 0x480a, 0x480a, FUNC(dac_w));
}
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 75ecb213a93..8c9c15d19b9 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -541,13 +541,13 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, cps_state )
AM_RANGE(0x800020, 0x800021) AM_READNOP /* ? Used by Rockman ? not mapped according to PAL */
AM_RANGE(0x800030, 0x800037) AM_WRITE(cps1_coinctrl_w)
/* Forgotten Worlds has dial controls on B-board mapped at 800040-80005f. See DRIVER_INIT */
- AM_RANGE(0x800100, 0x80013f) AM_WRITE_LEGACY(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* CPS-A custom */
+ AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* CPS-A custom */
/* CPS-B custom is mapped by the PAL IOB2 on the B-board. SF2 revision "E" World and USA 910228 has it a a different
address, see DRIVER_INIT */
- AM_RANGE(0x800140, 0x80017f) AM_READWRITE_LEGACY(cps1_cps_b_r, cps1_cps_b_w) AM_BASE(m_cps_b_regs)
+ AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_BASE(m_cps_b_regs)
AM_RANGE(0x800180, 0x800187) AM_WRITE(cps1_soundlatch_w) /* Sound command */
AM_RANGE(0x800188, 0x80018f) AM_WRITE(cps1_soundlatch2_w) /* Sound timer fade */
- AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE_LEGACY(cps1_gfxram_w) AM_BASE_SIZE(m_gfxram, m_gfxram_size) /* SF2CE executes code from here */
+ AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE(cps1_gfxram_w) AM_BASE_SIZE(m_gfxram, m_gfxram_size) /* SF2CE executes code from here */
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
@@ -591,9 +591,9 @@ static ADDRESS_MAP_START( qsound_main_map, AS_PROGRAM, 16, cps_state )
AM_RANGE(0x800000, 0x800007) AM_READ_PORT("IN1") /* Player input ports */
AM_RANGE(0x800018, 0x80001f) AM_READ(cps1_dsw_r) /* System input ports / Dip Switches */
AM_RANGE(0x800030, 0x800037) AM_WRITE(cps1_coinctrl_w)
- AM_RANGE(0x800100, 0x80013f) AM_WRITE_LEGACY(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* CPS-A custom */
- AM_RANGE(0x800140, 0x80017f) AM_READWRITE_LEGACY(cps1_cps_b_r, cps1_cps_b_w) AM_BASE(m_cps_b_regs) /* CPS-B custom (mapped by LWIO/IOB1 PAL on B-board) */
- AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE_LEGACY(cps1_gfxram_w) AM_BASE_SIZE(m_gfxram, m_gfxram_size) /* SF2CE executes code from here */
+ AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* CPS-A custom */
+ AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_BASE(m_cps_b_regs) /* CPS-B custom (mapped by LWIO/IOB1 PAL on B-board) */
+ AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE(cps1_gfxram_w) AM_BASE_SIZE(m_gfxram, m_gfxram_size) /* SF2CE executes code from here */
AM_RANGE(0xf00000, 0xf0ffff) AM_READ(qsound_rom_r) /* Slammasters protection */
AM_RANGE(0xf18000, 0xf19fff) AM_READWRITE(qsound_sharedram1_r, qsound_sharedram1_w) /* Q RAM */
AM_RANGE(0xf1c000, 0xf1c001) AM_READ_PORT("IN2") /* Player 3 controls (later games) */
@@ -10714,18 +10714,20 @@ static DRIVER_INIT( forgottn )
static DRIVER_INIT( sf2ee )
{
+ cps_state *state = machine.driver_data<cps_state>();
/* This specific revision of SF2 has the CPS-B custom mapped at a different address. */
/* The mapping is handled by the PAL IOB2 on the B-board */
machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_readwrite(0x800140, 0x80017f);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x8001c0, 0x8001ff, FUNC(cps1_cps_b_r), FUNC(cps1_cps_b_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x8001c0, 0x8001ff, read16_delegate(FUNC(cps_state::cps1_cps_b_r),state), write16_delegate(FUNC(cps_state::cps1_cps_b_w),state));
DRIVER_INIT_CALL(cps1);
}
static DRIVER_INIT( sf2thndr )
{
+ cps_state *state = machine.driver_data<cps_state>();
/* This particular hack uses a modified B-board PAL which mirrors the CPS-B registers at an alternate address */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x8001c0, 0x8001ff, FUNC(cps1_cps_b_r), FUNC(cps1_cps_b_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x8001c0, 0x8001ff, read16_delegate(FUNC(cps_state::cps1_cps_b_r),state), write16_delegate(FUNC(cps_state::cps1_cps_b_w),state));
DRIVER_INIT_CALL(cps1);
}
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 990477e3b73..b9ba0c83eb2 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -819,13 +819,13 @@ static ADDRESS_MAP_START( cps2_map, AS_PROGRAM, 16, cps_state )
AM_RANGE(0x662020, 0x662021) AM_RAM /* Network adapter related, accessed in SSF2TB */
AM_RANGE(0x660000, 0x663fff) AM_RAM /* When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available. */
AM_RANGE(0x664000, 0x664001) AM_RAM /* Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?) */
- AM_RANGE(0x700000, 0x701fff) AM_WRITE_LEGACY(cps2_objram1_w) AM_BASE(m_objram1) /* Object RAM, no game seems to use it directly */
- AM_RANGE(0x708000, 0x709fff) AM_READWRITE_LEGACY(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* Object RAM */
- AM_RANGE(0x70a000, 0x70bfff) AM_READWRITE_LEGACY(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* mirror */
- AM_RANGE(0x70c000, 0x70dfff) AM_READWRITE_LEGACY(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* mirror */
- AM_RANGE(0x70e000, 0x70ffff) AM_READWRITE_LEGACY(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* mirror */
- AM_RANGE(0x800100, 0x80013f) AM_WRITE_LEGACY(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* mirror (sfa) */
- AM_RANGE(0x800140, 0x80017f) AM_READWRITE_LEGACY(cps1_cps_b_r, cps1_cps_b_w) AM_BASE(m_cps_b_regs) /* mirror (sfa) */
+ AM_RANGE(0x700000, 0x701fff) AM_WRITE(cps2_objram1_w) AM_BASE(m_objram1) /* Object RAM, no game seems to use it directly */
+ AM_RANGE(0x708000, 0x709fff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* Object RAM */
+ AM_RANGE(0x70a000, 0x70bfff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* mirror */
+ AM_RANGE(0x70c000, 0x70dfff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* mirror */
+ AM_RANGE(0x70e000, 0x70ffff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* mirror */
+ AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* mirror (sfa) */
+ AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_BASE(m_cps_b_regs) /* mirror (sfa) */
AM_RANGE(0x804000, 0x804001) AM_READ_PORT("IN0") /* IN0 */
AM_RANGE(0x804010, 0x804011) AM_READ_PORT("IN1") /* IN1 */
AM_RANGE(0x804020, 0x804021) AM_READ_PORT("IN2") /* IN2 + EEPROM */
@@ -833,10 +833,10 @@ static ADDRESS_MAP_START( cps2_map, AS_PROGRAM, 16, cps_state )
AM_RANGE(0x804040, 0x804041) AM_WRITE_LEGACY(cps2_eeprom_port_w) /* EEPROM */
AM_RANGE(0x8040a0, 0x8040a1) AM_WRITENOP /* Unknown (reset once on startup) */
AM_RANGE(0x8040b0, 0x8040b3) AM_READ_LEGACY(kludge_r) /* unknown (xmcotaj hangs if this is 0) */
- AM_RANGE(0x8040e0, 0x8040e1) AM_WRITE_LEGACY(cps2_objram_bank_w) /* bit 0 = Object ram bank swap */
- AM_RANGE(0x804100, 0x80413f) AM_WRITE_LEGACY(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* CPS-A custom */
- AM_RANGE(0x804140, 0x80417f) AM_READWRITE_LEGACY(cps1_cps_b_r, cps1_cps_b_w) /* CPS-B custom */
- AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE_LEGACY(cps1_gfxram_w) AM_BASE_SIZE(m_gfxram, m_gfxram_size) /* Video RAM */
+ AM_RANGE(0x8040e0, 0x8040e1) AM_WRITE(cps2_objram_bank_w) /* bit 0 = Object ram bank swap */
+ AM_RANGE(0x804100, 0x80413f) AM_WRITE(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* CPS-A custom */
+ AM_RANGE(0x804140, 0x80417f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) /* CPS-B custom */
+ AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE(cps1_gfxram_w) AM_BASE_SIZE(m_gfxram, m_gfxram_size) /* Video RAM */
AM_RANGE(0xff0000, 0xffffff) AM_RAM /* RAM */
ADDRESS_MAP_END
@@ -850,13 +850,13 @@ static ADDRESS_MAP_START( dead_cps2_map, AS_PROGRAM, 16, cps_state )
AM_RANGE(0x662020, 0x662021) AM_RAM /* Network adapter related, accessed in SSF2TB */
AM_RANGE(0x660000, 0x663fff) AM_RAM /* When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available. */
AM_RANGE(0x664000, 0x664001) AM_RAM /* Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?) */
- AM_RANGE(0x700000, 0x701fff) AM_WRITE_LEGACY(cps2_objram1_w) AM_BASE(m_objram1) /* Object RAM, no game seems to use it directly */
- AM_RANGE(0x708000, 0x709fff) AM_READWRITE_LEGACY(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* Object RAM */
- AM_RANGE(0x70a000, 0x70bfff) AM_READWRITE_LEGACY(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* mirror */
- AM_RANGE(0x70c000, 0x70dfff) AM_READWRITE_LEGACY(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* mirror */
- AM_RANGE(0x70e000, 0x70ffff) AM_READWRITE_LEGACY(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* mirror */
- AM_RANGE(0x800100, 0x80013f) AM_WRITE_LEGACY(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* mirror (sfa) */
- AM_RANGE(0x800140, 0x80017f) AM_READWRITE_LEGACY(cps1_cps_b_r, cps1_cps_b_w) AM_BASE(m_cps_b_regs) /* mirror (sfa) */
+ AM_RANGE(0x700000, 0x701fff) AM_WRITE(cps2_objram1_w) AM_BASE(m_objram1) /* Object RAM, no game seems to use it directly */
+ AM_RANGE(0x708000, 0x709fff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* Object RAM */
+ AM_RANGE(0x70a000, 0x70bfff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* mirror */
+ AM_RANGE(0x70c000, 0x70dfff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* mirror */
+ AM_RANGE(0x70e000, 0x70ffff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE(m_objram2) /* mirror */
+ AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* mirror (sfa) */
+ AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_BASE(m_cps_b_regs) /* mirror (sfa) */
AM_RANGE(0x804000, 0x804001) AM_READ_PORT("IN0") /* IN0 */
AM_RANGE(0x804010, 0x804011) AM_READ_PORT("IN1") /* IN1 */
AM_RANGE(0x804020, 0x804021) AM_READ_PORT("IN2") /* IN2 + EEPROM */
@@ -864,10 +864,10 @@ static ADDRESS_MAP_START( dead_cps2_map, AS_PROGRAM, 16, cps_state )
AM_RANGE(0x804040, 0x804041) AM_WRITE_LEGACY(cps2_eeprom_port_w) /* EEPROM */
AM_RANGE(0x8040a0, 0x8040a1) AM_WRITENOP /* Unknown (reset once on startup) */
AM_RANGE(0x8040b0, 0x8040b3) AM_READ_LEGACY(kludge_r) /* unknown (xmcotaj hangs if this is 0) */
- AM_RANGE(0x8040e0, 0x8040e1) AM_WRITE_LEGACY(cps2_objram_bank_w) /* bit 0 = Object ram bank swap */
- AM_RANGE(0x804100, 0x80413f) AM_WRITE_LEGACY(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* CPS-A custom */
- AM_RANGE(0x804140, 0x80417f) AM_READWRITE_LEGACY(cps1_cps_b_r, cps1_cps_b_w) /* CPS-B custom */
- AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE_LEGACY(cps1_gfxram_w) AM_BASE_SIZE(m_gfxram, m_gfxram_size) /* Video RAM */
+ AM_RANGE(0x8040e0, 0x8040e1) AM_WRITE(cps2_objram_bank_w) /* bit 0 = Object ram bank swap */
+ AM_RANGE(0x804100, 0x80413f) AM_WRITE(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* CPS-A custom */
+ AM_RANGE(0x804140, 0x80417f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) /* CPS-B custom */
+ AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE(cps1_gfxram_w) AM_BASE_SIZE(m_gfxram, m_gfxram_size) /* Video RAM */
AM_RANGE(0xff0000, 0xffffef) AM_RAM /* RAM */
AM_RANGE(0xfffff0, 0xfffffb) AM_RAM AM_BASE_SIZE(m_output, m_output_size) /* CPS2 output */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c
index 08b40985f77..4434aace409 100644
--- a/src/mame/drivers/crbaloon.c
+++ b/src/mame/drivers/crbaloon.c
@@ -199,8 +199,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, crbaloon_state )
ADDRESS_MAP_GLOBAL_MASK(0x7fff) /* A15 is not decoded */
AM_RANGE(0x0000, 0x3fff) AM_ROM /* not fully populated */
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(crbaloon_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5000, 0x53ff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(crbaloon_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE(crbaloon_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5000, 0x53ff) AM_MIRROR(0x0400) AM_RAM_WRITE(crbaloon_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x5800, 0x7fff) AM_NOP
ADDRESS_MAP_END
diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c
index 04735b188c5..b9183d2a98a 100644
--- a/src/mame/drivers/crgolf.c
+++ b/src/mame/drivers/crgolf.c
@@ -259,7 +259,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, crgolf_state )
AM_RANGE(0x8007, 0x8007) AM_WRITEONLY AM_BASE(m_screena_enable)
AM_RANGE(0x8800, 0x8800) AM_READWRITE(sound_to_main_r, main_to_sound_w)
AM_RANGE(0x9000, 0x9000) AM_WRITE(rom_bank_select_w)
- AM_RANGE(0xa000, 0xffff) AM_READWRITE_LEGACY(crgolf_videoram_r, crgolf_videoram_w)
+ AM_RANGE(0xa000, 0xffff) AM_READWRITE(crgolf_videoram_r, crgolf_videoram_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index 5601c847749..1ccc0f989b3 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -51,13 +51,13 @@ WRITE16_MEMBER(crospang_state::crospang_soundlatch_w)
static ADDRESS_MAP_START( crospang_map, AS_PROGRAM, 16, crospang_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_WRITENOP // writes to rom quite often
AM_RANGE(0x100000, 0x100001) AM_WRITENOP
- AM_RANGE(0x100002, 0x100003) AM_WRITE_LEGACY(crospang_fg_scrolly_w)
- AM_RANGE(0x100004, 0x100005) AM_WRITE_LEGACY(crospang_bg_scrollx_w)
- AM_RANGE(0x100006, 0x100007) AM_WRITE_LEGACY(crospang_bg_scrolly_w)
- AM_RANGE(0x100008, 0x100009) AM_WRITE_LEGACY(crospang_fg_scrollx_w)
+ AM_RANGE(0x100002, 0x100003) AM_WRITE(crospang_fg_scrolly_w)
+ AM_RANGE(0x100004, 0x100005) AM_WRITE(crospang_bg_scrollx_w)
+ AM_RANGE(0x100006, 0x100007) AM_WRITE(crospang_bg_scrolly_w)
+ AM_RANGE(0x100008, 0x100009) AM_WRITE(crospang_fg_scrollx_w)
AM_RANGE(0x10000e, 0x10000f) AM_WRITENOP
- AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE_LEGACY(crospang_fg_videoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0x122000, 0x1227ff) AM_RAM_WRITE_LEGACY(crospang_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(crospang_fg_videoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0x122000, 0x1227ff) AM_RAM_WRITE(crospang_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x210000, 0x2107ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x270000, 0x270001) AM_WRITE(crospang_soundlatch_w)
@@ -70,14 +70,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bestri_map, AS_PROGRAM, 16, crospang_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_WRITENOP // writes to rom quite often
- AM_RANGE(0x100004, 0x100005) AM_WRITE_LEGACY(bestri_fg_scrollx_w)
- AM_RANGE(0x100006, 0x100007) AM_WRITE_LEGACY(bestri_fg_scrolly_w)
- AM_RANGE(0x10000a, 0x10000b) AM_WRITE_LEGACY(bestri_bg_scrolly_w)
- AM_RANGE(0x10000c, 0x10000d) AM_WRITE_LEGACY(bestri_bg_scrollx_w)
- AM_RANGE(0x10000e, 0x10000f) AM_WRITE_LEGACY(bestri_tilebank_w)
+ AM_RANGE(0x100004, 0x100005) AM_WRITE(bestri_fg_scrollx_w)
+ AM_RANGE(0x100006, 0x100007) AM_WRITE(bestri_fg_scrolly_w)
+ AM_RANGE(0x10000a, 0x10000b) AM_WRITE(bestri_bg_scrolly_w)
+ AM_RANGE(0x10000c, 0x10000d) AM_WRITE(bestri_bg_scrollx_w)
+ AM_RANGE(0x10000e, 0x10000f) AM_WRITE(bestri_tilebank_w)
- AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE_LEGACY(crospang_fg_videoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0x122000, 0x1227ff) AM_RAM_WRITE_LEGACY(crospang_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(crospang_fg_videoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0x122000, 0x1227ff) AM_RAM_WRITE(crospang_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x210000, 0x2107ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x270000, 0x270001) AM_WRITE(crospang_soundlatch_w)
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index 5a62dbbdc0b..9a1daf3825b 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -189,13 +189,13 @@ static ADDRESS_MAP_START( crshrace_map, AS_PROGRAM, 16, crshrace_state )
AM_RANGE(0x400000, 0x4fffff) AM_READ(extrarom2_r)
AM_RANGE(0x500000, 0x5fffff) AM_READ(extrarom2_r) /* mirror */
AM_RANGE(0xa00000, 0xa0ffff) AM_RAM AM_SHARE("spriteram2")
- AM_RANGE(0xd00000, 0xd01fff) AM_RAM_WRITE_LEGACY(crshrace_videoram1_w) AM_BASE(m_videoram1)
+ AM_RANGE(0xd00000, 0xd01fff) AM_RAM_WRITE(crshrace_videoram1_w) AM_BASE(m_videoram1)
AM_RANGE(0xe00000, 0xe01fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xfe0000, 0xfeffff) AM_RAM
- AM_RANGE(0xffc000, 0xffc001) AM_WRITE_LEGACY(crshrace_roz_bank_w)
- AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE_LEGACY(crshrace_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xffc000, 0xffc001) AM_WRITE(crshrace_roz_bank_w)
+ AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE(crshrace_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xGGGGGBBBBBRRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("P1") AM_WRITE_LEGACY(crshrace_gfxctrl_w)
+ AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("P1") AM_WRITE(crshrace_gfxctrl_w)
AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("P2")
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW0")
AM_RANGE(0xfff006, 0xfff007) AM_READ_PORT("DSW2")
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index 6971bf9e31d..03a9f3c0983 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -487,9 +487,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cvs_main_cpu_io_map, AS_IO, 8, cvs_state )
- AM_RANGE(0x00, 0xff) AM_READ(cvs_input_r) AM_WRITE_LEGACY(cvs_scroll_w)
- AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READWRITE_LEGACY(cvs_collision_clear, cvs_video_fx_w)
- AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READ_LEGACY(cvs_collision_r) AM_WRITE(audio_command_w)
+ AM_RANGE(0x00, 0xff) AM_READ(cvs_input_r) AM_WRITE(cvs_scroll_w)
+ AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READWRITE(cvs_collision_clear, cvs_video_fx_w)
+ AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READ(cvs_collision_r) AM_WRITE(audio_command_w)
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE")
AM_RANGE(S2650_FO_PORT, S2650_FO_PORT) AM_RAM AM_BASE(m_fo_state)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c
index 2e21c38c9a3..b0e7c24f32d 100644
--- a/src/mame/drivers/dambustr.c
+++ b/src/mame/drivers/dambustr.c
@@ -79,21 +79,21 @@ static WRITE8_DEVICE_HANDLER( dambustr_noise_enable_w )
static ADDRESS_MAP_START( dambustr_map, AS_PROGRAM, 8, dambustr_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x8000) AM_WRITE_LEGACY(dambustr_bg_color_w)
- AM_RANGE(0x8001, 0x8001) AM_WRITE_LEGACY(dambustr_bg_split_line_w)
+ AM_RANGE(0x8000, 0x8000) AM_WRITE(dambustr_bg_color_w)
+ AM_RANGE(0x8001, 0x8001) AM_WRITE(dambustr_bg_split_line_w)
AM_RANGE(0xc000, 0xc7ff) AM_RAM
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd400, 0xd7ff) AM_READ_LEGACY(galaxold_videoram_r)
- AM_RANGE(0xd800, 0xd83f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd400, 0xd7ff) AM_READ(galaxold_videoram_r)
+ AM_RANGE(0xd800, 0xd83f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0xd840, 0xd85f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0xd860, 0xd87f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0xd880, 0xd8ff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ_PORT("IN0")
- AM_RANGE(0xe002, 0xe003) AM_WRITE_LEGACY(galaxold_coin_counter_w)
+ AM_RANGE(0xe002, 0xe003) AM_WRITE(galaxold_coin_counter_w)
AM_RANGE(0xe004, 0xe007) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_lfo_freq_w)
AM_RANGE(0xe800, 0xefff) AM_READ_PORT("IN1")
@@ -104,10 +104,10 @@ static ADDRESS_MAP_START( dambustr_map, AS_PROGRAM, 8, dambustr_state )
AM_RANGE(0xe806, 0xe807) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_vol_w)
AM_RANGE(0xf000, 0xf7ff) AM_READ_PORT("DSW")
- AM_RANGE(0xf001, 0xf001) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0xf004, 0xf004) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0xf006, 0xf006) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0xf007, 0xf007) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0xf001, 0xf001) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0xf004, 0xf004) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0xf006, 0xf006) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0xf007, 0xf007) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0xf800, 0xf800) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
AM_RANGE(0xf800, 0xffff) AM_READ(watchdog_reset_r)
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 23cecbd474d..b3ef655686e 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -252,7 +252,7 @@ static ADDRESS_MAP_START( darius_map, AS_PROGRAM, 16, darius_state )
AM_RANGE(0xd80000, 0xd80fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")/* palette */
AM_RANGE(0xe00100, 0xe00fff) AM_RAM AM_SHARE("share1") AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe01000, 0xe02fff) AM_RAM AM_SHARE("share2")
- AM_RANGE(0xe08000, 0xe0ffff) AM_RAM_WRITE_LEGACY(darius_fg_layer_w) AM_SHARE("share3") AM_BASE(m_fg_ram)
+ AM_RANGE(0xe08000, 0xe0ffff) AM_RAM_WRITE(darius_fg_layer_w) AM_SHARE("share3") AM_BASE(m_fg_ram)
AM_RANGE(0xe10000, 0xe10fff) AM_RAM /* ??? */
ADDRESS_MAP_END
@@ -263,7 +263,7 @@ static ADDRESS_MAP_START( darius_cpub_map, AS_PROGRAM, 16, darius_state )
AM_RANGE(0xd80000, 0xd80fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w)
AM_RANGE(0xe00100, 0xe00fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xe01000, 0xe02fff) AM_RAM AM_SHARE("share2")
- AM_RANGE(0xe08000, 0xe0ffff) AM_RAM_WRITE_LEGACY(darius_fg_layer_w) AM_SHARE("share3")
+ AM_RANGE(0xe08000, 0xe0ffff) AM_RAM_WRITE(darius_fg_layer_w) AM_SHARE("share3")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 0f27cab57a4..fa2de78b7f0 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -63,11 +63,11 @@ To do:
#include "cpu/z80/z80.h"
-class darkhors_state : public driver_device
+class darkhors_state : public st0016_state
{
public:
darkhors_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ : st0016_state(mconfig, type, tag),
m_maincpu(*this, "maincpu")
{ }
@@ -731,13 +731,13 @@ static ADDRESS_MAP_START( st0016_mem, AS_PROGRAM, 8, darkhors_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE_LEGACY("stsnd", st0016_snd_r, st0016_snd_w)
- AM_RANGE(0xec00, 0xec1f) AM_READ_LEGACY(st0016_character_ram_r) AM_WRITE_LEGACY(st0016_character_ram_w)
+ AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w)
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( st0016_io, AS_IO, 8, darkhors_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0xbf) AM_READ_LEGACY(st0016_vregs_r) AM_WRITE_LEGACY(st0016_vregs_w)
+ AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w)
//AM_RANGE(0xc0, 0xc0) AM_READ_LEGACY(cmd1_r)
//AM_RANGE(0xc1, 0xc1) AM_READ_LEGACY(cmd2_r)
//AM_RANGE(0xc2, 0xc2) AM_READ_LEGACY(cmd_stat8_r)
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index 5de941406d6..8ba040c108e 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -63,8 +63,8 @@ static ADDRESS_MAP_START( darkseal_map, AS_PROGRAM, 16, darkseal_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE(m_ram)
AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE_LEGACY(darkseal_palette_24bit_rg_w) AM_SHARE("paletteram")
- AM_RANGE(0x141000, 0x141fff) AM_RAM_WRITE_LEGACY(darkseal_palette_24bit_b_w) AM_SHARE("paletteram2")
+ AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(darkseal_palette_24bit_rg_w) AM_SHARE("paletteram")
+ AM_RANGE(0x141000, 0x141fff) AM_RAM_WRITE(darkseal_palette_24bit_b_w) AM_SHARE("paletteram2")
AM_RANGE(0x180000, 0x18000f) AM_READWRITE(darkseal_control_r, darkseal_control_w)
AM_RANGE(0x200000, 0x201fff) AM_DEVREADWRITE_LEGACY("tilegen2", deco16ic_pf1_data_r, deco16ic_pf1_data_w)
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 03406ddce7f..82d146b8e90 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -138,8 +138,8 @@ static ADDRESS_MAP_START( dbz_map, AS_PROGRAM, 16, dbz_state )
AM_RANGE(0x4f8000, 0x4f801f) AM_DEVREADWRITE8_LEGACY("k053252",k053252_r,k053252_w,0xff00) // 251 #1
AM_RANGE(0x4fc000, 0x4fc01f) AM_DEVWRITE_LEGACY("k053251", k053251_lsb_w) // 251 #2
- AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE_LEGACY(dbz_bg2_videoram_w) AM_BASE(m_bg2_videoram)
- AM_RANGE(0x508000, 0x509fff) AM_RAM_WRITE_LEGACY(dbz_bg1_videoram_w) AM_BASE(m_bg1_videoram)
+ AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(dbz_bg2_videoram_w) AM_BASE(m_bg2_videoram)
+ AM_RANGE(0x508000, 0x509fff) AM_RAM_WRITE(dbz_bg1_videoram_w) AM_BASE(m_bg1_videoram)
AM_RANGE(0x510000, 0x513fff) AM_DEVREADWRITE_LEGACY("k053936_1", k053936_linectrl_r, k053936_linectrl_w) // ?? guess, it might not be
AM_RANGE(0x518000, 0x51bfff) AM_DEVREADWRITE_LEGACY("k053936_2", k053936_linectrl_r, k053936_linectrl_w) // ?? guess, it might not be
AM_RANGE(0x600000, 0x6fffff) AM_READNOP // PSAC 1 ROM readback window
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index 6a1198f93d3..7d42473cc6d 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -215,13 +215,13 @@ static ADDRESS_MAP_START( main_cpu_map, AS_PROGRAM, 16, dcheese_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x200001) AM_READ_PORT("200000") AM_WRITE(watchdog_reset16_w)
- AM_RANGE(0x220000, 0x220001) AM_READ_PORT("220000") AM_WRITE_LEGACY(madmax_blitter_color_w)
+ AM_RANGE(0x220000, 0x220001) AM_READ_PORT("220000") AM_WRITE(madmax_blitter_color_w)
AM_RANGE(0x240000, 0x240001) AM_READ_PORT("240000") AM_WRITE(eeprom_control_w)
- AM_RANGE(0x260000, 0x26001f) AM_WRITE_LEGACY(madmax_blitter_xparam_w)
- AM_RANGE(0x280000, 0x28001f) AM_WRITE_LEGACY(madmax_blitter_yparam_w)
- AM_RANGE(0x2a0000, 0x2a003f) AM_READWRITE_LEGACY(madmax_blitter_vidparam_r, madmax_blitter_vidparam_w)
+ AM_RANGE(0x260000, 0x26001f) AM_WRITE(madmax_blitter_xparam_w)
+ AM_RANGE(0x280000, 0x28001f) AM_WRITE(madmax_blitter_yparam_w)
+ AM_RANGE(0x2a0000, 0x2a003f) AM_READWRITE(madmax_blitter_vidparam_r, madmax_blitter_vidparam_w)
AM_RANGE(0x2e0000, 0x2e0001) AM_WRITE(sound_command_w)
- AM_RANGE(0x300000, 0x300001) AM_WRITE_LEGACY(madmax_blitter_unknown_w)
+ AM_RANGE(0x300000, 0x300001) AM_WRITE(madmax_blitter_unknown_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c
index c419f25407d..5107004b275 100644
--- a/src/mame/drivers/dcon.c
+++ b/src/mame/drivers/dcon.c
@@ -24,16 +24,16 @@ static ADDRESS_MAP_START( dcon_map, AS_PROGRAM, 16, dcon_state )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0x80000, 0x8bfff) AM_RAM
- AM_RANGE(0x8c000, 0x8c7ff) AM_RAM_WRITE_LEGACY(dcon_background_w) AM_BASE(m_back_data)
- AM_RANGE(0x8c800, 0x8cfff) AM_RAM_WRITE_LEGACY(dcon_foreground_w) AM_BASE(m_fore_data)
- AM_RANGE(0x8d000, 0x8d7ff) AM_RAM_WRITE_LEGACY(dcon_midground_w) AM_BASE(m_mid_data)
- AM_RANGE(0x8d800, 0x8e7ff) AM_RAM_WRITE_LEGACY(dcon_text_w) AM_BASE(m_textram)
+ AM_RANGE(0x8c000, 0x8c7ff) AM_RAM_WRITE(dcon_background_w) AM_BASE(m_back_data)
+ AM_RANGE(0x8c800, 0x8cfff) AM_RAM_WRITE(dcon_foreground_w) AM_BASE(m_fore_data)
+ AM_RANGE(0x8d000, 0x8d7ff) AM_RAM_WRITE(dcon_midground_w) AM_BASE(m_mid_data)
+ AM_RANGE(0x8d800, 0x8e7ff) AM_RAM_WRITE(dcon_text_w) AM_BASE(m_textram)
AM_RANGE(0x8e800, 0x8f7ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x8f800, 0x8ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x9d000, 0x9d7ff) AM_WRITE_LEGACY(dcon_gfxbank_w)
+ AM_RANGE(0x9d000, 0x9d7ff) AM_WRITE(dcon_gfxbank_w)
AM_RANGE(0xa0000, 0xa000d) AM_READWRITE_LEGACY(seibu_main_word_r, seibu_main_word_w)
- AM_RANGE(0xc001c, 0xc001d) AM_READWRITE_LEGACY(dcon_control_r, dcon_control_w)
+ AM_RANGE(0xc001c, 0xc001d) AM_READWRITE(dcon_control_r, dcon_control_w)
AM_RANGE(0xc0020, 0xc002f) AM_WRITEONLY AM_BASE(m_scroll_ram)
AM_RANGE(0xc0080, 0xc0081) AM_WRITENOP
AM_RANGE(0xc00c0, 0xc00c1) AM_WRITENOP
diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c
index 949d11b59a6..f020a20ed1b 100644
--- a/src/mame/drivers/dday.c
+++ b/src/mame/drivers/dday.c
@@ -57,18 +57,18 @@ write:
static ADDRESS_MAP_START( dday_map, AS_PROGRAM, 8, dday_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x4000) AM_WRITE_LEGACY(dday_sl_control_w)
- AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE_LEGACY(dday_textvideoram_w) AM_BASE(m_textvideoram)
- AM_RANGE(0x5400, 0x57ff) AM_RAM_WRITE_LEGACY(dday_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0x5800, 0x5bff) AM_RAM_WRITE_LEGACY(dday_bgvideoram_w) AM_BASE(m_bgvideoram)
- AM_RANGE(0x5c00, 0x5fff) AM_READWRITE_LEGACY(dday_colorram_r, dday_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x4000) AM_WRITE(dday_sl_control_w)
+ AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE(dday_textvideoram_w) AM_BASE(m_textvideoram)
+ AM_RANGE(0x5400, 0x57ff) AM_RAM_WRITE(dday_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x5800, 0x5bff) AM_RAM_WRITE(dday_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x5c00, 0x5fff) AM_READWRITE(dday_colorram_r, dday_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x6000, 0x63ff) AM_RAM
AM_RANGE(0x6400, 0x6401) AM_MIRROR(0x000e) AM_DEVWRITE_LEGACY("ay1", ay8910_address_data_w)
AM_RANGE(0x6800, 0x6801) AM_DEVWRITE_LEGACY("ay2", ay8910_address_data_w)
AM_RANGE(0x6c00, 0x6c00) AM_READ_PORT("BUTTONS")
AM_RANGE(0x7000, 0x7000) AM_READ_PORT("DSW0")
AM_RANGE(0x7400, 0x7400) AM_READ_PORT("DSW1")
- AM_RANGE(0x7800, 0x7800) AM_READWRITE_LEGACY(dday_countdown_timer_r, dday_control_w)
+ AM_RANGE(0x7800, 0x7800) AM_READWRITE(dday_countdown_timer_r, dday_control_w)
AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("PADDLE")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index eb6d7865fc5..4d597c87162 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -506,9 +506,9 @@ static ADDRESS_MAP_START( ddragon_map, AS_PROGRAM, 8, ddragon_state )
AM_RANGE(0x1000, 0x11ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
AM_RANGE(0x1200, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
AM_RANGE(0x1400, 0x17ff) AM_RAM
- AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE_LEGACY(ddragon_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(ddragon_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0x2000, 0x2fff) AM_READWRITE_LEGACY(ddragon_spriteram_r, ddragon_spriteram_w) AM_BASE(m_spriteram)
- AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE_LEGACY(ddragon_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(ddragon_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0x3800, 0x3800) AM_READ_PORT("P1")
AM_RANGE(0x3801, 0x3801) AM_READ_PORT("P2")
AM_RANGE(0x3802, 0x3802) AM_READ_PORT("EXTRA")
@@ -525,9 +525,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dd2_map, AS_PROGRAM, 8, ddragon_state )
AM_RANGE(0x0000, 0x17ff) AM_RAM
- AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE_LEGACY(ddragon_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(ddragon_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0x2000, 0x2fff) AM_READWRITE_LEGACY(ddragon_spriteram_r, ddragon_spriteram_w) AM_BASE(m_spriteram)
- AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE_LEGACY(ddragon_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(ddragon_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0x3800, 0x3800) AM_READ_PORT("P1")
AM_RANGE(0x3801, 0x3801) AM_READ_PORT("P2")
AM_RANGE(0x3802, 0x3802) AM_READ_PORT("EXTRA")
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index 2ce3771f63b..25b325c019b 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -208,9 +208,9 @@ WRITE16_MEMBER(ddragon3_state::ddragon3_io_w)
static ADDRESS_MAP_START( ddragon3_map, AS_PROGRAM, 16, ddragon3_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE_LEGACY(ddragon3_fg_videoram_w) AM_BASE(m_fg_videoram) /* Foreground (32x32 Tiles - 4 by per tile) */
- AM_RANGE(0x082000, 0x0827ff) AM_RAM_WRITE_LEGACY(ddragon3_bg_videoram_w) AM_BASE(m_bg_videoram) /* Background (32x32 Tiles - 2 by per tile) */
- AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE_LEGACY(ddragon3_scroll_w)
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(ddragon3_fg_videoram_w) AM_BASE(m_fg_videoram) /* Foreground (32x32 Tiles - 4 by per tile) */
+ AM_RANGE(0x082000, 0x0827ff) AM_RAM_WRITE(ddragon3_bg_videoram_w) AM_BASE(m_bg_videoram) /* Background (32x32 Tiles - 2 by per tile) */
+ AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE(ddragon3_scroll_w)
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("P1_P2")
AM_RANGE(0x100002, 0x100003) AM_READ_PORT("SYSTEM")
AM_RANGE(0x100004, 0x100005) AM_READ_PORT("DSW")
@@ -223,10 +223,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dd3b_map, AS_PROGRAM, 16, ddragon3_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE_LEGACY(ddragon3_fg_videoram_w) AM_BASE(m_fg_videoram) /* Foreground (32x32 Tiles - 4 by per tile) */
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(ddragon3_fg_videoram_w) AM_BASE(m_fg_videoram) /* Foreground (32x32 Tiles - 4 by per tile) */
AM_RANGE(0x081000, 0x081fff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x082000, 0x0827ff) AM_RAM_WRITE_LEGACY(ddragon3_bg_videoram_w) AM_BASE(m_bg_videoram) /* Background (32x32 Tiles - 2 by per tile) */
- AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE_LEGACY(ddragon3_scroll_w)
+ AM_RANGE(0x082000, 0x0827ff) AM_RAM_WRITE(ddragon3_bg_videoram_w) AM_BASE(m_bg_videoram) /* Background (32x32 Tiles - 2 by per tile) */
+ AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE(ddragon3_scroll_w)
AM_RANGE(0x100000, 0x1005ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette RAM */
AM_RANGE(0x140000, 0x14000f) AM_WRITE(ddragon3_io_w)
AM_RANGE(0x180000, 0x180001) AM_READ_PORT("IN0")
@@ -238,11 +238,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ctribe_map, AS_PROGRAM, 16, ddragon3_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE_LEGACY(ddragon3_fg_videoram_w) AM_BASE(m_fg_videoram) /* Foreground (32x32 Tiles - 4 by per tile) */
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(ddragon3_fg_videoram_w) AM_BASE(m_fg_videoram) /* Foreground (32x32 Tiles - 4 by per tile) */
AM_RANGE(0x081000, 0x081fff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x082000, 0x0827ff) AM_RAM_WRITE_LEGACY(ddragon3_bg_videoram_w) AM_BASE(m_bg_videoram) /* Background (32x32 Tiles - 2 by per tile) */
+ AM_RANGE(0x082000, 0x0827ff) AM_RAM_WRITE(ddragon3_bg_videoram_w) AM_BASE(m_bg_videoram) /* Background (32x32 Tiles - 2 by per tile) */
AM_RANGE(0x082800, 0x082fff) AM_RAM
- AM_RANGE(0x0c0000, 0x0c000f) AM_READWRITE_LEGACY(ddragon3_scroll_r, ddragon3_scroll_w)
+ AM_RANGE(0x0c0000, 0x0c000f) AM_READWRITE(ddragon3_scroll_r, ddragon3_scroll_w)
AM_RANGE(0x100000, 0x1005ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram") /* Palette RAM */
AM_RANGE(0x140000, 0x14000f) AM_WRITE(ddragon3_io_w)
AM_RANGE(0x180000, 0x180001) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/ddribble.c b/src/mame/drivers/ddribble.c
index 5fd7f2abff6..79ff70caa88 100644
--- a/src/mame/drivers/ddribble.c
+++ b/src/mame/drivers/ddribble.c
@@ -110,13 +110,13 @@ static WRITE8_DEVICE_HANDLER( ddribble_vlm5030_ctrl_w )
static ADDRESS_MAP_START( cpu0_map, AS_PROGRAM, 8, ddribble_state )
- AM_RANGE(0x0000, 0x0004) AM_WRITE_LEGACY(K005885_0_w) /* video registers (005885 #1) */
- AM_RANGE(0x0800, 0x0804) AM_WRITE_LEGACY(K005885_1_w) /* video registers (005885 #2) */
+ AM_RANGE(0x0000, 0x0004) AM_WRITE(K005885_0_w) /* video registers (005885 #1) */
+ AM_RANGE(0x0800, 0x0804) AM_WRITE(K005885_1_w) /* video registers (005885 #2) */
AM_RANGE(0x1800, 0x187f) AM_RAM AM_BASE(m_paletteram) /* palette */
- AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE_LEGACY(ddribble_fg_videoram_w) AM_BASE(m_fg_videoram) /* Video RAM 1 */
+ AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE(ddribble_fg_videoram_w) AM_BASE(m_fg_videoram) /* Video RAM 1 */
AM_RANGE(0x3000, 0x3fff) AM_RAM AM_BASE(m_spriteram_1) /* Object RAM 1 */
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE(m_sharedram) /* shared RAM with CPU #1 */
- AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE_LEGACY(ddribble_bg_videoram_w) AM_BASE(m_bg_videoram) /* Video RAM 2 */
+ AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(ddribble_bg_videoram_w) AM_BASE(m_bg_videoram) /* Video RAM 2 */
AM_RANGE(0x7000, 0x7fff) AM_RAM AM_BASE(m_spriteram_2) /* Object RAM 2 */
AM_RANGE(0x8000, 0x8000) AM_WRITE(ddribble_bankswitch_w) /* bankswitch control */
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") /* banked ROM */
diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c
index 5979143a5c0..93e72204aca 100644
--- a/src/mame/drivers/deadang.c
+++ b/src/mame/drivers/deadang.c
@@ -63,7 +63,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, deadang_state )
AM_RANGE(0x05000, 0x05fff) AM_WRITEONLY
AM_RANGE(0x06000, 0x0600f) AM_READWRITE_LEGACY(seibu_main_word_r, seibu_main_word_w)
AM_RANGE(0x06010, 0x07fff) AM_WRITEONLY
- AM_RANGE(0x08000, 0x087ff) AM_WRITE_LEGACY(deadang_text_w) AM_BASE(m_videoram)
+ AM_RANGE(0x08000, 0x087ff) AM_WRITE(deadang_text_w) AM_BASE(m_videoram)
AM_RANGE(0x08800, 0x0bfff) AM_WRITEONLY
AM_RANGE(0x0a000, 0x0a001) AM_READ_PORT("P1_P2")
AM_RANGE(0x0a002, 0x0a003) AM_READ_PORT("DSW")
@@ -76,9 +76,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 16, deadang_state )
AM_RANGE(0x00000, 0x037ff) AM_RAM
- AM_RANGE(0x03800, 0x03fff) AM_RAM_WRITE_LEGACY(deadang_foreground_w) AM_BASE(m_video_data)
+ AM_RANGE(0x03800, 0x03fff) AM_RAM_WRITE(deadang_foreground_w) AM_BASE(m_video_data)
AM_RANGE(0x04000, 0x04fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x08000, 0x08001) AM_WRITE_LEGACY(deadang_bank_w)
+ AM_RANGE(0x08000, 0x08001) AM_WRITE(deadang_bank_w)
AM_RANGE(0x0c000, 0x0c001) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0xe0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 063ca0b4daa..5b260aa97f2 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -178,11 +178,11 @@ WRITE16_MEMBER(dec0_state::dec0_control_w)
switch (offset << 1)
{
case 0: /* Playfield & Sprite priority */
- dec0_priority_w(&space, 0, data, mem_mask);
+ dec0_priority_w(space, 0, data, mem_mask);
break;
case 2: /* DMA flag */
- dec0_update_sprites_w(&space, 0, 0, mem_mask);
+ dec0_update_sprites_w(space, 0, 0, mem_mask);
break;
case 4: /* 6502 sound cpu */
@@ -233,7 +233,7 @@ WRITE16_MEMBER(dec0_state::automat_control_w)
break;
case 12: /* DMA flag */
- dec0_update_sprites_w(&space, 0, 0, mem_mask);
+ dec0_update_sprites_w(space, 0, 0, mem_mask);
break;
#if 0
case 8: /* Interrupt ack (VBL - IRQ 6) */
@@ -265,7 +265,7 @@ WRITE16_MEMBER(dec0_state::slyspy_control_w)
}
break;
case 2:
- dec0_priority_w(&space, 0, data, mem_mask);
+ dec0_priority_w(space, 0, data, mem_mask);
break;
}
}
@@ -302,11 +302,11 @@ static ADDRESS_MAP_START( dec0_map, AS_PROGRAM, 16, dec0_state )
AM_RANGE(0x24cc00, 0x24cfff) AM_DEVREADWRITE_LEGACY("tilegen3", deco_bac06_pf_rowscroll_r, deco_bac06_pf_rowscroll_w)
AM_RANGE(0x24d000, 0x24d7ff) AM_DEVREADWRITE_LEGACY("tilegen3", deco_bac06_pf_data_r, deco_bac06_pf_data_w)
- AM_RANGE(0x300000, 0x30001f) AM_READ_LEGACY(dec0_rotary_r)
- AM_RANGE(0x30c000, 0x30c00b) AM_READ_LEGACY(dec0_controls_r)
+ AM_RANGE(0x300000, 0x30001f) AM_READ(dec0_rotary_r)
+ AM_RANGE(0x30c000, 0x30c00b) AM_READ(dec0_controls_r)
AM_RANGE(0x30c010, 0x30c01f) AM_WRITE(dec0_control_w) /* Priority, sound, etc. */
- AM_RANGE(0x310000, 0x3107ff) AM_RAM_WRITE_LEGACY(dec0_paletteram_rg_w) AM_SHARE("paletteram")
- AM_RANGE(0x314000, 0x3147ff) AM_RAM_WRITE_LEGACY(dec0_paletteram_b_w) AM_SHARE("paletteram2")
+ AM_RANGE(0x310000, 0x3107ff) AM_RAM_WRITE(dec0_paletteram_rg_w) AM_SHARE("paletteram")
+ AM_RANGE(0x314000, 0x3147ff) AM_RAM_WRITE(dec0_paletteram_b_w) AM_SHARE("paletteram2")
AM_RANGE(0xff8000, 0xffbfff) AM_RAM AM_BASE(m_ram) /* Main ram */
AM_RANGE(0xffc000, 0xffc7ff) AM_RAM AM_BASE(m_spriteram) /* Sprites */
ADDRESS_MAP_END
@@ -320,11 +320,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( hippodrm_sub_map, AS_PROGRAM, 8, dec0_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
- AM_RANGE(0x180000, 0x1800ff) AM_READWRITE_LEGACY(hippodrm_shared_r, hippodrm_shared_w)
+ AM_RANGE(0x180000, 0x1800ff) AM_READWRITE(hippodrm_shared_r, hippodrm_shared_w)
AM_RANGE(0x1a0000, 0x1a0007) AM_DEVWRITE_LEGACY("tilegen3", deco_bac06_pf_control0_8bit_packed_w)
AM_RANGE(0x1a0010, 0x1a001f) AM_DEVWRITE_LEGACY("tilegen3", deco_bac06_pf_control1_8bit_swap_w)
AM_RANGE(0x1a1000, 0x1a17ff) AM_DEVREADWRITE_LEGACY("tilegen3", deco_bac06_pf_data_8bit_swap_r, deco_bac06_pf_data_8bit_swap_w)
- AM_RANGE(0x1d0000, 0x1d00ff) AM_READWRITE_LEGACY(hippodrm_prot_r, hippodrm_prot_w)
+ AM_RANGE(0x1d0000, 0x1d00ff) AM_READWRITE(hippodrm_prot_r, hippodrm_prot_w)
AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") /* Main ram */
AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE_LEGACY(h6280_irq_status_w)
AM_RANGE(0x1ff402, 0x1ff403) AM_READ_PORT("VBLANK")
@@ -519,8 +519,8 @@ static ADDRESS_MAP_START( midres_map, AS_PROGRAM, 16, dec0_state )
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE(m_ram)
AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x160000, 0x160001) AM_WRITE_LEGACY(dec0_priority_w)
- AM_RANGE(0x180000, 0x18000f) AM_READ_LEGACY(midres_controls_r)
+ AM_RANGE(0x160000, 0x160001) AM_WRITE(dec0_priority_w)
+ AM_RANGE(0x180000, 0x18000f) AM_READ(midres_controls_r)
AM_RANGE(0x180008, 0x18000f) AM_WRITENOP /* ?? watchdog ?? */
AM_RANGE(0x1a0000, 0x1a0001) AM_WRITE(midres_sound_w)
@@ -633,12 +633,12 @@ static ADDRESS_MAP_START( automat_map, AS_PROGRAM, 16, dec0_state )
AM_RANGE(0x24cc00, 0x24cfff) AM_DEVREADWRITE_LEGACY("tilegen3", deco_bac06_pf_rowscroll_r, deco_bac06_pf_rowscroll_w)
AM_RANGE(0x24d000, 0x24d7ff) AM_DEVREADWRITE_LEGACY("tilegen3", deco_bac06_pf_data_r, deco_bac06_pf_data_w)
- AM_RANGE(0x300000, 0x30001f) AM_READ_LEGACY(dec0_rotary_r)
- AM_RANGE(0x30c000, 0x30c00b) AM_READ_LEGACY(dec0_controls_r)
+ AM_RANGE(0x300000, 0x30001f) AM_READ(dec0_rotary_r)
+ AM_RANGE(0x30c000, 0x30c00b) AM_READ(dec0_controls_r)
AM_RANGE(0x30c000, 0x30c01f) AM_WRITE(automat_control_w) /* Priority, sound, etc. */
AM_RANGE(0x310000, 0x3107ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x314000, 0x3147ff) AM_RAM
- AM_RANGE(0x400008, 0x400009) AM_WRITE_LEGACY(dec0_priority_w) // NEW
+ AM_RANGE(0x400008, 0x400009) AM_WRITE(dec0_priority_w) // NEW
AM_RANGE(0xff8000, 0xffbfff) AM_RAM AM_BASE(m_ram) /* Main ram */
AM_RANGE(0xffc000, 0xffc7ff) AM_RAM AM_BASE(m_spriteram) /* Sprites */
ADDRESS_MAP_END
@@ -661,7 +661,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8, dec0_state )
ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P3) AM_READWRITE_LEGACY(dec0_mcu_port_r, dec0_mcu_port_w)
+ AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P3) AM_READWRITE(dec0_mcu_port_r, dec0_mcu_port_w)
ADDRESS_MAP_END
/******************************************************************************/
@@ -3060,8 +3060,8 @@ static DRIVER_INIT( convert_robocop_gfx4_to_automat )
static DRIVER_INIT( midresb )
{
dec0_state *state = machine.driver_data<dec0_state>();
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x00180000, 0x0018000f, FUNC(dec0_controls_r) );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x001a0000, 0x001a000f, FUNC(dec0_rotary_r) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00180000, 0x0018000f, read16_delegate(FUNC(dec0_state::dec0_controls_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x001a0000, 0x001a000f, read16_delegate(FUNC(dec0_state::dec0_rotary_r),state));
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x00180014, 0x00180015, write16_delegate(FUNC(dec0_state::midres_sound_w),state));
}
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index ecb7fd23ca6..61eafc0fda0 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -594,15 +594,15 @@ static ADDRESS_MAP_START( lastmisn_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x1805, 0x1805) AM_WRITE(dec8_mxc06_karn_buffer_spriteram_w) /* DMA */
AM_RANGE(0x1806, 0x1806) AM_READ(i8751_h_r)
AM_RANGE(0x1807, 0x1807) AM_READWRITE(i8751_l_r, flip_screen_w)
- AM_RANGE(0x1809, 0x1809) AM_WRITE_LEGACY(lastmisn_scrollx_w) /* Scroll LSB */
- AM_RANGE(0x180b, 0x180b) AM_WRITE_LEGACY(lastmisn_scrolly_w) /* Scroll LSB */
+ AM_RANGE(0x1809, 0x1809) AM_WRITE(lastmisn_scrollx_w) /* Scroll LSB */
+ AM_RANGE(0x180b, 0x180b) AM_WRITE(lastmisn_scrolly_w) /* Scroll LSB */
AM_RANGE(0x180c, 0x180c) AM_WRITE(dec8_sound_w)
- AM_RANGE(0x180d, 0x180d) AM_WRITE_LEGACY(lastmisn_control_w) /* Bank switch + Scroll MSB */
+ AM_RANGE(0x180d, 0x180d) AM_WRITE(lastmisn_control_w) /* Bank switch + Scroll MSB */
AM_RANGE(0x180e, 0x180f) AM_WRITE(lastmisn_i8751_w)
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("share2")
- AM_RANGE(0x3800, 0x3fff) AM_READWRITE_LEGACY(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
+ AM_RANGE(0x3800, 0x3fff) AM_READWRITE(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -620,10 +620,10 @@ static ADDRESS_MAP_START( lastmisn_sub_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x1805, 0x1805) AM_WRITE(dec8_mxc06_karn_buffer_spriteram_w) /* DMA */
AM_RANGE(0x1807, 0x1807) AM_WRITE(flip_screen_w)
AM_RANGE(0x180c, 0x180c) AM_WRITE(dec8_sound_w)
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(dec8_videoram_w)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(dec8_videoram_w)
AM_RANGE(0x2800, 0x2fff) AM_WRITEONLY AM_SHARE("spriteram")
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("share2")
- AM_RANGE(0x3800, 0x3fff) AM_READWRITE_LEGACY(dec8_bg_data_r, dec8_bg_data_w)
+ AM_RANGE(0x3800, 0x3fff) AM_READWRITE(dec8_bg_data_r, dec8_bg_data_w)
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -639,14 +639,14 @@ static ADDRESS_MAP_START( shackled_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w)
AM_RANGE(0x1805, 0x1805) AM_WRITE(dec8_mxc06_karn_buffer_spriteram_w) /* DMA */
AM_RANGE(0x1807, 0x1807) AM_WRITE(flip_screen_w)
- AM_RANGE(0x1809, 0x1809) AM_WRITE_LEGACY(lastmisn_scrollx_w) /* Scroll LSB */
- AM_RANGE(0x180b, 0x180b) AM_WRITE_LEGACY(lastmisn_scrolly_w) /* Scroll LSB */
+ AM_RANGE(0x1809, 0x1809) AM_WRITE(lastmisn_scrollx_w) /* Scroll LSB */
+ AM_RANGE(0x180b, 0x180b) AM_WRITE(lastmisn_scrolly_w) /* Scroll LSB */
AM_RANGE(0x180c, 0x180c) AM_WRITE(dec8_sound_w)
- AM_RANGE(0x180d, 0x180d) AM_WRITE_LEGACY(shackled_control_w) /* Bank switch + Scroll MSB */
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(dec8_videoram_w)
+ AM_RANGE(0x180d, 0x180d) AM_WRITE(shackled_control_w) /* Bank switch + Scroll MSB */
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(dec8_videoram_w)
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("share2")
- AM_RANGE(0x3800, 0x3fff) AM_READWRITE_LEGACY(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
+ AM_RANGE(0x3800, 0x3fff) AM_READWRITE(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -664,22 +664,22 @@ static ADDRESS_MAP_START( shackled_sub_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x1805, 0x1805) AM_WRITE(dec8_mxc06_karn_buffer_spriteram_w) /* DMA */
AM_RANGE(0x1806, 0x1806) AM_READ(i8751_h_r)
AM_RANGE(0x1807, 0x1807) AM_READWRITE(i8751_l_r, flip_screen_w)
- AM_RANGE(0x1809, 0x1809) AM_WRITE_LEGACY(lastmisn_scrollx_w) /* Scroll LSB */
- AM_RANGE(0x180b, 0x180b) AM_WRITE_LEGACY(lastmisn_scrolly_w) /* Scroll LSB */
+ AM_RANGE(0x1809, 0x1809) AM_WRITE(lastmisn_scrollx_w) /* Scroll LSB */
+ AM_RANGE(0x180b, 0x180b) AM_WRITE(lastmisn_scrolly_w) /* Scroll LSB */
AM_RANGE(0x180c, 0x180c) AM_WRITE(dec8_sound_w)
- AM_RANGE(0x180d, 0x180d) AM_WRITE_LEGACY(shackled_control_w) /* Bank switch + Scroll MSB */
+ AM_RANGE(0x180d, 0x180d) AM_WRITE(shackled_control_w) /* Bank switch + Scroll MSB */
AM_RANGE(0x180e, 0x180f) AM_WRITE(shackled_i8751_w)
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("share2")
- AM_RANGE(0x3800, 0x3fff) AM_READWRITE_LEGACY(dec8_bg_data_r, dec8_bg_data_w)
+ AM_RANGE(0x3800, 0x3fff) AM_READWRITE(dec8_bg_data_r, dec8_bg_data_w)
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( gondo_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x17ff) AM_RAM
- AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE_LEGACY(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0x2000, 0x27ff) AM_READWRITE_LEGACY(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
+ AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x2000, 0x27ff) AM_READWRITE(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
AM_RANGE(0x2800, 0x2bff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
AM_RANGE(0x2c00, 0x2fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("spriteram") /* Sprites */
@@ -690,7 +690,7 @@ static ADDRESS_MAP_START( gondo_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x380e, 0x380e) AM_READ_PORT("IN3") /* VBL */
AM_RANGE(0x380f, 0x380f) AM_READ_PORT("IN2") /* Fire buttons */
AM_RANGE(0x3810, 0x3810) AM_WRITE(dec8_sound_w)
- AM_RANGE(0x3818, 0x382f) AM_WRITE_LEGACY(gondo_scroll_w)
+ AM_RANGE(0x3818, 0x382f) AM_WRITE(gondo_scroll_w)
AM_RANGE(0x3830, 0x3830) AM_WRITE(ghostb_bank_w) /* Bank + NMI enable */
AM_RANGE(0x3838, 0x3838) AM_READ(i8751_h_r)
AM_RANGE(0x3839, 0x3839) AM_READ(i8751_l_r)
@@ -701,8 +701,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( garyoret_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x17ff) AM_RAM
- AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE_LEGACY(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0x2000, 0x27ff) AM_READWRITE_LEGACY(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
+ AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x2000, 0x27ff) AM_READWRITE(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
AM_RANGE(0x2800, 0x2bff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
AM_RANGE(0x2c00, 0x2fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("spriteram") /* Sprites */
@@ -712,7 +712,7 @@ static ADDRESS_MAP_START( garyoret_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x380a, 0x380a) AM_READ_PORT("IN1") /* Player 2 + VBL */
AM_RANGE(0x380b, 0x380b) AM_READ_PORT("IN0") /* Player 1 */
AM_RANGE(0x3810, 0x3810) AM_WRITE(dec8_sound_w)
- AM_RANGE(0x3818, 0x382f) AM_WRITE_LEGACY(gondo_scroll_w)
+ AM_RANGE(0x3818, 0x382f) AM_WRITE(gondo_scroll_w)
AM_RANGE(0x3830, 0x3830) AM_WRITE(ghostb_bank_w) /* Bank + NMI enable */
AM_RANGE(0x3838, 0x3839) AM_WRITE(dec8_i8751_w)
AM_RANGE(0x383a, 0x383a) AM_READ(i8751_h_r)
@@ -724,7 +724,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( meikyuh_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x17ff) AM_RAM
- AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE_LEGACY(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x2000, 0x27ff) AM_DEVREADWRITE_LEGACY("tilegen1", deco_bac06_pf_data_8bit_r, deco_bac06_pf_data_8bit_w)
AM_RANGE(0x2800, 0x2bff) AM_RAM // colscroll? mirror?
AM_RANGE(0x2c00, 0x2fff) AM_DEVREADWRITE_LEGACY("tilegen1", deco_bac06_pf_rowscroll_8bit_r, deco_bac06_pf_rowscroll_8bit_w)
@@ -756,16 +756,16 @@ static ADDRESS_MAP_START( csilver_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w)
AM_RANGE(0x1805, 0x1805) AM_READ_PORT("DSW0") AM_WRITE(dec8_mxc06_karn_buffer_spriteram_w) /* Dip 1, DMA */
AM_RANGE(0x1807, 0x1807) AM_WRITE(flip_screen_w)
- AM_RANGE(0x1808, 0x180b) AM_WRITE_LEGACY(dec8_scroll2_w)
+ AM_RANGE(0x1808, 0x180b) AM_WRITE(dec8_scroll2_w)
AM_RANGE(0x180c, 0x180c) AM_WRITE(dec8_sound_w)
AM_RANGE(0x180d, 0x180d) AM_WRITE(csilver_control_w)
AM_RANGE(0x180e, 0x180f) AM_WRITE(csilver_i8751_w)
AM_RANGE(0x1c00, 0x1c00) AM_READ(i8751_h_r)
AM_RANGE(0x1e00, 0x1e00) AM_READ(i8751_l_r)
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(dec8_videoram_w)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(dec8_videoram_w)
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("share2")
- AM_RANGE(0x3800, 0x3fff) AM_READWRITE_LEGACY(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
+ AM_RANGE(0x3800, 0x3fff) AM_READWRITE(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -779,10 +779,10 @@ static ADDRESS_MAP_START( csilver_sub_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w)
AM_RANGE(0x1805, 0x1805) AM_READ_PORT("DSW0") AM_WRITE(dec8_mxc06_karn_buffer_spriteram_w) /* DMA */
AM_RANGE(0x180c, 0x180c) AM_WRITE(dec8_sound_w)
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("share2")
- AM_RANGE(0x3800, 0x3fff) AM_READWRITE_LEGACY(dec8_bg_data_r, dec8_bg_data_w)
+ AM_RANGE(0x3800, 0x3fff) AM_READWRITE(dec8_bg_data_r, dec8_bg_data_w)
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -790,7 +790,7 @@ static ADDRESS_MAP_START( oscar_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x0eff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x0f00, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_RAM AM_SHARE("share2")
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x2800, 0x2fff) AM_DEVREADWRITE_LEGACY("tilegen1", deco_bac06_pf_data_8bit_r, deco_bac06_pf_data_8bit_w)
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("spriteram") /* Sprites */
AM_RANGE(0x3800, 0x3bff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_be_w) AM_SHARE("paletteram")
@@ -821,14 +821,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( srdarwin_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x05ff) AM_RAM
AM_RANGE(0x0600, 0x07ff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE_LEGACY(srdarwin_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE(srdarwin_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1000, 0x13ff) AM_RAM
- AM_RANGE(0x1400, 0x17ff) AM_READWRITE_LEGACY(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
+ AM_RANGE(0x1400, 0x17ff) AM_READWRITE(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
AM_RANGE(0x1800, 0x1801) AM_WRITE(srdarwin_i8751_w)
AM_RANGE(0x1802, 0x1802) AM_WRITE(i8751_reset_w) /* Maybe.. */
AM_RANGE(0x1803, 0x1803) AM_WRITENOP /* NMI ack */
AM_RANGE(0x1804, 0x1804) AM_DEVWRITE("spriteram", buffered_spriteram8_device, write) /* DMA */
- AM_RANGE(0x1805, 0x1806) AM_WRITE_LEGACY(srdarwin_control_w) /* Scroll & Bank */
+ AM_RANGE(0x1805, 0x1806) AM_WRITE(srdarwin_control_w) /* Scroll & Bank */
AM_RANGE(0x2000, 0x2000) AM_READWRITE(i8751_h_r, dec8_sound_w) /* Sound */
AM_RANGE(0x2001, 0x2001) AM_READWRITE(i8751_l_r, flip_screen_w) /* Flipscreen */
AM_RANGE(0x2800, 0x288f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
@@ -846,7 +846,7 @@ static ADDRESS_MAP_START( cobra_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0800, 0x0fff) AM_DEVREADWRITE_LEGACY("tilegen1", deco_bac06_pf_data_8bit_r, deco_bac06_pf_data_8bit_w)
AM_RANGE(0x1000, 0x17ff) AM_DEVREADWRITE_LEGACY("tilegen2", deco_bac06_pf_data_8bit_r, deco_bac06_pf_data_8bit_w)
AM_RANGE(0x1800, 0x1fff) AM_RAM
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x3000, 0x31ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_be_w) AM_SHARE("paletteram")
AM_RANGE(0x3200, 0x37ff) AM_WRITEONLY /* Unused */
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 885a31bded2..378f656db8d 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -392,7 +392,7 @@ WRITE32_MEMBER(deco32_state::fghthist_eeprom_w)
eeprom->write_bit(data & 0x10);
eeprom->set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE);
- deco32_pri_w(&space,0,data&0x1,0xffffffff); /* Bit 0 - layer priority toggle */
+ deco32_pri_w(space,0,data&0x1,0xffffffff); /* Bit 0 - layer priority toggle */
}
else if (!ACCESSING_BITS_8_15)
{
@@ -496,7 +496,7 @@ WRITE32_MEMBER(deco32_state::tattass_prot_w)
/* 'Swap bits 0 and 3 to correct for design error from BSMT schematic' */
int soundcommand = (data>>16)&0xff;
soundcommand = BITSWAP8(soundcommand,7,6,5,4,0,2,1,3);
- m_decobsmt->bsmt_comms_w(*&space, 0, soundcommand);
+ m_decobsmt->bsmt_comms_w(space, 0, soundcommand);
}
}
@@ -617,7 +617,7 @@ WRITE32_MEMBER(deco32_state::tattass_control_w)
}
/* Playfield control - Only written in full word memory accesses */
- deco32_pri_w(&space,0,data&0x3,0xffffffff); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */
+ deco32_pri_w(space,0,data&0x3,0xffffffff); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */
/* Sound board reset control */
if (data&0x80)
@@ -656,7 +656,7 @@ WRITE32_MEMBER(deco32_state::nslasher_eeprom_w)
eeprom->write_bit(data & 0x10);
eeprom->set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE);
- deco32_pri_w(&space,0,data&0x3,0xffffffff); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */
+ deco32_pri_w(space,0,data&0x3,0xffffffff); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */
}
}
@@ -730,12 +730,12 @@ static ADDRESS_MAP_START( captaven_map, AS_PROGRAM, 32, deco32_state )
AM_RANGE(0x128000, 0x128fff) AM_READ(captaven_prot_r)
AM_RANGE(0x1280c8, 0x1280cb) AM_WRITE(deco32_sound_w)
- AM_RANGE(0x130000, 0x131fff) AM_RAM_WRITE_LEGACY(deco32_nonbuffered_palette_w) AM_SHARE("paletteram") /* Palette RAM */
+ AM_RANGE(0x130000, 0x131fff) AM_RAM_WRITE(deco32_nonbuffered_palette_w) AM_SHARE("paletteram") /* Palette RAM */
AM_RANGE(0x148000, 0x14800f) AM_READWRITE(deco32_irq_controller_r, deco32_irq_controller_w)
AM_RANGE(0x160000, 0x167fff) AM_RAM /* Extra work RAM */
AM_RANGE(0x168000, 0x168003) AM_READ(captaven_soundcpu_r)
- AM_RANGE(0x178000, 0x178003) AM_WRITE_LEGACY(deco32_pri_w)
+ AM_RANGE(0x178000, 0x178003) AM_WRITE(deco32_pri_w)
AM_RANGE(0x180000, 0x18001f) AM_DEVREADWRITE_LEGACY("tilegen1", deco16ic_pf_control_dword_r, deco16ic_pf_control_dword_w)
AM_RANGE(0x190000, 0x191fff) AM_DEVREADWRITE_LEGACY("tilegen1", deco16ic_pf1_data_dword_r, deco16ic_pf1_data_dword_w)
@@ -762,8 +762,8 @@ static ADDRESS_MAP_START( fghthist_map, AS_PROGRAM, 32, deco32_state )
AM_RANGE(0x140000, 0x140003) AM_WRITENOP /* VBL irq ack */
- AM_RANGE(0x168000, 0x169fff) AM_RAM_WRITE_LEGACY(deco32_buffered_palette_w) AM_SHARE("paletteram")
- AM_RANGE(0x16c008, 0x16c00b) AM_WRITE_LEGACY(deco32_palette_dma_w)
+ AM_RANGE(0x168000, 0x169fff) AM_RAM_WRITE(deco32_buffered_palette_w) AM_SHARE("paletteram")
+ AM_RANGE(0x16c008, 0x16c00b) AM_WRITE(deco32_palette_dma_w)
//
AM_RANGE(0x178000, 0x179fff) AM_READWRITE(deco32_spriteram_r, deco32_spriteram_w)
AM_RANGE(0x17c010, 0x17c013) AM_WRITE(deco32_buffer_spriteram_w)
@@ -793,8 +793,8 @@ static ADDRESS_MAP_START( fghthsta_memmap, AS_PROGRAM, 32, deco32_state )
AM_RANGE(0x140000, 0x140003) AM_WRITENOP /* VBL irq ack */
AM_RANGE(0x150000, 0x150003) AM_WRITE(fghthist_eeprom_w) /* Volume port/Eprom */
- AM_RANGE(0x168000, 0x169fff) AM_RAM_WRITE_LEGACY(deco32_buffered_palette_w) AM_SHARE("paletteram")
- AM_RANGE(0x16c008, 0x16c00b) AM_WRITE_LEGACY(deco32_palette_dma_w)
+ AM_RANGE(0x168000, 0x169fff) AM_RAM_WRITE(deco32_buffered_palette_w) AM_SHARE("paletteram")
+ AM_RANGE(0x16c008, 0x16c00b) AM_WRITE(deco32_palette_dma_w)
AM_RANGE(0x16c010, 0x16c013) AM_READNOP
AM_RANGE(0x178000, 0x179fff) AM_READWRITE(deco32_spriteram_r, deco32_spriteram_w)
@@ -824,9 +824,9 @@ static ADDRESS_MAP_START( dragngun_map, AS_PROGRAM, 32, dragngun_state )
AM_RANGE(0x120000, 0x120fff) AM_READ(dragngun_prot_r)
AM_RANGE(0x1204c0, 0x1204c3) AM_WRITE(deco32_sound_w)
AM_RANGE(0x128000, 0x12800f) AM_READWRITE(deco32_irq_controller_r, deco32_irq_controller_w)
- AM_RANGE(0x130000, 0x131fff) AM_RAM_WRITE_LEGACY(deco32_buffered_palette_w) AM_SHARE("paletteram")
+ AM_RANGE(0x130000, 0x131fff) AM_RAM_WRITE(deco32_buffered_palette_w) AM_SHARE("paletteram")
AM_RANGE(0x138000, 0x138003) AM_NOP /* Palette dma complete in bit 0x8? ack? return 0 else tight loop */
- AM_RANGE(0x138008, 0x13800b) AM_WRITE_LEGACY(deco32_palette_dma_w)
+ AM_RANGE(0x138008, 0x13800b) AM_WRITE(deco32_palette_dma_w)
AM_RANGE(0x180000, 0x18001f) AM_DEVREADWRITE_LEGACY("tilegen1", deco16ic_pf_control_dword_r, deco16ic_pf_control_dword_w)
AM_RANGE(0x190000, 0x191fff) AM_DEVREADWRITE_LEGACY("tilegen1", deco16ic_pf1_data_dword_r, deco16ic_pf1_data_dword_w)
@@ -851,7 +851,7 @@ static ADDRESS_MAP_START( dragngun_map, AS_PROGRAM, 32, dragngun_state )
AM_RANGE(0x228000, 0x2283ff) AM_RAM //0x10 byte increments only
- AM_RANGE(0x230000, 0x230003) AM_WRITE_LEGACY(dragngun_spriteram_dma_w)
+ AM_RANGE(0x230000, 0x230003) AM_WRITE(dragngun_spriteram_dma_w)
AM_RANGE(0x300000, 0x3fffff) AM_ROM
@@ -862,7 +862,7 @@ static ADDRESS_MAP_START( dragngun_map, AS_PROGRAM, 32, dragngun_state )
AM_RANGE(0x430000, 0x43001f) AM_WRITE(dragngun_lightgun_w)
AM_RANGE(0x440000, 0x440003) AM_READ(dragngun_service_r)
- AM_RANGE(0x500000, 0x500003) AM_WRITE_LEGACY(dragngun_sprite_control_w)
+ AM_RANGE(0x500000, 0x500003) AM_WRITE(dragngun_sprite_control_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( lockload_map, AS_PROGRAM, 32, dragngun_state )
@@ -872,9 +872,9 @@ static ADDRESS_MAP_START( lockload_map, AS_PROGRAM, 32, dragngun_state )
AM_RANGE(0x1204c0, 0x1204c3) AM_WRITE(deco32_sound_w)
AM_RANGE(0x128000, 0x12800f) AM_READWRITE(deco32_irq_controller_r, deco32_irq_controller_w)
- AM_RANGE(0x130000, 0x131fff) AM_RAM_WRITE_LEGACY(deco32_buffered_palette_w) AM_SHARE("paletteram")
+ AM_RANGE(0x130000, 0x131fff) AM_RAM_WRITE(deco32_buffered_palette_w) AM_SHARE("paletteram")
AM_RANGE(0x138000, 0x138003) AM_READONLY AM_WRITENOP //palette dma complete in bit 0x8? ack? return 0 else tight loop
- AM_RANGE(0x138008, 0x13800b) AM_WRITE_LEGACY(deco32_palette_dma_w)
+ AM_RANGE(0x138008, 0x13800b) AM_WRITE(deco32_palette_dma_w)
AM_RANGE(0x170000, 0x170007) AM_READ(lockload_gun_mirror_r) /* Not on Dragongun */
AM_RANGE(0x178008, 0x17800f) AM_WRITENOP /* Gun read ACK's */
@@ -899,7 +899,7 @@ static ADDRESS_MAP_START( lockload_map, AS_PROGRAM, 32, dragngun_state )
AM_RANGE(0x220000, 0x221fff) AM_RAM AM_SHARE("spriteram") /* Main spriteram */
AM_RANGE(0x228000, 0x2283ff) AM_RAM //0x10 byte increments only
- AM_RANGE(0x230000, 0x230003) AM_WRITE_LEGACY(dragngun_spriteram_dma_w)
+ AM_RANGE(0x230000, 0x230003) AM_WRITE(dragngun_spriteram_dma_w)
AM_RANGE(0x300000, 0x3fffff) AM_ROM
@@ -908,7 +908,7 @@ static ADDRESS_MAP_START( lockload_map, AS_PROGRAM, 32, dragngun_state )
// AM_RANGE(0x430000, 0x43001f) AM_WRITE(dragngun_lightgun_w)
// AM_RANGE(0x438000, 0x438003) AM_READ(dragngun_lightgun_r)
AM_RANGE(0x440000, 0x440003) AM_READ(dragngun_service_r)
- AM_RANGE(0x500000, 0x500003) AM_WRITE_LEGACY(dragngun_sprite_control_w)
+ AM_RANGE(0x500000, 0x500003) AM_WRITE(dragngun_sprite_control_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( tattass_map, AS_PROGRAM, 32, deco32_state )
@@ -922,14 +922,14 @@ static ADDRESS_MAP_START( tattass_map, AS_PROGRAM, 32, deco32_state )
AM_RANGE(0x150000, 0x150003) AM_WRITE(tattass_control_w) /* Volume port/Eprom/Priority */
AM_RANGE(0x162000, 0x162fff) AM_RAM /* 'Jack' RAM!? */
- AM_RANGE(0x163000, 0x16309f) AM_RAM_WRITE_LEGACY(deco32_ace_ram_w) AM_BASE(m_ace_ram)
+ AM_RANGE(0x163000, 0x16309f) AM_RAM_WRITE(deco32_ace_ram_w) AM_BASE(m_ace_ram)
AM_RANGE(0x164000, 0x164003) AM_WRITENOP /* Palette control BG2/3 ($1a constant) */
AM_RANGE(0x164004, 0x164007) AM_WRITENOP /* Palette control Obj1 ($6 constant) */
AM_RANGE(0x164008, 0x16400b) AM_WRITENOP /* Palette control Obj2 ($5 constant) */
AM_RANGE(0x16400c, 0x16400f) AM_WRITENOP
- AM_RANGE(0x168000, 0x169fff) AM_RAM_WRITE_LEGACY(deco32_buffered_palette_w) AM_SHARE("paletteram")
+ AM_RANGE(0x168000, 0x169fff) AM_RAM_WRITE(deco32_buffered_palette_w) AM_SHARE("paletteram")
AM_RANGE(0x16c000, 0x16c003) AM_WRITENOP
- AM_RANGE(0x16c008, 0x16c00b) AM_WRITE_LEGACY(deco32_palette_dma_w)
+ AM_RANGE(0x16c008, 0x16c00b) AM_WRITE(deco32_palette_dma_w)
AM_RANGE(0x170000, 0x171fff) AM_READWRITE(deco32_spriteram_r, deco32_spriteram_w)
AM_RANGE(0x174000, 0x174003) AM_WRITENOP /* Sprite DMA mode (2) */
@@ -963,14 +963,14 @@ static ADDRESS_MAP_START( nslasher_map, AS_PROGRAM, 32, deco32_state )
AM_RANGE(0x140000, 0x140003) AM_WRITENOP /* Vblank ack */
AM_RANGE(0x150000, 0x150003) AM_WRITE(nslasher_eeprom_w) /* Volume port/Eprom/Priority */
- AM_RANGE(0x163000, 0x16309f) AM_RAM_WRITE_LEGACY(deco32_ace_ram_w) AM_BASE(m_ace_ram) /* 'Ace' RAM!? */
+ AM_RANGE(0x163000, 0x16309f) AM_RAM_WRITE(deco32_ace_ram_w) AM_BASE(m_ace_ram) /* 'Ace' RAM!? */
AM_RANGE(0x164000, 0x164003) AM_WRITENOP /* Palette control BG2/3 ($1a constant) */
AM_RANGE(0x164004, 0x164007) AM_WRITENOP /* Palette control Obj1 ($4 constant) */
AM_RANGE(0x164008, 0x16400b) AM_WRITENOP /* Palette control Obj2 ($6 constant) */
AM_RANGE(0x16400c, 0x16400f) AM_WRITENOP
- AM_RANGE(0x168000, 0x169fff) AM_RAM_WRITE_LEGACY(deco32_buffered_palette_w) AM_SHARE("paletteram")
+ AM_RANGE(0x168000, 0x169fff) AM_RAM_WRITE(deco32_buffered_palette_w) AM_SHARE("paletteram")
AM_RANGE(0x16c000, 0x16c003) AM_WRITENOP
- AM_RANGE(0x16c008, 0x16c00b) AM_WRITE_LEGACY(deco32_palette_dma_w)
+ AM_RANGE(0x16c008, 0x16c00b) AM_WRITE(deco32_palette_dma_w)
AM_RANGE(0x170000, 0x171fff) AM_READWRITE(deco32_spriteram_r, deco32_spriteram_w)
AM_RANGE(0x174000, 0x174003) AM_WRITENOP /* Sprite DMA mode (2) */
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index dbc83fa198a..98680cf8d7f 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -79,12 +79,12 @@ WRITE16_MEMBER(deniam_state::deniam_irq_ack_w)
static ADDRESS_MAP_START( deniam16b_map, AS_PROGRAM, 16, deniam_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
- AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE_LEGACY(deniam_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE_LEGACY(deniam_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(deniam_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(deniam_textram_w) AM_BASE(m_textram)
AM_RANGE(0x440000, 0x4407ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x840000, 0x840fff) AM_WRITE_LEGACY(deniam_palette_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x840000, 0x840fff) AM_WRITE(deniam_palette_w) AM_BASE(m_paletteram)
AM_RANGE(0xc40000, 0xc40001) AM_WRITE(sound_command_w)
- AM_RANGE(0xc40002, 0xc40003) AM_READWRITE_LEGACY(deniam_coinctrl_r, deniam_coinctrl_w)
+ AM_RANGE(0xc40002, 0xc40003) AM_READWRITE(deniam_coinctrl_r, deniam_coinctrl_w)
AM_RANGE(0xc40004, 0xc40005) AM_WRITE(deniam_irq_ack_w)
AM_RANGE(0xc44000, 0xc44001) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc44002, 0xc44003) AM_READ_PORT("P1")
@@ -110,12 +110,12 @@ ADDRESS_MAP_END
/* identical to 16b, but handles sound directly */
static ADDRESS_MAP_START( deniam16c_map, AS_PROGRAM, 16, deniam_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
- AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE_LEGACY(deniam_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE_LEGACY(deniam_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(deniam_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(deniam_textram_w) AM_BASE(m_textram)
AM_RANGE(0x440000, 0x4407ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x840000, 0x840fff) AM_WRITE_LEGACY(deniam_palette_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x840000, 0x840fff) AM_WRITE(deniam_palette_w) AM_BASE(m_paletteram)
AM_RANGE(0xc40000, 0xc40001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0xc40002, 0xc40003) AM_READWRITE_LEGACY(deniam_coinctrl_r, deniam_coinctrl_w)
+ AM_RANGE(0xc40002, 0xc40003) AM_READWRITE(deniam_coinctrl_r, deniam_coinctrl_w)
AM_RANGE(0xc40004, 0xc40005) AM_WRITE(deniam_irq_ack_w)
AM_RANGE(0xc44000, 0xc44001) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc44002, 0xc44003) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c
index 44527b3a087..268faa76fcb 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -263,8 +263,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu1_am, AS_PROGRAM, 8, djboy_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
- AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE_LEGACY(djboy_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(djboy_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(djboy_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(djboy_paletteram_w) AM_BASE(m_paletteram)
AM_RANGE(0xd400, 0xd8ff) AM_RAM
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
@@ -274,8 +274,8 @@ static ADDRESS_MAP_START( cpu1_port_am, AS_IO, 8, djboy_state )
AM_RANGE(0x00, 0x00) AM_WRITE(cpu1_bankswitch_w)
AM_RANGE(0x02, 0x02) AM_WRITE(trigger_nmi_on_sound_cpu2)
AM_RANGE(0x04, 0x04) AM_READWRITE(beast_data_r, beast_data_w)
- AM_RANGE(0x06, 0x06) AM_WRITE_LEGACY(djboy_scrolly_w)
- AM_RANGE(0x08, 0x08) AM_WRITE_LEGACY(djboy_scrollx_w)
+ AM_RANGE(0x06, 0x06) AM_WRITE(djboy_scrolly_w)
+ AM_RANGE(0x08, 0x08) AM_WRITE(djboy_scrollx_w)
AM_RANGE(0x0a, 0x0a) AM_WRITE(trigger_nmi_on_cpu0)
AM_RANGE(0x0c, 0x0c) AM_READ(beast_status_r)
AM_RANGE(0x0e, 0x0e) AM_WRITE(coin_count_w)
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index f938fced703..d4526f6f12a 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -772,21 +772,21 @@ static ADDRESS_MAP_START( dkong_map, AS_PROGRAM, 8, dkong_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x6000, 0x6bff) AM_RAM
AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_SIZE(m_sprite_ram, m_sprite_ram_size) /* sprite set 1 */
- AM_RANGE(0x7400, 0x77ff) AM_RAM_WRITE_LEGACY(dkong_videoram_w) AM_BASE(m_video_ram)
+ AM_RANGE(0x7400, 0x77ff) AM_RAM_WRITE(dkong_videoram_w) AM_BASE(m_video_ram)
AM_RANGE(0x7800, 0x780f) AM_DEVREADWRITE_LEGACY("dma8257", i8257_r, i8257_w) /* P8257 control registers */
AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_LATCH8_WRITE("ls175.3d") /* IN0, sound CPU intf */
- AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_WRITE_LEGACY(radarscp_grid_color_w)/* IN1 */
+ AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_WRITE(radarscp_grid_color_w)/* IN1 */
AM_RANGE(0x7d00, 0x7d00) AM_READ(dkong_in2_r) /* IN2 */
AM_RANGE(0x7d00, 0x7d07) AM_DEVWRITE_LEGACY("ls259.6h", latch8_bit0_w) /* Sound signals */
AM_RANGE(0x7d80, 0x7d80) AM_READ_PORT("DSW0") AM_WRITE_LEGACY(dkong_audio_irq_w) /* DSW0 */
- AM_RANGE(0x7d81, 0x7d81) AM_WRITE_LEGACY(radarscp_grid_enable_w)
- AM_RANGE(0x7d82, 0x7d82) AM_WRITE_LEGACY(dkong_flipscreen_w)
- AM_RANGE(0x7d83, 0x7d83) AM_WRITE_LEGACY(dkong_spritebank_w) /* 2 PSL Signal */
+ AM_RANGE(0x7d81, 0x7d81) AM_WRITE(radarscp_grid_enable_w)
+ AM_RANGE(0x7d82, 0x7d82) AM_WRITE(dkong_flipscreen_w)
+ AM_RANGE(0x7d83, 0x7d83) AM_WRITE(dkong_spritebank_w) /* 2 PSL Signal */
AM_RANGE(0x7d84, 0x7d84) AM_WRITE(nmi_mask_w)
AM_RANGE(0x7d85, 0x7d85) AM_DEVWRITE_LEGACY("dma8257", p8257_drq_w) /* P8257 ==> /DRQ0 /DRQ1 */
- AM_RANGE(0x7d86, 0x7d87) AM_WRITE_LEGACY(dkong_palettebank_w)
+ AM_RANGE(0x7d86, 0x7d87) AM_WRITE(dkong_palettebank_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( dkongjr_map, AS_PROGRAM, 8, dkong_state )
@@ -794,23 +794,23 @@ static ADDRESS_MAP_START( dkongjr_map, AS_PROGRAM, 8, dkong_state )
AM_RANGE(0x6000, 0x6bff) AM_RAM
AM_RANGE(0x6c00, 0x6fff) AM_RAM /* DK3 bootleg only */
AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_SIZE(m_sprite_ram, m_sprite_ram_size) /* sprite set 1 */
- AM_RANGE(0x7400, 0x77ff) AM_RAM_WRITE_LEGACY(dkong_videoram_w) AM_BASE(m_video_ram)
+ AM_RANGE(0x7400, 0x77ff) AM_RAM_WRITE(dkong_videoram_w) AM_BASE(m_video_ram)
AM_RANGE(0x7800, 0x780f) AM_DEVREADWRITE_LEGACY("dma8257", i8257_r, i8257_w) /* P8257 control registers */
AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_LATCH8_WRITE("ls174.3d") /* IN0, sound interface */
- AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_WRITE_LEGACY(dkongjr_gfxbank_w)
+ AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_WRITE(dkongjr_gfxbank_w)
AM_RANGE(0x7c80, 0x7c87) AM_DEVWRITE_LEGACY("ls259.4h", latch8_bit0_w) /* latch for sound and signals above */
AM_RANGE(0x7d00, 0x7d00) AM_READ(dkongjr_in2_r) /* IN2 */
AM_RANGE(0x7d00, 0x7d07) AM_DEVWRITE_LEGACY("ls259.6h",latch8_bit0_w) /* Sound addrs */
AM_RANGE(0x7d80, 0x7d80) AM_READ_PORT("DSW0") AM_WRITE_LEGACY(dkong_audio_irq_w) /* DSW0 */
- AM_RANGE(0x7d82, 0x7d82) AM_WRITE_LEGACY(dkong_flipscreen_w)
- AM_RANGE(0x7d83, 0x7d83) AM_WRITE_LEGACY(dkong_spritebank_w) /* 2 PSL Signal */
+ AM_RANGE(0x7d82, 0x7d82) AM_WRITE(dkong_flipscreen_w)
+ AM_RANGE(0x7d83, 0x7d83) AM_WRITE(dkong_spritebank_w) /* 2 PSL Signal */
AM_RANGE(0x7d84, 0x7d84) AM_WRITE(nmi_mask_w)
AM_RANGE(0x7d85, 0x7d85) AM_DEVWRITE_LEGACY("dma8257", p8257_drq_w) /* P8257 ==> /DRQ0 /DRQ1 */
- AM_RANGE(0x7d86, 0x7d87) AM_WRITE_LEGACY(dkong_palettebank_w)
+ AM_RANGE(0x7d86, 0x7d87) AM_WRITE(dkong_palettebank_w)
AM_RANGE(0x7d80, 0x7d87) AM_DEVWRITE_LEGACY("ls259.5h", latch8_bit0_w) /* latch for sound and signals above*/
AM_RANGE(0x8000, 0x9fff) AM_ROM /* bootleg DKjr only */
@@ -823,18 +823,18 @@ static ADDRESS_MAP_START( dkong3_map, AS_PROGRAM, 8, dkong_state )
AM_RANGE(0x6000, 0x67ff) AM_RAM
AM_RANGE(0x6800, 0x6fff) AM_RAM
AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_SIZE(m_sprite_ram, m_sprite_ram_size) /* sprite set 1 */
- AM_RANGE(0x7400, 0x77ff) AM_RAM_WRITE_LEGACY(dkong_videoram_w) AM_BASE(m_video_ram)
+ AM_RANGE(0x7400, 0x77ff) AM_RAM_WRITE(dkong_videoram_w) AM_BASE(m_video_ram)
AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_LATCH8_WRITE("latch1")
AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_LATCH8_WRITE("latch2")
AM_RANGE(0x7d00, 0x7d00) AM_READ_PORT("DSW0") AM_LATCH8_WRITE("latch3")
AM_RANGE(0x7d80, 0x7d80) AM_READ_PORT("DSW1") AM_WRITE(dkong3_2a03_reset_w)
AM_RANGE(0x7e80, 0x7e80) AM_WRITE(dkong3_coin_counter_w)
- AM_RANGE(0x7e81, 0x7e81) AM_WRITE_LEGACY(dkong3_gfxbank_w)
- AM_RANGE(0x7e82, 0x7e82) AM_WRITE_LEGACY(dkong_flipscreen_w)
- AM_RANGE(0x7e83, 0x7e83) AM_WRITE_LEGACY(dkong_spritebank_w) /* 2 PSL Signal */
+ AM_RANGE(0x7e81, 0x7e81) AM_WRITE(dkong3_gfxbank_w)
+ AM_RANGE(0x7e82, 0x7e82) AM_WRITE(dkong_flipscreen_w)
+ AM_RANGE(0x7e83, 0x7e83) AM_WRITE(dkong_spritebank_w) /* 2 PSL Signal */
AM_RANGE(0x7e84, 0x7e84) AM_WRITE(nmi_mask_w)
AM_RANGE(0x7e85, 0x7e85) AM_DEVWRITE_LEGACY("z80dma", dkong_z80dma_rdy_w) /* ==> DMA Chip */
- AM_RANGE(0x7e86, 0x7e87) AM_WRITE_LEGACY(dkong_palettebank_w)
+ AM_RANGE(0x7e86, 0x7e87) AM_WRITE(dkong_palettebank_w)
AM_RANGE(0x8000, 0x9fff) AM_ROM /* DK3 and bootleg DKjr only */
ADDRESS_MAP_END
@@ -860,13 +860,13 @@ static ADDRESS_MAP_START( s2650_map, AS_PROGRAM, 8, dkong_state )
AM_RANGE(0x1500, 0x1500) AM_MIRROR(0x007f) AM_READ(dkong_in2_r) /* IN2 */
AM_RANGE(0x1500, 0x1507) AM_DEVWRITE_LEGACY("ls259.6h", latch8_bit0_w) /* Sound signals */
AM_RANGE(0x1580, 0x1580) AM_READ_PORT("DSW0") AM_WRITE_LEGACY(dkong_audio_irq_w) /* DSW0 */
- AM_RANGE(0x1582, 0x1582) AM_WRITE_LEGACY(dkong_flipscreen_w)
- AM_RANGE(0x1583, 0x1583) AM_WRITE_LEGACY(dkong_spritebank_w) /* 2 PSL Signal */
+ AM_RANGE(0x1582, 0x1582) AM_WRITE(dkong_flipscreen_w)
+ AM_RANGE(0x1583, 0x1583) AM_WRITE(dkong_spritebank_w) /* 2 PSL Signal */
AM_RANGE(0x1584, 0x1584) AM_NOP /* Possibly still interrupt enable */
AM_RANGE(0x1585, 0x1585) AM_DEVWRITE_LEGACY("dma8257", p8257_drq_w) /* P8257 ==> /DRQ0 /DRQ1 */
- AM_RANGE(0x1586, 0x1587) AM_WRITE_LEGACY(dkong_palettebank_w)
+ AM_RANGE(0x1586, 0x1587) AM_WRITE(dkong_palettebank_w)
AM_RANGE(0x1600, 0x17ff) AM_RAM /* 0x6400 spriteram location */
- AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE_LEGACY(dkong_videoram_w) AM_BASE(m_video_ram) /* 0x7400 */
+ AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(dkong_videoram_w) AM_BASE(m_video_ram) /* 0x7400 */
AM_RANGE(0x1C00, 0x1f7f) AM_RAM /* 0x6000 */
AM_RANGE(0x1f80, 0x1f8f) AM_DEVREADWRITE_LEGACY("dma8257", i8257_r, i8257_w) /* P8257 control registers */
/* 0x6800 not remapped */
diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c
index 09b779f91eb..6334b6e269d 100644
--- a/src/mame/drivers/docastle.c
+++ b/src/mame/drivers/docastle.c
@@ -212,24 +212,24 @@ static ADDRESS_MAP_START( docastle_map, AS_PROGRAM, 8, docastle_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x97ff) AM_RAM
AM_RANGE(0x9800, 0x99ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xa000, 0xa008) AM_READWRITE_LEGACY(docastle_shared0_r, docastle_shared1_w)
+ AM_RANGE(0xa000, 0xa008) AM_READWRITE(docastle_shared0_r, docastle_shared1_w)
AM_RANGE(0xa800, 0xa800) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0xb000, 0xb3ff) AM_MIRROR(0x0800) AM_RAM_WRITE_LEGACY(docastle_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xb400, 0xb7ff) AM_MIRROR(0x0800) AM_RAM_WRITE_LEGACY(docastle_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xe000, 0xe000) AM_WRITE_LEGACY(docastle_nmitrigger_w)
+ AM_RANGE(0xb000, 0xb3ff) AM_MIRROR(0x0800) AM_RAM_WRITE(docastle_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xb400, 0xb7ff) AM_MIRROR(0x0800) AM_RAM_WRITE(docastle_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xe000, 0xe000) AM_WRITE(docastle_nmitrigger_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( docastle_map2, AS_PROGRAM, 8, docastle_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0xa000, 0xa008) AM_READWRITE_LEGACY(docastle_shared1_r, docastle_shared0_w)
+ AM_RANGE(0xa000, 0xa008) AM_READWRITE(docastle_shared1_r, docastle_shared0_w)
AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x0080) AM_READ_PORT("DSW2")
AM_RANGE(0xc002, 0xc002) AM_MIRROR(0x0080) AM_READ_PORT("DSW1")
AM_RANGE(0xc003, 0xc003) AM_MIRROR(0x0080) AM_READ_PORT("JOYS")
- AM_RANGE(0xc004, 0xc004) AM_READWRITE_LEGACY(docastle_flipscreen_off_r, docastle_flipscreen_off_w)
+ AM_RANGE(0xc004, 0xc004) AM_READWRITE(docastle_flipscreen_off_r, docastle_flipscreen_off_w)
AM_RANGE(0xc005, 0xc005) AM_MIRROR(0x0080) AM_READ_PORT("BUTTONS")
AM_RANGE(0xc007, 0xc007) AM_MIRROR(0x0080) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xc084, 0xc084) AM_READWRITE_LEGACY(docastle_flipscreen_on_r, docastle_flipscreen_on_w)
+ AM_RANGE(0xc084, 0xc084) AM_READWRITE(docastle_flipscreen_on_r, docastle_flipscreen_on_w)
AM_RANGE(0xe000, 0xe000) AM_DEVWRITE_LEGACY("sn1", sn76496_w)
AM_RANGE(0xe400, 0xe400) AM_DEVWRITE_LEGACY("sn2", sn76496_w)
AM_RANGE(0xe800, 0xe800) AM_DEVWRITE_LEGACY("sn3", sn76496_w)
@@ -239,7 +239,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( docastle_map3, AS_PROGRAM, 8, docastle_state )
AM_RANGE(0x0000, 0x00ff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x8000, 0x8008) AM_READ_LEGACY(docastle_shared1_r) // ???
+ AM_RANGE(0x8000, 0x8008) AM_READ(docastle_shared1_r) // ???
AM_RANGE(0xc003, 0xc003) AM_NOP // EP according to schematics
AM_RANGE(0xc432, 0xc435) AM_NOP // ???
ADDRESS_MAP_END
@@ -256,11 +256,11 @@ static ADDRESS_MAP_START( dorunrun_map, AS_PROGRAM, 8, docastle_state )
AM_RANGE(0x2000, 0x37ff) AM_RAM
AM_RANGE(0x3800, 0x39ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x4000, 0x9fff) AM_ROM
- AM_RANGE(0xa000, 0xa008) AM_READWRITE_LEGACY(docastle_shared0_r, docastle_shared1_w)
+ AM_RANGE(0xa000, 0xa008) AM_READWRITE(docastle_shared0_r, docastle_shared1_w)
AM_RANGE(0xa800, 0xa800) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0xb000, 0xb3ff) AM_RAM_WRITE_LEGACY(docastle_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xb400, 0xb7ff) AM_RAM_WRITE_LEGACY(docastle_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xb800, 0xb800) AM_WRITE_LEGACY(docastle_nmitrigger_w)
+ AM_RANGE(0xb000, 0xb3ff) AM_RAM_WRITE(docastle_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xb400, 0xb7ff) AM_RAM_WRITE(docastle_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xb800, 0xb800) AM_WRITE(docastle_nmitrigger_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( dorunrun_map2, AS_PROGRAM, 8, docastle_state )
@@ -273,11 +273,11 @@ static ADDRESS_MAP_START( dorunrun_map2, AS_PROGRAM, 8, docastle_state )
AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x0080) AM_READ_PORT("DSW2")
AM_RANGE(0xc002, 0xc002) AM_MIRROR(0x0080) AM_READ_PORT("DSW1")
AM_RANGE(0xc003, 0xc003) AM_MIRROR(0x0080) AM_READ_PORT("JOYS")
- AM_RANGE(0xc004, 0xc004) AM_READWRITE_LEGACY(docastle_flipscreen_off_r, docastle_flipscreen_off_w)
+ AM_RANGE(0xc004, 0xc004) AM_READWRITE(docastle_flipscreen_off_r, docastle_flipscreen_off_w)
AM_RANGE(0xc005, 0xc005) AM_MIRROR(0x0080) AM_READ_PORT("BUTTONS")
AM_RANGE(0xc007, 0xc007) AM_MIRROR(0x0080) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xc084, 0xc084) AM_READWRITE_LEGACY(docastle_flipscreen_on_r, docastle_flipscreen_on_w)
- AM_RANGE(0xe000, 0xe008) AM_READWRITE_LEGACY(docastle_shared1_r, docastle_shared0_w)
+ AM_RANGE(0xc084, 0xc084) AM_READWRITE(docastle_flipscreen_on_r, docastle_flipscreen_on_w)
+ AM_RANGE(0xe000, 0xe008) AM_READWRITE(docastle_shared1_r, docastle_shared0_w)
ADDRESS_MAP_END
@@ -286,25 +286,25 @@ static ADDRESS_MAP_START( idsoccer_map, AS_PROGRAM, 8, docastle_state )
AM_RANGE(0x4000, 0x57ff) AM_RAM
AM_RANGE(0x5800, 0x59ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x6000, 0x9fff) AM_ROM
- AM_RANGE(0xa000, 0xa008) AM_READWRITE_LEGACY(docastle_shared0_r, docastle_shared1_w)
+ AM_RANGE(0xa000, 0xa008) AM_READWRITE(docastle_shared0_r, docastle_shared1_w)
AM_RANGE(0xa800, 0xa800) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0xb000, 0xb3ff) AM_MIRROR(0x0800) AM_RAM_WRITE_LEGACY(docastle_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xb400, 0xb7ff) AM_MIRROR(0x0800) AM_RAM_WRITE_LEGACY(docastle_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xb000, 0xb3ff) AM_MIRROR(0x0800) AM_RAM_WRITE(docastle_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xb400, 0xb7ff) AM_MIRROR(0x0800) AM_RAM_WRITE(docastle_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xc000, 0xc000) AM_DEVREADWRITE_LEGACY("msm", idsoccer_adpcm_status_r, idsoccer_adpcm_w)
- AM_RANGE(0xe000, 0xe000) AM_WRITE_LEGACY(docastle_nmitrigger_w)
+ AM_RANGE(0xe000, 0xe000) AM_WRITE(docastle_nmitrigger_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( idsoccer_map2, AS_PROGRAM, 8, docastle_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0xa000, 0xa008) AM_READWRITE_LEGACY(docastle_shared1_r, docastle_shared0_w)
+ AM_RANGE(0xa000, 0xa008) AM_READWRITE(docastle_shared1_r, docastle_shared0_w)
AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x0080) AM_READ_PORT("DSW2")
AM_RANGE(0xc002, 0xc002) AM_MIRROR(0x0080) AM_READ_PORT("DSW1")
AM_RANGE(0xc003, 0xc003) AM_MIRROR(0x0080) AM_READ_PORT("JOYS")
- AM_RANGE(0xc004, 0xc004) AM_READ_PORT("JOYS_RIGHT") AM_WRITE_LEGACY(docastle_flipscreen_off_w)
+ AM_RANGE(0xc004, 0xc004) AM_READ_PORT("JOYS_RIGHT") AM_WRITE(docastle_flipscreen_off_w)
AM_RANGE(0xc005, 0xc005) AM_MIRROR(0x0080) AM_READ_PORT("BUTTONS")
AM_RANGE(0xc007, 0xc007) AM_MIRROR(0x0080) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xc084, 0xc084) AM_READ_PORT("JOYS_RIGHT") AM_WRITE_LEGACY(docastle_flipscreen_on_w)
+ AM_RANGE(0xc084, 0xc084) AM_READ_PORT("JOYS_RIGHT") AM_WRITE(docastle_flipscreen_on_w)
AM_RANGE(0xe000, 0xe000) AM_DEVWRITE_LEGACY("sn1", sn76496_w)
AM_RANGE(0xe400, 0xe400) AM_DEVWRITE_LEGACY("sn2", sn76496_w)
AM_RANGE(0xe800, 0xe800) AM_DEVWRITE_LEGACY("sn3", sn76496_w)
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index 4ffdd930db3..e56654cd710 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -60,19 +60,19 @@ WRITE8_MEMBER(dogfgt_state::dogfgt_soundcontrol_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, dogfgt_state )
AM_RANGE(0x0000, 0x07ff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(m_sharedram)
AM_RANGE(0x0f80, 0x0fdf) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x1000, 0x17ff) AM_WRITE_LEGACY(dogfgt_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x1000, 0x17ff) AM_WRITE(dogfgt_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0x1800, 0x1800) AM_READ_PORT("P1")
- AM_RANGE(0x1800, 0x1800) AM_WRITE_LEGACY(dogfgt_1800_w) /* text color, flip screen & coin counters */
+ AM_RANGE(0x1800, 0x1800) AM_WRITE(dogfgt_1800_w) /* text color, flip screen & coin counters */
AM_RANGE(0x1810, 0x1810) AM_READ_PORT("P2")
AM_RANGE(0x1810, 0x1810) AM_WRITE(subirqtrigger_w)
AM_RANGE(0x1820, 0x1820) AM_READ_PORT("DSW1")
- AM_RANGE(0x1820, 0x1823) AM_WRITE_LEGACY(dogfgt_scroll_w)
- AM_RANGE(0x1824, 0x1824) AM_WRITE_LEGACY(dogfgt_plane_select_w)
+ AM_RANGE(0x1820, 0x1823) AM_WRITE(dogfgt_scroll_w)
+ AM_RANGE(0x1824, 0x1824) AM_WRITE(dogfgt_plane_select_w)
AM_RANGE(0x1830, 0x1830) AM_READ_PORT("DSW2")
AM_RANGE(0x1830, 0x1830) AM_WRITE(dogfgt_soundlatch_w)
AM_RANGE(0x1840, 0x1840) AM_WRITE(dogfgt_soundcontrol_w)
AM_RANGE(0x1870, 0x187f) AM_WRITE(paletteram_BBGGGRRR_w) AM_SHARE("paletteram")
- AM_RANGE(0x2000, 0x3fff) AM_READWRITE_LEGACY(dogfgt_bitmapram_r, dogfgt_bitmapram_w)
+ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(dogfgt_bitmapram_r, dogfgt_bitmapram_w)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index bf94a7295a1..f3bc364a11a 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -118,10 +118,10 @@ static MACHINE_RESET( sound_ym2203 )
static ADDRESS_MAP_START( lastday_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xc007) AM_WRITE_LEGACY(dooyong_bgscroll8_w)
- AM_RANGE(0xc008, 0xc00f) AM_WRITE_LEGACY(dooyong_fgscroll8_w)
+ AM_RANGE(0xc000, 0xc007) AM_WRITE(dooyong_bgscroll8_w)
+ AM_RANGE(0xc008, 0xc00f) AM_WRITE(dooyong_fgscroll8_w)
AM_RANGE(0xc010, 0xc010) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xc010, 0xc010) AM_WRITE_LEGACY(lastday_ctrl_w) /* coin counter, flip screen */
+ AM_RANGE(0xc010, 0xc010) AM_WRITE(lastday_ctrl_w) /* coin counter, flip screen */
AM_RANGE(0xc011, 0xc011) AM_READ_PORT("P1")
AM_RANGE(0xc011, 0xc011) AM_WRITE(lastday_bankswitch_w)
AM_RANGE(0xc012, 0xc012) AM_READ_PORT("P2")
@@ -129,7 +129,7 @@ static ADDRESS_MAP_START( lastday_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0xc013, 0xc013) AM_READ_PORT("DSWA")
AM_RANGE(0xc014, 0xc014) AM_READ_PORT("DSWB")
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_SHARE("paletteram")
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
AM_RANGE(0xe000, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("spriteram")
ADDRESS_MAP_END
@@ -139,16 +139,16 @@ static ADDRESS_MAP_START( pollux_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xdfff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE_LEGACY(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
AM_RANGE(0xf000, 0xf000) AM_READ_PORT("DSWA") AM_WRITE(lastday_bankswitch_w)
AM_RANGE(0xf001, 0xf001) AM_READ_PORT("DSWB")
AM_RANGE(0xf002, 0xf002) AM_READ_PORT("P1")
AM_RANGE(0xf003, 0xf003) AM_READ_PORT("P2")
AM_RANGE(0xf004, 0xf004) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xf008, 0xf008) AM_WRITE_LEGACY(pollux_ctrl_w) /* coin counter, flip screen */
+ AM_RANGE(0xf008, 0xf008) AM_WRITE(pollux_ctrl_w) /* coin counter, flip screen */
AM_RANGE(0xf010, 0xf010) AM_WRITE(soundlatch_w)
- AM_RANGE(0xf018, 0xf01f) AM_WRITE_LEGACY(dooyong_bgscroll8_w)
- AM_RANGE(0xf020, 0xf027) AM_WRITE_LEGACY(dooyong_fgscroll8_w)
+ AM_RANGE(0xf018, 0xf01f) AM_WRITE(dooyong_bgscroll8_w)
+ AM_RANGE(0xf020, 0xf027) AM_WRITE(dooyong_fgscroll8_w)
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
@@ -157,17 +157,17 @@ static ADDRESS_MAP_START( gulfstrm_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xdfff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE_LEGACY(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
AM_RANGE(0xf000, 0xf000) AM_READ_PORT("DSWA")
AM_RANGE(0xf000, 0xf000) AM_WRITE(lastday_bankswitch_w)
AM_RANGE(0xf001, 0xf001) AM_READ_PORT("DSWB")
AM_RANGE(0xf002, 0xf002) AM_READ_PORT("P2")
AM_RANGE(0xf003, 0xf003) AM_READ_PORT("P1")
AM_RANGE(0xf004, 0xf004) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xf008, 0xf008) AM_WRITE_LEGACY(pollux_ctrl_w) /* coin counter, flip screen */
+ AM_RANGE(0xf008, 0xf008) AM_WRITE(pollux_ctrl_w) /* coin counter, flip screen */
AM_RANGE(0xf010, 0xf010) AM_WRITE(soundlatch_w)
- AM_RANGE(0xf018, 0xf01f) AM_WRITE_LEGACY(dooyong_bgscroll8_w)
- AM_RANGE(0xf020, 0xf027) AM_WRITE_LEGACY(dooyong_fgscroll8_w)
+ AM_RANGE(0xf018, 0xf01f) AM_WRITE(dooyong_bgscroll8_w)
+ AM_RANGE(0xf020, 0xf027) AM_WRITE(dooyong_fgscroll8_w)
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
@@ -182,11 +182,11 @@ static ADDRESS_MAP_START( bluehawk_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc008, 0xc008) AM_WRITE(lastday_bankswitch_w)
AM_RANGE(0xc010, 0xc010) AM_WRITE(soundlatch_w)
- AM_RANGE(0xc018, 0xc01f) AM_WRITE_LEGACY(dooyong_fg2scroll8_w)
- AM_RANGE(0xc040, 0xc047) AM_WRITE_LEGACY(dooyong_bgscroll8_w)
- AM_RANGE(0xc048, 0xc04f) AM_WRITE_LEGACY(dooyong_fgscroll8_w)
+ AM_RANGE(0xc018, 0xc01f) AM_WRITE(dooyong_fg2scroll8_w)
+ AM_RANGE(0xc040, 0xc047) AM_WRITE(dooyong_bgscroll8_w)
+ AM_RANGE(0xc048, 0xc04f) AM_WRITE(dooyong_fgscroll8_w)
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -202,12 +202,12 @@ static ADDRESS_MAP_START( flytiger_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0xe004, 0xe004) AM_READ_PORT("SYSTEM")
AM_RANGE(0xe006, 0xe006) AM_READ_PORT("DSWA")
AM_RANGE(0xe008, 0xe008) AM_READ_PORT("DSWB")
- AM_RANGE(0xe010, 0xe010) AM_WRITE_LEGACY(flytiger_ctrl_w) /* coin counter, flip screen */
+ AM_RANGE(0xe010, 0xe010) AM_WRITE(flytiger_ctrl_w) /* coin counter, flip screen */
AM_RANGE(0xe020, 0xe020) AM_WRITE(soundlatch_w)
- AM_RANGE(0xe030, 0xe037) AM_WRITE_LEGACY(dooyong_bgscroll8_w)
- AM_RANGE(0xe040, 0xe047) AM_WRITE_LEGACY(dooyong_fgscroll8_w)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(paletteram_flytiger_w) AM_BASE(m_paletteram_flytiger)
- AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE_LEGACY(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xe030, 0xe037) AM_WRITE(dooyong_bgscroll8_w)
+ AM_RANGE(0xe040, 0xe047) AM_WRITE(dooyong_fgscroll8_w)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_flytiger_w) AM_BASE(m_paletteram_flytiger)
+ AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( primella_map, AS_PROGRAM, 8, dooyong_state )
@@ -215,17 +215,17 @@ static ADDRESS_MAP_START( primella_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd3ff) AM_RAM /* what is this? looks like a palette? scratchpad RAM maybe? */
- AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE_LEGACY(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
AM_RANGE(0xf000, 0xf7ff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("DSWA")
- AM_RANGE(0xf800, 0xf800) AM_WRITE_LEGACY(primella_ctrl_w) /* bank switch, flip screen etc */
+ AM_RANGE(0xf800, 0xf800) AM_WRITE(primella_ctrl_w) /* bank switch, flip screen etc */
AM_RANGE(0xf810, 0xf810) AM_READ_PORT("DSWB")
AM_RANGE(0xf810, 0xf810) AM_WRITE(soundlatch_w)
AM_RANGE(0xf820, 0xf820) AM_READ_PORT("P1")
AM_RANGE(0xf830, 0xf830) AM_READ_PORT("P2")
AM_RANGE(0xf840, 0xf840) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xfc00, 0xfc07) AM_WRITE_LEGACY(dooyong_bgscroll8_w)
- AM_RANGE(0xfc08, 0xfc0f) AM_WRITE_LEGACY(dooyong_fgscroll8_w)
+ AM_RANGE(0xfc00, 0xfc07) AM_WRITE(dooyong_bgscroll8_w)
+ AM_RANGE(0xfc08, 0xfc0f) AM_WRITE(dooyong_fgscroll8_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( rshark_map, AS_PROGRAM, 16, dooyong_state )
@@ -237,13 +237,13 @@ static ADDRESS_MAP_START( rshark_map, AS_PROGRAM, 16, dooyong_state )
AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("DSW")
AM_RANGE(0x0c0004, 0x0c0005) AM_READ_PORT("P1_P2")
AM_RANGE(0x0c0006, 0x0c0007) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x0c4000, 0x0c400f) AM_WRITE_LEGACY(dooyong_bgscroll16_w)
- AM_RANGE(0x0c4010, 0x0c401f) AM_WRITE_LEGACY(dooyong_bg2scroll16_w)
+ AM_RANGE(0x0c4000, 0x0c400f) AM_WRITE(dooyong_bgscroll16_w)
+ AM_RANGE(0x0c4010, 0x0c401f) AM_WRITE(dooyong_bg2scroll16_w)
AM_RANGE(0x0c8000, 0x0c8fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0c0012, 0x0c0013) AM_WRITE(soundlatch_word_w)
- AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE_LEGACY(rshark_ctrl_w) /* flip screen + unknown stuff */
- AM_RANGE(0x0cc000, 0x0cc00f) AM_WRITE_LEGACY(dooyong_fgscroll16_w)
- AM_RANGE(0x0cc010, 0x0cc01f) AM_WRITE_LEGACY(dooyong_fg2scroll16_w)
+ AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(rshark_ctrl_w) /* flip screen + unknown stuff */
+ AM_RANGE(0x0cc000, 0x0cc00f) AM_WRITE(dooyong_fgscroll16_w)
+ AM_RANGE(0x0cc010, 0x0cc01f) AM_WRITE(dooyong_fg2scroll16_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( superx_map, AS_PROGRAM, 16, dooyong_state )
@@ -255,13 +255,13 @@ static ADDRESS_MAP_START( superx_map, AS_PROGRAM, 16, dooyong_state )
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("DSW")
AM_RANGE(0x080004, 0x080005) AM_READ_PORT("P1_P2")
AM_RANGE(0x080006, 0x080007) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x084000, 0x08400f) AM_WRITE_LEGACY(dooyong_bgscroll16_w)
- AM_RANGE(0x084010, 0x08401f) AM_WRITE_LEGACY(dooyong_bg2scroll16_w)
+ AM_RANGE(0x084000, 0x08400f) AM_WRITE(dooyong_bgscroll16_w)
+ AM_RANGE(0x084010, 0x08401f) AM_WRITE(dooyong_bg2scroll16_w)
AM_RANGE(0x088000, 0x088fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x080012, 0x080013) AM_WRITE(soundlatch_word_w)
- AM_RANGE(0x080014, 0x080015) AM_WRITE_LEGACY(rshark_ctrl_w) /* flip screen + unknown stuff */
- AM_RANGE(0x08c000, 0x08c00f) AM_WRITE_LEGACY(dooyong_fgscroll16_w)
- AM_RANGE(0x08c010, 0x08c01f) AM_WRITE_LEGACY(dooyong_fg2scroll16_w)
+ AM_RANGE(0x080014, 0x080015) AM_WRITE(rshark_ctrl_w) /* flip screen + unknown stuff */
+ AM_RANGE(0x08c000, 0x08c00f) AM_WRITE(dooyong_fgscroll16_w)
+ AM_RANGE(0x08c010, 0x08c01f) AM_WRITE(dooyong_fg2scroll16_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( popbingo_map, AS_PROGRAM, 16, dooyong_state )
@@ -274,13 +274,13 @@ static ADDRESS_MAP_START( popbingo_map, AS_PROGRAM, 16, dooyong_state )
AM_RANGE(0x0c0004, 0x0c0005) AM_READ_PORT("P1_P2")
AM_RANGE(0x0c0006, 0x0c0007) AM_READ_PORT("SYSTEM")
AM_RANGE(0x0c0012, 0x0c0013) AM_WRITE(soundlatch_word_w)
- AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE_LEGACY(rshark_ctrl_w)
+ AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(rshark_ctrl_w)
AM_RANGE(0x0c0018, 0x0c001b) AM_WRITENOP // ?
- AM_RANGE(0x0c4000, 0x0c400f) AM_WRITE_LEGACY(dooyong_bgscroll16_w)
- AM_RANGE(0x0c4010, 0x0c401f) AM_WRITE_LEGACY(dooyong_bg2scroll16_w) // not used atm
+ AM_RANGE(0x0c4000, 0x0c400f) AM_WRITE(dooyong_bgscroll16_w)
+ AM_RANGE(0x0c4010, 0x0c401f) AM_WRITE(dooyong_bg2scroll16_w) // not used atm
AM_RANGE(0x0c8000, 0x0c8fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x0cc000, 0x0cc00f) AM_WRITE_LEGACY(dooyong_fgscroll16_w) // not used atm
- AM_RANGE(0x0cc010, 0x0cc01f) AM_WRITE_LEGACY(dooyong_fg2scroll16_w) // not used atm
+ AM_RANGE(0x0cc000, 0x0cc00f) AM_WRITE(dooyong_fgscroll16_w) // not used atm
+ AM_RANGE(0x0cc010, 0x0cc01f) AM_WRITE(dooyong_fg2scroll16_w) // not used atm
AM_RANGE(0x0dc000, 0x0dc01f) AM_RAM // registers of some kind?
ADDRESS_MAP_END
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index 6a69e832b91..10a11d3c88e 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -78,8 +78,8 @@ READ8_MEMBER(drgnmst_state::drgnmst_snd_command_r)
switch (m_oki_control & 0x1f)
{
- case 0x12: data = (m_oki_2->read(*&space, 0) & 0x0f); break;
- case 0x16: data = (m_oki_1->read(*&space, 0) & 0x0f); break;
+ case 0x12: data = (m_oki_2->read(space, 0) & 0x0f); break;
+ case 0x16: data = (m_oki_1->read(space, 0) & 0x0f); break;
case 0x0b:
case 0x0f: data = m_snd_command; break;
default: break;
@@ -164,12 +164,12 @@ WRITE8_MEMBER(drgnmst_state::drgnmst_snd_control_w)
case 0x11:
// logerror("Writing %02x to OKI1", m_oki_command);
// logerror(", PortC=%02x, Code=%02x, Bank0=%01x, Bank1=%01x\n", m_oki_control, m_snd_command, m_oki0_bank, m_oki1_bank);
- m_oki_2->write(*&space, 0, m_oki_command);
+ m_oki_2->write(space, 0, m_oki_command);
break;
case 0x15:
// logerror("Writing %02x to OKI0", m_oki_command);
// logerror(", PortC=%02x, Code=%02x, Bank0=%01x, Bank1=%01x\n", m_oki_control, m_snd_command, m_oki0_bank, m_oki1_bank);
- m_oki_1->write(*&space, 0, m_oki_command);
+ m_oki_1->write(space, 0, m_oki_command);
break;
default: break;
}
@@ -200,9 +200,9 @@ static ADDRESS_MAP_START( drgnmst_main_map, AS_PROGRAM, 16, drgnmst_state )
AM_RANGE(0x800188, 0x800189) AM_WRITE(drgnmst_snd_flag_w)
AM_RANGE(0x8001e0, 0x8001e1) AM_WRITENOP
AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x904000, 0x907fff) AM_RAM_WRITE_LEGACY(drgnmst_md_videoram_w) AM_BASE(m_md_videoram)
- AM_RANGE(0x908000, 0x90bfff) AM_RAM_WRITE_LEGACY(drgnmst_bg_videoram_w) AM_BASE(m_bg_videoram)
- AM_RANGE(0x90c000, 0x90ffff) AM_RAM_WRITE_LEGACY(drgnmst_fg_videoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0x904000, 0x907fff) AM_RAM_WRITE(drgnmst_md_videoram_w) AM_BASE(m_md_videoram)
+ AM_RANGE(0x908000, 0x90bfff) AM_RAM_WRITE(drgnmst_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x90c000, 0x90ffff) AM_RAM_WRITE(drgnmst_fg_videoram_w) AM_BASE(m_fg_videoram)
AM_RANGE(0x920000, 0x923fff) AM_RAM AM_BASE(m_rowscrollram) // rowscroll ram
AM_RANGE(0x930000, 0x9307ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xff0000, 0xffffff) AM_RAM
diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c
index 57472b8a3db..e081d820bc1 100644
--- a/src/mame/drivers/dribling.c
+++ b/src/mame/drivers/dribling.c
@@ -215,7 +215,7 @@ static ADDRESS_MAP_START( dribling_map, AS_PROGRAM, 8, dribling_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0x4000, 0x7fff) AM_ROM
- AM_RANGE(0xc000, 0xdfff) AM_RAM_WRITE_LEGACY(dribling_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xc000, 0xdfff) AM_RAM_WRITE(dribling_colorram_w) AM_BASE(m_colorram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c
index 287630e9cf8..6b8ad2c15fe 100644
--- a/src/mame/drivers/drmicro.c
+++ b/src/mame/drivers/drmicro.c
@@ -78,7 +78,7 @@ WRITE8_MEMBER(drmicro_state::pcm_set_w)
static ADDRESS_MAP_START( drmicro_map, AS_PROGRAM, 8, drmicro_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE_LEGACY(drmicro_videoram_w)
+ AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(drmicro_videoram_w)
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index a90858e93c7..0ebb1280513 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -291,7 +291,7 @@ WRITE8_MEMBER(dynax_state::hnoridur_rombank_w)
WRITE8_MEMBER(dynax_state::hnoridur_palbank_w)
{
m_palbank = data & 0x0f;
- dynax_blit_palbank_w(&space, 0, data);
+ dynax_blit_palbank_w(space, 0, data);
}
WRITE8_MEMBER(dynax_state::hnoridur_palette_w)
@@ -348,7 +348,7 @@ WRITE8_MEMBER(dynax_state::yarunara_palette_w)
{
msm6242_device *rtc = machine().device<msm6242_device>("rtc");
- rtc->write(*&space, offset,data);
+ rtc->write(space, offset,data);
}
return;
@@ -448,12 +448,12 @@ static MACHINE_RESET( adpcm )
WRITE8_MEMBER(dynax_state::yarunara_layer_half_w)
{
- hanamai_layer_half_w(&space, 0, data >> 1);
+ hanamai_layer_half_w(space, 0, data >> 1);
}
WRITE8_MEMBER(dynax_state::yarunara_layer_half2_w)
{
- hnoridur_layer_half2_w(&space, 0, data >> 1);
+ hnoridur_layer_half2_w(space, 0, data >> 1);
}
static ADDRESS_MAP_START( sprtmtch_mem_map, AS_PROGRAM, 8, dynax_state )
@@ -515,9 +515,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( hanamai_io_map, AS_IO, 8, dynax_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE( 0x00, 0x00 ) AM_WRITE_LEGACY(dynax_extra_scrollx_w) // screen scroll X
- AM_RANGE( 0x20, 0x20 ) AM_WRITE_LEGACY(dynax_extra_scrolly_w) // screen scroll Y
- AM_RANGE( 0x41, 0x47 ) AM_WRITE_LEGACY(dynax_blitter_rev2_w) // Blitter
+ AM_RANGE( 0x00, 0x00 ) AM_WRITE(dynax_extra_scrollx_w) // screen scroll X
+ AM_RANGE( 0x20, 0x20 ) AM_WRITE(dynax_extra_scrolly_w) // screen scroll Y
+ AM_RANGE( 0x41, 0x47 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
AM_RANGE( 0x50, 0x50 ) AM_WRITE(dynax_rombank_w) // BANK ROM Select hnkochou only
AM_RANGE( 0x60, 0x60 ) AM_READ(hanamai_keyboard_0_r) // P1
AM_RANGE( 0x61, 0x61 ) AM_READ(hanamai_keyboard_1_r) // P2
@@ -527,31 +527,31 @@ static ADDRESS_MAP_START( hanamai_io_map, AS_IO, 8, dynax_state )
AM_RANGE( 0x65, 0x65 ) AM_WRITE(dynax_rombank_w) // BANK ROM Select hanamai only
AM_RANGE( 0x66, 0x66 ) AM_WRITE(dynax_vblank_ack_w) // VBlank IRQ Ack
AM_RANGE( 0x67, 0x67 ) AM_WRITE(adpcm_data_w) // MSM5205 data
- AM_RANGE( 0x68, 0x68 ) AM_WRITE_LEGACY(dynax_layer_enable_w) // Layers Enable
- AM_RANGE( 0x69, 0x69 ) AM_WRITE_LEGACY(hanamai_priority_w) // layer priority
- AM_RANGE( 0x6a, 0x6a ) AM_WRITE_LEGACY(dynax_blit_dest_w) // Destination Layer
- AM_RANGE( 0x6b, 0x6b ) AM_WRITE_LEGACY(dynax_blit_pen_w) // Destination Pen
- AM_RANGE( 0x6c, 0x6c ) AM_WRITE_LEGACY(dynax_blit_palette01_w) // Layers Palettes (Low Bits)
- AM_RANGE( 0x6d, 0x6d ) AM_WRITE_LEGACY(dynax_blit_palette23_w) //
- AM_RANGE( 0x6e, 0x6e ) AM_WRITE_LEGACY(dynax_blit_backpen_w) // Background Color
+ AM_RANGE( 0x68, 0x68 ) AM_WRITE(dynax_layer_enable_w) // Layers Enable
+ AM_RANGE( 0x69, 0x69 ) AM_WRITE(hanamai_priority_w) // layer priority
+ AM_RANGE( 0x6a, 0x6a ) AM_WRITE(dynax_blit_dest_w) // Destination Layer
+ AM_RANGE( 0x6b, 0x6b ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
+ AM_RANGE( 0x6c, 0x6c ) AM_WRITE(dynax_blit_palette01_w) // Layers Palettes (Low Bits)
+ AM_RANGE( 0x6d, 0x6d ) AM_WRITE(dynax_blit_palette23_w) //
+ AM_RANGE( 0x6e, 0x6e ) AM_WRITE(dynax_blit_backpen_w) // Background Color
AM_RANGE( 0x70, 0x70 ) AM_DEVWRITE_LEGACY("msm", adpcm_reset_w) // MSM5205 reset
- AM_RANGE( 0x71, 0x71 ) AM_WRITE_LEGACY(dynax_flipscreen_w) // Flip Screen
+ AM_RANGE( 0x71, 0x71 ) AM_WRITE(dynax_flipscreen_w) // Flip Screen
AM_RANGE( 0x72, 0x72 ) AM_WRITE(dynax_coincounter_0_w) // Coin Counters
AM_RANGE( 0x73, 0x73 ) AM_WRITE(dynax_coincounter_1_w) //
AM_RANGE( 0x74, 0x74 ) AM_WRITE(dynax_blitter_ack_w) // Blitter IRQ Ack
- AM_RANGE( 0x76, 0x76 ) AM_WRITE_LEGACY(dynax_blit_palbank_w) // Layers Palettes (High Bit)
- AM_RANGE( 0x77, 0x77 ) AM_WRITE_LEGACY(hanamai_layer_half_w) // half of the interleaved layer to write to
+ AM_RANGE( 0x76, 0x76 ) AM_WRITE(dynax_blit_palbank_w) // Layers Palettes (High Bit)
+ AM_RANGE( 0x77, 0x77 ) AM_WRITE(hanamai_layer_half_w) // half of the interleaved layer to write to
AM_RANGE( 0x78, 0x79 ) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w) // 2 x DSW
AM_RANGE( 0x7a, 0x7b ) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_data_w) // AY8910
// AM_RANGE( 0x7c, 0x7c ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x7d, 0x7d ) AM_WRITENOP //
- AM_RANGE( 0x7e, 0x7e ) AM_WRITE_LEGACY(dynax_blit_romregion_w) // Blitter ROM bank
+ AM_RANGE( 0x7e, 0x7e ) AM_WRITE(dynax_blit_romregion_w) // Blitter ROM bank
ADDRESS_MAP_END
static ADDRESS_MAP_START( hnoridur_io_map, AS_IO, 8, dynax_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE( 0x01, 0x07 ) AM_WRITE_LEGACY(dynax_blitter_rev2_w) // Blitter
+ AM_RANGE( 0x01, 0x07 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller
AM_RANGE( 0x20, 0x20 ) AM_WRITE(hanamai_keyboard_w) // keyboard row select
@@ -567,23 +567,23 @@ static ADDRESS_MAP_START( hnoridur_io_map, AS_IO, 8, dynax_state )
AM_RANGE( 0x36, 0x36 ) AM_DEVREAD_LEGACY("aysnd", ay8910_r) // AY8910, DSW1
AM_RANGE( 0x38, 0x38 ) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_w) // AY8910
AM_RANGE( 0x3a, 0x3a ) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w) //
- AM_RANGE( 0x40, 0x40 ) AM_WRITE_LEGACY(dynax_blit_pen_w) // Destination Pen
- AM_RANGE( 0x41, 0x41 ) AM_WRITE_LEGACY(dynax_blit_dest_w) // Destination Layer
- AM_RANGE( 0x42, 0x42 ) AM_WRITE_LEGACY(dynax_blit_palette01_w) // Layers Palettes
- AM_RANGE( 0x43, 0x43 ) AM_WRITE_LEGACY(dynax_blit_palette23_w) //
- AM_RANGE( 0x44, 0x44 ) AM_WRITE_LEGACY(hanamai_priority_w) // layer priority and enable
- AM_RANGE( 0x45, 0x45 ) AM_WRITE_LEGACY(dynax_blit_backpen_w) // Background Color
- AM_RANGE( 0x46, 0x46 ) AM_WRITE_LEGACY(dynax_blit_romregion_w) // Blitter ROM bank
+ AM_RANGE( 0x40, 0x40 ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
+ AM_RANGE( 0x41, 0x41 ) AM_WRITE(dynax_blit_dest_w) // Destination Layer
+ AM_RANGE( 0x42, 0x42 ) AM_WRITE(dynax_blit_palette01_w) // Layers Palettes
+ AM_RANGE( 0x43, 0x43 ) AM_WRITE(dynax_blit_palette23_w) //
+ AM_RANGE( 0x44, 0x44 ) AM_WRITE(hanamai_priority_w) // layer priority and enable
+ AM_RANGE( 0x45, 0x45 ) AM_WRITE(dynax_blit_backpen_w) // Background Color
+ AM_RANGE( 0x46, 0x46 ) AM_WRITE(dynax_blit_romregion_w) // Blitter ROM bank
AM_RANGE( 0x47, 0x47 ) AM_WRITE(hnoridur_palbank_w)
- AM_RANGE( 0x50, 0x50 ) AM_WRITE_LEGACY(dynax_extra_scrollx_w) // screen scroll X
- AM_RANGE( 0x51, 0x51 ) AM_WRITE_LEGACY(dynax_extra_scrolly_w) // screen scroll Y
+ AM_RANGE( 0x50, 0x50 ) AM_WRITE(dynax_extra_scrollx_w) // screen scroll X
+ AM_RANGE( 0x51, 0x51 ) AM_WRITE(dynax_extra_scrolly_w) // screen scroll Y
AM_RANGE( 0x54, 0x54 ) AM_WRITE(hnoridur_rombank_w) // BANK ROM Select
AM_RANGE( 0x55, 0x55 ) AM_WRITENOP // ? VBlank IRQ Ack
AM_RANGE( 0x56, 0x56 ) AM_WRITE(dynax_vblank_ack_w) // VBlank IRQ Ack
AM_RANGE( 0x57, 0x57 ) AM_READ(ret_ff) // ?
- AM_RANGE( 0x60, 0x60 ) AM_WRITE_LEGACY(dynax_flipscreen_w) // Flip Screen
- AM_RANGE( 0x61, 0x61 ) AM_WRITE_LEGACY(hanamai_layer_half_w) // half of the interleaved layer to write to
- AM_RANGE( 0x62, 0x62 ) AM_WRITE_LEGACY(hnoridur_layer_half2_w) //
+ AM_RANGE( 0x60, 0x60 ) AM_WRITE(dynax_flipscreen_w) // Flip Screen
+ AM_RANGE( 0x61, 0x61 ) AM_WRITE(hanamai_layer_half_w) // half of the interleaved layer to write to
+ AM_RANGE( 0x62, 0x62 ) AM_WRITE(hnoridur_layer_half2_w) //
AM_RANGE( 0x67, 0x67 ) AM_WRITE(dynax_blitter_ack_w) // Blitter IRQ Ack
AM_RANGE( 0x70, 0x70 ) AM_WRITE(dynax_coincounter_0_w) // Coin Counters
AM_RANGE( 0x71, 0x71 ) AM_WRITE(dynax_coincounter_1_w) //
@@ -633,7 +633,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( hjingi_io_map, AS_IO, 8, dynax_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE( 0x01, 0x07 ) AM_WRITE_LEGACY(dynax_blitter_rev2_w) // Blitter
+ AM_RANGE( 0x01, 0x07 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller
@@ -654,17 +654,17 @@ static ADDRESS_MAP_START( hjingi_io_map, AS_IO, 8, dynax_state )
AM_RANGE( 0x38, 0x38 ) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_w) // AY8910
AM_RANGE( 0x3a, 0x3a ) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w) //
- AM_RANGE( 0x40, 0x40 ) AM_WRITE_LEGACY(dynax_blit_pen_w) // Destination Pen
- AM_RANGE( 0x41, 0x41 ) AM_WRITE_LEGACY(dynax_blit_dest_w) // Destination Layer
- AM_RANGE( 0x42, 0x42 ) AM_WRITE_LEGACY(dynax_blit_palette01_w) // Layers Palettes
- AM_RANGE( 0x43, 0x43 ) AM_WRITE_LEGACY(dynax_blit_palette23_w) //
- AM_RANGE( 0x44, 0x44 ) AM_WRITE_LEGACY(hanamai_priority_w) // layer priority and enable
- AM_RANGE( 0x45, 0x45 ) AM_WRITE_LEGACY(dynax_blit_backpen_w) // Background Color
- AM_RANGE( 0x46, 0x46 ) AM_WRITE_LEGACY(dynax_blit_romregion_w) // Blitter ROM bank
+ AM_RANGE( 0x40, 0x40 ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
+ AM_RANGE( 0x41, 0x41 ) AM_WRITE(dynax_blit_dest_w) // Destination Layer
+ AM_RANGE( 0x42, 0x42 ) AM_WRITE(dynax_blit_palette01_w) // Layers Palettes
+ AM_RANGE( 0x43, 0x43 ) AM_WRITE(dynax_blit_palette23_w) //
+ AM_RANGE( 0x44, 0x44 ) AM_WRITE(hanamai_priority_w) // layer priority and enable
+ AM_RANGE( 0x45, 0x45 ) AM_WRITE(dynax_blit_backpen_w) // Background Color
+ AM_RANGE( 0x46, 0x46 ) AM_WRITE(dynax_blit_romregion_w) // Blitter ROM bank
AM_RANGE( 0x47, 0x47 ) AM_WRITE(hnoridur_palbank_w)
- AM_RANGE( 0x50, 0x50 ) AM_WRITE_LEGACY(dynax_extra_scrollx_w) // screen scroll X
- AM_RANGE( 0x51, 0x51 ) AM_WRITE_LEGACY(dynax_extra_scrolly_w) // screen scroll Y
+ AM_RANGE( 0x50, 0x50 ) AM_WRITE(dynax_extra_scrollx_w) // screen scroll X
+ AM_RANGE( 0x51, 0x51 ) AM_WRITE(dynax_extra_scrolly_w) // screen scroll Y
AM_RANGE( 0x54, 0x54 ) AM_WRITE(hjingi_bank_w) //
@@ -672,9 +672,9 @@ static ADDRESS_MAP_START( hjingi_io_map, AS_IO, 8, dynax_state )
AM_RANGE( 0x57, 0x57 ) AM_READ(ret_ff) // Blitter Busy
AM_RANGE( 0x67, 0x67 ) AM_WRITE(dynax_blitter_ack_w) // Blitter IRQ Ack
- AM_RANGE( 0x60, 0x60 ) AM_WRITE_LEGACY(dynax_flipscreen_w) // Flip Screen
- AM_RANGE( 0x61, 0x61 ) AM_WRITE_LEGACY(hanamai_layer_half_w) // half of the interleaved layer to write to
- AM_RANGE( 0x62, 0x62 ) AM_WRITE_LEGACY(hnoridur_layer_half2_w) //
+ AM_RANGE( 0x60, 0x60 ) AM_WRITE(dynax_flipscreen_w) // Flip Screen
+ AM_RANGE( 0x61, 0x61 ) AM_WRITE(hanamai_layer_half_w) // half of the interleaved layer to write to
+ AM_RANGE( 0x62, 0x62 ) AM_WRITE(hnoridur_layer_half2_w) //
AM_RANGE( 0x70, 0x70 ) AM_WRITE(dynax_coincounter_0_w) // Coin Counters
AM_RANGE( 0x71, 0x71 ) AM_WRITE(dynax_coincounter_1_w) //
@@ -761,23 +761,23 @@ WRITE8_MEMBER(dynax_state::yarunara_rombank_w)
WRITE8_MEMBER(dynax_state::yarunara_flipscreen_w)
{
- dynax_flipscreen_w(&space, 0, BIT(data, 1));
+ dynax_flipscreen_w(space, 0, BIT(data, 1));
}
WRITE8_MEMBER(dynax_state::yarunara_flipscreen_inv_w)
{
- dynax_flipscreen_w(&space, 0, !BIT(data, 1));
+ dynax_flipscreen_w(space, 0, !BIT(data, 1));
}
WRITE8_MEMBER(dynax_state::yarunara_blit_romregion_w)
{
switch(data)
{
- case 0x00: dynax_blit_romregion_w(&space, 0, 0); return;
- case 0x01: dynax_blit_romregion_w(&space, 0, 1); return;
- case 0x80: dynax_blit_romregion_w(&space, 0, 2); return;
- case 0x81: dynax_blit_romregion_w(&space, 0, 3); return;
- case 0x82: dynax_blit_romregion_w(&space, 0, 4); return; // mjcomv1
+ case 0x00: dynax_blit_romregion_w(space, 0, 0); return;
+ case 0x01: dynax_blit_romregion_w(space, 0, 1); return;
+ case 0x80: dynax_blit_romregion_w(space, 0, 2); return;
+ case 0x81: dynax_blit_romregion_w(space, 0, 3); return;
+ case 0x82: dynax_blit_romregion_w(space, 0, 4); return; // mjcomv1
}
logerror("%04x: unmapped romregion=%02X\n", cpu_get_pc(&space.device()), data);
}
@@ -786,14 +786,14 @@ static ADDRESS_MAP_START( yarunara_io_map, AS_IO, 8, dynax_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x00, 0x01 ) AM_WRITE(yarunara_input_w) // Controls
AM_RANGE( 0x02, 0x03 ) AM_READ(yarunara_input_r) //
- AM_RANGE( 0x11, 0x17 ) AM_WRITE_LEGACY(dynax_blitter_rev2_w) // Blitter
+ AM_RANGE( 0x11, 0x17 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
AM_RANGE( 0x20, 0x20 ) AM_DEVWRITE_LEGACY("msm", adpcm_reset_w) // MSM5205 reset
AM_RANGE( 0x22, 0x22 ) AM_WRITE(adpcm_data_w) // MSM5205 data
AM_RANGE( 0x24, 0x25 ) AM_DEVWRITE_LEGACY("ymsnd", ym2413_w) //
AM_RANGE( 0x28, 0x28 ) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_w) // AY8910
AM_RANGE( 0x2a, 0x2a ) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w) //
- AM_RANGE( 0x48, 0x48 ) AM_WRITE_LEGACY(dynax_extra_scrollx_w) // screen scroll X
- AM_RANGE( 0x49, 0x49 ) AM_WRITE_LEGACY(dynax_extra_scrolly_w) // screen scroll Y
+ AM_RANGE( 0x48, 0x48 ) AM_WRITE(dynax_extra_scrollx_w) // screen scroll X
+ AM_RANGE( 0x49, 0x49 ) AM_WRITE(dynax_extra_scrolly_w) // screen scroll Y
AM_RANGE( 0x4a, 0x4a ) AM_WRITE(yarunara_rombank_w) // BANK ROM Select
AM_RANGE( 0x4b, 0x4b ) AM_WRITE(dynax_vblank_ack_w) // VBlank IRQ Ack
AM_RANGE( 0x4c, 0x4c ) AM_READ_PORT("DSW0") // DSW 1
@@ -804,12 +804,12 @@ static ADDRESS_MAP_START( yarunara_io_map, AS_IO, 8, dynax_state )
// 53 ?
// 54 ?
AM_RANGE( 0x57, 0x57 ) AM_WRITE(dynax_blitter_ack_w) // Blitter IRQ Ack
- AM_RANGE( 0x68, 0x68 ) AM_WRITE_LEGACY(dynax_blit_pen_w) // Destination Pen
- AM_RANGE( 0x69, 0x69 ) AM_WRITE_LEGACY(dynax_blit_dest_w) // Destination Layer
- AM_RANGE( 0x6a, 0x6a ) AM_WRITE_LEGACY(dynax_blit_palette01_w) // Layers Palettes
- AM_RANGE( 0x6b, 0x6b ) AM_WRITE_LEGACY(dynax_blit_palette23_w) //
- AM_RANGE( 0x6c, 0x6c ) AM_WRITE_LEGACY(hanamai_priority_w) // layer priority and enable
- AM_RANGE( 0x6d, 0x6d ) AM_WRITE_LEGACY(dynax_blit_backpen_w) // Background Color
+ AM_RANGE( 0x68, 0x68 ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
+ AM_RANGE( 0x69, 0x69 ) AM_WRITE(dynax_blit_dest_w) // Destination Layer
+ AM_RANGE( 0x6a, 0x6a ) AM_WRITE(dynax_blit_palette01_w) // Layers Palettes
+ AM_RANGE( 0x6b, 0x6b ) AM_WRITE(dynax_blit_palette23_w) //
+ AM_RANGE( 0x6c, 0x6c ) AM_WRITE(hanamai_priority_w) // layer priority and enable
+ AM_RANGE( 0x6d, 0x6d ) AM_WRITE(dynax_blit_backpen_w) // Background Color
AM_RANGE( 0x6e, 0x6e ) AM_WRITE(yarunara_blit_romregion_w) // Blitter ROM bank
ADDRESS_MAP_END
@@ -817,7 +817,7 @@ ADDRESS_MAP_END
// Almost identical to hnoridur
static ADDRESS_MAP_START( mcnpshnt_io_map, AS_IO, 8, dynax_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE( 0x01, 0x07 ) AM_WRITE_LEGACY(dynax_blitter_rev2_w) // Blitter
+ AM_RANGE( 0x01, 0x07 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x11, 0x11 ) AM_WRITENOP // CRT Controller
AM_RANGE( 0x20, 0x20 ) AM_WRITE(hanamai_keyboard_w) // keyboard row select
@@ -831,22 +831,22 @@ static ADDRESS_MAP_START( mcnpshnt_io_map, AS_IO, 8, dynax_state )
AM_RANGE( 0x34, 0x35 ) AM_DEVWRITE_LEGACY("ymsnd", ym2413_w) //
AM_RANGE( 0x38, 0x38 ) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_w) // AY8910
AM_RANGE( 0x3a, 0x3a ) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w) //
- AM_RANGE( 0x40, 0x40 ) AM_WRITE_LEGACY(dynax_blit_pen_w) // Destination Pen
- AM_RANGE( 0x41, 0x41 ) AM_WRITE_LEGACY(dynax_blit_dest_w) // Destination Layer
- AM_RANGE( 0x42, 0x42 ) AM_WRITE_LEGACY(dynax_blit_palette01_w) // Layers Palettes
- AM_RANGE( 0x43, 0x43 ) AM_WRITE_LEGACY(dynax_blit_palette23_w) //
- AM_RANGE( 0x44, 0x44 ) AM_WRITE_LEGACY(hanamai_priority_w) // layer priority and enable
- AM_RANGE( 0x45, 0x45 ) AM_WRITE_LEGACY(dynax_blit_backpen_w) // Background Color
+ AM_RANGE( 0x40, 0x40 ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
+ AM_RANGE( 0x41, 0x41 ) AM_WRITE(dynax_blit_dest_w) // Destination Layer
+ AM_RANGE( 0x42, 0x42 ) AM_WRITE(dynax_blit_palette01_w) // Layers Palettes
+ AM_RANGE( 0x43, 0x43 ) AM_WRITE(dynax_blit_palette23_w) //
+ AM_RANGE( 0x44, 0x44 ) AM_WRITE(hanamai_priority_w) // layer priority and enable
+ AM_RANGE( 0x45, 0x45 ) AM_WRITE(dynax_blit_backpen_w) // Background Color
AM_RANGE( 0x46, 0x46 ) AM_WRITE(yarunara_blit_romregion_w) // Blitter ROM bank
AM_RANGE( 0x47, 0x47 ) AM_WRITE(hnoridur_palbank_w)
- AM_RANGE( 0x50, 0x50 ) AM_WRITE_LEGACY(dynax_extra_scrollx_w) // screen scroll X
- AM_RANGE( 0x51, 0x51 ) AM_WRITE_LEGACY(dynax_extra_scrolly_w) // screen scroll Y
+ AM_RANGE( 0x50, 0x50 ) AM_WRITE(dynax_extra_scrollx_w) // screen scroll X
+ AM_RANGE( 0x51, 0x51 ) AM_WRITE(dynax_extra_scrolly_w) // screen scroll Y
AM_RANGE( 0x54, 0x54 ) AM_WRITE(hnoridur_rombank_w) // BANK ROM Select
AM_RANGE( 0x56, 0x56 ) AM_WRITE(dynax_vblank_ack_w) // VBlank IRQ Ack
AM_RANGE( 0x57, 0x57 ) AM_READ(ret_ff) // ?
- AM_RANGE( 0x60, 0x60 ) AM_WRITE_LEGACY(dynax_flipscreen_w) // Flip Screen
- AM_RANGE( 0x61, 0x61 ) AM_WRITE_LEGACY(hanamai_layer_half_w) // half of the interleaved layer to write to
- AM_RANGE( 0x62, 0x62 ) AM_WRITE_LEGACY(hnoridur_layer_half2_w) //
+ AM_RANGE( 0x60, 0x60 ) AM_WRITE(dynax_flipscreen_w) // Flip Screen
+ AM_RANGE( 0x61, 0x61 ) AM_WRITE(hanamai_layer_half_w) // half of the interleaved layer to write to
+ AM_RANGE( 0x62, 0x62 ) AM_WRITE(hnoridur_layer_half2_w) //
AM_RANGE( 0x67, 0x67 ) AM_WRITE(dynax_blitter_ack_w) // Blitter IRQ Ack
AM_RANGE( 0x70, 0x70 ) AM_WRITE(dynax_coincounter_0_w) // Coin Counters
AM_RANGE( 0x71, 0x71 ) AM_WRITE(dynax_coincounter_1_w) //
@@ -855,7 +855,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sprtmtch_io_map, AS_IO, 8, dynax_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE( 0x01, 0x07 ) AM_WRITE_LEGACY(dynax_blitter_rev2_w) // Blitter
+ AM_RANGE( 0x01, 0x07 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
AM_RANGE( 0x10, 0x11 ) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w) // 2 x DSW
// AM_RANGE( 0x12, 0x12 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x13, 0x13 ) AM_WRITENOP // CRT Controller
@@ -863,37 +863,37 @@ static ADDRESS_MAP_START( sprtmtch_io_map, AS_IO, 8, dynax_state )
AM_RANGE( 0x21, 0x21 ) AM_READ_PORT("P2") // P2
AM_RANGE( 0x22, 0x22 ) AM_READ_PORT("COINS") // Coins
AM_RANGE( 0x23, 0x23 ) AM_READ(ret_ff) // ?
- AM_RANGE( 0x30, 0x30 ) AM_WRITE_LEGACY(dynax_layer_enable_w) // Layers Enable
+ AM_RANGE( 0x30, 0x30 ) AM_WRITE(dynax_layer_enable_w) // Layers Enable
AM_RANGE( 0x31, 0x31 ) AM_WRITE(dynax_rombank_w) // BANK ROM Select
- AM_RANGE( 0x32, 0x32 ) AM_WRITE_LEGACY(dynax_blit_dest_w) // Destination Layer
- AM_RANGE( 0x33, 0x33 ) AM_WRITE_LEGACY(dynax_blit_pen_w) // Destination Pen
- AM_RANGE( 0x34, 0x34 ) AM_WRITE_LEGACY(dynax_blit_palette01_w) // Layers Palettes (Low Bits)
- AM_RANGE( 0x35, 0x35 ) AM_WRITE_LEGACY(dynax_blit_palette23_w) //
- AM_RANGE( 0x36, 0x36 ) AM_WRITE_LEGACY(dynax_blit_backpen_w) // Background Color
+ AM_RANGE( 0x32, 0x32 ) AM_WRITE(dynax_blit_dest_w) // Destination Layer
+ AM_RANGE( 0x33, 0x33 ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
+ AM_RANGE( 0x34, 0x34 ) AM_WRITE(dynax_blit_palette01_w) // Layers Palettes (Low Bits)
+ AM_RANGE( 0x35, 0x35 ) AM_WRITE(dynax_blit_palette23_w) //
+ AM_RANGE( 0x36, 0x36 ) AM_WRITE(dynax_blit_backpen_w) // Background Color
AM_RANGE( 0x37, 0x37 ) AM_WRITE(dynax_vblank_ack_w) // VBlank IRQ Ack
// AM_RANGE( 0x40, 0x40 ) AM_DEVWRITE_LEGACY("msm", adpcm_reset_w) // MSM5205 reset
- AM_RANGE( 0x41, 0x41 ) AM_WRITE_LEGACY(dynax_flipscreen_w) // Flip Screen
+ AM_RANGE( 0x41, 0x41 ) AM_WRITE(dynax_flipscreen_w) // Flip Screen
AM_RANGE( 0x42, 0x42 ) AM_WRITE(dynax_coincounter_0_w) // Coin Counters
AM_RANGE( 0x43, 0x43 ) AM_WRITE(dynax_coincounter_1_w) //
AM_RANGE( 0x44, 0x44 ) AM_WRITE(dynax_blitter_ack_w) // Blitter IRQ Ack
- AM_RANGE( 0x45, 0x45 ) AM_WRITE_LEGACY(dynax_blit_palbank_w) // Layers Palettes (High Bit)
+ AM_RANGE( 0x45, 0x45 ) AM_WRITE(dynax_blit_palbank_w) // Layers Palettes (High Bit)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mjfriday_io_map, AS_IO, 8, dynax_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE( 0x00, 0x00 ) AM_WRITE_LEGACY(dynax_blit_pen_w) // Destination Pen
- AM_RANGE( 0x01, 0x01 ) AM_WRITE_LEGACY(dynax_blit_palette01_w) // Layers Palettes (Low Bits)
+ AM_RANGE( 0x00, 0x00 ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
+ AM_RANGE( 0x01, 0x01 ) AM_WRITE(dynax_blit_palette01_w) // Layers Palettes (Low Bits)
AM_RANGE( 0x02, 0x02 ) AM_WRITE(dynax_rombank_w) // BANK ROM Select
- AM_RANGE( 0x03, 0x03 ) AM_WRITE_LEGACY(dynax_blit_backpen_w) // Background Color
- AM_RANGE( 0x10, 0x11 ) AM_WRITE_LEGACY(mjdialq2_blit_dest_w) // Destination Layer
- AM_RANGE( 0x12, 0x12 ) AM_WRITE_LEGACY(dynax_blit_palbank_w) // Layers Palettes (High Bit)
- AM_RANGE( 0x13, 0x13 ) AM_WRITE_LEGACY(dynax_flipscreen_w) // Flip Screen
+ AM_RANGE( 0x03, 0x03 ) AM_WRITE(dynax_blit_backpen_w) // Background Color
+ AM_RANGE( 0x10, 0x11 ) AM_WRITE(mjdialq2_blit_dest_w) // Destination Layer
+ AM_RANGE( 0x12, 0x12 ) AM_WRITE(dynax_blit_palbank_w) // Layers Palettes (High Bit)
+ AM_RANGE( 0x13, 0x13 ) AM_WRITE(dynax_flipscreen_w) // Flip Screen
AM_RANGE( 0x14, 0x14 ) AM_WRITE(dynax_coincounter_0_w) // Coin Counters
AM_RANGE( 0x15, 0x15 ) AM_WRITE(dynax_coincounter_1_w) //
- AM_RANGE( 0x16, 0x17 ) AM_WRITE_LEGACY(mjdialq2_layer_enable_w) // Layers Enable
- AM_RANGE( 0x41, 0x47 ) AM_WRITE_LEGACY(dynax_blitter_rev2_w) // Blitter
+ AM_RANGE( 0x16, 0x17 ) AM_WRITE(mjdialq2_layer_enable_w) // Layers Enable
+ AM_RANGE( 0x41, 0x47 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
// AM_RANGE( 0x50, 0x50 ) AM_WRITENOP // CRT Controller
// AM_RANGE( 0x51, 0x51 ) AM_WRITENOP // CRT Controller
AM_RANGE( 0x60, 0x60 ) AM_WRITE(hanamai_keyboard_w) // keyboard row select
@@ -922,22 +922,22 @@ static ADDRESS_MAP_START( nanajign_io_map, AS_IO, 8, dynax_state )
AM_RANGE( 0x15, 0x15 ) AM_READ_PORT("DSW1") // DSW2
AM_RANGE( 0x16, 0x16 ) AM_READ_PORT("DSW2") // DSW3
// AM_RANGE( 0x20, 0x21 ) AM_WRITENOP // CRT Controller
- AM_RANGE( 0x31, 0x37 ) AM_WRITE_LEGACY(dynax_blitter_rev2_w) // Blitter
+ AM_RANGE( 0x31, 0x37 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
AM_RANGE( 0x40, 0x40 ) AM_WRITE(dynax_coincounter_0_w) // Coin Counter
- AM_RANGE( 0x50, 0x50 ) AM_WRITE_LEGACY(dynax_flipscreen_w) // Flip Screen
- AM_RANGE( 0x51, 0x51 ) AM_WRITE_LEGACY(hanamai_layer_half_w) // half of the interleaved layer to write to
- AM_RANGE( 0x52, 0x52 ) AM_WRITE_LEGACY(hnoridur_layer_half2_w) //
+ AM_RANGE( 0x50, 0x50 ) AM_WRITE(dynax_flipscreen_w) // Flip Screen
+ AM_RANGE( 0x51, 0x51 ) AM_WRITE(hanamai_layer_half_w) // half of the interleaved layer to write to
+ AM_RANGE( 0x52, 0x52 ) AM_WRITE(hnoridur_layer_half2_w) //
AM_RANGE( 0x57, 0x57 ) AM_WRITE(dynax_blitter_ack_w) // Blitter IRQ Ack
- AM_RANGE( 0x60, 0x60 ) AM_WRITE_LEGACY(dynax_extra_scrollx_w) // screen scroll X
- AM_RANGE( 0x62, 0x62 ) AM_WRITE_LEGACY(dynax_extra_scrolly_w) // screen scroll Y
+ AM_RANGE( 0x60, 0x60 ) AM_WRITE(dynax_extra_scrollx_w) // screen scroll X
+ AM_RANGE( 0x62, 0x62 ) AM_WRITE(dynax_extra_scrolly_w) // screen scroll Y
AM_RANGE( 0x6a, 0x6a ) AM_WRITE(hnoridur_rombank_w) // BANK ROM Select
AM_RANGE( 0x6c, 0x6c ) AM_WRITE(dynax_vblank_ack_w) // VBlank IRQ Ack
- AM_RANGE( 0x70, 0x70 ) AM_WRITE_LEGACY(dynax_blit_pen_w) // Destination Pen
- AM_RANGE( 0x71, 0x71 ) AM_WRITE_LEGACY(dynax_blit_dest_w) // Destination Layer
- AM_RANGE( 0x72, 0x72 ) AM_WRITE_LEGACY(dynax_blit_palette01_w) // Layers Palettes
- AM_RANGE( 0x73, 0x73 ) AM_WRITE_LEGACY(dynax_blit_palette23_w) //
- AM_RANGE( 0x74, 0x74 ) AM_WRITE_LEGACY(hanamai_priority_w) // layer priority and enable
- AM_RANGE( 0x75, 0x75 ) AM_WRITE_LEGACY(dynax_blit_backpen_w) // Background Color
+ AM_RANGE( 0x70, 0x70 ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
+ AM_RANGE( 0x71, 0x71 ) AM_WRITE(dynax_blit_dest_w) // Destination Layer
+ AM_RANGE( 0x72, 0x72 ) AM_WRITE(dynax_blit_palette01_w) // Layers Palettes
+ AM_RANGE( 0x73, 0x73 ) AM_WRITE(dynax_blit_palette23_w) //
+ AM_RANGE( 0x74, 0x74 ) AM_WRITE(hanamai_priority_w) // layer priority and enable
+ AM_RANGE( 0x75, 0x75 ) AM_WRITE(dynax_blit_backpen_w) // Background Color
AM_RANGE( 0x76, 0x76 ) AM_WRITE(yarunara_blit_romregion_w) // Blitter ROM bank
AM_RANGE( 0x77, 0x77 ) AM_WRITE(hnoridur_palbank_w)
ADDRESS_MAP_END
@@ -979,9 +979,9 @@ static ADDRESS_MAP_START( jantouki_io_map, AS_IO, 8, dynax_state )
AM_RANGE( 0x48, 0x48 ) AM_WRITE(jantouki_rombank_w) // BANK ROM Select
AM_RANGE( 0x49, 0x49 ) AM_WRITE(jantouki_soundlatch_w) // To Sound CPU
AM_RANGE( 0x4a, 0x4a ) AM_READ(jantouki_soundlatch_ack_r) // Soundlatch status
- AM_RANGE( 0x4b, 0x4b ) AM_WRITE_LEGACY(dynax_blit2_dest_w) // Destination Layer 2
- AM_RANGE( 0x4d, 0x4d ) AM_WRITE_LEGACY(dynax_blit_dest_w) // Destination Layer
- AM_RANGE( 0x4f, 0x4f ) AM_WRITE_LEGACY(dynax_blit2_romregion_w) // Blitter 2 ROM bank
+ AM_RANGE( 0x4b, 0x4b ) AM_WRITE(dynax_blit2_dest_w) // Destination Layer 2
+ AM_RANGE( 0x4d, 0x4d ) AM_WRITE(dynax_blit_dest_w) // Destination Layer
+ AM_RANGE( 0x4f, 0x4f ) AM_WRITE(dynax_blit2_romregion_w) // Blitter 2 ROM bank
AM_RANGE( 0x50, 0x50 ) AM_WRITE(jantouki_vblank_ack_w) // VBlank IRQ Ack
AM_RANGE( 0x51, 0x51 ) AM_WRITE(hanamai_keyboard_w) // keyboard row select
AM_RANGE( 0x52, 0x52 ) AM_READ(hanamai_keyboard_0_r) // P1
@@ -989,21 +989,21 @@ static ADDRESS_MAP_START( jantouki_io_map, AS_IO, 8, dynax_state )
AM_RANGE( 0x55, 0x55 ) AM_READ_PORT("DSW0") // DSW1
AM_RANGE( 0x56, 0x56 ) AM_READ_PORT("DSW1") // DSW2
AM_RANGE( 0x58, 0x58 ) AM_WRITE(dynax_coincounter_0_w) // Coin Counter
- AM_RANGE( 0x5b, 0x5b ) AM_WRITE_LEGACY(dynax_blit2_palbank_w) // Layers Palettes (High Bit)
- AM_RANGE( 0x5d, 0x5d ) AM_WRITE_LEGACY(dynax_blit_palbank_w) //
+ AM_RANGE( 0x5b, 0x5b ) AM_WRITE(dynax_blit2_palbank_w) // Layers Palettes (High Bit)
+ AM_RANGE( 0x5d, 0x5d ) AM_WRITE(dynax_blit_palbank_w) //
AM_RANGE( 0x5e, 0x5e ) AM_WRITE(jantouki_blitter_ack_w) // Blitter IRQ Ack
AM_RANGE( 0x5f, 0x5f ) AM_WRITE(jantouki_blitter2_ack_w) // Blitter 2 IRQ Ack
- AM_RANGE( 0x60, 0x60 ) AM_WRITE_LEGACY(dynax_blit_palette67_w) // Layers Palettes (Low Bits)
- AM_RANGE( 0x61, 0x61 ) AM_WRITE_LEGACY(dynax_blit_palette45_w) //
- AM_RANGE( 0x62, 0x62 ) AM_WRITE_LEGACY(dynax_blit_palette23_w) //
- AM_RANGE( 0x63, 0x63 ) AM_WRITE_LEGACY(dynax_blit_palette01_w) //
- AM_RANGE( 0x64, 0x64 ) AM_WRITE_LEGACY(dynax_blit_backpen_w) // Background Color
- AM_RANGE( 0x65, 0x65 ) AM_WRITE_LEGACY(dynax_blit2_pen_w) // Destination Pen 2
- AM_RANGE( 0x66, 0x66 ) AM_WRITE_LEGACY(dynax_blit_pen_w) // Destination Pen
+ AM_RANGE( 0x60, 0x60 ) AM_WRITE(dynax_blit_palette67_w) // Layers Palettes (Low Bits)
+ AM_RANGE( 0x61, 0x61 ) AM_WRITE(dynax_blit_palette45_w) //
+ AM_RANGE( 0x62, 0x62 ) AM_WRITE(dynax_blit_palette23_w) //
+ AM_RANGE( 0x63, 0x63 ) AM_WRITE(dynax_blit_palette01_w) //
+ AM_RANGE( 0x64, 0x64 ) AM_WRITE(dynax_blit_backpen_w) // Background Color
+ AM_RANGE( 0x65, 0x65 ) AM_WRITE(dynax_blit2_pen_w) // Destination Pen 2
+ AM_RANGE( 0x66, 0x66 ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
AM_RANGE( 0x67, 0x67 ) AM_READ(jantouki_blitter_busy_r) //
- AM_RANGE( 0x69, 0x6f ) AM_WRITE_LEGACY(jantouki_blitter2_rev2_w) // Blitter 2
- AM_RANGE( 0x71, 0x77 ) AM_WRITE_LEGACY(jantouki_blitter_rev2_w) // Blitter
- AM_RANGE( 0x78, 0x7e ) AM_WRITE_LEGACY(jantouki_layer_enable_w) // Layers Enable
+ AM_RANGE( 0x69, 0x6f ) AM_WRITE(jantouki_blitter2_rev2_w) // Blitter 2
+ AM_RANGE( 0x71, 0x77 ) AM_WRITE(jantouki_blitter_rev2_w) // Blitter
+ AM_RANGE( 0x78, 0x7e ) AM_WRITE(jantouki_layer_enable_w) // Layers Enable
ADDRESS_MAP_END
/***************************************************************************
@@ -1078,10 +1078,10 @@ static ADDRESS_MAP_START( mjelctrn_io_map, AS_IO, 8, dynax_state )
// AM_RANGE( 0x21, 0x21 ) AM_WRITENOP // CRT Controller
AM_RANGE( 0x40, 0x40 ) AM_WRITE(dynax_coincounter_0_w) // Coin Counters
AM_RANGE( 0x41, 0x41 ) AM_WRITE(dynax_coincounter_1_w) //
- AM_RANGE( 0x60, 0x60 ) AM_WRITE_LEGACY(dynax_extra_scrollx_w) // screen scroll X
- AM_RANGE( 0x62, 0x62 ) AM_WRITE_LEGACY(dynax_extra_scrolly_w) // screen scroll Y
-// AM_RANGE( 0x64, 0x64 ) AM_WRITE_LEGACY(dynax_extra_scrollx_w) // screen scroll X
-// AM_RANGE( 0x66, 0x66 ) AM_WRITE_LEGACY(dynax_extra_scrolly_w) // screen scroll Y
+ AM_RANGE( 0x60, 0x60 ) AM_WRITE(dynax_extra_scrollx_w) // screen scroll X
+ AM_RANGE( 0x62, 0x62 ) AM_WRITE(dynax_extra_scrolly_w) // screen scroll Y
+// AM_RANGE( 0x64, 0x64 ) AM_WRITE(dynax_extra_scrollx_w) // screen scroll X
+// AM_RANGE( 0x66, 0x66 ) AM_WRITE(dynax_extra_scrolly_w) // screen scroll Y
AM_RANGE( 0x6a, 0x6a ) AM_WRITE(hnoridur_rombank_w) // BANK ROM Select
AM_RANGE( 0x80, 0x80 ) AM_WRITE(hanamai_keyboard_w) // keyboard row select
AM_RANGE( 0x81, 0x81 ) AM_READ_PORT("COINS") // Coins
@@ -1089,17 +1089,17 @@ static ADDRESS_MAP_START( mjelctrn_io_map, AS_IO, 8, dynax_state )
AM_RANGE( 0x83, 0x83 ) AM_READ(hanamai_keyboard_0_r) // P1
AM_RANGE( 0x84, 0x84 ) AM_READ(mjelctrn_dsw_r) // DSW x 4
AM_RANGE( 0x85, 0x85 ) AM_READ(ret_ff) // ?
- AM_RANGE( 0xa1, 0xa7 ) AM_WRITE_LEGACY(dynax_blitter_rev2_w) // Blitter
- AM_RANGE( 0xc0, 0xc0 ) AM_WRITE_LEGACY(dynax_flipscreen_w) // Flip Screen
- AM_RANGE( 0xc1, 0xc1 ) AM_WRITE_LEGACY(hanamai_layer_half_w) // half of the interleaved layer to write to
- AM_RANGE( 0xc2, 0xc2 ) AM_WRITE_LEGACY(hnoridur_layer_half2_w) //
+ AM_RANGE( 0xa1, 0xa7 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
+ AM_RANGE( 0xc0, 0xc0 ) AM_WRITE(dynax_flipscreen_w) // Flip Screen
+ AM_RANGE( 0xc1, 0xc1 ) AM_WRITE(hanamai_layer_half_w) // half of the interleaved layer to write to
+ AM_RANGE( 0xc2, 0xc2 ) AM_WRITE(hnoridur_layer_half2_w) //
// c3,c4 seem to be related to wrap around enable
- AM_RANGE( 0xe0, 0xe0 ) AM_WRITE_LEGACY(dynax_blit_pen_w) // Destination Pen
- AM_RANGE( 0xe1, 0xe1 ) AM_WRITE_LEGACY(dynax_blit_dest_w) // Destination Layer
- AM_RANGE( 0xe2, 0xe2 ) AM_WRITE_LEGACY(dynax_blit_palette01_w) // Layers Palettes
- AM_RANGE( 0xe3, 0xe3 ) AM_WRITE_LEGACY(dynax_blit_palette23_w) //
- AM_RANGE( 0xe4, 0xe4 ) AM_WRITE_LEGACY(hanamai_priority_w) // layer priority and enable
- AM_RANGE( 0xe5, 0xe5 ) AM_WRITE_LEGACY(dynax_blit_backpen_w) // Background Color
+ AM_RANGE( 0xe0, 0xe0 ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
+ AM_RANGE( 0xe1, 0xe1 ) AM_WRITE(dynax_blit_dest_w) // Destination Layer
+ AM_RANGE( 0xe2, 0xe2 ) AM_WRITE(dynax_blit_palette01_w) // Layers Palettes
+ AM_RANGE( 0xe3, 0xe3 ) AM_WRITE(dynax_blit_palette23_w) //
+ AM_RANGE( 0xe4, 0xe4 ) AM_WRITE(hanamai_priority_w) // layer priority and enable
+ AM_RANGE( 0xe5, 0xe5 ) AM_WRITE(dynax_blit_backpen_w) // Background Color
AM_RANGE( 0xe6, 0xe6 ) AM_WRITE(yarunara_blit_romregion_w) // Blitter ROM bank
AM_RANGE( 0xe7, 0xe7 ) AM_WRITE(hnoridur_palbank_w)
ADDRESS_MAP_END
@@ -1198,9 +1198,9 @@ WRITE8_MEMBER(dynax_state::htengoku_blit_romregion_w)
{
switch (data)
{
- case 0x80: dynax_blit_romregion_w(&space, 0, 0); return;
- case 0x81: dynax_blit_romregion_w(&space, 0, 1); return;
- case 0x00: dynax_blit_romregion_w(&space, 0, 2); return;
+ case 0x80: dynax_blit_romregion_w(space, 0, 0); return;
+ case 0x81: dynax_blit_romregion_w(space, 0, 1); return;
+ case 0x00: dynax_blit_romregion_w(space, 0, 2); return;
}
logerror("%04x: unmapped romregion=%02X\n", cpu_get_pc(&space.device()), data);
}
@@ -1212,7 +1212,7 @@ READ8_MEMBER(dynax_state::unk_r)
static ADDRESS_MAP_START( htengoku_io_map, AS_IO, 8, dynax_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE( 0x01, 0x07 ) AM_WRITE_LEGACY(dynax_blitter_rev2_w) // Blitter
+ AM_RANGE( 0x01, 0x07 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
AM_RANGE( 0x20, 0x20 ) AM_WRITE(htengoku_select_w) // Controls
AM_RANGE( 0x21, 0x21 ) AM_WRITE(htengoku_coin_w) //
AM_RANGE( 0x22, 0x22 ) AM_READ(htengoku_coin_r) //
@@ -1232,11 +1232,11 @@ static ADDRESS_MAP_START( htengoku_io_map, AS_IO, 8, dynax_state )
AM_RANGE( 0xb6, 0xb6 ) AM_WRITE_LEGACY(ddenlovr_layer_enable_w)
AM_RANGE( 0xb8, 0xb8 ) AM_READ(unk_r) // ? must be 78 on startup
AM_RANGE( 0xc2, 0xc2 ) AM_WRITE(htengoku_rombank_w) // BANK ROM Select
- AM_RANGE( 0xc0, 0xc0 ) AM_WRITE_LEGACY(dynax_extra_scrollx_w) // screen scroll X
- AM_RANGE( 0xc1, 0xc1 ) AM_WRITE_LEGACY(dynax_extra_scrolly_w) // screen scroll Y
+ AM_RANGE( 0xc0, 0xc0 ) AM_WRITE(dynax_extra_scrollx_w) // screen scroll X
+ AM_RANGE( 0xc1, 0xc1 ) AM_WRITE(dynax_extra_scrolly_w) // screen scroll Y
AM_RANGE( 0xc3, 0xc3 ) AM_WRITE(dynax_vblank_ack_w) // VBlank IRQ Ack
- AM_RANGE( 0xc4, 0xc4 ) AM_WRITE_LEGACY(dynax_blit_pen_w) // Destination Pen
- AM_RANGE( 0xc5, 0xc5 ) AM_WRITE_LEGACY(dynax_blit_dest_w) // Destination Layer
+ AM_RANGE( 0xc4, 0xc4 ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
+ AM_RANGE( 0xc5, 0xc5 ) AM_WRITE(dynax_blit_dest_w) // Destination Layer
AM_RANGE( 0xc6, 0xc6 ) AM_WRITE(htengoku_blit_romregion_w) // Blitter ROM bank
AM_RANGE( 0xe0, 0xe0 ) AM_WRITE(yarunara_flipscreen_w)
AM_RANGE( 0xe1, 0xe1 ) AM_WRITE(yarunara_layer_half_w) // half of the interleaved layer to write to
@@ -1436,7 +1436,7 @@ READ8_MEMBER(dynax_state::tenkai_8000_r)
{
msm6242_device *rtc = machine().device<msm6242_device>("rtc");
- return rtc->read(*&space, offset);
+ return rtc->read(space, offset);
}
else if (m_rombank == 0x12)
return tenkai_palette_r(space, offset);
@@ -1452,7 +1452,7 @@ WRITE8_MEMBER(dynax_state::tenkai_8000_w)
{
msm6242_device *rtc = machine().device<msm6242_device>("rtc");
- rtc->write(*&space, offset, data);
+ rtc->write(space, offset, data);
return;
}
else if (m_rombank == 0x12)
@@ -1486,9 +1486,9 @@ WRITE8_MEMBER(dynax_state::tenkai_blit_romregion_w)
{
switch (data)
{
- case 0x00: dynax_blit_romregion_w(&space, 0, 0); return;
- case 0x83: dynax_blit_romregion_w(&space, 0, 1); return;
- case 0x80: dynax_blit_romregion_w(&space, 0, 2); return;
+ case 0x00: dynax_blit_romregion_w(space, 0, 0); return;
+ case 0x83: dynax_blit_romregion_w(space, 0, 1); return;
+ case 0x80: dynax_blit_romregion_w(space, 0, 2); return;
}
logerror("%04x: unmapped romregion=%02X\n", cpu_get_pc(&space.device()), data);
}
@@ -1502,12 +1502,12 @@ static ADDRESS_MAP_START( tenkai_map, AS_PROGRAM, 8, dynax_state )
AM_RANGE( 0x10008, 0x10008 ) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_w) //
AM_RANGE( 0x10010, 0x10010 ) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w) //
AM_RANGE( 0x10020, 0x10021 ) AM_DEVWRITE_LEGACY("ymsnd", ym2413_w) //
- AM_RANGE( 0x10040, 0x10040 ) AM_WRITE_LEGACY(dynax_blit_pen_w) // Destination Pen
- AM_RANGE( 0x10044, 0x10044 ) AM_WRITE_LEGACY(tenkai_blit_dest_w) // Destination Layer
- AM_RANGE( 0x10048, 0x10048 ) AM_WRITE_LEGACY(tenkai_blit_palette23_w) // Layers Palettes
- AM_RANGE( 0x1004c, 0x1004c ) AM_WRITE_LEGACY(tenkai_blit_palette01_w) //
- AM_RANGE( 0x10050, 0x10050 ) AM_WRITE_LEGACY(tenkai_priority_w) // layer priority and enable
- AM_RANGE( 0x10054, 0x10054 ) AM_WRITE_LEGACY(dynax_blit_backpen_w) // Background Color
+ AM_RANGE( 0x10040, 0x10040 ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
+ AM_RANGE( 0x10044, 0x10044 ) AM_WRITE(tenkai_blit_dest_w) // Destination Layer
+ AM_RANGE( 0x10048, 0x10048 ) AM_WRITE(tenkai_blit_palette23_w) // Layers Palettes
+ AM_RANGE( 0x1004c, 0x1004c ) AM_WRITE(tenkai_blit_palette01_w) //
+ AM_RANGE( 0x10050, 0x10050 ) AM_WRITE(tenkai_priority_w) // layer priority and enable
+ AM_RANGE( 0x10054, 0x10054 ) AM_WRITE(dynax_blit_backpen_w) // Background Color
AM_RANGE( 0x10058, 0x10058 ) AM_WRITE(tenkai_blit_romregion_w) // Blitter ROM bank
AM_RANGE( 0x10060, 0x10060 ) AM_WRITE(yarunara_flipscreen_inv_w) // Flip Screen
AM_RANGE( 0x10064, 0x10064 ) AM_WRITE(yarunara_layer_half_w) // half of the interleaved layer to write to
@@ -1518,7 +1518,7 @@ static ADDRESS_MAP_START( tenkai_map, AS_PROGRAM, 8, dynax_state )
AM_RANGE( 0x100c0, 0x100c0 ) AM_WRITE(tenkai_ipsel_w)
AM_RANGE( 0x100c1, 0x100c1 ) AM_WRITE(tenkai_ip_w)
AM_RANGE( 0x100c2, 0x100c3 ) AM_READ(tenkai_ip_r)
- AM_RANGE( 0x100e1, 0x100e7 ) AM_WRITE_LEGACY(tenkai_blitter_rev2_w) // Blitter (inverted scroll values)
+ AM_RANGE( 0x100e1, 0x100e7 ) AM_WRITE(tenkai_blitter_rev2_w) // Blitter (inverted scroll values)
ADDRESS_MAP_END
static ADDRESS_MAP_START( tenkai_io_map, AS_IO, 8, dynax_state )
@@ -1613,24 +1613,24 @@ WRITE8_MEMBER(dynax_state::gekisha_8000_w)
{
// same offsets as mjfriday
- case 0x8001: dynax_blit_palette01_w(&space, offset - 0x01, data); return;
+ case 0x8001: dynax_blit_palette01_w(space, offset - 0x01, data); return;
// case 0x8002: // ? 1
- case 0x8003: dynax_blit_backpen_w(&space, offset - 0x03, data); return;
+ case 0x8003: dynax_blit_backpen_w(space, offset - 0x03, data); return;
case 0x8010:
- case 0x8011: mjdialq2_blit_dest_w(&space, offset - 0x10, data); return;
+ case 0x8011: mjdialq2_blit_dest_w(space, offset - 0x10, data); return;
- case 0x8012: dynax_blit_palbank_w(&space, offset - 0x12, data); return;
+ case 0x8012: dynax_blit_palbank_w(space, offset - 0x12, data); return;
- case 0x8013: dynax_flipscreen_w(&space, offset - 0x13, data); return;
+ case 0x8013: dynax_flipscreen_w(space, offset - 0x13, data); return;
case 0x8014: dynax_coincounter_0_w(space, offset - 0x14, data); return;
case 0x8015: dynax_coincounter_1_w(space, offset - 0x15, data); return;
case 0x8016:
- case 0x8017: mjdialq2_layer_enable_w(&space, offset - 0x16, data); return;
+ case 0x8017: mjdialq2_layer_enable_w(space, offset - 0x16, data); return;
case 0x8020:
case 0x8021: gekisha_hopper_w(space, offset - 0x20, data); return;
@@ -1641,7 +1641,7 @@ WRITE8_MEMBER(dynax_state::gekisha_8000_w)
case 0x8044:
case 0x8045:
case 0x8046:
- case 0x8047: dynax_blitter_rev2_w(&space, offset - 0x41, data); return;
+ case 0x8047: dynax_blitter_rev2_w(space, offset - 0x41, data); return;
case 0x8050: // CRT controller
case 0x8051: return;
diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c
index 01eae481057..7e697b189fa 100644
--- a/src/mame/drivers/dynduke.c
+++ b/src/mame/drivers/dynduke.c
@@ -80,19 +80,19 @@ static ADDRESS_MAP_START( master_map, AS_PROGRAM, 16, dynduke_state )
AM_RANGE(0x0b000, 0x0b001) AM_READ_PORT("P1_P2")
AM_RANGE(0x0b002, 0x0b003) AM_READ_PORT("DSW")
AM_RANGE(0x0b004, 0x0b005) AM_WRITENOP
- AM_RANGE(0x0b006, 0x0b007) AM_WRITE_LEGACY(dynduke_control_w)
- AM_RANGE(0x0c000, 0x0c7ff) AM_RAM_WRITE_LEGACY(dynduke_text_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0b006, 0x0b007) AM_WRITE(dynduke_control_w)
+ AM_RANGE(0x0c000, 0x0c7ff) AM_RAM_WRITE(dynduke_text_w) AM_BASE(m_videoram)
AM_RANGE(0x0d000, 0x0d00d) AM_READWRITE_LEGACY(seibu_main_word_r, seibu_main_word_w)
AM_RANGE(0xa0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 16, dynduke_state )
AM_RANGE(0x00000, 0x05fff) AM_RAM
- AM_RANGE(0x06000, 0x067ff) AM_RAM_WRITE_LEGACY(dynduke_background_w) AM_BASE(m_back_data)
- AM_RANGE(0x06800, 0x06fff) AM_RAM_WRITE_LEGACY(dynduke_foreground_w) AM_BASE(m_fore_data)
- AM_RANGE(0x07000, 0x07fff) AM_RAM_WRITE_LEGACY(dynduke_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x06000, 0x067ff) AM_RAM_WRITE(dynduke_background_w) AM_BASE(m_back_data)
+ AM_RANGE(0x06800, 0x06fff) AM_RAM_WRITE(dynduke_foreground_w) AM_BASE(m_fore_data)
+ AM_RANGE(0x07000, 0x07fff) AM_RAM_WRITE(dynduke_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x08000, 0x08fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x0a000, 0x0a001) AM_WRITE_LEGACY(dynduke_gfxbank_w)
+ AM_RANGE(0x0a000, 0x0a001) AM_WRITE(dynduke_gfxbank_w)
AM_RANGE(0x0c000, 0x0c001) AM_WRITENOP
AM_RANGE(0xc0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -101,14 +101,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( masterj_map, AS_PROGRAM, 16, dynduke_state )
AM_RANGE(0x00000, 0x06fff) AM_RAM
AM_RANGE(0x07000, 0x07fff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x08000, 0x087ff) AM_RAM_WRITE_LEGACY(dynduke_text_w) AM_BASE(m_videoram)
+ AM_RANGE(0x08000, 0x087ff) AM_RAM_WRITE(dynduke_text_w) AM_BASE(m_videoram)
AM_RANGE(0x09000, 0x0900d) AM_READWRITE_LEGACY(seibu_main_word_r, seibu_main_word_w)
AM_RANGE(0x0c000, 0x0c0ff) AM_RAM AM_BASE(m_scroll_ram)
AM_RANGE(0x0e000, 0x0efff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x0f000, 0x0f001) AM_READ_PORT("P1_P2")
AM_RANGE(0x0f002, 0x0f003) AM_READ_PORT("DSW")
AM_RANGE(0x0f004, 0x0f005) AM_WRITENOP
- AM_RANGE(0x0f006, 0x0f007) AM_WRITE_LEGACY(dynduke_control_w)
+ AM_RANGE(0x0f006, 0x0f007) AM_WRITE(dynduke_control_w)
AM_RANGE(0xa0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index 20311eb3f17..d3b4bb05b70 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -147,7 +147,7 @@ READ32_MEMBER(eolith_state::hidctch3_pen2_r)
static ADDRESS_MAP_START( eolith_map, AS_PROGRAM, 32, eolith_state )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM // fort2b wants ram here
AM_RANGE(0x40000000, 0x401fffff) AM_RAM
- AM_RANGE(0x90000000, 0x9003ffff) AM_READWRITE_LEGACY(eolith_vram_r, eolith_vram_w)
+ AM_RANGE(0x90000000, 0x9003ffff) AM_READWRITE(eolith_vram_r, eolith_vram_w)
AM_RANGE(0xfc000000, 0xfc000003) AM_READ(eolith_custom_r)
AM_RANGE(0xfc400000, 0xfc400003) AM_WRITE(systemcontrol_w)
AM_RANGE(0xfc800000, 0xfc800003) AM_WRITENOP // sound latch
diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c
index 3bfbd26144c..2fc7d0a35b0 100644
--- a/src/mame/drivers/epos.c
+++ b/src/mame/drivers/epos.c
@@ -79,7 +79,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( io_map, AS_IO, 8, epos_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW") AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(epos_port_1_w)
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM") AM_WRITE(epos_port_1_w)
AM_RANGE(0x02, 0x02) AM_READ_PORT("INPUTS") AM_DEVWRITE_LEGACY("aysnd", ay8910_data_w)
AM_RANGE(0x03, 0x03) AM_READ_PORT("UNK")
AM_RANGE(0x06, 0x06) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w)
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index b12c2b00722..3a3a186fe47 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -706,21 +706,21 @@ WRITE16_MEMBER(equites_state::mcu_halt_clear_w)
static ADDRESS_MAP_START( equites_map, AS_PROGRAM, 16, equites_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM // ROM area is written several times (dev system?)
AM_RANGE(0x040000, 0x040fff) AM_RAM AM_SHARE("nvram") // nvram is for gekisou only
- AM_RANGE(0x080000, 0x080fff) AM_READWRITE_LEGACY(equites_fg_videoram_r, equites_fg_videoram_w) // 8-bit
- AM_RANGE(0x0c0000, 0x0c01ff) AM_RAM_WRITE_LEGACY(equites_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x080000, 0x080fff) AM_READWRITE(equites_fg_videoram_r, equites_fg_videoram_w) // 8-bit
+ AM_RANGE(0x0c0000, 0x0c01ff) AM_RAM_WRITE(equites_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x0c0200, 0x0c0fff) AM_RAM
AM_RANGE(0x100000, 0x100001) AM_READ(equites_spriteram_kludge_r)
AM_RANGE(0x100000, 0x1001ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x140000, 0x1407ff) AM_READWRITE(mcu_r, mcu_w) // 8-bit
AM_RANGE(0x180000, 0x180001) AM_READ_PORT("IN1") AM_WRITE(soundlatch_word_w) // LSB: sound latch
- AM_RANGE(0x184000, 0x184001) AM_WRITE_LEGACY(equites_flip0_w)
+ AM_RANGE(0x184000, 0x184001) AM_WRITE(equites_flip0_w)
AM_RANGE(0x188000, 0x188001) AM_WRITE(mcu_halt_clear_w) // 8404 control port1
AM_RANGE(0x18c000, 0x18c001) AM_WRITENOP // 8404 control port2
- AM_RANGE(0x1a4000, 0x1a4001) AM_WRITE_LEGACY(equites_flip1_w)
+ AM_RANGE(0x1a4000, 0x1a4001) AM_WRITE(equites_flip1_w)
AM_RANGE(0x1a8000, 0x1a8001) AM_WRITE(mcu_halt_assert_w) // 8404 control port3
AM_RANGE(0x1ac000, 0x1ac001) AM_WRITENOP // 8404 control port4
- AM_RANGE(0x1c0000, 0x1c0001) AM_READ_PORT("IN0") AM_WRITE_LEGACY(equites_scrollreg_w) // scroll register[XXYY]
- AM_RANGE(0x380000, 0x380001) AM_WRITE_LEGACY(equites_bgcolor_w) // bg color register[CC--]
+ AM_RANGE(0x1c0000, 0x1c0001) AM_READ_PORT("IN0") AM_WRITE(equites_scrollreg_w) // scroll register[XXYY]
+ AM_RANGE(0x380000, 0x380001) AM_WRITE(equites_bgcolor_w) // bg color register[CC--]
// 580000 unknown (protection?) (gekisou only, installed by DRIVER_INIT)
// 5a0000 unknown (protection?) (gekisou only, installed by DRIVER_INIT)
AM_RANGE(0x780000, 0x780001) AM_WRITE(watchdog_reset16_w)
@@ -730,20 +730,20 @@ static ADDRESS_MAP_START( splndrbt_map, AS_PROGRAM, 16, equites_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x040fff) AM_RAM AM_BASE(m_workram) // work RAM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0") // joyport [2211]
- AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("IN1") AM_WRITE_LEGACY(splndrbt_flip0_w) // [MMLL] MM: bg color register, LL: normal screen
+ AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("IN1") AM_WRITE(splndrbt_flip0_w) // [MMLL] MM: bg color register, LL: normal screen
AM_RANGE(0x0c4000, 0x0c4001) AM_WRITE(mcu_halt_clear_w) // 8404 control port1
AM_RANGE(0x0c8000, 0x0c8001) AM_WRITENOP // 8404 control port2
- AM_RANGE(0x0cc000, 0x0cc001) AM_WRITE_LEGACY(splndrbt_selchar0_w) // select active char map
- AM_RANGE(0x0e0000, 0x0e0001) AM_WRITE_LEGACY(splndrbt_flip1_w) // [MMLL] MM: not used, LL: flip screen
+ AM_RANGE(0x0cc000, 0x0cc001) AM_WRITE(splndrbt_selchar0_w) // select active char map
+ AM_RANGE(0x0e0000, 0x0e0001) AM_WRITE(splndrbt_flip1_w) // [MMLL] MM: not used, LL: flip screen
AM_RANGE(0x0e4000, 0x0e4001) AM_WRITE(mcu_halt_assert_w) // 8404 control port3
AM_RANGE(0x0e8000, 0x0e8001) AM_WRITENOP // 8404 control port4
- AM_RANGE(0x0ec000, 0x0ec001) AM_WRITE_LEGACY(splndrbt_selchar1_w) // select active char map
- AM_RANGE(0x100000, 0x100001) AM_WRITE_LEGACY(splndrbt_bg_scrollx_w)
+ AM_RANGE(0x0ec000, 0x0ec001) AM_WRITE(splndrbt_selchar1_w) // select active char map
+ AM_RANGE(0x100000, 0x100001) AM_WRITE(splndrbt_bg_scrollx_w)
AM_RANGE(0x140000, 0x140001) AM_WRITE(soundlatch_word_w) // LSB: sound command
- AM_RANGE(0x1c0000, 0x1c0001) AM_WRITE_LEGACY(splndrbt_bg_scrolly_w)
+ AM_RANGE(0x1c0000, 0x1c0001) AM_WRITE(splndrbt_bg_scrolly_w)
AM_RANGE(0x180000, 0x1807ff) AM_READWRITE(mcu_r, mcu_w) // 8-bit
- AM_RANGE(0x200000, 0x200fff) AM_MIRROR(0x1000) AM_READWRITE_LEGACY(equites_fg_videoram_r, equites_fg_videoram_w) // 8-bit
- AM_RANGE(0x400000, 0x4007ff) AM_RAM_WRITE_LEGACY(equites_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x200000, 0x200fff) AM_MIRROR(0x1000) AM_READWRITE(equites_fg_videoram_r, equites_fg_videoram_w) // 8-bit
+ AM_RANGE(0x400000, 0x4007ff) AM_RAM_WRITE(equites_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x400800, 0x400fff) AM_RAM
AM_RANGE(0x600000, 0x6000ff) AM_RAM AM_BASE(m_spriteram) // sprite RAM 0,1
AM_RANGE(0x600100, 0x6001ff) AM_RAM AM_BASE(m_spriteram_2) // sprite RAM 2 (8-bit)
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index 2ec2b025ea5..6dab380a2c2 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -85,8 +85,8 @@ static ADDRESS_MAP_START( multchmp_map, AS_PROGRAM, 16, esd16_state )
AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
/**/AM_RANGE(0x300000, 0x3007ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x300800, 0x300807) AM_WRITE(esd16_spriteram_w) // Sprites (Mirrored)
-/**/AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE_LEGACY(esd16_vram_0_w) AM_BASE(m_vram_0) // Layers
-/**/AM_RANGE(0x420000, 0x423fff) AM_RAM_WRITE_LEGACY(esd16_vram_1_w) AM_BASE(m_vram_1) //
+/**/AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE(esd16_vram_0_w) AM_BASE(m_vram_0) // Layers
+/**/AM_RANGE(0x420000, 0x423fff) AM_RAM_WRITE(esd16_vram_1_w) AM_BASE(m_vram_1) //
/**/AM_RANGE(0x500000, 0x500003) AM_RAM AM_BASE(m_scroll_0) // Scroll
/**/AM_RANGE(0x500004, 0x500007) AM_RAM AM_BASE(m_scroll_1) //
AM_RANGE(0x500008, 0x500009) AM_WRITEONLY AM_BASE(m_headpanic_platform_x)
@@ -96,7 +96,7 @@ static ADDRESS_MAP_START( multchmp_map, AS_PROGRAM, 16, esd16_state )
AM_RANGE(0x600002, 0x600003) AM_READ_PORT("P1_P2")
AM_RANGE(0x600004, 0x600005) AM_READ_PORT("SYSTEM")
AM_RANGE(0x600006, 0x600007) AM_READ_PORT("DSW")
- AM_RANGE(0x600008, 0x600009) AM_WRITE_LEGACY(esd16_tilemap0_color_w) // Flip Screen + Tileamp0 palette banking
+ AM_RANGE(0x600008, 0x600009) AM_WRITE(esd16_tilemap0_color_w) // Flip Screen + Tileamp0 palette banking
AM_RANGE(0x60000a, 0x60000b) AM_WRITENOP // ? 2
AM_RANGE(0x60000c, 0x60000d) AM_WRITE(esd16_sound_command_w) // To Sound CPU
AM_RANGE(0x700008, 0x70000b) AM_READNOP // ? Only read once
@@ -136,9 +136,9 @@ static ADDRESS_MAP_START( hedpanic_map, AS_PROGRAM, 16, esd16_state )
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x900000, 0x9007ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x900800, 0x900807) AM_WRITE(esd16_spriteram_w) // Sprites (Mirrored)
- AM_RANGE(0xa00000, 0xa03fff) AM_WRITE_LEGACY(esd16_vram_0_w) AM_BASE(m_vram_0) // Layers
- AM_RANGE(0xa20000, 0xa23fff) AM_WRITE_LEGACY(esd16_vram_1_w) AM_BASE(m_vram_1) //
- AM_RANGE(0xa24000, 0xa27fff) AM_WRITE_LEGACY(esd16_vram_1_w) AM_BASE(m_vram_1) // mirror?
+ AM_RANGE(0xa00000, 0xa03fff) AM_WRITE(esd16_vram_0_w) AM_BASE(m_vram_0) // Layers
+ AM_RANGE(0xa20000, 0xa23fff) AM_WRITE(esd16_vram_1_w) AM_BASE(m_vram_1) //
+ AM_RANGE(0xa24000, 0xa27fff) AM_WRITE(esd16_vram_1_w) AM_BASE(m_vram_1) // mirror?
AM_RANGE(0xb00000, 0xb00003) AM_WRITEONLY AM_BASE(m_scroll_0) // Scroll
AM_RANGE(0xb00004, 0xb00007) AM_WRITEONLY AM_BASE(m_scroll_1) //
AM_RANGE(0xb00008, 0xb00009) AM_WRITEONLY AM_BASE(m_headpanic_platform_x)
@@ -149,7 +149,7 @@ static ADDRESS_MAP_START( hedpanic_map, AS_PROGRAM, 16, esd16_state )
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("P1_P2")
AM_RANGE(0xc00004, 0xc00005) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc00006, 0xc00007) AM_READ(esd_eeprom_r)
- AM_RANGE(0xc00008, 0xc00009) AM_WRITE_LEGACY(esd16_tilemap0_color_w) // Flip Screen + Tileamp0 palette banking
+ AM_RANGE(0xc00008, 0xc00009) AM_WRITE(esd16_tilemap0_color_w) // Flip Screen + Tileamp0 palette banking
AM_RANGE(0xc0000a, 0xc0000b) AM_WRITENOP // ? 2 not checked
AM_RANGE(0xc0000c, 0xc0000d) AM_WRITE(esd16_sound_command_w) // To Sound CPU // ok
AM_RANGE(0xc0000e, 0xc0000f) AM_WRITE(esd_eeprom_w)
@@ -161,15 +161,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mchampdx_map, AS_PROGRAM, 16, esd16_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
- AM_RANGE(0x300000, 0x303fff) AM_WRITE_LEGACY(esd16_vram_0_w) AM_BASE(m_vram_0) // Layers
- AM_RANGE(0x320000, 0x323fff) AM_WRITE_LEGACY(esd16_vram_1_w) AM_BASE(m_vram_1) //
- AM_RANGE(0x324000, 0x327fff) AM_WRITE_LEGACY(esd16_vram_1_w) AM_BASE(m_vram_1) // mirror?
+ AM_RANGE(0x300000, 0x303fff) AM_WRITE(esd16_vram_0_w) AM_BASE(m_vram_0) // Layers
+ AM_RANGE(0x320000, 0x323fff) AM_WRITE(esd16_vram_1_w) AM_BASE(m_vram_1) //
+ AM_RANGE(0x324000, 0x327fff) AM_WRITE(esd16_vram_1_w) AM_BASE(m_vram_1) // mirror?
AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x500000, 0x500001) AM_WRITENOP // IRQ Ack
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P1_P2")
AM_RANGE(0x500004, 0x500005) AM_READ_PORT("SYSTEM")
AM_RANGE(0x500006, 0x500007) AM_READ(esd_eeprom_r)
- AM_RANGE(0x500008, 0x500009) AM_WRITE_LEGACY(esd16_tilemap0_color_w) // Flip Screen + Tileamp0 palette banking
+ AM_RANGE(0x500008, 0x500009) AM_WRITE(esd16_tilemap0_color_w) // Flip Screen + Tileamp0 palette banking
AM_RANGE(0x50000a, 0x50000b) AM_WRITENOP // ? 2 not checked
AM_RANGE(0x50000c, 0x50000d) AM_WRITE(esd16_sound_command_w) // To Sound CPU // ok
AM_RANGE(0x50000e, 0x50000f) AM_WRITE(esd_eeprom_w)
@@ -191,9 +191,9 @@ static ADDRESS_MAP_START( tangtang_map, AS_PROGRAM, 16, esd16_state )
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // RAM
AM_RANGE(0x200000, 0x2007ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x200800, 0x200807) AM_WRITE(esd16_spriteram_w) // Sprites (Mirrored)
- AM_RANGE(0x300000, 0x303fff) AM_WRITE_LEGACY(esd16_vram_0_w) AM_BASE(m_vram_0) // Layers
- AM_RANGE(0x320000, 0x323fff) AM_WRITE_LEGACY(esd16_vram_1_w) AM_BASE(m_vram_1) //
- AM_RANGE(0x324000, 0x327fff) AM_WRITE_LEGACY(esd16_vram_1_w) AM_BASE(m_vram_1) // mirror?
+ AM_RANGE(0x300000, 0x303fff) AM_WRITE(esd16_vram_0_w) AM_BASE(m_vram_0) // Layers
+ AM_RANGE(0x320000, 0x323fff) AM_WRITE(esd16_vram_1_w) AM_BASE(m_vram_1) //
+ AM_RANGE(0x324000, 0x327fff) AM_WRITE(esd16_vram_1_w) AM_BASE(m_vram_1) // mirror?
AM_RANGE(0x400000, 0x400003) AM_WRITEONLY AM_BASE(m_scroll_0) // Scroll
AM_RANGE(0x400004, 0x400007) AM_WRITEONLY AM_BASE(m_scroll_1) //
AM_RANGE(0x400008, 0x400009) AM_WRITEONLY AM_BASE(m_headpanic_platform_x) // not used in mchampdx?
@@ -204,7 +204,7 @@ static ADDRESS_MAP_START( tangtang_map, AS_PROGRAM, 16, esd16_state )
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P1_P2")
AM_RANGE(0x500004, 0x500005) AM_READ_PORT("SYSTEM")
AM_RANGE(0x500006, 0x500007) AM_READ(esd_eeprom_r)
- AM_RANGE(0x500008, 0x500009) AM_WRITE_LEGACY(esd16_tilemap0_color_w) // Flip Screen + Tileamp0 palette banking
+ AM_RANGE(0x500008, 0x500009) AM_WRITE(esd16_tilemap0_color_w) // Flip Screen + Tileamp0 palette banking
AM_RANGE(0x50000a, 0x50000b) AM_WRITENOP // ? 2 not checked
AM_RANGE(0x50000c, 0x50000d) AM_WRITE(esd16_sound_command_w) // To Sound CPU // ok
AM_RANGE(0x50000e, 0x50000f) AM_WRITE(esd_eeprom_w)
diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c
index e10f58df6ab..7a8bde6f06a 100644
--- a/src/mame/drivers/espial.c
+++ b/src/mame/drivers/espial.c
@@ -116,15 +116,15 @@ static ADDRESS_MAP_START( espial_map, AS_PROGRAM, 8, espial_state )
AM_RANGE(0x6090, 0x6090) AM_READ(soundlatch2_r) AM_WRITE(espial_master_soundlatch_w)
AM_RANGE(0x7000, 0x7000) AM_READWRITE(watchdog_reset_r, watchdog_reset_w)
AM_RANGE(0x7100, 0x7100) AM_WRITE(espial_master_interrupt_mask_w)
- AM_RANGE(0x7200, 0x7200) AM_WRITE_LEGACY(espial_flipscreen_w)
+ AM_RANGE(0x7200, 0x7200) AM_WRITE(espial_flipscreen_w)
AM_RANGE(0x8000, 0x801f) AM_RAM AM_BASE(m_spriteram_1)
AM_RANGE(0x8020, 0x803f) AM_READONLY
- AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE_LEGACY(espial_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(espial_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x8800, 0x880f) AM_WRITEONLY AM_BASE(m_spriteram_3)
- AM_RANGE(0x8c00, 0x8fff) AM_RAM_WRITE_LEGACY(espial_attributeram_w) AM_BASE(m_attributeram)
+ AM_RANGE(0x8c00, 0x8fff) AM_RAM_WRITE(espial_attributeram_w) AM_BASE(m_attributeram)
AM_RANGE(0x9000, 0x901f) AM_RAM AM_BASE(m_spriteram_2)
- AM_RANGE(0x9020, 0x903f) AM_RAM_WRITE_LEGACY(espial_scrollram_w) AM_BASE(m_scrollram)
- AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE_LEGACY(espial_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x9020, 0x903f) AM_RAM_WRITE(espial_scrollram_w) AM_BASE(m_scrollram)
+ AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE(espial_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xc000, 0xcfff) AM_ROM
ADDRESS_MAP_END
@@ -141,14 +141,14 @@ static ADDRESS_MAP_START( netwars_map, AS_PROGRAM, 8, espial_state )
AM_RANGE(0x6090, 0x6090) AM_READ(soundlatch2_r) AM_WRITE(espial_master_soundlatch_w)
AM_RANGE(0x7000, 0x7000) AM_READWRITE(watchdog_reset_r, watchdog_reset_w)
AM_RANGE(0x7100, 0x7100) AM_WRITE(espial_master_interrupt_mask_w)
- AM_RANGE(0x7200, 0x7200) AM_WRITE_LEGACY(espial_flipscreen_w)
+ AM_RANGE(0x7200, 0x7200) AM_WRITE(espial_flipscreen_w)
AM_RANGE(0x8000, 0x801f) AM_RAM AM_BASE(m_spriteram_1)
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(espial_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(espial_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x8800, 0x880f) AM_RAM AM_BASE(m_spriteram_3)
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(espial_attributeram_w) AM_BASE(m_attributeram)
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(espial_attributeram_w) AM_BASE(m_attributeram)
AM_RANGE(0x9000, 0x901f) AM_RAM AM_BASE(m_spriteram_2)
- AM_RANGE(0x9020, 0x903f) AM_RAM_WRITE_LEGACY(espial_scrollram_w) AM_BASE(m_scrollram)
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(espial_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x9020, 0x903f) AM_RAM_WRITE(espial_scrollram_w) AM_BASE(m_scrollram)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(espial_colorram_w) AM_BASE(m_colorram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/esripsys.c b/src/mame/drivers/esripsys.c
index c33f8391e28..38a43d4cd97 100644
--- a/src/mame/drivers/esripsys.c
+++ b/src/mame/drivers/esripsys.c
@@ -595,7 +595,7 @@ WRITE8_MEMBER(esripsys_state::volume_dac_w)
static ADDRESS_MAP_START( game_cpu_map, AS_PROGRAM, 8, esripsys_state )
AM_RANGE(0x0000, 0x3fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x4000, 0x42ff) AM_RAM AM_BASE(m_pal_ram)
- AM_RANGE(0x4300, 0x4300) AM_WRITE_LEGACY(esripsys_bg_intensity_w)
+ AM_RANGE(0x4300, 0x4300) AM_WRITE(esripsys_bg_intensity_w)
AM_RANGE(0x4400, 0x47ff) AM_NOP /* Collision detection RAM */
AM_RANGE(0x4800, 0x4bff) AM_READWRITE(g_status_r, g_status_w)
AM_RANGE(0x4c00, 0x4fff) AM_READWRITE(g_iobus_r, g_iobus_w)
diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c
index fd9caa9f94e..4ca96eb103e 100644
--- a/src/mame/drivers/exedexes.c
+++ b/src/mame/drivers/exedexes.c
@@ -36,14 +36,14 @@ static ADDRESS_MAP_START( exedexes_map, AS_PROGRAM, 8, exedexes_state )
AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW0")
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSW1")
AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w)
- AM_RANGE(0xc804, 0xc804) AM_WRITE_LEGACY(exedexes_c804_w) /* coin counters + text layer enable */
+ AM_RANGE(0xc804, 0xc804) AM_WRITE(exedexes_c804_w) /* coin counters + text layer enable */
AM_RANGE(0xc806, 0xc806) AM_WRITENOP /* Watchdog ?? */
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(exedexes_videoram_w) AM_BASE(m_videoram) /* Video RAM */
- AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE_LEGACY(exedexes_colorram_w) AM_BASE(m_colorram) /* Color RAM */
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(exedexes_videoram_w) AM_BASE(m_videoram) /* Video RAM */
+ AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(exedexes_colorram_w) AM_BASE(m_colorram) /* Color RAM */
AM_RANGE(0xd800, 0xd801) AM_WRITEONLY AM_BASE(m_nbg_yscroll)
AM_RANGE(0xd802, 0xd803) AM_WRITEONLY AM_BASE(m_nbg_xscroll)
AM_RANGE(0xd804, 0xd805) AM_WRITEONLY AM_BASE(m_bg_scroll)
- AM_RANGE(0xd807, 0xd807) AM_WRITE_LEGACY(exedexes_gfxctrl_w) /* layer enables */
+ AM_RANGE(0xd807, 0xd807) AM_WRITE(exedexes_gfxctrl_w) /* layer enables */
AM_RANGE(0xe000, 0xefff) AM_RAM /* Work RAM */
AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("spriteram") /* Sprite RAM */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index 226c2a79a6b..b98eeb54f08 100644
--- a/src/mame/drivers/exerion.c
+++ b/src/mame/drivers/exerion.c
@@ -200,7 +200,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, exerion_state )
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("DSW0")
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW1")
- AM_RANGE(0xc000, 0xc000) AM_WRITE_LEGACY(exerion_videoreg_w)
+ AM_RANGE(0xc000, 0xc000) AM_WRITE(exerion_videoreg_w)
AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w)
AM_RANGE(0xd000, 0xd001) AM_DEVWRITE_LEGACY("ay1", ay8910_address_data_w)
AM_RANGE(0xd800, 0xd801) AM_DEVWRITE_LEGACY("ay2", ay8910_address_data_w)
@@ -219,8 +219,8 @@ static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8, exerion_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
- AM_RANGE(0x8000, 0x800c) AM_WRITE_LEGACY(exerion_video_latch_w)
- AM_RANGE(0xa000, 0xa000) AM_READ_LEGACY(exerion_video_timing_r)
+ AM_RANGE(0x8000, 0x800c) AM_WRITE(exerion_video_latch_w)
+ AM_RANGE(0xa000, 0xa000) AM_READ(exerion_video_timing_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c
index e0484dab6b0..d52c0ddcaa4 100644
--- a/src/mame/drivers/exidy.c
+++ b/src/mame/drivers/exidy.c
@@ -212,7 +212,7 @@ static ADDRESS_MAP_START( exidy_map, AS_PROGRAM, 8, exidy_state )
AM_RANGE(0x5100, 0x5100) AM_MIRROR(0x00fc) AM_WRITEONLY AM_BASE(m_spriteno)
AM_RANGE(0x5101, 0x5101) AM_MIRROR(0x00fc) AM_READ_PORT("IN0")
AM_RANGE(0x5101, 0x5101) AM_MIRROR(0x00fc) AM_WRITEONLY AM_BASE(m_sprite_enable)
- AM_RANGE(0x5103, 0x5103) AM_MIRROR(0x00fc) AM_READ_LEGACY(exidy_interrupt_r)
+ AM_RANGE(0x5103, 0x5103) AM_MIRROR(0x00fc) AM_READ(exidy_interrupt_r)
AM_RANGE(0x5210, 0x5212) AM_WRITEONLY AM_BASE(m_color_latch)
AM_RANGE(0x5213, 0x5213) AM_READ_PORT("IN2")
ADDRESS_MAP_END
@@ -259,7 +259,7 @@ static ADDRESS_MAP_START( rallys_map, AS_PROGRAM, 8, exidy_state )
AM_RANGE(0x5100, 0x5100) AM_MIRROR(0x00fc) AM_WRITEONLY AM_BASE(m_spriteno)
AM_RANGE(0x5101, 0x5101) AM_MIRROR(0x00fc) AM_READ_PORT("IN0")
AM_RANGE(0x5101, 0x5101) AM_MIRROR(0x00fc) AM_WRITEONLY AM_BASE(m_sprite_enable)
- AM_RANGE(0x5103, 0x5103) AM_MIRROR(0x00fc) AM_READ_LEGACY(exidy_interrupt_r)
+ AM_RANGE(0x5103, 0x5103) AM_MIRROR(0x00fc) AM_READ(exidy_interrupt_r)
AM_RANGE(0x5200, 0x5200) AM_WRITE_LEGACY(targ_audio_1_w)
AM_RANGE(0x5201, 0x5201) AM_WRITE_LEGACY(spectar_audio_2_w)
AM_RANGE(0x5210, 0x5212) AM_WRITEONLY AM_BASE(m_color_latch)
diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c
index c665373fed2..367ded21ee2 100644
--- a/src/mame/drivers/exidy440.c
+++ b/src/mame/drivers/exidy440.c
@@ -470,14 +470,14 @@ static MACHINE_RESET( exidy440 )
static ADDRESS_MAP_START( exidy440_map, AS_PROGRAM, 8, exidy440_state )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE(m_imageram)
- AM_RANGE(0x2000, 0x209f) AM_RAM_WRITE_LEGACY(exidy440_spriteram_w) AM_BASE(m_spriteram)
+ AM_RANGE(0x2000, 0x209f) AM_RAM_WRITE(exidy440_spriteram_w) AM_BASE(m_spriteram)
AM_RANGE(0x20a0, 0x29ff) AM_RAM
- AM_RANGE(0x2a00, 0x2aff) AM_READWRITE_LEGACY(exidy440_videoram_r, exidy440_videoram_w)
- AM_RANGE(0x2b00, 0x2b00) AM_READ_LEGACY(exidy440_vertical_pos_r)
- AM_RANGE(0x2b01, 0x2b01) AM_READWRITE_LEGACY(exidy440_horizontal_pos_r, exidy440_interrupt_clear_w)
+ AM_RANGE(0x2a00, 0x2aff) AM_READWRITE(exidy440_videoram_r, exidy440_videoram_w)
+ AM_RANGE(0x2b00, 0x2b00) AM_READ(exidy440_vertical_pos_r)
+ AM_RANGE(0x2b01, 0x2b01) AM_READWRITE(exidy440_horizontal_pos_r, exidy440_interrupt_clear_w)
AM_RANGE(0x2b02, 0x2b02) AM_RAM AM_BASE(m_scanline)
- AM_RANGE(0x2b03, 0x2b03) AM_READ_PORT("IN0") AM_WRITE_LEGACY(exidy440_control_w)
- AM_RANGE(0x2c00, 0x2dff) AM_READWRITE_LEGACY(exidy440_paletteram_r, exidy440_paletteram_w)
+ AM_RANGE(0x2b03, 0x2b03) AM_READ_PORT("IN0") AM_WRITE(exidy440_control_w)
+ AM_RANGE(0x2c00, 0x2dff) AM_READWRITE(exidy440_paletteram_r, exidy440_paletteram_w)
AM_RANGE(0x2e00, 0x2e1f) AM_RAM_WRITE(sound_command_w)
AM_RANGE(0x2e20, 0x2e3f) AM_READWRITE(exidy440_input_port_3_r, exidy440_input_port_3_w)
AM_RANGE(0x2e40, 0x2e5f) AM_READNOP AM_WRITE(exidy440_coin_counter_w) /* read: clear coin counters I/O2 */
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index cbcc6627a7b..2a9cc0e7258 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -339,7 +339,7 @@ static WRITE16_HANDLER(galsnew_vram_0_bank_w)
{
if(state->m_vram[0][i])
{
- kaneko16_vram_0_w(space, i+1, data << 8, 0xFF00);
+ state->kaneko16_vram_0_w(*space, i+1, data << 8, 0xFF00);
}
}
state->m_vram_0_bank_num = data;
@@ -356,7 +356,7 @@ static WRITE16_HANDLER(galsnew_vram_1_bank_w)
{
if(state->m_vram[1][i])
{
- kaneko16_vram_1_w(space, i+1, data << 8, 0xFF00);
+ state->kaneko16_vram_1_w(*space, i+1, data << 8, 0xFF00);
}
}
state->m_vram_1_bank_num = data;
@@ -379,18 +379,18 @@ static ADDRESS_MAP_START( galsnew_map, AS_PROGRAM, 16, expro02_state )
AM_RANGE(0x500000, 0x51ffff) AM_RAM AM_BASE(m_galsnew_bg_pixram)
AM_RANGE(0x520000, 0x53ffff) AM_RAM AM_BASE(m_galsnew_fg_pixram)
- AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
- AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
+ AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
+ AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0x582000, 0x582fff) AM_RAM AM_BASE(m_vscroll[1]) //
AM_RANGE(0x583000, 0x583fff) AM_RAM AM_BASE(m_vscroll[0]) //
AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE_LEGACY(galsnew_paletteram_w) AM_SHARE("paletteram") // palette?
- AM_RANGE(0x680000, 0x68001f) AM_RAM_WRITE_LEGACY(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // sprite regs? tileregs?
+ AM_RANGE(0x680000, 0x68001f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // sprite regs? tileregs?
AM_RANGE(0x700000, 0x700fff) AM_RAM AM_SHARE("spriteram") // sprites? 0x72f words tested
- AM_RANGE(0x780000, 0x78001f) AM_RAM_WRITE_LEGACY(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // sprite regs? tileregs?
+ AM_RANGE(0x780000, 0x78001f) AM_RAM_WRITE(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // sprite regs? tileregs?
AM_RANGE(0x800000, 0x800001) AM_READ_PORT("DSW1")
AM_RANGE(0x800002, 0x800003) AM_READ_PORT("DSW2")
@@ -404,7 +404,7 @@ static ADDRESS_MAP_START( galsnew_map, AS_PROGRAM, 16, expro02_state )
AM_RANGE(0xd80000, 0xd80001) AM_WRITE_LEGACY(galsnew_vram_1_bank_w) /* ??? */
- AM_RANGE(0xe00000, 0xe00015) AM_READWRITE_LEGACY(galpanib_calc_r,galpanib_calc_w) /* CALC1 MCU interaction (simulated) */
+ AM_RANGE(0xe00000, 0xe00015) AM_READWRITE(galpanib_calc_r,galpanib_calc_w) /* CALC1 MCU interaction (simulated) */
AM_RANGE(0xe80000, 0xe80001) AM_WRITE_LEGACY(galsnew_vram_0_bank_w) /* ??? */
ADDRESS_MAP_END
@@ -416,14 +416,14 @@ static ADDRESS_MAP_START( fantasia_map, AS_PROGRAM, 16, expro02_state )
AM_RANGE(0x000000, 0x4fffff) AM_ROM
AM_RANGE(0x500000, 0x51ffff) AM_RAM AM_BASE(m_galsnew_bg_pixram)
AM_RANGE(0x520000, 0x53ffff) AM_RAM AM_BASE(m_galsnew_fg_pixram)
- AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
- AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
+ AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
+ AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0x582000, 0x582fff) AM_RAM AM_BASE(m_vscroll[1]) //
AM_RANGE(0x583000, 0x583fff) AM_RAM AM_BASE(m_vscroll[0]) //
AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE_LEGACY(galsnew_paletteram_w) AM_SHARE("paletteram") // palette?
- AM_RANGE(0x680000, 0x68001f) AM_RAM_WRITE_LEGACY(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // sprite regs? tileregs?
+ AM_RANGE(0x680000, 0x68001f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // sprite regs? tileregs?
AM_RANGE(0x700000, 0x700fff) AM_RAM AM_SHARE("spriteram") // sprites? 0x72f words tested
- AM_RANGE(0x780000, 0x78001f) AM_RAM_WRITE_LEGACY(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // sprite regs? tileregs?
+ AM_RANGE(0x780000, 0x78001f) AM_RAM_WRITE(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // sprite regs? tileregs?
AM_RANGE(0x800000, 0x800001) AM_READ_PORT("DSW1")
AM_RANGE(0x800002, 0x800003) AM_READ_PORT("DSW2")
AM_RANGE(0x800004, 0x800005) AM_READ_PORT("DSW3")
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index f117c7a7948..4ea59dc5b41 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -244,8 +244,8 @@ READ8_MEMBER(exprraid_state::vblank_r)
static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8, exprraid_state )
AM_RANGE(0x0000, 0x05ff) AM_RAM AM_BASE(m_main_ram)
AM_RANGE(0x0600, 0x07ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE_LEGACY(exprraid_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE_LEGACY(exprraid_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(exprraid_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(exprraid_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x1317, 0x1317) AM_READNOP // ???
AM_RANGE(0x1700, 0x1700) AM_READNOP // ???
AM_RANGE(0x1800, 0x1800) AM_READ_PORT("DSW0") /* DSW 0 */
@@ -254,12 +254,12 @@ static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8, exprraid_state )
AM_RANGE(0x1803, 0x1803) AM_READ_PORT("DSW1") /* DSW 1 */
AM_RANGE(0x2000, 0x2000) AM_WRITENOP // ???
AM_RANGE(0x2001, 0x2001) AM_WRITE(sound_cpu_command_w)
- AM_RANGE(0x2002, 0x2002) AM_WRITE_LEGACY(exprraid_flipscreen_w)
+ AM_RANGE(0x2002, 0x2002) AM_WRITE(exprraid_flipscreen_w)
AM_RANGE(0x2003, 0x2003) AM_WRITENOP // ???
AM_RANGE(0x2800, 0x2801) AM_READ(exprraid_protection_r)
- AM_RANGE(0x2800, 0x2803) AM_WRITE_LEGACY(exprraid_bgselect_w)
- AM_RANGE(0x2804, 0x2804) AM_WRITE_LEGACY(exprraid_scrolly_w)
- AM_RANGE(0x2805, 0x2806) AM_WRITE_LEGACY(exprraid_scrollx_w)
+ AM_RANGE(0x2800, 0x2803) AM_WRITE(exprraid_bgselect_w)
+ AM_RANGE(0x2804, 0x2804) AM_WRITE(exprraid_scrolly_w)
+ AM_RANGE(0x2805, 0x2806) AM_WRITE(exprraid_scrollx_w)
AM_RANGE(0x2807, 0x2807) AM_WRITENOP // Scroll related ?
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index f1660c95118..7e70825df64 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -137,8 +137,8 @@ static DRIVER_INIT( exzisus )
static ADDRESS_MAP_START( cpua_map, AS_PROGRAM, 8, exzisus_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
- AM_RANGE(0xc000, 0xc5ff) AM_READWRITE_LEGACY(exzisus_objectram_1_r, exzisus_objectram_1_w) AM_BASE(m_objectram1) AM_SIZE(m_objectram_size1)
- AM_RANGE(0xc600, 0xdfff) AM_READWRITE_LEGACY(exzisus_videoram_1_r, exzisus_videoram_1_w) AM_BASE(m_videoram1)
+ AM_RANGE(0xc000, 0xc5ff) AM_READWRITE(exzisus_objectram_1_r, exzisus_objectram_1_w) AM_BASE(m_objectram1) AM_SIZE(m_objectram_size1)
+ AM_RANGE(0xc600, 0xdfff) AM_READWRITE(exzisus_videoram_1_r, exzisus_videoram_1_w) AM_BASE(m_videoram1)
AM_RANGE(0xe000, 0xefff) AM_READWRITE(exzisus_sharedram_ac_r, exzisus_sharedram_ac_w) AM_BASE(m_sharedram_ac)
AM_RANGE(0xf400, 0xf400) AM_WRITE(exzisus_cpua_bankswitch_w)
AM_RANGE(0xf404, 0xf404) AM_WRITE(exzisus_cpub_reset_w) // ??
@@ -148,8 +148,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cpub_map, AS_PROGRAM, 8, exzisus_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xc5ff) AM_READWRITE_LEGACY(exzisus_objectram_0_r, exzisus_objectram_0_w) AM_BASE(m_objectram0) AM_SIZE(m_objectram_size0)
- AM_RANGE(0xc600, 0xdfff) AM_READWRITE_LEGACY(exzisus_videoram_0_r, exzisus_videoram_0_w) AM_BASE(m_videoram0)
+ AM_RANGE(0xc000, 0xc5ff) AM_READWRITE(exzisus_objectram_0_r, exzisus_objectram_0_w) AM_BASE(m_objectram0) AM_SIZE(m_objectram_size0)
+ AM_RANGE(0xc600, 0xdfff) AM_READWRITE(exzisus_videoram_0_r, exzisus_videoram_0_w) AM_BASE(m_videoram0)
AM_RANGE(0xe000, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xf000) AM_READNOP AM_DEVWRITE_LEGACY("tc0140syt", tc0140syt_port_w)
AM_RANGE(0xf001, 0xf001) AM_DEVREADWRITE_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w)
@@ -166,8 +166,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cpuc_map, AS_PROGRAM, 8, exzisus_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x85ff) AM_READWRITE_LEGACY(exzisus_objectram_1_r, exzisus_objectram_1_w)
- AM_RANGE(0x8600, 0x9fff) AM_READWRITE_LEGACY(exzisus_videoram_1_r, exzisus_videoram_1_w)
+ AM_RANGE(0x8000, 0x85ff) AM_READWRITE(exzisus_objectram_1_r, exzisus_objectram_1_w)
+ AM_RANGE(0x8600, 0x9fff) AM_READWRITE(exzisus_videoram_1_r, exzisus_videoram_1_w)
AM_RANGE(0xa000, 0xafff) AM_READWRITE(exzisus_sharedram_ac_r, exzisus_sharedram_ac_w)
AM_RANGE(0xb000, 0xbfff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index 7f49f89c622..37af171917f 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -91,24 +91,24 @@ static ADDRESS_MAP_START( f1gp_cpu1_map, AS_PROGRAM, 16, f1gp_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x2fffff) AM_READ(extrarom_r)
AM_RANGE(0xa00000, 0xbfffff) AM_READ(extrarom2_r)
- AM_RANGE(0xc00000, 0xc3ffff) AM_READWRITE_LEGACY(f1gp_zoomdata_r, f1gp_zoomdata_w)
- AM_RANGE(0xd00000, 0xd01fff) AM_READWRITE_LEGACY(f1gp_rozvideoram_r, f1gp_rozvideoram_w) AM_BASE(m_rozvideoram)
- AM_RANGE(0xd02000, 0xd03fff) AM_READWRITE_LEGACY(f1gp_rozvideoram_r, f1gp_rozvideoram_w) /* mirror */
- AM_RANGE(0xd04000, 0xd05fff) AM_READWRITE_LEGACY(f1gp_rozvideoram_r, f1gp_rozvideoram_w) /* mirror */
- AM_RANGE(0xd06000, 0xd07fff) AM_READWRITE_LEGACY(f1gp_rozvideoram_r, f1gp_rozvideoram_w) /* mirror */
+ AM_RANGE(0xc00000, 0xc3ffff) AM_READWRITE(f1gp_zoomdata_r, f1gp_zoomdata_w)
+ AM_RANGE(0xd00000, 0xd01fff) AM_READWRITE(f1gp_rozvideoram_r, f1gp_rozvideoram_w) AM_BASE(m_rozvideoram)
+ AM_RANGE(0xd02000, 0xd03fff) AM_READWRITE(f1gp_rozvideoram_r, f1gp_rozvideoram_w) /* mirror */
+ AM_RANGE(0xd04000, 0xd05fff) AM_READWRITE(f1gp_rozvideoram_r, f1gp_rozvideoram_w) /* mirror */
+ AM_RANGE(0xd06000, 0xd07fff) AM_READWRITE(f1gp_rozvideoram_r, f1gp_rozvideoram_w) /* mirror */
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_BASE_SIZE(m_spr1cgram, m_spr1cgram_size) // SPR-1 CG RAM
AM_RANGE(0xe04000, 0xe07fff) AM_RAM AM_BASE_SIZE(m_spr2cgram, m_spr2cgram_size) // SPR-2 CG RAM
AM_RANGE(0xf00000, 0xf003ff) AM_RAM AM_BASE(m_spr1vram) // SPR-1 VRAM
AM_RANGE(0xf10000, 0xf103ff) AM_RAM AM_BASE(m_spr2vram) // SPR-2 VRAM
AM_RANGE(0xff8000, 0xffbfff) AM_RAM // WORK RAM-1
AM_RANGE(0xffc000, 0xffcfff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(m_sharedram) // DUAL RAM
- AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE_LEGACY(f1gp_fgvideoram_w) AM_BASE(m_fgvideoram) // CHARACTER
+ AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE(f1gp_fgvideoram_w) AM_BASE(m_fgvideoram) // CHARACTER
AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // PALETTE
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("INPUTS")
- AM_RANGE(0xfff000, 0xfff001) AM_WRITE_LEGACY(f1gp_gfxctrl_w)
+ AM_RANGE(0xfff000, 0xfff001) AM_WRITE(f1gp_gfxctrl_w)
// AM_RANGE(0xfff002, 0xfff003) analog wheel?
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW1")
- AM_RANGE(0xfff002, 0xfff005) AM_WRITE_LEGACY(f1gp_fgscroll_w)
+ AM_RANGE(0xfff002, 0xfff005) AM_WRITE(f1gp_fgscroll_w)
AM_RANGE(0xfff006, 0xfff007) AM_READ_PORT("DSW2")
AM_RANGE(0xfff008, 0xfff009) AM_READ(command_pending_r)
AM_RANGE(0xfff008, 0xfff009) AM_WRITE(sound_command_w)
@@ -120,20 +120,20 @@ static ADDRESS_MAP_START( f1gp2_cpu1_map, AS_PROGRAM, 16, f1gp_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x2fffff) AM_READ(extrarom_r)
AM_RANGE(0xa00000, 0xa07fff) AM_RAM AM_BASE(m_sprcgram) // SPR-1 CG RAM + SPR-2 CG RAM
- AM_RANGE(0xd00000, 0xd01fff) AM_READWRITE_LEGACY(f1gp_rozvideoram_r, f1gp_rozvideoram_w) AM_BASE(m_rozvideoram) // BACK VRAM
+ AM_RANGE(0xd00000, 0xd01fff) AM_READWRITE(f1gp_rozvideoram_r, f1gp_rozvideoram_w) AM_BASE(m_rozvideoram) // BACK VRAM
AM_RANGE(0xe00000, 0xe00fff) AM_RAM AM_BASE(m_spritelist) // not checked + SPR-1 VRAM + SPR-2 VRAM
AM_RANGE(0xff8000, 0xffbfff) AM_RAM // WORK RAM-1
AM_RANGE(0xffc000, 0xffcfff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(m_sharedram) // DUAL RAM
- AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE_LEGACY(f1gp_fgvideoram_w) AM_BASE(m_fgvideoram) // CHARACTER
+ AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE(f1gp_fgvideoram_w) AM_BASE(m_fgvideoram) // CHARACTER
AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // PALETTE
- AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("INPUTS") AM_WRITE_LEGACY(f1gp2_gfxctrl_w)
+ AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("INPUTS") AM_WRITE(f1gp2_gfxctrl_w)
// AM_RANGE(0xfff002, 0xfff003) analog wheel?
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW1")
AM_RANGE(0xfff006, 0xfff007) AM_READ_PORT("DSW2")
AM_RANGE(0xfff008, 0xfff009) AM_READWRITE(command_pending_r, sound_command_w)
AM_RANGE(0xfff00a, 0xfff00b) AM_READ_PORT("DSW3")
AM_RANGE(0xfff020, 0xfff03f) AM_DEVWRITE_LEGACY("k053936", k053936_ctrl_w)
- AM_RANGE(0xfff044, 0xfff047) AM_WRITE_LEGACY(f1gp_fgscroll_w)
+ AM_RANGE(0xfff044, 0xfff047) AM_WRITE(f1gp_fgscroll_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( f1gp_cpu2_map, AS_PROGRAM, 16, f1gp_state )
@@ -186,18 +186,18 @@ static ADDRESS_MAP_START( f1gpb_cpu1_map, AS_PROGRAM, 16, f1gp_state )
AM_RANGE(0x100000, 0x2fffff) AM_READ(extrarom_r)
AM_RANGE(0xa00000, 0xbfffff) AM_READ(extrarom2_r)
AM_RANGE(0x800000, 0x801fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xc00000, 0xc3ffff) AM_READWRITE_LEGACY(f1gp_zoomdata_r, f1gp_zoomdata_w)
- AM_RANGE(0xd00000, 0xd01fff) AM_READWRITE_LEGACY(f1gp_rozvideoram_r, f1gp_rozvideoram_w) AM_BASE(m_rozvideoram)
- AM_RANGE(0xd02000, 0xd03fff) AM_READWRITE_LEGACY(f1gp_rozvideoram_r, f1gp_rozvideoram_w) /* mirror */
- AM_RANGE(0xd04000, 0xd05fff) AM_READWRITE_LEGACY(f1gp_rozvideoram_r, f1gp_rozvideoram_w) /* mirror */
- AM_RANGE(0xd06000, 0xd07fff) AM_READWRITE_LEGACY(f1gp_rozvideoram_r, f1gp_rozvideoram_w) /* mirror */
+ AM_RANGE(0xc00000, 0xc3ffff) AM_READWRITE(f1gp_zoomdata_r, f1gp_zoomdata_w)
+ AM_RANGE(0xd00000, 0xd01fff) AM_READWRITE(f1gp_rozvideoram_r, f1gp_rozvideoram_w) AM_BASE(m_rozvideoram)
+ AM_RANGE(0xd02000, 0xd03fff) AM_READWRITE(f1gp_rozvideoram_r, f1gp_rozvideoram_w) /* mirror */
+ AM_RANGE(0xd04000, 0xd05fff) AM_READWRITE(f1gp_rozvideoram_r, f1gp_rozvideoram_w) /* mirror */
+ AM_RANGE(0xd06000, 0xd07fff) AM_READWRITE(f1gp_rozvideoram_r, f1gp_rozvideoram_w) /* mirror */
AM_RANGE(0xe00000, 0xe03fff) AM_RAM //unused
AM_RANGE(0xe04000, 0xe07fff) AM_RAM //unused
AM_RANGE(0xf00000, 0xf003ff) AM_RAM //unused
AM_RANGE(0xf10000, 0xf103ff) AM_RAM //unused
AM_RANGE(0xff8000, 0xffbfff) AM_RAM
AM_RANGE(0xffc000, 0xffcfff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(m_sharedram)
- AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE_LEGACY(f1gp_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE(f1gp_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("INPUTS")
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW1")
diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c
index 758479fef6a..410fc0c9996 100644
--- a/src/mame/drivers/fastlane.c
+++ b/src/mame/drivers/fastlane.c
@@ -82,8 +82,8 @@ static ADDRESS_MAP_START( fastlane_map, AS_PROGRAM, 8, fastlane_state )
AM_RANGE(0x0f00, 0x0f1f) AM_DEVREADWRITE_LEGACY("k051733", k051733_r, k051733_w) /* 051733 (protection) */
AM_RANGE(0x1000, 0x17ff) AM_RAM AM_BASE(m_paletteram) /* Palette RAM */
AM_RANGE(0x1800, 0x1fff) AM_RAM /* Work RAM */
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(fastlane_vram1_w) AM_BASE(m_videoram1) /* Video RAM (chip 1) */
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE_LEGACY(fastlane_vram2_w) AM_BASE(m_videoram2) /* Video RAM (chip 2) */
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(fastlane_vram1_w) AM_BASE(m_videoram1) /* Video RAM (chip 1) */
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(fastlane_vram2_w) AM_BASE(m_videoram2) /* Video RAM (chip 2) */
AM_RANGE(0x3000, 0x3fff) AM_RAM AM_BASE(m_spriteram) /* Sprite RAM */
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM */
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */
diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c
index 47ca6d39f78..72b21e0521f 100644
--- a/src/mame/drivers/fcombat.c
+++ b/src/mame/drivers/fcombat.c
@@ -119,7 +119,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, fcombat_state )
AM_RANGE(0xe200, 0xe200) AM_READ_PORT("DSW1")
AM_RANGE(0xe300, 0xe300) AM_READ(e300_r)
AM_RANGE(0xe400, 0xe400) AM_READ(fcombat_protection_r) // protection?
- AM_RANGE(0xe800, 0xe800) AM_WRITE_LEGACY(fcombat_videoreg_w) // at least bit 0 for flip screen and joystick input multiplexor
+ AM_RANGE(0xe800, 0xe800) AM_WRITE(fcombat_videoreg_w) // at least bit 0 for flip screen and joystick input multiplexor
AM_RANGE(0xe900, 0xe900) AM_WRITE(e900_w)
AM_RANGE(0xea00, 0xea00) AM_WRITE(ea00_w)
AM_RANGE(0xeb00, 0xeb00) AM_WRITE(eb00_w)
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index 257afccb860..114081ee5e1 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -388,7 +388,7 @@ static ADDRESS_MAP_START( fcrash_map, AS_PROGRAM, 16, cps_state )
AM_RANGE(0x880006, 0x880007) AM_WRITE_LEGACY(fcrash_soundlatch_w) /* Sound command */
AM_RANGE(0x880008, 0x88000f) AM_READ(cps1_dsw_r) /* System input ports / Dip Switches */
AM_RANGE(0x890000, 0x890001) AM_WRITENOP // palette related?
- AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE_LEGACY(cps1_gfxram_w) AM_BASE_SIZE(m_gfxram, m_gfxram_size)
+ AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE(cps1_gfxram_w) AM_BASE_SIZE(m_gfxram, m_gfxram_size)
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
@@ -413,12 +413,12 @@ static ADDRESS_MAP_START( kodb_map, AS_PROGRAM, 16, cps_state )
AM_RANGE(0x800020, 0x800021) AM_READNOP /* ? Used by Rockman ? not mapped according to PAL */
AM_RANGE(0x800030, 0x800037) AM_WRITE(cps1_coinctrl_w)
/* Forgotten Worlds has dial controls on B-board mapped at 800040-80005f. See DRIVER_INIT */
- AM_RANGE(0x800100, 0x80013f) AM_WRITE_LEGACY(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* CPS-A custom */
- AM_RANGE(0x800140, 0x80017f) AM_READWRITE_LEGACY(cps1_cps_b_r, cps1_cps_b_w) AM_BASE(m_cps_b_regs) /* CPS-B custom */
+ AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_BASE(m_cps_a_regs) /* CPS-A custom */
+ AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_BASE(m_cps_b_regs) /* CPS-B custom */
// AM_RANGE(0x800180, 0x800187) AM_WRITE_LEGACY(cps1_soundlatch_w) /* Sound command */
// AM_RANGE(0x800188, 0x80018f) AM_WRITE_LEGACY(cps1_soundlatch2_w) /* Sound timer fade */
- AM_RANGE(0x8001c0, 0x8001ff) AM_READWRITE_LEGACY(cps1_cps_b_r, cps1_cps_b_w) /* mirror (SF2 revision "E" US 910228) */
- AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE_LEGACY(cps1_gfxram_w) AM_BASE_SIZE(m_gfxram, m_gfxram_size) /* SF2CE executes code from here */
+ AM_RANGE(0x8001c0, 0x8001ff) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) /* mirror (SF2 revision "E" US 910228) */
+ AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE(cps1_gfxram_w) AM_BASE_SIZE(m_gfxram, m_gfxram_size) /* SF2CE executes code from here */
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c
index 63c9c785d60..ddd2101b8ad 100644
--- a/src/mame/drivers/fgoal.c
+++ b/src/mame/drivers/fgoal.c
@@ -222,9 +222,9 @@ static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 8, fgoal_state )
AM_RANGE(0x0100, 0x03ff) AM_RAM
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE(m_video_ram)
- AM_RANGE(0x8000, 0x8000) AM_WRITE_LEGACY(fgoal_ypos_w)
- AM_RANGE(0x8001, 0x8001) AM_WRITE_LEGACY(fgoal_xpos_w)
- AM_RANGE(0x8002, 0x8002) AM_WRITE_LEGACY(fgoal_color_w)
+ AM_RANGE(0x8000, 0x8000) AM_WRITE(fgoal_ypos_w)
+ AM_RANGE(0x8001, 0x8001) AM_WRITE(fgoal_xpos_w)
+ AM_RANGE(0x8002, 0x8002) AM_WRITE(fgoal_color_w)
AM_RANGE(0xa000, 0xbfff) AM_ROM
AM_RANGE(0xd000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index b14d0e22def..f5c704f8a4a 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -95,7 +95,7 @@ WRITE8_MEMBER(finalizr_state::i8039_T0_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, finalizr_state )
AM_RANGE(0x0001, 0x0001) AM_WRITEONLY AM_BASE(m_scroll)
- AM_RANGE(0x0003, 0x0003) AM_WRITE_LEGACY(finalizr_videoctrl_w)
+ AM_RANGE(0x0003, 0x0003) AM_WRITE(finalizr_videoctrl_w)
AM_RANGE(0x0004, 0x0004) AM_WRITE(finalizr_flipscreen_w)
// AM_RANGE(0x0020, 0x003f) AM_WRITEONLY AM_BASE(m_scroll)
AM_RANGE(0x0800, 0x0800) AM_READ_PORT("DSW3")
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index 7963fa461a1..425ff605263 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -345,9 +345,9 @@ static ADDRESS_MAP_START( firetrap_map, AS_PROGRAM, 8, firetrap_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(firetrap_bg1videoram_w) AM_BASE(m_bg1videoram)
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(firetrap_bg2videoram_w) AM_BASE(m_bg2videoram)
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(firetrap_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(firetrap_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(firetrap_bg2videoram_w) AM_BASE(m_bg2videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(firetrap_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0xe800, 0xe97f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xf000, 0xf000) AM_WRITENOP /* IRQ acknowledge */
AM_RANGE(0xf001, 0xf001) AM_WRITE(firetrap_sound_command_w)
@@ -355,10 +355,10 @@ static ADDRESS_MAP_START( firetrap_map, AS_PROGRAM, 8, firetrap_state )
AM_RANGE(0xf003, 0xf003) AM_WRITE(flip_screen_w)
AM_RANGE(0xf004, 0xf004) AM_WRITE(firetrap_nmi_disable_w)
AM_RANGE(0xf005, 0xf005) AM_WRITE(firetrap_8751_w)
- AM_RANGE(0xf008, 0xf009) AM_WRITE_LEGACY(firetrap_bg1_scrollx_w)
- AM_RANGE(0xf00a, 0xf00b) AM_WRITE_LEGACY(firetrap_bg1_scrolly_w)
- AM_RANGE(0xf00c, 0xf00d) AM_WRITE_LEGACY(firetrap_bg2_scrollx_w)
- AM_RANGE(0xf00e, 0xf00f) AM_WRITE_LEGACY(firetrap_bg2_scrolly_w)
+ AM_RANGE(0xf008, 0xf009) AM_WRITE(firetrap_bg1_scrollx_w)
+ AM_RANGE(0xf00a, 0xf00b) AM_WRITE(firetrap_bg1_scrolly_w)
+ AM_RANGE(0xf00c, 0xf00d) AM_WRITE(firetrap_bg2_scrollx_w)
+ AM_RANGE(0xf00e, 0xf00f) AM_WRITE(firetrap_bg2_scrolly_w)
AM_RANGE(0xf010, 0xf010) AM_READ_PORT("IN0")
AM_RANGE(0xf011, 0xf011) AM_READ_PORT("IN1")
AM_RANGE(0xf012, 0xf012) AM_READ_PORT("IN2")
@@ -371,9 +371,9 @@ static ADDRESS_MAP_START( firetrap_bootleg_map, AS_PROGRAM, 8, firetrap_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(firetrap_bg1videoram_w) AM_BASE(m_bg1videoram)
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(firetrap_bg2videoram_w) AM_BASE(m_bg2videoram)
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(firetrap_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(firetrap_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(firetrap_bg2videoram_w) AM_BASE(m_bg2videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(firetrap_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0xe800, 0xe97f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xf000, 0xf000) AM_WRITENOP /* IRQ acknowledge */
AM_RANGE(0xf001, 0xf001) AM_WRITE(firetrap_sound_command_w)
@@ -381,10 +381,10 @@ static ADDRESS_MAP_START( firetrap_bootleg_map, AS_PROGRAM, 8, firetrap_state )
AM_RANGE(0xf003, 0xf003) AM_WRITE(flip_screen_w)
AM_RANGE(0xf004, 0xf004) AM_WRITE(firetrap_nmi_disable_w)
AM_RANGE(0xf005, 0xf005) AM_WRITENOP
- AM_RANGE(0xf008, 0xf009) AM_WRITE_LEGACY(firetrap_bg1_scrollx_w)
- AM_RANGE(0xf00a, 0xf00b) AM_WRITE_LEGACY(firetrap_bg1_scrolly_w)
- AM_RANGE(0xf00c, 0xf00d) AM_WRITE_LEGACY(firetrap_bg2_scrollx_w)
- AM_RANGE(0xf00e, 0xf00f) AM_WRITE_LEGACY(firetrap_bg2_scrolly_w)
+ AM_RANGE(0xf008, 0xf009) AM_WRITE(firetrap_bg1_scrollx_w)
+ AM_RANGE(0xf00a, 0xf00b) AM_WRITE(firetrap_bg1_scrolly_w)
+ AM_RANGE(0xf00c, 0xf00d) AM_WRITE(firetrap_bg2_scrollx_w)
+ AM_RANGE(0xf00e, 0xf00f) AM_WRITE(firetrap_bg2_scrolly_w)
AM_RANGE(0xf010, 0xf010) AM_READ_PORT("IN0")
AM_RANGE(0xf011, 0xf011) AM_READ_PORT("IN1")
AM_RANGE(0xf012, 0xf012) AM_READ_PORT("IN2")
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index 6e70666788c..18b58f38fb8 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -156,9 +156,9 @@ static ADDRESS_MAP_START( fitfight_main_map, AS_PROGRAM, 16, fitfight_state )
// histryma: @0x000031be,@0x00001d8e
AM_RANGE(0xb00000, 0xb03fff) AM_WRITENOP /* unused layer? */
- AM_RANGE(0xb04000, 0xb07fff) AM_RAM_WRITE_LEGACY(fof_bak_tileram_w) AM_BASE(m_fof_bak_tileram)
- AM_RANGE(0xb08000, 0xb0bfff) AM_RAM_WRITE_LEGACY(fof_mid_tileram_w) AM_BASE(m_fof_mid_tileram)
- AM_RANGE(0xb0c000, 0xb0ffff) AM_RAM_WRITE_LEGACY(fof_txt_tileram_w) AM_BASE(m_fof_txt_tileram)
+ AM_RANGE(0xb04000, 0xb07fff) AM_RAM_WRITE(fof_bak_tileram_w) AM_BASE(m_fof_bak_tileram)
+ AM_RANGE(0xb08000, 0xb0bfff) AM_RAM_WRITE(fof_mid_tileram_w) AM_BASE(m_fof_mid_tileram)
+ AM_RANGE(0xb0c000, 0xb0ffff) AM_RAM_WRITE(fof_txt_tileram_w) AM_BASE(m_fof_txt_tileram)
AM_RANGE(0xb10000, 0xb13fff) AM_WRITENOP //used by histryma @0x0000b25a
AM_RANGE(0xb14000, 0xb17fff) AM_WRITENOP //used by histryma @0x0000b25a,b270
@@ -190,9 +190,9 @@ static ADDRESS_MAP_START( bbprot_main_map, AS_PROGRAM, 16, fitfight_state )
AM_RANGE(0xa00000, 0xa00001) AM_WRITEONLY AM_BASE(m_fof_a00000)
AM_RANGE(0xb00000, 0xb03fff) AM_WRITENOP /* unused layer? */
- AM_RANGE(0xb04000, 0xb07fff) AM_RAM_WRITE_LEGACY(fof_bak_tileram_w) AM_BASE(m_fof_bak_tileram)
- AM_RANGE(0xb08000, 0xb0bfff) AM_RAM_WRITE_LEGACY(fof_mid_tileram_w) AM_BASE(m_fof_mid_tileram)
- AM_RANGE(0xb0c000, 0xb0ffff) AM_RAM_WRITE_LEGACY(fof_txt_tileram_w) AM_BASE(m_fof_txt_tileram)
+ AM_RANGE(0xb04000, 0xb07fff) AM_RAM_WRITE(fof_bak_tileram_w) AM_BASE(m_fof_bak_tileram)
+ AM_RANGE(0xb08000, 0xb0bfff) AM_RAM_WRITE(fof_mid_tileram_w) AM_BASE(m_fof_mid_tileram)
+ AM_RANGE(0xb0c000, 0xb0ffff) AM_RAM_WRITE(fof_txt_tileram_w) AM_BASE(m_fof_txt_tileram)
AM_RANGE(0xc00000, 0xc00fff) AM_READONLY
AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 9fbc6a9297f..e9867c63120 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -93,12 +93,12 @@ WRITE8_MEMBER(flkatck_state::multiply_w)
static ADDRESS_MAP_START( flkatck_map, AS_PROGRAM, 8, flkatck_state )
- AM_RANGE(0x0000, 0x0007) AM_RAM_WRITE_LEGACY(flkatck_k007121_regs_w) /* 007121 registers */
+ AM_RANGE(0x0000, 0x0007) AM_RAM_WRITE(flkatck_k007121_regs_w) /* 007121 registers */
AM_RANGE(0x0008, 0x03ff) AM_RAM /* RAM */
AM_RANGE(0x0400, 0x041f) AM_READWRITE(flkatck_ls138_r, flkatck_ls138_w) /* inputs, DIPS, bankswitch, counters, sound command */
AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_le_w) AM_SHARE("paletteram") /* palette */
AM_RANGE(0x1000, 0x1fff) AM_RAM /* RAM */
- AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE_LEGACY(flkatck_k007121_w) AM_BASE(m_k007121_ram) /* Video RAM (007121) */
+ AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(flkatck_k007121_w) AM_BASE(m_k007121_ram) /* Video RAM (007121) */
AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank1") /* banked ROM */
AM_RANGE(0x6000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c
index f3491e4e5dd..4981211df28 100644
--- a/src/mame/drivers/flower.c
+++ b/src/mame/drivers/flower.c
@@ -111,7 +111,7 @@ WRITE8_MEMBER(flower_state::sound_command_w)
static ADDRESS_MAP_START( flower_cpu1_2, AS_PROGRAM, 8, flower_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITE(flower_coin_lockout_w)
- AM_RANGE(0xa001, 0xa001) AM_WRITE_LEGACY(flower_flipscreen_w)
+ AM_RANGE(0xa001, 0xa001) AM_WRITE(flower_flipscreen_w)
AM_RANGE(0xa002, 0xa002) AM_WRITE(flower_maincpu_irq_ack)
AM_RANGE(0xa003, 0xa003) AM_WRITE(flower_subcpu_irq_ack)
AM_RANGE(0xa004, 0xa004) AM_WRITE(flower_coin_counter_w)
@@ -123,11 +123,11 @@ static ADDRESS_MAP_START( flower_cpu1_2, AS_PROGRAM, 8, flower_state )
AM_RANGE(0xa400, 0xa400) AM_WRITE(sound_command_w)
AM_RANGE(0xc000, 0xddff) AM_SHARE("share1") AM_RAM
AM_RANGE(0xde00, 0xdfff) AM_SHARE("share2") AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0xe000, 0xe7ff) AM_SHARE("share3") AM_RAM_WRITE_LEGACY(flower_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0xe000, 0xe7ff) AM_SHARE("share3") AM_RAM_WRITE(flower_textram_w) AM_BASE(m_textram)
AM_RANGE(0xe000, 0xefff) AM_SHARE("share4") AM_RAM // only cleared?
- AM_RANGE(0xf000, 0xf1ff) AM_SHARE("share5") AM_RAM_WRITE_LEGACY(flower_bg0ram_w) AM_BASE(m_bg0ram)
+ AM_RANGE(0xf000, 0xf1ff) AM_SHARE("share5") AM_RAM_WRITE(flower_bg0ram_w) AM_BASE(m_bg0ram)
AM_RANGE(0xf200, 0xf200) AM_SHARE("share6") AM_RAM AM_BASE(m_bg0_scroll)
- AM_RANGE(0xf800, 0xf9ff) AM_SHARE("share7") AM_RAM_WRITE_LEGACY(flower_bg1ram_w) AM_BASE(m_bg1ram)
+ AM_RANGE(0xf800, 0xf9ff) AM_SHARE("share7") AM_RAM_WRITE(flower_bg1ram_w) AM_BASE(m_bg1ram)
AM_RANGE(0xfa00, 0xfa00) AM_SHARE("share8") AM_RAM AM_BASE(m_bg1_scroll)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index 67f368458b8..724599139fe 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -67,9 +67,9 @@ WRITE8_MEMBER(flstory_state::nmi_enable_w)
static ADDRESS_MAP_START( flstory_map, AS_PROGRAM, 8, flstory_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(flstory_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(flstory_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xc800, 0xcfff) AM_RAM /* unknown */
- AM_RANGE(0xd000, 0xd000) AM_READWRITE_LEGACY(flstory_mcu_r, flstory_mcu_w)
+ AM_RANGE(0xd000, 0xd000) AM_READWRITE(flstory_mcu_r, flstory_mcu_w)
AM_RANGE(0xd001, 0xd001) AM_WRITENOP /* watchdog? */
AM_RANGE(0xd002, 0xd002) AM_WRITENOP /* coin lock out? */
AM_RANGE(0xd400, 0xd400) AM_READWRITE(from_snd_r, sound_command_w)
@@ -80,22 +80,22 @@ static ADDRESS_MAP_START( flstory_map, AS_PROGRAM, 8, flstory_state )
AM_RANGE(0xd802, 0xd802) AM_READ_PORT("DSW2")
AM_RANGE(0xd803, 0xd803) AM_READ_PORT("SYSTEM")
AM_RANGE(0xd804, 0xd804) AM_READ_PORT("P1")
- AM_RANGE(0xd805, 0xd805) AM_READ_LEGACY(flstory_mcu_status_r)
+ AM_RANGE(0xd805, 0xd805) AM_READ(flstory_mcu_status_r)
AM_RANGE(0xd806, 0xd806) AM_READ_PORT("P2")
// AM_RANGE(0xda00, 0xda00) AM_WRITEONLY
AM_RANGE(0xdc00, 0xdc9f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xdca0, 0xdcbf) AM_RAM_WRITE_LEGACY(flstory_scrlram_w) AM_BASE(m_scrlram)
+ AM_RANGE(0xdca0, 0xdcbf) AM_RAM_WRITE(flstory_scrlram_w) AM_BASE(m_scrlram)
AM_RANGE(0xdcc0, 0xdcff) AM_RAM /* unknown */
- AM_RANGE(0xdd00, 0xdeff) AM_READWRITE_LEGACY(flstory_palette_r, flstory_palette_w)
- AM_RANGE(0xdf03, 0xdf03) AM_WRITE_LEGACY(flstory_gfxctrl_w)
+ AM_RANGE(0xdd00, 0xdeff) AM_READWRITE(flstory_palette_r, flstory_palette_w)
+ AM_RANGE(0xdf03, 0xdf03) AM_WRITE(flstory_gfxctrl_w)
AM_RANGE(0xe000, 0xe7ff) AM_RAM /* work RAM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( onna34ro_map, AS_PROGRAM, 8, flstory_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(flstory_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(flstory_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xc800, 0xcfff) AM_RAM /* unknown */
- AM_RANGE(0xd000, 0xd000) AM_READWRITE_LEGACY(onna34ro_mcu_r, onna34ro_mcu_w)
+ AM_RANGE(0xd000, 0xd000) AM_READWRITE(onna34ro_mcu_r, onna34ro_mcu_w)
AM_RANGE(0xd001, 0xd001) AM_WRITENOP /* watchdog? */
AM_RANGE(0xd002, 0xd002) AM_WRITENOP /* coin lock out? */
AM_RANGE(0xd400, 0xd400) AM_READWRITE(from_snd_r, sound_command_w)
@@ -106,14 +106,14 @@ static ADDRESS_MAP_START( onna34ro_map, AS_PROGRAM, 8, flstory_state )
AM_RANGE(0xd802, 0xd802) AM_READ_PORT("DSW2")
AM_RANGE(0xd803, 0xd803) AM_READ_PORT("SYSTEM")
AM_RANGE(0xd804, 0xd804) AM_READ_PORT("P1")
- AM_RANGE(0xd805, 0xd805) AM_READ_LEGACY(onna34ro_mcu_status_r)
+ AM_RANGE(0xd805, 0xd805) AM_READ(onna34ro_mcu_status_r)
AM_RANGE(0xd806, 0xd806) AM_READ_PORT("P2")
// AM_RANGE(0xda00, 0xda00) AM_WRITEONLY
AM_RANGE(0xdc00, 0xdc9f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xdca0, 0xdcbf) AM_RAM_WRITE_LEGACY(flstory_scrlram_w) AM_BASE(m_scrlram)
+ AM_RANGE(0xdca0, 0xdcbf) AM_RAM_WRITE(flstory_scrlram_w) AM_BASE(m_scrlram)
AM_RANGE(0xdcc0, 0xdcff) AM_RAM /* unknown */
- AM_RANGE(0xdd00, 0xdeff) AM_READWRITE_LEGACY(flstory_palette_r, flstory_palette_w)
- AM_RANGE(0xdf03, 0xdf03) AM_WRITE_LEGACY(flstory_gfxctrl_w)
+ AM_RANGE(0xdd00, 0xdeff) AM_READWRITE(flstory_palette_r, flstory_palette_w)
+ AM_RANGE(0xdf03, 0xdf03) AM_WRITE(flstory_gfxctrl_w)
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(m_workram) /* work RAM */
ADDRESS_MAP_END
@@ -122,14 +122,14 @@ static CUSTOM_INPUT( victnine_mcu_status_bit01_r )
flstory_state *state = field.machine().driver_data<flstory_state>();
address_space *space = state->m_maincpu->memory().space(AS_PROGRAM);
- return (victnine_mcu_status_r(space, 0) & 3);
+ return (state->victnine_mcu_status_r(*space, 0) & 3);
}
static ADDRESS_MAP_START( victnine_map, AS_PROGRAM, 8, flstory_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(flstory_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(flstory_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xc800, 0xcfff) AM_RAM /* unknown */
- AM_RANGE(0xd000, 0xd000) AM_READWRITE_LEGACY(victnine_mcu_r, victnine_mcu_w)
+ AM_RANGE(0xd000, 0xd000) AM_READWRITE(victnine_mcu_r, victnine_mcu_w)
AM_RANGE(0xd001, 0xd001) AM_WRITENOP /* watchdog? */
AM_RANGE(0xd002, 0xd002) AM_NOP /* unknown read & coin lock out? */
AM_RANGE(0xd400, 0xd400) AM_READWRITE(from_snd_r, sound_command_w)
@@ -145,10 +145,10 @@ static ADDRESS_MAP_START( victnine_map, AS_PROGRAM, 8, flstory_state )
AM_RANGE(0xd807, 0xd807) AM_READ_PORT("EXTRA_P2")
// AM_RANGE(0xda00, 0xda00) AM_WRITEONLY
AM_RANGE(0xdc00, 0xdc9f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xdca0, 0xdcbf) AM_RAM_WRITE_LEGACY(flstory_scrlram_w) AM_BASE(m_scrlram)
- AM_RANGE(0xdce0, 0xdce0) AM_READWRITE_LEGACY(victnine_gfxctrl_r, victnine_gfxctrl_w)
+ AM_RANGE(0xdca0, 0xdcbf) AM_RAM_WRITE(flstory_scrlram_w) AM_BASE(m_scrlram)
+ AM_RANGE(0xdce0, 0xdce0) AM_READWRITE(victnine_gfxctrl_r, victnine_gfxctrl_w)
AM_RANGE(0xdce1, 0xdce1) AM_WRITENOP /* unknown */
- AM_RANGE(0xdd00, 0xdeff) AM_READWRITE_LEGACY(flstory_palette_r, flstory_palette_w)
+ AM_RANGE(0xdd00, 0xdeff) AM_READWRITE(flstory_palette_r, flstory_palette_w)
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(m_workram) /* work RAM */
ADDRESS_MAP_END
@@ -334,7 +334,7 @@ WRITE8_MEMBER(flstory_state::rumba_mcu_w)
static ADDRESS_MAP_START( rumba_map, AS_PROGRAM, 8, flstory_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(flstory_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(flstory_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
// AM_RANGE(0xc800, 0xcfff) AM_RAM /* unknown */
AM_RANGE(0xd000, 0xd000) AM_READWRITE(rumba_mcu_r, rumba_mcu_w)
AM_RANGE(0xd001, 0xd001) AM_WRITENOP /* watchdog? */
@@ -352,10 +352,10 @@ static ADDRESS_MAP_START( rumba_map, AS_PROGRAM, 8, flstory_state )
AM_RANGE(0xd807, 0xd807) AM_READ_PORT("EXTRA_P2")
// AM_RANGE(0xda00, 0xda00) AM_WRITEONLY
AM_RANGE(0xdc00, 0xdc9f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xdca0, 0xdcbf) AM_RAM_WRITE_LEGACY(flstory_scrlram_w) AM_BASE(m_scrlram)
- AM_RANGE(0xdce0, 0xdce0) AM_READWRITE_LEGACY(victnine_gfxctrl_r, victnine_gfxctrl_w)
+ AM_RANGE(0xdca0, 0xdcbf) AM_RAM_WRITE(flstory_scrlram_w) AM_BASE(m_scrlram)
+ AM_RANGE(0xdce0, 0xdce0) AM_READWRITE(victnine_gfxctrl_r, victnine_gfxctrl_w)
// AM_RANGE(0xdce1, 0xdce1) AM_WRITENOP /* unknown */
- AM_RANGE(0xdd00, 0xdeff) AM_READWRITE_LEGACY(flstory_palette_r, flstory_palette_w)
+ AM_RANGE(0xdd00, 0xdeff) AM_READWRITE(flstory_palette_r, flstory_palette_w)
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(m_workram) /* work RAM */
ADDRESS_MAP_END
@@ -454,12 +454,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( flstory_m68705_map, AS_PROGRAM, 8, flstory_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(flstory_68705_port_a_r, flstory_68705_port_a_w)
- AM_RANGE(0x0001, 0x0001) AM_READWRITE_LEGACY(flstory_68705_port_b_r, flstory_68705_port_b_w)
- AM_RANGE(0x0002, 0x0002) AM_READWRITE_LEGACY(flstory_68705_port_c_r, flstory_68705_port_c_w)
- AM_RANGE(0x0004, 0x0004) AM_WRITE_LEGACY(flstory_68705_ddr_a_w)
- AM_RANGE(0x0005, 0x0005) AM_WRITE_LEGACY(flstory_68705_ddr_b_w)
- AM_RANGE(0x0006, 0x0006) AM_WRITE_LEGACY(flstory_68705_ddr_c_w)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(flstory_68705_port_a_r, flstory_68705_port_a_w)
+ AM_RANGE(0x0001, 0x0001) AM_READWRITE(flstory_68705_port_b_r, flstory_68705_port_b_w)
+ AM_RANGE(0x0002, 0x0002) AM_READWRITE(flstory_68705_port_c_r, flstory_68705_port_c_w)
+ AM_RANGE(0x0004, 0x0004) AM_WRITE(flstory_68705_ddr_a_w)
+ AM_RANGE(0x0005, 0x0005) AM_WRITE(flstory_68705_ddr_b_w)
+ AM_RANGE(0x0006, 0x0006) AM_WRITE(flstory_68705_ddr_c_w)
AM_RANGE(0x0010, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index cf906a98062..7c464982e47 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -159,7 +159,7 @@ static ADDRESS_MAP_START( pbillrd_map, AS_PROGRAM, 8, freekick_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(freek_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(freek_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xd800, 0xd8ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd900, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ_PORT("IN0")
@@ -178,7 +178,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( freekickb_map, AS_PROGRAM, 8, freekick_state )
AM_RANGE(0x0000, 0xcfff) AM_ROM
AM_RANGE(0xd000, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(freek_videoram_w) AM_BASE(m_videoram) // tilemap
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(freek_videoram_w) AM_BASE(m_videoram) // tilemap
AM_RANGE(0xe800, 0xe8ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // sprites
AM_RANGE(0xec00, 0xec03) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0xf000, 0xf003) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w)
@@ -198,7 +198,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gigas_map, AS_PROGRAM, 8, freekick_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(freek_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(freek_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xd800, 0xd8ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd900, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ_PORT("IN0") AM_WRITENOP // probably not flipscreen
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index c204f2086e1..fd2dd058891 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -179,18 +179,18 @@ static ADDRESS_MAP_START( fromanc2_main_map, AS_PROGRAM, 16, fromanc2_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // MAIN ROM
AM_RANGE(0x802000, 0x802fff) AM_READNOP // ???
- AM_RANGE(0x800000, 0x803fff) AM_WRITE_LEGACY(fromanc2_videoram_0_w) // VRAM 0, 1 (1P)
- AM_RANGE(0x880000, 0x883fff) AM_WRITE_LEGACY(fromanc2_videoram_1_w) // VRAM 2, 3 (1P)
- AM_RANGE(0x900000, 0x903fff) AM_WRITE_LEGACY(fromanc2_videoram_2_w) // VRAM 0, 1 (2P)
- AM_RANGE(0x980000, 0x983fff) AM_WRITE_LEGACY(fromanc2_videoram_3_w) // VRAM 2, 3 (2P)
+ AM_RANGE(0x800000, 0x803fff) AM_WRITE(fromanc2_videoram_0_w) // VRAM 0, 1 (1P)
+ AM_RANGE(0x880000, 0x883fff) AM_WRITE(fromanc2_videoram_1_w) // VRAM 2, 3 (1P)
+ AM_RANGE(0x900000, 0x903fff) AM_WRITE(fromanc2_videoram_2_w) // VRAM 0, 1 (2P)
+ AM_RANGE(0x980000, 0x983fff) AM_WRITE(fromanc2_videoram_3_w) // VRAM 2, 3 (2P)
- AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE_LEGACY(fromanc2_paletteram_0_r, fromanc2_paletteram_0_w) // PALETTE (1P)
- AM_RANGE(0xa80000, 0xa80fff) AM_READWRITE_LEGACY(fromanc2_paletteram_1_r, fromanc2_paletteram_1_w) // PALETTE (2P)
+ AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE(fromanc2_paletteram_0_r, fromanc2_paletteram_0_w) // PALETTE (1P)
+ AM_RANGE(0xa80000, 0xa80fff) AM_READWRITE(fromanc2_paletteram_1_r, fromanc2_paletteram_1_w) // PALETTE (2P)
- AM_RANGE(0xd00000, 0xd00023) AM_WRITE_LEGACY(fromanc2_gfxreg_0_w) // SCROLL REG (1P/2P)
- AM_RANGE(0xd00100, 0xd00123) AM_WRITE_LEGACY(fromanc2_gfxreg_2_w) // SCROLL REG (1P/2P)
- AM_RANGE(0xd00200, 0xd00223) AM_WRITE_LEGACY(fromanc2_gfxreg_1_w) // SCROLL REG (1P/2P)
- AM_RANGE(0xd00300, 0xd00323) AM_WRITE_LEGACY(fromanc2_gfxreg_3_w) // SCROLL REG (1P/2P)
+ AM_RANGE(0xd00000, 0xd00023) AM_WRITE(fromanc2_gfxreg_0_w) // SCROLL REG (1P/2P)
+ AM_RANGE(0xd00100, 0xd00123) AM_WRITE(fromanc2_gfxreg_2_w) // SCROLL REG (1P/2P)
+ AM_RANGE(0xd00200, 0xd00223) AM_WRITE(fromanc2_gfxreg_1_w) // SCROLL REG (1P/2P)
+ AM_RANGE(0xd00300, 0xd00323) AM_WRITE(fromanc2_gfxreg_3_w) // SCROLL REG (1P/2P)
AM_RANGE(0xd00400, 0xd00413) AM_WRITENOP // ???
AM_RANGE(0xd00500, 0xd00513) AM_WRITENOP // ???
@@ -199,8 +199,8 @@ static ADDRESS_MAP_START( fromanc2_main_map, AS_PROGRAM, 16, fromanc2_state )
AM_RANGE(0xd01100, 0xd01101) AM_READ_PORT("SYSTEM")
AM_RANGE(0xd01200, 0xd01201) AM_WRITE(fromanc2_subcpu_w) // SUB CPU WRITE
AM_RANGE(0xd01300, 0xd01301) AM_READ(fromanc2_subcpu_r ) // SUB CPU READ
- AM_RANGE(0xd01400, 0xd01401) AM_WRITE_LEGACY(fromanc2_gfxbank_0_w) // GFXBANK (1P)
- AM_RANGE(0xd01500, 0xd01501) AM_WRITE_LEGACY(fromanc2_gfxbank_1_w) // GFXBANK (2P)
+ AM_RANGE(0xd01400, 0xd01401) AM_WRITE(fromanc2_gfxbank_0_w) // GFXBANK (1P)
+ AM_RANGE(0xd01500, 0xd01501) AM_WRITE(fromanc2_gfxbank_1_w) // GFXBANK (2P)
AM_RANGE(0xd01600, 0xd01601) AM_WRITE(fromanc2_eeprom_w) // EEPROM DATA
AM_RANGE(0xd01800, 0xd01801) AM_READ(fromanc2_keymatrix_r) // INPUT KEY MATRIX
AM_RANGE(0xd01a00, 0xd01a01) AM_WRITE(fromanc2_portselect_w) // PORT SELECT (1P/2P)
@@ -211,20 +211,20 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( fromancr_main_map, AS_PROGRAM, 16, fromanc2_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // MAIN ROM
- AM_RANGE(0x800000, 0x803fff) AM_WRITE_LEGACY(fromancr_videoram_0_w) // VRAM BG (1P/2P)
- AM_RANGE(0x880000, 0x883fff) AM_WRITE_LEGACY(fromancr_videoram_1_w) // VRAM FG (1P/2P)
- AM_RANGE(0x900000, 0x903fff) AM_WRITE_LEGACY(fromancr_videoram_2_w) // VRAM TEXT (1P/2P)
+ AM_RANGE(0x800000, 0x803fff) AM_WRITE(fromancr_videoram_0_w) // VRAM BG (1P/2P)
+ AM_RANGE(0x880000, 0x883fff) AM_WRITE(fromancr_videoram_1_w) // VRAM FG (1P/2P)
+ AM_RANGE(0x900000, 0x903fff) AM_WRITE(fromancr_videoram_2_w) // VRAM TEXT (1P/2P)
AM_RANGE(0x980000, 0x983fff) AM_WRITENOP // VRAM Unused ?
- AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE_LEGACY(fromancr_paletteram_0_r, fromancr_paletteram_0_w) // PALETTE (1P)
- AM_RANGE(0xa80000, 0xa80fff) AM_READWRITE_LEGACY(fromancr_paletteram_1_r, fromancr_paletteram_1_w) // PALETTE (2P)
+ AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE(fromancr_paletteram_0_r, fromancr_paletteram_0_w) // PALETTE (1P)
+ AM_RANGE(0xa80000, 0xa80fff) AM_READWRITE(fromancr_paletteram_1_r, fromancr_paletteram_1_w) // PALETTE (2P)
- AM_RANGE(0xd00000, 0xd00023) AM_WRITE_LEGACY(fromancr_gfxreg_1_w) // SCROLL REG (1P/2P)
+ AM_RANGE(0xd00000, 0xd00023) AM_WRITE(fromancr_gfxreg_1_w) // SCROLL REG (1P/2P)
AM_RANGE(0xd00200, 0xd002ff) AM_WRITENOP // ?
AM_RANGE(0xd00400, 0xd00413) AM_WRITENOP // ???
AM_RANGE(0xd00500, 0xd00513) AM_WRITENOP // ???
AM_RANGE(0xd01000, 0xd01001) AM_WRITE(fromanc2_sndcmd_w) // SOUND REQ (1P/2P)
- AM_RANGE(0xd00100, 0xd00123) AM_WRITE_LEGACY(fromancr_gfxreg_0_w) // SCROLL REG (1P/2P)
+ AM_RANGE(0xd00100, 0xd00123) AM_WRITE(fromancr_gfxreg_0_w) // SCROLL REG (1P/2P)
AM_RANGE(0xd01100, 0xd01101) AM_READ_PORT("SYSTEM")
AM_RANGE(0xd01200, 0xd01201) AM_WRITE(fromanc2_subcpu_w) // SUB CPU WRITE
AM_RANGE(0xd01300, 0xd01301) AM_READ(fromanc2_subcpu_r) // SUB CPU READ
@@ -250,19 +250,19 @@ static ADDRESS_MAP_START( fromanc4_main_map, AS_PROGRAM, 16, fromanc2_state )
AM_RANGE(0xd70000, 0xd70001) AM_WRITE(fromanc2_sndcmd_w) // SOUND REQ (1P/2P)
- AM_RANGE(0xd80000, 0xd8ffff) AM_WRITE_LEGACY(fromanc4_videoram_0_w) // VRAM FG (1P/2P)
- AM_RANGE(0xd90000, 0xd9ffff) AM_WRITE_LEGACY(fromanc4_videoram_1_w) // VRAM BG (1P/2P)
- AM_RANGE(0xda0000, 0xdaffff) AM_WRITE_LEGACY(fromanc4_videoram_2_w) // VRAM TEXT (1P/2P)
+ AM_RANGE(0xd80000, 0xd8ffff) AM_WRITE(fromanc4_videoram_0_w) // VRAM FG (1P/2P)
+ AM_RANGE(0xd90000, 0xd9ffff) AM_WRITE(fromanc4_videoram_1_w) // VRAM BG (1P/2P)
+ AM_RANGE(0xda0000, 0xdaffff) AM_WRITE(fromanc4_videoram_2_w) // VRAM TEXT (1P/2P)
- AM_RANGE(0xdb0000, 0xdb0fff) AM_READWRITE_LEGACY(fromanc4_paletteram_0_r, fromanc4_paletteram_0_w) // PALETTE (1P)
- AM_RANGE(0xdc0000, 0xdc0fff) AM_READWRITE_LEGACY(fromanc4_paletteram_1_r, fromanc4_paletteram_1_w) // PALETTE (2P)
+ AM_RANGE(0xdb0000, 0xdb0fff) AM_READWRITE(fromanc4_paletteram_0_r, fromanc4_paletteram_0_w) // PALETTE (1P)
+ AM_RANGE(0xdc0000, 0xdc0fff) AM_READWRITE(fromanc4_paletteram_1_r, fromanc4_paletteram_1_w) // PALETTE (2P)
AM_RANGE(0xd10000, 0xd10001) AM_READ(fromanc2_keymatrix_r) // INPUT KEY MATRIX
AM_RANGE(0xd20000, 0xd20001) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xe00000, 0xe0001d) AM_WRITE_LEGACY(fromanc4_gfxreg_0_w) // SCROLL, GFXBANK (1P/2P)
- AM_RANGE(0xe10000, 0xe1001d) AM_WRITE_LEGACY(fromanc4_gfxreg_1_w) // SCROLL, GFXBANK (1P/2P)
- AM_RANGE(0xe20000, 0xe2001d) AM_WRITE_LEGACY(fromanc4_gfxreg_2_w) // SCROLL, GFXBANK (1P/2P)
+ AM_RANGE(0xe00000, 0xe0001d) AM_WRITE(fromanc4_gfxreg_0_w) // SCROLL, GFXBANK (1P/2P)
+ AM_RANGE(0xe10000, 0xe1001d) AM_WRITE(fromanc4_gfxreg_1_w) // SCROLL, GFXBANK (1P/2P)
+ AM_RANGE(0xe20000, 0xe2001d) AM_WRITE(fromanc4_gfxreg_2_w) // SCROLL, GFXBANK (1P/2P)
AM_RANGE(0xe30000, 0xe30013) AM_WRITENOP // ???
AM_RANGE(0xe40000, 0xe40013) AM_WRITENOP // ???
diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c
index c6e88c4d0f9..8c80175280f 100644
--- a/src/mame/drivers/fromance.c
+++ b/src/mame/drivers/fromance.c
@@ -248,17 +248,17 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( nekkyoku_sub_map, AS_PROGRAM, 8, fromance_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xefff) AM_READWRITE_LEGACY(fromance_videoram_r, fromance_videoram_w)
+ AM_RANGE(0xc000, 0xefff) AM_READWRITE(fromance_videoram_r, fromance_videoram_w)
AM_RANGE(0xf000, 0xf7ff) AM_RAM
- AM_RANGE(0xf800, 0xffff) AM_READWRITE_LEGACY(fromance_paletteram_r, fromance_paletteram_w)
+ AM_RANGE(0xf800, 0xffff) AM_READWRITE(fromance_paletteram_r, fromance_paletteram_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( fromance_sub_map, AS_PROGRAM, 8, fromance_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_RAM
- AM_RANGE(0xc800, 0xcfff) AM_READWRITE_LEGACY(fromance_paletteram_r, fromance_paletteram_w)
- AM_RANGE(0xd000, 0xffff) AM_READWRITE_LEGACY(fromance_videoram_r, fromance_videoram_w)
+ AM_RANGE(0xc800, 0xcfff) AM_READWRITE(fromance_paletteram_r, fromance_paletteram_w)
+ AM_RANGE(0xd000, 0xffff) AM_READWRITE(fromance_videoram_r, fromance_videoram_w)
ADDRESS_MAP_END
@@ -271,12 +271,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( nekkyoku_sub_io_map, AS_IO, 8, fromance_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(fromance_crtc_data_w)
- AM_RANGE(0x11, 0x11) AM_WRITE_LEGACY(fromance_crtc_register_w)
+ AM_RANGE(0x10, 0x10) AM_WRITE(fromance_crtc_data_w)
+ AM_RANGE(0x11, 0x11) AM_WRITE(fromance_crtc_register_w)
AM_RANGE(0x12, 0x12) AM_READNOP // unknown
AM_RANGE(0xe0, 0xe0) AM_WRITE(fromance_rombank_w)
- AM_RANGE(0xe1, 0xe1) AM_READ(fromance_busycheck_sub_r) AM_WRITE_LEGACY(fromance_gfxreg_w)
- AM_RANGE(0xe2, 0xe5) AM_WRITE_LEGACY(fromance_scroll_w)
+ AM_RANGE(0xe1, 0xe1) AM_READ(fromance_busycheck_sub_r) AM_WRITE(fromance_gfxreg_w)
+ AM_RANGE(0xe2, 0xe5) AM_WRITE(fromance_scroll_w)
AM_RANGE(0xe6, 0xe6) AM_READWRITE(fromance_commanddata_r, fromance_busycheck_sub_w)
AM_RANGE(0xe7, 0xe7) AM_DEVWRITE_LEGACY("msm", fromance_adpcm_reset_w)
AM_RANGE(0xe8, 0xe8) AM_WRITE(fromance_adpcm_w)
@@ -285,12 +285,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( idolmj_sub_io_map, AS_IO, 8, fromance_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(fromance_crtc_data_w)
- AM_RANGE(0x11, 0x11) AM_WRITE_LEGACY(fromance_crtc_register_w)
+ AM_RANGE(0x10, 0x10) AM_WRITE(fromance_crtc_data_w)
+ AM_RANGE(0x11, 0x11) AM_WRITE(fromance_crtc_register_w)
AM_RANGE(0x12, 0x12) AM_READNOP // unknown
AM_RANGE(0x20, 0x20) AM_WRITE(fromance_rombank_w)
- AM_RANGE(0x21, 0x21) AM_READ(fromance_busycheck_sub_r) AM_WRITE_LEGACY(fromance_gfxreg_w)
- AM_RANGE(0x22, 0x25) AM_WRITE_LEGACY(fromance_scroll_w)
+ AM_RANGE(0x21, 0x21) AM_READ(fromance_busycheck_sub_r) AM_WRITE(fromance_gfxreg_w)
+ AM_RANGE(0x22, 0x25) AM_WRITE(fromance_scroll_w)
AM_RANGE(0x26, 0x26) AM_READWRITE(fromance_commanddata_r, fromance_busycheck_sub_w)
AM_RANGE(0x27, 0x27) AM_DEVWRITE_LEGACY("msm", fromance_adpcm_reset_w)
AM_RANGE(0x28, 0x28) AM_WRITE(fromance_adpcm_w)
@@ -299,12 +299,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( fromance_sub_io_map, AS_IO, 8, fromance_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(fromance_crtc_data_w)
- AM_RANGE(0x11, 0x11) AM_WRITE_LEGACY(fromance_crtc_register_w)
+ AM_RANGE(0x10, 0x10) AM_WRITE(fromance_crtc_data_w)
+ AM_RANGE(0x11, 0x11) AM_WRITE(fromance_crtc_register_w)
AM_RANGE(0x12, 0x12) AM_READNOP // unknown
AM_RANGE(0x20, 0x20) AM_WRITE(fromance_rombank_w)
- AM_RANGE(0x21, 0x21) AM_READ(fromance_busycheck_sub_r) AM_WRITE_LEGACY(fromance_gfxreg_w)
- AM_RANGE(0x22, 0x25) AM_WRITE_LEGACY(fromance_scroll_w)
+ AM_RANGE(0x21, 0x21) AM_READ(fromance_busycheck_sub_r) AM_WRITE(fromance_gfxreg_w)
+ AM_RANGE(0x22, 0x25) AM_WRITE(fromance_scroll_w)
AM_RANGE(0x26, 0x26) AM_READWRITE(fromance_commanddata_r, fromance_busycheck_sub_w)
AM_RANGE(0x27, 0x27) AM_DEVWRITE_LEGACY("msm", fromance_adpcm_reset_w)
AM_RANGE(0x28, 0x28) AM_WRITE(fromance_adpcm_w)
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index b488dedacba..fe05d295391 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -91,12 +91,12 @@ WRITE8_MEMBER(funkybee_state::funkybee_coin_counter_w)
static ADDRESS_MAP_START( funkybee_map, AS_PROGRAM, 8, funkybee_state )
AM_RANGE(0x0000, 0x4fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0xa000, 0xbfff) AM_RAM_WRITE_LEGACY(funkybee_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xc000, 0xdfff) AM_RAM_WRITE_LEGACY(funkybee_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xe000, 0xe000) AM_WRITE_LEGACY(funkybee_scroll_w)
- AM_RANGE(0xe800, 0xe800) AM_WRITE_LEGACY(funkybee_flipscreen_w)
+ AM_RANGE(0xa000, 0xbfff) AM_RAM_WRITE(funkybee_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xc000, 0xdfff) AM_RAM_WRITE(funkybee_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xe000, 0xe000) AM_WRITE(funkybee_scroll_w)
+ AM_RANGE(0xe800, 0xe800) AM_WRITE(funkybee_flipscreen_w)
AM_RANGE(0xe802, 0xe803) AM_WRITE(funkybee_coin_counter_w)
- AM_RANGE(0xe805, 0xe805) AM_WRITE_LEGACY(funkybee_gfx_bank_w)
+ AM_RANGE(0xe805, 0xe805) AM_WRITE(funkybee_gfx_bank_w)
AM_RANGE(0xf000, 0xf000) AM_READNOP /* IRQ Ack */
AM_RANGE(0xf800, 0xf800) AM_READWRITE(funkybee_input_port_0_r, watchdog_reset_w)
AM_RANGE(0xf801, 0xf801) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index ac3e17c43cb..b46337fd445 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -856,8 +856,8 @@ static ADDRESS_MAP_START( funworld_map, AS_PROGRAM, 8, funworld_state )
AM_RANGE(0x0c00, 0x0c01) AM_DEVWRITE_LEGACY("ay8910", ay8910_address_data_w)
AM_RANGE(0x0e00, 0x0e00) AM_DEVWRITE("crtc", mc6845_device, address_w)
AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
- AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE_LEGACY(funworld_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE_LEGACY(funworld_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE(funworld_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x4000, 0x4000) AM_READNOP
AM_RANGE(0x8000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xffff) AM_ROM
@@ -893,8 +893,8 @@ static ADDRESS_MAP_START( funquiz_map, AS_PROGRAM, 8, funworld_state )
AM_RANGE(0x1800, 0x1800) AM_WRITE(question_bank_w)
- AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE_LEGACY(funworld_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE_LEGACY(funworld_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE(funworld_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x4000, 0x7fff) AM_READ(questions_r)
AM_RANGE(0xc000, 0xffff) AM_ROM
@@ -911,8 +911,8 @@ static ADDRESS_MAP_START( magicrd2_map, AS_PROGRAM, 8, funworld_state )
AM_RANGE(0x2c00, 0x2cff) AM_RAM /* range for protection */
AM_RANGE(0x3600, 0x36ff) AM_RAM /* some games use $3603-05 range for protection */
AM_RANGE(0x3c00, 0x3cff) AM_RAM /* range for protection */
- AM_RANGE(0x4000, 0x4fff) AM_RAM_WRITE_LEGACY(funworld_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5000, 0x5fff) AM_RAM_WRITE_LEGACY(funworld_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x4fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5000, 0x5fff) AM_RAM_WRITE(funworld_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -926,8 +926,8 @@ static ADDRESS_MAP_START( cuoreuno_map, AS_PROGRAM, 8, funworld_state )
AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
AM_RANGE(0x2000, 0x2000) AM_READNOP /* some unknown reads */
AM_RANGE(0x3e00, 0x3fff) AM_RAM /* some games use $3e03-05 range for protection */
- AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE_LEGACY(funworld_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE_LEGACY(funworld_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE(funworld_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -941,8 +941,8 @@ static ADDRESS_MAP_START( saloon_map, AS_PROGRAM, 8, funworld_state )
AM_RANGE(0x1800, 0x1800) AM_DEVREAD_LEGACY("ay8910", ay8910_r)
AM_RANGE(0x1800, 0x1801) AM_DEVWRITE_LEGACY("ay8910", ay8910_address_data_w)
// AM_RANGE(0x2000, 0x2000) AM_READNOP /* some unknown reads... maybe a DSW */
- AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE_LEGACY(funworld_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE_LEGACY(funworld_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE(funworld_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -967,8 +967,8 @@ static ADDRESS_MAP_START( witchryl_map, AS_PROGRAM, 8, funworld_state )
AM_RANGE(0x0c00, 0x0c01) AM_DEVWRITE_LEGACY("ay8910", ay8910_address_data_w)
AM_RANGE(0x0e00, 0x0e00) AM_DEVWRITE("crtc", mc6845_device, address_w)
AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
- AM_RANGE(0x4000, 0x4fff) AM_RAM_WRITE_LEGACY(funworld_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5000, 0x5fff) AM_RAM_WRITE_LEGACY(funworld_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x4fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5000, 0x5fff) AM_RAM_WRITE(funworld_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x6000, 0x6000) AM_READ_PORT("DSW2")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c
index a76e418be47..0f3dd856235 100644
--- a/src/mame/drivers/funybubl.c
+++ b/src/mame/drivers/funybubl.c
@@ -81,7 +81,7 @@ static WRITE8_DEVICE_HANDLER( funybubl_oki_bank_sw )
static ADDRESS_MAP_START( funybubl_map, AS_PROGRAM, 8, funybubl_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") // banked port 1?
- AM_RANGE(0xc400, 0xcfff) AM_RAM_WRITE_LEGACY(funybubl_paldatawrite) AM_BASE(m_paletteram) // palette
+ AM_RANGE(0xc400, 0xcfff) AM_RAM_WRITE(funybubl_paldatawrite) AM_BASE(m_paletteram) // palette
AM_RANGE(0xd000, 0xdfff) AM_RAMBANK("bank1") // banked port 0?
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index 219e22a89e1..8a2024d45c1 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -88,10 +88,10 @@ WRITE16_MEMBER(fuuki16_state::fuuki16_sound_command_w)
static ADDRESS_MAP_START( fuuki16_map, AS_PROGRAM, 16, fuuki16_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM // RAM
- AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE_LEGACY(fuuki16_vram_0_w) AM_BASE(m_vram[0]) // Layers
- AM_RANGE(0x502000, 0x503fff) AM_RAM_WRITE_LEGACY(fuuki16_vram_1_w) AM_BASE(m_vram[1]) //
- AM_RANGE(0x504000, 0x505fff) AM_RAM_WRITE_LEGACY(fuuki16_vram_2_w) AM_BASE(m_vram[2]) //
- AM_RANGE(0x506000, 0x507fff) AM_RAM_WRITE_LEGACY(fuuki16_vram_3_w) AM_BASE(m_vram[3]) //
+ AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(fuuki16_vram_0_w) AM_BASE(m_vram[0]) // Layers
+ AM_RANGE(0x502000, 0x503fff) AM_RAM_WRITE(fuuki16_vram_1_w) AM_BASE(m_vram[1]) //
+ AM_RANGE(0x504000, 0x505fff) AM_RAM_WRITE(fuuki16_vram_2_w) AM_BASE(m_vram[2]) //
+ AM_RANGE(0x506000, 0x507fff) AM_RAM_WRITE(fuuki16_vram_3_w) AM_BASE(m_vram[3]) //
AM_RANGE(0x600000, 0x601fff) AM_MIRROR(0x008000) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites, mirrored?
AM_RANGE(0x700000, 0x703fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x800000, 0x800001) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index 81470792b49..77cfb959753 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -238,10 +238,10 @@ static ADDRESS_MAP_START( fuuki32_map, AS_PROGRAM, 32, fuuki32_state )
AM_RANGE(0x400000, 0x40ffff) AM_RAM // Work RAM
AM_RANGE(0x410000, 0x41ffff) AM_RAM // Work RAM (used by asurabus)
- AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE_LEGACY(fuuki32_vram_0_w) AM_BASE(m_vram[0]) // Tilemap 1
- AM_RANGE(0x502000, 0x503fff) AM_RAM_WRITE_LEGACY(fuuki32_vram_1_w) AM_BASE(m_vram[1]) // Tilemap 2
- AM_RANGE(0x504000, 0x505fff) AM_RAM_WRITE_LEGACY(fuuki32_vram_2_w) AM_BASE(m_vram[2]) // Tilemap bg
- AM_RANGE(0x506000, 0x507fff) AM_RAM_WRITE_LEGACY(fuuki32_vram_3_w) AM_BASE(m_vram[3]) // Tilemap bg2
+ AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(fuuki32_vram_0_w) AM_BASE(m_vram[0]) // Tilemap 1
+ AM_RANGE(0x502000, 0x503fff) AM_RAM_WRITE(fuuki32_vram_1_w) AM_BASE(m_vram[1]) // Tilemap 2
+ AM_RANGE(0x504000, 0x505fff) AM_RAM_WRITE(fuuki32_vram_2_w) AM_BASE(m_vram[2]) // Tilemap bg
+ AM_RANGE(0x506000, 0x507fff) AM_RAM_WRITE(fuuki32_vram_3_w) AM_BASE(m_vram[3]) // Tilemap bg2
AM_RANGE(0x508000, 0x517fff) AM_RAM // More tilemap, or linescroll? Seems to be empty all of the time
AM_RANGE(0x600000, 0x601fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x700000, 0x703fff) AM_RAM_WRITE(paletteram32_xRRRRRGGGGGBBBBB_dword_w) AM_BASE(m_paletteram) // Palette
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index b944036ee94..629c0d2e2b0 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -118,7 +118,7 @@ WRITE16_MEMBER(gaelco_state::thoop_encrypted_w)
static ADDRESS_MAP_START( bigkarnk_map, AS_PROGRAM, 16, gaelco_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM /* ROM */
- AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE_LEGACY(gaelco_vram_w) AM_BASE(m_videoram) /* Video RAM */
+ AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(gaelco_vram_w) AM_BASE(m_videoram) /* Video RAM */
AM_RANGE(0x102000, 0x103fff) AM_RAM /* Screen RAM */
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE(m_vregs) /* Video Registers */
// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */
@@ -145,7 +145,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( maniacsq_map, AS_PROGRAM, 16, gaelco_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
- AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE_LEGACY(gaelco_vram_w) AM_BASE(m_videoram) /* Video RAM */
+ AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(gaelco_vram_w) AM_BASE(m_videoram) /* Video RAM */
AM_RANGE(0x102000, 0x103fff) AM_RAM /* Screen RAM */
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE(m_vregs) /* Video Registers */
// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */
diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c
index 16e71b43f47..89660fe8422 100644
--- a/src/mame/drivers/gaelco2.c
+++ b/src/mame/drivers/gaelco2.c
@@ -57,14 +57,14 @@ GFXDECODEINFO(0x0400000, 128)
static ADDRESS_MAP_START( maniacsq_map, AS_PROGRAM, 16, gaelco2_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM /* ROM */
AM_RANGE(0x202890, 0x2028ff) AM_DEVREADWRITE_LEGACY("gaelco", gaelcosnd_r, gaelcosnd_w) /* Sound Registers */
- AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE_LEGACY(gaelco2_vram_w) AM_SHARE("spriteram") /* Video RAM */
- AM_RANGE(0x210000, 0x211fff) AM_RAM_WRITE_LEGACY(gaelco2_palette_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(gaelco2_vram_w) AM_SHARE("spriteram") /* Video RAM */
+ AM_RANGE(0x210000, 0x211fff) AM_RAM_WRITE(gaelco2_palette_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x218004, 0x218009) AM_RAM AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x300000, 0x300001) AM_READ_PORT("IN0") /* DSW #1 + Input 1P */
AM_RANGE(0x300002, 0x300003) AM_READ_PORT("IN1") /* DSW #2 + Input 2P */
AM_RANGE(0x30004a, 0x30004b) AM_WRITENOP /* Sound muting? */
AM_RANGE(0x320000, 0x320001) AM_READ_PORT("COIN") /* COINSW + SERVICESW */
- AM_RANGE(0x500000, 0x500001) AM_WRITE_LEGACY(gaelco2_coin_w) /* Coin lockout + counters */
+ AM_RANGE(0x500000, 0x500001) AM_WRITE(gaelco2_coin_w) /* Coin lockout + counters */
AM_RANGE(0xfe0000, 0xfeffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
@@ -214,20 +214,20 @@ READ16_MEMBER(gaelco2_state::p2_gun_y){return (input_port_read(machine(), "LIGHT
static ADDRESS_MAP_START( bang_map, AS_PROGRAM, 16, gaelco2_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x202890, 0x2028ff) AM_DEVREADWRITE_LEGACY("gaelco", gaelcosnd_r, gaelcosnd_w) /* Sound Registers */
- AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE_LEGACY(gaelco2_vram_w) AM_SHARE("spriteram") /* Video RAM */
- AM_RANGE(0x210000, 0x211fff) AM_RAM_WRITE_LEGACY(gaelco2_palette_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(gaelco2_vram_w) AM_SHARE("spriteram") /* Video RAM */
+ AM_RANGE(0x210000, 0x211fff) AM_RAM_WRITE(gaelco2_palette_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x218004, 0x218009) AM_READONLY /* Video Registers */
AM_RANGE(0x218004, 0x218007) AM_WRITEONLY AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x218008, 0x218009) AM_WRITENOP /* CLR INT Video */
AM_RANGE(0x300000, 0x300001) AM_READ_PORT("P1")
AM_RANGE(0x300002, 0x300003) AM_READNOP /* Random number generator? */
- AM_RANGE(0x300000, 0x300003) AM_WRITE_LEGACY(gaelco2_coin2_w) /* Coin Counters */
+ AM_RANGE(0x300000, 0x300003) AM_WRITE(gaelco2_coin2_w) /* Coin Counters */
AM_RANGE(0x300008, 0x300009) AM_DEVWRITE_LEGACY("eeprom", gaelco2_eeprom_data_w) /* EEPROM data */
AM_RANGE(0x30000a, 0x30000b) AM_DEVWRITE_LEGACY("eeprom", gaelco2_eeprom_sk_w) /* EEPROM serial clock */
AM_RANGE(0x30000c, 0x30000d) AM_DEVWRITE_LEGACY("eeprom", gaelco2_eeprom_cs_w) /* EEPROM chip select */
AM_RANGE(0x300010, 0x300011) AM_READ_PORT("P2")
AM_RANGE(0x300020, 0x300021) AM_READ_PORT("COIN")
- AM_RANGE(0x310000, 0x310001) AM_READ(p1_gun_x) AM_WRITE_LEGACY(bang_clr_gun_int_w) /* Gun 1P X */ /* CLR INT Gun */
+ AM_RANGE(0x310000, 0x310001) AM_READ(p1_gun_x) AM_WRITE(bang_clr_gun_int_w) /* Gun 1P X */ /* CLR INT Gun */
AM_RANGE(0x310002, 0x310003) AM_READ(p2_gun_x) /* Gun 2P X */
AM_RANGE(0x310004, 0x310005) AM_READ(p1_gun_y) /* Gun 1P Y */
AM_RANGE(0x310006, 0x310007) AM_READ(p2_gun_y) /* Gun 2P Y */
@@ -432,13 +432,13 @@ ROM_END
static ADDRESS_MAP_START( alighunt_map, AS_PROGRAM, 16, gaelco2_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x202890, 0x2028ff) AM_DEVREADWRITE_LEGACY("gaelco", gaelcosnd_r, gaelcosnd_w) /* Sound Registers */
- AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE_LEGACY(gaelco2_vram_w) AM_SHARE("spriteram") /* Video RAM */
- AM_RANGE(0x210000, 0x211fff) AM_RAM_WRITE_LEGACY(gaelco2_palette_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(gaelco2_vram_w) AM_SHARE("spriteram") /* Video RAM */
+ AM_RANGE(0x210000, 0x211fff) AM_RAM_WRITE(gaelco2_palette_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x218004, 0x218009) AM_RAM AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x300000, 0x300001) AM_READ_PORT("IN0") /* DSW #1 + Input 1P */
AM_RANGE(0x300002, 0x300003) AM_READ_PORT("IN1") /* DSW #2 + Input 2P */
AM_RANGE(0x320000, 0x320001) AM_READ_PORT("COIN") /* COINSW + SERVICESW */
- AM_RANGE(0x500000, 0x500001) AM_WRITE_LEGACY(gaelco2_coin_w) /* Coin lockout + counters */
+ AM_RANGE(0x500000, 0x500001) AM_WRITE(gaelco2_coin_w) /* Coin lockout + counters */
AM_RANGE(0x500006, 0x500007) AM_WRITENOP /* ??? */
AM_RANGE(0xfe0000, 0xfeffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
@@ -643,14 +643,14 @@ READ16_MEMBER(gaelco2_state::dallas_kludge_r)
static ADDRESS_MAP_START( touchgo_map, AS_PROGRAM, 16, gaelco2_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x202890, 0x2028ff) AM_DEVREADWRITE_LEGACY("gaelco", gaelcosnd_r, gaelcosnd_w) /* Sound Registers */
- AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE_LEGACY(gaelco2_vram_w) AM_SHARE("spriteram") /* Video RAM */
- AM_RANGE(0x210000, 0x211fff) AM_RAM_WRITE_LEGACY(gaelco2_palette_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(gaelco2_vram_w) AM_SHARE("spriteram") /* Video RAM */
+ AM_RANGE(0x210000, 0x211fff) AM_RAM_WRITE(gaelco2_palette_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x218004, 0x218009) AM_RAM AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x300000, 0x300001) AM_READ_PORT("IN0") /* DSW #1 + Input 1P */
AM_RANGE(0x300002, 0x300003) AM_READ_PORT("IN1") /* DSW #2 + Input 2P */
AM_RANGE(0x300004, 0x300005) AM_READ_PORT("IN2") /* COINSW + Input 3P */
AM_RANGE(0x300006, 0x300007) AM_READ_PORT("IN3") /* SERVICESW + Input 4P */
- AM_RANGE(0x500000, 0x50001f) AM_WRITE_LEGACY(touchgo_coin_w) /* Coin counters */
+ AM_RANGE(0x500000, 0x50001f) AM_WRITE(touchgo_coin_w) /* Coin counters */
AM_RANGE(0xfefffa, 0xfefffb) AM_RAM_READ(dallas_kludge_r) /* DS5002FP related patch */
AM_RANGE(0xfe0000, 0xfeffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
@@ -907,18 +907,18 @@ ROM_END
static ADDRESS_MAP_START( snowboar_map, AS_PROGRAM, 16, gaelco2_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x202890, 0x2028ff) AM_DEVREADWRITE_LEGACY("gaelco", gaelcosnd_r, gaelcosnd_w) /* Sound Registers */
- AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE_LEGACY(gaelco2_vram_w) AM_SHARE("spriteram") /* Video RAM */
- AM_RANGE(0x210000, 0x211fff) AM_RAM_WRITE_LEGACY(gaelco2_palette_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(gaelco2_vram_w) AM_SHARE("spriteram") /* Video RAM */
+ AM_RANGE(0x210000, 0x211fff) AM_RAM_WRITE(gaelco2_palette_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x212000, 0x213fff) AM_RAM /* Extra RAM */
AM_RANGE(0x218004, 0x218009) AM_RAM AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x300000, 0x300001) AM_READ_PORT("P1")
- AM_RANGE(0x300000, 0x300003) AM_WRITE_LEGACY(gaelco2_coin2_w) /* Coin Counters */
+ AM_RANGE(0x300000, 0x300003) AM_WRITE(gaelco2_coin2_w) /* Coin Counters */
AM_RANGE(0x300008, 0x300009) AM_DEVWRITE_LEGACY("eeprom", gaelco2_eeprom_data_w) /* EEPROM data */
AM_RANGE(0x30000a, 0x30000b) AM_DEVWRITE_LEGACY("eeprom", gaelco2_eeprom_sk_w) /* EEPROM serial clock */
AM_RANGE(0x30000c, 0x30000d) AM_DEVWRITE_LEGACY("eeprom", gaelco2_eeprom_cs_w) /* EEPROM chip select */
AM_RANGE(0x300010, 0x300011) AM_READ_PORT("P2")
AM_RANGE(0x300020, 0x300021) AM_READ_PORT("COIN")
- AM_RANGE(0x310000, 0x31ffff) AM_READWRITE_LEGACY(snowboar_protection_r,snowboar_protection_w) AM_BASE(m_snowboar_protection) /* Protection */
+ AM_RANGE(0x310000, 0x31ffff) AM_READWRITE(snowboar_protection_r,snowboar_protection_w) AM_BASE(m_snowboar_protection) /* Protection */
AM_RANGE(0xfe0000, 0xfeffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
@@ -1092,17 +1092,17 @@ ROM_END
static ADDRESS_MAP_START( wrally2_map, AS_PROGRAM, 16, gaelco2_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x202890, 0x2028ff) AM_DEVREADWRITE_LEGACY("gaelco", gaelcosnd_r, gaelcosnd_w) /* Sound Registers */
- AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE_LEGACY(gaelco2_vram_w) AM_SHARE("spriteram") /* Video RAM */
- AM_RANGE(0x210000, 0x211fff) AM_RAM_WRITE_LEGACY(gaelco2_palette_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(gaelco2_vram_w) AM_SHARE("spriteram") /* Video RAM */
+ AM_RANGE(0x210000, 0x211fff) AM_RAM_WRITE(gaelco2_palette_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x212000, 0x213fff) AM_RAM /* Extra RAM */
AM_RANGE(0x218004, 0x218009) AM_RAM AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x300000, 0x300001) AM_READ_PORT("IN0") /* DIPSW #2 + Inputs 1P */
AM_RANGE(0x300002, 0x300003) AM_READ_PORT("IN1") /* DIPSW #1 */
AM_RANGE(0x300004, 0x300005) AM_READ_PORT("IN2") /* Inputs 2P + COINSW */
AM_RANGE(0x300006, 0x300007) AM_READ_PORT("IN3") /* SERVICESW */
- AM_RANGE(0x400000, 0x400011) AM_WRITE_LEGACY(wrally2_coin_w) /* Coin Counters */
- AM_RANGE(0x400028, 0x400029) AM_WRITE_LEGACY(wrally2_adc_clk) /* ADCs clock-in line */
- AM_RANGE(0x400030, 0x400031) AM_WRITE_LEGACY(wrally2_adc_cs) /* ADCs chip select line */
+ AM_RANGE(0x400000, 0x400011) AM_WRITE(wrally2_coin_w) /* Coin Counters */
+ AM_RANGE(0x400028, 0x400029) AM_WRITE(wrally2_adc_clk) /* ADCs clock-in line */
+ AM_RANGE(0x400030, 0x400031) AM_WRITE(wrally2_adc_cs) /* ADCs chip select line */
AM_RANGE(0xfe0000, 0xfeffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index 590836ab997..fdaeeba2d3d 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -770,7 +770,7 @@ WRITE32_MEMBER(gaelco3d_state::unknown_13a_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, gaelco3d_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x1fffff) AM_ROM
- AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE_LEGACY(gaelco3d_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(gaelco3d_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x51000c, 0x51000d) AM_READ_PORT("IN0")
AM_RANGE(0x51001c, 0x51001d) AM_READ_PORT("IN1")
AM_RANGE(0x51002c, 0x51002d) AM_READ_PORT("IN2")
@@ -800,7 +800,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( main020_map, AS_PROGRAM, 32, gaelco3d_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
- AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE_LEGACY(gaelco3d_paletteram_020_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(gaelco3d_paletteram_020_w) AM_SHARE("paletteram")
AM_RANGE(0x51000c, 0x51000f) AM_READ_PORT("IN0")
AM_RANGE(0x51001c, 0x51001f) AM_READ_PORT("IN1")
AM_RANGE(0x51002c, 0x51002f) AM_READ_PORT("IN2")
@@ -831,7 +831,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( tms_map, AS_PROGRAM, 32, gaelco3d_state )
AM_RANGE(0x000000, 0x007fff) AM_READWRITE(tms_m68k_ram_r, tms_m68k_ram_w)
AM_RANGE(0x400000, 0x5fffff) AM_ROM AM_REGION("user2", 0)
- AM_RANGE(0xc00000, 0xc00007) AM_WRITE_LEGACY(gaelco3d_render_w)
+ AM_RANGE(0xc00000, 0xc00007) AM_WRITE(gaelco3d_render_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 6136f4f0e30..f51528b7034 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -390,35 +390,35 @@ READ16_MEMBER(gaiden_state::raiga_protection_r)
static ADDRESS_MAP_START( gaiden_map, AS_PROGRAM, 16, gaiden_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x060000, 0x063fff) AM_RAM
- AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE_LEGACY(gaiden_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x072000, 0x073fff) AM_READWRITE_LEGACY(gaiden_videoram2_r, gaiden_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x074000, 0x075fff) AM_READWRITE_LEGACY(gaiden_videoram3_r, gaiden_videoram3_w) AM_BASE(m_videoram3)
+ AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(gaiden_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x072000, 0x073fff) AM_READWRITE(gaiden_videoram2_r, gaiden_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x074000, 0x075fff) AM_READWRITE(gaiden_videoram3_r, gaiden_videoram3_w) AM_BASE(m_videoram3)
AM_RANGE(0x076000, 0x077fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x078000, 0x079fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x07a000, 0x07a001) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x07a002, 0x07a003) AM_READ_PORT("P1_P2") AM_WRITE_LEGACY(gaiden_sproffsety_w)
+ AM_RANGE(0x07a002, 0x07a003) AM_READ_PORT("P1_P2") AM_WRITE(gaiden_sproffsety_w)
AM_RANGE(0x07a004, 0x07a005) AM_READ_PORT("DSW")
- AM_RANGE(0x07a104, 0x07a105) AM_WRITE_LEGACY(gaiden_txscrolly_w)
- AM_RANGE(0x07a108, 0x07a109) AM_WRITE_LEGACY(gaiden_txoffsety_w)
- AM_RANGE(0x07a10c, 0x07a10d) AM_WRITE_LEGACY(gaiden_txscrollx_w)
- AM_RANGE(0x07a204, 0x07a205) AM_WRITE_LEGACY(gaiden_fgscrolly_w)
- AM_RANGE(0x07a208, 0x07a209) AM_WRITE_LEGACY(gaiden_fgoffsety_w)
- AM_RANGE(0x07a20c, 0x07a20d) AM_WRITE_LEGACY(gaiden_fgscrollx_w)
- AM_RANGE(0x07a304, 0x07a305) AM_WRITE_LEGACY(gaiden_bgscrolly_w)
- AM_RANGE(0x07a308, 0x07a309) AM_WRITE_LEGACY(gaiden_bgoffsety_w)
- AM_RANGE(0x07a30c, 0x07a30d) AM_WRITE_LEGACY(gaiden_bgscrollx_w)
+ AM_RANGE(0x07a104, 0x07a105) AM_WRITE(gaiden_txscrolly_w)
+ AM_RANGE(0x07a108, 0x07a109) AM_WRITE(gaiden_txoffsety_w)
+ AM_RANGE(0x07a10c, 0x07a10d) AM_WRITE(gaiden_txscrollx_w)
+ AM_RANGE(0x07a204, 0x07a205) AM_WRITE(gaiden_fgscrolly_w)
+ AM_RANGE(0x07a208, 0x07a209) AM_WRITE(gaiden_fgoffsety_w)
+ AM_RANGE(0x07a20c, 0x07a20d) AM_WRITE(gaiden_fgscrollx_w)
+ AM_RANGE(0x07a304, 0x07a305) AM_WRITE(gaiden_bgscrolly_w)
+ AM_RANGE(0x07a308, 0x07a309) AM_WRITE(gaiden_bgoffsety_w)
+ AM_RANGE(0x07a30c, 0x07a30d) AM_WRITE(gaiden_bgscrollx_w)
AM_RANGE(0x07a800, 0x07a801) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x07a802, 0x07a803) AM_WRITE(gaiden_sound_command_w)
AM_RANGE(0x07a806, 0x07a807) AM_WRITENOP
- AM_RANGE(0x07a808, 0x07a809) AM_WRITE_LEGACY(gaiden_flip_w)
+ AM_RANGE(0x07a808, 0x07a809) AM_WRITE(gaiden_flip_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( drgnbowl_map, AS_PROGRAM, 16, gaiden_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x060000, 0x063fff) AM_RAM
- AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE_LEGACY(gaiden_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x072000, 0x073fff) AM_RAM_WRITE_LEGACY(gaiden_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x074000, 0x075fff) AM_RAM_WRITE_LEGACY(gaiden_videoram3_w) AM_BASE(m_videoram3)
+ AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(gaiden_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x072000, 0x073fff) AM_RAM_WRITE(gaiden_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x074000, 0x075fff) AM_RAM_WRITE(gaiden_videoram3_w) AM_BASE(m_videoram3)
AM_RANGE(0x076000, 0x077fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x078000, 0x079fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x07a000, 0x07a001) AM_READ_PORT("SYSTEM")
@@ -426,10 +426,10 @@ static ADDRESS_MAP_START( drgnbowl_map, AS_PROGRAM, 16, gaiden_state )
AM_RANGE(0x07a004, 0x07a005) AM_READ_PORT("DSW")
AM_RANGE(0x07a00e, 0x07a00f) AM_WRITE(drgnbowl_sound_command_w)
AM_RANGE(0x07e000, 0x07e001) AM_WRITENOP
- AM_RANGE(0x07f000, 0x07f001) AM_WRITE_LEGACY(gaiden_bgscrolly_w)
- AM_RANGE(0x07f002, 0x07f003) AM_WRITE_LEGACY(gaiden_bgscrollx_w)
- AM_RANGE(0x07f004, 0x07f005) AM_WRITE_LEGACY(gaiden_fgscrolly_w)
- AM_RANGE(0x07f006, 0x07f007) AM_WRITE_LEGACY(gaiden_fgscrollx_w)
+ AM_RANGE(0x07f000, 0x07f001) AM_WRITE(gaiden_bgscrolly_w)
+ AM_RANGE(0x07f002, 0x07f003) AM_WRITE(gaiden_bgscrollx_w)
+ AM_RANGE(0x07f004, 0x07f005) AM_WRITE(gaiden_fgscrolly_w)
+ AM_RANGE(0x07f006, 0x07f007) AM_WRITE(gaiden_fgscrollx_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, gaiden_state )
@@ -912,25 +912,25 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mastninj_map, AS_PROGRAM, 16, gaiden_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x060000, 0x063fff) AM_RAM
- AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE_LEGACY(gaiden_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x072000, 0x073fff) AM_READWRITE_LEGACY(gaiden_videoram2_r, gaiden_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x074000, 0x075fff) AM_READWRITE_LEGACY(gaiden_videoram3_r, gaiden_videoram3_w) AM_BASE(m_videoram3)
+ AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(gaiden_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x072000, 0x073fff) AM_READWRITE(gaiden_videoram2_r, gaiden_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x074000, 0x075fff) AM_READWRITE(gaiden_videoram3_r, gaiden_videoram3_w) AM_BASE(m_videoram3)
AM_RANGE(0x076000, 0x077fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x078000, 0x079fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
// AM_RANGE(0x078800, 0x079fff) AM_RAM
AM_RANGE(0x07a000, 0x07a001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x07a002, 0x07a003) AM_READ_PORT("P1_P2")
AM_RANGE(0x07a004, 0x07a005) AM_READ_PORT("DSW")
-// AM_RANGE(0x07a104, 0x07a105) AM_WRITE_LEGACY(gaiden_txscrolly_w)
-// AM_RANGE(0x07a10c, 0x07a10d) AM_WRITE_LEGACY(gaiden_txscrollx_w)
- AM_RANGE(0x07f000, 0x07f001) AM_WRITE_LEGACY(gaiden_bgscrolly_w)
- AM_RANGE(0x07f002, 0x07f003) AM_WRITE_LEGACY(gaiden_bgscrollx_w)
- AM_RANGE(0x07f004, 0x07f005) AM_WRITE_LEGACY(gaiden_fgscrolly_w)
- AM_RANGE(0x07f006, 0x07f007) AM_WRITE_LEGACY(gaiden_fgscrollx_w)
+// AM_RANGE(0x07a104, 0x07a105) AM_WRITE(gaiden_txscrolly_w)
+// AM_RANGE(0x07a10c, 0x07a10d) AM_WRITE(gaiden_txscrollx_w)
+ AM_RANGE(0x07f000, 0x07f001) AM_WRITE(gaiden_bgscrolly_w)
+ AM_RANGE(0x07f002, 0x07f003) AM_WRITE(gaiden_bgscrollx_w)
+ AM_RANGE(0x07f004, 0x07f005) AM_WRITE(gaiden_fgscrolly_w)
+ AM_RANGE(0x07f006, 0x07f007) AM_WRITE(gaiden_fgscrollx_w)
AM_RANGE(0x07a800, 0x07a801) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x07e000, 0x07e001) AM_WRITE(gaiden_sound_command_w)
// AM_RANGE(0x07a806, 0x07a807) AM_WRITENOP
-// AM_RANGE(0x07a808, 0x07a809) AM_WRITE_LEGACY(gaiden_flip_w)
+// AM_RANGE(0x07a808, 0x07a809) AM_WRITE(gaiden_flip_w)
ADDRESS_MAP_END
static MACHINE_CONFIG_START( mastninj, gaiden_state )
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index 9bf6d019389..43fe3b9aa2a 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -947,7 +947,7 @@ static ADDRESS_MAP_START( galaga_map, AS_PROGRAM, 8, galaga_state )
AM_RANGE(0x6830, 0x6830) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x7000, 0x70ff) AM_DEVREADWRITE_LEGACY("06xx", namco_06xx_data_r, namco_06xx_data_w)
AM_RANGE(0x7100, 0x7100) AM_DEVREADWRITE_LEGACY("06xx", namco_06xx_ctrl_r, namco_06xx_ctrl_w)
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(galaga_videoram_w) AM_BASE(m_videoram) AM_SHARE("gvr")
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(galaga_videoram_w) AM_BASE(m_videoram) AM_SHARE("gvr")
AM_RANGE(0x8800, 0x8bff) AM_RAM AM_SHARE("share1") AM_BASE(m_galaga_ram1)
AM_RANGE(0x9000, 0x93ff) AM_RAM AM_SHARE("share2") AM_BASE(m_galaga_ram2)
AM_RANGE(0x9800, 0x9bff) AM_RAM AM_SHARE("share3") AM_BASE(m_galaga_ram3)
@@ -3279,7 +3279,8 @@ static DRIVER_INIT (gatsbee)
DRIVER_INIT_CALL(galaga);
/* Gatsbee has a larger character ROM, we need a handler for banking */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x1000, 0x1000, FUNC(gatsbee_bank_w));
+ galaga_state *state = machine.driver_data<galaga_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x1000, 0x1000, write8_delegate(FUNC(galaga_state::gatsbee_bank_w),state));
}
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 2100a07ba49..86c183eb2f2 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -1092,10 +1092,10 @@ static INPUT_CHANGED( gmgalax_game_changed )
/* select the bank and graphics bank based on it */
memory_set_bank(field.machine(), "bank1", state->m_gmgalax_selected_game);
- galaxian_gfxbank_w(space, 0, state->m_gmgalax_selected_game);
+ state->galaxian_gfxbank_w(*space, 0, state->m_gmgalax_selected_game);
/* reset the stars */
- galaxian_stars_enable_w(space, 0, 0);
+ state->galaxian_stars_enable_w(*space, 0, 0);
/* reset the CPU */
cputag_set_input_line(field.machine(), "maincpu", INPUT_LINE_RESET, PULSE_LINE);
@@ -1438,8 +1438,8 @@ static ADDRESS_MAP_START( galaxian_map_base, AS_PROGRAM, 8, galaxian_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM
- AM_RANGE(0x5000, 0x53ff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5800, 0x58ff) AM_MIRROR(0x0700) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0x5000, 0x53ff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5800, 0x58ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x07ff) AM_READ_PORT("IN0")
AM_RANGE(0x6000, 0x6001) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(start_lamp_w)
AM_RANGE(0x6002, 0x6002) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(coin_lock_w)
@@ -1449,9 +1449,9 @@ static ADDRESS_MAP_START( galaxian_map_base, AS_PROGRAM, 8, galaxian_state )
//AM_RANGE(0x6800, 0x6807) AM_MIRROR(0x07f8) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_sound_w)
AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x07ff) AM_READ_PORT("IN2")
AM_RANGE(0x7001, 0x7001) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(irq_enable_w)
- AM_RANGE(0x7004, 0x7004) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_stars_enable_w)
- AM_RANGE(0x7006, 0x7006) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_x_w)
- AM_RANGE(0x7007, 0x7007) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_y_w)
+ AM_RANGE(0x7004, 0x7004) AM_MIRROR(0x07f8) AM_WRITE(galaxian_stars_enable_w)
+ AM_RANGE(0x7006, 0x7006) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_x_w)
+ AM_RANGE(0x7007, 0x7007) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_y_w)
//AM_RANGE(0x7800, 0x7800) AM_MIRROR(0x07ff) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
AM_RANGE(0x7800, 0x7800) AM_MIRROR(0x07ff) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
@@ -1473,19 +1473,19 @@ static ADDRESS_MAP_START( mooncrst_map_base, AS_PROGRAM, 8, galaxian_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x0400) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9800, 0x98ff) AM_MIRROR(0x0700) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9800, 0x98ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x07ff) AM_READ_PORT("IN0")
- AM_RANGE(0xa000, 0xa002) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_gfxbank_w)
+ AM_RANGE(0xa000, 0xa002) AM_MIRROR(0x07f8) AM_WRITE(galaxian_gfxbank_w)
AM_RANGE(0xa003, 0xa003) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(coin_count_0_w)
// AM_RANGE(0xa004, 0xa007) AM_MIRROR(0x07f8) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_lfo_freq_w)
AM_RANGE(0xa800, 0xa800) AM_MIRROR(0x07ff) AM_READ_PORT("IN1")
// AM_RANGE(0xa800, 0xa807) AM_MIRROR(0x07f8) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_sound_w)
AM_RANGE(0xb000, 0xb000) AM_MIRROR(0x07ff) AM_READ_PORT("IN2")
AM_RANGE(0xb000, 0xb000) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(irq_enable_w)
- AM_RANGE(0xb004, 0xb004) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_stars_enable_w)
- AM_RANGE(0xb006, 0xb006) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_x_w)
- AM_RANGE(0xb007, 0xb007) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_y_w)
+ AM_RANGE(0xb004, 0xb004) AM_MIRROR(0x07f8) AM_WRITE(galaxian_stars_enable_w)
+ AM_RANGE(0xb006, 0xb006) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_x_w)
+ AM_RANGE(0xb007, 0xb007) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_y_w)
// AM_RANGE(0xb800, 0xb800) AM_MIRROR(0x07ff) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
AM_RANGE(0xb800, 0xb800) AM_MIRROR(0x07ff) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
@@ -1504,8 +1504,8 @@ static ADDRESS_MAP_START( fantastc_map, AS_PROGRAM, 8, galaxian_state )
AM_RANGE(0x880b, 0x880b) AM_DEVWRITE_LEGACY("8910.0", ay8910_data_w)
AM_RANGE(0x880c, 0x880c) AM_DEVWRITE_LEGACY("8910.1", ay8910_address_w)
AM_RANGE(0x880e, 0x880e) AM_DEVWRITE_LEGACY("8910.1", ay8910_data_w)
- AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9800, 0x98ff) AM_MIRROR(0x0700) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9800, 0x98ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x07ff) AM_READ_PORT("IN0")
AM_RANGE(0xa800, 0xa800) AM_MIRROR(0x07ff) AM_READ_PORT("IN1")
AM_RANGE(0xb000, 0xb000) AM_MIRROR(0x07ff) AM_READ_PORT("IN2")
@@ -1523,17 +1523,17 @@ static ADDRESS_MAP_START( dambustr_map, AS_PROGRAM, 8, galaxian_state )
// AM_RANGE(0x8000, 0x8000) AM_WRITE_LEGACY(dambustr_bg_color_w)
// AM_RANGE(0x8001, 0x8001) AM_WRITE_LEGACY(dambustr_bg_split_line_w)
AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x0400) AM_RAM
- AM_RANGE(0xd000, 0xd3ff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd800, 0xd8ff) AM_MIRROR(0x0700) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0xd000, 0xd3ff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd800, 0xd8ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x07ff) AM_READ_PORT("IN0")
AM_RANGE(0xe004, 0xe007) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_lfo_freq_w)
AM_RANGE(0xe800, 0xe800) AM_MIRROR(0x07ff) AM_READ_PORT("IN1")
AM_RANGE(0xe800, 0xe807) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_sound_w)
AM_RANGE(0xf000, 0xf000) AM_MIRROR(0x07ff) AM_READ_PORT("IN2")
AM_RANGE(0xf001, 0xf001) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(irq_enable_w)
- AM_RANGE(0xf004, 0xf004) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_stars_enable_w)
- AM_RANGE(0xf006, 0xf006) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_x_w)
- AM_RANGE(0xf007, 0xf007) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_y_w)
+ AM_RANGE(0xf004, 0xf004) AM_MIRROR(0x07f8) AM_WRITE(galaxian_stars_enable_w)
+ AM_RANGE(0xf006, 0xf006) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_x_w)
+ AM_RANGE(0xf007, 0xf007) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_y_w)
AM_RANGE(0xf800, 0xf800) AM_MIRROR(0x07ff) AM_READ(watchdog_reset_r)
AM_RANGE(0xf800, 0xf800) AM_MIRROR(0x07ff) AM_WRITE_LEGACY(galaxian_pitch_w)
ADDRESS_MAP_END
@@ -1545,15 +1545,15 @@ static ADDRESS_MAP_START( theend_map, AS_PROGRAM, 8, galaxian_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5000, 0x50ff) AM_MIRROR(0x0700) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5000, 0x50ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
AM_RANGE(0x6801, 0x6801) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(irq_enable_w)
AM_RANGE(0x6802, 0x6802) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(coin_count_0_w)
- AM_RANGE(0x6803, 0x6803) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(scramble_background_enable_w)
- AM_RANGE(0x6804, 0x6804) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_stars_enable_w)
+ AM_RANGE(0x6803, 0x6803) AM_MIRROR(0x07f8) AM_WRITE(scramble_background_enable_w)
+ AM_RANGE(0x6804, 0x6804) AM_MIRROR(0x07f8) AM_WRITE(galaxian_stars_enable_w)
AM_RANGE(0x6805, 0x6805) AM_MIRROR(0x07f8) //POUT2
- AM_RANGE(0x6806, 0x6806) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_x_w)
- AM_RANGE(0x6807, 0x6807) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_y_w)
+ AM_RANGE(0x6806, 0x6806) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_x_w)
+ AM_RANGE(0x6807, 0x6807) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_y_w)
AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x07ff) AM_READ(watchdog_reset_r)
AM_RANGE(0x8000, 0xffff) AM_READWRITE_LEGACY(theend_ppi8255_r, theend_ppi8255_w)
ADDRESS_MAP_END
@@ -1564,17 +1564,17 @@ static ADDRESS_MAP_START( scobra_map, AS_PROGRAM, 8, galaxian_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x4000) AM_RAM
- AM_RANGE(0x8800, 0x8bff) AM_MIRROR(0x4400) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9000, 0x90ff) AM_MIRROR(0x4700) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0x8800, 0x8bff) AM_MIRROR(0x4400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9000, 0x90ff) AM_MIRROR(0x4700) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
AM_RANGE(0x9800, 0x9803) AM_MIRROR(0x47fc) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x47fc) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w)
AM_RANGE(0xa801, 0xa801) AM_MIRROR(0x47f8) AM_WRITE_LEGACY(irq_enable_w)
AM_RANGE(0xa802, 0xa802) AM_MIRROR(0x47f8) AM_WRITE_LEGACY(coin_count_0_w)
- AM_RANGE(0xa803, 0xa803) AM_MIRROR(0x47f8) AM_WRITE_LEGACY(scramble_background_enable_w)
- AM_RANGE(0xa804, 0xa804) AM_MIRROR(0x47f8) AM_WRITE_LEGACY(galaxian_stars_enable_w)
+ AM_RANGE(0xa803, 0xa803) AM_MIRROR(0x47f8) AM_WRITE(scramble_background_enable_w)
+ AM_RANGE(0xa804, 0xa804) AM_MIRROR(0x47f8) AM_WRITE(galaxian_stars_enable_w)
AM_RANGE(0xa805, 0xa805) AM_MIRROR(0x47f8) /* POUT2 */
- AM_RANGE(0xa806, 0xa806) AM_MIRROR(0x47f8) AM_WRITE_LEGACY(galaxian_flip_screen_x_w)
- AM_RANGE(0xa807, 0xa807) AM_MIRROR(0x47f8) AM_WRITE_LEGACY(galaxian_flip_screen_y_w)
+ AM_RANGE(0xa806, 0xa806) AM_MIRROR(0x47f8) AM_WRITE(galaxian_flip_screen_x_w)
+ AM_RANGE(0xa807, 0xa807) AM_MIRROR(0x47f8) AM_WRITE(galaxian_flip_screen_y_w)
AM_RANGE(0xb000, 0xb000) AM_MIRROR(0x47ff) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
@@ -1583,15 +1583,15 @@ static ADDRESS_MAP_START( anteateruk_map, AS_PROGRAM, 8, galaxian_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x03ff) AM_ROM
AM_RANGE(0x0400, 0x0bff) AM_RAM
- AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1001, 0x1001) AM_MIRROR(0x01f8) AM_WRITE_LEGACY(irq_enable_w)
AM_RANGE(0x1002, 0x1002) AM_MIRROR(0x01f8) AM_WRITE_LEGACY(coin_count_0_w)
- AM_RANGE(0x1003, 0x1003) AM_MIRROR(0x01f8) AM_WRITE_LEGACY(scramble_background_enable_w)
- AM_RANGE(0x1004, 0x1004) AM_MIRROR(0x01f8) AM_WRITE_LEGACY(galaxian_stars_enable_w)
+ AM_RANGE(0x1003, 0x1003) AM_MIRROR(0x01f8) AM_WRITE(scramble_background_enable_w)
+ AM_RANGE(0x1004, 0x1004) AM_MIRROR(0x01f8) AM_WRITE(galaxian_stars_enable_w)
AM_RANGE(0x1005, 0x1005) AM_MIRROR(0x01f8) //POUT2
- AM_RANGE(0x1006, 0x1006) AM_MIRROR(0x01f8) AM_WRITE_LEGACY(galaxian_flip_screen_x_w)
- AM_RANGE(0x1007, 0x1007) AM_MIRROR(0x01f8) AM_WRITE_LEGACY(galaxian_flip_screen_y_w)
- AM_RANGE(0x1200, 0x12ff) AM_MIRROR(0x0100) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0x1006, 0x1006) AM_MIRROR(0x01f8) AM_WRITE(galaxian_flip_screen_x_w)
+ AM_RANGE(0x1007, 0x1007) AM_MIRROR(0x01f8) AM_WRITE(galaxian_flip_screen_y_w)
+ AM_RANGE(0x1200, 0x12ff) AM_MIRROR(0x0100) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x03ff) AM_READ(watchdog_reset_r)
AM_RANGE(0x4000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc003) AM_MIRROR(0x3efc) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w)
@@ -1603,18 +1603,18 @@ static ADDRESS_MAP_START( anteaterg_map, AS_PROGRAM, 8, galaxian_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x03ff) AM_ROM
AM_RANGE(0x0400, 0x0bff) AM_RAM
- AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x2000, 0x20ff) AM_MIRROR(0x0300) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2000, 0x20ff) AM_MIRROR(0x0300) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
AM_RANGE(0x2400, 0x2403) AM_MIRROR(0x01fc) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w)
AM_RANGE(0x2601, 0x2601) AM_MIRROR(0x01f8) AM_WRITE_LEGACY(irq_enable_w)
AM_RANGE(0x2602, 0x2602) AM_MIRROR(0x01f8) AM_WRITE_LEGACY(coin_count_0_w)
- AM_RANGE(0x2603, 0x2603) AM_MIRROR(0x01f8) AM_WRITE_LEGACY(scramble_background_enable_w)
- AM_RANGE(0x2604, 0x2604) AM_MIRROR(0x01f8) AM_WRITE_LEGACY(galaxian_stars_enable_w)
+ AM_RANGE(0x2603, 0x2603) AM_MIRROR(0x01f8) AM_WRITE(scramble_background_enable_w)
+ AM_RANGE(0x2604, 0x2604) AM_MIRROR(0x01f8) AM_WRITE(galaxian_stars_enable_w)
AM_RANGE(0x2605, 0x2605) AM_MIRROR(0x01f8) //POUT2
- AM_RANGE(0x2606, 0x2606) AM_MIRROR(0x01f8) AM_WRITE_LEGACY(galaxian_flip_screen_x_w)
- AM_RANGE(0x2607, 0x2607) AM_MIRROR(0x01f8) AM_WRITE_LEGACY(galaxian_flip_screen_y_w)
+ AM_RANGE(0x2606, 0x2606) AM_MIRROR(0x01f8) AM_WRITE(galaxian_flip_screen_x_w)
+ AM_RANGE(0x2607, 0x2607) AM_MIRROR(0x01f8) AM_WRITE(galaxian_flip_screen_y_w)
AM_RANGE(0x4000, 0xbfff) AM_ROM
- AM_RANGE(0x7c00, 0x7fff) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram) /* mirror! */
+ AM_RANGE(0x7c00, 0x7fff) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram) /* mirror! */
AM_RANGE(0xf400, 0xf400) AM_MIRROR(0x01ff) AM_READ(watchdog_reset_r)
AM_RANGE(0xf600, 0xf603) AM_MIRROR(0x01fc) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w)
ADDRESS_MAP_END
@@ -1626,11 +1626,11 @@ static ADDRESS_MAP_START( frogger_map, AS_PROGRAM, 8, galaxian_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x07ff) AM_READ(watchdog_reset_r)
- AM_RANGE(0xa800, 0xabff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xb000, 0xb0ff) AM_MIRROR(0x0700) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0xa800, 0xabff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xb000, 0xb0ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
AM_RANGE(0xb808, 0xb808) AM_MIRROR(0x07e3) AM_WRITE_LEGACY(irq_enable_w)
- AM_RANGE(0xb80c, 0xb80c) AM_MIRROR(0x07e3) AM_WRITE_LEGACY(galaxian_flip_screen_y_w)
- AM_RANGE(0xb810, 0xb810) AM_MIRROR(0x07e3) AM_WRITE_LEGACY(galaxian_flip_screen_x_w)
+ AM_RANGE(0xb80c, 0xb80c) AM_MIRROR(0x07e3) AM_WRITE(galaxian_flip_screen_y_w)
+ AM_RANGE(0xb810, 0xb810) AM_MIRROR(0x07e3) AM_WRITE(galaxian_flip_screen_x_w)
AM_RANGE(0xb818, 0xb818) AM_MIRROR(0x07e3) AM_WRITE_LEGACY(coin_count_0_w) /* IOPC7 */
AM_RANGE(0xb81c, 0xb81c) AM_MIRROR(0x07e3) AM_WRITE_LEGACY(coin_count_1_w) /* POUT1 */
AM_RANGE(0xc000, 0xffff) AM_READWRITE_LEGACY(frogger_ppi8255_r, frogger_ppi8255_w)
@@ -1642,14 +1642,14 @@ static ADDRESS_MAP_START( turtles_map, AS_PROGRAM, 8, galaxian_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x4000) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x4400) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9800, 0x98ff) AM_MIRROR(0x4700) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
- AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x47c7) AM_WRITE_LEGACY(scramble_background_red_w)
+ AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x4400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9800, 0x98ff) AM_MIRROR(0x4700) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x47c7) AM_WRITE(scramble_background_red_w)
AM_RANGE(0xa008, 0xa008) AM_MIRROR(0x47c7) AM_WRITE_LEGACY(irq_enable_w)
- AM_RANGE(0xa010, 0xa010) AM_MIRROR(0x47c7) AM_WRITE_LEGACY(galaxian_flip_screen_y_w)
- AM_RANGE(0xa018, 0xa018) AM_MIRROR(0x47c7) AM_WRITE_LEGACY(galaxian_flip_screen_x_w)
- AM_RANGE(0xa020, 0xa020) AM_MIRROR(0x47c7) AM_WRITE_LEGACY(scramble_background_green_w)
- AM_RANGE(0xa028, 0xa028) AM_MIRROR(0x47c7) AM_WRITE_LEGACY(scramble_background_blue_w)
+ AM_RANGE(0xa010, 0xa010) AM_MIRROR(0x47c7) AM_WRITE(galaxian_flip_screen_y_w)
+ AM_RANGE(0xa018, 0xa018) AM_MIRROR(0x47c7) AM_WRITE(galaxian_flip_screen_x_w)
+ AM_RANGE(0xa020, 0xa020) AM_MIRROR(0x47c7) AM_WRITE(scramble_background_green_w)
+ AM_RANGE(0xa028, 0xa028) AM_MIRROR(0x47c7) AM_WRITE(scramble_background_blue_w)
AM_RANGE(0xa030, 0xa030) AM_MIRROR(0x47c7) AM_WRITE_LEGACY(coin_count_0_w)
AM_RANGE(0xa038, 0xa038) AM_MIRROR(0x47c7) AM_WRITE_LEGACY(coin_count_1_w)
AM_RANGE(0xa800, 0xa800) AM_MIRROR(0x47ff) AM_READ(watchdog_reset_r)
@@ -1663,16 +1663,16 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sfx_map, AS_PROGRAM, 8, galaxian_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5000, 0x50ff) AM_MIRROR(0x0700) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
- AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(scramble_background_red_w)
+ AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5000, 0x50ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07f8) AM_WRITE(scramble_background_red_w)
AM_RANGE(0x6801, 0x6801) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(irq_enable_w)
AM_RANGE(0x6802, 0x6802) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(coin_count_0_w)
- AM_RANGE(0x6803, 0x6803) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(scramble_background_blue_w)
- AM_RANGE(0x6804, 0x6804) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_stars_enable_w)
- AM_RANGE(0x6805, 0x6805) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(scramble_background_green_w)
- AM_RANGE(0x6806, 0x6806) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_x_w)
- AM_RANGE(0x6807, 0x6807) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_y_w)
+ AM_RANGE(0x6803, 0x6803) AM_MIRROR(0x07f8) AM_WRITE(scramble_background_blue_w)
+ AM_RANGE(0x6804, 0x6804) AM_MIRROR(0x07f8) AM_WRITE(galaxian_stars_enable_w)
+ AM_RANGE(0x6805, 0x6805) AM_MIRROR(0x07f8) AM_WRITE(scramble_background_green_w)
+ AM_RANGE(0x6806, 0x6806) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_x_w)
+ AM_RANGE(0x6807, 0x6807) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_y_w)
AM_RANGE(0x7000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_READWRITE_LEGACY(theend_ppi8255_r, theend_ppi8255_w)
AM_RANGE(0xc000, 0xefff) AM_ROM
@@ -1683,16 +1683,16 @@ static ADDRESS_MAP_START( monsterz_map, AS_PROGRAM, 8, galaxian_state )
AM_RANGE(0x0000, 0x37ff) AM_ROM
AM_RANGE(0x3800, 0x3fff) AM_RAM // extra RAM used by protection
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5000, 0x50ff) AM_MIRROR(0x0700) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
- AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(scramble_background_red_w)
+ AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5000, 0x50ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07f8) AM_WRITE(scramble_background_red_w)
AM_RANGE(0x6801, 0x6801) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(irq_enable_w)
AM_RANGE(0x6802, 0x6802) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(coin_count_0_w)
- AM_RANGE(0x6803, 0x6803) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(scramble_background_blue_w)
- AM_RANGE(0x6804, 0x6804) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_stars_enable_w)
- AM_RANGE(0x6805, 0x6805) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(scramble_background_green_w)
- AM_RANGE(0x6806, 0x6806) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_x_w)
- AM_RANGE(0x6807, 0x6807) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_y_w)
+ AM_RANGE(0x6803, 0x6803) AM_MIRROR(0x07f8) AM_WRITE(scramble_background_blue_w)
+ AM_RANGE(0x6804, 0x6804) AM_MIRROR(0x07f8) AM_WRITE(galaxian_stars_enable_w)
+ AM_RANGE(0x6805, 0x6805) AM_MIRROR(0x07f8) AM_WRITE(scramble_background_green_w)
+ AM_RANGE(0x6806, 0x6806) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_x_w)
+ AM_RANGE(0x6807, 0x6807) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_y_w)
AM_RANGE(0x8000, 0xbfff) AM_READWRITE_LEGACY(theend_ppi8255_r, theend_ppi8255_w)
AM_RANGE(0xc000, 0xd7ff) AM_ROM
AM_RANGE(0xd800, 0xd800) AM_READ_LEGACY(monsterz_protection_r)
@@ -1712,19 +1712,19 @@ static ADDRESS_MAP_START( jumpbug_map, AS_PROGRAM, 8, galaxian_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5000, 0x50ff) AM_MIRROR(0x0700) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5000, 0x50ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
AM_RANGE(0x5800, 0x5800) AM_MIRROR(0x00ff) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_w)
AM_RANGE(0x5900, 0x5900) AM_MIRROR(0x00ff) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w)
AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x07ff) AM_READ_PORT("IN0")
- AM_RANGE(0x6002, 0x6006) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_gfxbank_w)
+ AM_RANGE(0x6002, 0x6006) AM_MIRROR(0x07f8) AM_WRITE(galaxian_gfxbank_w)
AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07ff) AM_READ_PORT("IN1")
AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x07ff) AM_READ_PORT("IN2")
AM_RANGE(0x7001, 0x7001) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(irq_enable_w)
AM_RANGE(0x7002, 0x7002) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(coin_count_0_w)
- AM_RANGE(0x7004, 0x7004) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_stars_enable_w)
- AM_RANGE(0x7006, 0x7006) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_x_w)
- AM_RANGE(0x7007, 0x7007) AM_MIRROR(0x07f8) AM_WRITE_LEGACY(galaxian_flip_screen_y_w)
+ AM_RANGE(0x7004, 0x7004) AM_MIRROR(0x07f8) AM_WRITE(galaxian_stars_enable_w)
+ AM_RANGE(0x7006, 0x7006) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_x_w)
+ AM_RANGE(0x7007, 0x7007) AM_MIRROR(0x07f8) AM_WRITE(galaxian_flip_screen_y_w)
AM_RANGE(0x8000, 0xafff) AM_ROM
AM_RANGE(0xb000, 0xbfff) AM_READ_LEGACY(jumpbug_protection_r)
ADDRESS_MAP_END
@@ -1734,11 +1734,11 @@ static ADDRESS_MAP_START( frogf_map, AS_PROGRAM, 8, galaxian_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x8bff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9000, 0x90ff) AM_MIRROR(0x0700) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
- AM_RANGE(0xa802, 0xa802) AM_MIRROR(0x07f1) AM_WRITE_LEGACY(galaxian_flip_screen_x_w)
+ AM_RANGE(0x8800, 0x8bff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9000, 0x90ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0xa802, 0xa802) AM_MIRROR(0x07f1) AM_WRITE(galaxian_flip_screen_x_w)
AM_RANGE(0xa804, 0xa804) AM_MIRROR(0x07f1) AM_WRITE_LEGACY(irq_enable_w)
- AM_RANGE(0xa806, 0xa806) AM_MIRROR(0x07f1) AM_WRITE_LEGACY(galaxian_flip_screen_y_w)
+ AM_RANGE(0xa806, 0xa806) AM_MIRROR(0x07f1) AM_WRITE(galaxian_flip_screen_y_w)
AM_RANGE(0xa808, 0xa808) AM_MIRROR(0x07f1) AM_WRITE_LEGACY(coin_count_1_w)
AM_RANGE(0xa80e, 0xa80e) AM_MIRROR(0x07f1) AM_WRITE_LEGACY(coin_count_0_w)
AM_RANGE(0xb800, 0xb800) AM_MIRROR(0x07ff) AM_READ(watchdog_reset_r)
@@ -1751,12 +1751,12 @@ static ADDRESS_MAP_START( mshuttle_map, AS_PROGRAM, 8, galaxian_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(galaxian_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9800, 0x98ff) AM_MIRROR(0x0700) AM_RAM_WRITE_LEGACY(galaxian_objram_w) AM_SHARE("spriteram")
+ AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9800, 0x98ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_SHARE("spriteram")
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
AM_RANGE(0xa000, 0xa000) AM_WRITE_LEGACY(irq_enable_w)
- AM_RANGE(0xa001, 0xa001) AM_WRITE_LEGACY(galaxian_stars_enable_w)
- AM_RANGE(0xa002, 0xa002) AM_WRITE_LEGACY(galaxian_flip_screen_xy_w)
+ AM_RANGE(0xa001, 0xa001) AM_WRITE(galaxian_stars_enable_w)
+ AM_RANGE(0xa002, 0xa002) AM_WRITE(galaxian_flip_screen_xy_w)
AM_RANGE(0xa004, 0xa004) AM_WRITE_LEGACY(cclimber_sample_trigger_w)
AM_RANGE(0xa007, 0xa007) AM_WRITE_LEGACY(mshuttle_ay8910_cs_w)
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN1")
@@ -2835,25 +2835,27 @@ static DRIVER_INIT( gmgalax )
static DRIVER_INIT( pisces )
{
+ galaxian_state *state = machine.driver_data<galaxian_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, pisces_extend_tile_info, pisces_extend_sprite_info);
/* coin lockout replaced by graphics bank */
- space->install_legacy_write_handler(0x6002, 0x6002, 0, 0x7f8, FUNC(galaxian_gfxbank_w));
+ space->install_write_handler(0x6002, 0x6002, 0, 0x7f8, write8_delegate(FUNC(galaxian_state::galaxian_gfxbank_w),state));
}
static DRIVER_INIT( batman2 )
{
+ galaxian_state *state = machine.driver_data<galaxian_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, batman2_extend_tile_info, upper_extend_sprite_info);
/* coin lockout replaced by graphics bank */
- space->install_legacy_write_handler(0x6002, 0x6002, 0, 0x7f8, FUNC(galaxian_gfxbank_w));
+ space->install_write_handler(0x6002, 0x6002, 0, 0x7f8, write8_delegate(FUNC(galaxian_state::galaxian_gfxbank_w),state));
}
@@ -2895,13 +2897,14 @@ static DRIVER_INIT( mooncrsu )
static DRIVER_INIT( mooncrgx )
{
+ galaxian_state *state = machine.driver_data<galaxian_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info);
/* LEDs and coin lockout replaced by graphics banking */
- space->install_legacy_write_handler(0x6000, 0x6002, 0, 0x7f8, FUNC(galaxian_gfxbank_w));
+ space->install_write_handler(0x6000, 0x6002, 0, 0x7f8, write8_delegate(FUNC(galaxian_state::galaxian_gfxbank_w),state));
}
@@ -3144,13 +3147,14 @@ static DRIVER_INIT( dingoe )
static DRIVER_INIT( skybase )
{
+ galaxian_state *state = machine.driver_data<galaxian_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, pisces_extend_tile_info, pisces_extend_sprite_info);
/* coin lockout replaced by graphics bank */
- space->install_legacy_write_handler(0xa002, 0xa002, 0, 0x7f8, FUNC(galaxian_gfxbank_w));
+ space->install_write_handler(0xa002, 0xa002, 0, 0x7f8, write8_delegate(FUNC(galaxian_state::galaxian_gfxbank_w),state));
/* needs a full 2k of RAM */
space->install_ram(0x8000, 0x87ff);
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index 9c20fe324f0..fef2204e83a 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -410,16 +410,16 @@ READ8_MEMBER(galaxold_state::drivfrcg_port0_r)
static ADDRESS_MAP_START( galaxold_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5400, 0x57ff) AM_READ_LEGACY(galaxold_videoram_r)
- AM_RANGE(0x5800, 0x583f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5400, 0x57ff) AM_READ(galaxold_videoram_r)
+ AM_RANGE(0x5800, 0x583f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x5840, 0x585f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x5860, 0x587f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x5880, 0x58ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ_PORT("IN0")
- AM_RANGE(0x6000, 0x6001) AM_WRITE_LEGACY(galaxold_leds_w)
- AM_RANGE(0x6002, 0x6002) AM_WRITE_LEGACY(galaxold_coin_lockout_w)
- AM_RANGE(0x6003, 0x6003) AM_WRITE_LEGACY(galaxold_coin_counter_w)
+ AM_RANGE(0x6000, 0x6001) AM_WRITE(galaxold_leds_w)
+ AM_RANGE(0x6002, 0x6002) AM_WRITE(galaxold_coin_lockout_w)
+ AM_RANGE(0x6003, 0x6003) AM_WRITE(galaxold_coin_counter_w)
AM_RANGE(0x6004, 0x6007) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_lfo_freq_w)
AM_RANGE(0x6800, 0x6800) AM_READ_PORT("IN1")
AM_RANGE(0x6800, 0x6802) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_background_enable_w)
@@ -427,10 +427,10 @@ static ADDRESS_MAP_START( galaxold_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x6805, 0x6805) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_shoot_enable_w)
AM_RANGE(0x6806, 0x6807) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_vol_w)
AM_RANGE(0x7000, 0x7000) AM_READ_PORT("IN2")
- AM_RANGE(0x7001, 0x7001) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0x7004, 0x7004) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0x7006, 0x7006) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0x7007, 0x7007) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0x7001, 0x7001) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0x7004, 0x7004) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0x7006, 0x7006) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0x7007, 0x7007) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x7800, 0x7fff) AM_READ(watchdog_reset_r)
AM_RANGE(0x7800, 0x7800) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
AM_RANGE(0xfffc, 0xffff) AM_RAM
@@ -440,24 +440,24 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mooncrst_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9400, 0x97ff) AM_READ_LEGACY(galaxold_videoram_r)
- AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9400, 0x97ff) AM_READ(galaxold_videoram_r)
+ AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x9840, 0x985f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9860, 0x987f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x9880, 0x98ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
- AM_RANGE(0xa003, 0xa003) AM_WRITE_LEGACY(galaxold_coin_counter_w)
+ AM_RANGE(0xa003, 0xa003) AM_WRITE(galaxold_coin_counter_w)
AM_RANGE(0xa004, 0xa007) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_lfo_freq_w)
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN1")
AM_RANGE(0xa800, 0xa802) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_background_enable_w)
AM_RANGE(0xa803, 0xa803) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_noise_enable_w)
AM_RANGE(0xa805, 0xa805) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_shoot_enable_w)
AM_RANGE(0xa806, 0xa807) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_vol_w)
- AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW0") AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0xb004, 0xb004) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0xb006, 0xb006) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0xb007, 0xb007) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW0") AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0xb004, 0xb004) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0xb006, 0xb006) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0xb007, 0xb007) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0xb800, 0xb800) AM_READ(watchdog_reset_r)
AM_RANGE(0xb800, 0xb800) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
ADDRESS_MAP_END
@@ -465,31 +465,31 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( rockclim_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x47ff) AM_READWRITE_LEGACY(rockclim_videoram_r, rockclim_videoram_w) AM_BASE(m_rockclim_videoram)//4800 - 4803 = bg scroll ?
- AM_RANGE(0x4800, 0x4803) AM_WRITE_LEGACY(rockclim_scroll_w)
+ AM_RANGE(0x4000, 0x47ff) AM_READWRITE(rockclim_videoram_r, rockclim_videoram_w) AM_BASE(m_rockclim_videoram)//4800 - 4803 = bg scroll ?
+ AM_RANGE(0x4800, 0x4803) AM_WRITE(rockclim_scroll_w)
AM_RANGE(0x5000, 0x53ff) AM_RAM //?
AM_RANGE(0x5800, 0x5800) AM_READ_PORT("IN2")
AM_RANGE(0x6000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8800) AM_READ_PORT("DSW1")
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9400, 0x97ff) AM_READ_LEGACY(galaxold_videoram_r)
- AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9400, 0x97ff) AM_READ(galaxold_videoram_r)
+ AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x9840, 0x985f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9860, 0x987f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x9880, 0x98ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
- AM_RANGE(0xa000, 0xa002) AM_WRITE_LEGACY(galaxold_gfxbank_w)// a002 - sprite bank
- AM_RANGE(0xa003, 0xa003) AM_WRITE_LEGACY(galaxold_coin_counter_w)
+ AM_RANGE(0xa000, 0xa002) AM_WRITE(galaxold_gfxbank_w)// a002 - sprite bank
+ AM_RANGE(0xa003, 0xa003) AM_WRITE(galaxold_coin_counter_w)
AM_RANGE(0xa004, 0xa007) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_lfo_freq_w)
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN1")
AM_RANGE(0xa800, 0xa802) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_background_enable_w)
AM_RANGE(0xa803, 0xa803) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_noise_enable_w)
AM_RANGE(0xa805, 0xa805) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_shoot_enable_w)
AM_RANGE(0xa806, 0xa807) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_vol_w)
- AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW0") AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0xb006, 0xb006) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0xb007, 0xb007) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW0") AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0xb006, 0xb006) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0xb007, 0xb007) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0xb800, 0xb800) AM_READ(watchdog_reset_r)
AM_RANGE(0xb800, 0xb800) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
ADDRESS_MAP_END
@@ -498,15 +498,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ckongg_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_READWRITE_LEGACY(galaxold_videoram_r, galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x9000, 0x93ff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x9840, 0x985f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9860, 0x987f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x9880, 0x98ff) AM_RAM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0")
- AM_RANGE(0xc000, 0xc001) AM_WRITE_LEGACY(galaxold_leds_w)
- AM_RANGE(0xc002, 0xc002) AM_WRITE_LEGACY(galaxold_coin_lockout_w)
- AM_RANGE(0xc003, 0xc003) AM_WRITE_LEGACY(galaxold_coin_counter_w)
+ AM_RANGE(0xc000, 0xc001) AM_WRITE(galaxold_leds_w)
+ AM_RANGE(0xc002, 0xc002) AM_WRITE(galaxold_coin_lockout_w)
+ AM_RANGE(0xc003, 0xc003) AM_WRITE(galaxold_coin_counter_w)
AM_RANGE(0xc004, 0xc007) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_lfo_freq_w)
AM_RANGE(0xc400, 0xc400) AM_READ_PORT("IN1")
AM_RANGE(0xc400, 0xc402) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_background_enable_w)
@@ -514,10 +514,10 @@ static ADDRESS_MAP_START( ckongg_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0xc405, 0xc405) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_shoot_enable_w)
AM_RANGE(0xc406, 0xc407) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_vol_w)
AM_RANGE(0xc800, 0xc800) AM_READ_PORT("DSW")
- AM_RANGE(0xc801, 0xc801) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
+ AM_RANGE(0xc801, 0xc801) AM_WRITE(galaxold_nmi_enable_w)
AM_RANGE(0xc804, 0xc804) AM_WRITENOP // link cut
- AM_RANGE(0xc806, 0xc806) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0xc807, 0xc807) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0xc806, 0xc806) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0xc807, 0xc807) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0xcc00, 0xcc00) AM_READ(watchdog_reset_r) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
ADDRESS_MAP_END
@@ -525,15 +525,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ckongmc_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_READWRITE_LEGACY(galaxold_videoram_r, galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x9000, 0x93ff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x9840, 0x985f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9860, 0x987f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x9880, 0x98ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
- AM_RANGE(0xa001, 0xa002) AM_WRITE_LEGACY(galaxold_leds_w) /* GUESS */
-// AM_RANGE(0xa002, 0xa002) AM_WRITE_LEGACY(galaxold_coin_lockout_w) /* not written */
-// AM_RANGE(0xa003, 0xa003) AM_WRITE_LEGACY(galaxold_coin_counter_w) /* not written */
+ AM_RANGE(0xa001, 0xa002) AM_WRITE(galaxold_leds_w) /* GUESS */
+// AM_RANGE(0xa002, 0xa002) AM_WRITE(galaxold_coin_lockout_w) /* not written */
+// AM_RANGE(0xa003, 0xa003) AM_WRITE(galaxold_coin_counter_w) /* not written */
AM_RANGE(0xa004, 0xa007) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_lfo_freq_w) /* GUESS */
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN1")
AM_RANGE(0xa800, 0xa802) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_background_enable_w) /* GUESS */
@@ -541,10 +541,10 @@ static ADDRESS_MAP_START( ckongmc_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0xa805, 0xa805) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_shoot_enable_w) /* GUESS */
AM_RANGE(0xa806, 0xa807) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_vol_w) /* GUESS */
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW")
- AM_RANGE(0xb001, 0xb001) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0xb004, 0xb004) AM_WRITENOP /* AM_WRITE_LEGACY(galaxold_stars_enable_w) */
- AM_RANGE(0xb006, 0xb006) AM_WRITE_LEGACY(galaxold_flip_screen_x_w) /* GUESS */
- AM_RANGE(0xb007, 0xb007) AM_WRITE_LEGACY(galaxold_flip_screen_y_w) /* GUESS */
+ AM_RANGE(0xb001, 0xb001) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0xb004, 0xb004) AM_WRITENOP /* AM_WRITE(galaxold_stars_enable_w) */
+ AM_RANGE(0xb006, 0xb006) AM_WRITE(galaxold_flip_screen_x_w) /* GUESS */
+ AM_RANGE(0xb007, 0xb007) AM_WRITE(galaxold_flip_screen_y_w) /* GUESS */
AM_RANGE(0xb800, 0xb800) AM_READ(watchdog_reset_r) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w) /* GUESS */
ADDRESS_MAP_END
@@ -552,14 +552,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( scramblb_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x5040, 0x505f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x5060, 0x507f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x5080, 0x50ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ_PORT("IN0")
AM_RANGE(0x6000, 0x6001) AM_WRITENOP /* sound triggers */
- AM_RANGE(0x6003, 0x6003) AM_WRITE_LEGACY(galaxold_coin_counter_w)
+ AM_RANGE(0x6003, 0x6003) AM_WRITE(galaxold_coin_counter_w)
AM_RANGE(0x6004, 0x6007) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_lfo_freq_w)
AM_RANGE(0x6800, 0x6800) AM_READ_PORT("IN1")
AM_RANGE(0x6800, 0x6802) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_background_enable_w)
@@ -567,16 +567,16 @@ static ADDRESS_MAP_START( scramblb_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x6805, 0x6805) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_shoot_enable_w)
AM_RANGE(0x6806, 0x6807) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_vol_w)
AM_RANGE(0x7000, 0x7000) AM_READ_PORT("IN2")
- AM_RANGE(0x7001, 0x7001) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0x7002, 0x7002) AM_WRITE_LEGACY(galaxold_coin_counter_w)
- AM_RANGE(0x7003, 0x7003) AM_WRITE_LEGACY(scrambold_background_enable_w)
- AM_RANGE(0x7004, 0x7004) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0x7006, 0x7006) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0x7007, 0x7007) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0x7001, 0x7001) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0x7002, 0x7002) AM_WRITE(galaxold_coin_counter_w)
+ AM_RANGE(0x7003, 0x7003) AM_WRITE(scrambold_background_enable_w)
+ AM_RANGE(0x7004, 0x7004) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0x7006, 0x7006) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0x7007, 0x7007) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x7800, 0x7800) AM_READ(watchdog_reset_r)
AM_RANGE(0x7800, 0x7800) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
- AM_RANGE(0x8102, 0x8102) AM_READ_LEGACY(scramblb_protection_1_r)
- AM_RANGE(0x8202, 0x8202) AM_READ_LEGACY(scramblb_protection_2_r)
+ AM_RANGE(0x8102, 0x8102) AM_READ(scramblb_protection_1_r)
+ AM_RANGE(0x8202, 0x8202) AM_READ(scramblb_protection_2_r)
ADDRESS_MAP_END
READ8_MEMBER(galaxold_state::scramb2_protection_r){ return 0x25; }
@@ -587,20 +587,20 @@ READ8_MEMBER(galaxold_state::scramb2_port2_r){ return (input_port_read(machine()
static ADDRESS_MAP_START( scramb2_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4c00, 0x4fff) AM_WRITE_LEGACY(galaxold_videoram_w) // mirror
- AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4c00, 0x4fff) AM_WRITE(galaxold_videoram_w) // mirror
+ AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x5040, 0x505f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x5060, 0x507f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x5080, 0x50ff) AM_RAM
AM_RANGE(0x5800, 0x5fff) AM_READ(scramb2_protection_r) // must return 0x25
AM_RANGE(0x6000, 0x6007) AM_READ(scramb2_port0_r) // reads from 8 addresses, 1 bit per address
AM_RANGE(0x6800, 0x6807) AM_READ(scramb2_port1_r) // reads from 8 addresses, 1 bit per address
- AM_RANGE(0x6801, 0x6801) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0x6802, 0x6802) AM_WRITE_LEGACY(galaxold_coin_counter_w)
- AM_RANGE(0x6804, 0x6804) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0x6806, 0x6806) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0x6807, 0x6807) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxold_coin_counter_w)
+ AM_RANGE(0x6804, 0x6804) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0x6806, 0x6806) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0x6807, 0x6807) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x7000, 0x7007) AM_READ(watchdog_reset_r)
AM_RANGE(0x7006, 0x7006) AM_WRITENOP
AM_RANGE(0x7007, 0x7007) AM_WRITENOP
@@ -612,16 +612,16 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( _4in1_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1") /* banked game code */
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5400, 0x57ff) AM_READ_LEGACY(galaxold_videoram_r)
- AM_RANGE(0x5800, 0x583f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5400, 0x57ff) AM_READ(galaxold_videoram_r)
+ AM_RANGE(0x5800, 0x583f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x5840, 0x585f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x5860, 0x587f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x5880, 0x58ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ_PORT("IN0")
- AM_RANGE(0x6000, 0x6001) AM_WRITE_LEGACY(galaxold_leds_w)
-// AM_RANGE(0x6002, 0x6002) AM_WRITE_LEGACY(galaxold_coin_lockout_w)
- AM_RANGE(0x6003, 0x6003) AM_WRITE_LEGACY(galaxold_coin_counter_w)
+ AM_RANGE(0x6000, 0x6001) AM_WRITE(galaxold_leds_w)
+// AM_RANGE(0x6002, 0x6002) AM_WRITE(galaxold_coin_lockout_w)
+ AM_RANGE(0x6003, 0x6003) AM_WRITE(galaxold_coin_counter_w)
AM_RANGE(0x6004, 0x6007) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_lfo_freq_w)
AM_RANGE(0x6800, 0x6800) AM_READ_PORT("IN1")
AM_RANGE(0x6800, 0x6802) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_background_enable_w)
@@ -629,13 +629,13 @@ static ADDRESS_MAP_START( _4in1_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x6805, 0x6805) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_shoot_enable_w)
AM_RANGE(0x6806, 0x6807) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_vol_w)
AM_RANGE(0x7000, 0x7000) AM_READ_PORT("DSW0")
- AM_RANGE(0x7001, 0x7001) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0x7004, 0x7004) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0x7006, 0x7006) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0x7007, 0x7007) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0x7001, 0x7001) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0x7004, 0x7004) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0x7006, 0x7006) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0x7007, 0x7007) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x7800, 0x78ff) AM_READ(watchdog_reset_r)
AM_RANGE(0x7800, 0x78ff) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
- AM_RANGE(0x8000, 0x8000) AM_WRITE_LEGACY(_4in1_bank_w)
+ AM_RANGE(0x8000, 0x8000) AM_WRITE(_4in1_bank_w)
AM_RANGE(0xc000, 0xdfff) AM_ROM /* fixed menu code */
ADDRESS_MAP_END
@@ -643,20 +643,20 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bagmanmc_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9400, 0x97ff) AM_READ_LEGACY(galaxold_videoram_r)
- AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9400, 0x97ff) AM_READ(galaxold_videoram_r)
+ AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x9840, 0x985f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9860, 0x987f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x9880, 0x98ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
- AM_RANGE(0xa003, 0xa003) AM_WRITE_LEGACY(galaxold_coin_counter_w)
+ AM_RANGE(0xa003, 0xa003) AM_WRITE(galaxold_coin_counter_w)
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN1")
AM_RANGE(0xa803, 0xa803) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_noise_enable_w)
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW")
- AM_RANGE(0xb001, 0xb001) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0xb006, 0xb006) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0xb007, 0xb007) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0xb001, 0xb001) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0xb006, 0xb006) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0xb007, 0xb007) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0xb800, 0xb800) AM_READ(watchdog_reset_r) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
ADDRESS_MAP_END
@@ -665,12 +665,12 @@ static ADDRESS_MAP_START( dkongjrm_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
AM_RANGE(0x7000, 0x7fff) AM_ROM
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9800, 0x983f) AM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x9840, 0x987f) AM_WRITEONLY AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x98c0, 0x98ff) AM_WRITEONLY AM_BASE(m_spriteram2) AM_SIZE(m_spriteram2_size)
AM_RANGE(0xa000, 0xa0ff) AM_READ_PORT("IN0")
- AM_RANGE(0xa003, 0xa003) AM_WRITE_LEGACY(galaxold_coin_counter_w)
+ AM_RANGE(0xa003, 0xa003) AM_WRITE(galaxold_coin_counter_w)
//AM_RANGE(0xa004, 0xa007) AM_WRITE_LEGACY(galaxian_lfo_freq_w)
AM_RANGE(0xa800, 0xa8ff) AM_READ_PORT("IN1")
AM_RANGE(0xa800, 0xa802) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_background_enable_w)
@@ -678,11 +678,11 @@ static ADDRESS_MAP_START( dkongjrm_map, AS_PROGRAM, 8, galaxold_state )
//AM_RANGE(0xa805, 0xa805) AM_WRITE_LEGACY(galaxian)
AM_RANGE(0xa806, 0xa807) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_vol_w)
AM_RANGE(0xb000, 0xb0ff) AM_READ_PORT("DSW")
- AM_RANGE(0xb000, 0xb000) AM_WRITE_LEGACY(galaxold_gfxbank_w)
- AM_RANGE(0xb001, 0xb001) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- //AM_RANGE(0xb004, 0xb004) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0xb006, 0xb006) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0xb007, 0xb007) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0xb000, 0xb000) AM_WRITE(galaxold_gfxbank_w)
+ AM_RANGE(0xb001, 0xb001) AM_WRITE(galaxold_nmi_enable_w)
+ //AM_RANGE(0xb004, 0xb004) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0xb006, 0xb006) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0xb007, 0xb007) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0xb800, 0xb800) AM_READ(watchdog_reset_r) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
ADDRESS_MAP_END
@@ -691,23 +691,23 @@ static ADDRESS_MAP_START( tazzmang, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x7000, 0x7000) AM_READ_PORT("DSW0") /* mirror */
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x883f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x8800, 0x883f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x8840, 0x885f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x8860, 0x887f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x8880, 0x8bff) AM_WRITENOP
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x9800, 0x9800) AM_READ(watchdog_reset_r)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
AM_RANGE(0xa7ff, 0xa7ff) AM_READ_PORT("IN0") /* mirror */
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN1") AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_background_enable_w)
- AM_RANGE(0xa803, 0xa803) AM_WRITE_LEGACY(galaxold_coin_counter_w)
+ AM_RANGE(0xa803, 0xa803) AM_WRITE(galaxold_coin_counter_w)
AM_RANGE(0xa805, 0xa805) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_shoot_enable_w)
AM_RANGE(0xa806, 0xa807) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_vol_w)
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW0")
- AM_RANGE(0xb001, 0xb001) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0xb004, 0xb004) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0xb006, 0xb006) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0xb007, 0xb007) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0xb001, 0xb001) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0xb004, 0xb004) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0xb006, 0xb006) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0xb007, 0xb007) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0xb800, 0xb800) AM_READ(watchdog_reset_r) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
ADDRESS_MAP_END
@@ -716,18 +716,18 @@ static ADDRESS_MAP_START( bongo, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
AM_RANGE(0x8400, 0x87ff) AM_WRITENOP // not used
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x9400, 0x97ff) AM_WRITENOP // not used
- AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x9840, 0x985f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9860, 0x987f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN1")
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW0")
- AM_RANGE(0xb001, 0xb001) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0xb004, 0xb004) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0xb006, 0xb006) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0xb007, 0xb007) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0xb001, 0xb001) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0xb004, 0xb004) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0xb006, 0xb006) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0xb007, 0xb007) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0xb800, 0xb800) AM_READ(watchdog_reset_r) AM_WRITENOP
ADDRESS_MAP_END
@@ -742,14 +742,14 @@ static ADDRESS_MAP_START( ozon1_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x4000, 0x4200) AM_RAM
AM_RANGE(0x4300, 0x43ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_READWRITE_LEGACY(galaxold_videoram_r, galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4c00, 0x4fff) AM_WRITE_LEGACY(galaxold_videoram_w)
- AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x4800, 0x4bff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4c00, 0x4fff) AM_WRITE(galaxold_videoram_w)
+ AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x5040, 0x505f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x6801, 0x6801) AM_WRITENOP //continuosly 0 and 1
- AM_RANGE(0x6802, 0x6802) AM_WRITE_LEGACY(galaxold_coin_counter_w)
- AM_RANGE(0x6806, 0x6806) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0x6807, 0x6807) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxold_coin_counter_w)
+ AM_RANGE(0x6806, 0x6806) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0x6807, 0x6807) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x8100, 0x8100) AM_READ_PORT("IN0")
AM_RANGE(0x8101, 0x8101) AM_READ_PORT("IN1")
AM_RANGE(0x8102, 0x8102) AM_READ_PORT("IN2")
@@ -772,7 +772,7 @@ static ADDRESS_MAP_START( harem_cpu1, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4fff) AM_READWRITE_LEGACY(galaxold_videoram_r, galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4800, 0x4fff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x5000, 0x5000) AM_WRITENOP
AM_RANGE(0x5800, 0x5800) AM_READNOP AM_WRITE(harem_nmi_mask_w)
AM_RANGE(0x5801, 0x5807) AM_WRITENOP
@@ -803,12 +803,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( hunchbkg, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x0fff) AM_ROM
- AM_RANGE(0x1480, 0x14bf) AM_MIRROR(0x6000) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x1480, 0x14bf) AM_MIRROR(0x6000) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x14c0, 0x14ff) AM_MIRROR(0x6000) AM_WRITEONLY AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x1500, 0x1500) AM_MIRROR(0x6000) AM_READ_PORT("IN0")
- AM_RANGE(0x1500, 0x1501) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_leds_w) /* not connected ... */
- AM_RANGE(0x1502, 0x1502) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_coin_lockout_w) /* not connected ... */
- AM_RANGE(0x1503, 0x1503) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_coin_counter_w)
+ AM_RANGE(0x1500, 0x1501) AM_MIRROR(0x6000) AM_WRITE(galaxold_leds_w) /* not connected ... */
+ AM_RANGE(0x1502, 0x1502) AM_MIRROR(0x6000) AM_WRITE(galaxold_coin_lockout_w) /* not connected ... */
+ AM_RANGE(0x1503, 0x1503) AM_MIRROR(0x6000) AM_WRITE(galaxold_coin_counter_w)
AM_RANGE(0x1504, 0x1507) AM_MIRROR(0x6000) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_lfo_freq_w)
AM_RANGE(0x1580, 0x1580) AM_MIRROR(0x6000) AM_READ_PORT("IN1")
AM_RANGE(0x1580, 0x1587) AM_MIRROR(0x6000) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_sound_w)
@@ -816,12 +816,12 @@ static ADDRESS_MAP_START( hunchbkg, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x1585, 0x1585) AM_MIRROR(0x6000) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_shoot_enable_w)
AM_RANGE(0x1586, 0x1587) AM_MIRROR(0x6000) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_vol_w)
AM_RANGE(0x1600, 0x1600) AM_MIRROR(0x6000) AM_READ_PORT("DSW0")
- AM_RANGE(0x1601, 0x1601) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0x1604, 0x1604) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0x1606, 0x1606) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0x1607, 0x1607) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0x1601, 0x1601) AM_MIRROR(0x6000) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0x1604, 0x1604) AM_MIRROR(0x6000) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0x1606, 0x1606) AM_MIRROR(0x6000) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0x1607, 0x1607) AM_MIRROR(0x6000) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x1680, 0x1680) AM_MIRROR(0x6000) AM_READ(watchdog_reset_r) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
- AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0x6000) AM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1c00, 0x1fff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x2000, 0x2fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_ROM
@@ -838,10 +838,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( drivfrcg, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x0fff) AM_ROM
- AM_RANGE(0x1480, 0x14bf) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x1480, 0x14bf) AM_MIRROR(0x6000) AM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x14c0, 0x14ff) AM_MIRROR(0x6000) AM_WRITEONLY AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x1500, 0x1500) AM_MIRROR(0x6000) AM_READ_PORT("IN0")
- AM_RANGE(0x1503, 0x1503) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_coin_counter_w)
+ AM_RANGE(0x1503, 0x1503) AM_MIRROR(0x6000) AM_WRITE(galaxold_coin_counter_w)
AM_RANGE(0x1580, 0x1580) AM_MIRROR(0x6000) AM_READ_PORT("IN1")
AM_RANGE(0x1580, 0x1582) AM_MIRROR(0x6000) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_background_enable_w)
AM_RANGE(0x1583, 0x1583) AM_MIRROR(0x6000) AM_WRITENOP
@@ -851,7 +851,7 @@ static ADDRESS_MAP_START( drivfrcg, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x1700, 0x1700) AM_MIRROR(0x6000) AM_READ_PORT("DSW1") AM_WRITENOP
AM_RANGE(0x1701, 0x1701) AM_MIRROR(0x6000) AM_WRITENOP
AM_RANGE(0x1704, 0x1707) AM_MIRROR(0x6000) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_vol_w)
- AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0x6000) AM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1c00, 0x1fff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x2000, 0x2fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_ROM
@@ -866,19 +866,19 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( racknrol, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x0000, 0x0fff) AM_ROM
- AM_RANGE(0x1400, 0x143f) AM_MIRROR(0x6000) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x1400, 0x143f) AM_MIRROR(0x6000) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x1440, 0x14bf) AM_MIRROR(0x6000) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x14c0, 0x14ff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x1500, 0x1500) AM_MIRROR(0x6000) AM_READ_PORT("IN0")
AM_RANGE(0x1580, 0x1580) AM_MIRROR(0x6000) AM_READ_PORT("IN1")
AM_RANGE(0x1600, 0x1600) AM_MIRROR(0x6000) AM_READ_PORT("DSW0")
AM_RANGE(0x1600, 0x1601) AM_MIRROR(0x6000) AM_WRITENOP
- AM_RANGE(0x1606, 0x1606) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0x1607, 0x1607) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0x1606, 0x1606) AM_MIRROR(0x6000) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0x1607, 0x1607) AM_MIRROR(0x6000) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x1680, 0x1680) AM_MIRROR(0x6000) AM_READNOP
// AM_RANGE(0x1700, 0x1700) AM_MIRROR(0x6000) AM_READ_LEGACY(trvchlng_question_r)
// AM_RANGE(0x1701, 0x1703) AM_MIRROR(0x6000) AM_READ_LEGACY(trvchlng_question_w)
- AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0x6000) AM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0x6000) AM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1c00, 0x1fff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x2000, 0x2fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_ROM
@@ -889,7 +889,7 @@ static ADDRESS_MAP_START( racknrol_io, AS_IO, 8, galaxold_state )
AM_RANGE(0x1d, 0x1d) AM_DEVWRITE_LEGACY("sn1", sn76496_w)
AM_RANGE(0x1e, 0x1e) AM_DEVWRITE_LEGACY("sn2", sn76496_w)
AM_RANGE(0x1f, 0x1f) AM_DEVWRITE_LEGACY("sn3", sn76496_w)
- AM_RANGE(0x20, 0x3f) AM_WRITE_LEGACY(racknrol_tiles_bank_w) AM_BASE(m_racknrol_tiles_bank)
+ AM_RANGE(0x20, 0x3f) AM_WRITE(racknrol_tiles_bank_w) AM_BASE(m_racknrol_tiles_bank)
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE")
ADDRESS_MAP_END
@@ -909,7 +909,7 @@ READ8_MEMBER(galaxold_state::hexpoola_data_port_r)
static ADDRESS_MAP_START( hexpoola_io, AS_IO, 8, galaxold_state )
AM_RANGE(0x00, 0x00) AM_READNOP
- AM_RANGE(0x20, 0x3f) AM_WRITE_LEGACY(racknrol_tiles_bank_w) AM_BASE(m_racknrol_tiles_bank)
+ AM_RANGE(0x20, 0x3f) AM_WRITE(racknrol_tiles_bank_w) AM_BASE(m_racknrol_tiles_bank)
AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(hexpoola_data_port_r) AM_DEVWRITE_LEGACY("snsnd", sn76496_w)
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index 62757300c2b..314b59cac9b 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -57,7 +57,7 @@ static ADDRESS_MAP_START( galivan_map, AS_PROGRAM, 8, galivan_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank1")
- AM_RANGE(0xd800, 0xdfff) AM_WRITE_LEGACY(galivan_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xd800, 0xdfff) AM_WRITE(galivan_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xe000, 0xe0ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe100, 0xffff) AM_RAM
@@ -67,7 +67,7 @@ static ADDRESS_MAP_START( ninjemak_map, AS_PROGRAM, 8, galivan_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank1")
- AM_RANGE(0xd800, 0xdfff) AM_WRITE_LEGACY(galivan_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xd800, 0xdfff) AM_WRITE(galivan_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xe000, 0xe1ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe200, 0xffff) AM_RAM
@@ -80,9 +80,9 @@ static ADDRESS_MAP_START( io_map, AS_IO, 8, galivan_state )
AM_RANGE(0x02, 0x02) AM_READ_PORT("SYSTEM")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
- AM_RANGE(0x40, 0x40) AM_WRITE_LEGACY(galivan_gfxbank_w)
- AM_RANGE(0x41, 0x42) AM_WRITE_LEGACY(galivan_scrollx_w)
- AM_RANGE(0x43, 0x44) AM_WRITE_LEGACY(galivan_scrolly_w)
+ AM_RANGE(0x40, 0x40) AM_WRITE(galivan_gfxbank_w)
+ AM_RANGE(0x41, 0x42) AM_WRITE(galivan_scrollx_w)
+ AM_RANGE(0x43, 0x44) AM_WRITE(galivan_scrolly_w)
AM_RANGE(0x45, 0x45) AM_WRITE(galivan_sound_command_w)
/* AM_RANGE(0x46, 0x46) AM_WRITENOP */
/* AM_RANGE(0x47, 0x47) AM_WRITENOP */
@@ -97,7 +97,7 @@ WRITE8_MEMBER(galivan_state::blit_trigger_w)
static ADDRESS_MAP_START( ninjemak_io_map, AS_IO, 8, galivan_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x80, 0x80) AM_READ_PORT("P1") AM_WRITE_LEGACY(ninjemak_gfxbank_w)
+ AM_RANGE(0x80, 0x80) AM_READ_PORT("P1") AM_WRITE(ninjemak_gfxbank_w)
AM_RANGE(0x81, 0x81) AM_READ_PORT("P2")
AM_RANGE(0x82, 0x82) AM_READ_PORT("SYSTEM")
AM_RANGE(0x83, 0x83) AM_READ_PORT("SERVICE")
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index 7993e57a614..17781730f7c 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -297,7 +297,7 @@ static ADDRESS_MAP_START( galpani2_mem1, AS_PROGRAM, 16, galpani2_state )
AM_RANGE(0x110000, 0x11000f) AM_RAM // ? corrupted? stack dumper on POST failure, pc+sr on gp2se
AM_RANGE(0x300000, 0x301fff) AM_RAM // ?
AM_RANGE(0x302000, 0x303fff) AM_RAM AM_SHARE("spriteram") // Sprites
- AM_RANGE(0x304000, 0x30401f) AM_RAM_WRITE_LEGACY(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
+ AM_RANGE(0x304000, 0x30401f) AM_RAM_WRITE(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
AM_RANGE(0x308000, 0x308001) AM_WRITENOP // ? 0 at startup
AM_RANGE(0x30c000, 0x30c001) AM_WRITENOP // ? hblank effect ?
AM_RANGE(0x310000, 0x3101ff) AM_RAM_WRITE_LEGACY(galpani2_palette_0_w) AM_BASE(m_palette[0]) // ?
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index e22c9833ea5..9b22708a9df 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -241,7 +241,7 @@ static ADDRESS_MAP_START( galpanic_map, AS_PROGRAM, 16, galpanic_state )
AM_RANGE(0xb00000, 0xb00001) AM_WRITENOP /* ??? */
AM_RANGE(0xc00000, 0xc00001) AM_WRITENOP /* ??? */
AM_RANGE(0xd00000, 0xd00001) AM_WRITENOP /* ??? */
- AM_RANGE(0xe00000, 0xe00015) AM_READWRITE_LEGACY(galpanib_calc_r,galpanib_calc_w) /* CALC1 MCU interaction (simulated) */
+ AM_RANGE(0xe00000, 0xe00015) AM_READWRITE(galpanib_calc_r,galpanib_calc_w) /* CALC1 MCU interaction (simulated) */
ADDRESS_MAP_END
static READ16_HANDLER( comad_timer_r )
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index f7fb019b835..5a6b3c3b60b 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -286,37 +286,37 @@ static INTERRUPT_GEN( gaplus_vblank_sub2_irq )
static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8, gaplus_state )
- AM_RANGE(0x0000, 0x07ff) AM_READWRITE_LEGACY(gaplus_videoram_r, gaplus_videoram_w) AM_BASE(m_videoram) /* tilemap RAM (shared with CPU #2) */
+ AM_RANGE(0x0000, 0x07ff) AM_READWRITE(gaplus_videoram_r, gaplus_videoram_w) AM_BASE(m_videoram) /* tilemap RAM (shared with CPU #2) */
AM_RANGE(0x0800, 0x1fff) AM_READWRITE(gaplus_spriteram_r, gaplus_spriteram_w) AM_BASE(m_spriteram) /* shared RAM with CPU #2 (includes sprite RAM) */
AM_RANGE(0x6000, 0x63ff) AM_DEVREADWRITE_LEGACY("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with CPU #3 */
AM_RANGE(0x6800, 0x680f) AM_DEVREADWRITE_LEGACY("56xx", namcoio_r, namcoio_w) /* custom I/O chips interface */
AM_RANGE(0x6810, 0x681f) AM_DEVREADWRITE_LEGACY("58xx", namcoio_r, namcoio_w) /* custom I/O chips interface */
- AM_RANGE(0x6820, 0x682f) AM_READWRITE_LEGACY(gaplus_customio_3_r, gaplus_customio_3_w) AM_BASE(m_customio_3) /* custom I/O chip #3 interface */
+ AM_RANGE(0x6820, 0x682f) AM_READWRITE(gaplus_customio_3_r, gaplus_customio_3_w) AM_BASE(m_customio_3) /* custom I/O chip #3 interface */
AM_RANGE(0x7000, 0x7fff) AM_WRITE(gaplus_irq_1_ctrl_w) /* main CPU irq control */
AM_RANGE(0x7800, 0x7fff) AM_READ(watchdog_reset_r) /* watchdog */
AM_RANGE(0x8000, 0x8fff) AM_WRITE(gaplus_sreset_w) /* reset CPU #2 & #3, enable sound */
AM_RANGE(0x9000, 0x9fff) AM_WRITE(gaplus_freset_w) /* reset I/O chips */
- AM_RANGE(0xa000, 0xa7ff) AM_WRITE_LEGACY(gaplus_starfield_control_w) /* starfield control */
+ AM_RANGE(0xa000, 0xa7ff) AM_WRITE(gaplus_starfield_control_w) /* starfield control */
AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( gaplusa_cpu1_map, AS_PROGRAM, 8, gaplus_state )
- AM_RANGE(0x0000, 0x07ff) AM_READWRITE_LEGACY(gaplus_videoram_r, gaplus_videoram_w) AM_BASE(m_videoram) /* tilemap RAM (shared with CPU #2) */
+ AM_RANGE(0x0000, 0x07ff) AM_READWRITE(gaplus_videoram_r, gaplus_videoram_w) AM_BASE(m_videoram) /* tilemap RAM (shared with CPU #2) */
AM_RANGE(0x0800, 0x1fff) AM_READWRITE(gaplus_spriteram_r, gaplus_spriteram_w) AM_BASE(m_spriteram) /* shared RAM with CPU #2 (includes sprite RAM) */
AM_RANGE(0x6000, 0x63ff) AM_DEVREADWRITE_LEGACY("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with CPU #3 */
AM_RANGE(0x6800, 0x680f) AM_DEVREADWRITE_LEGACY("58xx", namcoio_r, namcoio_w) /* custom I/O chips interface */
AM_RANGE(0x6810, 0x681f) AM_DEVREADWRITE_LEGACY("56xx", namcoio_r, namcoio_w) /* custom I/O chips interface */
- AM_RANGE(0x6820, 0x682f) AM_READWRITE_LEGACY(gaplus_customio_3_r, gaplus_customio_3_w) AM_BASE(m_customio_3) /* custom I/O chip #3 interface */
+ AM_RANGE(0x6820, 0x682f) AM_READWRITE(gaplus_customio_3_r, gaplus_customio_3_w) AM_BASE(m_customio_3) /* custom I/O chip #3 interface */
AM_RANGE(0x7000, 0x7fff) AM_WRITE(gaplus_irq_1_ctrl_w) /* main CPU irq control */
AM_RANGE(0x7800, 0x7fff) AM_READ(watchdog_reset_r) /* watchdog */
AM_RANGE(0x8000, 0x8fff) AM_WRITE(gaplus_sreset_w) /* reset CPU #2 & #3, enable sound */
AM_RANGE(0x9000, 0x9fff) AM_WRITE(gaplus_freset_w) /* reset I/O chips */
- AM_RANGE(0xa000, 0xa7ff) AM_WRITE_LEGACY(gaplus_starfield_control_w) /* starfield control */
+ AM_RANGE(0xa000, 0xa7ff) AM_WRITE(gaplus_starfield_control_w) /* starfield control */
AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8, gaplus_state )
- AM_RANGE(0x0000, 0x07ff) AM_READWRITE_LEGACY(gaplus_videoram_r, gaplus_videoram_w) /* tilemap RAM (shared with CPU #1) */
+ AM_RANGE(0x0000, 0x07ff) AM_READWRITE(gaplus_videoram_r, gaplus_videoram_w) /* tilemap RAM (shared with CPU #1) */
AM_RANGE(0x0800, 0x1fff) AM_READWRITE(gaplus_spriteram_r, gaplus_spriteram_w) /* shared RAM with CPU #1 */
// AM_RANGE(0x500f, 0x500f) AM_WRITENOP /* ??? written 256 times on startup */
AM_RANGE(0x6000, 0x6fff) AM_WRITE(gaplus_irq_2_ctrl_w) /* IRQ 2 control */
diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c
index e5b8d6e644b..9c67199dc4f 100644
--- a/src/mame/drivers/gatron.c
+++ b/src/mame/drivers/gatron.c
@@ -339,7 +339,7 @@ static const ppi8255_interface ppi8255_intf =
static ADDRESS_MAP_START( gat_map, AS_PROGRAM, 8, gatron_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
- AM_RANGE(0x6000, 0x63ff) AM_RAM_WRITE_LEGACY(gat_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x6000, 0x63ff) AM_RAM_WRITE(gat_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */
AM_RANGE(0xa000, 0xa000) AM_DEVWRITE_LEGACY("snsnd", sn76496_w) /* PSG */
AM_RANGE(0xe000, 0xe000) AM_WRITE(output_port_0_w) /* lamps */
diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c
index 4261f79c906..f9dcdae825d 100644
--- a/src/mame/drivers/gberet.c
+++ b/src/mame/drivers/gberet.c
@@ -150,14 +150,14 @@ WRITE8_MEMBER(gberet_state::gberet_sound_w)
static ADDRESS_MAP_START( gberet_map, AS_PROGRAM, 8, gberet_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(gberet_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(gberet_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(gberet_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(gberet_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xd000, 0xd0ff) AM_RAM AM_BASE(m_spriteram2)
AM_RANGE(0xd100, 0xd1ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xd200, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xe03f) AM_RAM_WRITE_LEGACY(gberet_scroll_w) AM_BASE(m_scrollram)
+ AM_RANGE(0xe000, 0xe03f) AM_RAM_WRITE(gberet_scroll_w) AM_BASE(m_scrollram)
AM_RANGE(0xe040, 0xe042) AM_WRITENOP // ???
- AM_RANGE(0xe043, 0xe043) AM_WRITE_LEGACY(gberet_sprite_bank_w)
+ AM_RANGE(0xe043, 0xe043) AM_WRITE(gberet_sprite_bank_w)
AM_RANGE(0xe044, 0xe044) AM_WRITE(gberet_flipscreen_w)
AM_RANGE(0xf000, 0xf000) AM_WRITE(gberet_coin_counter_w)
AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW2") AM_WRITEONLY AM_BASE(m_soundlatch)
@@ -170,14 +170,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mrgoemon_map, AS_PROGRAM, 8, gberet_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(gberet_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(gberet_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(gberet_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(gberet_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xd000, 0xd0ff) AM_RAM AM_BASE(m_spriteram2)
AM_RANGE(0xd100, 0xd1ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xd200, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xe03f) AM_RAM_WRITE_LEGACY(gberet_scroll_w) AM_BASE(m_scrollram)
+ AM_RANGE(0xe000, 0xe03f) AM_RAM_WRITE(gberet_scroll_w) AM_BASE(m_scrollram)
AM_RANGE(0xe040, 0xe042) AM_WRITENOP // ???
- AM_RANGE(0xe043, 0xe043) AM_WRITE_LEGACY(gberet_sprite_bank_w)
+ AM_RANGE(0xe043, 0xe043) AM_WRITE(gberet_sprite_bank_w)
AM_RANGE(0xe044, 0xe044) AM_WRITE(gberet_flipscreen_w)
AM_RANGE(0xf000, 0xf000) AM_WRITE(mrgoemon_coin_counter_w)
AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW2") AM_WRITEONLY AM_BASE(m_soundlatch)
@@ -208,8 +208,8 @@ WRITE8_MEMBER(gberet_state::gberetb_nmi_ack_w)
static ADDRESS_MAP_START( gberetb_map, AS_PROGRAM, 8, gberet_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(gberet_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(gberet_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(gberet_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(gberet_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe03f) AM_RAM
AM_RANGE(0xe040, 0xe043) AM_WRITENOP // ???
@@ -224,7 +224,7 @@ static ADDRESS_MAP_START( gberetb_map, AS_PROGRAM, 8, gberet_state )
AM_RANGE(0xf602, 0xf602) AM_READ_PORT("P1")
AM_RANGE(0xf603, 0xf603) AM_READ_PORT("SYSTEM")
AM_RANGE(0xf800, 0xf800) AM_READWRITE(gberetb_irq_ack_r, gberetb_nmi_ack_w)
- AM_RANGE(0xf900, 0xf901) AM_WRITE_LEGACY(gberetb_scroll_w)
+ AM_RANGE(0xf900, 0xf901) AM_WRITE(gberetb_scroll_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c
index 270ba1f9aad..cb16a3de6bd 100644
--- a/src/mame/drivers/gcpinbal.c
+++ b/src/mame/drivers/gcpinbal.c
@@ -92,7 +92,7 @@ READ16_MEMBER(gcpinbal_state::ioc_r)
case 0x50:
case 0x51:
- return m_oki->read(*&space, 0) << 8;
+ return m_oki->read(space, 0) << 8;
}
@@ -144,7 +144,7 @@ WRITE16_MEMBER(gcpinbal_state::ioc_w)
// OKIM6295
case 0x50:
case 0x51:
- m_oki->write(*&space, 0, data >> 8);
+ m_oki->write(space, 0, data >> 8);
break;
// MSM6585 ADPCM - mini emulation
@@ -231,7 +231,7 @@ static void gcp_adpcm_int( device_t *device )
static ADDRESS_MAP_START( gcpinbal_map, AS_PROGRAM, 16, gcpinbal_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
- AM_RANGE(0xc00000, 0xc03fff) AM_READWRITE_LEGACY(gcpinbal_tilemaps_word_r, gcpinbal_tilemaps_word_w) AM_BASE(m_tilemapram)
+ AM_RANGE(0xc00000, 0xc03fff) AM_READWRITE(gcpinbal_tilemaps_word_r, gcpinbal_tilemaps_word_w) AM_BASE(m_tilemapram)
AM_RANGE(0xc80000, 0xc80fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* sprite ram */
AM_RANGE(0xd00000, 0xd00fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0xd80000, 0xd800ff) AM_READWRITE(ioc_r, ioc_w) AM_BASE(m_ioc_ram)
diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c
index 5e9184433f8..b2c3097c598 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -74,11 +74,11 @@ static ADDRESS_MAP_START( ginganin_map, AS_PROGRAM, 16, ginganin_state )
/* The ROM area: 10000-13fff is written with: 0000 0000 0000 0001, at startup only. Why? */
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x020000, 0x023fff) AM_RAM
- AM_RANGE(0x030000, 0x0307ff) AM_RAM_WRITE_LEGACY(ginganin_txtram16_w) AM_BASE(m_txtram)
+ AM_RANGE(0x030000, 0x0307ff) AM_RAM_WRITE(ginganin_txtram16_w) AM_BASE(m_txtram)
AM_RANGE(0x040000, 0x0407ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x050000, 0x0507ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x060000, 0x06000f) AM_RAM_WRITE_LEGACY(ginganin_vregs16_w) AM_BASE(m_vregs)
- AM_RANGE(0x068000, 0x06bfff) AM_RAM_WRITE_LEGACY(ginganin_fgram16_w) AM_BASE(m_fgram)
+ AM_RANGE(0x060000, 0x06000f) AM_RAM_WRITE(ginganin_vregs16_w) AM_BASE(m_vregs)
+ AM_RANGE(0x068000, 0x06bfff) AM_RAM_WRITE(ginganin_fgram16_w) AM_BASE(m_fgram)
AM_RANGE(0x070000, 0x070001) AM_READ_PORT("P1_P2")
AM_RANGE(0x070002, 0x070003) AM_READ_PORT("DSW")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index e33eedf3e86..eb5a05d896a 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -379,11 +379,11 @@ static MACHINE_RESET( ppking )
static ADDRESS_MAP_START( ppking_cpu1_map, AS_PROGRAM, 8, gladiatr_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcbff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0xcc00, 0xcfff) AM_WRITE_LEGACY(ppking_video_registers_w)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(gladiatr_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(gladiatr_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(gladiatr_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(gladiatr_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0xcc00, 0xcfff) AM_WRITE(ppking_video_registers_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(gladiatr_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(gladiatr_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(gladiatr_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(gladiatr_textram_w) AM_BASE(m_textram)
AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */
ADDRESS_MAP_END
@@ -395,7 +395,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ppking_cpu1_io, AS_IO, 8, gladiatr_state )
// ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0xc000, 0xc000) AM_WRITE_LEGACY(gladiatr_spritebuffer_w)
+ AM_RANGE(0xc000, 0xc000) AM_WRITE(gladiatr_spritebuffer_w)
AM_RANGE(0xc004, 0xc004) AM_NOP // WRITE(ppking_irq_patch_w)
AM_RANGE(0xc09e, 0xc09f) AM_READ_LEGACY(qx0_r) AM_WRITE_LEGACY(qx0_w)
AM_RANGE(0xc0bf, 0xc0bf) AM_NOP
@@ -417,11 +417,11 @@ static ADDRESS_MAP_START( gladiatr_cpu1_map, AS_PROGRAM, 8, gladiatr_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcbff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0xcc00, 0xcfff) AM_WRITE_LEGACY(gladiatr_video_registers_w)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(gladiatr_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(gladiatr_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(gladiatr_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(gladiatr_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0xcc00, 0xcfff) AM_WRITE(gladiatr_video_registers_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(gladiatr_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(gladiatr_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(gladiatr_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(gladiatr_textram_w) AM_BASE(m_textram)
AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */
ADDRESS_MAP_END
@@ -439,8 +439,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gladiatr_cpu1_io, AS_IO, 8, gladiatr_state )
// ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0xc000, 0xc000) AM_WRITE_LEGACY(gladiatr_spritebuffer_w)
- AM_RANGE(0xc001, 0xc001) AM_WRITE_LEGACY(gladiatr_spritebank_w)
+ AM_RANGE(0xc000, 0xc000) AM_WRITE(gladiatr_spritebuffer_w)
+ AM_RANGE(0xc001, 0xc001) AM_WRITE(gladiatr_spritebank_w)
AM_RANGE(0xc002, 0xc002) AM_WRITE_LEGACY(gladiatr_bankswitch_w)
AM_RANGE(0xc004, 0xc004) AM_WRITE_LEGACY(gladiatr_irq_patch_w) /* !!! patch to 2nd CPU IRQ !!! */
AM_RANGE(0xc007, 0xc007) AM_WRITE_LEGACY(gladiatr_flipscreen_w)
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 5aad4572dab..1bb0099ed79 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -79,7 +79,7 @@ WRITE16_MEMBER(glass_state::glass_coin_w)
static ADDRESS_MAP_START( glass_map, AS_PROGRAM, 16, glass_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM /* ROM */
- AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE_LEGACY(glass_vram_w) AM_BASE(m_videoram) /* Video RAM */
+ AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(glass_vram_w) AM_BASE(m_videoram) /* Video RAM */
AM_RANGE(0x102000, 0x102fff) AM_RAM /* Extra Video RAM */
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x108008, 0x108009) AM_WRITE(clr_int_w) /* CLR INT Video */
@@ -89,7 +89,7 @@ static ADDRESS_MAP_START( glass_map, AS_PROGRAM, 16, glass_state )
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW1")
AM_RANGE(0x700004, 0x700005) AM_READ_PORT("P1")
AM_RANGE(0x700006, 0x700007) AM_READ_PORT("P2")
- AM_RANGE(0x700008, 0x700009) AM_WRITE_LEGACY(glass_blitter_w) /* serial blitter */
+ AM_RANGE(0x700008, 0x700009) AM_WRITE(glass_blitter_w) /* serial blitter */
AM_RANGE(0x70000c, 0x70000d) AM_WRITE(OKIM6295_bankswitch_w) /* OKI6295 bankswitch */
AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) /* OKI6295 status register */
AM_RANGE(0x70000a, 0x70004b) AM_WRITE(glass_coin_w) /* Coin Counters/Lockout */
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index 8445752cbe0..e81fba0f2dc 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -43,8 +43,8 @@ WRITE8_MEMBER(gng_state::gng_coin_counter_w)
static ADDRESS_MAP_START( gng_map, AS_PROGRAM, 8, gng_state )
AM_RANGE(0x0000, 0x1dff) AM_RAM
AM_RANGE(0x1e00, 0x1fff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(gng_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE_LEGACY(gng_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(gng_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(gng_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0x3000, 0x3000) AM_READ_PORT("SYSTEM")
AM_RANGE(0x3001, 0x3001) AM_READ_PORT("P1")
AM_RANGE(0x3002, 0x3002) AM_READ_PORT("P2")
@@ -53,10 +53,10 @@ static ADDRESS_MAP_START( gng_map, AS_PROGRAM, 8, gng_state )
AM_RANGE(0x3800, 0x38ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split2_w) AM_SHARE("paletteram2")
AM_RANGE(0x3900, 0x39ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split1_w) AM_SHARE("paletteram")
AM_RANGE(0x3a00, 0x3a00) AM_WRITE(soundlatch_w)
- AM_RANGE(0x3b08, 0x3b09) AM_WRITE_LEGACY(gng_bgscrollx_w)
- AM_RANGE(0x3b0a, 0x3b0b) AM_WRITE_LEGACY(gng_bgscrolly_w)
+ AM_RANGE(0x3b08, 0x3b09) AM_WRITE(gng_bgscrollx_w)
+ AM_RANGE(0x3b0a, 0x3b0b) AM_WRITE(gng_bgscrolly_w)
AM_RANGE(0x3c00, 0x3c00) AM_NOP /* watchdog? */
- AM_RANGE(0x3d00, 0x3d00) AM_WRITE_LEGACY(gng_flipscreen_w)
+ AM_RANGE(0x3d00, 0x3d00) AM_WRITE(gng_flipscreen_w)
// { 0x3d01, 0x3d01, reset sound cpu?
AM_RANGE(0x3d02, 0x3d03) AM_WRITE(gng_coin_counter_w)
AM_RANGE(0x3e00, 0x3e00) AM_WRITE(gng_bankswitch_w)
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index 7db93d693d0..f795de0698f 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -49,10 +49,10 @@ READ16_MEMBER(goal92_state::goal92_inputs_r)
static ADDRESS_MAP_START( goal92_map, AS_PROGRAM, 16, goal92_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1007ff) AM_RAM
- AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE_LEGACY(goal92_background_w) AM_BASE(m_bg_data)
- AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE_LEGACY(goal92_foreground_w) AM_BASE(m_fg_data)
+ AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE(goal92_background_w) AM_BASE(m_bg_data)
+ AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(goal92_foreground_w) AM_BASE(m_fg_data)
AM_RANGE(0x101800, 0x101fff) AM_RAM // it has tiles for clouds, but they aren't used
- AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE_LEGACY(goal92_text_w) AM_BASE(m_tx_data)
+ AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(goal92_text_w) AM_BASE(m_tx_data)
AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x104000, 0x13ffff) AM_RAM
AM_RANGE(0x140000, 0x1407ff) AM_RAM AM_BASE(m_spriteram)
@@ -62,7 +62,7 @@ static ADDRESS_MAP_START( goal92_map, AS_PROGRAM, 16, goal92_state )
AM_RANGE(0x180008, 0x180009) AM_WRITE(goal92_sound_command_w)
AM_RANGE(0x18000a, 0x18000b) AM_WRITENOP
AM_RANGE(0x180010, 0x180017) AM_WRITEONLY AM_BASE(m_scrollram)
- AM_RANGE(0x18001c, 0x18001d) AM_READWRITE_LEGACY(goal92_fg_bank_r, goal92_fg_bank_w)
+ AM_RANGE(0x18001c, 0x18001d) AM_READWRITE(goal92_fg_bank_r, goal92_fg_bank_w)
ADDRESS_MAP_END
/* Sound CPU */
diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c
index 7d7ff78c41d..eba1433b7d0 100644
--- a/src/mame/drivers/goindol.c
+++ b/src/mame/drivers/goindol.c
@@ -94,10 +94,10 @@ static ADDRESS_MAP_START( goindol_map, AS_PROGRAM, 8, goindol_state )
AM_RANGE(0xc834, 0xc834) AM_READ_PORT("P2")
AM_RANGE(0xd000, 0xd03f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd040, 0xd7ff) AM_RAM
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(goindol_bg_videoram_w) AM_BASE_SIZE(m_bg_videoram, m_bg_videoram_size)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(goindol_bg_videoram_w) AM_BASE_SIZE(m_bg_videoram, m_bg_videoram_size)
AM_RANGE(0xe000, 0xe03f) AM_RAM AM_BASE(m_spriteram2)
AM_RANGE(0xe040, 0xe7ff) AM_RAM
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(goindol_fg_videoram_w) AM_BASE_SIZE(m_fg_videoram, m_fg_videoram_size)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(goindol_fg_videoram_w) AM_BASE_SIZE(m_fg_videoram, m_fg_videoram_size)
AM_RANGE(0xf000, 0xf000) AM_READ_PORT("DSW1")
AM_RANGE(0xf422, 0xf422) AM_READ(prot_f422_r)
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("DSW2")
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 1965dd36904..a6463e3ae73 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -140,11 +140,11 @@ static ADDRESS_MAP_START( goldstar_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0x0000, 0xb7ff) AM_ROM
AM_RANGE(0xb800, 0xbfff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xc000, 0xc7ff) AM_ROM
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(goldstar_fg_vidram_w ) AM_BASE(m_fg_vidram)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(goldstar_fg_atrram_w ) AM_BASE(m_fg_atrram)
- AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE_LEGACY(goldstar_reel1_ram_w ) AM_BASE(m_reel1_ram)
- AM_RANGE(0xe000, 0xe1ff) AM_RAM_WRITE_LEGACY(goldstar_reel2_ram_w ) AM_BASE(m_reel2_ram)
- AM_RANGE(0xe800, 0xe9ff) AM_RAM_WRITE_LEGACY(goldstar_reel3_ram_w ) AM_BASE(m_reel3_ram)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(goldstar_fg_vidram_w ) AM_BASE(m_fg_vidram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(goldstar_fg_atrram_w ) AM_BASE(m_fg_atrram)
+ AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE(goldstar_reel1_ram_w ) AM_BASE(m_reel1_ram)
+ AM_RANGE(0xe000, 0xe1ff) AM_RAM_WRITE(goldstar_reel2_ram_w ) AM_BASE(m_reel2_ram)
+ AM_RANGE(0xe800, 0xe9ff) AM_RAM_WRITE(goldstar_reel3_ram_w ) AM_BASE(m_reel3_ram)
AM_RANGE(0xf040, 0xf07f) AM_RAM AM_BASE(m_reel1_scroll)
AM_RANGE(0xf080, 0xf0bf) AM_RAM AM_BASE(m_reel2_scroll)
AM_RANGE(0xf0c0, 0xf0ff) AM_RAM AM_BASE(m_reel3_scroll)
@@ -161,7 +161,7 @@ static ADDRESS_MAP_START( goldstar_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0xf820, 0xf820) AM_READ_PORT("DSW2")
AM_RANGE(0xf830, 0xf830) AM_DEVREADWRITE_LEGACY("aysnd", ay8910_r, ay8910_data_w)
AM_RANGE(0xf840, 0xf840) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w)
- AM_RANGE(0xfa00, 0xfa00) AM_WRITE_LEGACY(goldstar_fa00_w)
+ AM_RANGE(0xfa00, 0xfa00) AM_WRITE(goldstar_fa00_w)
AM_RANGE(0xfb00, 0xfb00) AM_DEVREADWRITE("oki", okim6295_device, read, write)
AM_RANGE(0xfd00, 0xfdff) AM_RAM_WRITE(paletteram_BBGGGRRR_w) AM_SHARE("paletteram")
AM_RANGE(0xfe00, 0xfe00) AM_READWRITE(protection_r,protection_w)
@@ -183,18 +183,18 @@ static ADDRESS_MAP_START( ncb3_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0x0000, 0xb7ff) AM_ROM
AM_RANGE(0xb800, 0xbfff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xc000, 0xc7ff) AM_ROM
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
- AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE_LEGACY(goldstar_reel1_ram_w) AM_BASE(m_reel1_ram)
- AM_RANGE(0xe000, 0xe1ff) AM_RAM_WRITE_LEGACY(goldstar_reel2_ram_w) AM_BASE(m_reel2_ram)
- AM_RANGE(0xe800, 0xe9ff) AM_RAM_WRITE_LEGACY(goldstar_reel3_ram_w) AM_BASE(m_reel3_ram)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
+ AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE(goldstar_reel1_ram_w) AM_BASE(m_reel1_ram)
+ AM_RANGE(0xe000, 0xe1ff) AM_RAM_WRITE(goldstar_reel2_ram_w) AM_BASE(m_reel2_ram)
+ AM_RANGE(0xe800, 0xe9ff) AM_RAM_WRITE(goldstar_reel3_ram_w) AM_BASE(m_reel3_ram)
AM_RANGE(0xf040, 0xf07f) AM_RAM AM_BASE(m_reel1_scroll)
AM_RANGE(0xf080, 0xf0bf) AM_RAM AM_BASE(m_reel2_scroll)
AM_RANGE(0xf100, 0xf17f) AM_RAM AM_BASE(m_reel3_scroll) // moved compared to goldstar
AM_RANGE(0xf800, 0xf803) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */
AM_RANGE(0xf810, 0xf813) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w) /* Input Ports */
- AM_RANGE(0xf822, 0xf822) AM_WRITE_LEGACY(goldstar_fa00_w) // hack (connected to ppi output port?, needed for colour banking)
+ AM_RANGE(0xf822, 0xf822) AM_WRITE(goldstar_fa00_w) // hack (connected to ppi output port?, needed for colour banking)
AM_RANGE(0xf820, 0xf823) AM_DEVREADWRITE_LEGACY("ppi8255_2", ppi8255_r, ppi8255_w) /* Input/Output Ports */
AM_RANGE(0xf830, 0xf830) AM_DEVREADWRITE_LEGACY("aysnd", ay8910_r, ay8910_data_w)
@@ -257,12 +257,12 @@ static ADDRESS_MAP_START( cm_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
- AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE_LEGACY(goldstar_reel1_ram_w ) AM_BASE(m_reel1_ram)
- AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE_LEGACY(goldstar_reel2_ram_w ) AM_BASE(m_reel2_ram)
- AM_RANGE(0xf400, 0xf5ff) AM_RAM_WRITE_LEGACY(goldstar_reel3_ram_w ) AM_BASE(m_reel3_ram)
+ AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE(goldstar_reel1_ram_w ) AM_BASE(m_reel1_ram)
+ AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE(goldstar_reel2_ram_w ) AM_BASE(m_reel2_ram)
+ AM_RANGE(0xf400, 0xf5ff) AM_RAM_WRITE(goldstar_reel3_ram_w ) AM_BASE(m_reel3_ram)
AM_RANGE(0xf600, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf87f) AM_RAM AM_BASE(m_reel1_scroll)
@@ -279,12 +279,12 @@ static ADDRESS_MAP_START( nfm_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
- AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE_LEGACY(goldstar_reel1_ram_w ) AM_BASE(m_reel1_ram)
- AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE_LEGACY(goldstar_reel2_ram_w ) AM_BASE(m_reel2_ram)
- AM_RANGE(0xf400, 0xf5ff) AM_RAM_WRITE_LEGACY(goldstar_reel3_ram_w ) AM_BASE(m_reel3_ram)
+ AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE(goldstar_reel1_ram_w ) AM_BASE(m_reel1_ram)
+ AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE(goldstar_reel2_ram_w ) AM_BASE(m_reel2_ram)
+ AM_RANGE(0xf400, 0xf5ff) AM_RAM_WRITE(goldstar_reel3_ram_w ) AM_BASE(m_reel3_ram)
AM_RANGE(0xf600, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf87f) AM_RAM AM_BASE(m_reel1_scroll)
@@ -303,11 +303,11 @@ static ADDRESS_MAP_START( cm_portmap, AS_IO, 8, goldstar_state )
AM_RANGE(0x02, 0x03) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
AM_RANGE(0x04, 0x07) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w) /* Inputs */
AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(cm_outport0_w) /* output port */
+ AM_RANGE(0x10, 0x10) AM_WRITE(cm_outport0_w) /* output port */
AM_RANGE(0x11, 0x11) AM_WRITENOP
AM_RANGE(0x12, 0x12) AM_WRITE(cm_outport1_w) /* output port */
- AM_RANGE(0x13, 0x13) AM_WRITE_LEGACY(cm_background_col_w)
- AM_RANGE(0x14, 0x14) AM_WRITE_LEGACY(cm_girl_scroll_w)
+ AM_RANGE(0x13, 0x13) AM_WRITE(cm_background_col_w)
+ AM_RANGE(0x14, 0x14) AM_WRITE(cm_girl_scroll_w)
ADDRESS_MAP_END
@@ -326,10 +326,10 @@ static ADDRESS_MAP_START( amcoe1_portmap, AS_IO, 8, goldstar_state )
AM_RANGE(0x02, 0x03) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
AM_RANGE(0x04, 0x07) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */
AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(cm_outport0_w) /* output port */
+ AM_RANGE(0x10, 0x10) AM_WRITE(cm_outport0_w) /* output port */
AM_RANGE(0x11, 0x11) AM_WRITENOP
AM_RANGE(0x12, 0x12) AM_WRITE(cm_outport1_w) /* output port */
- AM_RANGE(0x13, 0x13) AM_WRITE_LEGACY(cm_background_col_w)
+ AM_RANGE(0x13, 0x13) AM_WRITE(cm_background_col_w)
AM_RANGE(0x20, 0x20) AM_DEVREADWRITE("oki", okim6295_device, read, write)
ADDRESS_MAP_END
@@ -339,10 +339,10 @@ static ADDRESS_MAP_START( amcoe2_portmap, AS_IO, 8, goldstar_state )
AM_RANGE(0x02, 0x03) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
AM_RANGE(0x04, 0x07) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */
AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(cm_outport0_w) /* output port */
+ AM_RANGE(0x10, 0x10) AM_WRITE(cm_outport0_w) /* output port */
AM_RANGE(0x11, 0x11) AM_WRITENOP
AM_RANGE(0x12, 0x12) AM_WRITE(cm_outport1_w) /* output port */
- AM_RANGE(0x13, 0x13) AM_WRITE_LEGACY(cm_background_col_w)
+ AM_RANGE(0x13, 0x13) AM_WRITE(cm_background_col_w)
ADDRESS_MAP_END
@@ -362,11 +362,11 @@ WRITE8_MEMBER(goldstar_state::lucky8_outport_w)
static ADDRESS_MAP_START( lucky8_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
- AM_RANGE(0x9800, 0x99ff) AM_RAM_WRITE_LEGACY(goldstar_reel1_ram_w) AM_BASE(m_reel1_ram)
- AM_RANGE(0xa000, 0xa1ff) AM_RAM_WRITE_LEGACY(goldstar_reel2_ram_w) AM_BASE(m_reel2_ram)
- AM_RANGE(0xa800, 0xa9ff) AM_RAM_WRITE_LEGACY(goldstar_reel3_ram_w) AM_BASE(m_reel3_ram)
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
+ AM_RANGE(0x9800, 0x99ff) AM_RAM_WRITE(goldstar_reel1_ram_w) AM_BASE(m_reel1_ram)
+ AM_RANGE(0xa000, 0xa1ff) AM_RAM_WRITE(goldstar_reel2_ram_w) AM_BASE(m_reel2_ram)
+ AM_RANGE(0xa800, 0xa9ff) AM_RAM_WRITE(goldstar_reel3_ram_w) AM_BASE(m_reel3_ram)
AM_RANGE(0xb040, 0xb07f) AM_RAM AM_BASE(m_reel1_scroll)
AM_RANGE(0xb080, 0xb0bf) AM_RAM AM_BASE(m_reel2_scroll)
AM_RANGE(0xb100, 0xb17f) AM_RAM AM_BASE(m_reel3_scroll)
@@ -406,11 +406,11 @@ static ADDRESS_MAP_START(magodds_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
// where does the extra rom data map?? it seems like it should come straight after the existing rom, but it can't if this is a plain z80?
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("share1") AM_SHARE("nvram")
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
- AM_RANGE(0x9800, 0x99ff) AM_RAM_WRITE_LEGACY(goldstar_reel1_ram_w) AM_BASE(m_reel1_ram)
- AM_RANGE(0xa000, 0xa1ff) AM_RAM_WRITE_LEGACY(goldstar_reel2_ram_w) AM_BASE(m_reel2_ram)
- AM_RANGE(0xa900, 0xaaff) AM_RAM_WRITE_LEGACY(goldstar_reel3_ram_w) AM_BASE(m_reel3_ram) // +0x100 compared to lucky8
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
+ AM_RANGE(0x9800, 0x99ff) AM_RAM_WRITE(goldstar_reel1_ram_w) AM_BASE(m_reel1_ram)
+ AM_RANGE(0xa000, 0xa1ff) AM_RAM_WRITE(goldstar_reel2_ram_w) AM_BASE(m_reel2_ram)
+ AM_RANGE(0xa900, 0xaaff) AM_RAM_WRITE(goldstar_reel3_ram_w) AM_BASE(m_reel3_ram) // +0x100 compared to lucky8
AM_RANGE(0xb040, 0xb07f) AM_RAM AM_BASE(m_reel1_scroll)
AM_RANGE(0xb080, 0xb0bf) AM_RAM AM_BASE(m_reel2_scroll)
AM_RANGE(0xb100, 0xb17f) AM_RAM AM_BASE(m_reel3_scroll)
@@ -429,11 +429,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( kkotnoli_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM /* definitely no NVRAM */
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
- AM_RANGE(0x9800, 0x99ff) AM_RAM_WRITE_LEGACY(goldstar_reel1_ram_w) AM_BASE(m_reel1_ram)
- AM_RANGE(0xa000, 0xa1ff) AM_RAM_WRITE_LEGACY(goldstar_reel2_ram_w) AM_BASE(m_reel2_ram)
- AM_RANGE(0xa800, 0xa9ff) AM_RAM_WRITE_LEGACY(goldstar_reel3_ram_w) AM_BASE(m_reel3_ram)
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
+ AM_RANGE(0x9800, 0x99ff) AM_RAM_WRITE(goldstar_reel1_ram_w) AM_BASE(m_reel1_ram)
+ AM_RANGE(0xa000, 0xa1ff) AM_RAM_WRITE(goldstar_reel2_ram_w) AM_BASE(m_reel2_ram)
+ AM_RANGE(0xa800, 0xa9ff) AM_RAM_WRITE(goldstar_reel3_ram_w) AM_BASE(m_reel3_ram)
AM_RANGE(0xb040, 0xb07f) AM_RAM AM_BASE(m_reel1_scroll)
AM_RANGE(0xb080, 0xb0bf) AM_RAM AM_BASE(m_reel2_scroll)
AM_RANGE(0xb100, 0xb17f) AM_RAM AM_BASE(m_reel3_scroll)
@@ -468,11 +468,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ladylinr_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
- AM_RANGE(0x9800, 0x99ff) AM_RAM_WRITE_LEGACY(goldstar_reel1_ram_w) AM_BASE(m_reel1_ram)
- AM_RANGE(0xa000, 0xa1ff) AM_RAM_WRITE_LEGACY(goldstar_reel2_ram_w) AM_BASE(m_reel2_ram)
- AM_RANGE(0xa800, 0xa9ff) AM_RAM_WRITE_LEGACY(goldstar_reel3_ram_w) AM_BASE(m_reel3_ram)
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
+ AM_RANGE(0x9800, 0x99ff) AM_RAM_WRITE(goldstar_reel1_ram_w) AM_BASE(m_reel1_ram)
+ AM_RANGE(0xa000, 0xa1ff) AM_RAM_WRITE(goldstar_reel2_ram_w) AM_BASE(m_reel2_ram)
+ AM_RANGE(0xa800, 0xa9ff) AM_RAM_WRITE(goldstar_reel3_ram_w) AM_BASE(m_reel3_ram)
AM_RANGE(0xb040, 0xb07f) AM_RAM AM_BASE(m_reel1_scroll)
AM_RANGE(0xb080, 0xb0bf) AM_RAM AM_BASE(m_reel2_scroll)
AM_RANGE(0xb100, 0xb17f) AM_RAM AM_BASE(m_reel3_scroll)
@@ -489,11 +489,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( wcat3_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
- AM_RANGE(0x9800, 0x99ff) AM_RAM_WRITE_LEGACY(goldstar_reel1_ram_w) AM_BASE(m_reel1_ram)
- AM_RANGE(0xa000, 0xa1ff) AM_RAM_WRITE_LEGACY(goldstar_reel2_ram_w) AM_BASE(m_reel2_ram)
- AM_RANGE(0xa800, 0xa9ff) AM_RAM_WRITE_LEGACY(goldstar_reel3_ram_w) AM_BASE(m_reel3_ram)
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
+ AM_RANGE(0x9800, 0x99ff) AM_RAM_WRITE(goldstar_reel1_ram_w) AM_BASE(m_reel1_ram)
+ AM_RANGE(0xa000, 0xa1ff) AM_RAM_WRITE(goldstar_reel2_ram_w) AM_BASE(m_reel2_ram)
+ AM_RANGE(0xa800, 0xa9ff) AM_RAM_WRITE(goldstar_reel3_ram_w) AM_BASE(m_reel3_ram)
AM_RANGE(0xb040, 0xb07f) AM_RAM AM_BASE(m_reel1_scroll)
AM_RANGE(0xb080, 0xb0bf) AM_RAM AM_BASE(m_reel2_scroll)
AM_RANGE(0xb100, 0xb17f) AM_RAM AM_BASE(m_reel3_scroll)
@@ -532,16 +532,16 @@ static ADDRESS_MAP_START( unkch_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0xd900, 0xd93f) AM_RAM AM_BASE(m_reel3_scroll)
AM_RANGE(0xdfc0, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(goldstar_fg_vidram_w) AM_BASE(m_fg_vidram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(goldstar_fg_atrram_w) AM_BASE(m_fg_atrram)
- AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE_LEGACY(goldstar_reel1_ram_w ) AM_BASE(m_reel1_ram)
- AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE_LEGACY(goldstar_reel2_ram_w ) AM_BASE(m_reel2_ram)
- AM_RANGE(0xf400, 0xf5ff) AM_RAM_WRITE_LEGACY(goldstar_reel3_ram_w ) AM_BASE(m_reel3_ram)
+ AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE(goldstar_reel1_ram_w ) AM_BASE(m_reel1_ram)
+ AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE(goldstar_reel2_ram_w ) AM_BASE(m_reel2_ram)
+ AM_RANGE(0xf400, 0xf5ff) AM_RAM_WRITE(goldstar_reel3_ram_w ) AM_BASE(m_reel3_ram)
AM_RANGE(0xf600, 0xf7ff) AM_RAM
- AM_RANGE(0xf800, 0xf9ff) AM_RAM_WRITE_LEGACY(unkch_reel1_attrram_w ) AM_BASE(m_reel1_attrram)
- AM_RANGE(0xfa00, 0xfbff) AM_RAM_WRITE_LEGACY(unkch_reel2_attrram_w ) AM_BASE(m_reel2_attrram)
- AM_RANGE(0xfc00, 0xfdff) AM_RAM_WRITE_LEGACY(unkch_reel3_attrram_w ) AM_BASE(m_reel3_attrram)
+ AM_RANGE(0xf800, 0xf9ff) AM_RAM_WRITE(unkch_reel1_attrram_w ) AM_BASE(m_reel1_attrram)
+ AM_RANGE(0xfa00, 0xfbff) AM_RAM_WRITE(unkch_reel2_attrram_w ) AM_BASE(m_reel2_attrram)
+ AM_RANGE(0xfc00, 0xfdff) AM_RAM_WRITE(unkch_reel3_attrram_w ) AM_BASE(m_reel3_attrram)
AM_RANGE(0xfe00, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -584,8 +584,8 @@ static ADDRESS_MAP_START( unkch_portmap, AS_IO, 8, goldstar_state )
// AM_RANGE(0x10, 0x10) AM_WRITE (cm_outport0_w) /* output port */
// AM_RANGE(0x11, 0x11) AM_WRITENOP
// AM_RANGE(0x12, 0x12) AM_WRITE (cm_outport1_w) /* output port */
-// AM_RANGE(0x13, 0x13) AM_WRITE_LEGACY(cm_background_col_w)
-// AM_RANGE(0x14, 0x14) AM_WRITE_LEGACY(cm_girl_scroll_w)
+// AM_RANGE(0x13, 0x13) AM_WRITE(cm_background_col_w)
+// AM_RANGE(0x14, 0x14) AM_WRITE(cm_girl_scroll_w)
AM_RANGE(0x08, 0x08) AM_READ_PORT("IN0")
AM_RANGE(0x09, 0x09) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c
index 2ae9f6c94e6..80496fa1423 100644
--- a/src/mame/drivers/gomoku.c
+++ b/src/mame/drivers/gomoku.c
@@ -41,14 +41,14 @@ READ8_MEMBER(gomoku_state::input_port_r)
static ADDRESS_MAP_START( gomoku_map, AS_PROGRAM, 8, gomoku_state )
AM_RANGE(0x0000, 0x47ff) AM_ROM
AM_RANGE(0x4800, 0x4fff) AM_RAM
- AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE_LEGACY(gomoku_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5400, 0x57ff) AM_RAM_WRITE_LEGACY(gomoku_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x5800, 0x58ff) AM_RAM_WRITE_LEGACY(gomoku_bgram_w) AM_BASE(m_bgram)
+ AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE(gomoku_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5400, 0x57ff) AM_RAM_WRITE(gomoku_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x5800, 0x58ff) AM_RAM_WRITE(gomoku_bgram_w) AM_BASE(m_bgram)
AM_RANGE(0x6000, 0x601f) AM_DEVWRITE_LEGACY("gomoku", gomoku_sound1_w)
AM_RANGE(0x6800, 0x681f) AM_DEVWRITE_LEGACY("gomoku", gomoku_sound2_w)
AM_RANGE(0x7000, 0x7000) AM_WRITENOP
- AM_RANGE(0x7001, 0x7001) AM_WRITE_LEGACY(gomoku_flipscreen_w)
- AM_RANGE(0x7002, 0x7002) AM_WRITE_LEGACY(gomoku_bg_dispsw_w)
+ AM_RANGE(0x7001, 0x7001) AM_WRITE(gomoku_flipscreen_w)
+ AM_RANGE(0x7002, 0x7002) AM_WRITE(gomoku_bg_dispsw_w)
AM_RANGE(0x7003, 0x7007) AM_WRITENOP
AM_RANGE(0x7800, 0x7807) AM_READ(input_port_r)
AM_RANGE(0x7800, 0x7800) AM_WRITENOP
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index ab3c09808a0..504f7f25bb4 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -106,12 +106,12 @@ static ADDRESS_MAP_START( gotcha_map, AS_PROGRAM, 16, gotcha_state )
AM_RANGE(0x180000, 0x180001) AM_READ_PORT("INPUTS")
AM_RANGE(0x180002, 0x180003) AM_READ_PORT("SYSTEM")
AM_RANGE(0x180004, 0x180005) AM_READ_PORT("DSW")
- AM_RANGE(0x300000, 0x300001) AM_WRITE_LEGACY(gotcha_gfxbank_select_w)
- AM_RANGE(0x300002, 0x300009) AM_WRITE_LEGACY(gotcha_scroll_w)
+ AM_RANGE(0x300000, 0x300001) AM_WRITE(gotcha_gfxbank_select_w)
+ AM_RANGE(0x300002, 0x300009) AM_WRITE(gotcha_scroll_w)
// { 0x30000c, 0x30000d,
- AM_RANGE(0x30000e, 0x30000f) AM_WRITE_LEGACY(gotcha_gfxbank_w)
- AM_RANGE(0x320000, 0x320fff) AM_WRITE_LEGACY(gotcha_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0x322000, 0x322fff) AM_WRITE_LEGACY(gotcha_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x30000e, 0x30000f) AM_WRITE(gotcha_gfxbank_w)
+ AM_RANGE(0x320000, 0x320fff) AM_WRITE(gotcha_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x322000, 0x322fff) AM_WRITE(gotcha_bgvideoram_w) AM_BASE(m_bgvideoram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index 88101927480..61e89f1b7d8 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -327,9 +327,9 @@ WRITE8_MEMBER(gottlieb_state::general_output_w)
{
/* bits 0-3 control video features, and are different for laserdisc games */
if (m_laserdisc == NULL)
- gottlieb_video_control_w(&space, offset, data);
+ gottlieb_video_control_w(space, offset, data);
else
- gottlieb_laserdisc_video_control_w(&space, offset, data);
+ gottlieb_laserdisc_video_control_w(space, offset, data);
/* bit 4 controls the coin meter */
coin_counter_w(machine(), 0, data & 0x10);
@@ -690,19 +690,19 @@ static INTERRUPT_GEN( gottlieb_interrupt )
WRITE8_MEMBER(gottlieb_state::gottlieb_sh_w)
{
if (m_r1_sound != NULL)
- m_r1_sound->write(*&space, offset, data);
+ m_r1_sound->write(space, offset, data);
if (m_r2_sound != NULL)
- m_r2_sound->write(*&space, offset, data);
+ m_r2_sound->write(space, offset, data);
}
static ADDRESS_MAP_START( reactor_map, AS_PROGRAM, 8, gottlieb_state )
ADDRESS_MAP_GLOBAL_MASK(0xffff)
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x20ff) AM_MIRROR(0x0f00) AM_WRITEONLY AM_BASE(m_spriteram) /* FRSEL */
- AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM_WRITE_LEGACY(gottlieb_videoram_w) AM_BASE(m_videoram) /* BRSEL */
- AM_RANGE(0x4000, 0x4fff) AM_RAM_WRITE_LEGACY(gottlieb_charram_w) AM_BASE(m_charram) /* BOJRSEL1 */
+ AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM_WRITE(gottlieb_videoram_w) AM_BASE(m_videoram) /* BRSEL */
+ AM_RANGE(0x4000, 0x4fff) AM_RAM_WRITE(gottlieb_charram_w) AM_BASE(m_charram) /* BOJRSEL1 */
/* AM_RANGE(0x5000, 0x5fff) AM_WRITE_LEGACY() */ /* BOJRSEL2 */
- AM_RANGE(0x6000, 0x601f) AM_MIRROR(0x0fe0) AM_WRITE_LEGACY(gottlieb_paletteram_w) AM_SHARE("paletteram") /* COLSEL */
+ AM_RANGE(0x6000, 0x601f) AM_MIRROR(0x0fe0) AM_WRITE(gottlieb_paletteram_w) AM_SHARE("paletteram") /* COLSEL */
AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0ff8) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x7001, 0x7001) AM_MIRROR(0x0ff8) AM_WRITE(gottlieb_analog_reset_w) /* A1J2 interface */
AM_RANGE(0x7002, 0x7002) AM_MIRROR(0x0ff8) AM_WRITE(gottlieb_sh_w) /* trackball H */
@@ -722,9 +722,9 @@ static ADDRESS_MAP_START( gottlieb_map, AS_PROGRAM, 8, gottlieb_state )
AM_RANGE(0x1000, 0x1fff) AM_RAM AM_REGION("maincpu", 0x1000) /* or ROM */
AM_RANGE(0x2000, 0x2fff) AM_RAM AM_REGION("maincpu", 0x2000) /* or ROM */
AM_RANGE(0x3000, 0x30ff) AM_MIRROR(0x0700) AM_WRITEONLY AM_BASE(m_spriteram) /* FRSEL */
- AM_RANGE(0x3800, 0x3bff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(gottlieb_videoram_w) AM_BASE(m_videoram) /* BRSEL */
- AM_RANGE(0x4000, 0x4fff) AM_RAM_WRITE_LEGACY(gottlieb_charram_w) AM_BASE(m_charram) /* BOJRSEL1 */
- AM_RANGE(0x5000, 0x501f) AM_MIRROR(0x07e0) AM_WRITE_LEGACY(gottlieb_paletteram_w) AM_SHARE("paletteram") /* COLSEL */
+ AM_RANGE(0x3800, 0x3bff) AM_MIRROR(0x0400) AM_RAM_WRITE(gottlieb_videoram_w) AM_BASE(m_videoram) /* BRSEL */
+ AM_RANGE(0x4000, 0x4fff) AM_RAM_WRITE(gottlieb_charram_w) AM_BASE(m_charram) /* BOJRSEL1 */
+ AM_RANGE(0x5000, 0x501f) AM_MIRROR(0x07e0) AM_WRITE(gottlieb_paletteram_w) AM_SHARE("paletteram") /* COLSEL */
AM_RANGE(0x5800, 0x5800) AM_MIRROR(0x07f8) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x5801, 0x5801) AM_MIRROR(0x07f8) AM_WRITE(gottlieb_analog_reset_w) /* A1J2 interface */
AM_RANGE(0x5802, 0x5802) AM_MIRROR(0x07f8) AM_WRITE(gottlieb_sh_w) /* OP20-27 */
diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c
index 25a38c1a7b2..85027da1f1b 100644
--- a/src/mame/drivers/gotya.c
+++ b/src/mame/drivers/gotya.c
@@ -45,12 +45,12 @@ static ADDRESS_MAP_START( gotya_map, AS_PROGRAM, 8, gotya_state )
AM_RANGE(0x6000, 0x6000) AM_READ_PORT("P1")
AM_RANGE(0x6001, 0x6001) AM_READ_PORT("P2")
AM_RANGE(0x6002, 0x6002) AM_READ_PORT("DSW")
- AM_RANGE(0x6004, 0x6004) AM_WRITE_LEGACY(gotya_video_control_w)
+ AM_RANGE(0x6004, 0x6004) AM_WRITE(gotya_video_control_w)
AM_RANGE(0x6005, 0x6005) AM_WRITE_LEGACY(gotya_soundlatch_w)
AM_RANGE(0x6006, 0x6006) AM_WRITEONLY AM_BASE(m_scroll)
AM_RANGE(0x6007, 0x6007) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(gotya_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(gotya_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(gotya_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(gotya_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xd000, 0xd3df) AM_RAM AM_BASE(m_videoram2)
AM_RANGE(0xd3e0, 0xd3ff) AM_RAM AM_BASE(m_spriteram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index e1ad6f52257..1b9d1cf2d96 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -171,7 +171,7 @@ static ADDRESS_MAP_START( gradius3_map, AS_PROGRAM, 16, gradius3_state )
AM_RANGE(0x0f0000, 0x0f0001) AM_WRITE(sound_irq_w)
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x14c000, 0x153fff) AM_READWRITE(k052109_halfword_r, k052109_halfword_w)
- AM_RANGE(0x180000, 0x19ffff) AM_RAM_WRITE_LEGACY(gradius3_gfxram_w) AM_BASE(m_gfxram) AM_SHARE("share2")
+ AM_RANGE(0x180000, 0x19ffff) AM_RAM_WRITE(gradius3_gfxram_w) AM_BASE(m_gfxram) AM_SHARE("share2")
ADDRESS_MAP_END
@@ -181,10 +181,10 @@ static ADDRESS_MAP_START( gradius3_map2, AS_PROGRAM, 16, gradius3_state )
AM_RANGE(0x140000, 0x140001) AM_WRITE(cpuB_irqenable_w)
AM_RANGE(0x200000, 0x203fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x24c000, 0x253fff) AM_READWRITE(k052109_halfword_r, k052109_halfword_w)
- AM_RANGE(0x280000, 0x29ffff) AM_RAM_WRITE_LEGACY(gradius3_gfxram_w) AM_SHARE("share2")
+ AM_RANGE(0x280000, 0x29ffff) AM_RAM_WRITE(gradius3_gfxram_w) AM_SHARE("share2")
AM_RANGE(0x2c0000, 0x2c000f) AM_READWRITE(k051937_halfword_r, k051937_halfword_w)
AM_RANGE(0x2c0800, 0x2c0fff) AM_READWRITE(k051960_halfword_r, k051960_halfword_w)
- AM_RANGE(0x400000, 0x5fffff) AM_READ_LEGACY(gradius3_gfxrom_r) /* gfx ROMs are mapped here, and copied to RAM */
+ AM_RANGE(0x400000, 0x5fffff) AM_READ(gradius3_gfxrom_r) /* gfx ROMs are mapped here, and copied to RAM */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index 6ff97297aa7..51c964e0bb4 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -538,9 +538,9 @@ ADDRESS_MAP_END
/* complete memory map derived from schematics */
static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8, grchamp_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(grchamp_left_w) AM_BASE(m_leftram)
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE_LEGACY(grchamp_right_w) AM_BASE(m_rightram)
- AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE_LEGACY(grchamp_center_w) AM_BASE(m_centerram)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(grchamp_left_w) AM_BASE(m_leftram)
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(grchamp_right_w) AM_BASE(m_rightram)
+ AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(grchamp_center_w) AM_BASE(m_centerram)
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM
AM_RANGE(0x5000, 0x6fff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c
index ed709d49f82..f29a7c28838 100644
--- a/src/mame/drivers/gridlee.c
+++ b/src/mame/drivers/gridlee.c
@@ -306,13 +306,13 @@ WRITE8_MEMBER(gridlee_state::gridlee_coin_counter_w)
/* CPU 1 read addresses */
static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8, gridlee_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x0800, 0x7fff) AM_RAM_WRITE_LEGACY(gridlee_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0800, 0x7fff) AM_RAM_WRITE(gridlee_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x9000, 0x9000) AM_WRITE(led_0_w)
AM_RANGE(0x9010, 0x9010) AM_WRITE(led_1_w)
AM_RANGE(0x9020, 0x9020) AM_WRITE(gridlee_coin_counter_w)
/* { 0x9060, 0x9060, unknown - only written to at startup */
- AM_RANGE(0x9070, 0x9070) AM_WRITE_LEGACY(gridlee_cocktail_flip_w)
- AM_RANGE(0x9200, 0x9200) AM_WRITE_LEGACY(gridlee_palette_select_w)
+ AM_RANGE(0x9070, 0x9070) AM_WRITE(gridlee_cocktail_flip_w)
+ AM_RANGE(0x9200, 0x9200) AM_WRITE(gridlee_palette_select_w)
AM_RANGE(0x9380, 0x9380) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x9500, 0x9501) AM_READ(analog_port_r)
AM_RANGE(0x9502, 0x9502) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index b4886c03703..ac694c39909 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -278,13 +278,13 @@ static const ym2610_interface ym2610_config =
static ADDRESS_MAP_START( gstriker_map, AS_PROGRAM, 16, gstriker_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
- AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE_LEGACY(MB60553_0_vram_w) AM_BASE(m_MB60553[0].vram)
+ AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(MB60553_0_vram_w) AM_BASE(m_MB60553[0].vram)
AM_RANGE(0x140000, 0x141fff) AM_RAM AM_BASE(m_CG10103[0].vram)
- AM_RANGE(0x180000, 0x180fff) AM_RAM_WRITE_LEGACY(VS920A_0_vram_w) AM_BASE(m_VS920A[0].vram)
+ AM_RANGE(0x180000, 0x180fff) AM_RAM_WRITE(VS920A_0_vram_w) AM_BASE(m_VS920A[0].vram)
AM_RANGE(0x181000, 0x181fff) AM_RAM AM_BASE(m_lineram)
AM_RANGE(0x1c0000, 0x1c0fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x200000, 0x20000f) AM_RAM_WRITE_LEGACY(MB60553_0_regs_w)
+ AM_RANGE(0x200000, 0x20000f) AM_RAM_WRITE(MB60553_0_regs_w)
AM_RANGE(0x200040, 0x20005f) AM_RAM //AM_BASE_LEGACY(&gs_mixer_regs)
AM_RANGE(0x200060, 0x20007f) AM_RAM
AM_RANGE(0x200080, 0x200081) AM_READ_PORT("P1")
@@ -315,12 +315,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( vgoal_map, AS_PROGRAM, 16, gstriker_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
- AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE_LEGACY(MB60553_0_vram_w) AM_BASE(m_MB60553[0].vram)
+ AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(MB60553_0_vram_w) AM_BASE(m_MB60553[0].vram)
AM_RANGE(0x140000, 0x141fff) AM_RAM AM_BASE(m_CG10103[0].vram)
- AM_RANGE(0x180000, 0x180fff) AM_RAM_WRITE_LEGACY(VS920A_0_vram_w) AM_BASE(m_VS920A[0].vram)
+ AM_RANGE(0x180000, 0x180fff) AM_RAM_WRITE(VS920A_0_vram_w) AM_BASE(m_VS920A[0].vram)
AM_RANGE(0x181000, 0x181fff) AM_RAM AM_BASE(m_lineram)
AM_RANGE(0x1c0000, 0x1c4fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x200000, 0x20000f) AM_RAM_WRITE_LEGACY(MB60553_0_regs_w)
+ AM_RANGE(0x200000, 0x20000f) AM_RAM_WRITE(MB60553_0_regs_w)
AM_RANGE(0x200040, 0x20005f) AM_RAM //AM_BASE_LEGACY(&gs_mixer_regs)
AM_RANGE(0x200080, 0x200081) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index e9186d0f8bc..631600da579 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -338,11 +338,11 @@ static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM , 8, gsword_state )
AM_RANGE(0xa380, 0xa3ff) AM_RAM AM_BASE(m_spritetile_ram)
AM_RANGE(0xa400, 0xa77f) AM_RAM
AM_RANGE(0xa780, 0xa7ff) AM_RAM AM_BASE(m_spritexy_ram) AM_SIZE(m_spritexy_size)
- AM_RANGE(0xa980, 0xa980) AM_WRITE_LEGACY(gsword_charbank_w)
- AM_RANGE(0xaa80, 0xaa80) AM_WRITE_LEGACY(gsword_videoctrl_w) /* flip screen, char palette bank */
- AM_RANGE(0xab00, 0xab00) AM_WRITE_LEGACY(gsword_scroll_w)
+ AM_RANGE(0xa980, 0xa980) AM_WRITE(gsword_charbank_w)
+ AM_RANGE(0xaa80, 0xaa80) AM_WRITE(gsword_videoctrl_w) /* flip screen, char palette bank */
+ AM_RANGE(0xab00, 0xab00) AM_WRITE(gsword_scroll_w)
AM_RANGE(0xab80, 0xabff) AM_WRITEONLY AM_BASE(m_spriteattrib_ram)
- AM_RANGE(0xb000, 0xb7ff) AM_RAM_WRITE_LEGACY(gsword_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xb000, 0xb7ff) AM_RAM_WRITE(gsword_videoram_w) AM_BASE(m_videoram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu1_io_map, AS_IO, 8, gsword_state )
diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c
index 8c84d284e7f..c47b753231b 100644
--- a/src/mame/drivers/gumbo.c
+++ b/src/mame/drivers/gumbo.c
@@ -53,8 +53,8 @@ static ADDRESS_MAP_START( gumbo_map, AS_PROGRAM, 16, gumbo_state )
AM_RANGE(0x1c0100, 0x1c0101) AM_READ_PORT("P1_P2")
AM_RANGE(0x1c0200, 0x1c0201) AM_READ_PORT("DSW")
AM_RANGE(0x1c0300, 0x1c0301) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0x1e0000, 0x1e0fff) AM_RAM_WRITE_LEGACY(gumbo_bg_videoram_w) AM_BASE(m_bg_videoram) // bg tilemap
- AM_RANGE(0x1f0000, 0x1f3fff) AM_RAM_WRITE_LEGACY(gumbo_fg_videoram_w) AM_BASE(m_fg_videoram) // fg tilemap
+ AM_RANGE(0x1e0000, 0x1e0fff) AM_RAM_WRITE(gumbo_bg_videoram_w) AM_BASE(m_bg_videoram) // bg tilemap
+ AM_RANGE(0x1f0000, 0x1f3fff) AM_RAM_WRITE(gumbo_fg_videoram_w) AM_BASE(m_fg_videoram) // fg tilemap
ADDRESS_MAP_END
/* Miss Puzzle has a different memory map */
@@ -62,12 +62,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mspuzzle_map, AS_PROGRAM, 16, gumbo_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM // main ram
- AM_RANGE(0x190000, 0x197fff) AM_RAM_WRITE_LEGACY(gumbo_fg_videoram_w) AM_BASE(m_fg_videoram) // fg tilemap
+ AM_RANGE(0x190000, 0x197fff) AM_RAM_WRITE(gumbo_fg_videoram_w) AM_BASE(m_fg_videoram) // fg tilemap
AM_RANGE(0x1a0000, 0x1a03ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x1b0100, 0x1b0101) AM_READ_PORT("P1_P2")
AM_RANGE(0x1b0200, 0x1b0201) AM_READ_PORT("DSW")
AM_RANGE(0x1b0300, 0x1b0301) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0x1c0000, 0x1c1fff) AM_RAM_WRITE_LEGACY(gumbo_bg_videoram_w) AM_BASE(m_bg_videoram) // bg tilemap
+ AM_RANGE(0x1c0000, 0x1c1fff) AM_RAM_WRITE(gumbo_bg_videoram_w) AM_BASE(m_bg_videoram) // bg tilemap
ADDRESS_MAP_END
static ADDRESS_MAP_START( dblpoint_map, AS_PROGRAM, 16, gumbo_state )
@@ -77,8 +77,8 @@ static ADDRESS_MAP_START( dblpoint_map, AS_PROGRAM, 16, gumbo_state )
AM_RANGE(0x1c0100, 0x1c0101) AM_READ_PORT("P1_P2")
AM_RANGE(0x1c0200, 0x1c0201) AM_READ_PORT("DSW")
AM_RANGE(0x1c0300, 0x1c0301) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0x1e0000, 0x1e3fff) AM_RAM_WRITE_LEGACY(gumbo_fg_videoram_w) AM_BASE(m_fg_videoram) // fg tilemap
- AM_RANGE(0x1f0000, 0x1f0fff) AM_RAM_WRITE_LEGACY(gumbo_bg_videoram_w) AM_BASE(m_bg_videoram) // bg tilemap
+ AM_RANGE(0x1e0000, 0x1e3fff) AM_RAM_WRITE(gumbo_fg_videoram_w) AM_BASE(m_fg_videoram) // fg tilemap
+ AM_RANGE(0x1f0000, 0x1f0fff) AM_RAM_WRITE(gumbo_bg_videoram_w) AM_BASE(m_bg_videoram) // bg tilemap
ADDRESS_MAP_END
static INPUT_PORTS_START( gumbo )
diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c
index a805a1adc3e..1b6fc757241 100644
--- a/src/mame/drivers/gundealr.c
+++ b/src/mame/drivers/gundealr.c
@@ -66,13 +66,13 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, gundealr_state )
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("IN0")
AM_RANGE(0xc005, 0xc005) AM_READ_PORT("IN1")
AM_RANGE(0xc006, 0xc006) AM_READ_PORT("IN2")
- AM_RANGE(0xc010, 0xc013) AM_WRITE_LEGACY(yamyam_fg_scroll_w) /* Yam Yam only */
- AM_RANGE(0xc014, 0xc014) AM_WRITE_LEGACY(gundealr_flipscreen_w)
+ AM_RANGE(0xc010, 0xc013) AM_WRITE(yamyam_fg_scroll_w) /* Yam Yam only */
+ AM_RANGE(0xc014, 0xc014) AM_WRITE(gundealr_flipscreen_w)
AM_RANGE(0xc016, 0xc016) AM_WRITE(yamyam_bankswitch_w)
- AM_RANGE(0xc020, 0xc023) AM_WRITE_LEGACY(gundealr_fg_scroll_w) /* Gun Dealer only */
- AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE_LEGACY(gundealr_paletteram_w) AM_BASE(m_paletteram)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(gundealr_bg_videoram_w) AM_BASE(m_bg_videoram)
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(gundealr_fg_videoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0xc020, 0xc023) AM_WRITE(gundealr_fg_scroll_w) /* Gun Dealer only */
+ AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(gundealr_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(gundealr_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(gundealr_fg_videoram_w) AM_BASE(m_fg_videoram)
AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE(m_rambase)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c
index 8e73d4d098a..96899cd2566 100644
--- a/src/mame/drivers/gunsmoke.c
+++ b/src/mame/drivers/gunsmoke.c
@@ -107,13 +107,13 @@ static ADDRESS_MAP_START( gunsmoke_map, AS_PROGRAM, 8, gunsmoke_state )
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSW2")
AM_RANGE(0xc4c9, 0xc4cb) AM_READ(gunsmoke_protection_r)
AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w)
- AM_RANGE(0xc804, 0xc804) AM_WRITE_LEGACY(gunsmoke_c804_w) // ROM bank switch, screen flip
+ AM_RANGE(0xc804, 0xc804) AM_WRITE(gunsmoke_c804_w) // ROM bank switch, screen flip
AM_RANGE(0xc806, 0xc806) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(gunsmoke_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE_LEGACY(gunsmoke_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(gunsmoke_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(gunsmoke_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xd800, 0xd801) AM_RAM AM_BASE(m_scrollx)
AM_RANGE(0xd802, 0xd802) AM_RAM AM_BASE(m_scrolly)
- AM_RANGE(0xd806, 0xd806) AM_WRITE_LEGACY(gunsmoke_d806_w) // sprites and bg enable
+ AM_RANGE(0xd806, 0xd806) AM_WRITE(gunsmoke_d806_w) // sprites and bg enable
AM_RANGE(0xe000, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index 957d0d038e5..46974125fd4 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -170,10 +170,10 @@ static ADDRESS_MAP_START( main_cpu1_map, AS_PROGRAM, 8, gyruss_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( main_cpu2_map, AS_PROGRAM, 8, gyruss_state )
- AM_RANGE(0x0000, 0x0000) AM_READ_LEGACY(gyruss_scanline_r)
+ AM_RANGE(0x0000, 0x0000) AM_READ(gyruss_scanline_r)
AM_RANGE(0x2000, 0x2000) AM_WRITE(slave_irq_mask_w)
AM_RANGE(0x4000, 0x403f) AM_RAM
- AM_RANGE(0x4040, 0x40ff) AM_RAM_WRITE_LEGACY(gyruss_spriteram_w) AM_BASE(m_spriteram)
+ AM_RANGE(0x4040, 0x40ff) AM_RAM_WRITE(gyruss_spriteram_w) AM_BASE(m_spriteram)
AM_RANGE(0x4100, 0x47ff) AM_RAM
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xe000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c
index 4d655148ddc..7894dfe6bec 100644
--- a/src/mame/drivers/hanaawas.c
+++ b/src/mame/drivers/hanaawas.c
@@ -72,8 +72,8 @@ static ADDRESS_MAP_START( hanaawas_map, AS_PROGRAM, 8, hanaawas_state )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_ROM
- AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE_LEGACY(hanaawas_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE_LEGACY(hanaawas_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(hanaawas_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(hanaawas_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x8800, 0x8bff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index 2411dec21f2..53071113ee3 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -36,9 +36,9 @@ WRITE8_MEMBER(hcastle_state::hcastle_coin_w)
static ADDRESS_MAP_START( hcastle_map, AS_PROGRAM, 8, hcastle_state )
- AM_RANGE(0x0000, 0x0007) AM_WRITE_LEGACY(hcastle_pf1_control_w)
+ AM_RANGE(0x0000, 0x0007) AM_WRITE(hcastle_pf1_control_w)
AM_RANGE(0x0020, 0x003f) AM_RAM /* rowscroll? */
- AM_RANGE(0x0200, 0x0207) AM_WRITE_LEGACY(hcastle_pf2_control_w)
+ AM_RANGE(0x0200, 0x0207) AM_WRITE(hcastle_pf2_control_w)
AM_RANGE(0x0220, 0x023f) AM_RAM /* rowscroll? */
AM_RANGE(0x0400, 0x0400) AM_WRITE(hcastle_bankswitch_w)
AM_RANGE(0x0404, 0x0404) AM_WRITE(soundlatch_w)
@@ -50,12 +50,12 @@ static ADDRESS_MAP_START( hcastle_map, AS_PROGRAM, 8, hcastle_state )
AM_RANGE(0x0413, 0x0413) AM_READ_PORT("DSW3")
AM_RANGE(0x0414, 0x0414) AM_READ_PORT("DSW1")
AM_RANGE(0x0415, 0x0415) AM_READ_PORT("DSW2")
- AM_RANGE(0x0418, 0x0418) AM_READWRITE_LEGACY(hcastle_gfxbank_r, hcastle_gfxbank_w)
+ AM_RANGE(0x0418, 0x0418) AM_READWRITE(hcastle_gfxbank_r, hcastle_gfxbank_w)
AM_RANGE(0x0600, 0x06ff) AM_RAM AM_BASE(m_paletteram)
AM_RANGE(0x0700, 0x1fff) AM_RAM
- AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE_LEGACY(hcastle_pf1_video_w) AM_BASE(m_pf1_videoram)
+ AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE(hcastle_pf1_video_w) AM_BASE(m_pf1_videoram)
AM_RANGE(0x3000, 0x3fff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x4000, 0x4fff) AM_RAM_WRITE_LEGACY(hcastle_pf2_video_w) AM_BASE(m_pf2_videoram)
+ AM_RANGE(0x4000, 0x4fff) AM_RAM_WRITE(hcastle_pf2_video_w) AM_BASE(m_pf2_videoram)
AM_RANGE(0x5000, 0x5fff) AM_RAM AM_SHARE("spriteram2")
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index 81c07949d7d..5e98037f86f 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -116,8 +116,8 @@ static ADDRESS_MAP_START( hexion_map, AS_PROGRAM, 8, hexion_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xbfff) AM_RAM
- AM_RANGE(0xc000, 0xdffe) AM_READWRITE_LEGACY(hexion_bankedram_r, hexion_bankedram_w)
- AM_RANGE(0xdfff, 0xdfff) AM_WRITE_LEGACY(hexion_bankctrl_w)
+ AM_RANGE(0xc000, 0xdffe) AM_READWRITE(hexion_bankedram_r, hexion_bankedram_w)
+ AM_RANGE(0xdfff, 0xdfff) AM_WRITE(hexion_bankctrl_w)
AM_RANGE(0xe800, 0xe87f) AM_DEVREADWRITE_LEGACY("konami", k051649_waveform_r, k051649_waveform_w)
AM_RANGE(0xe880, 0xe889) AM_DEVWRITE_LEGACY("konami", k051649_frequency_w)
AM_RANGE(0xe88a, 0xe88e) AM_DEVWRITE_LEGACY("konami", k051649_volume_w)
@@ -131,9 +131,9 @@ static ADDRESS_MAP_START( hexion_map, AS_PROGRAM, 8, hexion_state )
AM_RANGE(0xf403, 0xf403) AM_READ_PORT("P2")
AM_RANGE(0xf440, 0xf440) AM_READ_PORT("DSW3")
AM_RANGE(0xf441, 0xf441) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xf480, 0xf480) AM_WRITE_LEGACY(hexion_bankswitch_w)
+ AM_RANGE(0xf480, 0xf480) AM_WRITE(hexion_bankswitch_w)
AM_RANGE(0xf4c0, 0xf4c0) AM_WRITE(coincntr_w)
- AM_RANGE(0xf500, 0xf500) AM_WRITE_LEGACY(hexion_gfxrom_select_w)
+ AM_RANGE(0xf500, 0xf500) AM_WRITE(hexion_gfxrom_select_w)
AM_RANGE(0xf540, 0xf540) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c
index ed16402d52b..cc2e8b23340 100644
--- a/src/mame/drivers/higemaru.c
+++ b/src/mame/drivers/higemaru.c
@@ -35,11 +35,11 @@ static ADDRESS_MAP_START( higemaru_map, AS_PROGRAM, 8, higemaru_state )
AM_RANGE(0xc002, 0xc002) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW1")
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSW2")
- AM_RANGE(0xc800, 0xc800) AM_WRITE_LEGACY(higemaru_c800_w)
+ AM_RANGE(0xc800, 0xc800) AM_WRITE(higemaru_c800_w)
AM_RANGE(0xc801, 0xc802) AM_DEVWRITE_LEGACY("ay1", ay8910_address_data_w)
AM_RANGE(0xc803, 0xc804) AM_DEVWRITE_LEGACY("ay2", ay8910_address_data_w)
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(higemaru_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE_LEGACY(higemaru_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(higemaru_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(higemaru_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xd880, 0xd9ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c
index 2acda7072f7..7f761fa75fc 100644
--- a/src/mame/drivers/himesiki.c
+++ b/src/mame/drivers/himesiki.c
@@ -110,7 +110,7 @@ static ADDRESS_MAP_START( himesiki_prm0, AS_PROGRAM, 8, himesiki_state )
AM_RANGE(0x8000, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
- AM_RANGE(0xb000, 0xbfff) AM_RAM_WRITE_LEGACY(himesiki_bg_ram_w) AM_BASE(m_bg_ram)
+ AM_RANGE(0xb000, 0xbfff) AM_RAM_WRITE(himesiki_bg_ram_w) AM_BASE(m_bg_ram)
AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
@@ -124,8 +124,8 @@ static ADDRESS_MAP_START( himesiki_iom0, AS_IO, 8, himesiki_state )
AM_RANGE(0x05, 0x05) AM_READ_PORT("DSW2")
AM_RANGE(0x06, 0x06) AM_WRITE(himesiki_rombank_w)
AM_RANGE(0x07, 0x07) AM_WRITENOP // 8255 cw
- AM_RANGE(0x08, 0x08) AM_WRITE_LEGACY(himesiki_flip_w)
- AM_RANGE(0x09, 0x0a) AM_WRITE_LEGACY(himesiki_scrollx_w)
+ AM_RANGE(0x08, 0x08) AM_WRITE(himesiki_flip_w)
+ AM_RANGE(0x09, 0x0a) AM_WRITE(himesiki_scrollx_w)
AM_RANGE(0x0b, 0x0b) AM_WRITE(himesiki_sound_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c
index d3dd2689934..e21e24e7d70 100644
--- a/src/mame/drivers/hnayayoi.c
+++ b/src/mame/drivers/hnayayoi.c
@@ -102,16 +102,16 @@ static ADDRESS_MAP_START( hnayayoi_io_map, AS_IO, 8, hnayayoi_state )
AM_RANGE(0x06, 0x06) AM_DEVWRITE_LEGACY("msm", adpcm_data_w)
// AM_RANGE(0x08, 0x08) AM_WRITENOP // CRT Controller
// AM_RANGE(0x09, 0x09) AM_WRITENOP // CRT Controller
- AM_RANGE(0x0a, 0x0a) AM_WRITE_LEGACY(dynax_blitter_rev1_start_w)
- AM_RANGE(0x0c, 0x0c) AM_WRITE_LEGACY(dynax_blitter_rev1_clear_w)
+ AM_RANGE(0x0a, 0x0a) AM_WRITE(dynax_blitter_rev1_start_w)
+ AM_RANGE(0x0c, 0x0c) AM_WRITE(dynax_blitter_rev1_clear_w)
AM_RANGE(0x23, 0x23) AM_DEVWRITE_LEGACY("msm", adpcm_vclk_w)
AM_RANGE(0x24, 0x24) AM_DEVWRITE_LEGACY("msm", adpcm_reset_w)
AM_RANGE(0x40, 0x40) AM_WRITE(keyboard_w)
AM_RANGE(0x41, 0x41) AM_READ(keyboard_0_r)
AM_RANGE(0x42, 0x42) AM_READ(keyboard_1_r)
AM_RANGE(0x43, 0x43) AM_READ_PORT("COIN")
- AM_RANGE(0x60, 0x61) AM_WRITE_LEGACY(hnayayoi_palbank_w)
- AM_RANGE(0x62, 0x67) AM_WRITE_LEGACY(dynax_blitter_rev1_param_w)
+ AM_RANGE(0x60, 0x61) AM_WRITE(hnayayoi_palbank_w)
+ AM_RANGE(0x62, 0x67) AM_WRITE(dynax_blitter_rev1_param_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( hnfubuki_map, AS_PROGRAM, 8, hnayayoi_state )
@@ -124,16 +124,16 @@ static ADDRESS_MAP_START( hnfubuki_map, AS_PROGRAM, 8, hnayayoi_state )
AM_RANGE(0xff06, 0xff06) AM_DEVWRITE_LEGACY("msm", adpcm_data_w)
// AM_RANGE(0xff08, 0xff08) AM_WRITENOP // CRT Controller
// AM_RANGE(0xff09, 0xff09) AM_WRITENOP // CRT Controller
- AM_RANGE(0xff0a, 0xff0a) AM_WRITE_LEGACY(dynax_blitter_rev1_start_w)
- AM_RANGE(0xff0c, 0xff0c) AM_WRITE_LEGACY(dynax_blitter_rev1_clear_w)
+ AM_RANGE(0xff0a, 0xff0a) AM_WRITE(dynax_blitter_rev1_start_w)
+ AM_RANGE(0xff0c, 0xff0c) AM_WRITE(dynax_blitter_rev1_clear_w)
AM_RANGE(0xff23, 0xff23) AM_DEVWRITE_LEGACY("msm", adpcm_vclk_w)
AM_RANGE(0xff24, 0xff24) AM_DEVWRITE_LEGACY("msm", adpcm_reset_inv_w)
AM_RANGE(0xff40, 0xff40) AM_WRITE(keyboard_w)
AM_RANGE(0xff41, 0xff41) AM_READ(keyboard_0_r)
AM_RANGE(0xff42, 0xff42) AM_READ(keyboard_1_r)
AM_RANGE(0xff43, 0xff43) AM_READ_PORT("COIN")
- AM_RANGE(0xff60, 0xff61) AM_WRITE_LEGACY(hnayayoi_palbank_w)
- AM_RANGE(0xff62, 0xff67) AM_WRITE_LEGACY(dynax_blitter_rev1_param_w)
+ AM_RANGE(0xff60, 0xff61) AM_WRITE(hnayayoi_palbank_w)
+ AM_RANGE(0xff62, 0xff67) AM_WRITE(dynax_blitter_rev1_param_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( untoucha_map, AS_PROGRAM, 8, hnayayoi_state )
@@ -152,10 +152,10 @@ static ADDRESS_MAP_START( untoucha_io_map, AS_IO, 8, hnayayoi_state )
AM_RANGE(0x15, 0x15) AM_READ(keyboard_1_r)
AM_RANGE(0x16, 0x16) AM_READ(keyboard_0_r) // bit 7 = blitter busy flag
AM_RANGE(0x17, 0x17) AM_WRITE(keyboard_w)
- AM_RANGE(0x18, 0x19) AM_WRITE_LEGACY(hnayayoi_palbank_w)
- AM_RANGE(0x1a, 0x1f) AM_WRITE_LEGACY(dynax_blitter_rev1_param_w)
- AM_RANGE(0x20, 0x20) AM_WRITE_LEGACY(dynax_blitter_rev1_clear_w)
- AM_RANGE(0x28, 0x28) AM_WRITE_LEGACY(dynax_blitter_rev1_start_w)
+ AM_RANGE(0x18, 0x19) AM_WRITE(hnayayoi_palbank_w)
+ AM_RANGE(0x1a, 0x1f) AM_WRITE(dynax_blitter_rev1_param_w)
+ AM_RANGE(0x20, 0x20) AM_WRITE(dynax_blitter_rev1_clear_w)
+ AM_RANGE(0x28, 0x28) AM_WRITE(dynax_blitter_rev1_start_w)
AM_RANGE(0x31, 0x31) AM_DEVWRITE_LEGACY("msm", adpcm_vclk_w)
AM_RANGE(0x32, 0x32) AM_DEVWRITE_LEGACY("msm", adpcm_reset_inv_w)
AM_RANGE(0x50, 0x50) AM_DEVWRITE_LEGACY("ymsnd", ym2203_write_port_w)
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index 8eaddaf5649..4bfae63a81a 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -1048,7 +1048,7 @@ static ADDRESS_MAP_START( hng_map, AS_PROGRAM, 32, hng64_state )
AM_RANGE(0x2000d800, 0x2000e3ff) AM_WRITE(hng64_sprite_clear_even_w)
AM_RANGE(0x2000e400, 0x2000efff) AM_WRITE(hng64_sprite_clear_odd_w)
AM_RANGE(0x20010000, 0x20010013) AM_RAM AM_BASE(m_spriteregs)
- AM_RANGE(0x20100000, 0x2017ffff) AM_RAM_WRITE_LEGACY(hng64_videoram_w) AM_BASE(m_videoram) // Tilemap
+ AM_RANGE(0x20100000, 0x2017ffff) AM_RAM_WRITE(hng64_videoram_w) AM_BASE(m_videoram) // Tilemap
AM_RANGE(0x20190000, 0x20190037) AM_RAM AM_BASE(m_videoregs)
AM_RANGE(0x20200000, 0x20203fff) AM_RAM_WRITE(hng64_pal_w) AM_SHARE("paletteram")
AM_RANGE(0x20208000, 0x2020805f) AM_READWRITE(tcram_r, tcram_w) AM_BASE(m_tcram) // Transition Control
diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c
index 5b46148f939..d56c9b18d5a 100644
--- a/src/mame/drivers/holeland.c
+++ b/src/mame/drivers/holeland.c
@@ -22,21 +22,21 @@ static ADDRESS_MAP_START( holeland_map, AS_PROGRAM, 8, holeland_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc001) AM_WRITE_LEGACY(holeland_pal_offs_w)
- AM_RANGE(0xc006, 0xc007) AM_WRITE_LEGACY(holeland_flipscreen_w)
- AM_RANGE(0xe000, 0xe3ff) AM_WRITE_LEGACY(holeland_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xe400, 0xe7ff) AM_WRITE_LEGACY(holeland_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xc000, 0xc001) AM_WRITE(holeland_pal_offs_w)
+ AM_RANGE(0xc006, 0xc007) AM_WRITE(holeland_flipscreen_w)
+ AM_RANGE(0xe000, 0xe3ff) AM_WRITE(holeland_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xe400, 0xe7ff) AM_WRITE(holeland_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xf000, 0xf3ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
ADDRESS_MAP_END
static ADDRESS_MAP_START( crzrally_map, AS_PROGRAM, 8, holeland_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0xe000, 0xe3ff) AM_WRITE_LEGACY(holeland_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xe400, 0xe7ff) AM_WRITE_LEGACY(holeland_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xe000, 0xe3ff) AM_WRITE(holeland_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xe400, 0xe7ff) AM_WRITE(holeland_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xe800, 0xebff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xf000, 0xf000) AM_WRITE_LEGACY(holeland_scroll_w)
- AM_RANGE(0xf800, 0xf801) AM_WRITE_LEGACY(holeland_pal_offs_w)
+ AM_RANGE(0xf000, 0xf000) AM_WRITE(holeland_scroll_w)
+ AM_RANGE(0xf800, 0xf801) AM_WRITE(holeland_pal_offs_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( io_map, AS_IO, 8, holeland_state )
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index 604e6fce3b4..ef8ef6d2d92 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -523,7 +523,7 @@ WRITE8_MEMBER(homedata_state::bankswitch_w)
static ADDRESS_MAP_START( mrokumei_map, AS_PROGRAM, 8, homedata_state )
- AM_RANGE(0x0000, 0x3fff) AM_RAM_WRITE_LEGACY(mrokumei_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0000, 0x3fff) AM_RAM_WRITE(mrokumei_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4000, 0x5fff) AM_RAM
AM_RANGE(0x6000, 0x6fff) AM_RAM /* work ram */
AM_RANGE(0x7000, 0x77ff) AM_RAM /* hourouki expects this to act as RAM */
@@ -534,12 +534,12 @@ static ADDRESS_MAP_START( mrokumei_map, AS_PROGRAM, 8, homedata_state )
AM_RANGE(0x7805, 0x7805) AM_READ_PORT("DSW2") // DSW2
AM_RANGE(0x7ff0, 0x7ffd) AM_WRITEONLY AM_BASE(m_vreg)
AM_RANGE(0x7ffe, 0x7ffe) AM_READNOP // ??? read every vblank, value discarded
- AM_RANGE(0x8000, 0x8000) AM_WRITE_LEGACY(mrokumei_blitter_start_w) // in some games also ROM bank switch to access service ROM
+ AM_RANGE(0x8000, 0x8000) AM_WRITE(mrokumei_blitter_start_w) // in some games also ROM bank switch to access service ROM
AM_RANGE(0x8001, 0x8001) AM_WRITE(mrokumei_keyboard_select_w)
AM_RANGE(0x8002, 0x8002) AM_WRITE(mrokumei_sound_cmd_w)
AM_RANGE(0x8003, 0x8003) AM_DEVWRITE_LEGACY("snsnd", sn76496_w)
- AM_RANGE(0x8006, 0x8006) AM_WRITE_LEGACY(homedata_blitter_param_w)
- AM_RANGE(0x8007, 0x8007) AM_WRITE_LEGACY(mrokumei_blitter_bank_w)
+ AM_RANGE(0x8006, 0x8006) AM_WRITE(homedata_blitter_param_w)
+ AM_RANGE(0x8007, 0x8007) AM_WRITE(mrokumei_blitter_bank_w)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -557,7 +557,7 @@ ADDRESS_MAP_END
/********************************************************************************/
static ADDRESS_MAP_START( reikaids_map, AS_PROGRAM, 8, homedata_state )
- AM_RANGE(0x0000, 0x3fff) AM_RAM_WRITE_LEGACY(reikaids_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0000, 0x3fff) AM_RAM_WRITE(reikaids_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4000, 0x5fff) AM_RAM
AM_RANGE(0x6000, 0x6fff) AM_RAM /* work RAM */
AM_RANGE(0x7800, 0x7800) AM_RAM /* behaves as normal RAM */
@@ -565,12 +565,12 @@ static ADDRESS_MAP_START( reikaids_map, AS_PROGRAM, 8, homedata_state )
AM_RANGE(0x7802, 0x7802) AM_READ_PORT("IN1")
AM_RANGE(0x7803, 0x7803) AM_READ(reikaids_io_r) // coin, blitter, upd7807
AM_RANGE(0x7ff0, 0x7ffd) AM_WRITEONLY AM_BASE(m_vreg)
- AM_RANGE(0x7ffe, 0x7ffe) AM_WRITE_LEGACY(reikaids_blitter_bank_w)
- AM_RANGE(0x7fff, 0x7fff) AM_WRITE_LEGACY(reikaids_blitter_start_w)
+ AM_RANGE(0x7ffe, 0x7ffe) AM_WRITE(reikaids_blitter_bank_w)
+ AM_RANGE(0x7fff, 0x7fff) AM_WRITE(reikaids_blitter_start_w)
AM_RANGE(0x8000, 0x8000) AM_WRITE(bankswitch_w)
AM_RANGE(0x8002, 0x8002) AM_WRITE(reikaids_snd_command_w)
- AM_RANGE(0x8005, 0x8005) AM_WRITE_LEGACY(reikaids_gfx_bank_w)
- AM_RANGE(0x8006, 0x8006) AM_WRITE_LEGACY(homedata_blitter_param_w)
+ AM_RANGE(0x8005, 0x8005) AM_WRITE(reikaids_gfx_bank_w)
+ AM_RANGE(0x8006, 0x8006) AM_WRITE(homedata_blitter_param_w)
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -591,7 +591,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pteacher_map, AS_PROGRAM, 8, homedata_state )
- AM_RANGE(0x0000, 0x3fff) AM_RAM_WRITE_LEGACY(mrokumei_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0000, 0x3fff) AM_RAM_WRITE(mrokumei_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4000, 0x5eff) AM_RAM
AM_RANGE(0x5f00, 0x5fff) AM_RAM
AM_RANGE(0x6000, 0x6fff) AM_RAM /* work ram */
@@ -599,12 +599,12 @@ static ADDRESS_MAP_START( pteacher_map, AS_PROGRAM, 8, homedata_state )
AM_RANGE(0x7801, 0x7801) AM_READ(pteacher_io_r) // vblank, visible page
AM_RANGE(0x7ff2, 0x7ff2) AM_READ(pteacher_snd_r)
AM_RANGE(0x7ff0, 0x7ffd) AM_WRITEONLY AM_BASE(m_vreg)
- AM_RANGE(0x7fff, 0x7fff) AM_WRITE_LEGACY(pteacher_blitter_start_w)
+ AM_RANGE(0x7fff, 0x7fff) AM_WRITE(pteacher_blitter_start_w)
AM_RANGE(0x8000, 0x8000) AM_WRITE(bankswitch_w)
AM_RANGE(0x8002, 0x8002) AM_WRITE(pteacher_snd_command_w)
- AM_RANGE(0x8005, 0x8005) AM_WRITE_LEGACY(pteacher_blitter_bank_w)
- AM_RANGE(0x8006, 0x8006) AM_WRITE_LEGACY(homedata_blitter_param_w)
- AM_RANGE(0x8007, 0x8007) AM_WRITE_LEGACY(pteacher_gfx_bank_w)
+ AM_RANGE(0x8005, 0x8005) AM_WRITE(pteacher_blitter_bank_w)
+ AM_RANGE(0x8006, 0x8006) AM_WRITE(homedata_blitter_param_w)
+ AM_RANGE(0x8007, 0x8007) AM_WRITE(pteacher_gfx_bank_w)
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -1437,7 +1437,7 @@ WRITE8_MEMBER(homedata_state::mirderby_prot_w)
static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8, homedata_state )
- AM_RANGE(0x0000, 0x3fff) AM_RAM_WRITE_LEGACY(mrokumei_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0000, 0x3fff) AM_RAM_WRITE(mrokumei_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4000, 0x5fff) AM_RAM
AM_RANGE(0x6000, 0x6fff) AM_RAM /* work ram */
AM_RANGE(0x7000, 0x77ff) AM_RAM
@@ -2006,8 +2006,9 @@ static DRIVER_INIT( jogakuen )
/* it seems that Mahjong Jogakuen runs on the same board as the others,
but with just these two addresses swapped. Instead of creating a new
MachineDriver, I just fix them here. */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8007, 0x8007, FUNC(pteacher_blitter_bank_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8005, 0x8005, FUNC(pteacher_gfx_bank_w));
+ homedata_state *state = machine.driver_data<homedata_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8007, 0x8007, write8_delegate(FUNC(homedata_state::pteacher_blitter_bank_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8005, 0x8005, write8_delegate(FUNC(homedata_state::pteacher_gfx_bank_w),state));
}
static DRIVER_INIT( mjikaga )
diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c
index 8485af0edb3..2728052eab3 100644
--- a/src/mame/drivers/homerun.c
+++ b/src/mame/drivers/homerun.c
@@ -56,9 +56,9 @@ static const ppi8255_interface ppi8255_intf =
static ADDRESS_MAP_START( homerun_memmap, AS_PROGRAM, 8, homerun_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
- AM_RANGE(0x8000, 0x9fff) AM_RAM_WRITE_LEGACY(homerun_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8000, 0x9fff) AM_RAM_WRITE(homerun_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xa000, 0xa0ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xb000, 0xb0ff) AM_WRITE_LEGACY(homerun_color_w)
+ AM_RANGE(0xb000, 0xb0ff) AM_WRITE(homerun_color_w)
AM_RANGE(0xc000, 0xdfff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index ae65be45f5f..b069fe3ecf5 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -60,12 +60,12 @@ static ADDRESS_MAP_START( hyhoo_io_map, AS_IO, 8, hyhoo_state )
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("aysnd", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x90, 0x97) AM_WRITE_LEGACY(hyhoo_blitter_w)
+ AM_RANGE(0x90, 0x97) AM_WRITE(hyhoo_blitter_w)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r, nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r, nb1413m3_sndrombank1_w)
AM_RANGE(0xc0, 0xcf) AM_WRITEONLY AM_BASE(m_clut)
AM_RANGE(0xd0, 0xd0) AM_READNOP AM_DEVWRITE_LEGACY("dac", DAC_WRITE) // unknown read
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(hyhoo_romsel_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(hyhoo_romsel_w)
AM_RANGE(0xe0, 0xe1) AM_READ_LEGACY(nb1413m3_gfxrom_r)
AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r)
// AM_RANGE(0xf0, 0xf0) AM_WRITENOP
diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c
index 20f61bac406..f095b78713f 100644
--- a/src/mame/drivers/hyperspt.c
+++ b/src/mame/drivers/hyperspt.c
@@ -36,7 +36,7 @@ static ADDRESS_MAP_START( hyperspt_map, AS_PROGRAM, 8, hyperspt_state )
AM_RANGE(0x1000, 0x10bf) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x10c0, 0x10ff) AM_RAM AM_BASE(m_scroll) /* Scroll amount */
AM_RANGE(0x1400, 0x1400) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x1480, 0x1480) AM_WRITE_LEGACY(hyperspt_flipscreen_w)
+ AM_RANGE(0x1480, 0x1480) AM_WRITE(hyperspt_flipscreen_w)
AM_RANGE(0x1481, 0x1481) AM_WRITE_LEGACY(konami_sh_irqtrigger_w) /* cause interrupt on audio CPU */
AM_RANGE(0x1483, 0x1484) AM_WRITE(hyperspt_coin_counter_w)
AM_RANGE(0x1487, 0x1487) AM_WRITE(irq_mask_w) /* Interrupt enable */
@@ -46,8 +46,8 @@ static ADDRESS_MAP_START( hyperspt_map, AS_PROGRAM, 8, hyperspt_state )
AM_RANGE(0x1681, 0x1681) AM_READ_PORT("P1_P2")
AM_RANGE(0x1682, 0x1682) AM_READ_PORT("P3_P4")
AM_RANGE(0x1683, 0x1683) AM_READ_PORT("DSW1")
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(hyperspt_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE_LEGACY(hyperspt_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(hyperspt_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(hyperspt_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x3000, 0x37ff) AM_RAM
AM_RANGE(0x3800, 0x3fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x4000, 0xffff) AM_ROM
@@ -57,7 +57,7 @@ static ADDRESS_MAP_START( roadf_map, AS_PROGRAM, 8, hyperspt_state )
AM_RANGE(0x1000, 0x10bf) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x10c0, 0x10ff) AM_RAM AM_BASE(m_scroll) /* Scroll amount */
AM_RANGE(0x1400, 0x1400) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x1480, 0x1480) AM_WRITE_LEGACY(hyperspt_flipscreen_w)
+ AM_RANGE(0x1480, 0x1480) AM_WRITE(hyperspt_flipscreen_w)
AM_RANGE(0x1481, 0x1481) AM_WRITE_LEGACY(konami_sh_irqtrigger_w) /* cause interrupt on audio CPU */
AM_RANGE(0x1483, 0x1484) AM_WRITE(hyperspt_coin_counter_w)
AM_RANGE(0x1487, 0x1487) AM_WRITE(irq_mask_w) /* Interrupt enable */
@@ -67,8 +67,8 @@ static ADDRESS_MAP_START( roadf_map, AS_PROGRAM, 8, hyperspt_state )
AM_RANGE(0x1681, 0x1681) AM_READ_PORT("P1")
AM_RANGE(0x1682, 0x1682) AM_READ_PORT("P2")
AM_RANGE(0x1683, 0x1683) AM_READ_PORT("DSW1")
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(hyperspt_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE_LEGACY(hyperspt_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(hyperspt_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(hyperspt_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x3000, 0x37ff) AM_RAM
AM_RANGE(0x3800, 0x3fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x4000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index d864ee9c4a0..15e019b8cc9 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -268,13 +268,13 @@ INLINE int blt_read( const UINT8 *ROM, const int offs )
return ROM[offs];
}
-INLINE void blt_write( address_space *space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask )
+void hyprduel_state::blt_write( address_space *space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask )
{
switch( tmap )
{
- case 1: hyprduel_vram_0_w(space,offs,data,mask); break;
- case 2: hyprduel_vram_1_w(space, offs, data, mask); break;
- case 3: hyprduel_vram_2_w(space, offs, data, mask); break;
+ case 1: hyprduel_vram_0_w(*space, offs,data,mask); break;
+ case 2: hyprduel_vram_1_w(*space, offs, data, mask); break;
+ case 3: hyprduel_vram_2_w(*space, offs, data, mask); break;
}
// logerror("%s : Blitter %X] %04X <- %04X & %04X\n", space->machine().describe_context(), tmap, offs, data, mask);
}
@@ -415,18 +415,18 @@ WRITE16_MEMBER(hyprduel_state::hyprduel_blitter_w)
static ADDRESS_MAP_START( hyprduel_map, AS_PROGRAM, 16, hyprduel_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE_LEGACY(hyprduel_vram_0_w) AM_BASE(m_vram_0) /* Layer 0 */
- AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE_LEGACY(hyprduel_vram_1_w) AM_BASE(m_vram_1) /* Layer 1 */
- AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE_LEGACY(hyprduel_vram_2_w) AM_BASE(m_vram_2) /* Layer 2 */
+ AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE(hyprduel_vram_0_w) AM_BASE(m_vram_0) /* Layer 0 */
+ AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE(hyprduel_vram_1_w) AM_BASE(m_vram_1) /* Layer 1 */
+ AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE(hyprduel_vram_2_w) AM_BASE(m_vram_2) /* Layer 2 */
AM_RANGE(0x460000, 0x46ffff) AM_READ(hyprduel_bankedrom_r) /* Banked ROM */
- AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE_LEGACY(hyprduel_paletteram_w) AM_BASE(m_paletteram) /* Palette */
+ AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE(hyprduel_paletteram_w) AM_BASE(m_paletteram) /* Palette */
AM_RANGE(0x474000, 0x474fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* Sprites */
AM_RANGE(0x475000, 0x477fff) AM_RAM /* only used memory test */
AM_RANGE(0x478000, 0x4787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) /* Tiles Set */
AM_RANGE(0x478840, 0x47884d) AM_WRITE(hyprduel_blitter_w) AM_BASE(m_blitter_regs) /* Tiles Blitter */
- AM_RANGE(0x478860, 0x47886b) AM_WRITE_LEGACY(hyprduel_window_w) AM_BASE(m_window) /* Tilemap Window */
- AM_RANGE(0x478870, 0x47887b) AM_RAM_WRITE_LEGACY(hyprduel_scrollreg_w) AM_BASE(m_scroll) /* Scroll Regs */
- AM_RANGE(0x47887c, 0x47887d) AM_WRITE_LEGACY(hyprduel_scrollreg_init_w)
+ AM_RANGE(0x478860, 0x47886b) AM_WRITE(hyprduel_window_w) AM_BASE(m_window) /* Tilemap Window */
+ AM_RANGE(0x478870, 0x47887b) AM_RAM_WRITE(hyprduel_scrollreg_w) AM_BASE(m_scroll) /* Scroll Regs */
+ AM_RANGE(0x47887c, 0x47887d) AM_WRITE(hyprduel_scrollreg_init_w)
AM_RANGE(0x478880, 0x478881) AM_WRITENOP
AM_RANGE(0x478890, 0x478891) AM_WRITENOP
AM_RANGE(0x4788a0, 0x4788a1) AM_WRITENOP
@@ -462,18 +462,18 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( magerror_map, AS_PROGRAM, 16, hyprduel_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x400000, 0x400001) AM_WRITE(hyprduel_subcpu_control_w)
- AM_RANGE(0x800000, 0x81ffff) AM_RAM_WRITE_LEGACY(hyprduel_vram_0_w) AM_BASE(m_vram_0) /* Layer 0 */
- AM_RANGE(0x820000, 0x83ffff) AM_RAM_WRITE_LEGACY(hyprduel_vram_1_w) AM_BASE(m_vram_1) /* Layer 1 */
- AM_RANGE(0x840000, 0x85ffff) AM_RAM_WRITE_LEGACY(hyprduel_vram_2_w) AM_BASE(m_vram_2) /* Layer 2 */
+ AM_RANGE(0x800000, 0x81ffff) AM_RAM_WRITE(hyprduel_vram_0_w) AM_BASE(m_vram_0) /* Layer 0 */
+ AM_RANGE(0x820000, 0x83ffff) AM_RAM_WRITE(hyprduel_vram_1_w) AM_BASE(m_vram_1) /* Layer 1 */
+ AM_RANGE(0x840000, 0x85ffff) AM_RAM_WRITE(hyprduel_vram_2_w) AM_BASE(m_vram_2) /* Layer 2 */
AM_RANGE(0x860000, 0x86ffff) AM_READ(hyprduel_bankedrom_r) /* Banked ROM */
- AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE_LEGACY(hyprduel_paletteram_w) AM_BASE(m_paletteram) /* Palette */
+ AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(hyprduel_paletteram_w) AM_BASE(m_paletteram) /* Palette */
AM_RANGE(0x874000, 0x874fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* Sprites */
AM_RANGE(0x875000, 0x877fff) AM_RAM /* only used memory test */
AM_RANGE(0x878000, 0x8787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) /* Tiles Set */
AM_RANGE(0x878840, 0x87884d) AM_WRITE(hyprduel_blitter_w) AM_BASE(m_blitter_regs) /* Tiles Blitter */
- AM_RANGE(0x878860, 0x87886b) AM_WRITE_LEGACY(hyprduel_window_w) AM_BASE(m_window) /* Tilemap Window */
- AM_RANGE(0x878870, 0x87887b) AM_RAM_WRITE_LEGACY(hyprduel_scrollreg_w) AM_BASE(m_scroll) /* Scroll Regs */
- AM_RANGE(0x87887c, 0x87887d) AM_WRITE_LEGACY(hyprduel_scrollreg_init_w)
+ AM_RANGE(0x878860, 0x87886b) AM_WRITE(hyprduel_window_w) AM_BASE(m_window) /* Tilemap Window */
+ AM_RANGE(0x878870, 0x87887b) AM_RAM_WRITE(hyprduel_scrollreg_w) AM_BASE(m_scroll) /* Scroll Regs */
+ AM_RANGE(0x87887c, 0x87887d) AM_WRITE(hyprduel_scrollreg_init_w)
AM_RANGE(0x878880, 0x878881) AM_WRITENOP
AM_RANGE(0x878890, 0x878891) AM_WRITENOP
AM_RANGE(0x8788a0, 0x8788a1) AM_WRITENOP
diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c
index 2bbd24e647e..c4b19495e31 100644
--- a/src/mame/drivers/ikki.c
+++ b/src/mame/drivers/ikki.c
@@ -55,7 +55,7 @@ static ADDRESS_MAP_START( ikki_cpu1, AS_PROGRAM, 8, ikki_state )
AM_RANGE(0xe003, 0xe003) AM_READ_PORT("SYSTEM")
AM_RANGE(0xe004, 0xe004) AM_READ_PORT("P1")
AM_RANGE(0xe005, 0xe005) AM_READ_PORT("P2")
- AM_RANGE(0xe008, 0xe008) AM_WRITE_LEGACY(ikki_scrn_ctrl_w)
+ AM_RANGE(0xe008, 0xe008) AM_WRITE(ikki_scrn_ctrl_w)
AM_RANGE(0xe009, 0xe009) AM_WRITE(ikki_coin_counters)
AM_RANGE(0xe00a, 0xe00b) AM_WRITEONLY AM_BASE(m_scroll)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index 90a8b7e5bc7..d474d20d80e 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -142,13 +142,13 @@ static ADDRESS_MAP_START( inufuku_map, AS_PROGRAM, 16, inufuku_state )
AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram16_xGGGGGBBBBBRRRRR_word_w) AM_SHARE("paletteram") // palette ram
AM_RANGE(0x380000, 0x3801ff) AM_WRITEONLY AM_BASE(m_bg_rasterram) // bg raster ram
- AM_RANGE(0x400000, 0x401fff) AM_READWRITE_LEGACY(inufuku_bg_videoram_r, inufuku_bg_videoram_w) AM_BASE(m_bg_videoram) // bg ram
- AM_RANGE(0x402000, 0x403fff) AM_READWRITE_LEGACY(inufuku_tx_videoram_r, inufuku_tx_videoram_w) AM_BASE(m_tx_videoram) // text ram
+ AM_RANGE(0x400000, 0x401fff) AM_READWRITE(inufuku_bg_videoram_r, inufuku_bg_videoram_w) AM_BASE(m_bg_videoram) // bg ram
+ AM_RANGE(0x402000, 0x403fff) AM_READWRITE(inufuku_tx_videoram_r, inufuku_tx_videoram_w) AM_BASE(m_tx_videoram) // text ram
AM_RANGE(0x580000, 0x580fff) AM_RAM AM_BASE_SIZE(m_spriteram1, m_spriteram1_size) // sprite table + sprite attribute
AM_RANGE(0x600000, 0x61ffff) AM_RAM AM_BASE(m_spriteram2) // cell table
- AM_RANGE(0x780000, 0x780013) AM_WRITE_LEGACY(inufuku_palettereg_w) // bg & text palettebank register
- AM_RANGE(0x7a0000, 0x7a0023) AM_WRITE_LEGACY(inufuku_scrollreg_w) // bg & text scroll register
+ AM_RANGE(0x780000, 0x780013) AM_WRITE(inufuku_palettereg_w) // bg & text palettebank register
+ AM_RANGE(0x7a0000, 0x7a0023) AM_WRITE(inufuku_scrollreg_w) // bg & text scroll register
AM_RANGE(0x7e0000, 0x7e0001) AM_WRITENOP // ?
AM_RANGE(0x800000, 0xbfffff) AM_ROM // data rom
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index f7ca6ec5648..5cfe085b2dc 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -133,16 +133,16 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( main_portmap, AS_IO, 8, iqblock_state )
AM_RANGE(0x2000, 0x23ff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w)
AM_RANGE(0x2800, 0x2bff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w)
- AM_RANGE(0x6000, 0x603f) AM_WRITE_LEGACY(iqblock_fgscroll_w)
- AM_RANGE(0x6800, 0x69ff) AM_WRITE_LEGACY(iqblock_fgvideoram_w) /* initialized up to 6fff... bug or larger tilemap? */
- AM_RANGE(0x7000, 0x7fff) AM_WRITE_LEGACY(iqblock_bgvideoram_w)
+ AM_RANGE(0x6000, 0x603f) AM_WRITE(iqblock_fgscroll_w)
+ AM_RANGE(0x6800, 0x69ff) AM_WRITE(iqblock_fgvideoram_w) /* initialized up to 6fff... bug or larger tilemap? */
+ AM_RANGE(0x7000, 0x7fff) AM_WRITE(iqblock_bgvideoram_w)
AM_RANGE(0x5080, 0x5083) AM_DEVWRITE_LEGACY("ppi8255", ppi8255_w)
AM_RANGE(0x5080, 0x5083) AM_DEVREAD_LEGACY("ppi8255", ppi8255_r)
AM_RANGE(0x5090, 0x5090) AM_READ_PORT("SW0")
AM_RANGE(0x50a0, 0x50a0) AM_READ_PORT("SW1")
AM_RANGE(0x50b0, 0x50b1) AM_DEVWRITE_LEGACY("ymsnd", ym2413_w) // UM3567_data_port_0_w
AM_RANGE(0x50c0, 0x50c0) AM_WRITE(iqblock_irqack_w)
- AM_RANGE(0x7000, 0x7fff) AM_READ_LEGACY(iqblock_bgvideoram_r)
+ AM_RANGE(0x7000, 0x7fff) AM_READ(iqblock_bgvideoram_r)
AM_RANGE(0x8000, 0xffff) AM_READ(extrarom_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c
index 0ed64422712..829ea957be2 100644
--- a/src/mame/drivers/irobot.c
+++ b/src/mame/drivers/irobot.c
@@ -129,21 +129,21 @@ static ADDRESS_MAP_START( irobot_map, AS_PROGRAM, 8, irobot_state )
AM_RANGE(0x0800, 0x0fff) AM_RAMBANK("bank2")
AM_RANGE(0x1000, 0x103f) AM_READ_PORT("IN0")
AM_RANGE(0x1040, 0x1040) AM_READ_PORT("IN1")
- AM_RANGE(0x1080, 0x1080) AM_READ_LEGACY(irobot_status_r)
+ AM_RANGE(0x1080, 0x1080) AM_READ(irobot_status_r)
AM_RANGE(0x10c0, 0x10c0) AM_READ_PORT("DSW1")
AM_RANGE(0x1100, 0x1100) AM_WRITE(irobot_clearirq_w)
- AM_RANGE(0x1140, 0x1140) AM_WRITE_LEGACY(irobot_statwr_w)
- AM_RANGE(0x1180, 0x1180) AM_WRITE_LEGACY(irobot_out0_w)
- AM_RANGE(0x11c0, 0x11c0) AM_WRITE_LEGACY(irobot_rom_banksel_w)
+ AM_RANGE(0x1140, 0x1140) AM_WRITE(irobot_statwr_w)
+ AM_RANGE(0x1180, 0x1180) AM_WRITE(irobot_out0_w)
+ AM_RANGE(0x11c0, 0x11c0) AM_WRITE(irobot_rom_banksel_w)
AM_RANGE(0x1200, 0x12ff) AM_RAM_WRITE(irobot_nvram_w) AM_SHARE("nvram")
- AM_RANGE(0x1300, 0x13ff) AM_READ_LEGACY(irobot_control_r)
+ AM_RANGE(0x1300, 0x13ff) AM_READ(irobot_control_r)
AM_RANGE(0x1400, 0x143f) AM_READWRITE_LEGACY(quad_pokey_r, quad_pokey_w)
- AM_RANGE(0x1800, 0x18ff) AM_WRITE_LEGACY(irobot_paletteram_w)
+ AM_RANGE(0x1800, 0x18ff) AM_WRITE(irobot_paletteram_w)
AM_RANGE(0x1900, 0x19ff) AM_WRITEONLY /* Watchdog reset */
AM_RANGE(0x1a00, 0x1a00) AM_WRITE(irobot_clearfirq_w)
- AM_RANGE(0x1b00, 0x1bff) AM_WRITE_LEGACY(irobot_control_w)
+ AM_RANGE(0x1b00, 0x1bff) AM_WRITE(irobot_control_w)
AM_RANGE(0x1c00, 0x1fff) AM_RAM AM_BASE(m_videoram)
- AM_RANGE(0x2000, 0x3fff) AM_READWRITE_LEGACY(irobot_sharedmem_r, irobot_sharedmem_w)
+ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(irobot_sharedmem_r, irobot_sharedmem_w)
AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank1")
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index 0c9b2a022df..67bd03a88cb 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -58,7 +58,7 @@ static WRITE8_DEVICE_HANDLER( ironhors_filter_w )
static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8, ironhors_state )
AM_RANGE(0x0000, 0x0002) AM_RAM
- AM_RANGE(0x0003, 0x0003) AM_RAM_WRITE_LEGACY(ironhors_charbank_w)
+ AM_RANGE(0x0003, 0x0003) AM_RAM_WRITE(ironhors_charbank_w)
AM_RANGE(0x0004, 0x0004) AM_RAM AM_BASE(m_interrupt_enable)
AM_RANGE(0x0005, 0x001f) AM_RAM
AM_RANGE(0x0020, 0x003f) AM_RAM AM_BASE(m_scroll)
@@ -66,16 +66,16 @@ static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8, ironhors_state )
AM_RANGE(0x0060, 0x00df) AM_RAM
AM_RANGE(0x0800, 0x0800) AM_WRITE(soundlatch_w)
AM_RANGE(0x0900, 0x0900) AM_READ_PORT("DSW3") AM_WRITE(ironhors_sh_irqtrigger_w)
- AM_RANGE(0x0a00, 0x0a00) AM_READ_PORT("DSW2") AM_WRITE_LEGACY(ironhors_palettebank_w)
- AM_RANGE(0x0b00, 0x0b00) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(ironhors_flipscreen_w)
+ AM_RANGE(0x0a00, 0x0a00) AM_READ_PORT("DSW2") AM_WRITE(ironhors_palettebank_w)
+ AM_RANGE(0x0b00, 0x0b00) AM_READ_PORT("DSW1") AM_WRITE(ironhors_flipscreen_w)
AM_RANGE(0x0b01, 0x0b01) AM_READ_PORT("P2")
AM_RANGE(0x0b02, 0x0b02) AM_READ_PORT("P1")
AM_RANGE(0x0b03, 0x0b03) AM_READ_PORT("SYSTEM")
AM_RANGE(0x1800, 0x1800) AM_WRITENOP // ???
AM_RANGE(0x1a00, 0x1a01) AM_WRITENOP // ???
AM_RANGE(0x1c00, 0x1dff) AM_WRITENOP // ???
- AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE_LEGACY(ironhors_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x2400, 0x27ff) AM_RAM_WRITE_LEGACY(ironhors_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(ironhors_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x2400, 0x27ff) AM_RAM_WRITE(ironhors_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x2800, 0x2fff) AM_RAM
AM_RANGE(0x3000, 0x30ff) AM_RAM AM_BASE(m_spriteram2)
AM_RANGE(0x3100, 0x37ff) AM_RAM
@@ -105,9 +105,9 @@ static ADDRESS_MAP_START( farwest_master_map, AS_PROGRAM, 8, ironhors_state )
AM_RANGE(0x0060, 0x00ff) AM_RAM
AM_RANGE(0x0800, 0x0800) AM_WRITE(soundlatch_w)
AM_RANGE(0x0900, 0x0900) /*AM_READ_PORT("DSW3") */AM_WRITE(ironhors_sh_irqtrigger_w)
- AM_RANGE(0x0a00, 0x0a00) AM_READ_PORT("DSW2") //AM_WRITE_LEGACY(ironhors_palettebank_w)
- AM_RANGE(0x0b00, 0x0b00) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(ironhors_flipscreen_w)
- AM_RANGE(0x0b01, 0x0b01) AM_READ_PORT("DSW2") //AM_WRITE_LEGACY(ironhors_palettebank_w)
+ AM_RANGE(0x0a00, 0x0a00) AM_READ_PORT("DSW2") //AM_WRITE(ironhors_palettebank_w)
+ AM_RANGE(0x0b00, 0x0b00) AM_READ_PORT("DSW1") AM_WRITE(ironhors_flipscreen_w)
+ AM_RANGE(0x0b01, 0x0b01) AM_READ_PORT("DSW2") //AM_WRITE(ironhors_palettebank_w)
AM_RANGE(0x0b02, 0x0b02) AM_READ_PORT("P1")
AM_RANGE(0x0b03, 0x0b03) AM_READ_PORT("SYSTEM")
@@ -115,12 +115,12 @@ static ADDRESS_MAP_START( farwest_master_map, AS_PROGRAM, 8, ironhors_state )
AM_RANGE(0x1800, 0x1800) AM_WRITE(ironhors_sh_irqtrigger_w)
AM_RANGE(0x1a00, 0x1a00) AM_RAM AM_BASE(m_interrupt_enable)
- AM_RANGE(0x1a01, 0x1a01) AM_RAM_WRITE_LEGACY(ironhors_charbank_w)
- AM_RANGE(0x1a02, 0x1a02) AM_WRITE_LEGACY(ironhors_palettebank_w)
+ AM_RANGE(0x1a01, 0x1a01) AM_RAM_WRITE(ironhors_charbank_w)
+ AM_RANGE(0x1a02, 0x1a02) AM_WRITE(ironhors_palettebank_w)
AM_RANGE(0x0000, 0x1bff) AM_ROM
// AM_RANGE(0x1c00, 0x1fff) AM_RAM
- AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE_LEGACY(ironhors_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x2400, 0x27ff) AM_RAM_WRITE_LEGACY(ironhors_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(ironhors_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x2400, 0x27ff) AM_RAM_WRITE(ironhors_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x2800, 0x2fff) AM_RAM
AM_RANGE(0x1c00, 0x1dff) AM_RAM AM_BASE(m_spriteram2)
AM_RANGE(0x3000, 0x38ff) AM_RAM
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 3050ed28b24..5a6190f54b6 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -903,15 +903,15 @@ static ADDRESS_MAP_START( timekill_map, AS_PROGRAM, 16, itech32_state )
AM_RANGE(0x000000, 0x003fff) AM_RAM AM_BASE(m_main_ram) AM_SHARE("nvram")
AM_RANGE(0x040000, 0x040001) AM_READ_PORT("P1")
AM_RANGE(0x048000, 0x048001) AM_READ_PORT("P2")
- AM_RANGE(0x050000, 0x050001) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(timekill_intensity_w)
+ AM_RANGE(0x050000, 0x050001) AM_READ_PORT("SYSTEM") AM_WRITE(timekill_intensity_w)
AM_RANGE(0x058000, 0x058001) AM_READ_PORT("DIPS") AM_WRITE(watchdog_reset16_w)
- AM_RANGE(0x060000, 0x060001) AM_WRITE_LEGACY(timekill_colora_w)
- AM_RANGE(0x068000, 0x068001) AM_WRITE_LEGACY(timekill_colorbc_w)
+ AM_RANGE(0x060000, 0x060001) AM_WRITE(timekill_colora_w)
+ AM_RANGE(0x068000, 0x068001) AM_WRITE(timekill_colorbc_w)
AM_RANGE(0x070000, 0x070001) AM_WRITENOP /* noisy */
AM_RANGE(0x078000, 0x078001) AM_WRITE(sound_data_w)
- AM_RANGE(0x080000, 0x08007f) AM_READWRITE_LEGACY(itech32_video_r, itech32_video_w) AM_BASE(m_video)
+ AM_RANGE(0x080000, 0x08007f) AM_READWRITE(itech32_video_r, itech32_video_w) AM_BASE(m_video)
AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(int1_ack_w)
- AM_RANGE(0x0c0000, 0x0c7fff) AM_RAM_WRITE_LEGACY(timekill_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c0000, 0x0c7fff) AM_RAM_WRITE(timekill_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x100000, 0x17ffff) AM_ROM AM_REGION("user1", 0) AM_BASE(m_main_rom)
ADDRESS_MAP_END
@@ -924,13 +924,13 @@ static ADDRESS_MAP_START( bloodstm_map, AS_PROGRAM, 16, itech32_state )
AM_RANGE(0x180000, 0x180001) AM_READ_PORT("P3")
AM_RANGE(0x200000, 0x200001) AM_READ_PORT("P4") AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x280000, 0x280001) AM_READ_PORT("DIPS")
- AM_RANGE(0x300000, 0x300001) AM_WRITE_LEGACY(bloodstm_color1_w)
- AM_RANGE(0x380000, 0x380001) AM_WRITE_LEGACY(bloodstm_color2_w)
+ AM_RANGE(0x300000, 0x300001) AM_WRITE(bloodstm_color1_w)
+ AM_RANGE(0x380000, 0x380001) AM_WRITE(bloodstm_color2_w)
AM_RANGE(0x400000, 0x400001) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x480000, 0x480001) AM_WRITE(sound_data_w)
- AM_RANGE(0x500000, 0x5000ff) AM_READWRITE_LEGACY(bloodstm_video_r, bloodstm_video_w) AM_BASE(m_video)
- AM_RANGE(0x580000, 0x59ffff) AM_RAM_WRITE_LEGACY(bloodstm_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0x700000, 0x700001) AM_WRITE_LEGACY(bloodstm_plane_w)
+ AM_RANGE(0x500000, 0x5000ff) AM_READWRITE(bloodstm_video_r, bloodstm_video_w) AM_BASE(m_video)
+ AM_RANGE(0x580000, 0x59ffff) AM_RAM_WRITE(bloodstm_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x700000, 0x700001) AM_WRITE(bloodstm_plane_w)
AM_RANGE(0x780000, 0x780001) AM_READ_PORT("EXTRA")
AM_RANGE(0x800000, 0x87ffff) AM_MIRROR(0x780000) AM_ROM AM_REGION("user1", 0) AM_BASE(m_main_rom)
ADDRESS_MAP_END
@@ -991,11 +991,11 @@ AM_RANGE(0x000c00, 0x007fff) AM_MIRROR(0x40000) AM_READWRITE(test2_r, test2_w)
AM_RANGE(0x08a000, 0x08a003) AM_READ(drivedge_gas_r) AM_WRITENOP
AM_RANGE(0x08c000, 0x08c003) AM_READ_PORT("8c000")
AM_RANGE(0x08e000, 0x08e003) AM_READ_PORT("8e000") AM_WRITENOP
- AM_RANGE(0x100000, 0x10000f) AM_WRITE_LEGACY(drivedge_zbuf_control_w) AM_BASE(m_drivedge_zbuf_control)
- AM_RANGE(0x180000, 0x180003) AM_WRITE_LEGACY(drivedge_color0_w)
- AM_RANGE(0x1a0000, 0x1bffff) AM_RAM_WRITE_LEGACY(drivedge_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x100000, 0x10000f) AM_WRITE(drivedge_zbuf_control_w) AM_BASE(m_drivedge_zbuf_control)
+ AM_RANGE(0x180000, 0x180003) AM_WRITE(drivedge_color0_w)
+ AM_RANGE(0x1a0000, 0x1bffff) AM_RAM_WRITE(drivedge_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x1c0000, 0x1c0003) AM_WRITENOP
- AM_RANGE(0x1e0000, 0x1e0113) AM_READWRITE_LEGACY(itech020_video_r, itech020_video_w) AM_BASE(m_video)
+ AM_RANGE(0x1e0000, 0x1e0113) AM_READWRITE(itech020_video_r, itech020_video_w) AM_BASE(m_video)
AM_RANGE(0x1e4000, 0x1e4003) AM_WRITE(tms_reset_assert_w)
AM_RANGE(0x1ec000, 0x1ec003) AM_WRITE(tms_reset_clear_w)
AM_RANGE(0x200000, 0x200003) AM_READ_PORT("200000")
@@ -1025,18 +1025,18 @@ static ADDRESS_MAP_START( itech020_map, AS_PROGRAM, 32, itech32_state )
AM_RANGE(0x180000, 0x180003) AM_READ_PORT("P3")
AM_RANGE(0x200000, 0x200003) AM_READ_PORT("P4")
AM_RANGE(0x280000, 0x280003) AM_READ_PORT("DIPS")
- AM_RANGE(0x300000, 0x300003) AM_WRITE_LEGACY(itech020_color1_w)
- AM_RANGE(0x380000, 0x380003) AM_WRITE_LEGACY(itech020_color2_w)
+ AM_RANGE(0x300000, 0x300003) AM_WRITE(itech020_color1_w)
+ AM_RANGE(0x380000, 0x380003) AM_WRITE(itech020_color2_w)
AM_RANGE(0x400000, 0x400003) AM_WRITE(watchdog_reset32_w)
AM_RANGE(0x480000, 0x480003) AM_WRITE(sound_data32_w)
- AM_RANGE(0x500000, 0x5000ff) AM_READWRITE_LEGACY(itech020_video_r, itech020_video_w) AM_BASE(m_video)
+ AM_RANGE(0x500000, 0x5000ff) AM_READWRITE(itech020_video_r, itech020_video_w) AM_BASE(m_video)
AM_RANGE(0x578000, 0x57ffff) AM_READNOP /* touched by protection */
- AM_RANGE(0x580000, 0x59ffff) AM_RAM_WRITE_LEGACY(itech020_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x580000, 0x59ffff) AM_RAM_WRITE(itech020_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x600000, 0x603fff) AM_RAM AM_SHARE("nvram")
/* ? */ AM_RANGE(0x61ff00, 0x61ffff) AM_WRITENOP /* Unknown Writes */
AM_RANGE(0x680000, 0x680003) AM_READ(itech020_prot_result_r) AM_WRITENOP
/* ! */ AM_RANGE(0x680800, 0x68083f) AM_READONLY AM_WRITENOP /* Serial DUART Channel A/B & Top LED sign - To Do! */
- AM_RANGE(0x700000, 0x700003) AM_WRITE_LEGACY(itech020_plane_w)
+ AM_RANGE(0x700000, 0x700003) AM_WRITE(itech020_plane_w)
AM_RANGE(0x800000, 0xbfffff) AM_ROM AM_REGION("user1", 0) AM_BASE(m_main_rom)
ADDRESS_MAP_END
@@ -4030,8 +4030,8 @@ static void init_sftm_common(running_machine &machine, int prot_addr)
state->m_itech020_prot_address = prot_addr;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x300000, 0x300003, FUNC(itech020_color2_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x380000, 0x380003, FUNC(itech020_color1_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x300000, 0x300003, write32_delegate(FUNC(itech32_state::itech020_color2_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x380000, 0x380003, write32_delegate(FUNC(itech32_state::itech020_color1_w),state));
}
@@ -4062,8 +4062,8 @@ static void init_shuffle_bowl_common(running_machine &machine, int prot_addr)
state->m_itech020_prot_address = prot_addr;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x300000, 0x300003, FUNC(itech020_color2_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x380000, 0x380003, FUNC(itech020_color1_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x300000, 0x300003, write32_delegate(FUNC(itech32_state::itech020_color2_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x380000, 0x380003, write32_delegate(FUNC(itech32_state::itech020_color1_w),state));
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x180800, 0x180803, read32_delegate(FUNC(itech32_state::trackball32_4bit_p1_r),state));
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x181000, 0x181003, read32_delegate(FUNC(itech32_state::trackball32_4bit_p2_r),state));
}
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index baa2d267556..bdeee6a4d10 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -708,7 +708,7 @@ WRITE8_MEMBER(itech8_state::blitter_w)
memory_set_bankptr(machine(), "bank1", &machine().region("maincpu")->base()[0x4000 + 0xc000 * ((data >> 5) & 1)]);
/* the rest is handled by the video hardware */
- itech8_blitter_w(&space, offset, data);
+ itech8_blitter_w(space, offset, data);
}
@@ -832,14 +832,14 @@ WRITE16_MEMBER(itech8_state::grom_bank16_w)
WRITE16_MEMBER(itech8_state::display_page16_w)
{
if (ACCESSING_BITS_8_15)
- itech8_page_w(&space, 0, ~data >> 8);
+ itech8_page_w(space, 0, ~data >> 8);
}
WRITE16_MEMBER(itech8_state::palette16_w)
{
if (ACCESSING_BITS_8_15)
- itech8_palette_w(&space, offset / 8, data >> 8);
+ itech8_palette_w(space, offset / 8, data >> 8);
}
@@ -852,15 +852,15 @@ WRITE16_MEMBER(itech8_state::palette16_w)
/*------ common layout with TMS34061 at 0000 ------*/
static ADDRESS_MAP_START( tmslo_map, AS_PROGRAM, 8, itech8_state )
- AM_RANGE(0x0000, 0x0fff) AM_READWRITE_LEGACY(itech8_tms34061_r, itech8_tms34061_w)
+ AM_RANGE(0x0000, 0x0fff) AM_READWRITE(itech8_tms34061_r, itech8_tms34061_w)
AM_RANGE(0x1100, 0x1100) AM_WRITENOP
AM_RANGE(0x1120, 0x1120) AM_WRITE(sound_data_w)
AM_RANGE(0x1140, 0x1140) AM_READ_PORT("40") AM_WRITEONLY AM_BASE(m_grom_bank)
- AM_RANGE(0x1160, 0x1160) AM_READ_PORT("60") AM_WRITE_LEGACY(itech8_page_w)
+ AM_RANGE(0x1160, 0x1160) AM_READ_PORT("60") AM_WRITE(itech8_page_w)
AM_RANGE(0x1180, 0x1180) AM_READ_PORT("80") AM_WRITE_LEGACY(tms34061_latch_w)
AM_RANGE(0x11a0, 0x11a0) AM_WRITE(itech8_nmi_ack_w)
- AM_RANGE(0x11c0, 0x11df) AM_READ_LEGACY(itech8_blitter_r) AM_WRITE(blitter_w)
- AM_RANGE(0x11e0, 0x11ff) AM_WRITE_LEGACY(itech8_palette_w)
+ AM_RANGE(0x11c0, 0x11df) AM_READ(itech8_blitter_r) AM_WRITE(blitter_w)
+ AM_RANGE(0x11e0, 0x11ff) AM_WRITE(itech8_palette_w)
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x4000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
@@ -868,15 +868,15 @@ ADDRESS_MAP_END
/*------ common layout with TMS34061 at 1000 ------*/
static ADDRESS_MAP_START( tmshi_map, AS_PROGRAM, 8, itech8_state )
- AM_RANGE(0x1000, 0x1fff) AM_READWRITE_LEGACY(itech8_tms34061_r, itech8_tms34061_w)
+ AM_RANGE(0x1000, 0x1fff) AM_READWRITE(itech8_tms34061_r, itech8_tms34061_w)
AM_RANGE(0x0100, 0x0100) AM_WRITENOP
AM_RANGE(0x0120, 0x0120) AM_WRITE(sound_data_w)
AM_RANGE(0x0140, 0x0140) AM_READ_PORT("40") AM_WRITEONLY AM_BASE(m_grom_bank)
- AM_RANGE(0x0160, 0x0160) AM_READ_PORT("60") AM_WRITE_LEGACY(itech8_page_w)
+ AM_RANGE(0x0160, 0x0160) AM_READ_PORT("60") AM_WRITE(itech8_page_w)
AM_RANGE(0x0180, 0x0180) AM_READ_PORT("80") AM_WRITE_LEGACY(tms34061_latch_w)
AM_RANGE(0x01a0, 0x01a0) AM_WRITE(itech8_nmi_ack_w)
- AM_RANGE(0x01c0, 0x01df) AM_READ_LEGACY(itech8_blitter_r) AM_WRITE(blitter_w)
- AM_RANGE(0x01e0, 0x01ff) AM_WRITE_LEGACY(itech8_palette_w)
+ AM_RANGE(0x01c0, 0x01df) AM_READ(itech8_blitter_r) AM_WRITE(blitter_w)
+ AM_RANGE(0x01e0, 0x01ff) AM_WRITE(itech8_palette_w)
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x4000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
@@ -885,14 +885,14 @@ ADDRESS_MAP_END
/*------ Golden Tee Golf II 1992 layout ------*/
static ADDRESS_MAP_START( gtg2_map, AS_PROGRAM, 8, itech8_state )
AM_RANGE(0x0100, 0x0100) AM_READ_PORT("40") AM_WRITE(itech8_nmi_ack_w)
- AM_RANGE(0x0120, 0x0120) AM_READ_PORT("60") AM_WRITE_LEGACY(itech8_page_w)
- AM_RANGE(0x0140, 0x015f) AM_WRITE_LEGACY(itech8_palette_w)
+ AM_RANGE(0x0120, 0x0120) AM_READ_PORT("60") AM_WRITE(itech8_page_w)
+ AM_RANGE(0x0140, 0x015f) AM_WRITE(itech8_palette_w)
AM_RANGE(0x0140, 0x0140) AM_READ_PORT("80")
AM_RANGE(0x0160, 0x0160) AM_WRITEONLY AM_BASE(m_grom_bank)
- AM_RANGE(0x0180, 0x019f) AM_READ_LEGACY(itech8_blitter_r) AM_WRITE(blitter_w)
+ AM_RANGE(0x0180, 0x019f) AM_READ(itech8_blitter_r) AM_WRITE(blitter_w)
AM_RANGE(0x01c0, 0x01c0) AM_WRITE(gtg2_sound_data_w)
AM_RANGE(0x01e0, 0x01e0) AM_WRITE_LEGACY(tms34061_latch_w)
- AM_RANGE(0x1000, 0x1fff) AM_READWRITE_LEGACY(itech8_tms34061_r, itech8_tms34061_w)
+ AM_RANGE(0x1000, 0x1fff) AM_READWRITE(itech8_tms34061_r, itech8_tms34061_w)
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x4000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
@@ -908,9 +908,9 @@ static ADDRESS_MAP_START( ninclown_map, AS_PROGRAM, 16, itech8_state )
AM_RANGE(0x100180, 0x100181) AM_READ_PORT("60") AM_WRITE(display_page16_w)
AM_RANGE(0x100240, 0x100241) AM_WRITE8_LEGACY(tms34061_latch_w, 0xff00)
AM_RANGE(0x100280, 0x100281) AM_READ_PORT("80") AM_WRITENOP
- AM_RANGE(0x100300, 0x10031f) AM_READWRITE8_LEGACY(itech8_blitter_r, itech8_blitter_w, 0xffff)
+ AM_RANGE(0x100300, 0x10031f) AM_READWRITE8(itech8_blitter_r, itech8_blitter_w, 0xffff)
AM_RANGE(0x100380, 0x1003ff) AM_WRITE(palette16_w)
- AM_RANGE(0x110000, 0x110fff) AM_READWRITE8_LEGACY(itech8_tms34061_r, itech8_tms34061_w, 0xffff)
+ AM_RANGE(0x110000, 0x110fff) AM_READWRITE8(itech8_tms34061_r, itech8_tms34061_w, 0xffff)
ADDRESS_MAP_END
@@ -2630,8 +2630,9 @@ ROM_END
static DRIVER_INIT( grmatch )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x0160, 0x0160, FUNC(grmatch_palette_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x0180, 0x0180, FUNC(grmatch_xscroll_w));
+ itech8_state *state = machine.driver_data<itech8_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0160, 0x0160, write8_delegate(FUNC(itech8_state::grmatch_palette_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0180, 0x0180, write8_delegate(FUNC(itech8_state::grmatch_xscroll_w),state));
machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x01e0, 0x01ff);
}
@@ -2692,7 +2693,7 @@ static DRIVER_INIT( rimrockn )
/* different banking mechanism (disable the old one) */
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x01a0, 0x01a0, write8_delegate(FUNC(itech8_state::rimrockn_bank_w),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x01c0, 0x01df, FUNC(itech8_blitter_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x01c0, 0x01df, write8_delegate(FUNC(itech8_state::itech8_blitter_w),state));
}
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index 3a34f4c7cbd..bbfd70c7bd6 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -144,10 +144,10 @@ static ADDRESS_MAP_START( jack_map, AS_PROGRAM, 8, jack_state )
AM_RANGE(0xb503, 0xb503) AM_READ_PORT("IN1")
AM_RANGE(0xb504, 0xb504) AM_READ_PORT("IN2")
AM_RANGE(0xb505, 0xb505) AM_READ_PORT("IN3")
- AM_RANGE(0xb506, 0xb507) AM_READWRITE_LEGACY(jack_flipscreen_r, jack_flipscreen_w)
- AM_RANGE(0xb600, 0xb61f) AM_WRITE_LEGACY(jack_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0xb800, 0xbbff) AM_RAM_WRITE_LEGACY(jack_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xbc00, 0xbfff) AM_RAM_WRITE_LEGACY(jack_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xb506, 0xb507) AM_READWRITE(jack_flipscreen_r, jack_flipscreen_w)
+ AM_RANGE(0xb600, 0xb61f) AM_WRITE(jack_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xb800, 0xbbff) AM_RAM_WRITE(jack_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xbc00, 0xbfff) AM_RAM_WRITE(jack_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -161,10 +161,10 @@ static ADDRESS_MAP_START( joinem_map, AS_PROGRAM, 8, jack_state )
AM_RANGE(0xb502, 0xb502) AM_READ_PORT("IN0")
AM_RANGE(0xb503, 0xb503) AM_READ_PORT("IN1")
AM_RANGE(0xb504, 0xb504) AM_READ_PORT("IN2")
- AM_RANGE(0xb506, 0xb507) AM_READWRITE_LEGACY(jack_flipscreen_r, jack_flipscreen_w)
+ AM_RANGE(0xb506, 0xb507) AM_READWRITE(jack_flipscreen_r, jack_flipscreen_w)
AM_RANGE(0xb700, 0xb700) AM_WRITE(joinem_misc_w)
- AM_RANGE(0xb800, 0xbbff) AM_RAM_WRITE_LEGACY(jack_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xbc00, 0xbfff) AM_RAM_WRITE_LEGACY(jack_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xb800, 0xbbff) AM_RAM_WRITE(jack_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xbc00, 0xbfff) AM_RAM_WRITE(jack_colorram_w) AM_BASE(m_colorram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c
index 6f7997f20a8..4196205ec44 100644
--- a/src/mame/drivers/jailbrek.c
+++ b/src/mame/drivers/jailbrek.c
@@ -130,8 +130,8 @@ static WRITE8_DEVICE_HANDLER( jailbrek_speech_w )
}
static ADDRESS_MAP_START( jailbrek_map, AS_PROGRAM, 8, jailbrek_state )
- AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE_LEGACY(jailbrek_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE_LEGACY(jailbrek_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(jailbrek_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE(jailbrek_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1000, 0x10bf) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x10c0, 0x14ff) AM_RAM /* ??? */
AM_RANGE(0x1500, 0x1fff) AM_RAM /* work ram */
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index 71a5905c660..9d9eec30bfd 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -524,11 +524,11 @@ static ADDRESS_MAP_START( jchan_sub, AS_PROGRAM, 16, jchan_state )
AM_RANGE(0x400000, 0x403fff) AM_RAM AM_BASE(m_mainsub_shared_ram) AM_SHARE("share1")
/* VIEW2 Tilemap - [D] grid tested, cleared ($1d84), also cleared at startup ($810-$826) */
- AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
- AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
+ AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
+ AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0x502000, 0x502fff) AM_RAM AM_BASE(m_vscroll[1]) //
AM_RANGE(0x503000, 0x503fff) AM_RAM AM_BASE(m_vscroll[0]) //
- AM_RANGE(0x600000, 0x60001f) AM_RAM_WRITE_LEGACY(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
+ AM_RANGE(0x600000, 0x60001f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
/* background prites */
AM_RANGE(0x700000, 0x703fff) AM_RAM_WRITE_LEGACY(jchan_suprnova_sprite32_2_w) AM_BASE(m_spriteram_2)
diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c
index 508065d117e..9981702c734 100644
--- a/src/mame/drivers/jedi.c
+++ b/src/mame/drivers/jedi.c
@@ -290,8 +290,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, jedi_state )
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_BASE(m_paletteram)
AM_RANGE(0x3000, 0x37bf) AM_RAM AM_BASE(m_foregroundram)
AM_RANGE(0x37c0, 0x3bff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x3c00, 0x3c01) AM_MIRROR(0x00fe) AM_READNOP AM_WRITE_LEGACY(jedi_vscroll_w)
- AM_RANGE(0x3d00, 0x3d01) AM_MIRROR(0x00fe) AM_READNOP AM_WRITE_LEGACY(jedi_hscroll_w)
+ AM_RANGE(0x3c00, 0x3c01) AM_MIRROR(0x00fe) AM_READNOP AM_WRITE(jedi_vscroll_w)
+ AM_RANGE(0x3d00, 0x3d01) AM_MIRROR(0x00fe) AM_READNOP AM_WRITE(jedi_hscroll_w)
AM_RANGE(0x3e00, 0x3e00) AM_MIRROR(0x01ff) AM_WRITEONLY AM_BASE(m_smoothing_table)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index 627a4b54ce6..3fa35e4665b 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -619,8 +619,8 @@ static ADDRESS_MAP_START( tms_program_map, AS_PROGRAM, 16, jpmimpct_state )
AM_RANGE(0x00000000, 0x003fffff) AM_MIRROR(0xf8000000) AM_RAM AM_BASE(m_vram)
AM_RANGE(0x00800000, 0x00ffffff) AM_MIRROR(0xf8000000) AM_ROM AM_REGION("user1", 0x100000)
AM_RANGE(0x02000000, 0x027fffff) AM_MIRROR(0xf8000000) AM_ROM AM_REGION("user1", 0)
-// AM_RANGE(0x01000000, 0x0100003f) AM_MIRROR(0xf87fffc0) AM_READWRITE_LEGACY(jpmimpct_bt477_r, jpmimpct_bt477_w)
- AM_RANGE(0x01000000, 0x017fffff) AM_MIRROR(0xf8000000) AM_MASK(0x1f) AM_READWRITE_LEGACY(jpmimpct_bt477_r, jpmimpct_bt477_w)
+// AM_RANGE(0x01000000, 0x0100003f) AM_MIRROR(0xf87fffc0) AM_READWRITE(jpmimpct_bt477_r, jpmimpct_bt477_w)
+ AM_RANGE(0x01000000, 0x017fffff) AM_MIRROR(0xf8000000) AM_MASK(0x1f) AM_READWRITE(jpmimpct_bt477_r, jpmimpct_bt477_w)
AM_RANGE(0x07800000, 0x07bfffff) AM_MIRROR(0xf8400000) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c
index 12117ec98e1..b0461df4d7c 100644
--- a/src/mame/drivers/jrpacman.c
+++ b/src/mame/drivers/jrpacman.c
@@ -134,23 +134,23 @@ static WRITE8_HANDLER( irq_mask_w )
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, jrpacman_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x47ff) AM_RAM_WRITE_LEGACY(jrpacman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4000, 0x47ff) AM_RAM_WRITE(jrpacman_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4800, 0x4fef) AM_RAM
AM_RANGE(0x4ff0, 0x4fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x5000, 0x503f) AM_READ_PORT("P1")
AM_RANGE(0x5000, 0x5000) AM_WRITE_LEGACY(irq_mask_w)
AM_RANGE(0x5001, 0x5001) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
- AM_RANGE(0x5003, 0x5003) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x5003, 0x5003) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x5040, 0x507f) AM_READ_PORT("P2")
AM_RANGE(0x5040, 0x505f) AM_DEVWRITE_LEGACY("namco", pacman_sound_w)
AM_RANGE(0x5060, 0x506f) AM_WRITEONLY AM_SHARE("spriteram2")
- AM_RANGE(0x5070, 0x5070) AM_WRITE_LEGACY(pengo_palettebank_w)
- AM_RANGE(0x5071, 0x5071) AM_WRITE_LEGACY(pengo_colortablebank_w)
- AM_RANGE(0x5073, 0x5073) AM_WRITE_LEGACY(jrpacman_bgpriority_w)
- AM_RANGE(0x5074, 0x5074) AM_WRITE_LEGACY(jrpacman_charbank_w)
- AM_RANGE(0x5075, 0x5075) AM_WRITE_LEGACY(jrpacman_spritebank_w)
+ AM_RANGE(0x5070, 0x5070) AM_WRITE(pengo_palettebank_w)
+ AM_RANGE(0x5071, 0x5071) AM_WRITE(pengo_colortablebank_w)
+ AM_RANGE(0x5073, 0x5073) AM_WRITE(jrpacman_bgpriority_w)
+ AM_RANGE(0x5074, 0x5074) AM_WRITE(jrpacman_charbank_w)
+ AM_RANGE(0x5075, 0x5075) AM_WRITE(jrpacman_spritebank_w)
AM_RANGE(0x5080, 0x50bf) AM_READ_PORT("DSW")
- AM_RANGE(0x5080, 0x5080) AM_WRITE_LEGACY(jrpacman_scroll_w)
+ AM_RANGE(0x5080, 0x5080) AM_WRITE(jrpacman_scroll_w)
AM_RANGE(0x50c0, 0x50c0) AM_WRITENOP
AM_RANGE(0x8000, 0xdfff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index 5d3734b57ec..718a92b1e55 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -257,8 +257,9 @@ static WRITE8_HANDLER( i8039_irqen_and_status_w )
static WRITE8_HANDLER( flip_screen_w )
{
- tutankhm_flip_screen_x_w(space, 0, data);
- tutankhm_flip_screen_y_w(space, 0, data);
+ junofrst_state *state = space->machine().driver_data<junofrst_state>();
+ state->tutankhm_flip_screen_x_w(*space, 0, data);
+ state->tutankhm_flip_screen_y_w(*space, 0, data);
}
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index f2352cbb443..677da46b57a 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -374,9 +374,9 @@ static ADDRESS_MAP_START( berlwall, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x30e000, 0x30ffff) AM_RAM AM_SHARE("spriteram") // Sprites
AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
// AM_RANGE(0x480000, 0x480001) AM_RAM // ?
- AM_RANGE(0x500000, 0x500001) AM_READWRITE_LEGACY(kaneko16_bg15_reg_r, kaneko16_bg15_reg_w) AM_BASE(m_bg15_reg) // High Color Background
- AM_RANGE(0x580000, 0x580001) AM_READWRITE_LEGACY(kaneko16_bg15_select_r, kaneko16_bg15_select_w) AM_BASE(m_bg15_select)
- AM_RANGE(0x600000, 0x60003f) AM_RAM_WRITE_LEGACY(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
+ AM_RANGE(0x500000, 0x500001) AM_READWRITE(kaneko16_bg15_reg_r, kaneko16_bg15_reg_w) AM_BASE(m_bg15_reg) // High Color Background
+ AM_RANGE(0x580000, 0x580001) AM_READWRITE(kaneko16_bg15_select_r, kaneko16_bg15_select_w) AM_BASE(m_bg15_select)
+ AM_RANGE(0x600000, 0x60003f) AM_RAM_WRITE(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
AM_RANGE(0x680000, 0x680001) AM_READ_PORT("P1")
AM_RANGE(0x680002, 0x680003) AM_READ_PORT("P2")
AM_RANGE(0x680004, 0x680005) AM_READ_PORT("SYSTEM")
@@ -387,11 +387,11 @@ static ADDRESS_MAP_START( berlwall, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x800200, 0x80021f) AM_DEVREADWRITE_LEGACY("ay2", kaneko16_YM2149_r, kaneko16_YM2149_w)
AM_RANGE(0x8003fe, 0x8003ff) AM_NOP // for OKI when accessed as .l
AM_RANGE(0x800400, 0x800401) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0xc00000, 0xc00fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers
- AM_RANGE(0xc01000, 0xc01fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
+ AM_RANGE(0xc00000, 0xc00fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers
+ AM_RANGE(0xc01000, 0xc01fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0xc02000, 0xc02fff) AM_RAM AM_BASE(m_vscroll[1]) //
AM_RANGE(0xc03000, 0xc03fff) AM_RAM AM_BASE(m_vscroll[0]) //
- AM_RANGE(0xd00000, 0xd0001f) AM_RAM_WRITE_LEGACY(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers Regs
+ AM_RANGE(0xd00000, 0xd0001f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers Regs
ADDRESS_MAP_END
@@ -420,20 +420,20 @@ static ADDRESS_MAP_START( bakubrkr, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x40001e, 0x40001f) AM_DEVWRITE_LEGACY("oki", bakubrkr_oki_bank_sw) // OKI bank Switch
AM_RANGE(0x400200, 0x40021f) AM_DEVREADWRITE_LEGACY("ay2", kaneko16_YM2149_r,kaneko16_YM2149_w) // Sound
AM_RANGE(0x400400, 0x400401) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) //
- AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
- AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
+ AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
+ AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0x502000, 0x502fff) AM_RAM AM_BASE(m_vscroll[1]) //
AM_RANGE(0x503000, 0x503fff) AM_RAM AM_BASE(m_vscroll[0]) //
- AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_3_w) AM_BASE(m_vram[3]) // Layers 1
- AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_2_w) AM_BASE(m_vram[2]) //
+ AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE(kaneko16_vram_3_w) AM_BASE(m_vram[3]) // Layers 1
+ AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE(kaneko16_vram_2_w) AM_BASE(m_vram[2]) //
AM_RANGE(0x582000, 0x582fff) AM_RAM AM_BASE(m_vscroll[3]) //
AM_RANGE(0x583000, 0x583fff) AM_RAM AM_BASE(m_vscroll[2]) //
AM_RANGE(0x600000, 0x601fff) AM_RAM AM_SHARE("spriteram") // Sprites
AM_RANGE(0x700000, 0x700fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0x800000, 0x80001f) AM_RAM_WRITE_LEGACY(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
- AM_RANGE(0x900000, 0x90001f) AM_RAM_WRITE_LEGACY(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs ) // Sprites Regs
+ AM_RANGE(0x800000, 0x80001f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
+ AM_RANGE(0x900000, 0x90001f) AM_RAM_WRITE(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs ) // Sprites Regs
AM_RANGE(0xa80000, 0xa80001) AM_READ(watchdog_reset16_r) // Watchdog
- AM_RANGE(0xb00000, 0xb0001f) AM_RAM_WRITE_LEGACY(kaneko16_layers_1_regs_w) AM_BASE(m_layers_1_regs) // Layers 1 Regs
+ AM_RANGE(0xb00000, 0xb0001f) AM_RAM_WRITE(kaneko16_layers_1_regs_w) AM_BASE(m_layers_1_regs) // Layers 1 Regs
AM_RANGE(0xd00000, 0xd00001) AM_WRITE(kaneko16_eeprom_w) // EEPROM
AM_RANGE(0xe00000, 0xe00001) AM_READ_PORT("P1")
AM_RANGE(0xe00002, 0xe00003) AM_READ_PORT("P2")
@@ -450,13 +450,13 @@ static ADDRESS_MAP_START( blazeon, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x300000, 0x30ffff) AM_RAM // Work RAM
AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
- AM_RANGE(0x601000, 0x601fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
+ AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
+ AM_RANGE(0x601000, 0x601fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0x602000, 0x602fff) AM_RAM AM_BASE(m_vscroll[1]) //
AM_RANGE(0x603000, 0x603fff) AM_RAM AM_BASE(m_vscroll[0]) //
AM_RANGE(0x700000, 0x700fff) AM_RAM AM_SHARE("spriteram") // Sprites
- AM_RANGE(0x800000, 0x80001f) AM_RAM_WRITE_LEGACY(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
- AM_RANGE(0x900000, 0x90001f) AM_RAM_WRITE_LEGACY(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs #1
+ AM_RANGE(0x800000, 0x80001f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
+ AM_RANGE(0x900000, 0x90001f) AM_RAM_WRITE(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs #1
AM_RANGE(0x980000, 0x98001f) AM_RAM // Sprites Regs #2
AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("DSW2_P1")
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("DSW1_P2")
@@ -509,34 +509,34 @@ static ADDRESS_MAP_START( bloodwar, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // Work RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE(m_mcu_ram) // Shared With MCU
- AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE_LEGACY(toybox_mcu_com0_w) // To MCU ?
- AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE_LEGACY(toybox_mcu_com1_w)
- AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE_LEGACY(toybox_mcu_com2_w)
- AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE_LEGACY(toybox_mcu_com3_w)
+ AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE(toybox_mcu_com0_w) // To MCU ?
+ AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE(toybox_mcu_com1_w)
+ AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE(toybox_mcu_com2_w)
+ AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(toybox_mcu_com3_w)
AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x400000, 0x401fff) AM_RAM AM_SHARE("spriteram") // Sprites
- AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
- AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
+ AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
+ AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0x502000, 0x502fff) AM_RAM AM_BASE(m_vscroll[1]) //
AM_RANGE(0x503000, 0x503fff) AM_RAM AM_BASE(m_vscroll[0]) //
- AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_3_w) AM_BASE(m_vram[3]) // Layers 1
- AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_2_w) AM_BASE(m_vram[2]) //
+ AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE(kaneko16_vram_3_w) AM_BASE(m_vram[3]) // Layers 1
+ AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE(kaneko16_vram_2_w) AM_BASE(m_vram[2]) //
AM_RANGE(0x582000, 0x582fff) AM_RAM AM_BASE(m_vscroll[3]) //
AM_RANGE(0x583000, 0x583fff) AM_RAM AM_BASE(m_vscroll[2]) //
- AM_RANGE(0x600000, 0x60001f) AM_RAM_WRITE_LEGACY(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
- AM_RANGE(0x680000, 0x68001f) AM_RAM_WRITE_LEGACY(kaneko16_layers_1_regs_w) AM_BASE(m_layers_1_regs) // Layers 1 Regs
- AM_RANGE(0x700000, 0x70001f) AM_RAM_WRITE_LEGACY(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
+ AM_RANGE(0x600000, 0x60001f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
+ AM_RANGE(0x680000, 0x68001f) AM_RAM_WRITE(kaneko16_layers_1_regs_w) AM_BASE(m_layers_1_regs) // Layers 1 Regs
+ AM_RANGE(0x700000, 0x70001f) AM_RAM_WRITE(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
AM_RANGE(0x800000, 0x800001) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x880000, 0x880001) AM_DEVREADWRITE8("oki2", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0x900000, 0x900039) AM_READWRITE_LEGACY(bloodwar_calc_r, bloodwar_calc_w)
+ AM_RANGE(0x900000, 0x900039) AM_READWRITE(bloodwar_calc_r, bloodwar_calc_w)
AM_RANGE(0xa00000, 0xa00001) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w) // Watchdog
AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1")
AM_RANGE(0xb00002, 0xb00003) AM_READ_PORT("P2")
AM_RANGE(0xb00004, 0xb00005) AM_READ_PORT("SYSTEM")
AM_RANGE(0xb00006, 0xb00007) AM_READ_PORT("EXTRA")
AM_RANGE(0xb80000, 0xb80001) AM_WRITE(bloodwar_coin_lockout_w) // Coin Lockout
- AM_RANGE(0xc00000, 0xc00001) AM_WRITE_LEGACY(kaneko16_display_enable)
- AM_RANGE(0xd00000, 0xd00001) AM_READ_LEGACY(toybox_mcu_status_r)
+ AM_RANGE(0xc00000, 0xc00001) AM_WRITE(kaneko16_display_enable)
+ AM_RANGE(0xd00000, 0xd00001) AM_READ(toybox_mcu_status_r)
AM_RANGE(0xe00000, 0xe00001) AM_DEVWRITE_LEGACY("oki1", bloodwar_oki_0_bank_w)
AM_RANGE(0xe80000, 0xe80001) AM_DEVWRITE_LEGACY("oki2", bloodwar_oki_1_bank_w)
ADDRESS_MAP_END
@@ -571,34 +571,34 @@ static ADDRESS_MAP_START( bonkadv, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // Work RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE(m_mcu_ram) // Shared With MCU
- AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE_LEGACY(toybox_mcu_com0_w) // To MCU ?
- AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE_LEGACY(toybox_mcu_com1_w)
- AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE_LEGACY(toybox_mcu_com2_w)
- AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE_LEGACY(toybox_mcu_com3_w)
+ AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE(toybox_mcu_com0_w) // To MCU ?
+ AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE(toybox_mcu_com1_w)
+ AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE(toybox_mcu_com2_w)
+ AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(toybox_mcu_com3_w)
AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x400000, 0x401fff) AM_RAM AM_SHARE("spriteram") // Sprites
- AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
- AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
+ AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
+ AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0x502000, 0x502fff) AM_RAM AM_BASE(m_vscroll[1]) //
AM_RANGE(0x503000, 0x503fff) AM_RAM AM_BASE(m_vscroll[0]) //
- AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_3_w) AM_BASE(m_vram[3]) // Layers 1
- AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_2_w) AM_BASE(m_vram[2]) //
+ AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE(kaneko16_vram_3_w) AM_BASE(m_vram[3]) // Layers 1
+ AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE(kaneko16_vram_2_w) AM_BASE(m_vram[2]) //
AM_RANGE(0x582000, 0x582fff) AM_RAM AM_BASE(m_vscroll[3]) //
AM_RANGE(0x583000, 0x583fff) AM_RAM AM_BASE(m_vscroll[2]) //
- AM_RANGE(0x600000, 0x60001f) AM_RAM_WRITE_LEGACY(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
- AM_RANGE(0x680000, 0x68001f) AM_RAM_WRITE_LEGACY(kaneko16_layers_1_regs_w) AM_BASE(m_layers_1_regs) // Layers 1 Regs
- AM_RANGE(0x700000, 0x70001f) AM_RAM_WRITE_LEGACY(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
+ AM_RANGE(0x600000, 0x60001f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
+ AM_RANGE(0x680000, 0x68001f) AM_RAM_WRITE(kaneko16_layers_1_regs_w) AM_BASE(m_layers_1_regs) // Layers 1 Regs
+ AM_RANGE(0x700000, 0x70001f) AM_RAM_WRITE(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
AM_RANGE(0x800000, 0x800001) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x880000, 0x880001) AM_DEVREADWRITE8("oki2", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0x900000, 0x900015) AM_READWRITE_LEGACY(galpanib_calc_r,galpanib_calc_w)
+ AM_RANGE(0x900000, 0x900015) AM_READWRITE(galpanib_calc_r,galpanib_calc_w)
AM_RANGE(0xa00000, 0xa00001) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w) // Watchdog
AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1")
AM_RANGE(0xb00002, 0xb00003) AM_READ_PORT("P2")
AM_RANGE(0xb00004, 0xb00005) AM_READ_PORT("SYSTEM")
AM_RANGE(0xb00006, 0xb00007) AM_READ_PORT("UNK")
AM_RANGE(0xb80000, 0xb80001) AM_WRITE(bloodwar_coin_lockout_w) // Coin Lockout
- AM_RANGE(0xc00000, 0xc00001) AM_WRITE_LEGACY(kaneko16_display_enable)
- AM_RANGE(0xd00000, 0xd00001) AM_READ_LEGACY(toybox_mcu_status_r)
+ AM_RANGE(0xc00000, 0xc00001) AM_WRITE(kaneko16_display_enable)
+ AM_RANGE(0xd00000, 0xd00001) AM_READ(toybox_mcu_status_r)
AM_RANGE(0xe00000, 0xe00001) AM_DEVWRITE_LEGACY("oki1", bonkadv_oki_0_bank_w)
AM_RANGE(0xe80000, 0xe80001) AM_DEVWRITE_LEGACY("oki2", bonkadv_oki_1_bank_w)
ADDRESS_MAP_END
@@ -650,29 +650,29 @@ static ADDRESS_MAP_START( gtmr_map, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x100000, 0x10ffff) AM_RAM // Work RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE(m_mcu_ram) // Shared With MCU
- AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE_LEGACY(toybox_mcu_com0_w) // To MCU ?
- AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE_LEGACY(toybox_mcu_com1_w)
- AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE_LEGACY(toybox_mcu_com2_w)
- AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE_LEGACY(toybox_mcu_com3_w)
+ AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE(toybox_mcu_com0_w) // To MCU ?
+ AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE(toybox_mcu_com1_w)
+ AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE(toybox_mcu_com2_w)
+ AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(toybox_mcu_com3_w)
AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x310000, 0x327fff) AM_RAM //
AM_RANGE(0x400000, 0x401fff) AM_RAM AM_SHARE("spriteram") // Sprites
- AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
- AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
+ AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
+ AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0x502000, 0x502fff) AM_RAM AM_BASE(m_vscroll[1]) //
AM_RANGE(0x503000, 0x503fff) AM_RAM AM_BASE(m_vscroll[0]) //
- AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_3_w) AM_BASE(m_vram[3]) // Layers 1
- AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_2_w) AM_BASE(m_vram[2]) //
+ AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE(kaneko16_vram_3_w) AM_BASE(m_vram[3]) // Layers 1
+ AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE(kaneko16_vram_2_w) AM_BASE(m_vram[2]) //
AM_RANGE(0x582000, 0x582fff) AM_RAM AM_BASE(m_vscroll[3]) //
AM_RANGE(0x583000, 0x583fff) AM_RAM AM_BASE(m_vscroll[2]) //
- AM_RANGE(0x600000, 0x60000f) AM_RAM_WRITE_LEGACY(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
- AM_RANGE(0x680000, 0x68000f) AM_RAM_WRITE_LEGACY(kaneko16_layers_1_regs_w) AM_BASE(m_layers_1_regs) // Layers 1 Regs
+ AM_RANGE(0x600000, 0x60000f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
+ AM_RANGE(0x680000, 0x68000f) AM_RAM_WRITE(kaneko16_layers_1_regs_w) AM_BASE(m_layers_1_regs) // Layers 1 Regs
- AM_RANGE(0x700000, 0x70001f) AM_READWRITE_LEGACY(kaneko16_sprites_regs_r, kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
+ AM_RANGE(0x700000, 0x70001f) AM_READWRITE(kaneko16_sprites_regs_r, kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
AM_RANGE(0x800000, 0x800001) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff) // Samples
AM_RANGE(0x880000, 0x880001) AM_DEVREADWRITE8("oki2", okim6295_device, read, write, 0x00ff)
@@ -685,9 +685,9 @@ static ADDRESS_MAP_START( gtmr_map, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0xb00004, 0xb00005) AM_READ_PORT("SYSTEM")
AM_RANGE(0xb00006, 0xb00007) AM_READ_PORT("UNK")
AM_RANGE(0xb80000, 0xb80001) AM_WRITE(kaneko16_coin_lockout_w) // Coin Lockout
- AM_RANGE(0xc00000, 0xc00001) AM_WRITE_LEGACY(kaneko16_display_enable) // might do more than that
+ AM_RANGE(0xc00000, 0xc00001) AM_WRITE(kaneko16_display_enable) // might do more than that
- AM_RANGE(0xd00000, 0xd00001) AM_READ_LEGACY(toybox_mcu_status_r)
+ AM_RANGE(0xd00000, 0xd00001) AM_READ(toybox_mcu_status_r)
AM_RANGE(0xe00000, 0xe00001) AM_DEVWRITE_LEGACY("oki1", gtmr_oki_0_bank_w) // Samples Bankswitching
AM_RANGE(0xe80000, 0xe80001) AM_DEVWRITE_LEGACY("oki2", gtmr_oki_1_bank_w)
@@ -726,28 +726,28 @@ static ADDRESS_MAP_START( gtmr2_map, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x100000, 0x10ffff) AM_RAM // Work RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE(m_mcu_ram) // Shared With MCU
- AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE_LEGACY(toybox_mcu_com0_w) // To MCU ?
- AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE_LEGACY(toybox_mcu_com1_w)
- AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE_LEGACY(toybox_mcu_com2_w)
- AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE_LEGACY(toybox_mcu_com3_w)
+ AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE(toybox_mcu_com0_w) // To MCU ?
+ AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE(toybox_mcu_com1_w)
+ AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE(toybox_mcu_com2_w)
+ AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(toybox_mcu_com3_w)
AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x310000, 0x327fff) AM_RAM //
AM_RANGE(0x400000, 0x401fff) AM_RAM AM_SHARE("spriteram") // Sprites
- AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
- AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
+ AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
+ AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0x502000, 0x502fff) AM_RAM AM_BASE(m_vscroll[1]) //
AM_RANGE(0x503000, 0x503fff) AM_RAM AM_BASE(m_vscroll[0]) //
- AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_3_w) AM_BASE(m_vram[3]) // Layers 1
- AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_2_w) AM_BASE(m_vram[2]) //
+ AM_RANGE(0x580000, 0x580fff) AM_RAM_WRITE(kaneko16_vram_3_w) AM_BASE(m_vram[3]) // Layers 1
+ AM_RANGE(0x581000, 0x581fff) AM_RAM_WRITE(kaneko16_vram_2_w) AM_BASE(m_vram[2]) //
AM_RANGE(0x582000, 0x582fff) AM_RAM AM_BASE(m_vscroll[3]) //
AM_RANGE(0x583000, 0x583fff) AM_RAM AM_BASE(m_vscroll[2]) //
- AM_RANGE(0x600000, 0x60000f) AM_RAM_WRITE_LEGACY(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
+ AM_RANGE(0x600000, 0x60000f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
- AM_RANGE(0x680000, 0x68000f) AM_RAM_WRITE_LEGACY(kaneko16_layers_1_regs_w) AM_BASE(m_layers_1_regs) // Layers 1 Regs
- AM_RANGE(0x700000, 0x70001f) AM_READWRITE_LEGACY(kaneko16_sprites_regs_r, kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
+ AM_RANGE(0x680000, 0x68000f) AM_RAM_WRITE(kaneko16_layers_1_regs_w) AM_BASE(m_layers_1_regs) // Layers 1 Regs
+ AM_RANGE(0x700000, 0x70001f) AM_READWRITE(kaneko16_sprites_regs_r, kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
AM_RANGE(0x800000, 0x800001) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff) // Samples
AM_RANGE(0x880000, 0x880001) AM_DEVREADWRITE8("oki2", okim6295_device, read, write, 0x00ff)
@@ -760,9 +760,9 @@ static ADDRESS_MAP_START( gtmr2_map, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0xb00004, 0xb00005) AM_READ_PORT("SYSTEM")
AM_RANGE(0xb00006, 0xb00007) AM_READ_PORT("EXTRA")
AM_RANGE(0xb80000, 0xb80001) AM_WRITE(kaneko16_coin_lockout_w) // Coin Lockout
- AM_RANGE(0xc00000, 0xc00001) AM_WRITE_LEGACY(kaneko16_display_enable) // might do more than that
+ AM_RANGE(0xc00000, 0xc00001) AM_WRITE(kaneko16_display_enable) // might do more than that
- AM_RANGE(0xd00000, 0xd00001) AM_READ_LEGACY(toybox_mcu_status_r)
+ AM_RANGE(0xd00000, 0xd00001) AM_READ(toybox_mcu_status_r)
AM_RANGE(0xe00000, 0xe00001) AM_DEVWRITE_LEGACY("oki1", gtmr_oki_0_bank_w) // Samples Bankswitching
AM_RANGE(0xe80000, 0xe80001) AM_DEVWRITE_LEGACY("oki2", gtmr_oki_1_bank_w)
@@ -779,18 +779,18 @@ static ADDRESS_MAP_START( mgcrystl, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x400200, 0x40021f) AM_DEVREADWRITE_LEGACY("ay2", kaneko16_YM2149_r, kaneko16_YM2149_w)
AM_RANGE(0x400400, 0x400401) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
- AM_RANGE(0x601000, 0x601fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
+ AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
+ AM_RANGE(0x601000, 0x601fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0x602000, 0x602fff) AM_RAM AM_BASE(m_vscroll[1]) //
AM_RANGE(0x603000, 0x603fff) AM_RAM AM_BASE(m_vscroll[0]) //
- AM_RANGE(0x680000, 0x680fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_3_w) AM_BASE(m_vram[3]) // Layers 1
- AM_RANGE(0x681000, 0x681fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_2_w) AM_BASE(m_vram[2]) //
+ AM_RANGE(0x680000, 0x680fff) AM_RAM_WRITE(kaneko16_vram_3_w) AM_BASE(m_vram[3]) // Layers 1
+ AM_RANGE(0x681000, 0x681fff) AM_RAM_WRITE(kaneko16_vram_2_w) AM_BASE(m_vram[2]) //
AM_RANGE(0x682000, 0x682fff) AM_RAM AM_BASE(m_vscroll[3]) //
AM_RANGE(0x683000, 0x683fff) AM_RAM AM_BASE(m_vscroll[2]) //
AM_RANGE(0x700000, 0x701fff) AM_RAM AM_SHARE("spriteram") // Sprites
- AM_RANGE(0x800000, 0x80001f) AM_RAM_WRITE_LEGACY(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
- AM_RANGE(0x900000, 0x90001f) AM_RAM_WRITE_LEGACY(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
- AM_RANGE(0xb00000, 0xb0001f) AM_RAM_WRITE_LEGACY(kaneko16_layers_1_regs_w) AM_BASE(m_layers_1_regs) // Layers 1 Regs
+ AM_RANGE(0x800000, 0x80001f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
+ AM_RANGE(0x900000, 0x90001f) AM_RAM_WRITE(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
+ AM_RANGE(0xb00000, 0xb0001f) AM_RAM_WRITE(kaneko16_layers_1_regs_w) AM_BASE(m_layers_1_regs) // Layers 1 Regs
AM_RANGE(0xa00000, 0xa00001) AM_READ(watchdog_reset16_r) // Watchdog
AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("DSW_P1")
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("P2")
@@ -840,23 +840,23 @@ WRITE16_MEMBER(kaneko16_state::brapboys_oki_bank_w)
static ADDRESS_MAP_START( shogwarr, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE(m_mainram) // Work RAM
- AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE_LEGACY(calc3_mcu_ram_w) AM_BASE(m_mcu_ram) // Shared With MCU
- AM_RANGE(0x280000, 0x280001) AM_WRITE_LEGACY(calc3_mcu_com0_w)
- AM_RANGE(0x290000, 0x290001) AM_WRITE_LEGACY(calc3_mcu_com1_w)
- AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE_LEGACY(calc3_mcu_com2_w)
+ AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(calc3_mcu_ram_w) AM_BASE(m_mcu_ram) // Shared With MCU
+ AM_RANGE(0x280000, 0x280001) AM_WRITE(calc3_mcu_com0_w)
+ AM_RANGE(0x290000, 0x290001) AM_WRITE(calc3_mcu_com1_w)
+ AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE(calc3_mcu_com2_w)
//AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE_LEGACY(calc3_run) // guess, might be irqack
- AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE_LEGACY(calc3_mcu_com3_w)
+ AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(calc3_mcu_com3_w)
AM_RANGE(0x380000, 0x380fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x400000, 0x400001) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff) // Samples
AM_RANGE(0x480000, 0x480001) AM_DEVREADWRITE8("oki2", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x580000, 0x581fff) AM_RAM AM_SHARE("spriteram") // Sprites
- AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
- AM_RANGE(0x601000, 0x601fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_0_w) AM_BASE(m_vram[0])
+ AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
+ AM_RANGE(0x601000, 0x601fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0])
AM_RANGE(0x602000, 0x602fff) AM_RAM AM_BASE(m_vscroll[1])
AM_RANGE(0x603000, 0x603fff) AM_RAM AM_BASE(m_vscroll[0])
- AM_RANGE(0x800000, 0x80000f) AM_RAM_WRITE_LEGACY(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
- AM_RANGE(0x900000, 0x90001f) AM_RAM_WRITE_LEGACY(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
- AM_RANGE(0xa00000, 0xa0007f) AM_READWRITE_LEGACY(bloodwar_calc_r, bloodwar_calc_w)
+ AM_RANGE(0x800000, 0x80000f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
+ AM_RANGE(0x900000, 0x90001f) AM_RAM_WRITE(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs) // Sprites Regs
+ AM_RANGE(0xa00000, 0xa0007f) AM_READWRITE(bloodwar_calc_r, bloodwar_calc_w)
AM_RANGE(0xa80000, 0xa80001) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w) // Watchdog
AM_RANGE(0xb80000, 0xb80001) AM_READ_PORT("P1")
AM_RANGE(0xb80002, 0xb80003) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c
index 1205b2b3955..eddba041428 100644
--- a/src/mame/drivers/kangaroo.c
+++ b/src/mame/drivers/kangaroo.c
@@ -253,11 +253,11 @@ WRITE8_MEMBER(kangaroo_state::kangaroo_coin_counter_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, kangaroo_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
- AM_RANGE(0x8000, 0xbfff) AM_WRITE_LEGACY(kangaroo_videoram_w)
+ AM_RANGE(0x8000, 0xbfff) AM_WRITE(kangaroo_videoram_w)
AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank1")
AM_RANGE(0xe000, 0xe3ff) AM_RAM
AM_RANGE(0xe400, 0xe400) AM_MIRROR(0x03ff) AM_READ_PORT("DSW0")
- AM_RANGE(0xe800, 0xe80a) AM_MIRROR(0x03f0) AM_WRITE_LEGACY(kangaroo_video_control_w) AM_BASE(m_video_control)
+ AM_RANGE(0xe800, 0xe80a) AM_MIRROR(0x03f0) AM_WRITE(kangaroo_video_control_w) AM_BASE(m_video_control)
AM_RANGE(0xec00, 0xec00) AM_MIRROR(0x00ff) AM_READ_PORT("IN0") AM_WRITE(soundlatch_w)
AM_RANGE(0xed00, 0xed00) AM_MIRROR(0x00ff) AM_READ_PORT("IN1") AM_WRITE(kangaroo_coin_counter_w)
AM_RANGE(0xee00, 0xee00) AM_MIRROR(0x00ff) AM_READ_PORT("IN2")
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index 9b4eb022a9c..623b2130ad5 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -429,10 +429,10 @@ static ADDRESS_MAP_START( karnov_map, AS_PROGRAM, 16, karnov_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x063fff) AM_RAM AM_BASE(m_ram)
AM_RANGE(0x080000, 0x080fff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x0a0000, 0x0a07ff) AM_RAM_WRITE_LEGACY(karnov_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x0a0800, 0x0a0fff) AM_WRITE_LEGACY(karnov_videoram_w) /* Wndrplnt Mirror */
+ AM_RANGE(0x0a0000, 0x0a07ff) AM_RAM_WRITE(karnov_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0a0800, 0x0a0fff) AM_WRITE(karnov_videoram_w) /* Wndrplnt Mirror */
AM_RANGE(0x0a1000, 0x0a17ff) AM_WRITEONLY AM_BASE(m_pf_data)
- AM_RANGE(0x0a1800, 0x0a1fff) AM_WRITE_LEGACY(karnov_playfield_swap_w)
+ AM_RANGE(0x0a1800, 0x0a1fff) AM_WRITE(karnov_playfield_swap_w)
AM_RANGE(0x0c0000, 0x0c0007) AM_READ(karnov_control_r)
AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE(karnov_control_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index fe3d127822a..3bf1bc53670 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -107,8 +107,8 @@ WRITE8_MEMBER(kchamp_state::sound_msm_w)
static ADDRESS_MAP_START( kchampvs_map, AS_PROGRAM, 8, kchamp_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(kchamp_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE_LEGACY(kchamp_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(kchamp_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(kchamp_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xd800, 0xd8ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd900, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xffff) AM_ROM
@@ -116,7 +116,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( kchampvs_io_map, AS_IO, 8, kchamp_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_WRITE_LEGACY(kchamp_flipscreen_w)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_WRITE(kchamp_flipscreen_w)
AM_RANGE(0x01, 0x01) AM_WRITE(control_w)
AM_RANGE(0x02, 0x02) AM_WRITE(sound_reset_w)
AM_RANGE(0x40, 0x40) AM_READ_PORT("P2") AM_WRITE(sound_command_w)
@@ -160,15 +160,15 @@ WRITE8_MEMBER(kchamp_state::kc_sound_control_w)
static ADDRESS_MAP_START( kchamp_map, AS_PROGRAM, 8, kchamp_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE_LEGACY(kchamp_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xe400, 0xe7ff) AM_RAM_WRITE_LEGACY(kchamp_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(kchamp_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe400, 0xe7ff) AM_RAM_WRITE(kchamp_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xea00, 0xeaff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xeb00, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( kchamp_io_map, AS_IO, 8, kchamp_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x80, 0x80) AM_READ_PORT("DSW") AM_WRITE_LEGACY(kchamp_flipscreen_w)
+ AM_RANGE(0x80, 0x80) AM_READ_PORT("DSW") AM_WRITE(kchamp_flipscreen_w)
AM_RANGE(0x81, 0x81) AM_WRITE(control_w)
AM_RANGE(0x90, 0x90) AM_READ_PORT("P1")
AM_RANGE(0x98, 0x98) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index e1b674e911c..e9098b91dfd 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -487,9 +487,9 @@ static ADDRESS_MAP_START( kickgoal_program_map, AS_PROGRAM, 16, kickgoal_state )
AM_RANGE(0x800004, 0x800005) AM_DEVWRITE_LEGACY("oki", actionhw_snd_w)
AM_RANGE(0x900000, 0x900005) AM_WRITE(kickgoal_eeprom_w)
AM_RANGE(0x900006, 0x900007) AM_READ(kickgoal_eeprom_r)
- AM_RANGE(0xa00000, 0xa03fff) AM_RAM_WRITE_LEGACY(kickgoal_fgram_w) AM_BASE(m_fgram) /* FG Layer */
- AM_RANGE(0xa04000, 0xa07fff) AM_RAM_WRITE_LEGACY(kickgoal_bgram_w) AM_BASE(m_bgram) /* Higher BG Layer */
- AM_RANGE(0xa08000, 0xa0bfff) AM_RAM_WRITE_LEGACY(kickgoal_bg2ram_w) AM_BASE(m_bg2ram) /* Lower BG Layer */
+ AM_RANGE(0xa00000, 0xa03fff) AM_RAM_WRITE(kickgoal_fgram_w) AM_BASE(m_fgram) /* FG Layer */
+ AM_RANGE(0xa04000, 0xa07fff) AM_RAM_WRITE(kickgoal_bgram_w) AM_BASE(m_bgram) /* Higher BG Layer */
+ AM_RANGE(0xa08000, 0xa0bfff) AM_RAM_WRITE(kickgoal_bg2ram_w) AM_BASE(m_bg2ram) /* Lower BG Layer */
AM_RANGE(0xa0c000, 0xa0ffff) AM_RAM // more tilemap?
AM_RANGE(0xa10000, 0xa1000f) AM_WRITEONLY AM_BASE(m_scrram) /* Scroll Registers */
AM_RANGE(0xb00000, 0xb007ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* Sprites */
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index ec82002904e..ddedaf4d2bf 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -50,7 +50,7 @@ static ADDRESS_MAP_START( kingobox_map, AS_PROGRAM, 8, kingofb_state )
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("share2") /* shared with sprite cpu */
AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("share1") /* shared with video cpu */
AM_RANGE(0xf000, 0xf7ff) AM_RAM /* ???? */
- AM_RANGE(0xf800, 0xf800) AM_WRITE_LEGACY(kingofb_f800_w) /* NMI enable, palette bank */
+ AM_RANGE(0xf800, 0xf800) AM_WRITE(kingofb_f800_w) /* NMI enable, palette bank */
AM_RANGE(0xf801, 0xf801) AM_WRITENOP /* ???? */
AM_RANGE(0xf802, 0xf802) AM_WRITEONLY AM_BASE(m_scroll_y)
AM_RANGE(0xf803, 0xf803) AM_WRITE(scroll_interrupt_w)
@@ -68,10 +68,10 @@ static ADDRESS_MAP_START( kingobox_video_map, AS_PROGRAM, 8, kingofb_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM /* work ram */
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE("share1") /* shared with main */
- AM_RANGE(0xc000, 0xc0ff) AM_RAM_WRITE_LEGACY(kingofb_videoram_w) AM_BASE(m_videoram) /* background vram */
- AM_RANGE(0xc400, 0xc4ff) AM_RAM_WRITE_LEGACY(kingofb_colorram_w) AM_BASE(m_colorram) /* background colorram */
- AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE_LEGACY(kingofb_videoram2_w) AM_BASE(m_videoram2) /* foreground vram */
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE_LEGACY(kingofb_colorram2_w) AM_BASE(m_colorram2) /* foreground colorram */
+ AM_RANGE(0xc000, 0xc0ff) AM_RAM_WRITE(kingofb_videoram_w) AM_BASE(m_videoram) /* background vram */
+ AM_RANGE(0xc400, 0xc4ff) AM_RAM_WRITE(kingofb_colorram_w) AM_BASE(m_colorram) /* background colorram */
+ AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE(kingofb_videoram2_w) AM_BASE(m_videoram2) /* foreground vram */
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(kingofb_colorram2_w) AM_BASE(m_colorram2) /* foreground colorram */
ADDRESS_MAP_END
static ADDRESS_MAP_START( kingobox_sprite_map, AS_PROGRAM, 8, kingofb_state )
@@ -101,7 +101,7 @@ static ADDRESS_MAP_START( ringking_map, AS_PROGRAM, 8, kingofb_state )
AM_RANGE(0xc000, 0xc3ff) AM_RAM /* work ram */
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share2") /* shared with sprite cpu */
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("share1") /* shared with video cpu */
- AM_RANGE(0xd800, 0xd800) AM_WRITE_LEGACY(kingofb_f800_w)
+ AM_RANGE(0xd800, 0xd800) AM_WRITE(kingofb_f800_w)
AM_RANGE(0xd801, 0xd801) AM_WRITE(sprite_interrupt_w)
AM_RANGE(0xd802, 0xd802) AM_WRITE(video_interrupt_w)
AM_RANGE(0xd803, 0xd803) AM_WRITE(sound_command_w)
@@ -119,10 +119,10 @@ static ADDRESS_MAP_START( ringking_video_map, AS_PROGRAM, 8, kingofb_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM /* work ram */
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1") /* shared with main */
- AM_RANGE(0xa800, 0xa8ff) AM_RAM_WRITE_LEGACY(kingofb_videoram_w) AM_BASE(m_videoram) /* background vram */
- AM_RANGE(0xac00, 0xacff) AM_RAM_WRITE_LEGACY(kingofb_colorram_w) AM_BASE(m_colorram) /* background colorram */
- AM_RANGE(0xa000, 0xa3ff) AM_RAM_WRITE_LEGACY(kingofb_videoram2_w) AM_BASE(m_videoram2) /* foreground vram */
- AM_RANGE(0xa400, 0xa7ff) AM_RAM_WRITE_LEGACY(kingofb_colorram2_w) AM_BASE(m_colorram2) /* foreground colorram */
+ AM_RANGE(0xa800, 0xa8ff) AM_RAM_WRITE(kingofb_videoram_w) AM_BASE(m_videoram) /* background vram */
+ AM_RANGE(0xac00, 0xacff) AM_RAM_WRITE(kingofb_colorram_w) AM_BASE(m_colorram) /* background colorram */
+ AM_RANGE(0xa000, 0xa3ff) AM_RAM_WRITE(kingofb_videoram2_w) AM_BASE(m_videoram2) /* foreground vram */
+ AM_RANGE(0xa400, 0xa7ff) AM_RAM_WRITE(kingofb_colorram2_w) AM_BASE(m_colorram2) /* foreground colorram */
ADDRESS_MAP_END
static ADDRESS_MAP_START( ringking_sprite_map, AS_PROGRAM, 8, kingofb_state )
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index 4421b098a68..9fd5e33e239 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -45,15 +45,15 @@ WRITE8_MEMBER(kncljoe_state::sound_cmd_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, kncljoe_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE_LEGACY(kncljoe_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd000, 0xd001) AM_WRITE_LEGACY(kncljoe_scroll_w) AM_BASE(m_scrollregs)
+ AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(kncljoe_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd000, 0xd001) AM_WRITE(kncljoe_scroll_w) AM_BASE(m_scrollregs)
AM_RANGE(0xd800, 0xd800) AM_READ_PORT("SYSTEM")
AM_RANGE(0xd801, 0xd801) AM_READ_PORT("P1")
AM_RANGE(0xd802, 0xd802) AM_READ_PORT("P2")
AM_RANGE(0xd803, 0xd803) AM_READ_PORT("DSWA")
AM_RANGE(0xd804, 0xd804) AM_READ_PORT("DSWB")
AM_RANGE(0xd800, 0xd800) AM_WRITE(sound_cmd_w)
- AM_RANGE(0xd801, 0xd801) AM_WRITE_LEGACY(kncljoe_control_w)
+ AM_RANGE(0xd801, 0xd801) AM_WRITE(kncljoe_control_w)
AM_RANGE(0xd802, 0xd802) AM_DEVWRITE_LEGACY("sn1", sn76496_w)
AM_RANGE(0xd803, 0xd803) AM_DEVWRITE_LEGACY("sn2", sn76496_w)
AM_RANGE(0xd807, 0xd807) AM_READNOP /* unknown read */
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 5c31b190268..569a54964c8 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -1163,7 +1163,7 @@ static ADDRESS_MAP_START( gx_base_memmap, AS_PROGRAM, 32, konamigx_state )
AM_RANGE(0xd20000, 0xd20fff) AM_READWRITE_LEGACY(K053247_long_r, K053247_long_w)
AM_RANGE(0xd21000, 0xd23fff) AM_RAM
AM_RANGE(0xd40000, 0xd4003f) AM_WRITE_LEGACY(K056832_long_w)
- AM_RANGE(0xd44000, 0xd4400f) AM_WRITE_LEGACY(konamigx_tilebank_w)
+ AM_RANGE(0xd44000, 0xd4400f) AM_WRITE(konamigx_tilebank_w)
AM_RANGE(0xd48000, 0xd48007) AM_WRITE_LEGACY(K053246_long_w)
AM_RANGE(0xd4a010, 0xd4a01f) AM_WRITE_LEGACY(K053247_reg_long_w)
AM_RANGE(0xd4c000, 0xd4c01f) AM_READWRITE(ccu_r, ccu_w)
@@ -1188,7 +1188,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gx_type1_map, AS_PROGRAM, 32, konamigx_state )
AM_RANGE(0xd4a000, 0xd4a01f) AM_READ(gx6bppspr_r) // sprite ROM readback
- AM_RANGE(0xd90000, 0xd97fff) AM_RAM_WRITE_LEGACY(konamigx_palette_w) AM_SHARE("paletteram")
+ AM_RANGE(0xd90000, 0xd97fff) AM_RAM_WRITE(konamigx_palette_w) AM_SHARE("paletteram")
AM_RANGE(0xdc0000, 0xdc1fff) AM_RAM // LAN RAM? (Racin' Force has, Open Golf doesn't)
AM_RANGE(0xdd0000, 0xdd00ff) AM_READNOP AM_WRITENOP // LAN board
AM_RANGE(0xdda000, 0xddafff) AM_WRITE_PORT("ADC-WRPORT")
@@ -1198,7 +1198,7 @@ static ADDRESS_MAP_START( gx_type1_map, AS_PROGRAM, 32, konamigx_state )
AM_RANGE(0xe20000, 0xe2000f) AM_WRITENOP
AM_RANGE(0xe40000, 0xe40003) AM_WRITENOP
AM_RANGE(0xe80000, 0xe81fff) AM_RAM AM_BASE_LEGACY((UINT32**)&K053936_0_linectrl) // chips 21L+19L / S
- AM_RANGE(0xec0000, 0xedffff) AM_RAM_WRITE_LEGACY(konamigx_t1_psacmap_w) AM_BASE_LEGACY(&gx_psacram) // chips 20J+23J+18J / S
+ AM_RANGE(0xec0000, 0xedffff) AM_RAM_WRITE(konamigx_t1_psacmap_w) AM_BASE_LEGACY(&gx_psacram) // chips 20J+23J+18J / S
AM_RANGE(0xf00000, 0xf3ffff) AM_READ(type1_roz_r1) // ROM readback
AM_RANGE(0xf40000, 0xf7ffff) AM_READ(type1_roz_r2) // ROM readback
AM_RANGE(0xf80000, 0xf80fff) AM_RAM // chip 21Q / S
@@ -1208,7 +1208,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gx_type2_map, AS_PROGRAM, 32, konamigx_state )
AM_RANGE(0xcc0000, 0xcc0003) AM_WRITE(esc_w)
- AM_RANGE(0xd90000, 0xd97fff) AM_RAM_WRITE_LEGACY(konamigx_palette_w) AM_SHARE("paletteram")
+ AM_RANGE(0xd90000, 0xd97fff) AM_RAM_WRITE(konamigx_palette_w) AM_SHARE("paletteram")
AM_IMPORT_FROM(gx_base_memmap)
ADDRESS_MAP_END
@@ -1217,7 +1217,7 @@ static ADDRESS_MAP_START( gx_type3_map, AS_PROGRAM, 32, konamigx_state )
//AM_RANGE(0xcc0000, 0xcc0007) AM_WRITE(type4_prot_w)
AM_RANGE(0xe00000, 0xe0001f) AM_RAM AM_BASE_LEGACY((UINT32**)&K053936_0_ctrl)
//AM_RANGE(0xe20000, 0xe20003) AM_WRITENOP
- AM_RANGE(0xe40000, 0xe40003) AM_WRITE_LEGACY(konamigx_type3_psac2_bank_w) AM_BASE_LEGACY(&konamigx_type3_psac2_bank)
+ AM_RANGE(0xe40000, 0xe40003) AM_WRITE(konamigx_type3_psac2_bank_w) AM_BASE_LEGACY(&konamigx_type3_psac2_bank)
AM_RANGE(0xe60000, 0xe60fff) AM_RAM AM_BASE_LEGACY((UINT32**)&K053936_0_linectrl)
AM_RANGE(0xe80000, 0xe83fff) AM_RAM AM_SHARE("paletteram") // main monitor palette
AM_RANGE(0xea0000, 0xea3fff) AM_RAM AM_BASE_LEGACY(&gx_subpaletteram32)
@@ -1236,7 +1236,7 @@ static ADDRESS_MAP_START( gx_type4_map, AS_PROGRAM, 32, konamigx_state )
AM_RANGE(0xe80000, 0xe87fff) AM_RAM AM_SHARE("paletteram") // 11G/13G/15G (main screen palette RAM)
AM_RANGE(0xea0000, 0xea7fff) AM_RAM AM_BASE_LEGACY(&gx_subpaletteram32) // 5G/7G/9G (sub screen palette RAM)
AM_RANGE(0xec0000, 0xec0003) AM_READ(type3_sync_r) // type 4 polls this too
- AM_RANGE(0xf00000, 0xf07fff) AM_RAM_WRITE_LEGACY(konamigx_t4_psacmap_w) AM_BASE_LEGACY(&gx_psacram) // PSAC2 tilemap
+ AM_RANGE(0xf00000, 0xf07fff) AM_RAM_WRITE(konamigx_t4_psacmap_w) AM_BASE_LEGACY(&gx_psacram) // PSAC2 tilemap
// AM_RANGE(0xf00000, 0xf07fff) AM_RAM
AM_IMPORT_FROM(gx_base_memmap)
ADDRESS_MAP_END
@@ -1262,27 +1262,27 @@ static INTERRUPT_GEN(tms_sync)
READ16_MEMBER(konamigx_state::tms57002_data_word_r)
{
- return machine().device<tms57002_device>("dasp")->data_r(*&space, 0);
+ return machine().device<tms57002_device>("dasp")->data_r(space, 0);
}
WRITE16_MEMBER(konamigx_state::tms57002_data_word_w)
{
if (ACCESSING_BITS_0_7)
- machine().device<tms57002_device>("dasp")->data_w(*&space, 0, data);
+ machine().device<tms57002_device>("dasp")->data_w(space, 0, data);
}
READ16_MEMBER(konamigx_state::tms57002_status_word_r)
{
- return (machine().device<tms57002_device>("dasp")->dready_r(*&space, 0) ? 4 : 0) |
- (machine().device<tms57002_device>("dasp")->empty_r(*&space, 0) ? 1 : 0);
+ return (machine().device<tms57002_device>("dasp")->dready_r(space, 0) ? 4 : 0) |
+ (machine().device<tms57002_device>("dasp")->empty_r(space, 0) ? 1 : 0);
}
WRITE16_MEMBER(konamigx_state::tms57002_control_word_w)
{
if (ACCESSING_BITS_0_7)
{
- machine().device<tms57002_device>("dasp")->pload_w(*&space, 0, data & 4);
- machine().device<tms57002_device>("dasp")->cload_w(*&space, 0, data & 8);
+ machine().device<tms57002_device>("dasp")->pload_w(space, 0, data & 4);
+ machine().device<tms57002_device>("dasp")->cload_w(space, 0, data & 8);
cputag_set_input_line(machine(), "dasp", INPUT_LINE_RESET, !(data & 16) ? ASSERT_LINE : CLEAR_LINE);
}
}
diff --git a/src/mame/drivers/kongambl.c b/src/mame/drivers/kongambl.c
index cf4c0d5f939..6cb1efa5389 100644
--- a/src/mame/drivers/kongambl.c
+++ b/src/mame/drivers/kongambl.c
@@ -19,11 +19,11 @@
#include "machine/eeprom.h"
-class kongambl_state : public driver_device
+class kongambl_state : public konamigx_state
{
public:
kongambl_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag) { }
+ : konamigx_state(mconfig, type, tag) { }
DECLARE_READ32_MEMBER(eeprom_r);
DECLARE_WRITE32_MEMBER(eeprom_w);
@@ -85,7 +85,7 @@ static ADDRESS_MAP_START( kongambl_map, AS_PROGRAM, 32, kongambl_state )
AM_RANGE(0x440000, 0x443fff) AM_RAM
- AM_RANGE(0x460000, 0x47ffff) AM_RAM_WRITE_LEGACY(konamigx_palette_w) AM_SHARE("paletteram")
+ AM_RANGE(0x460000, 0x47ffff) AM_RAM_WRITE(konamigx_palette_w) AM_SHARE("paletteram")
AM_RANGE(0x480000, 0x48003f) AM_DEVWRITE_LEGACY("k056832", k056832_long_w)
diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c
index b8a2d3a1634..fb65514b884 100644
--- a/src/mame/drivers/kopunch.c
+++ b/src/mame/drivers/kopunch.c
@@ -45,8 +45,8 @@ WRITE8_MEMBER(kopunch_state::kopunch_coin_w)
static ADDRESS_MAP_START( kopunch_map, AS_PROGRAM, 8, kopunch_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
- AM_RANGE(0x6000, 0x63ff) AM_RAM_WRITE_LEGACY(kopunch_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x7000, 0x70ff) AM_RAM_WRITE_LEGACY(kopunch_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x6000, 0x63ff) AM_RAM_WRITE(kopunch_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x7000, 0x70ff) AM_RAM_WRITE(kopunch_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0x7100, 0x7aff) AM_RAM // ???
ADDRESS_MAP_END
@@ -62,9 +62,9 @@ static ADDRESS_MAP_START( kopunch_io_map, AS_IO, 8, kopunch_state )
AM_RANGE(0x39, 0x39) AM_WRITENOP
AM_RANGE(0x3a, 0x3a) AM_READ_PORT("DSW")
AM_RANGE(0x3b, 0x3b) AM_WRITENOP
- AM_RANGE(0x3c, 0x3c) AM_WRITE_LEGACY(kopunch_scroll_x_w)
- AM_RANGE(0x3d, 0x3d) AM_WRITE_LEGACY(kopunch_scroll_y_w)
- AM_RANGE(0x3e, 0x3e) AM_READ_PORT("P2") AM_WRITE_LEGACY(kopunch_gfxbank_w)
+ AM_RANGE(0x3c, 0x3c) AM_WRITE(kopunch_scroll_x_w)
+ AM_RANGE(0x3d, 0x3d) AM_WRITE(kopunch_scroll_y_w)
+ AM_RANGE(0x3e, 0x3e) AM_READ_PORT("P2") AM_WRITE(kopunch_gfxbank_w)
AM_RANGE(0x3f, 0x3f) AM_WRITENOP
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index 34d2e22e1a5..f74d67dfbfa 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -110,12 +110,12 @@ static ADDRESS_MAP_START( maincpu_map, AS_PROGRAM, 8, ksayakyu_state )
AM_RANGE(0xa801, 0xa801) AM_READ_PORT("P2")
AM_RANGE(0xa802, 0xa802) AM_READ_PORT("DSW")
AM_RANGE(0xa803, 0xa803) AM_READNOP /* watchdog ? */
- AM_RANGE(0xa804, 0xa804) AM_WRITE_LEGACY(ksayakyu_videoctrl_w)
+ AM_RANGE(0xa804, 0xa804) AM_WRITE(ksayakyu_videoctrl_w)
AM_RANGE(0xa805, 0xa805) AM_WRITE(latch_w)
AM_RANGE(0xa806, 0xa806) AM_READ(sound_status_r)
AM_RANGE(0xa807, 0xa807) AM_READNOP /* watchdog ? */
AM_RANGE(0xa808, 0xa808) AM_WRITE(bank_select_w)
- AM_RANGE(0xb000, 0xb7ff) AM_RAM_WRITE_LEGACY(ksayakyu_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xb000, 0xb7ff) AM_RAM_WRITE(ksayakyu_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xb800, 0xbfff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index 669d59ddf2a..59d1e2aa530 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -35,14 +35,14 @@
static ADDRESS_MAP_START( kyugo_main_map, AS_PROGRAM, 8, kyugo_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(kyugo_bgvideoram_w) AM_BASE(m_bgvideoram)
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(kyugo_bgattribram_w) AM_BASE(m_bgattribram)
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(kyugo_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0x9800, 0x9fff) AM_RAM_READ_LEGACY(kyugo_spriteram_2_r) AM_BASE(m_spriteram_2)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(kyugo_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(kyugo_bgattribram_w) AM_BASE(m_bgattribram)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(kyugo_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x9800, 0x9fff) AM_RAM_READ(kyugo_spriteram_2_r) AM_BASE(m_spriteram_2)
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE(m_spriteram_1)
- AM_RANGE(0xa800, 0xa800) AM_WRITE_LEGACY(kyugo_scroll_x_lo_w)
- AM_RANGE(0xb000, 0xb000) AM_WRITE_LEGACY(kyugo_gfxctrl_w)
- AM_RANGE(0xb800, 0xb800) AM_WRITE_LEGACY(kyugo_scroll_y_w)
+ AM_RANGE(0xa800, 0xa800) AM_WRITE(kyugo_scroll_x_lo_w)
+ AM_RANGE(0xb000, 0xb000) AM_WRITE(kyugo_gfxctrl_w)
+ AM_RANGE(0xb800, 0xb800) AM_WRITE(kyugo_scroll_y_w)
AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("share1") AM_BASE(m_shared_ram)
ADDRESS_MAP_END
@@ -68,7 +68,7 @@ WRITE8_MEMBER(kyugo_state::kyugo_sub_cpu_control_w)
static ADDRESS_MAP_START( kyugo_main_portmap, AS_IO, 8, kyugo_state )
ADDRESS_MAP_GLOBAL_MASK(0x07)
AM_RANGE(0x00, 0x00) AM_WRITE(kyugo_nmi_mask_w)
- AM_RANGE(0x01, 0x01) AM_WRITE_LEGACY(kyugo_flipscreen_w)
+ AM_RANGE(0x01, 0x01) AM_WRITE(kyugo_flipscreen_w)
AM_RANGE(0x02, 0x02) AM_WRITE(kyugo_sub_cpu_control_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c
index ee7f12f0b4f..01ee0ca5e67 100644
--- a/src/mame/drivers/labyrunr.c
+++ b/src/mame/drivers/labyrunr.c
@@ -55,8 +55,8 @@ static ADDRESS_MAP_START( labyrunr_map, AS_PROGRAM, 8, labyrunr_state )
AM_RANGE(0x1000, 0x10ff) AM_RAM AM_BASE(m_paletteram)
AM_RANGE(0x1800, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2fff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE_LEGACY(labyrunr_vram1_w) AM_BASE(m_videoram1)
- AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE_LEGACY(labyrunr_vram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(labyrunr_vram1_w) AM_BASE(m_videoram1)
+ AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE(labyrunr_vram2_w) AM_BASE(m_videoram2)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index 10d8654e02a..327dbf504b6 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -133,11 +133,11 @@ static ADDRESS_MAP_START( ladybug_map, AS_PROGRAM, 8, ladybug_state )
AM_RANGE(0x9001, 0x9001) AM_READ_PORT("IN1")
AM_RANGE(0x9002, 0x9002) AM_READ_PORT("DSW0")
AM_RANGE(0x9003, 0x9003) AM_READ_PORT("DSW1")
- AM_RANGE(0xa000, 0xa000) AM_WRITE_LEGACY(ladybug_flipscreen_w)
+ AM_RANGE(0xa000, 0xa000) AM_WRITE(ladybug_flipscreen_w)
AM_RANGE(0xb000, 0xbfff) AM_DEVWRITE_LEGACY("sn1", sn76496_w)
AM_RANGE(0xc000, 0xcfff) AM_DEVWRITE_LEGACY("sn2", sn76496_w)
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(ladybug_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE_LEGACY(ladybug_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(ladybug_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(ladybug_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xe000, 0xe000) AM_READ_PORT("IN2")
ADDRESS_MAP_END
@@ -153,8 +153,8 @@ static ADDRESS_MAP_START( sraider_cpu1_map, AS_PROGRAM, 8, ladybug_state )
AM_RANGE(0x9001, 0x9001) AM_READ_PORT("IN1")
AM_RANGE(0x9002, 0x9002) AM_READ_PORT("DSW0")
AM_RANGE(0x9003, 0x9003) AM_READ_PORT("DSW1")
- AM_RANGE(0xd000, 0xd3ff) AM_WRITE_LEGACY(ladybug_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd400, 0xd7ff) AM_WRITE_LEGACY(ladybug_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xd000, 0xd3ff) AM_WRITE(ladybug_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd400, 0xd7ff) AM_WRITE(ladybug_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xe000, 0xe000) AM_WRITENOP //unknown 0x10 when in attract, 0x20 when coined/playing
ADDRESS_MAP_END
@@ -166,7 +166,7 @@ static ADDRESS_MAP_START( sraider_cpu2_map, AS_PROGRAM, 8, ladybug_state )
AM_RANGE(0xa000, 0xa000) AM_READ(sraider_sound_high_r)
AM_RANGE(0xc000, 0xc000) AM_READNOP //some kind of sync
AM_RANGE(0xe000, 0xe0ff) AM_WRITEONLY AM_BASE(m_grid_data)
- AM_RANGE(0xe800, 0xe800) AM_WRITE_LEGACY(sraider_io_w)
+ AM_RANGE(0xe800, 0xe800) AM_WRITE(sraider_io_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index 9aec361e1e6..42678e96c5e 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -130,8 +130,8 @@ READ8_MEMBER(ladyfrog_state::snd_flag_r)
static ADDRESS_MAP_START( ladyfrog_map, AS_PROGRAM, 8, ladyfrog_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc07f) AM_RAM
- AM_RANGE(0xc080, 0xc87f) AM_READWRITE_LEGACY(ladyfrog_videoram_r, ladyfrog_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0xd000, 0xd000) AM_WRITE_LEGACY(ladyfrog_gfxctrl2_w)
+ AM_RANGE(0xc080, 0xc87f) AM_READWRITE(ladyfrog_videoram_r, ladyfrog_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xd000, 0xd000) AM_WRITE(ladyfrog_gfxctrl2_w)
AM_RANGE(0xd400, 0xd400) AM_READWRITE(from_snd_r, sound_command_w)
AM_RANGE(0xd401, 0xd401) AM_READ(snd_flag_r)
AM_RANGE(0xd403, 0xd403) AM_WRITE(sound_cpu_reset_w)
@@ -139,12 +139,12 @@ static ADDRESS_MAP_START( ladyfrog_map, AS_PROGRAM, 8, ladyfrog_state )
AM_RANGE(0xd801, 0xd801) AM_READ_PORT("DSW2")
AM_RANGE(0xd804, 0xd804) AM_READ_PORT("INPUTS")
AM_RANGE(0xd806, 0xd806) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE_LEGACY(ladyfrog_spriteram_r,ladyfrog_spriteram_w)
- AM_RANGE(0xdca0, 0xdcbf) AM_READWRITE_LEGACY(ladyfrog_scrlram_r, ladyfrog_scrlram_w) AM_BASE(m_scrlram)
+ AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE(ladyfrog_spriteram_r,ladyfrog_spriteram_w)
+ AM_RANGE(0xdca0, 0xdcbf) AM_READWRITE(ladyfrog_scrlram_r, ladyfrog_scrlram_w) AM_BASE(m_scrlram)
AM_RANGE(0xdcc0, 0xdcff) AM_RAM
- AM_RANGE(0xdd00, 0xdeff) AM_READWRITE_LEGACY(ladyfrog_palette_r, ladyfrog_palette_w)
+ AM_RANGE(0xdd00, 0xdeff) AM_READWRITE(ladyfrog_palette_r, ladyfrog_palette_w)
AM_RANGE(0xd0d0, 0xd0d0) AM_READNOP /* code jumps to ASCII text "Alfa tecnology" @ $b7 */
- AM_RANGE(0xdf03, 0xdf03) AM_WRITE_LEGACY(ladyfrog_gfxctrl_w)
+ AM_RANGE(0xdf03, 0xdf03) AM_WRITE(ladyfrog_gfxctrl_w)
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c
index f9ae1b21839..215372df550 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -79,13 +79,13 @@ WRITE8_MEMBER(lasso_state::sound_select_w)
static ADDRESS_MAP_START( lasso_main_map, AS_PROGRAM, 8, lasso_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM
- AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE_LEGACY(lasso_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE_LEGACY(lasso_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(lasso_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(lasso_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x0c00, 0x0c7f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x1000, 0x17ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1800, 0x1800) AM_WRITE(sound_command_w)
AM_RANGE(0x1801, 0x1801) AM_WRITEONLY AM_BASE(m_back_color)
- AM_RANGE(0x1802, 0x1802) AM_WRITE_LEGACY(lasso_video_control_w)
+ AM_RANGE(0x1802, 0x1802) AM_WRITE(lasso_video_control_w)
AM_RANGE(0x1804, 0x1804) AM_READ_PORT("1804")
AM_RANGE(0x1805, 0x1805) AM_READ_PORT("1805")
AM_RANGE(0x1806, 0x1806) AM_READ_PORT("1806") AM_WRITENOP /* game uses 'lsr' to read port */
@@ -114,14 +114,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( chameleo_main_map, AS_PROGRAM, 8, lasso_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM
- AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE_LEGACY(lasso_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE_LEGACY(lasso_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(lasso_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(lasso_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x0c00, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x107f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x1080, 0x10ff) AM_RAM
AM_RANGE(0x1800, 0x1800) AM_WRITE(sound_command_w)
AM_RANGE(0x1801, 0x1801) AM_WRITEONLY AM_BASE(m_back_color)
- AM_RANGE(0x1802, 0x1802) AM_WRITE_LEGACY(lasso_video_control_w)
+ AM_RANGE(0x1802, 0x1802) AM_WRITE(lasso_video_control_w)
AM_RANGE(0x1804, 0x1804) AM_READ_PORT("1804")
AM_RANGE(0x1805, 0x1805) AM_READ_PORT("1805")
AM_RANGE(0x1806, 0x1806) AM_READ_PORT("1806")
@@ -145,12 +145,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( wwjgtin_main_map, AS_PROGRAM, 8, lasso_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
- AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE_LEGACY(lasso_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE_LEGACY(lasso_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(lasso_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(lasso_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x1000, 0x10ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x1800, 0x1800) AM_WRITE(sound_command_w)
AM_RANGE(0x1801, 0x1801) AM_WRITEONLY AM_BASE(m_back_color)
- AM_RANGE(0x1802, 0x1802) AM_WRITE_LEGACY(wwjgtin_video_control_w)
+ AM_RANGE(0x1802, 0x1802) AM_WRITE(wwjgtin_video_control_w)
AM_RANGE(0x1804, 0x1804) AM_READ_PORT("1804")
AM_RANGE(0x1805, 0x1805) AM_READ_PORT("1805")
AM_RANGE(0x1806, 0x1806) AM_READ_PORT("1806")
@@ -175,12 +175,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pinbo_main_map, AS_PROGRAM, 8, lasso_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM
- AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE_LEGACY(lasso_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE_LEGACY(lasso_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(lasso_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(lasso_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x1000, 0x10ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x1800, 0x1800) AM_WRITE(pinbo_sound_command_w)
AM_RANGE(0x1801, 0x1801) AM_WRITEONLY AM_BASE(m_back_color)
- AM_RANGE(0x1802, 0x1802) AM_WRITE_LEGACY(pinbo_video_control_w)
+ AM_RANGE(0x1802, 0x1802) AM_WRITE(pinbo_video_control_w)
AM_RANGE(0x1804, 0x1804) AM_READ_PORT("1804")
AM_RANGE(0x1805, 0x1805) AM_READ_PORT("1805")
AM_RANGE(0x1806, 0x1806) AM_READ_PORT("1806")
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index 26d0c038235..60c899577cb 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -136,30 +136,30 @@ static ADDRESS_MAP_START( lastduel_map, AS_PROGRAM, 16, lastduel_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0xfc0000, 0xfc0003) AM_WRITENOP /* Written rarely */
AM_RANGE(0xfc0800, 0xfc0fff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xfc4000, 0xfc4001) AM_READ_PORT("P1_P2") AM_WRITE_LEGACY(lastduel_flip_w)
+ AM_RANGE(0xfc4000, 0xfc4001) AM_READ_PORT("P1_P2") AM_WRITE(lastduel_flip_w)
AM_RANGE(0xfc4002, 0xfc4003) AM_READ_PORT("SYSTEM") AM_WRITE(lastduel_sound_w)
AM_RANGE(0xfc4004, 0xfc4005) AM_READ_PORT("DSW1")
AM_RANGE(0xfc4006, 0xfc4007) AM_READ_PORT("DSW2")
- AM_RANGE(0xfc8000, 0xfc800f) AM_WRITE_LEGACY(lastduel_scroll_w)
- AM_RANGE(0xfcc000, 0xfcdfff) AM_RAM_WRITE_LEGACY(lastduel_vram_w) AM_BASE(m_vram)
- AM_RANGE(0xfd0000, 0xfd3fff) AM_RAM_WRITE_LEGACY(lastduel_scroll1_w) AM_BASE(m_scroll1)
- AM_RANGE(0xfd4000, 0xfd7fff) AM_RAM_WRITE_LEGACY(lastduel_scroll2_w) AM_BASE(m_scroll2)
- AM_RANGE(0xfd8000, 0xfd87ff) AM_RAM_WRITE_LEGACY(lastduel_palette_word_w) AM_BASE(m_paletteram)
+ AM_RANGE(0xfc8000, 0xfc800f) AM_WRITE(lastduel_scroll_w)
+ AM_RANGE(0xfcc000, 0xfcdfff) AM_RAM_WRITE(lastduel_vram_w) AM_BASE(m_vram)
+ AM_RANGE(0xfd0000, 0xfd3fff) AM_RAM_WRITE(lastduel_scroll1_w) AM_BASE(m_scroll1)
+ AM_RANGE(0xfd4000, 0xfd7fff) AM_RAM_WRITE(lastduel_scroll2_w) AM_BASE(m_scroll2)
+ AM_RANGE(0xfd8000, 0xfd87ff) AM_RAM_WRITE(lastduel_palette_word_w) AM_BASE(m_paletteram)
AM_RANGE(0xfe0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( madgear_map, AS_PROGRAM, 16, lastduel_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0xfc1800, 0xfc1fff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xfc4000, 0xfc4001) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(lastduel_flip_w)
+ AM_RANGE(0xfc4000, 0xfc4001) AM_READ_PORT("DSW1") AM_WRITE(lastduel_flip_w)
AM_RANGE(0xfc4002, 0xfc4003) AM_READ_PORT("DSW2") AM_WRITE(lastduel_sound_w)
AM_RANGE(0xfc4004, 0xfc4005) AM_READ_PORT("P1_P2")
AM_RANGE(0xfc4006, 0xfc4007) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xfc8000, 0xfc9fff) AM_RAM_WRITE_LEGACY(lastduel_vram_w) AM_BASE(m_vram)
- AM_RANGE(0xfcc000, 0xfcc7ff) AM_RAM_WRITE_LEGACY(lastduel_palette_word_w) AM_BASE(m_paletteram)
- AM_RANGE(0xfd0000, 0xfd000f) AM_WRITE_LEGACY(lastduel_scroll_w)
- AM_RANGE(0xfd4000, 0xfd7fff) AM_RAM_WRITE_LEGACY(madgear_scroll1_w) AM_BASE(m_scroll1)
- AM_RANGE(0xfd8000, 0xfdffff) AM_RAM_WRITE_LEGACY(madgear_scroll2_w) AM_BASE(m_scroll2)
+ AM_RANGE(0xfc8000, 0xfc9fff) AM_RAM_WRITE(lastduel_vram_w) AM_BASE(m_vram)
+ AM_RANGE(0xfcc000, 0xfcc7ff) AM_RAM_WRITE(lastduel_palette_word_w) AM_BASE(m_paletteram)
+ AM_RANGE(0xfd0000, 0xfd000f) AM_WRITE(lastduel_scroll_w)
+ AM_RANGE(0xfd4000, 0xfd7fff) AM_RAM_WRITE(madgear_scroll1_w) AM_BASE(m_scroll1)
+ AM_RANGE(0xfd8000, 0xfdffff) AM_RAM_WRITE(madgear_scroll2_w) AM_BASE(m_scroll2)
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index de50f0fa328..996b3c5a8da 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -83,10 +83,10 @@ static ADDRESS_MAP_START( legionna_map, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE_LEGACY(legionna_mcu_r, legionna_mcu_w) AM_BASE_LEGACY(&cop_mcu_ram) /* COP mcu */
- AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE_LEGACY(legionna_background_w) AM_BASE(m_back_data)
- AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE_LEGACY(legionna_foreground_w) AM_BASE(m_fore_data)
- AM_RANGE(0x102000, 0x1027ff) AM_RAM_WRITE_LEGACY(legionna_midground_w) AM_BASE(m_mid_data)
- AM_RANGE(0x102800, 0x1037ff) AM_RAM_WRITE_LEGACY(legionna_text_w) AM_BASE(m_textram)
+ AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(legionna_background_w) AM_BASE(m_back_data)
+ AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
+ AM_RANGE(0x102000, 0x1027ff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
+ AM_RANGE(0x102800, 0x1037ff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* palette xRRRRxGGGGxBBBBx ? */
AM_RANGE(0x105000, 0x105fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x106000, 0x107fff) AM_RAM
@@ -98,10 +98,10 @@ static ADDRESS_MAP_START( heatbrl_map, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE_LEGACY(heatbrl_mcu_r, heatbrl_mcu_w) AM_BASE_LEGACY(&cop_mcu_ram) /* COP mcu */
- AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE_LEGACY(legionna_background_w) AM_BASE(m_back_data)
- AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE_LEGACY(legionna_foreground_w) AM_BASE(m_fore_data)
- AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE_LEGACY(legionna_midground_w) AM_BASE(m_mid_data)
- AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE_LEGACY(legionna_text_w) AM_BASE(m_textram)
+ AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE(legionna_background_w) AM_BASE(m_back_data)
+ AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
+ AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
+ AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
AM_RANGE(0x103000, 0x103fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x108000, 0x11ffff) AM_RAM
@@ -112,10 +112,10 @@ static ADDRESS_MAP_START( godzilla_map, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE_LEGACY(godzilla_mcu_r, godzilla_mcu_w) AM_BASE_LEGACY(&cop_mcu_ram) /* COP mcu */
AM_RANGE(0x100800, 0x100fff) AM_RAM
- AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE_LEGACY(legionna_background_w) AM_BASE(m_back_data)
- AM_RANGE(0x102000, 0x1027ff) AM_RAM_WRITE_LEGACY(legionna_midground_w) AM_BASE(m_mid_data)
- AM_RANGE(0x102800, 0x1037ff) AM_RAM_WRITE_LEGACY(legionna_text_w) AM_BASE(m_textram)
- AM_RANGE(0x103800, 0x103fff) AM_RAM_WRITE_LEGACY(legionna_foreground_w) AM_BASE(m_fore_data)
+ AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(legionna_background_w) AM_BASE(m_back_data)
+ AM_RANGE(0x102000, 0x1027ff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
+ AM_RANGE(0x102800, 0x1037ff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
+ AM_RANGE(0x103800, 0x103fff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x105000, 0x105fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x106000, 0x1067ff) AM_RAM
@@ -137,10 +137,10 @@ static ADDRESS_MAP_START( denjinmk_map, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE_LEGACY(denjinmk_mcu_r, denjinmk_mcu_w) AM_BASE_LEGACY(&cop_mcu_ram) /* COP mcu */
AM_RANGE(0x100800, 0x100fff) AM_RAM
- AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE_LEGACY(legionna_background_w) AM_BASE(m_back_data)
- AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE_LEGACY(legionna_foreground_w) AM_BASE(m_fore_data)
- AM_RANGE(0x102000, 0x1027ff) AM_RAM_WRITE_LEGACY(legionna_midground_w) AM_BASE(m_mid_data)
- AM_RANGE(0x102800, 0x103fff) AM_RAM_WRITE_LEGACY(legionna_text_w) AM_BASE(m_textram)
+ AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(legionna_background_w) AM_BASE(m_back_data)
+ AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
+ AM_RANGE(0x102000, 0x1027ff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
+ AM_RANGE(0x102800, 0x103fff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(denjin_paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x105000, 0x105fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x106000, 0x107fff) AM_RAM
@@ -153,10 +153,10 @@ static ADDRESS_MAP_START( grainbow_map, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE_LEGACY(grainbow_mcu_r, grainbow_mcu_w) AM_BASE_LEGACY(&cop_mcu_ram) /* COP mcu */
- AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE_LEGACY(legionna_background_w) AM_BASE(m_back_data)
- AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE_LEGACY(legionna_foreground_w) AM_BASE(m_fore_data)
- AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE_LEGACY(legionna_midground_w) AM_BASE(m_mid_data)
- AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE_LEGACY(legionna_text_w) AM_BASE(m_textram)
+ AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE(legionna_background_w) AM_BASE(m_back_data)
+ AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
+ AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
+ AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x104000, 0x104fff) AM_RAM//_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x105000, 0x105fff) AM_RAM
@@ -169,10 +169,10 @@ static ADDRESS_MAP_START( cupsoc_mem, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE_LEGACY(cupsoc_mcu_r,cupsoc_mcu_w) AM_BASE_LEGACY(&cop_mcu_ram)
- AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE_LEGACY(legionna_background_w) AM_BASE(m_back_data)
- AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE_LEGACY(legionna_foreground_w) AM_BASE(m_fore_data)
- AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE_LEGACY(legionna_midground_w) AM_BASE(m_mid_data)
- AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE_LEGACY(legionna_text_w) AM_BASE(m_textram)
+ AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE(legionna_background_w) AM_BASE(m_back_data)
+ AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
+ AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
+ AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x104000, 0x104fff) AM_RAM
AM_RANGE(0x105000, 0x106fff) AM_RAM
@@ -188,10 +188,10 @@ static ADDRESS_MAP_START( cupsocs_mem, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE_LEGACY(cupsocs_mcu_r,cupsocs_mcu_w) AM_BASE_LEGACY(&cop_mcu_ram)
- AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE_LEGACY(legionna_background_w) AM_BASE(m_back_data)
- AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE_LEGACY(legionna_foreground_w) AM_BASE(m_fore_data)
- AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE_LEGACY(legionna_midground_w) AM_BASE(m_mid_data)
- AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE_LEGACY(legionna_text_w) AM_BASE(m_textram)
+ AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE(legionna_background_w) AM_BASE(m_back_data)
+ AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
+ AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
+ AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x104000, 0x104fff) AM_RAM
AM_RANGE(0x105000, 0x106fff) AM_RAM
@@ -207,10 +207,10 @@ static ADDRESS_MAP_START( cupsocbl_mem, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
//AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100000, 0x1007ff) AM_READWRITE_LEGACY(copdxbl_0_r,copdxbl_0_w) AM_BASE_LEGACY(&cop_mcu_ram)
- AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE_LEGACY(legionna_background_w) AM_BASE(m_back_data)
- AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE_LEGACY(legionna_foreground_w) AM_BASE(m_fore_data)
- AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE_LEGACY(legionna_midground_w) AM_BASE(m_mid_data)
- AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE_LEGACY(legionna_text_w) AM_BASE(m_textram)
+ AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE(legionna_background_w) AM_BASE(m_back_data)
+ AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
+ AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
+ AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x104000, 0x104fff) AM_RAM
AM_RANGE(0x105000, 0x106fff) AM_RAM
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index b3353d0c757..5c29bad6b18 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -65,19 +65,19 @@
static ADDRESS_MAP_START( master_map_program, AS_PROGRAM, 8, leland_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x9fff) AM_ROMBANK("bank1")
- AM_RANGE(0xa000, 0xdfff) AM_ROMBANK("bank2") AM_WRITE_LEGACY(leland_battery_ram_w) AM_SHARE("battery")
+ AM_RANGE(0xa000, 0xdfff) AM_ROMBANK("bank2") AM_WRITE(leland_battery_ram_w) AM_SHARE("battery")
AM_RANGE(0xe000, 0xefff) AM_RAM
- AM_RANGE(0xf000, 0xf3ff) AM_READWRITE_LEGACY(leland_gated_paletteram_r, leland_gated_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0xf800, 0xf801) AM_WRITE_LEGACY(leland_master_video_addr_w)
+ AM_RANGE(0xf000, 0xf3ff) AM_READWRITE(leland_gated_paletteram_r, leland_gated_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf800, 0xf801) AM_WRITE(leland_master_video_addr_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( master_map_io, AS_IO, 8, leland_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0xf0, 0xf0) AM_WRITE_LEGACY(leland_master_alt_bankswitch_w)
+ AM_RANGE(0xf0, 0xf0) AM_WRITE(leland_master_alt_bankswitch_w)
AM_RANGE(0xf2, 0xf2) AM_DEVREADWRITE_LEGACY("custom", leland_80186_response_r, leland_80186_command_lo_w)
AM_RANGE(0xf4, 0xf4) AM_DEVWRITE_LEGACY("custom", leland_80186_command_hi_w)
- AM_RANGE(0xfd, 0xff) AM_READWRITE_LEGACY(leland_master_analog_key_r, leland_master_analog_key_w)
+ AM_RANGE(0xfd, 0xff) AM_READWRITE(leland_master_analog_key_r, leland_master_analog_key_w)
ADDRESS_MAP_END
@@ -92,26 +92,26 @@ static ADDRESS_MAP_START( slave_small_map_program, AS_PROGRAM, 8, leland_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0xdfff) AM_ROMBANK("bank3")
AM_RANGE(0xe000, 0xefff) AM_RAM
- AM_RANGE(0xf800, 0xf801) AM_WRITE_LEGACY(leland_slave_video_addr_w)
- AM_RANGE(0xf802, 0xf802) AM_READ_LEGACY(leland_raster_r)
- AM_RANGE(0xf803, 0xf803) AM_WRITE_LEGACY(leland_slave_small_banksw_w)
+ AM_RANGE(0xf800, 0xf801) AM_WRITE(leland_slave_video_addr_w)
+ AM_RANGE(0xf802, 0xf802) AM_READ(leland_raster_r)
+ AM_RANGE(0xf803, 0xf803) AM_WRITE(leland_slave_small_banksw_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( slave_large_map_program, AS_PROGRAM, 8, leland_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank3")
- AM_RANGE(0xc000, 0xc000) AM_WRITE_LEGACY(leland_slave_large_banksw_w)
+ AM_RANGE(0xc000, 0xc000) AM_WRITE(leland_slave_large_banksw_w)
AM_RANGE(0xe000, 0xefff) AM_RAM
- AM_RANGE(0xf800, 0xf801) AM_WRITE_LEGACY(leland_slave_video_addr_w)
- AM_RANGE(0xf802, 0xf802) AM_READ_LEGACY(leland_raster_r)
+ AM_RANGE(0xf800, 0xf801) AM_WRITE(leland_slave_video_addr_w)
+ AM_RANGE(0xf802, 0xf802) AM_READ(leland_raster_r)
ADDRESS_MAP_END
static ADDRESS_MAP_START( slave_map_io, AS_IO, 8, leland_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x1f) AM_READWRITE_LEGACY(leland_svram_port_r, leland_svram_port_w)
- AM_RANGE(0x40, 0x5f) AM_READWRITE_LEGACY(leland_svram_port_r, leland_svram_port_w)
+ AM_RANGE(0x00, 0x1f) AM_READWRITE(leland_svram_port_r, leland_svram_port_w)
+ AM_RANGE(0x40, 0x5f) AM_READWRITE(leland_svram_port_r, leland_svram_port_w)
ADDRESS_MAP_END
@@ -1980,12 +1980,13 @@ ROM_END
static void init_master_ports(running_machine &machine, UINT8 mvram_base, UINT8 io_base)
{
+ leland_state *state = machine.driver_data<leland_state>();
/* set up the master CPU VRAM I/O */
- machine.device("master")->memory().space(AS_IO)->install_legacy_readwrite_handler(mvram_base, mvram_base + 0x1f, FUNC(leland_mvram_port_r), FUNC(leland_mvram_port_w));
+ machine.device("master")->memory().space(AS_IO)->install_readwrite_handler(mvram_base, mvram_base + 0x1f, read8_delegate(FUNC(leland_state::leland_mvram_port_r),state), write8_delegate(FUNC(leland_state::leland_mvram_port_w),state));
/* set up the master CPU I/O ports */
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(io_base, io_base + 0x1f, FUNC(leland_master_input_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_write_handler(io_base, io_base + 0x0f, FUNC(leland_master_output_w));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(io_base, io_base + 0x1f, read8_delegate(FUNC(leland_state::leland_master_input_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_write_handler(io_base, io_base + 0x0f, write8_delegate(FUNC(leland_state::leland_master_output_w),state));
}
@@ -2001,9 +2002,9 @@ static DRIVER_INIT( cerberus )
/* set up the master CPU I/O ports */
init_master_ports(machine, 0x40, 0x80);
- /* set up additional input ports */
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0x80, 0x80, FUNC(cerberus_dial_1_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0x90, 0x90, FUNC(cerberus_dial_2_r));
+ /* set up additional input ports */
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0x80, 0x80, read8_delegate(FUNC(leland_state::cerberus_dial_1_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0x90, 0x90, read8_delegate(FUNC(leland_state::cerberus_dial_2_r),state));
}
@@ -2052,7 +2053,7 @@ static DRIVER_INIT( alleymas )
/* kludge warning: the game uses location E0CA to determine if the joysticks are available */
/* it gets cleared by the code, but there is no obvious way for the value to be set to a */
/* non-zero value. If the value is zero, the joystick is never read. */
- state->m_alleymas_kludge_mem = machine.device("master")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xe0ca, 0xe0ca, FUNC(alleymas_joystick_kludge));
+ state->m_alleymas_kludge_mem = machine.device("master")->memory().space(AS_PROGRAM)->install_write_handler(0xe0ca, 0xe0ca, write8_delegate(FUNC(leland_state::alleymas_joystick_kludge),state));
}
@@ -2077,9 +2078,9 @@ static DRIVER_INIT( dangerz )
init_master_ports(machine, 0x40, 0x80);
/* set up additional input ports */
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xf4, 0xf4, FUNC(dangerz_input_upper_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xf8, 0xf8, FUNC(dangerz_input_y_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xfc, 0xfc, FUNC(dangerz_input_x_r));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xf4, 0xf4, read8_delegate(FUNC(leland_state::dangerz_input_upper_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::dangerz_input_y_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xfc, 0xfc, read8_delegate(FUNC(leland_state::dangerz_input_x_r),state));
}
@@ -2128,10 +2129,10 @@ static DRIVER_INIT( redlin2p )
init_master_ports(machine, 0x00, 0xc0);
/* set up additional input ports */
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xc0, 0xc0, FUNC(redline_pedal_1_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xd0, 0xd0, FUNC(redline_pedal_2_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xf8, 0xf8, FUNC(redline_wheel_2_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xfb, 0xfb, FUNC(redline_wheel_1_r));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xc0, 0xc0, read8_delegate(FUNC(leland_state::redline_pedal_1_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xd0, 0xd0, read8_delegate(FUNC(leland_state::redline_pedal_2_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::redline_wheel_2_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(leland_state::redline_wheel_1_r),state));
}
@@ -2162,9 +2163,9 @@ static DRIVER_INIT( viper )
init_master_ports(machine, 0x00, 0xc0);
/* set up additional input ports */
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xa4, 0xa4, FUNC(dangerz_input_upper_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xb8, 0xb8, FUNC(dangerz_input_y_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xbc, 0xbc, FUNC(dangerz_input_x_r));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xa4, 0xa4, read8_delegate(FUNC(leland_state::dangerz_input_upper_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xb8, 0xb8, read8_delegate(FUNC(leland_state::dangerz_input_y_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xbc, 0xbc, read8_delegate(FUNC(leland_state::dangerz_input_x_r),state));
}
@@ -2259,9 +2260,9 @@ static DRIVER_INIT( offroad )
init_master_ports(machine, 0x40, 0x80); /* yes, this is intentional */
/* set up additional input ports */
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xf8, 0xf8, FUNC(offroad_wheel_3_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xf9, 0xf9, FUNC(offroad_wheel_1_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xfb, 0xfb, FUNC(offroad_wheel_2_r));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::offroad_wheel_3_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xf9, 0xf9, read8_delegate(FUNC(leland_state::offroad_wheel_1_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(leland_state::offroad_wheel_2_r),state));
}
@@ -2279,9 +2280,9 @@ static DRIVER_INIT( offroadt )
init_master_ports(machine, 0x80, 0x40);
/* set up additional input ports */
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xf8, 0xf8, FUNC(offroad_wheel_3_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xf9, 0xf9, FUNC(offroad_wheel_1_r));
- machine.device("master")->memory().space(AS_IO)->install_legacy_read_handler(0xfb, 0xfb, FUNC(offroad_wheel_2_r));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::offroad_wheel_3_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xf9, 0xf9, read8_delegate(FUNC(leland_state::offroad_wheel_1_r),state));
+ machine.device("master")->memory().space(AS_IO)->install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(leland_state::offroad_wheel_2_r),state));
}
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index 9b141caa1fd..4e61d720708 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -102,10 +102,10 @@ static ADDRESS_MAP_START( lemmings_map, AS_PROGRAM, 16, lemmings_state )
AM_RANGE(0x1a0064, 0x1a0065) AM_WRITE(lemmings_sound_w)
AM_RANGE(0x1c0000, 0x1c0001) AM_DEVWRITE("spriteram", buffered_spriteram16_device, write) /* 1 written once a frame */
AM_RANGE(0x1e0000, 0x1e0001) AM_DEVWRITE("spriteram2", buffered_spriteram16_device, write) /* 1 written once a frame */
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE_LEGACY(lemmings_vram_w) AM_BASE(m_vram_data)
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(lemmings_vram_w) AM_BASE(m_vram_data)
AM_RANGE(0x202000, 0x202fff) AM_RAM
- AM_RANGE(0x300000, 0x37ffff) AM_RAM_WRITE_LEGACY(lemmings_pixel_0_w) AM_BASE(m_pixel_0_data)
- AM_RANGE(0x380000, 0x39ffff) AM_RAM_WRITE_LEGACY(lemmings_pixel_1_w) AM_BASE(m_pixel_1_data)
+ AM_RANGE(0x300000, 0x37ffff) AM_RAM_WRITE(lemmings_pixel_0_w) AM_BASE(m_pixel_0_data)
+ AM_RANGE(0x380000, 0x39ffff) AM_RAM_WRITE(lemmings_pixel_1_w) AM_BASE(m_pixel_1_data)
ADDRESS_MAP_END
/******************************************************************************/
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index 8b63218ace6..c550025a3aa 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -464,7 +464,7 @@ static ADDRESS_MAP_START( le_main, AS_PROGRAM, 8, lethal_state )
AM_RANGE(0x4090, 0x4090) AM_READNOP
AM_RANGE(0x40a0, 0x40a0) AM_READNOP
AM_RANGE(0x40c4, 0x40c4) AM_WRITE(control2_w)
- AM_RANGE(0x40c8, 0x40d0) AM_WRITE_LEGACY(lethalen_palette_control) // PCU1-PCU3 on the schematics
+ AM_RANGE(0x40c8, 0x40d0) AM_WRITE(lethalen_palette_control) // PCU1-PCU3 on the schematics
AM_RANGE(0x40d4, 0x40d7) AM_READ(guns_r)
AM_RANGE(0x40d8, 0x40d8) AM_READ_PORT("DSW")
AM_RANGE(0x40d9, 0x40d9) AM_READ_PORT("INPUTS")
diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c
index 9ef4420b0e9..7fe50f9995d 100644
--- a/src/mame/drivers/lethalj.c
+++ b/src/mame/drivers/lethalj.c
@@ -215,11 +215,11 @@ static ADDRESS_MAP_START( lethalj_map, AS_PROGRAM, 16, lethalj_state )
AM_RANGE(0x04100000, 0x0410000f) AM_DEVREADWRITE8("oki3", okim6295_device, read, write, 0x00ff)
// AM_RANGE(0x04100010, 0x0410001f) AM_READNOP /* read but never examined */
AM_RANGE(0x04200000, 0x0420001f) AM_WRITENOP /* clocks bits through here */
- AM_RANGE(0x04300000, 0x0430007f) AM_READ_LEGACY(lethalj_gun_r)
+ AM_RANGE(0x04300000, 0x0430007f) AM_READ(lethalj_gun_r)
AM_RANGE(0x04400000, 0x0440000f) AM_WRITENOP /* clocks bits through here */
AM_RANGE(0x04500010, 0x0450001f) AM_READ_PORT("IN0")
AM_RANGE(0x04600000, 0x0460000f) AM_READ_PORT("IN1")
- AM_RANGE(0x04700000, 0x0470007f) AM_WRITE_LEGACY(lethalj_blitter_w)
+ AM_RANGE(0x04700000, 0x0470007f) AM_WRITE(lethalj_blitter_w)
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE_LEGACY(tms34010_io_register_r, tms34010_io_register_w)
AM_RANGE(0xc0000240, 0xc000025f) AM_WRITENOP /* seems to be a bug in their code, one of many. */
AM_RANGE(0xff800000, 0xffffffff) AM_ROM AM_REGION("user1", 0)
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index 567b6d923ef..7e04abc5810 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -130,7 +130,7 @@ WRITE8_MEMBER(liberate_state::prosoccr_charram_w)
if (m_bank)
{
- prosoccr_io_w(&space, offset & 0x0f, data);
+ prosoccr_io_w(space, offset & 0x0f, data);
}
else
{
@@ -235,15 +235,15 @@ WRITE8_MEMBER(liberate_state::prosport_charram_w)
*************************************/
static ADDRESS_MAP_START( prosport_map, AS_PROGRAM, 8, liberate_state )
- AM_RANGE(0x0200, 0x021f) AM_RAM_WRITE_LEGACY(prosport_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x0200, 0x021f) AM_RAM_WRITE(prosport_paletteram_w) AM_BASE(m_paletteram)
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x2000) AM_RAM
- AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE_LEGACY(prosport_bg_vram_w) AM_BASE(m_bg_vram)
+ AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(prosport_bg_vram_w) AM_BASE(m_bg_vram)
AM_RANGE(0x0800, 0x1fff) AM_READWRITE(prosport_charram_r,prosport_charram_w) //0x1e00-0x1fff isn't charram!
AM_RANGE(0x2400, 0x2fff) AM_RAM
- AM_RANGE(0x3000, 0x33ff) AM_RAM_WRITE_LEGACY(liberate_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x3400, 0x37ff) AM_RAM_WRITE_LEGACY(liberate_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x3000, 0x33ff) AM_RAM_WRITE(liberate_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x3400, 0x37ff) AM_RAM_WRITE(liberate_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x3800, 0x3fff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x8000, 0x800f) AM_WRITE_LEGACY(prosport_io_w)
+ AM_RANGE(0x8000, 0x800f) AM_WRITE(prosport_io_w)
AM_RANGE(0x8000, 0x800f) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -252,11 +252,11 @@ static ADDRESS_MAP_START( liberate_map, AS_PROGRAM, 8, liberate_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x3fff) AM_ROM /* Mirror of main rom */
AM_RANGE(0x4000, 0x7fff) AM_READ(deco16_bank_r)
- AM_RANGE(0x4000, 0x43ff) AM_WRITE_LEGACY(liberate_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x4400, 0x47ff) AM_WRITE_LEGACY(liberate_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4000, 0x43ff) AM_WRITE(liberate_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4400, 0x47ff) AM_WRITE(liberate_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4800, 0x4fff) AM_WRITEONLY AM_BASE(m_spriteram)
AM_RANGE(0x6200, 0x67ff) AM_RAM AM_BASE(m_scratchram)
- AM_RANGE(0x8000, 0x800f) AM_WRITE_LEGACY(deco16_io_w)
+ AM_RANGE(0x8000, 0x800f) AM_WRITE(deco16_io_w)
AM_RANGE(0x8000, 0x800f) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -265,8 +265,8 @@ static ADDRESS_MAP_START( prosoccr_map, AS_PROGRAM, 8, liberate_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x3fff) AM_ROM /* Mirror of main rom */
AM_RANGE(0x4000, 0x7fff) AM_READ(prosoccr_bank_r)
- AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x800) AM_WRITE_LEGACY(liberate_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x4400, 0x47ff) AM_WRITE_LEGACY(liberate_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x800) AM_WRITE(liberate_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4400, 0x47ff) AM_WRITE(liberate_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4c00, 0x4fff) AM_WRITEONLY AM_BASE(m_spriteram)
AM_RANGE(0x6200, 0x67ff) AM_RAM AM_BASE(m_scratchram)
AM_RANGE(0x8000, 0x97ff) AM_READWRITE(prosoccr_charram_r, prosoccr_charram_w)
@@ -289,11 +289,11 @@ static ADDRESS_MAP_START( liberatb_map, AS_PROGRAM, 8, liberate_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x3fff) AM_ROM /* Mirror of main rom */
AM_RANGE(0x4000, 0x7fff) AM_READ(deco16_bank_r)
- AM_RANGE(0x4000, 0x43ff) AM_WRITE_LEGACY(liberate_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x4400, 0x47ff) AM_WRITE_LEGACY(liberate_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4000, 0x43ff) AM_WRITE(liberate_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4400, 0x47ff) AM_WRITE(liberate_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4800, 0x4fff) AM_WRITEONLY AM_BASE(m_spriteram)
AM_RANGE(0x6200, 0x67ff) AM_WRITEONLY AM_BASE(m_scratchram)
- AM_RANGE(0xf000, 0xf00f) AM_WRITE_LEGACY(deco16_io_w)
+ AM_RANGE(0xf000, 0xf00f) AM_WRITE(deco16_io_w)
AM_RANGE(0xf000, 0xf000) AM_READ_PORT("IN1")
AM_RANGE(0xf001, 0xf001) AM_READ_PORT("IN2")
AM_RANGE(0xf002, 0xf002) AM_READ_PORT("IN3")
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index 2e526e17cf3..28ea82d31cb 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -139,7 +139,7 @@ static ADDRESS_MAP_START( lkage_map, AS_PROGRAM, 8, lkage_state )
AM_RANGE(0xf000, 0xf003) AM_RAM AM_BASE(m_vreg) /* video registers */
AM_RANGE(0xf060, 0xf060) AM_WRITE(lkage_sound_command_w)
AM_RANGE(0xf061, 0xf061) AM_WRITENOP AM_READ(sound_status_r)
- AM_RANGE(0xf062, 0xf062) AM_READWRITE_LEGACY(lkage_mcu_r,lkage_mcu_w)
+ AM_RANGE(0xf062, 0xf062) AM_READWRITE(lkage_mcu_r,lkage_mcu_w)
AM_RANGE(0xf063, 0xf063) AM_WRITENOP /* pulsed; nmi on sound cpu? */
AM_RANGE(0xf080, 0xf080) AM_READ_PORT("DSW1")
AM_RANGE(0xf081, 0xf081) AM_READ_PORT("DSW2")
@@ -147,13 +147,13 @@ static ADDRESS_MAP_START( lkage_map, AS_PROGRAM, 8, lkage_state )
AM_RANGE(0xf083, 0xf083) AM_READ_PORT("SYSTEM")
AM_RANGE(0xf084, 0xf084) AM_READ_PORT("P1")
AM_RANGE(0xf086, 0xf086) AM_READ_PORT("P2")
- AM_RANGE(0xf087, 0xf087) AM_READ_LEGACY(lkage_mcu_status_r)
+ AM_RANGE(0xf087, 0xf087) AM_READ(lkage_mcu_status_r)
AM_RANGE(0xf0a0, 0xf0a3) AM_RAM /* unknown */
AM_RANGE(0xf0c0, 0xf0c5) AM_RAM AM_BASE(m_scroll)
AM_RANGE(0xf0e1, 0xf0e1) AM_WRITENOP /* pulsed */
AM_RANGE(0xf100, 0xf15f) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xf160, 0xf1ff) AM_RAM /* unknown - no valid sprite data */
- AM_RANGE(0xf400, 0xffff) AM_RAM_WRITE_LEGACY(lkage_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xf400, 0xffff) AM_RAM_WRITE(lkage_videoram_w) AM_BASE(m_videoram)
ADDRESS_MAP_END
@@ -168,12 +168,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( lkage_m68705_map, AS_PROGRAM, 8, lkage_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(lkage_68705_port_a_r,lkage_68705_port_a_w)
- AM_RANGE(0x0001, 0x0001) AM_READWRITE_LEGACY(lkage_68705_port_b_r,lkage_68705_port_b_w)
- AM_RANGE(0x0002, 0x0002) AM_READWRITE_LEGACY(lkage_68705_port_c_r,lkage_68705_port_c_w)
- AM_RANGE(0x0004, 0x0004) AM_WRITE_LEGACY(lkage_68705_ddr_a_w)
- AM_RANGE(0x0005, 0x0005) AM_WRITE_LEGACY(lkage_68705_ddr_b_w)
- AM_RANGE(0x0006, 0x0006) AM_WRITE_LEGACY(lkage_68705_ddr_c_w)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(lkage_68705_port_a_r,lkage_68705_port_a_w)
+ AM_RANGE(0x0001, 0x0001) AM_READWRITE(lkage_68705_port_b_r,lkage_68705_port_b_w)
+ AM_RANGE(0x0002, 0x0002) AM_READWRITE(lkage_68705_port_c_r,lkage_68705_port_c_w)
+ AM_RANGE(0x0004, 0x0004) AM_WRITE(lkage_68705_ddr_a_w)
+ AM_RANGE(0x0005, 0x0005) AM_WRITE(lkage_68705_ddr_b_w)
+ AM_RANGE(0x0006, 0x0006) AM_WRITE(lkage_68705_ddr_c_w)
AM_RANGE(0x0010, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index fbb6cf69e55..05aecd6ffc1 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -156,13 +156,13 @@ static WRITE16_HANDLER( emres_w )
static ADDRESS_MAP_START( main_v30, AS_PROGRAM, 16, lockon_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000, 0x03fff) AM_RAM
- AM_RANGE(0x04000, 0x04003) AM_READWRITE_LEGACY(lockon_crtc_r, lockon_crtc_w)
+ AM_RANGE(0x04000, 0x04003) AM_READWRITE(lockon_crtc_r, lockon_crtc_w)
AM_RANGE(0x06000, 0x06001) AM_READ_PORT("DSW")
AM_RANGE(0x08000, 0x081ff) AM_RAM AM_BASE_SIZE(m_hud_ram, m_hudram_size)
- AM_RANGE(0x09000, 0x09fff) AM_RAM_WRITE_LEGACY(lockon_char_w) AM_BASE(m_char_ram)
+ AM_RANGE(0x09000, 0x09fff) AM_RAM_WRITE(lockon_char_w) AM_BASE(m_char_ram)
AM_RANGE(0x0a000, 0x0a001) AM_WRITE_LEGACY(adrst_w)
- AM_RANGE(0x0b000, 0x0bfff) AM_WRITE_LEGACY(lockon_rotate_w)
- AM_RANGE(0x0c000, 0x0cfff) AM_WRITE_LEGACY(lockon_fb_clut_w)
+ AM_RANGE(0x0b000, 0x0bfff) AM_WRITE(lockon_rotate_w)
+ AM_RANGE(0x0c000, 0x0cfff) AM_WRITE(lockon_fb_clut_w)
AM_RANGE(0x0e000, 0x0e001) AM_WRITE_LEGACY(inten_w)
AM_RANGE(0x0f000, 0x0f001) AM_WRITE_LEGACY(emres_w)
AM_RANGE(0x10000, 0x1ffff) AM_READNOP AM_WRITE_LEGACY(tst_w)
@@ -180,9 +180,9 @@ static ADDRESS_MAP_START( ground_v30, AS_PROGRAM, 16, lockon_state )
AM_RANGE(0x00000, 0x03fff) AM_RAM
AM_RANGE(0x04000, 0x04fff) AM_RAM AM_BASE(m_scene_ram)
AM_RANGE(0x08000, 0x08fff) AM_RAM AM_BASE_SIZE(m_ground_ram, m_groundram_size)
- AM_RANGE(0x0C000, 0x0C001) AM_WRITE_LEGACY(lockon_scene_h_scr_w)
- AM_RANGE(0x0C002, 0x0C003) AM_WRITE_LEGACY(lockon_scene_v_scr_w)
- AM_RANGE(0x0C004, 0x0C005) AM_WRITE_LEGACY(lockon_ground_ctrl_w)
+ AM_RANGE(0x0C000, 0x0C001) AM_WRITE(lockon_scene_h_scr_w)
+ AM_RANGE(0x0C002, 0x0C003) AM_WRITE(lockon_scene_v_scr_w)
+ AM_RANGE(0x0C004, 0x0C005) AM_WRITE(lockon_ground_ctrl_w)
AM_RANGE(0x20000, 0x2ffff) AM_MIRROR(0xc0000) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_MIRROR(0xc0000) AM_ROM
ADDRESS_MAP_END
@@ -191,8 +191,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( object_v30, AS_PROGRAM, 16, lockon_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000, 0x03fff) AM_RAM
- AM_RANGE(0x04000, 0x04001) AM_READWRITE_LEGACY(lockon_obj_4000_r, lockon_obj_4000_w)
- AM_RANGE(0x08000, 0x08fff) AM_WRITE_LEGACY(lockon_tza112_w)
+ AM_RANGE(0x04000, 0x04001) AM_READWRITE(lockon_obj_4000_r, lockon_obj_4000_w)
+ AM_RANGE(0x08000, 0x08fff) AM_WRITE(lockon_tza112_w)
AM_RANGE(0x0c000, 0x0c1ff) AM_RAM AM_BASE_SIZE(m_object_ram, m_objectram_size)
AM_RANGE(0x30000, 0x3ffff) AM_MIRROR(0xc0000) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index bfd4e1ad4e5..296a35882c3 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -266,14 +266,14 @@ static ADDRESS_MAP_START( lordgun_map, AS_PROGRAM, 16, lordgun_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x210000, 0x21ffff) AM_RAM AM_BASE(m_priority_ram) // PRIORITY
- AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE_LEGACY(lordgun_vram_0_w) AM_BASE(m_vram[0]) // DISPLAY
- AM_RANGE(0x310000, 0x313fff) AM_RAM_WRITE_LEGACY(lordgun_vram_1_w) AM_BASE(m_vram[1]) // DISPLAY
- AM_RANGE(0x314000, 0x314fff) AM_RAM_WRITE_LEGACY(lordgun_vram_2_w) AM_BASE(m_vram[2]) // DISPLAY
+ AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(lordgun_vram_0_w) AM_BASE(m_vram[0]) // DISPLAY
+ AM_RANGE(0x310000, 0x313fff) AM_RAM_WRITE(lordgun_vram_1_w) AM_BASE(m_vram[1]) // DISPLAY
+ AM_RANGE(0x314000, 0x314fff) AM_RAM_WRITE(lordgun_vram_2_w) AM_BASE(m_vram[2]) // DISPLAY
AM_RANGE(0x315000, 0x317fff) AM_RAM //
- AM_RANGE(0x318000, 0x319fff) AM_RAM_WRITE_LEGACY(lordgun_vram_3_w) AM_BASE(m_vram[3]) // DISPLAY
+ AM_RANGE(0x318000, 0x319fff) AM_RAM_WRITE(lordgun_vram_3_w) AM_BASE(m_vram[3]) // DISPLAY
AM_RANGE(0x31c000, 0x31c7ff) AM_RAM AM_BASE(m_scrollram) // LINE
AM_RANGE(0x400000, 0x4007ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // ANIMATOR
- AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE_LEGACY(lordgun_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(lordgun_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x502000, 0x502001) AM_WRITEONLY AM_BASE(m_scroll_x[0])
AM_RANGE(0x502200, 0x502201) AM_WRITEONLY AM_BASE(m_scroll_x[1])
AM_RANGE(0x502400, 0x502401) AM_WRITEONLY AM_BASE(m_scroll_x[2])
@@ -298,14 +298,14 @@ static ADDRESS_MAP_START( aliencha_map, AS_PROGRAM, 16, lordgun_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x210000, 0x21ffff) AM_RAM AM_BASE(m_priority_ram) // PRIORITY
- AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE_LEGACY(lordgun_vram_0_w) AM_BASE(m_vram[0]) // BACKGROUND 1
- AM_RANGE(0x310000, 0x313fff) AM_RAM_WRITE_LEGACY(lordgun_vram_1_w) AM_BASE(m_vram[1]) // BACKGROUND 2
- AM_RANGE(0x314000, 0x314fff) AM_RAM_WRITE_LEGACY(lordgun_vram_2_w) AM_BASE(m_vram[2]) // BACKGROUND 3
+ AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(lordgun_vram_0_w) AM_BASE(m_vram[0]) // BACKGROUND 1
+ AM_RANGE(0x310000, 0x313fff) AM_RAM_WRITE(lordgun_vram_1_w) AM_BASE(m_vram[1]) // BACKGROUND 2
+ AM_RANGE(0x314000, 0x314fff) AM_RAM_WRITE(lordgun_vram_2_w) AM_BASE(m_vram[2]) // BACKGROUND 3
AM_RANGE(0x315000, 0x317fff) AM_RAM //
- AM_RANGE(0x318000, 0x319fff) AM_RAM_WRITE_LEGACY(lordgun_vram_3_w) AM_BASE(m_vram[3]) // TEXT
+ AM_RANGE(0x318000, 0x319fff) AM_RAM_WRITE(lordgun_vram_3_w) AM_BASE(m_vram[3]) // TEXT
AM_RANGE(0x31c000, 0x31c7ff) AM_RAM AM_BASE(m_scrollram) // LINE OFFSET
AM_RANGE(0x400000, 0x4007ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // ANIMATE
- AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE_LEGACY(lordgun_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(lordgun_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x502000, 0x502001) AM_WRITEONLY AM_BASE(m_scroll_x[0])
AM_RANGE(0x502200, 0x502201) AM_WRITEONLY AM_BASE(m_scroll_x[1])
AM_RANGE(0x502400, 0x502401) AM_WRITEONLY AM_BASE(m_scroll_x[2])
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index fc071984253..18123a842ff 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -175,15 +175,15 @@ static ADDRESS_MAP_START( lsasquad_map, AS_PROGRAM, 8, lsasquad_state )
AM_RANGE(0xe800, 0xe800) AM_READ_PORT("DSWA")
AM_RANGE(0xe801, 0xe801) AM_READ_PORT("DSWB")
AM_RANGE(0xe802, 0xe802) AM_READ_PORT("DSWC")
- AM_RANGE(0xe803, 0xe803) AM_READ_LEGACY(lsasquad_mcu_status_r) /* COIN + 68705 status */
+ AM_RANGE(0xe803, 0xe803) AM_READ(lsasquad_mcu_status_r) /* COIN + 68705 status */
AM_RANGE(0xe804, 0xe804) AM_READ_PORT("P1")
AM_RANGE(0xe805, 0xe805) AM_READ_PORT("P2")
AM_RANGE(0xe806, 0xe806) AM_READ_PORT("START")
AM_RANGE(0xe807, 0xe807) AM_READ_PORT("SERVICE")
AM_RANGE(0xea00, 0xea00) AM_WRITE(lsasquad_bankswitch_w)
- AM_RANGE(0xec00, 0xec00) AM_READWRITE_LEGACY(lsasquad_sound_result_r,lsasquad_sound_command_w)
- AM_RANGE(0xec01, 0xec01) AM_READ_LEGACY(lsasquad_sound_status_r)
- AM_RANGE(0xee00, 0xee00) AM_READWRITE_LEGACY(lsasquad_mcu_r,lsasquad_mcu_w)
+ AM_RANGE(0xec00, 0xec00) AM_READWRITE(lsasquad_sound_result_r,lsasquad_sound_command_w)
+ AM_RANGE(0xec01, 0xec01) AM_READ(lsasquad_sound_status_r)
+ AM_RANGE(0xee00, 0xee00) AM_READWRITE(lsasquad_mcu_r,lsasquad_mcu_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( lsasquad_sound_map, AS_PROGRAM, 8, lsasquad_state )
@@ -191,20 +191,20 @@ static ADDRESS_MAP_START( lsasquad_sound_map, AS_PROGRAM, 8, lsasquad_state )
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r,ym2203_w)
AM_RANGE(0xc000, 0xc001) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_data_w)
- AM_RANGE(0xd000, 0xd000) AM_READWRITE_LEGACY(lsasquad_sh_sound_command_r, lsasquad_sh_result_w)
- AM_RANGE(0xd400, 0xd400) AM_WRITE_LEGACY(lsasquad_sh_nmi_disable_w)
- AM_RANGE(0xd800, 0xd800) AM_WRITE_LEGACY(lsasquad_sh_nmi_enable_w)
- AM_RANGE(0xd800, 0xd800) AM_READ_LEGACY(lsasquad_sound_status_r)
+ AM_RANGE(0xd000, 0xd000) AM_READWRITE(lsasquad_sh_sound_command_r, lsasquad_sh_result_w)
+ AM_RANGE(0xd400, 0xd400) AM_WRITE(lsasquad_sh_nmi_disable_w)
+ AM_RANGE(0xd800, 0xd800) AM_WRITE(lsasquad_sh_nmi_enable_w)
+ AM_RANGE(0xd800, 0xd800) AM_READ(lsasquad_sound_status_r)
AM_RANGE(0xe000, 0xefff) AM_ROM /* space for diagnostic ROM? */
ADDRESS_MAP_END
static ADDRESS_MAP_START( lsasquad_m68705_map, AS_PROGRAM, 8, lsasquad_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(lsasquad_68705_port_a_r,lsasquad_68705_port_a_w)
- AM_RANGE(0x0001, 0x0001) AM_READWRITE_LEGACY(lsasquad_68705_port_b_r,lsasquad_68705_port_b_w)
- AM_RANGE(0x0002, 0x0002) AM_READ_LEGACY(lsasquad_mcu_status_r)
- AM_RANGE(0x0004, 0x0004) AM_WRITE_LEGACY(lsasquad_68705_ddr_a_w)
- AM_RANGE(0x0005, 0x0005) AM_WRITE_LEGACY(lsasquad_68705_ddr_b_w)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(lsasquad_68705_port_a_r,lsasquad_68705_port_a_w)
+ AM_RANGE(0x0001, 0x0001) AM_READWRITE(lsasquad_68705_port_b_r,lsasquad_68705_port_b_w)
+ AM_RANGE(0x0002, 0x0002) AM_READ(lsasquad_mcu_status_r)
+ AM_RANGE(0x0004, 0x0004) AM_WRITE(lsasquad_68705_ddr_a_w)
+ AM_RANGE(0x0005, 0x0005) AM_WRITE(lsasquad_68705_ddr_b_w)
AM_RANGE(0x0010, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
@@ -226,8 +226,8 @@ static ADDRESS_MAP_START( storming_map, AS_PROGRAM, 8, lsasquad_state )
AM_RANGE(0xe806, 0xe806) AM_READ_PORT("START")
AM_RANGE(0xe807, 0xe807) AM_READ_PORT("SERVICE")
AM_RANGE(0xea00, 0xea00) AM_WRITE(lsasquad_bankswitch_w)
- AM_RANGE(0xec00, 0xec00) AM_READWRITE_LEGACY(lsasquad_sound_result_r,lsasquad_sound_command_w)
- AM_RANGE(0xec01, 0xec01) AM_READ_LEGACY(lsasquad_sound_status_r)
+ AM_RANGE(0xec00, 0xec00) AM_READWRITE(lsasquad_sound_result_r,lsasquad_sound_command_w)
+ AM_RANGE(0xec01, 0xec01) AM_READ(lsasquad_sound_status_r)
ADDRESS_MAP_END
@@ -382,15 +382,15 @@ static ADDRESS_MAP_START( daikaiju_map, AS_PROGRAM, 8, lsasquad_state )
AM_RANGE(0xe400, 0xe7ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* OBJECT RAM */
AM_RANGE(0xe800, 0xe800) AM_READ_PORT("DSWA")
AM_RANGE(0xe801, 0xe801) AM_READ_PORT("DSWB")
- AM_RANGE(0xe803, 0xe803) AM_READ_LEGACY(daikaiju_mcu_status_r) /* COIN + 68705 status */
+ AM_RANGE(0xe803, 0xe803) AM_READ(daikaiju_mcu_status_r) /* COIN + 68705 status */
AM_RANGE(0xe804, 0xe804) AM_READ_PORT("P1")
AM_RANGE(0xe805, 0xe805) AM_READ_PORT("P2")
AM_RANGE(0xe806, 0xe806) AM_READ_PORT("START")
AM_RANGE(0xe807, 0xe807) AM_READ_PORT("SERVICE")
AM_RANGE(0xea00, 0xea00) AM_WRITE(lsasquad_bankswitch_w)
- AM_RANGE(0xec00, 0xec00) AM_WRITE_LEGACY(lsasquad_sound_command_w)
- AM_RANGE(0xec01, 0xec01) AM_READ_LEGACY(lsasquad_sound_status_r)
- AM_RANGE(0xee00, 0xee00) AM_READWRITE_LEGACY(lsasquad_mcu_r, lsasquad_mcu_w)
+ AM_RANGE(0xec00, 0xec00) AM_WRITE(lsasquad_sound_command_w)
+ AM_RANGE(0xec01, 0xec01) AM_READ(lsasquad_sound_status_r)
+ AM_RANGE(0xee00, 0xee00) AM_READWRITE(lsasquad_mcu_r, lsasquad_mcu_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( daikaiju_sound_map, AS_PROGRAM, 8, lsasquad_state )
@@ -398,9 +398,9 @@ static ADDRESS_MAP_START( daikaiju_sound_map, AS_PROGRAM, 8, lsasquad_state )
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xc000, 0xc001) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_data_w)
- AM_RANGE(0xd000, 0xd000) AM_READ_LEGACY(daikaiju_sh_sound_command_r)
+ AM_RANGE(0xd000, 0xd000) AM_READ(daikaiju_sh_sound_command_r)
AM_RANGE(0xd400, 0xd400) AM_WRITENOP
- AM_RANGE(0xd800, 0xd800) AM_READ_LEGACY(daikaiju_sound_status_r) AM_WRITENOP
+ AM_RANGE(0xd800, 0xd800) AM_READ(daikaiju_sound_status_r) AM_WRITENOP
AM_RANGE(0xdc00, 0xdc00) AM_WRITENOP
AM_RANGE(0xe000, 0xefff) AM_ROM /* space for diagnostic ROM? */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index d644847d79c..35767bb41ff 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -805,10 +805,10 @@ static INTERRUPT_GEN( nmi_interrupt )
static ADDRESS_MAP_START( lucky74_map, AS_PROGRAM, 8, lucky74_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_SHARE("nvram") /* NVRAM */
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(lucky74_fg_videoram_w) AM_BASE(m_fg_videoram) /* VRAM1-1 */
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(lucky74_fg_colorram_w) AM_BASE(m_fg_colorram) /* VRAM1-2 */
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(lucky74_bg_videoram_w) AM_BASE(m_bg_videoram) /* VRAM2-1 */
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(lucky74_bg_colorram_w) AM_BASE(m_bg_colorram) /* VRAM2-2 */
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(lucky74_fg_videoram_w) AM_BASE(m_fg_videoram) /* VRAM1-1 */
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(lucky74_fg_colorram_w) AM_BASE(m_fg_colorram) /* VRAM1-2 */
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(lucky74_bg_videoram_w) AM_BASE(m_bg_videoram) /* VRAM2-1 */
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(lucky74_bg_colorram_w) AM_BASE(m_bg_colorram) /* VRAM2-2 */
AM_RANGE(0xf000, 0xf003) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports 0 & 1 */
AM_RANGE(0xf080, 0xf083) AM_DEVREADWRITE_LEGACY("ppi8255_2", ppi8255_r, ppi8255_w) /* DSW 1, 2 & 3 */
AM_RANGE(0xf0c0, 0xf0c3) AM_DEVREADWRITE_LEGACY("ppi8255_3", ppi8255_r, ppi8255_w) /* DSW 4 */
diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c
index 8d911f63189..e10bec91bb8 100644
--- a/src/mame/drivers/lvcards.c
+++ b/src/mame/drivers/lvcards.c
@@ -150,8 +150,8 @@ READ8_MEMBER(lvcards_state::payout_r)
static ADDRESS_MAP_START( ponttehk_map, AS_PROGRAM, 8, lvcards_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE_LEGACY(lvcards_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE_LEGACY(lvcards_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(lvcards_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(lvcards_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
AM_RANGE(0xa001, 0xa001) AM_READ_PORT("IN1") AM_WRITENOP // lamps
AM_RANGE(0xa002, 0xa002) AM_READ(payout_r) AM_WRITE(control_port_2a_w)//AM_WRITENOP // ???
@@ -160,8 +160,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( lvcards_map, AS_PROGRAM, 8, lvcards_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(lvcards_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE_LEGACY(lvcards_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(lvcards_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE(lvcards_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
AM_RANGE(0xa001, 0xa001) AM_READ_PORT("IN1") AM_WRITENOP
AM_RANGE(0xa002, 0xa002) AM_READ_PORT("IN2") AM_WRITENOP
@@ -177,8 +177,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( lvpoker_map, AS_PROGRAM, 8, lvcards_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(lvcards_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE_LEGACY(lvcards_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(lvcards_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE(lvcards_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
AM_RANGE(0xa001, 0xa001) AM_READ_PORT("IN1") AM_WRITENOP // lamps
AM_RANGE(0xa002, 0xa002) AM_READ(payout_r) AM_WRITE(control_port_2_w)
diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c
index d7503aa7733..c7df2c2ac14 100644
--- a/src/mame/drivers/lwings.c
+++ b/src/mame/drivers/lwings.c
@@ -286,14 +286,14 @@ static ADDRESS_MAP_START( avengers_map, AS_PROGRAM, 8, lwings_state )
AM_RANGE(0xc000, 0xddff) AM_RAM
AM_RANGE(0xde00, 0xdf7f) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xdf80, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(lwings_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(lwings_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(lwings_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(lwings_bg1videoram_w) AM_BASE(m_bg1videoram)
AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split2_w) AM_SHARE("paletteram2")
AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0xf800, 0xf801) AM_WRITE_LEGACY(lwings_bg1_scrollx_w)
- AM_RANGE(0xf802, 0xf803) AM_WRITE_LEGACY(lwings_bg1_scrolly_w)
- AM_RANGE(0xf804, 0xf804) AM_WRITE_LEGACY(trojan_bg2_scrollx_w)
- AM_RANGE(0xf805, 0xf805) AM_WRITE_LEGACY(trojan_bg2_image_w)
+ AM_RANGE(0xf800, 0xf801) AM_WRITE(lwings_bg1_scrollx_w)
+ AM_RANGE(0xf802, 0xf803) AM_WRITE(lwings_bg1_scrolly_w)
+ AM_RANGE(0xf804, 0xf804) AM_WRITE(trojan_bg2_scrollx_w)
+ AM_RANGE(0xf805, 0xf805) AM_WRITE(trojan_bg2_image_w)
AM_RANGE(0xf808, 0xf808) AM_READ_PORT("SERVICE") AM_WRITENOP /* ? */
AM_RANGE(0xf809, 0xf809) AM_READ_PORT("P1") AM_WRITE(avengers_protection_w)
@@ -309,17 +309,17 @@ static ADDRESS_MAP_START( lwings_map, AS_PROGRAM, 8, lwings_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xddff) AM_RAM
AM_RANGE(0xde00, 0xdfff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(lwings_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(lwings_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(lwings_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(lwings_bg1videoram_w) AM_BASE(m_bg1videoram)
AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split2_w) AM_SHARE("paletteram2")
AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split1_w) AM_SHARE("paletteram")
AM_RANGE(0xf808, 0xf808) AM_READ_PORT("SERVICE")
AM_RANGE(0xf809, 0xf809) AM_READ_PORT("P1")
- AM_RANGE(0xf808, 0xf809) AM_WRITE_LEGACY(lwings_bg1_scrollx_w)
+ AM_RANGE(0xf808, 0xf809) AM_WRITE(lwings_bg1_scrollx_w)
AM_RANGE(0xf80a, 0xf80a) AM_READ_PORT("P2")
AM_RANGE(0xf80b, 0xf80b) AM_READ_PORT("DSWA")
- AM_RANGE(0xf80a, 0xf80b) AM_WRITE_LEGACY(lwings_bg1_scrolly_w)
+ AM_RANGE(0xf80a, 0xf80b) AM_WRITE(lwings_bg1_scrolly_w)
AM_RANGE(0xf80c, 0xf80c) AM_READ_PORT("DSWB") AM_WRITE(soundlatch_w)
AM_RANGE(0xf80d, 0xf80d) AM_WRITE(watchdog_reset_w)
AM_RANGE(0xf80e, 0xf80e) AM_WRITE(lwings_bankswitch_w)
@@ -331,15 +331,15 @@ static ADDRESS_MAP_START( trojan_map, AS_PROGRAM, 8, lwings_state )
AM_RANGE(0xc000, 0xddff) AM_RAM
AM_RANGE(0xde00, 0xdf7f) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xdf80, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(lwings_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(lwings_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(lwings_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(lwings_bg1videoram_w) AM_BASE(m_bg1videoram)
AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split2_w) AM_SHARE("paletteram2")
AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0xf800, 0xf801) AM_WRITE_LEGACY(lwings_bg1_scrollx_w)
- AM_RANGE(0xf802, 0xf803) AM_WRITE_LEGACY(lwings_bg1_scrolly_w)
- AM_RANGE(0xf804, 0xf804) AM_WRITE_LEGACY(trojan_bg2_scrollx_w)
- AM_RANGE(0xf805, 0xf805) AM_WRITE_LEGACY(trojan_bg2_image_w)
+ AM_RANGE(0xf800, 0xf801) AM_WRITE(lwings_bg1_scrollx_w)
+ AM_RANGE(0xf802, 0xf803) AM_WRITE(lwings_bg1_scrolly_w)
+ AM_RANGE(0xf804, 0xf804) AM_WRITE(trojan_bg2_scrollx_w)
+ AM_RANGE(0xf805, 0xf805) AM_WRITE(trojan_bg2_image_w)
AM_RANGE(0xf808, 0xf808) AM_READ_PORT("SERVICE") AM_WRITENOP //watchdog
AM_RANGE(0xf809, 0xf809) AM_READ_PORT("P1")
AM_RANGE(0xf80a, 0xf80a) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c
index 5d5fce22c0b..f73493e35cb 100644
--- a/src/mame/drivers/m10.c
+++ b/src/mame/drivers/m10.c
@@ -554,8 +554,8 @@ static ADDRESS_MAP_START( m10_main, AS_PROGRAM, 8, m10_state )
AM_RANGE(0x0000, 0x02ff) AM_RAM AM_BASE(m_memory) /* scratch ram */
AM_RANGE(0x1000, 0x2fff) AM_ROM AM_BASE(m_rom)
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE_LEGACY(m10_colorram_w) AM_BASE(m_colorram) /* foreground colour */
- AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE_LEGACY(m10_chargen_w) AM_BASE(m_chargen) /* background ????? */
+ AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(m10_colorram_w) AM_BASE(m_colorram) /* foreground colour */
+ AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE(m10_chargen_w) AM_BASE(m_chargen) /* background ????? */
AM_RANGE(0xa200, 0xa200) AM_READ_PORT("DSW")
AM_RANGE(0xa300, 0xa300) AM_READ_PORT("INPUTS")
AM_RANGE(0xa400, 0xa400) AM_WRITE(m10_ctrl_w) /* line at bottom of screen?, sound, flip screen */
@@ -568,7 +568,7 @@ static ADDRESS_MAP_START( m11_main, AS_PROGRAM, 8, m10_state )
AM_RANGE(0x0000, 0x02ff) AM_RAM AM_BASE(m_memory) /* scratch ram */
AM_RANGE(0x1000, 0x2fff) AM_ROM AM_BASE(m_rom)
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE_LEGACY(m10_colorram_w) AM_BASE(m_colorram) /* foreground colour */
+ AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(m10_colorram_w) AM_BASE(m_colorram) /* foreground colour */
AM_RANGE(0x5000, 0x53ff) AM_RAM AM_BASE(m_chargen) /* background ????? */
AM_RANGE(0xa100, 0xa100) AM_WRITE(m11_a100_w) /* sound writes ???? */
AM_RANGE(0xa200, 0xa200) AM_READ_PORT("DSW")
@@ -582,8 +582,8 @@ static ADDRESS_MAP_START( m15_main, AS_PROGRAM, 8, m10_state )
AM_RANGE(0x0000, 0x02ff) AM_RAM AM_BASE(m_memory) /* scratch ram */
AM_RANGE(0x1000, 0x33ff) AM_ROM AM_BASE(m_rom)
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE_LEGACY(m10_colorram_w) AM_BASE(m_colorram) /* foreground colour */
- AM_RANGE(0x5000, 0x57ff) AM_RAM_WRITE_LEGACY(m15_chargen_w) AM_BASE(m_chargen) /* background ????? */
+ AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(m10_colorram_w) AM_BASE(m_colorram) /* foreground colour */
+ AM_RANGE(0x5000, 0x57ff) AM_RAM_WRITE(m15_chargen_w) AM_BASE(m_chargen) /* background ????? */
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P2")
AM_RANGE(0xa100, 0xa100) AM_WRITE(m15_a100_w) /* sound writes ???? */
AM_RANGE(0xa200, 0xa200) AM_READ_PORT("DSW")
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index 6b5c258e822..b86df9a5fe0 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -128,7 +128,7 @@ WRITE16_MEMBER(m107_state::m107_sound_reset_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, m107_state )
AM_RANGE(0x00000, 0x9ffff) AM_ROM
AM_RANGE(0xa0000, 0xbffff) AM_ROMBANK("bank1")
- AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE_LEGACY(m107_vram_w) AM_BASE(m_vram_data)
+ AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m107_vram_w) AM_BASE(m_vram_data)
AM_RANGE(0xe0000, 0xeffff) AM_RAM /* System ram */
AM_RANGE(0xf8000, 0xf8fff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xf9000, 0xf9fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
@@ -144,9 +144,9 @@ static ADDRESS_MAP_START( main_portmap, AS_IO, 16, m107_state )
AM_RANGE(0x00, 0x01) AM_WRITE(m107_soundlatch_w)
AM_RANGE(0x02, 0x03) AM_WRITE(m107_coincounter_w)
AM_RANGE(0x04, 0x05) AM_WRITENOP /* ??? 0008 */
- AM_RANGE(0x80, 0x9f) AM_WRITE_LEGACY(m107_control_w)
+ AM_RANGE(0x80, 0x9f) AM_WRITE(m107_control_w)
AM_RANGE(0xa0, 0xaf) AM_WRITENOP /* Written with 0's in interrupt */
- AM_RANGE(0xb0, 0xb1) AM_WRITE_LEGACY(m107_spritebuffer_w)
+ AM_RANGE(0xb0, 0xb1) AM_WRITE(m107_spritebuffer_w)
AM_RANGE(0xc0, 0xc3) AM_READNOP /* Only wpksoc: ticket related? */
AM_RANGE(0xc0, 0xc1) AM_WRITE(m107_sound_reset_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/m52.c b/src/mame/drivers/m52.c
index 53096735c2b..56dce1ae9c2 100644
--- a/src/mame/drivers/m52.c
+++ b/src/mame/drivers/m52.c
@@ -60,12 +60,12 @@
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, m52_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE_LEGACY(m52_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE_LEGACY(m52_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x07ff) AM_READ_LEGACY(m52_protection_r)
+ AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(m52_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(m52_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x07ff) AM_READ(m52_protection_r)
AM_RANGE(0xc800, 0xcbff) AM_MIRROR(0x0400) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd000, 0xd000) AM_MIRROR(0x07fc) AM_WRITE_LEGACY(irem_sound_cmd_w)
- AM_RANGE(0xd001, 0xd001) AM_MIRROR(0x07fc) AM_WRITE_LEGACY(m52_flipscreen_w) /* + coin counters */
+ AM_RANGE(0xd001, 0xd001) AM_MIRROR(0x07fc) AM_WRITE(m52_flipscreen_w) /* + coin counters */
AM_RANGE(0xd000, 0xd000) AM_MIRROR(0x07f8) AM_READ_PORT("IN0")
AM_RANGE(0xd001, 0xd001) AM_MIRROR(0x07f8) AM_READ_PORT("IN1")
AM_RANGE(0xd002, 0xd002) AM_MIRROR(0x07f8) AM_READ_PORT("IN2")
@@ -77,11 +77,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( alpha1v_map, AS_PROGRAM, 8, m52_state )
AM_RANGE(0x0000, 0x6fff) AM_ROM
- AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE_LEGACY(m52_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE_LEGACY(m52_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(m52_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(m52_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xc800, 0xc9ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size) AM_SHARE("share1") // bigger or mirrored?
AM_RANGE(0xd000, 0xd000) AM_READ_PORT("IN0") AM_WRITE_LEGACY(irem_sound_cmd_w)
- AM_RANGE(0xd001, 0xd001) AM_READ_PORT("IN1") AM_WRITE_LEGACY(alpha1v_flipscreen_w)
+ AM_RANGE(0xd001, 0xd001) AM_READ_PORT("IN1") AM_WRITE(alpha1v_flipscreen_w)
AM_RANGE(0xd002, 0xd002) AM_READ_PORT("IN2")
AM_RANGE(0xd003, 0xd003) AM_READ_PORT("DSW1")
AM_RANGE(0xd004, 0xd004) AM_READ_PORT("DSW2")
@@ -91,12 +91,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( main_portmap, AS_IO, 8, m52_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_MIRROR(0x1f) AM_WRITE_LEGACY(m52_scroll_w)
- AM_RANGE(0x40, 0x40) AM_MIRROR(0x1f) AM_WRITE_LEGACY(m52_bg1xpos_w)
- AM_RANGE(0x60, 0x60) AM_MIRROR(0x1f) AM_WRITE_LEGACY(m52_bg1ypos_w)
- AM_RANGE(0x80, 0x80) AM_MIRROR(0x1f) AM_WRITE_LEGACY(m52_bg2xpos_w)
- AM_RANGE(0xa0, 0xa0) AM_MIRROR(0x1f) AM_WRITE_LEGACY(m52_bg2ypos_w)
- AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x1f) AM_WRITE_LEGACY(m52_bgcontrol_w)
+ AM_RANGE(0x00, 0x00) AM_MIRROR(0x1f) AM_WRITE(m52_scroll_w)
+ AM_RANGE(0x40, 0x40) AM_MIRROR(0x1f) AM_WRITE(m52_bg1xpos_w)
+ AM_RANGE(0x60, 0x60) AM_MIRROR(0x1f) AM_WRITE(m52_bg1ypos_w)
+ AM_RANGE(0x80, 0x80) AM_MIRROR(0x1f) AM_WRITE(m52_bg2xpos_w)
+ AM_RANGE(0xa0, 0xa0) AM_MIRROR(0x1f) AM_WRITE(m52_bg2ypos_w)
+ AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x1f) AM_WRITE(m52_bgcontrol_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c
index a3396f05777..74dca7d004f 100644
--- a/src/mame/drivers/m57.c
+++ b/src/mame/drivers/m57.c
@@ -66,11 +66,11 @@
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, m57_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(m57_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(m57_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x9000, 0x91ff) AM_RAM AM_BASE(m_scrollram)
AM_RANGE(0xc820, 0xc8ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd000, 0xd000) AM_WRITE_LEGACY(irem_sound_cmd_w)
- AM_RANGE(0xd001, 0xd001) AM_WRITE_LEGACY(m57_flipscreen_w) /* + coin counters */
+ AM_RANGE(0xd001, 0xd001) AM_WRITE(m57_flipscreen_w) /* + coin counters */
AM_RANGE(0xd000, 0xd000) AM_READ_PORT("IN0")
AM_RANGE(0xd001, 0xd001) AM_READ_PORT("IN1")
AM_RANGE(0xd002, 0xd002) AM_READ_PORT("IN2")
diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c
index 983e943e0aa..9c68cdbfe15 100644
--- a/src/mame/drivers/m58.c
+++ b/src/mame/drivers/m58.c
@@ -26,15 +26,15 @@
static ADDRESS_MAP_START( yard_map, AS_PROGRAM, 8, m58_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
- AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE_LEGACY(yard_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9000, 0x9fff) AM_WRITE_LEGACY(yard_scroll_panel_w)
+ AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(yard_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9000, 0x9fff) AM_WRITE(yard_scroll_panel_w)
AM_RANGE(0xc820, 0xc87f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xa000, 0xa000) AM_RAM AM_BASE(m_yard_scroll_x_low)
AM_RANGE(0xa200, 0xa200) AM_RAM AM_BASE(m_yard_scroll_x_high)
AM_RANGE(0xa400, 0xa400) AM_RAM AM_BASE(m_yard_scroll_y_low)
AM_RANGE(0xa800, 0xa800) AM_RAM AM_BASE(m_yard_score_panel_disabled)
AM_RANGE(0xd000, 0xd000) AM_WRITE_LEGACY(irem_sound_cmd_w)
- AM_RANGE(0xd001, 0xd001) AM_WRITE_LEGACY(yard_flipscreen_w) /* + coin counters */
+ AM_RANGE(0xd001, 0xd001) AM_WRITE(yard_flipscreen_w) /* + coin counters */
AM_RANGE(0xd000, 0xd000) AM_READ_PORT("IN0")
AM_RANGE(0xd001, 0xd001) AM_READ_PORT("IN1")
AM_RANGE(0xd002, 0xd002) AM_READ_PORT("IN2")
diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c
index 77e2d6ea46b..c7ff198ddff 100644
--- a/src/mame/drivers/m62.c
+++ b/src/mame/drivers/m62.c
@@ -172,19 +172,19 @@ WRITE8_MEMBER(m62_state::youjyudn_bankswitch_w)
static ADDRESS_MAP_START( kungfum_map, AS_PROGRAM, 8, m62_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0xa000, 0xa000) AM_WRITE_LEGACY(m62_hscroll_low_w)
- AM_RANGE(0xb000, 0xb000) AM_WRITE_LEGACY(m62_hscroll_high_w)
+ AM_RANGE(0xa000, 0xa000) AM_WRITE(m62_hscroll_low_w)
+ AM_RANGE(0xb000, 0xb000) AM_WRITE(m62_hscroll_high_w)
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
/* Kung Fu Master is the only game in this driver to have separated (but */
/* contiguous) videoram and colorram. They are interleaved in all the others. */
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(kungfum_tileram_w) AM_BASE(m_m62_tileram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(kungfum_tileram_w) AM_BASE(m_m62_tileram)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( kungfum_io_map, AS_IO, 8, m62_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(irem_sound_cmd_w)
- AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE_LEGACY(m62_flipscreen_w) /* + coin counters */
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
AM_RANGE(0x02, 0x02) AM_READ_PORT("P2")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
@@ -194,28 +194,28 @@ static ADDRESS_MAP_START( battroad_map, AS_PROGRAM, 8, m62_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(m62_textram_w) AM_BASE(m_m62_textram)
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(m62_tileram_w) AM_BASE(m_m62_tileram)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(m62_textram_w) AM_BASE(m_m62_textram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE(m_m62_tileram)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( battroad_io_map, AS_IO, 8, m62_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(irem_sound_cmd_w)
- AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE_LEGACY(m62_flipscreen_w) /* + coin counters */
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
AM_RANGE(0x02, 0x02) AM_READ_PORT("P2")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
- AM_RANGE(0x80, 0x80) AM_WRITE_LEGACY(m62_vscroll_low_w)
- AM_RANGE(0x81, 0x81) AM_WRITE_LEGACY(m62_hscroll_high_w)
- AM_RANGE(0x82, 0x82) AM_WRITE_LEGACY(m62_hscroll_low_w)
+ AM_RANGE(0x80, 0x80) AM_WRITE(m62_vscroll_low_w)
+ AM_RANGE(0x81, 0x81) AM_WRITE(m62_hscroll_high_w)
+ AM_RANGE(0x82, 0x82) AM_WRITE(m62_hscroll_low_w)
AM_RANGE(0x83, 0x83) AM_WRITE(battroad_bankswitch_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( ldrun_map, AS_PROGRAM, 8, m62_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(m62_tileram_w) AM_BASE(m_m62_tileram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE(m_m62_tileram)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
@@ -223,14 +223,14 @@ static ADDRESS_MAP_START( ldrun2_map, AS_PROGRAM, 8, m62_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(m62_tileram_w) AM_BASE(m_m62_tileram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE(m_m62_tileram)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( ldrun2_io_map, AS_IO, 8, m62_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(irem_sound_cmd_w)
- AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE_LEGACY(m62_flipscreen_w) /* + coin counters */
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
AM_RANGE(0x02, 0x02) AM_READ_PORT("P2")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
@@ -244,19 +244,19 @@ static ADDRESS_MAP_START( ldrun3_map, AS_PROGRAM, 8, m62_state )
AM_RANGE(0xcc00, 0xcc00) AM_READ(ldrun3_prot_7_r)
AM_RANGE(0xcfff, 0xcfff) AM_READ(ldrun3_prot_7_r)
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(m62_tileram_w) AM_BASE(m_m62_tileram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE(m_m62_tileram)
AM_RANGE(0xd000, 0xefff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( ldrun3_io_map, AS_IO, 8, m62_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(irem_sound_cmd_w)
- AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE_LEGACY(m62_flipscreen_w) /* + coin counters */
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
AM_RANGE(0x02, 0x02) AM_READ_PORT("P2")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
- AM_RANGE(0x80, 0x80) AM_WRITE_LEGACY(m62_vscroll_low_w)
- AM_RANGE(0x81, 0x81) AM_WRITE_LEGACY(ldrun3_topbottom_mask_w)
+ AM_RANGE(0x80, 0x80) AM_WRITE(m62_vscroll_low_w)
+ AM_RANGE(0x81, 0x81) AM_WRITE(ldrun3_topbottom_mask_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( ldrun4_map, AS_PROGRAM, 8, m62_state )
@@ -264,65 +264,65 @@ static ADDRESS_MAP_START( ldrun4_map, AS_PROGRAM, 8, m62_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xc800, 0xc800) AM_WRITE(ldrun4_bankswitch_w)
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(m62_tileram_w) AM_BASE(m_m62_tileram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE(m_m62_tileram)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( ldrun4_io_map, AS_IO, 8, m62_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(irem_sound_cmd_w)
- AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE_LEGACY(m62_flipscreen_w) /* + coin counters */
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
AM_RANGE(0x02, 0x02) AM_READ_PORT("P2")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
- AM_RANGE(0x82, 0x82) AM_WRITE_LEGACY(m62_hscroll_high_w)
- AM_RANGE(0x83, 0x83) AM_WRITE_LEGACY(m62_hscroll_low_w)
+ AM_RANGE(0x82, 0x82) AM_WRITE(m62_hscroll_high_w)
+ AM_RANGE(0x83, 0x83) AM_WRITE(m62_hscroll_low_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( lotlot_map, AS_PROGRAM, 8, m62_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE_LEGACY(m62_textram_w) AM_BASE(m_m62_textram)
+ AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(m62_textram_w) AM_BASE(m_m62_textram)
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(m62_tileram_w) AM_BASE(m_m62_tileram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE(m_m62_tileram)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( kidniki_map, AS_PROGRAM, 8, m62_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
- AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE_LEGACY(m62_tileram_w) AM_BASE(m_m62_tileram)
+ AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(m62_tileram_w) AM_BASE(m_m62_tileram)
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(m62_textram_w) AM_BASE(m_m62_textram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(m62_textram_w) AM_BASE(m_m62_textram)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( kidniki_io_map, AS_IO, 8, m62_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(irem_sound_cmd_w)
- AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE_LEGACY(m62_flipscreen_w) /* + coin counters */
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
AM_RANGE(0x02, 0x02) AM_READ_PORT("P2")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
- AM_RANGE(0x80, 0x80) AM_WRITE_LEGACY(m62_hscroll_low_w)
- AM_RANGE(0x81, 0x81) AM_WRITE_LEGACY(m62_hscroll_high_w)
- AM_RANGE(0x82, 0x82) AM_WRITE_LEGACY(kidniki_text_vscroll_low_w)
- AM_RANGE(0x83, 0x83) AM_WRITE_LEGACY(kidniki_text_vscroll_high_w)
- AM_RANGE(0x84, 0x84) AM_WRITE_LEGACY(kidniki_background_bank_w)
+ AM_RANGE(0x80, 0x80) AM_WRITE(m62_hscroll_low_w)
+ AM_RANGE(0x81, 0x81) AM_WRITE(m62_hscroll_high_w)
+ AM_RANGE(0x82, 0x82) AM_WRITE(kidniki_text_vscroll_low_w)
+ AM_RANGE(0x83, 0x83) AM_WRITE(kidniki_text_vscroll_high_w)
+ AM_RANGE(0x84, 0x84) AM_WRITE(kidniki_background_bank_w)
AM_RANGE(0x85, 0x85) AM_WRITE(kidniki_bankswitch_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( spelunkr_map, AS_PROGRAM, 8, m62_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
- AM_RANGE(0xa000, 0xbfff) AM_RAM_WRITE_LEGACY(m62_tileram_w) AM_BASE(m_m62_tileram)
+ AM_RANGE(0xa000, 0xbfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE(m_m62_tileram)
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(m62_textram_w) AM_BASE(m_m62_textram)
- AM_RANGE(0xd000, 0xd000) AM_WRITE_LEGACY(m62_vscroll_low_w)
- AM_RANGE(0xd001, 0xd001) AM_WRITE_LEGACY(m62_vscroll_high_w)
- AM_RANGE(0xd002, 0xd002) AM_WRITE_LEGACY(m62_hscroll_low_w)
- AM_RANGE(0xd003, 0xd003) AM_WRITE_LEGACY(m62_hscroll_high_w)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(m62_textram_w) AM_BASE(m_m62_textram)
+ AM_RANGE(0xd000, 0xd000) AM_WRITE(m62_vscroll_low_w)
+ AM_RANGE(0xd001, 0xd001) AM_WRITE(m62_vscroll_high_w)
+ AM_RANGE(0xd002, 0xd002) AM_WRITE(m62_hscroll_low_w)
+ AM_RANGE(0xd003, 0xd003) AM_WRITE(m62_hscroll_high_w)
AM_RANGE(0xd004, 0xd004) AM_WRITE(spelunkr_bankswitch_w)
- AM_RANGE(0xd005, 0xd005) AM_WRITE_LEGACY(spelunkr_palbank_w)
+ AM_RANGE(0xd005, 0xd005) AM_WRITE(spelunkr_palbank_w)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
@@ -330,12 +330,12 @@ static ADDRESS_MAP_START( spelunk2_map, AS_PROGRAM, 8, m62_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_ROMBANK("bank1")
AM_RANGE(0x9000, 0x9fff) AM_ROMBANK("bank2")
- AM_RANGE(0xa000, 0xbfff) AM_RAM_WRITE_LEGACY(m62_tileram_w) AM_BASE(m_m62_tileram)
+ AM_RANGE(0xa000, 0xbfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE(m_m62_tileram)
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(m62_textram_w) AM_BASE(m_m62_textram)
- AM_RANGE(0xd000, 0xd000) AM_WRITE_LEGACY(m62_vscroll_low_w)
- AM_RANGE(0xd001, 0xd001) AM_WRITE_LEGACY(m62_hscroll_low_w)
- AM_RANGE(0xd002, 0xd002) AM_WRITE_LEGACY(spelunk2_gfxport_w)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(m62_textram_w) AM_BASE(m_m62_textram)
+ AM_RANGE(0xd000, 0xd000) AM_WRITE(m62_vscroll_low_w)
+ AM_RANGE(0xd001, 0xd001) AM_WRITE(m62_hscroll_low_w)
+ AM_RANGE(0xd002, 0xd002) AM_WRITE(spelunk2_gfxport_w)
AM_RANGE(0xd003, 0xd003) AM_WRITE(spelunk2_bankswitch_w)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
@@ -344,28 +344,28 @@ static ADDRESS_MAP_START( youjyudn_map, AS_PROGRAM, 8, m62_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(m62_textram_w) AM_BASE(m_m62_textram)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(m62_tileram_w) AM_BASE(m_m62_tileram)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(m62_textram_w) AM_BASE(m_m62_textram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(m62_tileram_w) AM_BASE(m_m62_tileram)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( youjyudn_io_map, AS_IO, 8, m62_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(irem_sound_cmd_w)
- AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE_LEGACY(m62_flipscreen_w) /* + coin counters */
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
AM_RANGE(0x02, 0x02) AM_READ_PORT("P2")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
- AM_RANGE(0x80, 0x80) AM_WRITE_LEGACY(m62_hscroll_high_w)
- AM_RANGE(0x81, 0x81) AM_WRITE_LEGACY(m62_hscroll_low_w)
+ AM_RANGE(0x80, 0x80) AM_WRITE(m62_hscroll_high_w)
+ AM_RANGE(0x81, 0x81) AM_WRITE(m62_hscroll_low_w)
AM_RANGE(0x83, 0x83) AM_WRITE(youjyudn_bankswitch_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( horizon_map, AS_PROGRAM, 8, m62_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc1ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xc800, 0xc83f) AM_RAM_WRITE_LEGACY(horizon_scrollram_w) AM_BASE(m_scrollram)
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(m62_tileram_w) AM_BASE(m_m62_tileram)
+ AM_RANGE(0xc800, 0xc83f) AM_RAM_WRITE(horizon_scrollram_w) AM_BASE(m_scrollram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE(m_m62_tileram)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index 266992d5dea..fa981c94d4c 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -871,10 +871,10 @@ static ADDRESS_MAP_START( NAME##_map, AS_PROGRAM, 16 , m72_state ) \
AM_RANGE(0x00000, ROMSIZE-1) AM_ROM \
AM_RANGE(WORKRAM, WORKRAM+0x3fff) AM_RAM /* work RAM */ \
AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) \
- AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE_LEGACY(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram") \
- AM_RANGE(0xcc000, 0xccbff) AM_READWRITE_LEGACY(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2") \
- AM_RANGE(0xd0000, 0xd3fff) AM_RAM_WRITE_LEGACY(m72_videoram1_w) AM_BASE(m_videoram1) \
- AM_RANGE(0xd8000, 0xdbfff) AM_RAM_WRITE_LEGACY(m72_videoram2_w) AM_BASE(m_videoram2) \
+ AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram") \
+ AM_RANGE(0xcc000, 0xccbff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2") \
+ AM_RANGE(0xd0000, 0xd3fff) AM_RAM_WRITE(m72_videoram1_w) AM_BASE(m_videoram1) \
+ AM_RANGE(0xd8000, 0xdbfff) AM_RAM_WRITE(m72_videoram2_w) AM_BASE(m_videoram2) \
AM_RANGE(0xe0000, 0xeffff) AM_READWRITE(soundram_r, soundram_w) \
AM_RANGE(0xffff0, 0xfffff) AM_ROM \
ADDRESS_MAP_END
@@ -891,10 +891,10 @@ static ADDRESS_MAP_START( xmultipl_map, AS_PROGRAM, 16, m72_state )
AM_RANGE(0x9c000, 0x9ffff) AM_RAM /* work RAM */
AM_RANGE(0xb0ffe, 0xb0fff) AM_WRITEONLY /* leftover from protection?? */
AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE_LEGACY(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
- AM_RANGE(0xcc000, 0xccbff) AM_READWRITE_LEGACY(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
- AM_RANGE(0xd0000, 0xd3fff) AM_RAM_WRITE_LEGACY(m72_videoram1_w) AM_BASE(m_videoram1)
- AM_RANGE(0xd8000, 0xdbfff) AM_RAM_WRITE_LEGACY(m72_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
+ AM_RANGE(0xcc000, 0xccbff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xd0000, 0xd3fff) AM_RAM_WRITE(m72_videoram1_w) AM_BASE(m_videoram1)
+ AM_RANGE(0xd8000, 0xdbfff) AM_RAM_WRITE(m72_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -903,22 +903,22 @@ static ADDRESS_MAP_START( dbreed_map, AS_PROGRAM, 16, m72_state )
AM_RANGE(0x88000, 0x8bfff) AM_RAM /* work RAM */
AM_RANGE(0xb0ffe, 0xb0fff) AM_WRITEONLY /* leftover from protection?? */
AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE_LEGACY(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
- AM_RANGE(0xcc000, 0xccbff) AM_READWRITE_LEGACY(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
- AM_RANGE(0xd0000, 0xd3fff) AM_RAM_WRITE_LEGACY(m72_videoram1_w) AM_BASE(m_videoram1)
- AM_RANGE(0xd8000, 0xdbfff) AM_RAM_WRITE_LEGACY(m72_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
+ AM_RANGE(0xcc000, 0xccbff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xd0000, 0xd3fff) AM_RAM_WRITE(m72_videoram1_w) AM_BASE(m_videoram1)
+ AM_RANGE(0xd8000, 0xdbfff) AM_RAM_WRITE(m72_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( rtype2_map, AS_PROGRAM, 16, m72_state )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
- AM_RANGE(0xb0000, 0xb0001) AM_WRITE_LEGACY(m72_irq_line_w)
- AM_RANGE(0xbc000, 0xbc001) AM_WRITE_LEGACY(m72_dmaon_w)
+ AM_RANGE(0xb0000, 0xb0001) AM_WRITE(m72_irq_line_w)
+ AM_RANGE(0xbc000, 0xbc001) AM_WRITE(m72_dmaon_w)
AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE_LEGACY(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
- AM_RANGE(0xd0000, 0xd3fff) AM_RAM_WRITE_LEGACY(m72_videoram1_w) AM_BASE(m_videoram1)
- AM_RANGE(0xd4000, 0xd7fff) AM_RAM_WRITE_LEGACY(m72_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0xd8000, 0xd8bff) AM_READWRITE_LEGACY(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
+ AM_RANGE(0xd0000, 0xd3fff) AM_RAM_WRITE(m72_videoram1_w) AM_BASE(m_videoram1)
+ AM_RANGE(0xd4000, 0xd7fff) AM_RAM_WRITE(m72_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xd8000, 0xd8bff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
AM_RANGE(0xe0000, 0xe3fff) AM_RAM /* work RAM */
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -926,16 +926,16 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( majtitle_map, AS_PROGRAM, 16, m72_state )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0xa0000, 0xa03ff) AM_RAM AM_BASE(m_majtitle_rowscrollram)
- AM_RANGE(0xa4000, 0xa4bff) AM_READWRITE_LEGACY(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
- AM_RANGE(0xac000, 0xaffff) AM_RAM_WRITE_LEGACY(m72_videoram1_w) AM_BASE(m_videoram1)
- AM_RANGE(0xb0000, 0xbffff) AM_RAM_WRITE_LEGACY(m72_videoram2_w) AM_BASE(m_videoram2) /* larger than the other games */
+ AM_RANGE(0xa4000, 0xa4bff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xac000, 0xaffff) AM_RAM_WRITE(m72_videoram1_w) AM_BASE(m_videoram1)
+ AM_RANGE(0xb0000, 0xbffff) AM_RAM_WRITE(m72_videoram2_w) AM_BASE(m_videoram2) /* larger than the other games */
AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xc8000, 0xc83ff) AM_RAM AM_BASE(m_spriteram2)
- AM_RANGE(0xcc000, 0xccbff) AM_READWRITE_LEGACY(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
+ AM_RANGE(0xcc000, 0xccbff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
AM_RANGE(0xd0000, 0xd3fff) AM_RAM /* work RAM */
- AM_RANGE(0xe0000, 0xe0001) AM_WRITE_LEGACY(m72_irq_line_w)
+ AM_RANGE(0xe0000, 0xe0001) AM_WRITE(m72_irq_line_w)
AM_RANGE(0xe4000, 0xe4001) AM_WRITEONLY /* playfield enable? 1 during screen transitions, 0 otherwise */
- AM_RANGE(0xec000, 0xec001) AM_WRITE_LEGACY(m72_dmaon_w)
+ AM_RANGE(0xec000, 0xec001) AM_WRITE(m72_dmaon_w)
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -944,37 +944,37 @@ static ADDRESS_MAP_START( hharry_map, AS_PROGRAM, 16, m72_state )
AM_RANGE(0xa0000, 0xa3fff) AM_RAM /* work RAM */
AM_RANGE(0xb0ffe, 0xb0fff) AM_WRITEONLY /* leftover from protection?? */
AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE_LEGACY(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
- AM_RANGE(0xcc000, 0xccbff) AM_READWRITE_LEGACY(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
- AM_RANGE(0xd0000, 0xd3fff) AM_RAM_WRITE_LEGACY(m72_videoram1_w) AM_BASE(m_videoram1)
- AM_RANGE(0xd8000, 0xdbfff) AM_RAM_WRITE_LEGACY(m72_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
+ AM_RANGE(0xcc000, 0xccbff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xd0000, 0xd3fff) AM_RAM_WRITE(m72_videoram1_w) AM_BASE(m_videoram1)
+ AM_RANGE(0xd8000, 0xdbfff) AM_RAM_WRITE(m72_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( hharryu_map, AS_PROGRAM, 16, m72_state )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
- AM_RANGE(0xa0000, 0xa0bff) AM_READWRITE_LEGACY(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
- AM_RANGE(0xa8000, 0xa8bff) AM_READWRITE_LEGACY(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
- AM_RANGE(0xb0000, 0xb0001) AM_WRITE_LEGACY(m72_irq_line_w)
- AM_RANGE(0xbc000, 0xbc001) AM_WRITE_LEGACY(m72_dmaon_w)
+ AM_RANGE(0xa0000, 0xa0bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa8000, 0xa8bff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xb0000, 0xb0001) AM_WRITE(m72_irq_line_w)
+ AM_RANGE(0xbc000, 0xbc001) AM_WRITE(m72_dmaon_w)
AM_RANGE(0xb0ffe, 0xb0fff) AM_WRITEONLY /* leftover from protection?? */
AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xd0000, 0xd3fff) AM_RAM_WRITE_LEGACY(m72_videoram1_w) AM_BASE(m_videoram1)
- AM_RANGE(0xd4000, 0xd7fff) AM_RAM_WRITE_LEGACY(m72_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xd0000, 0xd3fff) AM_RAM_WRITE(m72_videoram1_w) AM_BASE(m_videoram1)
+ AM_RANGE(0xd4000, 0xd7fff) AM_RAM_WRITE(m72_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0xe0000, 0xe3fff) AM_RAM /* work RAM */
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( kengo_map, AS_PROGRAM, 16, m72_state )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
- AM_RANGE(0xa0000, 0xa0bff) AM_READWRITE_LEGACY(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
- AM_RANGE(0xa8000, 0xa8bff) AM_READWRITE_LEGACY(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
- AM_RANGE(0xb0000, 0xb0001) AM_WRITE_LEGACY(m72_irq_line_w)
+ AM_RANGE(0xa0000, 0xa0bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa8000, 0xa8bff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xb0000, 0xb0001) AM_WRITE(m72_irq_line_w)
AM_RANGE(0xb4000, 0xb4001) AM_WRITENOP /* ??? */
- AM_RANGE(0xbc000, 0xbc001) AM_WRITE_LEGACY(m72_dmaon_w)
+ AM_RANGE(0xbc000, 0xbc001) AM_WRITE(m72_dmaon_w)
AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x80000, 0x83fff) AM_RAM_WRITE_LEGACY(m72_videoram1_w) AM_BASE(m_videoram1)
- AM_RANGE(0x84000, 0x87fff) AM_RAM_WRITE_LEGACY(m72_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x80000, 0x83fff) AM_RAM_WRITE(m72_videoram1_w) AM_BASE(m_videoram1)
+ AM_RANGE(0x84000, 0x87fff) AM_RAM_WRITE(m72_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0xe0000, 0xe3fff) AM_RAM /* work RAM */
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -984,14 +984,14 @@ static ADDRESS_MAP_START( m72_portmap, AS_IO, 16, m72_state )
AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
AM_RANGE(0x00, 0x01) AM_DEVWRITE_LEGACY("m72", m72_sound_command_w)
- AM_RANGE(0x02, 0x03) AM_WRITE_LEGACY(m72_port02_w) /* coin counters, reset sound cpu, other stuff? */
- AM_RANGE(0x04, 0x05) AM_WRITE_LEGACY(m72_dmaon_w)
- AM_RANGE(0x06, 0x07) AM_WRITE_LEGACY(m72_irq_line_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(m72_port02_w) /* coin counters, reset sound cpu, other stuff? */
+ AM_RANGE(0x04, 0x05) AM_WRITE(m72_dmaon_w)
+ AM_RANGE(0x06, 0x07) AM_WRITE(m72_irq_line_w)
//AM_RANGE(0x40, 0x43) AM_WRITENOP /* Interrupt controller, only written to at bootup */
- AM_RANGE(0x80, 0x81) AM_WRITE_LEGACY(m72_scrolly1_w)
- AM_RANGE(0x82, 0x83) AM_WRITE_LEGACY(m72_scrollx1_w)
- AM_RANGE(0x84, 0x85) AM_WRITE_LEGACY(m72_scrolly2_w)
- AM_RANGE(0x86, 0x87) AM_WRITE_LEGACY(m72_scrollx2_w)
+ AM_RANGE(0x80, 0x81) AM_WRITE(m72_scrolly1_w)
+ AM_RANGE(0x82, 0x83) AM_WRITE(m72_scrollx1_w)
+ AM_RANGE(0x84, 0x85) AM_WRITE(m72_scrolly2_w)
+ AM_RANGE(0x86, 0x87) AM_WRITE(m72_scrollx2_w)
/* { 0xc0, 0xc0 trigger sample, filled by init_ function */
ADDRESS_MAP_END
@@ -1000,12 +1000,12 @@ static ADDRESS_MAP_START( rtype2_portmap, AS_IO, 16, m72_state )
AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
AM_RANGE(0x00, 0x01) AM_DEVWRITE_LEGACY("m72", m72_sound_command_w)
- AM_RANGE(0x02, 0x03) AM_WRITE_LEGACY(rtype2_port02_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w)
AM_RANGE(0x40, 0x43) AM_WRITENOP /* Interrupt controller, only written to at bootup */
- AM_RANGE(0x80, 0x81) AM_WRITE_LEGACY(m72_scrolly1_w)
- AM_RANGE(0x82, 0x83) AM_WRITE_LEGACY(m72_scrollx1_w)
- AM_RANGE(0x84, 0x85) AM_WRITE_LEGACY(m72_scrolly2_w)
- AM_RANGE(0x86, 0x87) AM_WRITE_LEGACY(m72_scrollx2_w)
+ AM_RANGE(0x80, 0x81) AM_WRITE(m72_scrolly1_w)
+ AM_RANGE(0x82, 0x83) AM_WRITE(m72_scrollx1_w)
+ AM_RANGE(0x84, 0x85) AM_WRITE(m72_scrolly2_w)
+ AM_RANGE(0x86, 0x87) AM_WRITE(m72_scrollx2_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( poundfor_portmap, AS_IO, 16, m72_state )
@@ -1013,12 +1013,12 @@ static ADDRESS_MAP_START( poundfor_portmap, AS_IO, 16, m72_state )
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
AM_RANGE(0x08, 0x0f) AM_READ(poundfor_trackball_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE_LEGACY("m72", m72_sound_command_w)
- AM_RANGE(0x02, 0x03) AM_WRITE_LEGACY(rtype2_port02_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w)
AM_RANGE(0x40, 0x43) AM_WRITENOP /* Interrupt controller, only written to at bootup */
- AM_RANGE(0x80, 0x81) AM_WRITE_LEGACY(m72_scrolly1_w)
- AM_RANGE(0x82, 0x83) AM_WRITE_LEGACY(m72_scrollx1_w)
- AM_RANGE(0x84, 0x85) AM_WRITE_LEGACY(m72_scrolly2_w)
- AM_RANGE(0x86, 0x87) AM_WRITE_LEGACY(m72_scrollx2_w)
+ AM_RANGE(0x80, 0x81) AM_WRITE(m72_scrolly1_w)
+ AM_RANGE(0x82, 0x83) AM_WRITE(m72_scrollx1_w)
+ AM_RANGE(0x84, 0x85) AM_WRITE(m72_scrolly2_w)
+ AM_RANGE(0x86, 0x87) AM_WRITE(m72_scrollx2_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( majtitle_portmap, AS_IO, 16, m72_state )
@@ -1026,13 +1026,13 @@ static ADDRESS_MAP_START( majtitle_portmap, AS_IO, 16, m72_state )
AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
AM_RANGE(0x00, 0x01) AM_DEVWRITE_LEGACY("m72", m72_sound_command_w)
- AM_RANGE(0x02, 0x03) AM_WRITE_LEGACY(rtype2_port02_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w)
AM_RANGE(0x40, 0x43) AM_WRITENOP /* Interrupt controller, only written to at bootup */
- AM_RANGE(0x80, 0x81) AM_WRITE_LEGACY(m72_scrolly1_w)
- AM_RANGE(0x82, 0x83) AM_WRITE_LEGACY(m72_scrollx1_w)
- AM_RANGE(0x84, 0x85) AM_WRITE_LEGACY(m72_scrolly2_w)
- AM_RANGE(0x86, 0x87) AM_WRITE_LEGACY(m72_scrollx2_w)
- AM_RANGE(0x8e, 0x8f) AM_WRITE_LEGACY(majtitle_gfx_ctrl_w)
+ AM_RANGE(0x80, 0x81) AM_WRITE(m72_scrolly1_w)
+ AM_RANGE(0x82, 0x83) AM_WRITE(m72_scrollx1_w)
+ AM_RANGE(0x84, 0x85) AM_WRITE(m72_scrolly2_w)
+ AM_RANGE(0x86, 0x87) AM_WRITE(m72_scrollx2_w)
+ AM_RANGE(0x8e, 0x8f) AM_WRITE(majtitle_gfx_ctrl_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( hharry_portmap, AS_IO, 16, m72_state )
@@ -1040,14 +1040,14 @@ static ADDRESS_MAP_START( hharry_portmap, AS_IO, 16, m72_state )
AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
AM_RANGE(0x00, 0x01) AM_DEVWRITE_LEGACY("m72", m72_sound_command_w)
- AM_RANGE(0x02, 0x03) AM_WRITE_LEGACY(rtype2_port02_w) /* coin counters, reset sound cpu, other stuff? */
- AM_RANGE(0x04, 0x05) AM_WRITE_LEGACY(m72_dmaon_w)
- AM_RANGE(0x06, 0x07) AM_WRITE_LEGACY(m72_irq_line_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w) /* coin counters, reset sound cpu, other stuff? */
+ AM_RANGE(0x04, 0x05) AM_WRITE(m72_dmaon_w)
+ AM_RANGE(0x06, 0x07) AM_WRITE(m72_irq_line_w)
AM_RANGE(0x40, 0x43) AM_WRITENOP /* Interrupt controller, only written to at bootup */
- AM_RANGE(0x80, 0x81) AM_WRITE_LEGACY(m72_scrolly1_w)
- AM_RANGE(0x82, 0x83) AM_WRITE_LEGACY(m72_scrollx1_w)
- AM_RANGE(0x84, 0x85) AM_WRITE_LEGACY(m72_scrolly2_w)
- AM_RANGE(0x86, 0x87) AM_WRITE_LEGACY(m72_scrollx2_w)
+ AM_RANGE(0x80, 0x81) AM_WRITE(m72_scrolly1_w)
+ AM_RANGE(0x82, 0x83) AM_WRITE(m72_scrollx1_w)
+ AM_RANGE(0x84, 0x85) AM_WRITE(m72_scrolly2_w)
+ AM_RANGE(0x86, 0x87) AM_WRITE(m72_scrollx2_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( kengo_portmap, AS_IO, 16, m72_state )
@@ -1055,11 +1055,11 @@ static ADDRESS_MAP_START( kengo_portmap, AS_IO, 16, m72_state )
AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
AM_RANGE(0x00, 0x01) AM_DEVWRITE_LEGACY("m72", m72_sound_command_w)
- AM_RANGE(0x02, 0x03) AM_WRITE_LEGACY(rtype2_port02_w)
- AM_RANGE(0x80, 0x81) AM_WRITE_LEGACY(m72_scrolly1_w)
- AM_RANGE(0x82, 0x83) AM_WRITE_LEGACY(m72_scrollx1_w)
- AM_RANGE(0x84, 0x85) AM_WRITE_LEGACY(m72_scrolly2_w)
- AM_RANGE(0x86, 0x87) AM_WRITE_LEGACY(m72_scrollx2_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w)
+ AM_RANGE(0x80, 0x81) AM_WRITE(m72_scrolly1_w)
+ AM_RANGE(0x82, 0x83) AM_WRITE(m72_scrollx1_w)
+ AM_RANGE(0x84, 0x85) AM_WRITE(m72_scrolly2_w)
+ AM_RANGE(0x86, 0x87) AM_WRITE(m72_scrollx2_w)
// AM_RANGE(0x8c, 0x8f) AM_WRITENOP /* ??? */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index 4307f9aad53..b39e1120276 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -76,7 +76,7 @@ static ADDRESS_MAP_START( m90_main_cpu_map, AS_PROGRAM, 16, m90_state )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0x80000, 0x8ffff) AM_ROMBANK("bank1") /* Quiz F1 only */
AM_RANGE(0xa0000, 0xa3fff) AM_RAM
- AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE_LEGACY(m90_video_w) AM_BASE(m_video_data)
+ AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m90_video_w) AM_BASE(m_video_data)
AM_RANGE(0xe0000, 0xe03ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -85,7 +85,7 @@ static ADDRESS_MAP_START( dynablsb_main_cpu_map, AS_PROGRAM, 16, m90_state )
AM_RANGE(0x00000, 0x3ffff) AM_ROM
AM_RANGE(0x6000e, 0x60fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xa0000, 0xa3fff) AM_RAM
- AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE_LEGACY(m90_video_w) AM_BASE(m_video_data)
+ AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m90_video_w) AM_BASE(m_video_data)
AM_RANGE(0xe0000, 0xe03ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -94,7 +94,7 @@ static ADDRESS_MAP_START( bomblord_main_cpu_map, AS_PROGRAM, 16, m90_state )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0xa0000, 0xa3fff) AM_RAM
AM_RANGE(0xc000e, 0xc0fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE_LEGACY(m90_video_w) AM_BASE(m_video_data)
+ AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m90_video_w) AM_BASE(m_video_data)
AM_RANGE(0xe0000, 0xe03ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -106,7 +106,7 @@ static ADDRESS_MAP_START( m90_main_cpu_io_map, AS_IO, 16, m90_state )
AM_RANGE(0x02, 0x03) AM_READ_PORT("SYSTEM")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
AM_RANGE(0x06, 0x07) AM_READ_PORT("P3_P4")
- AM_RANGE(0x80, 0x8f) AM_WRITE_LEGACY(m90_video_control_w)
+ AM_RANGE(0x80, 0x8f) AM_WRITE(m90_video_control_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( dynablsb_main_cpu_io_map, AS_IO, 16, m90_state )
@@ -117,7 +117,7 @@ static ADDRESS_MAP_START( dynablsb_main_cpu_io_map, AS_IO, 16, m90_state )
// AM_RANGE(0x04, 0x05) AM_WRITE(unknown_w) /* dynablsb: write continuously 0x6000 */
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
AM_RANGE(0x06, 0x07) AM_READ_PORT("P3_P4")
- AM_RANGE(0x80, 0x8f) AM_WRITE_LEGACY(m90_video_control_w)
+ AM_RANGE(0x80, 0x8f) AM_WRITE(m90_video_control_w)
// AM_RANGE(0x90, 0x91) AM_WRITE(unknown_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index cec72909fc7..1fca610b7c8 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -334,12 +334,12 @@ WRITE16_MEMBER(m92_state::m92_sound_reset_w)
/* appears to be an earlier board */
static ADDRESS_MAP_START( lethalth_map, AS_PROGRAM, 16, m92_state )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
- AM_RANGE(0x80000, 0x8ffff) AM_RAM_WRITE_LEGACY(m92_vram_w) AM_BASE(m_vram_data)
+ AM_RANGE(0x80000, 0x8ffff) AM_RAM_WRITE(m92_vram_w) AM_BASE(m_vram_data)
AM_RANGE(0xe0000, 0xeffff) AM_RAM /* System ram */
AM_RANGE(0xf8000, 0xf87ff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xf8800, 0xf8fff) AM_READWRITE_LEGACY(m92_paletteram_r, m92_paletteram_w)
- AM_RANGE(0xf9000, 0xf900f) AM_WRITE_LEGACY(m92_spritecontrol_w) AM_BASE(m_spritecontrol)
- AM_RANGE(0xf9800, 0xf9801) AM_WRITE_LEGACY(m92_videocontrol_w)
+ AM_RANGE(0xf8800, 0xf8fff) AM_READWRITE(m92_paletteram_r, m92_paletteram_w)
+ AM_RANGE(0xf9000, 0xf900f) AM_WRITE(m92_spritecontrol_w) AM_BASE(m_spritecontrol)
+ AM_RANGE(0xf9800, 0xf9801) AM_WRITE(m92_videocontrol_w)
AM_RANGE(0xffff0, 0xfffff) AM_ROM AM_REGION("maincpu", 0x7fff0)
ADDRESS_MAP_END
@@ -347,12 +347,12 @@ static ADDRESS_MAP_START( m92_map, AS_PROGRAM, 16, m92_state )
AM_RANGE(0x00000, 0x9ffff) AM_ROM
AM_RANGE(0xa0000, 0xbffff) AM_ROMBANK("bank1")
AM_RANGE(0xc0000, 0xcffff) AM_ROM AM_REGION("maincpu", 0x00000) /* Mirror used by In The Hunt as protection */
- AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE_LEGACY(m92_vram_w) AM_BASE(m_vram_data)
+ AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m92_vram_w) AM_BASE(m_vram_data)
AM_RANGE(0xe0000, 0xeffff) AM_RAM /* System ram */
AM_RANGE(0xf8000, 0xf87ff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xf8800, 0xf8fff) AM_READWRITE_LEGACY(m92_paletteram_r, m92_paletteram_w)
- AM_RANGE(0xf9000, 0xf900f) AM_WRITE_LEGACY(m92_spritecontrol_w) AM_BASE(m_spritecontrol)
- AM_RANGE(0xf9800, 0xf9801) AM_WRITE_LEGACY(m92_videocontrol_w)
+ AM_RANGE(0xf8800, 0xf8fff) AM_READWRITE(m92_paletteram_r, m92_paletteram_w)
+ AM_RANGE(0xf9000, 0xf900f) AM_WRITE(m92_spritecontrol_w) AM_BASE(m_spritecontrol)
+ AM_RANGE(0xf9800, 0xf9801) AM_WRITE(m92_videocontrol_w)
AM_RANGE(0xffff0, 0xfffff) AM_ROM AM_REGION("maincpu", 0x7fff0)
ADDRESS_MAP_END
@@ -365,10 +365,10 @@ static ADDRESS_MAP_START( m92_portmap, AS_IO, 16, m92_state )
AM_RANGE(0x00, 0x01) AM_WRITE(m92_soundlatch_w)
AM_RANGE(0x02, 0x03) AM_WRITE(m92_coincounter_w)
AM_RANGE(0x40, 0x43) AM_WRITENOP /* Interrupt controller, only written to at bootup */
- AM_RANGE(0x80, 0x87) AM_WRITE_LEGACY(m92_pf1_control_w)
- AM_RANGE(0x88, 0x8f) AM_WRITE_LEGACY(m92_pf2_control_w)
- AM_RANGE(0x90, 0x97) AM_WRITE_LEGACY(m92_pf3_control_w)
- AM_RANGE(0x98, 0x9f) AM_WRITE_LEGACY(m92_master_control_w)
+ AM_RANGE(0x80, 0x87) AM_WRITE(m92_pf1_control_w)
+ AM_RANGE(0x88, 0x8f) AM_WRITE(m92_pf2_control_w)
+ AM_RANGE(0x90, 0x97) AM_WRITE(m92_pf3_control_w)
+ AM_RANGE(0x98, 0x9f) AM_WRITE(m92_master_control_w)
AM_RANGE(0xc0, 0xc1) AM_WRITE(m92_sound_reset_w)
ADDRESS_MAP_END
@@ -387,10 +387,10 @@ static ADDRESS_MAP_START( ppan_portmap, AS_IO, 16, m92_state )
AM_RANGE(0x18, 0x19) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x02, 0x03) AM_WRITE(m92_coincounter_w)
AM_RANGE(0x40, 0x43) AM_WRITENOP /* Interrupt controller, only written to at bootup */
- AM_RANGE(0x80, 0x87) AM_WRITE_LEGACY(m92_pf1_control_w)
- AM_RANGE(0x88, 0x8f) AM_WRITE_LEGACY(m92_pf2_control_w)
- AM_RANGE(0x90, 0x97) AM_WRITE_LEGACY(m92_pf3_control_w)
- AM_RANGE(0x98, 0x9f) AM_WRITE_LEGACY(m92_master_control_w)
+ AM_RANGE(0x80, 0x87) AM_WRITE(m92_pf1_control_w)
+ AM_RANGE(0x88, 0x8f) AM_WRITE(m92_pf2_control_w)
+ AM_RANGE(0x90, 0x97) AM_WRITE(m92_pf3_control_w)
+ AM_RANGE(0x98, 0x9f) AM_WRITE(m92_master_control_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index cc8da10a4ca..15aec0c2802 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -401,19 +401,19 @@ static ADDRESS_MAP_START( macrossp_map, AS_PROGRAM, 32, macrossp_state )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
AM_RANGE(0x800000, 0x802fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
/* SCR A Layer */
- AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE_LEGACY(macrossp_scra_videoram_w) AM_BASE(m_scra_videoram)
+ AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(macrossp_scra_videoram_w) AM_BASE(m_scra_videoram)
AM_RANGE(0x904200, 0x9043ff) AM_WRITEONLY /* W/O? */
AM_RANGE(0x905000, 0x90500b) AM_WRITEONLY AM_BASE(m_scra_videoregs) /* W/O? */
/* SCR B Layer */
- AM_RANGE(0x908000, 0x90bfff) AM_RAM_WRITE_LEGACY(macrossp_scrb_videoram_w) AM_BASE(m_scrb_videoram)
+ AM_RANGE(0x908000, 0x90bfff) AM_RAM_WRITE(macrossp_scrb_videoram_w) AM_BASE(m_scrb_videoram)
AM_RANGE(0x90c200, 0x90c3ff) AM_WRITEONLY /* W/O? */
AM_RANGE(0x90d000, 0x90d00b) AM_WRITEONLY AM_BASE(m_scrb_videoregs) /* W/O? */
/* SCR C Layer */
- AM_RANGE(0x910000, 0x913fff) AM_RAM_WRITE_LEGACY(macrossp_scrc_videoram_w) AM_BASE(m_scrc_videoram)
+ AM_RANGE(0x910000, 0x913fff) AM_RAM_WRITE(macrossp_scrc_videoram_w) AM_BASE(m_scrc_videoram)
AM_RANGE(0x914200, 0x9143ff) AM_WRITEONLY /* W/O? */
AM_RANGE(0x915000, 0x91500b) AM_WRITEONLY AM_BASE(m_scrc_videoregs) /* W/O? */
/* Text Layer */
- AM_RANGE(0x918000, 0x91bfff) AM_RAM_WRITE_LEGACY(macrossp_text_videoram_w) AM_BASE(m_text_videoram)
+ AM_RANGE(0x918000, 0x91bfff) AM_RAM_WRITE(macrossp_text_videoram_w) AM_BASE(m_text_videoram)
AM_RANGE(0x91c200, 0x91c3ff) AM_WRITEONLY /* W/O? */
AM_RANGE(0x91d000, 0x91d00b) AM_WRITEONLY AM_BASE(m_text_videoregs) /* W/O? */
diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c
index 1245111a8c5..75985334093 100644
--- a/src/mame/drivers/macs.c
+++ b/src/mame/drivers/macs.c
@@ -61,11 +61,11 @@ KISEKAE -- info
#include "includes/st0016.h"
-class macs_state : public driver_device
+class macs_state : public st0016_state
{
public:
macs_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag) { }
+ : st0016_state(mconfig, type, tag) { }
UINT8 m_mux_data;
UINT8 m_rev;
@@ -84,13 +84,13 @@ static MACHINE_RESET(macs);
static ADDRESS_MAP_START( macs_mem, AS_PROGRAM, 8, macs_state )
AM_RANGE(0x0000, 0x7fff) AM_ROMBANK("bank4")
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xcfff) AM_READ_LEGACY(st0016_sprite_ram_r) AM_WRITE_LEGACY(st0016_sprite_ram_w)
- AM_RANGE(0xd000, 0xdfff) AM_READ_LEGACY(st0016_sprite2_ram_r) AM_WRITE_LEGACY(st0016_sprite2_ram_w)
+ AM_RANGE(0xc000, 0xcfff) AM_READ(st0016_sprite_ram_r) AM_WRITE(st0016_sprite_ram_w)
+ AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w)
AM_RANGE(0xe000, 0xe7ff) AM_RAM /* work ram ? */
AM_RANGE(0xe800, 0xe87f) AM_RAM AM_BASE(m_ram2)
AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE_LEGACY("stsnd", st0016_snd_r, st0016_snd_w)
- AM_RANGE(0xea00, 0xebff) AM_READ_LEGACY(st0016_palette_ram_r) AM_WRITE_LEGACY(st0016_palette_ram_w)
- AM_RANGE(0xec00, 0xec1f) AM_READ_LEGACY(st0016_character_ram_r) AM_WRITE_LEGACY(st0016_character_ram_w)
+ AM_RANGE(0xea00, 0xebff) AM_READ(st0016_palette_ram_r) AM_WRITE(st0016_palette_ram_w)
+ AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w)
AM_RANGE(0xf000, 0xf7ff) AM_RAMBANK("bank3") /* common /backup ram ?*/
AM_RANGE(0xf800, 0xffff) AM_RAMBANK("bank2") /* common /backup ram ?*/
ADDRESS_MAP_END
@@ -173,16 +173,16 @@ WRITE8_MEMBER(macs_state::macs_output_w)
static ADDRESS_MAP_START( macs_io, AS_IO, 8, macs_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0xbf) AM_READ_LEGACY(st0016_vregs_r) AM_WRITE_LEGACY(st0016_vregs_w) /* video/crt regs ? */
+ AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w) /* video/crt regs ? */
AM_RANGE(0xc0, 0xc7) AM_READWRITE(macs_input_r,macs_output_w)
AM_RANGE(0xe0, 0xe0) AM_WRITENOP /* renju = $40, neratte = 0 */
AM_RANGE(0xe1, 0xe1) AM_WRITE(macs_rom_bank_w)
- AM_RANGE(0xe2, 0xe2) AM_WRITE_LEGACY(st0016_sprite_bank_w)
- AM_RANGE(0xe3, 0xe4) AM_WRITE_LEGACY(st0016_character_bank_w)
- AM_RANGE(0xe5, 0xe5) AM_WRITE_LEGACY(st0016_palette_bank_w)
+ AM_RANGE(0xe2, 0xe2) AM_WRITE(st0016_sprite_bank_w)
+ AM_RANGE(0xe3, 0xe4) AM_WRITE(st0016_character_bank_w)
+ AM_RANGE(0xe5, 0xe5) AM_WRITE(st0016_palette_bank_w)
AM_RANGE(0xe6, 0xe6) AM_WRITE(rambank_w) /* banking ? ram bank ? shared rambank ? */
AM_RANGE(0xe7, 0xe7) AM_WRITENOP /* watchdog */
- AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(st0016_dma_r)
+ AM_RANGE(0xf0, 0xf0) AM_READ(st0016_dma_r)
ADDRESS_MAP_END
static GFXDECODE_START( macs )
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index 884a52c6820..9038d225299 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -79,9 +79,9 @@ static WRITE8_DEVICE_HANDLER( madalien_portB_w )
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, madalien_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM
- AM_RANGE(0x6000, 0x63ff) AM_RAM_WRITE_LEGACY(madalien_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x6000, 0x63ff) AM_RAM_WRITE(madalien_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x6400, 0x67ff) AM_RAM
- AM_RANGE(0x6800, 0x7fff) AM_RAM_WRITE_LEGACY(madalien_charram_w) AM_BASE(m_charram)
+ AM_RANGE(0x6800, 0x7fff) AM_RAM_WRITE(madalien_charram_w) AM_BASE(m_charram)
AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0ff0) AM_DEVWRITE("crtc", mc6845_device, address_w)
AM_RANGE(0x8001, 0x8001) AM_MIRROR(0x0ff0) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index 949931a1500..716bfa247b5 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -149,12 +149,12 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, mainsnk_state )
AM_RANGE(0xc300, 0xc300) AM_READ_PORT("IN3")
AM_RANGE(0xc400, 0xc400) AM_READ_PORT("DSW1")
AM_RANGE(0xc500, 0xc500) AM_READ_PORT("DSW2")
- AM_RANGE(0xc600, 0xc600) AM_WRITE_LEGACY(mainsnk_c600_w)
+ AM_RANGE(0xc600, 0xc600) AM_WRITE(mainsnk_c600_w)
AM_RANGE(0xc700, 0xc700) AM_WRITE(sound_command_w)
- AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE_LEGACY(mainsnk_bgram_w) AM_BASE(m_bgram)
+ AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(mainsnk_bgram_w) AM_BASE(m_bgram)
AM_RANGE(0xdc00, 0xe7ff) AM_RAM
AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(mainsnk_fgram_w) AM_BASE(m_fgram) // + work RAM
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(mainsnk_fgram_w) AM_BASE(m_fgram) // + work RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, mainsnk_state )
diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c
index 9ba934fdcc6..6ef97032e56 100644
--- a/src/mame/drivers/malzak.c
+++ b/src/mame/drivers/malzak.c
@@ -108,7 +108,7 @@ static ADDRESS_MAP_START( malzak_map, AS_PROGRAM, 8, malzak_state )
AM_RANGE(0x14cb, 0x14cb) AM_MIRROR(0x6000) AM_READ(fake_VRLE_r)
AM_RANGE(0x1400, 0x14ff) AM_MIRROR(0x6000) AM_DEVREADWRITE_LEGACY("s2636_0", s2636_work_ram_r, s2636_work_ram_w)
AM_RANGE(0x1500, 0x15ff) AM_MIRROR(0x6000) AM_DEVREADWRITE_LEGACY("s2636_1", s2636_work_ram_r, s2636_work_ram_w)
- AM_RANGE(0x1600, 0x16ff) AM_MIRROR(0x6000) AM_RAM_WRITE_LEGACY(malzak_playfield_w)
+ AM_RANGE(0x1600, 0x16ff) AM_MIRROR(0x6000) AM_RAM_WRITE(malzak_playfield_w)
AM_RANGE(0x1700, 0x17ff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x1800, 0x1fff) AM_MIRROR(0x6000) AM_DEVREADWRITE_LEGACY("saa5050", saa5050_videoram_r, saa5050_videoram_w)
AM_RANGE(0x2000, 0x2fff) AM_ROM
@@ -129,7 +129,7 @@ static ADDRESS_MAP_START( malzak2_map, AS_PROGRAM, 8, malzak_state )
AM_RANGE(0x14cc, 0x14cc) AM_MIRROR(0x6000) AM_READ(s2636_portA_r)
AM_RANGE(0x1400, 0x14ff) AM_MIRROR(0x6000) AM_DEVREADWRITE_LEGACY("s2636_0", s2636_work_ram_r, s2636_work_ram_w)
AM_RANGE(0x1500, 0x15ff) AM_MIRROR(0x6000) AM_DEVREADWRITE_LEGACY("s2636_1", s2636_work_ram_r, s2636_work_ram_w)
- AM_RANGE(0x1600, 0x16ff) AM_MIRROR(0x6000) AM_RAM_WRITE_LEGACY(malzak_playfield_w)
+ AM_RANGE(0x1600, 0x16ff) AM_MIRROR(0x6000) AM_RAM_WRITE(malzak_playfield_w)
AM_RANGE(0x1700, 0x17ff) AM_MIRROR(0x6000) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x1800, 0x1fff) AM_MIRROR(0x6000) AM_DEVREADWRITE_LEGACY("saa5050", saa5050_videoram_r, saa5050_videoram_w)
AM_RANGE(0x2000, 0x2fff) AM_ROM
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index a763d2463b5..411d9cbd56c 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -895,9 +895,9 @@ static INTERRUPT_GEN( sub2_vblank_irq )
}
static ADDRESS_MAP_START( superpac_cpu1_map, AS_PROGRAM, 8, mappy_state )
- AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE_LEGACY(superpac_videoram_w) AM_BASE(m_videoram) /* video RAM */
+ AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(superpac_videoram_w) AM_BASE(m_videoram) /* video RAM */
AM_RANGE(0x0800, 0x1fff) AM_RAM AM_BASE(m_spriteram) /* work RAM with embedded sprite RAM */
- AM_RANGE(0x2000, 0x2000) AM_READWRITE_LEGACY(superpac_flipscreen_r, superpac_flipscreen_w)
+ AM_RANGE(0x2000, 0x2000) AM_READWRITE(superpac_flipscreen_r, superpac_flipscreen_w)
AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE_LEGACY("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with the sound CPU */
AM_RANGE(0x4800, 0x480f) AM_DEVREADWRITE_LEGACY("namcoio_1", namcoio_r, namcoio_w) /* custom I/O chips interface */
AM_RANGE(0x4810, 0x481f) AM_DEVREADWRITE_LEGACY("namcoio_2", namcoio_r, namcoio_w) /* custom I/O chips interface */
@@ -907,7 +907,7 @@ static ADDRESS_MAP_START( superpac_cpu1_map, AS_PROGRAM, 8, mappy_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( phozon_cpu1_map, AS_PROGRAM, 8, mappy_state )
- AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE_LEGACY(superpac_videoram_w) AM_SHARE("share2") AM_BASE(m_videoram) /* video RAM */
+ AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(superpac_videoram_w) AM_SHARE("share2") AM_BASE(m_videoram) /* video RAM */
AM_RANGE(0x0800, 0x1fff) AM_RAM AM_BASE(m_spriteram) AM_SHARE("share3") /* shared RAM with CPU #2/sprite RAM*/
AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE_LEGACY("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with the sound CPU */
AM_RANGE(0x4800, 0x480f) AM_DEVREADWRITE_LEGACY("namcoio_1", namcoio_r, namcoio_w) /* custom I/O chips interface */
@@ -918,9 +918,9 @@ static ADDRESS_MAP_START( phozon_cpu1_map, AS_PROGRAM, 8, mappy_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( mappy_cpu1_map, AS_PROGRAM, 8, mappy_state )
- AM_RANGE(0x0000, 0x0fff) AM_RAM_WRITE_LEGACY(mappy_videoram_w) AM_BASE(m_videoram) /* video RAM */
+ AM_RANGE(0x0000, 0x0fff) AM_RAM_WRITE(mappy_videoram_w) AM_BASE(m_videoram) /* video RAM */
AM_RANGE(0x1000, 0x27ff) AM_RAM AM_BASE(m_spriteram) /* work RAM with embedded sprite RAM */
- AM_RANGE(0x3800, 0x3fff) AM_WRITE_LEGACY(mappy_scroll_w) /* scroll */
+ AM_RANGE(0x3800, 0x3fff) AM_WRITE(mappy_scroll_w) /* scroll */
AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE_LEGACY("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with the sound CPU */
AM_RANGE(0x4800, 0x480f) AM_DEVREADWRITE_LEGACY("namcoio_1", namcoio_r, namcoio_w) /* custom I/O chips interface */
AM_RANGE(0x4810, 0x481f) AM_DEVREADWRITE_LEGACY("namcoio_2", namcoio_r, namcoio_w) /* custom I/O chips interface */
@@ -950,7 +950,7 @@ ADDRESS_MAP_END
/* extra CPU only present in Phozon */
static ADDRESS_MAP_START( phozon_cpu3_map, AS_PROGRAM, 8, mappy_state )
- AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE_LEGACY(superpac_videoram_w) AM_SHARE("share2") /* video RAM */
+ AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(superpac_videoram_w) AM_SHARE("share2") /* video RAM */
AM_RANGE(0x0800, 0x1fff) AM_RAM AM_SHARE("share3") /* shared RAM with CPU #2/sprite RAM*/
AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE_LEGACY("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with CPU #2 */
AM_RANGE(0xa000, 0xa7ff) AM_RAM /* RAM */
diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c
index 7f30c70dda3..a35bf1918f1 100644
--- a/src/mame/drivers/marineb.c
+++ b/src/mame/drivers/marineb.c
@@ -80,15 +80,15 @@ WRITE8_MEMBER(marineb_state::irq_mask_w)
static ADDRESS_MAP_START( marineb_map, AS_PROGRAM, 8, marineb_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE_LEGACY(marineb_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(marineb_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x8c00, 0x8c3f) AM_RAM AM_BASE(m_spriteram) /* Hoccer only */
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(marineb_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x9800, 0x9800) AM_WRITE_LEGACY(marineb_column_scroll_w)
- AM_RANGE(0x9a00, 0x9a00) AM_WRITE_LEGACY(marineb_palette_bank_0_w)
- AM_RANGE(0x9c00, 0x9c00) AM_WRITE_LEGACY(marineb_palette_bank_1_w)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(marineb_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x9800, 0x9800) AM_WRITE(marineb_column_scroll_w)
+ AM_RANGE(0x9a00, 0x9a00) AM_WRITE(marineb_palette_bank_0_w)
+ AM_RANGE(0x9c00, 0x9c00) AM_WRITE(marineb_palette_bank_1_w)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P2") AM_WRITE(irq_mask_w)
- AM_RANGE(0xa001, 0xa001) AM_WRITE_LEGACY(marineb_flipscreen_y_w)
- AM_RANGE(0xa002, 0xa002) AM_WRITE_LEGACY(marineb_flipscreen_x_w)
+ AM_RANGE(0xa001, 0xa001) AM_WRITE(marineb_flipscreen_y_w)
+ AM_RANGE(0xa002, 0xa002) AM_WRITE(marineb_flipscreen_x_w)
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("P1")
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW")
AM_RANGE(0xb800, 0xb800) AM_READ_PORT("SYSTEM") AM_WRITENOP /* also watchdog */
diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c
index 07bb05ec302..c7cf4c8c42c 100644
--- a/src/mame/drivers/mario.c
+++ b/src/mame/drivers/mario.c
@@ -136,13 +136,13 @@ static ADDRESS_MAP_START( mario_map, AS_PROGRAM, 8, mario_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* physical sprite ram */
- AM_RANGE(0x7400, 0x77ff) AM_RAM_WRITE_LEGACY(mario_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x7400, 0x77ff) AM_RAM_WRITE(mario_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_DEVWRITE_LEGACY("discrete", mario_sh1_w) /* Mario run sample */
AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_DEVWRITE_LEGACY("discrete", mario_sh2_w) /* Luigi run sample */
- AM_RANGE(0x7d00, 0x7d00) AM_WRITE_LEGACY(mario_scroll_w)
- AM_RANGE(0x7e80, 0x7e80) AM_WRITE_LEGACY(mario_gfxbank_w)
- AM_RANGE(0x7e82, 0x7e82) AM_WRITE_LEGACY(mario_flip_w)
- AM_RANGE(0x7e83, 0x7e83) AM_WRITE_LEGACY(mario_palettebank_w)
+ AM_RANGE(0x7d00, 0x7d00) AM_WRITE(mario_scroll_w)
+ AM_RANGE(0x7e80, 0x7e80) AM_WRITE(mario_gfxbank_w)
+ AM_RANGE(0x7e82, 0x7e82) AM_WRITE(mario_flip_w)
+ AM_RANGE(0x7e83, 0x7e83) AM_WRITE(mario_palettebank_w)
AM_RANGE(0x7e84, 0x7e84) AM_WRITE(nmi_mask_w)
AM_RANGE(0x7e85, 0x7e85) AM_DEVWRITE_LEGACY("z80dma", mario_z80dma_rdy_w) /* ==> DMA Chip */
AM_RANGE(0x7f00, 0x7f07) AM_WRITE_LEGACY(mario_sh3_w) /* Sound port */
@@ -155,14 +155,14 @@ static ADDRESS_MAP_START( masao_map, AS_PROGRAM, 8, mario_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* physical sprite ram */
- AM_RANGE(0x7400, 0x77ff) AM_RAM_WRITE_LEGACY(mario_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x7400, 0x77ff) AM_RAM_WRITE(mario_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0")
AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1")
- AM_RANGE(0x7d00, 0x7d00) AM_WRITE_LEGACY(mario_scroll_w)
+ AM_RANGE(0x7d00, 0x7d00) AM_WRITE(mario_scroll_w)
AM_RANGE(0x7e00, 0x7e00) AM_WRITE(soundlatch_w)
- AM_RANGE(0x7e80, 0x7e80) AM_WRITE_LEGACY(mario_gfxbank_w)
- AM_RANGE(0x7e82, 0x7e82) AM_WRITE_LEGACY(mario_flip_w)
- AM_RANGE(0x7e83, 0x7e83) AM_WRITE_LEGACY(mario_palettebank_w)
+ AM_RANGE(0x7e80, 0x7e80) AM_WRITE(mario_gfxbank_w)
+ AM_RANGE(0x7e82, 0x7e82) AM_WRITE(mario_flip_w)
+ AM_RANGE(0x7e83, 0x7e83) AM_WRITE(mario_palettebank_w)
AM_RANGE(0x7e84, 0x7e84) AM_WRITE(nmi_mask_w)
AM_RANGE(0x7e85, 0x7e85) AM_DEVWRITE_LEGACY("z80dma", mario_z80dma_rdy_w) /* ==> DMA Chip */
AM_RANGE(0x7f00, 0x7f00) AM_WRITE_LEGACY(masao_sh_irqtrigger_w)
diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c
index 687c558b231..630f2510589 100644
--- a/src/mame/drivers/markham.c
+++ b/src/mame/drivers/markham.c
@@ -26,7 +26,7 @@ static ADDRESS_MAP_START( markham_master_map, AS_PROGRAM, 8, markham_state )
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(markham_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(markham_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xe000, 0xe000) AM_READ_PORT("DSW2")
@@ -42,7 +42,7 @@ static ADDRESS_MAP_START( markham_master_map, AS_PROGRAM, 8, markham_state )
AM_RANGE(0xe009, 0xe009) AM_WRITENOP /* to CPU2 busreq */
AM_RANGE(0xe00c, 0xe00d) AM_WRITEONLY AM_BASE(m_xscroll)
- AM_RANGE(0xe00e, 0xe00e) AM_WRITE_LEGACY(markham_flipscreen_w)
+ AM_RANGE(0xe00e, 0xe00e) AM_WRITE(markham_flipscreen_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( markham_slave_map, AS_PROGRAM, 8, markham_state )
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index 35e86222d37..b9677f9df0a 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -76,7 +76,7 @@ static ADDRESS_MAP_START( matmania_map, AS_PROGRAM, 8, matmania_state )
AM_RANGE(0x3010, 0x3010) AM_READ_PORT("IN1") AM_WRITE(matmania_sh_command_w)
AM_RANGE(0x3020, 0x3020) AM_READ_PORT("DSW2") AM_WRITEONLY AM_BASE(m_scroll)
AM_RANGE(0x3030, 0x3030) AM_READ_PORT("DSW1") AM_WRITENOP /* ?? */
- AM_RANGE(0x3050, 0x307f) AM_WRITE_LEGACY(matmania_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x3050, 0x307f) AM_WRITE(matmania_paletteram_w) AM_BASE(m_paletteram)
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -95,7 +95,7 @@ static ADDRESS_MAP_START( maniach_map, AS_PROGRAM, 8, matmania_state )
AM_RANGE(0x3030, 0x3030) AM_READ_PORT("DSW1") AM_WRITENOP /* ?? */
AM_RANGE(0x3040, 0x3040) AM_READWRITE_LEGACY(maniach_mcu_r,maniach_mcu_w)
AM_RANGE(0x3041, 0x3041) AM_READ_LEGACY(maniach_mcu_status_r)
- AM_RANGE(0x3050, 0x307f) AM_WRITE_LEGACY(matmania_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x3050, 0x307f) AM_WRITE(matmania_paletteram_w) AM_BASE(m_paletteram)
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index 933542009ae..8674e037759 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -180,8 +180,8 @@ static ADDRESS_MAP_START( mcatadv_map, AS_PROGRAM, 16, mcatadv_state )
AM_RANGE(0x200000, 0x200005) AM_RAM AM_BASE(m_scroll1)
AM_RANGE(0x300000, 0x300005) AM_RAM AM_BASE(m_scroll2)
- AM_RANGE(0x400000, 0x401fff) AM_RAM_WRITE_LEGACY(mcatadv_videoram1_w) AM_BASE(m_videoram1) // Tilemap 0
- AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE_LEGACY(mcatadv_videoram2_w) AM_BASE(m_videoram2) // Tilemap 1
+ AM_RANGE(0x400000, 0x401fff) AM_RAM_WRITE(mcatadv_videoram1_w) AM_BASE(m_videoram1) // Tilemap 0
+ AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(mcatadv_videoram2_w) AM_BASE(m_videoram2) // Tilemap 1
AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x602000, 0x602fff) AM_RAM // Bigger than needs to be?
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index db7d6e2c3ee..a5cb26961b8 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -643,7 +643,7 @@ static ADDRESS_MAP_START( cpu_90009_map, AS_PROGRAM, 8, mcr_state )
AM_RANGE(0xf000, 0xf1ff) AM_MIRROR(0x0200) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xf400, 0xf41f) AM_MIRROR(0x03e0) AM_WRITE(paletteram_xxxxRRRRBBBBGGGG_split1_w) AM_SHARE("paletteram")
AM_RANGE(0xf800, 0xf81f) AM_MIRROR(0x03e0) AM_WRITE(paletteram_xxxxRRRRBBBBGGGG_split2_w) AM_SHARE("paletteram2")
- AM_RANGE(0xfc00, 0xffff) AM_RAM_WRITE_LEGACY(mcr_90009_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xfc00, 0xffff) AM_RAM_WRITE(mcr_90009_videoram_w) AM_BASE(m_videoram)
ADDRESS_MAP_END
/* upper I/O map determined by PAL; only SSIO ports are verified from schematics */
@@ -670,7 +670,7 @@ static ADDRESS_MAP_START( cpu_90010_map, AS_PROGRAM, 8, mcr_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x1800) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xe000, 0xe1ff) AM_MIRROR(0x1600) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xe800, 0xefff) AM_MIRROR(0x1000) AM_RAM_WRITE_LEGACY(mcr_90010_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe800, 0xefff) AM_MIRROR(0x1000) AM_RAM_WRITE(mcr_90010_videoram_w) AM_BASE(m_videoram)
ADDRESS_MAP_END
/* upper I/O map determined by PAL; only SSIO ports are verified from schematics */
@@ -697,8 +697,8 @@ static ADDRESS_MAP_START( cpu_91490_map, AS_PROGRAM, 8, mcr_state )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xe800, 0xe9ff) AM_MIRROR(0x0200) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(mcr_91490_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xf800, 0xf87f) AM_MIRROR(0x0780) AM_WRITE_LEGACY(mcr_91490_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(mcr_91490_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xf800, 0xf87f) AM_MIRROR(0x0780) AM_WRITE(mcr_91490_paletteram_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
/* upper I/O map determined by PAL; only SSIO ports are verified from schematics */
@@ -734,8 +734,8 @@ static ADDRESS_MAP_START( ipu_91695_portmap, AS_IO, 8, mcr_state )
AM_RANGE(0x04, 0x07) AM_MIRROR(0xe0) AM_DEVREADWRITE_LEGACY("ipu_sio", z80sio_cd_ba_r, z80sio_cd_ba_w)
AM_RANGE(0x08, 0x0b) AM_MIRROR(0xe0) AM_DEVREADWRITE_LEGACY("ipu_ctc", z80ctc_r, z80ctc_w)
AM_RANGE(0x0c, 0x0f) AM_MIRROR(0xe0) AM_DEVREADWRITE_LEGACY("ipu_pio1", z80pio_cd_ba_r, z80pio_cd_ba_w)
- AM_RANGE(0x10, 0x13) AM_MIRROR(0xe0) AM_WRITE_LEGACY(mcr_ipu_laserdisk_w)
- AM_RANGE(0x1c, 0x1f) AM_MIRROR(0xe0) AM_READWRITE_LEGACY(mcr_ipu_watchdog_r, mcr_ipu_watchdog_w)
+ AM_RANGE(0x10, 0x13) AM_MIRROR(0xe0) AM_WRITE(mcr_ipu_laserdisk_w)
+ AM_RANGE(0x1c, 0x1f) AM_MIRROR(0xe0) AM_READWRITE(mcr_ipu_watchdog_r, mcr_ipu_watchdog_w)
ADDRESS_MAP_END
@@ -2626,8 +2626,8 @@ static DRIVER_INIT( twotiger )
mcr_sound_init(machine, MCR_SSIO);
ssio_set_custom_output(4, 0xff, twotiger_op4_w);
-
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe800, 0xefff, 0, 0x1000, FUNC(twotiger_videoram_r), FUNC(twotiger_videoram_w));
+ mcr_state *state = machine.driver_data<mcr_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xe800, 0xefff, 0, 0x1000, read8_delegate(FUNC(mcr_state::twotiger_videoram_r),state), write8_delegate(FUNC(mcr_state::twotiger_videoram_w),state));
}
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index de17f095be6..f088f396491 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -493,8 +493,8 @@ static ADDRESS_MAP_START( mcrmono_map, AS_PROGRAM, 8, mcr3_state )
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xe800, 0xe9ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xea00, 0xebff) AM_RAM
- AM_RANGE(0xec00, 0xec7f) AM_MIRROR(0x0380) AM_WRITE_LEGACY(mcr3_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(mcr3_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xec00, 0xec7f) AM_MIRROR(0x0380) AM_WRITE(mcr3_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(mcr3_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xf800, 0xffff) AM_ROM /* schematics show a 2716 @ 2B here, but nobody used it */
ADDRESS_MAP_END
@@ -524,11 +524,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( spyhunt_map, AS_PROGRAM, 8, mcr3_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0xdfff) AM_ROM
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(spyhunt_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xe800, 0xebff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(spyhunt_alpharam_w) AM_BASE(m_spyhunt_alpharam)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(spyhunt_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe800, 0xebff) AM_MIRROR(0x0400) AM_RAM_WRITE(spyhunt_alpharam_w) AM_BASE(m_spyhunt_alpharam)
AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xf800, 0xf9ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xfa00, 0xfa7f) AM_MIRROR(0x0180) AM_WRITE_LEGACY(mcr3_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xfa00, 0xfa7f) AM_MIRROR(0x0180) AM_WRITE(mcr3_paletteram_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
/* upper I/O map determined by PAL; only SSIO ports and scroll registers are verified from schematics */
@@ -536,7 +536,7 @@ static ADDRESS_MAP_START( spyhunt_portmap, AS_IO, 8, mcr3_state )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
SSIO_INPUT_PORTS
- AM_RANGE(0x84, 0x86) AM_WRITE_LEGACY(spyhunt_scroll_value_w)
+ AM_RANGE(0x84, 0x86) AM_WRITE(spyhunt_scroll_value_w)
AM_RANGE(0xe0, 0xe0) AM_WRITE(watchdog_reset_w)
AM_RANGE(0xe8, 0xe8) AM_WRITENOP
AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE_LEGACY("ctc", z80ctc_r, z80ctc_w)
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index 095156a1848..603e985797f 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -88,7 +88,7 @@ READ16_MEMBER(mcr68_state::zwackery_6840_r)
/* make this happen, we must assume that reads from the */
/* 6840 take 14 additional cycles */
device_adjust_icount(&space.device(), -14);
- return mcr68_6840_upper_r(&space,offset,0xffff);
+ return mcr68_6840_upper_r(space,offset,0xffff);
}
@@ -304,11 +304,11 @@ static ADDRESS_MAP_START( mcr68_map, AS_PROGRAM, 16, mcr68_state )
ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x060000, 0x063fff) AM_RAM
- AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE_LEGACY(mcr68_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(mcr68_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x071000, 0x071fff) AM_RAM
AM_RANGE(0x080000, 0x080fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x090000, 0x09007f) AM_WRITE_LEGACY(mcr68_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0x0a0000, 0x0a000f) AM_READWRITE_LEGACY(mcr68_6840_upper_r, mcr68_6840_upper_w)
+ AM_RANGE(0x090000, 0x09007f) AM_WRITE(mcr68_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0a0000, 0x0a000f) AM_READWRITE(mcr68_6840_upper_r, mcr68_6840_upper_w)
AM_RANGE(0x0b0000, 0x0bffff) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x0d0000, 0x0dffff) AM_READ_PORT("IN0")
AM_RANGE(0x0e0000, 0x0effff) AM_READ_PORT("IN1")
@@ -328,13 +328,13 @@ static ADDRESS_MAP_START( zwackery_map, AS_PROGRAM, 16, mcr68_state )
AM_RANGE(0x000000, 0x037fff) AM_ROM
AM_RANGE(0x080000, 0x080fff) AM_RAM
AM_RANGE(0x084000, 0x084fff) AM_RAM
- AM_RANGE(0x100000, 0x10000f) AM_READ(zwackery_6840_r) AM_WRITE_LEGACY(mcr68_6840_upper_w)
+ AM_RANGE(0x100000, 0x10000f) AM_READ(zwackery_6840_r) AM_WRITE(mcr68_6840_upper_w)
AM_RANGE(0x104000, 0x104007) AM_DEVREADWRITE8("pia0", pia6821_device, read, write, 0xff00)
AM_RANGE(0x108000, 0x108007) AM_DEVREADWRITE8("pia1", pia6821_device, read, write, 0x00ff)
AM_RANGE(0x10c000, 0x10c007) AM_DEVREADWRITE8("pia2", pia6821_device, read, write, 0x00ff)
- AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE_LEGACY(zwackery_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x802000, 0x803fff) AM_RAM_WRITE_LEGACY(zwackery_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0xc00000, 0xc00fff) AM_RAM_WRITE_LEGACY(zwackery_spriteram_w) AM_BASE_SIZE(m_spriteram, m_spriteram_size)
+ AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(zwackery_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x802000, 0x803fff) AM_RAM_WRITE(zwackery_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc00000, 0xc00fff) AM_RAM_WRITE(zwackery_spriteram_w) AM_BASE_SIZE(m_spriteram, m_spriteram_size)
ADDRESS_MAP_END
@@ -351,13 +351,13 @@ static ADDRESS_MAP_START( pigskin_map, AS_PROGRAM, 16, mcr68_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_READ(pigskin_port_1_r)
AM_RANGE(0x0a0000, 0x0affff) AM_READ(pigskin_port_2_r)
- AM_RANGE(0x0c0000, 0x0c007f) AM_WRITE_LEGACY(mcr68_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c0000, 0x0c007f) AM_WRITE(mcr68_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x0e0000, 0x0effff) AM_WRITE(watchdog_reset16_w)
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE_LEGACY(mcr68_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(mcr68_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x120000, 0x120001) AM_READWRITE(pigskin_protection_r, pigskin_protection_w)
AM_RANGE(0x140000, 0x143fff) AM_RAM
AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x180000, 0x18000f) AM_READWRITE_LEGACY(mcr68_6840_upper_r, mcr68_6840_upper_w)
+ AM_RANGE(0x180000, 0x18000f) AM_READWRITE(mcr68_6840_upper_r, mcr68_6840_upper_w)
AM_RANGE(0x1a0000, 0x1affff) AM_WRITE(archrivl_control_w)
AM_RANGE(0x1e0000, 0x1effff) AM_READ_PORT("IN0")
ADDRESS_MAP_END
@@ -377,10 +377,10 @@ static ADDRESS_MAP_START( trisport_map, AS_PROGRAM, 16, mcr68_state )
AM_RANGE(0x080000, 0x08ffff) AM_READ(trisport_port_1_r)
AM_RANGE(0x0a0000, 0x0affff) AM_READ_PORT("DSW")
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x120000, 0x12007f) AM_WRITE_LEGACY(mcr68_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x120000, 0x12007f) AM_WRITE(mcr68_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x140000, 0x1407ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x160000, 0x160fff) AM_RAM_WRITE_LEGACY(mcr68_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x180000, 0x18000f) AM_READWRITE_LEGACY(mcr68_6840_upper_r, mcr68_6840_upper_w)
+ AM_RANGE(0x160000, 0x160fff) AM_RAM_WRITE(mcr68_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x180000, 0x18000f) AM_READWRITE(mcr68_6840_upper_r, mcr68_6840_upper_w)
AM_RANGE(0x1a0000, 0x1affff) AM_WRITE(archrivl_control_w)
AM_RANGE(0x1c0000, 0x1cffff) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x1e0000, 0x1effff) AM_READ_PORT("IN0")
@@ -1599,7 +1599,7 @@ static DRIVER_INIT( blasted )
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0c0000, 0x0cffff, write16_delegate(FUNC(mcr68_state::blasted_control_w),state));
/* 6840 is mapped to the lower 8 bits */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x0a0000, 0x0a000f, FUNC(mcr68_6840_lower_r), FUNC(mcr68_6840_lower_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x0a0000, 0x0a000f, read16_delegate(FUNC(mcr68_state::mcr68_6840_lower_r),state), write16_delegate(FUNC(mcr68_state::mcr68_6840_lower_w),state));
}
static DRIVER_INIT( intlaser )
@@ -1632,7 +1632,7 @@ static DRIVER_INIT( archrivl )
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0e0000, 0x0effff, read16_delegate(FUNC(mcr68_state::archrivl_port_1_r),state));
/* 6840 is mapped to the lower 8 bits */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x0a0000, 0x0a000f, FUNC(mcr68_6840_lower_r), FUNC(mcr68_6840_lower_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x0a0000, 0x0a000f, read16_delegate(FUNC(mcr68_state::mcr68_6840_lower_r),state), write16_delegate(FUNC(mcr68_state::mcr68_6840_lower_w),state));
}
diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c
index 863a1489d1b..8dce3127276 100644
--- a/src/mame/drivers/meadows.c
+++ b/src/mame/drivers/meadows.c
@@ -343,10 +343,10 @@ static ADDRESS_MAP_START( meadows_main_map, AS_PROGRAM, 8, meadows_state )
AM_RANGE(0x0c02, 0x0c02) AM_READ(hsync_chain_r)
AM_RANGE(0x0c03, 0x0c03) AM_READ_PORT("DSW")
AM_RANGE(0x0c00, 0x0c03) AM_WRITE(meadows_audio_w)
- AM_RANGE(0x0d00, 0x0d0f) AM_WRITE_LEGACY(meadows_spriteram_w) AM_BASE(m_spriteram)
+ AM_RANGE(0x0d00, 0x0d0f) AM_WRITE(meadows_spriteram_w) AM_BASE(m_spriteram)
AM_RANGE(0x0e00, 0x0eff) AM_RAM
AM_RANGE(0x1000, 0x1bff) AM_ROM
- AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE_LEGACY(meadows_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(meadows_videoram_w) AM_BASE(m_videoram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bowl3d_main_map, AS_PROGRAM, 8, meadows_state )
@@ -356,15 +356,15 @@ static ADDRESS_MAP_START( bowl3d_main_map, AS_PROGRAM, 8, meadows_state )
AM_RANGE(0x0c02, 0x0c02) AM_READ(hsync_chain_r)
AM_RANGE(0x0c03, 0x0c03) AM_READ_PORT("DSW")
AM_RANGE(0x0c00, 0x0c03) AM_WRITE(meadows_audio_w)
- AM_RANGE(0x0d00, 0x0d0f) AM_WRITE_LEGACY(meadows_spriteram_w) AM_BASE(m_spriteram)
+ AM_RANGE(0x0d00, 0x0d0f) AM_WRITE(meadows_spriteram_w) AM_BASE(m_spriteram)
AM_RANGE(0x0e00, 0x0eff) AM_RAM
AM_RANGE(0x1000, 0x1bff) AM_ROM
- AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE_LEGACY(meadows_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(meadows_videoram_w) AM_BASE(m_videoram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( minferno_main_map, AS_PROGRAM, 8, meadows_state )
AM_RANGE(0x0000, 0x0bff) AM_ROM
- AM_RANGE(0x1c00, 0x1eff) AM_RAM_WRITE_LEGACY(meadows_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1c00, 0x1eff) AM_RAM_WRITE(meadows_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1f00, 0x1f00) AM_READ_PORT("JOY1")
AM_RANGE(0x1f01, 0x1f01) AM_READ_PORT("JOY2")
AM_RANGE(0x1f02, 0x1f02) AM_READ_PORT("BUTTONS")
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 2616b073301..1f378d9bb6d 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -179,12 +179,12 @@ static ADDRESS_MAP_START( megasys1A_map, AS_PROGRAM, 16, megasys1_state )
AM_RANGE(0x080004, 0x080005) AM_READ_PORT("P2")
AM_RANGE(0x080006, 0x080007) AM_READ_PORT("DSW")
AM_RANGE(0x080008, 0x080009) AM_READ(soundlatch2_word_r) /* from sound cpu */
- AM_RANGE(0x084000, 0x0843ff) AM_RAM_WRITE_LEGACY(megasys1_vregs_A_w) AM_BASE(m_vregs)
+ AM_RANGE(0x084000, 0x0843ff) AM_RAM_WRITE(megasys1_vregs_A_w) AM_BASE(m_vregs)
AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08e000, 0x08ffff) AM_RAM AM_BASE(m_objectram)
- AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE_LEGACY(megasys1_scrollram_0_w) AM_BASE(m_scrollram[0])
- AM_RANGE(0x094000, 0x097fff) AM_RAM_WRITE_LEGACY(megasys1_scrollram_1_w) AM_BASE(m_scrollram[1])
- AM_RANGE(0x098000, 0x09bfff) AM_RAM_WRITE_LEGACY(megasys1_scrollram_2_w) AM_BASE(m_scrollram[2])
+ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(megasys1_scrollram_0_w) AM_BASE(m_scrollram[0])
+ AM_RANGE(0x094000, 0x097fff) AM_RAM_WRITE(megasys1_scrollram_1_w) AM_BASE(m_scrollram[1])
+ AM_RANGE(0x098000, 0x09bfff) AM_RAM_WRITE(megasys1_scrollram_2_w) AM_BASE(m_scrollram[2])
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(m_ram)
ADDRESS_MAP_END
@@ -256,12 +256,12 @@ WRITE16_MEMBER(megasys1_state::ip_select_w)
static ADDRESS_MAP_START( megasys1B_map, AS_PROGRAM, 16, megasys1_state )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x044000, 0x0443ff) AM_RAM_WRITE_LEGACY(megasys1_vregs_A_w) AM_BASE(m_vregs)
+ AM_RANGE(0x044000, 0x0443ff) AM_RAM_WRITE(megasys1_vregs_A_w) AM_BASE(m_vregs)
AM_RANGE(0x048000, 0x0487ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x04e000, 0x04ffff) AM_RAM AM_BASE(m_objectram)
- AM_RANGE(0x050000, 0x053fff) AM_RAM_WRITE_LEGACY(megasys1_scrollram_0_w) AM_BASE(m_scrollram[0])
- AM_RANGE(0x054000, 0x057fff) AM_RAM_WRITE_LEGACY(megasys1_scrollram_1_w) AM_BASE(m_scrollram[1])
- AM_RANGE(0x058000, 0x05bfff) AM_RAM_WRITE_LEGACY(megasys1_scrollram_2_w) AM_BASE(m_scrollram[2])
+ AM_RANGE(0x050000, 0x053fff) AM_RAM_WRITE(megasys1_scrollram_0_w) AM_BASE(m_scrollram[0])
+ AM_RANGE(0x054000, 0x057fff) AM_RAM_WRITE(megasys1_scrollram_1_w) AM_BASE(m_scrollram[1])
+ AM_RANGE(0x058000, 0x05bfff) AM_RAM_WRITE(megasys1_scrollram_2_w) AM_BASE(m_scrollram[2])
AM_RANGE(0x060000, 0x07ffff) AM_RAM AM_BASE(m_ram)
AM_RANGE(0x080000, 0x0bffff) AM_ROM
AM_RANGE(0x0e0000, 0x0e0001) AM_READWRITE(ip_select_r,ip_select_w)
@@ -279,11 +279,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( megasys1C_map, AS_PROGRAM, 16, megasys1_state )
ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x0c0000, 0x0cffff) AM_READWRITE_LEGACY(megasys1_vregs_C_r,megasys1_vregs_C_w) AM_BASE(m_vregs)
+ AM_RANGE(0x0c0000, 0x0cffff) AM_READWRITE(megasys1_vregs_C_r,megasys1_vregs_C_w) AM_BASE(m_vregs)
AM_RANGE(0x0d2000, 0x0d3fff) AM_RAM AM_BASE(m_objectram)
- AM_RANGE(0x0e0000, 0x0e3fff) AM_RAM_WRITE_LEGACY(megasys1_scrollram_0_w) AM_BASE(m_scrollram[0])
- AM_RANGE(0x0e8000, 0x0ebfff) AM_RAM_WRITE_LEGACY(megasys1_scrollram_1_w) AM_BASE(m_scrollram[1])
- AM_RANGE(0x0f0000, 0x0f3fff) AM_RAM_WRITE_LEGACY(megasys1_scrollram_2_w) AM_BASE(m_scrollram[2])
+ AM_RANGE(0x0e0000, 0x0e3fff) AM_RAM_WRITE(megasys1_scrollram_0_w) AM_BASE(m_scrollram[0])
+ AM_RANGE(0x0e8000, 0x0ebfff) AM_RAM_WRITE(megasys1_scrollram_1_w) AM_BASE(m_scrollram[1])
+ AM_RANGE(0x0f0000, 0x0f3fff) AM_RAM_WRITE(megasys1_scrollram_2_w) AM_BASE(m_scrollram[2])
AM_RANGE(0x0f8000, 0x0f87ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0d8000, 0x0d8001) AM_READWRITE(ip_select_r,ip_select_w)
AM_RANGE(0x1c0000, 0x1cffff) AM_MIRROR(0x30000) AM_RAM AM_BASE(m_ram) //0x1f****, Cybattler reads attract mode inputs at 0x1d****
@@ -301,13 +301,13 @@ static INTERRUPT_GEN( megasys1D_irq )
static ADDRESS_MAP_START( megasys1D_map, AS_PROGRAM, 16, megasys1_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x0c0000, 0x0c9fff) AM_RAM_WRITE_LEGACY(megasys1_vregs_D_w) AM_BASE(m_vregs)
+ AM_RANGE(0x0c0000, 0x0c9fff) AM_RAM_WRITE(megasys1_vregs_D_w) AM_BASE(m_vregs)
AM_RANGE(0x0ca000, 0x0cbfff) AM_RAM AM_BASE(m_objectram)
- AM_RANGE(0x0d0000, 0x0d3fff) AM_RAM_WRITE_LEGACY(megasys1_scrollram_1_w) AM_BASE(m_scrollram[1])
- AM_RANGE(0x0d4000, 0x0d7fff) AM_RAM_WRITE_LEGACY(megasys1_scrollram_2_w) AM_BASE(m_scrollram[2])
+ AM_RANGE(0x0d0000, 0x0d3fff) AM_RAM_WRITE(megasys1_scrollram_1_w) AM_BASE(m_scrollram[1])
+ AM_RANGE(0x0d4000, 0x0d7fff) AM_RAM_WRITE(megasys1_scrollram_2_w) AM_BASE(m_scrollram[2])
AM_RANGE(0x0d8000, 0x0d87ff) AM_MIRROR(0x3000) AM_RAM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0e0000, 0x0e0001) AM_READ_PORT("DSW")
- AM_RANGE(0x0e8000, 0x0ebfff) AM_RAM_WRITE_LEGACY(megasys1_scrollram_0_w) AM_BASE(m_scrollram[0])
+ AM_RANGE(0x0e8000, 0x0ebfff) AM_RAM_WRITE(megasys1_scrollram_0_w) AM_BASE(m_scrollram[0])
AM_RANGE(0x0f0000, 0x0f0001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x0f8000, 0x0f8001) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff)
// AM_RANGE(0x100000, 0x100001) // protection
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index 3ce67a3be5f..109d61c06f8 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -83,7 +83,7 @@ WRITE8_MEMBER(megazone_state::irq_mask_w)
static ADDRESS_MAP_START( megazone_map, AS_PROGRAM, 8, megazone_state )
AM_RANGE(0x0000, 0x0001) AM_WRITE(megazone_coin_counter_w) /* coin counter 2, coin counter 1 */
- AM_RANGE(0x0005, 0x0005) AM_WRITE_LEGACY(megazone_flipscreen_w)
+ AM_RANGE(0x0005, 0x0005) AM_WRITE(megazone_flipscreen_w)
AM_RANGE(0x0007, 0x0007) AM_WRITE(irq_mask_w)
AM_RANGE(0x0800, 0x0800) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x1000, 0x1000) AM_WRITEONLY AM_BASE(m_scrolly)
diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c
index dbcf2e4d5b7..8dab0ddff88 100644
--- a/src/mame/drivers/mermaid.c
+++ b/src/mame/drivers/mermaid.c
@@ -146,27 +146,27 @@ WRITE8_MEMBER(mermaid_state::nmi_mask_w)
static ADDRESS_MAP_START( mermaid_map, AS_PROGRAM, 8, mermaid_state )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
- AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE_LEGACY(mermaid_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(mermaid_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd800, 0xd81f) AM_RAM_WRITE_LEGACY(mermaid_bg_scroll_w) AM_BASE(m_bg_scrollram)
- AM_RANGE(0xd840, 0xd85f) AM_RAM_WRITE_LEGACY(mermaid_fg_scroll_w) AM_BASE(m_fg_scrollram)
+ AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE(mermaid_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(mermaid_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd800, 0xd81f) AM_RAM_WRITE(mermaid_bg_scroll_w) AM_BASE(m_bg_scrollram)
+ AM_RANGE(0xd840, 0xd85f) AM_RAM_WRITE(mermaid_fg_scroll_w) AM_BASE(m_fg_scrollram)
AM_RANGE(0xd880, 0xd8bf) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE_LEGACY(mermaid_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(mermaid_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xe000, 0xe000) AM_READ_PORT("DSW")
AM_RANGE(0xe000, 0xe001) AM_RAM AM_BASE(m_ay8910_enable)
AM_RANGE(0xe002, 0xe004) AM_WRITENOP // ???
- AM_RANGE(0xe005, 0xe005) AM_WRITE_LEGACY(mermaid_flip_screen_x_w)
- AM_RANGE(0xe006, 0xe006) AM_WRITE_LEGACY(mermaid_flip_screen_y_w)
+ AM_RANGE(0xe005, 0xe005) AM_WRITE(mermaid_flip_screen_x_w)
+ AM_RANGE(0xe006, 0xe006) AM_WRITE(mermaid_flip_screen_y_w)
AM_RANGE(0xe007, 0xe007) AM_WRITE(nmi_mask_w)
AM_RANGE(0xe800, 0xe800) AM_READ_PORT("P1") AM_WRITENOP // ???
AM_RANGE(0xe801, 0xe801) AM_WRITENOP // ???
AM_RANGE(0xe802, 0xe802) AM_WRITENOP // ???
AM_RANGE(0xe803, 0xe803) AM_WRITENOP // ???
- AM_RANGE(0xe804, 0xe804) AM_WRITE_LEGACY(rougien_gfxbankswitch1_w)
- AM_RANGE(0xe805, 0xe805) AM_WRITE_LEGACY(rougien_gfxbankswitch2_w)
+ AM_RANGE(0xe804, 0xe804) AM_WRITE(rougien_gfxbankswitch1_w)
+ AM_RANGE(0xe805, 0xe805) AM_WRITE(rougien_gfxbankswitch2_w)
AM_RANGE(0xe807, 0xe807) AM_WRITENOP // ???
AM_RANGE(0xf000, 0xf000) AM_READ_PORT("P2")
- AM_RANGE(0xf800, 0xf800) AM_READ_LEGACY(mermaid_collision_r)
+ AM_RANGE(0xf800, 0xf800) AM_READ(mermaid_collision_r)
AM_RANGE(0xf802, 0xf802) AM_WRITENOP // ???
AM_RANGE(0xf806, 0xf806) AM_WRITE(mermaid_ay8910_write_port_w)
AM_RANGE(0xf807, 0xf807) AM_WRITE(mermaid_ay8910_control_port_w)
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index 403e1a4b93d..72386c4daef 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -68,7 +68,7 @@ static ADDRESS_MAP_START( metlclsh_master_map, AS_PROGRAM, 8, metlclsh_state )
/**/AM_RANGE(0xc800, 0xc82f) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
/**/AM_RANGE(0xcc00, 0xcc2f) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
AM_RANGE(0xd000, 0xd001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r,ym2203_w)
-/**/AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(metlclsh_fgram_w) AM_BASE(m_fgram)
+/**/AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(metlclsh_fgram_w) AM_BASE(m_fgram)
AM_RANGE(0xe000, 0xe001) AM_DEVWRITE_LEGACY("ym2", ym3526_w )
AM_RANGE(0xe800, 0xe9ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xfff0, 0xffff) AM_ROM // Reset/IRQ vectors
@@ -104,15 +104,15 @@ WRITE8_MEMBER(metlclsh_state::metlclsh_flipscreen_w)
static ADDRESS_MAP_START( metlclsh_slave_map, AS_PROGRAM, 8, metlclsh_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0") AM_WRITE_LEGACY(metlclsh_gfxbank_w) // bg tiles bank
+ AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0") AM_WRITE(metlclsh_gfxbank_w) // bg tiles bank
AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN1")
AM_RANGE(0xc002, 0xc002) AM_READ_PORT("IN2")
AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW")
AM_RANGE(0xc0c0, 0xc0c0) AM_WRITE(metlclsh_cause_nmi2) // cause nmi on cpu #1
AM_RANGE(0xc0c1, 0xc0c1) AM_WRITE(metlclsh_ack_irq2) // irq ack
- AM_RANGE(0xd000, 0xd7ff) AM_ROMBANK("bank1") AM_WRITE_LEGACY(metlclsh_bgram_w) AM_BASE(m_bgram) // this is banked
+ AM_RANGE(0xd000, 0xd7ff) AM_ROMBANK("bank1") AM_WRITE(metlclsh_bgram_w) AM_BASE(m_bgram) // this is banked
AM_RANGE(0xe301, 0xe301) AM_WRITE(metlclsh_flipscreen_w) // 0/1
- AM_RANGE(0xe401, 0xe401) AM_WRITE_LEGACY(metlclsh_rambank_w)
+ AM_RANGE(0xe401, 0xe401) AM_WRITE(metlclsh_rambank_w)
AM_RANGE(0xe402, 0xe403) AM_WRITEONLY AM_BASE(m_scrollx)
// AM_RANGE(0xe404, 0xe404) AM_WRITENOP // ? 0
// AM_RANGE(0xe410, 0xe410) AM_WRITENOP // ? 0 on startup only
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 264f1df038d..56f9a0f5cd0 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -463,7 +463,7 @@ WRITE8_MEMBER(metro_state::metro_portb_w)
{
/* write */
if (!BIT(data, 4))
- m_oki->write(*&space, 0, m_porta);
+ m_oki->write(space, 0, m_porta);
}
m_portb = data;
@@ -512,14 +512,14 @@ WRITE8_MEMBER(metro_state::daitorid_portb_w)
{
/* write */
if (!BIT(data, 4))
- m_oki->write(*&space, 0, m_porta);
+ m_oki->write(space, 0, m_porta);
}
if (BIT(m_portb, 3) && !BIT(data, 3)) /* clock 1->0 */
{
/* read */
if (!BIT(data, 4))
- m_porta = m_oki->read(*&space, 0);
+ m_porta = m_oki->read(space, 0);
}
m_portb = data;
@@ -663,13 +663,13 @@ INLINE int blt_read( const UINT8 *ROM, const int offs )
return ROM[offs];
}
-INLINE void blt_write( address_space *space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask )
+void metro_state::blt_write( address_space *space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask )
{
switch(tmap)
{
- case 1: metro_vram_0_w(space, offs, data, mask); break;
- case 2: metro_vram_1_w(space, offs, data, mask); break;
- case 3: metro_vram_2_w(space, offs, data, mask); break;
+ case 1: metro_vram_0_w(*space, offs, data, mask); break;
+ case 2: metro_vram_1_w(*space, offs, data, mask); break;
+ case 3: metro_vram_2_w(*space, offs, data, mask); break;
}
// logerror("%s : Blitter %X] %04X <- %04X & %04X\n", space->machine().describe_context(), tmap, offs, data, mask);
}
@@ -879,15 +879,15 @@ static ADDRESS_MAP_START( balcube_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("IN1") //
AM_RANGE(0x500006, 0x500007) AM_READNOP //
AM_RANGE(0x500002, 0x500009) AM_WRITE(metro_coin_lockout_4words_w) // Coin Lockout
- AM_RANGE(0x600000, 0x61ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x620000, 0x63ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x640000, 0x65ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x600000, 0x61ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x620000, 0x63ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x640000, 0x65ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x660000, 0x66ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x670000, 0x673fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x674000, 0x674fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x678000, 0x6787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x678840, 0x67884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x678860, 0x67886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x678860, 0x67886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x678870, 0x67887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll
AM_RANGE(0x678880, 0x678881) AM_WRITENOP // ? increasing
AM_RANGE(0x678890, 0x678891) AM_WRITENOP // ? increasing
@@ -910,15 +910,15 @@ static ADDRESS_MAP_START( daitoa_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x400000, 0x400001) AM_DEVREAD8_LEGACY("ymf", ymf278b_r, 0x00ff) // Sound
AM_RANGE(0x400000, 0x40000b) AM_DEVWRITE8_LEGACY("ymf", ymf278b_w, 0x00ff) // Sound
AM_RANGE(0x300000, 0x31ffff) AM_READ(balcube_dsw_r) // DSW x 3
- AM_RANGE(0x100000, 0x11ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x120000, 0x13ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x140000, 0x15ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x100000, 0x11ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x120000, 0x13ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x140000, 0x15ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x160000, 0x16ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x170000, 0x173fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x174000, 0x174fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x178000, 0x1787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x178840, 0x17884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x178860, 0x17886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x178860, 0x17886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x178870, 0x17887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll
AM_RANGE(0x178880, 0x178881) AM_WRITENOP // ? increasing
AM_RANGE(0x178890, 0x178891) AM_WRITENOP // ? increasing
@@ -949,15 +949,15 @@ static ADDRESS_MAP_START( bangball_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0xd00002, 0xd00003) AM_READ_PORT("IN1") //
AM_RANGE(0xd00006, 0xd00007) AM_READNOP //
AM_RANGE(0xd00002, 0xd00009) AM_WRITE(metro_coin_lockout_4words_w) // Coin Lockout
- AM_RANGE(0xe00000, 0xe1ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0xe20000, 0xe3ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0xe40000, 0xe5ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0xe00000, 0xe1ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0xe20000, 0xe3ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0xe40000, 0xe5ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0xe60000, 0xe6ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0xe70000, 0xe73fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xe74000, 0xe74fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xe78000, 0xe787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0xe78840, 0xe7884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0xe78860, 0xe7886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0xe78860, 0xe7886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0xe78870, 0xe7887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll
AM_RANGE(0xe78880, 0xe78881) AM_WRITENOP // ? increasing
AM_RANGE(0xe78890, 0xe78891) AM_WRITENOP // ? increasing
@@ -975,15 +975,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( batlbubl_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
- AM_RANGE(0x100000, 0x11ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x120000, 0x13ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x140000, 0x15ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x100000, 0x11ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x120000, 0x13ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x140000, 0x15ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x160000, 0x16ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x170000, 0x173fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x174000, 0x174fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x178000, 0x1787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x178840, 0x17884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x178860, 0x17886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x178860, 0x17886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x178870, 0x17887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll
AM_RANGE(0x178880, 0x178881) AM_WRITENOP // ? increasing
AM_RANGE(0x178890, 0x178891) AM_WRITENOP // ? increasing
@@ -1011,15 +1011,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( msgogo_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
- AM_RANGE(0x100000, 0x11ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x120000, 0x13ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x140000, 0x15ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x100000, 0x11ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x120000, 0x13ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x140000, 0x15ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x160000, 0x16ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x170000, 0x173fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x174000, 0x174fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x178000, 0x1787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x178840, 0x17884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x178860, 0x17886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x178860, 0x17886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x178870, 0x17887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll
AM_RANGE(0x178880, 0x178881) AM_WRITENOP // ? increasing
AM_RANGE(0x178890, 0x178891) AM_WRITENOP // ? increasing
@@ -1045,15 +1045,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( daitorid_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x800000, 0x80ffff) AM_RAM // RAM
- AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x460000, 0x46ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x474000, 0x474fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x478000, 0x4787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x478840, 0x47884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x478860, 0x47886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x478860, 0x47886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x478870, 0x47887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll
AM_RANGE(0x478880, 0x478881) AM_WRITENOP // ? increasing
AM_RANGE(0x478890, 0x478891) AM_WRITENOP // ? increasing
@@ -1078,15 +1078,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dharma_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM // RAM
- AM_RANGE(0x800000, 0x81ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x820000, 0x83ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x840000, 0x85ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x800000, 0x81ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x820000, 0x83ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x840000, 0x85ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x874000, 0x874fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x878000, 0x8787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x878840, 0x87884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x878860, 0x87886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x878860, 0x87886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x878870, 0x87887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll Regs
AM_RANGE(0x878880, 0x878881) AM_WRITENOP // ? increasing
AM_RANGE(0x878890, 0x878891) AM_WRITENOP // ? increasing
@@ -1118,9 +1118,9 @@ READ16_MEMBER(metro_state::karatour_vram_0_r){ return m_vram_0[KARATOUR_OFFS(off
READ16_MEMBER(metro_state::karatour_vram_1_r){ return m_vram_1[KARATOUR_OFFS(offset)]; }
READ16_MEMBER(metro_state::karatour_vram_2_r){ return m_vram_2[KARATOUR_OFFS(offset)]; }
-WRITE16_MEMBER(metro_state::karatour_vram_0_w){ metro_vram_0_w(&space, KARATOUR_OFFS(offset), data, mem_mask); }
-WRITE16_MEMBER(metro_state::karatour_vram_1_w){ metro_vram_1_w(&space, KARATOUR_OFFS(offset), data, mem_mask); }
-WRITE16_MEMBER(metro_state::karatour_vram_2_w){ metro_vram_2_w(&space, KARATOUR_OFFS(offset), data, mem_mask); }
+WRITE16_MEMBER(metro_state::karatour_vram_0_w){ metro_vram_0_w(space, KARATOUR_OFFS(offset), data, mem_mask); }
+WRITE16_MEMBER(metro_state::karatour_vram_1_w){ metro_vram_1_w(space, KARATOUR_OFFS(offset), data, mem_mask); }
+WRITE16_MEMBER(metro_state::karatour_vram_2_w){ metro_vram_2_w(space, KARATOUR_OFFS(offset), data, mem_mask); }
static ADDRESS_MAP_START( karatour_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
@@ -1141,7 +1141,7 @@ static ADDRESS_MAP_START( karatour_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x878000, 0x8787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x878800, 0x878813) AM_WRITEONLY AM_BASE(m_videoregs) // Video Registers
AM_RANGE(0x878840, 0x87884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x878860, 0x87886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x878860, 0x87886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x878870, 0x87887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll
AM_RANGE(0x878880, 0x878881) AM_WRITENOP // ? increasing
AM_RANGE(0x878890, 0x878891) AM_WRITENOP // ? increasing
@@ -1170,7 +1170,7 @@ static ADDRESS_MAP_START( kokushi_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x877000, 0x877fff) AM_READWRITE(karatour_vram_2_r, karatour_vram_2_w) // Layer 2 (Part of)
AM_RANGE(0x878000, 0x8787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x878840, 0x87884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x878860, 0x87886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x878860, 0x87886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x878870, 0x87887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll Regs - WRONG
// AM_RANGE(0x878880, 0x878881) AM_WRITENOP // ? increasing
AM_RANGE(0x878890, 0x878891) AM_WRITENOP // ? increasing
@@ -1194,16 +1194,16 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( lastfort_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM // RAM
- AM_RANGE(0x800000, 0x81ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x820000, 0x83ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x840000, 0x85ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x800000, 0x81ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x820000, 0x83ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x840000, 0x85ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x874000, 0x874fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x878000, 0x8787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x878800, 0x878813) AM_WRITEONLY AM_BASE(m_videoregs) // Video Registers
AM_RANGE(0x878840, 0x87884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x878860, 0x87886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x878860, 0x87886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x878870, 0x87887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll
AM_RANGE(0x878880, 0x878881) AM_WRITENOP // ? increasing
AM_RANGE(0x878890, 0x878891) AM_WRITENOP // ? increasing
@@ -1234,16 +1234,16 @@ static ADDRESS_MAP_START( lastforg_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x400006, 0x400007) AM_READ_PORT("DSW0") //
AM_RANGE(0x40000a, 0x40000b) AM_READ_PORT("DSW1") //
AM_RANGE(0x40000c, 0x40000d) AM_READ_PORT("IN2") //
- AM_RANGE(0x880000, 0x89ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x8a0000, 0x8bffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x8c0000, 0x8dffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x880000, 0x89ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x8a0000, 0x8bffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x8c0000, 0x8dffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x8e0000, 0x8effff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x8f0000, 0x8f3fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x8f4000, 0x8f4fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x8f8000, 0x8f87ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x8f8800, 0x8f8813) AM_WRITEONLY AM_BASE(m_videoregs) // Video Registers
AM_RANGE(0x8f8840, 0x8f884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x8f8860, 0x8f886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x8f8860, 0x8f886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x8f8870, 0x8f887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll
AM_RANGE(0x8f8880, 0x8f8881) AM_WRITENOP // ? increasing
AM_RANGE(0x8f8890, 0x8f8891) AM_WRITENOP // ? increasing
@@ -1328,9 +1328,9 @@ static WRITE16_DEVICE_HANDLER( gakusai_eeprom_w )
static ADDRESS_MAP_START( gakusai_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
- AM_RANGE(0x200000, 0x21ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x220000, 0x23ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x240000, 0x25ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x200000, 0x21ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x220000, 0x23ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x240000, 0x25ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x260000, 0x26ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x270000, 0x273fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x274000, 0x274fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
@@ -1344,7 +1344,7 @@ static ADDRESS_MAP_START( gakusai_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x278882, 0x278883) AM_READ_PORT("IN0") //
AM_RANGE(0x278836, 0x278837) AM_WRITE(watchdog_reset16_w) // Watchdog
AM_RANGE(0x278840, 0x27884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x278860, 0x27886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x278860, 0x27886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x278850, 0x27885b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll Regs
AM_RANGE(0x278870, 0x278871) AM_WRITEONLY AM_BASE(m_rombank) // Rom Bank
AM_RANGE(0x278888, 0x278889) AM_WRITEONLY AM_BASE(m_input_sel) // Inputs
@@ -1365,9 +1365,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gakusai2_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
- AM_RANGE(0x600000, 0x61ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x620000, 0x63ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x640000, 0x65ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x600000, 0x61ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x620000, 0x63ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x640000, 0x65ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x660000, 0x66ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x670000, 0x673fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x674000, 0x674fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
@@ -1380,7 +1380,7 @@ static ADDRESS_MAP_START( gakusai2_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x678832, 0x678833) AM_READWRITE(metro_irq_cause_r,metro_irq_cause_w) // IRQ Cause / IRQ Acknowledge
AM_RANGE(0x678836, 0x678837) AM_WRITE(watchdog_reset16_w) // Watchdog
AM_RANGE(0x678840, 0x67884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x678860, 0x67886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x678860, 0x67886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x678880, 0x678881) AM_READ(gakusai_input_r) // Inputs
AM_RANGE(0x678882, 0x678883) AM_READ_PORT("IN0") //
AM_RANGE(0x678850, 0x67885b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll Regs
@@ -1437,9 +1437,9 @@ static WRITE16_DEVICE_HANDLER( dokyusp_eeprom_reset_w )
static ADDRESS_MAP_START( dokyusp_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
- AM_RANGE(0x200000, 0x21ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x220000, 0x23ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x240000, 0x25ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x200000, 0x21ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x220000, 0x23ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x240000, 0x25ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x260000, 0x26ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x270000, 0x273fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x274000, 0x274fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
@@ -1450,7 +1450,7 @@ static ADDRESS_MAP_START( dokyusp_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x278832, 0x278833) AM_READWRITE(metro_irq_cause_r,metro_irq_cause_w) // IRQ Cause / IRQ Acknowledge
AM_RANGE(0x278836, 0x278837) AM_WRITE(watchdog_reset16_w) // Watchdog
AM_RANGE(0x278840, 0x27884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x278860, 0x27886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x278860, 0x27886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x278850, 0x27885b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll Regs
AM_RANGE(0x278870, 0x278871) AM_WRITEONLY AM_BASE(m_rombank) // Rom Bank
AM_RANGE(0x278880, 0x278881) AM_READ(gakusai_input_r) // Inputs
@@ -1474,9 +1474,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dokyusei_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
- AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x460000, 0x46ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x460000, 0x46ffff) AM_WRITENOP // DSW Selection
AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
@@ -1491,7 +1491,7 @@ static ADDRESS_MAP_START( dokyusei_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x478836, 0x478837) AM_WRITENOP // ? watchdog ?
AM_RANGE(0x478840, 0x47884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
AM_RANGE(0x478850, 0x47885b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll Regs
- AM_RANGE(0x478860, 0x47886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x478860, 0x47886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x478870, 0x478871) AM_WRITEONLY AM_BASE(m_rombank) // Rom Bank
AM_RANGE(0x479700, 0x479713) AM_WRITEONLY AM_BASE(m_videoregs) // Video Registers
AM_RANGE(0x478888, 0x478889) AM_WRITEONLY AM_BASE(m_input_sel) // Inputs
@@ -1514,16 +1514,16 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pangpoms_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0xc00000, 0xc0ffff) AM_RAM // RAM
- AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x460000, 0x46ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x474000, 0x474fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x478000, 0x4787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x478800, 0x478813) AM_RAM AM_BASE(m_videoregs) // Video Registers
AM_RANGE(0x478840, 0x47884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x478860, 0x47886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x478860, 0x47886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x478870, 0x47887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll Regs
AM_RANGE(0x478880, 0x478881) AM_WRITENOP // ? increasing
AM_RANGE(0x478890, 0x478891) AM_WRITENOP // ? increasing
@@ -1550,16 +1550,16 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( poitto_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM // RAM
- AM_RANGE(0xc00000, 0xc1ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0xc20000, 0xc3ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0xc40000, 0xc5ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0xc00000, 0xc1ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0xc20000, 0xc3ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0xc40000, 0xc5ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0xc60000, 0xc6ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0xc70000, 0xc73fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc74000, 0xc74fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xc78000, 0xc787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0xc78800, 0xc78813) AM_WRITEONLY AM_BASE(m_videoregs) // Video Registers
AM_RANGE(0xc78840, 0xc7884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0xc78860, 0xc7886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0xc78860, 0xc7886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0xc78870, 0xc7887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll Regs
AM_RANGE(0xc78880, 0xc78881) AM_WRITENOP // ? increasing
AM_RANGE(0xc78890, 0xc78891) AM_WRITENOP // ? increasing
@@ -1583,16 +1583,16 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( skyalert_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0xc00000, 0xc0ffff) AM_RAM // RAM
- AM_RANGE(0x800000, 0x81ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x820000, 0x83ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x840000, 0x85ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x800000, 0x81ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x820000, 0x83ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x840000, 0x85ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x874000, 0x874fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x878000, 0x8787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x878800, 0x878813) AM_WRITEONLY AM_BASE(m_videoregs) // Video Registers
AM_RANGE(0x878840, 0x87884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x878860, 0x87886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x878860, 0x87886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x878870, 0x87887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll
AM_RANGE(0x878880, 0x878881) AM_WRITENOP // ? increasing
AM_RANGE(0x878890, 0x878891) AM_WRITENOP // ? increasing
@@ -1619,15 +1619,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pururun_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x800000, 0x80ffff) AM_RAM // RAM
- AM_RANGE(0xc00000, 0xc1ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0xc20000, 0xc3ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0xc40000, 0xc5ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0xc00000, 0xc1ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0xc20000, 0xc3ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0xc40000, 0xc5ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0xc60000, 0xc6ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0xc70000, 0xc73fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc74000, 0xc74fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xc78000, 0xc787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0xc78840, 0xc7884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0xc78860, 0xc7886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0xc78860, 0xc7886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0xc78870, 0xc7887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll Regs
AM_RANGE(0xc78880, 0xc78881) AM_WRITENOP // ? increasing
AM_RANGE(0xc78890, 0xc78891) AM_WRITENOP // ? increasing
@@ -1652,15 +1652,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( toride2g_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x400000, 0x4cffff) AM_RAM // RAM (4xc000-4xffff mirrored?)
- AM_RANGE(0xc00000, 0xc1ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0xc20000, 0xc3ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0xc40000, 0xc5ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0xc00000, 0xc1ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0xc20000, 0xc3ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0xc40000, 0xc5ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0xc60000, 0xc6ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0xc70000, 0xc73fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc74000, 0xc74fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xc78000, 0xc787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0xc78840, 0xc7884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0xc78860, 0xc7886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0xc78860, 0xc7886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0xc78870, 0xc7887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll Regs
AM_RANGE(0xc78880, 0xc78881) AM_WRITENOP // ? increasing
AM_RANGE(0xc78890, 0xc78891) AM_WRITENOP // ? increasing
@@ -1728,15 +1728,15 @@ static ADDRESS_MAP_START( blzntrnd_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
// AM_RANGE(0x300000, 0x300001) AM_READNOP // Sound
- AM_RANGE(0x200000, 0x21ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x220000, 0x23ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x240000, 0x25ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x200000, 0x21ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x220000, 0x23ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x240000, 0x25ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x260000, 0x26ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x260000, 0x26ffff) AM_WRITENOP // ??????
AM_RANGE(0x270000, 0x273fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x274000, 0x274fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x278000, 0x2787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
- AM_RANGE(0x278860, 0x27886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x278860, 0x27886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x278870, 0x27887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll
AM_RANGE(0x278890, 0x278891) AM_WRITENOP // ? increasing
AM_RANGE(0x2788a2, 0x2788a3) AM_READWRITE(metro_irq_cause_r,metro_irq_cause_w) // IRQ Cause / IRQ Acknowledge
@@ -1745,7 +1745,7 @@ static ADDRESS_MAP_START( blzntrnd_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x2788ac, 0x2788ad) AM_WRITEONLY AM_BASE(m_screenctrl) // Screen Control
AM_RANGE(0x279700, 0x279713) AM_WRITEONLY AM_BASE(m_videoregs) // Video Registers
- AM_RANGE(0x400000, 0x43ffff) AM_RAM_WRITE_LEGACY(metro_k053936_w) AM_BASE(m_k053936_ram) // 053936
+ AM_RANGE(0x400000, 0x43ffff) AM_RAM_WRITE(metro_k053936_w) AM_BASE(m_k053936_ram) // 053936
AM_RANGE(0x500000, 0x500fff) AM_DEVWRITE_LEGACY("k053936", k053936_linectrl_w) // 053936 line control
AM_RANGE(0x600000, 0x60001f) AM_DEVWRITE_LEGACY("k053936", k053936_ctrl_w) // 053936 control
@@ -1772,9 +1772,9 @@ static WRITE16_DEVICE_HANDLER( mouja_sound_rombank_w )
static ADDRESS_MAP_START( mouja_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xf00000, 0xf0ffff) AM_RAM // RAM
- AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x474000, 0x474fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x478000, 0x4787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
@@ -1786,7 +1786,7 @@ static ADDRESS_MAP_START( mouja_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x478834, 0x478835) AM_WRITE(mouja_irq_timer_ctrl_w) // IRQ set timer count
AM_RANGE(0x478836, 0x478837) AM_WRITE(watchdog_reset16_w) // Watchdog
AM_RANGE(0x478850, 0x47885b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll Regs
- AM_RANGE(0x478860, 0x47886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x478860, 0x47886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x478880, 0x478881) AM_READ_PORT("IN0") // Inputs
AM_RANGE(0x478882, 0x478883) AM_READ_PORT("IN1") //
AM_RANGE(0x478884, 0x478885) AM_READ_PORT("DSW0") //
@@ -1854,9 +1854,9 @@ static ADDRESS_MAP_START( puzzlet_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x500000, 0x500001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0xff00)
AM_RANGE(0x580000, 0x580003) AM_DEVWRITE8_LEGACY("ymsnd", ym2413_w, 0xff00)
- AM_RANGE(0x700000, 0x71ffff) AM_RAM_WRITE_LEGACY(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x720000, 0x73ffff) AM_RAM_WRITE_LEGACY(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x740000, 0x75ffff) AM_RAM_WRITE_LEGACY(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
+ AM_RANGE(0x700000, 0x71ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x720000, 0x73ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x740000, 0x75ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x774000, 0x774fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x760000, 0x76ffff) AM_READ(metro_bankedrom_r) // Banked ROM
@@ -1871,7 +1871,7 @@ static ADDRESS_MAP_START( puzzlet_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x778000, 0x7787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x778800, 0x778813) AM_WRITEONLY AM_BASE(m_videoregs) // Video Registers
AM_RANGE(0x778840, 0x77884f) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
- AM_RANGE(0x778860, 0x77886b) AM_WRITE_LEGACY(metro_window_w) AM_BASE(m_window) // Tilemap Window
+ AM_RANGE(0x778860, 0x77886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
AM_RANGE(0x778870, 0x77887b) AM_WRITEONLY AM_BASE(m_scroll) // Scroll
AM_RANGE(0x778890, 0x778891) AM_WRITENOP // ? increasing
AM_RANGE(0x7788a2, 0x7788a3) AM_WRITE(metro_irq_cause_w) // IRQ Cause
diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c
index edda98e66be..17139289666 100644
--- a/src/mame/drivers/mexico86.c
+++ b/src/mame/drivers/mexico86.c
@@ -88,8 +88,8 @@ static ADDRESS_MAP_START( mexico86_map, AS_PROGRAM, 8, mexico86_state )
AM_RANGE(0xe800, 0xe8ff) AM_RAM AM_BASE(m_protection_ram) /* shared with mcu */
AM_RANGE(0xe900, 0xefff) AM_RAM
AM_RANGE(0xc000, 0xd4ff) AM_RAM AM_BASE(m_videoram)
- AM_RANGE(0xf000, 0xf000) AM_WRITE_LEGACY(mexico86_bankswitch_w) /* program and gfx ROM banks */
- AM_RANGE(0xf008, 0xf008) AM_WRITE_LEGACY(mexico86_f008_w) /* cpu reset lines + other unknown stuff */
+ AM_RANGE(0xf000, 0xf000) AM_WRITE(mexico86_bankswitch_w) /* program and gfx ROM banks */
+ AM_RANGE(0xf008, 0xf008) AM_WRITE(mexico86_f008_w) /* cpu reset lines + other unknown stuff */
AM_RANGE(0xf010, 0xf010) AM_READ_PORT("IN3")
AM_RANGE(0xf018, 0xf018) AM_WRITENOP /* watchdog? */
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("share2") /* communication ram - to connect 4 players's subboard */
@@ -104,11 +104,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mexico86_m68705_map, AS_PROGRAM, 8, mexico86_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(mexico86_68705_port_a_r,mexico86_68705_port_a_w)
- AM_RANGE(0x0001, 0x0001) AM_READWRITE_LEGACY(mexico86_68705_port_b_r,mexico86_68705_port_b_w)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(mexico86_68705_port_a_r,mexico86_68705_port_a_w)
+ AM_RANGE(0x0001, 0x0001) AM_READWRITE(mexico86_68705_port_b_r,mexico86_68705_port_b_w)
AM_RANGE(0x0002, 0x0002) AM_READ_PORT("IN0") /* COIN */
- AM_RANGE(0x0004, 0x0004) AM_WRITE_LEGACY(mexico86_68705_ddr_a_w)
- AM_RANGE(0x0005, 0x0005) AM_WRITE_LEGACY(mexico86_68705_ddr_b_w)
+ AM_RANGE(0x0004, 0x0004) AM_WRITE(mexico86_68705_ddr_a_w)
+ AM_RANGE(0x0005, 0x0005) AM_WRITE(mexico86_68705_ddr_b_w)
AM_RANGE(0x000a, 0x000a) AM_WRITENOP /* looks like a bug in the code, writes to */
/* 0x0a (=10dec) instead of 0x10 */
AM_RANGE(0x0010, 0x007f) AM_RAM
diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c
index e11eca0d16c..41dfeace195 100644
--- a/src/mame/drivers/mhavoc.c
+++ b/src/mame/drivers/mhavoc.c
@@ -236,17 +236,17 @@ static ADDRESS_MAP_START( alpha_map, AS_PROGRAM, 8, mhavoc_state )
AM_RANGE(0x0200, 0x07ff) AM_RAMBANK("bank1") AM_BASE(m_zram0)
AM_RANGE(0x0800, 0x09ff) AM_RAM
AM_RANGE(0x0a00, 0x0fff) AM_RAMBANK("bank1") AM_BASE(m_zram1)
- AM_RANGE(0x1000, 0x1000) AM_READ_LEGACY(mhavoc_gamma_r) /* Gamma Read Port */
+ AM_RANGE(0x1000, 0x1000) AM_READ(mhavoc_gamma_r) /* Gamma Read Port */
AM_RANGE(0x1200, 0x1200) AM_READ_PORT("IN0") AM_WRITENOP /* Alpha Input Port 0 */
AM_RANGE(0x1400, 0x141f) AM_RAM AM_BASE_LEGACY(&avgdvg_colorram) /* ColorRAM */
- AM_RANGE(0x1600, 0x1600) AM_WRITE_LEGACY(mhavoc_out_0_w) /* Control Signals */
+ AM_RANGE(0x1600, 0x1600) AM_WRITE(mhavoc_out_0_w) /* Control Signals */
AM_RANGE(0x1640, 0x1640) AM_WRITE_LEGACY(avgdvg_go_w) /* Vector Generator GO */
AM_RANGE(0x1680, 0x1680) AM_WRITE(watchdog_reset_w) /* Watchdog Clear */
AM_RANGE(0x16c0, 0x16c0) AM_WRITE_LEGACY(avgdvg_reset_w) /* Vector Generator Reset */
- AM_RANGE(0x1700, 0x1700) AM_WRITE_LEGACY(mhavoc_alpha_irq_ack_w) /* IRQ ack */
- AM_RANGE(0x1740, 0x1740) AM_WRITE_LEGACY(mhavoc_rom_banksel_w) /* Program ROM Page Select */
- AM_RANGE(0x1780, 0x1780) AM_WRITE_LEGACY(mhavoc_ram_banksel_w) /* Program RAM Page Select */
- AM_RANGE(0x17c0, 0x17c0) AM_WRITE_LEGACY(mhavoc_gamma_w) /* Gamma Communication Write Port */
+ AM_RANGE(0x1700, 0x1700) AM_WRITE(mhavoc_alpha_irq_ack_w) /* IRQ ack */
+ AM_RANGE(0x1740, 0x1740) AM_WRITE(mhavoc_rom_banksel_w) /* Program ROM Page Select */
+ AM_RANGE(0x1780, 0x1780) AM_WRITE(mhavoc_ram_banksel_w) /* Program RAM Page Select */
+ AM_RANGE(0x17c0, 0x17c0) AM_WRITE(mhavoc_gamma_w) /* Gamma Communication Write Port */
AM_RANGE(0x1800, 0x1fff) AM_RAM /* Shared Beta Ram */
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank2") /* Paged Program ROM (32K) */
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE_LEGACY(&avgdvg_vectorram) AM_SIZE_LEGACY(&avgdvg_vectorram_size) AM_REGION("alpha", 0x4000) /* Vector Generator RAM */
@@ -267,11 +267,11 @@ static ADDRESS_MAP_START( gamma_map, AS_PROGRAM, 8, mhavoc_state )
AM_RANGE(0x0800, 0x0fff) AM_RAM AM_MIRROR (0x1800)
AM_RANGE(0x2000, 0x203f) AM_READWRITE_LEGACY(quad_pokey_r, quad_pokey_w) /* Quad Pokey read */
AM_RANGE(0x2800, 0x2800) AM_READ_PORT("IN1") /* Gamma Input Port */
- AM_RANGE(0x3000, 0x3000) AM_READ_LEGACY(mhavoc_alpha_r) /* Alpha Comm. Read Port*/
+ AM_RANGE(0x3000, 0x3000) AM_READ(mhavoc_alpha_r) /* Alpha Comm. Read Port*/
AM_RANGE(0x3800, 0x3803) AM_READ_PORT("DIAL") /* Roller Controller Input*/
- AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSW2") AM_WRITE_LEGACY(mhavoc_gamma_irq_ack_w) /* DSW at 8S, IRQ Acknowledge*/
- AM_RANGE(0x4800, 0x4800) AM_WRITE_LEGACY(mhavoc_out_1_w) /* Coin Counters */
- AM_RANGE(0x5000, 0x5000) AM_WRITE_LEGACY(mhavoc_alpha_w) /* Alpha Comm. Write Port */
+ AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSW2") AM_WRITE(mhavoc_gamma_irq_ack_w) /* DSW at 8S, IRQ Acknowledge*/
+ AM_RANGE(0x4800, 0x4800) AM_WRITE(mhavoc_out_1_w) /* Coin Counters */
+ AM_RANGE(0x5000, 0x5000) AM_WRITE(mhavoc_alpha_w) /* Alpha Comm. Write Port */
AM_RANGE(0x6000, 0x61ff) AM_RAM AM_SHARE("nvram") /* EEROM */
AM_RANGE(0x8000, 0xffff) AM_ROM /* Program ROM (16K) */
ADDRESS_MAP_END
@@ -294,13 +294,13 @@ static ADDRESS_MAP_START( alphaone_map, AS_PROGRAM, 8, mhavoc_state )
AM_RANGE(0x1040, 0x1040) AM_READ_PORT("IN0") AM_WRITENOP /* Alpha Input Port 0 */
AM_RANGE(0x1060, 0x1060) AM_READ_PORT("IN1") /* Gamma Input Port */
AM_RANGE(0x1080, 0x1080) AM_READ_PORT("DIAL") /* Roller Controller Input*/
- AM_RANGE(0x10a0, 0x10a0) AM_WRITE_LEGACY(alphaone_out_0_w) /* Control Signals */
+ AM_RANGE(0x10a0, 0x10a0) AM_WRITE(alphaone_out_0_w) /* Control Signals */
AM_RANGE(0x10a4, 0x10a4) AM_WRITE_LEGACY(avgdvg_go_w) /* Vector Generator GO */
AM_RANGE(0x10a8, 0x10a8) AM_WRITE(watchdog_reset_w) /* Watchdog Clear */
AM_RANGE(0x10ac, 0x10ac) AM_WRITE_LEGACY(avgdvg_reset_w) /* Vector Generator Reset */
- AM_RANGE(0x10b0, 0x10b0) AM_WRITE_LEGACY(mhavoc_alpha_irq_ack_w) /* IRQ ack */
- AM_RANGE(0x10b4, 0x10b4) AM_WRITE_LEGACY(mhavoc_rom_banksel_w)
- AM_RANGE(0x10b8, 0x10b8) AM_WRITE_LEGACY(mhavoc_ram_banksel_w)
+ AM_RANGE(0x10b0, 0x10b0) AM_WRITE(mhavoc_alpha_irq_ack_w) /* IRQ ack */
+ AM_RANGE(0x10b4, 0x10b4) AM_WRITE(mhavoc_rom_banksel_w)
+ AM_RANGE(0x10b8, 0x10b8) AM_WRITE(mhavoc_ram_banksel_w)
AM_RANGE(0x10e0, 0x10ff) AM_WRITEONLY AM_BASE_LEGACY(&avgdvg_colorram) /* ColorRAM */
AM_RANGE(0x1800, 0x18ff) AM_RAM AM_SHARE("nvram") /* EEROM */
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank2") /* Paged Program ROM (32K) */
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index 537db9762ab..6bb26e3899a 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -200,17 +200,17 @@ static ADDRESS_MAP_START( hostmem, AS_PROGRAM, 16, micro3d_state )
AM_RANGE(0x000000, 0x143fff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x800000, 0x83ffff) AM_RAM AM_BASE(m_shared_ram)
- AM_RANGE(0x900000, 0x900001) AM_WRITE_LEGACY(host_drmath_int_w)
+ AM_RANGE(0x900000, 0x900001) AM_WRITE(host_drmath_int_w)
AM_RANGE(0x920000, 0x920001) AM_READ_PORT("INPUTS_C_D")
AM_RANGE(0x940000, 0x940001) AM_READ_PORT("INPUTS_A_B")
- AM_RANGE(0x960000, 0x960001) AM_WRITE_LEGACY(micro3d_reset_w)
- AM_RANGE(0x980000, 0x980001) AM_READWRITE_LEGACY(micro3d_adc_r, micro3d_adc_w)
- AM_RANGE(0x9a0000, 0x9a0007) AM_READWRITE_LEGACY(micro3d_tms_host_r, micro3d_tms_host_w)
+ AM_RANGE(0x960000, 0x960001) AM_WRITE(micro3d_reset_w)
+ AM_RANGE(0x980000, 0x980001) AM_READWRITE(micro3d_adc_r, micro3d_adc_w)
+ AM_RANGE(0x9a0000, 0x9a0007) AM_READWRITE(micro3d_tms_host_r, micro3d_tms_host_w)
AM_RANGE(0x9c0000, 0x9c0001) AM_NOP /* Lamps */
AM_RANGE(0x9e0000, 0x9e002f) AM_DEVREADWRITE8("mc68901", mc68901_device, read, write, 0xff00)
AM_RANGE(0xa00000, 0xa0003f) AM_DEVREADWRITE8_LEGACY("duart68681", duart68681_r, duart68681_w, 0xff00)
- AM_RANGE(0xa20000, 0xa20001) AM_READ_LEGACY(micro3d_encoder_h_r)
- AM_RANGE(0xa40002, 0xa40003) AM_READ_LEGACY(micro3d_encoder_l_r)
+ AM_RANGE(0xa20000, 0xa20001) AM_READ(micro3d_encoder_h_r)
+ AM_RANGE(0xa40002, 0xa40003) AM_READ(micro3d_encoder_l_r)
ADDRESS_MAP_END
@@ -224,11 +224,11 @@ static ADDRESS_MAP_START( vgbmem, AS_PROGRAM, 16, micro3d_state )
AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE(m_micro3d_sprite_vram)
AM_RANGE(0x00800000, 0x00bfffff) AM_RAM
AM_RANGE(0x00c00000, 0x00c0000f) AM_READ_PORT("VGB_SW")
- AM_RANGE(0x00e00000, 0x00e0000f) AM_WRITE_LEGACY(micro3d_xfer3dk_w)
- AM_RANGE(0x02000000, 0x0200ffff) AM_RAM_WRITE_LEGACY(micro3d_clut_w) AM_SHARE("paletteram")
- AM_RANGE(0x02600000, 0x0260000f) AM_WRITE_LEGACY(micro3d_creg_w)
- AM_RANGE(0x02c00000, 0x02c0003f) AM_READ_LEGACY(micro3d_ti_uart_r)
- AM_RANGE(0x02e00000, 0x02e0003f) AM_WRITE_LEGACY(micro3d_ti_uart_w)
+ AM_RANGE(0x00e00000, 0x00e0000f) AM_WRITE(micro3d_xfer3dk_w)
+ AM_RANGE(0x02000000, 0x0200ffff) AM_RAM_WRITE(micro3d_clut_w) AM_SHARE("paletteram")
+ AM_RANGE(0x02600000, 0x0260000f) AM_WRITE(micro3d_creg_w)
+ AM_RANGE(0x02c00000, 0x02c0003f) AM_READ(micro3d_ti_uart_r)
+ AM_RANGE(0x02e00000, 0x02e0003f) AM_WRITE(micro3d_ti_uart_w)
AM_RANGE(0x03800000, 0x03dfffff) AM_ROM AM_REGION("tms_gfx", 0)
AM_RANGE(0x03e00000, 0x03ffffff) AM_ROM AM_REGION("tms34010", 0)
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE_LEGACY(tms34010_io_register_r, tms34010_io_register_w)
@@ -248,17 +248,17 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( drmath_data, AS_DATA, 32, micro3d_state )
AM_RANGE(0x00000000, 0x000fffff) AM_ROM AM_REGION("drmath", 0)
- AM_RANGE(0x00800000, 0x0083ffff) AM_READWRITE_LEGACY(micro3d_shared_r, micro3d_shared_w)
+ AM_RANGE(0x00800000, 0x0083ffff) AM_READWRITE(micro3d_shared_r, micro3d_shared_w)
AM_RANGE(0x00400000, 0x004fffff) AM_RAM
AM_RANGE(0x00500000, 0x005fffff) AM_RAM
- AM_RANGE(0x00a00000, 0x00a00003) AM_WRITE_LEGACY(drmath_int_w)
- AM_RANGE(0x01000000, 0x01000003) AM_WRITE_LEGACY(micro3d_mac1_w)
- AM_RANGE(0x01000004, 0x01000007) AM_READWRITE_LEGACY(micro3d_mac2_r, micro3d_mac2_w)
+ AM_RANGE(0x00a00000, 0x00a00003) AM_WRITE(drmath_int_w)
+ AM_RANGE(0x01000000, 0x01000003) AM_WRITE(micro3d_mac1_w)
+ AM_RANGE(0x01000004, 0x01000007) AM_READWRITE(micro3d_mac2_r, micro3d_mac2_w)
AM_RANGE(0x01200000, 0x01203fff) AM_RAM AM_BASE(m_mac_sram)
- AM_RANGE(0x01400000, 0x01400003) AM_READWRITE_LEGACY(micro3d_pipe_r, micro3d_fifo_w)
- AM_RANGE(0x01600000, 0x01600003) AM_WRITE_LEGACY(drmath_intr2_ack)
- AM_RANGE(0x01800000, 0x01800003) AM_WRITE_LEGACY(micro3d_alt_fifo_w)
- AM_RANGE(0x03fffff0, 0x03fffff7) AM_READWRITE_LEGACY(micro3d_scc_r, micro3d_scc_w)
+ AM_RANGE(0x01400000, 0x01400003) AM_READWRITE(micro3d_pipe_r, micro3d_fifo_w)
+ AM_RANGE(0x01600000, 0x01600003) AM_WRITE(drmath_intr2_ack)
+ AM_RANGE(0x01800000, 0x01800003) AM_WRITE(micro3d_alt_fifo_w)
+ AM_RANGE(0x03fffff0, 0x03fffff7) AM_READWRITE(micro3d_scc_r, micro3d_scc_w)
ADDRESS_MAP_END
/*************************************
diff --git a/src/mame/drivers/midtunit.c b/src/mame/drivers/midtunit.c
index 5f89de5c377..0bf1586fee0 100644
--- a/src/mame/drivers/midtunit.c
+++ b/src/mame/drivers/midtunit.c
@@ -41,20 +41,20 @@
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, midtunit_state )
ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x00000000, 0x003fffff) AM_READWRITE_LEGACY(midtunit_vram_r, midtunit_vram_w)
+ AM_RANGE(0x00000000, 0x003fffff) AM_READWRITE(midtunit_vram_r, midtunit_vram_w)
AM_RANGE(0x01000000, 0x013fffff) AM_RAM
- AM_RANGE(0x01400000, 0x0141ffff) AM_READWRITE_LEGACY(midtunit_cmos_r, midtunit_cmos_w) AM_SHARE("nvram")
- AM_RANGE(0x01480000, 0x014fffff) AM_WRITE_LEGACY(midtunit_cmos_enable_w)
- AM_RANGE(0x01600000, 0x0160003f) AM_READ_LEGACY(midtunit_input_r)
- AM_RANGE(0x01800000, 0x0187ffff) AM_RAM_WRITE_LEGACY(midtunit_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0x01a80000, 0x01a800ff) AM_READWRITE_LEGACY(midtunit_dma_r, midtunit_dma_w)
- AM_RANGE(0x01b00000, 0x01b0001f) AM_WRITE_LEGACY(midtunit_control_w)
-/* AM_RANGE(0x01c00060, 0x01c0007f) AM_WRITE_LEGACY(midtunit_cmos_enable_w) */
- AM_RANGE(0x01d00000, 0x01d0001f) AM_READ_LEGACY(midtunit_sound_state_r)
- AM_RANGE(0x01d01020, 0x01d0103f) AM_READWRITE_LEGACY(midtunit_sound_r, midtunit_sound_w)
+ AM_RANGE(0x01400000, 0x0141ffff) AM_READWRITE(midtunit_cmos_r, midtunit_cmos_w) AM_SHARE("nvram")
+ AM_RANGE(0x01480000, 0x014fffff) AM_WRITE(midtunit_cmos_enable_w)
+ AM_RANGE(0x01600000, 0x0160003f) AM_READ(midtunit_input_r)
+ AM_RANGE(0x01800000, 0x0187ffff) AM_RAM_WRITE(midtunit_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x01a80000, 0x01a800ff) AM_READWRITE(midtunit_dma_r, midtunit_dma_w)
+ AM_RANGE(0x01b00000, 0x01b0001f) AM_WRITE(midtunit_control_w)
+/* AM_RANGE(0x01c00060, 0x01c0007f) AM_WRITE(midtunit_cmos_enable_w) */
+ AM_RANGE(0x01d00000, 0x01d0001f) AM_READ(midtunit_sound_state_r)
+ AM_RANGE(0x01d01020, 0x01d0103f) AM_READWRITE(midtunit_sound_r, midtunit_sound_w)
AM_RANGE(0x01d81060, 0x01d8107f) AM_WRITE(watchdog_reset16_w)
- AM_RANGE(0x01f00000, 0x01f0001f) AM_WRITE_LEGACY(midtunit_control_w)
- AM_RANGE(0x02000000, 0x07ffffff) AM_READ_LEGACY(midtunit_gfxrom_r) AM_BASE_LEGACY((UINT16 **)&midtunit_gfx_rom) AM_SIZE_LEGACY(&midtunit_gfx_rom_size)
+ AM_RANGE(0x01f00000, 0x01f0001f) AM_WRITE(midtunit_control_w)
+ AM_RANGE(0x02000000, 0x07ffffff) AM_READ(midtunit_gfxrom_r) AM_BASE_LEGACY((UINT16 **)&midtunit_gfx_rom) AM_SIZE_LEGACY(&midtunit_gfx_rom_size)
AM_RANGE(0x1f800000, 0x1fffffff) AM_ROM AM_REGION("user1", 0) /* mirror used by MK */
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE_LEGACY(tms34010_io_register_r, tms34010_io_register_w)
AM_RANGE(0xff800000, 0xffffffff) AM_ROM AM_REGION("user1", 0)
diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c
index e14c65ae65f..7bdcf2d296e 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -478,16 +478,16 @@ static void midvplus_xf1_w(tms3203x_device &device, UINT8 val)
static ADDRESS_MAP_START( midvunit_map, AS_PROGRAM, 32, midvunit_state )
AM_RANGE(0x000000, 0x01ffff) AM_RAM AM_BASE(m_ram_base)
AM_RANGE(0x400000, 0x41ffff) AM_RAM
- AM_RANGE(0x600000, 0x600000) AM_WRITE_LEGACY(midvunit_dma_queue_w)
+ AM_RANGE(0x600000, 0x600000) AM_WRITE(midvunit_dma_queue_w)
AM_RANGE(0x808000, 0x80807f) AM_READWRITE_LEGACY(tms32031_control_r, tms32031_control_w) AM_BASE(m_tms32031_control)
AM_RANGE(0x809800, 0x809fff) AM_RAM
- AM_RANGE(0x900000, 0x97ffff) AM_READWRITE_LEGACY(midvunit_videoram_r, midvunit_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x980000, 0x980000) AM_READ_LEGACY(midvunit_dma_queue_entries_r)
- AM_RANGE(0x980020, 0x980020) AM_READ_LEGACY(midvunit_scanline_r)
- AM_RANGE(0x980020, 0x98002b) AM_WRITE_LEGACY(midvunit_video_control_w)
- AM_RANGE(0x980040, 0x980040) AM_READWRITE_LEGACY(midvunit_page_control_r, midvunit_page_control_w)
+ AM_RANGE(0x900000, 0x97ffff) AM_READWRITE(midvunit_videoram_r, midvunit_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x980000, 0x980000) AM_READ(midvunit_dma_queue_entries_r)
+ AM_RANGE(0x980020, 0x980020) AM_READ(midvunit_scanline_r)
+ AM_RANGE(0x980020, 0x98002b) AM_WRITE(midvunit_video_control_w)
+ AM_RANGE(0x980040, 0x980040) AM_READWRITE(midvunit_page_control_r, midvunit_page_control_w)
AM_RANGE(0x980080, 0x980080) AM_NOP
- AM_RANGE(0x980082, 0x980083) AM_READ_LEGACY(midvunit_dma_trigger_r)
+ AM_RANGE(0x980082, 0x980083) AM_READ(midvunit_dma_trigger_r)
AM_RANGE(0x990000, 0x990000) AM_READNOP // link PAL (low 4 bits must == 4)
AM_RANGE(0x991030, 0x991030) AM_READ_PORT("991030")
// AM_RANGE(0x991050, 0x991050) AM_READONLY // seems to be another port
@@ -500,8 +500,8 @@ static ADDRESS_MAP_START( midvunit_map, AS_PROGRAM, 32, midvunit_state )
AM_RANGE(0x997000, 0x997000) AM_NOP // communications
AM_RANGE(0x9a0000, 0x9a0000) AM_WRITE_LEGACY(midvunit_sound_w)
AM_RANGE(0x9c0000, 0x9c1fff) AM_READWRITE_LEGACY(midvunit_cmos_r, midvunit_cmos_w) AM_SHARE("nvram")
- AM_RANGE(0x9e0000, 0x9e7fff) AM_RAM_WRITE_LEGACY(midvunit_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0xa00000, 0xbfffff) AM_READWRITE_LEGACY(midvunit_textureram_r, midvunit_textureram_w) AM_BASE(m_textureram)
+ AM_RANGE(0x9e0000, 0x9e7fff) AM_RAM_WRITE(midvunit_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa00000, 0xbfffff) AM_READWRITE(midvunit_textureram_r, midvunit_textureram_w) AM_BASE(m_textureram)
AM_RANGE(0xc00000, 0xffffff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
@@ -511,23 +511,23 @@ static const tms3203x_config midvplus_config = { 0, NULL, midvplus_xf1_w };
static ADDRESS_MAP_START( midvplus_map, AS_PROGRAM, 32, midvunit_state )
AM_RANGE(0x000000, 0x01ffff) AM_RAM AM_BASE(m_ram_base)
AM_RANGE(0x400000, 0x41ffff) AM_RAM AM_BASE(m_fastram_base)
- AM_RANGE(0x600000, 0x600000) AM_WRITE_LEGACY(midvunit_dma_queue_w)
+ AM_RANGE(0x600000, 0x600000) AM_WRITE(midvunit_dma_queue_w)
AM_RANGE(0x808000, 0x80807f) AM_READWRITE_LEGACY(tms32031_control_r, tms32031_control_w) AM_BASE(m_tms32031_control)
AM_RANGE(0x809800, 0x809fff) AM_RAM
- AM_RANGE(0x900000, 0x97ffff) AM_READWRITE_LEGACY(midvunit_videoram_r, midvunit_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x980000, 0x980000) AM_READ_LEGACY(midvunit_dma_queue_entries_r)
- AM_RANGE(0x980020, 0x980020) AM_READ_LEGACY(midvunit_scanline_r)
- AM_RANGE(0x980020, 0x98002b) AM_WRITE_LEGACY(midvunit_video_control_w)
- AM_RANGE(0x980040, 0x980040) AM_READWRITE_LEGACY(midvunit_page_control_r, midvunit_page_control_w)
+ AM_RANGE(0x900000, 0x97ffff) AM_READWRITE(midvunit_videoram_r, midvunit_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x980000, 0x980000) AM_READ(midvunit_dma_queue_entries_r)
+ AM_RANGE(0x980020, 0x980020) AM_READ(midvunit_scanline_r)
+ AM_RANGE(0x980020, 0x98002b) AM_WRITE(midvunit_video_control_w)
+ AM_RANGE(0x980040, 0x980040) AM_READWRITE(midvunit_page_control_r, midvunit_page_control_w)
AM_RANGE(0x980080, 0x980080) AM_NOP
- AM_RANGE(0x980082, 0x980083) AM_READ_LEGACY(midvunit_dma_trigger_r)
+ AM_RANGE(0x980082, 0x980083) AM_READ(midvunit_dma_trigger_r)
AM_RANGE(0x990000, 0x99000f) AM_READWRITE_LEGACY(midway_ioasic_r, midway_ioasic_w)
AM_RANGE(0x994000, 0x994000) AM_WRITE_LEGACY(midvunit_control_w)
AM_RANGE(0x995020, 0x995020) AM_WRITE_LEGACY(midvunit_cmos_protect_w)
AM_RANGE(0x9a0000, 0x9a0007) AM_DEVREADWRITE_LEGACY("ide", midway_ide_asic_r, midway_ide_asic_w)
- AM_RANGE(0x9c0000, 0x9c7fff) AM_RAM_WRITE_LEGACY(midvunit_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x9c0000, 0x9c7fff) AM_RAM_WRITE(midvunit_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x9d0000, 0x9d000f) AM_READWRITE_LEGACY(midvplus_misc_r, midvplus_misc_w) AM_BASE(m_midvplus_misc)
- AM_RANGE(0xa00000, 0xbfffff) AM_READWRITE_LEGACY(midvunit_textureram_r, midvunit_textureram_w) AM_BASE(m_textureram)
+ AM_RANGE(0xa00000, 0xbfffff) AM_READWRITE(midvunit_textureram_r, midvunit_textureram_w) AM_BASE(m_textureram)
AM_RANGE(0xc00000, 0xcfffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/midwunit.c b/src/mame/drivers/midwunit.c
index a27ddacac15..c67c4900017 100644
--- a/src/mame/drivers/midwunit.c
+++ b/src/mame/drivers/midwunit.c
@@ -103,17 +103,17 @@ Notes:
*************************************/
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, midwunit_state )
- AM_RANGE(0x00000000, 0x003fffff) AM_READWRITE_LEGACY(midtunit_vram_r, midtunit_vram_w)
+ AM_RANGE(0x00000000, 0x003fffff) AM_READWRITE(midtunit_vram_r, midtunit_vram_w)
AM_RANGE(0x01000000, 0x013fffff) AM_RAM
- AM_RANGE(0x01400000, 0x0145ffff) AM_READWRITE_LEGACY(midwunit_cmos_r, midwunit_cmos_w) AM_SHARE("nvram")
- AM_RANGE(0x01480000, 0x014fffff) AM_WRITE_LEGACY(midwunit_cmos_enable_w)
- AM_RANGE(0x01600000, 0x0160001f) AM_READWRITE_LEGACY(midwunit_security_r, midwunit_security_w)
- AM_RANGE(0x01680000, 0x0168001f) AM_READWRITE_LEGACY(midwunit_sound_r, midwunit_sound_w)
- AM_RANGE(0x01800000, 0x0187ffff) AM_READWRITE_LEGACY(midwunit_io_r, midwunit_io_w)
- AM_RANGE(0x01880000, 0x018fffff) AM_RAM_WRITE_LEGACY(midtunit_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0x01a00000, 0x01a000ff) AM_MIRROR(0x00080000) AM_READWRITE_LEGACY(midtunit_dma_r, midtunit_dma_w)
- AM_RANGE(0x01b00000, 0x01b0001f) AM_READWRITE_LEGACY(midwunit_control_r, midwunit_control_w)
- AM_RANGE(0x02000000, 0x06ffffff) AM_READ_LEGACY(midwunit_gfxrom_r) AM_BASE(m_decode_memory)
+ AM_RANGE(0x01400000, 0x0145ffff) AM_READWRITE(midwunit_cmos_r, midwunit_cmos_w) AM_SHARE("nvram")
+ AM_RANGE(0x01480000, 0x014fffff) AM_WRITE(midwunit_cmos_enable_w)
+ AM_RANGE(0x01600000, 0x0160001f) AM_READWRITE(midwunit_security_r, midwunit_security_w)
+ AM_RANGE(0x01680000, 0x0168001f) AM_READWRITE(midwunit_sound_r, midwunit_sound_w)
+ AM_RANGE(0x01800000, 0x0187ffff) AM_READWRITE(midwunit_io_r, midwunit_io_w)
+ AM_RANGE(0x01880000, 0x018fffff) AM_RAM_WRITE(midtunit_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x01a00000, 0x01a000ff) AM_MIRROR(0x00080000) AM_READWRITE(midtunit_dma_r, midtunit_dma_w)
+ AM_RANGE(0x01b00000, 0x01b0001f) AM_READWRITE(midwunit_control_r, midwunit_control_w)
+ AM_RANGE(0x02000000, 0x06ffffff) AM_READ(midwunit_gfxrom_r) AM_BASE(m_decode_memory)
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE_LEGACY(tms34010_io_register_r, tms34010_io_register_w)
AM_RANGE(0xff800000, 0xffffffff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/midxunit.c b/src/mame/drivers/midxunit.c
index d58cd8e9498..87ef0941c5a 100644
--- a/src/mame/drivers/midxunit.c
+++ b/src/mame/drivers/midxunit.c
@@ -99,21 +99,21 @@ There's a separate sound board also, but it wasn't available so is not documente
*************************************/
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, midxunit_state )
- AM_RANGE(0x00000000, 0x003fffff) AM_READWRITE_LEGACY(midtunit_vram_data_r, midtunit_vram_data_w)
- AM_RANGE(0x00800000, 0x00bfffff) AM_READWRITE_LEGACY(midtunit_vram_color_r, midtunit_vram_color_w)
+ AM_RANGE(0x00000000, 0x003fffff) AM_READWRITE(midtunit_vram_data_r, midtunit_vram_data_w)
+ AM_RANGE(0x00800000, 0x00bfffff) AM_READWRITE(midtunit_vram_color_r, midtunit_vram_color_w)
AM_RANGE(0x20000000, 0x20ffffff) AM_RAM
- AM_RANGE(0x40800000, 0x4fffffff) AM_WRITE_LEGACY(midxunit_unknown_w)
- AM_RANGE(0x60400000, 0x6040001f) AM_READWRITE_LEGACY(midxunit_status_r, midxunit_security_clock_w)
- AM_RANGE(0x60c00000, 0x60c0007f) AM_READ_LEGACY(midxunit_io_r)
- AM_RANGE(0x60c00080, 0x60c000df) AM_WRITE_LEGACY(midxunit_io_w)
- AM_RANGE(0x60c000e0, 0x60c000ff) AM_READWRITE_LEGACY(midxunit_security_r, midxunit_security_w)
- AM_RANGE(0x80800000, 0x8080001f) AM_READWRITE_LEGACY(midxunit_analog_r, midxunit_analog_select_w)
- AM_RANGE(0x80c00000, 0x80c000ff) AM_READWRITE_LEGACY(midxunit_uart_r, midxunit_uart_w)
- AM_RANGE(0xa0440000, 0xa047ffff) AM_READWRITE_LEGACY(midxunit_cmos_r, midxunit_cmos_w) AM_SHARE("nvram")
- AM_RANGE(0xa0800000, 0xa08fffff) AM_READWRITE_LEGACY(midxunit_paletteram_r, midxunit_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x40800000, 0x4fffffff) AM_WRITE(midxunit_unknown_w)
+ AM_RANGE(0x60400000, 0x6040001f) AM_READWRITE(midxunit_status_r, midxunit_security_clock_w)
+ AM_RANGE(0x60c00000, 0x60c0007f) AM_READ(midxunit_io_r)
+ AM_RANGE(0x60c00080, 0x60c000df) AM_WRITE(midxunit_io_w)
+ AM_RANGE(0x60c000e0, 0x60c000ff) AM_READWRITE(midxunit_security_r, midxunit_security_w)
+ AM_RANGE(0x80800000, 0x8080001f) AM_READWRITE(midxunit_analog_r, midxunit_analog_select_w)
+ AM_RANGE(0x80c00000, 0x80c000ff) AM_READWRITE(midxunit_uart_r, midxunit_uart_w)
+ AM_RANGE(0xa0440000, 0xa047ffff) AM_READWRITE(midxunit_cmos_r, midxunit_cmos_w) AM_SHARE("nvram")
+ AM_RANGE(0xa0800000, 0xa08fffff) AM_READWRITE(midxunit_paletteram_r, midxunit_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0xc0000000, 0xc00003ff) AM_READWRITE_LEGACY(tms34020_io_register_r, tms34020_io_register_w)
- AM_RANGE(0xc0c00000, 0xc0c000ff) AM_MIRROR(0x00400000) AM_READWRITE_LEGACY(midtunit_dma_r, midtunit_dma_w)
- AM_RANGE(0xf8000000, 0xfeffffff) AM_READ_LEGACY(midwunit_gfxrom_r) AM_BASE(m_decode_memory)
+ AM_RANGE(0xc0c00000, 0xc0c000ff) AM_MIRROR(0x00400000) AM_READWRITE(midtunit_dma_r, midtunit_dma_w)
+ AM_RANGE(0xf8000000, 0xfeffffff) AM_READ(midwunit_gfxrom_r) AM_BASE(m_decode_memory)
AM_RANGE(0xff000000, 0xffffffff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c
index 3c78cb392ba..97903651e7d 100644
--- a/src/mame/drivers/midyunit.c
+++ b/src/mame/drivers/midyunit.c
@@ -176,16 +176,16 @@ static CUSTOM_INPUT( adpcm_irq_state_r )
*************************************/
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, midyunit_state )
- AM_RANGE(0x00000000, 0x001fffff) AM_READWRITE_LEGACY(midyunit_vram_r, midyunit_vram_w)
+ AM_RANGE(0x00000000, 0x001fffff) AM_READWRITE(midyunit_vram_r, midyunit_vram_w)
AM_RANGE(0x01000000, 0x010fffff) AM_RAM
- AM_RANGE(0x01400000, 0x0140ffff) AM_READWRITE_LEGACY(midyunit_cmos_r, midyunit_cmos_w)
- AM_RANGE(0x01800000, 0x0181ffff) AM_RAM_WRITE_LEGACY(midyunit_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0x01a80000, 0x01a8009f) AM_MIRROR(0x00080000) AM_READWRITE_LEGACY(midyunit_dma_r, midyunit_dma_w)
- AM_RANGE(0x01c00000, 0x01c0005f) AM_READ_LEGACY(midyunit_input_r)
- AM_RANGE(0x01c00060, 0x01c0007f) AM_READWRITE_LEGACY(midyunit_protection_r, midyunit_cmos_enable_w)
- AM_RANGE(0x01e00000, 0x01e0001f) AM_WRITE_LEGACY(midyunit_sound_w)
- AM_RANGE(0x01f00000, 0x01f0001f) AM_WRITE_LEGACY(midyunit_control_w)
- AM_RANGE(0x02000000, 0x05ffffff) AM_READ_LEGACY(midyunit_gfxrom_r) AM_BASE(m_gfx_rom) AM_SIZE(m_gfx_rom_size)
+ AM_RANGE(0x01400000, 0x0140ffff) AM_READWRITE(midyunit_cmos_r, midyunit_cmos_w)
+ AM_RANGE(0x01800000, 0x0181ffff) AM_RAM_WRITE(midyunit_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x01a80000, 0x01a8009f) AM_MIRROR(0x00080000) AM_READWRITE(midyunit_dma_r, midyunit_dma_w)
+ AM_RANGE(0x01c00000, 0x01c0005f) AM_READ(midyunit_input_r)
+ AM_RANGE(0x01c00060, 0x01c0007f) AM_READWRITE(midyunit_protection_r, midyunit_cmos_enable_w)
+ AM_RANGE(0x01e00000, 0x01e0001f) AM_WRITE(midyunit_sound_w)
+ AM_RANGE(0x01f00000, 0x01f0001f) AM_WRITE(midyunit_control_w)
+ AM_RANGE(0x02000000, 0x05ffffff) AM_READ(midyunit_gfxrom_r) AM_BASE(m_gfx_rom) AM_SIZE(m_gfx_rom_size)
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE_LEGACY(tms34010_io_register_r, tms34010_io_register_w)
AM_RANGE(0xff800000, 0xffffffff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c
index a49b034bcb3..7f695a9426b 100644
--- a/src/mame/drivers/midzeus.c
+++ b/src/mame/drivers/midzeus.c
@@ -565,7 +565,7 @@ static ADDRESS_MAP_START( zeus_map, AS_PROGRAM, 32, midzeus_state )
AM_RANGE(0x000000, 0x03ffff) AM_RAM AM_BASE_LEGACY(&ram_base)
AM_RANGE(0x400000, 0x41ffff) AM_RAM
AM_RANGE(0x808000, 0x80807f) AM_READWRITE(tms32031_control_r, tms32031_control_w) AM_BASE_LEGACY(&tms32031_control)
- AM_RANGE(0x880000, 0x8803ff) AM_READWRITE_LEGACY(zeus_r, zeus_w) AM_BASE_LEGACY(&zeusbase)
+ AM_RANGE(0x880000, 0x8803ff) AM_READWRITE(zeus_r, zeus_w) AM_BASE_LEGACY(&zeusbase)
AM_RANGE(0x8d0000, 0x8d0004) AM_READWRITE(bitlatches_r, bitlatches_w)
AM_RANGE(0x990000, 0x99000f) AM_READWRITE_LEGACY(midway_ioasic_r, midway_ioasic_w)
AM_RANGE(0x9e0000, 0x9e0000) AM_WRITENOP // watchdog?
diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c
index 9a9c318e395..4bd156c900d 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -97,10 +97,10 @@ static ADDRESS_MAP_START( mikie_map, AS_PROGRAM, 8, mikie_state )
AM_RANGE(0x0000, 0x00ff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_WRITE(mikie_coin_counter_w)
AM_RANGE(0x2002, 0x2002) AM_WRITE(mikie_sh_irqtrigger_w)
- AM_RANGE(0x2006, 0x2006) AM_WRITE_LEGACY(mikie_flipscreen_w)
+ AM_RANGE(0x2006, 0x2006) AM_WRITE(mikie_flipscreen_w)
AM_RANGE(0x2007, 0x2007) AM_WRITE(irq_mask_w)
AM_RANGE(0x2100, 0x2100) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x2200, 0x2200) AM_WRITE_LEGACY(mikie_palettebank_w)
+ AM_RANGE(0x2200, 0x2200) AM_WRITE(mikie_palettebank_w)
AM_RANGE(0x2300, 0x2300) AM_WRITENOP // ???
AM_RANGE(0x2400, 0x2400) AM_READ_PORT("SYSTEM") AM_WRITE(soundlatch_w)
AM_RANGE(0x2401, 0x2401) AM_READ_PORT("P1")
@@ -110,8 +110,8 @@ static ADDRESS_MAP_START( mikie_map, AS_PROGRAM, 8, mikie_state )
AM_RANGE(0x2501, 0x2501) AM_READ_PORT("DSW2")
AM_RANGE(0x2800, 0x288f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x2890, 0x37ff) AM_RAM
- AM_RANGE(0x3800, 0x3bff) AM_RAM_WRITE_LEGACY(mikie_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x3c00, 0x3fff) AM_RAM_WRITE_LEGACY(mikie_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x3800, 0x3bff) AM_RAM_WRITE(mikie_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x3c00, 0x3fff) AM_RAM_WRITE(mikie_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4000, 0x5fff) AM_ROM // Machine checks for extra rom
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index beb2b118a61..34c53511aed 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -163,10 +163,10 @@ static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8, missb2_state )
AM_RANGE(0xdd00, 0xdfff) AM_RAM AM_BASE_SIZE(m_objectram, m_objectram_size)
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xf800, 0xf9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
- AM_RANGE(0xfa00, 0xfa00) AM_WRITE_LEGACY(bublbobl_sound_command_w)
+ AM_RANGE(0xfa00, 0xfa00) AM_WRITE(bublbobl_sound_command_w)
AM_RANGE(0xfa03, 0xfa03) AM_WRITENOP // sound cpu reset
AM_RANGE(0xfa80, 0xfa80) AM_WRITENOP
- AM_RANGE(0xfb40, 0xfb40) AM_WRITE_LEGACY(bublbobl_bankswitch_w)
+ AM_RANGE(0xfb40, 0xfb40) AM_WRITE(bublbobl_bankswitch_w)
AM_RANGE(0xfc00, 0xfcff) AM_RAM
AM_RANGE(0xfd00, 0xfdff) AM_RAM // ???
AM_RANGE(0xfe00, 0xfe03) AM_RAM // ???
@@ -200,8 +200,8 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, missb2_state )
AM_RANGE(0x9000, 0x9000) AM_DEVREADWRITE("oki", okim6295_device, read, write)
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ymsnd", ym3526_r, ym3526_w)
AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r) AM_WRITENOP // message for main cpu
- AM_RANGE(0xb001, 0xb001) AM_READNOP AM_WRITE_LEGACY(bublbobl_sh_nmi_enable_w) // bit 0: message pending for main cpu, bit 1: message pending for sound cpu
- AM_RANGE(0xb002, 0xb002) AM_WRITE_LEGACY(bublbobl_sh_nmi_disable_w)
+ AM_RANGE(0xb001, 0xb001) AM_READNOP AM_WRITE(bublbobl_sh_nmi_enable_w) // bit 0: message pending for main cpu, bit 1: message pending for sound cpu
+ AM_RANGE(0xb002, 0xb002) AM_WRITE(bublbobl_sh_nmi_disable_w)
AM_RANGE(0xe000, 0xefff) AM_ROM // space for diagnostic ROM?
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index 232243c6441..a24d68be973 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -298,25 +298,25 @@ WRITE8_MEMBER(mitchell_state::input_w)
static ADDRESS_MAP_START( mgakuen_map, AS_PROGRAM, 8, mitchell_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xc7ff) AM_READWRITE_LEGACY(mgakuen_paletteram_r, mgakuen_paletteram_w) /* palette RAM */
- AM_RANGE(0xc800, 0xcfff) AM_READWRITE_LEGACY(pang_colorram_r, pang_colorram_w) AM_BASE(m_colorram) /* Attribute RAM */
- AM_RANGE(0xd000, 0xdfff) AM_READWRITE_LEGACY(mgakuen_videoram_r, mgakuen_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size) /* char RAM */
+ AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(mgakuen_paletteram_r, mgakuen_paletteram_w) /* palette RAM */
+ AM_RANGE(0xc800, 0xcfff) AM_READWRITE(pang_colorram_r, pang_colorram_w) AM_BASE(m_colorram) /* Attribute RAM */
+ AM_RANGE(0xd000, 0xdfff) AM_READWRITE(mgakuen_videoram_r, mgakuen_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size) /* char RAM */
AM_RANGE(0xe000, 0xefff) AM_RAM /* Work RAM */
- AM_RANGE(0xf000, 0xffff) AM_READWRITE_LEGACY(mgakuen_objram_r, mgakuen_objram_w) /* OBJ RAM */
+ AM_RANGE(0xf000, 0xffff) AM_READWRITE(mgakuen_objram_r, mgakuen_objram_w) /* OBJ RAM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( mitchell_map, AS_PROGRAM, 8, mitchell_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xc7ff) AM_READWRITE_LEGACY(pang_paletteram_r,pang_paletteram_w) /* Banked palette RAM */
- AM_RANGE(0xc800, 0xcfff) AM_READWRITE_LEGACY(pang_colorram_r,pang_colorram_w) AM_BASE(m_colorram) /* Attribute RAM */
- AM_RANGE(0xd000, 0xdfff) AM_READWRITE_LEGACY(pang_videoram_r,pang_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)/* Banked char / OBJ RAM */
+ AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(pang_paletteram_r,pang_paletteram_w) /* Banked palette RAM */
+ AM_RANGE(0xc800, 0xcfff) AM_READWRITE(pang_colorram_r,pang_colorram_w) AM_BASE(m_colorram) /* Attribute RAM */
+ AM_RANGE(0xd000, 0xdfff) AM_READWRITE(pang_videoram_r,pang_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)/* Banked char / OBJ RAM */
AM_RANGE(0xe000, 0xffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( mitchell_io_map, AS_IO, 8, mitchell_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(pang_gfxctrl_w) /* Palette bank, layer enable, coin counters, more */
+ AM_RANGE(0x00, 0x00) AM_WRITE(pang_gfxctrl_w) /* Palette bank, layer enable, coin counters, more */
AM_RANGE(0x00, 0x02) AM_READ(input_r) /* The Mahjong games and Block Block need special input treatment */
AM_RANGE(0x01, 0x01) AM_WRITE(input_w)
AM_RANGE(0x02, 0x02) AM_WRITE(pang_bankswitch_w) /* Code bank register */
@@ -324,7 +324,7 @@ static ADDRESS_MAP_START( mitchell_io_map, AS_IO, 8, mitchell_state )
AM_RANGE(0x04, 0x04) AM_DEVWRITE_LEGACY("ymsnd", ym2413_register_port_w)
AM_RANGE(0x05, 0x05) AM_READ(pang_port5_r) AM_DEVWRITE("oki", okim6295_device, write)
AM_RANGE(0x06, 0x06) AM_WRITENOP /* watchdog? irq ack? */
- AM_RANGE(0x07, 0x07) AM_WRITE_LEGACY(pang_video_bank_w) /* Video RAM bank register */
+ AM_RANGE(0x07, 0x07) AM_WRITE(pang_video_bank_w) /* Video RAM bank register */
AM_RANGE(0x08, 0x08) AM_DEVWRITE_LEGACY("eeprom", eeprom_cs_w)
AM_RANGE(0x10, 0x10) AM_DEVWRITE_LEGACY("eeprom", eeprom_clock_w)
AM_RANGE(0x18, 0x18) AM_DEVWRITE_LEGACY("eeprom", eeprom_serial_w)
@@ -334,22 +334,22 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( spangbl_map, AS_PROGRAM, 8, mitchell_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_WRITENOP
- AM_RANGE(0xc000, 0xc7ff) AM_READWRITE_LEGACY(pang_paletteram_r, pang_paletteram_w) /* Banked palette RAM */
- AM_RANGE(0xc800, 0xcfff) AM_READWRITE_LEGACY(pang_colorram_r, pang_colorram_w) AM_BASE(m_colorram)/* Attribute RAM */
- AM_RANGE(0xd000, 0xdfff) AM_READWRITE_LEGACY(pang_videoram_r, pang_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size) /* Banked char / OBJ RAM */
+ AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(pang_paletteram_r, pang_paletteram_w) /* Banked palette RAM */
+ AM_RANGE(0xc800, 0xcfff) AM_READWRITE(pang_colorram_r, pang_colorram_w) AM_BASE(m_colorram)/* Attribute RAM */
+ AM_RANGE(0xd000, 0xdfff) AM_READWRITE(pang_videoram_r, pang_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size) /* Banked char / OBJ RAM */
AM_RANGE(0xe000, 0xffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( spangbl_io_map, AS_IO, 8, mitchell_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x02) AM_READ(input_r)
- AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(pangbl_gfxctrl_w) /* Palette bank, layer enable, coin counters, more */
+ AM_RANGE(0x00, 0x00) AM_WRITE(pangbl_gfxctrl_w) /* Palette bank, layer enable, coin counters, more */
AM_RANGE(0x02, 0x02) AM_WRITE(pang_bankswitch_w) /* Code bank register */
AM_RANGE(0x03, 0x03) AM_DEVWRITE_LEGACY("ymsnd", ym2413_data_port_w)
AM_RANGE(0x04, 0x04) AM_DEVWRITE_LEGACY("ymsnd", ym2413_register_port_w)
AM_RANGE(0x05, 0x05) AM_READ_PORT("SYS0")
AM_RANGE(0x06, 0x06) AM_WRITENOP /* watchdog? irq ack? */
- AM_RANGE(0x07, 0x07) AM_WRITE_LEGACY(pang_video_bank_w) /* Video RAM bank register */
+ AM_RANGE(0x07, 0x07) AM_WRITE(pang_video_bank_w) /* Video RAM bank register */
AM_RANGE(0x08, 0x08) AM_DEVWRITE_LEGACY("eeprom", eeprom_cs_w)
AM_RANGE(0x10, 0x10) AM_DEVWRITE_LEGACY("eeprom", eeprom_clock_w)
AM_RANGE(0x18, 0x18) AM_DEVWRITE_LEGACY("eeprom", eeprom_serial_w)
@@ -397,7 +397,7 @@ WRITE8_MEMBER(mitchell_state::mstworld_sound_w)
static ADDRESS_MAP_START( mstworld_io_map, AS_IO, 8, mitchell_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE_LEGACY(mstworld_gfxctrl_w) /* Palette bank, layer enable, coin counters, more */
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(mstworld_gfxctrl_w) /* Palette bank, layer enable, coin counters, more */
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_WRITE(pang_bankswitch_w) /* Code bank register */
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW0") AM_WRITE(mstworld_sound_w) /* write to sound cpu */
@@ -405,7 +405,7 @@ static ADDRESS_MAP_START( mstworld_io_map, AS_IO, 8, mitchell_state )
AM_RANGE(0x05, 0x05) AM_READ_PORT("SYS0") /* special? */
AM_RANGE(0x06, 0x06) AM_READ_PORT("DSW2") /* dips? */
AM_RANGE(0x06, 0x06) AM_WRITENOP /* watchdog? irq ack? */
- AM_RANGE(0x07, 0x07) AM_WRITE_LEGACY(mstworld_video_bank_w) /* Video RAM bank register */
+ AM_RANGE(0x07, 0x07) AM_WRITE(mstworld_video_bank_w) /* Video RAM bank register */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index 3d8e4dc2b91..2544d341423 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -176,7 +176,7 @@ static ADDRESS_MAP_START( mjkjidai_map, AS_PROGRAM, 8, mjkjidai_state )
AM_RANGE(0xe000, 0xe01f) AM_RAM AM_BASE(m_spriteram1) // shared with tilemap ram
AM_RANGE(0xe800, 0xe81f) AM_RAM AM_BASE(m_spriteram2) // shared with tilemap ram
AM_RANGE(0xf000, 0xf01f) AM_RAM AM_BASE(m_spriteram3) // shared with tilemap ram
- AM_RANGE(0xe000, 0xf7ff) AM_RAM_WRITE_LEGACY(mjkjidai_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe000, 0xf7ff) AM_RAM_WRITE(mjkjidai_videoram_w) AM_BASE(m_videoram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mjkjidai_io_map, AS_IO, 8, mjkjidai_state )
@@ -185,7 +185,7 @@ static ADDRESS_MAP_START( mjkjidai_io_map, AS_IO, 8, mjkjidai_state )
AM_RANGE(0x01, 0x01) AM_READNOP // ???
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2")
AM_RANGE(0x01, 0x02) AM_WRITE(keyboard_select_w)
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(mjkjidai_ctrl_w) // rom bank, coin counter, flip screen etc
+ AM_RANGE(0x10, 0x10) AM_WRITE(mjkjidai_ctrl_w) // rom bank, coin counter, flip screen etc
AM_RANGE(0x11, 0x11) AM_READ_PORT("IN0")
AM_RANGE(0x12, 0x12) AM_READ_PORT("IN1")
AM_RANGE(0x20, 0x20) AM_DEVWRITE_LEGACY("sn1", sn76496_w)
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index a5d46064b90..e89ff9f0168 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -855,7 +855,7 @@ WRITE16_MEMBER(model1_state::snd_latch_to_68k_w)
if (m_dsbz80 != NULL)
{
- m_dsbz80->latch_w(*&space, 0, data);
+ m_dsbz80->latch_w(space, 0, data);
}
// signal the 68000 that there's data waiting
@@ -874,7 +874,7 @@ static ADDRESS_MAP_START( model1_mem, AS_PROGRAM, 16, model1_state )
AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(md0_w) AM_BASE(m_display_list0)
AM_RANGE(0x610000, 0x61ffff) AM_RAM_WRITE(md1_w) AM_BASE(m_display_list1)
- AM_RANGE(0x680000, 0x680003) AM_READWRITE_LEGACY(model1_listctl_r, model1_listctl_w)
+ AM_RANGE(0x680000, 0x680003) AM_READWRITE(model1_listctl_r, model1_listctl_w)
AM_RANGE(0x700000, 0x70ffff) AM_DEVREADWRITE("tile", segas24_tile, tile_r, tile_w)
AM_RANGE(0x720000, 0x720001) AM_WRITENOP // Unknown, always 0
@@ -895,9 +895,9 @@ static ADDRESS_MAP_START( model1_mem, AS_PROGRAM, 16, model1_state )
AM_RANGE(0xc40000, 0xc40001) AM_WRITE(snd_latch_to_68k_w)
AM_RANGE(0xc40002, 0xc40003) AM_READ(snd_68k_ready_r)
- AM_RANGE(0xd00000, 0xd00001) AM_READWRITE_LEGACY(model1_tgp_copro_adr_r, model1_tgp_copro_adr_w)
- AM_RANGE(0xd20000, 0xd20003) AM_WRITE_LEGACY(model1_tgp_copro_ram_w )
- AM_RANGE(0xd80000, 0xd80003) AM_WRITE_LEGACY(model1_tgp_copro_w) AM_MIRROR(0x10)
+ AM_RANGE(0xd00000, 0xd00001) AM_READWRITE(model1_tgp_copro_adr_r, model1_tgp_copro_adr_w)
+ AM_RANGE(0xd20000, 0xd20003) AM_WRITE(model1_tgp_copro_ram_w )
+ AM_RANGE(0xd80000, 0xd80003) AM_WRITE(model1_tgp_copro_w) AM_MIRROR(0x10)
AM_RANGE(0xdc0000, 0xdc0003) AM_READ(fifoin_status_r)
AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // Watchdog? IRQ ack? Always 0x20, usually on irq
@@ -908,8 +908,8 @@ static ADDRESS_MAP_START( model1_mem, AS_PROGRAM, 16, model1_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( model1_io, AS_IO, 16, model1_state )
- AM_RANGE(0xd20000, 0xd20003) AM_READ_LEGACY(model1_tgp_copro_ram_r)
- AM_RANGE(0xd80000, 0xd80003) AM_READ_LEGACY(model1_tgp_copro_r)
+ AM_RANGE(0xd20000, 0xd20003) AM_READ(model1_tgp_copro_ram_r)
+ AM_RANGE(0xd80000, 0xd80003) AM_READ(model1_tgp_copro_r)
ADDRESS_MAP_END
static ADDRESS_MAP_START( model1_vr_mem, AS_PROGRAM, 16, model1_state )
@@ -922,7 +922,7 @@ static ADDRESS_MAP_START( model1_vr_mem, AS_PROGRAM, 16, model1_state )
AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(md0_w) AM_BASE(m_display_list0)
AM_RANGE(0x610000, 0x61ffff) AM_RAM_WRITE(md1_w) AM_BASE(m_display_list1)
- AM_RANGE(0x680000, 0x680003) AM_READWRITE_LEGACY(model1_listctl_r, model1_listctl_w)
+ AM_RANGE(0x680000, 0x680003) AM_READWRITE(model1_listctl_r, model1_listctl_w)
AM_RANGE(0x700000, 0x70ffff) AM_DEVREADWRITE("tile", segas24_tile, tile_r, tile_w)
AM_RANGE(0x720000, 0x720001) AM_WRITENOP // Unknown, always 0
@@ -943,9 +943,9 @@ static ADDRESS_MAP_START( model1_vr_mem, AS_PROGRAM, 16, model1_state )
AM_RANGE(0xc40000, 0xc40001) AM_WRITE(snd_latch_to_68k_w)
AM_RANGE(0xc40002, 0xc40003) AM_READ(snd_68k_ready_r)
- AM_RANGE(0xd00000, 0xd00001) AM_READWRITE_LEGACY(model1_tgp_vr_adr_r, model1_tgp_vr_adr_w)
- AM_RANGE(0xd20000, 0xd20003) AM_WRITE_LEGACY(model1_vr_tgp_ram_w )
- AM_RANGE(0xd80000, 0xd80003) AM_WRITE_LEGACY(model1_vr_tgp_w) AM_MIRROR(0x10)
+ AM_RANGE(0xd00000, 0xd00001) AM_READWRITE(model1_tgp_vr_adr_r, model1_tgp_vr_adr_w)
+ AM_RANGE(0xd20000, 0xd20003) AM_WRITE(model1_vr_tgp_ram_w )
+ AM_RANGE(0xd80000, 0xd80003) AM_WRITE(model1_vr_tgp_w) AM_MIRROR(0x10)
AM_RANGE(0xdc0000, 0xdc0003) AM_READ(fifoin_status_r)
AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // Watchdog? IRQ ack? Always 0x20, usually on irq
@@ -956,8 +956,8 @@ static ADDRESS_MAP_START( model1_vr_mem, AS_PROGRAM, 16, model1_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( model1_vr_io, AS_IO, 16, model1_state )
- AM_RANGE(0xd20000, 0xd20003) AM_READ_LEGACY(model1_vr_tgp_ram_r)
- AM_RANGE(0xd80000, 0xd80003) AM_READ_LEGACY(model1_vr_tgp_r)
+ AM_RANGE(0xd20000, 0xd20003) AM_READ(model1_vr_tgp_ram_r)
+ AM_RANGE(0xd80000, 0xd80003) AM_READ(model1_vr_tgp_r)
ADDRESS_MAP_END
READ16_MEMBER(model1_state::m1_snd_68k_latch_r)
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index a39f7765959..6bd3e76c277 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -1625,23 +1625,25 @@ static WRITE64_HANDLER( model3_sys_w )
static READ64_HANDLER( model3_rtc_r )
{
+ model3_state *state = space->machine().driver_data<model3_state>();
UINT64 r = 0;
if(ACCESSING_BITS_56_63) {
- r |= (UINT64)rtc72421_r(space, (offset*2)+0, (UINT32)(mem_mask >> 32)) << 32;
+ r |= (UINT64)state->rtc72421_r(*space, (offset*2)+0, (UINT32)(mem_mask >> 32)) << 32;
}
if(ACCESSING_BITS_24_31) {
- r |= (UINT64)rtc72421_r(space, (offset*2)+1, (UINT32)(mem_mask));
+ r |= (UINT64)state->rtc72421_r(*space, (offset*2)+1, (UINT32)(mem_mask));
}
return r;
}
static WRITE64_HANDLER( model3_rtc_w )
{
+ model3_state *state = space->machine().driver_data<model3_state>();
if(ACCESSING_BITS_56_63) {
- rtc72421_w(space, (offset*2)+0, (UINT32)(data >> 32), (UINT32)(mem_mask >> 32));
+ state->rtc72421_w(*space, (offset*2)+0, (UINT32)(data >> 32), (UINT32)(mem_mask >> 32));
}
if(ACCESSING_BITS_24_31) {
- rtc72421_w(space, (offset*2)+1, (UINT32)(data), (UINT32)(mem_mask));
+ state->rtc72421_w(*space, (offset*2)+1, (UINT32)(data), (UINT32)(mem_mask));
}
}
@@ -1877,9 +1879,9 @@ static ADDRESS_MAP_START( model3_mem, AS_PROGRAM, 64, model3_state )
AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE(m_work_ram) /* work RAM */
AM_RANGE(0x84000000, 0x8400003f) AM_READ_LEGACY(real3d_status_r )
- AM_RANGE(0x88000000, 0x88000007) AM_WRITE_LEGACY(real3d_cmd_w )
- AM_RANGE(0x8e000000, 0x8e0fffff) AM_WRITE_LEGACY(real3d_display_list_w )
- AM_RANGE(0x98000000, 0x980fffff) AM_WRITE_LEGACY(real3d_polygon_ram_w )
+ AM_RANGE(0x88000000, 0x88000007) AM_WRITE(real3d_cmd_w )
+ AM_RANGE(0x8e000000, 0x8e0fffff) AM_WRITE(real3d_display_list_w )
+ AM_RANGE(0x98000000, 0x980fffff) AM_WRITE(real3d_polygon_ram_w )
AM_RANGE(0xf0040000, 0xf004003f) AM_MIRROR(0x0e000000) AM_READWRITE_LEGACY(model3_ctrl_r, model3_ctrl_w )
AM_RANGE(0xf0080000, 0xf008ffff) AM_MIRROR(0x0e000000) AM_WRITE8_LEGACY(model3_sound_w, U64(0xffffffffffffffff) )
@@ -1889,10 +1891,10 @@ static ADDRESS_MAP_START( model3_mem, AS_PROGRAM, 64, model3_state )
AM_RANGE(0xf0180000, 0xf019ffff) AM_MIRROR(0x0e000000) AM_RAM /* Security Board RAM */
AM_RANGE(0xf01a0000, 0xf01a003f) AM_MIRROR(0x0e000000) AM_READ_LEGACY(model3_security_r ) /* Security board */
- AM_RANGE(0xf1000000, 0xf10f7fff) AM_READWRITE_LEGACY(model3_char_r, model3_char_w ) /* character RAM */
- AM_RANGE(0xf10f8000, 0xf10fffff) AM_READWRITE_LEGACY(model3_tile_r, model3_tile_w ) /* tilemaps */
- AM_RANGE(0xf1100000, 0xf111ffff) AM_READWRITE_LEGACY(model3_palette_r, model3_palette_w ) AM_BASE(m_paletteram64) /* palette */
- AM_RANGE(0xf1180000, 0xf11800ff) AM_READWRITE_LEGACY(model3_vid_reg_r, model3_vid_reg_w )
+ AM_RANGE(0xf1000000, 0xf10f7fff) AM_READWRITE(model3_char_r, model3_char_w ) /* character RAM */
+ AM_RANGE(0xf10f8000, 0xf10fffff) AM_READWRITE(model3_tile_r, model3_tile_w ) /* tilemaps */
+ AM_RANGE(0xf1100000, 0xf111ffff) AM_READWRITE(model3_palette_r, model3_palette_w ) AM_BASE(m_paletteram64) /* palette */
+ AM_RANGE(0xf1180000, 0xf11800ff) AM_READWRITE(model3_vid_reg_r, model3_vid_reg_w )
AM_RANGE(0xff800000, 0xffffffff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c
index 1f3ac166c37..c25c5c96be3 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -59,23 +59,23 @@ static ADDRESS_MAP_START( momoko_map, AS_PROGRAM, 8, momoko_state )
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd064, 0xd0ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd400, 0xd400) AM_READ_PORT("IN0") AM_WRITENOP /* interrupt ack? */
- AM_RANGE(0xd402, 0xd402) AM_READ_PORT("IN1") AM_WRITE_LEGACY(momoko_flipscreen_w)
+ AM_RANGE(0xd402, 0xd402) AM_READ_PORT("IN1") AM_WRITE(momoko_flipscreen_w)
AM_RANGE(0xd404, 0xd404) AM_WRITE(watchdog_reset_w)
AM_RANGE(0xd406, 0xd406) AM_READ_PORT("DSW0") AM_WRITE(soundlatch_w)
AM_RANGE(0xd407, 0xd407) AM_READ_PORT("DSW1")
AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_be_w) AM_SHARE("paletteram")
- AM_RANGE(0xdc00, 0xdc00) AM_WRITE_LEGACY(momoko_fg_scrolly_w)
- AM_RANGE(0xdc01, 0xdc01) AM_WRITE_LEGACY(momoko_fg_scrollx_w)
- AM_RANGE(0xdc02, 0xdc02) AM_WRITE_LEGACY(momoko_fg_select_w)
+ AM_RANGE(0xdc00, 0xdc00) AM_WRITE(momoko_fg_scrolly_w)
+ AM_RANGE(0xdc01, 0xdc01) AM_WRITE(momoko_fg_scrollx_w)
+ AM_RANGE(0xdc02, 0xdc02) AM_WRITE(momoko_fg_select_w)
AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0xe800, 0xe800) AM_WRITE_LEGACY(momoko_text_scrolly_w)
- AM_RANGE(0xe801, 0xe801) AM_WRITE_LEGACY(momoko_text_mode_w)
+ AM_RANGE(0xe800, 0xe800) AM_WRITE(momoko_text_scrolly_w)
+ AM_RANGE(0xe801, 0xe801) AM_WRITE(momoko_text_mode_w)
AM_RANGE(0xf000, 0xffff) AM_ROMBANK("bank1")
- AM_RANGE(0xf000, 0xf001) AM_WRITE_LEGACY(momoko_bg_scrolly_w) AM_BASE(m_bg_scrolly)
- AM_RANGE(0xf002, 0xf003) AM_WRITE_LEGACY(momoko_bg_scrollx_w) AM_BASE(m_bg_scrollx)
+ AM_RANGE(0xf000, 0xf001) AM_WRITE(momoko_bg_scrolly_w) AM_BASE(m_bg_scrolly)
+ AM_RANGE(0xf002, 0xf003) AM_WRITE(momoko_bg_scrollx_w) AM_BASE(m_bg_scrollx)
AM_RANGE(0xf004, 0xf004) AM_WRITE(momoko_bg_read_bank_w)
- AM_RANGE(0xf006, 0xf006) AM_WRITE_LEGACY(momoko_bg_select_w)
- AM_RANGE(0xf007, 0xf007) AM_WRITE_LEGACY(momoko_bg_priority_w)
+ AM_RANGE(0xf006, 0xf006) AM_WRITE(momoko_bg_select_w)
+ AM_RANGE(0xf007, 0xf007) AM_WRITE(momoko_bg_priority_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( momoko_sound_map, AS_PROGRAM, 8, momoko_state )
diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c
index e06263d9793..54feb2e870d 100644
--- a/src/mame/drivers/mosaic.c
+++ b/src/mame/drivers/mosaic.c
@@ -90,16 +90,16 @@ READ8_MEMBER(mosaic_state::gfire2_protection_r)
static ADDRESS_MAP_START( mosaic_map, AS_PROGRAM, 8, mosaic_state )
AM_RANGE(0x00000, 0x0ffff) AM_ROM
AM_RANGE(0x20000, 0x21fff) AM_RAM
- AM_RANGE(0x22000, 0x22fff) AM_RAM_WRITE_LEGACY(mosaic_bgvideoram_w) AM_BASE(m_bgvideoram)
- AM_RANGE(0x23000, 0x23fff) AM_RAM_WRITE_LEGACY(mosaic_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x22000, 0x22fff) AM_RAM_WRITE(mosaic_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x23000, 0x23fff) AM_RAM_WRITE(mosaic_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0x24000, 0x241ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( gfire2_map, AS_PROGRAM, 8, mosaic_state )
AM_RANGE(0x00000, 0x0ffff) AM_ROM
AM_RANGE(0x10000, 0x17fff) AM_RAM
- AM_RANGE(0x22000, 0x22fff) AM_RAM_WRITE_LEGACY(mosaic_bgvideoram_w) AM_BASE(m_bgvideoram)
- AM_RANGE(0x23000, 0x23fff) AM_RAM_WRITE_LEGACY(mosaic_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x22000, 0x22fff) AM_RAM_WRITE(mosaic_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x23000, 0x23fff) AM_RAM_WRITE(mosaic_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0x24000, 0x241ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index f7c2e3912f3..fc5042644a9 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -69,8 +69,8 @@ static ADDRESS_MAP_START( mouser_map, AS_PROGRAM, 8, mouser_state )
AM_RANGE(0x9800, 0x9cff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x9c00, 0x9fff) AM_RAM AM_BASE(m_colorram)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1") AM_WRITE(mouser_nmi_enable_w) /* bit 0 = NMI Enable */
- AM_RANGE(0xa001, 0xa001) AM_WRITE_LEGACY(mouser_flip_screen_x_w)
- AM_RANGE(0xa002, 0xa002) AM_WRITE_LEGACY(mouser_flip_screen_y_w)
+ AM_RANGE(0xa001, 0xa001) AM_WRITE(mouser_flip_screen_x_w)
+ AM_RANGE(0xa002, 0xa002) AM_WRITE(mouser_flip_screen_y_w)
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("SYSTEM")
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW")
AM_RANGE(0xb800, 0xb800) AM_READ_PORT("P2") AM_WRITE(mouser_sound_interrupt_w) /* byte to sound cpu */
diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c
index ecf28b03f44..e04c9f473c3 100644
--- a/src/mame/drivers/mrdo.c
+++ b/src/mame/drivers/mrdo.c
@@ -42,10 +42,10 @@ READ8_MEMBER(mrdo_state::mrdo_SECRE_r)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, mrdo_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(mrdo_bgvideoram_w) AM_BASE(m_bgvideoram)
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(mrdo_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(mrdo_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(mrdo_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0x9000, 0x90ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x9800, 0x9800) AM_WRITE_LEGACY(mrdo_flipscreen_w) /* screen flip + playfield priority */
+ AM_RANGE(0x9800, 0x9800) AM_WRITE(mrdo_flipscreen_w) /* screen flip + playfield priority */
AM_RANGE(0x9801, 0x9801) AM_DEVWRITE_LEGACY("sn1", sn76496_w)
AM_RANGE(0x9802, 0x9802) AM_DEVWRITE_LEGACY("sn2", sn76496_w)
AM_RANGE(0x9803, 0x9803) AM_READ(mrdo_SECRE_r)
@@ -54,8 +54,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, mrdo_state )
AM_RANGE(0xa002, 0xa002) AM_READ_PORT("DSW1")
AM_RANGE(0xa003, 0xa003) AM_READ_PORT("DSW2")
AM_RANGE(0xe000, 0xefff) AM_RAM
- AM_RANGE(0xf000, 0xf7ff) AM_WRITE_LEGACY(mrdo_scrollx_w)
- AM_RANGE(0xf800, 0xffff) AM_WRITE_LEGACY(mrdo_scrolly_w)
+ AM_RANGE(0xf000, 0xf7ff) AM_WRITE(mrdo_scrollx_w)
+ AM_RANGE(0xf800, 0xffff) AM_WRITE(mrdo_scrolly_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index c0c57aac375..60467c36085 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -161,9 +161,9 @@ WRITE8_MEMBER(mrflea_state::mrflea_data1_w)
static ADDRESS_MAP_START( mrflea_master_map, AS_PROGRAM, 8, mrflea_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(mrflea_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(mrflea_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xe800, 0xe83f) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_SHARE("paletteram")
- AM_RANGE(0xec00, 0xecff) AM_RAM_WRITE_LEGACY(mrflea_spriteram_w) AM_BASE(m_spriteram)
+ AM_RANGE(0xec00, 0xecff) AM_RAM_WRITE(mrflea_spriteram_w) AM_BASE(m_spriteram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mrflea_master_io_map, AS_IO, 8, mrflea_state )
@@ -173,7 +173,7 @@ static ADDRESS_MAP_START( mrflea_master_io_map, AS_IO, 8, mrflea_state )
AM_RANGE(0x41, 0x41) AM_READ(mrflea_main_r)
AM_RANGE(0x42, 0x42) AM_READ(mrflea_main_status_r)
AM_RANGE(0x43, 0x43) AM_WRITENOP /* 0xa6,0x0d,0x05 */
- AM_RANGE(0x60, 0x60) AM_WRITE_LEGACY(mrflea_gfx_bank_w)
+ AM_RANGE(0x60, 0x60) AM_WRITE(mrflea_gfx_bank_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c
index 86ba540f660..cabdb72970d 100644
--- a/src/mame/drivers/mrjong.c
+++ b/src/mame/drivers/mrjong.c
@@ -71,13 +71,13 @@ static ADDRESS_MAP_START( mrjong_map, AS_PROGRAM, 8, mrjong_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa7ff) AM_RAM
- AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE_LEGACY(mrjong_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xe400, 0xe7ff) AM_RAM_WRITE_LEGACY(mrjong_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(mrjong_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe400, 0xe7ff) AM_RAM_WRITE(mrjong_colorram_w) AM_BASE(m_colorram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mrjong_io_map, AS_IO, 8, mrjong_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ_PORT("P2") AM_WRITE_LEGACY(mrjong_flipscreen_w)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("P2") AM_WRITE(mrjong_flipscreen_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_DEVWRITE_LEGACY("sn1", sn76496_w)
AM_RANGE(0x02, 0x02) AM_READ_PORT("DSW") AM_DEVWRITE_LEGACY("sn2", sn76496_w)
AM_RANGE(0x03, 0x03) AM_READ(io_0x03_r) // Unknown
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index 48ed38db7d2..ebd70dda08a 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -365,8 +365,8 @@ static ADDRESS_MAP_START( ms32_map, AS_PROGRAM, 32, ms32_state )
AM_RANGE(0xfce00038, 0xfce0003b) AM_WRITE(reset_sub_w)
AM_RANGE(0xfce00050, 0xfce0005f) AM_WRITENOP // watchdog? I haven't investigated
// AM_RANGE(0xfce00000, 0xfce0007f) AM_WRITEONLY AM_BASE_LEGACY(&ms32_fce00000) /* registers not ram? */
- AM_RANGE(0xfce00000, 0xfce00003) AM_WRITE_LEGACY(ms32_gfxctrl_w) /* flip screen + other unknown bits */
- AM_RANGE(0xfce00280, 0xfce0028f) AM_WRITE_LEGACY(ms32_brightness_w) // global brightness control
+ AM_RANGE(0xfce00000, 0xfce00003) AM_WRITE(ms32_gfxctrl_w) /* flip screen + other unknown bits */
+ AM_RANGE(0xfce00280, 0xfce0028f) AM_WRITE(ms32_brightness_w) // global brightness control
/**/AM_RANGE(0xfce00600, 0xfce0065f) AM_RAM AM_BASE(m_roz_ctrl) /* roz control registers */
/**/AM_RANGE(0xfce00a00, 0xfce00a17) AM_RAM AM_BASE(m_tx_scroll) /* tx layer scroll */
/**/AM_RANGE(0xfce00a20, 0xfce00a37) AM_RAM AM_BASE(m_bg_scroll) /* bg layer scroll */
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index c4fee058d4a..9a75c7c269c 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -175,7 +175,7 @@ static ADDRESS_MAP_START( msisaac_map, AS_PROGRAM, 8, msisaac_state )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_SHARE("paletteram")
- AM_RANGE(0xf000, 0xf000) AM_WRITE_LEGACY(msisaac_bg2_textbank_w)
+ AM_RANGE(0xf000, 0xf000) AM_WRITE(msisaac_bg2_textbank_w)
AM_RANGE(0xf001, 0xf001) AM_WRITENOP //???
AM_RANGE(0xf002, 0xf002) AM_WRITENOP //???
@@ -184,12 +184,12 @@ static ADDRESS_MAP_START( msisaac_map, AS_PROGRAM, 8, msisaac_state )
AM_RANGE(0xf0a3, 0xf0a3) AM_WRITE(ms_unknown_w) //???? written in interrupt routine
- AM_RANGE(0xf0c0, 0xf0c0) AM_WRITE_LEGACY(msisaac_fg_scrollx_w)
- AM_RANGE(0xf0c1, 0xf0c1) AM_WRITE_LEGACY(msisaac_fg_scrolly_w)
- AM_RANGE(0xf0c2, 0xf0c2) AM_WRITE_LEGACY(msisaac_bg2_scrollx_w)
- AM_RANGE(0xf0c3, 0xf0c3) AM_WRITE_LEGACY(msisaac_bg2_scrolly_w)
- AM_RANGE(0xf0c4, 0xf0c4) AM_WRITE_LEGACY(msisaac_bg_scrollx_w)
- AM_RANGE(0xf0c5, 0xf0c5) AM_WRITE_LEGACY(msisaac_bg_scrolly_w)
+ AM_RANGE(0xf0c0, 0xf0c0) AM_WRITE(msisaac_fg_scrollx_w)
+ AM_RANGE(0xf0c1, 0xf0c1) AM_WRITE(msisaac_fg_scrolly_w)
+ AM_RANGE(0xf0c2, 0xf0c2) AM_WRITE(msisaac_bg2_scrollx_w)
+ AM_RANGE(0xf0c3, 0xf0c3) AM_WRITE(msisaac_bg2_scrolly_w)
+ AM_RANGE(0xf0c4, 0xf0c4) AM_WRITE(msisaac_bg_scrollx_w)
+ AM_RANGE(0xf0c5, 0xf0c5) AM_WRITE(msisaac_bg_scrolly_w)
AM_RANGE(0xf0e0, 0xf0e0) AM_READWRITE(msisaac_mcu_r, msisaac_mcu_w)
AM_RANGE(0xf0e1, 0xf0e1) AM_READ(msisaac_mcu_status_r)
@@ -202,9 +202,9 @@ static ADDRESS_MAP_START( msisaac_map, AS_PROGRAM, 8, msisaac_state )
// AM_RANGE(0xf086, 0xf086) AM_READ_PORT("IN2")
AM_RANGE(0xf100, 0xf17f) AM_RAM AM_BASE(m_spriteram) //sprites
- AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE_LEGACY(msisaac_fg_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xf800, 0xfbff) AM_RAM_WRITE_LEGACY(msisaac_bg2_videoram_w) AM_BASE(m_videoram3)
- AM_RANGE(0xfc00, 0xffff) AM_RAM_WRITE_LEGACY(msisaac_bg_videoram_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(msisaac_fg_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xf800, 0xfbff) AM_RAM_WRITE(msisaac_bg2_videoram_w) AM_BASE(m_videoram3)
+ AM_RANGE(0xfc00, 0xffff) AM_RAM_WRITE(msisaac_bg_videoram_w) AM_BASE(m_videoram2)
// AM_RANGE(0xf801, 0xf801) AM_WRITE_LEGACY(msisaac_bgcolor_w)
// AM_RANGE(0xfc00, 0xfc00) AM_WRITE(flip_screen_w)
// AM_RANGE(0xfc03, 0xfc04) AM_WRITE(msisaac_coin_counter_w)
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index f1863fe5e0d..884dd02442f 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -173,9 +173,9 @@ READ16_MEMBER(mugsmash_state::mugsmash_input_ports_r)
static ADDRESS_MAP_START( mugsmash_map, AS_PROGRAM, 16, mugsmash_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE_LEGACY(mugsmash_videoram1_w) AM_BASE(m_videoram1)
- AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE_LEGACY(mugsmash_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x0c0000, 0x0c0007) AM_WRITE_LEGACY(mugsmash_reg_w) AM_BASE(m_regs1) /* video registers*/
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(mugsmash_videoram1_w) AM_BASE(m_videoram1)
+ AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE(mugsmash_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x0c0000, 0x0c0007) AM_WRITE(mugsmash_reg_w) AM_BASE(m_regs1) /* video registers*/
AM_RANGE(0x100000, 0x1005ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x140000, 0x140007) AM_WRITE(mugsmash_reg2_w) AM_BASE(m_regs2) /* sound + ? */
AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM /* main ram? */
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c
index e71c6686e09..acc07f5b002 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -93,13 +93,13 @@ static ADDRESS_MAP_START( mnchmobl_map, AS_PROGRAM, 8, munchmo_state )
AM_RANGE(0xbaba, 0xbaba) AM_WRITENOP /* ? */
AM_RANGE(0xbc00, 0xbc7f) AM_RAM AM_BASE(m_status_vram)
AM_RANGE(0xbe00, 0xbe00) AM_WRITE(mnchmobl_soundlatch_w)
- AM_RANGE(0xbe01, 0xbe01) AM_WRITE_LEGACY(mnchmobl_palette_bank_w)
+ AM_RANGE(0xbe01, 0xbe01) AM_WRITE(mnchmobl_palette_bank_w)
AM_RANGE(0xbe02, 0xbe02) AM_READ_PORT("DSW1")
AM_RANGE(0xbe03, 0xbe03) AM_READ_PORT("DSW2")
AM_RANGE(0xbe11, 0xbe11) AM_WRITENOP /* ? */
AM_RANGE(0xbe21, 0xbe21) AM_WRITENOP /* ? */
AM_RANGE(0xbe31, 0xbe31) AM_WRITENOP /* ? */
- AM_RANGE(0xbe41, 0xbe41) AM_WRITE_LEGACY(mnchmobl_flipscreen_w)
+ AM_RANGE(0xbe41, 0xbe41) AM_WRITE(mnchmobl_flipscreen_w)
AM_RANGE(0xbe61, 0xbe61) AM_WRITE(mnchmobl_nmi_enable_w) /* ENI 1-10C */
AM_RANGE(0xbf00, 0xbf07) AM_WRITEONLY AM_BASE(m_vreg) /* MY0 1-8C */
AM_RANGE(0xbf01, 0xbf01) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c
index 3a8d74199f4..9aef890235d 100644
--- a/src/mame/drivers/mustache.c
+++ b/src/mame/drivers/mustache.c
@@ -45,7 +45,7 @@ YM2151:
static ADDRESS_MAP_START( memmap, AS_PROGRAM, 8, mustache_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE_LEGACY(mustache_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(mustache_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xd000, 0xd000) AM_WRITE_LEGACY(t5182_sound_irq_w)
AM_RANGE(0xd001, 0xd001) AM_READ_LEGACY(t5182_sharedram_semaphore_snd_r)
AM_RANGE(0xd002, 0xd002) AM_WRITE_LEGACY(t5182_sharedram_semaphore_main_acquire_w)
@@ -56,8 +56,8 @@ static ADDRESS_MAP_START( memmap, AS_PROGRAM, 8, mustache_state )
AM_RANGE(0xd802, 0xd802) AM_READ_PORT("START")
AM_RANGE(0xd803, 0xd803) AM_READ_PORT("DSWA")
AM_RANGE(0xd804, 0xd804) AM_READ_PORT("DSWB")
- AM_RANGE(0xd806, 0xd806) AM_WRITE_LEGACY(mustache_scroll_w)
- AM_RANGE(0xd807, 0xd807) AM_WRITE_LEGACY(mustache_video_control_w)
+ AM_RANGE(0xd806, 0xd806) AM_WRITE(mustache_scroll_w)
+ AM_RANGE(0xd807, 0xd807) AM_WRITE(mustache_video_control_w)
AM_RANGE(0xe800, 0xefff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c
index 35c53a14bae..15a26ff2ec9 100644
--- a/src/mame/drivers/mystston.c
+++ b/src/mame/drivers/mystston.c
@@ -104,7 +104,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, mystston_state )
AM_RANGE(0x07e0, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x17ff) AM_RAM AM_BASE(m_fg_videoram)
AM_RANGE(0x1800, 0x1fff) AM_RAM AM_BASE(m_bg_videoram)
- AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x1f8f) AM_READ_PORT("IN0") AM_WRITE_LEGACY(mystston_video_control_w) AM_BASE(m_video_control)
+ AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x1f8f) AM_READ_PORT("IN0") AM_WRITE(mystston_video_control_w) AM_BASE(m_video_control)
AM_RANGE(0x2010, 0x2010) AM_MIRROR(0x1f8f) AM_READ_PORT("IN1") AM_WRITE(irq_clear_w)
AM_RANGE(0x2020, 0x2020) AM_MIRROR(0x1f8f) AM_READ_PORT("DSW0") AM_WRITEONLY AM_BASE(m_scroll)
AM_RANGE(0x2030, 0x2030) AM_MIRROR(0x1f8f) AM_READ_PORT("DSW1") AM_WRITEONLY AM_BASE(m_ay8910_data)
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index c70dd292673..523feb489d1 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -339,7 +339,7 @@ static ADDRESS_MAP_START( viostorm_map, AS_PROGRAM, 16, mystwarr_state )
AM_RANGE(0x250000, 0x25000f) AM_RAM // K053250 reg
AM_RANGE(0x254000, 0x25401f) AM_WRITE_LEGACY(K054338_word_w)
AM_RANGE(0x258000, 0x2580ff) AM_WRITE_LEGACY(K055555_word_w)
- AM_RANGE(0x25c000, 0x25c03f) AM_READWRITE_LEGACY(K055550_word_r,K055550_word_w)
+ AM_RANGE(0x25c000, 0x25c03f) AM_READWRITE(K055550_word_r,K055550_word_w)
AM_RANGE(0x260000, 0x26001f) AM_DEVREADWRITE8_LEGACY("k053252",k053252_r,k053252_w,0x00ff)
AM_RANGE(0x264000, 0x264001) AM_WRITE(sound_irq_w)
AM_RANGE(0x26800c, 0x26800d) AM_WRITE(sound_cmd1_w)
@@ -430,7 +430,7 @@ static ADDRESS_MAP_START( martchmp_map, AS_PROGRAM, 16, mystwarr_state )
AM_RANGE(0x404000, 0x404007) AM_WRITE_LEGACY(K053246_word_w) // OBJSET1
AM_RANGE(0x40a000, 0x40a01f) AM_WRITE_LEGACY(K054338_word_w) // CLTC
AM_RANGE(0x40c000, 0x40c03f) AM_WRITE_LEGACY(K056832_word_w) // VACSET
- AM_RANGE(0x40e000, 0x40e03f) AM_WRITE_LEGACY(K053990_martchmp_word_w) // protection
+ AM_RANGE(0x40e000, 0x40e03f) AM_WRITE(K053990_martchmp_word_w) // protection
AM_RANGE(0x410000, 0x410001) AM_WRITE(mweeprom_w)
AM_RANGE(0x412000, 0x412001) AM_READWRITE(mccontrol_r,mccontrol_w)
AM_RANGE(0x414000, 0x414001) AM_READ_PORT("P1_P2")
@@ -475,7 +475,7 @@ static ADDRESS_MAP_START( dadandrn_map, AS_PROGRAM, 16, mystwarr_state )
AM_RANGE(0x470000, 0x470fff) AM_RAM AM_BASE_LEGACY(&K053936_0_linectrl)
AM_RANGE(0x480000, 0x48003f) AM_WRITE_LEGACY(K056832_word_w) // VACSET
AM_RANGE(0x482000, 0x482007) AM_WRITE_LEGACY(K056832_b_word_w) // VSCCS
- AM_RANGE(0x484000, 0x484003) AM_WRITE_LEGACY(ddd_053936_clip_w)
+ AM_RANGE(0x484000, 0x484003) AM_WRITE(ddd_053936_clip_w)
AM_RANGE(0x486000, 0x48601f) AM_DEVREADWRITE8_LEGACY("k053252",k053252_r,k053252_w,0x00ff)
AM_RANGE(0x488000, 0x4880ff) AM_WRITE_LEGACY(K055555_word_w)
AM_RANGE(0x48a00c, 0x48a00d) AM_WRITE(sound_cmd1_msb_w)
@@ -486,13 +486,13 @@ static ADDRESS_MAP_START( dadandrn_map, AS_PROGRAM, 16, mystwarr_state )
AM_RANGE(0x48e000, 0x48e001) AM_READ_PORT("IN0_P1") // bit 3 (0x8) is test switch
AM_RANGE(0x48e020, 0x48e021) AM_READ(dddeeprom_r)
AM_RANGE(0x600000, 0x60ffff) AM_RAM AM_BASE(m_gx_workram)
- AM_RANGE(0x680000, 0x68003f) AM_READWRITE_LEGACY(K055550_word_r,K055550_word_w)
+ AM_RANGE(0x680000, 0x68003f) AM_READWRITE(K055550_word_r,K055550_word_w)
AM_RANGE(0x6a0000, 0x6a0001) AM_WRITE(mmeeprom_w)
- AM_RANGE(0x6c0000, 0x6c0001) AM_WRITE_LEGACY(ddd_053936_enable_w)
+ AM_RANGE(0x6c0000, 0x6c0001) AM_WRITE(ddd_053936_enable_w)
AM_RANGE(0x6e0000, 0x6e0001) AM_WRITE(sound_irq_w)
- AM_RANGE(0x800000, 0x87ffff) AM_READ_LEGACY(ddd_053936_tilerom_0_r) // 256k tilemap readback
- AM_RANGE(0xa00000, 0xa7ffff) AM_READ_LEGACY(ddd_053936_tilerom_1_r) // 128k tilemap readback
- AM_RANGE(0xc00000, 0xdfffff) AM_READ_LEGACY(ddd_053936_tilerom_2_r) // tile character readback
+ AM_RANGE(0x800000, 0x87ffff) AM_READ(ddd_053936_tilerom_0_r) // 256k tilemap readback
+ AM_RANGE(0xa00000, 0xa7ffff) AM_READ(ddd_053936_tilerom_1_r) // 128k tilemap readback
+ AM_RANGE(0xc00000, 0xdfffff) AM_READ(ddd_053936_tilerom_2_r) // tile character readback
AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // watchdog
#if MW_DEBUG
AM_RANGE(0x430000, 0x430007) AM_READ_LEGACY(K053246_reg_word_r)
@@ -522,7 +522,7 @@ static ADDRESS_MAP_START( gaiapols_map, AS_PROGRAM, 16, mystwarr_state )
AM_RANGE(0x470000, 0x470fff) AM_RAM AM_BASE_LEGACY(&K053936_0_linectrl)
AM_RANGE(0x480000, 0x48003f) AM_WRITE_LEGACY(K056832_word_w) // VACSET
AM_RANGE(0x482000, 0x482007) AM_WRITE_LEGACY(K056832_b_word_w) // VSCCS
- AM_RANGE(0x484000, 0x484003) AM_WRITE_LEGACY(ddd_053936_clip_w)
+ AM_RANGE(0x484000, 0x484003) AM_WRITE(ddd_053936_clip_w)
AM_RANGE(0x486000, 0x48601f) AM_DEVREADWRITE8_LEGACY("k053252",k053252_r,k053252_w,0x00ff)
AM_RANGE(0x488000, 0x4880ff) AM_WRITE_LEGACY(K055555_word_w)
AM_RANGE(0x48a00c, 0x48a00d) AM_WRITE(sound_cmd1_msb_w)
@@ -535,11 +535,11 @@ static ADDRESS_MAP_START( gaiapols_map, AS_PROGRAM, 16, mystwarr_state )
AM_RANGE(0x600000, 0x60ffff) AM_RAM AM_BASE(m_gx_workram)
AM_RANGE(0x660000, 0x6600ff) AM_READWRITE_LEGACY(K054000_lsb_r,K054000_lsb_w)
AM_RANGE(0x6a0000, 0x6a0001) AM_WRITE(mmeeprom_w)
- AM_RANGE(0x6c0000, 0x6c0001) AM_WRITE_LEGACY(ddd_053936_enable_w)
+ AM_RANGE(0x6c0000, 0x6c0001) AM_WRITE(ddd_053936_enable_w)
AM_RANGE(0x6e0000, 0x6e0001) AM_WRITE(sound_irq_w)
- AM_RANGE(0x800000, 0x87ffff) AM_READ_LEGACY(gai_053936_tilerom_0_r) // 256k tilemap readback
- AM_RANGE(0xa00000, 0xa7ffff) AM_READ_LEGACY(ddd_053936_tilerom_1_r) // 128k tilemap readback
- AM_RANGE(0xc00000, 0xdfffff) AM_READ_LEGACY(gai_053936_tilerom_2_r) // tile character readback
+ AM_RANGE(0x800000, 0x87ffff) AM_READ(gai_053936_tilerom_0_r) // 256k tilemap readback
+ AM_RANGE(0xa00000, 0xa7ffff) AM_READ(ddd_053936_tilerom_1_r) // 128k tilemap readback
+ AM_RANGE(0xc00000, 0xdfffff) AM_READ(gai_053936_tilerom_2_r) // tile character readback
AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // watchdog
#if MW_DEBUG
AM_RANGE(0x430000, 0x430007) AM_READ_LEGACY(K053246_reg_word_r)
diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c
index c9e8a74f9f8..e6b0d32ffff 100644
--- a/src/mame/drivers/n8080.c
+++ b/src/mame/drivers/n8080.c
@@ -57,7 +57,7 @@ static ADDRESS_MAP_START( main_io_map, AS_IO, 8, n8080_state )
AM_RANGE(0x03, 0x03) AM_WRITE(n8080_shift_data_w)
AM_RANGE(0x04, 0x04) AM_WRITE_LEGACY(n8080_sound_1_w)
AM_RANGE(0x05, 0x05) AM_WRITE_LEGACY(n8080_sound_2_w)
- AM_RANGE(0x06, 0x06) AM_WRITE_LEGACY(n8080_video_control_w)
+ AM_RANGE(0x06, 0x06) AM_WRITE(n8080_video_control_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c
index ef7eb5b8192..55dd8a94615 100644
--- a/src/mame/drivers/namcofl.c
+++ b/src/mame/drivers/namcofl.c
@@ -229,7 +229,7 @@ static ADDRESS_MAP_START( namcofl_mem, AS_PROGRAM, 32, namcofl_state )
AM_RANGE(0x10000000, 0x100fffff) AM_RAMBANK("bank2")
AM_RANGE(0x20000000, 0x201fffff) AM_ROM AM_REGION("user1", 0) /* data */
AM_RANGE(0x30000000, 0x30001fff) AM_RAM AM_SHARE("nvram") /* nvram */
- AM_RANGE(0x30100000, 0x30100003) AM_WRITE_LEGACY(namcofl_spritebank_w)
+ AM_RANGE(0x30100000, 0x30100003) AM_WRITE(namcofl_spritebank_w)
AM_RANGE(0x30284000, 0x3028bfff) AM_READWRITE(namcofl_share_r, namcofl_share_w)
AM_RANGE(0x30300000, 0x30303fff) AM_RAM /* COMRAM */
AM_RANGE(0x30380000, 0x303800ff) AM_READ(fl_network_r ) /* network registers */
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index 81bde2fe360..ca73c437828 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -516,15 +516,15 @@ static int transfer_dword( running_machine &machine, UINT32 dest, UINT32 source
}
if( dest>=0xf00000 && dest<0xf02000 )
{
- namcona1_paletteram_w(space, (dest-0xf00000)/2, data, 0xffff );
+ state->namcona1_paletteram_w(*space, (dest-0xf00000)/2, data, 0xffff );
}
else if( dest>=0xf40000 && dest<0xf80000 )
{
- namcona1_gfxram_w(space, (dest-0xf40000)/2, data, 0xffff );
+ state->namcona1_gfxram_w(*space, (dest-0xf40000)/2, data, 0xffff );
}
else if( dest>=0xff0000 && dest<0xffc000 )
{
- namcona1_videoram_w(space, (dest-0xff0000)/2, data, 0xffff );
+ state->namcona1_videoram_w(*space, (dest-0xff0000)/2, data, 0xffff );
}
else if( dest>=0xfff000 && dest<0x1000000 )
{
@@ -745,9 +745,9 @@ static ADDRESS_MAP_START( namcona1_main_map, AS_PROGRAM, 16, namcona1_state )
AM_RANGE(0xe00000, 0xe00fff) AM_READWRITE(namcona1_nvram_r, namcona1_nvram_w)
AM_RANGE(0xe40000, 0xe4000f) AM_READWRITE(custom_key_r, custom_key_w)
AM_RANGE(0xefff00, 0xefffff) AM_READWRITE(namcona1_vreg_r, namcona1_vreg_w) AM_BASE(m_vreg)
- AM_RANGE(0xf00000, 0xf01fff) AM_READWRITE_LEGACY(namcona1_paletteram_r, namcona1_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0xf40000, 0xf7ffff) AM_READWRITE_LEGACY(namcona1_gfxram_r, namcona1_gfxram_w)
- AM_RANGE(0xff0000, 0xffbfff) AM_READWRITE_LEGACY(namcona1_videoram_r, namcona1_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xf00000, 0xf01fff) AM_READWRITE(namcona1_paletteram_r, namcona1_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf40000, 0xf7ffff) AM_READWRITE(namcona1_gfxram_r, namcona1_gfxram_w)
+ AM_RANGE(0xff0000, 0xffbfff) AM_READWRITE(namcona1_videoram_r, namcona1_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM /* unknown */
AM_RANGE(0xffe000, 0xffefff) AM_RAM AM_BASE(m_scroll) /* scroll registers */
AM_RANGE(0xfff000, 0xffffff) AM_RAM AM_BASE(m_spriteram) /* spriteram */
@@ -767,9 +767,9 @@ static ADDRESS_MAP_START( namcona2_main_map, AS_PROGRAM, 16, namcona1_state )
/* xday: additional battery-backed ram at 00E024FA? */
AM_RANGE(0xe40000, 0xe4000f) AM_READWRITE(custom_key_r, custom_key_w)
AM_RANGE(0xefff00, 0xefffff) AM_READWRITE(namcona1_vreg_r, namcona1_vreg_w) AM_BASE(m_vreg)
- AM_RANGE(0xf00000, 0xf01fff) AM_READWRITE_LEGACY(namcona1_paletteram_r, namcona1_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0xf40000, 0xf7ffff) AM_READWRITE_LEGACY(namcona1_gfxram_r, namcona1_gfxram_w)
- AM_RANGE(0xff0000, 0xffbfff) AM_READWRITE_LEGACY(namcona1_videoram_r, namcona1_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xf00000, 0xf01fff) AM_READWRITE(namcona1_paletteram_r, namcona1_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf40000, 0xf7ffff) AM_READWRITE(namcona1_gfxram_r, namcona1_gfxram_w)
+ AM_RANGE(0xff0000, 0xffbfff) AM_READWRITE(namcona1_videoram_r, namcona1_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM /* unknown */
AM_RANGE(0xffe000, 0xffefff) AM_RAM AM_BASE(m_scroll) /* scroll registers */
AM_RANGE(0xfff000, 0xffffff) AM_RAM AM_BASE(m_spriteram) /* spriteram */
diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c
index 0cfc6323d31..58b1e14efa7 100644
--- a/src/mame/drivers/namcond1.c
+++ b/src/mame/drivers/namcond1.c
@@ -78,13 +78,13 @@ Notes:
static ADDRESS_MAP_START( namcond1_map, AS_PROGRAM, 16, namcond1_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
- AM_RANGE(0x400000, 0x40ffff) AM_READWRITE_LEGACY(namcond1_shared_ram_r,namcond1_shared_ram_w) AM_BASE(m_shared_ram)
+ AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(namcond1_shared_ram_r,namcond1_shared_ram_w) AM_BASE(m_shared_ram)
AM_RANGE(0x800000, 0x80000f) AM_READWRITE_LEGACY(ygv608_r,ygv608_w)
AM_RANGE(0xa00000, 0xa00fff) AM_DEVREADWRITE8_LEGACY("at28c16", at28c16_r, at28c16_w, 0xff00)
#ifdef MAME_DEBUG
AM_RANGE(0xb00000, 0xb00001) AM_READ_LEGACY(ygv608_debug_trigger)
#endif
- AM_RANGE(0xc3ff00, 0xc3ffff) AM_READWRITE_LEGACY(namcond1_cuskey_r,namcond1_cuskey_w)
+ AM_RANGE(0xc3ff00, 0xc3ffff) AM_READWRITE(namcond1_cuskey_r,namcond1_cuskey_w)
ADDRESS_MAP_END
/*************************************************************/
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index a3eadf747ac..e530e84bcfb 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -433,14 +433,14 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, namcos1_state )
AM_RANGE(0x8000, 0x9fff) AM_RAMBANK("bank5")
AM_RANGE(0xa000, 0xbfff) AM_RAMBANK("bank6")
AM_RANGE(0xc000, 0xdfff) AM_RAMBANK("bank7")
- AM_RANGE(0xe000, 0xefff) AM_WRITE_LEGACY(namcos1_bankswitch_w)
- AM_RANGE(0xf000, 0xf000) AM_WRITE_LEGACY(namcos1_cpu_control_w)
- AM_RANGE(0xf200, 0xf200) AM_WRITE_LEGACY(namcos1_watchdog_w)
+ AM_RANGE(0xe000, 0xefff) AM_WRITE(namcos1_bankswitch_w)
+ AM_RANGE(0xf000, 0xf000) AM_WRITE(namcos1_cpu_control_w)
+ AM_RANGE(0xf200, 0xf200) AM_WRITE(namcos1_watchdog_w)
// AM_RANGE(0xf400, 0xf400) AM_WRITENOP // unknown
AM_RANGE(0xf600, 0xf600) AM_WRITE(irq_ack_w)
AM_RANGE(0xf800, 0xf800) AM_WRITE(firq_ack_w)
AM_RANGE(0xfa00, 0xfa00) AM_WRITE(namcos1_sub_firq_w) // asserts FIRQ on CPU1
- AM_RANGE(0xfc00, 0xfc01) AM_WRITE_LEGACY(namcos1_subcpu_bank_w)
+ AM_RANGE(0xfc00, 0xfc01) AM_WRITE(namcos1_subcpu_bank_w)
AM_RANGE(0xe000, 0xffff) AM_ROMBANK("bank8")
ADDRESS_MAP_END
@@ -453,9 +453,9 @@ static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8, namcos1_state )
AM_RANGE(0x8000, 0x9fff) AM_RAMBANK("bank13")
AM_RANGE(0xa000, 0xbfff) AM_RAMBANK("bank14")
AM_RANGE(0xc000, 0xdfff) AM_RAMBANK("bank15")
- AM_RANGE(0xe000, 0xefff) AM_WRITE_LEGACY(namcos1_bankswitch_w)
+ AM_RANGE(0xe000, 0xefff) AM_WRITE(namcos1_bankswitch_w)
// AM_RANGE(0xf000, 0xf000) AM_WRITENOP // IO Chip
- AM_RANGE(0xf200, 0xf200) AM_WRITE_LEGACY(namcos1_watchdog_w)
+ AM_RANGE(0xf200, 0xf200) AM_WRITE(namcos1_watchdog_w)
// AM_RANGE(0xf400, 0xf400) AM_WRITENOP // ?
AM_RANGE(0xf600, 0xf600) AM_WRITE(irq_ack_w)
AM_RANGE(0xf800, 0xf800) AM_WRITE(firq_ack_w)
@@ -470,8 +470,8 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, namcos1_state )
AM_RANGE(0x5000, 0x53ff) AM_DEVREADWRITE_LEGACY("namco", namcos1_cus30_r, namcos1_cus30_w) AM_MIRROR(0x400) /* PSG ( Shared ) */
AM_RANGE(0x7000, 0x77ff) AM_RAMBANK("bank18") /* TRIRAM (shared) */
AM_RANGE(0x8000, 0x9fff) AM_RAM /* Sound RAM 3 */
- AM_RANGE(0xc000, 0xc001) AM_WRITE_LEGACY(namcos1_sound_bankswitch_w) /* ROM bank selector */
- AM_RANGE(0xd001, 0xd001) AM_WRITE_LEGACY(namcos1_watchdog_w)
+ AM_RANGE(0xc000, 0xc001) AM_WRITE(namcos1_sound_bankswitch_w) /* ROM bank selector */
+ AM_RANGE(0xd001, 0xd001) AM_WRITE(namcos1_watchdog_w)
AM_RANGE(0xe000, 0xe000) AM_WRITE(irq_ack_w)
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -484,12 +484,12 @@ static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8, namcos1_state )
AM_RANGE(0x1400, 0x1400) AM_READ_PORT("CONTROL0")
AM_RANGE(0x1401, 0x1401) AM_READ_PORT("CONTROL1")
AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank20") /* banked ROM */
- AM_RANGE(0xc000, 0xc000) AM_WRITE_LEGACY(namcos1_mcu_patch_w) /* kludge! see notes */
+ AM_RANGE(0xc000, 0xc000) AM_WRITE(namcos1_mcu_patch_w) /* kludge! see notes */
AM_RANGE(0xc000, 0xc7ff) AM_RAMBANK("bank19") /* TRIRAM (shared) */
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("nvram") /* EEPROM */
AM_RANGE(0xd000, 0xd000) AM_WRITE(namcos1_dac0_w)
AM_RANGE(0xd400, 0xd400) AM_WRITE(namcos1_dac1_w)
- AM_RANGE(0xd800, 0xd800) AM_WRITE_LEGACY(namcos1_mcu_bankswitch_w) /* ROM bank selector */
+ AM_RANGE(0xd800, 0xd800) AM_WRITE(namcos1_mcu_bankswitch_w) /* ROM bank selector */
AM_RANGE(0xf000, 0xf000) AM_WRITE(irq_ack_w)
AM_RANGE(0xf000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index 05426abbfbb..b2e2d695e88 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -1351,14 +1351,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( am_gpu_winrun, AS_PROGRAM, 16, namcos21_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x100000, 0x100001) AM_READWRITE_LEGACY(winrun_gpu_color_r,winrun_gpu_color_w) /* ? */
+ AM_RANGE(0x100000, 0x100001) AM_READWRITE(winrun_gpu_color_r,winrun_gpu_color_w) /* ? */
AM_RANGE(0x180000, 0x19ffff) AM_RAM /* work RAM */
AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_gpu_C148_r,namcos2_68k_gpu_C148_w)
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE(m_winrun_gpucomram )
AM_RANGE(0x400000, 0x41ffff) AM_READWRITE(paletteram16_r,paletteram16_w) AM_SHARE("paletteram")
AM_RANGE(0x600000, 0x6fffff) AM_READ(gpu_data_r)
- AM_RANGE(0xc00000, 0xcfffff) AM_READWRITE_LEGACY(winrun_gpu_videoram_r,winrun_gpu_videoram_w)
- AM_RANGE(0xd00000, 0xd0000f) AM_READWRITE_LEGACY(winrun_gpu_register_r,winrun_gpu_register_w)
+ AM_RANGE(0xc00000, 0xcfffff) AM_READWRITE(winrun_gpu_videoram_r,winrun_gpu_videoram_w)
+ AM_RANGE(0xd00000, 0xd0000f) AM_READWRITE(winrun_gpu_register_r,winrun_gpu_register_w)
// AM_RANGE(0xe0000c, 0xe0000d) POSIRQ
ADDRESS_MAP_END
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index 08c2c0dba82..80b6040267f 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -1805,7 +1805,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( master_dsp_data, AS_DATA, 16, namcos22_state )
AM_RANGE(0x1000, 0x3fff) AM_RAM
AM_RANGE(0x4000, 0x7fff) AM_READ_LEGACY(master_external_ram_r) AM_WRITE_LEGACY(master_external_ram_w)
- AM_RANGE(0x8000, 0xffff) AM_READ_LEGACY(namcos22_dspram16_r) AM_WRITE_LEGACY(namcos22_dspram16_w)
+ AM_RANGE(0x8000, 0xffff) AM_READ(namcos22_dspram16_r) AM_WRITE(namcos22_dspram16_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( master_dsp_io, AS_IO, 16, namcos22_state )
@@ -1820,7 +1820,7 @@ static ADDRESS_MAP_START( master_dsp_io, AS_IO, 16, namcos22_state )
AM_RANGE(0xa,0xa) AM_WRITE_LEGACY(dsp_unk_porta_w)
AM_RANGE(0xb,0xb) AM_WRITENOP /* RINT-related? */
AM_RANGE(0xc,0xc) AM_WRITE_LEGACY(master_render_device_w)
- AM_RANGE(0xd,0xd) AM_WRITE_LEGACY(namcos22_dspram16_bank_w)
+ AM_RANGE(0xd,0xd) AM_WRITE(namcos22_dspram16_bank_w)
AM_RANGE(0xe,0xe) AM_WRITE_LEGACY(dsp_led_w)
AM_RANGE(0xf,0xf) AM_WRITENOP AM_READ_LEGACY(dsp_upload_status_r)
AM_RANGE(TMS32025_HOLD, TMS32025_HOLD) AM_READ_LEGACY(dsp_HOLD_signal_r)
@@ -2559,19 +2559,19 @@ static ADDRESS_MAP_START( namcos22s_am, AS_PROGRAM, 32, namcos22_state )
AM_RANGE(0x700000, 0x70001f) AM_READWRITE_LEGACY(namcos22_system_controller_r, namcos22s_system_controller_w) AM_BASE(m_system_controller)
AM_RANGE(0x800000, 0x800003) AM_WRITE_LEGACY(namcos22s_chipselect_w)
AM_RANGE(0x810000, 0x81000f) AM_RAM AM_BASE(m_czattr)
- AM_RANGE(0x810200, 0x8103ff) AM_READWRITE_LEGACY(namcos22s_czram_r, namcos22s_czram_w)
+ AM_RANGE(0x810200, 0x8103ff) AM_READWRITE(namcos22s_czram_r, namcos22s_czram_w)
AM_RANGE(0x820000, 0x8202ff) AM_WRITENOP /* leftover of old (non-super) video mixer device */
- AM_RANGE(0x824000, 0x8243ff) AM_READWRITE_LEGACY(namcos22_gamma_r, namcos22_gamma_w) AM_BASE(m_gamma)
- AM_RANGE(0x828000, 0x83ffff) AM_READWRITE_LEGACY(namcos22_paletteram_r, namcos22_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0x860000, 0x860007) AM_READWRITE_LEGACY(namcos22s_spotram_r, namcos22s_spotram_w)
- AM_RANGE(0x880000, 0x89dfff) AM_READWRITE_LEGACY(namcos22_cgram_r, namcos22_cgram_w) AM_BASE(m_cgram)
- AM_RANGE(0x89e000, 0x89ffff) AM_READWRITE_LEGACY(namcos22_textram_r, namcos22_textram_w) AM_BASE(m_textram)
- AM_RANGE(0x8a0000, 0x8a000f) AM_READWRITE_LEGACY(namcos22_tilemapattr_r, namcos22_tilemapattr_w) AM_BASE(m_tilemapattr)
+ AM_RANGE(0x824000, 0x8243ff) AM_READWRITE(namcos22_gamma_r, namcos22_gamma_w) AM_BASE(m_gamma)
+ AM_RANGE(0x828000, 0x83ffff) AM_READWRITE(namcos22_paletteram_r, namcos22_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x860000, 0x860007) AM_READWRITE(namcos22s_spotram_r, namcos22s_spotram_w)
+ AM_RANGE(0x880000, 0x89dfff) AM_READWRITE(namcos22_cgram_r, namcos22_cgram_w) AM_BASE(m_cgram)
+ AM_RANGE(0x89e000, 0x89ffff) AM_READWRITE(namcos22_textram_r, namcos22_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x8a0000, 0x8a000f) AM_READWRITE(namcos22_tilemapattr_r, namcos22_tilemapattr_w) AM_BASE(m_tilemapattr)
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_BASE(m_vics_data)
- AM_RANGE(0x940000, 0x94007f) AM_READWRITE_LEGACY(namcos22s_vics_control_r, namcos22s_vics_control_w) AM_BASE(m_vics_control)
+ AM_RANGE(0x940000, 0x94007f) AM_READWRITE(namcos22s_vics_control_r, namcos22s_vics_control_w) AM_BASE(m_vics_control)
AM_RANGE(0x980000, 0x9affff) AM_RAM AM_BASE(m_spriteram) /* C374 */
AM_RANGE(0xa04000, 0xa0bfff) AM_READWRITE_LEGACY(namcos22_mcuram_r, namcos22_mcuram_w) AM_BASE(m_shareram) /* COM RAM */
- AM_RANGE(0xc00000, 0xc1ffff) AM_READWRITE_LEGACY(namcos22_dspram_r, namcos22_dspram_w) AM_BASE(m_polygonram)
+ AM_RANGE(0xc00000, 0xc1ffff) AM_READWRITE(namcos22_dspram_r, namcos22_dspram_w) AM_BASE(m_polygonram)
AM_RANGE(0xe00000, 0xe3ffff) AM_RAM /* workram */
ADDRESS_MAP_END
@@ -3179,7 +3179,7 @@ static ADDRESS_MAP_START( namcos22_am, AS_PROGRAM, 32, namcos22_state )
* Known chip type: TC55328P-25, N341256P-15
* Notes: connected bits = 0x00ffffff (24bit)
*/
- AM_RANGE(0x70000000, 0x7001ffff) AM_READWRITE_LEGACY(namcos22_dspram_r, namcos22_dspram_w) AM_BASE(m_polygonram)
+ AM_RANGE(0x70000000, 0x7001ffff) AM_READWRITE(namcos22_dspram_r, namcos22_dspram_w) AM_BASE(m_polygonram)
/**
* LED on PCB(?)
@@ -3198,13 +3198,13 @@ static ADDRESS_MAP_START( namcos22_am, AS_PROGRAM, 32, namcos22_state )
* Mounted position: VIDEO 7D (C305)
* Notes: Boot time check: 0x90020100 - 0x9002027f
*/
- AM_RANGE(0x90020000, 0x90027fff) AM_READWRITE_LEGACY(namcos22_gamma_r, namcos22_gamma_w) AM_BASE(m_gamma)
+ AM_RANGE(0x90020000, 0x90027fff) AM_READWRITE(namcos22_gamma_r, namcos22_gamma_w) AM_BASE(m_gamma)
/**
* Mounted position: VIDEO 6B, 7B, 8B (near C305)
* Note: 0xff00-0xffff are for Tilemap (16 x 16)
*/
- AM_RANGE(0x90028000, 0x9003ffff) AM_READWRITE_LEGACY(namcos22_paletteram_r, namcos22_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x90028000, 0x9003ffff) AM_READWRITE(namcos22_paletteram_r, namcos22_paletteram_w) AM_SHARE("paletteram")
/**
* unknown (option)
@@ -3215,7 +3215,7 @@ static ADDRESS_MAP_START( namcos22_am, AS_PROGRAM, 32, namcos22_state )
/**
* Tilemap PCG Memory
*/
- AM_RANGE(0x90080000, 0x9009dfff) AM_READWRITE_LEGACY(namcos22_cgram_r, namcos22_cgram_w) AM_BASE(m_cgram)
+ AM_RANGE(0x90080000, 0x9009dfff) AM_READWRITE(namcos22_cgram_r, namcos22_cgram_w) AM_BASE(m_cgram)
/**
* Tilemap Memory (64 x 64)
@@ -3223,13 +3223,13 @@ static ADDRESS_MAP_START( namcos22_am, AS_PROGRAM, 32, namcos22_state )
* Known chip type: HM511664 (64k x 16bit SRAM)
* Note: Self test: 90084000 - 9009ffff
*/
- AM_RANGE(0x9009e000, 0x9009ffff) AM_READWRITE_LEGACY(namcos22_textram_r, namcos22_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x9009e000, 0x9009ffff) AM_READWRITE(namcos22_textram_r, namcos22_textram_w) AM_BASE(m_textram)
/**
* Tilemap Register
* Mounted position: unknown
*/
- AM_RANGE(0x900a0000, 0x900a000f) AM_READWRITE_LEGACY(namcos22_tilemapattr_r, namcos22_tilemapattr_w) AM_BASE(m_tilemapattr)
+ AM_RANGE(0x900a0000, 0x900a000f) AM_READWRITE(namcos22_tilemapattr_r, namcos22_tilemapattr_w) AM_BASE(m_tilemapattr)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index a6add889cfe..5e84f8f7c7d 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -332,12 +332,12 @@ static MACHINE_RESET( namco86 )
static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8, namcos86_state )
- AM_RANGE(0x0000, 0x1fff) AM_READWRITE_LEGACY(rthunder_videoram1_r,rthunder_videoram1_w) AM_BASE(m_rthunder_videoram1)
- AM_RANGE(0x2000, 0x3fff) AM_READWRITE_LEGACY(rthunder_videoram2_r,rthunder_videoram2_w) AM_BASE(m_rthunder_videoram2)
+ AM_RANGE(0x0000, 0x1fff) AM_READWRITE(rthunder_videoram1_r,rthunder_videoram1_w) AM_BASE(m_rthunder_videoram1)
+ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(rthunder_videoram2_r,rthunder_videoram2_w) AM_BASE(m_rthunder_videoram2)
AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE_LEGACY("namco", namcos1_cus30_r, namcos1_cus30_w) /* PSG device, shared RAM */
- AM_RANGE(0x4000, 0x5fff) AM_READWRITE_LEGACY(rthunder_spriteram_r,rthunder_spriteram_w)
+ AM_RANGE(0x4000, 0x5fff) AM_READWRITE(rthunder_spriteram_r,rthunder_spriteram_w)
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
@@ -347,25 +347,25 @@ static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8, namcos86_state )
AM_RANGE(0x8000, 0x8000) AM_WRITE(watchdog1_w)
AM_RANGE(0x8400, 0x8400) AM_WRITE(int_ack1_w) /* IRQ acknowledge */
- AM_RANGE(0x8800, 0x8fff) AM_WRITE_LEGACY(rthunder_tilebank_select_w)
+ AM_RANGE(0x8800, 0x8fff) AM_WRITE(rthunder_tilebank_select_w)
- AM_RANGE(0x9000, 0x9002) AM_WRITE_LEGACY(rthunder_scroll0_w) /* scroll + priority */
+ AM_RANGE(0x9000, 0x9002) AM_WRITE(rthunder_scroll0_w) /* scroll + priority */
AM_RANGE(0x9003, 0x9003) AM_WRITE(bankswitch1_w)
- AM_RANGE(0x9004, 0x9006) AM_WRITE_LEGACY(rthunder_scroll1_w) /* scroll + priority */
+ AM_RANGE(0x9004, 0x9006) AM_WRITE(rthunder_scroll1_w) /* scroll + priority */
- AM_RANGE(0x9400, 0x9402) AM_WRITE_LEGACY(rthunder_scroll2_w) /* scroll + priority */
+ AM_RANGE(0x9400, 0x9402) AM_WRITE(rthunder_scroll2_w) /* scroll + priority */
// { 0x9403, 0x9403 } sub CPU rom bank select would be here
- AM_RANGE(0x9404, 0x9406) AM_WRITE_LEGACY(rthunder_scroll3_w) /* scroll + priority */
+ AM_RANGE(0x9404, 0x9406) AM_WRITE(rthunder_scroll3_w) /* scroll + priority */
- AM_RANGE(0xa000, 0xa000) AM_WRITE_LEGACY(rthunder_backcolor_w)
+ AM_RANGE(0xa000, 0xa000) AM_WRITE(rthunder_backcolor_w)
ADDRESS_MAP_END
#define CPU2_MEMORY(NAME,ADDR_SPRITE,ADDR_VIDEO1,ADDR_VIDEO2,ADDR_ROM,ADDR_BANK,ADDR_WDOG,ADDR_INT) \
static ADDRESS_MAP_START( NAME##_cpu2_map, AS_PROGRAM, 8, namcos86_state ) \
- AM_RANGE(ADDR_SPRITE+0x0000, ADDR_SPRITE+0x1fff) AM_READWRITE_LEGACY(rthunder_spriteram_r,rthunder_spriteram_w) AM_BASE(m_rthunder_spriteram) \
- AM_RANGE(ADDR_VIDEO1+0x0000, ADDR_VIDEO1+0x1fff) AM_READWRITE_LEGACY(rthunder_videoram1_r,rthunder_videoram1_w) \
- AM_RANGE(ADDR_VIDEO2+0x0000, ADDR_VIDEO2+0x1fff) AM_READWRITE_LEGACY(rthunder_videoram2_r,rthunder_videoram2_w) \
+ AM_RANGE(ADDR_SPRITE+0x0000, ADDR_SPRITE+0x1fff) AM_READWRITE(rthunder_spriteram_r,rthunder_spriteram_w) AM_BASE(m_rthunder_spriteram) \
+ AM_RANGE(ADDR_VIDEO1+0x0000, ADDR_VIDEO1+0x1fff) AM_READWRITE(rthunder_videoram1_r,rthunder_videoram1_w) \
+ AM_RANGE(ADDR_VIDEO2+0x0000, ADDR_VIDEO2+0x1fff) AM_READWRITE(rthunder_videoram2_r,rthunder_videoram2_w) \
AM_RANGE(ADDR_ROM+0x0000, ADDR_ROM+0x1fff) AM_ROMBANK("bank2") \
AM_RANGE(0x8000, 0xffff) AM_ROM \
/* { ADDR_BANK+0x00, ADDR_BANK+0x02 } layer 2 scroll registers would be here */ \
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index f7c799c458f..3a176a63949 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -248,7 +248,7 @@ static ADDRESS_MAP_START( naughtyb_map, AS_PROGRAM, 8, naughtyb_state )
AM_RANGE(0x4000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0x8800, 0x8fff) AM_RAM AM_BASE(m_videoram2)
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(naughtyb_videoreg_w)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(naughtyb_videoreg_w)
AM_RANGE(0x9800, 0x9fff) AM_RAM AM_BASE(m_scrollreg)
AM_RANGE(0xa000, 0xa7ff) AM_DEVWRITE_LEGACY("cust", pleiads_sound_control_a_w)
AM_RANGE(0xa800, 0xafff) AM_DEVWRITE_LEGACY("cust", pleiads_sound_control_b_w)
@@ -261,7 +261,7 @@ static ADDRESS_MAP_START( popflame_map, AS_PROGRAM, 8, naughtyb_state )
AM_RANGE(0x4000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0x8800, 0x8fff) AM_RAM AM_BASE(m_videoram2)
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(popflame_videoreg_w)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(popflame_videoreg_w)
AM_RANGE(0x9800, 0x9fff) AM_RAM AM_BASE(m_scrollreg)
AM_RANGE(0xa000, 0xa7ff) AM_DEVWRITE_LEGACY("cust", pleiads_sound_control_a_w)
AM_RANGE(0xa800, 0xafff) AM_DEVWRITE_LEGACY("cust", pleiads_sound_control_b_w)
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index 103e03b902a..fd4c0680594 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -311,16 +311,16 @@ static ADDRESS_MAP_START( secolove_io_map, AS_IO, 8, nbmj8688_state )
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("psg", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("psg", ay8910_data_address_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
- AM_RANGE(0x90, 0x97) AM_WRITE_LEGACY(nbmj8688_blitter_w)
+ AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_blitter_w)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj8688_clut_w)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj8688_clut_w)
AM_RANGE(0xd0, 0xd0) AM_READ(ff_r) // irq ack? watchdog?
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(secolove_romsel_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(secolove_romsel_w)
// AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r)
// AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
- AM_RANGE(0xf0, 0xf0) AM_WRITE_LEGACY(mjsikaku_scrolly_w)
+ AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w)
ADDRESS_MAP_END
WRITE8_MEMBER(nbmj8688_state::barline_output_w)
@@ -336,14 +336,14 @@ static ADDRESS_MAP_START( barline_io_map, AS_IO, 8, nbmj8688_state )
AM_RANGE(0x70, 0x70) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
AM_RANGE(0x80, 0x81) AM_DEVREADWRITE_LEGACY("psg", ym3812_r,ym3812_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
- AM_RANGE(0x90, 0x97) AM_WRITE_LEGACY(nbmj8688_blitter_w)
+ AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_blitter_w)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READ_LEGACY(nb1413m3_inputport2_r) AM_WRITE(barline_output_w)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj8688_clut_w)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj8688_clut_w)
AM_RANGE(0xd0, 0xd0) AM_READ(ff_r) // irq ack? watchdog?
// AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE) //not used
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(secolove_romsel_w)
- AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r) AM_WRITE_LEGACY(mjsikaku_scrolly_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(secolove_romsel_w)
+ AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r) AM_WRITE(mjsikaku_scrolly_w)
AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
@@ -354,13 +354,13 @@ static ADDRESS_MAP_START( crystalg_io_map, AS_IO, 8, nbmj8688_state )
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("psg", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("psg", ay8910_data_address_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
- AM_RANGE(0x90, 0x97) AM_WRITE_LEGACY(nbmj8688_blitter_w)
+ AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_blitter_w)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj8688_clut_w)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj8688_clut_w)
AM_RANGE(0xd0, 0xd0) AM_READ(ff_r) // irq ack? watchdog?
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(crystalg_romsel_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(crystalg_romsel_w)
// AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r)
// AM_RANGE(0xf0, 0xf0) AM_WRITENOP
// AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
@@ -371,17 +371,17 @@ static ADDRESS_MAP_START( otonano_io_map, AS_IO, 8, nbmj8688_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
- AM_RANGE(0x20, 0x3f) AM_WRITE_LEGACY(nbmj8688_clut_w)
- AM_RANGE(0x50, 0x50) AM_WRITE_LEGACY(mjsikaku_romsel_w)
- AM_RANGE(0x70, 0x77) AM_WRITE_LEGACY(nbmj8688_blitter_w)
+ AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w)
+ AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w)
+ AM_RANGE(0x70, 0x77) AM_WRITE(nbmj8688_blitter_w)
AM_RANGE(0x80, 0x81) AM_DEVREADWRITE_LEGACY("psg", ym3812_r,ym3812_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
AM_RANGE(0xd0, 0xd0) AM_READ(ff_r) // irq ack? watchdog?
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(mjsikaku_gfxflag2_w)
- AM_RANGE(0xf0, 0xf0) AM_READWRITE_LEGACY(nb1413m3_dipsw1_r,mjsikaku_scrolly_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w)
+ AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r) AM_WRITE(mjsikaku_scrolly_w)
AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
@@ -390,9 +390,9 @@ static ADDRESS_MAP_START( kaguya_io_map, AS_IO, 8, nbmj8688_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
- AM_RANGE(0x20, 0x3f) AM_WRITE_LEGACY(nbmj8688_clut_w)
- AM_RANGE(0x50, 0x50) AM_WRITE_LEGACY(mjsikaku_romsel_w)
- AM_RANGE(0x70, 0x77) AM_WRITE_LEGACY(nbmj8688_blitter_w)
+ AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w)
+ AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w)
+ AM_RANGE(0x70, 0x77) AM_WRITE(nbmj8688_blitter_w)
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("psg", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("psg", ay8910_data_address_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
@@ -400,8 +400,8 @@ static ADDRESS_MAP_START( kaguya_io_map, AS_IO, 8, nbmj8688_state )
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
AM_RANGE(0xd0, 0xd0) AM_READ(ff_r) // irq ack? watchdog?
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(mjsikaku_gfxflag2_w)
- AM_RANGE(0xf0, 0xf0) AM_READWRITE_LEGACY(nb1413m3_dipsw1_r,mjsikaku_scrolly_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w)
+ AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r) AM_WRITE(mjsikaku_scrolly_w)
AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
@@ -411,9 +411,9 @@ static ADDRESS_MAP_START( iemoto_io_map, AS_IO, 8, nbmj8688_state )
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(nb1413m3_sndrombank2_w)
- AM_RANGE(0x20, 0x3f) AM_WRITE_LEGACY(nbmj8688_clut_w)
- AM_RANGE(0x40, 0x47) AM_WRITE_LEGACY(nbmj8688_blitter_w)
- AM_RANGE(0x50, 0x50) AM_WRITE_LEGACY(seiha_romsel_w)
+ AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w)
+ AM_RANGE(0x40, 0x47) AM_WRITE(nbmj8688_blitter_w)
+ AM_RANGE(0x50, 0x50) AM_WRITE(seiha_romsel_w)
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("psg", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("psg", ay8910_data_address_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
@@ -421,10 +421,10 @@ static ADDRESS_MAP_START( iemoto_io_map, AS_IO, 8, nbmj8688_state )
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
AM_RANGE(0xd0, 0xd0) AM_READ(ff_r) // irq ack? watchdog?
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(mjsikaku_gfxflag2_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w)
// AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r)
// AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
- AM_RANGE(0xf0, 0xf0) AM_WRITE_LEGACY(mjsikaku_scrolly_w)
+ AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w)
ADDRESS_MAP_END
@@ -433,65 +433,65 @@ static ADDRESS_MAP_START( seiha_io_map, AS_IO, 8, nbmj8688_state )
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(nb1413m3_sndrombank2_w)
- AM_RANGE(0x20, 0x3f) AM_WRITE_LEGACY(nbmj8688_clut_w)
- AM_RANGE(0x50, 0x50) AM_WRITE_LEGACY(seiha_romsel_w)
+ AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w)
+ AM_RANGE(0x50, 0x50) AM_WRITE(seiha_romsel_w)
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("psg", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("psg", ay8910_data_address_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
- AM_RANGE(0x90, 0x97) AM_WRITE_LEGACY(nbmj8688_blitter_w)
+ AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_blitter_w)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
AM_RANGE(0xd0, 0xd0) AM_READ(ff_r) // irq ack? watchdog?
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(mjsikaku_gfxflag2_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w)
// AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r)
// AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
- AM_RANGE(0xf0, 0xf0) AM_WRITE_LEGACY(mjsikaku_scrolly_w)
+ AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mjgaiden_io_map, AS_IO, 8, nbmj8688_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
- AM_RANGE(0x20, 0x3f) AM_WRITE_LEGACY(nbmj8688_clut_w)
- AM_RANGE(0x50, 0x50) AM_WRITE_LEGACY(mjsikaku_romsel_w)
+ AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w)
+ AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w)
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("psg", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("psg", ay8910_data_address_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
- AM_RANGE(0x90, 0x97) AM_WRITE_LEGACY(nbmj8688_blitter_w)
+ AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_blitter_w)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
AM_RANGE(0xd0, 0xd0) AM_READ(ff_r) // irq ack? watchdog?
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(mjsikaku_gfxflag2_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w)
// AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r)
// AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
- AM_RANGE(0xf0, 0xf0) AM_WRITE_LEGACY(mjsikaku_scrolly_w)
+ AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( p16bit_LCD_io_map, AS_IO, 8, nbmj8688_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
- AM_RANGE(0x42, 0x42) AM_WRITE_LEGACY(nbmj8688_HD61830B_0_data_w)
- AM_RANGE(0x43, 0x43) AM_WRITE_LEGACY(nbmj8688_HD61830B_0_instr_w)
- AM_RANGE(0x44, 0x44) AM_WRITE_LEGACY(nbmj8688_HD61830B_1_data_w)
- AM_RANGE(0x45, 0x45) AM_WRITE_LEGACY(nbmj8688_HD61830B_1_instr_w)
- AM_RANGE(0x46, 0x46) AM_WRITE_LEGACY(nbmj8688_HD61830B_both_data_w)
- AM_RANGE(0x47, 0x47) AM_WRITE_LEGACY(nbmj8688_HD61830B_both_instr_w)
+ AM_RANGE(0x42, 0x42) AM_WRITE(nbmj8688_HD61830B_0_data_w)
+ AM_RANGE(0x43, 0x43) AM_WRITE(nbmj8688_HD61830B_0_instr_w)
+ AM_RANGE(0x44, 0x44) AM_WRITE(nbmj8688_HD61830B_1_data_w)
+ AM_RANGE(0x45, 0x45) AM_WRITE(nbmj8688_HD61830B_1_instr_w)
+ AM_RANGE(0x46, 0x46) AM_WRITE(nbmj8688_HD61830B_both_data_w)
+ AM_RANGE(0x47, 0x47) AM_WRITE(nbmj8688_HD61830B_both_instr_w)
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("psg", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("psg", ay8910_data_address_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
- AM_RANGE(0x90, 0x97) AM_WRITE_LEGACY(nbmj8688_blitter_w)
+ AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_blitter_w)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj8688_clut_w)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj8688_clut_w)
AM_RANGE(0xd0, 0xd0) AM_READ(ff_r) // irq ack? watchdog?
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(secolove_romsel_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(secolove_romsel_w)
// AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r)
// AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
- AM_RANGE(0xf0, 0xf0) AM_WRITE_LEGACY(mjsikaku_scrolly_w)
+ AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w)
ADDRESS_MAP_END
@@ -500,19 +500,19 @@ static ADDRESS_MAP_START( mjsikaku_io_map, AS_IO, 8, nbmj8688_state )
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(nb1413m3_sndrombank2_w)
- AM_RANGE(0x20, 0x3f) AM_WRITE_LEGACY(nbmj8688_clut_w)
- AM_RANGE(0x50, 0x50) AM_WRITE_LEGACY(mjsikaku_romsel_w)
- AM_RANGE(0x60, 0x67) AM_WRITE_LEGACY(nbmj8688_blitter_w)
+ AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w)
+ AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w)
+ AM_RANGE(0x60, 0x67) AM_WRITE(nbmj8688_blitter_w)
AM_RANGE(0x80, 0x81) AM_DEVREADWRITE_LEGACY("psg", ym3812_r, ym3812_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
AM_RANGE(0xd0, 0xd0) AM_READ(ff_r) // irq ack? watchdog?
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(mjsikaku_gfxflag2_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w)
AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r)
AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
- AM_RANGE(0xf0, 0xf0) AM_WRITE_LEGACY(mjsikaku_scrolly_w)
+ AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w)
ADDRESS_MAP_END
@@ -521,9 +521,9 @@ static ADDRESS_MAP_START( mmsikaku_io_map, AS_IO, 8, nbmj8688_state )
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(nb1413m3_sndrombank2_w)
- AM_RANGE(0x20, 0x3f) AM_WRITE_LEGACY(nbmj8688_clut_w)
- AM_RANGE(0x40, 0x47) AM_WRITE_LEGACY(nbmj8688_blitter_w)
- AM_RANGE(0x50, 0x50) AM_WRITE_LEGACY(mjsikaku_romsel_w)
+ AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w)
+ AM_RANGE(0x40, 0x47) AM_WRITE(nbmj8688_blitter_w)
+ AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w)
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("psg", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("psg", ay8910_data_address_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
@@ -531,10 +531,10 @@ static ADDRESS_MAP_START( mmsikaku_io_map, AS_IO, 8, nbmj8688_state )
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
AM_RANGE(0xd0, 0xd0) AM_READ(ff_r) // irq ack? watchdog?
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(mjsikaku_gfxflag2_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(mjsikaku_gfxflag2_w)
// AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r)
// AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
- AM_RANGE(0xf0, 0xf0) AM_WRITE_LEGACY(mjsikaku_scrolly_w)
+ AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index af5087c01e5..5fc8c38666a 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -331,83 +331,83 @@ static DRIVER_INIT( taiwanmb )
static ADDRESS_MAP_START( gionbana_map, AS_PROGRAM, 8, nbmj8891_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf00f) AM_READWRITE_LEGACY(nbmj8891_clut_r,nbmj8891_clut_w)
- AM_RANGE(0xf400, 0xf5ff) AM_READWRITE_LEGACY(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
+ AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
+ AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( mgion_map, AS_PROGRAM, 8, nbmj8891_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf1ff) AM_READWRITE_LEGACY(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
- AM_RANGE(0xf400, 0xf40f) AM_READWRITE_LEGACY(nbmj8891_clut_r,nbmj8891_clut_w)
+ AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
+ AM_RANGE(0xf400, 0xf40f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( omotesnd_map, AS_PROGRAM, 8, nbmj8891_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf400, 0xf5ff) AM_READWRITE_LEGACY(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
+ AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( hanamomo_map, AS_PROGRAM, 8, nbmj8891_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf1ff) AM_READWRITE_LEGACY(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
- AM_RANGE(0xf400, 0xf40f) AM_READWRITE_LEGACY(nbmj8891_clut_r,nbmj8891_clut_w)
+ AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
+ AM_RANGE(0xf400, 0xf40f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( scandalm_map, AS_PROGRAM, 8, nbmj8891_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf400, 0xf5ff) AM_READWRITE_LEGACY(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
+ AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( club90s_map, AS_PROGRAM, 8, nbmj8891_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
- AM_RANGE(0xf800, 0xf80f) AM_READWRITE_LEGACY(nbmj8891_clut_r,nbmj8891_clut_w)
- AM_RANGE(0xfc00, 0xfdff) AM_READWRITE_LEGACY(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
+ AM_RANGE(0xf800, 0xf80f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
+ AM_RANGE(0xfc00, 0xfdff) AM_READWRITE(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( lovehous_map, AS_PROGRAM, 8, nbmj8891_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf00f) AM_READWRITE_LEGACY(nbmj8891_clut_r,nbmj8891_clut_w)
- AM_RANGE(0xf400, 0xf5ff) AM_READWRITE_LEGACY(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
+ AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
+ AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( maiko_map, AS_PROGRAM, 8, nbmj8891_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf1ff) AM_READWRITE_LEGACY(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
- AM_RANGE(0xf400, 0xf40f) AM_READWRITE_LEGACY(nbmj8891_clut_r,nbmj8891_clut_w)
+ AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
+ AM_RANGE(0xf400, 0xf40f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( hnxmasev_map, AS_PROGRAM, 8, nbmj8891_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf200, 0xf3ff) AM_READWRITE_LEGACY(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
- AM_RANGE(0xf700, 0xf70f) AM_READWRITE_LEGACY(nbmj8891_clut_r,nbmj8891_clut_w)
+ AM_RANGE(0xf200, 0xf3ff) AM_READWRITE(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
+ AM_RANGE(0xf700, 0xf70f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( hnageman_map, AS_PROGRAM, 8, nbmj8891_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf00f) AM_READWRITE_LEGACY(nbmj8891_clut_r,nbmj8891_clut_w)
- AM_RANGE(0xf400, 0xf5ff) AM_READWRITE_LEGACY(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
+ AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
+ AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( mmaiko_map, AS_PROGRAM, 8, nbmj8891_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf1ff) AM_READWRITE_LEGACY(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
- AM_RANGE(0xf400, 0xf40f) AM_READWRITE_LEGACY(nbmj8891_clut_r,nbmj8891_clut_w)
+ AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
+ AM_RANGE(0xf400, 0xf40f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( hanaoji_map, AS_PROGRAM, 8, nbmj8891_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf200, 0xf3ff) AM_READWRITE_LEGACY(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
- AM_RANGE(0xf700, 0xf70f) AM_READWRITE_LEGACY(nbmj8891_clut_r,nbmj8891_clut_w)
+ AM_RANGE(0xf200, 0xf3ff) AM_READWRITE(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
+ AM_RANGE(0xf700, 0xf70f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
@@ -418,18 +418,18 @@ READ8_MEMBER(nbmj8891_state::taiwanmb_unk_r)
static ADDRESS_MAP_START( taiwanmb_map, AS_PROGRAM, 8, nbmj8891_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0xec00, 0xedff) AM_READWRITE_LEGACY(nbmj8891_palette_type3_r,nbmj8891_palette_type3_w)
+ AM_RANGE(0xec00, 0xedff) AM_READWRITE(nbmj8891_palette_type3_r,nbmj8891_palette_type3_w)
AM_RANGE(0xf800, 0xfeff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xff00, 0xff1f) AM_NOP // ?
AM_RANGE(0xff20, 0xff20) AM_READ(taiwanmb_unk_r) // MCU or 1413M3 STATUS? (return != 0x00 then loop)
- AM_RANGE(0xff20, 0xff20) AM_WRITE_LEGACY(nbmj8891_taiwanmb_mcu_w) // MCU PARAMETER?
+ AM_RANGE(0xff20, 0xff20) AM_WRITE(nbmj8891_taiwanmb_mcu_w) // MCU PARAMETER?
AM_RANGE(0xff21, 0xff2f) AM_READNOP // ?
AM_RANGE(0xff21, 0xff21) AM_WRITENOP // blitter parameter set end (write 0x01 only)
- AM_RANGE(0xff22, 0xff27) AM_WRITE_LEGACY(nbmj8891_taiwanmb_blitter_w) // blitter parameter
- AM_RANGE(0xff28, 0xff28) AM_WRITE_LEGACY(nbmj8891_romsel_w) // gfx rombank select
- AM_RANGE(0xff29, 0xff29) AM_WRITE_LEGACY(nbmj8891_taiwanmb_gfxflag_w) // screen flip flag?
+ AM_RANGE(0xff22, 0xff27) AM_WRITE(nbmj8891_taiwanmb_blitter_w) // blitter parameter
+ AM_RANGE(0xff28, 0xff28) AM_WRITE(nbmj8891_romsel_w) // gfx rombank select
+ AM_RANGE(0xff29, 0xff29) AM_WRITE(nbmj8891_taiwanmb_gfxflag_w) // screen flip flag?
AM_RANGE(0xff2a, 0xff2a) AM_WRITENOP // not used?
- AM_RANGE(0xff2b, 0xff2b) AM_WRITE_LEGACY(nbmj8891_clutsel_w) // color look up table select
+ AM_RANGE(0xff2b, 0xff2b) AM_WRITE(nbmj8891_clutsel_w) // color look up table select
AM_RANGE(0xff2c, 0xff2c) AM_WRITENOP // blitter parameter set start (write 0xff only)
AM_RANGE(0xff2d, 0xff2d) AM_WRITENOP // not used?
AM_RANGE(0xff2e, 0xff2e) AM_WRITENOP // not used?
@@ -442,17 +442,17 @@ static ADDRESS_MAP_START( gionbana_io_map, AS_IO, 8, nbmj8891_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
- AM_RANGE(0x20, 0x27) AM_WRITE_LEGACY(nbmj8891_blitter_w)
- AM_RANGE(0x40, 0x40) AM_WRITE_LEGACY(nbmj8891_clutsel_w)
- AM_RANGE(0x60, 0x60) AM_WRITE_LEGACY(nbmj8891_romsel_w)
- AM_RANGE(0x70, 0x70) AM_WRITE_LEGACY(nbmj8891_scrolly_w)
+ AM_RANGE(0x20, 0x27) AM_WRITE(nbmj8891_blitter_w)
+ AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w)
+ AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w)
+ AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE_LEGACY("fmsnd", ym3812_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
AM_RANGE(0xc0, 0xc0) AM_READ_LEGACY(nb1413m3_inputport3_r) //AM_WRITENOP
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(nbmj8891_vramsel_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8891_vramsel_w)
AM_RANGE(0xf0, 0xf0) AM_READWRITE_LEGACY(nb1413m3_dipsw1_r,nb1413m3_outcoin_w)
AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
@@ -461,17 +461,17 @@ static ADDRESS_MAP_START( mgion_io_map, AS_IO, 8, nbmj8891_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
- AM_RANGE(0x30, 0x37) AM_WRITE_LEGACY(nbmj8891_blitter_w)
- AM_RANGE(0x40, 0x40) AM_WRITE_LEGACY(nbmj8891_clutsel_w)
- AM_RANGE(0x60, 0x60) AM_WRITE_LEGACY(nbmj8891_romsel_w)
- AM_RANGE(0x70, 0x70) AM_WRITE_LEGACY(nbmj8891_scrolly_w)
+ AM_RANGE(0x30, 0x37) AM_WRITE(nbmj8891_blitter_w)
+ AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w)
+ AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w)
+ AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE_LEGACY("fmsnd", ym3812_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
AM_RANGE(0xc0, 0xc0) AM_READ_LEGACY(nb1413m3_inputport3_r) //AM_WRITENOP
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(nbmj8891_vramsel_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8891_vramsel_w)
AM_RANGE(0xf0, 0xf0) AM_READWRITE_LEGACY(nb1413m3_dipsw1_r,nb1413m3_outcoin_w)
AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
@@ -479,20 +479,20 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( omotesnd_io_map, AS_IO, 8, nbmj8891_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
- AM_RANGE(0x00, 0x07) AM_WRITE_LEGACY(nbmj8891_blitter_w)
- AM_RANGE(0x30, 0x30) AM_WRITE_LEGACY(nbmj8891_vramsel_w)
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(nbmj8891_romsel_w)
- AM_RANGE(0x20, 0x20) AM_WRITE_LEGACY(nbmj8891_clutsel_w)
- AM_RANGE(0x40, 0x4f) AM_WRITE_LEGACY(nbmj8891_clut_w)
+ AM_RANGE(0x00, 0x07) AM_WRITE(nbmj8891_blitter_w)
+ AM_RANGE(0x30, 0x30) AM_WRITE(nbmj8891_vramsel_w)
+ AM_RANGE(0x10, 0x10) AM_WRITE(nbmj8891_romsel_w)
+ AM_RANGE(0x20, 0x20) AM_WRITE(nbmj8891_clutsel_w)
+ AM_RANGE(0x40, 0x4f) AM_WRITE(nbmj8891_clut_w)
// AM_RANGE(0x50, 0x50) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
- AM_RANGE(0x70, 0x70) AM_WRITE_LEGACY(nbmj8891_scrolly_w)
+ AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("fmsnd", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("fmsnd", ay8910_data_address_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r) AM_WRITENOP
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
AM_RANGE(0xc0, 0xc0) AM_READ_LEGACY(nb1413m3_inputport3_r) AM_WRITENOP
- AM_RANGE(0xd0, 0xdf) AM_READ_LEGACY(nbmj8891_clut_r)
+ AM_RANGE(0xd0, 0xdf) AM_READ(nbmj8891_clut_r)
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
AM_RANGE(0xf0, 0xf0) AM_READWRITE_LEGACY(nb1413m3_dipsw1_r,nb1413m3_outcoin_w)
AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
@@ -502,10 +502,10 @@ static ADDRESS_MAP_START( hanamomo_io_map, AS_IO, 8, nbmj8891_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
- AM_RANGE(0x30, 0x37) AM_WRITE_LEGACY(nbmj8891_blitter_w)
- AM_RANGE(0x40, 0x40) AM_WRITE_LEGACY(nbmj8891_clutsel_w)
- AM_RANGE(0x60, 0x60) AM_WRITE_LEGACY(nbmj8891_romsel_w)
- AM_RANGE(0x70, 0x70) AM_WRITE_LEGACY(nbmj8891_scrolly_w)
+ AM_RANGE(0x30, 0x37) AM_WRITE(nbmj8891_blitter_w)
+ AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w)
+ AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w)
+ AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE_LEGACY("fmsnd", ym3812_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
@@ -521,10 +521,10 @@ static ADDRESS_MAP_START( msjiken_io_map, AS_IO, 8, nbmj8891_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
- AM_RANGE(0x40, 0x40) AM_WRITE_LEGACY(nbmj8891_clutsel_w)
- AM_RANGE(0x50, 0x57) AM_WRITE_LEGACY(nbmj8891_blitter_w)
- AM_RANGE(0x60, 0x60) AM_WRITE_LEGACY(nbmj8891_romsel_w)
- AM_RANGE(0x70, 0x70) AM_WRITE_LEGACY(nbmj8891_scrolly_w)
+ AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w)
+ AM_RANGE(0x50, 0x57) AM_WRITE(nbmj8891_blitter_w)
+ AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w)
+ AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE_LEGACY("fmsnd", ym3812_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
@@ -539,11 +539,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( scandal_io_map, AS_IO, 8, nbmj8891_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
- AM_RANGE(0x40, 0x4f) AM_WRITE_LEGACY(nbmj8891_clut_w)
- AM_RANGE(0x00, 0x07) AM_WRITE_LEGACY(nbmj8891_blitter_w)
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(nbmj8891_romsel_w)
- AM_RANGE(0x20, 0x20) AM_WRITE_LEGACY(nbmj8891_clutsel_w)
- AM_RANGE(0x50, 0x50) AM_WRITE_LEGACY(nbmj8891_scrolly_w)
+ AM_RANGE(0x40, 0x4f) AM_WRITE(nbmj8891_clut_w)
+ AM_RANGE(0x00, 0x07) AM_WRITE(nbmj8891_blitter_w)
+ AM_RANGE(0x10, 0x10) AM_WRITE(nbmj8891_romsel_w)
+ AM_RANGE(0x20, 0x20) AM_WRITE(nbmj8891_clutsel_w)
+ AM_RANGE(0x50, 0x50) AM_WRITE(nbmj8891_scrolly_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE_LEGACY("fmsnd", ym3812_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
@@ -558,11 +558,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( scandalm_io_map, AS_IO, 8, nbmj8891_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
- AM_RANGE(0x00, 0x07) AM_WRITE_LEGACY(nbmj8891_blitter_w)
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(nbmj8891_romsel_w)
- AM_RANGE(0x20, 0x20) AM_WRITE_LEGACY(nbmj8891_clutsel_w)
- AM_RANGE(0x40, 0x4f) AM_WRITE_LEGACY(nbmj8891_clut_w)
- AM_RANGE(0x50, 0x50) AM_WRITE_LEGACY(nbmj8891_scrolly_w)
+ AM_RANGE(0x00, 0x07) AM_WRITE(nbmj8891_blitter_w)
+ AM_RANGE(0x10, 0x10) AM_WRITE(nbmj8891_romsel_w)
+ AM_RANGE(0x20, 0x20) AM_WRITE(nbmj8891_clutsel_w)
+ AM_RANGE(0x40, 0x4f) AM_WRITE(nbmj8891_clut_w)
+ AM_RANGE(0x50, 0x50) AM_WRITE(nbmj8891_scrolly_w)
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("fmsnd", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("fmsnd", ay8910_data_address_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
@@ -578,12 +578,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bananadr_io_map, AS_IO, 8, nbmj8891_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
- AM_RANGE(0x00, 0x07) AM_WRITE_LEGACY(nbmj8891_blitter_w)
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(nbmj8891_romsel_w)
- AM_RANGE(0x20, 0x20) AM_WRITE_LEGACY(nbmj8891_clutsel_w)
- AM_RANGE(0x30, 0x30) AM_WRITE_LEGACY(nbmj8891_vramsel_w)
- AM_RANGE(0x40, 0x4f) AM_WRITE_LEGACY(nbmj8891_clut_w)
- AM_RANGE(0x50, 0x50) AM_WRITE_LEGACY(nbmj8891_scrolly_w)
+ AM_RANGE(0x00, 0x07) AM_WRITE(nbmj8891_blitter_w)
+ AM_RANGE(0x10, 0x10) AM_WRITE(nbmj8891_romsel_w)
+ AM_RANGE(0x20, 0x20) AM_WRITE(nbmj8891_clutsel_w)
+ AM_RANGE(0x30, 0x30) AM_WRITE(nbmj8891_vramsel_w)
+ AM_RANGE(0x40, 0x4f) AM_WRITE(nbmj8891_clut_w)
+ AM_RANGE(0x50, 0x50) AM_WRITE(nbmj8891_scrolly_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE_LEGACY("fmsnd", ym3812_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
@@ -599,17 +599,17 @@ static ADDRESS_MAP_START( lovehous_io_map, AS_IO, 8, nbmj8891_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
- AM_RANGE(0x40, 0x40) AM_WRITE_LEGACY(nbmj8891_clutsel_w)
- AM_RANGE(0x50, 0x57) AM_WRITE_LEGACY(nbmj8891_blitter_w)
- AM_RANGE(0x60, 0x60) AM_WRITE_LEGACY(nbmj8891_romsel_w)
- AM_RANGE(0x70, 0x70) AM_WRITE_LEGACY(nbmj8891_scrolly_w)
+ AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w)
+ AM_RANGE(0x50, 0x57) AM_WRITE(nbmj8891_blitter_w)
+ AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w)
+ AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE_LEGACY("fmsnd", ym3812_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r) //AM_WRITENOP
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
AM_RANGE(0xc0, 0xc0) AM_READ_PORT("PORT0-2")
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(nbmj8891_vramsel_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8891_vramsel_w)
AM_RANGE(0xf0, 0xf0) AM_READWRITE_LEGACY(nb1413m3_dipsw1_r,nb1413m3_outcoin_w)
AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
@@ -618,17 +618,17 @@ static ADDRESS_MAP_START( maiko_io_map, AS_IO, 8, nbmj8891_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
- AM_RANGE(0x40, 0x40) AM_WRITE_LEGACY(nbmj8891_clutsel_w)
- AM_RANGE(0x50, 0x57) AM_WRITE_LEGACY(nbmj8891_blitter_w)
- AM_RANGE(0x60, 0x60) AM_WRITE_LEGACY(nbmj8891_romsel_w)
- AM_RANGE(0x70, 0x70) AM_WRITE_LEGACY(nbmj8891_scrolly_w)
+ AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w)
+ AM_RANGE(0x50, 0x57) AM_WRITE(nbmj8891_blitter_w)
+ AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w)
+ AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE_LEGACY("fmsnd", ym3812_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
AM_RANGE(0xc0, 0xc0) AM_READ_PORT("PORT0-2") //AM_WRITENOP
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(nbmj8891_vramsel_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8891_vramsel_w)
AM_RANGE(0xf0, 0xf0) AM_READWRITE_LEGACY(nb1413m3_dipsw1_r,nb1413m3_outcoin_w)
AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
@@ -644,7 +644,7 @@ static ADDRESS_MAP_START( taiwanmb_io_map, AS_IO, 8, nbmj8891_state )
// AM_RANGE(0xc0, 0xc0) AM_WRITENOP // ?
// AM_RANGE(0xd0, 0xd0) AM_READ_LEGACY(ff_r) // irq ack? watchdog?
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_READ_LEGACY(nb1413m3_dipsw3_h_r) AM_WRITE_LEGACY(nbmj8891_taiwanmb_gfxdraw_w) // blitter draw start
+ AM_RANGE(0xe0, 0xe0) AM_READ_LEGACY(nb1413m3_dipsw3_h_r) AM_WRITE(nbmj8891_taiwanmb_gfxdraw_w) // blitter draw start
AM_RANGE(0xe1, 0xe1) AM_READ_LEGACY(nb1413m3_dipsw3_l_r)
AM_RANGE(0xf0, 0xf0) AM_READWRITE_LEGACY(nb1413m3_dipsw2_r,nb1413m3_outcoin_w)
AM_RANGE(0xf1, 0xf1) AM_READ_LEGACY(nb1413m3_dipsw1_r)
diff --git a/src/mame/drivers/nbmj8900.c b/src/mame/drivers/nbmj8900.c
index fe51d4a390c..9c6d8abfdb0 100644
--- a/src/mame/drivers/nbmj8900.c
+++ b/src/mame/drivers/nbmj8900.c
@@ -110,15 +110,15 @@ static DRIVER_INIT( togenkyo )
static ADDRESS_MAP_START( ohpaipee_map, AS_PROGRAM, 8, nbmj8900_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf00f) AM_READWRITE_LEGACY(nbmj8900_clut_r, nbmj8900_clut_w)
- AM_RANGE(0xf400, 0xf5ff) AM_READWRITE_LEGACY(nbmj8900_palette_type1_r, nbmj8900_palette_type1_w)
+ AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8900_clut_r, nbmj8900_clut_w)
+ AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8900_palette_type1_r, nbmj8900_palette_type1_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( togenkyo_map, AS_PROGRAM, 8, nbmj8900_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf00f) AM_READWRITE_LEGACY(nbmj8900_clut_r, nbmj8900_clut_w)
- AM_RANGE(0xf400, 0xf5ff) AM_READWRITE_LEGACY(nbmj8900_palette_type1_r, nbmj8900_palette_type1_w)
+ AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8900_clut_r, nbmj8900_clut_w)
+ AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8900_palette_type1_r, nbmj8900_palette_type1_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -126,11 +126,11 @@ static ADDRESS_MAP_START( ohpaipee_io_map, AS_IO, 8, nbmj8900_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(nb1413m3_nmi_clock_w)
- AM_RANGE(0x20, 0x27) AM_WRITE_LEGACY(nbmj8900_blitter_w)
+ AM_RANGE(0x20, 0x27) AM_WRITE(nbmj8900_blitter_w)
- AM_RANGE(0x40, 0x40) AM_WRITE_LEGACY(nbmj8900_clutsel_w)
- AM_RANGE(0x60, 0x60) AM_WRITE_LEGACY(nbmj8900_romsel_w)
- AM_RANGE(0x70, 0x70) AM_WRITE_LEGACY(nbmj8900_scrolly_w)
+ AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8900_clutsel_w)
+ AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8900_romsel_w)
+ AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8900_scrolly_w)
AM_RANGE(0x80, 0x81) AM_DEVREADWRITE_LEGACY("ymsnd", ym3812_r,ym3812_w)
@@ -140,7 +140,7 @@ static ADDRESS_MAP_START( ohpaipee_io_map, AS_IO, 8, nbmj8900_state )
AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w)
AM_RANGE(0xc0, 0xc0) AM_READ_LEGACY(nb1413m3_inputport3_r)
AM_RANGE(0xd0, 0xd0) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
- AM_RANGE(0xe0, 0xe0) AM_WRITE_LEGACY(nbmj8900_vramsel_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8900_vramsel_w)
AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(nb1413m3_dipsw1_r)
AM_RANGE(0xf1, 0xf1) AM_READWRITE_LEGACY(nb1413m3_dipsw2_r, nb1413m3_outcoin_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index dd990bf8c2d..4d738b77d71 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -192,70 +192,70 @@ static DRIVER_INIT( av2mj2rg )
static ADDRESS_MAP_START( pstadium_map, AS_PROGRAM, 8, nbmj8991_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf00f) AM_READWRITE_LEGACY(nbmj8991_clut_r,nbmj8991_clut_w)
- AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE_LEGACY(nbmj8991_palette_type3_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
+ AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE(nbmj8991_palette_type3_w) AM_SHARE("paletteram")
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram") // finalbny
ADDRESS_MAP_END
static ADDRESS_MAP_START( triplew1_map, AS_PROGRAM, 8, nbmj8991_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE_LEGACY(nbmj8991_palette_type3_w) AM_SHARE("paletteram")
- AM_RANGE(0xf200, 0xf20f) AM_READWRITE_LEGACY(nbmj8991_clut_r,nbmj8991_clut_w)
+ AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE(nbmj8991_palette_type3_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf200, 0xf20f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram") // mjgottub
ADDRESS_MAP_END
static ADDRESS_MAP_START( triplew2_map, AS_PROGRAM, 8, nbmj8991_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE_LEGACY(nbmj8991_palette_type3_w) AM_SHARE("paletteram")
- AM_RANGE(0xf400, 0xf40f) AM_READWRITE_LEGACY(nbmj8991_clut_r,nbmj8991_clut_w)
+ AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE(nbmj8991_palette_type3_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf400, 0xf40f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( mjlstory_map, AS_PROGRAM, 8, nbmj8991_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE_LEGACY(nbmj8991_palette_type3_w) AM_SHARE("paletteram")
- AM_RANGE(0xf700, 0xf70f) AM_READWRITE_LEGACY(nbmj8991_clut_r,nbmj8991_clut_w)
+ AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE(nbmj8991_palette_type3_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf700, 0xf70f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( galkoku_map, AS_PROGRAM, 8, nbmj8991_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf00f) AM_READWRITE_LEGACY(nbmj8991_clut_r,nbmj8991_clut_w)
- AM_RANGE(0xf400, 0xf5ff) AM_RAM_WRITE_LEGACY(nbmj8991_palette_type1_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
+ AM_RANGE(0xf400, 0xf5ff) AM_RAM_WRITE(nbmj8991_palette_type1_w) AM_SHARE("paletteram")
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram") // hyouban
ADDRESS_MAP_END
static ADDRESS_MAP_START( galkaika_map, AS_PROGRAM, 8, nbmj8991_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf00f) AM_READWRITE_LEGACY(nbmj8991_clut_r,nbmj8991_clut_w)
- AM_RANGE(0xf400, 0xf5ff) AM_RAM_WRITE_LEGACY(nbmj8991_palette_type2_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
+ AM_RANGE(0xf400, 0xf5ff) AM_RAM_WRITE(nbmj8991_palette_type2_w) AM_SHARE("paletteram")
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram") // tokimbsj
ADDRESS_MAP_END
static ADDRESS_MAP_START( tokyogal_map, AS_PROGRAM, 8, nbmj8991_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE_LEGACY(nbmj8991_palette_type2_w) AM_SHARE("paletteram")
- AM_RANGE(0xf400, 0xf40f) AM_READWRITE_LEGACY(nbmj8991_clut_r,nbmj8991_clut_w)
+ AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE(nbmj8991_palette_type2_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf400, 0xf40f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( av2mj1bb_map, AS_PROGRAM, 8, nbmj8991_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE_LEGACY(nbmj8991_palette_type3_w) AM_SHARE("paletteram")
- AM_RANGE(0xf500, 0xf50f) AM_READWRITE_LEGACY(nbmj8991_clut_r,nbmj8991_clut_w)
+ AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE(nbmj8991_palette_type3_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf500, 0xf50f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( av2mj2rg_map, AS_PROGRAM, 8, nbmj8991_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf00f) AM_READWRITE_LEGACY(nbmj8991_clut_r,nbmj8991_clut_w)
- AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE_LEGACY(nbmj8991_palette_type3_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
+ AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE(nbmj8991_palette_type3_w) AM_SHARE("paletteram")
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( galkoku_io_map, AS_IO, 8, nbmj8991_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x7f) AM_READWRITE_LEGACY(nb1413m3_sndrom_r,nbmj8991_blitter_w)
+ AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r) AM_WRITE(nbmj8991_blitter_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE_LEGACY("fmsnd", ym3812_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
@@ -269,7 +269,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( hyouban_io_map, AS_IO, 8, nbmj8991_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x7f) AM_READWRITE_LEGACY(nb1413m3_sndrom_r,nbmj8991_blitter_w)
+ AM_RANGE(0x00, 0x7f) AM_READ_LEGACY(nb1413m3_sndrom_r) AM_WRITE(nbmj8991_blitter_w)
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("fmsnd", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("fmsnd", ay8910_data_address_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
@@ -284,7 +284,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pstadium_io_map, AS_IO, 8, nbmj8991_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x7f) AM_WRITE_LEGACY(nbmj8991_blitter_w)
+ AM_RANGE(0x00, 0x7f) AM_WRITE(nbmj8991_blitter_w)
AM_RANGE(0x80, 0x80) AM_WRITE(nbmj8991_sound_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
@@ -297,7 +297,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( av2mj1bb_io_map, AS_IO, 8, nbmj8991_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x7f) AM_WRITE_LEGACY(nbmj8991_blitter_w)
+ AM_RANGE(0x00, 0x7f) AM_WRITE(nbmj8991_blitter_w)
AM_RANGE(0x80, 0x80) AM_WRITE(nbmj8991_sound_w)
AM_RANGE(0x90, 0x90) AM_READ_LEGACY(nb1413m3_inputport0_r)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r,nb1413m3_inputportsel_w)
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 5b84a6dbdb0..60073463161 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -687,39 +687,39 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sailorws_map, AS_PROGRAM, 8, nbmj9195_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf000, 0xf1ff) AM_READWRITE_LEGACY(nbmj9195_palette_r,nbmj9195_palette_w)
+ AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(nbmj9195_palette_r,nbmj9195_palette_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( mjuraden_map, AS_PROGRAM, 8, nbmj9195_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
- AM_RANGE(0xf200, 0xf3ff) AM_READWRITE_LEGACY(nbmj9195_palette_r,nbmj9195_palette_w)
+ AM_RANGE(0xf200, 0xf3ff) AM_READWRITE(nbmj9195_palette_r,nbmj9195_palette_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( koinomp_map, AS_PROGRAM, 8, nbmj9195_state )
AM_RANGE(0x0000, 0xdfff) AM_ROM
- AM_RANGE(0xe000, 0xe1ff) AM_READWRITE_LEGACY(nbmj9195_palette_r,nbmj9195_palette_w)
+ AM_RANGE(0xe000, 0xe1ff) AM_READWRITE(nbmj9195_palette_r,nbmj9195_palette_w)
AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( ngpgal_map, AS_PROGRAM, 8, nbmj9195_state )
AM_RANGE(0x0000, 0xcfff) AM_ROM
- AM_RANGE(0xd000, 0xd1ff) AM_READWRITE_LEGACY(nbmj9195_palette_r,nbmj9195_palette_w)
+ AM_RANGE(0xd000, 0xd1ff) AM_READWRITE(nbmj9195_palette_r,nbmj9195_palette_w)
AM_RANGE(0xd800, 0xdfff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( mscoutm_map, AS_PROGRAM, 8, nbmj9195_state )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe5ff) AM_RAM
- AM_RANGE(0xe600, 0xebff) AM_READWRITE_LEGACY(nbmj9195_nb22090_palette_r,nbmj9195_nb22090_palette_w)
+ AM_RANGE(0xe600, 0xebff) AM_READWRITE(nbmj9195_nb22090_palette_r,nbmj9195_nb22090_palette_w)
AM_RANGE(0xec00, 0xf1ff) AM_RAM
AM_RANGE(0xf200, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( mjegolf_map, AS_PROGRAM, 8, nbmj9195_state )
AM_RANGE(0x0000, 0xdfff) AM_ROM
- AM_RANGE(0xe000, 0xe5ff) AM_READWRITE_LEGACY(nbmj9195_nb22090_palette_r,nbmj9195_nb22090_palette_w)
+ AM_RANGE(0xe000, 0xe5ff) AM_READWRITE(nbmj9195_nb22090_palette_r,nbmj9195_nb22090_palette_w)
AM_RANGE(0xe600, 0xebff) AM_RAM
AM_RANGE(0xec00, 0xf1ff) AM_RAM
AM_RANGE(0xf200, 0xffff) AM_RAM
@@ -729,9 +729,9 @@ static ADDRESS_MAP_START( mjuraden_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x80, 0x81) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x80, 0x8f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x90, 0x9f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x90, 0x9f) AM_WRITE(nbmj9195_clut_0_w)
AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xb2, 0xb2) AM_WRITENOP
@@ -744,13 +744,13 @@ static ADDRESS_MAP_START( koinomp_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x80, 0x81) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x80, 0x8f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x90, 0x9f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x90, 0x9f) AM_WRITE(nbmj9195_clut_0_w)
- AM_RANGE(0xa0, 0xa1) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0xa0, 0xaf) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0xb0, 0xbf) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0xa0, 0xa1) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0xa0, 0xaf) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0xb0, 0xbf) AM_WRITE(nbmj9195_clut_1_w)
AM_RANGE(0xc0, 0xc0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xc2, 0xc2) AM_WRITENOP
@@ -764,27 +764,27 @@ static ADDRESS_MAP_START( patimono_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x80, 0x81) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0x80, 0x8f) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
+ AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_1_w)
- AM_RANGE(0x90, 0x9f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x90, 0x9f) AM_WRITE(nbmj9195_clut_0_w)
AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xa4, 0xa4) AM_WRITENOP
AM_RANGE(0xa8, 0xa8) AM_WRITENOP
AM_RANGE(0xb0, 0xb8) AM_WRITE(nbmj9195_inputportsel_w)
- AM_RANGE(0xc0, 0xc1) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0xd0, 0xdf) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0xc0, 0xc1) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_1_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mmehyou_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x80, 0x81) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x80, 0x8f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x90, 0x9f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x90, 0x9f) AM_WRITE(nbmj9195_clut_0_w)
AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xa4, 0xa4) AM_WRITENOP
@@ -796,13 +796,13 @@ static ADDRESS_MAP_START( gal10ren_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x60, 0x61) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x60, 0x6f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x70, 0x7f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x70, 0x7f) AM_WRITE(nbmj9195_clut_0_w)
- AM_RANGE(0xa0, 0xa1) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0xa0, 0xaf) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0xb0, 0xbf) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0xa0, 0xa1) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0xa0, 0xaf) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0xb0, 0xbf) AM_WRITE(nbmj9195_clut_1_w)
AM_RANGE(0xc0, 0xc0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xc8, 0xc8) AM_WRITENOP
@@ -819,13 +819,13 @@ static ADDRESS_MAP_START( renaiclb_io_map, AS_IO, 8, nbmj9195_state )
AM_RANGE(0x28, 0x28) AM_WRITENOP
AM_RANGE(0x2c, 0x2c) AM_WRITE(nbmj9195_inputportsel_w)
- AM_RANGE(0x60, 0x61) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x60, 0x6f) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0x70, 0x7f) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0x70, 0x7f) AM_WRITE(nbmj9195_clut_1_w)
- AM_RANGE(0xe0, 0xe1) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0xe0, 0xef) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0xf0, 0xff) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0xe0, 0xe1) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0xe0, 0xef) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0xf0, 0xff) AM_WRITE(nbmj9195_clut_0_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mjlaman_io_map, AS_IO, 8, nbmj9195_state )
@@ -837,13 +837,13 @@ static ADDRESS_MAP_START( mjlaman_io_map, AS_IO, 8, nbmj9195_state )
AM_RANGE(0x24, 0x24) AM_WRITENOP
AM_RANGE(0x26, 0x26) AM_WRITE(nbmj9195_inputportsel_w)
- AM_RANGE(0x80, 0x81) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x80, 0x8f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x90, 0x9f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x90, 0x9f) AM_WRITE(nbmj9195_clut_0_w)
- AM_RANGE(0xe0, 0xe1) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0xe0, 0xef) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0xf0, 0xff) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0xe0, 0xe1) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0xe0, 0xef) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0xf0, 0xff) AM_WRITE(nbmj9195_clut_1_w)
ADDRESS_MAP_END
@@ -851,13 +851,13 @@ static ADDRESS_MAP_START( mkeibaou_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x80, 0x81) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x80, 0x8f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x90, 0x9f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x90, 0x9f) AM_WRITE(nbmj9195_clut_0_w)
- AM_RANGE(0xa0, 0xa1) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0xa0, 0xaf) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0xb0, 0xbf) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0xa0, 0xa1) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0xa0, 0xaf) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0xb0, 0xbf) AM_WRITE(nbmj9195_clut_1_w)
AM_RANGE(0xd8, 0xd8) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xda, 0xda) AM_WRITENOP
@@ -870,13 +870,13 @@ static ADDRESS_MAP_START( pachiten_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x60, 0x61) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x60, 0x6f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x70, 0x7f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x70, 0x7f) AM_WRITE(nbmj9195_clut_0_w)
- AM_RANGE(0xa0, 0xa1) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0xa0, 0xaf) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0xb0, 0xbf) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0xa0, 0xa1) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0xa0, 0xaf) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0xb0, 0xbf) AM_WRITE(nbmj9195_clut_1_w)
AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xe2, 0xe2) AM_WRITENOP
@@ -888,13 +888,13 @@ static ADDRESS_MAP_START( sailorws_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x60, 0x61) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x60, 0x6f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x70, 0x7f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x70, 0x7f) AM_WRITE(nbmj9195_clut_0_w)
- AM_RANGE(0x80, 0x81) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0x80, 0x8f) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0x90, 0x9f) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0x90, 0x9f) AM_WRITE(nbmj9195_clut_1_w)
AM_RANGE(0xf0, 0xf0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xf2, 0xf2) AM_WRITENOP
@@ -906,13 +906,13 @@ static ADDRESS_MAP_START( sailorwr_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x60, 0x61) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x60, 0x6f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x70, 0x7f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x70, 0x7f) AM_WRITE(nbmj9195_clut_0_w)
- AM_RANGE(0x80, 0x81) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0x80, 0x8f) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0x90, 0x9f) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0x90, 0x9f) AM_WRITE(nbmj9195_clut_1_w)
AM_RANGE(0xf8, 0xf8) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xfa, 0xfa) AM_WRITENOP
@@ -925,13 +925,13 @@ static ADDRESS_MAP_START( psailor1_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x60, 0x61) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x60, 0x6f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x70, 0x7f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x70, 0x7f) AM_WRITE(nbmj9195_clut_0_w)
- AM_RANGE(0xc0, 0xc1) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0xd0, 0xdf) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0xc0, 0xc1) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_1_w)
AM_RANGE(0xf0, 0xf0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xf2, 0xf2) AM_WRITENOP
@@ -943,13 +943,13 @@ static ADDRESS_MAP_START( psailor2_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x60, 0x61) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x60, 0x6f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x70, 0x7f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x70, 0x7f) AM_WRITE(nbmj9195_clut_0_w)
- AM_RANGE(0xa0, 0xa1) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0xa0, 0xaf) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0xb0, 0xbf) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0xa0, 0xa1) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0xa0, 0xaf) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0xb0, 0xbf) AM_WRITE(nbmj9195_clut_1_w)
AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xe2, 0xe2) AM_WRITENOP
@@ -961,13 +961,13 @@ static ADDRESS_MAP_START( otatidai_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x60, 0x61) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x60, 0x6f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x70, 0x7f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x70, 0x7f) AM_WRITE(nbmj9195_clut_0_w)
- AM_RANGE(0x80, 0x81) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0x80, 0x8f) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0x90, 0x9f) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0x90, 0x9f) AM_WRITE(nbmj9195_clut_1_w)
AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xa8, 0xa8) AM_WRITENOP
@@ -979,31 +979,31 @@ static ADDRESS_MAP_START( yosimoto_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x60, 0x61) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x60, 0x6f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x70, 0x7f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x70, 0x7f) AM_WRITE(nbmj9195_clut_0_w)
AM_RANGE(0x90, 0x90) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0x94, 0x94) AM_WRITENOP
AM_RANGE(0x98, 0x98) AM_WRITENOP
AM_RANGE(0x9c, 0x9c) AM_WRITE(nbmj9195_inputportsel_w)
- AM_RANGE(0xc0, 0xc1) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0xd0, 0xdf) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0xc0, 0xc1) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_1_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( jituroku_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x60, 0x61) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x60, 0x6f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x70, 0x7f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x70, 0x7f) AM_WRITE(nbmj9195_clut_0_w)
- AM_RANGE(0xc0, 0xc1) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0xd0, 0xdf) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0xc0, 0xc1) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_1_w)
AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xe8, 0xe8) AM_WRITENOP
@@ -1020,18 +1020,18 @@ static ADDRESS_MAP_START( ngpgal_io_map, AS_IO, 8, nbmj9195_state )
AM_RANGE(0xa8, 0xa8) AM_WRITENOP
AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_inputportsel_w)
- AM_RANGE(0xc0, 0xc1) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0xd0, 0xdf) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0xc0, 0xc1) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_0_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mjgottsu_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x80, 0x81) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x80, 0x8f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x90, 0x9f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x90, 0x9f) AM_WRITE(nbmj9195_clut_0_w)
AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xa4, 0xa4) AM_WRITENOP
@@ -1048,18 +1048,18 @@ static ADDRESS_MAP_START( cmehyou_io_map, AS_IO, 8, nbmj9195_state )
AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_inputportsel_w)
AM_RANGE(0xb4, 0xb4) AM_WRITENOP
- AM_RANGE(0xc0, 0xc1) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0xd0, 0xdf) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0xc0, 0xc1) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_0_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mjkoiura_io_map, AS_IO, 8, nbmj9195_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
- AM_RANGE(0x80, 0x81) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0x80, 0x8f) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0x90, 0x9f) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0x90, 0x9f) AM_WRITE(nbmj9195_clut_0_w)
AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xa4, 0xa4) AM_WRITENOP
@@ -1076,9 +1076,9 @@ static ADDRESS_MAP_START( mkoiuraa_io_map, AS_IO, 8, nbmj9195_state )
AM_RANGE(0xa8, 0xa8) AM_WRITENOP
AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_inputportsel_w)
- AM_RANGE(0xc0, 0xc1) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0xd0, 0xdf) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0xc0, 0xc1) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_0_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mscoutm_io_map, AS_IO, 8, nbmj9195_state )
@@ -1091,14 +1091,14 @@ static ADDRESS_MAP_START( mscoutm_io_map, AS_IO, 8, nbmj9195_state )
AM_RANGE(0xa0, 0xa6) AM_WRITENOP // nb22090 param ?
- AM_RANGE(0xc0, 0xc1) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
+ AM_RANGE(0xc0, 0xc1) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_0_w)
- AM_RANGE(0xd0, 0xdf) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
- AM_RANGE(0xe0, 0xe1) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0xe0, 0xef) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
+ AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_0_w)
+ AM_RANGE(0xe0, 0xe1) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0xe0, 0xef) AM_WRITE(nbmj9195_blitter_1_w)
- AM_RANGE(0xf0, 0xff) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0xf0, 0xff) AM_WRITE(nbmj9195_clut_1_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( imekura_io_map, AS_IO, 8, nbmj9195_state )
@@ -1111,14 +1111,14 @@ static ADDRESS_MAP_START( imekura_io_map, AS_IO, 8, nbmj9195_state )
AM_RANGE(0xb0, 0xb6) AM_WRITENOP // nb22090 param ?
- AM_RANGE(0xc0, 0xc1) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
+ AM_RANGE(0xc0, 0xc1) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_0_w)
- AM_RANGE(0xd0, 0xdf) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_0_w)
- AM_RANGE(0xe0, 0xe1) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0xe0, 0xef) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
- AM_RANGE(0xf0, 0xff) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0xe0, 0xe1) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0xe0, 0xef) AM_WRITE(nbmj9195_blitter_1_w)
+ AM_RANGE(0xf0, 0xff) AM_WRITE(nbmj9195_clut_1_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( mjegolf_io_map, AS_IO, 8, nbmj9195_state )
@@ -1127,14 +1127,14 @@ static ADDRESS_MAP_START( mjegolf_io_map, AS_IO, 8, nbmj9195_state )
AM_RANGE(0x80, 0x86) AM_WRITENOP // nb22090 param ?
- AM_RANGE(0xa0, 0xa1) AM_READ_LEGACY(nbmj9195_blitter_0_r)
- AM_RANGE(0xa0, 0xaf) AM_WRITE_LEGACY(nbmj9195_blitter_0_w)
- AM_RANGE(0xb0, 0xbf) AM_WRITE_LEGACY(nbmj9195_clut_0_w)
+ AM_RANGE(0xa0, 0xa1) AM_READ(nbmj9195_blitter_0_r)
+ AM_RANGE(0xa0, 0xaf) AM_WRITE(nbmj9195_blitter_0_w)
+ AM_RANGE(0xb0, 0xbf) AM_WRITE(nbmj9195_clut_0_w)
- AM_RANGE(0xc0, 0xc1) AM_READ_LEGACY(nbmj9195_blitter_1_r)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(nbmj9195_blitter_1_w)
+ AM_RANGE(0xc0, 0xc1) AM_READ(nbmj9195_blitter_1_r)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_1_w)
- AM_RANGE(0xd0, 0xdf) AM_WRITE_LEGACY(nbmj9195_clut_1_w)
+ AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_1_w)
AM_RANGE(0xe0, 0xe0) AM_READ(mscoutm_dipsw_1_r)
AM_RANGE(0xe2, 0xe2) AM_READ(mscoutm_dipsw_0_r)
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index b8f6f44380b..4ad6c934dcb 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -289,18 +289,18 @@ static WRITE8_DEVICE_HANDLER( city_sound_bank_w )
static ADDRESS_MAP_START( nemesis_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x040000, 0x04ffff) AM_RAM_WRITE_LEGACY(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
+ AM_RANGE(0x040000, 0x04ffff) AM_RAM_WRITE(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
AM_RANGE(0x050000, 0x051fff) AM_RAM
AM_RANGE(0x050000, 0x0503ff) AM_BASE(m_xscroll1)
AM_RANGE(0x050400, 0x0507ff) AM_BASE(m_xscroll2)
AM_RANGE(0x050f00, 0x050f7f) AM_BASE(m_yscroll2)
AM_RANGE(0x050f80, 0x050fff) AM_BASE(m_yscroll1)
- AM_RANGE(0x052000, 0x052fff) AM_RAM_WRITE_LEGACY(nemesis_videoram1_word_w) AM_BASE(m_videoram1) /* VRAM */
- AM_RANGE(0x053000, 0x053fff) AM_RAM_WRITE_LEGACY(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
- AM_RANGE(0x054000, 0x054fff) AM_RAM_WRITE_LEGACY(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
- AM_RANGE(0x055000, 0x055fff) AM_RAM_WRITE_LEGACY(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
+ AM_RANGE(0x052000, 0x052fff) AM_RAM_WRITE(nemesis_videoram1_word_w) AM_BASE(m_videoram1) /* VRAM */
+ AM_RANGE(0x053000, 0x053fff) AM_RAM_WRITE(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x054000, 0x054fff) AM_RAM_WRITE(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
+ AM_RANGE(0x055000, 0x055fff) AM_RAM_WRITE(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
AM_RANGE(0x056000, 0x056fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x05a000, 0x05afff) AM_RAM_WRITE_LEGACY(nemesis_palette_word_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x05a000, 0x05afff) AM_RAM_WRITE(nemesis_palette_word_w) AM_BASE(m_paletteram)
AM_RANGE(0x05c000, 0x05c001) AM_WRITE(nemesis_soundlatch_word_w)
AM_RANGE(0x05c400, 0x05c401) AM_READ_PORT("DSW0")
AM_RANGE(0x05c402, 0x05c403) AM_READ_PORT("DSW1")
@@ -311,8 +311,8 @@ static ADDRESS_MAP_START( nemesis_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x05cc06, 0x05cc07) AM_READ_PORT("TEST")
AM_RANGE(0x05e000, 0x05e001) AM_WRITE(nemesis_irq_enable_word_w)
AM_RANGE(0x05e002, 0x05e003) AM_WRITENOP /* not used irq */
- AM_RANGE(0x05e004, 0x05e005) AM_WRITE_LEGACY(nemesis_gfx_flipx_word_w)
- AM_RANGE(0x05e006, 0x05e007) AM_WRITE_LEGACY(nemesis_gfx_flipy_word_w)
+ AM_RANGE(0x05e004, 0x05e005) AM_WRITE(nemesis_gfx_flipx_word_w)
+ AM_RANGE(0x05e006, 0x05e007) AM_WRITE(nemesis_gfx_flipy_word_w)
AM_RANGE(0x05e008, 0x05e009) AM_WRITENOP /* not used irq */
AM_RANGE(0x05e00e, 0x05e00f) AM_WRITENOP /* not used irq */
AM_RANGE(0x060000, 0x067fff) AM_RAM /* WORK RAM */
@@ -322,19 +322,19 @@ static ADDRESS_MAP_START( gx400_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM /* ROM BIOS */
AM_RANGE(0x010000, 0x01ffff) AM_RAM
AM_RANGE(0x020000, 0x0287ff) AM_READWRITE(gx400_sharedram_word_r, gx400_sharedram_word_w)
- AM_RANGE(0x030000, 0x03ffff) AM_RAM_WRITE_LEGACY(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
+ AM_RANGE(0x030000, 0x03ffff) AM_RAM_WRITE(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
AM_RANGE(0x050000, 0x051fff) AM_RAM
AM_RANGE(0x050000, 0x0503ff) AM_BASE(m_xscroll1)
AM_RANGE(0x050400, 0x0507ff) AM_BASE(m_xscroll2)
AM_RANGE(0x050f00, 0x050f7f) AM_BASE(m_yscroll2)
AM_RANGE(0x050f80, 0x050fff) AM_BASE(m_yscroll1)
- AM_RANGE(0x052000, 0x052fff) AM_RAM_WRITE_LEGACY(nemesis_videoram1_word_w) AM_BASE(m_videoram1) /* VRAM */
- AM_RANGE(0x053000, 0x053fff) AM_RAM_WRITE_LEGACY(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
- AM_RANGE(0x054000, 0x054fff) AM_RAM_WRITE_LEGACY(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
- AM_RANGE(0x055000, 0x055fff) AM_RAM_WRITE_LEGACY(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
+ AM_RANGE(0x052000, 0x052fff) AM_RAM_WRITE(nemesis_videoram1_word_w) AM_BASE(m_videoram1) /* VRAM */
+ AM_RANGE(0x053000, 0x053fff) AM_RAM_WRITE(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x054000, 0x054fff) AM_RAM_WRITE(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
+ AM_RANGE(0x055000, 0x055fff) AM_RAM_WRITE(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
AM_RANGE(0x056000, 0x056fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x057000, 0x057fff) AM_RAM /* needed for twinbee */
- AM_RANGE(0x05a000, 0x05afff) AM_RAM_WRITE_LEGACY(nemesis_palette_word_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x05a000, 0x05afff) AM_RAM_WRITE(nemesis_palette_word_w) AM_BASE(m_paletteram)
AM_RANGE(0x05c000, 0x05c001) AM_WRITE(nemesis_soundlatch_word_w)
AM_RANGE(0x05c402, 0x05c403) AM_READ_PORT("DSW0")
AM_RANGE(0x05c404, 0x05c405) AM_READ_PORT("DSW1")
@@ -345,8 +345,8 @@ static ADDRESS_MAP_START( gx400_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x05cc04, 0x05cc05) AM_READ_PORT("IN2")
AM_RANGE(0x05e000, 0x05e001) AM_WRITE(gx400_irq2_enable_word_w) /* ?? */
AM_RANGE(0x05e002, 0x05e003) AM_WRITE(gx400_irq1_enable_word_w) /* ?? */
- AM_RANGE(0x05e004, 0x05e005) AM_WRITE_LEGACY(nemesis_gfx_flipx_word_w)
- AM_RANGE(0x05e006, 0x05e007) AM_WRITE_LEGACY(nemesis_gfx_flipy_word_w)
+ AM_RANGE(0x05e004, 0x05e005) AM_WRITE(nemesis_gfx_flipx_word_w)
+ AM_RANGE(0x05e006, 0x05e007) AM_WRITE(nemesis_gfx_flipy_word_w)
AM_RANGE(0x05e008, 0x05e009) AM_WRITENOP /* IRQ acknowledge??? */
AM_RANGE(0x05e00e, 0x05e00f) AM_WRITE(gx400_irq4_enable_word_w) /* ?? */
AM_RANGE(0x060000, 0x07ffff) AM_RAM /* WORK RAM */
@@ -355,18 +355,18 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( konamigt_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x040000, 0x04ffff) AM_RAM_WRITE_LEGACY(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
+ AM_RANGE(0x040000, 0x04ffff) AM_RAM_WRITE(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
AM_RANGE(0x050000, 0x051fff) AM_RAM
AM_RANGE(0x050000, 0x0503ff) AM_BASE(m_xscroll1)
AM_RANGE(0x050400, 0x0507ff) AM_BASE(m_xscroll2)
AM_RANGE(0x050f00, 0x050f7f) AM_BASE(m_yscroll2)
AM_RANGE(0x050f80, 0x050fff) AM_BASE(m_yscroll1)
- AM_RANGE(0x052000, 0x052fff) AM_RAM_WRITE_LEGACY(nemesis_videoram1_word_w) AM_BASE(m_videoram1) /* VRAM */
- AM_RANGE(0x053000, 0x053fff) AM_RAM_WRITE_LEGACY(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
- AM_RANGE(0x054000, 0x054fff) AM_RAM_WRITE_LEGACY(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
- AM_RANGE(0x055000, 0x055fff) AM_RAM_WRITE_LEGACY(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
+ AM_RANGE(0x052000, 0x052fff) AM_RAM_WRITE(nemesis_videoram1_word_w) AM_BASE(m_videoram1) /* VRAM */
+ AM_RANGE(0x053000, 0x053fff) AM_RAM_WRITE(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x054000, 0x054fff) AM_RAM_WRITE(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
+ AM_RANGE(0x055000, 0x055fff) AM_RAM_WRITE(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
AM_RANGE(0x056000, 0x056fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x05a000, 0x05afff) AM_RAM_WRITE_LEGACY(nemesis_palette_word_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x05a000, 0x05afff) AM_RAM_WRITE(nemesis_palette_word_w) AM_BASE(m_paletteram)
AM_RANGE(0x05c000, 0x05c001) AM_WRITE(nemesis_soundlatch_word_w)
AM_RANGE(0x05c400, 0x05c401) AM_READ_PORT("DSW0")
AM_RANGE(0x05c402, 0x05c403) AM_READ_PORT("DSW1")
@@ -377,8 +377,8 @@ static ADDRESS_MAP_START( konamigt_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x05cc06, 0x05cc07) AM_READ_PORT("TEST")
AM_RANGE(0x05e000, 0x05e001) AM_WRITE(konamigt_irq2_enable_word_w)
AM_RANGE(0x05e002, 0x05e003) AM_WRITE(konamigt_irq_enable_word_w)
- AM_RANGE(0x05e004, 0x05e005) AM_WRITE_LEGACY(nemesis_gfx_flipx_word_w)
- AM_RANGE(0x05e006, 0x05e007) AM_WRITE_LEGACY(nemesis_gfx_flipy_word_w)
+ AM_RANGE(0x05e004, 0x05e005) AM_WRITE(nemesis_gfx_flipx_word_w)
+ AM_RANGE(0x05e006, 0x05e007) AM_WRITE(nemesis_gfx_flipy_word_w)
AM_RANGE(0x05e008, 0x05e009) AM_WRITENOP /* not used irq */
AM_RANGE(0x05e00e, 0x05e00f) AM_WRITENOP /* not used irq */
AM_RANGE(0x060000, 0x067fff) AM_RAM /* WORK RAM */
@@ -389,18 +389,18 @@ static ADDRESS_MAP_START( rf2_gx400_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM /* ROM BIOS */
AM_RANGE(0x010000, 0x01ffff) AM_RAM
AM_RANGE(0x020000, 0x0287ff) AM_READWRITE(gx400_sharedram_word_r, gx400_sharedram_word_w)
- AM_RANGE(0x030000, 0x03ffff) AM_RAM_WRITE_LEGACY(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
+ AM_RANGE(0x030000, 0x03ffff) AM_RAM_WRITE(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
AM_RANGE(0x050000, 0x051fff) AM_RAM
AM_RANGE(0x050000, 0x0503ff) AM_BASE(m_xscroll1)
AM_RANGE(0x050400, 0x0507ff) AM_BASE(m_xscroll2)
AM_RANGE(0x050f00, 0x050f7f) AM_BASE(m_yscroll2)
AM_RANGE(0x050f80, 0x050fff) AM_BASE(m_yscroll1)
- AM_RANGE(0x052000, 0x052fff) AM_RAM_WRITE_LEGACY(nemesis_videoram1_word_w) AM_BASE(m_videoram1) /* VRAM */
- AM_RANGE(0x053000, 0x053fff) AM_RAM_WRITE_LEGACY(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
- AM_RANGE(0x054000, 0x054fff) AM_RAM_WRITE_LEGACY(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
- AM_RANGE(0x055000, 0x055fff) AM_RAM_WRITE_LEGACY(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
+ AM_RANGE(0x052000, 0x052fff) AM_RAM_WRITE(nemesis_videoram1_word_w) AM_BASE(m_videoram1) /* VRAM */
+ AM_RANGE(0x053000, 0x053fff) AM_RAM_WRITE(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x054000, 0x054fff) AM_RAM_WRITE(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
+ AM_RANGE(0x055000, 0x055fff) AM_RAM_WRITE(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
AM_RANGE(0x056000, 0x056fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x05a000, 0x05afff) AM_RAM_WRITE_LEGACY(nemesis_palette_word_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x05a000, 0x05afff) AM_RAM_WRITE(nemesis_palette_word_w) AM_BASE(m_paletteram)
AM_RANGE(0x05c000, 0x05c001) AM_WRITE(nemesis_soundlatch_word_w)
AM_RANGE(0x05c402, 0x05c403) AM_READ_PORT("DSW0")
AM_RANGE(0x05c404, 0x05c405) AM_READ_PORT("DSW1")
@@ -411,8 +411,8 @@ static ADDRESS_MAP_START( rf2_gx400_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x05cc04, 0x05cc05) AM_READ_PORT("IN2")
AM_RANGE(0x05e000, 0x05e001) AM_WRITE(gx400_irq2_enable_word_w) /* ?? */
AM_RANGE(0x05e002, 0x05e003) AM_WRITE(gx400_irq1_enable_word_w) /* ?? */
- AM_RANGE(0x05e004, 0x05e005) AM_WRITE_LEGACY(nemesis_gfx_flipx_word_w)
- AM_RANGE(0x05e006, 0x05e007) AM_WRITE_LEGACY(nemesis_gfx_flipy_word_w)
+ AM_RANGE(0x05e004, 0x05e005) AM_WRITE(nemesis_gfx_flipx_word_w)
+ AM_RANGE(0x05e006, 0x05e007) AM_WRITE(nemesis_gfx_flipy_word_w)
AM_RANGE(0x05e008, 0x05e009) AM_WRITENOP /* IRQ acknowledge??? */
AM_RANGE(0x05e00e, 0x05e00f) AM_WRITE(gx400_irq4_enable_word_w) /* ?? */
AM_RANGE(0x060000, 0x067fff) AM_RAM /* WORK RAM */
@@ -460,8 +460,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( salamand_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x087fff) AM_RAM
- AM_RANGE(0x090000, 0x091fff) AM_RAM_WRITE_LEGACY(salamander_palette_word_w) AM_BASE(m_paletteram)
- AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE_LEGACY(salamand_control_port_word_w) /* irq enable, flipscreen, etc. */
+ AM_RANGE(0x090000, 0x091fff) AM_RAM_WRITE(salamander_palette_word_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(salamand_control_port_word_w) /* irq enable, flipscreen, etc. */
AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(nemesis_soundlatch_word_w)
AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("DSW0")
AM_RANGE(0x0c0004, 0x0c0005) AM_WRITE(watchdog_reset16_w) /* probably */
@@ -469,11 +469,11 @@ static ADDRESS_MAP_START( salamand_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x0c2002, 0x0c2003) AM_READ_PORT("IN1")
AM_RANGE(0x0c2004, 0x0c2005) AM_READ_PORT("IN2")
AM_RANGE(0x0c2006, 0x0c2007) AM_READ_PORT("DSW1")
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE_LEGACY(nemesis_videoram2_word_w) AM_BASE(m_videoram2) /* VRAM */
- AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE_LEGACY(nemesis_videoram1_word_w) AM_BASE(m_videoram1)
- AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE_LEGACY(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
- AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE_LEGACY(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
- AM_RANGE(0x120000, 0x12ffff) AM_RAM_WRITE_LEGACY(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(nemesis_videoram2_word_w) AM_BASE(m_videoram2) /* VRAM */
+ AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(nemesis_videoram1_word_w) AM_BASE(m_videoram1)
+ AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
+ AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
+ AM_RANGE(0x120000, 0x12ffff) AM_RAM_WRITE(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
AM_RANGE(0x180000, 0x180fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* more sprite ram ??? */
AM_RANGE(0x190000, 0x191fff) AM_RAM
AM_RANGE(0x190000, 0x1903ff) AM_BASE(m_xscroll2)
@@ -484,9 +484,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( blkpnthr_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x080000, 0x081fff) AM_RAM_WRITE_LEGACY(salamander_palette_word_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x080000, 0x081fff) AM_RAM_WRITE(salamander_palette_word_w) AM_BASE(m_paletteram)
AM_RANGE(0x090000, 0x097fff) AM_RAM
- AM_RANGE(0x0a0000, 0x0a0001) AM_RAM_WRITE_LEGACY(salamand_control_port_word_w) /* irq enable, flipscreen, etc. */
+ AM_RANGE(0x0a0000, 0x0a0001) AM_RAM_WRITE(salamand_control_port_word_w) /* irq enable, flipscreen, etc. */
AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(nemesis_soundlatch_word_w)
AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("DSW0")
AM_RANGE(0x0c0004, 0x0c0005) AM_WRITE(watchdog_reset16_w) /* probably */
@@ -494,11 +494,11 @@ static ADDRESS_MAP_START( blkpnthr_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x0c2002, 0x0c2003) AM_READ_PORT("IN1")
AM_RANGE(0x0c2004, 0x0c2005) AM_READ_PORT("IN2")
AM_RANGE(0x0c2006, 0x0c2007) AM_READ_PORT("DSW1")
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE_LEGACY(nemesis_colorram1_word_w) AM_BASE(m_colorram1) AM_MIRROR(0x4000) /* VRAM */
- AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE_LEGACY(nemesis_colorram2_word_w) AM_BASE(m_colorram2) AM_MIRROR(0x4000)
- AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE_LEGACY(nemesis_videoram1_word_w) AM_BASE(m_videoram1)
- AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE_LEGACY(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
- AM_RANGE(0x120000, 0x12ffff) AM_RAM_WRITE_LEGACY(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(nemesis_colorram1_word_w) AM_BASE(m_colorram1) AM_MIRROR(0x4000) /* VRAM */
+ AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(nemesis_colorram2_word_w) AM_BASE(m_colorram2) AM_MIRROR(0x4000)
+ AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(nemesis_videoram1_word_w) AM_BASE(m_videoram1)
+ AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x120000, 0x12ffff) AM_RAM_WRITE(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
AM_RANGE(0x180000, 0x181fff) AM_RAM
AM_RANGE(0x180000, 0x1803ff) AM_BASE(m_xscroll1)
AM_RANGE(0x180400, 0x1807ff) AM_BASE(m_xscroll2)
@@ -510,7 +510,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( citybomb_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x080000, 0x087fff) AM_RAM
- AM_RANGE(0x0e0000, 0x0e1fff) AM_RAM_WRITE_LEGACY(salamander_palette_word_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x0e0000, 0x0e1fff) AM_RAM_WRITE(salamander_palette_word_w) AM_BASE(m_paletteram)
AM_RANGE(0x0f0000, 0x0f0001) AM_READ_PORT("DSW1")
AM_RANGE(0x0f0002, 0x0f0003) AM_READ_PORT("IN2")
AM_RANGE(0x0f0004, 0x0f0005) AM_READ_PORT("IN1")
@@ -519,13 +519,13 @@ static ADDRESS_MAP_START( citybomb_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x0f0010, 0x0f0011) AM_WRITE(nemesis_soundlatch_word_w)
AM_RANGE(0x0f0018, 0x0f0019) AM_WRITE(watchdog_reset16_w) /* probably */
AM_RANGE(0x0f0020, 0x0f0021) AM_READ(selected_ip_word_r) AM_WRITENOP /* WEC Le Mans 24 control? */
- AM_RANGE(0x0f8000, 0x0f8001) AM_WRITE_LEGACY(salamand_control_port_word_w) /* irq enable, flipscreen, etc. */
+ AM_RANGE(0x0f8000, 0x0f8001) AM_WRITE(salamand_control_port_word_w) /* irq enable, flipscreen, etc. */
AM_RANGE(0x100000, 0x1bffff) AM_ROM
- AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE_LEGACY(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
- AM_RANGE(0x210000, 0x210fff) AM_RAM_WRITE_LEGACY(nemesis_videoram1_word_w) AM_BASE(m_videoram1) /* VRAM */
- AM_RANGE(0x211000, 0x211fff) AM_RAM_WRITE_LEGACY(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
- AM_RANGE(0x212000, 0x212fff) AM_RAM_WRITE_LEGACY(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
- AM_RANGE(0x213000, 0x213fff) AM_RAM_WRITE_LEGACY(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
+ AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
+ AM_RANGE(0x210000, 0x210fff) AM_RAM_WRITE(nemesis_videoram1_word_w) AM_BASE(m_videoram1) /* VRAM */
+ AM_RANGE(0x211000, 0x211fff) AM_RAM_WRITE(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x212000, 0x212fff) AM_RAM_WRITE(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
+ AM_RANGE(0x213000, 0x213fff) AM_RAM_WRITE(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
AM_RANGE(0x300000, 0x301fff) AM_RAM
AM_RANGE(0x300000, 0x3003ff) AM_BASE(m_xscroll1)
AM_RANGE(0x300400, 0x3007ff) AM_BASE(m_xscroll2)
@@ -537,7 +537,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( nyanpani_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x040000, 0x047fff) AM_RAM
- AM_RANGE(0x060000, 0x061fff) AM_RAM_WRITE_LEGACY(salamander_palette_word_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x060000, 0x061fff) AM_RAM_WRITE(salamander_palette_word_w) AM_BASE(m_paletteram)
AM_RANGE(0x100000, 0x13ffff) AM_ROM
AM_RANGE(0x070000, 0x070001) AM_READ_PORT("DSW1")
AM_RANGE(0x070002, 0x070003) AM_READ_PORT("IN2")
@@ -546,12 +546,12 @@ static ADDRESS_MAP_START( nyanpani_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x070008, 0x070009) AM_READ_PORT("DSW0")
AM_RANGE(0x070010, 0x070011) AM_WRITE(nemesis_soundlatch_word_w)
AM_RANGE(0x070018, 0x070019) AM_WRITE(watchdog_reset16_w) /* probably */
- AM_RANGE(0x078000, 0x078001) AM_WRITE_LEGACY(salamand_control_port_word_w) /* irq enable, flipscreen, etc. */
- AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE_LEGACY(nemesis_videoram1_word_w) AM_BASE(m_videoram1) /* VRAM */
- AM_RANGE(0x201000, 0x201fff) AM_RAM_WRITE_LEGACY(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
- AM_RANGE(0x202000, 0x202fff) AM_RAM_WRITE_LEGACY(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
- AM_RANGE(0x203000, 0x203fff) AM_RAM_WRITE_LEGACY(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
- AM_RANGE(0x210000, 0x21ffff) AM_RAM_WRITE_LEGACY(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
+ AM_RANGE(0x078000, 0x078001) AM_WRITE(salamand_control_port_word_w) /* irq enable, flipscreen, etc. */
+ AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(nemesis_videoram1_word_w) AM_BASE(m_videoram1) /* VRAM */
+ AM_RANGE(0x201000, 0x201fff) AM_RAM_WRITE(nemesis_videoram2_word_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x202000, 0x202fff) AM_RAM_WRITE(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
+ AM_RANGE(0x203000, 0x203fff) AM_RAM_WRITE(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
+ AM_RANGE(0x210000, 0x21ffff) AM_RAM_WRITE(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
AM_RANGE(0x300000, 0x300fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* more sprite ram ??? */
AM_RANGE(0x310000, 0x311fff) AM_RAM
AM_RANGE(0x310000, 0x3103ff) AM_BASE(m_xscroll1)
@@ -606,8 +606,8 @@ static ADDRESS_MAP_START( hcrash_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x05ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM
- AM_RANGE(0x090000, 0x091fff) AM_RAM_WRITE_LEGACY(salamander_palette_word_w) AM_BASE(m_paletteram)
- AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE_LEGACY(salamand_control_port_word_w) /* irq enable, flipscreen, etc. */
+ AM_RANGE(0x090000, 0x091fff) AM_RAM_WRITE(salamander_palette_word_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(salamand_control_port_word_w) /* irq enable, flipscreen, etc. */
AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(nemesis_soundlatch_word_w)
AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("DSW0")
AM_RANGE(0x0c0004, 0x0c0005) AM_READ_PORT("DSW1")
@@ -620,11 +620,11 @@ static ADDRESS_MAP_START( hcrash_map, AS_PROGRAM, 16, nemesis_state )
AM_RANGE(0x0c2804, 0x0c2805) AM_WRITENOP
AM_RANGE(0x0c4000, 0x0c4001) AM_READ_PORT("IN1") AM_WRITE(selected_ip_word_w)
AM_RANGE(0x0c4002, 0x0c4003) AM_READ(selected_ip_word_r) AM_WRITENOP /* WEC Le Mans 24 control. latches the value read previously */
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE_LEGACY(nemesis_videoram2_word_w) AM_BASE(m_videoram2) /* VRAM */
- AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE_LEGACY(nemesis_videoram1_word_w) AM_BASE(m_videoram1)
- AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE_LEGACY(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
- AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE_LEGACY(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
- AM_RANGE(0x120000, 0x12ffff) AM_RAM_WRITE_LEGACY(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(nemesis_videoram2_word_w) AM_BASE(m_videoram2) /* VRAM */
+ AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(nemesis_videoram1_word_w) AM_BASE(m_videoram1)
+ AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(nemesis_colorram2_word_w) AM_BASE(m_colorram2)
+ AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(nemesis_colorram1_word_w) AM_BASE(m_colorram1)
+ AM_RANGE(0x120000, 0x12ffff) AM_RAM_WRITE(nemesis_charram_word_w) AM_BASE_SIZE(m_charram, m_charram_size)
AM_RANGE(0x180000, 0x180fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x190000, 0x191fff) AM_RAM
AM_RANGE(0x190000, 0x1903ff) AM_BASE(m_xscroll2)
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 4a38b952e86..c9fa725d7c5 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -1098,10 +1098,10 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, neogeo_state )
AM_RANGE(0x380000, 0x380001) AM_MIRROR(0x01fffe) AM_READ_PORT("IN2")
AM_RANGE(0x380000, 0x38007f) AM_MIRROR(0x01ff80) AM_WRITE(io_control_w)
AM_RANGE(0x3a0000, 0x3a001f) AM_MIRROR(0x01ffe0) AM_READ(neogeo_unmapped_r) AM_WRITE(system_control_w)
- AM_RANGE(0x3c0000, 0x3c0007) AM_MIRROR(0x01fff8) AM_READ_LEGACY(neogeo_video_register_r)
- AM_RANGE(0x3c0000, 0x3c000f) AM_MIRROR(0x01fff0) AM_WRITE_LEGACY(neogeo_video_register_w)
+ AM_RANGE(0x3c0000, 0x3c0007) AM_MIRROR(0x01fff8) AM_READ(neogeo_video_register_r)
+ AM_RANGE(0x3c0000, 0x3c000f) AM_MIRROR(0x01fff0) AM_WRITE(neogeo_video_register_w)
AM_RANGE(0x3e0000, 0x3fffff) AM_READ(neogeo_unmapped_r)
- AM_RANGE(0x400000, 0x401fff) AM_MIRROR(0x3fe000) AM_READWRITE_LEGACY(neogeo_paletteram_r, neogeo_paletteram_w)
+ AM_RANGE(0x400000, 0x401fff) AM_MIRROR(0x3fe000) AM_READWRITE(neogeo_paletteram_r, neogeo_paletteram_w)
AM_RANGE(0x800000, 0x800fff) AM_READWRITE(memcard_r, memcard_w)
AM_RANGE(0xc00000, 0xc1ffff) AM_MIRROR(0x0e0000) AM_ROMBANK(NEOGEO_BANK_BIOS)
AM_RANGE(0xd00000, 0xd0ffff) AM_MIRROR(0x0f0000) AM_RAM_WRITE(save_ram_w) AM_BASE_LEGACY(&save_ram)
diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c
index e21f87f79c9..178861ea962 100644
--- a/src/mame/drivers/news.c
+++ b/src/mame/drivers/news.c
@@ -21,13 +21,13 @@ driver by David Haywood
static ADDRESS_MAP_START( news_map, AS_PROGRAM, 8, news_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* 4000-7fff is written to during startup, probably leftover code */
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(news_fgram_w) AM_BASE(m_fgram)
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(news_bgram_w) AM_BASE(m_bgram)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(news_fgram_w) AM_BASE(m_fgram)
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(news_bgram_w) AM_BASE(m_bgram)
AM_RANGE(0x9000, 0x91ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_be_w) AM_SHARE("paletteram")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSW")
AM_RANGE(0xc001, 0xc001) AM_READ_PORT("INPUTS")
AM_RANGE(0xc002, 0xc002) AM_DEVREADWRITE("oki", okim6295_device, read, write)
- AM_RANGE(0xc003, 0xc003) AM_WRITE_LEGACY(news_bgpic_w)
+ AM_RANGE(0xc003, 0xc003) AM_WRITE(news_bgpic_w)
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index 13e5fc2883d..2ceef72966d 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -400,11 +400,11 @@ static ADDRESS_MAP_START( ninjakd2_main_cpu, AS_PROGRAM, 8, ninjakd2_state )
AM_RANGE(0xc200, 0xc200) AM_WRITE(soundlatch_w)
AM_RANGE(0xc201, 0xc201) AM_WRITE(ninjakd2_soundreset_w) // sound reset + flip screen
AM_RANGE(0xc202, 0xc202) AM_WRITE(ninjakd2_bankselect_w)
- AM_RANGE(0xc203, 0xc203) AM_WRITE_LEGACY(ninjakd2_sprite_overdraw_w)
- AM_RANGE(0xc208, 0xc20c) AM_WRITE_LEGACY(ninjakd2_bg_ctrl_w) // scroll + enable
+ AM_RANGE(0xc203, 0xc203) AM_WRITE(ninjakd2_sprite_overdraw_w)
+ AM_RANGE(0xc208, 0xc20c) AM_WRITE(ninjakd2_bg_ctrl_w) // scroll + enable
AM_RANGE(0xc800, 0xcdff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(ninjakd2_fgvideoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(ninjakd2_bgvideoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(ninjakd2_fgvideoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(ninjakd2_bgvideoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0xe000, 0xf9ff) AM_RAM
AM_RANGE(0xfa00, 0xffff) AM_RAM AM_BASE(m_spriteram)
ADDRESS_MAP_END
@@ -415,8 +415,8 @@ static ADDRESS_MAP_START( mnight_main_cpu, AS_PROGRAM, 8, ninjakd2_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xd9ff) AM_RAM
AM_RANGE(0xda00, 0xdfff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(ninjakd2_bgvideoram_w) AM_BASE(m_bg_videoram)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(ninjakd2_fgvideoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(ninjakd2_bgvideoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(ninjakd2_fgvideoram_w) AM_BASE(m_fg_videoram)
AM_RANGE(0xf000, 0xf5ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("KEYCOIN")
AM_RANGE(0xf801, 0xf801) AM_READ_PORT("PAD1")
@@ -426,8 +426,8 @@ static ADDRESS_MAP_START( mnight_main_cpu, AS_PROGRAM, 8, ninjakd2_state )
AM_RANGE(0xfa00, 0xfa00) AM_WRITE(soundlatch_w)
AM_RANGE(0xfa01, 0xfa01) AM_WRITE(ninjakd2_soundreset_w)
AM_RANGE(0xfa02, 0xfa02) AM_WRITE(ninjakd2_bankselect_w)
- AM_RANGE(0xfa03, 0xfa03) AM_WRITE_LEGACY(ninjakd2_sprite_overdraw_w)
- AM_RANGE(0xfa08, 0xfa0c) AM_WRITE_LEGACY(ninjakd2_bg_ctrl_w) // scroll + enable
+ AM_RANGE(0xfa03, 0xfa03) AM_WRITE(ninjakd2_sprite_overdraw_w)
+ AM_RANGE(0xfa08, 0xfa0c) AM_WRITE(ninjakd2_bg_ctrl_w) // scroll + enable
ADDRESS_MAP_END
@@ -435,10 +435,10 @@ static ADDRESS_MAP_START( robokid_main_cpu, AS_PROGRAM, 8, ninjakd2_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(ninjakd2_fgvideoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0xd000, 0xd3ff) AM_READWRITE_LEGACY(robokid_bg2_videoram_r, robokid_bg2_videoram_w) // banked
- AM_RANGE(0xd400, 0xd7ff) AM_READWRITE_LEGACY(robokid_bg1_videoram_r, robokid_bg1_videoram_w) // banked
- AM_RANGE(0xd800, 0xdbff) AM_READWRITE_LEGACY(robokid_bg0_videoram_r, robokid_bg0_videoram_w) // banked
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(ninjakd2_fgvideoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0xd000, 0xd3ff) AM_READWRITE(robokid_bg2_videoram_r, robokid_bg2_videoram_w) // banked
+ AM_RANGE(0xd400, 0xd7ff) AM_READWRITE(robokid_bg1_videoram_r, robokid_bg1_videoram_w) // banked
+ AM_RANGE(0xd800, 0xdbff) AM_READWRITE(robokid_bg0_videoram_r, robokid_bg0_videoram_w) // banked
AM_RANGE(0xdc00, 0xdc00) AM_READ_PORT("KEYCOIN")
AM_RANGE(0xdc01, 0xdc01) AM_READ_PORT("PAD1")
AM_RANGE(0xdc02, 0xdc02) AM_READ_PORT("PAD2")
@@ -447,13 +447,13 @@ static ADDRESS_MAP_START( robokid_main_cpu, AS_PROGRAM, 8, ninjakd2_state )
AM_RANGE(0xdc00, 0xdc00) AM_WRITE(soundlatch_w)
AM_RANGE(0xdc01, 0xdc01) AM_WRITE(ninjakd2_soundreset_w) // sound reset + flip screen
AM_RANGE(0xdc02, 0xdc02) AM_WRITE(robokid_bankselect_w)
- AM_RANGE(0xdc03, 0xdc03) AM_WRITE_LEGACY(ninjakd2_sprite_overdraw_w)
- AM_RANGE(0xdd00, 0xdd04) AM_WRITE_LEGACY(robokid_bg0_ctrl_w) // scroll + enable
- AM_RANGE(0xdd05, 0xdd05) AM_WRITE_LEGACY(robokid_bg0_bank_w)
- AM_RANGE(0xde00, 0xde04) AM_WRITE_LEGACY(robokid_bg1_ctrl_w) // scroll + enable
- AM_RANGE(0xde05, 0xde05) AM_WRITE_LEGACY(robokid_bg1_bank_w)
- AM_RANGE(0xdf00, 0xdf04) AM_WRITE_LEGACY(robokid_bg2_ctrl_w) // scroll + enable
- AM_RANGE(0xdf05, 0xdf05) AM_WRITE_LEGACY(robokid_bg2_bank_w)
+ AM_RANGE(0xdc03, 0xdc03) AM_WRITE(ninjakd2_sprite_overdraw_w)
+ AM_RANGE(0xdd00, 0xdd04) AM_WRITE(robokid_bg0_ctrl_w) // scroll + enable
+ AM_RANGE(0xdd05, 0xdd05) AM_WRITE(robokid_bg0_bank_w)
+ AM_RANGE(0xde00, 0xde04) AM_WRITE(robokid_bg1_ctrl_w) // scroll + enable
+ AM_RANGE(0xde05, 0xde05) AM_WRITE(robokid_bg1_bank_w)
+ AM_RANGE(0xdf00, 0xdf04) AM_WRITE(robokid_bg2_ctrl_w) // scroll + enable
+ AM_RANGE(0xdf05, 0xdf05) AM_WRITE(robokid_bg2_bank_w)
AM_RANGE(0xe000, 0xf9ff) AM_RAM
AM_RANGE(0xfa00, 0xffff) AM_RAM AM_BASE(m_spriteram)
ADDRESS_MAP_END
@@ -467,19 +467,19 @@ static ADDRESS_MAP_START( omegaf_main_cpu, AS_PROGRAM, 8, ninjakd2_state )
AM_RANGE(0xc000, 0xc000) AM_WRITE(soundlatch_w)
AM_RANGE(0xc001, 0xc001) AM_WRITE(ninjakd2_soundreset_w) // sound reset + flip screen
AM_RANGE(0xc002, 0xc002) AM_WRITE(robokid_bankselect_w)
- AM_RANGE(0xc003, 0xc003) AM_WRITE_LEGACY(ninjakd2_sprite_overdraw_w)
+ AM_RANGE(0xc003, 0xc003) AM_WRITE(ninjakd2_sprite_overdraw_w)
AM_RANGE(0xc004, 0xc006) AM_WRITE(omegaf_io_protection_w)
- AM_RANGE(0xc100, 0xc104) AM_WRITE_LEGACY(robokid_bg0_ctrl_w) // scroll + enable
- AM_RANGE(0xc105, 0xc105) AM_WRITE_LEGACY(robokid_bg0_bank_w)
+ AM_RANGE(0xc100, 0xc104) AM_WRITE(robokid_bg0_ctrl_w) // scroll + enable
+ AM_RANGE(0xc105, 0xc105) AM_WRITE(robokid_bg0_bank_w)
AM_RANGE(0xc1e7, 0xc1e7) AM_READNOP // see notes
- AM_RANGE(0xc200, 0xc204) AM_WRITE_LEGACY(robokid_bg1_ctrl_w) // scroll + enable
- AM_RANGE(0xc205, 0xc205) AM_WRITE_LEGACY(robokid_bg1_bank_w)
- AM_RANGE(0xc300, 0xc304) AM_WRITE_LEGACY(robokid_bg2_ctrl_w) // scroll + enable
- AM_RANGE(0xc305, 0xc305) AM_WRITE_LEGACY(robokid_bg2_bank_w)
- AM_RANGE(0xc400, 0xc7ff) AM_READWRITE_LEGACY(robokid_bg0_videoram_r, robokid_bg0_videoram_w) // banked
- AM_RANGE(0xc800, 0xcbff) AM_READWRITE_LEGACY(robokid_bg1_videoram_r, robokid_bg1_videoram_w) // banked
- AM_RANGE(0xcc00, 0xcfff) AM_READWRITE_LEGACY(robokid_bg2_videoram_r, robokid_bg2_videoram_w) // banked
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(ninjakd2_fgvideoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0xc200, 0xc204) AM_WRITE(robokid_bg1_ctrl_w) // scroll + enable
+ AM_RANGE(0xc205, 0xc205) AM_WRITE(robokid_bg1_bank_w)
+ AM_RANGE(0xc300, 0xc304) AM_WRITE(robokid_bg2_ctrl_w) // scroll + enable
+ AM_RANGE(0xc305, 0xc305) AM_WRITE(robokid_bg2_bank_w)
+ AM_RANGE(0xc400, 0xc7ff) AM_READWRITE(robokid_bg0_videoram_r, robokid_bg0_videoram_w) // banked
+ AM_RANGE(0xc800, 0xcbff) AM_READWRITE(robokid_bg1_videoram_r, robokid_bg1_videoram_w) // banked
+ AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(robokid_bg2_videoram_r, robokid_bg2_videoram_w) // banked
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(ninjakd2_fgvideoram_w) AM_BASE(m_fg_videoram)
AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
AM_RANGE(0xe000, 0xf9ff) AM_RAM
AM_RANGE(0xfa00, 0xffff) AM_RAM AM_BASE(m_spriteram)
diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c
index 19a80f68d92..3ab85786512 100644
--- a/src/mame/drivers/nitedrvr.c
+++ b/src/mame/drivers/nitedrvr.c
@@ -44,14 +44,14 @@
static ADDRESS_MAP_START( nitedrvr_map, AS_PROGRAM, 8, nitedrvr_state )
AM_RANGE(0x0000, 0x00ff) AM_RAM AM_MIRROR(0x100) // SCRAM
- AM_RANGE(0x0200, 0x027f) AM_RAM_WRITE_LEGACY(nitedrvr_videoram_w) AM_MIRROR(0x180) AM_BASE(m_videoram) // PFW
- AM_RANGE(0x0400, 0x05ff) AM_WRITE_LEGACY(nitedrvr_hvc_w) AM_BASE(m_hvc) // POSH, POSV, CHAR, Watchdog
- AM_RANGE(0x0600, 0x07ff) AM_READ_LEGACY(nitedrvr_in0_r)
- AM_RANGE(0x0800, 0x09ff) AM_READ_LEGACY(nitedrvr_in1_r)
- AM_RANGE(0x0a00, 0x0bff) AM_WRITE_LEGACY(nitedrvr_out0_w)
- AM_RANGE(0x0c00, 0x0dff) AM_WRITE_LEGACY(nitedrvr_out1_w)
+ AM_RANGE(0x0200, 0x027f) AM_RAM_WRITE(nitedrvr_videoram_w) AM_MIRROR(0x180) AM_BASE(m_videoram) // PFW
+ AM_RANGE(0x0400, 0x05ff) AM_WRITE(nitedrvr_hvc_w) AM_BASE(m_hvc) // POSH, POSV, CHAR, Watchdog
+ AM_RANGE(0x0600, 0x07ff) AM_READ(nitedrvr_in0_r)
+ AM_RANGE(0x0800, 0x09ff) AM_READ(nitedrvr_in1_r)
+ AM_RANGE(0x0a00, 0x0bff) AM_WRITE(nitedrvr_out0_w)
+ AM_RANGE(0x0c00, 0x0dff) AM_WRITE(nitedrvr_out1_w)
AM_RANGE(0x8000, 0x807f) AM_RAM AM_MIRROR(0x380) AM_BASE(m_videoram) // PFR
- AM_RANGE(0x8400, 0x87ff) AM_READWRITE_LEGACY(nitedrvr_steering_reset_r, nitedrvr_steering_reset_w)
+ AM_RANGE(0x8400, 0x87ff) AM_READWRITE(nitedrvr_steering_reset_r, nitedrvr_steering_reset_w)
AM_RANGE(0x9000, 0x9fff) AM_ROM // ROM1-ROM2
AM_RANGE(0xfff0, 0xffff) AM_ROM // ROM2 for 6502 vectors
ADDRESS_MAP_END
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index 171d960aeac..10fa4161d44 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -346,7 +346,7 @@ static ADDRESS_MAP_START( niyanpai_map, AS_PROGRAM, 16, niyanpai_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x040fff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x0a0000, 0x0a08ff) AM_READWRITE_LEGACY(niyanpai_palette_r,niyanpai_palette_w)
+ AM_RANGE(0x0a0000, 0x0a08ff) AM_READWRITE(niyanpai_palette_r,niyanpai_palette_w)
AM_RANGE(0x0a0900, 0x0a11ff) AM_RAM // palette work ram?
AM_RANGE(0x0bf800, 0x0bffff) AM_RAM
@@ -357,22 +357,22 @@ static ADDRESS_MAP_START( niyanpai_map, AS_PROGRAM, 16, niyanpai_state )
AM_RANGE(0x240000, 0x240009) AM_WRITENOP // unknown
AM_RANGE(0x240200, 0x2403ff) AM_WRITENOP // unknown
- AM_RANGE(0x240400, 0x240403) AM_READ_LEGACY(niyanpai_blitter_0_r)
- AM_RANGE(0x240400, 0x24041f) AM_WRITE_LEGACY(niyanpai_blitter_0_w)
- AM_RANGE(0x240420, 0x24043f) AM_WRITE_LEGACY(niyanpai_clut_0_w)
- AM_RANGE(0x240600, 0x240603) AM_READ_LEGACY(niyanpai_blitter_1_r)
- AM_RANGE(0x240600, 0x24061f) AM_WRITE_LEGACY(niyanpai_blitter_1_w)
- AM_RANGE(0x240620, 0x24063f) AM_WRITE_LEGACY(niyanpai_clut_1_w)
- AM_RANGE(0x240800, 0x240803) AM_READ_LEGACY(niyanpai_blitter_2_r)
- AM_RANGE(0x240800, 0x24081f) AM_WRITE_LEGACY(niyanpai_blitter_2_w)
- AM_RANGE(0x240820, 0x24083f) AM_WRITE_LEGACY(niyanpai_clut_2_w)
+ AM_RANGE(0x240400, 0x240403) AM_READ(niyanpai_blitter_0_r)
+ AM_RANGE(0x240400, 0x24041f) AM_WRITE(niyanpai_blitter_0_w)
+ AM_RANGE(0x240420, 0x24043f) AM_WRITE(niyanpai_clut_0_w)
+ AM_RANGE(0x240600, 0x240603) AM_READ(niyanpai_blitter_1_r)
+ AM_RANGE(0x240600, 0x24061f) AM_WRITE(niyanpai_blitter_1_w)
+ AM_RANGE(0x240620, 0x24063f) AM_WRITE(niyanpai_clut_1_w)
+ AM_RANGE(0x240800, 0x240803) AM_READ(niyanpai_blitter_2_r)
+ AM_RANGE(0x240800, 0x24081f) AM_WRITE(niyanpai_blitter_2_w)
+ AM_RANGE(0x240820, 0x24083f) AM_WRITE(niyanpai_clut_2_w)
AM_RANGE(0x280000, 0x280001) AM_READ(niyanpai_dipsw_r)
AM_RANGE(0x280200, 0x280201) AM_READ_PORT("P1_P2")
AM_RANGE(0x280400, 0x280401) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x240a00, 0x240a01) AM_WRITE_LEGACY(niyanpai_clutsel_0_w)
- AM_RANGE(0x240c00, 0x240c01) AM_WRITE_LEGACY(niyanpai_clutsel_1_w)
- AM_RANGE(0x240e00, 0x240e01) AM_WRITE_LEGACY(niyanpai_clutsel_2_w)
+ AM_RANGE(0x240a00, 0x240a01) AM_WRITE(niyanpai_clutsel_0_w)
+ AM_RANGE(0x240c00, 0x240c01) AM_WRITE(niyanpai_clutsel_1_w)
+ AM_RANGE(0x240e00, 0x240e01) AM_WRITE(niyanpai_clutsel_2_w)
AM_IMPORT_FROM( tmp68301_regs )
ADDRESS_MAP_END
@@ -381,7 +381,7 @@ static ADDRESS_MAP_START( musobana_map, AS_PROGRAM, 16, niyanpai_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x040fff) AM_RAM
- AM_RANGE(0x0a0000, 0x0a08ff) AM_READWRITE_LEGACY(niyanpai_palette_r,niyanpai_palette_w)
+ AM_RANGE(0x0a0000, 0x0a08ff) AM_READWRITE(niyanpai_palette_r,niyanpai_palette_w)
AM_RANGE(0x0a0900, 0x0a11ff) AM_RAM // palette work ram?
AM_RANGE(0x0a8000, 0x0a87ff) AM_RAM AM_SHARE("nvram")
@@ -393,20 +393,20 @@ static ADDRESS_MAP_START( musobana_map, AS_PROGRAM, 16, niyanpai_state )
AM_RANGE(0x240000, 0x240009) AM_WRITENOP // unknown
AM_RANGE(0x240200, 0x2403ff) AM_WRITENOP // unknown
- AM_RANGE(0x240400, 0x240403) AM_READ_LEGACY(niyanpai_blitter_0_r)
- AM_RANGE(0x240400, 0x24041f) AM_WRITE_LEGACY(niyanpai_blitter_0_w)
- AM_RANGE(0x240420, 0x24043f) AM_WRITE_LEGACY(niyanpai_clut_0_w)
+ AM_RANGE(0x240400, 0x240403) AM_READ(niyanpai_blitter_0_r)
+ AM_RANGE(0x240400, 0x24041f) AM_WRITE(niyanpai_blitter_0_w)
+ AM_RANGE(0x240420, 0x24043f) AM_WRITE(niyanpai_clut_0_w)
- AM_RANGE(0x240600, 0x240603) AM_READ_LEGACY(niyanpai_blitter_1_r)
- AM_RANGE(0x240600, 0x24061f) AM_WRITE_LEGACY(niyanpai_blitter_1_w)
- AM_RANGE(0x240620, 0x24063f) AM_WRITE_LEGACY(niyanpai_clut_1_w)
+ AM_RANGE(0x240600, 0x240603) AM_READ(niyanpai_blitter_1_r)
+ AM_RANGE(0x240600, 0x24061f) AM_WRITE(niyanpai_blitter_1_w)
+ AM_RANGE(0x240620, 0x24063f) AM_WRITE(niyanpai_clut_1_w)
- AM_RANGE(0x240800, 0x240803) AM_READ_LEGACY(niyanpai_blitter_2_r)
- AM_RANGE(0x240800, 0x24081f) AM_WRITE_LEGACY(niyanpai_blitter_2_w)
- AM_RANGE(0x240820, 0x24083f) AM_WRITE_LEGACY(niyanpai_clut_2_w)
- AM_RANGE(0x240a00, 0x240a01) AM_WRITE_LEGACY(niyanpai_clutsel_0_w)
- AM_RANGE(0x240c00, 0x240c01) AM_WRITE_LEGACY(niyanpai_clutsel_1_w)
- AM_RANGE(0x240e00, 0x240e01) AM_WRITE_LEGACY(niyanpai_clutsel_2_w)
+ AM_RANGE(0x240800, 0x240803) AM_READ(niyanpai_blitter_2_r)
+ AM_RANGE(0x240800, 0x24081f) AM_WRITE(niyanpai_blitter_2_w)
+ AM_RANGE(0x240820, 0x24083f) AM_WRITE(niyanpai_clut_2_w)
+ AM_RANGE(0x240a00, 0x240a01) AM_WRITE(niyanpai_clutsel_0_w)
+ AM_RANGE(0x240c00, 0x240c01) AM_WRITE(niyanpai_clutsel_1_w)
+ AM_RANGE(0x240e00, 0x240e01) AM_WRITE(niyanpai_clutsel_2_w)
AM_RANGE(0x280000, 0x280001) AM_READ(niyanpai_dipsw_r)
AM_RANGE(0x280200, 0x280201) AM_READ(musobana_inputport_0_r)
@@ -419,7 +419,7 @@ static ADDRESS_MAP_START( mhhonban_map, AS_PROGRAM, 16, niyanpai_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x040fff) AM_RAM
- AM_RANGE(0x060000, 0x0608ff) AM_READWRITE_LEGACY(niyanpai_palette_r,niyanpai_palette_w)
+ AM_RANGE(0x060000, 0x0608ff) AM_READWRITE(niyanpai_palette_r,niyanpai_palette_w)
AM_RANGE(0x060900, 0x0611ff) AM_RAM // palette work ram?
AM_RANGE(0x07f800, 0x07ffff) AM_RAM
@@ -432,21 +432,21 @@ static ADDRESS_MAP_START( mhhonban_map, AS_PROGRAM, 16, niyanpai_state )
AM_RANGE(0x240000, 0x240009) AM_WRITENOP // unknown
AM_RANGE(0x240200, 0x2403ff) AM_WRITENOP // unknown
- AM_RANGE(0x240400, 0x240403) AM_READ_LEGACY(niyanpai_blitter_0_r)
- AM_RANGE(0x240400, 0x24041f) AM_WRITE_LEGACY(niyanpai_blitter_0_w)
- AM_RANGE(0x240420, 0x24043f) AM_WRITE_LEGACY(niyanpai_clut_0_w)
+ AM_RANGE(0x240400, 0x240403) AM_READ(niyanpai_blitter_0_r)
+ AM_RANGE(0x240400, 0x24041f) AM_WRITE(niyanpai_blitter_0_w)
+ AM_RANGE(0x240420, 0x24043f) AM_WRITE(niyanpai_clut_0_w)
- AM_RANGE(0x240600, 0x240603) AM_READ_LEGACY(niyanpai_blitter_1_r)
- AM_RANGE(0x240600, 0x24061f) AM_WRITE_LEGACY(niyanpai_blitter_1_w)
- AM_RANGE(0x240620, 0x24063f) AM_WRITE_LEGACY(niyanpai_clut_1_w)
+ AM_RANGE(0x240600, 0x240603) AM_READ(niyanpai_blitter_1_r)
+ AM_RANGE(0x240600, 0x24061f) AM_WRITE(niyanpai_blitter_1_w)
+ AM_RANGE(0x240620, 0x24063f) AM_WRITE(niyanpai_clut_1_w)
- AM_RANGE(0x240800, 0x240803) AM_READ_LEGACY(niyanpai_blitter_2_r)
- AM_RANGE(0x240800, 0x24081f) AM_WRITE_LEGACY(niyanpai_blitter_2_w)
- AM_RANGE(0x240820, 0x24083f) AM_WRITE_LEGACY(niyanpai_clut_2_w)
+ AM_RANGE(0x240800, 0x240803) AM_READ(niyanpai_blitter_2_r)
+ AM_RANGE(0x240800, 0x24081f) AM_WRITE(niyanpai_blitter_2_w)
+ AM_RANGE(0x240820, 0x24083f) AM_WRITE(niyanpai_clut_2_w)
- AM_RANGE(0x240a00, 0x240a01) AM_WRITE_LEGACY(niyanpai_clutsel_0_w)
- AM_RANGE(0x240c00, 0x240c01) AM_WRITE_LEGACY(niyanpai_clutsel_1_w)
- AM_RANGE(0x240e00, 0x240e01) AM_WRITE_LEGACY(niyanpai_clutsel_2_w)
+ AM_RANGE(0x240a00, 0x240a01) AM_WRITE(niyanpai_clutsel_0_w)
+ AM_RANGE(0x240c00, 0x240c01) AM_WRITE(niyanpai_clutsel_1_w)
+ AM_RANGE(0x240e00, 0x240e01) AM_WRITE(niyanpai_clutsel_2_w)
AM_RANGE(0x280000, 0x280001) AM_READ(niyanpai_dipsw_r)
AM_RANGE(0x280200, 0x280201) AM_READ(musobana_inputport_0_r)
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index c1d4637191d..f42652b19b0 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -317,13 +317,13 @@ static ADDRESS_MAP_START( vandyke_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("DSW2")
AM_RANGE(0x08000e, 0x08000f) AM_READ_LEGACY(NMK004_r)
AM_RANGE(0x080016, 0x080017) AM_WRITENOP /* IRQ enable? */
- AM_RANGE(0x080018, 0x080019) AM_WRITE_LEGACY(nmk_tilebank_w)
+ AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x08c000, 0x08c007) AM_WRITE_LEGACY(vandyke_scroll_w)
- AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x08c000, 0x08c007) AM_WRITE(vandyke_scroll_w)
+ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x094000, 0x097fff) AM_RAM /* what is this? */
- AM_RANGE(0x09d000, 0x09d7ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x09d000, 0x09d7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -335,14 +335,14 @@ static ADDRESS_MAP_START( vandykeb_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("DSW2")
AM_RANGE(0x08000e, 0x08000f) AM_READ_LEGACY(NMK004_r)
AM_RANGE(0x080016, 0x080017) AM_WRITENOP /* IRQ enable? */
- AM_RANGE(0x080018, 0x080019) AM_WRITE_LEGACY(nmk_tilebank_w)
- AM_RANGE(0x080010, 0x08001d) AM_WRITE_LEGACY(vandykeb_scroll_w) /* 10, 12, 1a, 1c */
+ AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w)
+ AM_RANGE(0x080010, 0x08001d) AM_WRITE(vandykeb_scroll_w) /* 10, 12, 1a, 1c */
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08c000, 0x08c007) AM_WRITENOP /* just in case... */
- AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x094000, 0x097fff) AM_RAM /* what is this? */
- AM_RANGE(0x09d000, 0x09d7ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x09d000, 0x09d7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -353,13 +353,13 @@ static ADDRESS_MAP_START( manybloc_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080004, 0x080005) AM_READ_PORT("DSW1")
AM_RANGE(0x080010, 0x080011) AM_WRITENOP /* See notes at the top of the driver */
AM_RANGE(0x080012, 0x080013) AM_WRITENOP /* See notes at the top of the driver */
- AM_RANGE(0x080014, 0x080015) AM_WRITE_LEGACY(nmk_flipscreen_w)
+ AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x08001c, 0x08001d) AM_WRITENOP /* See notes at the top of the driver */
AM_RANGE(0x08001e, 0x08001f) AM_READWRITE(soundlatch2_word_r,soundlatch_word_w)
AM_RANGE(0x088000, 0x0883ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x09c000, 0x09cfff) AM_RAM_WRITE_LEGACY(manybloc_scroll_w) AM_BASE(m_gunnail_scrollram)
- AM_RANGE(0x09d000, 0x09d7ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x09c000, 0x09cfff) AM_RAM_WRITE(manybloc_scroll_w) AM_BASE(m_gunnail_scrollram)
+ AM_RANGE(0x09d000, 0x09d7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -371,15 +371,15 @@ static ADDRESS_MAP_START( tharrier_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x08000e, 0x08000f) AM_READ(soundlatch2_word_r) /* from Z80 */
AM_RANGE(0x080010, 0x080011) AM_WRITE(tharrier_mcu_control_w)
AM_RANGE(0x080012, 0x080013) AM_WRITENOP
-// AM_RANGE(0x080014, 0x080015) AM_WRITE_LEGACY(nmk_flipscreen_w)
-// AM_RANGE(0x080018, 0x080019) AM_WRITE_LEGACY(nmk_tilebank_w)
+// AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
+// AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x08001e, 0x08001f) AM_WRITE(soundlatch_word_w)
AM_RANGE(0x080202, 0x080203) AM_READ_PORT("IN2")
AM_RANGE(0x088000, 0x0883ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
-// AM_RANGE(0x08c000, 0x08c007) AM_WRITE_LEGACY(nmk_scroll_w)
- AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+// AM_RANGE(0x08c000, 0x08c007) AM_WRITE(nmk_scroll_w)
+ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x09c000, 0x09c7ff) AM_RAM /* Unused txvideoram area? */
- AM_RANGE(0x09d000, 0x09d7ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x09d000, 0x09d7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM_WRITE(nmk16_mainram_strange_w) AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -407,14 +407,14 @@ static ADDRESS_MAP_START( mustang_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
AM_RANGE(0x080004, 0x080005) AM_READ_PORT("DSW1")
AM_RANGE(0x08000e, 0x08000f) AM_READ_LEGACY(NMK004_r) AM_WRITENOP
- AM_RANGE(0x080014, 0x080015) AM_WRITE_LEGACY(nmk_flipscreen_w)
+ AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x080016, 0x080017) AM_WRITENOP // frame number?
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x08c000, 0x08c001) AM_WRITE_LEGACY(mustang_scroll_w)
+ AM_RANGE(0x08c000, 0x08c001) AM_WRITE(mustang_scroll_w)
AM_RANGE(0x08c002, 0x08c087) AM_WRITENOP // ??
- AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM_WRITE(nmk16_mainram_strange_w) AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -424,14 +424,14 @@ static ADDRESS_MAP_START( mustangb_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
AM_RANGE(0x080004, 0x080005) AM_READ_PORT("DSW1")
AM_RANGE(0x08000e, 0x08000f) AM_NOP
- AM_RANGE(0x080014, 0x080015) AM_WRITE_LEGACY(nmk_flipscreen_w)
+ AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x080016, 0x080017) AM_WRITENOP // frame number?
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(seibu_main_mustb_w)
AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x08c000, 0x08c001) AM_WRITE_LEGACY(mustang_scroll_w)
+ AM_RANGE(0x08c000, 0x08c001) AM_WRITE(mustang_scroll_w)
AM_RANGE(0x08c002, 0x08c087) AM_WRITENOP // ??
- AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM_WRITE(nmk16_mainram_strange_w) AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -442,14 +442,14 @@ static ADDRESS_MAP_START( twinactn_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
AM_RANGE(0x080004, 0x080005) AM_READ_PORT("DSW1")
AM_RANGE(0x08000e, 0x08000f) AM_NOP
- AM_RANGE(0x080014, 0x080015) AM_WRITE_LEGACY(nmk_flipscreen_w)
+ AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x080016, 0x080017) AM_WRITENOP // frame number?
AM_RANGE(0x08001e, 0x08001f) AM_WRITE(afega_soundlatch_w)
AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x08c000, 0x08c001) AM_WRITE_LEGACY(mustang_scroll_w)
+ AM_RANGE(0x08c000, 0x08c001) AM_WRITE(mustang_scroll_w)
AM_RANGE(0x08c002, 0x08c087) AM_WRITENOP // ??
- AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM_WRITE(nmk16_mainram_strange_w) AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -462,14 +462,14 @@ static ADDRESS_MAP_START( acrobatm_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0xc0008, 0xc0009) AM_READ_PORT("DSW1")
AM_RANGE(0xc000a, 0xc000b) AM_READ_PORT("DSW2")
AM_RANGE(0xc000e, 0xc000f) AM_READ_LEGACY(NMK004_r)
- AM_RANGE(0xc0014, 0xc0015) AM_WRITE_LEGACY(nmk_flipscreen_w)
+ AM_RANGE(0xc0014, 0xc0015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0xc0016, 0xc0017) AM_WRITENOP
- AM_RANGE(0xc0018, 0xc0019) AM_WRITE_LEGACY(nmk_tilebank_w)
+ AM_RANGE(0xc0018, 0xc0019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0xc001e, 0xc001f) AM_WRITE_LEGACY(NMK004_w)
AM_RANGE(0xc4000, 0xc45ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0xc8000, 0xc8007) AM_RAM_WRITE_LEGACY(nmk_scroll_w)
- AM_RANGE(0xcc000, 0xcffff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0xd4000, 0xd47ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0xc8000, 0xc8007) AM_RAM_WRITE(nmk_scroll_w)
+ AM_RANGE(0xcc000, 0xcffff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0xd4000, 0xd47ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bioship_map, AS_PROGRAM, 16, nmk16_state )
@@ -479,14 +479,14 @@ static ADDRESS_MAP_START( bioship_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1")
AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("DSW2")
AM_RANGE(0x08000e, 0x08000f) AM_READ_LEGACY(NMK004_r)
-// AM_RANGE(0x080014, 0x080015) AM_WRITE_LEGACY(nmk_flipscreen_w)
+// AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
- AM_RANGE(0x084000, 0x084001) AM_WRITE_LEGACY(bioship_bank_w)
+ AM_RANGE(0x084000, 0x084001) AM_WRITE(bioship_bank_w)
AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x08c000, 0x08c007) AM_RAM_WRITE_LEGACY(bioshipbg_scroll_w)
- AM_RANGE(0x08c010, 0x08c017) AM_RAM_WRITE_LEGACY(bioship_scroll_w)
- AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x08c000, 0x08c007) AM_RAM_WRITE(bioshipbg_scroll_w)
+ AM_RANGE(0x08c010, 0x08c017) AM_RAM_WRITE(bioship_scroll_w)
+ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -658,14 +658,14 @@ static ADDRESS_MAP_START( hachamf_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1")
AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("UNK")
AM_RANGE(0x08000e, 0x08000f) AM_READ_LEGACY(NMK004_r)
- AM_RANGE(0x080014, 0x080015) AM_WRITE_LEGACY(nmk_flipscreen_w)
- AM_RANGE(0x080018, 0x080019) AM_WRITE_LEGACY(nmk_tilebank_w)
+ AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
+ AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
/* Video Region */
AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x08c000, 0x08c007) AM_WRITE_LEGACY(nmk_scroll_w)
- AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x08c000, 0x08c007) AM_WRITE(nmk_scroll_w)
+ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
/* Main RAM, inc sprites, shared with MCU */
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM_WRITE(hachamf_mainram_w) AM_BASE(m_mainram) // ram is shared with MCU
ADDRESS_MAP_END
@@ -891,13 +891,13 @@ static ADDRESS_MAP_START( tdragon_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0c0008, 0x0c0009) AM_READ_PORT("DSW1")
AM_RANGE(0x0c000a, 0x0c000b) AM_READ_PORT("DSW2")
AM_RANGE(0x0c000e, 0x0c000f) AM_READ_LEGACY(NMK004_r)
- AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE_LEGACY(nmk_flipscreen_w) /* Maybe */
- AM_RANGE(0x0c0018, 0x0c0019) AM_WRITE_LEGACY(nmk_tilebank_w) /* Tile Bank ? */
+ AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(nmk_flipscreen_w) /* Maybe */
+ AM_RANGE(0x0c0018, 0x0c0019) AM_WRITE(nmk_tilebank_w) /* Tile Bank ? */
AM_RANGE(0x0c001e, 0x0c001f) AM_WRITE_LEGACY(NMK004_w)
- AM_RANGE(0x0c4000, 0x0c4007) AM_RAM_WRITE_LEGACY(nmk_scroll_w)
+ AM_RANGE(0x0c4000, 0x0c4007) AM_RAM_WRITE(nmk_scroll_w)
AM_RANGE(0x0c8000, 0x0c87ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x0cc000, 0x0cffff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x0cc000, 0x0cffff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( tdragonb_map, AS_PROGRAM, 16, nmk16_state )
@@ -908,13 +908,13 @@ static ADDRESS_MAP_START( tdragonb_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("IN1")
AM_RANGE(0x0c0008, 0x0c0009) AM_READ_PORT("DSW1")
AM_RANGE(0x0c000a, 0x0c000b) AM_READ_PORT("DSW2")
- AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE_LEGACY(nmk_flipscreen_w) /* Maybe */
- AM_RANGE(0x0c0018, 0x0c0019) AM_WRITE_LEGACY(nmk_tilebank_w) /* Tile Bank ? */
+ AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(nmk_flipscreen_w) /* Maybe */
+ AM_RANGE(0x0c0018, 0x0c0019) AM_WRITE(nmk_tilebank_w) /* Tile Bank ? */
AM_RANGE(0x0c001e, 0x0c001f) AM_WRITE_LEGACY(seibu_main_mustb_w)
- AM_RANGE(0x0c4000, 0x0c4007) AM_RAM_WRITE_LEGACY(nmk_scroll_w)
+ AM_RANGE(0x0c4000, 0x0c4007) AM_RAM_WRITE(nmk_scroll_w)
AM_RANGE(0x0c8000, 0x0c87ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x0cc000, 0x0cffff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x0cc000, 0x0cffff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( ssmissin_map, AS_PROGRAM, 16, nmk16_state )
@@ -924,13 +924,13 @@ static ADDRESS_MAP_START( ssmissin_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0c0004, 0x0c0005) AM_READ_PORT("IN1")
AM_RANGE(0x0c0006, 0x0c0007) AM_READ_PORT("DSW1")
// AM_RANGE(0x0c000e, 0x0c000f) AM_READ_LEGACY(??)
- AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE_LEGACY(nmk_flipscreen_w) /* Maybe */
- AM_RANGE(0x0c0018, 0x0c0019) AM_WRITE_LEGACY(nmk_tilebank_w) /* Tile Bank ? */
+ AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(nmk_flipscreen_w) /* Maybe */
+ AM_RANGE(0x0c0018, 0x0c0019) AM_WRITE(nmk_tilebank_w) /* Tile Bank ? */
AM_RANGE(0x0c001e, 0x0c001f) AM_WRITE(ssmissin_sound_w)
- AM_RANGE(0x0c4000, 0x0c4007) AM_RAM_WRITE_LEGACY(nmk_scroll_w)
+ AM_RANGE(0x0c4000, 0x0c4007) AM_RAM_WRITE(nmk_scroll_w)
AM_RANGE(0x0c8000, 0x0c87ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x0cc000, 0x0cffff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x0d0000, 0x0d07ff) AM_MIRROR(0x1800) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram) //mirror for airattck
+ AM_RANGE(0x0cc000, 0x0cffff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x0d0000, 0x0d07ff) AM_MIRROR(0x1800) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram) //mirror for airattck
ADDRESS_MAP_END
static ADDRESS_MAP_START( ssmissin_sound_map, AS_PROGRAM, 8, nmk16_state )
@@ -948,15 +948,15 @@ static ADDRESS_MAP_START( strahl_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x80008, 0x80009) AM_READ_PORT("DSW1")
AM_RANGE(0x8000a, 0x8000b) AM_READ_PORT("DSW2")
AM_RANGE(0x8000e, 0x8000f) AM_READ_LEGACY(NMK004_r)
- AM_RANGE(0x80014, 0x80015) AM_WRITE_LEGACY(nmk_flipscreen_w)
+ AM_RANGE(0x80014, 0x80015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x80016, 0x80017) AM_WRITENOP /* IRQ enable? */
AM_RANGE(0x8001e, 0x8001f) AM_WRITE_LEGACY(NMK004_w)
- AM_RANGE(0x84000, 0x84007) AM_RAM_WRITE_LEGACY(nmk_scroll_w)
- AM_RANGE(0x88000, 0x88007) AM_RAM_WRITE_LEGACY(nmk_scroll_2_w)
+ AM_RANGE(0x84000, 0x84007) AM_RAM_WRITE(nmk_scroll_w)
+ AM_RANGE(0x88000, 0x88007) AM_RAM_WRITE(nmk_scroll_2_w)
AM_RANGE(0x8c000, 0x8c7ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x90000, 0x93fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x94000, 0x97fff) AM_RAM_WRITE_LEGACY(nmk_fgvideoram_w) AM_BASE(m_nmk_fgvideoram)
- AM_RANGE(0x9c000, 0x9c7ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x90000, 0x93fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x94000, 0x97fff) AM_RAM_WRITE(nmk_fgvideoram_w) AM_BASE(m_nmk_fgvideoram)
+ AM_RANGE(0x9c000, 0x9c7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
AM_RANGE(0xf0000, 0xfffff) AM_RAM AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -967,14 +967,14 @@ static ADDRESS_MAP_START( macross_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1")
AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("DSW2")
AM_RANGE(0x08000e, 0x08000f) AM_READ_LEGACY(NMK004_r)
- AM_RANGE(0x080014, 0x080015) AM_WRITE_LEGACY(nmk_flipscreen_w)
+ AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x080016, 0x080017) AM_WRITENOP /* IRQ enable? */
- AM_RANGE(0x080018, 0x080019) AM_WRITE_LEGACY(nmk_tilebank_w)
+ AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x08c000, 0x08c007) AM_RAM_WRITE_LEGACY(nmk_scroll_w)
- AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x08c000, 0x08c007) AM_RAM_WRITE(nmk_scroll_w)
+ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM_WRITE(nmk16_mainram_strange_w) AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -985,16 +985,16 @@ static ADDRESS_MAP_START( gunnail_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1")
AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("DSW2")
AM_RANGE(0x08000e, 0x08000f) AM_READ_LEGACY(NMK004_r)
- AM_RANGE(0x080014, 0x080015) AM_WRITE_LEGACY(nmk_flipscreen_w)
+ AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x080016, 0x080017) AM_WRITENOP /* IRQ enable? */
- AM_RANGE(0x080018, 0x080019) AM_WRITE_LEGACY(nmk_tilebank_w)
+ AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08c000, 0x08c1ff) AM_WRITEONLY AM_BASE(m_gunnail_scrollram)
AM_RANGE(0x08c200, 0x08c3ff) AM_WRITEONLY AM_BASE(m_gunnail_scrollramy)
AM_RANGE(0x08c400, 0x08c7ff) AM_WRITEONLY // unknown
- AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x09c000, 0x09cfff) AM_MIRROR(0x001000) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x09c000, 0x09cfff) AM_MIRROR(0x001000) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -1005,9 +1005,9 @@ static ADDRESS_MAP_START( macross2_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x100008, 0x100009) AM_READ_PORT("DSW1")
AM_RANGE(0x10000a, 0x10000b) AM_READ_PORT("DSW2")
AM_RANGE(0x10000e, 0x10000f) AM_READ(soundlatch2_word_r) /* from Z80 */
- AM_RANGE(0x100014, 0x100015) AM_WRITE_LEGACY(nmk_flipscreen_w)
+ AM_RANGE(0x100014, 0x100015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x100016, 0x100017) AM_WRITE(macross2_sound_reset_w) /* Z80 reset */
- AM_RANGE(0x100018, 0x100019) AM_WRITE_LEGACY(nmk_tilebank_w)
+ AM_RANGE(0x100018, 0x100019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x10001e, 0x10001f) AM_WRITE(macross2_sound_command_w) /* to Z80 */
AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
@@ -1015,12 +1015,12 @@ static ADDRESS_MAP_START( macross2_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x130200, 0x1303ff) AM_RAM AM_BASE(m_gunnail_scrollramy)
AM_RANGE(0x130400, 0x1307ff) AM_RAM
- AM_RANGE(0x140000, 0x143fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x144000, 0x147fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram1_w) AM_BASE(m_nmk_bgvideoram1)
- AM_RANGE(0x148000, 0x14bfff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram2_w) AM_BASE(m_nmk_bgvideoram2)
- AM_RANGE(0x14c000, 0x14ffff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram3_w) AM_BASE(m_nmk_bgvideoram3)
+ AM_RANGE(0x140000, 0x143fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x144000, 0x147fff) AM_RAM_WRITE(nmk_bgvideoram1_w) AM_BASE(m_nmk_bgvideoram1)
+ AM_RANGE(0x148000, 0x14bfff) AM_RAM_WRITE(nmk_bgvideoram2_w) AM_BASE(m_nmk_bgvideoram2)
+ AM_RANGE(0x14c000, 0x14ffff) AM_RAM_WRITE(nmk_bgvideoram3_w) AM_BASE(m_nmk_bgvideoram3)
- AM_RANGE(0x170000, 0x170fff) AM_MIRROR(0x1000) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x170000, 0x170fff) AM_MIRROR(0x1000) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
AM_RANGE(0x1f0000, 0x1fffff) AM_RAM AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -1031,9 +1031,9 @@ static ADDRESS_MAP_START( raphero_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x100008, 0x100009) AM_READ_PORT("DSW1")
AM_RANGE(0x10000a, 0x10000b) AM_READ_PORT("DSW2")
AM_RANGE(0x10000e, 0x10000f) AM_READ(soundlatch2_word_r) /* from Z80 */
- AM_RANGE(0x100014, 0x100015) AM_WRITE_LEGACY(nmk_flipscreen_w)
+ AM_RANGE(0x100014, 0x100015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x100016, 0x100017) AM_WRITENOP /* IRQ enable or z80 sound reset like in Macross 2? */
- AM_RANGE(0x100018, 0x100019) AM_WRITE_LEGACY(nmk_tilebank_w)
+ AM_RANGE(0x100018, 0x100019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x10001e, 0x10001f) AM_WRITE(macross2_sound_command_w) /* to Z80 */
AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
@@ -1041,13 +1041,13 @@ static ADDRESS_MAP_START( raphero_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x130200, 0x1303ff) AM_RAM AM_BASE(m_gunnail_scrollramy)
AM_RANGE(0x130400, 0x1307ff) AM_RAM
- AM_RANGE(0x140000, 0x143fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
- AM_RANGE(0x144000, 0x147fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram1_w) AM_BASE(m_nmk_bgvideoram1)
- AM_RANGE(0x148000, 0x14bfff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram2_w) AM_BASE(m_nmk_bgvideoram2)
- AM_RANGE(0x14c000, 0x14ffff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram3_w) AM_BASE(m_nmk_bgvideoram3)
+ AM_RANGE(0x140000, 0x143fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x144000, 0x147fff) AM_RAM_WRITE(nmk_bgvideoram1_w) AM_BASE(m_nmk_bgvideoram1)
+ AM_RANGE(0x148000, 0x14bfff) AM_RAM_WRITE(nmk_bgvideoram2_w) AM_BASE(m_nmk_bgvideoram2)
+ AM_RANGE(0x14c000, 0x14ffff) AM_RAM_WRITE(nmk_bgvideoram3_w) AM_BASE(m_nmk_bgvideoram3)
- AM_RANGE(0x170000, 0x170fff) AM_MIRROR(0x1000) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
+ AM_RANGE(0x170000, 0x170fff) AM_MIRROR(0x1000) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
AM_RANGE(0x1f0000, 0x1fffff) AM_RAM AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -1106,14 +1106,14 @@ static ADDRESS_MAP_START( bjtwin_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1")
AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("DSW2")
- AM_RANGE(0x080014, 0x080015) AM_WRITE_LEGACY(nmk_flipscreen_w)
+ AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x084000, 0x084001) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x084010, 0x084011) AM_DEVREADWRITE8("oki2", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x084020, 0x08402f) AM_DEVWRITE_LEGACY("nmk112", nmk112_okibank_lsb_w)
AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x094000, 0x094001) AM_WRITE_LEGACY(nmk_tilebank_w)
+ AM_RANGE(0x094000, 0x094001) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x094002, 0x094003) AM_WRITENOP /* IRQ enable? */
- AM_RANGE(0x09c000, 0x09cfff) AM_MIRROR(0x1000) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
+ AM_RANGE(0x09c000, 0x09cfff) AM_MIRROR(0x1000) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(m_mainram)
ADDRESS_MAP_END
@@ -4629,8 +4629,8 @@ static ADDRESS_MAP_START( afega, AS_PROGRAM, 16, nmk16_state )
/**/AM_RANGE(0x08c000, 0x08c003) AM_RAM_WRITE(afega_scroll0_w) AM_BASE(m_afega_scroll_0) // Scroll
/**/AM_RANGE(0x08c004, 0x08c007) AM_RAM_WRITE(afega_scroll1_w) AM_BASE(m_afega_scroll_1) //
AM_RANGE(0x08c008, 0x08ffff) AM_WRITEONLY //
-/**/AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE_LEGACY(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0) // Layer 0 // ?
-/**/AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE_LEGACY(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram) // Layer 1
+/**/AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0) // Layer 0 // ?
+/**/AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram) // Layer 1
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM_WRITE(nmk16_mainram_strange_w) AM_SHARE("share1") AM_BASE(m_mainram)
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM_WRITE(nmk16_mainram_strange_w) AM_SHARE("share1")
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index 785c2b92c14..6cf8d57be0d 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -175,10 +175,10 @@ static MACHINE_START( ninjakun )
static ADDRESS_MAP_START( nova2001_map, AS_PROGRAM, 8, nova2001_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0xa000, 0xa7ff) AM_RAM_WRITE_LEGACY(nova2001_fg_videoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE_LEGACY(nova2001_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0xa000, 0xa7ff) AM_RAM_WRITE(nova2001_fg_videoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE(nova2001_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0xb000, 0xb7ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0xb800, 0xbfff) AM_WRITE_LEGACY(nova2001_flipscreen_w)
+ AM_RANGE(0xb800, 0xbfff) AM_WRITE(nova2001_flipscreen_w)
AM_RANGE(0xc000, 0xc000) AM_DEVREADWRITE_LEGACY("ay1", ay8910_r, ay8910_data_w)
AM_RANGE(0xc001, 0xc001) AM_DEVREADWRITE_LEGACY("ay2", ay8910_r, ay8910_data_w)
AM_RANGE(0xc002, 0xc002) AM_DEVWRITE_LEGACY("ay1", ay8910_address_w)
@@ -201,11 +201,11 @@ static ADDRESS_MAP_START( ninjakun_cpu1_map, AS_PROGRAM, 8, nova2001_state )
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
AM_RANGE(0xa001, 0xa001) AM_READ_PORT("IN1")
AM_RANGE(0xa002, 0xa002) AM_READ_PORT("IN2") AM_WRITE(ninjakun_cpu1_io_A002_w)
- AM_RANGE(0xa003, 0xa003) AM_WRITE_LEGACY(pkunwar_flipscreen_w)
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(nova2001_fg_videoram_w) AM_BASE(m_fg_videoram) AM_SHARE("share1")
- AM_RANGE(0xc800, 0xcfff) AM_READWRITE_LEGACY(ninjakun_bg_videoram_r, ninjakun_bg_videoram_w) AM_BASE(m_bg_videoram) AM_SHARE("share2")
+ AM_RANGE(0xa003, 0xa003) AM_WRITE(pkunwar_flipscreen_w)
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(nova2001_fg_videoram_w) AM_BASE(m_fg_videoram) AM_SHARE("share1")
+ AM_RANGE(0xc800, 0xcfff) AM_READWRITE(ninjakun_bg_videoram_r, ninjakun_bg_videoram_w) AM_BASE(m_bg_videoram) AM_SHARE("share2")
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE(m_spriteram) AM_SHARE("share3")
- AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE_LEGACY(ninjakun_paletteram_w) AM_SHARE("paletteram") AM_SHARE("share4")
+ AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE(ninjakun_paletteram_w) AM_SHARE("paletteram") AM_SHARE("share4")
AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_SHARE("share5")
AM_RANGE(0xe400, 0xe7ff) AM_RAM AM_SHARE("share6")
ADDRESS_MAP_END
@@ -220,11 +220,11 @@ static ADDRESS_MAP_START( ninjakun_cpu2_map, AS_PROGRAM, 8, nova2001_state )
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
AM_RANGE(0xa001, 0xa001) AM_READ_PORT("IN1")
AM_RANGE(0xa002, 0xa002) AM_READ_PORT("IN2") AM_WRITE(ninjakun_cpu2_io_A002_w)
- AM_RANGE(0xa003, 0xa003) AM_WRITE_LEGACY(nova2001_flipscreen_w)
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(nova2001_fg_videoram_w) AM_SHARE("share1")
- AM_RANGE(0xc800, 0xcfff) AM_READWRITE_LEGACY(ninjakun_bg_videoram_r, ninjakun_bg_videoram_w) AM_SHARE("share2")
+ AM_RANGE(0xa003, 0xa003) AM_WRITE(nova2001_flipscreen_w)
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(nova2001_fg_videoram_w) AM_SHARE("share1")
+ AM_RANGE(0xc800, 0xcfff) AM_READWRITE(ninjakun_bg_videoram_r, ninjakun_bg_videoram_w) AM_SHARE("share2")
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("share3")
- AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE_LEGACY(ninjakun_paletteram_w) AM_SHARE("share4")
+ AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE(ninjakun_paletteram_w) AM_SHARE("share4")
AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_SHARE("share6") /* swapped wrt CPU1 */
AM_RANGE(0xe400, 0xe7ff) AM_RAM AM_SHARE("share5") /* swapped wrt CPU1 */
ADDRESS_MAP_END
@@ -233,7 +233,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pkunwar_map, AS_PROGRAM, 8, nova2001_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(nova2001_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(nova2001_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0xa000, 0xa001) AM_DEVWRITE_LEGACY("ay1", ay8910_address_data_w)
AM_RANGE(0xa001, 0xa001) AM_DEVREAD_LEGACY("ay1", ay8910_r)
AM_RANGE(0xa002, 0xa003) AM_DEVWRITE_LEGACY("ay2", ay8910_address_data_w)
@@ -244,23 +244,23 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pkunwar_io, AS_IO, 8, nova2001_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(pkunwar_flipscreen_w)
+ AM_RANGE(0x00, 0x00) AM_WRITE(pkunwar_flipscreen_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( raiders5_cpu1_map, AS_PROGRAM, 8, nova2001_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(nova2001_fg_videoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0x9000, 0x97ff) AM_READWRITE_LEGACY(ninjakun_bg_videoram_r, ninjakun_bg_videoram_w) AM_BASE(m_bg_videoram)
- AM_RANGE(0xa000, 0xa000) AM_WRITE_LEGACY(nova2001_scroll_x_w)
- AM_RANGE(0xa001, 0xa001) AM_WRITE_LEGACY(nova2001_scroll_y_w)
- AM_RANGE(0xa002, 0xa002) AM_WRITE_LEGACY(pkunwar_flipscreen_w)
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(nova2001_fg_videoram_w) AM_BASE(m_fg_videoram)
+ AM_RANGE(0x9000, 0x97ff) AM_READWRITE(ninjakun_bg_videoram_r, ninjakun_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0xa000, 0xa000) AM_WRITE(nova2001_scroll_x_w)
+ AM_RANGE(0xa001, 0xa001) AM_WRITE(nova2001_scroll_y_w)
+ AM_RANGE(0xa002, 0xa002) AM_WRITE(pkunwar_flipscreen_w)
AM_RANGE(0xc000, 0xc001) AM_DEVWRITE_LEGACY("ay1", ay8910_address_data_w)
AM_RANGE(0xc001, 0xc001) AM_DEVREAD_LEGACY("ay1", ay8910_r)
AM_RANGE(0xc002, 0xc003) AM_DEVWRITE_LEGACY("ay2", ay8910_address_data_w)
AM_RANGE(0xc003, 0xc003) AM_DEVREAD_LEGACY("ay2", ay8910_r)
- AM_RANGE(0xd000, 0xd1ff) AM_RAM_WRITE_LEGACY(ninjakun_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xd000, 0xd1ff) AM_RAM_WRITE(ninjakun_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
@@ -275,9 +275,9 @@ static ADDRESS_MAP_START( raiders5_cpu2_map, AS_PROGRAM, 8, nova2001_state )
AM_RANGE(0xc000, 0xc000) AM_READNOP /* unknown */
AM_RANGE(0xc800, 0xc800) AM_READNOP /* unknown */
AM_RANGE(0xd000, 0xd000) AM_READNOP /* unknown */
- AM_RANGE(0xe000, 0xe000) AM_WRITE_LEGACY(nova2001_scroll_x_w)
- AM_RANGE(0xe001, 0xe001) AM_WRITE_LEGACY(nova2001_scroll_y_w)
- AM_RANGE(0xe002, 0xe002) AM_WRITE_LEGACY(pkunwar_flipscreen_w)
+ AM_RANGE(0xe000, 0xe000) AM_WRITE(nova2001_scroll_x_w)
+ AM_RANGE(0xe001, 0xe001) AM_WRITE(nova2001_scroll_y_w)
+ AM_RANGE(0xe002, 0xe002) AM_WRITE(pkunwar_flipscreen_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( raiders5_io, AS_IO, 8, nova2001_state )
@@ -638,8 +638,8 @@ static const ay8910_interface nova2001_ay8910_interface_1 =
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
- DEVCB_MEMORY_HANDLER("maincpu", PROGRAM, nova2001_scroll_x_w),
- DEVCB_MEMORY_HANDLER("maincpu", PROGRAM, nova2001_scroll_y_w)
+ DEVCB_DRIVER_MEMBER(nova2001_state, nova2001_scroll_x_w),
+ DEVCB_DRIVER_MEMBER(nova2001_state, nova2001_scroll_y_w)
};
static const ay8910_interface nova2001_ay8910_interface_2 =
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index a5a081962fa..170d97871dc 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -337,8 +337,8 @@ WRITE8_MEMBER(nycaptor_state::nycaptor_generic_control_w)
static ADDRESS_MAP_START( nycaptor_master_map, AS_PROGRAM, 8, nycaptor_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xc7ff) AM_READWRITE_LEGACY(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0xd000, 0xd000) AM_READWRITE_LEGACY(nycaptor_mcu_r, nycaptor_mcu_w)
+ AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xd000, 0xd000) AM_READWRITE(nycaptor_mcu_r, nycaptor_mcu_w)
AM_RANGE(0xd001, 0xd001) AM_WRITE(sub_cpu_halt_w)
AM_RANGE(0xd002, 0xd002) AM_READWRITE(nycaptor_generic_control_r, nycaptor_generic_control_w) /* bit 3 - memory bank at 0x8000-0xbfff */
AM_RANGE(0xd400, 0xd400) AM_READWRITE(from_snd_r, sound_command_w)
@@ -349,33 +349,33 @@ static ADDRESS_MAP_START( nycaptor_master_map, AS_PROGRAM, 8, nycaptor_state )
AM_RANGE(0xd802, 0xd802) AM_READ_PORT("DSWC")
AM_RANGE(0xd803, 0xd803) AM_READ_PORT("IN0")
AM_RANGE(0xd804, 0xd804) AM_READ_PORT("IN1")
- AM_RANGE(0xd805, 0xd805) AM_READ_LEGACY(nycaptor_mcu_status_r1)
+ AM_RANGE(0xd805, 0xd805) AM_READ(nycaptor_mcu_status_r1)
AM_RANGE(0xd806, 0xd806) AM_READNOP /* unknown ?sound? */
- AM_RANGE(0xd807, 0xd807) AM_READ_LEGACY(nycaptor_mcu_status_r2)
- AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE_LEGACY(nycaptor_spriteram_r, nycaptor_spriteram_w)
- AM_RANGE(0xdca0, 0xdcbf) AM_READWRITE_LEGACY(nycaptor_scrlram_r, nycaptor_scrlram_w) AM_BASE(m_scrlram)
+ AM_RANGE(0xd807, 0xd807) AM_READ(nycaptor_mcu_status_r2)
+ AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE(nycaptor_spriteram_r, nycaptor_spriteram_w)
+ AM_RANGE(0xdca0, 0xdcbf) AM_READWRITE(nycaptor_scrlram_r, nycaptor_scrlram_w) AM_BASE(m_scrlram)
AM_RANGE(0xdce1, 0xdce1) AM_WRITENOP
- AM_RANGE(0xdd00, 0xdeff) AM_READWRITE_LEGACY(nycaptor_palette_r, nycaptor_palette_w)
- AM_RANGE(0xdf03, 0xdf03) AM_READWRITE_LEGACY(nycaptor_gfxctrl_r, nycaptor_gfxctrl_w)
+ AM_RANGE(0xdd00, 0xdeff) AM_READWRITE(nycaptor_palette_r, nycaptor_palette_w)
+ AM_RANGE(0xdf03, 0xdf03) AM_READWRITE(nycaptor_gfxctrl_r, nycaptor_gfxctrl_w)
AM_RANGE(0xe000, 0xffff) AM_READWRITE(nycaptor_sharedram_r, nycaptor_sharedram_w) AM_BASE(m_sharedram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( nycaptor_slave_map, AS_PROGRAM, 8, nycaptor_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_READWRITE_LEGACY(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xd800, 0xd800) AM_READ_PORT("DSWA")
AM_RANGE(0xd801, 0xd801) AM_READ_PORT("DSWB")
AM_RANGE(0xd802, 0xd802) AM_READ_PORT("DSWC")
AM_RANGE(0xd803, 0xd803) AM_READ_PORT("IN0")
AM_RANGE(0xd804, 0xd804) AM_READ_PORT("IN1")
- AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE_LEGACY(nycaptor_spriteram_r, nycaptor_spriteram_w)
- AM_RANGE(0xdca0, 0xdcbf) AM_WRITE_LEGACY(nycaptor_scrlram_w) AM_BASE(m_scrlram)
+ AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE(nycaptor_spriteram_r, nycaptor_spriteram_w)
+ AM_RANGE(0xdca0, 0xdcbf) AM_WRITE(nycaptor_scrlram_w) AM_BASE(m_scrlram)
- AM_RANGE(0xdd00, 0xdeff) AM_READWRITE_LEGACY(nycaptor_palette_r, nycaptor_palette_w)
+ AM_RANGE(0xdd00, 0xdeff) AM_READWRITE(nycaptor_palette_r, nycaptor_palette_w)
AM_RANGE(0xdf00, 0xdf00) AM_READ(nycaptor_bx_r)
AM_RANGE(0xdf01, 0xdf01) AM_READ(nycaptor_by_r)
AM_RANGE(0xdf02, 0xdf02) AM_READ(nycaptor_b_r)
- AM_RANGE(0xdf03, 0xdf03) AM_READ_LEGACY(nycaptor_gfxctrl_r) AM_WRITENOP/* ? gfx control ? */
+ AM_RANGE(0xdf03, 0xdf03) AM_READ(nycaptor_gfxctrl_r) AM_WRITENOP/* ? gfx control ? */
AM_RANGE(0xe000, 0xffff) AM_READWRITE(nycaptor_sharedram_r, nycaptor_sharedram_w)
ADDRESS_MAP_END
@@ -397,12 +397,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( nycaptor_m68705_map, AS_PROGRAM, 8, nycaptor_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(nycaptor_68705_port_a_r, nycaptor_68705_port_a_w)
- AM_RANGE(0x0001, 0x0001) AM_READWRITE_LEGACY(nycaptor_68705_port_b_r, nycaptor_68705_port_b_w)
- AM_RANGE(0x0002, 0x0002) AM_READWRITE_LEGACY(nycaptor_68705_port_c_r, nycaptor_68705_port_c_w)
- AM_RANGE(0x0004, 0x0004) AM_WRITE_LEGACY(nycaptor_68705_ddr_a_w)
- AM_RANGE(0x0005, 0x0005) AM_WRITE_LEGACY(nycaptor_68705_ddr_b_w)
- AM_RANGE(0x0006, 0x0006) AM_WRITE_LEGACY(nycaptor_68705_ddr_c_w)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(nycaptor_68705_port_a_r, nycaptor_68705_port_a_w)
+ AM_RANGE(0x0001, 0x0001) AM_READWRITE(nycaptor_68705_port_b_r, nycaptor_68705_port_b_w)
+ AM_RANGE(0x0002, 0x0002) AM_READWRITE(nycaptor_68705_port_c_r, nycaptor_68705_port_c_w)
+ AM_RANGE(0x0004, 0x0004) AM_WRITE(nycaptor_68705_ddr_a_w)
+ AM_RANGE(0x0005, 0x0005) AM_WRITE(nycaptor_68705_ddr_b_w)
+ AM_RANGE(0x0006, 0x0006) AM_WRITE(nycaptor_68705_ddr_c_w)
AM_RANGE(0x0010, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
@@ -443,7 +443,7 @@ WRITE8_MEMBER(nycaptor_state::cyclshtg_generic_control_w)
static ADDRESS_MAP_START( cyclshtg_master_map, AS_PROGRAM, 8, nycaptor_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xcfff) AM_READWRITE_LEGACY(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xc000, 0xcfff) AM_READWRITE(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xd000, 0xd000) AM_READWRITE(cyclshtg_mcu_r, cyclshtg_mcu_w)
AM_RANGE(0xd001, 0xd001) AM_WRITE(sub_cpu_halt_w)
AM_RANGE(0xd002, 0xd002) AM_READWRITE(nycaptor_generic_control_r, cyclshtg_generic_control_w)
@@ -457,29 +457,29 @@ static ADDRESS_MAP_START( cyclshtg_master_map, AS_PROGRAM, 8, nycaptor_state )
AM_RANGE(0xd805, 0xd805) AM_READ(cyclshtg_mcu_status_r)
AM_RANGE(0xd806, 0xd806) AM_READNOP
AM_RANGE(0xd807, 0xd807) AM_READ(cyclshtg_mcu_status_r)
- AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE_LEGACY(nycaptor_spriteram_r, nycaptor_spriteram_w)
- AM_RANGE(0xdca0, 0xdcbf) AM_READWRITE_LEGACY(nycaptor_scrlram_r, nycaptor_scrlram_w) AM_BASE(m_scrlram)
+ AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE(nycaptor_spriteram_r, nycaptor_spriteram_w)
+ AM_RANGE(0xdca0, 0xdcbf) AM_READWRITE(nycaptor_scrlram_r, nycaptor_scrlram_w) AM_BASE(m_scrlram)
AM_RANGE(0xdce1, 0xdce1) AM_WRITENOP
- AM_RANGE(0xdd00, 0xdeff) AM_READWRITE_LEGACY(nycaptor_palette_r, nycaptor_palette_w)
- AM_RANGE(0xdf03, 0xdf03) AM_READWRITE_LEGACY(nycaptor_gfxctrl_r, nycaptor_gfxctrl_w)
+ AM_RANGE(0xdd00, 0xdeff) AM_READWRITE(nycaptor_palette_r, nycaptor_palette_w)
+ AM_RANGE(0xdf03, 0xdf03) AM_READWRITE(nycaptor_gfxctrl_r, nycaptor_gfxctrl_w)
AM_RANGE(0xe000, 0xffff) AM_READWRITE(nycaptor_sharedram_r, nycaptor_sharedram_w) AM_BASE(m_sharedram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( cyclshtg_slave_map, AS_PROGRAM, 8, nycaptor_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xcfff) AM_READWRITE_LEGACY(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xc000, 0xcfff) AM_READWRITE(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xd800, 0xd800) AM_READ_PORT("DSWA")
AM_RANGE(0xd801, 0xd801) AM_READ_PORT("DSWB")
AM_RANGE(0xd802, 0xd802) AM_READ_PORT("DSWC")
AM_RANGE(0xd803, 0xd803) AM_READ_PORT("IN0")
AM_RANGE(0xd804, 0xd804) AM_READ_PORT("IN1")
- AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE_LEGACY(nycaptor_spriteram_r, nycaptor_spriteram_w)
- AM_RANGE(0xdca0, 0xdcbf) AM_WRITE_LEGACY(nycaptor_scrlram_w) AM_BASE(m_scrlram)
- AM_RANGE(0xdd00, 0xdeff) AM_READWRITE_LEGACY(nycaptor_palette_r, nycaptor_palette_w)
+ AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE(nycaptor_spriteram_r, nycaptor_spriteram_w)
+ AM_RANGE(0xdca0, 0xdcbf) AM_WRITE(nycaptor_scrlram_w) AM_BASE(m_scrlram)
+ AM_RANGE(0xdd00, 0xdeff) AM_READWRITE(nycaptor_palette_r, nycaptor_palette_w)
AM_RANGE(0xdf00, 0xdf00) AM_READ(nycaptor_bx_r)
AM_RANGE(0xdf01, 0xdf01) AM_READ(nycaptor_by_r)
AM_RANGE(0xdf02, 0xdf02) AM_READ(nycaptor_b_r)
- AM_RANGE(0xdf03, 0xdf03) AM_READ_LEGACY(nycaptor_gfxctrl_r)
+ AM_RANGE(0xdf03, 0xdf03) AM_READ(nycaptor_gfxctrl_r)
AM_RANGE(0xdf03, 0xdf03) AM_WRITENOP
AM_RANGE(0xe000, 0xffff) AM_READWRITE(nycaptor_sharedram_r, nycaptor_sharedram_w)
ADDRESS_MAP_END
@@ -492,7 +492,7 @@ READ8_MEMBER(nycaptor_state::unk_r)
static ADDRESS_MAP_START( bronx_master_map, AS_PROGRAM, 8, nycaptor_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xcfff) AM_READWRITE_LEGACY(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xc000, 0xcfff) AM_READWRITE(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xd000, 0xd000) AM_READ(cyclshtg_mcu_r) AM_WRITENOP
AM_RANGE(0xd001, 0xd001) AM_WRITE(sub_cpu_halt_w)
AM_RANGE(0xd002, 0xd002) AM_READWRITE(nycaptor_generic_control_r, cyclshtg_generic_control_w)
@@ -507,16 +507,16 @@ static ADDRESS_MAP_START( bronx_master_map, AS_PROGRAM, 8, nycaptor_state )
AM_RANGE(0xd805, 0xd805) AM_READ(cyclshtg_mcu_status_r)
AM_RANGE(0xd806, 0xd806) AM_READNOP
AM_RANGE(0xd807, 0xd807) AM_READ(cyclshtg_mcu_status_r)
- AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE_LEGACY(nycaptor_spriteram_r, nycaptor_spriteram_w)
- AM_RANGE(0xdca0, 0xdcbf) AM_READWRITE_LEGACY(nycaptor_scrlram_r, nycaptor_scrlram_w) AM_BASE(m_scrlram)
- AM_RANGE(0xdd00, 0xdeff) AM_READWRITE_LEGACY(nycaptor_palette_r, nycaptor_palette_w)
- AM_RANGE(0xdf03, 0xdf03) AM_READWRITE_LEGACY(nycaptor_gfxctrl_r, nycaptor_gfxctrl_w)
+ AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE(nycaptor_spriteram_r, nycaptor_spriteram_w)
+ AM_RANGE(0xdca0, 0xdcbf) AM_READWRITE(nycaptor_scrlram_r, nycaptor_scrlram_w) AM_BASE(m_scrlram)
+ AM_RANGE(0xdd00, 0xdeff) AM_READWRITE(nycaptor_palette_r, nycaptor_palette_w)
+ AM_RANGE(0xdf03, 0xdf03) AM_READWRITE(nycaptor_gfxctrl_r, nycaptor_gfxctrl_w)
AM_RANGE(0xe000, 0xffff) AM_READWRITE(nycaptor_sharedram_r, nycaptor_sharedram_w) AM_BASE(m_sharedram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bronx_slave_map, AS_PROGRAM, 8, nycaptor_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0xc000, 0xcfff) AM_READWRITE_LEGACY(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xc000, 0xcfff) AM_READWRITE(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xd800, 0xd800) AM_READ_PORT("DSWA")
AM_RANGE(0xd801, 0xd801) AM_READ_PORT("DSWB")
AM_RANGE(0xd802, 0xd802) AM_READ_PORT("DSWC")
@@ -524,13 +524,13 @@ static ADDRESS_MAP_START( bronx_slave_map, AS_PROGRAM, 8, nycaptor_state )
AM_RANGE(0xd804, 0xd804) AM_READ_PORT("IN1")
AM_RANGE(0xd805, 0xd805) AM_READ(cyclshtg_mcu_status_r1)
AM_RANGE(0xd807, 0xd807) AM_READ(cyclshtg_mcu_status_r)
- AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE_LEGACY(nycaptor_spriteram_r, nycaptor_spriteram_w)
- AM_RANGE(0xdca0, 0xdcbf) AM_WRITE_LEGACY(nycaptor_scrlram_w) AM_BASE(m_scrlram)
- AM_RANGE(0xdd00, 0xdeff) AM_READWRITE_LEGACY(nycaptor_palette_r, nycaptor_palette_w)
+ AM_RANGE(0xdc00, 0xdc9f) AM_READWRITE(nycaptor_spriteram_r, nycaptor_spriteram_w)
+ AM_RANGE(0xdca0, 0xdcbf) AM_WRITE(nycaptor_scrlram_w) AM_BASE(m_scrlram)
+ AM_RANGE(0xdd00, 0xdeff) AM_READWRITE(nycaptor_palette_r, nycaptor_palette_w)
AM_RANGE(0xdf00, 0xdf00) AM_READ(nycaptor_bx_r)
AM_RANGE(0xdf01, 0xdf01) AM_READ(nycaptor_by_r)
AM_RANGE(0xdf02, 0xdf02) AM_READ(nycaptor_b_r)
- AM_RANGE(0xdf03, 0xdf03) AM_READWRITE_LEGACY(nycaptor_gfxctrl_r, nycaptor_gfxctrl_w)
+ AM_RANGE(0xdf03, 0xdf03) AM_READWRITE(nycaptor_gfxctrl_r, nycaptor_gfxctrl_w)
AM_RANGE(0xe000, 0xffff) AM_READWRITE(nycaptor_sharedram_r, nycaptor_sharedram_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index 5c8a7397450..5f0b81d02e0 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -41,10 +41,10 @@ WRITE16_MEMBER(ohmygod_state::ohmygod_ctrl_w)
static ADDRESS_MAP_START( ohmygod_map, AS_PROGRAM, 16, ohmygod_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x300000, 0x303fff) AM_RAM
- AM_RANGE(0x304000, 0x307fff) AM_RAM_WRITE_LEGACY(ohmygod_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x304000, 0x307fff) AM_RAM_WRITE(ohmygod_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x308000, 0x30ffff) AM_RAM
- AM_RANGE(0x400000, 0x400001) AM_WRITE_LEGACY(ohmygod_scrollx_w)
- AM_RANGE(0x400002, 0x400003) AM_WRITE_LEGACY(ohmygod_scrolly_w)
+ AM_RANGE(0x400000, 0x400001) AM_WRITE(ohmygod_scrollx_w)
+ AM_RANGE(0x400002, 0x400003) AM_WRITE(ohmygod_scrolly_w)
AM_RANGE(0x600000, 0x6007ff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x700000, 0x703fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x704000, 0x707fff) AM_RAM
@@ -56,7 +56,7 @@ static ADDRESS_MAP_START( ohmygod_map, AS_PROGRAM, 16, ohmygod_state )
AM_RANGE(0xa00002, 0xa00003) AM_READ_PORT("DSW2")
AM_RANGE(0xb00000, 0xb00001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0xc00000, 0xc00001) AM_READ(watchdog_reset16_r)
- AM_RANGE(0xd00000, 0xd00001) AM_WRITE_LEGACY(ohmygod_spritebank_w)
+ AM_RANGE(0xd00000, 0xd00001) AM_WRITE(ohmygod_spritebank_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index 736206ca956..bb99e0d0251 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -194,18 +194,18 @@ WRITE8_MEMBER(ojankohs_state::ccasino_coinctr_w)
static ADDRESS_MAP_START( ojankohs_map, AS_PROGRAM, 8, ojankohs_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE_LEGACY(ojankohs_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9000, 0x9fff) AM_RAM_WRITE_LEGACY(ojankohs_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(ojankohs_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9000, 0x9fff) AM_RAM_WRITE(ojankohs_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xa000, 0xb7ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0xb800, 0xbfff) AM_RAM_WRITE_LEGACY(ojankohs_palette_w) AM_BASE(m_paletteram)
+ AM_RANGE(0xb800, 0xbfff) AM_RAM_WRITE(ojankohs_palette_w) AM_BASE(m_paletteram)
AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
static ADDRESS_MAP_START( ojankoy_map, AS_PROGRAM, 8, ojankohs_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x9fff) AM_RAM_WRITE_LEGACY(ojankohs_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE_LEGACY(ojankohs_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x8000, 0x9fff) AM_RAM_WRITE(ojankohs_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(ojankohs_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xb000, 0xbfff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
@@ -214,7 +214,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ojankoc_map, AS_PROGRAM, 8, ojankohs_state )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_WRITE_LEGACY(ojankoc_videoram_w)
+ AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_WRITE(ojankoc_videoram_w)
ADDRESS_MAP_END
@@ -222,9 +222,9 @@ static ADDRESS_MAP_START( ojankohs_io_map, AS_IO, 8, ojankohs_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(ojankohs_portselect_w)
AM_RANGE(0x01, 0x01) AM_READWRITE(ojankohs_keymatrix_r, ojankohs_rombank_w)
- AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1") AM_WRITE_LEGACY(ojankohs_gfxreg_w)
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1") AM_WRITE(ojankohs_gfxreg_w)
AM_RANGE(0x03, 0x03) AM_DEVWRITE_LEGACY("msm", ojankohs_adpcm_reset_w)
- AM_RANGE(0x04, 0x04) AM_WRITE_LEGACY(ojankohs_flipscreen_w)
+ AM_RANGE(0x04, 0x04) AM_WRITE(ojankohs_flipscreen_w)
AM_RANGE(0x05, 0x05) AM_WRITE(ojankohs_msm5205_w)
AM_RANGE(0x06, 0x06) AM_DEVREAD_LEGACY("aysnd", ay8910_r)
AM_RANGE(0x06, 0x07) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
@@ -237,7 +237,7 @@ static ADDRESS_MAP_START( ojankoy_io_map, AS_IO, 8, ojankohs_state )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(ojankohs_portselect_w)
AM_RANGE(0x01, 0x01) AM_READWRITE(ojankohs_keymatrix_r, ojankoy_rombank_w)
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1") AM_WRITE(ojankoy_coinctr_w)
- AM_RANGE(0x04, 0x04) AM_WRITE_LEGACY(ojankohs_flipscreen_w)
+ AM_RANGE(0x04, 0x04) AM_WRITE(ojankohs_flipscreen_w)
AM_RANGE(0x05, 0x05) AM_WRITE(ojankohs_msm5205_w)
AM_RANGE(0x06, 0x06) AM_DEVREAD_LEGACY("aysnd", ay8910_r)
AM_RANGE(0x06, 0x07) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
@@ -249,18 +249,18 @@ static ADDRESS_MAP_START( ccasino_io_map, AS_IO, 8, ojankohs_state )
AM_RANGE(0x01, 0x01) AM_READWRITE(ojankohs_keymatrix_r, ojankohs_rombank_w)
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1") AM_WRITE(ccasino_coinctr_w)
AM_RANGE(0x03, 0x03) AM_READ(ccasino_dipsw3_r) AM_DEVWRITE_LEGACY("msm", ojankohs_adpcm_reset_w)
- AM_RANGE(0x04, 0x04) AM_READ(ccasino_dipsw4_r) AM_WRITE_LEGACY(ojankohs_flipscreen_w)
+ AM_RANGE(0x04, 0x04) AM_READ(ccasino_dipsw4_r) AM_WRITE(ojankohs_flipscreen_w)
AM_RANGE(0x05, 0x05) AM_WRITE(ojankohs_msm5205_w)
AM_RANGE(0x06, 0x06) AM_DEVREAD_LEGACY("aysnd", ay8910_r)
AM_RANGE(0x06, 0x07) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
- AM_RANGE(0x08, 0x0f) AM_WRITE_LEGACY(ccasino_palette_w) AM_BASE(m_paletteram) // 16bit address access
+ AM_RANGE(0x08, 0x0f) AM_WRITE(ccasino_palette_w) AM_BASE(m_paletteram) // 16bit address access
AM_RANGE(0x10, 0x10) AM_WRITENOP
AM_RANGE(0x11, 0x11) AM_WRITENOP
ADDRESS_MAP_END
static ADDRESS_MAP_START( ojankoc_io_map, AS_IO, 8, ojankohs_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x1f) AM_WRITE_LEGACY(ojankoc_palette_w)
+ AM_RANGE(0x00, 0x1f) AM_WRITE(ojankoc_palette_w)
AM_RANGE(0xf9, 0xf9) AM_WRITE(ojankohs_msm5205_w)
AM_RANGE(0xfb, 0xfb) AM_WRITE(ojankoc_ctrl_w)
AM_RANGE(0xfc, 0xfd) AM_READ(ojankoc_keymatrix_r)
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index 89b8f58bce9..b56ee2c7e50 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -105,9 +105,9 @@ static ADDRESS_MAP_START( oneshot_map, AS_PROGRAM, 16, oneshot_state )
AM_RANGE(0x080000, 0x087fff) AM_RAM
AM_RANGE(0x0c0000, 0x0c07ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x120000, 0x120fff) AM_RAM AM_BASE(m_sprites)
- AM_RANGE(0x180000, 0x180fff) AM_RAM_WRITE_LEGACY(oneshot_mid_videoram_w) AM_BASE(m_mid_videoram) // some people , girl etc.
- AM_RANGE(0x181000, 0x181fff) AM_RAM_WRITE_LEGACY(oneshot_fg_videoram_w) AM_BASE(m_fg_videoram) // credits etc.
- AM_RANGE(0x182000, 0x182fff) AM_RAM_WRITE_LEGACY(oneshot_bg_videoram_w) AM_BASE(m_bg_videoram) // credits etc.
+ AM_RANGE(0x180000, 0x180fff) AM_RAM_WRITE(oneshot_mid_videoram_w) AM_BASE(m_mid_videoram) // some people , girl etc.
+ AM_RANGE(0x181000, 0x181fff) AM_RAM_WRITE(oneshot_fg_videoram_w) AM_BASE(m_fg_videoram) // credits etc.
+ AM_RANGE(0x182000, 0x182fff) AM_RAM_WRITE(oneshot_bg_videoram_w) AM_BASE(m_bg_videoram) // credits etc.
AM_RANGE(0x188000, 0x18800f) AM_WRITEONLY AM_BASE(m_scroll) // scroll registers
AM_RANGE(0x190002, 0x190003) AM_READ(soundlatch_word_r)
AM_RANGE(0x190010, 0x190011) AM_WRITE(soundlatch_word_w)
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index 8805492c761..85c68adbe74 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -356,15 +356,15 @@ static WRITE8_DEVICE_HANDLER( sound_bankswitch_w )
static ADDRESS_MAP_START( opwolf_map, AS_PROGRAM, 16, opwolf_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x0f0000, 0x0f07ff) AM_MIRROR(0xf000) AM_READ_LEGACY(opwolf_cchip_data_r)
- AM_RANGE(0x0f0802, 0x0f0803) AM_MIRROR(0xf000) AM_READ_LEGACY(opwolf_cchip_status_r)
- AM_RANGE(0x0ff000, 0x0ff7ff) AM_WRITE_LEGACY(opwolf_cchip_data_w)
- AM_RANGE(0x0ff802, 0x0ff803) AM_WRITE_LEGACY(opwolf_cchip_status_w)
- AM_RANGE(0x0ffc00, 0x0ffc01) AM_WRITE_LEGACY(opwolf_cchip_bank_w)
+ AM_RANGE(0x0f0000, 0x0f07ff) AM_MIRROR(0xf000) AM_READ(opwolf_cchip_data_r)
+ AM_RANGE(0x0f0802, 0x0f0803) AM_MIRROR(0xf000) AM_READ(opwolf_cchip_status_r)
+ AM_RANGE(0x0ff000, 0x0ff7ff) AM_WRITE(opwolf_cchip_data_w)
+ AM_RANGE(0x0ff802, 0x0ff803) AM_WRITE(opwolf_cchip_status_w)
+ AM_RANGE(0x0ffc00, 0x0ffc01) AM_WRITE(opwolf_cchip_bank_w)
AM_RANGE(0x100000, 0x107fff) AM_RAM
AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x380000, 0x380003) AM_READ(opwolf_dsw_r) /* dip switches */
- AM_RANGE(0x380000, 0x380003) AM_WRITE_LEGACY(opwolf_spritectrl_w) // usually 0x4, changes when you fire
+ AM_RANGE(0x380000, 0x380003) AM_WRITE(opwolf_spritectrl_w) // usually 0x4, changes when you fire
AM_RANGE(0x3a0000, 0x3a0003) AM_READ(opwolf_lightgun_r) /* lightgun, read at $11e0/6 */
AM_RANGE(0x3c0000, 0x3c0001) AM_WRITENOP /* watchdog ?? */
AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
@@ -385,7 +385,7 @@ static ADDRESS_MAP_START( opwolfb_map, AS_PROGRAM, 16, opwolf_state )
AM_RANGE(0x100000, 0x107fff) AM_RAM
AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x380000, 0x380003) AM_READ(opwolf_dsw_r) /* dip switches */
- AM_RANGE(0x380000, 0x380003) AM_WRITE_LEGACY(opwolf_spritectrl_w) // usually 0x4, changes when you fire
+ AM_RANGE(0x380000, 0x380003) AM_WRITE(opwolf_spritectrl_w) // usually 0x4, changes when you fire
AM_RANGE(0x3a0000, 0x3a0003) AM_READ(opwolf_lightgun_r) /* lightgun, read at $11e0/6 */
AM_RANGE(0x3c0000, 0x3c0001) AM_WRITENOP /* watchdog ?? */
AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c
index 3e698ebc513..b85e461b3c6 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -112,7 +112,7 @@ static ADDRESS_MAP_START( orbit_map, AS_PROGRAM, 8, orbit_state )
AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x07ff) AM_READ_PORT("DSW1")
AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x07ff) AM_READ_PORT("DSW2")
AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x07ff) AM_READ_PORT("BUTTONS")
- AM_RANGE(0x3000, 0x33bf) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(orbit_playfield_w) AM_BASE(m_playfield_ram)
+ AM_RANGE(0x3000, 0x33bf) AM_MIRROR(0x0400) AM_RAM_WRITE(orbit_playfield_w) AM_BASE(m_playfield_ram)
AM_RANGE(0x33c0, 0x33ff) AM_MIRROR(0x0400) AM_RAM AM_BASE(m_sprite_ram)
AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x00ff) AM_DEVWRITE_LEGACY("discrete", orbit_note_w)
AM_RANGE(0x3900, 0x3900) AM_MIRROR(0x00ff) AM_DEVWRITE_LEGACY("discrete", orbit_noise_amp_w)
diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c
index 3cf7efbd28e..c8a0446599a 100644
--- a/src/mame/drivers/othldrby.c
+++ b/src/mame/drivers/othldrby.c
@@ -84,11 +84,11 @@ static ADDRESS_MAP_START( othldrby_map, AS_PROGRAM, 16, othldrby_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x20000f) AM_READWRITE(calendar_r, calendar_w)
- AM_RANGE(0x300000, 0x300001) AM_WRITE_LEGACY(othldrby_videoram_addr_w)
- AM_RANGE(0x300004, 0x300007) AM_READWRITE_LEGACY(othldrby_videoram_r, othldrby_videoram_w)
- AM_RANGE(0x300008, 0x300009) AM_WRITE_LEGACY(othldrby_vreg_addr_w)
+ AM_RANGE(0x300000, 0x300001) AM_WRITE(othldrby_videoram_addr_w)
+ AM_RANGE(0x300004, 0x300007) AM_READWRITE(othldrby_videoram_r, othldrby_videoram_w)
+ AM_RANGE(0x300008, 0x300009) AM_WRITE(othldrby_vreg_addr_w)
AM_RANGE(0x30000c, 0x30000d) AM_READ_PORT("VBLANK")
- AM_RANGE(0x30000c, 0x30000f) AM_WRITE_LEGACY(othldrby_vreg_w)
+ AM_RANGE(0x30000c, 0x30000f) AM_WRITE(othldrby_vreg_w)
AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x600000, 0x600001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x700000, 0x700001) AM_READ(othldrby_scanline_r)
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index 3783fe0878a..57dd00dd730 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -236,12 +236,12 @@ WRITE8_MEMBER(pacland_state::pacland_irq_2_ctrl_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, pacland_state )
- AM_RANGE(0x0000, 0x0fff) AM_RAM_WRITE_LEGACY(pacland_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE_LEGACY(pacland_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x0000, 0x0fff) AM_RAM_WRITE(pacland_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(pacland_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0x2000, 0x37ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x3800, 0x3801) AM_WRITE_LEGACY(pacland_scroll0_w)
- AM_RANGE(0x3a00, 0x3a01) AM_WRITE_LEGACY(pacland_scroll1_w)
- AM_RANGE(0x3c00, 0x3c00) AM_WRITE_LEGACY(pacland_bankswitch_w)
+ AM_RANGE(0x3800, 0x3801) AM_WRITE(pacland_scroll0_w)
+ AM_RANGE(0x3a00, 0x3a01) AM_WRITE(pacland_scroll1_w)
+ AM_RANGE(0x3c00, 0x3c00) AM_WRITE(pacland_bankswitch_w)
AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank1")
AM_RANGE(0x6800, 0x6bff) AM_DEVREADWRITE_LEGACY("namco", namcos1_cus30_r, namcos1_cus30_w) /* PSG device, shared RAM */
AM_RANGE(0x7000, 0x7fff) AM_WRITE(pacland_irq_1_ctrl_w)
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index c716bf1d6d9..3f5ee1f4bc8 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -873,15 +873,15 @@ WRITE8_MEMBER(pacman_state::irq_mask_w)
static ADDRESS_MAP_START( pacman_map, AS_PROGRAM, 8, pacman_state )
//A lot of games don't have an a15 at the cpu. Generally only games with a cpu daughter board can access the full 32k of romspace.
AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x8000) AM_ROM
- AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READ(pacman_read_nop) AM_WRITENOP
AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM
AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(irq_mask_w)
AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITENOP
- AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_leds_w)
AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_coin_lockout_global_w)
AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w)
@@ -900,15 +900,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( birdiy_map, AS_PROGRAM, 8, pacman_state )
AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x8000) AM_ROM
- AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE(m_colorram)
// AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READ(pacman_read_nop) AM_WRITENOP
AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM
AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_WRITE(irq_mask_w)
// AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
// AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITENOP
- AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w)
// AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_leds_w)
// AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_coin_lockout_global_w)
AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w)
@@ -924,15 +924,15 @@ static ADDRESS_MAP_START( birdiy_map, AS_PROGRAM, 8, pacman_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( mspacman_map, AS_PROGRAM, 8, pacman_state )
- AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READ(pacman_read_nop) AM_WRITENOP
AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM
AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(irq_mask_w)
AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITENOP
- AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_leds_w)
AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_lockout_global_w)
AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w)
@@ -964,15 +964,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( woodpek_map, AS_PROGRAM, 8, pacman_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READ(pacman_read_nop) AM_WRITENOP
AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM
AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(irq_mask_w)
AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITENOP
- AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_leds_w)
AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_coin_lockout_global_w)
AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w)
@@ -991,8 +991,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( alibaba_map, AS_PROGRAM, 8, pacman_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READ(pacman_read_nop) AM_WRITENOP
AM_RANGE(0x4c00, 0x4eef) AM_MIRROR(0xa000) AM_RAM
AM_RANGE(0x4ef0, 0x4eff) AM_MIRROR(0xa000) AM_RAM AM_SHARE("spriteram")
@@ -1006,7 +1006,7 @@ static ADDRESS_MAP_START( alibaba_map, AS_PROGRAM, 8, pacman_state )
AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITENOP
AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITENOP
AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf00) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
- AM_RANGE(0x50c1, 0x50c1) AM_MIRROR(0xaf00) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x50c1, 0x50c1) AM_MIRROR(0xaf00) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x50c2, 0x50c2) AM_MIRROR(0xaf00) AM_WRITE(irq_mask_w)
AM_RANGE(0x50c3, 0x50ff) AM_MIRROR(0xaf00) AM_WRITENOP
AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ_PORT("IN0") /* IN0 */
@@ -1023,14 +1023,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dremshpr_map, AS_PROGRAM, 8, pacman_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x4800, 0x4fef) AM_MIRROR(0xa000) AM_RAM
AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(irq_mask_w)
// AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITENOP /* unknown */
- AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_leds_w)
AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_coin_lockout_global_w)
AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w)
@@ -1053,15 +1053,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( epos_map, AS_PROGRAM, 8, pacman_state )
AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x8000) AM_ROMBANK("bank1")
- AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READ(pacman_read_nop) AM_WRITENOP
AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM
AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(irq_mask_w)
AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITENOP
- AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_leds_w)
AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_coin_lockout_global_w)
AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w)
@@ -1079,14 +1079,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( s2650games_map, AS_PROGRAM, 8, pacman_state )
AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x8000) AM_ROMBANK("bank1")
- AM_RANGE(0x1000, 0x13ff) AM_MIRROR(0xe000) AM_WRITE_LEGACY(s2650games_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x1400, 0x141f) AM_MIRROR(0xe000) AM_WRITE_LEGACY(s2650games_scroll_w)
+ AM_RANGE(0x1000, 0x13ff) AM_MIRROR(0xe000) AM_WRITE(s2650games_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x1400, 0x141f) AM_MIRROR(0xe000) AM_WRITE(s2650games_scroll_w)
AM_RANGE(0x1420, 0x148f) AM_MIRROR(0xe000) AM_WRITEONLY
AM_RANGE(0x1490, 0x149f) AM_MIRROR(0xe000) AM_WRITEONLY AM_SHARE("s2650_spriteram")
- AM_RANGE(0x14a0, 0x14bf) AM_MIRROR(0xe000) AM_WRITE_LEGACY(s2650games_tilesbank_w) AM_BASE(m_s2650games_tileram)
+ AM_RANGE(0x14a0, 0x14bf) AM_MIRROR(0xe000) AM_WRITE(s2650games_tilesbank_w) AM_BASE(m_s2650games_tileram)
AM_RANGE(0x14c0, 0x14ff) AM_MIRROR(0xe000) AM_WRITEONLY
AM_RANGE(0x1500, 0x1502) AM_MIRROR(0xe000) AM_WRITENOP
- AM_RANGE(0x1503, 0x1503) AM_MIRROR(0xe000) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x1503, 0x1503) AM_MIRROR(0xe000) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x1504, 0x1506) AM_MIRROR(0xe000) AM_WRITENOP
AM_RANGE(0x1507, 0x1507) AM_MIRROR(0xe000) AM_WRITE(pacman_coin_counter_w)
AM_RANGE(0x1508, 0x155f) AM_MIRROR(0xe000) AM_WRITEONLY
@@ -1098,7 +1098,7 @@ static ADDRESS_MAP_START( s2650games_map, AS_PROGRAM, 8, pacman_state )
AM_RANGE(0x1500, 0x1500) AM_MIRROR(0xe000) AM_READ_PORT("IN0")
AM_RANGE(0x1540, 0x1540) AM_MIRROR(0xe000) AM_READ_PORT("IN1")
AM_RANGE(0x1580, 0x1580) AM_MIRROR(0xe000) AM_READ_PORT("DSW0")
- AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0xe000) AM_WRITE_LEGACY(s2650games_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0xe000) AM_WRITE(s2650games_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1c00, 0x1fef) AM_MIRROR(0xe000) AM_RAM
AM_RANGE(0x1ff0, 0x1fff) AM_MIRROR(0xe000) AM_WRITEONLY AM_SHARE("spriteram")
AM_RANGE(0x2000, 0x2fff) AM_MIRROR(0x8000) AM_ROMBANK("bank2")
@@ -1109,12 +1109,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( rocktrv2_map, AS_PROGRAM, 8, pacman_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE_LEGACY(pacman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4400, 0x47ff) AM_RAM_WRITE_LEGACY(pacman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(pacman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4400, 0x47ff) AM_RAM_WRITE(pacman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x4c00, 0x4fff) AM_RAM
AM_RANGE(0x5000, 0x5000) AM_WRITE(irq_mask_w)
AM_RANGE(0x5001, 0x5001) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
- AM_RANGE(0x5003, 0x5003) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x5003, 0x5003) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x5007, 0x5007) AM_WRITE(pacman_coin_counter_w)
AM_RANGE(0x5040, 0x505f) AM_DEVWRITE_LEGACY("namco", pacman_sound_w)
AM_RANGE(0x50c0, 0x50c0) AM_WRITE(watchdog_reset_w)
@@ -1136,12 +1136,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bigbucks_map, AS_PROGRAM, 8, pacman_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE_LEGACY(pacman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4400, 0x47ff) AM_RAM_WRITE_LEGACY(pacman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(pacman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4400, 0x47ff) AM_RAM_WRITE(pacman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x4c00, 0x4fff) AM_RAM
AM_RANGE(0x5000, 0x5000) AM_WRITE(irq_mask_w)
AM_RANGE(0x5001, 0x5001) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
- AM_RANGE(0x5003, 0x5003) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x5003, 0x5003) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x5007, 0x5007) AM_WRITENOP /*?*/
AM_RANGE(0x5040, 0x505f) AM_DEVWRITE_LEGACY("namco", pacman_sound_w)
AM_RANGE(0x50c0, 0x50c0) AM_WRITE(watchdog_reset_w)
@@ -1157,15 +1157,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mschamp_map, AS_PROGRAM, 8, pacman_state )
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1")
- AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READ(pacman_read_nop) AM_WRITENOP
AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM
AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(irq_mask_w)
AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITENOP
- AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_leds_w)
AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_coin_lockout_global_w)
AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w)
@@ -1184,15 +1184,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( crushs_map, AS_PROGRAM, 8, pacman_state )
//A lot of games don't have an a15 at the cpu. Generally only games with a cpu daughter board can access the full 32k of romspace.
AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x8000) AM_ROM
- AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE_LEGACY(pacman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READ(pacman_read_nop) AM_WRITENOP
AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM
AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(irq_mask_w)
AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITENOP
- AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_leds_w)
AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_coin_lockout_global_w)
AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w)
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index 0d6deff1ec8..6270259edf5 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -73,7 +73,7 @@ WRITE8_MEMBER(pandoras_state::pandoras_int_control_w)
break;
case 0x03: coin_counter_w(machine(), 1,data & 0x01);
break;
- case 0x05: pandoras_flipscreen_w(&space, 0, data);
+ case 0x05: pandoras_flipscreen_w(space, 0, data);
break;
case 0x06: if (!data)
device_set_input_line(m_subcpu, M6809_IRQ_LINE, CLEAR_LINE);
@@ -130,10 +130,10 @@ WRITE8_MEMBER(pandoras_state::pandoras_z80_irqtrigger_w)
static ADDRESS_MAP_START( pandoras_master_map, AS_PROGRAM, 8, pandoras_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1") AM_BASE(m_spriteram) /* Work RAM (Shared with CPU B) */
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE_LEGACY(pandoras_cram_w) AM_SHARE("share2") AM_BASE(m_colorram) /* Color RAM (shared with CPU B) */
- AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE_LEGACY(pandoras_vram_w) AM_SHARE("share3") AM_BASE(m_videoram) /* Video RAM (shared with CPU B) */
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(pandoras_cram_w) AM_SHARE("share2") AM_BASE(m_colorram) /* Color RAM (shared with CPU B) */
+ AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(pandoras_vram_w) AM_SHARE("share3") AM_BASE(m_videoram) /* Video RAM (shared with CPU B) */
AM_RANGE(0x1800, 0x1807) AM_WRITE(pandoras_int_control_w) /* INT control */
- AM_RANGE(0x1a00, 0x1a00) AM_WRITE_LEGACY(pandoras_scrolly_w) /* bg scroll */
+ AM_RANGE(0x1a00, 0x1a00) AM_WRITE(pandoras_scrolly_w) /* bg scroll */
AM_RANGE(0x1c00, 0x1c00) AM_WRITE(pandoras_z80_irqtrigger_w) /* cause INT on the Z80 */
AM_RANGE(0x1e00, 0x1e00) AM_WRITE(soundlatch_w) /* sound command to the Z80 */
AM_RANGE(0x2000, 0x2000) AM_WRITE(pandoras_cpub_irqtrigger_w) /* cause FIRQ on CPU B */
@@ -145,8 +145,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pandoras_slave_map, AS_PROGRAM, 8, pandoras_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1") /* Work RAM (Shared with CPU A) */
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE_LEGACY(pandoras_cram_w) AM_SHARE("share2") /* Color RAM (shared with CPU A) */
- AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE_LEGACY(pandoras_vram_w) AM_SHARE("share3") /* Video RAM (shared with CPU A) */
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(pandoras_cram_w) AM_SHARE("share2") /* Color RAM (shared with CPU A) */
+ AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(pandoras_vram_w) AM_SHARE("share3") /* Video RAM (shared with CPU A) */
AM_RANGE(0x1800, 0x1800) AM_READ_PORT("DSW1")
AM_RANGE(0x1800, 0x1807) AM_WRITE(pandoras_int_control_w) /* INT control */
AM_RANGE(0x1a00, 0x1a00) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index f0602540de9..a3539e9ce90 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -74,9 +74,9 @@ WRITE8_MEMBER(paradise_state::torus_coin_counter_w)
#define STANDARD_MAP \
AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM */ \
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* ROM (banked) */ \
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(paradise_vram_2_w) AM_BASE(m_vram_2) /* Background */ \
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(paradise_vram_1_w) AM_BASE(m_vram_1) /* Midground */ \
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(paradise_vram_0_w) AM_BASE(m_vram_0) /* Foreground */ \
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(paradise_vram_2_w) AM_BASE(m_vram_2) /* Background */ \
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(paradise_vram_1_w) AM_BASE(m_vram_1) /* Midground */ \
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(paradise_vram_0_w) AM_BASE(m_vram_0) /* Foreground */ \
static ADDRESS_MAP_START( paradise_map, AS_PROGRAM, 8, paradise_state )
@@ -100,10 +100,10 @@ static ADDRESS_MAP_START( torus_map, AS_PROGRAM, 8, paradise_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( paradise_io_map, AS_IO, 8, paradise_state )
- AM_RANGE(0x0000, 0x17ff) AM_RAM_WRITE_LEGACY(paradise_palette_w) AM_BASE(m_paletteram) // Palette
- AM_RANGE(0x1800, 0x1800) AM_WRITE_LEGACY(paradise_priority_w) // Layers priority
- AM_RANGE(0x2001, 0x2001) AM_WRITE_LEGACY(paradise_flipscreen_w) // Flip Screen
- AM_RANGE(0x2004, 0x2004) AM_WRITE_LEGACY(paradise_palbank_w) // Layers palette bank
+ AM_RANGE(0x0000, 0x17ff) AM_RAM_WRITE(paradise_palette_w) AM_BASE(m_paletteram) // Palette
+ AM_RANGE(0x1800, 0x1800) AM_WRITE(paradise_priority_w) // Layers priority
+ AM_RANGE(0x2001, 0x2001) AM_WRITE(paradise_flipscreen_w) // Flip Screen
+ AM_RANGE(0x2004, 0x2004) AM_WRITE(paradise_palbank_w) // Layers palette bank
AM_RANGE(0x2006, 0x2006) AM_WRITE(paradise_rombank_w) // ROM bank
AM_RANGE(0x2007, 0x2007) AM_DEVWRITE_LEGACY("oki2", paradise_okibank_w) // OKI 1 samples bank
AM_RANGE(0x2010, 0x2010) AM_DEVREADWRITE("oki1", okim6295_device, read, write) // OKI 0
@@ -113,14 +113,14 @@ static ADDRESS_MAP_START( paradise_io_map, AS_IO, 8, paradise_state )
AM_RANGE(0x2023, 0x2023) AM_READ_PORT("P2")
AM_RANGE(0x2024, 0x2024) AM_READ_PORT("SYSTEM")
AM_RANGE(0x2030, 0x2030) AM_DEVREADWRITE("oki2", okim6295_device, read, write) // OKI 1
- AM_RANGE(0x8000, 0xffff) AM_RAM_WRITE_LEGACY(paradise_pixmap_w) AM_BASE(m_videoram) // Pixmap
+ AM_RANGE(0x8000, 0xffff) AM_RAM_WRITE(paradise_pixmap_w) AM_BASE(m_videoram) // Pixmap
ADDRESS_MAP_END
static ADDRESS_MAP_START( torus_io_map, AS_IO, 8, paradise_state )
- AM_RANGE(0x0000, 0x17ff) AM_RAM_WRITE_LEGACY(paradise_palette_w) AM_BASE(m_paletteram) // Palette
- AM_RANGE(0x1800, 0x1800) AM_WRITE_LEGACY(paradise_priority_w) // Layers priority
- AM_RANGE(0x2001, 0x2001) AM_WRITE_LEGACY(paradise_flipscreen_w) // Flip Screen
- AM_RANGE(0x2004, 0x2004) AM_WRITE_LEGACY(paradise_palbank_w) // Layers palette bank
+ AM_RANGE(0x0000, 0x17ff) AM_RAM_WRITE(paradise_palette_w) AM_BASE(m_paletteram) // Palette
+ AM_RANGE(0x1800, 0x1800) AM_WRITE(paradise_priority_w) // Layers priority
+ AM_RANGE(0x2001, 0x2001) AM_WRITE(paradise_flipscreen_w) // Flip Screen
+ AM_RANGE(0x2004, 0x2004) AM_WRITE(paradise_palbank_w) // Layers palette bank
AM_RANGE(0x2006, 0x2006) AM_WRITE(paradise_rombank_w) // ROM bank
AM_RANGE(0x2010, 0x2010) AM_DEVREADWRITE("oki1", okim6295_device, read, write) // OKI 0
AM_RANGE(0x2020, 0x2020) AM_READ_PORT("DSW1")
@@ -128,7 +128,7 @@ static ADDRESS_MAP_START( torus_io_map, AS_IO, 8, paradise_state )
AM_RANGE(0x2022, 0x2022) AM_READ_PORT("P1")
AM_RANGE(0x2023, 0x2023) AM_READ_PORT("P2")
AM_RANGE(0x2024, 0x2024) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x8000, 0xffff) AM_RAM_WRITE_LEGACY(paradise_pixmap_w) AM_BASE(m_videoram) // Pixmap
+ AM_RANGE(0x8000, 0xffff) AM_RAM_WRITE(paradise_pixmap_w) AM_BASE(m_videoram) // Pixmap
ADDRESS_MAP_END
@@ -1223,7 +1223,7 @@ static DRIVER_INIT (tgtball)
{
paradise_state *state = machine.driver_data<paradise_state>();
state->m_sprite_inc = 4;
- machine.device("maincpu")->memory().space(AS_IO)->install_legacy_write_handler(0x2001, 0x2001, FUNC(tgtball_flipscreen_w) );
+ machine.device("maincpu")->memory().space(AS_IO)->install_write_handler(0x2001, 0x2001, write8_delegate(FUNC(paradise_state::tgtball_flipscreen_w),state));
}
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index b3c93e7b3b4..b23ad2930c7 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -111,8 +111,8 @@
static ADDRESS_MAP_START( pass_map, AS_PROGRAM, 16, pass_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM
- AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE_LEGACY(pass_bg_videoram_w) AM_BASE(m_bg_videoram) // Background
- AM_RANGE(0x210000, 0x213fff) AM_RAM_WRITE_LEGACY(pass_fg_videoram_w) AM_BASE(m_fg_videoram) // Foreground
+ AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(pass_bg_videoram_w) AM_BASE(m_bg_videoram) // Background
+ AM_RANGE(0x210000, 0x213fff) AM_RAM_WRITE(pass_fg_videoram_w) AM_BASE(m_fg_videoram) // Foreground
AM_RANGE(0x220000, 0x2203ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x230000, 0x230001) AM_WRITE(soundlatch_word_w)
AM_RANGE(0x230100, 0x230101) AM_READ_PORT("DSW")
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c
index 3102d54c075..1bd73e5fd27 100644
--- a/src/mame/drivers/pastelg.c
+++ b/src/mame/drivers/pastelg.c
@@ -68,11 +68,11 @@ static ADDRESS_MAP_START( pastelg_io_map, AS_IO, 8, pastelg_state )
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("aysnd", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x90, 0x96) AM_WRITE_LEGACY(pastelg_blitter_w)
+ AM_RANGE(0x90, 0x96) AM_WRITE(pastelg_blitter_w)
AM_RANGE(0xa0, 0xa0) AM_READWRITE_LEGACY(nb1413m3_inputport1_r, nb1413m3_inputportsel_w)
- AM_RANGE(0xb0, 0xb0) AM_READWRITE_LEGACY(nb1413m3_inputport2_r, pastelg_romsel_w)
+ AM_RANGE(0xb0, 0xb0) AM_READ_LEGACY(nb1413m3_inputport2_r) AM_WRITE(pastelg_romsel_w)
AM_RANGE(0xc0, 0xc0) AM_READ(pastelg_sndrom_r)
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(pastelg_clut_w)
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(pastelg_clut_w)
AM_RANGE(0xd0, 0xd0) AM_READ(pastelg_irq_ack_r) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
AM_RANGE(0xe0, 0xe0) AM_READ_PORT("DSWC")
ADDRESS_MAP_END
@@ -115,12 +115,12 @@ static ADDRESS_MAP_START( threeds_io_map, AS_IO, 8, pastelg_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x81, 0x81) AM_DEVREAD_LEGACY("aysnd", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
- AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(threeds_romsel_w )
- AM_RANGE(0xf0, 0xf6) AM_WRITE_LEGACY(pastelg_blitter_w)
+ AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM") AM_WRITE(threeds_romsel_w )
+ AM_RANGE(0xf0, 0xf6) AM_WRITE(pastelg_blitter_w)
AM_RANGE(0xa0, 0xa0) AM_READWRITE(threeds_inputport1_r, threeds_inputportsel_w)
- AM_RANGE(0xb0, 0xb0) AM_READ(threeds_inputport2_r) AM_WRITE_LEGACY(threeds_output_w)//writes: bit 3 is coin lockout, bit 1 is coin counter
- AM_RANGE(0xc0, 0xcf) AM_WRITE_LEGACY(pastelg_clut_w)
- AM_RANGE(0xc0, 0xc0) AM_READ_LEGACY(threeds_rom_readback_r)
+ AM_RANGE(0xb0, 0xb0) AM_READ(threeds_inputport2_r) AM_WRITE(threeds_output_w)//writes: bit 3 is coin lockout, bit 1 is coin counter
+ AM_RANGE(0xc0, 0xcf) AM_WRITE(pastelg_clut_w)
+ AM_RANGE(0xc0, 0xc0) AM_READ(threeds_rom_readback_r)
AM_RANGE(0xd0, 0xd0) AM_READ(pastelg_irq_ack_r) AM_DEVWRITE_LEGACY("dac", DAC_WRITE)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index 9dd5c0efc6e..8ee98763621 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -86,18 +86,18 @@ static ADDRESS_MAP_START( pbaction_map, AS_PROGRAM, 8, pbaction_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE(m_work_ram)
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(pbaction_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE_LEGACY(pbaction_colorram2_w) AM_BASE(m_colorram2)
- AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE_LEGACY(pbaction_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE_LEGACY(pbaction_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(pbaction_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(pbaction_colorram2_w) AM_BASE(m_colorram2)
+ AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(pbaction_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(pbaction_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xe000, 0xe07f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe400, 0xe5ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_SHARE("paletteram")
AM_RANGE(0xe600, 0xe600) AM_READ_PORT("P1") AM_WRITE(nmi_mask_w)
AM_RANGE(0xe601, 0xe601) AM_READ_PORT("P2")
AM_RANGE(0xe602, 0xe602) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xe604, 0xe604) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(pbaction_flipscreen_w)
+ AM_RANGE(0xe604, 0xe604) AM_READ_PORT("DSW1") AM_WRITE(pbaction_flipscreen_w)
AM_RANGE(0xe605, 0xe605) AM_READ_PORT("DSW2")
- AM_RANGE(0xe606, 0xe606) AM_READNOP /* ??? */ AM_WRITE_LEGACY(pbaction_scroll_w)
+ AM_RANGE(0xe606, 0xe606) AM_READNOP /* ??? */ AM_WRITE(pbaction_scroll_w)
AM_RANGE(0xe800, 0xe800) AM_WRITE(pbaction_sh_command_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c
index 34b5cf9fbba..f0e637da038 100644
--- a/src/mame/drivers/pengo.c
+++ b/src/mame/drivers/pengo.c
@@ -119,8 +119,8 @@ static WRITE8_HANDLER( irq_mask_w )
static ADDRESS_MAP_START( pengo_map, AS_PROGRAM, 8, pengo_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE_LEGACY(pacman_videoram_w) AM_BASE(m_videoram) /* video and color RAM, scratchpad RAM, sprite codes */
- AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE_LEGACY(pacman_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(pacman_videoram_w) AM_BASE(m_videoram) /* video and color RAM, scratchpad RAM, sprite codes */
+ AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(pacman_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x8800, 0x8fef) AM_RAM
AM_RANGE(0x8ff0, 0x8fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x9000, 0x901f) AM_DEVWRITE_LEGACY("namco", pacman_sound_w)
@@ -129,11 +129,11 @@ static ADDRESS_MAP_START( pengo_map, AS_PROGRAM, 8, pengo_state )
AM_RANGE(0x9040, 0x907f) AM_READ_PORT("DSW0")
AM_RANGE(0x9040, 0x9040) AM_WRITE_LEGACY(irq_mask_w)
AM_RANGE(0x9041, 0x9041) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
- AM_RANGE(0x9042, 0x9042) AM_WRITE_LEGACY(pengo_palettebank_w)
- AM_RANGE(0x9043, 0x9043) AM_WRITE_LEGACY(pacman_flipscreen_w)
+ AM_RANGE(0x9042, 0x9042) AM_WRITE(pengo_palettebank_w)
+ AM_RANGE(0x9043, 0x9043) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x9044, 0x9045) AM_WRITE_LEGACY(pengo_coin_counter_w)
- AM_RANGE(0x9046, 0x9046) AM_WRITE_LEGACY(pengo_colortablebank_w)
- AM_RANGE(0x9047, 0x9047) AM_WRITE_LEGACY(pengo_gfxbank_w)
+ AM_RANGE(0x9046, 0x9046) AM_WRITE(pengo_colortablebank_w)
+ AM_RANGE(0x9047, 0x9047) AM_WRITE(pengo_gfxbank_w)
AM_RANGE(0x9070, 0x9070) AM_WRITENOP
AM_RANGE(0x9080, 0x90bf) AM_READ_PORT("IN1")
AM_RANGE(0x90c0, 0x90ff) AM_READ_PORT("IN0")
@@ -142,21 +142,21 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( jrpacmbl_map, AS_PROGRAM, 8, pengo_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(jrpacman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(jrpacman_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x8800, 0x8fef) AM_RAM
AM_RANGE(0x8ff0, 0x8fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x9000, 0x901f) AM_DEVWRITE_LEGACY("namco", pacman_sound_w)
AM_RANGE(0x9020, 0x902f) AM_WRITEONLY AM_SHARE("spriteram2")
- AM_RANGE(0x9030, 0x9030) AM_WRITE_LEGACY(jrpacman_scroll_w)
+ AM_RANGE(0x9030, 0x9030) AM_WRITE(jrpacman_scroll_w)
AM_RANGE(0x9040, 0x904f) AM_READ_PORT("DSW")
AM_RANGE(0x9040, 0x9040) AM_WRITE_LEGACY(irq_mask_w)
AM_RANGE(0x9041, 0x9041) AM_DEVWRITE_LEGACY("namco", pacman_sound_enable_w)
- AM_RANGE(0x9042, 0x9042) AM_WRITE_LEGACY(pengo_palettebank_w)
- AM_RANGE(0x9043, 0x9043) AM_WRITE_LEGACY(pacman_flipscreen_w)
- AM_RANGE(0x9044, 0x9044) AM_WRITE_LEGACY(jrpacman_bgpriority_w)
- AM_RANGE(0x9045, 0x9045) AM_WRITE_LEGACY(jrpacman_spritebank_w)
- AM_RANGE(0x9046, 0x9046) AM_WRITE_LEGACY(pengo_colortablebank_w)
- AM_RANGE(0x9047, 0x9047) AM_WRITE_LEGACY(jrpacman_charbank_w)
+ AM_RANGE(0x9042, 0x9042) AM_WRITE(pengo_palettebank_w)
+ AM_RANGE(0x9043, 0x9043) AM_WRITE(pacman_flipscreen_w)
+ AM_RANGE(0x9044, 0x9044) AM_WRITE(jrpacman_bgpriority_w)
+ AM_RANGE(0x9045, 0x9045) AM_WRITE(jrpacman_spritebank_w)
+ AM_RANGE(0x9046, 0x9046) AM_WRITE(pengo_colortablebank_w)
+ AM_RANGE(0x9047, 0x9047) AM_WRITE(jrpacman_charbank_w)
AM_RANGE(0x9070, 0x9070) AM_WRITENOP
AM_RANGE(0x9080, 0x90bf) AM_READ_PORT("P2")
AM_RANGE(0x90c0, 0x90ff) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 7ced86b59bd..1094cc2f87e 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -210,9 +210,9 @@ WRITE16_MEMBER(pgm_state::pgm_videoram_w)
{
if (offset < 0x4000 / 2)
- pgm_bg_videoram_w(&space, offset&0x7ff, data, mem_mask);
+ pgm_bg_videoram_w(space, offset&0x7ff, data, mem_mask);
else if (offset < 0x7000 / 2)
- pgm_tx_videoram_w(&space, offset&0xfff, data, mem_mask);
+ pgm_tx_videoram_w(space, offset&0xfff, data, mem_mask);
else
COMBINE_DATA(&m_videoram[offset]);
}
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index 602bbf66557..489737f50c4 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -40,9 +40,9 @@ Pleiads:
static ADDRESS_MAP_START( phoenix_memory_map, AS_PROGRAM, 8, phoenix_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x4fff) AM_READ_BANK("bank1") AM_WRITE_LEGACY(phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */
- AM_RANGE(0x5000, 0x53ff) AM_WRITE_LEGACY(phoenix_videoreg_w)
- AM_RANGE(0x5800, 0x5bff) AM_WRITE_LEGACY(phoenix_scroll_w)
+ AM_RANGE(0x4000, 0x4fff) AM_READ_BANK("bank1") AM_WRITE(phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */
+ AM_RANGE(0x5000, 0x53ff) AM_WRITE(phoenix_videoreg_w)
+ AM_RANGE(0x5800, 0x5bff) AM_WRITE(phoenix_scroll_w)
AM_RANGE(0x6000, 0x63ff) AM_DEVWRITE_LEGACY("cust", phoenix_sound_control_a_w)
AM_RANGE(0x6800, 0x6bff) AM_DEVWRITE_LEGACY("cust", phoenix_sound_control_b_w)
AM_RANGE(0x7000, 0x73ff) AM_READ_PORT("IN0") /* IN0 or IN1 */
@@ -51,9 +51,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pleiads_memory_map, AS_PROGRAM, 8, phoenix_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x4fff) AM_READ_BANK("bank1") AM_WRITE_LEGACY(phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */
- AM_RANGE(0x5000, 0x53ff) AM_WRITE_LEGACY(pleiads_videoreg_w)
- AM_RANGE(0x5800, 0x5bff) AM_WRITE_LEGACY(phoenix_scroll_w)
+ AM_RANGE(0x4000, 0x4fff) AM_READ_BANK("bank1") AM_WRITE(phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */
+ AM_RANGE(0x5000, 0x53ff) AM_WRITE(pleiads_videoreg_w)
+ AM_RANGE(0x5800, 0x5bff) AM_WRITE(phoenix_scroll_w)
AM_RANGE(0x6000, 0x63ff) AM_DEVWRITE_LEGACY("cust", pleiads_sound_control_a_w)
AM_RANGE(0x6800, 0x6bff) AM_DEVWRITE_LEGACY("cust", pleiads_sound_control_b_w)
AM_RANGE(0x7000, 0x73ff) AM_READ_PORT("IN0") /* IN0 or IN1 + protection */
@@ -62,12 +62,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( survival_memory_map, AS_PROGRAM, 8, phoenix_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x4fff) AM_READ_BANK("bank1") AM_WRITE_LEGACY(phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */
- AM_RANGE(0x5000, 0x53ff) AM_WRITE_LEGACY(phoenix_videoreg_w)
- AM_RANGE(0x5800, 0x5bff) AM_WRITE_LEGACY(phoenix_scroll_w)
+ AM_RANGE(0x4000, 0x4fff) AM_READ_BANK("bank1") AM_WRITE(phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */
+ AM_RANGE(0x5000, 0x53ff) AM_WRITE(phoenix_videoreg_w)
+ AM_RANGE(0x5800, 0x5bff) AM_WRITE(phoenix_scroll_w)
AM_RANGE(0x6800, 0x68ff) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w)
AM_RANGE(0x6900, 0x69ff) AM_DEVREADWRITE_LEGACY("aysnd", ay8910_r, ay8910_data_w)
- AM_RANGE(0x7000, 0x73ff) AM_READ_LEGACY(survival_input_port_0_r) /* IN0 or IN1 */
+ AM_RANGE(0x7000, 0x73ff) AM_READ(survival_input_port_0_r) /* IN0 or IN1 */
AM_RANGE(0x7800, 0x7bff) AM_READ_PORT("DSW0") /* DSW */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c
index a339cc4826a..5d6e585ea94 100644
--- a/src/mame/drivers/pingpong.c
+++ b/src/mame/drivers/pingpong.c
@@ -87,8 +87,8 @@ static TIMER_DEVICE_CALLBACK( merlinmm_interrupt )
static ADDRESS_MAP_START( pingpong_map, AS_PROGRAM, 8, pingpong_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE_LEGACY(pingpong_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE_LEGACY(pingpong_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(pingpong_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(pingpong_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x9000, 0x9002) AM_RAM
AM_RANGE(0x9003, 0x9052) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x9053, 0x97ff) AM_RAM
@@ -108,8 +108,8 @@ static ADDRESS_MAP_START( merlinmm_map, AS_PROGRAM, 8, pingpong_state )
AM_RANGE(0x5400, 0x57ff) AM_RAM
AM_RANGE(0x6000, 0x6007) AM_WRITENOP /* solenoid writes */
AM_RANGE(0x7000, 0x7000) AM_READ_PORT("IN4")
- AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE_LEGACY(pingpong_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE_LEGACY(pingpong_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(pingpong_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(pingpong_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x9000, 0x9002) AM_RAM
AM_RANGE(0x9003, 0x9052) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x9053, 0x97ff) AM_RAM
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index 94acf6afb55..c7c62cae9a5 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -175,6 +175,7 @@ Added Multiple Coin Feature:
static WRITE8_HANDLER( pipedrm_bankswitch_w )
{
+ fromance_state *state = space->machine().driver_data<fromance_state>();
/*
Bit layout:
@@ -190,7 +191,7 @@ static WRITE8_HANDLER( pipedrm_bankswitch_w )
memory_set_bank(space->machine(), "bank1", data & 0x7);
/* map to the fromance gfx register */
- fromance_gfxreg_w(space, offset, ((data >> 6) & 0x01) | /* flipscreen */
+ state->fromance_gfxreg_w(*space, offset, ((data >> 6) & 0x01) | /* flipscreen */
((~data >> 2) & 0x02)); /* videoram select */
}
@@ -268,17 +269,17 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, fromance_state )
AM_RANGE(0x8000, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
- AM_RANGE(0xd000, 0xffff) AM_READWRITE_LEGACY(fromance_videoram_r, fromance_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0xd000, 0xffff) AM_READWRITE(fromance_videoram_r, fromance_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
ADDRESS_MAP_END
static ADDRESS_MAP_START( main_portmap, AS_IO, 8, fromance_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(fromance_crtc_data_w)
- AM_RANGE(0x11, 0x11) AM_WRITE_LEGACY(fromance_crtc_register_w)
+ AM_RANGE(0x10, 0x10) AM_WRITE(fromance_crtc_data_w)
+ AM_RANGE(0x11, 0x11) AM_WRITE(fromance_crtc_register_w)
AM_RANGE(0x20, 0x20) AM_READ_PORT("P1") AM_WRITE_LEGACY(sound_command_w)
AM_RANGE(0x21, 0x21) AM_READ_PORT("P2") AM_WRITE_LEGACY(pipedrm_bankswitch_w)
- AM_RANGE(0x22, 0x25) AM_WRITE_LEGACY(fromance_scroll_w)
+ AM_RANGE(0x22, 0x25) AM_WRITE(fromance_scroll_w)
AM_RANGE(0x22, 0x22) AM_READ_PORT("DSW1")
AM_RANGE(0x23, 0x23) AM_READ_PORT("DSW2")
AM_RANGE(0x24, 0x24) AM_READ_PORT("SYSTEM")
@@ -886,8 +887,9 @@ static DRIVER_INIT( pipedrm )
static DRIVER_INIT( hatris )
{
+ fromance_state *state = machine.driver_data<fromance_state>();
machine.device("maincpu")->memory().space(AS_IO)->install_legacy_write_handler(0x20, 0x20, FUNC(sound_command_nonmi_w));
- machine.device("maincpu")->memory().space(AS_IO)->install_legacy_write_handler(0x21, 0x21, FUNC(fromance_gfxreg_w));
+ machine.device("maincpu")->memory().space(AS_IO)->install_write_handler(0x21, 0x21, write8_delegate(FUNC(fromance_state::fromance_gfxreg_w),state));
}
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 4d775183b75..2b539835f81 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -174,10 +174,10 @@ static ADDRESS_MAP_START( pirates_map, AS_PROGRAM, 16, pirates_state )
AM_RANGE(0x700000, 0x700001) AM_WRITEONLY AM_BASE(m_scroll) // scroll reg
AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x900000, 0x90017f) AM_RAM // more of tilemaps ?
- AM_RANGE(0x900180, 0x90137f) AM_RAM_WRITE_LEGACY(pirates_tx_tileram_w) AM_BASE(m_tx_tileram)
- AM_RANGE(0x901380, 0x902a7f) AM_RAM_WRITE_LEGACY(pirates_fg_tileram_w) AM_BASE(m_fg_tileram)
+ AM_RANGE(0x900180, 0x90137f) AM_RAM_WRITE(pirates_tx_tileram_w) AM_BASE(m_tx_tileram)
+ AM_RANGE(0x901380, 0x902a7f) AM_RAM_WRITE(pirates_fg_tileram_w) AM_BASE(m_fg_tileram)
// AM_RANGE(0x902580, 0x902a7f) AM_RAM // more of tilemaps ?
- AM_RANGE(0x902a80, 0x904187) AM_RAM_WRITE_LEGACY(pirates_bg_tileram_w) AM_BASE(m_bg_tileram)
+ AM_RANGE(0x902a80, 0x904187) AM_RAM_WRITE(pirates_bg_tileram_w) AM_BASE(m_bg_tileram)
// AM_RANGE(0x903c80, 0x904187) AM_RAM // more of tilemaps ?
AM_RANGE(0xa00000, 0xa00001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index 5be269d3c5f..426aa003821 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -94,26 +94,26 @@ WRITE8_MEMBER(pitnrun_state::pitnrun_vflip_w)
static ADDRESS_MAP_START( pitnrun_map, AS_PROGRAM, 8, pitnrun_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(pitnrun_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9000, 0x9fff) AM_RAM_WRITE_LEGACY(pitnrun_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(pitnrun_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9000, 0x9fff) AM_RAM_WRITE(pitnrun_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0xa000, 0xa0ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("SYSTEM")
AM_RANGE(0xa800, 0xa807) AM_WRITENOP /* Analog Sound */
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW") AM_WRITE(nmi_enable_w)
- AM_RANGE(0xb001, 0xb001) AM_WRITE_LEGACY(pitnrun_color_select_w)
+ AM_RANGE(0xb001, 0xb001) AM_WRITE(pitnrun_color_select_w)
AM_RANGE(0xb004, 0xb004) AM_WRITENOP/* COLOR SEL 2 - not used ?*/
- AM_RANGE(0xb005, 0xb005) AM_WRITE_LEGACY(pitnrun_char_bank_select)
+ AM_RANGE(0xb005, 0xb005) AM_WRITE(pitnrun_char_bank_select)
AM_RANGE(0xb006, 0xb006) AM_WRITE(pitnrun_hflip_w)
AM_RANGE(0xb007, 0xb007) AM_WRITE(pitnrun_vflip_w)
AM_RANGE(0xb800, 0xb800) AM_READ_PORT("INPUTS") AM_WRITE(soundlatch_w)
- AM_RANGE(0xc800, 0xc801) AM_WRITE_LEGACY(pitnrun_scroll_w)
+ AM_RANGE(0xc800, 0xc801) AM_WRITE(pitnrun_scroll_w)
AM_RANGE(0xc802, 0xc802) AM_WRITENOP/* VP(VF?)MCV - not used ?*/
- AM_RANGE(0xc804, 0xc804) AM_WRITE_LEGACY(pitnrun_mcu_data_w)
- AM_RANGE(0xc805, 0xc805) AM_WRITE_LEGACY(pitnrun_h_heed_w)
- AM_RANGE(0xc806, 0xc806) AM_WRITE_LEGACY(pitnrun_v_heed_w)
- AM_RANGE(0xc807, 0xc807) AM_WRITE_LEGACY(pitnrun_ha_w)
- AM_RANGE(0xd800, 0xd800) AM_READ_LEGACY(pitnrun_mcu_status_r)
- AM_RANGE(0xd000, 0xd000) AM_READ_LEGACY(pitnrun_mcu_data_r)
+ AM_RANGE(0xc804, 0xc804) AM_WRITE(pitnrun_mcu_data_w)
+ AM_RANGE(0xc805, 0xc805) AM_WRITE(pitnrun_h_heed_w)
+ AM_RANGE(0xc806, 0xc806) AM_WRITE(pitnrun_v_heed_w)
+ AM_RANGE(0xc807, 0xc807) AM_WRITE(pitnrun_ha_w)
+ AM_RANGE(0xd800, 0xd800) AM_READ(pitnrun_mcu_status_r)
+ AM_RANGE(0xd000, 0xd000) AM_READ(pitnrun_mcu_data_r)
AM_RANGE(0xf000, 0xf000) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
@@ -135,9 +135,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pitnrun_mcu_map, AS_PROGRAM, 8, pitnrun_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(pitnrun_68705_portA_r,pitnrun_68705_portA_w)
- AM_RANGE(0x0001, 0x0001) AM_READWRITE_LEGACY(pitnrun_68705_portB_r,pitnrun_68705_portB_w)
- AM_RANGE(0x0002, 0x0002) AM_READ_LEGACY(pitnrun_68705_portC_r)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(pitnrun_68705_portA_r,pitnrun_68705_portA_w)
+ AM_RANGE(0x0001, 0x0001) AM_READWRITE(pitnrun_68705_portB_r,pitnrun_68705_portB_w)
+ AM_RANGE(0x0002, 0x0002) AM_READ(pitnrun_68705_portC_r)
AM_RANGE(0x0003, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index 5a5c7ab10a3..01445b90a35 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -369,24 +369,24 @@ static ADDRESS_MAP_START( bios_map, AS_PROGRAM, 8, playch10_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM // 8V
AM_RANGE(0x8800, 0x8fff) AM_READWRITE(ram_8w_r, ram_8w_w) AM_BASE(m_ram_8w) // 8W
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(playch10_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(playch10_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xc000, 0xdfff) AM_ROM
- AM_RANGE(0xe000, 0xffff) AM_READWRITE_LEGACY(pc10_prot_r, pc10_prot_w)
+ AM_RANGE(0xe000, 0xffff) AM_READWRITE(pc10_prot_r, pc10_prot_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bios_io_map, AS_IO, 8, playch10_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ_PORT("BIOS") AM_WRITE_LEGACY(pc10_SDCS_w)
- AM_RANGE(0x01, 0x01) AM_READ_PORT("SW1") AM_WRITE_LEGACY(pc10_CNTRLMASK_w)
- AM_RANGE(0x02, 0x02) AM_READ_PORT("SW2") AM_WRITE_LEGACY(pc10_DISPMASK_w)
- AM_RANGE(0x03, 0x03) AM_READWRITE_LEGACY(pc10_detectclr_r, pc10_SOUNDMASK_w)
- AM_RANGE(0x04, 0x04) AM_WRITE_LEGACY(pc10_GAMERES_w)
- AM_RANGE(0x05, 0x05) AM_WRITE_LEGACY(pc10_GAMESTOP_w)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("BIOS") AM_WRITE(pc10_SDCS_w)
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("SW1") AM_WRITE(pc10_CNTRLMASK_w)
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("SW2") AM_WRITE(pc10_DISPMASK_w)
+ AM_RANGE(0x03, 0x03) AM_READWRITE(pc10_detectclr_r, pc10_SOUNDMASK_w)
+ AM_RANGE(0x04, 0x04) AM_WRITE(pc10_GAMERES_w)
+ AM_RANGE(0x05, 0x05) AM_WRITE(pc10_GAMESTOP_w)
AM_RANGE(0x06, 0x07) AM_WRITENOP
- AM_RANGE(0x08, 0x08) AM_WRITE_LEGACY(pc10_NMIENABLE_w)
- AM_RANGE(0x09, 0x09) AM_WRITE_LEGACY(pc10_DOGDI_w)
- AM_RANGE(0x0a, 0x0a) AM_WRITE_LEGACY(pc10_PPURES_w)
- AM_RANGE(0x0b, 0x0e) AM_WRITE_LEGACY(pc10_CARTSEL_w)
+ AM_RANGE(0x08, 0x08) AM_WRITE(pc10_NMIENABLE_w)
+ AM_RANGE(0x09, 0x09) AM_WRITE(pc10_DOGDI_w)
+ AM_RANGE(0x0a, 0x0a) AM_WRITE(pc10_PPURES_w)
+ AM_RANGE(0x0b, 0x0e) AM_WRITE(pc10_CARTSEL_w)
AM_RANGE(0x0f, 0x0f) AM_WRITE(up8w_w)
AM_RANGE(0x10, 0x13) AM_WRITE(time_w) AM_BASE(m_timedata)
ADDRESS_MAP_END
@@ -398,8 +398,8 @@ static ADDRESS_MAP_START( cart_map, AS_PROGRAM, 8, playch10_state )
AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE_LEGACY("nes", nes_psg_r, nes_psg_w)
AM_RANGE(0x4014, 0x4014) AM_WRITE(sprite_dma_w)
AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE_LEGACY("nes", psg_4015_r, psg_4015_w) /* PSG status / first control register */
- AM_RANGE(0x4016, 0x4016) AM_READWRITE_LEGACY(pc10_in0_r, pc10_in0_w)
- AM_RANGE(0x4017, 0x4017) AM_READ_LEGACY(pc10_in1_r) AM_DEVWRITE_LEGACY("nes", psg_4017_w) /* IN1 - input port 2 / PSG second control register */
+ AM_RANGE(0x4016, 0x4016) AM_READWRITE(pc10_in0_r, pc10_in0_w)
+ AM_RANGE(0x4017, 0x4017) AM_READ(pc10_in1_r) AM_DEVWRITE_LEGACY("nes", psg_4017_w) /* IN1 - input port 2 / PSG second control register */
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index a9ecbeba6c6..db701b43c5d 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -139,7 +139,7 @@ READ8_MEMBER(playmark_state::playmark_snd_command_r)
}
else if ((m_oki_control & 0x38) == 0x28)
{
- data = (m_oki->read(*&space, 0) & 0x0f);
+ data = (m_oki->read(space, 0) & 0x0f);
// logerror("PC$%03x PortB reading %02x from the OKI status port\n", cpu_get_previouspc(&space.device()), data);
}
@@ -181,7 +181,7 @@ WRITE8_MEMBER(playmark_state::playmark_oki_w)
WRITE8_MEMBER(playmark_state::playmark_snd_control_w)
{
-// address_&space *&space = device->machine().device("audiocpu")->memory().&space(AS_PROGRAM);
+// address_&space space = device->machine().device("audiocpu")->memory().&space(AS_PROGRAM);
/* This port controls communications to and from the 68K, and the OKI
device.
@@ -202,7 +202,7 @@ WRITE8_MEMBER(playmark_state::playmark_snd_control_w)
{
// logerror("PC$%03x Writing %02x to OKI1, PortC=%02x, Code=%02x\n",cpu_get_previouspc(&space.device()),playmark_oki_command,playmark_oki_control,playmark_snd_command);
okim6295_device *oki = machine().device<okim6295_device>("oki");
- oki->write(*&space, 0, m_oki_command);
+ oki->write(space, 0, m_oki_command);
}
}
@@ -219,11 +219,11 @@ static ADDRESS_MAP_START( bigtwin_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x304000, 0x304001) AM_NOP /* watchdog? irq ack? */
AM_RANGE(0x440000, 0x4403ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x500000, 0x500fff) AM_WRITE_LEGACY(wbeachvl_fgvideoram_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x500000, 0x500fff) AM_WRITE(wbeachvl_fgvideoram_w) AM_BASE(m_videoram2)
AM_RANGE(0x501000, 0x501fff) AM_WRITENOP /* unused RAM? */
- AM_RANGE(0x502000, 0x503fff) AM_WRITE_LEGACY(wbeachvl_txvideoram_w) AM_BASE(m_videoram1)
+ AM_RANGE(0x502000, 0x503fff) AM_WRITE(wbeachvl_txvideoram_w) AM_BASE(m_videoram1)
AM_RANGE(0x504000, 0x50ffff) AM_WRITENOP /* unused RAM? */
- AM_RANGE(0x510000, 0x51000b) AM_WRITE_LEGACY(bigtwin_scroll_w)
+ AM_RANGE(0x510000, 0x51000b) AM_WRITE(bigtwin_scroll_w)
AM_RANGE(0x51000c, 0x51000d) AM_WRITENOP /* always 3? */
AM_RANGE(0x600000, 0x67ffff) AM_RAM AM_BASE(m_bgvideoram)
AM_RANGE(0x700010, 0x700011) AM_READ_PORT("SYSTEM")
@@ -233,7 +233,7 @@ static ADDRESS_MAP_START( bigtwin_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0x70001a, 0x70001b) AM_READ_PORT("DSW1")
AM_RANGE(0x70001c, 0x70001d) AM_READ_PORT("DSW2")
AM_RANGE(0x70001e, 0x70001f) AM_WRITE(playmark_snd_command_w)
- AM_RANGE(0x780000, 0x7807ff) AM_WRITE_LEGACY(bigtwin_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x780000, 0x7807ff) AM_WRITE(bigtwin_paletteram_w) AM_SHARE("paletteram")
// AM_RANGE(0xe00000, 0xe00001) ?? written on startup
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
@@ -241,12 +241,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bigtwinb_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE_LEGACY(hrdtimes_bgvideoram_w) AM_BASE(m_videoram3)
- AM_RANGE(0x104000, 0x107fff) AM_RAM_WRITE_LEGACY(hrdtimes_fgvideoram_w) AM_BASE(m_videoram2)
- AM_RANGE(0x108000, 0x10ffff) AM_RAM_WRITE_LEGACY(hrdtimes_txvideoram_w) AM_BASE(m_videoram1)
- AM_RANGE(0x110000, 0x11000d) AM_WRITE_LEGACY(hrdtimes_scroll_w)
+ AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(hrdtimes_bgvideoram_w) AM_BASE(m_videoram3)
+ AM_RANGE(0x104000, 0x107fff) AM_RAM_WRITE(hrdtimes_fgvideoram_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x108000, 0x10ffff) AM_RAM_WRITE(hrdtimes_txvideoram_w) AM_BASE(m_videoram1)
+ AM_RANGE(0x110000, 0x11000d) AM_WRITE(hrdtimes_scroll_w)
AM_RANGE(0x201000, 0x2013ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x280000, 0x2807ff) AM_RAM_WRITE_LEGACY(bigtwin_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x280000, 0x2807ff) AM_RAM_WRITE(bigtwin_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x300010, 0x300011) AM_READ_PORT("SYSTEM")
AM_RANGE(0x300012, 0x300013) AM_READ_PORT("P1")
AM_RANGE(0x300014, 0x300015) AM_READ_PORT("P2")
@@ -261,11 +261,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( wbeachvl_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE_LEGACY(wbeachvl_bgvideoram_w) AM_BASE(m_videoram3)
- AM_RANGE(0x504000, 0x505fff) AM_RAM_WRITE_LEGACY(wbeachvl_fgvideoram_w) AM_BASE(m_videoram2)
- AM_RANGE(0x508000, 0x509fff) AM_RAM_WRITE_LEGACY(wbeachvl_txvideoram_w) AM_BASE(m_videoram1)
+ AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(wbeachvl_bgvideoram_w) AM_BASE(m_videoram3)
+ AM_RANGE(0x504000, 0x505fff) AM_RAM_WRITE(wbeachvl_fgvideoram_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x508000, 0x509fff) AM_RAM_WRITE(wbeachvl_txvideoram_w) AM_BASE(m_videoram1)
AM_RANGE(0x50f000, 0x50ffff) AM_RAM AM_BASE(m_rowscroll)
- AM_RANGE(0x510000, 0x51000b) AM_WRITE_LEGACY(wbeachvl_scroll_w)
+ AM_RANGE(0x510000, 0x51000b) AM_WRITE(wbeachvl_scroll_w)
AM_RANGE(0x51000c, 0x51000d) AM_WRITENOP /* 2 and 3 */
// AM_RANGE(0x700000, 0x700001) ?? written on startup
AM_RANGE(0x710010, 0x710011) AM_READ_PORT("SYSTEM")
@@ -284,9 +284,9 @@ static ADDRESS_MAP_START( excelsr_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0x000000, 0x2fffff) AM_ROM
AM_RANGE(0x304000, 0x304001) AM_WRITENOP /* watchdog? irq ack? */
AM_RANGE(0x440000, 0x440cff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE_LEGACY(wbeachvl_fgvideoram_w) AM_BASE(m_videoram2)
- AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE_LEGACY(wbeachvl_txvideoram_w) AM_BASE(m_videoram1)
- AM_RANGE(0x510000, 0x51000b) AM_WRITE_LEGACY(excelsr_scroll_w)
+ AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(wbeachvl_fgvideoram_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE(wbeachvl_txvideoram_w) AM_BASE(m_videoram1)
+ AM_RANGE(0x510000, 0x51000b) AM_WRITE(excelsr_scroll_w)
AM_RANGE(0x51000c, 0x51000d) AM_WRITENOP /* 2 and 3 */
AM_RANGE(0x600000, 0x67ffff) AM_RAM AM_BASE(m_bgvideoram)
AM_RANGE(0x700010, 0x700011) AM_READ_PORT("SYSTEM")
@@ -296,18 +296,18 @@ static ADDRESS_MAP_START( excelsr_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0x70001a, 0x70001b) AM_READ_PORT("DSW1")
AM_RANGE(0x70001c, 0x70001d) AM_READ_PORT("DSW2")
AM_RANGE(0x70001e, 0x70001f) AM_WRITE(playmark_snd_command_w)
- AM_RANGE(0x780000, 0x7807ff) AM_RAM_WRITE_LEGACY(bigtwin_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x780000, 0x7807ff) AM_RAM_WRITE(bigtwin_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( hotmind_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE_LEGACY(hrdtimes_bgvideoram_w) AM_BASE(m_videoram3)
- AM_RANGE(0x104000, 0x107fff) AM_RAM_WRITE_LEGACY(hrdtimes_fgvideoram_w) AM_BASE(m_videoram2)
- AM_RANGE(0x108000, 0x10ffff) AM_RAM_WRITE_LEGACY(hrdtimes_txvideoram_w) AM_BASE(m_videoram1)
- AM_RANGE(0x110000, 0x11000d) AM_WRITE_LEGACY(hrdtimes_scroll_w)
+ AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(hrdtimes_bgvideoram_w) AM_BASE(m_videoram3)
+ AM_RANGE(0x104000, 0x107fff) AM_RAM_WRITE(hrdtimes_fgvideoram_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x108000, 0x10ffff) AM_RAM_WRITE(hrdtimes_txvideoram_w) AM_BASE(m_videoram1)
+ AM_RANGE(0x110000, 0x11000d) AM_WRITE(hrdtimes_scroll_w)
AM_RANGE(0x200000, 0x200fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x280000, 0x2807ff) AM_RAM_WRITE_LEGACY(bigtwin_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x280000, 0x2807ff) AM_RAM_WRITE(bigtwin_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x300010, 0x300011) AM_READ_PORT("SYSTEM")
AM_RANGE(0x300012, 0x300013) AM_READ_PORT("P1")
AM_RANGE(0x300014, 0x300015) AM_READ_PORT("P2") AM_WRITE(hotmind_coin_eeprom_w)
@@ -322,12 +322,12 @@ static ADDRESS_MAP_START( hrdtimes_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x0bffff) AM_RAM
AM_RANGE(0x0c0000, 0x0fffff) AM_ROM AM_REGION("maincpu", 0x0c0000)
- AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE_LEGACY(hrdtimes_bgvideoram_w) AM_BASE(m_videoram3)
- AM_RANGE(0x104000, 0x107fff) AM_RAM_WRITE_LEGACY(hrdtimes_fgvideoram_w) AM_BASE(m_videoram2)
- AM_RANGE(0x108000, 0x10ffff) AM_RAM_WRITE_LEGACY(hrdtimes_txvideoram_w) AM_BASE(m_videoram1)
- AM_RANGE(0x110000, 0x11000d) AM_WRITE_LEGACY(hrdtimes_scroll_w)
+ AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(hrdtimes_bgvideoram_w) AM_BASE(m_videoram3)
+ AM_RANGE(0x104000, 0x107fff) AM_RAM_WRITE(hrdtimes_fgvideoram_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x108000, 0x10ffff) AM_RAM_WRITE(hrdtimes_txvideoram_w) AM_BASE(m_videoram1)
+ AM_RANGE(0x110000, 0x11000d) AM_WRITE(hrdtimes_scroll_w)
AM_RANGE(0x200000, 0x200fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x280000, 0x2807ff) AM_RAM_WRITE_LEGACY(bigtwin_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x280000, 0x2807ff) AM_RAM_WRITE(bigtwin_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x280800, 0x280fff) AM_RAM // unused
AM_RANGE(0x300010, 0x300011) AM_READ_PORT("SYSTEM")
AM_RANGE(0x300012, 0x300013) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 7a9f20bf0d0..96364dd01cd 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -506,13 +506,13 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 32, polygonet_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x21ffff) AM_RAM_WRITE(plygonet_palette_w) AM_SHARE("paletteram")
AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE16_LEGACY("k053936", k053936_ctrl_r, k053936_ctrl_w, 0xffffffff)
- AM_RANGE(0x440000, 0x440fff) AM_READWRITE_LEGACY(polygonet_roz_ram_r, polygonet_roz_ram_w)
+ AM_RANGE(0x440000, 0x440fff) AM_READWRITE(polygonet_roz_ram_r, polygonet_roz_ram_w)
AM_RANGE(0x480000, 0x4bffff) AM_DEVREAD_LEGACY("eeprom", polygonet_eeprom_r)
AM_RANGE(0x4C0000, 0x4fffff) AM_WRITE(polygonet_eeprom_w)
AM_RANGE(0x500000, 0x503fff) AM_RAM_WRITE(shared_ram_write) AM_BASE(m_shared_ram)
AM_RANGE(0x504000, 0x504003) AM_WRITE(dsp_w_lines)
AM_RANGE(0x506000, 0x50600f) AM_READWRITE(dsp_host_interface_r, dsp_host_interface_w)
- AM_RANGE(0x540000, 0x540fff) AM_READWRITE_LEGACY(polygonet_ttl_ram_r, polygonet_ttl_ram_w)
+ AM_RANGE(0x540000, 0x540fff) AM_READWRITE(polygonet_ttl_ram_r, polygonet_ttl_ram_w)
AM_RANGE(0x541000, 0x54101f) AM_RAM
AM_RANGE(0x580000, 0x5807ff) AM_RAM
AM_RANGE(0x580800, 0x580803) AM_READ(network_r) AM_WRITENOP /* network RAM | registers? */
diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c
index 6d85c17e634..ef61165a4b9 100644
--- a/src/mame/drivers/pokechmp.c
+++ b/src/mame/drivers/pokechmp.c
@@ -107,11 +107,11 @@ WRITE8_MEMBER(pokechmp_state::pokechmp_paletteram_w)
static ADDRESS_MAP_START( pokechmp_map, AS_PROGRAM, 8, pokechmp_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
- AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE_LEGACY(pokechmp_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE(pokechmp_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1000, 0x11ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x1800, 0x1800) AM_READ_PORT("P1")
- AM_RANGE(0x1801, 0x1801) AM_WRITE_LEGACY(pokechmp_flipscreen_w)
+ AM_RANGE(0x1801, 0x1801) AM_WRITE(pokechmp_flipscreen_w)
/* 1800 - 0x181f are unused BAC-06 registers, see video/dec0.c */
AM_RANGE(0x1802, 0x181f) AM_WRITENOP
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index e8593152afd..ec917ff4153 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -325,7 +325,7 @@ WRITE8_MEMBER(polepos_state::polepos_latch_w)
break;
case 0x07: /* CHACL */
- polepos_chacl_w(&space,offset,data);
+ polepos_chacl_w(space,offset,data);
break;
}
}
@@ -488,10 +488,10 @@ static MACHINE_RESET( polepos )
static ADDRESS_MAP_START( z80_map, AS_PROGRAM, 8, polepos_state )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x37ff) AM_MIRROR(0x0800) AM_RAM AM_SHARE("nvram") /* Battery Backup */
- AM_RANGE(0x4000, 0x47ff) AM_READWRITE_LEGACY(polepos_sprite_r, polepos_sprite_w) /* Motion Object */
- AM_RANGE(0x4800, 0x4bff) AM_READWRITE_LEGACY(polepos_road_r, polepos_road_w) /* Road Memory */
- AM_RANGE(0x4c00, 0x4fff) AM_READWRITE_LEGACY(polepos_alpha_r, polepos_alpha_w) /* Alphanumeric (char ram) */
- AM_RANGE(0x5000, 0x57ff) AM_READWRITE_LEGACY(polepos_view_r, polepos_view_w) /* Background Memory */
+ AM_RANGE(0x4000, 0x47ff) AM_READWRITE(polepos_sprite_r, polepos_sprite_w) /* Motion Object */
+ AM_RANGE(0x4800, 0x4bff) AM_READWRITE(polepos_road_r, polepos_road_w) /* Road Memory */
+ AM_RANGE(0x4c00, 0x4fff) AM_READWRITE(polepos_alpha_r, polepos_alpha_w) /* Alphanumeric (char ram) */
+ AM_RANGE(0x5000, 0x57ff) AM_READWRITE(polepos_view_r, polepos_view_w) /* Background Memory */
AM_RANGE(0x8000, 0x83bf) AM_MIRROR(0x0c00) AM_RAM /* Sound Memory */
AM_RANGE(0x83c0, 0x83ff) AM_MIRROR(0x0c00) AM_DEVREADWRITE_LEGACY("namco", polepos_sound_r, polepos_sound_w) /* Sound data */
@@ -515,12 +515,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( z8002_map, AS_PROGRAM, 16, polepos_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x6000, 0x6001) AM_MIRROR(0x0ffe) AM_WRITE(polepos_z8002_nvi_enable_w) /* NVI enable - *NOT* shared by the two CPUs */
- AM_RANGE(0x8000, 0x8fff) AM_READWRITE_LEGACY(polepos_sprite16_r, polepos_sprite16_w) AM_BASE(m_sprite16_memory) /* Motion Object */
- AM_RANGE(0x9000, 0x97ff) AM_READWRITE_LEGACY(polepos_road16_r, polepos_road16_w) AM_BASE(m_road16_memory) /* Road Memory */
- AM_RANGE(0x9800, 0x9fff) AM_READWRITE_LEGACY(polepos_alpha16_r, polepos_alpha16_w) AM_BASE(m_alpha16_memory) /* Alphanumeric (char ram) */
- AM_RANGE(0xa000, 0xafff) AM_READWRITE_LEGACY(polepos_view16_r, polepos_view16_w) AM_BASE(m_view16_memory) /* Background memory */
- AM_RANGE(0xc000, 0xc001) AM_MIRROR(0x38fe) AM_WRITE_LEGACY(polepos_view16_hscroll_w) /* Background horz scroll position */
- AM_RANGE(0xc100, 0xc101) AM_MIRROR(0x38fe) AM_WRITE_LEGACY(polepos_road16_vscroll_w) /* Road vertical position */
+ AM_RANGE(0x8000, 0x8fff) AM_READWRITE(polepos_sprite16_r, polepos_sprite16_w) AM_BASE(m_sprite16_memory) /* Motion Object */
+ AM_RANGE(0x9000, 0x97ff) AM_READWRITE(polepos_road16_r, polepos_road16_w) AM_BASE(m_road16_memory) /* Road Memory */
+ AM_RANGE(0x9800, 0x9fff) AM_READWRITE(polepos_alpha16_r, polepos_alpha16_w) AM_BASE(m_alpha16_memory) /* Alphanumeric (char ram) */
+ AM_RANGE(0xa000, 0xafff) AM_READWRITE(polepos_view16_r, polepos_view16_w) AM_BASE(m_view16_memory) /* Background memory */
+ AM_RANGE(0xc000, 0xc001) AM_MIRROR(0x38fe) AM_WRITE(polepos_view16_hscroll_w) /* Background horz scroll position */
+ AM_RANGE(0xc100, 0xc101) AM_MIRROR(0x38fe) AM_WRITE(polepos_road16_vscroll_w) /* Road vertical position */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index 3e059498a06..9120f5c037d 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -251,14 +251,14 @@ static const eeprom_interface eeprom_interface_policetr =
static ADDRESS_MAP_START( policetr_map, AS_PROGRAM, 32, policetr_state )
AM_RANGE(0x00000000, 0x0001ffff) AM_RAM AM_BASE(m_rambase)
- AM_RANGE(0x00200000, 0x0020000f) AM_WRITE_LEGACY(policetr_video_w)
- AM_RANGE(0x00400000, 0x00400003) AM_READ_LEGACY(policetr_video_r)
+ AM_RANGE(0x00200000, 0x0020000f) AM_WRITE(policetr_video_w)
+ AM_RANGE(0x00400000, 0x00400003) AM_READ(policetr_video_r)
AM_RANGE(0x00500000, 0x00500003) AM_WRITENOP // copies ROM here at startup, plus checksum
AM_RANGE(0x00600000, 0x00600003) AM_READ(bsmt2000_data_r)
AM_RANGE(0x00700000, 0x00700003) AM_WRITE(policetr_bsmt2000_reg_w)
AM_RANGE(0x00800000, 0x00800003) AM_WRITE(policetr_bsmt2000_data_w)
- AM_RANGE(0x00900000, 0x00900003) AM_WRITE_LEGACY(policetr_palette_offset_w)
- AM_RANGE(0x00920000, 0x00920003) AM_WRITE_LEGACY(policetr_palette_data_w)
+ AM_RANGE(0x00900000, 0x00900003) AM_WRITE(policetr_palette_offset_w)
+ AM_RANGE(0x00920000, 0x00920003) AM_WRITE(policetr_palette_data_w)
AM_RANGE(0x00a00000, 0x00a00003) AM_WRITE(control_w)
AM_RANGE(0x00a00000, 0x00a00003) AM_READ_PORT("IN0")
AM_RANGE(0x00a20000, 0x00a20003) AM_READ_PORT("IN1")
@@ -271,13 +271,13 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sshooter_map, AS_PROGRAM, 32, policetr_state )
AM_RANGE(0x00000000, 0x0001ffff) AM_RAM AM_BASE(m_rambase)
AM_RANGE(0x00200000, 0x00200003) AM_WRITE(policetr_bsmt2000_data_w)
- AM_RANGE(0x00300000, 0x00300003) AM_WRITE_LEGACY(policetr_palette_offset_w)
- AM_RANGE(0x00320000, 0x00320003) AM_WRITE_LEGACY(policetr_palette_data_w)
- AM_RANGE(0x00400000, 0x00400003) AM_READ_LEGACY(policetr_video_r)
+ AM_RANGE(0x00300000, 0x00300003) AM_WRITE(policetr_palette_offset_w)
+ AM_RANGE(0x00320000, 0x00320003) AM_WRITE(policetr_palette_data_w)
+ AM_RANGE(0x00400000, 0x00400003) AM_READ(policetr_video_r)
AM_RANGE(0x00500000, 0x00500003) AM_WRITENOP // copies ROM here at startup, plus checksum
AM_RANGE(0x00600000, 0x00600003) AM_READ(bsmt2000_data_r)
AM_RANGE(0x00700000, 0x00700003) AM_WRITE(policetr_bsmt2000_reg_w)
- AM_RANGE(0x00800000, 0x0080000f) AM_WRITE_LEGACY(policetr_video_w)
+ AM_RANGE(0x00800000, 0x0080000f) AM_WRITE(policetr_video_w)
AM_RANGE(0x00a00000, 0x00a00003) AM_WRITE(control_w)
AM_RANGE(0x00a00000, 0x00a00003) AM_READ_PORT("IN0")
AM_RANGE(0x00a20000, 0x00a20003) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c
index 36371f03d26..b28840f0555 100644
--- a/src/mame/drivers/polyplay.c
+++ b/src/mame/drivers/polyplay.c
@@ -147,7 +147,7 @@ static ADDRESS_MAP_START( polyplay_map, AS_PROGRAM, 8, polyplay_state )
AM_RANGE(0x0c00, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x8fff) AM_ROM
AM_RANGE(0xe800, 0xebff) AM_ROM AM_REGION("gfx1", 0)
- AM_RANGE(0xec00, 0xf7ff) AM_RAM_WRITE_LEGACY(polyplay_characterram_w) AM_BASE(m_characterram)
+ AM_RANGE(0xec00, 0xf7ff) AM_RAM_WRITE(polyplay_characterram_w) AM_BASE(m_characterram)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_BASE(m_videoram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c
index d6754f028f5..7da909f8882 100644
--- a/src/mame/drivers/pooyan.c
+++ b/src/mame/drivers/pooyan.c
@@ -50,8 +50,8 @@ WRITE8_MEMBER(pooyan_state::irq_enable_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, pooyan_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE_LEGACY(pooyan_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE_LEGACY(pooyan_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(pooyan_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(pooyan_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x8800, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x90ff) AM_MIRROR(0x0b00) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x9400, 0x94ff) AM_MIRROR(0x0b00) AM_RAM AM_BASE(m_spriteram2)
@@ -65,7 +65,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, pooyan_state )
AM_RANGE(0xa180, 0xa180) AM_MIRROR(0x5e78) AM_WRITE(irq_enable_w)
AM_RANGE(0xa181, 0xa181) AM_MIRROR(0x5e78) AM_WRITE_LEGACY(timeplt_sh_irqtrigger_w)
AM_RANGE(0xa183, 0xa183) AM_MIRROR(0x5e78) AM_WRITENOP // ???
- AM_RANGE(0xa187, 0xa187) AM_MIRROR(0x5e78) AM_WRITE_LEGACY(pooyan_flipscreen_w)
+ AM_RANGE(0xa187, 0xa187) AM_MIRROR(0x5e78) AM_WRITE(pooyan_flipscreen_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c
index dbc3703bc16..0695b829f47 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -69,9 +69,9 @@ static ADDRESS_MAP_START( skyskipr_map, AS_PROGRAM, 8, popeye_state )
AM_RANGE(0x8c03, 0x8c03) AM_RAM AM_BASE(m_palettebank)
AM_RANGE(0x8c04, 0x8e7f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x8e80, 0x8fff) AM_RAM
- AM_RANGE(0xa000, 0xa3ff) AM_WRITE_LEGACY(popeye_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xa400, 0xa7ff) AM_WRITE_LEGACY(popeye_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xc000, 0xcfff) AM_WRITE_LEGACY(skyskipr_bitmap_w)
+ AM_RANGE(0xa000, 0xa3ff) AM_WRITE(popeye_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xa400, 0xa7ff) AM_WRITE(popeye_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xc000, 0xcfff) AM_WRITE(skyskipr_bitmap_w)
AM_RANGE(0xe000, 0xe001) AM_READWRITE(protection_r,protection_w)
ADDRESS_MAP_END
@@ -83,9 +83,9 @@ static ADDRESS_MAP_START( popeye_map, AS_PROGRAM, 8, popeye_state )
AM_RANGE(0x8c03, 0x8c03) AM_RAM AM_BASE(m_palettebank)
AM_RANGE(0x8c04, 0x8e7f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x8e80, 0x8fff) AM_RAM
- AM_RANGE(0xa000, 0xa3ff) AM_WRITE_LEGACY(popeye_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xa400, 0xa7ff) AM_WRITE_LEGACY(popeye_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xc000, 0xdfff) AM_WRITE_LEGACY(popeye_bitmap_w)
+ AM_RANGE(0xa000, 0xa3ff) AM_WRITE(popeye_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xa400, 0xa7ff) AM_WRITE(popeye_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xc000, 0xdfff) AM_WRITE(popeye_bitmap_w)
AM_RANGE(0xe000, 0xe001) AM_READWRITE(protection_r,protection_w)
ADDRESS_MAP_END
@@ -96,9 +96,9 @@ static ADDRESS_MAP_START( popeyebl_map, AS_PROGRAM, 8, popeye_state )
AM_RANGE(0x8c03, 0x8c03) AM_RAM AM_BASE(m_palettebank)
AM_RANGE(0x8c04, 0x8e7f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x8e80, 0x8fff) AM_RAM
- AM_RANGE(0xa000, 0xa3ff) AM_WRITE_LEGACY(popeye_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xa400, 0xa7ff) AM_WRITE_LEGACY(popeye_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xc000, 0xcfff) AM_WRITE_LEGACY(skyskipr_bitmap_w)
+ AM_RANGE(0xa000, 0xa3ff) AM_WRITE(popeye_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xa400, 0xa7ff) AM_WRITE(popeye_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xc000, 0xcfff) AM_WRITE(skyskipr_bitmap_w)
AM_RANGE(0xe000, 0xe01f) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index d8c762a325e..b0ee21c26b0 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -160,19 +160,19 @@ WRITE8_MEMBER(popper_state::nmi_mask_w)
static ADDRESS_MAP_START( popper_map, AS_PROGRAM, 8, popper_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0xc000, 0xc1bf) AM_RAM
- AM_RANGE(0xc1c0, 0xc1ff) AM_RAM_WRITE_LEGACY(popper_ol_videoram_w) AM_BASE(m_ol_videoram)
- AM_RANGE(0xc200, 0xc61f) AM_RAM_WRITE_LEGACY(popper_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xc1c0, 0xc1ff) AM_RAM_WRITE(popper_ol_videoram_w) AM_BASE(m_ol_videoram)
+ AM_RANGE(0xc200, 0xc61f) AM_RAM_WRITE(popper_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xc620, 0xc9bf) AM_RAM
- AM_RANGE(0xc9c0, 0xc9ff) AM_RAM_WRITE_LEGACY(popper_ol_attribram_w) AM_BASE(m_ol_attribram)
- AM_RANGE(0xca00, 0xce1f) AM_RAM_WRITE_LEGACY(popper_attribram_w) AM_BASE(m_attribram)
+ AM_RANGE(0xc9c0, 0xc9ff) AM_RAM_WRITE(popper_ol_attribram_w) AM_BASE(m_ol_attribram)
+ AM_RANGE(0xca00, 0xce1f) AM_RAM_WRITE(popper_attribram_w) AM_BASE(m_attribram)
AM_RANGE(0xce20, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xe000, 0xe007) AM_READ(popper_input_ports_r)
AM_RANGE(0xe000, 0xe000) AM_WRITE(nmi_mask_w)
- AM_RANGE(0xe001, 0xe001) AM_WRITE_LEGACY(popper_flipscreen_w)
- AM_RANGE(0xe002, 0xe002) AM_WRITE_LEGACY(popper_e002_w) //?? seems to be graphic related
- AM_RANGE(0xe003, 0xe003) AM_WRITE_LEGACY(popper_gfx_bank_w)
+ AM_RANGE(0xe001, 0xe001) AM_WRITE(popper_flipscreen_w)
+ AM_RANGE(0xe002, 0xe002) AM_WRITE(popper_e002_w) //?? seems to be graphic related
+ AM_RANGE(0xe003, 0xe003) AM_WRITE(popper_gfx_bank_w)
AM_RANGE(0xe004, 0xe007) AM_WRITENOP //?? range cleared once when the SP is set
AM_RANGE(0xe400, 0xe400) AM_READ(popper_soundcpu_nmi_r)
AM_RANGE(0xf800, 0xf800) AM_READNOP //?? read once at startup
diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c
index 476a23cca9b..00b1a45f3dd 100644
--- a/src/mame/drivers/portrait.c
+++ b/src/mame/drivers/portrait.c
@@ -118,8 +118,8 @@ WRITE8_MEMBER(portrait_state::portrait_negative_scroll_w)
static ADDRESS_MAP_START( portrait_map, AS_PROGRAM, 8, portrait_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(portrait_bgvideo_write) AM_BASE(m_bgvideoram)
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(portrait_fgvideo_write) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(portrait_bgvideo_write) AM_BASE(m_bgvideoram)
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(portrait_fgvideo_write) AM_BASE(m_fgvideoram)
AM_RANGE(0x9000, 0x91ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x9200, 0x97ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_WRITE(soundlatch_w)
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 85261388300..3b44c64eeff 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -77,7 +77,7 @@ static WRITE16_DEVICE_HANDLER( oki_banking )
static ADDRESS_MAP_START( magicstk_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x088000, 0x0883ff) AM_RAM_WRITE_LEGACY(bigtwin_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0883ff) AM_RAM_WRITE(bigtwin_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x094000, 0x094001) AM_WRITENOP
AM_RANGE(0x094002, 0x094003) AM_WRITENOP
AM_RANGE(0x094004, 0x094005) AM_WRITE_LEGACY(tile_banking_w)
@@ -96,7 +96,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( powerbal_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x088000, 0x0883ff) AM_RAM_WRITE_LEGACY(bigtwin_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0883ff) AM_RAM_WRITE(bigtwin_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x094000, 0x094001) AM_WRITENOP
AM_RANGE(0x094002, 0x094003) AM_WRITENOP
AM_RANGE(0x094004, 0x094005) AM_WRITE_LEGACY(tile_banking_w)
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index 70eec824fa3..f69d4146f25 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -77,16 +77,16 @@ static ADDRESS_MAP_START( powerins_map, AS_PROGRAM, 16, powerins_state )
AM_RANGE(0x100002, 0x100003) AM_READ_PORT("P1_P2")
AM_RANGE(0x100008, 0x100009) AM_READ_PORT("DSW1")
AM_RANGE(0x10000a, 0x10000b) AM_READ_PORT("DSW2")
- AM_RANGE(0x100014, 0x100015) AM_WRITE_LEGACY(powerins_flipscreen_w) // Flip Screen
+ AM_RANGE(0x100014, 0x100015) AM_WRITE(powerins_flipscreen_w) // Flip Screen
AM_RANGE(0x100016, 0x100017) AM_WRITENOP // ? always 1
- AM_RANGE(0x100018, 0x100019) AM_WRITE_LEGACY(powerins_tilebank_w) // Tiles Banking (VRAM 0)
+ AM_RANGE(0x100018, 0x100019) AM_WRITE(powerins_tilebank_w) // Tiles Banking (VRAM 0)
AM_RANGE(0x10001e, 0x10001f) AM_WRITE(powerins_soundlatch_w) // Sound Latch
AM_RANGE(0x100030, 0x100031) AM_WRITE(powerins_okibank_w) // Sound
- AM_RANGE(0x120000, 0x120fff) AM_RAM_WRITE_LEGACY(powerins_paletteram16_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x120000, 0x120fff) AM_RAM_WRITE(powerins_paletteram16_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x130000, 0x130007) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0 Control
- AM_RANGE(0x140000, 0x143fff) AM_RAM_WRITE_LEGACY(powerins_vram_0_w) AM_BASE(m_vram_0) // VRAM 0
- AM_RANGE(0x170000, 0x170fff) AM_RAM_WRITE_LEGACY(powerins_vram_1_w) AM_BASE(m_vram_1) // VRAM 1
- AM_RANGE(0x171000, 0x171fff) AM_WRITE_LEGACY(powerins_vram_1_w) // Mirror of VRAM 1?
+ AM_RANGE(0x140000, 0x143fff) AM_RAM_WRITE(powerins_vram_0_w) AM_BASE(m_vram_0) // VRAM 0
+ AM_RANGE(0x170000, 0x170fff) AM_RAM_WRITE(powerins_vram_1_w) AM_BASE(m_vram_1) // VRAM 1
+ AM_RANGE(0x171000, 0x171fff) AM_WRITE(powerins_vram_1_w) // Mirror of VRAM 1?
AM_RANGE(0x180000, 0x18ffff) AM_RAM AM_BASE(m_spriteram) // RAM + Sprites
ADDRESS_MAP_END
@@ -97,17 +97,17 @@ static ADDRESS_MAP_START( powerina_map, AS_PROGRAM, 16, powerins_state )
AM_RANGE(0x100002, 0x100003) AM_READ_PORT("P1_P2")
AM_RANGE(0x100008, 0x100009) AM_READ_PORT("DSW1")
AM_RANGE(0x10000a, 0x10000b) AM_READ_PORT("DSW2")
- AM_RANGE(0x100014, 0x100015) AM_WRITE_LEGACY(powerins_flipscreen_w) // Flip Screen
+ AM_RANGE(0x100014, 0x100015) AM_WRITE(powerins_flipscreen_w) // Flip Screen
AM_RANGE(0x100016, 0x100017) AM_WRITENOP // ? always 1
- AM_RANGE(0x100018, 0x100019) AM_WRITE_LEGACY(powerins_tilebank_w) // Tiles Banking (VRAM 0)
+ AM_RANGE(0x100018, 0x100019) AM_WRITE(powerins_tilebank_w) // Tiles Banking (VRAM 0)
AM_RANGE(0x10001e, 0x10001f) AM_WRITENOP // Sound Latch, NOPed since there is no sound cpu
AM_RANGE(0x100030, 0x100031) AM_WRITE(powerins_okibank_w) // Sound
AM_RANGE(0x10003e, 0x10003f) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff) // (used by powerina)
- AM_RANGE(0x120000, 0x120fff) AM_RAM_WRITE_LEGACY(powerins_paletteram16_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x120000, 0x120fff) AM_RAM_WRITE(powerins_paletteram16_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x130000, 0x130007) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0 Control
- AM_RANGE(0x140000, 0x143fff) AM_RAM_WRITE_LEGACY(powerins_vram_0_w) AM_BASE(m_vram_0) // VRAM 0
- AM_RANGE(0x170000, 0x170fff) AM_RAM_WRITE_LEGACY(powerins_vram_1_w) AM_BASE(m_vram_1) // VRAM 1
- AM_RANGE(0x171000, 0x171fff) AM_WRITE_LEGACY(powerins_vram_1_w) // Mirror of VRAM 1?
+ AM_RANGE(0x140000, 0x143fff) AM_RAM_WRITE(powerins_vram_0_w) AM_BASE(m_vram_0) // VRAM 0
+ AM_RANGE(0x170000, 0x170fff) AM_RAM_WRITE(powerins_vram_1_w) AM_BASE(m_vram_1) // VRAM 1
+ AM_RANGE(0x171000, 0x171fff) AM_WRITE(powerins_vram_1_w) // Mirror of VRAM 1?
AM_RANGE(0x180000, 0x18ffff) AM_RAM AM_BASE(m_spriteram) // RAM + Sprites
ADDRESS_MAP_END
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index ee9579bc955..01afa33d1cb 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -28,13 +28,13 @@ WRITE16_MEMBER(prehisle_state::prehisle_sound16_w)
static ADDRESS_MAP_START( prehisle_map, AS_PROGRAM, 16, prehisle_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x070000, 0x073fff) AM_RAM
- AM_RANGE(0x090000, 0x0907ff) AM_RAM_WRITE_LEGACY(prehisle_fg_videoram16_w) AM_BASE(m_videoram)
+ AM_RANGE(0x090000, 0x0907ff) AM_RAM_WRITE(prehisle_fg_videoram16_w) AM_BASE(m_videoram)
AM_RANGE(0x0a0000, 0x0a07ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x0b0000, 0x0b3fff) AM_RAM_WRITE_LEGACY(prehisle_bg_videoram16_w) AM_BASE(m_bg_videoram16)
+ AM_RANGE(0x0b0000, 0x0b3fff) AM_RAM_WRITE(prehisle_bg_videoram16_w) AM_BASE(m_bg_videoram16)
AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x0e0000, 0x0e00ff) AM_READ_LEGACY(prehisle_control16_r)
+ AM_RANGE(0x0e0000, 0x0e00ff) AM_READ(prehisle_control16_r)
AM_RANGE(0x0f0070, 0x0ff071) AM_WRITE(prehisle_sound16_w)
- AM_RANGE(0x0f0000, 0x0ff0ff) AM_WRITE_LEGACY(prehisle_control16_w)
+ AM_RANGE(0x0f0000, 0x0ff0ff) AM_WRITE(prehisle_control16_w)
ADDRESS_MAP_END
/******************************************************************************/
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 98ad0bf32f0..dc9fde0b69c 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -319,8 +319,8 @@ static ADDRESS_MAP_START( psikyo_map, AS_PROGRAM, 32, psikyo_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM (not all used)
AM_RANGE(0x400000, 0x401fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites, buffered by two frames (list buffered + fb buffered)
AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram32_xRRRRRGGGGGBBBBB_dword_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE_LEGACY(psikyo_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x802000, 0x803fff) AM_RAM_WRITE_LEGACY(psikyo_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(psikyo_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x802000, 0x803fff) AM_RAM_WRITE(psikyo_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x804000, 0x807fff) AM_RAM AM_BASE(m_vregs) // RAM + Vregs
// AM_RANGE(0xc00000, 0xc0000b) AM_READ_LEGACY(psikyo_input_r) // Depends on board, see DRIVER_INIT
// AM_RANGE(0xc00004, 0xc0000b) AM_WRITE(s1945_mcu_w) // MCU on sh404, see DRIVER_INIT
@@ -330,7 +330,7 @@ ADDRESS_MAP_END
READ32_MEMBER(psikyo_state::s1945bl_oki_r)
{
- UINT8 dat = machine().device<okim6295_device>("oki")->read(*&space, 0);
+ UINT8 dat = machine().device<okim6295_device>("oki")->read(space, 0);
return dat << 24;
}
@@ -339,7 +339,7 @@ WRITE32_MEMBER(psikyo_state::s1945bl_oki_w)
if (ACCESSING_BITS_24_31)
{
okim6295_device *oki = machine().device<okim6295_device>("oki");
- oki->write(*&space, 0, data >> 24);
+ oki->write(space, 0, data >> 24);
}
if (ACCESSING_BITS_16_23)
@@ -368,8 +368,8 @@ static ADDRESS_MAP_START( psikyo_bootleg_map, AS_PROGRAM, 32, psikyo_state )
AM_RANGE(0x400000, 0x401fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites, buffered by two frames (list buffered + fb buffered)
AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram32_xRRRRRGGGGGBBBBB_dword_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE_LEGACY(psikyo_vram_0_w) AM_BASE(m_vram_0) // Layer 0
- AM_RANGE(0x802000, 0x803fff) AM_RAM_WRITE_LEGACY(psikyo_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(psikyo_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x802000, 0x803fff) AM_RAM_WRITE(psikyo_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x804000, 0x807fff) AM_RAM AM_BASE(m_vregs) // RAM + Vregs
// AM_RANGE(0xc00000, 0xc0000b) AM_READ_LEGACY(psikyo_input_r) // Depends on board, see DRIVER_INIT
// AM_RANGE(0xc00004, 0xc0000b) AM_WRITE(s1945_mcu_w) // MCU on sh404, see DRIVER_INIT
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index 617c7f5c697..7fb83845692 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -409,14 +409,14 @@ WRITE8_MEMBER(psychic5_state::bombsa_flipscreen_w)
static ADDRESS_MAP_START( psychic5_main_map, AS_PROGRAM, 8, psychic5_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1")
- AM_RANGE(0xc000, 0xdfff) AM_READWRITE_LEGACY(psychic5_paged_ram_r, psychic5_paged_ram_w)
+ AM_RANGE(0xc000, 0xdfff) AM_READWRITE(psychic5_paged_ram_r, psychic5_paged_ram_w)
AM_RANGE(0xe000, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xf000) AM_RAM_WRITE(soundlatch_w)
AM_RANGE(0xf001, 0xf001) AM_READNOP AM_WRITE(psychic5_coin_counter_w)
AM_RANGE(0xf002, 0xf002) AM_READWRITE(psychic5_bankselect_r, psychic5_bankselect_w)
- AM_RANGE(0xf003, 0xf003) AM_READWRITE_LEGACY(psychic5_vram_page_select_r, psychic5_vram_page_select_w)
+ AM_RANGE(0xf003, 0xf003) AM_READWRITE(psychic5_vram_page_select_r, psychic5_vram_page_select_w)
AM_RANGE(0xf004, 0xf004) AM_NOP // ???
- AM_RANGE(0xf005, 0xf005) AM_READNOP AM_WRITE_LEGACY(psychic5_title_screen_w)
+ AM_RANGE(0xf005, 0xf005) AM_READNOP AM_WRITE(psychic5_title_screen_w)
AM_RANGE(0xf006, 0xf1ff) AM_NOP
AM_RANGE(0xf200, 0xf7ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xf800, 0xffff) AM_RAM
@@ -444,14 +444,14 @@ static ADDRESS_MAP_START( bombsa_main_map, AS_PROGRAM, 8, psychic5_state )
AM_RANGE(0xd000, 0xd000) AM_WRITE(soundlatch_w) // confirmed
AM_RANGE(0xd001, 0xd001) AM_WRITE(bombsa_flipscreen_w)
AM_RANGE(0xd002, 0xd002) AM_READWRITE(psychic5_bankselect_r, bombsa_bankselect_w)
- AM_RANGE(0xd003, 0xd003) AM_READWRITE_LEGACY(psychic5_vram_page_select_r, psychic5_vram_page_select_w)
- AM_RANGE(0xd005, 0xd005) AM_WRITE_LEGACY(bombsa_unknown_w) // ?
+ AM_RANGE(0xd003, 0xd003) AM_READWRITE(psychic5_vram_page_select_r, psychic5_vram_page_select_w)
+ AM_RANGE(0xd005, 0xd005) AM_WRITE(bombsa_unknown_w) // ?
AM_RANGE(0xd000, 0xd1ff) AM_RAM
AM_RANGE(0xd200, 0xd7ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd800, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xffff) AM_READWRITE_LEGACY(psychic5_paged_ram_r, bombsa_paged_ram_w)
+ AM_RANGE(0xe000, 0xffff) AM_READWRITE(psychic5_paged_ram_r, bombsa_paged_ram_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bombsa_sound_map, AS_PROGRAM, 8, psychic5_state )
diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c
index b97cdbb0ec5..cc9c72dbd2e 100644
--- a/src/mame/drivers/punchout.c
+++ b/src/mame/drivers/punchout.c
@@ -315,13 +315,13 @@ static ADDRESS_MAP_START( punchout_map, AS_PROGRAM, 8, punchout_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc3ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xd000, 0xd7ff) AM_RAM
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(punchout_bg_top_videoram_w) AM_BASE(m_bg_top_videoram)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(punchout_bg_top_videoram_w) AM_BASE(m_bg_top_videoram)
AM_RANGE(0xdff0, 0xdff7) AM_BASE(m_spr1_ctrlram)
AM_RANGE(0xdff8, 0xdffc) AM_BASE(m_spr2_ctrlram)
AM_RANGE(0xdffd, 0xdffd) AM_BASE(m_palettebank)
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(punchout_spr1_videoram_w) AM_BASE(m_spr1_videoram)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(punchout_spr2_videoram_w) AM_BASE(m_spr2_videoram)
- AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE_LEGACY(punchout_bg_bot_videoram_w) AM_BASE(m_bg_bot_videoram) // also contains scroll RAM
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(punchout_spr1_videoram_w) AM_BASE(m_spr1_videoram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(punchout_spr2_videoram_w) AM_BASE(m_spr2_videoram)
+ AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE(punchout_bg_bot_videoram_w) AM_BASE(m_bg_bot_videoram) // also contains scroll RAM
ADDRESS_MAP_END
@@ -329,14 +329,14 @@ static ADDRESS_MAP_START( armwrest_map, AS_PROGRAM, 8, punchout_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc3ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xd000, 0xd7ff) AM_RAM
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(armwrest_fg_videoram_w) AM_BASE(m_armwrest_fg_videoram)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(armwrest_fg_videoram_w) AM_BASE(m_armwrest_fg_videoram)
AM_RANGE(0xdff0, 0xdff7) AM_BASE(m_spr1_ctrlram)
AM_RANGE(0xdff8, 0xdffc) AM_BASE(m_spr2_ctrlram)
AM_RANGE(0xdffd, 0xdffd) AM_BASE(m_palettebank)
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(punchout_spr1_videoram_w) AM_BASE(m_spr1_videoram)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(punchout_spr2_videoram_w) AM_BASE(m_spr2_videoram)
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(punchout_bg_bot_videoram_w) AM_BASE(m_bg_bot_videoram)
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(punchout_bg_top_videoram_w) AM_BASE(m_bg_top_videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(punchout_spr1_videoram_w) AM_BASE(m_spr1_videoram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(punchout_spr2_videoram_w) AM_BASE(m_spr2_videoram)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(punchout_bg_bot_videoram_w) AM_BASE(m_bg_bot_videoram)
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(punchout_bg_top_videoram_w) AM_BASE(m_bg_top_videoram)
ADDRESS_MAP_END
WRITE8_MEMBER(punchout_state::nmi_mask_w)
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index 7e1e5abd361..f1493a44837 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -150,9 +150,9 @@ static ADDRESS_MAP_START( pushman_map, AS_PROGRAM, 16, pushman_state )
AM_RANGE(0xfe4000, 0xfe4001) AM_READ_PORT("INPUTS") AM_WRITE(pushman_flipscreen_w)
AM_RANGE(0xfe4002, 0xfe4003) AM_READ_PORT("SYSTEM") AM_WRITE(pushman_control_w)
AM_RANGE(0xfe4004, 0xfe4005) AM_READ_PORT("DSW")
- AM_RANGE(0xfe8000, 0xfe8003) AM_WRITE_LEGACY(pushman_scroll_w)
+ AM_RANGE(0xfe8000, 0xfe8003) AM_WRITE(pushman_scroll_w)
AM_RANGE(0xfe800e, 0xfe800f) AM_WRITENOP /* ? */
- AM_RANGE(0xfec000, 0xfec7ff) AM_RAM_WRITE_LEGACY(pushman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xfec000, 0xfec7ff) AM_RAM_WRITE(pushman_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xff8000, 0xff87ff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffc000, 0xffffff) AM_RAM
ADDRESS_MAP_END
@@ -183,9 +183,9 @@ static ADDRESS_MAP_START( bballs_map, AS_PROGRAM, 16, pushman_state )
AM_RANGE(0xe4000, 0xe4001) AM_READ_PORT("INPUTS") AM_WRITE(pushman_flipscreen_w)
AM_RANGE(0xe4002, 0xe4003) AM_READ_PORT("SYSTEM") AM_WRITE(pushman_control_w)
AM_RANGE(0xe4004, 0xe4005) AM_READ_PORT("DSW")
- AM_RANGE(0xe8000, 0xe8003) AM_WRITE_LEGACY(pushman_scroll_w)
+ AM_RANGE(0xe8000, 0xe8003) AM_WRITE(pushman_scroll_w)
AM_RANGE(0xe800e, 0xe800f) AM_WRITENOP /* ? */
- AM_RANGE(0xec000, 0xec7ff) AM_RAM_WRITE_LEGACY(pushman_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xec000, 0xec7ff) AM_RAM_WRITE(pushman_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xf8000, 0xf87ff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfc000, 0xfffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c
index 395f310c6dc..908d736976a 100644
--- a/src/mame/drivers/qix.c
+++ b/src/mame/drivers/qix.c
@@ -242,8 +242,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, qix_state )
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x8400, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8bff) AM_READNOP /* 6850 ACIA */
- AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x3fe) AM_READWRITE_LEGACY(qix_video_firq_r, qix_video_firq_w)
- AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x3fe) AM_READWRITE_LEGACY(qix_data_firq_ack_r, qix_data_firq_ack_w)
+ AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x3fe) AM_READWRITE(qix_video_firq_r, qix_video_firq_w)
+ AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x3fe) AM_READWRITE(qix_data_firq_ack_r, qix_data_firq_ack_w)
AM_RANGE(0x9000, 0x93ff) AM_DEVREADWRITE("sndpia0", pia6821_device, read, write)
AM_RANGE(0x9400, 0x97ff) AM_DEVREAD("pia0", pia6821_device, read) AM_DEVWRITE_LEGACY("pia0", qix_pia_w)
AM_RANGE(0x9800, 0x9bff) AM_DEVREADWRITE("pia1", pia6821_device, read, write)
@@ -256,8 +256,8 @@ static ADDRESS_MAP_START( zoo_main_map, AS_PROGRAM, 8, qix_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x0400, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0bff) AM_READNOP /* ACIA */
- AM_RANGE(0x0c00, 0x0c00) AM_MIRROR(0x3fe) AM_READWRITE_LEGACY(qix_video_firq_r, qix_video_firq_w)
- AM_RANGE(0x0c01, 0x0c01) AM_MIRROR(0x3fe) AM_READWRITE_LEGACY(qix_data_firq_ack_r, qix_data_firq_ack_w)
+ AM_RANGE(0x0c00, 0x0c00) AM_MIRROR(0x3fe) AM_READWRITE(qix_video_firq_r, qix_video_firq_w)
+ AM_RANGE(0x0c01, 0x0c01) AM_MIRROR(0x3fe) AM_READWRITE(qix_data_firq_ack_r, qix_data_firq_ack_w)
AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE("sndpia0", pia6821_device, read, write)
AM_RANGE(0x1400, 0x17ff) AM_DEVREAD("pia0", pia6821_device, read) AM_DEVWRITE_LEGACY("pia0", qix_pia_w)
AM_RANGE(0x1800, 0x1bff) AM_DEVREADWRITE("pia1", pia6821_device, read, write)
@@ -275,9 +275,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8, qix_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(qix_68705_portA_r, qix_68705_portA_w) AM_BASE(m_68705_port_out)
- AM_RANGE(0x0001, 0x0001) AM_READWRITE_LEGACY(qix_68705_portB_r, qix_68705_portB_w)
- AM_RANGE(0x0002, 0x0002) AM_READWRITE_LEGACY(qix_68705_portC_r, qix_68705_portC_w)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(qix_68705_portA_r, qix_68705_portA_w) AM_BASE(m_68705_port_out)
+ AM_RANGE(0x0001, 0x0001) AM_READWRITE(qix_68705_portB_r, qix_68705_portB_w)
+ AM_RANGE(0x0002, 0x0002) AM_READWRITE(qix_68705_portC_r, qix_68705_portC_w)
AM_RANGE(0x0004, 0x0007) AM_WRITEONLY AM_BASE(m_68705_ddr)
AM_RANGE(0x0010, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x07ff) AM_ROM
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c
index 470fac5c281..3e0f99def0f 100644
--- a/src/mame/drivers/quasar.c
+++ b/src/mame/drivers/quasar.c
@@ -133,8 +133,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( quasar_io, AS_IO, 8, quasar_state )
AM_RANGE(0x00, 0x03) AM_READWRITE_LEGACY(quasar_IO_r, video_page_select_w)
AM_RANGE(0x08, 0x0b) AM_WRITE_LEGACY(io_page_select_w)
- AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READWRITE_LEGACY(cvs_collision_clear, quasar_sh_command_w)
- AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READ_LEGACY(cvs_collision_r) AM_WRITENOP
+ AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(cvs_collision_clear) AM_WRITE_LEGACY(quasar_sh_command_w)
+ AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READ(cvs_collision_r) AM_WRITENOP
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE")
AM_RANGE(S2650_FO_PORT, S2650_FO_PORT) AM_RAM AM_BASE(m_fo_state)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c
index b5468fe3ec8..fa950ff3821 100644
--- a/src/mame/drivers/quizdna.c
+++ b/src/mame/drivers/quizdna.c
@@ -33,66 +33,66 @@ WRITE8_MEMBER(quizdna_state::gekiretu_rombank_w)
static ADDRESS_MAP_START( quizdna_map, AS_PROGRAM, 8, quizdna_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0x8000, 0x9fff) AM_WRITE_LEGACY(quizdna_fg_ram_w)
- AM_RANGE(0xa000, 0xbfff) AM_WRITE_LEGACY(quizdna_bg_ram_w)
+ AM_RANGE(0x8000, 0x9fff) AM_WRITE(quizdna_fg_ram_w)
+ AM_RANGE(0xa000, 0xbfff) AM_WRITE(quizdna_bg_ram_w)
AM_RANGE(0xc000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe1ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe200, 0xefff) AM_RAM
- AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE_LEGACY(paletteram_xBGR_RRRR_GGGG_BBBB_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE(paletteram_xBGR_RRRR_GGGG_BBBB_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( gekiretu_map, AS_PROGRAM, 8, quizdna_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0x8000, 0x9fff) AM_WRITE_LEGACY(quizdna_fg_ram_w)
- AM_RANGE(0xa000, 0xbfff) AM_WRITE_LEGACY(quizdna_bg_ram_w)
+ AM_RANGE(0x8000, 0x9fff) AM_WRITE(quizdna_fg_ram_w)
+ AM_RANGE(0xa000, 0xbfff) AM_WRITE(quizdna_bg_ram_w)
AM_RANGE(0xc000, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE_LEGACY(paletteram_xBGR_RRRR_GGGG_BBBB_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(paletteram_xBGR_RRRR_GGGG_BBBB_w) AM_SHARE("paletteram")
AM_RANGE(0xf000, 0xf1ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xf200, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( quizdna_io_map, AS_IO, 8, quizdna_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x02, 0x03) AM_WRITE_LEGACY(quizdna_bg_xscroll_w)
- AM_RANGE(0x04, 0x04) AM_WRITE_LEGACY(quizdna_bg_yscroll_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(quizdna_bg_xscroll_w)
+ AM_RANGE(0x04, 0x04) AM_WRITE(quizdna_bg_yscroll_w)
AM_RANGE(0x05, 0x06) AM_WRITENOP /* unknown */
AM_RANGE(0x80, 0x80) AM_READ_PORT("P1")
AM_RANGE(0x81, 0x81) AM_READ_PORT("P2")
AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM")
AM_RANGE(0x91, 0x91) AM_READ_PORT("SERVICE")
AM_RANGE(0xc0, 0xc0) AM_WRITE(quizdna_rombank_w)
- AM_RANGE(0xd0, 0xd0) AM_WRITE_LEGACY(quizdna_screen_ctrl_w)
+ AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w)
AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE("oki", okim6295_device, read, write)
ADDRESS_MAP_END
static ADDRESS_MAP_START( gakupara_io_map, AS_IO, 8, quizdna_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x01) AM_WRITE_LEGACY(quizdna_bg_xscroll_w)
- AM_RANGE(0x02, 0x02) AM_WRITE_LEGACY(quizdna_bg_yscroll_w)
+ AM_RANGE(0x00, 0x01) AM_WRITE(quizdna_bg_xscroll_w)
+ AM_RANGE(0x02, 0x02) AM_WRITE(quizdna_bg_yscroll_w)
AM_RANGE(0x03, 0x04) AM_WRITENOP /* unknown */
AM_RANGE(0x80, 0x80) AM_READ_PORT("P1")
AM_RANGE(0x81, 0x81) AM_READ_PORT("P2")
AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM")
AM_RANGE(0x91, 0x91) AM_READ_PORT("SERVICE")
AM_RANGE(0xc0, 0xc0) AM_WRITE(quizdna_rombank_w)
- AM_RANGE(0xd0, 0xd0) AM_WRITE_LEGACY(quizdna_screen_ctrl_w)
+ AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w)
AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE("oki", okim6295_device, read, write)
ADDRESS_MAP_END
static ADDRESS_MAP_START( gekiretu_io_map, AS_IO, 8, quizdna_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x02, 0x03) AM_WRITE_LEGACY(quizdna_bg_xscroll_w)
- AM_RANGE(0x04, 0x04) AM_WRITE_LEGACY(quizdna_bg_yscroll_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(quizdna_bg_xscroll_w)
+ AM_RANGE(0x04, 0x04) AM_WRITE(quizdna_bg_yscroll_w)
AM_RANGE(0x05, 0x06) AM_WRITENOP /* unknown */
AM_RANGE(0x80, 0x80) AM_READ_PORT("P1")
AM_RANGE(0x81, 0x81) AM_READ_PORT("P2")
AM_RANGE(0x90, 0x90) AM_READ_PORT("SYSTEM")
AM_RANGE(0x91, 0x91) AM_READ_PORT("SERVICE")
AM_RANGE(0xc0, 0xc0) AM_WRITE(gekiretu_rombank_w)
- AM_RANGE(0xd0, 0xd0) AM_WRITE_LEGACY(quizdna_screen_ctrl_w)
+ AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w)
AM_RANGE(0xe0, 0xe1) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE("oki", okim6295_device, read, write)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c
index 837580c7c2f..b46e51946f9 100644
--- a/src/mame/drivers/quizpani.c
+++ b/src/mame/drivers/quizpani.c
@@ -59,15 +59,15 @@ static ADDRESS_MAP_START( quizpani_map, AS_PROGRAM, 16, quizpani_state )
AM_RANGE(0x10000a, 0x10000b) AM_READ_PORT("DSW2")
AM_RANGE(0x100014, 0x100015) AM_WRITENOP /* screen flipping? */
AM_RANGE(0x100016, 0x100017) AM_WRITENOP /* IRQ enable? */
- AM_RANGE(0x100018, 0x100019) AM_WRITE_LEGACY(quizpani_tilesbank_w)
+ AM_RANGE(0x100018, 0x100019) AM_WRITE(quizpani_tilesbank_w)
AM_RANGE(0x104000, 0x104001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x104020, 0x104027) AM_DEVWRITE_LEGACY("nmk112", nmk112_okibank_lsb_w)
AM_RANGE(0x108000, 0x1083ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x108400, 0x1085ff) AM_WRITENOP
AM_RANGE(0x10c000, 0x10c007) AM_RAM AM_BASE(m_scrollreg)
AM_RANGE(0x10c008, 0x10c403) AM_WRITENOP
- AM_RANGE(0x110000, 0x113fff) AM_RAM_WRITE_LEGACY(quizpani_bg_videoram_w) AM_BASE(m_bg_videoram)
- AM_RANGE(0x11c000, 0x11ffff) AM_RAM_WRITE_LEGACY(quizpani_txt_videoram_w) AM_BASE(m_txt_videoram)
+ AM_RANGE(0x110000, 0x113fff) AM_RAM_WRITE(quizpani_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x11c000, 0x11ffff) AM_RAM_WRITE(quizpani_txt_videoram_w) AM_BASE(m_txt_videoram)
AM_RANGE(0x180000, 0x18ffff) AM_RAM
AM_RANGE(0x200000, 0x33ffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index 6a4c95cc2bc..00ef774e5f1 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -52,8 +52,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, raiden_state )
AM_RANGE(0x0a000, 0x0afff) AM_RAM AM_SHARE("share1") AM_BASE(m_shared_ram)
AM_RANGE(0x0b000, 0x0b001) AM_READ_PORT("P1_P2")
AM_RANGE(0x0b002, 0x0b003) AM_READ_PORT("DSW")
- AM_RANGE(0x0b000, 0x0b007) AM_WRITE_LEGACY(raiden_control_w)
- AM_RANGE(0x0c000, 0x0c7ff) AM_WRITE_LEGACY(raiden_text_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0b000, 0x0b007) AM_WRITE(raiden_control_w)
+ AM_RANGE(0x0c000, 0x0c7ff) AM_WRITE(raiden_text_w) AM_BASE(m_videoram)
AM_RANGE(0x0d000, 0x0d00d) AM_READWRITE_LEGACY(seibu_main_word_r, seibu_main_word_w)
AM_RANGE(0x0d060, 0x0d067) AM_WRITEONLY AM_BASE(m_scroll_ram)
AM_RANGE(0xa0000, 0xfffff) AM_ROM
@@ -61,8 +61,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 16, raiden_state )
AM_RANGE(0x00000, 0x01fff) AM_RAM
- AM_RANGE(0x02000, 0x027ff) AM_RAM_WRITE_LEGACY(raiden_background_w) AM_BASE(m_back_data)
- AM_RANGE(0x02800, 0x02fff) AM_RAM_WRITE_LEGACY(raiden_foreground_w) AM_BASE(m_fore_data)
+ AM_RANGE(0x02000, 0x027ff) AM_RAM_WRITE(raiden_background_w) AM_BASE(m_back_data)
+ AM_RANGE(0x02800, 0x02fff) AM_RAM_WRITE(raiden_foreground_w) AM_BASE(m_fore_data)
AM_RANGE(0x03000, 0x03fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x04000, 0x04fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x07ffe, 0x0afff) AM_WRITENOP
@@ -76,9 +76,9 @@ static ADDRESS_MAP_START( alt_main_map, AS_PROGRAM, 16, raiden_state )
AM_RANGE(0x07000, 0x07fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x08000, 0x08fff) AM_RAM AM_SHARE("share1") AM_BASE(m_shared_ram)
AM_RANGE(0x0a000, 0x0a00d) AM_READWRITE_LEGACY(seibu_main_word_r, seibu_main_word_w)
- AM_RANGE(0x0c000, 0x0c7ff) AM_WRITE_LEGACY(raiden_text_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0c000, 0x0c7ff) AM_WRITE(raiden_text_w) AM_BASE(m_videoram)
AM_RANGE(0x0e000, 0x0e001) AM_READ_PORT("P1_P2")
- AM_RANGE(0x0e000, 0x0e007) AM_WRITE_LEGACY(raidena_control_w)
+ AM_RANGE(0x0e000, 0x0e007) AM_WRITE(raidena_control_w)
AM_RANGE(0x0e002, 0x0e003) AM_READ_PORT("DSW")
AM_RANGE(0x0f000, 0x0f035) AM_WRITEONLY AM_BASE(m_scroll_ram)
AM_RANGE(0xa0000, 0xfffff) AM_ROM
@@ -93,8 +93,8 @@ static ADDRESS_MAP_START( raidenu_main_map, AS_PROGRAM, 16, raiden_state )
AM_RANGE(0x0a000, 0x0afff) AM_RAM AM_SHARE("share1") AM_BASE(m_shared_ram)
AM_RANGE(0x0b000, 0x0b001) AM_READ_PORT("P1_P2")
AM_RANGE(0x0b002, 0x0b003) AM_READ_PORT("DSW")
- AM_RANGE(0x0b000, 0x0b007) AM_WRITE_LEGACY(raidena_control_w)
- AM_RANGE(0x0c000, 0x0c7ff) AM_WRITE_LEGACY(raiden_text_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0b000, 0x0b007) AM_WRITE(raidena_control_w)
+ AM_RANGE(0x0c000, 0x0c7ff) AM_WRITE(raiden_text_w) AM_BASE(m_videoram)
AM_RANGE(0x0d000, 0x0d00d) AM_READWRITE_LEGACY(seibu_main_word_r, seibu_main_word_w)
AM_RANGE(0xa0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -102,8 +102,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( raidenu_sub_map, AS_PROGRAM, 16, raiden_state )
AM_RANGE(0x00000, 0x05fff) AM_RAM
- AM_RANGE(0x06000, 0x067ff) AM_RAM_WRITE_LEGACY(raiden_background_w) AM_BASE(m_back_data)
- AM_RANGE(0x06800, 0x06fff) AM_RAM_WRITE_LEGACY(raiden_foreground_w) AM_BASE(m_fore_data)
+ AM_RANGE(0x06000, 0x067ff) AM_RAM_WRITE(raiden_background_w) AM_BASE(m_back_data)
+ AM_RANGE(0x06800, 0x06fff) AM_RAM_WRITE(raiden_foreground_w) AM_BASE(m_fore_data)
AM_RANGE(0x07000, 0x07fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08000, 0x08fff) AM_RAM AM_SHARE("share1")
//AM_RANGE(0x07ffe, 0x0afff) AM_WRITENOP
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index cb6f06c9387..6f739c5fa94 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -350,14 +350,14 @@ static ADDRESS_MAP_START( rbisland_map, AS_PROGRAM, 16, rbisland_state )
AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x201000, 0x203fff) AM_RAM /* r/w in initial checks */
AM_RANGE(0x390000, 0x390003) AM_READ_PORT("DSWA")
- AM_RANGE(0x3a0000, 0x3a0001) AM_WRITE_LEGACY(rbisland_spritectrl_w)
+ AM_RANGE(0x3a0000, 0x3a0001) AM_WRITE(rbisland_spritectrl_w)
AM_RANGE(0x3b0000, 0x3b0003) AM_READ_PORT("DSWB")
AM_RANGE(0x3c0000, 0x3c0003) AM_WRITENOP /* written very often, watchdog? */
AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r,tc0140syt_comm_w, 0x00ff)
- AM_RANGE(0x800000, 0x8007ff) AM_READWRITE_LEGACY(rbisland_cchip_ram_r,rbisland_cchip_ram_w)
- AM_RANGE(0x800802, 0x800803) AM_READWRITE_LEGACY(rbisland_cchip_ctrl_r,rbisland_cchip_ctrl_w)
- AM_RANGE(0x800c00, 0x800c01) AM_WRITE_LEGACY(rbisland_cchip_bank_w)
+ AM_RANGE(0x800000, 0x8007ff) AM_READWRITE(rbisland_cchip_ram_r,rbisland_cchip_ram_w)
+ AM_RANGE(0x800802, 0x800803) AM_READWRITE(rbisland_cchip_ctrl_r,rbisland_cchip_ctrl_w)
+ AM_RANGE(0x800c00, 0x800c01) AM_WRITE(rbisland_cchip_bank_w)
AM_RANGE(0xc00000, 0xc0ffff) AM_DEVREADWRITE_LEGACY("pc080sn", pc080sn_word_r, pc080sn_word_w)
AM_RANGE(0xc20000, 0xc20003) AM_DEVWRITE_LEGACY("pc080sn", pc080sn_yscroll_word_w)
AM_RANGE(0xc40000, 0xc40003) AM_DEVWRITE_LEGACY("pc080sn", pc080sn_xscroll_word_w)
@@ -374,7 +374,7 @@ static ADDRESS_MAP_START( jumping_map, AS_PROGRAM, 16, rbisland_state )
AM_RANGE(0x400002, 0x400003) AM_READ_PORT("DSWB")
AM_RANGE(0x401000, 0x401001) AM_READ_PORT("401001")
AM_RANGE(0x401002, 0x401003) AM_READ_PORT("401003")
- AM_RANGE(0x3a0000, 0x3a0001) AM_WRITE_LEGACY(jumping_spritectrl_w)
+ AM_RANGE(0x3a0000, 0x3a0001) AM_WRITE(jumping_spritectrl_w)
AM_RANGE(0x3c0000, 0x3c0001) AM_WRITENOP /* watchdog? */
AM_RANGE(0x400006, 0x400007) AM_WRITE(jumping_sound_w)
AM_RANGE(0x420000, 0x420001) AM_READNOP /* read, but result not used */
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index 19bbd3c45b9..478b5695ce0 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -301,7 +301,7 @@ WRITE8_MEMBER(rallyx_state::locomotn_latch_w)
break;
case 0x07: /* STARSON */
- tactcian_starson_w(&space, offset, bit);
+ tactcian_starson_w(space, offset, bit);
break;
}
}
@@ -315,7 +315,7 @@ WRITE8_MEMBER(rallyx_state::locomotn_latch_w)
static ADDRESS_MAP_START( rallyx_map, AS_PROGRAM, 8, rallyx_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE_LEGACY(rallyx_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(rallyx_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x9800, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1")
AM_RANGE(0xa080, 0xa080) AM_READ_PORT("P2")
@@ -323,8 +323,8 @@ static ADDRESS_MAP_START( rallyx_map, AS_PROGRAM, 8, rallyx_state )
AM_RANGE(0xa000, 0xa00f) AM_WRITEONLY AM_BASE(m_radarattr)
AM_RANGE(0xa080, 0xa080) AM_WRITE(watchdog_reset_w)
AM_RANGE(0xa100, 0xa11f) AM_DEVWRITE_LEGACY("namco", pacman_sound_w)
- AM_RANGE(0xa130, 0xa130) AM_WRITE_LEGACY(rallyx_scrollx_w)
- AM_RANGE(0xa140, 0xa140) AM_WRITE_LEGACY(rallyx_scrolly_w)
+ AM_RANGE(0xa130, 0xa130) AM_WRITE(rallyx_scrollx_w)
+ AM_RANGE(0xa140, 0xa140) AM_WRITE(rallyx_scrolly_w)
AM_RANGE(0xa170, 0xa170) AM_WRITENOP /* ? */
AM_RANGE(0xa180, 0xa187) AM_WRITE(rallyx_latch_w)
ADDRESS_MAP_END
@@ -337,7 +337,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( jungler_map, AS_PROGRAM, 8, rallyx_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE_LEGACY(rallyx_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(rallyx_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x9800, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1")
AM_RANGE(0xa080, 0xa080) AM_READ_PORT("P2")
@@ -346,8 +346,8 @@ static ADDRESS_MAP_START( jungler_map, AS_PROGRAM, 8, rallyx_state )
AM_RANGE(0xa000, 0xa00f) AM_MIRROR(0x00f0) AM_WRITEONLY AM_BASE(m_radarattr) // jungler writes to a03x
AM_RANGE(0xa080, 0xa080) AM_WRITE(watchdog_reset_w)
AM_RANGE(0xa100, 0xa100) AM_WRITE(soundlatch_w)
- AM_RANGE(0xa130, 0xa130) AM_WRITE_LEGACY(rallyx_scrollx_w) /* only jungler and tactcian */
- AM_RANGE(0xa140, 0xa140) AM_WRITE_LEGACY(rallyx_scrolly_w) /* only jungler and tactcian */
+ AM_RANGE(0xa130, 0xa130) AM_WRITE(rallyx_scrollx_w) /* only jungler and tactcian */
+ AM_RANGE(0xa140, 0xa140) AM_WRITE(rallyx_scrolly_w) /* only jungler and tactcian */
AM_RANGE(0xa180, 0xa187) AM_WRITE(locomotn_latch_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index f6dda268a87..55372a72ac7 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -207,7 +207,7 @@ static ADDRESS_MAP_START( rastan_map, AS_PROGRAM, 16, rastan_state )
AM_RANGE(0x10c000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x350008, 0x350009) AM_WRITENOP /* 0 only (often) ? */
- AM_RANGE(0x380000, 0x380001) AM_WRITE_LEGACY(rastan_spritectrl_w) /* sprite palette bank, coin counters & lockout */
+ AM_RANGE(0x380000, 0x380001) AM_WRITE(rastan_spritectrl_w) /* sprite palette bank, coin counters & lockout */
AM_RANGE(0x390000, 0x390001) AM_READ_PORT("P1")
AM_RANGE(0x390002, 0x390003) AM_READ_PORT("P2")
AM_RANGE(0x390004, 0x390005) AM_READ_PORT("SPECIAL")
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index 4315bc12832..5a7eb45f43e 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -156,10 +156,10 @@ static ADDRESS_MAP_START( base_mem, AS_PROGRAM, 16, realbrk_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE(m_spriteram) // Sprites
AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram" ) // Palette
- AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE_LEGACY(realbrk_vram_0_w) AM_BASE(m_vram_0 ) // Background (0)
- AM_RANGE(0x602000, 0x603fff) AM_RAM_WRITE_LEGACY(realbrk_vram_1_w) AM_BASE(m_vram_1 ) // Background (1)
- AM_RANGE(0x604000, 0x604fff) AM_RAM_WRITE_LEGACY(realbrk_vram_2_w) AM_BASE(m_vram_2 ) // Text (2)
- AM_RANGE(0x606000, 0x60600f) AM_RAM_WRITE_LEGACY(realbrk_vregs_w) AM_BASE(m_vregs ) // Scroll + Video Regs
+ AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(realbrk_vram_0_w) AM_BASE(m_vram_0 ) // Background (0)
+ AM_RANGE(0x602000, 0x603fff) AM_RAM_WRITE(realbrk_vram_1_w) AM_BASE(m_vram_1 ) // Background (1)
+ AM_RANGE(0x604000, 0x604fff) AM_RAM_WRITE(realbrk_vram_2_w) AM_BASE(m_vram_2 ) // Text (2)
+ AM_RANGE(0x606000, 0x60600f) AM_RAM_WRITE(realbrk_vregs_w) AM_BASE(m_vregs ) // Scroll + Video Regs
AM_RANGE(0x605000, 0x61ffff) AM_RAM //
AM_RANGE(0x800000, 0x800003) AM_DEVREADWRITE8_LEGACY("ymz", ymz280b_r, ymz280b_w, 0xff00) // YMZ280
AM_RANGE(0xfe0000, 0xfeffff) AM_RAM // RAM
@@ -174,7 +174,7 @@ static ADDRESS_MAP_START( realbrk_mem, AS_PROGRAM, 16, realbrk_state )
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") // Coins
AM_RANGE(0xc00004, 0xc00005) AM_RAM_READ(realbrk_dsw_r) AM_BASE(m_dsw_select) // DSW select
AM_RANGE(0xff0000, 0xfffbff) AM_RAM // RAM
- AM_RANGE(0xfffd0a, 0xfffd0b) AM_WRITE_LEGACY(realbrk_flipscreen_w ) // Hack! Parallel port data register
+ AM_RANGE(0xfffd0a, 0xfffd0b) AM_WRITE(realbrk_flipscreen_w ) // Hack! Parallel port data register
ADDRESS_MAP_END
/*pkgnsh specific memory map*/
@@ -203,7 +203,7 @@ static ADDRESS_MAP_START( dai2kaku_mem, AS_PROGRAM, 16, realbrk_state )
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") // Coins
AM_RANGE(0xc00004, 0xc00005) AM_RAM_READ(realbrk_dsw_r) AM_BASE(m_dsw_select) // DSW select
AM_RANGE(0xff0000, 0xfffbff) AM_RAM // RAM
- AM_RANGE(0xfffd0a, 0xfffd0b) AM_WRITE_LEGACY(dai2kaku_flipscreen_w ) // Hack! Parallel port data register
+ AM_RANGE(0xfffd0a, 0xfffd0b) AM_WRITE(dai2kaku_flipscreen_w ) // Hack! Parallel port data register
AM_IMPORT_FROM(base_mem)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c
index 2f18383234f..4921d7298d4 100644
--- a/src/mame/drivers/redalert.c
+++ b/src/mame/drivers/redalert.c
@@ -152,7 +152,7 @@ READ8_MEMBER(redalert_state::panther_unk_r)
static ADDRESS_MAP_START( redalert_main_map, AS_PROGRAM, 8, redalert_state )
AM_RANGE(0x0000, 0x1fff) AM_RAM
- AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE_LEGACY(redalert_bitmap_videoram_w) AM_BASE(m_bitmap_videoram)
+ AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(redalert_bitmap_videoram_w) AM_BASE(m_bitmap_videoram)
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE(m_charmap_videoram)
AM_RANGE(0x5000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0f8f) AM_READ_PORT("C000") AM_WRITENOP
@@ -168,7 +168,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ww3_main_map, AS_PROGRAM, 8, redalert_state )
AM_RANGE(0x0000, 0x1fff) AM_RAM
- AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE_LEGACY(redalert_bitmap_videoram_w) AM_BASE(m_bitmap_videoram)
+ AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(redalert_bitmap_videoram_w) AM_BASE(m_bitmap_videoram)
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE(m_charmap_videoram)
AM_RANGE(0x5000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0f8f) AM_READ_PORT("C000") AM_WRITENOP
@@ -183,7 +183,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( panther_main_map, AS_PROGRAM, 8, redalert_state )
AM_RANGE(0x0000, 0x1fff) AM_RAM
- AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE_LEGACY(redalert_bitmap_videoram_w) AM_BASE(m_bitmap_videoram)
+ AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(redalert_bitmap_videoram_w) AM_BASE(m_bitmap_videoram)
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE(m_charmap_videoram)
AM_RANGE(0x5000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0f8f) AM_READ_PORT("C000") AM_WRITENOP
@@ -198,7 +198,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( demoneye_main_map, AS_PROGRAM, 8, redalert_state )
AM_RANGE(0x0000, 0x1fff) AM_RAM
- AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE_LEGACY(redalert_bitmap_videoram_w) AM_BASE(m_bitmap_videoram)
+ AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(redalert_bitmap_videoram_w) AM_BASE(m_bitmap_videoram)
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE(m_charmap_videoram)
AM_RANGE(0x6000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0f8f) AM_READ_PORT("C000") AM_WRITENOP
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index 91783eb27aa..73c0e0fab93 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -645,15 +645,15 @@ WRITE8_MEMBER(renegade_state::renegade_coin_counter_w)
static ADDRESS_MAP_START( renegade_map, AS_PROGRAM, 8, renegade_state )
AM_RANGE(0x0000, 0x17ff) AM_RAM
- AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE_LEGACY(renegade_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(renegade_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE_LEGACY(renegade_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(renegade_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x3000, 0x30ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
AM_RANGE(0x3100, 0x31ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
- AM_RANGE(0x3800, 0x3800) AM_READ_PORT("IN0") AM_WRITE_LEGACY(renegade_scroll0_w) /* Player#1 controls, P1,P2 start */
- AM_RANGE(0x3801, 0x3801) AM_READ_PORT("IN1") AM_WRITE_LEGACY(renegade_scroll1_w) /* Player#2 controls, coin triggers */
+ AM_RANGE(0x3800, 0x3800) AM_READ_PORT("IN0") AM_WRITE(renegade_scroll0_w) /* Player#1 controls, P1,P2 start */
+ AM_RANGE(0x3801, 0x3801) AM_READ_PORT("IN1") AM_WRITE(renegade_scroll1_w) /* Player#2 controls, coin triggers */
AM_RANGE(0x3802, 0x3802) AM_READ_PORT("DSW2") AM_WRITE(sound_w) /* DIP2 various IO ports */
- AM_RANGE(0x3803, 0x3803) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(renegade_flipscreen_w) /* DIP1 */
+ AM_RANGE(0x3803, 0x3803) AM_READ_PORT("DSW1") AM_WRITE(renegade_flipscreen_w) /* DIP1 */
AM_RANGE(0x3804, 0x3804) AM_READWRITE(mcu_r, mcu_w)
AM_RANGE(0x3805, 0x3805) AM_READWRITE(mcu_reset_r, bankswitch_w)
AM_RANGE(0x3806, 0x3806) AM_WRITENOP // ?? watchdog
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index edddc9e04f1..112dcbf6e5c 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -99,14 +99,14 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, retofinv_state )
AM_RANGE(0x7fff, 0x7fff) AM_WRITE(coincounter_w)
AM_RANGE(0x7b00, 0x7bff) AM_ROM /* space for diagnostic ROM? The code looks */
/* for a string here, and jumps if it's present */
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(retofinv_fg_videoram_w) AM_SHARE("share2") AM_BASE(m_fg_videoram)
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(retofinv_fg_videoram_w) AM_SHARE("share2") AM_BASE(m_fg_videoram)
AM_RANGE(0x8800, 0x9fff) AM_RAM AM_SHARE("share1") AM_BASE(m_sharedram)
- AM_RANGE(0xa000, 0xa7ff) AM_RAM_WRITE_LEGACY(retofinv_bg_videoram_w) AM_SHARE("share3") AM_BASE(m_bg_videoram)
- AM_RANGE(0xb800, 0xb802) AM_WRITE_LEGACY(retofinv_gfx_ctrl_w)
+ AM_RANGE(0xa000, 0xa7ff) AM_RAM_WRITE(retofinv_bg_videoram_w) AM_SHARE("share3") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xb800, 0xb802) AM_WRITE(retofinv_gfx_ctrl_w)
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P1")
AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P2")
AM_RANGE(0xc002, 0xc002) AM_READNOP /* bit 7 must be 0, otherwise game resets */
- AM_RANGE(0xc003, 0xc003) AM_READ_LEGACY(retofinv_mcu_status_r)
+ AM_RANGE(0xc003, 0xc003) AM_READ(retofinv_mcu_status_r)
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc005, 0xc005) AM_READ_PORT("DSW1")
AM_RANGE(0xc006, 0xc006) AM_READ_PORT("DSW2")
@@ -119,16 +119,16 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, retofinv_state )
AM_RANGE(0xc805, 0xc805) AM_WRITE(cpu1_reset_w)
AM_RANGE(0xd000, 0xd000) AM_WRITE(watchdog_reset_w)
AM_RANGE(0xd800, 0xd800) AM_WRITE(soundcommand_w)
- AM_RANGE(0xe000, 0xe000) AM_READ_LEGACY(retofinv_mcu_r)
- AM_RANGE(0xe800, 0xe800) AM_WRITE_LEGACY(retofinv_mcu_w)
+ AM_RANGE(0xe000, 0xe000) AM_READ(retofinv_mcu_r)
+ AM_RANGE(0xe800, 0xe800) AM_WRITE(retofinv_mcu_w)
AM_RANGE(0xf800, 0xf800) AM_READ(cpu0_mf800_r)
ADDRESS_MAP_END
static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8, retofinv_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE_LEGACY(retofinv_fg_videoram_w) AM_SHARE("share2")
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(retofinv_fg_videoram_w) AM_SHARE("share2")
AM_RANGE(0x8800, 0x9fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xa000, 0xa7ff) AM_RAM_WRITE_LEGACY(retofinv_bg_videoram_w) AM_SHARE("share3")
+ AM_RANGE(0xa000, 0xa7ff) AM_RAM_WRITE(retofinv_bg_videoram_w) AM_SHARE("share3")
AM_RANGE(0xc804, 0xc804) AM_WRITE(irq1_ack_w)
ADDRESS_MAP_END
@@ -144,12 +144,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8, retofinv_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(retofinv_68705_portA_r, retofinv_68705_portA_w)
- AM_RANGE(0x0001, 0x0001) AM_READWRITE_LEGACY(retofinv_68705_portB_r, retofinv_68705_portB_w)
- AM_RANGE(0x0002, 0x0002) AM_READWRITE_LEGACY(retofinv_68705_portC_r, retofinv_68705_portC_w)
- AM_RANGE(0x0004, 0x0004) AM_WRITE_LEGACY(retofinv_68705_ddrA_w)
- AM_RANGE(0x0005, 0x0005) AM_WRITE_LEGACY(retofinv_68705_ddrB_w)
- AM_RANGE(0x0006, 0x0006) AM_WRITE_LEGACY(retofinv_68705_ddrC_w)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(retofinv_68705_portA_r, retofinv_68705_portA_w)
+ AM_RANGE(0x0001, 0x0001) AM_READWRITE(retofinv_68705_portB_r, retofinv_68705_portB_w)
+ AM_RANGE(0x0002, 0x0002) AM_READWRITE(retofinv_68705_portC_r, retofinv_68705_portC_w)
+ AM_RANGE(0x0004, 0x0004) AM_WRITE(retofinv_68705_ddrA_w)
+ AM_RANGE(0x0005, 0x0005) AM_WRITE(retofinv_68705_ddrB_w)
+ AM_RANGE(0x0006, 0x0006) AM_WRITE(retofinv_68705_ddrC_w)
AM_RANGE(0x0010, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/rltennis.c b/src/mame/drivers/rltennis.c
index 053a7c96fa2..511326da0a1 100644
--- a/src/mame/drivers/rltennis.c
+++ b/src/mame/drivers/rltennis.c
@@ -89,7 +89,7 @@ static ADDRESS_MAP_START( rltennis_main, AS_PROGRAM, 16, rltennis_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x200000, 0x20ffff) AM_RAM
- AM_RANGE(0x700000, 0x70000f) AM_WRITE_LEGACY(rlt_blitter_w)
+ AM_RANGE(0x700000, 0x70000f) AM_WRITE(rlt_blitter_w)
AM_RANGE(0x720000, 0x720001) AM_DEVWRITE8("ramdac",ramdac_device,index_w,0x00ff)
AM_RANGE(0x720002, 0x720003) AM_DEVREADWRITE8("ramdac",ramdac_device,pal_r,pal_w,0x00ff)
AM_RANGE(0x720006, 0x720007) AM_DEVWRITE8("ramdac",ramdac_device,index_r_w,0x00ff)
diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c
index 0abaa393433..3b02c6ecd60 100644
--- a/src/mame/drivers/rockrage.c
+++ b/src/mame/drivers/rockrage.c
@@ -107,7 +107,7 @@ static ADDRESS_MAP_START( rockrage_map, AS_PROGRAM, 8, rockrage_state )
AM_RANGE(0x2e40, 0x2e40) AM_READ_PORT("DSW1")
AM_RANGE(0x2e80, 0x2e80) AM_WRITE(rockrage_sh_irqtrigger_w) /* cause interrupt on audio CPU */
AM_RANGE(0x2ec0, 0x2ec0) AM_WRITE(watchdog_reset_w) /* watchdog reset */
- AM_RANGE(0x2f00, 0x2f00) AM_WRITE_LEGACY(rockrage_vreg_w) /* ??? */
+ AM_RANGE(0x2f00, 0x2f00) AM_WRITE(rockrage_vreg_w) /* ??? */
AM_RANGE(0x2f40, 0x2f40) AM_WRITE(rockrage_bankswitch_w) /* bankswitch control */
AM_RANGE(0x4000, 0x5fff) AM_RAM /* RAM */
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM */
diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c
index 31014cc0c62..7eaacdca19d 100644
--- a/src/mame/drivers/rocnrope.c
+++ b/src/mame/drivers/rocnrope.c
@@ -52,11 +52,11 @@ static ADDRESS_MAP_START( rocnrope_map, AS_PROGRAM, 8, rocnrope_state )
AM_RANGE(0x4000, 0x402f) AM_RAM AM_BASE(m_spriteram2)
AM_RANGE(0x4400, 0x442f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE_LEGACY(rocnrope_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x4c00, 0x4fff) AM_RAM_WRITE_LEGACY(rocnrope_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(rocnrope_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4c00, 0x4fff) AM_RAM_WRITE(rocnrope_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x5000, 0x5fff) AM_RAM
AM_RANGE(0x8000, 0x8000) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x8080, 0x8080) AM_WRITE_LEGACY(rocnrope_flipscreen_w)
+ AM_RANGE(0x8080, 0x8080) AM_WRITE(rocnrope_flipscreen_w)
AM_RANGE(0x8081, 0x8081) AM_WRITE_LEGACY(timeplt_sh_irqtrigger_w) /* cause interrupt on audio CPU */
AM_RANGE(0x8082, 0x8082) AM_WRITENOP /* interrupt acknowledge??? */
AM_RANGE(0x8083, 0x8083) AM_WRITENOP /* Coin counter 1 */
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index 3750c7f736c..9d6e3ef0b39 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -142,7 +142,7 @@ static ADDRESS_MAP_START( rohga_map, AS_PROGRAM, 16, rohga_state )
AM_RANGE(0x2c0000, 0x2c0001) AM_READ_PORT("DSW3")
- AM_RANGE(0x300000, 0x300001) AM_WRITE_LEGACY(rohga_buffer_spriteram16_w) /* write 1 for sprite dma */
+ AM_RANGE(0x300000, 0x300001) AM_WRITE(rohga_buffer_spriteram16_w) /* write 1 for sprite dma */
AM_RANGE(0x310000, 0x310009) AM_WRITENOP /* Palette control? */
AM_RANGE(0x31000a, 0x31000b) AM_DEVWRITE_LEGACY("deco_common", decocomn_palette_dma_w) /* Write 1111 for dma? (Or any value?) */
AM_RANGE(0x320000, 0x320001) AM_WRITENOP /* ? */
@@ -235,7 +235,7 @@ static ADDRESS_MAP_START( schmeisr_map, AS_PROGRAM, 16, rohga_state )
AM_RANGE(0x280000, 0x2807ff) AM_MIRROR(0x800) AM_READWRITE_LEGACY(deco16_104_rohga_prot_r,deco16_104_rohga_prot_w) AM_BASE_LEGACY(&deco16_prot_ram) /* Protection device */
AM_RANGE(0x2c0000, 0x2c0001) AM_READ_PORT("DSW3")
- AM_RANGE(0x300000, 0x300001) AM_READ_PORT("DSW3") AM_WRITE_LEGACY(rohga_buffer_spriteram16_w) /* write 1 for sprite dma */
+ AM_RANGE(0x300000, 0x300001) AM_READ_PORT("DSW3") AM_WRITE(rohga_buffer_spriteram16_w) /* write 1 for sprite dma */
AM_RANGE(0x310002, 0x310003) AM_READ_PORT("IN1")
AM_RANGE(0x310000, 0x310009) AM_WRITENOP /* Palette control? */
AM_RANGE(0x31000a, 0x31000b) AM_DEVWRITE_LEGACY("deco_common", decocomn_palette_dma_w) /* Write 1111 for dma? (Or any value?) */
diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c
index faec223c08d..038553b253c 100644
--- a/src/mame/drivers/rollrace.c
+++ b/src/mame/drivers/rollrace.c
@@ -46,18 +46,18 @@ static ADDRESS_MAP_START( rollrace_map, AS_PROGRAM, 8, rollrace_state )
AM_RANGE(0xe800, 0xe800) AM_WRITE(soundlatch_w)
AM_RANGE(0xec00, 0xec0f) AM_NOP /* Analog sound effects ?? ec00 sound enable ?*/
AM_RANGE(0xf000, 0xf0ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xf400, 0xf400) AM_WRITE_LEGACY(rollrace_backgroundcolor_w)
+ AM_RANGE(0xf400, 0xf400) AM_WRITE(rollrace_backgroundcolor_w)
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("P1")
- AM_RANGE(0xf801, 0xf801) AM_READ_PORT("P2") AM_WRITE_LEGACY(rollrace_bkgpen_w)
- AM_RANGE(0xf802, 0xf802) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(rollrace_backgroundpage_w)
- AM_RANGE(0xf803, 0xf803) AM_WRITE_LEGACY(rollrace_flipy_w)
+ AM_RANGE(0xf801, 0xf801) AM_READ_PORT("P2") AM_WRITE(rollrace_bkgpen_w)
+ AM_RANGE(0xf802, 0xf802) AM_READ_PORT("SYSTEM") AM_WRITE(rollrace_backgroundpage_w)
+ AM_RANGE(0xf803, 0xf803) AM_WRITE(rollrace_flipy_w)
AM_RANGE(0xf804, 0xf804) AM_READ_PORT("DSW1")
AM_RANGE(0xf805, 0xf805) AM_READ_PORT("DSW2")
- AM_RANGE(0xfc00, 0xfc00) AM_WRITE_LEGACY(rollrace_flipx_w)
+ AM_RANGE(0xfc00, 0xfc00) AM_WRITE(rollrace_flipx_w)
AM_RANGE(0xfc01, 0xfc01) AM_WRITE(nmi_mask_w)
AM_RANGE(0xfc02, 0xfc03) AM_WRITENOP /* coin counters */
- AM_RANGE(0xfc04, 0xfc05) AM_WRITE_LEGACY(rollrace_charbank_w)
- AM_RANGE(0xfc06, 0xfc06) AM_WRITE_LEGACY(rollrace_spritebank_w)
+ AM_RANGE(0xfc04, 0xfc05) AM_WRITE(rollrace_charbank_w)
+ AM_RANGE(0xfc06, 0xfc06) AM_WRITE(rollrace_spritebank_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c
index 1d81fc44d10..f8763bcd9ea 100644
--- a/src/mame/drivers/route16.c
+++ b/src/mame/drivers/route16.c
@@ -216,8 +216,8 @@ static ADDRESS_MAP_START( route16_cpu1_map, AS_PROGRAM, 8, route16_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
/*AM_RANGE(0x3000, 0x3001) AM_NOP protection device */
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, route16_sharedram_w) AM_BASE(m_sharedram)
- AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE_LEGACY(route16_out0_w)
- AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_WRITE_LEGACY(route16_out1_w)
+ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
+ AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_WRITE(route16_out1_w)
AM_RANGE(0x5800, 0x5800) AM_READ_PORT("P2")
AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE(m_videoram1) AM_SIZE(m_videoram_size)
ADDRESS_MAP_END
@@ -226,8 +226,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( routex_cpu1_map, AS_PROGRAM, 8, route16_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, route16_sharedram_w) AM_BASE(m_sharedram)
- AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE_LEGACY(route16_out0_w)
- AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_WRITE_LEGACY(route16_out1_w)
+ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
+ AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_WRITE(route16_out1_w)
AM_RANGE(0x5800, 0x5800) AM_READ_PORT("P2")
AM_RANGE(0x6400, 0x6400) AM_READ(routex_prot_read)
AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE(m_videoram1) AM_SIZE(m_videoram_size)
@@ -237,8 +237,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( stratvox_cpu1_map, AS_PROGRAM, 8, route16_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(m_sharedram)
- AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE_LEGACY(route16_out0_w)
- AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_WRITE_LEGACY(route16_out1_w)
+ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
+ AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_WRITE(route16_out1_w)
AM_RANGE(0x5800, 0x5800) AM_READ_PORT("P2")
AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE(m_videoram1) AM_SIZE(m_videoram_size)
ADDRESS_MAP_END
@@ -247,8 +247,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( speakres_cpu1_map, AS_PROGRAM, 8, route16_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(m_sharedram)
- AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE_LEGACY(route16_out0_w)
- AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_WRITE_LEGACY(route16_out1_w)
+ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
+ AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_WRITE(route16_out1_w)
AM_RANGE(0x5800, 0x5800) AM_READ_PORT("P2") AM_WRITE(speakres_out2_w)
AM_RANGE(0x6000, 0x6000) AM_READ(speakres_in3_r)
AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE(m_videoram1) AM_SIZE(m_videoram_size)
@@ -258,8 +258,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ttmahjng_cpu1_map, AS_PROGRAM, 8, route16_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(m_sharedram)
- AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE_LEGACY(route16_out0_w)
- AM_RANGE(0x5000, 0x5000) AM_READ_PORT("IN0") AM_WRITE_LEGACY(route16_out1_w)
+ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
+ AM_RANGE(0x5000, 0x5000) AM_READ_PORT("IN0") AM_WRITE(route16_out1_w)
AM_RANGE(0x5800, 0x5800) AM_READWRITE(ttmahjng_input_port_matrix_r, ttmahjng_input_port_matrix_w)
AM_RANGE(0x6800, 0x6800) AM_DEVWRITE_LEGACY("ay8910", ay8910_data_w)
AM_RANGE(0x6900, 0x6900) AM_DEVWRITE_LEGACY("ay8910", ay8910_address_w)
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index df52d360541..92b871349f7 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -226,18 +226,18 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, rpunch_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x04ffff) AM_RAM AM_BASE(m_bitmapram) AM_SIZE(m_bitmapram_size)
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x080000, 0x083fff) AM_RAM_WRITE_LEGACY(rpunch_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x080000, 0x083fff) AM_RAM_WRITE(rpunch_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x0a0000, 0x0a07ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x0c0000, 0x0c0007) AM_WRITE_LEGACY(rpunch_scrollreg_w)
- AM_RANGE(0x0c0008, 0x0c0009) AM_WRITE_LEGACY(rpunch_crtc_data_w)
- AM_RANGE(0x0c000c, 0x0c000d) AM_WRITE_LEGACY(rpunch_videoreg_w)
+ AM_RANGE(0x0c0000, 0x0c0007) AM_WRITE(rpunch_scrollreg_w)
+ AM_RANGE(0x0c0008, 0x0c0009) AM_WRITE(rpunch_crtc_data_w)
+ AM_RANGE(0x0c000c, 0x0c000d) AM_WRITE(rpunch_videoreg_w)
AM_RANGE(0x0c000e, 0x0c000f) AM_WRITE(sound_command_w)
- AM_RANGE(0x0c0010, 0x0c0013) AM_WRITE_LEGACY(rpunch_ins_w)
+ AM_RANGE(0x0c0010, 0x0c0013) AM_WRITE(rpunch_ins_w)
AM_RANGE(0x0c0018, 0x0c0019) AM_READ_PORT("P1")
AM_RANGE(0x0c001a, 0x0c001b) AM_READ_PORT("P2")
AM_RANGE(0x0c001c, 0x0c001d) AM_READ_PORT("DSW")
AM_RANGE(0x0c001e, 0x0c001f) AM_READ(sound_busy_r)
- AM_RANGE(0x0c0028, 0x0c0029) AM_WRITE_LEGACY(rpunch_crtc_register_w)
+ AM_RANGE(0x0c0028, 0x0c0029) AM_WRITE(rpunch_crtc_register_w)
AM_RANGE(0x0fc000, 0x0fffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c
index 468b1101a9d..3d23c9137f5 100644
--- a/src/mame/drivers/runaway.c
+++ b/src/mame/drivers/runaway.c
@@ -83,16 +83,16 @@ WRITE8_MEMBER(runaway_state::runaway_irq_ack_w)
static ADDRESS_MAP_START( runaway_map, AS_PROGRAM, 8, runaway_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM
- AM_RANGE(0x0400, 0x07bf) AM_RAM_WRITE_LEGACY(runaway_video_ram_w) AM_BASE(m_video_ram)
+ AM_RANGE(0x0400, 0x07bf) AM_RAM_WRITE(runaway_video_ram_w) AM_BASE(m_video_ram)
AM_RANGE(0x07c0, 0x07ff) AM_RAM AM_BASE(m_sprite_ram)
AM_RANGE(0x1000, 0x1000) AM_WRITE(runaway_irq_ack_w)
AM_RANGE(0x1400, 0x143f) AM_DEVWRITE("earom", atari_vg_earom_device, write)
AM_RANGE(0x1800, 0x1800) AM_DEVWRITE("earom", atari_vg_earom_device, ctrl_w)
- AM_RANGE(0x1c00, 0x1c0f) AM_WRITE_LEGACY(runaway_paletteram_w)
+ AM_RANGE(0x1c00, 0x1c0f) AM_WRITE(runaway_paletteram_w)
AM_RANGE(0x2000, 0x2000) AM_WRITENOP /* coin counter? */
AM_RANGE(0x2001, 0x2001) AM_WRITENOP /* coin counter? */
AM_RANGE(0x2003, 0x2004) AM_WRITE(runaway_led_w)
- AM_RANGE(0x2005, 0x2005) AM_WRITE_LEGACY(runaway_tile_bank_w)
+ AM_RANGE(0x2005, 0x2005) AM_WRITE(runaway_tile_bank_w)
AM_RANGE(0x3000, 0x3007) AM_READ(runaway_input_r)
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("4000")
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index e82185e549e..d2d10af9dc9 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -197,9 +197,9 @@ static ADDRESS_MAP_START( rungun_map, AS_PROGRAM, 16, rungun_state )
AM_RANGE(0x601000, 0x601fff) AM_RAM // communication? second monitor buffer?
AM_RANGE(0x640000, 0x640007) AM_DEVWRITE_LEGACY("k055673", k053246_word_w) // '246A registers
AM_RANGE(0x680000, 0x68001f) AM_DEVWRITE_LEGACY("k053936", k053936_ctrl_w) // '936 registers
- AM_RANGE(0x6c0000, 0x6cffff) AM_RAM_WRITE_LEGACY(rng_936_videoram_w) AM_BASE(m_936_videoram) // PSAC2 ('936) RAM (34v + 35v)
+ AM_RANGE(0x6c0000, 0x6cffff) AM_RAM_WRITE(rng_936_videoram_w) AM_BASE(m_936_videoram) // PSAC2 ('936) RAM (34v + 35v)
AM_RANGE(0x700000, 0x7007ff) AM_DEVREADWRITE_LEGACY("k053936", k053936_linectrl_r, k053936_linectrl_w) // PSAC "Line RAM"
- AM_RANGE(0x740000, 0x741fff) AM_READWRITE_LEGACY(rng_ttl_ram_r, rng_ttl_ram_w) // text plane RAM
+ AM_RANGE(0x740000, 0x741fff) AM_READWRITE(rng_ttl_ram_r, rng_ttl_ram_w) // text plane RAM
AM_RANGE(0x7c0000, 0x7c0001) AM_WRITENOP // watchdog
#if RNG_DEBUG
AM_RANGE(0x5c0010, 0x5c001f) AM_DEVREAD_LEGACY("k055673", k053247_reg_word_r)
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index cf26de89896..a558c753c85 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -231,10 +231,10 @@ static ADDRESS_MAP_START( sandscrp, AS_PROGRAM, 16, sandscrp_state )
AM_RANGE(0x100000, 0x100001) AM_WRITE_LEGACY(sandscrp_irq_cause_w) // IRQ Ack
AM_RANGE(0x700000, 0x70ffff) AM_RAM // RAM
- AM_RANGE(0x200000, 0x20001f) AM_READWRITE_LEGACY(galpanib_calc_r,galpanib_calc_w) // Protection
- AM_RANGE(0x300000, 0x30000f) AM_RAM_WRITE_LEGACY(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
- AM_RANGE(0x401000, 0x401fff) AM_RAM_WRITE_LEGACY(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
+ AM_RANGE(0x200000, 0x20001f) AM_READWRITE(galpanib_calc_r,galpanib_calc_w) // Protection
+ AM_RANGE(0x300000, 0x30000f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
+ AM_RANGE(0x401000, 0x401fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0x402000, 0x402fff) AM_RAM AM_BASE(m_vscroll[1]) //
AM_RANGE(0x403000, 0x403fff) AM_RAM AM_BASE(m_vscroll[0]) //
AM_RANGE(0x500000, 0x501fff) AM_DEVREADWRITE_LEGACY("pandora", pandora_spriteram_LSB_r, pandora_spriteram_LSB_w ) // sprites
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index 68244066c83..43bc43418c3 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -167,10 +167,10 @@ static ADDRESS_MAP_START( sauro_map, AS_PROGRAM, 8, sauro_state )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xe800, 0xebff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE_LEGACY(tecfri_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE_LEGACY(tecfri_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xf800, 0xfbff) AM_RAM_WRITE_LEGACY(tecfri_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0xfc00, 0xffff) AM_RAM_WRITE_LEGACY(tecfri_colorram2_w) AM_BASE(m_colorram2)
+ AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(tecfri_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(tecfri_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xf800, 0xfbff) AM_RAM_WRITE(tecfri_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xfc00, 0xffff) AM_RAM_WRITE(tecfri_colorram2_w) AM_BASE(m_colorram2)
ADDRESS_MAP_END
static ADDRESS_MAP_START( sauro_io_map, AS_IO, 8, sauro_state )
@@ -180,8 +180,8 @@ static ADDRESS_MAP_START( sauro_io_map, AS_IO, 8, sauro_state )
AM_RANGE(0x40, 0x40) AM_READ_PORT("P1")
AM_RANGE(0x60, 0x60) AM_READ_PORT("P2")
AM_RANGE(0x80, 0x80) AM_WRITE(sauro_sound_command_w)
- AM_RANGE(0xa0, 0xa0) AM_WRITE_LEGACY(tecfri_scroll_bg_w)
- AM_RANGE(0xa1, 0xa1) AM_WRITE_LEGACY(sauro_scroll_fg_w)
+ AM_RANGE(0xa0, 0xa0) AM_WRITE(tecfri_scroll_bg_w)
+ AM_RANGE(0xa1, 0xa1) AM_WRITE(sauro_scroll_fg_w)
AM_RANGE(0xc0, 0xc0) AM_WRITE(flip_screen_w)
AM_RANGE(0xc2, 0xc2) AM_WRITENOP /* coin reset */
AM_RANGE(0xc3, 0xc3) AM_WRITE(sauro_coin1_w)
@@ -190,7 +190,7 @@ static ADDRESS_MAP_START( sauro_io_map, AS_IO, 8, sauro_state )
AM_RANGE(0xc6, 0xc7) AM_WRITENOP /* same as 0x80 - verified with debugger */
AM_RANGE(0xc8, 0xc8) AM_WRITENOP /* written every int: 0 written at end of isr */
AM_RANGE(0xc9, 0xc9) AM_WRITENOP /* written every int: 1 written at start of isr */
- AM_RANGE(0xca, 0xcb) AM_WRITE_LEGACY(sauro_palette_bank_w) /* 1 written upon death, cleared 2 vblanks later */
+ AM_RANGE(0xca, 0xcb) AM_WRITE(sauro_palette_bank_w) /* 1 written upon death, cleared 2 vblanks later */
/* Sequence 3,2,1 written during intro screen */
AM_RANGE(0xcc, 0xcc) AM_WRITENOP /* same as 0xca */
AM_RANGE(0xcd, 0xcd) AM_WRITENOP /* same as 0xcb */
@@ -213,15 +213,15 @@ static ADDRESS_MAP_START( trckydoc_map, AS_PROGRAM, 8, sauro_state )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xe800, 0xebff) AM_RAM AM_MIRROR(0x400) AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE_LEGACY(tecfri_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE_LEGACY(tecfri_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(tecfri_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(tecfri_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("DSW1")
AM_RANGE(0xf808, 0xf808) AM_READ_PORT("DSW2")
AM_RANGE(0xf810, 0xf810) AM_READ_PORT("P1")
AM_RANGE(0xf818, 0xf818) AM_READ_PORT("P2")
AM_RANGE(0xf820, 0xf821) AM_DEVWRITE_LEGACY("ymsnd", ym3812_w)
AM_RANGE(0xf828, 0xf828) AM_READ(watchdog_reset_r)
- AM_RANGE(0xf830, 0xf830) AM_WRITE_LEGACY(tecfri_scroll_bg_w)
+ AM_RANGE(0xf830, 0xf830) AM_WRITE(tecfri_scroll_bg_w)
AM_RANGE(0xf838, 0xf838) AM_WRITENOP /* only written at startup */
AM_RANGE(0xf839, 0xf839) AM_WRITE(flip_screen_w)
AM_RANGE(0xf83a, 0xf83a) AM_WRITE(sauro_coin1_w)
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index af287a9dbb5..1d2f9e82acb 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -68,14 +68,14 @@ WRITE8_MEMBER(sbasketb_state::irq_mask_w)
static ADDRESS_MAP_START( sbasketb_map, AS_PROGRAM, 8, sbasketb_state )
AM_RANGE(0x2000, 0x2fff) AM_RAM
- AM_RANGE(0x3000, 0x33ff) AM_RAM_WRITE_LEGACY(sbasketb_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x3400, 0x37ff) AM_RAM_WRITE_LEGACY(sbasketb_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x3000, 0x33ff) AM_RAM_WRITE(sbasketb_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x3400, 0x37ff) AM_RAM_WRITE(sbasketb_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x3800, 0x39ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x3a00, 0x3bff) AM_RAM /* Probably unused, but initialized */
AM_RANGE(0x3c00, 0x3c00) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x3c10, 0x3c10) AM_READNOP /* ???? */
AM_RANGE(0x3c20, 0x3c20) AM_WRITEONLY AM_BASE(m_palettebank)
- AM_RANGE(0x3c80, 0x3c80) AM_WRITE_LEGACY(sbasketb_flipscreen_w)
+ AM_RANGE(0x3c80, 0x3c80) AM_WRITE(sbasketb_flipscreen_w)
AM_RANGE(0x3c81, 0x3c81) AM_WRITE(irq_mask_w)
AM_RANGE(0x3c83, 0x3c84) AM_WRITE(sbasketb_coin_counter_w)
AM_RANGE(0x3c85, 0x3c85) AM_WRITEONLY AM_BASE(m_spriteram_select)
diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c
index 2f37a462e41..ef1aee73ef1 100644
--- a/src/mame/drivers/sbugger.c
+++ b/src/mame/drivers/sbugger.c
@@ -108,8 +108,8 @@ Sound PCB
static ADDRESS_MAP_START( sbugger_map, AS_PROGRAM, 8, sbugger_state )
AM_RANGE(0x0000, 0x37ff) AM_ROM
- AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE_LEGACY(sbugger_videoram_attr_w) AM_BASE(m_videoram_attr)
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE_LEGACY(sbugger_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE(sbugger_videoram_attr_w) AM_BASE(m_videoram_attr)
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(sbugger_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xe000, 0xe0ff) AM_DEVREADWRITE("i8156", i8155_device, memory_r, memory_w) /* sp is set to e0ff */
AM_RANGE(0xf400, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c
index 035873c66ec..80d3ab8440c 100644
--- a/src/mame/drivers/scobra.c
+++ b/src/mame/drivers/scobra.c
@@ -115,54 +115,54 @@ static WRITE8_DEVICE_HANDLER(hustler_ppi8255_w)
static ADDRESS_MAP_START( type1_map, AS_PROGRAM, 8, scobra_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x8c00, 0x8fff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) /* mirror */
- AM_RANGE(0x8c00, 0x8fff) AM_READ_LEGACY(galaxold_videoram_r) /* mirror */
- AM_RANGE(0x9000, 0x903f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8c00, 0x8fff) AM_RAM_WRITE(galaxold_videoram_w) /* mirror */
+ AM_RANGE(0x8c00, 0x8fff) AM_READ(galaxold_videoram_r) /* mirror */
+ AM_RANGE(0x9000, 0x903f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x9040, 0x905f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9060, 0x907f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x9080, 0x90ff) AM_RAM
AM_RANGE(0x9800, 0x9803) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0xa000, 0xa003) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w)
- AM_RANGE(0xa801, 0xa801) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0xa802, 0xa802) AM_WRITE_LEGACY(galaxold_coin_counter_w)
- AM_RANGE(0xa804, 0xa804) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0xa806, 0xa806) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0xa807, 0xa807) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0xa801, 0xa801) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0xa802, 0xa802) AM_WRITE(galaxold_coin_counter_w)
+ AM_RANGE(0xa804, 0xa804) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0xa806, 0xa806) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0xa807, 0xa807) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0xb000, 0xb000) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
static ADDRESS_MAP_START( type2_map, AS_PROGRAM, 8, scobra_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x883f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x8800, 0x883f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x8840, 0x885f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x8860, 0x887f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x8880, 0x88ff) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9400, 0x97ff) AM_READWRITE_LEGACY(galaxold_videoram_r, galaxold_videoram_w) /* mirror */
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9400, 0x97ff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w) /* mirror */
AM_RANGE(0x9800, 0x9800) AM_READ(watchdog_reset_r)
AM_RANGE(0xa000, 0xa00f) AM_DEVREADWRITE_LEGACY("ppi8255_0", scobra_type2_ppi8255_r, scobra_type2_ppi8255_w)
AM_RANGE(0xa800, 0xa80f) AM_DEVREADWRITE_LEGACY("ppi8255_1", scobra_type2_ppi8255_r, scobra_type2_ppi8255_w)
- AM_RANGE(0xb000, 0xb000) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0xb004, 0xb004) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0xb006, 0xb006) AM_WRITE_LEGACY(galaxold_coin_counter_0_w)
- AM_RANGE(0xb008, 0xb008) AM_WRITE_LEGACY(galaxold_coin_counter_1_w)
- AM_RANGE(0xb00c, 0xb00c) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
- AM_RANGE(0xb00e, 0xb00e) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
+ AM_RANGE(0xb000, 0xb000) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0xb004, 0xb004) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0xb006, 0xb006) AM_WRITE(galaxold_coin_counter_0_w)
+ AM_RANGE(0xb008, 0xb008) AM_WRITE(galaxold_coin_counter_1_w)
+ AM_RANGE(0xb00c, 0xb00c) AM_WRITE(galaxold_flip_screen_y_w)
+ AM_RANGE(0xb00e, 0xb00e) AM_WRITE(galaxold_flip_screen_x_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( hustler_map, AS_PROGRAM, 8, scobra_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9000, 0x903f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9000, 0x903f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x9040, 0x905f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9060, 0x907f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x9080, 0x90ff) AM_RAM
- AM_RANGE(0xa802, 0xa802) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0xa804, 0xa804) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0xa806, 0xa806) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0xa802, 0xa802) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0xa804, 0xa804) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0xa806, 0xa806) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0xa80e, 0xa80e) AM_WRITENOP /* coin counters */
AM_RANGE(0xb800, 0xb800) AM_READ(watchdog_reset_r)
AM_RANGE(0xd000, 0xd01f) AM_DEVREADWRITE_LEGACY("ppi8255_0", hustler_ppi8255_r, hustler_ppi8255_w)
@@ -172,15 +172,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( hustlerb_map, AS_PROGRAM, 8, scobra_state )
AM_RANGE(0x0000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9000, 0x903f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9000, 0x903f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x9040, 0x905f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9060, 0x907f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x9080, 0x90ff) AM_RAM
- AM_RANGE(0xa801, 0xa801) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
+ AM_RANGE(0xa801, 0xa801) AM_WRITE(galaxold_nmi_enable_w)
AM_RANGE(0xa802, 0xa802) AM_WRITENOP /* coin counters */
- AM_RANGE(0xa806, 0xa806) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
- AM_RANGE(0xa807, 0xa807) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
+ AM_RANGE(0xa806, 0xa806) AM_WRITE(galaxold_flip_screen_y_w)
+ AM_RANGE(0xa807, 0xa807) AM_WRITE(galaxold_flip_screen_x_w)
AM_RANGE(0xb000, 0xb000) AM_READ(watchdog_reset_r)
AM_RANGE(0xc100, 0xc103) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0xc200, 0xc203) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w)
@@ -189,18 +189,18 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mimonkey_map, AS_PROGRAM, 8, scobra_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x8c00, 0x8fff) AM_READWRITE_LEGACY(galaxold_videoram_r, galaxold_videoram_w) /* mirror */
- AM_RANGE(0x9000, 0x903f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8c00, 0x8fff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w) /* mirror */
+ AM_RANGE(0x9000, 0x903f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x9040, 0x905f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9060, 0x907f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x9080, 0x90ff) AM_RAM
AM_RANGE(0x9800, 0x9803) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0xa000, 0xa003) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w)
- AM_RANGE(0xa801, 0xa801) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0xa800, 0xa802) AM_WRITE_LEGACY(galaxold_gfxbank_w)
- AM_RANGE(0xa806, 0xa806) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0xa807, 0xa807) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0xa801, 0xa801) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0xa800, 0xa802) AM_WRITE(galaxold_gfxbank_w)
+ AM_RANGE(0xa806, 0xa806) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0xa807, 0xa807) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0xb000, 0xb000) AM_READ(watchdog_reset_r)
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index 97b1ffc40c1..f0c8daf2d34 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -61,17 +61,17 @@ WRITE8_MEMBER(scotrsht_state::scotrsht_soundlatch_w)
}
static ADDRESS_MAP_START( scotrsht_map, AS_PROGRAM, 8, scotrsht_state )
- AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE_LEGACY(scotrsht_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE_LEGACY(scotrsht_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(scotrsht_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE(scotrsht_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1000, 0x10bf) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* sprites */
AM_RANGE(0x10c0, 0x1fff) AM_RAM /* work ram */
AM_RANGE(0x2000, 0x201f) AM_RAM AM_BASE(m_scroll) /* scroll registers */
AM_RANGE(0x2040, 0x2040) AM_WRITENOP
AM_RANGE(0x2041, 0x2041) AM_WRITENOP
AM_RANGE(0x2042, 0x2042) AM_WRITENOP /* it should be -> bit 2 = scroll direction like in jailbrek, but it's not used */
- AM_RANGE(0x2043, 0x2043) AM_WRITE_LEGACY(scotrsht_charbank_w)
+ AM_RANGE(0x2043, 0x2043) AM_WRITE(scotrsht_charbank_w)
AM_RANGE(0x2044, 0x2044) AM_WRITE(ctrl_w)
- AM_RANGE(0x3000, 0x3000) AM_WRITE_LEGACY(scotrsht_palettebank_w)
+ AM_RANGE(0x3000, 0x3000) AM_WRITE(scotrsht_palettebank_w)
AM_RANGE(0x3100, 0x3100) AM_WRITE(scotrsht_soundlatch_w)
AM_RANGE(0x3200, 0x3200) AM_WRITENOP /* it writes 0, 1 */
AM_RANGE(0x3100, 0x3100) AM_READ_PORT("DSW2")
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index 46af29a0a80..3767c87ac32 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -40,17 +40,17 @@ Notes:
static ADDRESS_MAP_START( scramble_map, AS_PROGRAM, 8, scramble_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4c00, 0x4fff) AM_READWRITE_LEGACY(galaxold_videoram_r, galaxold_videoram_w) /* mirror address */
- AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4c00, 0x4fff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w) /* mirror address */
+ AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x5040, 0x505f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x5060, 0x507f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x5080, 0x50ff) AM_RAM
- AM_RANGE(0x6801, 0x6801) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0x6802, 0x6802) AM_WRITE_LEGACY(galaxold_coin_counter_w)
- AM_RANGE(0x6804, 0x6804) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0x6806, 0x6806) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0x6807, 0x6807) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxold_coin_counter_w)
+ AM_RANGE(0x6804, 0x6804) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0x6806, 0x6806) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0x6807, 0x6807) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r)
AM_RANGE(0x7800, 0x7800) AM_READ(watchdog_reset_r)
AM_RANGE(0x8100, 0x8103) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w)
@@ -62,9 +62,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( turpins_map, AS_PROGRAM, 8, scramble_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9400, 0x97ff) AM_READWRITE_LEGACY(galaxold_videoram_r, galaxold_videoram_w)
- AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9400, 0x97ff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w)
+ AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x9840, 0x985f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9860, 0x987f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x9880, 0x98ff) AM_RAM
@@ -73,11 +73,11 @@ static ADDRESS_MAP_START( turpins_map, AS_PROGRAM, 8, scramble_state )
AM_RANGE(0xa001, 0xa001) AM_READ_PORT("IN1")
AM_RANGE(0xa002, 0xa002) AM_READ_PORT("IN2")
- AM_RANGE(0xa801, 0xa801) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0xa802, 0xa802) AM_WRITE_LEGACY(galaxold_coin_counter_w)
- AM_RANGE(0xa804, 0xa804) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0xa806, 0xa806) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0xa807, 0xa807) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0xa801, 0xa801) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0xa802, 0xa802) AM_WRITE(galaxold_coin_counter_w)
+ AM_RANGE(0xa804, 0xa804) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0xa806, 0xa806) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0xa807, 0xa807) AM_WRITE(galaxold_flip_screen_y_w)
/* don't know where these are */
// AM_RANGE(0x8100, 0x8103) AM_WRITE_LEGACY(ppi8255_0_w)
// AM_RANGE(0x8200, 0x8203) AM_WRITE_LEGACY(ppi8255_1_w)
@@ -94,15 +94,15 @@ static ADDRESS_MAP_START( ckongs_map, AS_PROGRAM, 8, scramble_state )
AM_RANGE(0x6000, 0x6bff) AM_RAM
AM_RANGE(0x7000, 0x7003) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0x7800, 0x7803) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w)
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x9840, 0x985f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9860, 0x987f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x9880, 0x98ff) AM_RAM
- AM_RANGE(0xa801, 0xa801) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0xa802, 0xa802) AM_WRITE_LEGACY(galaxold_coin_counter_w)
- AM_RANGE(0xa806, 0xa806) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0xa807, 0xa807) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0xa801, 0xa801) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0xa802, 0xa802) AM_WRITE(galaxold_coin_counter_w)
+ AM_RANGE(0xa806, 0xa806) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0xa807, 0xa807) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0xb000, 0xb000) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
@@ -121,18 +121,18 @@ static WRITE8_DEVICE_HANDLER(mars_ppi8255_w)
static ADDRESS_MAP_START( mars_map, AS_PROGRAM, 8, scramble_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4c00, 0x4fff) AM_READ_LEGACY(galaxold_videoram_r)
- AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4c00, 0x4fff) AM_READ(galaxold_videoram_r)
+ AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x5040, 0x505f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x5060, 0x507f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x5080, 0x50ff) AM_RAM
- AM_RANGE(0x6800, 0x6800) AM_WRITE_LEGACY(galaxold_coin_counter_1_w)
- AM_RANGE(0x6801, 0x6801) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0x6802, 0x6802) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0x6808, 0x6808) AM_WRITE_LEGACY(galaxold_coin_counter_0_w)
- AM_RANGE(0x6809, 0x6809) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0x680b, 0x680b) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0x6800, 0x6800) AM_WRITE(galaxold_coin_counter_1_w)
+ AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0x6808, 0x6808) AM_WRITE(galaxold_coin_counter_0_w)
+ AM_RANGE(0x6809, 0x6809) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0x680b, 0x680b) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r)
AM_RANGE(0x7000, 0x7000) AM_READNOP
AM_RANGE(0x8100, 0x810f) AM_DEVREADWRITE_LEGACY("ppi8255_0", mars_ppi8255_r, mars_ppi8255_w)
@@ -143,18 +143,18 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( newsin7_map, AS_PROGRAM, 8, scramble_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4c00, 0x4fff) AM_READ_LEGACY(galaxold_videoram_r)
- AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4c00, 0x4fff) AM_READ(galaxold_videoram_r)
+ AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x5040, 0x505f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x5060, 0x507f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x5080, 0x50ff) AM_RAM
- AM_RANGE(0x6800, 0x6800) AM_WRITE_LEGACY(galaxold_coin_counter_1_w)
- AM_RANGE(0x6801, 0x6801) AM_WRITE_LEGACY(galaxold_stars_enable_w)
- AM_RANGE(0x6802, 0x6802) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0x6808, 0x6808) AM_WRITE_LEGACY(galaxold_coin_counter_0_w)
- AM_RANGE(0x6809, 0x6809) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0x680b, 0x680b) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0x6800, 0x6800) AM_WRITE(galaxold_coin_counter_1_w)
+ AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxold_stars_enable_w)
+ AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0x6808, 0x6808) AM_WRITE(galaxold_coin_counter_0_w)
+ AM_RANGE(0x6809, 0x6809) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0x680b, 0x680b) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r)
AM_RANGE(0x8200, 0x820f) AM_DEVREADWRITE_LEGACY("ppi8255_1", mars_ppi8255_r, mars_ppi8255_w)
AM_RANGE(0xa000, 0xafff) AM_ROM
@@ -165,17 +165,17 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mrkougar_map, AS_PROGRAM, 8, scramble_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4c00, 0x4fff) AM_READWRITE_LEGACY(galaxold_videoram_r, galaxold_videoram_w)
- AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4c00, 0x4fff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w)
+ AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x5040, 0x505f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x5060, 0x507f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x5080, 0x50ff) AM_RAM
- AM_RANGE(0x6800, 0x6800) AM_WRITE_LEGACY(galaxold_coin_counter_1_w)
- AM_RANGE(0x6801, 0x6801) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0x6808, 0x6808) AM_WRITE_LEGACY(galaxold_coin_counter_0_w)
- AM_RANGE(0x6809, 0x6809) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0x680b, 0x680b) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0x6800, 0x6800) AM_WRITE(galaxold_coin_counter_1_w)
+ AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0x6808, 0x6808) AM_WRITE(galaxold_coin_counter_0_w)
+ AM_RANGE(0x6809, 0x6809) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0x680b, 0x680b) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r)
AM_RANGE(0x8100, 0x810f) AM_DEVREADWRITE_LEGACY("ppi8255_0", mars_ppi8255_r, mars_ppi8255_w)
AM_RANGE(0x8200, 0x820f) AM_DEVREADWRITE_LEGACY("ppi8255_1", mars_ppi8255_r, mars_ppi8255_w)
@@ -185,18 +185,18 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( hotshock_map, AS_PROGRAM, 8, scramble_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4c00, 0x4fff) AM_READ_LEGACY(galaxold_videoram_r)
- AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4c00, 0x4fff) AM_READ(galaxold_videoram_r)
+ AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x5040, 0x505f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x5060, 0x507f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x5080, 0x50ff) AM_RAM
- AM_RANGE(0x6000, 0x6000) AM_WRITE_LEGACY(galaxold_coin_counter_2_w)
- AM_RANGE(0x6002, 0x6002) AM_WRITE_LEGACY(galaxold_coin_counter_1_w)
- AM_RANGE(0x6004, 0x6004) AM_WRITE_LEGACY(hotshock_flip_screen_w)
- AM_RANGE(0x6005, 0x6005) AM_WRITE_LEGACY(galaxold_coin_counter_0_w)
- AM_RANGE(0x6006, 0x6006) AM_WRITE_LEGACY(galaxold_gfxbank_w)
- AM_RANGE(0x6801, 0x6801) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
+ AM_RANGE(0x6000, 0x6000) AM_WRITE(galaxold_coin_counter_2_w)
+ AM_RANGE(0x6002, 0x6002) AM_WRITE(galaxold_coin_counter_1_w)
+ AM_RANGE(0x6004, 0x6004) AM_WRITE(hotshock_flip_screen_w)
+ AM_RANGE(0x6005, 0x6005) AM_WRITE(galaxold_coin_counter_0_w)
+ AM_RANGE(0x6006, 0x6006) AM_WRITE(galaxold_gfxbank_w)
+ AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxold_nmi_enable_w)
AM_RANGE(0x7000, 0x7000) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x8000, 0x8000) AM_READ_PORT("IN0") AM_WRITE(soundlatch_w)
AM_RANGE(0x8001, 0x8001) AM_READ_PORT("IN1")
@@ -209,16 +209,16 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( hunchbks_map, AS_PROGRAM, 8, scramble_state )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1210, 0x1213) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w)
- AM_RANGE(0x1400, 0x143f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x1400, 0x143f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x1440, 0x145f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x1460, 0x147f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x1480, 0x14ff) AM_RAM
AM_RANGE(0x1500, 0x1503) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w)
- AM_RANGE(0x1606, 0x1606) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0x1607, 0x1607) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0x1606, 0x1606) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0x1607, 0x1607) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x1680, 0x1680) AM_READ(watchdog_reset_r)
AM_RANGE(0x1780, 0x1780) AM_READ(watchdog_reset_r)
- AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1c00, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x3fff) AM_READWRITE_LEGACY(hunchbks_mirror_r, hunchbks_mirror_w)
@@ -231,17 +231,17 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mimonscr_map, AS_PROGRAM, 8, scramble_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x43ff) AM_READWRITE_LEGACY(galaxold_videoram_r, galaxold_videoram_w) /* mirror address?, probably not */
+ AM_RANGE(0x4000, 0x43ff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w) /* mirror address?, probably not */
AM_RANGE(0x4400, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE_LEGACY(galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x5040, 0x505f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x5060, 0x507f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x5080, 0x50ff) AM_RAM
- AM_RANGE(0x6801, 0x6801) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0x6800, 0x6802) AM_WRITE_LEGACY(galaxold_gfxbank_w)
- AM_RANGE(0x6806, 0x6806) AM_WRITE_LEGACY(galaxold_flip_screen_x_w)
- AM_RANGE(0x6807, 0x6807) AM_WRITE_LEGACY(galaxold_flip_screen_y_w)
+ AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0x6800, 0x6802) AM_WRITE(galaxold_gfxbank_w)
+ AM_RANGE(0x6806, 0x6806) AM_WRITE(galaxold_flip_screen_x_w)
+ AM_RANGE(0x6807, 0x6807) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r)
AM_RANGE(0x8100, 0x8103) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0x8200, 0x8203) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w)
@@ -252,18 +252,18 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ad2083_map, AS_PROGRAM, 8, scramble_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
- AM_RANGE(0x4800, 0x4bff) AM_READWRITE_LEGACY(galaxold_videoram_r, galaxold_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE_LEGACY(galaxold_attributesram_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x4800, 0x4bff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5000, 0x503f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(m_attributesram)
AM_RANGE(0x5040, 0x505f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x5060, 0x507f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
- AM_RANGE(0x6004, 0x6004) AM_WRITE_LEGACY(hotshock_flip_screen_w)
- AM_RANGE(0x6800, 0x6800) AM_WRITE_LEGACY(galaxold_coin_counter_2_w)
- AM_RANGE(0x6801, 0x6801) AM_WRITE_LEGACY(galaxold_nmi_enable_w)
- AM_RANGE(0x6802, 0x6802) AM_WRITE_LEGACY(galaxold_coin_counter_0_w)
- AM_RANGE(0x6803, 0x6803) AM_WRITE_LEGACY(scrambold_background_blue_w)
- AM_RANGE(0x6805, 0x6805) AM_WRITE_LEGACY(galaxold_coin_counter_1_w)
- AM_RANGE(0x6806, 0x6806) AM_WRITE_LEGACY(scrambold_background_red_w)
- AM_RANGE(0x6807, 0x6807) AM_WRITE_LEGACY(scrambold_background_green_w)
+ AM_RANGE(0x6004, 0x6004) AM_WRITE(hotshock_flip_screen_w)
+ AM_RANGE(0x6800, 0x6800) AM_WRITE(galaxold_coin_counter_2_w)
+ AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxold_nmi_enable_w)
+ AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxold_coin_counter_0_w)
+ AM_RANGE(0x6803, 0x6803) AM_WRITE(scrambold_background_blue_w)
+ AM_RANGE(0x6805, 0x6805) AM_WRITE(galaxold_coin_counter_1_w)
+ AM_RANGE(0x6806, 0x6806) AM_WRITE(scrambold_background_red_w)
+ AM_RANGE(0x6807, 0x6807) AM_WRITE(scrambold_background_green_w)
AM_RANGE(0x8000, 0x8000) AM_WRITE(soundlatch_w)
AM_RANGE(0x9000, 0x9000) AM_WRITE_LEGACY(hotshock_sh_irqtrigger_w)
AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r)
diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c
index 621cfd86da7..83c0bca2fc8 100644
--- a/src/mame/drivers/scregg.c
+++ b/src/mame/drivers/scregg.c
@@ -72,9 +72,9 @@ static ADDRESS_MAP_START( dommy_map, AS_PROGRAM, 8, btime_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x2000, 0x23ff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x2400, 0x27ff) AM_RAM AM_BASE(m_colorram)
- AM_RANGE(0x2800, 0x2bff) AM_READWRITE_LEGACY(btime_mirrorvideoram_r, btime_mirrorvideoram_w)
+ AM_RANGE(0x2800, 0x2bff) AM_READWRITE(btime_mirrorvideoram_r, btime_mirrorvideoram_w)
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(scregg_irqack_w)
- AM_RANGE(0x4001, 0x4001) AM_READ_PORT("DSW2") AM_WRITE_LEGACY(btime_video_control_w)
+ AM_RANGE(0x4001, 0x4001) AM_READ_PORT("DSW2") AM_WRITE(btime_video_control_w)
/* AM_RANGE(0x4004, 0x4004) */ /* this is read */
AM_RANGE(0x4002, 0x4002) AM_READ_PORT("P1")
AM_RANGE(0x4003, 0x4003) AM_READ_PORT("P2")
@@ -88,9 +88,9 @@ static ADDRESS_MAP_START( eggs_map, AS_PROGRAM, 8, btime_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1000, 0x13ff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x1400, 0x17ff) AM_RAM AM_BASE(m_colorram)
- AM_RANGE(0x1800, 0x1bff) AM_READWRITE_LEGACY(btime_mirrorvideoram_r,btime_mirrorvideoram_w)
- AM_RANGE(0x1c00, 0x1fff) AM_READWRITE_LEGACY(btime_mirrorcolorram_r,btime_mirrorcolorram_w)
- AM_RANGE(0x2000, 0x2000) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(btime_video_control_w)
+ AM_RANGE(0x1800, 0x1bff) AM_READWRITE(btime_mirrorvideoram_r,btime_mirrorvideoram_w)
+ AM_RANGE(0x1c00, 0x1fff) AM_READWRITE(btime_mirrorcolorram_r,btime_mirrorcolorram_w)
+ AM_RANGE(0x2000, 0x2000) AM_READ_PORT("DSW1") AM_WRITE(btime_video_control_w)
AM_RANGE(0x2001, 0x2001) AM_READ_PORT("DSW2") AM_WRITE_LEGACY(scregg_irqack_w)
AM_RANGE(0x2002, 0x2002) AM_READ_PORT("P1")
AM_RANGE(0x2003, 0x2003) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c
index 4da9d1b96ca..17c04087710 100644
--- a/src/mame/drivers/sderby.c
+++ b/src/mame/drivers/sderby.c
@@ -276,10 +276,10 @@ WRITE16_MEMBER(sderby_state::roulette_out_w)
static ADDRESS_MAP_START( sderby_map, AS_PROGRAM, 16, sderby_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE_LEGACY(sderby_videoram_w) AM_BASE(m_videoram) /* bg */
- AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE_LEGACY(sderby_md_videoram_w) AM_BASE(m_md_videoram) /* mid */
- AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE_LEGACY(sderby_fg_videoram_w) AM_BASE(m_fg_videoram) /* fg */
- AM_RANGE(0x104000, 0x10400b) AM_WRITE_LEGACY(sderby_scroll_w)
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(sderby_videoram_w) AM_BASE(m_videoram) /* bg */
+ AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(sderby_md_videoram_w) AM_BASE(m_md_videoram) /* mid */
+ AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(sderby_fg_videoram_w) AM_BASE(m_fg_videoram) /* fg */
+ AM_RANGE(0x104000, 0x10400b) AM_WRITE(sderby_scroll_w)
AM_RANGE(0x10400c, 0x10400d) AM_WRITENOP /* ??? - check code at 0x000456 (executed once at startup) */
AM_RANGE(0x10400e, 0x10400f) AM_WRITENOP /* ??? - check code at 0x000524 (executed once at startup) */
AM_RANGE(0x200000, 0x200fff) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
@@ -295,10 +295,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( luckboom_map, AS_PROGRAM, 16, sderby_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE_LEGACY(sderby_videoram_w) AM_BASE(m_videoram) /* bg */
- AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE_LEGACY(sderby_md_videoram_w) AM_BASE(m_md_videoram) /* mid */
- AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE_LEGACY(sderby_fg_videoram_w) AM_BASE(m_fg_videoram) /* fg */
- AM_RANGE(0x104000, 0x10400b) AM_WRITE_LEGACY(sderby_scroll_w)
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(sderby_videoram_w) AM_BASE(m_videoram) /* bg */
+ AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(sderby_md_videoram_w) AM_BASE(m_md_videoram) /* mid */
+ AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(sderby_fg_videoram_w) AM_BASE(m_fg_videoram) /* fg */
+ AM_RANGE(0x104000, 0x10400b) AM_WRITE(sderby_scroll_w)
AM_RANGE(0x10400c, 0x10400d) AM_WRITENOP /* ??? - check code at 0x000456 (executed once at startup) */
AM_RANGE(0x10400e, 0x10400f) AM_WRITENOP /* ??? - check code at 0x000524 (executed once at startup) */
AM_RANGE(0x200000, 0x200fff) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
@@ -313,10 +313,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( spacewin_map, AS_PROGRAM, 16, sderby_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE_LEGACY(sderby_videoram_w) AM_BASE(m_videoram) /* bg */
- AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE_LEGACY(sderby_md_videoram_w) AM_BASE(m_md_videoram) /* mid */
- AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE_LEGACY(sderby_fg_videoram_w) AM_BASE(m_fg_videoram) /* fg */
- AM_RANGE(0x104000, 0x10400b) AM_WRITE_LEGACY(sderby_scroll_w) /* tilemaps offset control */
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(sderby_videoram_w) AM_BASE(m_videoram) /* bg */
+ AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(sderby_md_videoram_w) AM_BASE(m_md_videoram) /* mid */
+ AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(sderby_fg_videoram_w) AM_BASE(m_fg_videoram) /* fg */
+ AM_RANGE(0x104000, 0x10400b) AM_WRITE(sderby_scroll_w) /* tilemaps offset control */
AM_RANGE(0x10400c, 0x10400d) AM_WRITENOP /* seems another video register. constantly used */
AM_RANGE(0x10400e, 0x10400f) AM_WRITENOP /* seems another video register. constantly used */
AM_RANGE(0x104010, 0x105fff) AM_WRITENOP /* unknown */
@@ -335,10 +335,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( roulette_map, AS_PROGRAM, 16, sderby_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x440000, 0x440fff) AM_WRITEONLY AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
- AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE_LEGACY(sderby_videoram_w) AM_BASE(m_videoram) /* bg */
- AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE_LEGACY(sderby_md_videoram_w) AM_BASE(m_md_videoram) /* mid */
- AM_RANGE(0x502000, 0x503fff) AM_RAM_WRITE_LEGACY(sderby_fg_videoram_w) AM_BASE(m_fg_videoram) /* fg */
- AM_RANGE(0x504000, 0x50400b) AM_RAM_WRITE_LEGACY(sderby_scroll_w)
+ AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(sderby_videoram_w) AM_BASE(m_videoram) /* bg */
+ AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE(sderby_md_videoram_w) AM_BASE(m_md_videoram) /* mid */
+ AM_RANGE(0x502000, 0x503fff) AM_RAM_WRITE(sderby_fg_videoram_w) AM_BASE(m_fg_videoram) /* fg */
+ AM_RANGE(0x504000, 0x50400b) AM_RAM_WRITE(sderby_scroll_w)
AM_RANGE(0x50400e, 0x50400f) AM_WRITENOP
AM_RANGE(0x708000, 0x708009) AM_READ(roulette_input_r)
diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c
index cbdd0636373..e716356ad8c 100644
--- a/src/mame/drivers/segag80r.c
+++ b/src/mame/drivers/segag80r.c
@@ -184,10 +184,10 @@ WRITE8_MEMBER(segag80r_state::mainram_w)
m_mainram[decrypt_offset(&space, offset)] = data;
}
-WRITE8_MEMBER(segag80r_state::vidram_w){ segag80r_videoram_w(&space, decrypt_offset(&space, offset), data); }
-WRITE8_MEMBER(segag80r_state::monsterb_vidram_w){ monsterb_videoram_w(&space, decrypt_offset(&space, offset), data); }
-WRITE8_MEMBER(segag80r_state::pignewt_vidram_w){ pignewt_videoram_w(&space, decrypt_offset(&space, offset), data); }
-WRITE8_MEMBER(segag80r_state::sindbadm_vidram_w){ sindbadm_videoram_w(&space, decrypt_offset(&space, offset), data); }
+WRITE8_MEMBER(segag80r_state::vidram_w){ segag80r_videoram_w(space, decrypt_offset(&space, offset), data); }
+WRITE8_MEMBER(segag80r_state::monsterb_vidram_w){ monsterb_videoram_w(space, decrypt_offset(&space, offset), data); }
+WRITE8_MEMBER(segag80r_state::pignewt_vidram_w){ pignewt_videoram_w(space, decrypt_offset(&space, offset), data); }
+WRITE8_MEMBER(segag80r_state::sindbadm_vidram_w){ sindbadm_videoram_w(space, decrypt_offset(&space, offset), data); }
static WRITE8_DEVICE_HANDLER( usb_ram_w ) { sega_usb_ram_w(device, decrypt_offset(device->machine().device("maincpu")->memory().space(AS_PROGRAM), offset), data); }
@@ -345,7 +345,7 @@ ADDRESS_MAP_END
/* complete memory map derived from schematics */
static ADDRESS_MAP_START( main_portmap, AS_IO, 8, segag80r_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0xbe, 0xbf) AM_READWRITE_LEGACY(segag80r_video_port_r, segag80r_video_port_w)
+ AM_RANGE(0xbe, 0xbf) AM_READWRITE(segag80r_video_port_r, segag80r_video_port_w)
AM_RANGE(0xf9, 0xf9) AM_MIRROR(0x04) AM_WRITE(coin_count_w)
AM_RANGE(0xf8, 0xfb) AM_READ(mangled_ports_r)
AM_RANGE(0xfc, 0xfc) AM_READ_PORT("FC")
@@ -355,7 +355,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( main_ppi8255_portmap, AS_IO, 8, segag80r_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE_LEGACY("ppi8255", ppi8255_r, ppi8255_w)
- AM_RANGE(0xbe, 0xbf) AM_READWRITE_LEGACY(segag80r_video_port_r, segag80r_video_port_w)
+ AM_RANGE(0xbe, 0xbf) AM_READWRITE(segag80r_video_port_r, segag80r_video_port_w)
AM_RANGE(0xf9, 0xf9) AM_MIRROR(0x04) AM_WRITE(coin_count_w)
AM_RANGE(0xf8, 0xfb) AM_READ(mangled_ports_r)
AM_RANGE(0xfc, 0xfc) AM_READ_PORT("FC")
@@ -364,7 +364,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sindbadm_portmap, AS_IO, 8, segag80r_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x42, 0x43) AM_READWRITE_LEGACY(segag80r_video_port_r, segag80r_video_port_w)
+ AM_RANGE(0x42, 0x43) AM_READWRITE(segag80r_video_port_r, segag80r_video_port_w)
AM_RANGE(0x80, 0x83) AM_DEVREADWRITE_LEGACY("ppi8255", ppi8255_r, ppi8255_w)
AM_RANGE(0xf8, 0xfb) AM_READ(mangled_ports_r)
ADDRESS_MAP_END
@@ -1471,7 +1471,7 @@ static DRIVER_INIT( spaceod )
state->m_background_pcb = G80_BACKGROUND_SPACEOD;
/* configure ports for the background board */
- iospace->install_legacy_readwrite_handler(0x08, 0x0f, FUNC(spaceod_back_port_r), FUNC(spaceod_back_port_w));
+ iospace->install_readwrite_handler(0x08, 0x0f, read8_delegate(FUNC(segag80r_state::spaceod_back_port_r),state), write8_delegate(FUNC(segag80r_state::spaceod_back_port_w),state));
/* install Space Odyssey sound board */
iospace->install_legacy_write_handler(0x0e, 0x0f, FUNC(spaceod_sound_w));
@@ -1496,7 +1496,7 @@ static DRIVER_INIT( monsterb )
monsterb_expand_gfx(machine, "gfx1");
/* install background board handlers */
- iospace->install_legacy_write_handler(0xb8, 0xbd, FUNC(monsterb_back_port_w));
+ iospace->install_write_handler(0xb8, 0xbd, write8_delegate(FUNC(segag80r_state::monsterb_back_port_w),state));
pgmspace->install_write_handler(0xe000, 0xffff, write8_delegate(FUNC(segag80r_state::monsterb_vidram_w),state));
}
@@ -1516,8 +1516,8 @@ static DRIVER_INIT( monster2 )
monsterb_expand_gfx(machine, "gfx1");
/* install background board handlers */
- iospace->install_legacy_write_handler(0xb4, 0xb5, FUNC(pignewt_back_color_w));
- iospace->install_legacy_write_handler(0xb8, 0xbd, FUNC(pignewt_back_port_w));
+ iospace->install_write_handler(0xb4, 0xb5, write8_delegate(FUNC(segag80r_state::pignewt_back_color_w),state));
+ iospace->install_write_handler(0xb8, 0xbd, write8_delegate(FUNC(segag80r_state::pignewt_back_port_w),state));
pgmspace->install_write_handler(0xe000, 0xffff, write8_delegate(FUNC(segag80r_state::pignewt_vidram_w),state));
}
@@ -1537,8 +1537,8 @@ static DRIVER_INIT( pignewt )
monsterb_expand_gfx(machine, "gfx1");
/* install background board handlers */
- iospace->install_legacy_write_handler(0xb4, 0xb5, FUNC(pignewt_back_color_w));
- iospace->install_legacy_write_handler(0xb8, 0xbd, FUNC(pignewt_back_port_w));
+ iospace->install_write_handler(0xb4, 0xb5, write8_delegate(FUNC(segag80r_state::pignewt_back_color_w),state));
+ iospace->install_write_handler(0xb8, 0xbd, write8_delegate(FUNC(segag80r_state::pignewt_back_port_w),state));
pgmspace->install_write_handler(0xe000, 0xffff, write8_delegate(FUNC(segag80r_state::pignewt_vidram_w),state));
/* install Universal sound board */
@@ -1561,7 +1561,7 @@ static DRIVER_INIT( sindbadm )
state->m_background_pcb = G80_BACKGROUND_SINDBADM;
/* install background board handlers */
- iospace->install_legacy_write_handler(0x40, 0x41, FUNC(sindbadm_back_port_w));
+ iospace->install_write_handler(0x40, 0x41, write8_delegate(FUNC(segag80r_state::sindbadm_back_port_w),state));
pgmspace->install_write_handler(0xe000, 0xffff, write8_delegate(FUNC(segag80r_state::sindbadm_vidram_w),state));
}
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 9d2871b450c..4b0027a4ac3 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -1204,11 +1204,11 @@ static ADDRESS_MAP_START( system32_map, AS_PROGRAM, 16, segas32_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_MIRROR(0x0f0000) AM_RAM AM_BASE(m_system32_workram)
- AM_RANGE(0x300000, 0x31ffff) AM_MIRROR(0x0e0000) AM_READWRITE_LEGACY(system32_videoram_r, system32_videoram_w) AM_BASE(m_system32_videoram)
- AM_RANGE(0x400000, 0x41ffff) AM_MIRROR(0x0e0000) AM_READWRITE_LEGACY(system32_spriteram_r, system32_spriteram_w) AM_BASE(m_system32_spriteram)
- AM_RANGE(0x500000, 0x50000f) AM_MIRROR(0x0ffff0) AM_READWRITE_LEGACY(system32_sprite_control_r, system32_sprite_control_w)
- AM_RANGE(0x600000, 0x60ffff) AM_MIRROR(0x0e0000) AM_READWRITE_LEGACY(system32_paletteram_r, system32_paletteram_w) AM_BASE(m_system32_paletteram[0])
- AM_RANGE(0x610000, 0x61007f) AM_MIRROR(0x0eff80) AM_READWRITE_LEGACY(system32_mixer_r, system32_mixer_w)
+ AM_RANGE(0x300000, 0x31ffff) AM_MIRROR(0x0e0000) AM_READWRITE(system32_videoram_r, system32_videoram_w) AM_BASE(m_system32_videoram)
+ AM_RANGE(0x400000, 0x41ffff) AM_MIRROR(0x0e0000) AM_READWRITE(system32_spriteram_r, system32_spriteram_w) AM_BASE(m_system32_spriteram)
+ AM_RANGE(0x500000, 0x50000f) AM_MIRROR(0x0ffff0) AM_READWRITE(system32_sprite_control_r, system32_sprite_control_w)
+ AM_RANGE(0x600000, 0x60ffff) AM_MIRROR(0x0e0000) AM_READWRITE(system32_paletteram_r, system32_paletteram_w) AM_BASE(m_system32_paletteram[0])
+ AM_RANGE(0x610000, 0x61007f) AM_MIRROR(0x0eff80) AM_READWRITE(system32_mixer_r, system32_mixer_w)
AM_RANGE(0x700000, 0x701fff) AM_MIRROR(0x0fe000) AM_READWRITE_LEGACY(shared_ram_16_r, shared_ram_16_w)
AM_RANGE(0xc00000, 0xc0001f) AM_MIRROR(0x0fff80) AM_READWRITE_LEGACY(io_chip_r, io_chip_w)
AM_RANGE(0xc00040, 0xc0007f) AM_MIRROR(0x0fff80) AM_READWRITE_LEGACY(io_expansion_r, io_expansion_w)
@@ -1223,13 +1223,13 @@ static ADDRESS_MAP_START( multi32_map, AS_PROGRAM, 32, segas32_state )
ADDRESS_MAP_GLOBAL_MASK(0xffffff)
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x21ffff) AM_MIRROR(0x0e0000) AM_RAM
- AM_RANGE(0x300000, 0x31ffff) AM_MIRROR(0x0e0000) AM_READWRITE_LEGACY(multi32_videoram_r, multi32_videoram_w) AM_BASE(m_system32_videoram)
- AM_RANGE(0x400000, 0x41ffff) AM_MIRROR(0x0e0000) AM_READWRITE_LEGACY(multi32_spriteram_r, multi32_spriteram_w) AM_BASE(m_system32_spriteram)
- AM_RANGE(0x500000, 0x50000f) AM_MIRROR(0x0ffff0) AM_READWRITE_LEGACY(multi32_sprite_control_r, multi32_sprite_control_w)
- AM_RANGE(0x600000, 0x60ffff) AM_MIRROR(0x060000) AM_READWRITE_LEGACY(multi32_paletteram_0_r, multi32_paletteram_0_w) AM_BASE(m_system32_paletteram[0])
- AM_RANGE(0x610000, 0x61007f) AM_MIRROR(0x06ff80) AM_WRITE_LEGACY(multi32_mixer_0_w)
- AM_RANGE(0x680000, 0x68ffff) AM_MIRROR(0x060000) AM_READWRITE_LEGACY(multi32_paletteram_1_r, multi32_paletteram_1_w) AM_BASE(m_system32_paletteram[1])
- AM_RANGE(0x690000, 0x69007f) AM_MIRROR(0x06ff80) AM_WRITE_LEGACY(multi32_mixer_1_w)
+ AM_RANGE(0x300000, 0x31ffff) AM_MIRROR(0x0e0000) AM_READWRITE(multi32_videoram_r, multi32_videoram_w) AM_BASE(m_system32_videoram)
+ AM_RANGE(0x400000, 0x41ffff) AM_MIRROR(0x0e0000) AM_READWRITE(multi32_spriteram_r, multi32_spriteram_w) AM_BASE(m_system32_spriteram)
+ AM_RANGE(0x500000, 0x50000f) AM_MIRROR(0x0ffff0) AM_READWRITE(multi32_sprite_control_r, multi32_sprite_control_w)
+ AM_RANGE(0x600000, 0x60ffff) AM_MIRROR(0x060000) AM_READWRITE(multi32_paletteram_0_r, multi32_paletteram_0_w) AM_BASE(m_system32_paletteram[0])
+ AM_RANGE(0x610000, 0x61007f) AM_MIRROR(0x06ff80) AM_WRITE(multi32_mixer_0_w)
+ AM_RANGE(0x680000, 0x68ffff) AM_MIRROR(0x060000) AM_READWRITE(multi32_paletteram_1_r, multi32_paletteram_1_w) AM_BASE(m_system32_paletteram[1])
+ AM_RANGE(0x690000, 0x69007f) AM_MIRROR(0x06ff80) AM_WRITE(multi32_mixer_1_w)
AM_RANGE(0x700000, 0x701fff) AM_MIRROR(0x0fe000) AM_READWRITE_LEGACY(shared_ram_32_r, shared_ram_32_w)
AM_RANGE(0xc00000, 0xc0001f) AM_MIRROR(0x07ff80) AM_READWRITE_LEGACY(io_chip_0_r, io_chip_0_w)
AM_RANGE(0xc00040, 0xc0007f) AM_MIRROR(0x07ff80) AM_READWRITE_LEGACY(io_expansion_0_r, io_expansion_0_w)
@@ -4050,7 +4050,7 @@ static DRIVER_INIT( arescue )
{
segas32_state *state = machine.driver_data<segas32_state>();
segas32_common_init(machine, analog_custom_io_r, analog_custom_io_w);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa00000, 0xa00007, FUNC(arescue_dsp_r), FUNC(arescue_dsp_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa00000, 0xa00007, read16_delegate(FUNC(segas32_state::arescue_dsp_r),state), write16_delegate(FUNC(segas32_state::arescue_dsp_w),state));
state->m_dual_pcb_comms = auto_alloc_array(machine, UINT16, 0x1000/2);
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x810000, 0x810fff, FUNC(dual_pcb_comms_r), FUNC(dual_pcb_comms_w));
@@ -4068,8 +4068,9 @@ static DRIVER_INIT( arabfgt )
segas32_common_init(machine, extra_custom_io_r, NULL);
/* install protection handlers */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa00100, 0xa0011f, FUNC(arf_wakeup_protection_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa00000, 0xa00fff, FUNC(arabfgt_protection_r), FUNC(arabfgt_protection_w));
+ segas32_state *state = machine.driver_data<segas32_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xa00100, 0xa0011f, read16_delegate(FUNC(segas32_state::arf_wakeup_protection_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa00000, 0xa00fff, read16_delegate(FUNC(segas32_state::arabfgt_protection_r),state), write16_delegate(FUNC(segas32_state::arabfgt_protection_w),state));
}
@@ -4080,8 +4081,8 @@ static DRIVER_INIT( brival )
/* install protection handlers */
state->m_system32_protram = auto_alloc_array(machine, UINT16, 0x1000/2);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x20ba00, 0x20ba07, FUNC(brival_protection_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa00000, 0xa00fff, FUNC(brival_protection_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x20ba00, 0x20ba07, read16_delegate(FUNC(segas32_state::brival_protection_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xa00000, 0xa00fff, write16_delegate(FUNC(segas32_state::brival_protection_w),state));
}
@@ -4091,7 +4092,7 @@ static DRIVER_INIT( darkedge )
segas32_common_init(machine, extra_custom_io_r, NULL);
/* install protection handlers */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa00000, 0xa7ffff, FUNC(darkedge_protection_r), FUNC(darkedge_protection_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa00000, 0xa7ffff, read16_delegate(FUNC(segas32_state::darkedge_protection_r),state), write16_delegate(FUNC(segas32_state::darkedge_protection_w),state));
state->m_system32_prot_vblank = darkedge_fd1149_vblank;
}
@@ -4100,7 +4101,8 @@ static DRIVER_INIT( dbzvrvs )
segas32_common_init(machine, NULL, NULL);
/* install protection handlers */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa00000, 0xa7ffff, FUNC(dbzvrvs_protection_r), FUNC(dbzvrvs_protection_w));
+ segas32_state *state = machine.driver_data<segas32_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa00000, 0xa7ffff, read16_delegate(FUNC(segas32_state::dbzvrvs_protection_r),state), write16_delegate(FUNC(segas32_state::dbzvrvs_protection_w),state));
}
static WRITE16_HANDLER( f1en_comms_echo_w )
@@ -4138,7 +4140,8 @@ static DRIVER_INIT( ga2 )
segas32_common_init(machine, extra_custom_io_r, NULL);
decrypt_ga2_protrom(machine);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa00000, 0xa00fff, FUNC(ga2_dpram_r), FUNC(ga2_dpram_w));
+ segas32_state *state = machine.driver_data<segas32_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa00000, 0xa00fff, read16_delegate(FUNC(segas32_state::ga2_dpram_r),state), write16_delegate(FUNC(segas32_state::ga2_dpram_w),state));
}
@@ -4223,7 +4226,8 @@ static DRIVER_INIT( sonic )
segas32_common_init(machine, sonic_custom_io_r, sonic_custom_io_w);
/* install protection handlers */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x20E5C4, 0x20E5C5, FUNC(sonic_level_load_protection));
+ segas32_state *state = machine.driver_data<segas32_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x20E5C4, 0x20E5C5, write16_delegate(FUNC(segas32_state::sonic_level_load_protection),state));
}
@@ -4248,7 +4252,8 @@ static DRIVER_INIT( svf )
static DRIVER_INIT( jleague )
{
segas32_common_init(machine, NULL, NULL);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x20F700, 0x20F705, FUNC(jleague_protection_w));
+ segas32_state *state = machine.driver_data<segas32_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x20F700, 0x20F705, write16_delegate(FUNC(segas32_state::jleague_protection_w),state));
}
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index f45d18a1d67..c153353be4d 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -1034,15 +1034,15 @@ static READ32_HANDLER( soundrom_r )
static ADDRESS_MAP_START( spi_map, AS_PROGRAM, 32, seibuspi_state )
AM_RANGE(0x00000000, 0x00000417) AM_RAM
- AM_RANGE(0x00000418, 0x0000041b) AM_READWRITE_LEGACY(spi_layer_bank_r, spi_layer_bank_w)
+ AM_RANGE(0x00000418, 0x0000041b) AM_READWRITE(spi_layer_bank_r, spi_layer_bank_w)
AM_RANGE(0x0000041c, 0x0000041f) AM_READNOP
- AM_RANGE(0x0000041c, 0x0000041f) AM_WRITE_LEGACY(spi_layer_enable_w)
+ AM_RANGE(0x0000041c, 0x0000041f) AM_WRITE(spi_layer_enable_w)
AM_RANGE(0x00000420, 0x0000042b) AM_RAM AM_BASE(m_spi_scrollram)
- AM_RANGE(0x00000480, 0x00000483) AM_WRITE_LEGACY(tilemap_dma_start_w)
- AM_RANGE(0x00000484, 0x00000487) AM_WRITE_LEGACY(palette_dma_start_w)
- AM_RANGE(0x00000490, 0x00000493) AM_WRITE_LEGACY(video_dma_length_w)
- AM_RANGE(0x00000494, 0x00000497) AM_WRITE_LEGACY(video_dma_address_w)
- AM_RANGE(0x0000050c, 0x0000050f) AM_WRITE_LEGACY(sprite_dma_start_w)
+ AM_RANGE(0x00000480, 0x00000483) AM_WRITE(tilemap_dma_start_w)
+ AM_RANGE(0x00000484, 0x00000487) AM_WRITE(palette_dma_start_w)
+ AM_RANGE(0x00000490, 0x00000493) AM_WRITE(video_dma_length_w)
+ AM_RANGE(0x00000494, 0x00000497) AM_WRITE(video_dma_address_w)
+ AM_RANGE(0x0000050c, 0x0000050f) AM_WRITE(sprite_dma_start_w)
AM_RANGE(0x00000600, 0x00000603) AM_READ_LEGACY(spi_int_r) /* Clear Interrupt */
AM_RANGE(0x00000600, 0x00000603) AM_WRITENOP /* Unknown */
AM_RANGE(0x00000604, 0x00000607) AM_READ_LEGACY(spi_controls1_r) /* Player controls */
@@ -1132,15 +1132,15 @@ static const ymf271_interface ymf271_config =
static ADDRESS_MAP_START( seibu386_map, AS_PROGRAM, 32, seibuspi_state )
AM_RANGE(0x00000000, 0x00000417) AM_RAM
- AM_RANGE(0x00000418, 0x0000041b) AM_READWRITE_LEGACY(spi_layer_bank_r, spi_layer_bank_w)
+ AM_RANGE(0x00000418, 0x0000041b) AM_READWRITE(spi_layer_bank_r, spi_layer_bank_w)
AM_RANGE(0x0000041c, 0x0000041f) AM_READNOP
- AM_RANGE(0x0000041c, 0x0000041f) AM_WRITE_LEGACY(spi_layer_enable_w)
+ AM_RANGE(0x0000041c, 0x0000041f) AM_WRITE(spi_layer_enable_w)
AM_RANGE(0x00000420, 0x0000042b) AM_RAM AM_BASE(m_spi_scrollram)
- AM_RANGE(0x00000480, 0x00000483) AM_WRITE_LEGACY(tilemap_dma_start_w)
- AM_RANGE(0x00000484, 0x00000487) AM_WRITE_LEGACY(palette_dma_start_w)
- AM_RANGE(0x00000490, 0x00000493) AM_WRITE_LEGACY(video_dma_length_w)
- AM_RANGE(0x00000494, 0x00000497) AM_WRITE_LEGACY(video_dma_address_w)
- AM_RANGE(0x0000050c, 0x0000050f) AM_WRITE_LEGACY(sprite_dma_start_w)
+ AM_RANGE(0x00000480, 0x00000483) AM_WRITE(tilemap_dma_start_w)
+ AM_RANGE(0x00000484, 0x00000487) AM_WRITE(palette_dma_start_w)
+ AM_RANGE(0x00000490, 0x00000493) AM_WRITE(video_dma_length_w)
+ AM_RANGE(0x00000494, 0x00000497) AM_WRITE(video_dma_address_w)
+ AM_RANGE(0x0000050c, 0x0000050f) AM_WRITE(sprite_dma_start_w)
AM_RANGE(0x00000600, 0x00000603) AM_READ_LEGACY(spi_int_r) /* Unknown */
AM_RANGE(0x00000604, 0x00000607) AM_READ_LEGACY(spi_controls1_r) /* Player controls */
AM_RANGE(0x00000608, 0x0000060b) AM_READ_LEGACY(spi_unknown_r)
@@ -1166,11 +1166,11 @@ static ADDRESS_MAP_START( sys386f2_map, AS_PROGRAM, 32, seibuspi_state )
AM_RANGE(0x00000400, 0x00000403) AM_READNOP AM_WRITE_LEGACY(input_select_w)
AM_RANGE(0x00000404, 0x00000407) AM_DEVWRITE_LEGACY("eeprom", sys386f2_eeprom_w)
AM_RANGE(0x00000408, 0x0000040f) AM_DEVWRITE8_LEGACY("ymz", ymz280b_w, 0x000000ff)
- AM_RANGE(0x00000484, 0x00000487) AM_WRITE_LEGACY(palette_dma_start_w)
- AM_RANGE(0x00000490, 0x00000493) AM_WRITE_LEGACY(video_dma_length_w)
- AM_RANGE(0x00000494, 0x00000497) AM_WRITE_LEGACY(video_dma_address_w)
+ AM_RANGE(0x00000484, 0x00000487) AM_WRITE(palette_dma_start_w)
+ AM_RANGE(0x00000490, 0x00000493) AM_WRITE(video_dma_length_w)
+ AM_RANGE(0x00000494, 0x00000497) AM_WRITE(video_dma_address_w)
AM_RANGE(0x00000500, 0x0000054f) AM_RAM /* Unknown */
- AM_RANGE(0x00000560, 0x00000563) AM_WRITE_LEGACY(sprite_dma_start_w)
+ AM_RANGE(0x00000560, 0x00000563) AM_WRITE(sprite_dma_start_w)
AM_RANGE(0x00000600, 0x00000607) AM_DEVREAD8_LEGACY("ymz", ymz280b_r, 0x000000ff)
AM_RANGE(0x00000608, 0x0000060b) AM_READ_LEGACY(spi_unknown_r)
AM_RANGE(0x0000060c, 0x0000060f) AM_READ_LEGACY(spi_controls1_r) /* Player controls */
@@ -2160,7 +2160,7 @@ static void init_rf2(running_machine &machine)
seibuspi_rise10_bg_decrypt(machine.region("gfx2")->base(), machine.region("gfx2")->bytes());
seibuspi_rise10_sprite_decrypt(machine.region("gfx3")->base(), 0x600000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x560, 0x563, FUNC(sprite_dma_start_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x560, 0x563, write32_delegate(FUNC(seibuspi_state::sprite_dma_start_w),state));
}
static DRIVER_INIT( rdft2 )
@@ -2185,7 +2185,7 @@ static void init_rfjet(running_machine &machine)
seibuspi_rise11_bg_decrypt(machine.region("gfx2")->base(), machine.region("gfx2")->bytes());
seibuspi_rise11_sprite_decrypt_rfjet(machine.region("gfx3")->base(), 0x800000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x560, 0x563, FUNC(sprite_dma_start_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x560, 0x563, write32_delegate(FUNC(seibuspi_state::sprite_dma_start_w),state));
}
static DRIVER_INIT( rfjet )
diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c
index ab2bc6f34b9..5cf3ef3cbb1 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -115,10 +115,10 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, seicross_state )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x8820, 0x887f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(seicross_videoram_w) AM_BASE(m_videoram) /* video RAM */
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(seicross_videoram_w) AM_BASE(m_videoram) /* video RAM */
AM_RANGE(0x9800, 0x981f) AM_RAM AM_BASE(m_row_scroll)
AM_RANGE(0x9880, 0x989f) AM_WRITEONLY AM_BASE_SIZE(m_spriteram2, m_spriteram2_size)
- AM_RANGE(0x9c00, 0x9fff) AM_RAM_WRITE_LEGACY(seicross_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x9c00, 0x9fff) AM_RAM_WRITE(seicross_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0") /* IN0 */
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN1") /* IN1 */
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("TEST") /* test */
diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c
index 218a15ef547..8ab6bc469b4 100644
--- a/src/mame/drivers/senjyo.c
+++ b/src/mame/drivers/senjyo.c
@@ -130,15 +130,15 @@ WRITE8_MEMBER(senjyo_state::senjyo_paletteram_w)
static ADDRESS_MAP_START( senjyo_map, AS_PROGRAM, 8, senjyo_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(senjyo_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE_LEGACY(senjyo_fgcolorram_w) AM_BASE(m_fgcolorram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(senjyo_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE(senjyo_fgcolorram_w) AM_BASE(m_fgcolorram)
AM_RANGE(0x9800, 0x987f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x9c00, 0x9dff) AM_RAM_WRITE(senjyo_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x9e00, 0x9e1f) AM_RAM AM_BASE(m_fgscroll)
AM_RANGE(0x9e20, 0x9e21) AM_RAM AM_BASE(m_scrolly3)
/* AM_RANGE(0x9e22, 0x9e23) height of the layer (Senjyo only, fixed at 0x380) */
AM_RANGE(0x9e25, 0x9e25) AM_RAM AM_BASE(m_scrollx3)
- AM_RANGE(0x9e27, 0x9e27) AM_RAM_WRITE_LEGACY(senjyo_bgstripes_w) AM_BASE(m_bgstripesram) /* controls width of background stripes */
+ AM_RANGE(0x9e27, 0x9e27) AM_RAM_WRITE(senjyo_bgstripes_w) AM_BASE(m_bgstripesram) /* controls width of background stripes */
AM_RANGE(0x9e28, 0x9e29) AM_RAM AM_BASE(m_scrolly2)
/* AM_RANGE(0x9e2a, 0x9e2b) height of the layer (Senjyo only, fixed at 0x200) */
AM_RANGE(0x9e2d, 0x9e2d) AM_RAM AM_BASE(m_scrollx2)
@@ -148,9 +148,9 @@ static ADDRESS_MAP_START( senjyo_map, AS_PROGRAM, 8, senjyo_state )
/* AM_RANGE(0x9e38, 0x9e38) probably radar y position (Senjyo only, fixed at 0x61) */
/* AM_RANGE(0x9e3d, 0x9e3d) probably radar x position (Senjyo only, 0x00/0xc0 depending on screen flip) */
AM_RANGE(0x9e00, 0x9e3f) AM_RAM
- AM_RANGE(0xa000, 0xa7ff) AM_RAM_WRITE_LEGACY(senjyo_bg3videoram_w) AM_BASE(m_bg3videoram)
- AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE_LEGACY(senjyo_bg2videoram_w) AM_BASE(m_bg2videoram)
- AM_RANGE(0xb000, 0xb7ff) AM_RAM_WRITE_LEGACY(senjyo_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0xa000, 0xa7ff) AM_RAM_WRITE(senjyo_bg3videoram_w) AM_BASE(m_bg3videoram)
+ AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE(senjyo_bg2videoram_w) AM_BASE(m_bg2videoram)
+ AM_RANGE(0xb000, 0xb7ff) AM_RAM_WRITE(senjyo_bg1videoram_w) AM_BASE(m_bg1videoram)
AM_RANGE(0xb800, 0xbbff) AM_RAM AM_BASE(m_radarram)
AM_RANGE(0xd000, 0xd000) AM_READ_PORT("P1") AM_WRITE(flip_screen_w)
AM_RANGE(0xd001, 0xd001) AM_READ_PORT("P2")
@@ -198,8 +198,8 @@ WRITE8_MEMBER(senjyo_state::starforb_scrollx2)
static ADDRESS_MAP_START( starforb_map, AS_PROGRAM, 8, senjyo_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(senjyo_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE_LEGACY(senjyo_fgcolorram_w) AM_BASE(m_fgcolorram)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(senjyo_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE(senjyo_fgcolorram_w) AM_BASE(m_fgcolorram)
AM_RANGE(0x9800, 0x987f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x9c00, 0x9dff) AM_RAM_WRITE(senjyo_paletteram_w) AM_SHARE("paletteram")
/* The format / use of the ram here is different on the bootleg */
@@ -209,9 +209,9 @@ static ADDRESS_MAP_START( starforb_map, AS_PROGRAM, 8, senjyo_state )
AM_RANGE(0x9e35, 0x9e35) AM_RAM_WRITE(starforb_scrollx2) AM_BASE(m_scrollx2) // ok
AM_RANGE(0x9e00, 0x9e3f) AM_RAM
- AM_RANGE(0xa000, 0xa7ff) AM_RAM_WRITE_LEGACY(senjyo_bg3videoram_w) AM_BASE(m_bg3videoram)
- AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE_LEGACY(senjyo_bg2videoram_w) AM_BASE(m_bg2videoram)
- AM_RANGE(0xb000, 0xb7ff) AM_RAM_WRITE_LEGACY(senjyo_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0xa000, 0xa7ff) AM_RAM_WRITE(senjyo_bg3videoram_w) AM_BASE(m_bg3videoram)
+ AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE(senjyo_bg2videoram_w) AM_BASE(m_bg2videoram)
+ AM_RANGE(0xb000, 0xb7ff) AM_RAM_WRITE(senjyo_bg1videoram_w) AM_BASE(m_bg1videoram)
AM_RANGE(0xb800, 0xbbff) AM_RAM AM_BASE(m_radarram)
AM_RANGE(0xd000, 0xd000) AM_READ_PORT("P1") AM_WRITE(flip_screen_w)
AM_RANGE(0xd001, 0xd001) AM_READ_PORT("P2")
@@ -221,7 +221,7 @@ static ADDRESS_MAP_START( starforb_map, AS_PROGRAM, 8, senjyo_state )
/* these aren't used / written, left here to make sure memory is allocated */
AM_RANGE(0xfe00, 0xfe1f) AM_RAM AM_BASE(m_fgscroll)
- AM_RANGE(0xfe27, 0xfe27) AM_RAM_WRITE_LEGACY(senjyo_bgstripes_w) AM_BASE(m_bgstripesram) /* controls width of background stripes */
+ AM_RANGE(0xfe27, 0xfe27) AM_RAM_WRITE(senjyo_bgstripes_w) AM_BASE(m_bgstripesram) /* controls width of background stripes */
AM_RANGE(0xfe28, 0xfe29) AM_RAM AM_BASE(m_scrolly1)
AM_RANGE(0xfe2d, 0xfe2d) AM_RAM AM_BASE(m_scrollx1)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 9bbfb641793..5343a55024f 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -1611,12 +1611,12 @@ static ADDRESS_MAP_START( downtown_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0x200000, 0x200001) AM_NOP // watchdog? (twineagl)
AM_RANGE(0x300000, 0x300001) AM_WRITENOP // IRQ enable/acknowledge?
- AM_RANGE(0x400000, 0x400007) AM_WRITE_LEGACY(twineagl_tilebank_w) // special tile banking to animate water in twineagl
+ AM_RANGE(0x400000, 0x400007) AM_WRITE(twineagl_tilebank_w) // special tile banking to animate water in twineagl
AM_RANGE(0x500000, 0x500001) AM_WRITENOP // ?
AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x700000, 0x7003ff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0x800000, 0x800005) AM_WRITEONLY AM_BASE(m_vctrl_0)// VRAM Ctrl
- AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM
+ AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM
AM_RANGE(0xa00000, 0xa00007) AM_WRITE_LEGACY(sub_ctrl_w) // Sub CPU Control?
AM_RANGE(0xb00000, 0xb00fff) AM_READWRITE_LEGACY(sharedram_68000_r,sharedram_68000_w) // Shared RAM
AM_RANGE(0xc00000, 0xc00001) AM_WRITENOP // ? $4000
@@ -1677,7 +1677,7 @@ static ADDRESS_MAP_START( calibr50_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x700000, 0x7003ff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0x800000, 0x800005) AM_WRITEONLY AM_BASE(m_vctrl_0)// VRAM Ctrl
- AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM
+ AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM
AM_RANGE(0x904000, 0x904fff) AM_RAM //
AM_RANGE(0xa00000, 0xa00019) AM_READ_LEGACY(calibr50_ip_r) // Input Ports
@@ -1768,7 +1768,7 @@ static ADDRESS_MAP_START( usclssic_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0xb40018, 0xb40019) AM_WRITE(watchdog_reset16_w) // Watchdog
AM_RANGE(0xb80000, 0xb80001) AM_READNOP // Watchdog (value is discarded)?
AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
- AM_RANGE(0xd00000, 0xd03fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM
+ AM_RANGE(0xd00000, 0xd03fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM
AM_RANGE(0xd04000, 0xd04fff) AM_RAM //
AM_RANGE(0xe00000, 0xe00fff) AM_RAM // NVRAM? (odd bytes)
ADDRESS_MAP_END
@@ -1809,7 +1809,7 @@ static ADDRESS_MAP_START( blandia_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1
AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2
AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins
- AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // (gundhara) Coin Lockout + Video Registers
+ AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // (gundhara) Coin Lockout + Video Registers
AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x700000, 0x7003ff) AM_RAM // (rezon,jjsquawk)
AM_RANGE(0x700400, 0x700fff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
@@ -1820,9 +1820,9 @@ static ADDRESS_MAP_START( blandia_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x900000, 0x903fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
/**/AM_RANGE(0xa00000, 0xa00005) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
/**/AM_RANGE(0xa80000, 0xa80005) AM_RAM AM_BASE(m_vctrl_2) // VRAM 2&3 Ctrl
- AM_RANGE(0xb00000, 0xb03fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
+ AM_RANGE(0xb00000, 0xb03fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
AM_RANGE(0xb04000, 0xb0ffff) AM_RAM // (jjsquawk)
- AM_RANGE(0xb80000, 0xb83fff) AM_RAM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
+ AM_RANGE(0xb80000, 0xb83fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
AM_RANGE(0xb84000, 0xb8ffff) AM_RAM // (jjsquawk)
AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xd00000, 0xd00007) AM_WRITENOP // ?
@@ -1844,14 +1844,14 @@ static ADDRESS_MAP_START( blandiap_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1
AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2
AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins
- AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // (gundhara) Coin Lockout + Video Registers
+ AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // (gundhara) Coin Lockout + Video Registers
AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x700000, 0x7003ff) AM_RAM // (rezon,jjsquawk)
AM_RANGE(0x700400, 0x700fff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0x703c00, 0x7047ff) AM_RAM AM_BASE_SIZE(m_paletteram2, m_paletteram2_size) // 2nd Palette for the palette offset effect
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
AM_RANGE(0x804000, 0x80ffff) AM_RAM // (jjsquawk)
- AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
+ AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
AM_RANGE(0x884000, 0x88ffff) AM_RAM // (jjsquawk)
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
/**/AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE(m_vctrl_2) // VRAM 2&3 Ctrl
@@ -1926,15 +1926,15 @@ static ADDRESS_MAP_START( wrofaero_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1
AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2
AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins
- AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // (gundhara) Coin Lockout + Video Registers
+ AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // (gundhara) Coin Lockout + Video Registers
AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x700000, 0x7003ff) AM_RAM // (rezon,jjsquawk)
AM_RANGE(0x700400, 0x700fff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0x701000, 0x70ffff) AM_RAM //
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
AM_RANGE(0x804000, 0x80ffff) AM_RAM // (jjsquawk)
- AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
+ AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
AM_RANGE(0x884000, 0x88ffff) AM_RAM // (jjsquawk)
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
/**/AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE(m_vctrl_2) // VRAM 2&3 Ctrl
@@ -1966,15 +1966,15 @@ static ADDRESS_MAP_START( zingzipbl_map, AS_PROGRAM, 16, seta_state )
// AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2
AM_RANGE(0x400002, 0x400003) AM_READ_LEGACY(zingzipbl_unknown_r) // P2
// AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins
- AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // (gundhara) Coin Lockout + Video Registers
+ AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // (gundhara) Coin Lockout + Video Registers
//AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x700000, 0x7003ff) AM_RAM // (rezon,jjsquawk)
AM_RANGE(0x700400, 0x700fff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0x701000, 0x70ffff) AM_RAM //
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
AM_RANGE(0x804000, 0x80ffff) AM_RAM // (jjsquawk)
- AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
+ AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
AM_RANGE(0x884000, 0x88ffff) AM_RAM // (jjsquawk)
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
@@ -2003,14 +2003,14 @@ static ADDRESS_MAP_START( jjsquawb_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1
AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2
AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins
- AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // (gundhara) Coin Lockout + Video Registers
+ AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // (gundhara) Coin Lockout + Video Registers
AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x700000, 0x70b3ff) AM_RAM // RZ: (rezon,jjsquawk)
AM_RANGE(0x70b400, 0x70bfff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0x70c000, 0x70ffff) AM_RAM //
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0
- AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0
+ AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2
AM_RANGE(0x884000, 0x88ffff) AM_RAM // (jjsquawk)
AM_RANGE(0x908000, 0x908005) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
AM_RANGE(0x909000, 0x909005) AM_RAM AM_BASE(m_vctrl_2) // VRAM 2&3 Ctrl
@@ -2159,7 +2159,7 @@ static ADDRESS_MAP_START( blockcar_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x100000, 0x100001) AM_WRITENOP // ? 1 (start of interrupts, main loop: watchdog?)
AM_RANGE(0x200000, 0x200001) AM_WRITENOP // ? 0/1 (IRQ acknowledge?)
AM_RANGE(0x300000, 0x300003) AM_READ_LEGACY(seta_dsw_r) // DSW
- AM_RANGE(0x400000, 0x400001) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Sound Enable (bit 4?)
+ AM_RANGE(0x400000, 0x400001) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Sound Enable (bit 4?)
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2
AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins
@@ -2182,15 +2182,15 @@ static ADDRESS_MAP_START( daioh_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1
AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2
AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins
- AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Video Registers
+ AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Video Registers
AM_RANGE(0x500006, 0x500007) AM_READ_PORT("EXTRA") // Buttons 4,5,6
AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r ) // DSW
AM_RANGE(0x700000, 0x7003ff) AM_RAM
AM_RANGE(0x700400, 0x700fff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0x701000, 0x70ffff) AM_RAM //
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0 ) // VRAM 0&1
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0 ) // VRAM 0&1
AM_RANGE(0x804000, 0x80ffff) AM_RAM //
- AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2 ) // VRAM 2&3
+ AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2 ) // VRAM 2&3
AM_RANGE(0x884000, 0x88ffff) AM_RAM //
AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE(m_vctrl_2) // VRAM 2&3 Ctrl
@@ -2216,11 +2216,11 @@ static ADDRESS_MAP_START( drgnunit_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0x200000, 0x200001) AM_WRITENOP // Watchdog
AM_RANGE(0x300000, 0x300001) AM_WRITENOP // ? IRQ Ack
- AM_RANGE(0x500000, 0x500001) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Video Registers
+ AM_RANGE(0x500000, 0x500001) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Video Registers
AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x700000, 0x7003ff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0x800000, 0x800005) AM_RAM AM_BASE(m_vctrl_0) // VRAM Ctrl
- AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0 ) // VRAM
+ AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0 ) // VRAM
AM_RANGE(0x904000, 0x90ffff) AM_WRITENOP // unused (qzkklogy)
AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1") // P1
AM_RANGE(0xb00002, 0xb00003) AM_READ_PORT("P2") // P2
@@ -2294,7 +2294,7 @@ static ADDRESS_MAP_START( setaroul_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0xdc0000, 0xdc3fff) AM_RAM
- AM_RANGE(0xe00000, 0xe03fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0 ) // VRAM - draws wheel if you reset enough times..
+ AM_RANGE(0xe00000, 0xe03fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0 ) // VRAM - draws wheel if you reset enough times..
AM_RANGE(0xe40000, 0xe40005) AM_RAM AM_BASE(m_vctrl_0) // VRAM Ctrl
AM_RANGE(0xf00000, 0xf03fff) AM_READWRITE_LEGACY(setaroul_spritecode_r, setaroul_spritecode_w)
AM_RANGE(0xf40000, 0xf40bff) AM_WRITE_LEGACY(setaroul_spriteylow_w)
@@ -2316,13 +2316,13 @@ static ADDRESS_MAP_START( extdwnhl_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins
AM_RANGE(0x400008, 0x40000b) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x40000c, 0x40000d) AM_READWRITE(watchdog_reset16_r,watchdog_reset16_w) // Watchdog (extdwnhl (R) & sokonuke (W) MUST RETURN $FFFF)
- AM_RANGE(0x500000, 0x500003) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Video Registers
+ AM_RANGE(0x500000, 0x500003) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Video Registers
AM_RANGE(0x500004, 0x500007) AM_NOP // IRQ Ack (extdwnhl (R) & sokonuke (W))
AM_RANGE(0x600400, 0x600fff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0x601000, 0x610bff) AM_RAM //
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
AM_RANGE(0x804000, 0x80ffff) AM_RAM //
- AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
+ AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
AM_RANGE(0x884000, 0x88ffff) AM_RAM //
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
/**/AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE(m_vctrl_2) // VRAM 2&3 Ctrl
@@ -2347,14 +2347,14 @@ static ADDRESS_MAP_START( kamenrid_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x500004, 0x500007) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x500008, 0x500009) AM_READ_PORT("COINS") // Coins
AM_RANGE(0x50000c, 0x50000d) AM_READWRITE(watchdog_reset16_r,watchdog_reset16_w) // xx Watchdog? (sokonuke)
- AM_RANGE(0x600000, 0x600005) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // ? Coin Lockout + Video Registers
+ AM_RANGE(0x600000, 0x600005) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // ? Coin Lockout + Video Registers
AM_RANGE(0x600006, 0x600007) AM_WRITENOP // ?
AM_RANGE(0x700000, 0x7003ff) AM_RAM // Palette RAM (tested)
AM_RANGE(0x700400, 0x700fff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0x701000, 0x703fff) AM_RAM // Palette
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0 ) // VRAM 0&1
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0 ) // VRAM 0&1
AM_RANGE(0x804000, 0x807fff) AM_RAM // tested
- AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2 ) // VRAM 2&3
+ AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2 ) // VRAM 2&3
AM_RANGE(0x884000, 0x887fff) AM_RAM // tested
AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE(m_vctrl_2) // VRAM 2&3 Ctrl
@@ -2380,11 +2380,11 @@ static ADDRESS_MAP_START( madshark_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins
AM_RANGE(0x500008, 0x50000b) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x50000c, 0x50000d) AM_WRITE(watchdog_reset16_w) // Watchdog
- AM_RANGE(0x600000, 0x600005) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // ? Coin Lockout + Video Registers
+ AM_RANGE(0x600000, 0x600005) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // ? Coin Lockout + Video Registers
AM_RANGE(0x600006, 0x600007) AM_WRITENOP // ?
AM_RANGE(0x700400, 0x700fff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
- AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
+ AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE(m_vctrl_2) // VRAM 2&3 Ctrl
@@ -2457,13 +2457,14 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( msgundam_vregs_w )
{
+ seta_state *state = space->machine().driver_data<seta_state>();
// swap $500002 with $500004
switch( offset )
{
case 1: offset = 2; break;
case 2: offset = 1; break;
- }
- seta_vregs_w(space,offset,data,mem_mask);
+ }
+ state->seta_vregs_w(*space,offset,data,mem_mask);
}
/* Mirror RAM is necessary or startup, to clear Work RAM after the test */
@@ -2484,8 +2485,8 @@ static ADDRESS_MAP_START( msgundam_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x800600, 0x800607) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0x880000, 0x880001) AM_RAM // ? 0x4000
AM_RANGE(0x900000, 0x903fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
- AM_RANGE(0xa00000, 0xa03fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
- AM_RANGE(0xa80000, 0xa83fff) AM_RAM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
+ AM_RANGE(0xa00000, 0xa03fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
+ AM_RANGE(0xa80000, 0xa83fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
AM_RANGE(0xb00000, 0xb00005) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
AM_RANGE(0xb80000, 0xb80005) AM_RAM AM_BASE(m_vctrl_2) // VRAM 2&3 Ctrl
AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
@@ -2511,10 +2512,10 @@ static ADDRESS_MAP_START( oisipuzl_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2
AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins
AM_RANGE(0x400000, 0x400001) AM_WRITENOP // ? IRQ Ack
- AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Video Registers
+ AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Video Registers
AM_RANGE(0x700000, 0x703fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
- AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
+ AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
/**/AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE(m_vctrl_2) // VRAM 2&3 Ctrl
/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
@@ -2540,10 +2541,10 @@ static ADDRESS_MAP_START( triplfun_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2
AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins
AM_RANGE(0x400000, 0x400001) AM_WRITENOP // ? IRQ Ack
- AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Video Registers
+ AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Video Registers
AM_RANGE(0x500006, 0x500007) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) // tfun sound
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
- AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
+ AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
/**/AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE(m_vctrl_2) // VRAM 2&3 Ctrl
/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
@@ -2634,7 +2635,7 @@ static ADDRESS_MAP_START( thunderl_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x200000, 0x200001) AM_WRITENOP // ?
AM_RANGE(0x300000, 0x300001) AM_WRITENOP // ?
AM_RANGE(0x400000, 0x40ffff) AM_WRITE_LEGACY(thunderl_protection_w) // Protection (not in wits)
- AM_RANGE(0x500000, 0x500001) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout
+ AM_RANGE(0x500000, 0x500001) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout
AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x700000, 0x7003ff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1") // P1
@@ -2658,7 +2659,7 @@ static ADDRESS_MAP_START( thunderlbl_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x200000, 0x200001) AM_WRITENOP // ?
AM_RANGE(0x300000, 0x300001) AM_WRITENOP // ?
// AM_RANGE(0x400000, 0x40ffff) AM_WRITE_LEGACY(thunderl_protection_w) // Protection (not in wits)
- AM_RANGE(0x500000, 0x500001) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout
+ AM_RANGE(0x500000, 0x500001) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout
AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x700000, 0x7003ff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1") // P1
@@ -2700,7 +2701,7 @@ static ADDRESS_MAP_START( wiggie_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x200000, 0x200001) AM_WRITENOP // ?
AM_RANGE(0x300000, 0x300001) AM_WRITENOP // ?
AM_RANGE(0x400000, 0x40ffff) AM_WRITE_LEGACY(thunderl_protection_w) // Protection (not in wits)
- AM_RANGE(0x500000, 0x500001) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout
+ AM_RANGE(0x500000, 0x500001) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout
AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x700000, 0x7003ff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1") // P1
@@ -2738,7 +2739,7 @@ static ADDRESS_MAP_START( umanclub_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins
AM_RANGE(0x400000, 0x400001) AM_WRITENOP // ? (end of lev 2)
AM_RANGE(0x400004, 0x400005) AM_WRITENOP // ? (end of lev 2)
- AM_RANGE(0x500000, 0x500001) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Video Registers
+ AM_RANGE(0x500000, 0x500001) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Video Registers
AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritectrl_r16, spritectrl_w16)
@@ -2768,11 +2769,11 @@ static ADDRESS_MAP_START( utoukond_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1
AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2
AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins
- AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // ? Coin Lockout + Video Registers
+ AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // ? Coin Lockout + Video Registers
AM_RANGE(0x600000, 0x600003) AM_READ_LEGACY(seta_dsw_r) // DSW
AM_RANGE(0x700400, 0x700fff) AM_RAM AM_BASE_SIZE(m_paletteram, m_paletteram_size) // Palette
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
- AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
+ AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2&3
AM_RANGE(0x900000, 0x900005) AM_WRITEONLY AM_BASE(m_vctrl_0)// VRAM 0&1 Ctrl
AM_RANGE(0x980000, 0x980005) AM_WRITEONLY AM_BASE(m_vctrl_2)// VRAM 2&3 Ctrl
AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
@@ -2810,7 +2811,7 @@ static ADDRESS_MAP_START( pairlove_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x100000, 0x100001) AM_WRITENOP // ? 1 (start of interrupts, main loop: watchdog?)
AM_RANGE(0x200000, 0x200001) AM_WRITENOP // ? 0/1 (IRQ acknowledge?)
AM_RANGE(0x300000, 0x300003) AM_READ_LEGACY(seta_dsw_r) // DSW
- AM_RANGE(0x400000, 0x400001) AM_RAM_WRITE_LEGACY(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Sound Enable (bit 4?)
+ AM_RANGE(0x400000, 0x400001) AM_RAM_WRITE(seta_vregs_w) AM_BASE(m_vregs) // Coin Lockout + Sound Enable (bit 4?)
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2
AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins
@@ -2842,8 +2843,8 @@ static ADDRESS_MAP_START( crazyfgt_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x650000, 0x650003) AM_DEVWRITE8_LEGACY("ymsnd", ym3812_w, 0x00ff)
AM_RANGE(0x658000, 0x658001) AM_DEVWRITE8("oki", okim6295_device, write, 0x00ff)
AM_RANGE(0x670000, 0x670001) AM_READNOP // watchdog?
- AM_RANGE(0x800000, 0x803fff) AM_WRITE_LEGACY(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2
- AM_RANGE(0x880000, 0x883fff) AM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0
+ AM_RANGE(0x800000, 0x803fff) AM_WRITE(seta_vram_2_w) AM_BASE(m_vram_2) // VRAM 2
+ AM_RANGE(0x880000, 0x883fff) AM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0
AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE(m_vctrl_2) // VRAM 2&3 Ctrl
AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
@@ -2912,7 +2913,7 @@ static ADDRESS_MAP_START( inttoote_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r, seta_sound_word_w ) // Sound
AM_RANGE(0xa00000, 0xa00005) AM_WRITEONLY AM_BASE(m_vctrl_0 ) // VRAM 0&1 Ctrl
- AM_RANGE(0xb00000, 0xb03fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0 ) // VRAM 0&1
+ AM_RANGE(0xb00000, 0xb03fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0 ) // VRAM 0&1
AM_RANGE(0xc00000, 0xc00001) AM_RAM // ? 0x4000
@@ -2978,7 +2979,7 @@ static ADDRESS_MAP_START( jockeyc_map, AS_PROGRAM, 16, seta_state )
AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r, seta_sound_word_w) // Sound
AM_RANGE(0xa00000, 0xa00005) AM_WRITEONLY AM_BASE(m_vctrl_0) // VRAM 0&1 Ctrl
- AM_RANGE(0xb00000, 0xb03fff) AM_RAM_WRITE_LEGACY(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
+ AM_RANGE(0xb00000, 0xb03fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(m_vram_0) // VRAM 0&1
AM_RANGE(0xb04000, 0xb0ffff) AM_WRITENOP // likely left-over
AM_RANGE(0xc00000, 0xc00001) AM_RAM // ? 0x4000
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index 0dd6d9923ad..c318d14db6d 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( grdians_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc50000, 0xc5ffff) AM_RAM // cleared
- AM_RANGE(0xc60000, 0xc6003f) AM_WRITE_LEGACY(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
+ AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0xe00010, 0xe0001f) AM_WRITE_LEGACY(seta2_sound_bank_w) // Samples Banks
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
ADDRESS_MAP_END
@@ -204,7 +204,7 @@ static ADDRESS_MAP_START( gundamex_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc50000, 0xc5ffff) AM_RAM // cleared
- AM_RANGE(0xc60000, 0xc6003f) AM_WRITE_LEGACY(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
+ AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0xe00010, 0xe0001f) AM_WRITE_LEGACY(seta2_sound_bank_w) // Samples Banks
AM_RANGE(0xfffd0a, 0xfffd0b) AM_DEVREADWRITE_LEGACY("eeprom", gundamex_eeprom_r,gundamex_eeprom_w) // parallel data register
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
@@ -268,7 +268,7 @@ static ADDRESS_MAP_START( mj4simai_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0xc60000, 0xc6003f) AM_WRITE_LEGACY(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
+ AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
ADDRESS_MAP_END
@@ -291,7 +291,7 @@ static ADDRESS_MAP_START( myangel_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0xc60000, 0xc6003f) AM_WRITE_LEGACY(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
+ AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
ADDRESS_MAP_END
@@ -314,7 +314,7 @@ static ADDRESS_MAP_START( myangel2_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xd00000, 0xd3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xd40000, 0xd4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0xd60000, 0xd6003f) AM_WRITE_LEGACY(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
+ AM_RANGE(0xd60000, 0xd6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
ADDRESS_MAP_END
@@ -358,7 +358,7 @@ static ADDRESS_MAP_START( pzlbowl_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0x700000, 0x700001) AM_READ_LEGACY(pzlbowl_protection_r) // Protection
AM_RANGE(0x800000, 0x83ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x840000, 0x84ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0x860000, 0x86003f) AM_WRITE_LEGACY(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
+ AM_RANGE(0x860000, 0x86003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
ADDRESS_MAP_END
@@ -384,7 +384,7 @@ static ADDRESS_MAP_START( penbros_map, AS_PROGRAM, 16, seta2_state )
//AM_RANGE(0x700000, 0x700001) AM_READ_LEGACY(pzlbowl_protection_r) // Protection
AM_RANGE(0xb00000, 0xb3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xb40000, 0xb4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0xb60000, 0xb6003f) AM_WRITE_LEGACY(seta2_vregs_w) AM_BASE(m_vregs)
+ AM_RANGE(0xb60000, 0xb6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs)
AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
ADDRESS_MAP_END
@@ -443,7 +443,7 @@ static ADDRESS_MAP_START( reelquak_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0xc60000, 0xc6003f) AM_WRITE_LEGACY(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
+ AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0xfffd0a, 0xfffd0b) AM_WRITE_LEGACY(reelquak_leds_w ) // parallel data register (leds)
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
ADDRESS_MAP_END
@@ -458,7 +458,7 @@ static ADDRESS_MAP_START( namcostr_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE(0xc60000, 0xc6003f) AM_WRITE_LEGACY(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
+ AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
ADDRESS_MAP_END
@@ -500,7 +500,7 @@ static ADDRESS_MAP_START( samshoot_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE( 0x800000, 0x83ffff ) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE( 0x840000, 0x84ffff ) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
- AM_RANGE( 0x860000, 0x86003f ) AM_WRITE_LEGACY(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
+ AM_RANGE( 0x860000, 0x86003f ) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE( 0x900000, 0x903fff ) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r, seta_sound_word_w ) // Sound
@@ -633,7 +633,7 @@ static ADDRESS_MAP_START( funcube_map, AS_PROGRAM, 32, seta2_state )
AM_RANGE( 0x00800000, 0x0083ffff ) AM_READWRITE16_LEGACY(spriteram16_word_r, spriteram16_word_w, 0xffffffff ) AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE( 0x00840000, 0x0084ffff ) AM_RAM_WRITE_LEGACY(paletteram32_dword_w) AM_SHARE("paletteram")
- AM_RANGE( 0x00860000, 0x0086003f ) AM_WRITE16_LEGACY(seta2_vregs_w, 0xffffffff ) AM_BASE(m_vregs)
+ AM_RANGE( 0x00860000, 0x0086003f ) AM_WRITE16(seta2_vregs_w, 0xffffffff ) AM_BASE(m_vregs)
AM_RANGE( 0x00c00000, 0x00c002ff ) AM_READWRITE_LEGACY(funcube_nvram_dword_r, funcube_nvram_dword_w )
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index 470f6af1cc8..753616a6aa3 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -115,8 +115,8 @@ WRITE16_MEMBER(sf_state::protection_w)
space.write_word(0xffc00c, 0xc0);
space.write_word(0xffc00e, 0);
- sf_fg_scroll_w(&space, 0, d1, 0xffff);
- sf_bg_scroll_w(&space, 0, d2, 0xffff);
+ sf_fg_scroll_w(space, 0, d1, 0xffff);
+ sf_bg_scroll_w(space, 0, d2, 0xffff);
break;
}
case 4:
@@ -140,7 +140,7 @@ WRITE16_MEMBER(sf_state::protection_w)
}
space.write_word(0xffc682, d1);
space.write_word(0xffc00e, off);
- sf_bg_scroll_w(&space, 0, d1, 0xffff);
+ sf_bg_scroll_w(space, 0, d1, 0xffff);
}
break;
}
@@ -190,7 +190,7 @@ static WRITE8_DEVICE_HANDLER( msm5205_w )
static ADDRESS_MAP_START( sf_map, AS_PROGRAM, 16, sf_state )
AM_RANGE(0x000000, 0x04ffff) AM_ROM
- AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE_LEGACY(sf_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(sf_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("COINS")
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN0")
@@ -201,9 +201,9 @@ static ADDRESS_MAP_START( sf_map, AS_PROGRAM, 16, sf_state )
AM_RANGE(0xc0000c, 0xc0000d) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc0000e, 0xc0000f) AM_READ(dummy_r)
AM_RANGE(0xc00010, 0xc00011) AM_WRITE(sf_coin_w)
- AM_RANGE(0xc00014, 0xc00015) AM_WRITE_LEGACY(sf_fg_scroll_w)
- AM_RANGE(0xc00018, 0xc00019) AM_WRITE_LEGACY(sf_bg_scroll_w)
- AM_RANGE(0xc0001a, 0xc0001b) AM_WRITE_LEGACY(sf_gfxctrl_w)
+ AM_RANGE(0xc00014, 0xc00015) AM_WRITE(sf_fg_scroll_w)
+ AM_RANGE(0xc00018, 0xc00019) AM_WRITE(sf_bg_scroll_w)
+ AM_RANGE(0xc0001a, 0xc0001b) AM_WRITE(sf_gfxctrl_w)
AM_RANGE(0xc0001c, 0xc0001d) AM_WRITE(soundcmd_w)
// AM_RANGE(0xc0001e, 0xc0001f) AM_WRITE(protection_w)
AM_RANGE(0xff8000, 0xffdfff) AM_RAM
@@ -212,7 +212,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sfus_map, AS_PROGRAM, 16, sf_state )
AM_RANGE(0x000000, 0x04ffff) AM_ROM
- AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE_LEGACY(sf_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(sf_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0")
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1")
@@ -223,9 +223,9 @@ static ADDRESS_MAP_START( sfus_map, AS_PROGRAM, 16, sf_state )
AM_RANGE(0xc0000c, 0xc0000d) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc0000e, 0xc0000f) AM_READ(dummy_r)
AM_RANGE(0xc00010, 0xc00011) AM_WRITE(sf_coin_w)
- AM_RANGE(0xc00014, 0xc00015) AM_WRITE_LEGACY(sf_fg_scroll_w)
- AM_RANGE(0xc00018, 0xc00019) AM_WRITE_LEGACY(sf_bg_scroll_w)
- AM_RANGE(0xc0001a, 0xc0001b) AM_WRITE_LEGACY(sf_gfxctrl_w)
+ AM_RANGE(0xc00014, 0xc00015) AM_WRITE(sf_fg_scroll_w)
+ AM_RANGE(0xc00018, 0xc00019) AM_WRITE(sf_bg_scroll_w)
+ AM_RANGE(0xc0001a, 0xc0001b) AM_WRITE(sf_gfxctrl_w)
AM_RANGE(0xc0001c, 0xc0001d) AM_WRITE(soundcmd_w)
// AM_RANGE(0xc0001e, 0xc0001f) AM_WRITE(protection_w)
AM_RANGE(0xff8000, 0xffdfff) AM_RAM
@@ -234,7 +234,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sfjp_map, AS_PROGRAM, 16, sf_state )
AM_RANGE(0x000000, 0x04ffff) AM_ROM
- AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE_LEGACY(sf_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(sf_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("COINS")
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("P1")
@@ -245,9 +245,9 @@ static ADDRESS_MAP_START( sfjp_map, AS_PROGRAM, 16, sf_state )
AM_RANGE(0xc0000c, 0xc0000d) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc0000e, 0xc0000f) AM_READ(dummy_r)
AM_RANGE(0xc00010, 0xc00011) AM_WRITE(sf_coin_w)
- AM_RANGE(0xc00014, 0xc00015) AM_WRITE_LEGACY(sf_fg_scroll_w)
- AM_RANGE(0xc00018, 0xc00019) AM_WRITE_LEGACY(sf_bg_scroll_w)
- AM_RANGE(0xc0001a, 0xc0001b) AM_WRITE_LEGACY(sf_gfxctrl_w)
+ AM_RANGE(0xc00014, 0xc00015) AM_WRITE(sf_fg_scroll_w)
+ AM_RANGE(0xc00018, 0xc00019) AM_WRITE(sf_bg_scroll_w)
+ AM_RANGE(0xc0001a, 0xc0001b) AM_WRITE(sf_gfxctrl_w)
AM_RANGE(0xc0001c, 0xc0001d) AM_WRITE(soundcmd_w)
AM_RANGE(0xc0001e, 0xc0001f) AM_WRITE(protection_w)
AM_RANGE(0xff8000, 0xffdfff) AM_RAM
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 867ba2faf90..90b801fba30 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -363,17 +363,17 @@ static TIMER_DEVICE_CALLBACK( shadfrce_scanline )
static ADDRESS_MAP_START( shadfrce_map, AS_PROGRAM, 16, shadfrce_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE_LEGACY(shadfrce_bg0videoram_w) AM_BASE(m_bg0videoram) /* video */
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(shadfrce_bg0videoram_w) AM_BASE(m_bg0videoram) /* video */
AM_RANGE(0x101000, 0x101fff) AM_RAM
- AM_RANGE(0x102000, 0x1027ff) AM_RAM_WRITE_LEGACY(shadfrce_bg1videoram_w) AM_BASE(m_bg1videoram) /* bg 2 */
+ AM_RANGE(0x102000, 0x1027ff) AM_RAM_WRITE(shadfrce_bg1videoram_w) AM_BASE(m_bg1videoram) /* bg 2 */
AM_RANGE(0x102800, 0x103fff) AM_RAM
- AM_RANGE(0x140000, 0x141fff) AM_RAM_WRITE_LEGACY(shadfrce_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0x140000, 0x141fff) AM_RAM_WRITE(shadfrce_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0x142000, 0x143fff) AM_RAM AM_BASE(m_spvideoram) AM_SIZE(m_spvideoram_size) /* sprites */
AM_RANGE(0x180000, 0x187fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x1c0000, 0x1c0001) AM_WRITE_LEGACY(shadfrce_bg0scrollx_w) /* SCROLL X */
- AM_RANGE(0x1c0002, 0x1c0003) AM_WRITE_LEGACY(shadfrce_bg0scrolly_w) /* SCROLL Y */
- AM_RANGE(0x1c0004, 0x1c0005) AM_WRITE_LEGACY(shadfrce_bg1scrollx_w) /* SCROLL X */
- AM_RANGE(0x1c0006, 0x1c0007) AM_WRITE_LEGACY(shadfrce_bg1scrolly_w) /* SCROLL Y */
+ AM_RANGE(0x1c0000, 0x1c0001) AM_WRITE(shadfrce_bg0scrollx_w) /* SCROLL X */
+ AM_RANGE(0x1c0002, 0x1c0003) AM_WRITE(shadfrce_bg0scrolly_w) /* SCROLL Y */
+ AM_RANGE(0x1c0004, 0x1c0005) AM_WRITE(shadfrce_bg1scrollx_w) /* SCROLL X */
+ AM_RANGE(0x1c0006, 0x1c0007) AM_WRITE(shadfrce_bg1scrolly_w) /* SCROLL Y */
AM_RANGE(0x1c0008, 0x1c0009) AM_WRITENOP /* ?? */
AM_RANGE(0x1c000a, 0x1c000b) AM_READNOP AM_WRITE(shadfrce_flip_screen)
AM_RANGE(0x1c000c, 0x1c000d) AM_WRITENOP /* ?? */
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index f96006c7362..02a74d383ff 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -121,7 +121,7 @@ static ADDRESS_MAP_START( shangha3_map, AS_PROGRAM, 16, shangha3_state )
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x200000, 0x200001) AM_READ_PORT("INPUTS")
AM_RANGE(0x200002, 0x200003) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x200008, 0x200009) AM_WRITE_LEGACY(shangha3_blitter_go_w)
+ AM_RANGE(0x200008, 0x200009) AM_WRITE(shangha3_blitter_go_w)
AM_RANGE(0x20000a, 0x20000b) AM_WRITENOP /* irq ack? */
AM_RANGE(0x20000c, 0x20000d) AM_WRITE(shangha3_coinctrl_w)
AM_RANGE(0x20001e, 0x20001f) AM_DEVREAD8_LEGACY("aysnd", ay8910_r, 0x00ff)
@@ -130,8 +130,8 @@ static ADDRESS_MAP_START( shangha3_map, AS_PROGRAM, 16, shangha3_state )
AM_RANGE(0x20004e, 0x20004f) AM_READWRITE(shangha3_prot_r,shangha3_prot_w)
AM_RANGE(0x20006e, 0x20006f) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x300000, 0x30ffff) AM_RAM AM_BASE_SIZE(m_ram, m_ram_size) /* gfx & work ram */
- AM_RANGE(0x340000, 0x340001) AM_WRITE_LEGACY(shangha3_flipscreen_w)
- AM_RANGE(0x360000, 0x360001) AM_WRITE_LEGACY(shangha3_gfxlist_addr_w)
+ AM_RANGE(0x340000, 0x340001) AM_WRITE(shangha3_flipscreen_w)
+ AM_RANGE(0x360000, 0x360001) AM_WRITE(shangha3_gfxlist_addr_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( heberpop_map, AS_PROGRAM, 16, shangha3_state )
@@ -140,13 +140,13 @@ static ADDRESS_MAP_START( heberpop_map, AS_PROGRAM, 16, shangha3_state )
AM_RANGE(0x200000, 0x200001) AM_READ_PORT("INPUTS")
AM_RANGE(0x200002, 0x200003) AM_READ_PORT("SYSTEM")
AM_RANGE(0x200004, 0x200005) AM_READ_PORT("DSW")
- AM_RANGE(0x200008, 0x200009) AM_WRITE_LEGACY(shangha3_blitter_go_w)
+ AM_RANGE(0x200008, 0x200009) AM_WRITE(shangha3_blitter_go_w)
AM_RANGE(0x20000a, 0x20000b) AM_WRITENOP /* irq ack? */
AM_RANGE(0x20000c, 0x20000d) AM_WRITE(heberpop_coinctrl_w)
AM_RANGE(0x20000e, 0x20000f) AM_WRITE(heberpop_sound_command_w)
AM_RANGE(0x300000, 0x30ffff) AM_RAM AM_BASE_SIZE(m_ram, m_ram_size) /* gfx & work ram */
- AM_RANGE(0x340000, 0x340001) AM_WRITE_LEGACY(shangha3_flipscreen_w)
- AM_RANGE(0x360000, 0x360001) AM_WRITE_LEGACY(shangha3_gfxlist_addr_w)
+ AM_RANGE(0x340000, 0x340001) AM_WRITE(shangha3_flipscreen_w)
+ AM_RANGE(0x360000, 0x360001) AM_WRITE(shangha3_gfxlist_addr_w)
AM_RANGE(0x800000, 0xb7ffff) AM_READ(heberpop_gfxrom_r)
ADDRESS_MAP_END
@@ -155,14 +155,14 @@ static ADDRESS_MAP_START( blocken_map, AS_PROGRAM, 16, shangha3_state )
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("INPUTS")
AM_RANGE(0x100002, 0x100003) AM_READ_PORT("SYSTEM")
AM_RANGE(0x100004, 0x100005) AM_READ_PORT("DSW")
- AM_RANGE(0x100008, 0x100009) AM_WRITE_LEGACY(shangha3_blitter_go_w)
+ AM_RANGE(0x100008, 0x100009) AM_WRITE(shangha3_blitter_go_w)
AM_RANGE(0x10000a, 0x10000b) AM_WRITENOP /* irq ack? */
AM_RANGE(0x10000c, 0x10000d) AM_WRITE(blocken_coinctrl_w)
AM_RANGE(0x10000e, 0x10000f) AM_WRITE(heberpop_sound_command_w)
AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x30ffff) AM_RAM AM_BASE_SIZE(m_ram, m_ram_size) /* gfx & work ram */
- AM_RANGE(0x340000, 0x340001) AM_WRITE_LEGACY(shangha3_flipscreen_w)
- AM_RANGE(0x360000, 0x360001) AM_WRITE_LEGACY(shangha3_gfxlist_addr_w)
+ AM_RANGE(0x340000, 0x340001) AM_WRITE(shangha3_flipscreen_w)
+ AM_RANGE(0x360000, 0x360001) AM_WRITE(shangha3_gfxlist_addr_w)
AM_RANGE(0x800000, 0xb7ffff) AM_READ(heberpop_gfxrom_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index e25d528adcc..83d09ed7be6 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -247,7 +247,7 @@ static ADDRESS_MAP_START( chinhero_main_map, AS_PROGRAM, 8, shangkid_state )
AM_RANGE(0xb802, 0xb802) AM_READ_PORT("P2")
AM_RANGE(0xb803, 0xb803) AM_READ_PORT("P1")
AM_RANGE(0xc000, 0xc002) AM_WRITEONLY AM_BASE(m_videoreg)
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(shangkid_videoram_w) AM_BASE(m_videoram) AM_SHARE("share1")
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(shangkid_videoram_w) AM_BASE(m_videoram) AM_SHARE("share1")
AM_RANGE(0xe000, 0xfdff) AM_RAM AM_SHARE("share2")
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_BASE(m_spriteram) AM_SHARE("share3")
ADDRESS_MAP_END
@@ -268,7 +268,7 @@ static ADDRESS_MAP_START( shangkid_main_map, AS_PROGRAM, 8, shangkid_state )
AM_RANGE(0xb802, 0xb802) AM_READ_PORT("P2")
AM_RANGE(0xb803, 0xb803) AM_READ_PORT("P1")
AM_RANGE(0xc000, 0xc002) AM_WRITEONLY AM_BASE(m_videoreg)
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(shangkid_videoram_w) AM_BASE(m_videoram) AM_SHARE("share1")
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(shangkid_videoram_w) AM_BASE(m_videoram) AM_SHARE("share1")
AM_RANGE(0xe000, 0xfdff) AM_RAM AM_SHARE("share2")
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_BASE(m_spriteram) AM_SHARE("share3")
ADDRESS_MAP_END
@@ -288,7 +288,7 @@ static ADDRESS_MAP_START( chinhero_bbx_map, AS_PROGRAM, 8, shangkid_state )
AM_RANGE(0xb801, 0xb801) AM_READ_PORT("SYSTEM")
AM_RANGE(0xb802, 0xb802) AM_READ_PORT("P2")
AM_RANGE(0xb803, 0xb803) AM_READ_PORT("P1")
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(shangkid_videoram_w) AM_SHARE("share1")
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(shangkid_videoram_w) AM_SHARE("share1")
AM_RANGE(0xe000, 0xfdff) AM_RAM AM_SHARE("share2")
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE("share3")
ADDRESS_MAP_END
@@ -307,7 +307,7 @@ static ADDRESS_MAP_START( shangkid_bbx_map, AS_PROGRAM, 8, shangkid_state )
AM_RANGE(0xb801, 0xb801) AM_READ_PORT("SYSTEM")
AM_RANGE(0xb802, 0xb802) AM_READ_PORT("P2")
AM_RANGE(0xb803, 0xb803) AM_READ_PORT("P1")
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(shangkid_videoram_w) AM_SHARE("share1")
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(shangkid_videoram_w) AM_SHARE("share1")
AM_RANGE(0xe000, 0xfdff) AM_RAM AM_SHARE("share2")
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE("share3")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c
index 4783b14d336..74435583c4e 100644
--- a/src/mame/drivers/shaolins.c
+++ b/src/mame/drivers/shaolins.c
@@ -27,7 +27,7 @@ static TIMER_DEVICE_CALLBACK( shaolins_interrupt )
static ADDRESS_MAP_START( shaolins_map, AS_PROGRAM, 8, shaolins_state )
- AM_RANGE(0x0000, 0x0000) AM_WRITE_LEGACY(shaolins_nmi_w) /* bit 0 = flip screen, bit 1 = nmi enable, bit 2 = ? */
+ AM_RANGE(0x0000, 0x0000) AM_WRITE(shaolins_nmi_w) /* bit 0 = flip screen, bit 1 = nmi enable, bit 2 = ? */
/* bit 3, bit 4 = coin counters */
AM_RANGE(0x0100, 0x0100) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x0300, 0x0300) AM_DEVWRITE_LEGACY("sn1", sn76496_w) /* trigger chip to read from latch. The program always */
@@ -41,13 +41,13 @@ static ADDRESS_MAP_START( shaolins_map, AS_PROGRAM, 8, shaolins_state )
AM_RANGE(0x0703, 0x0703) AM_READ_PORT("DSW3")
AM_RANGE(0x0800, 0x0800) AM_WRITENOP /* latch for 76496 #0 */
AM_RANGE(0x1000, 0x1000) AM_WRITENOP /* latch for 76496 #1 */
- AM_RANGE(0x1800, 0x1800) AM_WRITE_LEGACY(shaolins_palettebank_w)
- AM_RANGE(0x2000, 0x2000) AM_WRITE_LEGACY(shaolins_scroll_w)
+ AM_RANGE(0x1800, 0x1800) AM_WRITE(shaolins_palettebank_w)
+ AM_RANGE(0x2000, 0x2000) AM_WRITE(shaolins_scroll_w)
AM_RANGE(0x2800, 0x2bff) AM_RAM /* RAM BANK 2 */
AM_RANGE(0x3000, 0x30ff) AM_RAM /* RAM BANK 1 */
AM_RANGE(0x3100, 0x33ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x3800, 0x3bff) AM_RAM_WRITE_LEGACY(shaolins_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x3c00, 0x3fff) AM_RAM_WRITE_LEGACY(shaolins_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x3800, 0x3bff) AM_RAM_WRITE(shaolins_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x3c00, 0x3fff) AM_RAM_WRITE(shaolins_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4000, 0x5fff) AM_ROM /* Machine checks for extra rom */
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index 66bc292f7df..1125c30da9a 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -45,8 +45,8 @@ WRITE8_MEMBER(shisen_state::sichuan2_coin_w)
static ADDRESS_MAP_START( shisen_map, AS_PROGRAM, 8, shisen_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc800, 0xcaff) AM_RAM_WRITE_LEGACY(sichuan2_paletteram_w) AM_BASE(m_paletteram)
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(sichuan2_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xc800, 0xcaff) AM_RAM_WRITE(sichuan2_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(sichuan2_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -54,7 +54,7 @@ static ADDRESS_MAP_START( shisen_io_map, AS_IO, 8, shisen_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(sichuan2_dsw1_r, sichuan2_coin_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("DSW2") AM_DEVWRITE_LEGACY("m72", m72_sound_command_byte_w)
- AM_RANGE(0x02, 0x02) AM_READ_PORT("P1") AM_WRITE_LEGACY(sichuan2_bankswitch_w)
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("P1") AM_WRITE(sichuan2_bankswitch_w)
AM_RANGE(0x03, 0x03) AM_READ_PORT("P2")
AM_RANGE(0x04, 0x04) AM_READ_PORT("COIN")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index f86f007d994..1c409b3c40d 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -72,8 +72,8 @@ static ADDRESS_MAP_START( shootout_map, AS_PROGRAM, 8, shootout_state )
AM_RANGE(0x1003, 0x1003) AM_READ_PORT("DSW2") AM_WRITE(sound_cpu_command_w)
AM_RANGE(0x1004, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x19ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(shootout_textram_w) AM_BASE(m_textram)
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE_LEGACY(shootout_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(shootout_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(shootout_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -87,8 +87,8 @@ static ADDRESS_MAP_START( shootouj_map, AS_PROGRAM, 8, shootout_state )
AM_RANGE(0x1800, 0x1800) AM_WRITE(shootout_coin_counter_w)
AM_RANGE(0x2000, 0x21ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x2800, 0x2801) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r,ym2203_w)
- AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE_LEGACY(shootout_textram_w) AM_BASE(m_textram)
- AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE_LEGACY(shootout_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(shootout_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE(shootout_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index bbbffb3b53a..ecf7e936684 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -78,14 +78,14 @@ static ADDRESS_MAP_START( sidearms_map, AS_PROGRAM, 8, sidearms_state )
AM_RANGE(0xc801, 0xc801) AM_READ_PORT("P1") AM_WRITE(sidearms_bankswitch_w)
AM_RANGE(0xc802, 0xc802) AM_READ_PORT("P2") AM_WRITE(watchdog_reset_w)
AM_RANGE(0xc803, 0xc803) AM_READ_PORT("DSW0")
- AM_RANGE(0xc804, 0xc804) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(sidearms_c804_w)
- AM_RANGE(0xc805, 0xc805) AM_READ_PORT("DSW2") AM_WRITE_LEGACY(sidearms_star_scrollx_w)
- AM_RANGE(0xc806, 0xc806) AM_WRITE_LEGACY(sidearms_star_scrolly_w)
+ AM_RANGE(0xc804, 0xc804) AM_READ_PORT("DSW1") AM_WRITE(sidearms_c804_w)
+ AM_RANGE(0xc805, 0xc805) AM_READ_PORT("DSW2") AM_WRITE(sidearms_star_scrollx_w)
+ AM_RANGE(0xc806, 0xc806) AM_WRITE(sidearms_star_scrolly_w)
AM_RANGE(0xc808, 0xc809) AM_WRITEONLY AM_BASE(m_bg_scrollx)
AM_RANGE(0xc80a, 0xc80b) AM_WRITEONLY AM_BASE(m_bg_scrolly)
- AM_RANGE(0xc80c, 0xc80c) AM_WRITE_LEGACY(sidearms_gfxctrl_w) /* background and sprite enable */
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(sidearms_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(sidearms_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xc80c, 0xc80c) AM_WRITE(sidearms_gfxctrl_w) /* background and sprite enable */
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(sidearms_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(sidearms_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xe000, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("spriteram")
ADDRESS_MAP_END
@@ -101,14 +101,14 @@ static ADDRESS_MAP_START( turtship_map, AS_PROGRAM, 8, sidearms_state )
AM_RANGE(0xe800, 0xe800) AM_WRITE(soundlatch_w)
AM_RANGE(0xe801, 0xe801) AM_WRITE(sidearms_bankswitch_w)
AM_RANGE(0xe802, 0xe802) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0xe804, 0xe804) AM_WRITE_LEGACY(sidearms_c804_w)
- AM_RANGE(0xe805, 0xe805) AM_WRITE_LEGACY(sidearms_star_scrollx_w)
- AM_RANGE(0xe806, 0xe806) AM_WRITE_LEGACY(sidearms_star_scrolly_w)
+ AM_RANGE(0xe804, 0xe804) AM_WRITE(sidearms_c804_w)
+ AM_RANGE(0xe805, 0xe805) AM_WRITE(sidearms_star_scrollx_w)
+ AM_RANGE(0xe806, 0xe806) AM_WRITE(sidearms_star_scrolly_w)
AM_RANGE(0xe808, 0xe809) AM_WRITEONLY AM_BASE(m_bg_scrollx)
AM_RANGE(0xe80a, 0xe80b) AM_WRITEONLY AM_BASE(m_bg_scrolly)
- AM_RANGE(0xe80c, 0xe80c) AM_WRITE_LEGACY(sidearms_gfxctrl_w) /* background and sprite enable */
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(sidearms_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(sidearms_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xe80c, 0xe80c) AM_WRITE(sidearms_gfxctrl_w) /* background and sprite enable */
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(sidearms_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(sidearms_colorram_w) AM_BASE(m_colorram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( sidearms_sound_map, AS_PROGRAM, 8, sidearms_state )
@@ -148,17 +148,17 @@ static ADDRESS_MAP_START( whizz_map, AS_PROGRAM, 8, sidearms_state )
AM_RANGE(0xc801, 0xc801) AM_READ_PORT("DSW1") AM_WRITE(whizz_bankswitch_w)
AM_RANGE(0xc802, 0xc802) AM_READ_PORT("DSW2") AM_WRITE(watchdog_reset_w)
AM_RANGE(0xc803, 0xc803) AM_READ_PORT("IN0") AM_WRITENOP
- AM_RANGE(0xc804, 0xc804) AM_READ_PORT("IN1") AM_WRITE_LEGACY(sidearms_c804_w)
+ AM_RANGE(0xc804, 0xc804) AM_READ_PORT("IN1") AM_WRITE(sidearms_c804_w)
AM_RANGE(0xc805, 0xc805) AM_READ_PORT("IN2") AM_WRITENOP
AM_RANGE(0xc806, 0xc806) AM_READ_PORT("IN3")
AM_RANGE(0xc807, 0xc807) AM_READ_PORT("IN4")
AM_RANGE(0xc808, 0xc809) AM_WRITEONLY AM_BASE(m_bg_scrollx)
AM_RANGE(0xc80a, 0xc80b) AM_WRITEONLY AM_BASE(m_bg_scrolly)
- AM_RANGE(0xe805, 0xe805) AM_WRITE_LEGACY(sidearms_star_scrollx_w)
- AM_RANGE(0xe806, 0xe806) AM_WRITE_LEGACY(sidearms_star_scrolly_w)
- AM_RANGE(0xc80c, 0xc80c) AM_WRITE_LEGACY(sidearms_gfxctrl_w)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(sidearms_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(sidearms_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xe805, 0xe805) AM_WRITE(sidearms_star_scrollx_w)
+ AM_RANGE(0xe806, 0xe806) AM_WRITE(sidearms_star_scrolly_w)
+ AM_RANGE(0xc80c, 0xc80c) AM_WRITE(sidearms_gfxctrl_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(sidearms_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(sidearms_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xe000, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("spriteram")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index b1834e5c956..96ed88fc308 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -226,9 +226,9 @@ WRITE8_MEMBER(sidepckt_state::sidepctj_i8751_w)
static ADDRESS_MAP_START( sidepckt_map, AS_PROGRAM, 8, sidepckt_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE_LEGACY(sidepckt_videoram_w) AM_BASE(m_videoram) AM_SIZE(m_videoram_size)
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(sidepckt_videoram_w) AM_BASE(m_videoram) AM_SIZE(m_videoram_size)
AM_RANGE(0x1400, 0x17ff) AM_RAM // ???
- AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE_LEGACY(sidepckt_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(sidepckt_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x1c00, 0x1fff) AM_RAM // ???
AM_RANGE(0x2000, 0x20ff) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x2100, 0x24ff) AM_RAM // ???
@@ -237,7 +237,7 @@ static ADDRESS_MAP_START( sidepckt_map, AS_PROGRAM, 8, sidepckt_state )
AM_RANGE(0x3002, 0x3002) AM_READ_PORT("DSW1")
AM_RANGE(0x3003, 0x3003) AM_READ_PORT("DSW2")
AM_RANGE(0x3004, 0x3004) AM_WRITE(sound_cpu_command_w)
- AM_RANGE(0x300c, 0x300c) AM_READNOP AM_WRITE_LEGACY(sidepckt_flipscreen_w)
+ AM_RANGE(0x300c, 0x300c) AM_READNOP AM_WRITE(sidepckt_flipscreen_w)
// AM_RANGE(0x3014, 0x3014) //i8751 read
// AM_RANGE(0x3018, 0x3018) //i8751 write
AM_RANGE(0x4000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index 1d6de3e6a47..d02e6e4cc6a 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -156,9 +156,9 @@ static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 32, silkroad_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x40c000, 0x40cfff) AM_RAM AM_BASE(m_sprram) // sprites
AM_RANGE(0x600000, 0x603fff) AM_RAM_WRITE(paletteram32_xRRRRRGGGGGBBBBB_dword_w) AM_SHARE("paletteram") // palette
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(silkroad_fgram_w) AM_BASE(m_vidram) // lower Layer
- AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE_LEGACY(silkroad_fgram2_w) AM_BASE(m_vidram2) // mid layer
- AM_RANGE(0x808000, 0x80bfff) AM_RAM_WRITE_LEGACY(silkroad_fgram3_w) AM_BASE(m_vidram3) // higher layer
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(silkroad_fgram_w) AM_BASE(m_vidram) // lower Layer
+ AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE(silkroad_fgram2_w) AM_BASE(m_vidram2) // mid layer
+ AM_RANGE(0x808000, 0x80bfff) AM_RAM_WRITE(silkroad_fgram3_w) AM_BASE(m_vidram3) // higher layer
AM_RANGE(0xc00000, 0xc00003) AM_READ_PORT("INPUTS")
AM_RANGE(0xc00004, 0xc00007) AM_READ_PORT("DSW")
AM_RANGE(0xc00024, 0xc00027) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff0000)
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index 5ebba99c6bb..f7c2bb70b71 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -93,9 +93,9 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, simpsons_state )
AM_RANGE(0x1f93, 0x1f93) AM_READ_PORT("P4")
AM_RANGE(0x1fa0, 0x1fa7) AM_DEVWRITE_LEGACY("k053246", k053246_w)
AM_RANGE(0x1fb0, 0x1fbf) AM_DEVWRITE_LEGACY("k053251", k053251_w)
- AM_RANGE(0x1fc0, 0x1fc0) AM_WRITE_LEGACY(simpsons_coin_counter_w)
- AM_RANGE(0x1fc2, 0x1fc2) AM_WRITE_LEGACY(simpsons_eeprom_w)
- AM_RANGE(0x1fc4, 0x1fc4) AM_READ_LEGACY(simpsons_sound_interrupt_r)
+ AM_RANGE(0x1fc0, 0x1fc0) AM_WRITE(simpsons_coin_counter_w)
+ AM_RANGE(0x1fc2, 0x1fc2) AM_WRITE(simpsons_eeprom_w)
+ AM_RANGE(0x1fc4, 0x1fc4) AM_READ(simpsons_sound_interrupt_r)
AM_RANGE(0x1fc6, 0x1fc7) AM_DEVREADWRITE_LEGACY("k053260", simpsons_sound_r, k053260_w)
AM_RANGE(0x1fc8, 0x1fc9) AM_DEVREAD_LEGACY("k053246", k053246_r)
AM_RANGE(0x1fca, 0x1fca) AM_READ(watchdog_reset_r)
diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c
index b3516798f10..a18ea576a1b 100644
--- a/src/mame/drivers/skydiver.c
+++ b/src/mame/drivers/skydiver.c
@@ -187,22 +187,22 @@ static WRITE8_DEVICE_HANDLER( skydiver_whistle_w )
static ADDRESS_MAP_START( skydiver_map, AS_PROGRAM, 8, skydiver_state )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
- AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x4300) AM_READWRITE_LEGACY(skydiver_wram_r, skydiver_wram_w)
+ AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x4300) AM_READWRITE(skydiver_wram_r, skydiver_wram_w)
AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x4000) AM_RAM /* RAM B1 */
- AM_RANGE(0x0400, 0x07ff) AM_MIRROR(0x4000) AM_RAM_WRITE_LEGACY(skydiver_videoram_w) AM_BASE(m_videoram) /* RAMs K1,M1,P1,J1,N1,K/L1,L1,H/J1 */
- AM_RANGE(0x0800, 0x0801) AM_MIRROR(0x47f0) AM_WRITE_LEGACY(skydiver_lamp_s_w)
- AM_RANGE(0x0802, 0x0803) AM_MIRROR(0x47f0) AM_WRITE_LEGACY(skydiver_lamp_k_w)
- AM_RANGE(0x0804, 0x0805) AM_MIRROR(0x47f0) AM_WRITE_LEGACY(skydiver_start_lamp_1_w)
- AM_RANGE(0x0806, 0x0807) AM_MIRROR(0x47f0) AM_WRITE_LEGACY(skydiver_start_lamp_2_w)
- AM_RANGE(0x0808, 0x0809) AM_MIRROR(0x47f0) AM_WRITE_LEGACY(skydiver_lamp_y_w)
- AM_RANGE(0x080a, 0x080b) AM_MIRROR(0x47f0) AM_WRITE_LEGACY(skydiver_lamp_d_w)
+ AM_RANGE(0x0400, 0x07ff) AM_MIRROR(0x4000) AM_RAM_WRITE(skydiver_videoram_w) AM_BASE(m_videoram) /* RAMs K1,M1,P1,J1,N1,K/L1,L1,H/J1 */
+ AM_RANGE(0x0800, 0x0801) AM_MIRROR(0x47f0) AM_WRITE(skydiver_lamp_s_w)
+ AM_RANGE(0x0802, 0x0803) AM_MIRROR(0x47f0) AM_WRITE(skydiver_lamp_k_w)
+ AM_RANGE(0x0804, 0x0805) AM_MIRROR(0x47f0) AM_WRITE(skydiver_start_lamp_1_w)
+ AM_RANGE(0x0806, 0x0807) AM_MIRROR(0x47f0) AM_WRITE(skydiver_start_lamp_2_w)
+ AM_RANGE(0x0808, 0x0809) AM_MIRROR(0x47f0) AM_WRITE(skydiver_lamp_y_w)
+ AM_RANGE(0x080a, 0x080b) AM_MIRROR(0x47f0) AM_WRITE(skydiver_lamp_d_w)
AM_RANGE(0x080c, 0x080d) AM_MIRROR(0x47f0) AM_DEVWRITE_LEGACY("discrete", skydiver_sound_enable_w)
// AM_RANGE(0x1000, 0x1001) AM_MIRROR(0x47f0) AM_WRITE_LEGACY(skydiver_jump1_lamps_w)
- AM_RANGE(0x1002, 0x1003) AM_MIRROR(0x47f0) AM_WRITE_LEGACY(skydiver_coin_lockout_w)
+ AM_RANGE(0x1002, 0x1003) AM_MIRROR(0x47f0) AM_WRITE(skydiver_coin_lockout_w)
// AM_RANGE(0x1006, 0x1007) AM_MIRROR(0x47f0) AM_WRITE_LEGACY(skydiver_jump2_lamps_w)
AM_RANGE(0x1008, 0x100b) AM_MIRROR(0x47f0) AM_DEVWRITE_LEGACY("discrete", skydiver_whistle_w)
AM_RANGE(0x100c, 0x100d) AM_MIRROR(0x47f0) AM_WRITE(skydiver_nmion_w)
- AM_RANGE(0x100e, 0x100f) AM_MIRROR(0x47f0) AM_WRITE_LEGACY(skydiver_width_w)
+ AM_RANGE(0x100e, 0x100f) AM_MIRROR(0x47f0) AM_WRITE(skydiver_width_w)
AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x47e0) AM_READ_PORT("IN0")
AM_RANGE(0x1801, 0x1801) AM_MIRROR(0x47e0) AM_READ_PORT("IN1")
AM_RANGE(0x1802, 0x1802) AM_MIRROR(0x47e0) AM_READ_PORT("IN2")
@@ -217,7 +217,7 @@ static ADDRESS_MAP_START( skydiver_map, AS_PROGRAM, 8, skydiver_state )
AM_RANGE(0x180b, 0x180b) AM_MIRROR(0x47e4) AM_READ_PORT("IN11")
AM_RANGE(0x1810, 0x1810) AM_MIRROR(0x47e4) AM_READ_PORT("IN12")
AM_RANGE(0x1811, 0x1811) AM_MIRROR(0x47e4) AM_READ_PORT("IN13")
- AM_RANGE(0x2000, 0x201f) AM_MIRROR(0x47e0) AM_READ(watchdog_reset_r) AM_WRITE_LEGACY(skydiver_2000_201F_w)
+ AM_RANGE(0x2000, 0x201f) AM_MIRROR(0x47e0) AM_READ(watchdog_reset_r) AM_WRITE(skydiver_2000_201F_w)
AM_RANGE(0x2800, 0x2fff) AM_MIRROR(0x4000) AM_ROM
AM_RANGE(0x3000, 0x37ff) AM_MIRROR(0x4000) AM_ROM
AM_RANGE(0x3800, 0x3fff) AM_ROM
diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c
index 566681afe9a..2bd1f5155e5 100644
--- a/src/mame/drivers/skyfox.c
+++ b/src/mame/drivers/skyfox.c
@@ -43,9 +43,9 @@ static ADDRESS_MAP_START( skyfox_map, AS_PROGRAM, 8, skyfox_state )
AM_RANGE(0xe000, 0xe000) AM_READ_PORT("INPUTS") // Input Ports
AM_RANGE(0xe001, 0xe001) AM_READ_PORT("DSW0") //
AM_RANGE(0xe002, 0xe002) AM_READ_PORT("DSW1") //
- AM_RANGE(0xe008, 0xe00f) AM_WRITE_LEGACY(skyfox_vregs_w) // Video Regs
+ AM_RANGE(0xe008, 0xe00f) AM_WRITE(skyfox_vregs_w) // Video Regs
AM_RANGE(0xf001, 0xf001) AM_READ_PORT("DSW2") //
-// AM_RANGE(0xff00, 0xff07) AM_READ_LEGACY(skyfox_vregs_r) // fake to read the vregs
+// AM_RANGE(0xff00, 0xff07) AM_READ(skyfox_vregs_r) // fake to read the vregs
ADDRESS_MAP_END
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index dfbccd3ba04..9d156401f84 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -101,18 +101,18 @@ static MACHINE_START( skykid )
static ADDRESS_MAP_START( skykid_map, AS_PROGRAM, 8, skykid_state )
AM_RANGE(0x0000, 0x1fff) AM_ROMBANK("bank1") /* banked ROM */
- AM_RANGE(0x2000, 0x2fff) AM_READWRITE_LEGACY(skykid_videoram_r,skykid_videoram_w) AM_BASE(m_videoram)/* Video RAM (background) */
- AM_RANGE(0x4000, 0x47ff) AM_READWRITE_LEGACY(skykid_textram_r,skykid_textram_w) AM_BASE(m_textram) /* video RAM (text layer) */
+ AM_RANGE(0x2000, 0x2fff) AM_READWRITE(skykid_videoram_r,skykid_videoram_w) AM_BASE(m_videoram)/* Video RAM (background) */
+ AM_RANGE(0x4000, 0x47ff) AM_READWRITE(skykid_textram_r,skykid_textram_w) AM_BASE(m_textram) /* video RAM (text layer) */
AM_RANGE(0x4800, 0x5fff) AM_RAM AM_BASE(m_spriteram) /* RAM + Sprite RAM */
- AM_RANGE(0x6000, 0x60ff) AM_WRITE_LEGACY(skykid_scroll_y_w) /* Y scroll register map */
- AM_RANGE(0x6200, 0x63ff) AM_WRITE_LEGACY(skykid_scroll_x_w) /* X scroll register map */
+ AM_RANGE(0x6000, 0x60ff) AM_WRITE(skykid_scroll_y_w) /* Y scroll register map */
+ AM_RANGE(0x6200, 0x63ff) AM_WRITE(skykid_scroll_x_w) /* X scroll register map */
AM_RANGE(0x6800, 0x6bff) AM_DEVREADWRITE_LEGACY("namco", namcos1_cus30_r, namcos1_cus30_w) /* PSG device, shared RAM */
AM_RANGE(0x7000, 0x7fff) AM_WRITE(skykid_irq_1_ctrl_w) /* IRQ control */
AM_RANGE(0x7800, 0x7fff) AM_READ(watchdog_reset_r) /* watchdog reset */
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */
AM_RANGE(0x8000, 0x8fff) AM_WRITE(skykid_subreset_w) /* MCU control */
AM_RANGE(0x9000, 0x9fff) AM_WRITE(skykid_bankswitch_w) /* Bankswitch control */
- AM_RANGE(0xa000, 0xa001) AM_WRITE_LEGACY(skykid_flipscreen_priority_w) /* flip screen & priority */
+ AM_RANGE(0xa000, 0xa001) AM_WRITE(skykid_flipscreen_priority_w) /* flip screen & priority */
ADDRESS_MAP_END
static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8, skykid_state )
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index 36d4eaa3a65..4b9601bb429 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -274,8 +274,8 @@ static ADDRESS_MAP_START( perfrman_map, AS_PROGRAM, 8, slapfght_state )
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x880f) AM_RAM AM_SHARE("share1")
AM_RANGE(0x8810, 0x8fff) AM_RAMBANK("bank1") /* Shared RAM with sound CPU */
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(slapfight_videoram_w) AM_BASE(m_slapfight_videoram)
- AM_RANGE(0x9800, 0x9fff) AM_RAM_WRITE_LEGACY(slapfight_colorram_w) AM_BASE(m_slapfight_colorram)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(slapfight_videoram_w) AM_BASE(m_slapfight_videoram)
+ AM_RANGE(0x9800, 0x9fff) AM_RAM_WRITE(slapfight_colorram_w) AM_BASE(m_slapfight_colorram)
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE("spriteram")
ADDRESS_MAP_END
@@ -284,14 +284,14 @@ static ADDRESS_MAP_START( tigerh_map, AS_PROGRAM, 8, slapfght_state )
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc80f) AM_RAM AM_SHARE("share1")
AM_RANGE(0xc810, 0xcfff) AM_RAM
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(slapfight_videoram_w) AM_BASE(m_slapfight_videoram)
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(slapfight_colorram_w) AM_BASE(m_slapfight_colorram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(slapfight_videoram_w) AM_BASE(m_slapfight_videoram)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(slapfight_colorram_w) AM_BASE(m_slapfight_colorram)
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xe800, 0xe800) AM_WRITEONLY AM_BASE(m_slapfight_scrollx_lo)
AM_RANGE(0xe801, 0xe801) AM_WRITEONLY AM_BASE(m_slapfight_scrollx_hi)
AM_RANGE(0xe802, 0xe802) AM_WRITEONLY AM_BASE(m_slapfight_scrolly)
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(slapfight_fixram_w) AM_BASE(m_slapfight_fixvideoram)
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(slapfight_fixcol_w) AM_BASE(m_slapfight_fixcolorram)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(slapfight_fixram_w) AM_BASE(m_slapfight_fixvideoram)
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(slapfight_fixcol_w) AM_BASE(m_slapfight_fixcolorram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( slapfght_map, AS_PROGRAM, 8, slapfght_state )
@@ -300,15 +300,15 @@ static ADDRESS_MAP_START( slapfght_map, AS_PROGRAM, 8, slapfght_state )
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc80f) AM_RAM AM_SHARE("share1")
AM_RANGE(0xc810, 0xcfff) AM_RAM
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(slapfight_videoram_w) AM_BASE(m_slapfight_videoram)
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(slapfight_colorram_w) AM_BASE(m_slapfight_colorram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(slapfight_videoram_w) AM_BASE(m_slapfight_videoram)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(slapfight_colorram_w) AM_BASE(m_slapfight_colorram)
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xe800, 0xe800) AM_WRITEONLY AM_BASE(m_slapfight_scrollx_lo)
AM_RANGE(0xe801, 0xe801) AM_WRITEONLY AM_BASE(m_slapfight_scrollx_hi)
AM_RANGE(0xe802, 0xe802) AM_WRITEONLY AM_BASE(m_slapfight_scrolly)
-// AM_RANGE(0xe803, 0xe803) AM_READWRITE_LEGACY(slapfight_mcu_r, slapfight_mcu_w)
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(slapfight_fixram_w) AM_BASE(m_slapfight_fixvideoram)
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(slapfight_fixcol_w) AM_BASE(m_slapfight_fixcolorram)
+// AM_RANGE(0xe803, 0xe803) AM_READWRITE(slapfight_mcu_r, slapfight_mcu_w)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(slapfight_fixram_w) AM_BASE(m_slapfight_fixvideoram)
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(slapfight_fixcol_w) AM_BASE(m_slapfight_fixcolorram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( slapfighb2_map, AS_PROGRAM, 8, slapfght_state )
@@ -317,73 +317,73 @@ static ADDRESS_MAP_START( slapfighb2_map, AS_PROGRAM, 8, slapfght_state )
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc80f) AM_RAM AM_SHARE("share1")
AM_RANGE(0xc810, 0xcfff) AM_RAM
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(slapfight_videoram_w) AM_BASE(m_slapfight_videoram)
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(slapfight_colorram_w) AM_BASE(m_slapfight_colorram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(slapfight_videoram_w) AM_BASE(m_slapfight_videoram)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(slapfight_colorram_w) AM_BASE(m_slapfight_colorram)
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xe800, 0xe800) AM_WRITEONLY AM_BASE(m_slapfight_scrollx_hi)
AM_RANGE(0xe802, 0xe802) AM_WRITEONLY AM_BASE(m_slapfight_scrolly)
AM_RANGE(0xe803, 0xe803) AM_WRITEONLY AM_BASE(m_slapfight_scrollx_lo)
AM_RANGE(0xec00, 0xefff) AM_ROM // it reads a copy of the logo from here!
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(slapfight_fixram_w) AM_BASE(m_slapfight_fixvideoram)
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(slapfight_fixcol_w) AM_BASE(m_slapfight_fixcolorram)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(slapfight_fixram_w) AM_BASE(m_slapfight_fixvideoram)
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(slapfight_fixcol_w) AM_BASE(m_slapfight_fixcolorram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( slapfght_io_map, AS_IO, 8, slapfght_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(slapfight_port_00_w)
- AM_RANGE(0x01, 0x01) AM_WRITE_LEGACY(slapfight_port_01_w)
- AM_RANGE(0x02, 0x03) AM_WRITE_LEGACY(slapfight_flipscreen_w)
-// AM_RANGE(0x04, 0x04) AM_WRITE_LEGACY(getstar_port_04_w)
- AM_RANGE(0x06, 0x06) AM_WRITE_LEGACY(slapfight_port_06_w)
- AM_RANGE(0x07, 0x07) AM_WRITE_LEGACY(slapfight_port_07_w)
- AM_RANGE(0x08, 0x08) AM_WRITE_LEGACY(slapfight_port_08_w) /* select bank 0 */
- AM_RANGE(0x09, 0x09) AM_WRITE_LEGACY(slapfight_port_09_w) /* select bank 1 */
- AM_RANGE(0x0c, 0x0d) AM_WRITE_LEGACY(slapfight_palette_bank_w)
+ AM_RANGE(0x00, 0x00) AM_WRITE(slapfight_port_00_w)
+ AM_RANGE(0x01, 0x01) AM_WRITE(slapfight_port_01_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(slapfight_flipscreen_w)
+// AM_RANGE(0x04, 0x04) AM_WRITE(getstar_port_04_w)
+ AM_RANGE(0x06, 0x06) AM_WRITE(slapfight_port_06_w)
+ AM_RANGE(0x07, 0x07) AM_WRITE(slapfight_port_07_w)
+ AM_RANGE(0x08, 0x08) AM_WRITE(slapfight_port_08_w) /* select bank 0 */
+ AM_RANGE(0x09, 0x09) AM_WRITE(slapfight_port_09_w) /* select bank 1 */
+ AM_RANGE(0x0c, 0x0d) AM_WRITE(slapfight_palette_bank_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( slapfight_m68705_map, AS_PROGRAM, 8, slapfght_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(slapfight_68705_portA_r, slapfight_68705_portA_w)
- AM_RANGE(0x0001, 0x0001) AM_READWRITE_LEGACY(slapfight_68705_portB_r, slapfight_68705_portB_w)
- AM_RANGE(0x0002, 0x0002) AM_READWRITE_LEGACY(slapfight_68705_portC_r, slapfight_68705_portC_w)
- AM_RANGE(0x0004, 0x0004) AM_WRITE_LEGACY(slapfight_68705_ddrA_w)
- AM_RANGE(0x0005, 0x0005) AM_WRITE_LEGACY(slapfight_68705_ddrB_w)
- AM_RANGE(0x0006, 0x0006) AM_WRITE_LEGACY(slapfight_68705_ddrC_w)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(slapfight_68705_portA_r, slapfight_68705_portA_w)
+ AM_RANGE(0x0001, 0x0001) AM_READWRITE(slapfight_68705_portB_r, slapfight_68705_portB_w)
+ AM_RANGE(0x0002, 0x0002) AM_READWRITE(slapfight_68705_portC_r, slapfight_68705_portC_w)
+ AM_RANGE(0x0004, 0x0004) AM_WRITE(slapfight_68705_ddrA_w)
+ AM_RANGE(0x0005, 0x0005) AM_WRITE(slapfight_68705_ddrB_w)
+ AM_RANGE(0x0006, 0x0006) AM_WRITE(slapfight_68705_ddrC_w)
AM_RANGE(0x0010, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
READ8_MEMBER(slapfght_state::tigerh_status_r)
{
- return (slapfight_port_00_r(&space, 0) & 0xf9)| ((tigerh_mcu_status_r(&space, 0)));
+ return (slapfight_port_00_r(space, 0) & 0xf9)| ((tigerh_mcu_status_r(space, 0)));
}
static ADDRESS_MAP_START( tigerh_io_map, AS_IO, 8, slapfght_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(tigerh_status_r) AM_WRITE_LEGACY(slapfight_port_00_w) /* status register */
- AM_RANGE(0x01, 0x01) AM_WRITE_LEGACY(slapfight_port_01_w)
- AM_RANGE(0x02, 0x03) AM_WRITE_LEGACY(slapfight_flipscreen_w)
- AM_RANGE(0x06, 0x06) AM_WRITE_LEGACY(slapfight_port_06_w)
- AM_RANGE(0x07, 0x07) AM_WRITE_LEGACY(slapfight_port_07_w)
+ AM_RANGE(0x00, 0x00) AM_READ(tigerh_status_r) AM_WRITE(slapfight_port_00_w) /* status register */
+ AM_RANGE(0x01, 0x01) AM_WRITE(slapfight_port_01_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(slapfight_flipscreen_w)
+ AM_RANGE(0x06, 0x06) AM_WRITE(slapfight_port_06_w)
+ AM_RANGE(0x07, 0x07) AM_WRITE(slapfight_port_07_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( tigerhb_io_map, AS_IO, 8, slapfght_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READWRITE_LEGACY(slapfight_port_00_r, slapfight_port_00_w) /* status register */
- AM_RANGE(0x01, 0x01) AM_WRITE_LEGACY(slapfight_port_01_w)
- AM_RANGE(0x02, 0x03) AM_WRITE_LEGACY(slapfight_flipscreen_w)
- AM_RANGE(0x06, 0x06) AM_WRITE_LEGACY(slapfight_port_06_w)
- AM_RANGE(0x07, 0x07) AM_WRITE_LEGACY(slapfight_port_07_w)
+ AM_RANGE(0x00, 0x00) AM_READWRITE(slapfight_port_00_r, slapfight_port_00_w) /* status register */
+ AM_RANGE(0x01, 0x01) AM_WRITE(slapfight_port_01_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(slapfight_flipscreen_w)
+ AM_RANGE(0x06, 0x06) AM_WRITE(slapfight_port_06_w)
+ AM_RANGE(0x07, 0x07) AM_WRITE(slapfight_port_07_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( tigerh_m68705_map, AS_PROGRAM, 8, slapfght_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(tigerh_68705_portA_r,tigerh_68705_portA_w)
- AM_RANGE(0x0001, 0x0001) AM_READWRITE_LEGACY(tigerh_68705_portB_r,tigerh_68705_portB_w)
- AM_RANGE(0x0002, 0x0002) AM_READWRITE_LEGACY(tigerh_68705_portC_r,tigerh_68705_portC_w)
- AM_RANGE(0x0004, 0x0004) AM_WRITE_LEGACY(tigerh_68705_ddrA_w)
- AM_RANGE(0x0005, 0x0005) AM_WRITE_LEGACY(tigerh_68705_ddrB_w)
- AM_RANGE(0x0006, 0x0006) AM_WRITE_LEGACY(tigerh_68705_ddrC_w)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(tigerh_68705_portA_r,tigerh_68705_portA_w)
+ AM_RANGE(0x0001, 0x0001) AM_READWRITE(tigerh_68705_portB_r,tigerh_68705_portB_w)
+ AM_RANGE(0x0002, 0x0002) AM_READWRITE(tigerh_68705_portC_r,tigerh_68705_portC_w)
+ AM_RANGE(0x0004, 0x0004) AM_WRITE(tigerh_68705_ddrA_w)
+ AM_RANGE(0x0005, 0x0005) AM_WRITE(tigerh_68705_ddrB_w)
+ AM_RANGE(0x0006, 0x0006) AM_WRITE(tigerh_68705_ddrC_w)
AM_RANGE(0x0010, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
@@ -398,7 +398,7 @@ static ADDRESS_MAP_START( perfrman_sound_map, AS_PROGRAM, 8, slapfght_state )
AM_RANGE(0xa090, 0xa090) AM_DEVWRITE_LEGACY("ay2", ay8910_address_w)
AM_RANGE(0xa091, 0xa091) AM_DEVREAD_LEGACY("ay2", ay8910_r)
AM_RANGE(0xa092, 0xa092) AM_DEVWRITE_LEGACY("ay2", ay8910_data_w)
- AM_RANGE(0xa0e0, 0xa0e0) AM_WRITE_LEGACY(getstar_sh_intenable_w) /* maybe a0f0 also -LE */
+ AM_RANGE(0xa0e0, 0xa0e0) AM_WRITE(getstar_sh_intenable_w) /* maybe a0f0 also -LE */
// AM_RANGE(0xa0f0, 0xa0f0) AM_WRITENOP
ADDRESS_MAP_END
@@ -410,7 +410,7 @@ static ADDRESS_MAP_START( slapfght_sound_map, AS_PROGRAM, 8, slapfght_state )
AM_RANGE(0xa090, 0xa090) AM_DEVWRITE_LEGACY("ay2", ay8910_address_w)
AM_RANGE(0xa091, 0xa091) AM_DEVREAD_LEGACY("ay2", ay8910_r)
AM_RANGE(0xa092, 0xa092) AM_DEVWRITE_LEGACY("ay2", ay8910_data_w)
- AM_RANGE(0xa0e0, 0xa0e0) AM_WRITE_LEGACY(getstar_sh_intenable_w) /* maybe a0f0 also -LE */
+ AM_RANGE(0xa0e0, 0xa0e0) AM_WRITE(getstar_sh_intenable_w) /* maybe a0f0 also -LE */
// AM_RANGE(0xa0f0, 0xa0f0) AM_WRITENOP
AM_RANGE(0xc800, 0xc80f) AM_RAM AM_SHARE("share1")
AM_RANGE(0xc810, 0xcfff) AM_RAM
@@ -1740,12 +1740,14 @@ ROM_END
static DRIVER_INIT( tigerh )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe803, 0xe803, FUNC(tigerh_mcu_r), FUNC(tigerh_mcu_w) );
+ slapfght_state *state = machine.driver_data<slapfght_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xe803, 0xe803, read8_delegate(FUNC(slapfght_state::tigerh_mcu_r),state), write8_delegate(FUNC(slapfght_state::tigerh_mcu_w),state));
}
static DRIVER_INIT( tigerhb )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe803, 0xe803, FUNC(tigerhb_e803_r), FUNC(tigerhb_e803_w) );
+ slapfght_state *state = machine.driver_data<slapfght_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xe803, 0xe803, read8_delegate(FUNC(slapfght_state::tigerhb_e803_r),state), write8_delegate(FUNC(slapfght_state::tigerhb_e803_w),state));
}
@@ -1805,8 +1807,9 @@ READ8_MEMBER(slapfght_state::gtstarb1_port_0_read)
static void getstar_init( running_machine &machine )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe803, 0xe803, FUNC(getstar_e803_r), FUNC(getstar_e803_w) );
- machine.device("maincpu")->memory().space(AS_IO)->install_legacy_read_handler(0x00, 0x00, FUNC(slapfight_port_00_r) );
+ slapfght_state *state = machine.driver_data<slapfght_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xe803, 0xe803, read8_delegate(FUNC(slapfght_state::getstar_e803_r),state), write8_delegate(FUNC(slapfght_state::getstar_e803_w),state));
+ machine.device("maincpu")->memory().space(AS_IO)->install_read_handler(0x00, 0x00, read8_delegate(FUNC(slapfght_state::slapfight_port_00_r),state));
}
static DRIVER_INIT( getstar )
@@ -1849,13 +1852,15 @@ static DRIVER_INIT( gtstarb2 )
static DRIVER_INIT( slapfigh )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe803, 0xe803, FUNC(slapfight_mcu_r), FUNC(slapfight_mcu_w) );
- machine.device("maincpu")->memory().space(AS_IO)->install_legacy_read_handler(0x00, 0x00, FUNC(slapfight_mcu_status_r) );
+ slapfght_state *state = machine.driver_data<slapfght_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xe803, 0xe803, read8_delegate(FUNC(slapfght_state::slapfight_mcu_r),state), write8_delegate(FUNC(slapfght_state::slapfight_mcu_w),state));
+ machine.device("maincpu")->memory().space(AS_IO)->install_read_handler(0x00, 0x00, read8_delegate(FUNC(slapfght_state::slapfight_mcu_status_r),state));
}
static DRIVER_INIT( perfrman )
{
- machine.device("maincpu")->memory().space(AS_IO)->install_legacy_read_handler(0x00, 0x00, FUNC(perfrman_port_00_r) );
+ slapfght_state *state = machine.driver_data<slapfght_state>();
+ machine.device("maincpu")->memory().space(AS_IO)->install_read_handler(0x00, 0x00, read8_delegate(FUNC(slapfght_state::perfrman_port_00_r),state));
}
/* ( YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS ) */
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index 87bc89cd0e7..2d48febd26c 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -848,48 +848,48 @@ static CUSTOM_INPUT( snk_bonus_r )
static ADDRESS_MAP_START( marvins_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
- AM_RANGE(0x6000, 0x6000) AM_WRITE_LEGACY(marvins_palette_bank_w)
+ AM_RANGE(0x6000, 0x6000) AM_WRITE(marvins_palette_bank_w)
AM_RANGE(0x8000, 0x8000) AM_READ_PORT("IN0")
AM_RANGE(0x8100, 0x8100) AM_READ_PORT("IN1")
AM_RANGE(0x8200, 0x8200) AM_READ_PORT("IN2")
AM_RANGE(0x8300, 0x8300) AM_WRITE(marvins_soundlatch_w)
AM_RANGE(0x8400, 0x8400) AM_READ_PORT("DSW1")
AM_RANGE(0x8500, 0x8500) AM_READ_PORT("DSW2")
- AM_RANGE(0x8600, 0x8600) AM_WRITE_LEGACY(marvins_flipscreen_w)
+ AM_RANGE(0x8600, 0x8600) AM_WRITE(marvins_flipscreen_w)
AM_RANGE(0x8700, 0x8700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w)
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE(m_spriteram) AM_SHARE("share1") // + work ram
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(marvins_fg_videoram_w) AM_SHARE("share2") AM_BASE(m_fg_videoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(marvins_fg_videoram_w) AM_SHARE("share2") AM_BASE(m_fg_videoram)
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share3")
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share4") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share4") AM_BASE(m_bg_videoram)
AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("share5")
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share6") AM_BASE(m_tx_videoram) // + work RAM
- AM_RANGE(0xf800, 0xf800) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xf900, 0xf900) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xfa00, 0xfa00) AM_WRITE_LEGACY(snk_fg_scrolly_w)
- AM_RANGE(0xfb00, 0xfb00) AM_WRITE_LEGACY(snk_fg_scrollx_w)
- AM_RANGE(0xfc00, 0xfc00) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xfd00, 0xfd00) AM_WRITE_LEGACY(snk_bg_scrollx_w)
- AM_RANGE(0xfe00, 0xfe00) AM_WRITE_LEGACY(snk_sprite_split_point_w)
- AM_RANGE(0xff00, 0xff00) AM_WRITE_LEGACY(marvins_scroll_msb_w)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share6") AM_BASE(m_tx_videoram) // + work RAM
+ AM_RANGE(0xf800, 0xf800) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xf900, 0xf900) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xfa00, 0xfa00) AM_WRITE(snk_fg_scrolly_w)
+ AM_RANGE(0xfb00, 0xfb00) AM_WRITE(snk_fg_scrollx_w)
+ AM_RANGE(0xfc00, 0xfc00) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xfd00, 0xfd00) AM_WRITE(snk_bg_scrollx_w)
+ AM_RANGE(0xfe00, 0xfe00) AM_WRITE(snk_sprite_split_point_w)
+ AM_RANGE(0xff00, 0xff00) AM_WRITE(marvins_scroll_msb_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( marvins_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8700, 0x8700) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(marvins_fg_videoram_w) AM_SHARE("share2")
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(marvins_fg_videoram_w) AM_SHARE("share2")
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share3")
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share4")
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share4")
AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("share5")
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share6")
- AM_RANGE(0xf800, 0xf800) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xf900, 0xf900) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xfa00, 0xfa00) AM_WRITE_LEGACY(snk_fg_scrolly_w)
- AM_RANGE(0xfb00, 0xfb00) AM_WRITE_LEGACY(snk_fg_scrollx_w)
- AM_RANGE(0xfc00, 0xfc00) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xfd00, 0xfd00) AM_WRITE_LEGACY(snk_bg_scrollx_w)
- AM_RANGE(0xfe00, 0xfe00) AM_WRITE_LEGACY(snk_sprite_split_point_w)
- AM_RANGE(0xff00, 0xff00) AM_WRITE_LEGACY(marvins_scroll_msb_w)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share6")
+ AM_RANGE(0xf800, 0xf800) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xf900, 0xf900) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xfa00, 0xfa00) AM_WRITE(snk_fg_scrolly_w)
+ AM_RANGE(0xfb00, 0xfb00) AM_WRITE(snk_fg_scrollx_w)
+ AM_RANGE(0xfc00, 0xfc00) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xfd00, 0xfd00) AM_WRITE(snk_bg_scrollx_w)
+ AM_RANGE(0xfe00, 0xfe00) AM_WRITE(snk_sprite_split_point_w)
+ AM_RANGE(0xff00, 0xff00) AM_WRITE(marvins_scroll_msb_w)
ADDRESS_MAP_END
@@ -902,42 +902,42 @@ static ADDRESS_MAP_START( madcrash_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x8300, 0x8300) AM_WRITE(marvins_soundlatch_w)
AM_RANGE(0x8400, 0x8400) AM_READ_PORT("DSW1")
AM_RANGE(0x8500, 0x8500) AM_READ_PORT("DSW2")
- AM_RANGE(0x8600, 0x8600) AM_MIRROR(0xff) AM_WRITE_LEGACY(marvins_flipscreen_w)
+ AM_RANGE(0x8600, 0x8600) AM_MIRROR(0xff) AM_WRITE(marvins_flipscreen_w)
AM_RANGE(0x8700, 0x8700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w)
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_BASE(m_spriteram) AM_SHARE("share1") // + work ram
- AM_RANGE(0xc800, 0xc800) AM_MIRROR(0xff) AM_WRITE_LEGACY(marvins_palette_bank_w)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xc800, 0xc800) AM_MIRROR(0xff) AM_WRITE(marvins_palette_bank_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share3")
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(marvins_fg_videoram_w) AM_SHARE("share4") AM_BASE(m_fg_videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(marvins_fg_videoram_w) AM_SHARE("share4") AM_BASE(m_fg_videoram)
AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("share5")
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share6") AM_BASE(m_tx_videoram) // + work RAM
- AM_RANGE(0xf800, 0xf800) AM_MIRROR(0xff) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xf900, 0xf900) AM_MIRROR(0xff) AM_WRITE_LEGACY(snk_bg_scrollx_w)
- AM_RANGE(0xfa00, 0xfa00) AM_MIRROR(0xff) AM_WRITE_LEGACY(snk_sprite_split_point_w)
- AM_RANGE(0xfb00, 0xfb00) AM_MIRROR(0xff) AM_WRITE_LEGACY(marvins_scroll_msb_w)
- AM_RANGE(0xfc00, 0xfc00) AM_MIRROR(0xff) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xfd00, 0xfd00) AM_MIRROR(0xff) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xfe00, 0xfe00) AM_MIRROR(0xff) AM_WRITE_LEGACY(snk_fg_scrolly_w)
- AM_RANGE(0xff00, 0xff00) AM_MIRROR(0xff) AM_WRITE_LEGACY(snk_fg_scrollx_w)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share6") AM_BASE(m_tx_videoram) // + work RAM
+ AM_RANGE(0xf800, 0xf800) AM_MIRROR(0xff) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xf900, 0xf900) AM_MIRROR(0xff) AM_WRITE(snk_bg_scrollx_w)
+ AM_RANGE(0xfa00, 0xfa00) AM_MIRROR(0xff) AM_WRITE(snk_sprite_split_point_w)
+ AM_RANGE(0xfb00, 0xfb00) AM_MIRROR(0xff) AM_WRITE(marvins_scroll_msb_w)
+ AM_RANGE(0xfc00, 0xfc00) AM_MIRROR(0xff) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xfd00, 0xfd00) AM_MIRROR(0xff) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xfe00, 0xfe00) AM_MIRROR(0xff) AM_WRITE(snk_fg_scrolly_w)
+ AM_RANGE(0xff00, 0xff00) AM_MIRROR(0xff) AM_WRITE(snk_fg_scrollx_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( madcrash_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x8700, 0x8700) AM_WRITE(snk_cpuB_nmi_ack_w) // vangrd2
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITE(snk_cpuB_nmi_ack_w) // madcrash
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(marvins_fg_videoram_w) AM_SHARE("share4")
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(marvins_fg_videoram_w) AM_SHARE("share4")
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share5")
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share6")
- AM_RANGE(0xd800, 0xd800) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xd900, 0xd900) AM_WRITE_LEGACY(snk_bg_scrollx_w)
- AM_RANGE(0xda00, 0xda00) AM_WRITE_LEGACY(snk_sprite_split_point_w)
- AM_RANGE(0xdb00, 0xdb00) AM_WRITE_LEGACY(marvins_scroll_msb_w)
- AM_RANGE(0xdc00, 0xdc00) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xdd00, 0xdd00) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xde00, 0xde00) AM_WRITE_LEGACY(snk_fg_scrolly_w)
- AM_RANGE(0xdf00, 0xdf00) AM_WRITE_LEGACY(snk_fg_scrollx_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share6")
+ AM_RANGE(0xd800, 0xd800) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xd900, 0xd900) AM_WRITE(snk_bg_scrollx_w)
+ AM_RANGE(0xda00, 0xda00) AM_WRITE(snk_sprite_split_point_w)
+ AM_RANGE(0xdb00, 0xdb00) AM_WRITE(marvins_scroll_msb_w)
+ AM_RANGE(0xdc00, 0xdc00) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xdd00, 0xdd00) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xde00, 0xde00) AM_WRITE(snk_fg_scrolly_w)
+ AM_RANGE(0xdf00, 0xdf00) AM_WRITE(snk_fg_scrollx_w)
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share2")
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share2")
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("share3")
ADDRESS_MAP_END
@@ -949,43 +949,43 @@ static ADDRESS_MAP_START( madcrush_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x8300, 0x8300) AM_WRITE(marvins_soundlatch_w)
AM_RANGE(0x8400, 0x8400) AM_READ_PORT("DSW1")
AM_RANGE(0x8500, 0x8500) AM_READ_PORT("DSW2")
- AM_RANGE(0x8600, 0x8600) AM_MIRROR(0xff) AM_WRITE_LEGACY(marvins_flipscreen_w)
+ AM_RANGE(0x8600, 0x8600) AM_MIRROR(0xff) AM_WRITE(marvins_flipscreen_w)
AM_RANGE(0x8700, 0x8700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w)
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_BASE(m_spriteram) AM_SHARE("share1") // + work ram
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(marvins_fg_videoram_w) AM_SHARE("share4") AM_BASE(m_fg_videoram)
- AM_RANGE(0xc800, 0xc800) AM_MIRROR(0xff) AM_WRITE_LEGACY(marvins_palette_bank_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(marvins_fg_videoram_w) AM_SHARE("share4") AM_BASE(m_fg_videoram)
+ AM_RANGE(0xc800, 0xc800) AM_MIRROR(0xff) AM_WRITE(marvins_palette_bank_w)
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share5")
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("share3")
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share6") AM_BASE(m_tx_videoram)
- AM_RANGE(0xf800, 0xf800) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xf900, 0xf900) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xfa00, 0xfa00) AM_WRITE_LEGACY(snk_fg_scrolly_w)
- AM_RANGE(0xfb00, 0xfb00) AM_WRITE_LEGACY(snk_fg_scrollx_w)
- AM_RANGE(0xfc00, 0xfc00) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xfd00, 0xfd00) AM_WRITE_LEGACY(snk_bg_scrollx_w)
- AM_RANGE(0xfe00, 0xfe00) AM_WRITE_LEGACY(snk_sprite_split_point_w)
- AM_RANGE(0xff00, 0xff00) AM_WRITE_LEGACY(marvins_scroll_msb_w)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share6") AM_BASE(m_tx_videoram)
+ AM_RANGE(0xf800, 0xf800) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xf900, 0xf900) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xfa00, 0xfa00) AM_WRITE(snk_fg_scrolly_w)
+ AM_RANGE(0xfb00, 0xfb00) AM_WRITE(snk_fg_scrollx_w)
+ AM_RANGE(0xfc00, 0xfc00) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xfd00, 0xfd00) AM_WRITE(snk_bg_scrollx_w)
+ AM_RANGE(0xfe00, 0xfe00) AM_WRITE(snk_sprite_split_point_w)
+ AM_RANGE(0xff00, 0xff00) AM_WRITE(marvins_scroll_msb_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( madcrush_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITE(snk_cpuB_nmi_ack_w)
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1") // + work ram
- AM_RANGE(0xc800, 0xc800) AM_MIRROR(0xff) AM_WRITE_LEGACY(marvins_palette_bank_w)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(marvins_fg_videoram_w) AM_SHARE("share4")
+ AM_RANGE(0xc800, 0xc800) AM_MIRROR(0xff) AM_WRITE(marvins_palette_bank_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(marvins_fg_videoram_w) AM_SHARE("share4")
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share5")
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share2") // ??
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share2") // ??
AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("share3")
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share6")
- AM_RANGE(0xf800, 0xf800) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xf900, 0xf900) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xfa00, 0xfa00) AM_WRITE_LEGACY(snk_fg_scrolly_w)
- AM_RANGE(0xfb00, 0xfb00) AM_WRITE_LEGACY(snk_fg_scrollx_w)
- AM_RANGE(0xfc00, 0xfc00) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xfd00, 0xfd00) AM_WRITE_LEGACY(snk_bg_scrollx_w)
- AM_RANGE(0xfe00, 0xfe00) AM_WRITE_LEGACY(snk_sprite_split_point_w)
- AM_RANGE(0xff00, 0xff00) AM_WRITE_LEGACY(marvins_scroll_msb_w)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share6")
+ AM_RANGE(0xf800, 0xf800) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xf900, 0xf900) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xfa00, 0xfa00) AM_WRITE(snk_fg_scrolly_w)
+ AM_RANGE(0xfb00, 0xfb00) AM_WRITE(snk_fg_scrollx_w)
+ AM_RANGE(0xfc00, 0xfc00) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xfd00, 0xfd00) AM_WRITE(snk_bg_scrollx_w)
+ AM_RANGE(0xfe00, 0xfe00) AM_WRITE(snk_sprite_split_point_w)
+ AM_RANGE(0xff00, 0xff00) AM_WRITE(marvins_scroll_msb_w)
ADDRESS_MAP_END
@@ -997,16 +997,16 @@ static ADDRESS_MAP_START( jcross_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xa300, 0xa300) AM_WRITE(sgladiat_soundlatch_w)
AM_RANGE(0xa400, 0xa400) AM_READ_PORT("DSW1")
AM_RANGE(0xa500, 0xa500) AM_READ_PORT("DSW2")
- AM_RANGE(0xa600, 0xa600) AM_WRITE_LEGACY(sgladiat_flipscreen_w) // flip screen, bg palette bank
+ AM_RANGE(0xa600, 0xa600) AM_WRITE(sgladiat_flipscreen_w) // flip screen, bg palette bank
AM_RANGE(0xa700, 0xa700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w)
- AM_RANGE(0xd300, 0xd300) AM_WRITE_LEGACY(jcross_scroll_msb_w)
- AM_RANGE(0xd400, 0xd400) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xd500, 0xd500) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xd600, 0xd600) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xd700, 0xd700) AM_WRITE_LEGACY(snk_bg_scrollx_w)
+ AM_RANGE(0xd300, 0xd300) AM_WRITE(jcross_scroll_msb_w)
+ AM_RANGE(0xd400, 0xd400) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xd500, 0xd500) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xd600, 0xd600) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xd700, 0xd700) AM_WRITE(snk_bg_scrollx_w)
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_BASE(m_spriteram) AM_SHARE("share1") // + work ram
- AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share3") AM_BASE(m_tx_videoram) // + work RAM
+ AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share3") AM_BASE(m_tx_videoram) // + work RAM
AM_RANGE(0xffff, 0xffff) AM_WRITENOP // simply a program patch to not write to two not existing video registers?
ADDRESS_MAP_END
@@ -1014,8 +1014,8 @@ static ADDRESS_MAP_START( jcross_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa700, 0xa700) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xc800, 0xd7ff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share2")
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share3")
+ AM_RANGE(0xc800, 0xd7ff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share2")
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share3")
ADDRESS_MAP_END
@@ -1027,33 +1027,33 @@ static ADDRESS_MAP_START( sgladiat_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xa300, 0xa300) AM_WRITE(sgladiat_soundlatch_w)
AM_RANGE(0xa400, 0xa400) AM_READ_PORT("DSW1")
AM_RANGE(0xa500, 0xa500) AM_READ_PORT("DSW2")
- AM_RANGE(0xa600, 0xa600) AM_WRITE_LEGACY(sgladiat_flipscreen_w) // flip screen, bg palette bank
+ AM_RANGE(0xa600, 0xa600) AM_WRITE(sgladiat_flipscreen_w) // flip screen, bg palette bank
AM_RANGE(0xa700, 0xa700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w)
AM_RANGE(0xd200, 0xd200) AM_WRITENOP // unknown
- AM_RANGE(0xd300, 0xd300) AM_WRITE_LEGACY(sgladiat_scroll_msb_w)
- AM_RANGE(0xd400, 0xd400) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xd500, 0xd500) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xd600, 0xd600) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xd700, 0xd700) AM_WRITE_LEGACY(snk_bg_scrollx_w)
+ AM_RANGE(0xd300, 0xd300) AM_WRITE(sgladiat_scroll_msb_w)
+ AM_RANGE(0xd400, 0xd400) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xd500, 0xd500) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xd600, 0xd600) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xd700, 0xd700) AM_WRITE(snk_bg_scrollx_w)
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_BASE(m_spriteram) AM_SHARE("share1") // + work ram
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
AM_RANGE(0xe800, 0xefff) AM_RAM
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share3") AM_BASE(m_tx_videoram) // + work RAM
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share3") AM_BASE(m_tx_videoram) // + work RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( sgladiat_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
- AM_RANGE(0xa600, 0xa600) AM_WRITE_LEGACY(sgladiat_flipscreen_w) // flip screen, bg palette bank
+ AM_RANGE(0xa600, 0xa600) AM_WRITE(sgladiat_flipscreen_w) // flip screen, bg palette bank
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share2")
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share2")
AM_RANGE(0xda00, 0xda00) AM_WRITENOP // unknown
- AM_RANGE(0xdb00, 0xdb00) AM_WRITE_LEGACY(sgladiat_scroll_msb_w)
- AM_RANGE(0xdc00, 0xdc00) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xdd00, 0xdd00) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xde00, 0xde00) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xdf00, 0xdf00) AM_WRITE_LEGACY(snk_bg_scrollx_w)
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share3")
+ AM_RANGE(0xdb00, 0xdb00) AM_WRITE(sgladiat_scroll_msb_w)
+ AM_RANGE(0xdc00, 0xdc00) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xdd00, 0xdd00) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xde00, 0xde00) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xdf00, 0xdf00) AM_WRITE(snk_bg_scrollx_w)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share3")
ADDRESS_MAP_END
@@ -1065,24 +1065,24 @@ static ADDRESS_MAP_START( hal21_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xc300, 0xc300) AM_WRITE(sgladiat_soundlatch_w)
AM_RANGE(0xc400, 0xc400) AM_READ_PORT("DSW1")
AM_RANGE(0xc500, 0xc500) AM_READ_PORT("DSW2")
- AM_RANGE(0xc600, 0xc600) AM_WRITE_LEGACY(hal21_flipscreen_w) // flip screen, bg tile and palette bank
+ AM_RANGE(0xc600, 0xc600) AM_WRITE(hal21_flipscreen_w) // flip screen, bg tile and palette bank
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w)
- AM_RANGE(0xd300, 0xd300) AM_WRITE_LEGACY(jcross_scroll_msb_w)
- AM_RANGE(0xd400, 0xd400) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xd500, 0xd500) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xd600, 0xd600) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xd700, 0xd700) AM_WRITE_LEGACY(snk_bg_scrollx_w)
+ AM_RANGE(0xd300, 0xd300) AM_WRITE(jcross_scroll_msb_w)
+ AM_RANGE(0xd400, 0xd400) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xd500, 0xd500) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xd600, 0xd600) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xd700, 0xd700) AM_WRITE(snk_bg_scrollx_w)
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(m_spriteram) AM_SHARE("share1") // + work ram
- AM_RANGE(0xe800, 0xf7ff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share3") AM_BASE(m_tx_videoram) // + work RAM
+ AM_RANGE(0xe800, 0xf7ff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share3") AM_BASE(m_tx_videoram) // + work RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( hal21_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITE(snk_cpuB_nmi_ack_w)
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share2")
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share3")
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share2")
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share3")
ADDRESS_MAP_END
@@ -1095,17 +1095,17 @@ static ADDRESS_MAP_START( aso_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xc500, 0xc500) AM_READ_PORT("DSW1")
AM_RANGE(0xc600, 0xc600) AM_READ_PORT("DSW2")
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w)
- AM_RANGE(0xc800, 0xc800) AM_WRITE_LEGACY(aso_videoattrs_w) // flip screen, scroll msb
- AM_RANGE(0xc900, 0xc900) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xca00, 0xca00) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xcb00, 0xcb00) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xcc00, 0xcc00) AM_WRITE_LEGACY(snk_bg_scrollx_w)
+ AM_RANGE(0xc800, 0xc800) AM_WRITE(aso_videoattrs_w) // flip screen, scroll msb
+ AM_RANGE(0xc900, 0xc900) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xca00, 0xca00) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xcb00, 0xcb00) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xcc00, 0xcc00) AM_WRITE(snk_bg_scrollx_w)
AM_RANGE(0xce00, 0xce00) AM_WRITENOP // always 05?
- AM_RANGE(0xcf00, 0xcf00) AM_WRITE_LEGACY(aso_bg_bank_w) // tile and palette bank
+ AM_RANGE(0xcf00, 0xcf00) AM_WRITE(aso_bg_bank_w) // tile and palette bank
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("share2") AM_BASE(m_spriteram) // + work ram
- AM_RANGE(0xe800, 0xf7ff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share3") AM_BASE(m_bg_videoram)
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE(m_tx_videoram) // + work RAM
+ AM_RANGE(0xe800, 0xf7ff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share3") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE(m_tx_videoram) // + work RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( aso_cpuB_map, AS_PROGRAM, 8, snk_state )
@@ -1113,8 +1113,8 @@ static ADDRESS_MAP_START( aso_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xc000, 0xc000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("share2")
- AM_RANGE(0xd800, 0xe7ff) AM_RAM_WRITE_LEGACY(marvins_bg_videoram_w) AM_SHARE("share3")
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share4")
+ AM_RANGE(0xd800, 0xe7ff) AM_RAM_WRITE(marvins_bg_videoram_w) AM_SHARE("share3")
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4")
ADDRESS_MAP_END
@@ -1130,15 +1130,15 @@ static ADDRESS_MAP_START( tnk3_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xc500, 0xc500) AM_READ_PORT("DSW1")
AM_RANGE(0xc600, 0xc600) AM_READ_PORT("DSW2")
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w)
- AM_RANGE(0xc800, 0xc800) AM_WRITE_LEGACY(tnk3_videoattrs_w) // flip screen, char bank, scroll msb
- AM_RANGE(0xc900, 0xc900) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xca00, 0xca00) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xcb00, 0xcb00) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xcc00, 0xcc00) AM_WRITE_LEGACY(snk_bg_scrollx_w)
+ AM_RANGE(0xc800, 0xc800) AM_WRITE(tnk3_videoattrs_w) // flip screen, char bank, scroll msb
+ AM_RANGE(0xc900, 0xc900) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xca00, 0xca00) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xcb00, 0xcb00) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xcc00, 0xcc00) AM_WRITE(snk_bg_scrollx_w)
AM_RANGE(0xcf00, 0xcf00) AM_WRITENOP // fitegolf/countryc only. Either 0 or 1. Video related?
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("share1") AM_BASE(m_spriteram) // + work ram
- AM_RANGE(0xd800, 0xf7ff) AM_RAM_WRITE_LEGACY(snk_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share3") AM_BASE(m_tx_videoram) // + work RAM
+ AM_RANGE(0xd800, 0xf7ff) AM_RAM_WRITE(snk_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share3") AM_BASE(m_tx_videoram) // + work RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( tnk3_cpuB_map, AS_PROGRAM, 8, snk_state )
@@ -1146,9 +1146,9 @@ static ADDRESS_MAP_START( tnk3_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xc000, 0xc000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w) // tnk3, athena
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w) // fitegolf
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xd000, 0xefff) AM_RAM_WRITE_LEGACY(snk_bg_videoram_w) AM_SHARE("share2")
+ AM_RANGE(0xd000, 0xefff) AM_RAM_WRITE(snk_bg_videoram_w) AM_SHARE("share2")
AM_RANGE(0xf000, 0xf7ff) AM_RAM
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share3")
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share3")
ADDRESS_MAP_END
@@ -1162,17 +1162,17 @@ static ADDRESS_MAP_START( ikari_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xc500, 0xc500) AM_READ_PORT("DSW1")
AM_RANGE(0xc600, 0xc600) AM_READ_PORT("DSW2")
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w)
- AM_RANGE(0xc800, 0xc800) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xc880, 0xc880) AM_WRITE_LEGACY(snk_bg_scrollx_w)
- AM_RANGE(0xc900, 0xc900) AM_WRITE_LEGACY(ikari_bg_scroll_msb_w)
- AM_RANGE(0xc980, 0xc980) AM_WRITE_LEGACY(ikari_unknown_video_w)
- AM_RANGE(0xca00, 0xca00) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xca80, 0xca80) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xcb00, 0xcb00) AM_WRITE_LEGACY(snk_sp32_scrolly_w)
- AM_RANGE(0xcb80, 0xcb80) AM_WRITE_LEGACY(snk_sp32_scrollx_w)
+ AM_RANGE(0xc800, 0xc800) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xc880, 0xc880) AM_WRITE(snk_bg_scrollx_w)
+ AM_RANGE(0xc900, 0xc900) AM_WRITE(ikari_bg_scroll_msb_w)
+ AM_RANGE(0xc980, 0xc980) AM_WRITE(ikari_unknown_video_w)
+ AM_RANGE(0xca00, 0xca00) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xca80, 0xca80) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xcb00, 0xcb00) AM_WRITE(snk_sp32_scrolly_w)
+ AM_RANGE(0xcb80, 0xcb80) AM_WRITE(snk_sp32_scrollx_w)
AM_RANGE(0xcc00, 0xcc00) AM_WRITE(hardflags_scrolly_w)
AM_RANGE(0xcc80, 0xcc80) AM_WRITE(hardflags_scrollx_w)
- AM_RANGE(0xcd00, 0xcd00) AM_WRITE_LEGACY(ikari_sp_scroll_msb_w)
+ AM_RANGE(0xcd00, 0xcd00) AM_WRITE(ikari_sp_scroll_msb_w)
AM_RANGE(0xcd80, 0xcd80) AM_WRITE(hardflags_scroll_msb_w)
AM_RANGE(0xce00, 0xce00) AM_READ(hardflags1_r)
AM_RANGE(0xce20, 0xce20) AM_READ(hardflags2_r)
@@ -1182,15 +1182,15 @@ static ADDRESS_MAP_START( ikari_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xcea0, 0xcea0) AM_READ(hardflags6_r)
AM_RANGE(0xcee0, 0xcee0) AM_READ(hardflags7_r)
// note the mirror. ikari and victroad use d800, ikarijp uses d000
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(snk_bg_videoram_w) AM_MIRROR(0x0800) AM_SHARE("share2") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(snk_bg_videoram_w) AM_MIRROR(0x0800) AM_SHARE("share2") AM_BASE(m_bg_videoram)
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share3") AM_BASE(m_spriteram) // + work ram
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE(m_tx_videoram) // + work RAM
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE(m_tx_videoram) // + work RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( ikari_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
- AM_RANGE(0xc980, 0xc980) AM_WRITE_LEGACY(ikari_unknown_video_w)
+ AM_RANGE(0xc980, 0xc980) AM_WRITE(ikari_unknown_video_w)
AM_RANGE(0xcc00, 0xcc00) AM_WRITE(hardflags_scrolly_w)
AM_RANGE(0xcc80, 0xcc80) AM_WRITE(hardflags_scrollx_w)
AM_RANGE(0xcd80, 0xcd80) AM_WRITE(hardflags_scroll_msb_w)
@@ -1201,9 +1201,9 @@ static ADDRESS_MAP_START( ikari_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xce80, 0xce80) AM_READ(hardflags5_r)
AM_RANGE(0xcea0, 0xcea0) AM_READ(hardflags6_r)
AM_RANGE(0xcee0, 0xcee0) AM_READ(hardflags7_r)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(snk_bg_videoram_w) AM_MIRROR(0x0800) AM_SHARE("share2")
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(snk_bg_videoram_w) AM_MIRROR(0x0800) AM_SHARE("share2")
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share3")
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share4")
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4")
ADDRESS_MAP_END
@@ -1217,19 +1217,19 @@ static ADDRESS_MAP_START( bermudat_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xc500, 0xc500) AM_READ_PORT("DSW1")
AM_RANGE(0xc600, 0xc600) AM_READ_PORT("DSW2")
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w)
- AM_RANGE(0xc800, 0xc800) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xc840, 0xc840) AM_WRITE_LEGACY(snk_bg_scrollx_w)
- AM_RANGE(0xc880, 0xc880) AM_WRITE_LEGACY(gwara_videoattrs_w) // flip screen, scroll msb
- AM_RANGE(0xc8c0, 0xc8c0) AM_WRITE_LEGACY(gwar_tx_bank_w) // char and palette bank
- AM_RANGE(0xc900, 0xc900) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xc940, 0xc940) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xc980, 0xc980) AM_WRITE_LEGACY(snk_sp32_scrolly_w)
- AM_RANGE(0xc9c0, 0xc9c0) AM_WRITE_LEGACY(snk_sp32_scrollx_w)
+ AM_RANGE(0xc800, 0xc800) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xc840, 0xc840) AM_WRITE(snk_bg_scrollx_w)
+ AM_RANGE(0xc880, 0xc880) AM_WRITE(gwara_videoattrs_w) // flip screen, scroll msb
+ AM_RANGE(0xc8c0, 0xc8c0) AM_WRITE(gwar_tx_bank_w) // char and palette bank
+ AM_RANGE(0xc900, 0xc900) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xc940, 0xc940) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xc980, 0xc980) AM_WRITE(snk_sp32_scrolly_w)
+ AM_RANGE(0xc9c0, 0xc9c0) AM_WRITE(snk_sp32_scrollx_w)
// the "turbo check" addresses are only used by bermudat/bermudaj, not bermudaa/worldwar or the other games
AM_RANGE(0xca00, 0xca00) AM_WRITE(turbocheck16_1_w)
AM_RANGE(0xca40, 0xca40) AM_WRITE(turbocheck16_2_w)
- AM_RANGE(0xca80, 0xca80) AM_WRITE_LEGACY(gwara_sp_scroll_msb_w)
- AM_RANGE(0xcac0, 0xcac0) AM_WRITE_LEGACY(snk_sprite_split_point_w)
+ AM_RANGE(0xca80, 0xca80) AM_WRITE(gwara_sp_scroll_msb_w)
+ AM_RANGE(0xcac0, 0xcac0) AM_WRITE(snk_sprite_split_point_w)
AM_RANGE(0xcb00, 0xcb00) AM_READ(turbocheck16_1_r)
AM_RANGE(0xcb10, 0xcb10) AM_READ(turbocheck16_2_r)
AM_RANGE(0xcb20, 0xcb20) AM_READ(turbocheck16_3_r)
@@ -1245,28 +1245,28 @@ static ADDRESS_MAP_START( bermudat_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xccd0, 0xccd0) AM_READ(turbocheck32_2_r)
AM_RANGE(0xcce0, 0xcce0) AM_READ(turbocheck32_3_r)
AM_RANGE(0xccf0, 0xccf0) AM_READ(turbocheck32_4_r)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(snk_bg_videoram_w) AM_SHARE("share1") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(snk_bg_videoram_w) AM_SHARE("share1") AM_BASE(m_bg_videoram)
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share2")
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share3") AM_BASE(m_spriteram) // + work ram
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE(m_tx_videoram) // + work RAM
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE(m_tx_videoram) // + work RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( bermudat_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
- AM_RANGE(0xc800, 0xc800) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xc840, 0xc840) AM_WRITE_LEGACY(snk_bg_scrollx_w)
- AM_RANGE(0xc880, 0xc880) AM_WRITE_LEGACY(gwara_videoattrs_w) // flip screen, scroll msb
- AM_RANGE(0xc8c0, 0xc8c0) AM_WRITE_LEGACY(gwar_tx_bank_w) // char and palette bank
- AM_RANGE(0xc900, 0xc900) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xc940, 0xc940) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xc980, 0xc980) AM_WRITE_LEGACY(snk_sp32_scrolly_w)
- AM_RANGE(0xc9c0, 0xc9c0) AM_WRITE_LEGACY(snk_sp32_scrollx_w)
- AM_RANGE(0xca80, 0xca80) AM_WRITE_LEGACY(gwara_sp_scroll_msb_w)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(snk_bg_videoram_w) AM_SHARE("share1")
+ AM_RANGE(0xc800, 0xc800) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xc840, 0xc840) AM_WRITE(snk_bg_scrollx_w)
+ AM_RANGE(0xc880, 0xc880) AM_WRITE(gwara_videoattrs_w) // flip screen, scroll msb
+ AM_RANGE(0xc8c0, 0xc8c0) AM_WRITE(gwar_tx_bank_w) // char and palette bank
+ AM_RANGE(0xc900, 0xc900) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xc940, 0xc940) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xc980, 0xc980) AM_WRITE(snk_sp32_scrolly_w)
+ AM_RANGE(0xc9c0, 0xc9c0) AM_WRITE(snk_sp32_scrollx_w)
+ AM_RANGE(0xca80, 0xca80) AM_WRITE(gwara_sp_scroll_msb_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(snk_bg_videoram_w) AM_SHARE("share1")
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share2")
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share3")
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share4")
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4")
ADDRESS_MAP_END
@@ -1280,31 +1280,31 @@ static ADDRESS_MAP_START( gwar_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xc500, 0xc500) AM_READ_PORT("DSW1")
AM_RANGE(0xc600, 0xc600) AM_READ_PORT("DSW2")
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w)
- AM_RANGE(0xc800, 0xc800) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xc840, 0xc840) AM_WRITE_LEGACY(snk_bg_scrollx_w)
- AM_RANGE(0xc880, 0xc880) AM_WRITE_LEGACY(gwar_videoattrs_w) // flip screen, scroll msb
- AM_RANGE(0xc8c0, 0xc8c0) AM_WRITE_LEGACY(gwar_tx_bank_w) // char and palette bank
- AM_RANGE(0xc900, 0xc900) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xc940, 0xc940) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xc980, 0xc980) AM_WRITE_LEGACY(snk_sp32_scrolly_w)
- AM_RANGE(0xc9c0, 0xc9c0) AM_WRITE_LEGACY(snk_sp32_scrollx_w)
+ AM_RANGE(0xc800, 0xc800) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xc840, 0xc840) AM_WRITE(snk_bg_scrollx_w)
+ AM_RANGE(0xc880, 0xc880) AM_WRITE(gwar_videoattrs_w) // flip screen, scroll msb
+ AM_RANGE(0xc8c0, 0xc8c0) AM_WRITE(gwar_tx_bank_w) // char and palette bank
+ AM_RANGE(0xc900, 0xc900) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xc940, 0xc940) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xc980, 0xc980) AM_WRITE(snk_sp32_scrolly_w)
+ AM_RANGE(0xc9c0, 0xc9c0) AM_WRITE(snk_sp32_scrollx_w)
AM_RANGE(0xca00, 0xca00) AM_WRITENOP // always 0?
AM_RANGE(0xca40, 0xca40) AM_WRITENOP // always 0?
- AM_RANGE(0xcac0, 0xcac0) AM_WRITE_LEGACY(snk_sprite_split_point_w)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(snk_bg_videoram_w) AM_SHARE("share1") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xcac0, 0xcac0) AM_WRITE(snk_sprite_split_point_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(snk_bg_videoram_w) AM_SHARE("share1") AM_BASE(m_bg_videoram)
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share2")
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share3") AM_BASE(m_spriteram) // + work ram
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE(m_tx_videoram) // + work RAM
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE(m_tx_videoram) // + work RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( gwar_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
- AM_RANGE(0xc8c0, 0xc8c0) AM_WRITE_LEGACY(gwar_tx_bank_w) // char and palette bank
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(snk_bg_videoram_w) AM_SHARE("share1")
+ AM_RANGE(0xc8c0, 0xc8c0) AM_WRITE(gwar_tx_bank_w) // char and palette bank
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(snk_bg_videoram_w) AM_SHARE("share1")
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share2")
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share3")
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share4")
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4")
ADDRESS_MAP_END
@@ -1318,30 +1318,30 @@ static ADDRESS_MAP_START( gwara_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xc500, 0xc500) AM_READ_PORT("DSW1")
AM_RANGE(0xc600, 0xc600) AM_READ_PORT("DSW2")
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share1") AM_BASE(m_tx_videoram) // + work RAM
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(snk_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share1") AM_BASE(m_tx_videoram) // + work RAM
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(snk_bg_videoram_w) AM_SHARE("share2") AM_BASE(m_bg_videoram)
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share3")
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share4") AM_BASE(m_spriteram) // + work ram
- AM_RANGE(0xf800, 0xf800) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xf840, 0xf840) AM_WRITE_LEGACY(snk_bg_scrollx_w)
- AM_RANGE(0xf880, 0xf880) AM_WRITE_LEGACY(gwara_videoattrs_w) // flip screen, scroll msb
- AM_RANGE(0xf8c0, 0xf8c0) AM_WRITE_LEGACY(gwar_tx_bank_w) // char and palette bank
- AM_RANGE(0xf900, 0xf900) AM_WRITE_LEGACY(snk_sp16_scrolly_w)
- AM_RANGE(0xf940, 0xf940) AM_WRITE_LEGACY(snk_sp16_scrollx_w)
- AM_RANGE(0xf980, 0xf980) AM_WRITE_LEGACY(snk_sp32_scrolly_w)
- AM_RANGE(0xf9c0, 0xf9c0) AM_WRITE_LEGACY(snk_sp32_scrollx_w)
- AM_RANGE(0xfa80, 0xfa80) AM_WRITE_LEGACY(gwara_sp_scroll_msb_w)
- AM_RANGE(0xfac0, 0xfac0) AM_WRITE_LEGACY(snk_sprite_split_point_w)
+ AM_RANGE(0xf800, 0xf800) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xf840, 0xf840) AM_WRITE(snk_bg_scrollx_w)
+ AM_RANGE(0xf880, 0xf880) AM_WRITE(gwara_videoattrs_w) // flip screen, scroll msb
+ AM_RANGE(0xf8c0, 0xf8c0) AM_WRITE(gwar_tx_bank_w) // char and palette bank
+ AM_RANGE(0xf900, 0xf900) AM_WRITE(snk_sp16_scrolly_w)
+ AM_RANGE(0xf940, 0xf940) AM_WRITE(snk_sp16_scrollx_w)
+ AM_RANGE(0xf980, 0xf980) AM_WRITE(snk_sp32_scrolly_w)
+ AM_RANGE(0xf9c0, 0xf9c0) AM_WRITE(snk_sp32_scrollx_w)
+ AM_RANGE(0xfa80, 0xfa80) AM_WRITE(gwara_sp_scroll_msb_w)
+ AM_RANGE(0xfac0, 0xfac0) AM_WRITE(snk_sprite_split_point_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( gwara_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share1")
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(snk_bg_videoram_w) AM_SHARE("share2")
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share1")
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(snk_bg_videoram_w) AM_SHARE("share2")
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share3")
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share4") AM_BASE(m_spriteram) // + work ram
- AM_RANGE(0xf8c0, 0xf8c0) AM_WRITE_LEGACY(gwar_tx_bank_w) // char and palette bank
+ AM_RANGE(0xf8c0, 0xf8c0) AM_WRITE(gwar_tx_bank_w) // char and palette bank
ADDRESS_MAP_END
@@ -1362,28 +1362,28 @@ static ADDRESS_MAP_START( tdfever_cpuA_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0xc600, 0xc600) AM_READ_PORT("DSW2")
AM_RANGE(0xc680, 0xc680) AM_WRITE(tdfever_coin_counter_w)
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w)
- AM_RANGE(0xc800, 0xc800) AM_WRITE_LEGACY(snk_bg_scrolly_w)
- AM_RANGE(0xc840, 0xc840) AM_WRITE_LEGACY(snk_bg_scrollx_w)
- AM_RANGE(0xc880, 0xc880) AM_WRITE_LEGACY(gwara_videoattrs_w) // flip screen, scroll msb
- AM_RANGE(0xc8c0, 0xc8c0) AM_WRITE_LEGACY(gwar_tx_bank_w) // char and palette bank
- AM_RANGE(0xc900, 0xc900) AM_WRITE_LEGACY(tdfever_sp_scroll_msb_w)
- AM_RANGE(0xc980, 0xc980) AM_WRITE_LEGACY(snk_sp32_scrolly_w)
- AM_RANGE(0xc9c0, 0xc9c0) AM_WRITE_LEGACY(snk_sp32_scrollx_w)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(snk_bg_videoram_w) AM_SHARE("share1") AM_BASE(m_bg_videoram)
+ AM_RANGE(0xc800, 0xc800) AM_WRITE(snk_bg_scrolly_w)
+ AM_RANGE(0xc840, 0xc840) AM_WRITE(snk_bg_scrollx_w)
+ AM_RANGE(0xc880, 0xc880) AM_WRITE(gwara_videoattrs_w) // flip screen, scroll msb
+ AM_RANGE(0xc8c0, 0xc8c0) AM_WRITE(gwar_tx_bank_w) // char and palette bank
+ AM_RANGE(0xc900, 0xc900) AM_WRITE(tdfever_sp_scroll_msb_w)
+ AM_RANGE(0xc980, 0xc980) AM_WRITE(snk_sp32_scrolly_w)
+ AM_RANGE(0xc9c0, 0xc9c0) AM_WRITE(snk_sp32_scrollx_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(snk_bg_videoram_w) AM_SHARE("share1") AM_BASE(m_bg_videoram)
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share2")
- AM_RANGE(0xe000, 0xf7ff) AM_RAM_WRITE_LEGACY(tdfever_spriteram_w) AM_SHARE("share3") AM_BASE(m_spriteram) // + work ram
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE(m_tx_videoram) // + work RAM
+ AM_RANGE(0xe000, 0xf7ff) AM_RAM_WRITE(tdfever_spriteram_w) AM_SHARE("share3") AM_BASE(m_spriteram) // + work ram
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE(m_tx_videoram) // + work RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( tdfever_cpuB_map, AS_PROGRAM, 8, snk_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w) // tdfever, tdfever2
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w) // fsoccer
- AM_RANGE(0xc8c0, 0xc8c0) AM_WRITE_LEGACY(gwar_tx_bank_w) // char and palette bank
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(snk_bg_videoram_w) AM_SHARE("share1")
+ AM_RANGE(0xc8c0, 0xc8c0) AM_WRITE(gwar_tx_bank_w) // char and palette bank
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(snk_bg_videoram_w) AM_SHARE("share1")
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("share2")
- AM_RANGE(0xe000, 0xf7ff) AM_RAM_WRITE_LEGACY(tdfever_spriteram_w) AM_SHARE("share3")
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE_LEGACY(snk_tx_videoram_w) AM_SHARE("share4")
+ AM_RANGE(0xe000, 0xf7ff) AM_RAM_WRITE(tdfever_spriteram_w) AM_SHARE("share3")
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4")
ADDRESS_MAP_END
/***********************************************************************/
diff --git a/src/mame/drivers/snk6502.c b/src/mame/drivers/snk6502.c
index 2e005ce63aa..2cfb4b1bf08 100644
--- a/src/mame/drivers/snk6502.c
+++ b/src/mame/drivers/snk6502.c
@@ -340,16 +340,16 @@ static CUSTOM_INPUT( sasuke_count_r )
static ADDRESS_MAP_START( sasuke_map, AS_PROGRAM, 8, snk6502_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM
- AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE_LEGACY(snk6502_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE_LEGACY(snk6502_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE_LEGACY(snk6502_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE_LEGACY(snk6502_charram_w) AM_BASE(m_charram)
+ AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(snk6502_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(snk6502_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(snk6502_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(snk6502_charram_w) AM_BASE(m_charram)
AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("crtc", mc6845_device, address_w)
AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("crtc", mc6845_device, register_w)
AM_RANGE(0x4000, 0x8fff) AM_ROM
AM_RANGE(0xb000, 0xb001) AM_WRITE_LEGACY(sasuke_sound_w)
- AM_RANGE(0xb002, 0xb002) AM_WRITE_LEGACY(satansat_b002_w) /* flip screen & irq enable */
- AM_RANGE(0xb003, 0xb003) AM_WRITE_LEGACY(satansat_backcolor_w)
+ AM_RANGE(0xb002, 0xb002) AM_WRITE(satansat_b002_w) /* flip screen & irq enable */
+ AM_RANGE(0xb003, 0xb003) AM_WRITE(satansat_backcolor_w)
AM_RANGE(0xb004, 0xb004) AM_READ_PORT("IN0")
AM_RANGE(0xb005, 0xb005) AM_READ_PORT("IN1")
AM_RANGE(0xb006, 0xb006) AM_READ_PORT("DSW")
@@ -359,16 +359,16 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( satansat_map, AS_PROGRAM, 8, snk6502_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM
- AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE_LEGACY(snk6502_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE_LEGACY(snk6502_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE_LEGACY(snk6502_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE_LEGACY(snk6502_charram_w) AM_BASE(m_charram)
+ AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(snk6502_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(snk6502_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(snk6502_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(snk6502_charram_w) AM_BASE(m_charram)
AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("crtc", mc6845_device, address_w)
AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("crtc", mc6845_device, register_w)
AM_RANGE(0x4000, 0x97ff) AM_ROM
AM_RANGE(0xb000, 0xb001) AM_WRITE_LEGACY(satansat_sound_w)
- AM_RANGE(0xb002, 0xb002) AM_WRITE_LEGACY(satansat_b002_w) /* flip screen & irq enable */
- AM_RANGE(0xb003, 0xb003) AM_WRITE_LEGACY(satansat_backcolor_w)
+ AM_RANGE(0xb002, 0xb002) AM_WRITE(satansat_b002_w) /* flip screen & irq enable */
+ AM_RANGE(0xb003, 0xb003) AM_WRITE(satansat_backcolor_w)
AM_RANGE(0xb004, 0xb004) AM_READ_PORT("IN0")
AM_RANGE(0xb005, 0xb005) AM_READ_PORT("IN1")
AM_RANGE(0xb006, 0xb006) AM_READ_PORT("DSW")
@@ -378,20 +378,20 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( vanguard_map, AS_PROGRAM, 8, snk6502_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM
- AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE_LEGACY(snk6502_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE_LEGACY(snk6502_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE_LEGACY(snk6502_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE_LEGACY(snk6502_charram_w) AM_BASE(m_charram)
+ AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(snk6502_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(snk6502_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(snk6502_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(snk6502_charram_w) AM_BASE(m_charram)
AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("crtc", mc6845_device, address_w)
AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("crtc", mc6845_device, register_w)
AM_RANGE(0x3100, 0x3102) AM_WRITE_LEGACY(vanguard_sound_w)
- AM_RANGE(0x3103, 0x3103) AM_WRITE_LEGACY(snk6502_flipscreen_w)
+ AM_RANGE(0x3103, 0x3103) AM_WRITE(snk6502_flipscreen_w)
AM_RANGE(0x3104, 0x3104) AM_READ_PORT("IN0")
AM_RANGE(0x3105, 0x3105) AM_READ_PORT("IN1")
AM_RANGE(0x3106, 0x3106) AM_READ_PORT("DSW")
AM_RANGE(0x3107, 0x3107) AM_READ_PORT("IN2")
- AM_RANGE(0x3200, 0x3200) AM_WRITE_LEGACY(snk6502_scrollx_w)
- AM_RANGE(0x3300, 0x3300) AM_WRITE_LEGACY(snk6502_scrolly_w)
+ AM_RANGE(0x3200, 0x3200) AM_WRITE(snk6502_scrollx_w)
+ AM_RANGE(0x3300, 0x3300) AM_WRITE(snk6502_scrolly_w)
AM_RANGE(0x3400, 0x3400) AM_WRITE_LEGACY(vanguard_speech_w) // speech
AM_RANGE(0x4000, 0xbfff) AM_ROM
AM_RANGE(0xf000, 0xffff) AM_ROM /* for the reset / interrupt vectors */
@@ -399,10 +399,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( fantasy_map, AS_PROGRAM, 8, snk6502_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM
- AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE_LEGACY(snk6502_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE_LEGACY(snk6502_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE_LEGACY(snk6502_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE_LEGACY(snk6502_charram_w) AM_BASE(m_charram)
+ AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(snk6502_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(snk6502_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(snk6502_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(snk6502_charram_w) AM_BASE(m_charram)
AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("crtc", mc6845_device, address_w)
AM_RANGE(0x2001, 0x2001) AM_DEVWRITE("crtc", mc6845_device, register_w)
AM_RANGE(0x2100, 0x2103) AM_WRITE_LEGACY(fantasy_sound_w)
@@ -410,8 +410,8 @@ static ADDRESS_MAP_START( fantasy_map, AS_PROGRAM, 8, snk6502_state )
AM_RANGE(0x2105, 0x2105) AM_READ_PORT("IN1")
AM_RANGE(0x2106, 0x2106) AM_READ_PORT("DSW")
AM_RANGE(0x2107, 0x2107) AM_READ_PORT("IN2")
- AM_RANGE(0x2200, 0x2200) AM_WRITE_LEGACY(snk6502_scrollx_w)
- AM_RANGE(0x2300, 0x2300) AM_WRITE_LEGACY(snk6502_scrolly_w)
+ AM_RANGE(0x2200, 0x2200) AM_WRITE(snk6502_scrollx_w)
+ AM_RANGE(0x2300, 0x2300) AM_WRITE(snk6502_scrolly_w)
AM_RANGE(0x2400, 0x2400) AM_WRITE_LEGACY(fantasy_speech_w) // speech
AM_RANGE(0x3000, 0xbfff) AM_ROM
AM_RANGE(0xf000, 0xffff) AM_ROM
@@ -419,10 +419,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pballoon_map, AS_PROGRAM, 8, snk6502_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM
- AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE_LEGACY(snk6502_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE_LEGACY(snk6502_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE_LEGACY(snk6502_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE_LEGACY(snk6502_charram_w) AM_BASE(m_charram)
+ AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(snk6502_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(snk6502_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(snk6502_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(snk6502_charram_w) AM_BASE(m_charram)
AM_RANGE(0x3000, 0x9fff) AM_ROM
AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("crtc", mc6845_device, address_w)
AM_RANGE(0xb001, 0xb001) AM_DEVWRITE("crtc", mc6845_device, register_w)
@@ -431,8 +431,8 @@ static ADDRESS_MAP_START( pballoon_map, AS_PROGRAM, 8, snk6502_state )
AM_RANGE(0xb105, 0xb105) AM_READ_PORT("IN1")
AM_RANGE(0xb106, 0xb106) AM_READ_PORT("DSW")
AM_RANGE(0xb107, 0xb107) AM_READ_PORT("IN2")
- AM_RANGE(0xb200, 0xb200) AM_WRITE_LEGACY(snk6502_scrollx_w)
- AM_RANGE(0xb300, 0xb300) AM_WRITE_LEGACY(snk6502_scrolly_w)
+ AM_RANGE(0xb200, 0xb200) AM_WRITE(snk6502_scrollx_w)
+ AM_RANGE(0xb300, 0xb300) AM_WRITE(snk6502_scrolly_w)
AM_RANGE(0xf000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index bb787b49874..51e9f04fe95 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -121,15 +121,15 @@ static ADDRESS_MAP_START( pow_map, AS_PROGRAM, 16, snk68_state )
AM_RANGE(0x080000, 0x080001) AM_READ(control_1_r)
AM_RANGE(0x080000, 0x080001) AM_WRITE(sound_w)
AM_RANGE(0x0c0000, 0x0c0001) AM_READ(control_2_r)
- AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE_LEGACY(pow_flipscreen16_w) // + char bank
+ AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(pow_flipscreen16_w) // + char bank
AM_RANGE(0x0e0000, 0x0e0001) AM_READNOP /* Watchdog or IRQ ack */
AM_RANGE(0x0e8000, 0x0e8001) AM_READNOP /* Watchdog or IRQ ack */
AM_RANGE(0x0f0000, 0x0f0001) AM_READ_PORT("DSW1")
AM_RANGE(0x0f0008, 0x0f0009) AM_READ_PORT("DSW2")
// AM_RANGE(0x0f0008, 0x0f0009) AM_WRITENOP /* ?? */
- AM_RANGE(0x100000, 0x100fff) AM_READWRITE_LEGACY(pow_fg_videoram_r, pow_fg_videoram_w) AM_MIRROR(0x1000) AM_BASE(m_pow_fg_videoram) // 8-bit
- AM_RANGE(0x200000, 0x207fff) AM_READWRITE_LEGACY(pow_spriteram_r, pow_spriteram_w) AM_BASE(m_spriteram) // only partially populated
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE_LEGACY(pow_paletteram16_word_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x100000, 0x100fff) AM_READWRITE(pow_fg_videoram_r, pow_fg_videoram_w) AM_MIRROR(0x1000) AM_BASE(m_pow_fg_videoram) // 8-bit
+ AM_RANGE(0x200000, 0x207fff) AM_READWRITE(pow_spriteram_r, pow_spriteram_w) AM_BASE(m_spriteram) // only partially populated
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(pow_paletteram16_word_w) AM_BASE(m_paletteram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( searchar_map, AS_PROGRAM, 16, snk68_state )
@@ -138,7 +138,7 @@ static ADDRESS_MAP_START( searchar_map, AS_PROGRAM, 16, snk68_state )
AM_RANGE(0x080000, 0x080005) AM_READ(protcontrols_r) /* Player 1 & 2 */
AM_RANGE(0x080000, 0x080001) AM_WRITE(sound_w)
AM_RANGE(0x080006, 0x080007) AM_WRITE(protection_w) /* top byte unknown, bottom is protection in ikari3 and streetsm */
- AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE_LEGACY(searchar_flipscreen16_w)
+ AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(searchar_flipscreen16_w)
AM_RANGE(0x0c0000, 0x0c0001) AM_READ(rotary_1_r) /* Player 1 rotary */
AM_RANGE(0x0c8000, 0x0c8001) AM_READ(rotary_2_r) /* Player 2 rotary */
AM_RANGE(0x0d0000, 0x0d0001) AM_READ(rotary_lsb_r) /* Extra rotary bits */
@@ -148,10 +148,10 @@ static ADDRESS_MAP_START( searchar_map, AS_PROGRAM, 16, snk68_state )
AM_RANGE(0x0f0000, 0x0f0001) AM_READ_PORT("DSW1")
AM_RANGE(0x0f0008, 0x0f0009) AM_READ_PORT("DSW2")
AM_RANGE(0x0f8000, 0x0f8001) AM_READ(sound_status_r)
- AM_RANGE(0x100000, 0x107fff) AM_READWRITE_LEGACY(pow_spriteram_r, pow_spriteram_w) AM_BASE(m_spriteram) // only partially populated
- AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE_LEGACY(searchar_fg_videoram_w) AM_MIRROR(0x1000) AM_BASE(m_pow_fg_videoram) /* Mirror is used by Ikari 3 */
+ AM_RANGE(0x100000, 0x107fff) AM_READWRITE(pow_spriteram_r, pow_spriteram_w) AM_BASE(m_spriteram) // only partially populated
+ AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(searchar_fg_videoram_w) AM_MIRROR(0x1000) AM_BASE(m_pow_fg_videoram) /* Mirror is used by Ikari 3 */
AM_RANGE(0x300000, 0x33ffff) AM_ROMBANK("bank1") /* Extra code bank */
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE_LEGACY(pow_paletteram16_word_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(pow_paletteram16_word_w) AM_BASE(m_paletteram)
ADDRESS_MAP_END
/******************************************************************************/
diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c
index 03b7c937a24..8d4f0e71246 100644
--- a/src/mame/drivers/snookr10.c
+++ b/src/mame/drivers/snookr10.c
@@ -504,8 +504,8 @@ static ADDRESS_MAP_START( snookr10_map, AS_PROGRAM, 8, snookr10_state )
AM_RANGE(0x3004, 0x3004) AM_READ(dsw_port_1_r) /* complement of DS1, bit 7 */
AM_RANGE(0x5000, 0x5000) AM_WRITE(output_port_0_w) /* OUT0 */
AM_RANGE(0x5001, 0x5001) AM_WRITE(output_port_1_w) /* OUT1 */
- AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE_LEGACY(snookr10_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE_LEGACY(snookr10_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(snookr10_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE(snookr10_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -518,8 +518,8 @@ static ADDRESS_MAP_START( tenballs_map, AS_PROGRAM, 8, snookr10_state )
AM_RANGE(0x4003, 0x4003) AM_READ_PORT("SW1") /* DS1 */
AM_RANGE(0x5000, 0x5000) AM_WRITE(output_port_0_w) /* OUT0 */
AM_RANGE(0x5001, 0x5001) AM_WRITE(output_port_1_w) /* OUT1 */
- AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE_LEGACY(snookr10_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE_LEGACY(snookr10_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(snookr10_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE(snookr10_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c
index 5ebab7a695a..a7b2995bcfb 100644
--- a/src/mame/drivers/solomon.c
+++ b/src/mame/drivers/solomon.c
@@ -47,10 +47,10 @@ WRITE8_MEMBER(solomon_state::nmi_mask_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, solomon_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(solomon_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE_LEGACY(solomon_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE_LEGACY(solomon_colorram2_w) AM_BASE(m_colorram2)
- AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE_LEGACY(solomon_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(solomon_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(solomon_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(solomon_colorram2_w) AM_BASE(m_colorram2)
+ AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(solomon_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0xe000, 0xe07f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe400, 0xe5ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_SHARE("paletteram")
AM_RANGE(0xe600, 0xe600) AM_READ_PORT("P1")
@@ -61,7 +61,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, solomon_state )
AM_RANGE(0xe605, 0xe605) AM_READ_PORT("DSW2")
AM_RANGE(0xe606, 0xe606) AM_READNOP /* watchdog? */
AM_RANGE(0xe600, 0xe600) AM_WRITE(nmi_mask_w)
- AM_RANGE(0xe604, 0xe604) AM_WRITE_LEGACY(solomon_flipscreen_w)
+ AM_RANGE(0xe604, 0xe604) AM_WRITE(solomon_flipscreen_w)
AM_RANGE(0xe800, 0xe800) AM_WRITE(solomon_sh_command_w)
AM_RANGE(0xf000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c
index ed8429dad7d..94b709a2608 100644
--- a/src/mame/drivers/sonson.c
+++ b/src/mame/drivers/sonson.c
@@ -79,10 +79,10 @@ WRITE8_MEMBER(sonson_state::sonson_coin2_counter_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, sonson_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE_LEGACY(sonson_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE_LEGACY(sonson_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(sonson_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
+ AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(sonson_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x2020, 0x207f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x3000, 0x3000) AM_WRITE_LEGACY(sonson_scrollx_w)
+ AM_RANGE(0x3000, 0x3000) AM_WRITE(sonson_scrollx_w)
AM_RANGE(0x3002, 0x3002) AM_READ_PORT("P1")
AM_RANGE(0x3003, 0x3003) AM_READ_PORT("P2")
AM_RANGE(0x3004, 0x3004) AM_READ_PORT("SYSTEM")
@@ -90,7 +90,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, sonson_state )
AM_RANGE(0x3006, 0x3006) AM_READ_PORT("DSW2")
AM_RANGE(0x3008, 0x3008) AM_WRITENOP // might be Y scroll, but the game always sets it to 0
AM_RANGE(0x3010, 0x3010) AM_WRITE(soundlatch_w)
- AM_RANGE(0x3018, 0x3018) AM_WRITE_LEGACY(sonson_flipscreen_w)
+ AM_RANGE(0x3018, 0x3018) AM_WRITE(sonson_flipscreen_w)
AM_RANGE(0x3019, 0x3019) AM_WRITE(sonson_sh_irqtrigger_w)
AM_RANGE(0x301e, 0x301e) AM_WRITE(sonson_coin2_counter_w)
AM_RANGE(0x301f, 0x301f) AM_WRITE(sonson_coin1_counter_w)
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index c8866151019..0e26cf52618 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -181,10 +181,11 @@ static MACHINE_START( spacefb )
static MACHINE_RESET( spacefb )
{
address_space *space = machine.device("maincpu")->memory().space(AS_IO);
+ spacefb_state *state = machine.driver_data<spacefb_state>();
/* the 3 output ports are cleared on reset */
- spacefb_port_0_w(space, 0, 0);
+ state->spacefb_port_0_w(*space, 0, 0);
spacefb_port_1_w(space, 0, 0);
- spacefb_port_2_w(space, 0, 0);
+ state->spacefb_port_2_w(*space, 0, 0);
start_interrupt_timer(machine);
}
@@ -227,9 +228,9 @@ static ADDRESS_MAP_START( spacefb_main_io_map, AS_IO, 8, spacefb_state )
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW")
AM_RANGE(0x04, 0x07) AM_READNOP /* yes, this is correct (1-of-8 decoder) */
- AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_WRITE_LEGACY(spacefb_port_0_w)
+ AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_WRITE(spacefb_port_0_w)
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_WRITE_LEGACY(spacefb_port_1_w)
- AM_RANGE(0x02, 0x02) AM_MIRROR(0x04) AM_WRITE_LEGACY(spacefb_port_2_w)
+ AM_RANGE(0x02, 0x02) AM_MIRROR(0x04) AM_WRITE(spacefb_port_2_w)
AM_RANGE(0x03, 0x03) AM_MIRROR(0x04) AM_WRITENOP
ADDRESS_MAP_END
diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c
index 036ba78aad2..f38bd5f2c04 100644
--- a/src/mame/drivers/spcforce.c
+++ b/src/mame/drivers/spcforce.c
@@ -90,7 +90,7 @@ static ADDRESS_MAP_START( spcforce_map, AS_PROGRAM, 8, spcforce_state )
AM_RANGE(0x7000, 0x7000) AM_READ_PORT("DSW") AM_WRITE(soundlatch_w)
AM_RANGE(0x7001, 0x7001) AM_READ_PORT("P1") AM_WRITE(spcforce_soundtrigger_w)
AM_RANGE(0x7002, 0x7002) AM_READ_PORT("P2")
- AM_RANGE(0x700b, 0x700b) AM_WRITE_LEGACY(spcforce_flip_screen_w)
+ AM_RANGE(0x700b, 0x700b) AM_WRITE(spcforce_flip_screen_w)
AM_RANGE(0x700e, 0x700e) AM_WRITE(irq_mask_w)
AM_RANGE(0x700f, 0x700f) AM_WRITENOP
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_BASE(m_videoram)
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index b2cec0e4d6e..ca3d326ac36 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -247,14 +247,14 @@ READ8_MEMBER(spdodgeb_state::port_0_r)
static ADDRESS_MAP_START( spdodgeb_map, AS_PROGRAM, 8, spdodgeb_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x10ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE_LEGACY(spdodgeb_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE(spdodgeb_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x3000, 0x3000) AM_READ(port_0_r) //AM_WRITENOP
AM_RANGE(0x3001, 0x3001) AM_READ_PORT("DSW") //AM_WRITENOP
AM_RANGE(0x3002, 0x3002) AM_WRITE(sound_command_w)
// AM_RANGE(0x3003, 0x3003) AM_WRITENOP
- AM_RANGE(0x3004, 0x3004) AM_WRITE_LEGACY(spdodgeb_scrollx_lo_w)
+ AM_RANGE(0x3004, 0x3004) AM_WRITE(spdodgeb_scrollx_lo_w)
// AM_RANGE(0x3005, 0x3005) AM_WRITENOP /* mcu63701_output_w */
- AM_RANGE(0x3006, 0x3006) AM_WRITE_LEGACY(spdodgeb_ctrl_w) /* scroll hi, flip screen, bank switch, palette select */
+ AM_RANGE(0x3006, 0x3006) AM_WRITE(spdodgeb_ctrl_w) /* scroll hi, flip screen, bank switch, palette select */
AM_RANGE(0x3800, 0x3800) AM_WRITE(mcu63701_w)
AM_RANGE(0x3801, 0x3805) AM_READ(mcu63701_r)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c
index 705b4677794..59080a48785 100644
--- a/src/mame/drivers/speedatk.c
+++ b/src/mame/drivers/speedatk.c
@@ -177,14 +177,14 @@ static ADDRESS_MAP_START( speedatk_mem, AS_PROGRAM, 8, speedatk_state )
AM_RANGE(0x8000, 0x8000) AM_READWRITE(key_matrix_r,key_matrix_w)
AM_RANGE(0x8001, 0x8001) AM_READWRITE(key_matrix_status_r,key_matrix_status_w)
AM_RANGE(0x8800, 0x8fff) AM_RAM
- AM_RANGE(0xa000, 0xa3ff) AM_RAM_WRITE_LEGACY(speedatk_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xb000, 0xb3ff) AM_RAM_WRITE_LEGACY(speedatk_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xa000, 0xa3ff) AM_RAM_WRITE(speedatk_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xb000, 0xb3ff) AM_RAM_WRITE(speedatk_colorram_w) AM_BASE(m_colorram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( speedatk_io, AS_IO, 8, speedatk_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x01) AM_WRITE_LEGACY(speedatk_6845_w) //h46505 address / data routing
+ AM_RANGE(0x00, 0x01) AM_WRITE(speedatk_6845_w) //h46505 address / data routing
AM_RANGE(0x24, 0x24) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x40, 0x40) AM_DEVREAD_LEGACY("aysnd", ay8910_r)
AM_RANGE(0x40, 0x41) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_data_w)
diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c
index eafb262cc38..b8b70c1ab10 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -67,8 +67,8 @@ WRITE8_MEMBER(speedbal_state::speedbal_coincounter_w)
static ADDRESS_MAP_START( main_cpu_map, AS_PROGRAM, 8, speedbal_state )
AM_RANGE(0x0000, 0xdbff) AM_ROM
AM_RANGE(0xdc00, 0xdfff) AM_RAM AM_SHARE("share1") // shared with SOUND
- AM_RANGE(0xe000, 0xe1ff) AM_RAM_WRITE_LEGACY(speedbal_background_videoram_w) AM_BASE(m_background_videoram)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(speedbal_foreground_videoram_w) AM_BASE(m_foreground_videoram)
+ AM_RANGE(0xe000, 0xe1ff) AM_RAM_WRITE(speedbal_background_videoram_w) AM_BASE(m_background_videoram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(speedbal_foreground_videoram_w) AM_BASE(m_foreground_videoram)
AM_RANGE(0xf000, 0xf5ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
AM_RANGE(0xf600, 0xfeff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xff00, 0xffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c
index 7e425199536..27ff6f777d5 100644
--- a/src/mame/drivers/speedspn.c
+++ b/src/mame/drivers/speedspn.c
@@ -108,8 +108,8 @@ static WRITE8_DEVICE_HANDLER( oki_banking_w )
static ADDRESS_MAP_START( speedspn_map, AS_PROGRAM, 8, speedspn_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_SHARE("paletteram") /* RAM COLOUR */
- AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE_LEGACY(speedspn_attram_w) AM_BASE(m_attram)
- AM_RANGE(0x9000, 0x9fff) AM_READWRITE_LEGACY(speedspn_vidram_r,speedspn_vidram_w) /* RAM FIX / RAM OBJECTS (selected by bit 0 of port 17) */
+ AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(speedspn_attram_w) AM_BASE(m_attram)
+ AM_RANGE(0x9000, 0x9fff) AM_READWRITE(speedspn_vidram_r,speedspn_vidram_w) /* RAM FIX / RAM OBJECTS (selected by bit 0 of port 17) */
AM_RANGE(0xa000, 0xa7ff) AM_RAM
AM_RANGE(0xa800, 0xafff) AM_RAM
AM_RANGE(0xb000, 0xbfff) AM_RAM /* RAM PROGRAM */
@@ -118,14 +118,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( speedspn_io_map, AS_IO, 8, speedspn_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x07, 0x07) AM_WRITE_LEGACY(speedspn_global_display_w)
+ AM_RANGE(0x07, 0x07) AM_WRITE(speedspn_global_display_w)
AM_RANGE(0x10, 0x10) AM_READ_PORT("SYSTEM")
AM_RANGE(0x11, 0x11) AM_READ_PORT("P1")
AM_RANGE(0x12, 0x12) AM_READ_PORT("P2") AM_WRITE(speedspn_banked_rom_change)
AM_RANGE(0x13, 0x13) AM_READ_PORT("DSW1") AM_WRITE(speedspn_sound_w)
AM_RANGE(0x14, 0x14) AM_READ_PORT("DSW2")
AM_RANGE(0x16, 0x16) AM_READ(speedspn_irq_ack_r) // @@@ could be watchdog, value is discarded
- AM_RANGE(0x17, 0x17) AM_WRITE_LEGACY(speedspn_banked_vidram_change)
+ AM_RANGE(0x17, 0x17) AM_WRITE(speedspn_banked_vidram_change)
ADDRESS_MAP_END
/* sound cpu */
diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c
index 0c746c77a2b..e7a843c41d6 100644
--- a/src/mame/drivers/speglsht.c
+++ b/src/mame/drivers/speglsht.c
@@ -110,11 +110,11 @@ Notes:
#include "includes/st0016.h"
-class speglsht_state : public driver_device
+class speglsht_state : public st0016_state
{
public:
speglsht_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag) { }
+ : st0016_state(mconfig, type, tag) { }
UINT8 *m_shared;
UINT32 *m_framebuffer;
@@ -133,26 +133,26 @@ public:
static ADDRESS_MAP_START( st0016_mem, AS_PROGRAM, 8, speglsht_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xcfff) AM_READ_LEGACY(st0016_sprite_ram_r) AM_WRITE_LEGACY(st0016_sprite_ram_w)
- AM_RANGE(0xd000, 0xdfff) AM_READ_LEGACY(st0016_sprite2_ram_r) AM_WRITE_LEGACY(st0016_sprite2_ram_w)
+ AM_RANGE(0xc000, 0xcfff) AM_READ(st0016_sprite_ram_r) AM_WRITE(st0016_sprite_ram_w)
+ AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w)
AM_RANGE(0xe000, 0xe7ff) AM_RAM
AM_RANGE(0xe800, 0xe87f) AM_RAM
AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE_LEGACY("stsnd", st0016_snd_r, st0016_snd_w)
- AM_RANGE(0xea00, 0xebff) AM_READ_LEGACY(st0016_palette_ram_r) AM_WRITE_LEGACY(st0016_palette_ram_w)
- AM_RANGE(0xec00, 0xec1f) AM_READ_LEGACY(st0016_character_ram_r) AM_WRITE_LEGACY(st0016_character_ram_w)
+ AM_RANGE(0xea00, 0xebff) AM_READ(st0016_palette_ram_r) AM_WRITE(st0016_palette_ram_w)
+ AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w)
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE(m_shared)
ADDRESS_MAP_END
static ADDRESS_MAP_START( st0016_io, AS_IO, 8, speglsht_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0xbf) AM_READ_LEGACY(st0016_vregs_r) AM_WRITE_LEGACY(st0016_vregs_w)
+ AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w)
AM_RANGE(0xe1, 0xe1) AM_WRITE_LEGACY(st0016_rom_bank_w)
- AM_RANGE(0xe2, 0xe2) AM_WRITE_LEGACY(st0016_sprite_bank_w)
- AM_RANGE(0xe3, 0xe4) AM_WRITE_LEGACY(st0016_character_bank_w)
- AM_RANGE(0xe5, 0xe5) AM_WRITE_LEGACY(st0016_palette_bank_w)
+ AM_RANGE(0xe2, 0xe2) AM_WRITE(st0016_sprite_bank_w)
+ AM_RANGE(0xe3, 0xe4) AM_WRITE(st0016_character_bank_w)
+ AM_RANGE(0xe5, 0xe5) AM_WRITE(st0016_palette_bank_w)
AM_RANGE(0xe6, 0xe6) AM_WRITENOP
AM_RANGE(0xe7, 0xe7) AM_WRITENOP
- AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(st0016_dma_r)
+ AM_RANGE(0xf0, 0xf0) AM_READ(st0016_dma_r)
ADDRESS_MAP_END
READ32_MEMBER(speglsht_state::shared_r)
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index 3d5fa2d0bf0..39491f87a38 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -97,7 +97,7 @@ static ADDRESS_MAP_START( splash_map, AS_PROGRAM, 16, splash_state )
AM_RANGE(0x840006, 0x840007) AM_READ_PORT("P2")
AM_RANGE(0x84000e, 0x84000f) AM_WRITE(splash_sh_irqtrigger_w) /* Sound command */
AM_RANGE(0x84000a, 0x84003b) AM_WRITE(splash_coin_w) /* Coin Counters + Coin Lockout */
- AM_RANGE(0x880000, 0x8817ff) AM_RAM_WRITE_LEGACY(splash_vram_w) AM_BASE(m_videoram) /* Video RAM */
+ AM_RANGE(0x880000, 0x8817ff) AM_RAM_WRITE(splash_vram_w) AM_BASE(m_videoram) /* Video RAM */
AM_RANGE(0x881800, 0x881803) AM_RAM AM_BASE(m_vregs) /* Scroll registers */
AM_RANGE(0x881804, 0x881fff) AM_RAM /* Work RAM */
AM_RANGE(0x8c0000, 0x8c0fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")/* Palette is xRRRRxGGGGxBBBBx */
@@ -176,7 +176,7 @@ static ADDRESS_MAP_START( roldfrog_map, AS_PROGRAM, 16, splash_state )
AM_RANGE(0x840006, 0x840007) AM_READ_PORT("P2")
AM_RANGE(0x84000e, 0x84000f) AM_WRITE(roldf_sh_irqtrigger_w) /* Sound command */
AM_RANGE(0x84000a, 0x84003b) AM_WRITE(splash_coin_w) /* Coin Counters + Coin Lockout */
- AM_RANGE(0x880000, 0x8817ff) AM_RAM_WRITE_LEGACY(splash_vram_w) AM_BASE(m_videoram) /* Video RAM */
+ AM_RANGE(0x880000, 0x8817ff) AM_RAM_WRITE(splash_vram_w) AM_BASE(m_videoram) /* Video RAM */
AM_RANGE(0x881800, 0x881803) AM_RAM AM_BASE(m_vregs) /* Scroll registers */
AM_RANGE(0x881804, 0x881fff) AM_RAM /* Work RAM */
AM_RANGE(0x8c0000, 0x8c0fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")/* Palette is xRRRRxGGGGxBBBBx */
@@ -237,7 +237,7 @@ static ADDRESS_MAP_START( funystrp_map, AS_PROGRAM, 16, splash_state )
AM_RANGE(0x840004, 0x840005) AM_READ_PORT("P1")
AM_RANGE(0x840006, 0x840007) AM_READ_PORT("P2")
AM_RANGE(0x840008, 0x840009) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x880000, 0x8817ff) AM_RAM_WRITE_LEGACY(splash_vram_w) AM_BASE(m_videoram) /* Video RAM */
+ AM_RANGE(0x880000, 0x8817ff) AM_RAM_WRITE(splash_vram_w) AM_BASE(m_videoram) /* Video RAM */
AM_RANGE(0x881800, 0x881803) AM_RAM AM_BASE(m_vregs) /* Scroll registers */
AM_RANGE(0x881804, 0x881fff) AM_WRITENOP
AM_RANGE(0x8c0000, 0x8c0fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")/* Palette is xRRRRxGGGGxBBBBx */
diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c
index c6dd2a0073a..b331d028ed5 100644
--- a/src/mame/drivers/sprcros2.c
+++ b/src/mame/drivers/sprcros2.c
@@ -102,7 +102,7 @@ WRITE8_MEMBER(sprcros2_state::sprcros2_s_port3_w)
static ADDRESS_MAP_START( sprcros2_master_map, AS_PROGRAM, 8, sprcros2_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank1")
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(sprcros2_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(sprcros2_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0xe800, 0xe817) AM_RAM //always zero
AM_RANGE(0xe818, 0xe83f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe840, 0xefff) AM_RAM //always zero
@@ -123,7 +123,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sprcros2_slave_map, AS_PROGRAM, 8, sprcros2_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank2")
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(sprcros2_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(sprcros2_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0xe800, 0xefff) AM_RAM //always zero
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("share1")
@@ -131,8 +131,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sprcros2_slave_io_map, AS_IO, 8, sprcros2_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_WRITE_LEGACY(sprcros2_bgscrollx_w)
- AM_RANGE(0x01, 0x01) AM_WRITE_LEGACY(sprcros2_bgscrolly_w)
+ AM_RANGE(0x00, 0x00) AM_WRITE(sprcros2_bgscrollx_w)
+ AM_RANGE(0x01, 0x01) AM_WRITE(sprcros2_bgscrolly_w)
AM_RANGE(0x03, 0x03) AM_WRITE(sprcros2_s_port3_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c
index 21849d181b2..455fa59491b 100644
--- a/src/mame/drivers/sprint2.c
+++ b/src/mame/drivers/sprint2.c
@@ -249,7 +249,7 @@ WRITE8_MEMBER(sprint2_state::sprint2_lamp2_w)
static ADDRESS_MAP_START( sprint2_map, AS_PROGRAM, 8, sprint2_state )
AM_RANGE(0x0000, 0x03ff) AM_READWRITE(sprint2_wram_r,sprint2_wram_w)
- AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE_LEGACY(sprint2_video_ram_w) AM_BASE(m_video_ram)
+ AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(sprint2_video_ram_w) AM_BASE(m_video_ram)
AM_RANGE(0x0818, 0x081f) AM_READ(sprint2_input_A_r)
AM_RANGE(0x0828, 0x082f) AM_READ(sprint2_input_B_r)
AM_RANGE(0x0830, 0x0837) AM_READ(sprint2_dip_r)
@@ -264,13 +264,13 @@ static ADDRESS_MAP_START( sprint2_map, AS_PROGRAM, 8, sprint2_state )
AM_RANGE(0x0c40, 0x0c4f) AM_WRITE(sprint2_lamp2_w)
AM_RANGE(0x0c60, 0x0c6f) AM_WRITENOP /* SPARE */
AM_RANGE(0x0c80, 0x0cff) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x0d00, 0x0d7f) AM_WRITE_LEGACY(sprint2_collision_reset1_w)
- AM_RANGE(0x0d80, 0x0dff) AM_WRITE_LEGACY(sprint2_collision_reset2_w)
+ AM_RANGE(0x0d00, 0x0d7f) AM_WRITE(sprint2_collision_reset1_w)
+ AM_RANGE(0x0d80, 0x0dff) AM_WRITE(sprint2_collision_reset2_w)
AM_RANGE(0x0e00, 0x0e7f) AM_WRITE(sprint2_steering_reset1_w)
AM_RANGE(0x0e80, 0x0eff) AM_WRITE(sprint2_steering_reset2_w)
AM_RANGE(0x0f00, 0x0f7f) AM_DEVWRITE_LEGACY("discrete", sprint2_noise_reset_w)
- AM_RANGE(0x1000, 0x13ff) AM_READ_LEGACY(sprint2_collision1_r)
- AM_RANGE(0x1400, 0x17ff) AM_READ_LEGACY(sprint2_collision2_r)
+ AM_RANGE(0x1000, 0x13ff) AM_READ(sprint2_collision1_r)
+ AM_RANGE(0x1400, 0x17ff) AM_READ(sprint2_collision2_r)
AM_RANGE(0x1800, 0x1800) AM_READNOP /* debugger ROM location? */
AM_RANGE(0x2000, 0x3fff) AM_ROM
AM_RANGE(0xe000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c
index fc58323f925..5661f4cc576 100644
--- a/src/mame/drivers/sprint4.c
+++ b/src/mame/drivers/sprint4.c
@@ -231,7 +231,7 @@ static ADDRESS_MAP_START( sprint4_cpu_map, AS_PROGRAM, 8, sprint4_state )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x700) AM_READWRITE(sprint4_wram_r, sprint4_wram_w)
- AM_RANGE(0x0800, 0x0bff) AM_MIRROR(0x400) AM_RAM_WRITE_LEGACY(sprint4_video_ram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0800, 0x0bff) AM_MIRROR(0x400) AM_RAM_WRITE(sprint4_video_ram_w) AM_BASE(m_videoram)
AM_RANGE(0x0000, 0x0007) AM_MIRROR(0x718) AM_READ(sprint4_analog_r)
AM_RANGE(0x0020, 0x0027) AM_MIRROR(0x718) AM_READ(sprint4_coin_r)
diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c
index fc3c3b0bf4b..15720797807 100644
--- a/src/mame/drivers/sprint8.c
+++ b/src/mame/drivers/sprint8.c
@@ -101,7 +101,7 @@ WRITE8_MEMBER(sprint8_state::sprint8_int_reset_w)
static ADDRESS_MAP_START( sprint8_map, AS_PROGRAM, 8, sprint8_state )
AM_RANGE(0x0000, 0x00ff) AM_RAM
- AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE_LEGACY(sprint8_video_ram_w) AM_BASE(m_video_ram)
+ AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(sprint8_video_ram_w) AM_BASE(m_video_ram)
AM_RANGE(0x1c00, 0x1c00) AM_READ(sprint8_collision_r)
AM_RANGE(0x1c01, 0x1c08) AM_READ(sprint8_input_r)
AM_RANGE(0x1c09, 0x1c09) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index fbed9a9f016..b46954a50d8 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -61,11 +61,11 @@ This is not a bug (real machine behaves the same).
#define SPRITE_DATA_GRANULARITY 0x80
-class srmp5_state : public driver_device
+class srmp5_state : public st0016_state
{
public:
srmp5_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag) { }
+ : st0016_state(mconfig, type, tag) { }
UINT32 m_databank;
UINT16 *m_tileram;
@@ -382,7 +382,7 @@ static ADDRESS_MAP_START( st0016_mem, AS_PROGRAM, 8, srmp5_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE_LEGACY("stsnd", st0016_snd_r, st0016_snd_w)
- AM_RANGE(0xec00, 0xec1f) AM_READ_LEGACY(st0016_character_ram_r) AM_WRITE_LEGACY(st0016_character_ram_w)
+ AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w)
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -407,13 +407,13 @@ READ8_MEMBER(srmp5_state::cmd_stat8_r)
static ADDRESS_MAP_START( st0016_io, AS_IO, 8, srmp5_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0xbf) AM_READ_LEGACY(st0016_vregs_r) AM_WRITE_LEGACY(st0016_vregs_w)
+ AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w)
AM_RANGE(0xc0, 0xc0) AM_READ(cmd1_r)
AM_RANGE(0xc1, 0xc1) AM_READ(cmd2_r)
AM_RANGE(0xc2, 0xc2) AM_READ(cmd_stat8_r)
AM_RANGE(0xe1, 0xe1) AM_WRITE_LEGACY(st0016_rom_bank_w)
AM_RANGE(0xe7, 0xe7) AM_WRITE_LEGACY(st0016_rom_bank_w)
- AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(st0016_dma_r)
+ AM_RANGE(0xf0, 0xf0) AM_READ(st0016_dma_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index 6b1ccb19c45..db77d874343 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -76,15 +76,15 @@ Ignore the warnings about writing to unmapped memory.
static ADDRESS_MAP_START( srumbler_map, AS_PROGRAM, 8, srumbler_state )
AM_RANGE(0x0000, 0x1dff) AM_RAM /* RAM (of 1 sort or another) */
AM_RANGE(0x1e00, 0x1fff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE_LEGACY(srumbler_background_w) AM_BASE(m_backgroundram)
+ AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(srumbler_background_w) AM_BASE(m_backgroundram)
AM_RANGE(0x4008, 0x4008) AM_READ_PORT("SYSTEM") AM_WRITE(srumbler_bankswitch_w)
- AM_RANGE(0x4009, 0x4009) AM_READ_PORT("P1") AM_WRITE_LEGACY(srumbler_4009_w)
+ AM_RANGE(0x4009, 0x4009) AM_READ_PORT("P1") AM_WRITE(srumbler_4009_w)
AM_RANGE(0x400a, 0x400a) AM_READ_PORT("P2")
AM_RANGE(0x400b, 0x400b) AM_READ_PORT("DSW1")
AM_RANGE(0x400c, 0x400c) AM_READ_PORT("DSW2")
- AM_RANGE(0x400a, 0x400d) AM_WRITE_LEGACY(srumbler_scroll_w)
+ AM_RANGE(0x400a, 0x400d) AM_WRITE(srumbler_scroll_w)
AM_RANGE(0x400e, 0x400e) AM_WRITE(soundlatch_w)
- AM_RANGE(0x5000, 0x5fff) AM_ROMBANK("5000") AM_WRITE_LEGACY(srumbler_foreground_w) AM_BASE(m_foregroundram) /* Banked ROM */
+ AM_RANGE(0x5000, 0x5fff) AM_ROMBANK("5000") AM_WRITE(srumbler_foreground_w) AM_BASE(m_foregroundram) /* Banked ROM */
AM_RANGE(0x6000, 0x6fff) AM_ROMBANK("6000") /* Banked ROM */
AM_RANGE(0x6000, 0x6fff) AM_WRITENOP /* Video RAM 2 ??? (not used) */
AM_RANGE(0x7000, 0x7fff) AM_ROMBANK("7000") /* Banked ROM */
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index cf5fb6785ef..b69faccc5ae 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -162,7 +162,7 @@ static ADDRESS_MAP_START( sshangha_map, AS_PROGRAM, 16, sshangha_state )
AM_RANGE(0x206000, 0x2067ff) AM_RAM AM_BASE(m_pf2_rowscroll)
AM_RANGE(0x206800, 0x207fff) AM_RAM
AM_RANGE(0x300000, 0x30000f) AM_DEVWRITE_LEGACY("tilegen1", deco16ic_pf_control_w)
- AM_RANGE(0x320000, 0x320001) AM_WRITE_LEGACY(sshangha_video_w)
+ AM_RANGE(0x320000, 0x320001) AM_WRITE(sshangha_video_w)
AM_RANGE(0x320002, 0x320005) AM_WRITENOP
AM_RANGE(0x320006, 0x320007) AM_READNOP //irq ack
@@ -194,7 +194,7 @@ static ADDRESS_MAP_START( sshanghb_map, AS_PROGRAM, 16, sshangha_state )
AM_RANGE(0x206000, 0x2067ff) AM_RAM AM_BASE(m_pf2_rowscroll)
AM_RANGE(0x206800, 0x207fff) AM_RAM
AM_RANGE(0x300000, 0x30000f) AM_DEVWRITE_LEGACY("tilegen1", deco16ic_pf_control_w)
- AM_RANGE(0x320000, 0x320001) AM_WRITE_LEGACY(sshangha_video_w)
+ AM_RANGE(0x320000, 0x320001) AM_WRITE(sshangha_video_w)
AM_RANGE(0x320002, 0x320005) AM_WRITENOP
AM_RANGE(0x320006, 0x320007) AM_READNOP //irq ack
diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c
index 913fa2bf2cf..e6295b6b588 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -383,12 +383,12 @@ WRITE16_MEMBER(sslam_state::powerbls_sound_w)
static ADDRESS_MAP_START( sslam_program_map, AS_PROGRAM, 16, sslam_state )
AM_RANGE(0x000400, 0x07ffff) AM_RAM
- AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE_LEGACY(sslam_bg_tileram_w) AM_BASE(m_bg_tileram)
- AM_RANGE(0x104000, 0x107fff) AM_RAM_WRITE_LEGACY(sslam_md_tileram_w) AM_BASE(m_md_tileram)
- AM_RANGE(0x108000, 0x10ffff) AM_RAM_WRITE_LEGACY(sslam_tx_tileram_w) AM_BASE(m_tx_tileram)
+ AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(sslam_bg_tileram_w) AM_BASE(m_bg_tileram)
+ AM_RANGE(0x104000, 0x107fff) AM_RAM_WRITE(sslam_md_tileram_w) AM_BASE(m_md_tileram)
+ AM_RANGE(0x108000, 0x10ffff) AM_RAM_WRITE(sslam_tx_tileram_w) AM_BASE(m_tx_tileram)
AM_RANGE(0x110000, 0x11000d) AM_RAM AM_BASE(m_regs)
AM_RANGE(0x200000, 0x200001) AM_WRITENOP
- AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE_LEGACY(sslam_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(sslam_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x304000, 0x304001) AM_WRITENOP
AM_RANGE(0x300010, 0x300011) AM_READ_PORT("IN0")
@@ -406,12 +406,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( powerbls_map, AS_PROGRAM, 16, sslam_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE_LEGACY(powerbls_bg_tileram_w) AM_BASE(m_bg_tileram)
+ AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(powerbls_bg_tileram_w) AM_BASE(m_bg_tileram)
AM_RANGE(0x104000, 0x107fff) AM_RAM // not used
AM_RANGE(0x110000, 0x11000d) AM_RAM AM_BASE(m_regs)
AM_RANGE(0x200000, 0x200001) AM_WRITENOP
AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x280000, 0x2803ff) AM_RAM_WRITE_LEGACY(sslam_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0x280000, 0x2803ff) AM_RAM_WRITE(sslam_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0x300010, 0x300011) AM_READ_PORT("IN0")
AM_RANGE(0x300012, 0x300013) AM_READ_PORT("IN1")
AM_RANGE(0x300014, 0x300015) AM_READ_PORT("IN2")
@@ -435,7 +435,7 @@ READ8_MEMBER(sslam_state::playmark_snd_command_r)
data = soundlatch_r(space,0);
}
else if ((m_oki_control & 0x38) == 0x28) {
- data = (machine().device<okim6295_device>("oki")->read(*&space,0) & 0x0f);
+ data = (machine().device<okim6295_device>("oki")->read(space,0) & 0x0f);
}
return data;
@@ -463,7 +463,7 @@ WRITE8_MEMBER(sslam_state::playmark_snd_control_w)
if ((data & 0x38) == 0x18)
{
- machine().device<okim6295_device>("oki")->write(*&space, 0, m_oki_command);
+ machine().device<okim6295_device>("oki")->write(space, 0, m_oki_command);
}
// !(data & 0x80) -> sound enable
diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c
index e2e3b4ee59a..d9f724d8389 100644
--- a/src/mame/drivers/ssozumo.c
+++ b/src/mame/drivers/ssozumo.c
@@ -24,18 +24,18 @@ WRITE8_MEMBER(ssozumo_state::ssozumo_sh_command_w)
static ADDRESS_MAP_START( ssozumo_map, AS_PROGRAM, 8, ssozumo_state )
AM_RANGE(0x0000, 0x077f) AM_RAM
AM_RANGE(0x0780, 0x07ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE_LEGACY(ssozumo_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x2400, 0x27ff) AM_RAM_WRITE_LEGACY(ssozumo_colorram2_w) AM_BASE(m_colorram2)
- AM_RANGE(0x3000, 0x31ff) AM_RAM_WRITE_LEGACY(ssozumo_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x3200, 0x33ff) AM_RAM_WRITE_LEGACY(ssozumo_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(ssozumo_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x2400, 0x27ff) AM_RAM_WRITE(ssozumo_colorram2_w) AM_BASE(m_colorram2)
+ AM_RANGE(0x3000, 0x31ff) AM_RAM_WRITE(ssozumo_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x3200, 0x33ff) AM_RAM_WRITE(ssozumo_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x3400, 0x35ff) AM_RAM
AM_RANGE(0x3600, 0x37ff) AM_RAM
- AM_RANGE(0x4000, 0x4000) AM_READ_PORT("P1") AM_WRITE_LEGACY(ssozumo_flipscreen_w)
+ AM_RANGE(0x4000, 0x4000) AM_READ_PORT("P1") AM_WRITE(ssozumo_flipscreen_w)
AM_RANGE(0x4010, 0x4010) AM_READ_PORT("P2") AM_WRITE(ssozumo_sh_command_w)
- AM_RANGE(0x4020, 0x4020) AM_READ_PORT("DSW2") AM_WRITE_LEGACY(ssozumo_scroll_w)
+ AM_RANGE(0x4020, 0x4020) AM_READ_PORT("DSW2") AM_WRITE(ssozumo_scroll_w)
AM_RANGE(0x4030, 0x4030) AM_READ_PORT("DSW1")
// AM_RANGE(0x4030, 0x4030) AM_WRITEONLY
- AM_RANGE(0x4050, 0x407f) AM_RAM_WRITE_LEGACY(ssozumo_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x4050, 0x407f) AM_RAM_WRITE(ssozumo_paletteram_w) AM_BASE(m_paletteram)
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c
index 9110da84c2d..a9514eadebc 100644
--- a/src/mame/drivers/sspeedr.c
+++ b/src/mame/drivers/sspeedr.c
@@ -92,18 +92,18 @@ static ADDRESS_MAP_START( sspeedr_io_map, AS_IO, 8, sspeedr_state )
AM_RANGE(0x04, 0x04) AM_READ_PORT("IN2")
AM_RANGE(0x04, 0x05) AM_WRITE(sspeedr_time_w)
AM_RANGE(0x06, 0x06) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(sspeedr_driver_horz_w)
- AM_RANGE(0x11, 0x11) AM_WRITE_LEGACY(sspeedr_driver_pic_w)
- AM_RANGE(0x12, 0x12) AM_WRITE_LEGACY(sspeedr_driver_horz_2_w)
- AM_RANGE(0x13, 0x13) AM_WRITE_LEGACY(sspeedr_drones_horz_w)
- AM_RANGE(0x14, 0x14) AM_WRITE_LEGACY(sspeedr_drones_horz_2_w)
- AM_RANGE(0x15, 0x15) AM_WRITE_LEGACY(sspeedr_drones_mask_w)
- AM_RANGE(0x16, 0x16) AM_WRITE_LEGACY(sspeedr_driver_vert_w)
- AM_RANGE(0x17, 0x18) AM_WRITE_LEGACY(sspeedr_track_vert_w)
- AM_RANGE(0x19, 0x19) AM_WRITE_LEGACY(sspeedr_track_horz_w)
- AM_RANGE(0x1a, 0x1a) AM_WRITE_LEGACY(sspeedr_track_horz_2_w)
- AM_RANGE(0x1b, 0x1b) AM_WRITE_LEGACY(sspeedr_track_ice_w)
- AM_RANGE(0x1c, 0x1e) AM_WRITE_LEGACY(sspeedr_drones_vert_w)
+ AM_RANGE(0x10, 0x10) AM_WRITE(sspeedr_driver_horz_w)
+ AM_RANGE(0x11, 0x11) AM_WRITE(sspeedr_driver_pic_w)
+ AM_RANGE(0x12, 0x12) AM_WRITE(sspeedr_driver_horz_2_w)
+ AM_RANGE(0x13, 0x13) AM_WRITE(sspeedr_drones_horz_w)
+ AM_RANGE(0x14, 0x14) AM_WRITE(sspeedr_drones_horz_2_w)
+ AM_RANGE(0x15, 0x15) AM_WRITE(sspeedr_drones_mask_w)
+ AM_RANGE(0x16, 0x16) AM_WRITE(sspeedr_driver_vert_w)
+ AM_RANGE(0x17, 0x18) AM_WRITE(sspeedr_track_vert_w)
+ AM_RANGE(0x19, 0x19) AM_WRITE(sspeedr_track_horz_w)
+ AM_RANGE(0x1a, 0x1a) AM_WRITE(sspeedr_track_horz_2_w)
+ AM_RANGE(0x1b, 0x1b) AM_WRITE(sspeedr_track_ice_w)
+ AM_RANGE(0x1c, 0x1e) AM_WRITE(sspeedr_drones_vert_w)
AM_RANGE(0x1f, 0x1f) AM_WRITE(sspeedr_int_ack_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c
index 87f7423c5c9..61cb90ae01d 100644
--- a/src/mame/drivers/ssrj.c
+++ b/src/mame/drivers/ssrj.c
@@ -54,10 +54,10 @@ READ8_MEMBER(ssrj_state::ssrj_wheel_r)
static ADDRESS_MAP_START( ssrj_map, AS_PROGRAM, 8, ssrj_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(ssrj_vram1_w) AM_BASE(m_vram1)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(ssrj_vram2_w) AM_BASE(m_vram2)
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(ssrj_vram1_w) AM_BASE(m_vram1)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(ssrj_vram2_w) AM_BASE(m_vram2)
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE(m_vram3)
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(ssrj_vram4_w) AM_BASE(m_vram4)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(ssrj_vram4_w) AM_BASE(m_vram4)
AM_RANGE(0xe000, 0xe7ff) AM_RAM
AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(m_scrollram)
AM_RANGE(0xf000, 0xf000) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index f0a184a0092..c7776c878ef 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -408,11 +408,11 @@ READ16_MEMBER(ssv_state::fake_r){ return ssv_scroll[offset]; }
#define SSV_MAP( _ROM ) \
AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_BASE(m_mainram) /* RAM */ \
AM_RANGE(0x100000, 0x13ffff) AM_RAM AM_BASE(m_spriteram) /* Sprites */ \
- AM_RANGE(0x140000, 0x15ffff) AM_RAM_WRITE_LEGACY(paletteram16_xrgb_swap_word_w) AM_BASE(m_paletteram) /* Palette */ \
+ AM_RANGE(0x140000, 0x15ffff) AM_RAM_WRITE(paletteram16_xrgb_swap_word_w) AM_BASE(m_paletteram) /* Palette */ \
AM_RANGE(0x160000, 0x17ffff) AM_RAM /* */ \
- AM_RANGE(0x1c0000, 0x1c0001) AM_READ_LEGACY(ssv_vblank_r ) /* Vblank? */ \
+ AM_RANGE(0x1c0000, 0x1c0001) AM_READ(ssv_vblank_r ) /* Vblank? */ \
/**/AM_RANGE(0x1c0002, 0x1c007f) AM_READONLY /* Scroll */ \
- AM_RANGE(0x1c0000, 0x1c007f) AM_WRITE_LEGACY(ssv_scroll_w) AM_BASE(m_scroll) /* Scroll */ \
+ AM_RANGE(0x1c0000, 0x1c007f) AM_WRITE(ssv_scroll_w) AM_BASE(m_scroll) /* Scroll */ \
AM_RANGE(0x210002, 0x210003) AM_READ_PORT("DSW1") \
AM_RANGE(0x210004, 0x210005) AM_READ_PORT("DSW2") \
AM_RANGE(0x210008, 0x210009) AM_READ_PORT("P1") \
@@ -579,7 +579,7 @@ WRITE16_MEMBER(ssv_state::gdfs_blitram_w)
}
static ADDRESS_MAP_START( gdfs_map, AS_PROGRAM, 16, ssv_state )
- AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE_LEGACY(gdfs_tmapram_w) AM_BASE(m_gdfs_tmapram)
+ AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE(gdfs_tmapram_w) AM_BASE(m_gdfs_tmapram)
AM_RANGE(0x420000, 0x43ffff) AM_RAM
AM_RANGE(0x440000, 0x44003f) AM_RAM AM_BASE(m_gdfs_tmapscroll)
AM_RANGE(0x500000, 0x500001) AM_DEVWRITE_LEGACY("eeprom", gdfs_eeprom_w)
diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c
index faddaac1b39..4117d228b70 100644
--- a/src/mame/drivers/st0016.c
+++ b/src/mame/drivers/st0016.c
@@ -28,13 +28,13 @@ UINT32 st0016_rom_bank;
static ADDRESS_MAP_START( st0016_mem, AS_PROGRAM, 8, st0016_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xcfff) AM_READ_LEGACY(st0016_sprite_ram_r) AM_WRITE_LEGACY(st0016_sprite_ram_w)
- AM_RANGE(0xd000, 0xdfff) AM_READ_LEGACY(st0016_sprite2_ram_r) AM_WRITE_LEGACY(st0016_sprite2_ram_w)
+ AM_RANGE(0xc000, 0xcfff) AM_READ(st0016_sprite_ram_r) AM_WRITE(st0016_sprite_ram_w)
+ AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w)
AM_RANGE(0xe000, 0xe7ff) AM_RAM
AM_RANGE(0xe800, 0xe87f) AM_RAM /* common ram */
AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE_LEGACY("stsnd", st0016_snd_r, st0016_snd_w) /* sound regs 8 x $20 bytes, see notes */
- AM_RANGE(0xea00, 0xebff) AM_READ_LEGACY(st0016_palette_ram_r) AM_WRITE_LEGACY(st0016_palette_ram_w)
- AM_RANGE(0xec00, 0xec1f) AM_READ_LEGACY(st0016_character_ram_r) AM_WRITE_LEGACY(st0016_character_ram_w)
+ AM_RANGE(0xea00, 0xebff) AM_READ(st0016_palette_ram_r) AM_WRITE(st0016_palette_ram_w)
+ AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w)
AM_RANGE(0xf000, 0xffff) AM_RAM /* work ram */
ADDRESS_MAP_END
@@ -76,19 +76,19 @@ WRITE8_HANDLER(st0016_rom_bank_w)
static ADDRESS_MAP_START( st0016_io, AS_IO, 8, st0016_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0xbf) AM_READ_LEGACY(st0016_vregs_r) AM_WRITE_LEGACY(st0016_vregs_w) /* video/crt regs ? */
+ AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w) /* video/crt regs ? */
AM_RANGE(0xc0, 0xc0) AM_READ_PORT("P1") AM_WRITE(mux_select_w)
AM_RANGE(0xc1, 0xc1) AM_READ_PORT("P2") AM_WRITENOP
AM_RANGE(0xc2, 0xc2) AM_READ(mux_r) AM_WRITENOP
AM_RANGE(0xc3, 0xc3) AM_READ_PORT("P2") AM_WRITENOP
AM_RANGE(0xe0, 0xe0) AM_WRITENOP /* renju = $40, neratte = 0 */
AM_RANGE(0xe1, 0xe1) AM_WRITE_LEGACY(st0016_rom_bank_w)
- AM_RANGE(0xe2, 0xe2) AM_WRITE_LEGACY(st0016_sprite_bank_w)
- AM_RANGE(0xe3, 0xe4) AM_WRITE_LEGACY(st0016_character_bank_w)
- AM_RANGE(0xe5, 0xe5) AM_WRITE_LEGACY(st0016_palette_bank_w)
+ AM_RANGE(0xe2, 0xe2) AM_WRITE(st0016_sprite_bank_w)
+ AM_RANGE(0xe3, 0xe4) AM_WRITE(st0016_character_bank_w)
+ AM_RANGE(0xe5, 0xe5) AM_WRITE(st0016_palette_bank_w)
AM_RANGE(0xe6, 0xe6) AM_WRITENOP /* banking ? ram bank ? shared rambank ? */
AM_RANGE(0xe7, 0xe7) AM_WRITENOP /* watchdog */
- AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(st0016_dma_r)
+ AM_RANGE(0xf0, 0xf0) AM_READ(st0016_dma_r)
ADDRESS_MAP_END
@@ -140,7 +140,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( st0016_m2_io, AS_IO, 8, st0016_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0xbf) AM_READ_LEGACY(st0016_vregs_r) AM_WRITE_LEGACY(st0016_vregs_w)
+ AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w)
AM_RANGE(0xc0, 0xc3) AM_READ(latch8_r) AM_WRITE(latch8_w)
AM_RANGE(0xd0, 0xd0) AM_READ_PORT("P1") AM_WRITE(mux_select_w)
AM_RANGE(0xd1, 0xd1) AM_READ_PORT("P2") AM_WRITENOP
@@ -148,12 +148,12 @@ static ADDRESS_MAP_START( st0016_m2_io, AS_IO, 8, st0016_state )
AM_RANGE(0xd3, 0xd3) AM_READ_PORT("P2") AM_WRITENOP
AM_RANGE(0xe0, 0xe0) AM_WRITENOP
AM_RANGE(0xe1, 0xe1) AM_WRITE_LEGACY(st0016_rom_bank_w)
- AM_RANGE(0xe2, 0xe2) AM_WRITE_LEGACY(st0016_sprite_bank_w)
- AM_RANGE(0xe3, 0xe4) AM_WRITE_LEGACY(st0016_character_bank_w)
- AM_RANGE(0xe5, 0xe5) AM_WRITE_LEGACY(st0016_palette_bank_w)
+ AM_RANGE(0xe2, 0xe2) AM_WRITE(st0016_sprite_bank_w)
+ AM_RANGE(0xe3, 0xe4) AM_WRITE(st0016_character_bank_w)
+ AM_RANGE(0xe5, 0xe5) AM_WRITE(st0016_palette_bank_w)
AM_RANGE(0xe6, 0xe6) AM_WRITENOP /* banking ? ram bank ? shared rambank ? */
AM_RANGE(0xe7, 0xe7) AM_WRITENOP /* watchdog */
- AM_RANGE(0xf0, 0xf0) AM_READ_LEGACY(st0016_dma_r)
+ AM_RANGE(0xf0, 0xf0) AM_READ(st0016_dma_r)
ADDRESS_MAP_END
/*************************************
diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c
index 0441407b7a5..a0d51e8b135 100644
--- a/src/mame/drivers/stactics.c
+++ b/src/mame/drivers/stactics.c
@@ -180,16 +180,16 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, stactics_state )
/* AM_RANGE(0x6010, 0x6017) AM_MIRROR(0x0f08) AM_WRITE_LEGACY(stactics_sound_w) */
AM_RANGE(0x6016, 0x6016) AM_MIRROR(0x0f08) AM_WRITEONLY AM_BASE(m_motor_on) /* Note: This overlaps rocket sound */
AM_RANGE(0x6020, 0x6027) AM_MIRROR(0x0f08) AM_WRITEONLY AM_BASE(m_lamps)
- AM_RANGE(0x6030, 0x6030) AM_MIRROR(0x0f0f) AM_WRITE_LEGACY(stactics_speed_latch_w)
- AM_RANGE(0x6040, 0x6040) AM_MIRROR(0x0f0f) AM_WRITE_LEGACY(stactics_shot_trigger_w)
- AM_RANGE(0x6050, 0x6050) AM_MIRROR(0x0f0f) AM_WRITE_LEGACY(stactics_shot_flag_clear_w)
+ AM_RANGE(0x6030, 0x6030) AM_MIRROR(0x0f0f) AM_WRITE(stactics_speed_latch_w)
+ AM_RANGE(0x6040, 0x6040) AM_MIRROR(0x0f0f) AM_WRITE(stactics_shot_trigger_w)
+ AM_RANGE(0x6050, 0x6050) AM_MIRROR(0x0f0f) AM_WRITE(stactics_shot_flag_clear_w)
AM_RANGE(0x6060, 0x606f) AM_MIRROR(0x0f00) AM_WRITEONLY AM_BASE(m_display_buffer)
AM_RANGE(0x6070, 0x609f) AM_MIRROR(0x0f00) AM_WRITENOP
/* AM_RANGE(0x60a0, 0x60ef) AM_MIRROR(0x0f00) AM_WRITE_LEGACY(stactics_sound2_w) */
AM_RANGE(0x60f0, 0x60ff) AM_MIRROR(0x0f00) AM_WRITENOP
AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_READ_PORT("IN2")
AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_READ_PORT("IN3")
- AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x0800) AM_WRITE_LEGACY(stactics_scroll_ram_w)
+ AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x0800) AM_WRITE(stactics_scroll_ram_w)
AM_RANGE(0x9000, 0x9000) AM_MIRROR(0x0fff) AM_READ(vert_pos_r)
AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x0fff) AM_READ(horiz_pos_r)
AM_RANGE(0xb000, 0xbfff) AM_RAM AM_BASE(m_videoram_b)
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index b4070685c8c..93235c36018 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -59,7 +59,7 @@ WRITE16_MEMBER(stadhero_state::stadhero_control_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, stadhero_state )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
- AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE_LEGACY(stadhero_pf1_data_w) AM_BASE(m_pf1_data)
+ AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(stadhero_pf1_data_w) AM_BASE(m_pf1_data)
AM_RANGE(0x240000, 0x240007) AM_DEVWRITE_LEGACY("tilegen1", deco_bac06_pf_control_0_w) /* text layer */
AM_RANGE(0x240010, 0x240017) AM_DEVWRITE_LEGACY("tilegen1", deco_bac06_pf_control_1_w)
AM_RANGE(0x260000, 0x261fff) AM_DEVREADWRITE_LEGACY("tilegen1", deco_bac06_pf_data_r, deco_bac06_pf_data_w)
diff --git a/src/mame/drivers/starcrus.c b/src/mame/drivers/starcrus.c
index a86118f1149..6fc7ff35cb8 100644
--- a/src/mame/drivers/starcrus.c
+++ b/src/mame/drivers/starcrus.c
@@ -20,18 +20,18 @@ static ADDRESS_MAP_START( starcrus_map, AS_PROGRAM, 8, starcrus_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( starcrus_io_map, AS_IO, 8, starcrus_state )
- AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_WRITE_LEGACY(starcrus_s1_x_w)
- AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_WRITE_LEGACY(starcrus_s1_y_w)
- AM_RANGE(0x02, 0x02) AM_READWRITE_LEGACY(starcrus_coll_det_r, starcrus_s2_x_w)
- AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW") AM_WRITE_LEGACY(starcrus_s2_y_w)
- AM_RANGE(0x04, 0x04) AM_WRITE_LEGACY(starcrus_p1_x_w)
- AM_RANGE(0x05, 0x05) AM_WRITE_LEGACY(starcrus_p1_y_w)
- AM_RANGE(0x06, 0x06) AM_WRITE_LEGACY(starcrus_p2_x_w)
- AM_RANGE(0x07, 0x07) AM_WRITE_LEGACY(starcrus_p2_y_w)
- AM_RANGE(0x08, 0x08) AM_WRITE_LEGACY(starcrus_ship_parm_1_w)
- AM_RANGE(0x09, 0x09) AM_WRITE_LEGACY(starcrus_ship_parm_2_w)
- AM_RANGE(0x0a, 0x0a) AM_WRITE_LEGACY(starcrus_proj_parm_1_w)
- AM_RANGE(0x0b, 0x0b) AM_WRITE_LEGACY(starcrus_proj_parm_2_w)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_WRITE(starcrus_s1_x_w)
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_WRITE(starcrus_s1_y_w)
+ AM_RANGE(0x02, 0x02) AM_READWRITE(starcrus_coll_det_r, starcrus_s2_x_w)
+ AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW") AM_WRITE(starcrus_s2_y_w)
+ AM_RANGE(0x04, 0x04) AM_WRITE(starcrus_p1_x_w)
+ AM_RANGE(0x05, 0x05) AM_WRITE(starcrus_p1_y_w)
+ AM_RANGE(0x06, 0x06) AM_WRITE(starcrus_p2_x_w)
+ AM_RANGE(0x07, 0x07) AM_WRITE(starcrus_p2_y_w)
+ AM_RANGE(0x08, 0x08) AM_WRITE(starcrus_ship_parm_1_w)
+ AM_RANGE(0x09, 0x09) AM_WRITE(starcrus_ship_parm_2_w)
+ AM_RANGE(0x0a, 0x0a) AM_WRITE(starcrus_proj_parm_1_w)
+ AM_RANGE(0x0b, 0x0b) AM_WRITE(starcrus_proj_parm_2_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c
index abfec382e7c..e257aff4929 100644
--- a/src/mame/drivers/starfire.c
+++ b/src/mame/drivers/starfire.c
@@ -151,8 +151,8 @@ READ8_MEMBER(starfire_state::fireone_input_r)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, starfire_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_READWRITE(starfire_scratch_r, starfire_scratch_w)
- AM_RANGE(0xa000, 0xbfff) AM_READWRITE_LEGACY(starfire_colorram_r, starfire_colorram_w) AM_BASE(m_starfire_colorram)
- AM_RANGE(0xc000, 0xffff) AM_READWRITE_LEGACY(starfire_videoram_r, starfire_videoram_w) AM_BASE(m_starfire_videoram)
+ AM_RANGE(0xa000, 0xbfff) AM_READWRITE(starfire_colorram_r, starfire_colorram_w) AM_BASE(m_starfire_colorram)
+ AM_RANGE(0xc000, 0xffff) AM_READWRITE(starfire_videoram_r, starfire_videoram_w) AM_BASE(m_starfire_videoram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c
index 4add3eb685d..b2423eb4271 100644
--- a/src/mame/drivers/starshp1.c
+++ b/src/mame/drivers/starshp1.c
@@ -171,14 +171,14 @@ static ADDRESS_MAP_START( starshp1_map, AS_PROGRAM, 8, starshp1_state )
AM_RANGE(0x2c00, 0x3fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("SYSTEM")
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("VBLANK")
- AM_RANGE(0xc300, 0xc3ff) AM_WRITE_LEGACY(starshp1_sspic_w) /* spaceship picture */
+ AM_RANGE(0xc300, 0xc3ff) AM_WRITE(starshp1_sspic_w) /* spaceship picture */
AM_RANGE(0xc400, 0xc400) AM_READ_PORT("COINAGE")
- AM_RANGE(0xc400, 0xc4ff) AM_WRITE_LEGACY(starshp1_ssadd_w) /* spaceship address */
- AM_RANGE(0xc800, 0xc9ff) AM_RAM_WRITE_LEGACY(starshp1_playfield_w) AM_BASE(m_playfield_ram)
+ AM_RANGE(0xc400, 0xc4ff) AM_WRITE(starshp1_ssadd_w) /* spaceship address */
+ AM_RANGE(0xc800, 0xc9ff) AM_RAM_WRITE(starshp1_playfield_w) AM_BASE(m_playfield_ram)
AM_RANGE(0xcc00, 0xcc0f) AM_WRITEONLY AM_BASE(m_hpos_ram)
AM_RANGE(0xd000, 0xd00f) AM_WRITEONLY AM_BASE(m_vpos_ram)
AM_RANGE(0xd400, 0xd40f) AM_WRITEONLY AM_BASE(m_obj_ram)
- AM_RANGE(0xd800, 0xd800) AM_READ_LEGACY(starshp1_rng_r)
+ AM_RANGE(0xd800, 0xd800) AM_READ(starshp1_rng_r)
AM_RANGE(0xd800, 0xd80f) AM_WRITE(starshp1_collision_reset_w)
AM_RANGE(0xdc00, 0xdc0f) AM_WRITE(starshp1_misc_w)
AM_RANGE(0xdd00, 0xdd0f) AM_WRITE(starshp1_analog_in_w)
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index 3bc313cd229..f5a345ea3e9 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -57,7 +57,7 @@ static MACHINE_RESET( starwars )
memcpy(state->m_slapstic_base, &state->m_slapstic_source[state->m_slapstic_current_bank * 0x2000], 0x2000);
/* reset all the banks */
- starwars_out_w(space, 4, 0);
+ state->starwars_out_w(*space, 4, 0);
}
/* reset the matrix processor */
@@ -159,7 +159,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, starwars_state )
AM_RANGE(0x4320, 0x433f) AM_READ_PORT("IN1")
AM_RANGE(0x4340, 0x435f) AM_READ_PORT("DSW0")
AM_RANGE(0x4360, 0x437f) AM_READ_PORT("DSW1")
- AM_RANGE(0x4380, 0x439f) AM_READ_LEGACY(starwars_adc_r) /* a-d control result */
+ AM_RANGE(0x4380, 0x439f) AM_READ(starwars_adc_r) /* a-d control result */
AM_RANGE(0x4400, 0x4400) AM_READWRITE_LEGACY(starwars_main_read_r, starwars_main_wr_w)
AM_RANGE(0x4401, 0x4401) AM_READ_LEGACY(starwars_main_ready_flag_r)
AM_RANGE(0x4500, 0x45ff) AM_DEVREADWRITE("x2212", x2212_device, read, write)
@@ -167,14 +167,14 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, starwars_state )
AM_RANGE(0x4620, 0x463f) AM_WRITE_LEGACY(avgdvg_reset_w)
AM_RANGE(0x4640, 0x465f) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x4660, 0x467f) AM_WRITE(irq_ack_w)
- AM_RANGE(0x4680, 0x469f) AM_READNOP AM_WRITE_LEGACY(starwars_out_w)
- AM_RANGE(0x46a0, 0x46bf) AM_WRITE_LEGACY(starwars_nstore_w)
- AM_RANGE(0x46c0, 0x46c2) AM_WRITE_LEGACY(starwars_adc_select_w)
+ AM_RANGE(0x4680, 0x469f) AM_READNOP AM_WRITE(starwars_out_w)
+ AM_RANGE(0x46a0, 0x46bf) AM_WRITE(starwars_nstore_w)
+ AM_RANGE(0x46c0, 0x46c2) AM_WRITE(starwars_adc_select_w)
AM_RANGE(0x46e0, 0x46e0) AM_WRITE_LEGACY(starwars_soundrst_w)
- AM_RANGE(0x4700, 0x4707) AM_WRITE_LEGACY(starwars_math_w)
- AM_RANGE(0x4700, 0x4700) AM_READ_LEGACY(starwars_div_reh_r)
- AM_RANGE(0x4701, 0x4701) AM_READ_LEGACY(starwars_div_rel_r)
- AM_RANGE(0x4703, 0x4703) AM_READ_LEGACY(starwars_prng_r) /* pseudo random number generator */
+ AM_RANGE(0x4700, 0x4707) AM_WRITE(starwars_math_w)
+ AM_RANGE(0x4700, 0x4700) AM_READ(starwars_div_reh_r)
+ AM_RANGE(0x4701, 0x4701) AM_READ(starwars_div_rel_r)
+ AM_RANGE(0x4703, 0x4703) AM_READ(starwars_prng_r) /* pseudo random number generator */
AM_RANGE(0x4800, 0x4fff) AM_RAM /* CPU and Math RAM */
AM_RANGE(0x5000, 0x5fff) AM_RAM AM_BASE(m_mathram) /* CPU and Math RAM */
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM */
diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c
index f13273fa53c..75154b4fd3b 100644
--- a/src/mame/drivers/stepstag.c
+++ b/src/mame/drivers/stepstag.c
@@ -62,13 +62,13 @@ static ADDRESS_MAP_START( stepstag_map, AS_PROGRAM, 16, stepstag_state )
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram") // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
AM_RANGE(0x108000, 0x10ffff) AM_RAM // Work RAM
- AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8_LEGACY(tetrisp2_priority_r, rockn_priority_w, 0x00ff) // Priority
- AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE_LEGACY(tetrisp2_palette_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_fg_w) AM_BASE(m_vram_fg) // Foreground
- AM_RANGE(0x404000, 0x407fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_bg_w) AM_BASE(m_vram_bg) // Background
+ AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8(tetrisp2_priority_r, rockn_priority_w, 0x00ff) // Priority
+ AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(tetrisp2_palette_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE(tetrisp2_vram_fg_w) AM_BASE(m_vram_fg) // Foreground
+ AM_RANGE(0x404000, 0x407fff) AM_RAM_WRITE(tetrisp2_vram_bg_w) AM_BASE(m_vram_bg) // Background
AM_RANGE(0x408000, 0x409fff) AM_RAM // ???
AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line
- AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_rot_w) AM_BASE(m_vram_rot) // Rotation
+ AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(tetrisp2_vram_rot_w) AM_BASE(m_vram_rot) // Rotation
AM_RANGE(0x900000, 0x903fff) AM_READWRITE(tetrisp2_nvram_r, tetrisp2_nvram_w) AM_BASE(m_nvram) AM_SHARE("nvram") // NVRAM
AM_RANGE(0x904000, 0x907fff) AM_READWRITE(tetrisp2_nvram_r, tetrisp2_nvram_w) // NVRAM (mirror)
// AM_RANGE(0xa00000, 0xa7ffff) AM_READ_LEGACY(unknown_read_0xc00000 ) // presumably comms with slave CPU
diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c
index 7f4d49cd164..c9d449b9653 100644
--- a/src/mame/drivers/stfight.c
+++ b/src/mame/drivers/stfight.c
@@ -242,16 +242,16 @@ static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8, stfight_state )
AM_RANGE(0xc200, 0xc200) AM_READ_PORT("P1") /* IN1 */
AM_RANGE(0xc201, 0xc201) AM_READ_PORT("P2") /* IN2 */
AM_RANGE(0xc202, 0xc202) AM_READ_PORT("START") /* IN3 */
- AM_RANGE(0xc203, 0xc204) AM_READ_LEGACY(stfight_dsw_r) /* DS0,1 */
- AM_RANGE(0xc205, 0xc205) AM_READ_LEGACY(stfight_coin_r) /* coin mech */
- AM_RANGE(0xc500, 0xc500) AM_WRITE_LEGACY(stfight_fm_w) /* play fm sound */
+ AM_RANGE(0xc203, 0xc204) AM_READ(stfight_dsw_r) /* DS0,1 */
+ AM_RANGE(0xc205, 0xc205) AM_READ(stfight_coin_r) /* coin mech */
+ AM_RANGE(0xc500, 0xc500) AM_WRITE(stfight_fm_w) /* play fm sound */
AM_RANGE(0xc600, 0xc600) AM_DEVWRITE_LEGACY("msm", stfight_adpcm_control_w) /* voice control */
- AM_RANGE(0xc700, 0xc700) AM_WRITE_LEGACY(stfight_coin_w) /* coin mech */
+ AM_RANGE(0xc700, 0xc700) AM_WRITE(stfight_coin_w) /* coin mech */
AM_RANGE(0xc804, 0xc806) AM_WRITENOP /* TBD */
- AM_RANGE(0xc807, 0xc807) AM_WRITE_LEGACY(stfight_sprite_bank_w)
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(stfight_text_char_w) AM_BASE(m_text_char_ram)
- AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE_LEGACY(stfight_text_attr_w) AM_BASE(m_text_attr_ram)
- AM_RANGE(0xd800, 0xd808) AM_WRITE_LEGACY(stfight_vh_latch_w) AM_BASE(m_vh_latch_ram)
+ AM_RANGE(0xc807, 0xc807) AM_WRITE(stfight_sprite_bank_w)
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(stfight_text_char_w) AM_BASE(m_text_char_ram)
+ AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(stfight_text_attr_w) AM_BASE(m_text_attr_ram)
+ AM_RANGE(0xd800, 0xd808) AM_WRITE(stfight_vh_latch_w) AM_BASE(m_vh_latch_ram)
AM_RANGE(0xe000, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE(m_sprite_ram)
ADDRESS_MAP_END
@@ -260,8 +260,8 @@ static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8, stfight_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r, ym2203_w)
AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE_LEGACY("ym2", ym2203_r, ym2203_w)
- AM_RANGE(0xe800, 0xe800) AM_WRITE_LEGACY(stfight_e800_w)
- AM_RANGE(0xf000, 0xf000) AM_READ_LEGACY(stfight_fm_r)
+ AM_RANGE(0xe800, 0xe800) AM_WRITE(stfight_e800_w)
+ AM_RANGE(0xf000, 0xf000) AM_READ(stfight_fm_r)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index 7909840e33c..bb8c3b56331 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -92,10 +92,10 @@ static WRITE16_DEVICE_HANDLER( oki_bank_w )
static ADDRESS_MAP_START( stlforce_map, AS_PROGRAM, 16, stlforce_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x100000, 0x1007ff) AM_RAM_WRITE_LEGACY(stlforce_bg_videoram_w) AM_BASE(m_bg_videoram)
- AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE_LEGACY(stlforce_mlow_videoram_w) AM_BASE(m_mlow_videoram)
- AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE_LEGACY(stlforce_mhigh_videoram_w) AM_BASE(m_mhigh_videoram)
- AM_RANGE(0x101800, 0x1027ff) AM_RAM_WRITE_LEGACY(stlforce_tx_videoram_w) AM_BASE(m_tx_videoram)
+ AM_RANGE(0x100000, 0x1007ff) AM_RAM_WRITE(stlforce_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE(stlforce_mlow_videoram_w) AM_BASE(m_mlow_videoram)
+ AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(stlforce_mhigh_videoram_w) AM_BASE(m_mhigh_videoram)
+ AM_RANGE(0x101800, 0x1027ff) AM_RAM_WRITE(stlforce_tx_videoram_w) AM_BASE(m_tx_videoram)
AM_RANGE(0x102800, 0x102fff) AM_RAM /* unknown / ram */
AM_RANGE(0x103000, 0x1033ff) AM_RAM AM_BASE(m_bg_scrollram)
AM_RANGE(0x103400, 0x1037ff) AM_RAM AM_BASE(m_mlow_scrollram)
diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c
index 11349e6ef0a..8666eab1c03 100644
--- a/src/mame/drivers/strnskil.c
+++ b/src/mame/drivers/strnskil.c
@@ -84,7 +84,7 @@ static ADDRESS_MAP_START( strnskil_map1, AS_PROGRAM, 8, strnskil_state )
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(strnskil_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(strnskil_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xd800, 0xd800) AM_READ(strnskil_d800_r)
AM_RANGE(0xd801, 0xd801) AM_READ_PORT("DSW1")
@@ -93,7 +93,7 @@ static ADDRESS_MAP_START( strnskil_map1, AS_PROGRAM, 8, strnskil_state )
AM_RANGE(0xd804, 0xd804) AM_READ_PORT("P1")
AM_RANGE(0xd805, 0xd805) AM_READ_PORT("P2")
- AM_RANGE(0xd808, 0xd808) AM_WRITE_LEGACY(strnskil_scrl_ctrl_w)
+ AM_RANGE(0xd808, 0xd808) AM_WRITE(strnskil_scrl_ctrl_w)
AM_RANGE(0xd809, 0xd809) AM_WRITENOP /* coin counter? */
AM_RANGE(0xd80a, 0xd80b) AM_WRITEONLY AM_BASE(m_xscroll)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c
index 8318eecd70e..000949684a4 100644
--- a/src/mame/drivers/subs.c
+++ b/src/mame/drivers/subs.c
@@ -48,20 +48,20 @@ static PALETTE_INIT( subs )
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, subs_state )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x0000) AM_DEVWRITE_LEGACY("discrete", subs_noise_reset_w)
- AM_RANGE(0x0000, 0x0007) AM_READ_LEGACY(subs_control_r)
- AM_RANGE(0x0020, 0x0020) AM_WRITE_LEGACY(subs_steer_reset_w)
- AM_RANGE(0x0020, 0x0027) AM_READ_LEGACY(subs_coin_r)
+ AM_RANGE(0x0000, 0x0007) AM_READ(subs_control_r)
+ AM_RANGE(0x0020, 0x0020) AM_WRITE(subs_steer_reset_w)
+ AM_RANGE(0x0020, 0x0027) AM_READ(subs_coin_r)
// AM_RANGE(0x0040, 0x0040) AM_WRITE_LEGACY(subs_timer_reset_w)
- AM_RANGE(0x0060, 0x0063) AM_READ_LEGACY(subs_options_r)
- AM_RANGE(0x0060, 0x0061) AM_WRITE_LEGACY(subs_lamp1_w)
- AM_RANGE(0x0062, 0x0063) AM_WRITE_LEGACY(subs_lamp2_w)
+ AM_RANGE(0x0060, 0x0063) AM_READ(subs_options_r)
+ AM_RANGE(0x0060, 0x0061) AM_WRITE(subs_lamp1_w)
+ AM_RANGE(0x0062, 0x0063) AM_WRITE(subs_lamp2_w)
AM_RANGE(0x0064, 0x0065) AM_DEVWRITE_LEGACY("discrete", subs_sonar2_w)
AM_RANGE(0x0066, 0x0067) AM_DEVWRITE_LEGACY("discrete", subs_sonar1_w)
// Schematics show crash and explode reversed. But this is proper.
AM_RANGE(0x0068, 0x0069) AM_DEVWRITE_LEGACY("discrete", subs_explode_w)
AM_RANGE(0x006a, 0x006b) AM_DEVWRITE_LEGACY("discrete", subs_crash_w)
- AM_RANGE(0x006c, 0x006d) AM_WRITE_LEGACY(subs_invert1_w)
- AM_RANGE(0x006e, 0x006f) AM_WRITE_LEGACY(subs_invert2_w)
+ AM_RANGE(0x006c, 0x006d) AM_WRITE(subs_invert1_w)
+ AM_RANGE(0x006e, 0x006f) AM_WRITE(subs_invert2_w)
AM_RANGE(0x0090, 0x009f) AM_BASE(m_spriteram)
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0800, 0x0bff) AM_RAM AM_BASE(m_videoram)
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 0974d678406..f7c0ece736e 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -91,11 +91,11 @@ WRITE16_MEMBER(suna16_state::bestbest_coin_w)
static ADDRESS_MAP_START( bssoccer_map, AS_PROGRAM, 16, suna16_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM // RAM
- AM_RANGE(0x400000, 0x4001ff) AM_READWRITE_LEGACY(suna16_paletteram16_r, suna16_paletteram16_w) // Banked Palette
+ AM_RANGE(0x400000, 0x4001ff) AM_READWRITE(suna16_paletteram16_r, suna16_paletteram16_w) // Banked Palette
AM_RANGE(0x400200, 0x400fff) AM_RAM //
AM_RANGE(0x600000, 0x61ffff) AM_RAM AM_BASE(m_spriteram) // Sprites
AM_RANGE(0xa00000, 0xa00001) AM_READ_PORT("P1") AM_WRITE(suna16_soundlatch_w) // To Sound CPU
- AM_RANGE(0xa00002, 0xa00003) AM_READ_PORT("P2") AM_WRITE_LEGACY(suna16_flipscreen_w) // Flip Screen
+ AM_RANGE(0xa00002, 0xa00003) AM_READ_PORT("P2") AM_WRITE(suna16_flipscreen_w) // Flip Screen
AM_RANGE(0xa00004, 0xa00005) AM_READ_PORT("P3") AM_WRITE(bssoccer_leds_w) // Leds
AM_RANGE(0xa00006, 0xa00007) AM_READ_PORT("P4") AM_WRITENOP // ? IRQ 1 Ack
AM_RANGE(0xa00008, 0xa00009) AM_READ_PORT("DSW1") AM_WRITENOP // ? IRQ 2 Ack
@@ -110,12 +110,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( uballoon_map, AS_PROGRAM, 16, suna16_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x800000, 0x803fff) AM_RAM // RAM
- AM_RANGE(0x200000, 0x2001ff) AM_READWRITE_LEGACY(suna16_paletteram16_r, suna16_paletteram16_w) // Banked Palette
+ AM_RANGE(0x200000, 0x2001ff) AM_READWRITE(suna16_paletteram16_r, suna16_paletteram16_w) // Banked Palette
AM_RANGE(0x200200, 0x200fff) AM_RAM //
AM_RANGE(0x400000, 0x41ffff) AM_MIRROR(0x1e0000) AM_RAM AM_BASE(m_spriteram) // Sprites
AM_RANGE(0x600000, 0x600001) AM_READ_PORT("P1") AM_WRITE(suna16_soundlatch_w) // To Sound CPU
AM_RANGE(0x600002, 0x600003) AM_READ_PORT("P2")
- AM_RANGE(0x600004, 0x600005) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(suna16_flipscreen_w) // Flip Screen
+ AM_RANGE(0x600004, 0x600005) AM_READ_PORT("DSW1") AM_WRITE(suna16_flipscreen_w) // Flip Screen
AM_RANGE(0x600006, 0x600007) AM_READ_PORT("DSW2")
AM_RANGE(0x600008, 0x600009) AM_WRITE(uballoon_leds_w) // Leds
AM_RANGE(0x60000c, 0x60000d) AM_WRITENOP // ? IRQ 1 Ack
@@ -131,10 +131,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sunaq_map, AS_PROGRAM, 16, suna16_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") AM_WRITE(suna16_soundlatch_w) // To Sound CPU
- AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") AM_WRITE_LEGACY(suna16_flipscreen_w) // Flip Screen
+ AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") AM_WRITE(suna16_flipscreen_w) // Flip Screen
AM_RANGE(0x500004, 0x500005) AM_READ_PORT("DSW1")
AM_RANGE(0x500006, 0x500007) AM_READ_PORT("DSW2") // (unused?)
- AM_RANGE(0x540000, 0x5401ff) AM_READWRITE_LEGACY(suna16_paletteram16_r, suna16_paletteram16_w)
+ AM_RANGE(0x540000, 0x5401ff) AM_READWRITE(suna16_paletteram16_r, suna16_paletteram16_w)
AM_RANGE(0x540200, 0x540fff) AM_RAM // RAM
AM_RANGE(0x580000, 0x583fff) AM_RAM // RAM
AM_RANGE(0x5c0000, 0x5dffff) AM_RAM AM_BASE(m_spriteram) // Sprites
@@ -171,11 +171,11 @@ static ADDRESS_MAP_START( bestbest_map, AS_PROGRAM, 16, suna16_state )
AM_RANGE( 0x000000, 0x03ffff ) AM_ROM AM_MIRROR(0xc0000) // ROM
AM_RANGE( 0x200000, 0x2fffff ) AM_ROM AM_REGION("user1", 0) // ROM
AM_RANGE( 0x500000, 0x500001 ) AM_READ_PORT("P1") AM_WRITE(suna16_soundlatch_w) // To Sound CPU
- AM_RANGE( 0x500002, 0x500003 ) AM_READ_PORT("P2") AM_WRITE_LEGACY(bestbest_flipscreen_w) // P2 + Coins, Flip Screen
+ AM_RANGE( 0x500002, 0x500003 ) AM_READ_PORT("P2") AM_WRITE(bestbest_flipscreen_w) // P2 + Coins, Flip Screen
AM_RANGE( 0x500004, 0x500005 ) AM_READ_PORT("DSW") AM_WRITE(bestbest_coin_w) // Coin Counter
AM_RANGE( 0x500008, 0x500009 ) AM_WRITE(bestbest_prot_w ) // Protection
AM_RANGE( 0x500018, 0x500019 ) AM_READ(bestbest_prot_r ) //
- AM_RANGE( 0x540000, 0x540fff ) AM_READWRITE_LEGACY(suna16_paletteram16_r, suna16_paletteram16_w ) // Banked(?) Palette
+ AM_RANGE( 0x540000, 0x540fff ) AM_READWRITE(suna16_paletteram16_r, suna16_paletteram16_w ) // Banked(?) Palette
AM_RANGE( 0x541000, 0x54ffff ) AM_RAM //
AM_RANGE( 0x580000, 0x58ffff ) AM_RAM // RAM
AM_RANGE( 0x5c0000, 0x5dffff ) AM_RAM AM_BASE(m_spriteram) // Sprites (Chip 1)
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index 6aaa35c78d8..fa865c1f2ed 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -520,7 +520,7 @@ static ADDRESS_MAP_START( hardhead_map, AS_PROGRAM, 8, suna8_state )
AM_RANGE(0xdc80, 0xdc80) AM_NOP // <- R (after bank select)
AM_RANGE(0xdd00, 0xdd00) AM_NOP // <- R (after ip select)
AM_RANGE(0xdd80, 0xddff) AM_READWRITE(hardhead_protection_r, hardhead_protection_w ) // Protection
- AM_RANGE(0xe000, 0xffff) AM_RAM_WRITE_LEGACY(suna8_spriteram_w) AM_BASE(m_spriteram) // Sprites
+ AM_RANGE(0xe000, 0xffff) AM_RAM_WRITE(suna8_spriteram_w) AM_BASE(m_spriteram) // Sprites
ADDRESS_MAP_END
@@ -589,7 +589,7 @@ static ADDRESS_MAP_START( rranger_map, AS_PROGRAM, 8, suna8_state )
AM_RANGE(0xc2c0, 0xc2c0) AM_READ_PORT("DSW2") // DSW 2
AM_RANGE(0xc600, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc800, 0xdfff) AM_RAM // RAM
- AM_RANGE(0xe000, 0xffff) AM_RAM_WRITE_LEGACY(suna8_spriteram_w) AM_BASE(m_spriteram) // Sprites
+ AM_RANGE(0xe000, 0xffff) AM_RAM_WRITE(suna8_spriteram_w) AM_BASE(m_spriteram) // Sprites
ADDRESS_MAP_END
@@ -671,7 +671,7 @@ static ADDRESS_MAP_START( brickzn_map, AS_PROGRAM, 8, suna8_state )
AM_RANGE(0xc140, 0xc140) AM_READ(brickzn_c140_r) // ???
AM_RANGE(0xc600, 0xc7ff) AM_READWRITE(banked_paletteram_r, brickzn_banked_paletteram_w) // Palette (Banked)
AM_RANGE(0xc800, 0xdfff) AM_RAM // RAM
- AM_RANGE(0xe000, 0xffff) AM_READWRITE_LEGACY(suna8_banked_spriteram_r, suna8_banked_spriteram_w) // Sprites (Banked)
+ AM_RANGE(0xe000, 0xffff) AM_READWRITE(suna8_banked_spriteram_r, suna8_banked_spriteram_w) // Sprites (Banked)
ADDRESS_MAP_END
@@ -791,7 +791,7 @@ static ADDRESS_MAP_START( hardhea2_map, AS_PROGRAM, 8, suna8_state )
AM_RANGE(0xc600, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram" ) // Palette (Banked??)
AM_RANGE(0xc800, 0xdfff) AM_RAMBANK("bank2") // RAM (Banked?)
- AM_RANGE(0xe000, 0xffff) AM_READWRITE_LEGACY(suna8_banked_spriteram_r, suna8_banked_spriteram_w) // Sprites (Banked)
+ AM_RANGE(0xe000, 0xffff) AM_READWRITE(suna8_banked_spriteram_r, suna8_banked_spriteram_w) // Sprites (Banked)
ADDRESS_MAP_END
@@ -827,7 +827,7 @@ static ADDRESS_MAP_START( starfigh_map, AS_PROGRAM, 8, suna8_state )
AM_RANGE(0xc500, 0xc500) AM_WRITE(soundlatch_w ) // To Sound CPU
AM_RANGE(0xc600, 0xc7ff) AM_READWRITE(banked_paletteram_r, paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram" ) // Palette (Banked??)
AM_RANGE(0xc800, 0xdfff) AM_RAM // RAM
- AM_RANGE(0xe000, 0xffff) AM_READWRITE_LEGACY(suna8_banked_spriteram_r, suna8_banked_spriteram_w) // Sprites (Banked)
+ AM_RANGE(0xe000, 0xffff) AM_READWRITE(suna8_banked_spriteram_r, suna8_banked_spriteram_w) // Sprites (Banked)
ADDRESS_MAP_END
@@ -960,7 +960,7 @@ static ADDRESS_MAP_START( sparkman_map, AS_PROGRAM, 8, suna8_state )
AM_RANGE(0xc500, 0xc500) AM_WRITE(soundlatch_w ) // To Sound CPU
AM_RANGE(0xc600, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram" ) // Palette (Banked??)
AM_RANGE(0xc800, 0xdfff) AM_RAM_WRITE(suna8_wram_w) AM_BASE(m_wram) // RAM
- AM_RANGE(0xe000, 0xffff) AM_READWRITE_LEGACY(suna8_banked_spriteram_r, suna8_banked_spriteram_w) // Sprites (Banked)
+ AM_RANGE(0xe000, 0xffff) AM_READWRITE(suna8_banked_spriteram_r, suna8_banked_spriteram_w) // Sprites (Banked)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index a4650598274..d8834d68c26 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -567,7 +567,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, superqix_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xe000, 0xe0ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe100, 0xe7ff) AM_RAM
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(superqix_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(superqix_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -577,7 +577,7 @@ static ADDRESS_MAP_START( pbillian_port_map, AS_IO, 8, superqix_state )
AM_RANGE(0x0402, 0x0403) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
AM_RANGE(0x0408, 0x0408) AM_READ(pbillian_from_mcu_r)
AM_RANGE(0x0408, 0x0408) AM_WRITE(pbillian_z80_mcu_w)
- AM_RANGE(0x0410, 0x0410) AM_WRITE_LEGACY(pbillian_0410_w)
+ AM_RANGE(0x0410, 0x0410) AM_WRITE(pbillian_0410_w)
AM_RANGE(0x0418, 0x0418) AM_READNOP //?
AM_RANGE(0x0419, 0x0419) AM_WRITENOP //? watchdog ?
AM_RANGE(0x041a, 0x041a) AM_WRITE(pbillian_sample_trigger_w)
@@ -590,7 +590,7 @@ static ADDRESS_MAP_START( hotsmash_port_map, AS_IO, 8, superqix_state )
AM_RANGE(0x0402, 0x0403) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
AM_RANGE(0x0408, 0x0408) AM_READ(hotsmash_from_mcu_r)
AM_RANGE(0x0408, 0x0408) AM_WRITE(hotsmash_z80_mcu_w)
- AM_RANGE(0x0410, 0x0410) AM_WRITE_LEGACY(pbillian_0410_w)
+ AM_RANGE(0x0410, 0x0410) AM_WRITE(pbillian_0410_w)
AM_RANGE(0x0418, 0x0418) AM_READNOP //?
AM_RANGE(0x0419, 0x0419) AM_WRITENOP //? watchdog ?
AM_RANGE(0x041a, 0x041a) AM_WRITE(pbillian_sample_trigger_w)
@@ -604,10 +604,10 @@ static ADDRESS_MAP_START( sqix_port_map, AS_IO, 8, superqix_state )
AM_RANGE(0x0405, 0x0405) AM_DEVREAD_LEGACY("ay2", ay8910_r)
AM_RANGE(0x0406, 0x0407) AM_DEVWRITE_LEGACY("ay2", ay8910_data_address_w)
AM_RANGE(0x0408, 0x0408) AM_READ(mcu_acknowledge_r)
- AM_RANGE(0x0410, 0x0410) AM_WRITE_LEGACY(superqix_0410_w) /* ROM bank, NMI enable, tile bank */
+ AM_RANGE(0x0410, 0x0410) AM_WRITE(superqix_0410_w) /* ROM bank, NMI enable, tile bank */
AM_RANGE(0x0418, 0x0418) AM_READ(nmi_ack_r)
- AM_RANGE(0x0800, 0x77ff) AM_RAM_WRITE_LEGACY(superqix_bitmapram_w) AM_BASE(m_bitmapram)
- AM_RANGE(0x8800, 0xf7ff) AM_RAM_WRITE_LEGACY(superqix_bitmapram2_w) AM_BASE(m_bitmapram2)
+ AM_RANGE(0x0800, 0x77ff) AM_RAM_WRITE(superqix_bitmapram_w) AM_BASE(m_bitmapram)
+ AM_RANGE(0x8800, 0xf7ff) AM_RAM_WRITE(superqix_bitmapram2_w) AM_BASE(m_bitmapram2)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bootleg_port_map, AS_IO, 8, superqix_state )
@@ -617,10 +617,10 @@ static ADDRESS_MAP_START( bootleg_port_map, AS_IO, 8, superqix_state )
AM_RANGE(0x0405, 0x0405) AM_DEVREAD_LEGACY("ay2", ay8910_r)
AM_RANGE(0x0406, 0x0407) AM_DEVWRITE_LEGACY("ay2", ay8910_data_address_w)
AM_RANGE(0x0408, 0x0408) AM_WRITE(bootleg_flipscreen_w)
- AM_RANGE(0x0410, 0x0410) AM_WRITE_LEGACY(superqix_0410_w) /* ROM bank, NMI enable, tile bank */
+ AM_RANGE(0x0410, 0x0410) AM_WRITE(superqix_0410_w) /* ROM bank, NMI enable, tile bank */
AM_RANGE(0x0418, 0x0418) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x0800, 0x77ff) AM_RAM_WRITE_LEGACY(superqix_bitmapram_w) AM_BASE(m_bitmapram)
- AM_RANGE(0x8800, 0xf7ff) AM_RAM_WRITE_LEGACY(superqix_bitmapram2_w) AM_BASE(m_bitmapram2)
+ AM_RANGE(0x0800, 0x77ff) AM_RAM_WRITE(superqix_bitmapram_w) AM_BASE(m_bitmapram)
+ AM_RANGE(0x8800, 0xf7ff) AM_RAM_WRITE(superqix_bitmapram2_w) AM_BASE(m_bitmapram2)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c
index 2ba2a427be0..a35f6659fd2 100644
--- a/src/mame/drivers/suprloco.c
+++ b/src/mame/drivers/suprloco.c
@@ -35,10 +35,10 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, suprloco_state )
AM_RANGE(0xe000, 0xe000) AM_READ_PORT("DSW1")
AM_RANGE(0xe001, 0xe001) AM_READ_PORT("DSW2")
AM_RANGE(0xe800, 0xe800) AM_WRITE(suprloco_soundport_w)
- AM_RANGE(0xe801, 0xe801) AM_READWRITE_LEGACY(suprloco_control_r, suprloco_control_w)
- AM_RANGE(0xf000, 0xf6ff) AM_RAM_WRITE_LEGACY(suprloco_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe801, 0xe801) AM_READWRITE(suprloco_control_r, suprloco_control_w)
+ AM_RANGE(0xf000, 0xf6ff) AM_RAM_WRITE(suprloco_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xf700, 0xf7df) AM_RAM /* unused */
- AM_RANGE(0xf7e0, 0xf7ff) AM_RAM_WRITE_LEGACY(suprloco_scrollram_w) AM_BASE(m_scrollram)
+ AM_RANGE(0xf7e0, 0xf7ff) AM_RAM_WRITE(suprloco_scrollram_w) AM_BASE(m_scrollram)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index 7e095d68b90..c7899599cfe 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -693,12 +693,12 @@ static ADDRESS_MAP_START( skns_map, AS_PROGRAM, 32, skns_state )
AM_RANGE(0x01800000, 0x01800003) AM_WRITE(skns_hit2_w)
AM_RANGE(0x02000000, 0x02003fff) AM_RAM AM_SHARE("spriteram") /* sprite ram */
AM_RANGE(0x02100000, 0x0210003f) AM_RAM AM_BASE(m_spc_regs) /* sprite registers */
- AM_RANGE(0x02400000, 0x0240007f) AM_RAM_WRITE_LEGACY(skns_v3_regs_w) AM_BASE(m_v3_regs) /* tilemap registers */
- AM_RANGE(0x02500000, 0x02503fff) AM_RAM_WRITE_LEGACY(skns_tilemapA_w) AM_BASE(m_tilemapA_ram) /* tilemap A */
- AM_RANGE(0x02504000, 0x02507fff) AM_RAM_WRITE_LEGACY(skns_tilemapB_w) AM_BASE(m_tilemapB_ram) /* tilemap B */
+ AM_RANGE(0x02400000, 0x0240007f) AM_RAM_WRITE(skns_v3_regs_w) AM_BASE(m_v3_regs) /* tilemap registers */
+ AM_RANGE(0x02500000, 0x02503fff) AM_RAM_WRITE(skns_tilemapA_w) AM_BASE(m_tilemapA_ram) /* tilemap A */
+ AM_RANGE(0x02504000, 0x02507fff) AM_RAM_WRITE(skns_tilemapB_w) AM_BASE(m_tilemapB_ram) /* tilemap B */
AM_RANGE(0x02600000, 0x02607fff) AM_RAM AM_BASE(m_v3slc_ram) /* tilemap linescroll */
- AM_RANGE(0x02a00000, 0x02a0001f) AM_RAM_WRITE_LEGACY(skns_pal_regs_w) AM_BASE(m_pal_regs)
- AM_RANGE(0x02a40000, 0x02a5ffff) AM_RAM_WRITE_LEGACY(skns_palette_ram_w) AM_BASE(m_palette_ram)
+ AM_RANGE(0x02a00000, 0x02a0001f) AM_RAM_WRITE(skns_pal_regs_w) AM_BASE(m_pal_regs)
+ AM_RANGE(0x02a40000, 0x02a5ffff) AM_RAM_WRITE(skns_palette_ram_w) AM_BASE(m_palette_ram)
AM_RANGE(0x02f00000, 0x02f000ff) AM_READWRITE(skns_hit_r, skns_hit_w)
AM_RANGE(0x04000000, 0x041fffff) AM_ROMBANK("bank1") /* GAME ROM */
AM_RANGE(0x04800000, 0x0483ffff) AM_RAM_WRITE(skns_v3t_w) AM_BASE(m_v3t_ram) /* tilemap b ram based tiles */
diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c
index b23776988dd..4573a4bad92 100644
--- a/src/mame/drivers/suprridr.c
+++ b/src/mame/drivers/suprridr.c
@@ -165,8 +165,8 @@ WRITE8_MEMBER(suprridr_state::coin_lock_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, suprridr_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE_LEGACY(suprridr_bgram_w) AM_BASE(m_bgram)
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(suprridr_fgram_w) AM_BASE(m_fgram)
+ AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(suprridr_bgram_w) AM_BASE(m_bgram)
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(suprridr_fgram_w) AM_BASE(m_fgram)
AM_RANGE(0x9800, 0x983f) AM_RAM
AM_RANGE(0x9840, 0x987f) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x9880, 0x9bff) AM_RAM
@@ -174,12 +174,12 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, suprridr_state )
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("SYSTEM")
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW") AM_WRITE(nmi_enable_w)
AM_RANGE(0xb002, 0xb003) AM_WRITE(coin_lock_w)
- AM_RANGE(0xb006, 0xb006) AM_WRITE_LEGACY(suprridr_flipx_w)
- AM_RANGE(0xb007, 0xb007) AM_WRITE_LEGACY(suprridr_flipy_w)
+ AM_RANGE(0xb006, 0xb006) AM_WRITE(suprridr_flipx_w)
+ AM_RANGE(0xb007, 0xb007) AM_WRITE(suprridr_flipy_w)
AM_RANGE(0xb800, 0xb800) AM_WRITE(sound_data_w)
- AM_RANGE(0xc801, 0xc801) AM_WRITE_LEGACY(suprridr_fgdisable_w)
- AM_RANGE(0xc802, 0xc802) AM_WRITE_LEGACY(suprridr_fgscrolly_w)
- AM_RANGE(0xc804, 0xc804) AM_WRITE_LEGACY(suprridr_bgscrolly_w)
+ AM_RANGE(0xc801, 0xc801) AM_WRITE(suprridr_fgdisable_w)
+ AM_RANGE(0xc802, 0xc802) AM_WRITE(suprridr_fgscrolly_w)
+ AM_RANGE(0xc804, 0xc804) AM_WRITE(suprridr_bgscrolly_w)
AM_RANGE(0xc000, 0xefff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index a31ed3ab52b..82354ff2978 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -128,15 +128,15 @@ static ADDRESS_MAP_START( suprslam_map, AS_PROGRAM, 16, suprslam_state )
AM_RANGE(0xfb0000, 0xfb1fff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xfc0000, 0xfcffff) AM_RAM AM_BASE(m_sp_videoram)
AM_RANGE(0xfd0000, 0xfdffff) AM_RAM
- AM_RANGE(0xfe0000, 0xfe0fff) AM_RAM_WRITE_LEGACY(suprslam_screen_videoram_w) AM_BASE(m_screen_videoram)
- AM_RANGE(0xff0000, 0xff1fff) AM_RAM_WRITE_LEGACY(suprslam_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0xfe0000, 0xfe0fff) AM_RAM_WRITE(suprslam_screen_videoram_w) AM_BASE(m_screen_videoram)
+ AM_RANGE(0xff0000, 0xff1fff) AM_RAM_WRITE(suprslam_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0xff2000, 0xff203f) AM_RAM AM_BASE(m_screen_vregs)
// AM_RANGE(0xff3000, 0xff3001) AM_WRITENOP // sprite buffer trigger?
AM_RANGE(0xff8000, 0xff8fff) AM_DEVREADWRITE_LEGACY("k053936", k053936_linectrl_r, k053936_linectrl_w)
AM_RANGE(0xff9000, 0xff9001) AM_WRITE(sound_command_w)
AM_RANGE(0xffa000, 0xffafff) AM_RAM_WRITE(paletteram16_xGGGGGBBBBBRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffd000, 0xffd01f) AM_DEVWRITE_LEGACY("k053936", k053936_ctrl_w)
- AM_RANGE(0xffe000, 0xffe001) AM_WRITE_LEGACY(suprslam_bank_w)
+ AM_RANGE(0xffe000, 0xffe001) AM_WRITE(suprslam_bank_w)
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("P1")
AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("P2")
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index b152203ebda..7ddd15fd393 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -428,7 +428,7 @@ WRITE8_MEMBER(system1_state::videomode_w)
coin_counter_w(machine(), 0, data & 1);
/* remaining signals are video-related */
- system1_videomode_w(&space, 0, data);
+ system1_videomode_w(space, 0, data);
}
@@ -721,25 +721,25 @@ static ADDRESS_MAP_START( system1_map, AS_PROGRAM, 8, system1_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE(m_ram)
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(system1_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0xe000, 0xefff) AM_READWRITE_LEGACY(system1_videoram_r, system1_videoram_w)
- AM_RANGE(0xf000, 0xf3ff) AM_READWRITE_LEGACY(system1_mixer_collision_r, system1_mixer_collision_w)
- AM_RANGE(0xf400, 0xf7ff) AM_WRITE_LEGACY(system1_mixer_collision_reset_w)
- AM_RANGE(0xf800, 0xfbff) AM_READWRITE_LEGACY(system1_sprite_collision_r, system1_sprite_collision_w)
- AM_RANGE(0xfc00, 0xffff) AM_WRITE_LEGACY(system1_sprite_collision_reset_w)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(system1_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe000, 0xefff) AM_READWRITE(system1_videoram_r, system1_videoram_w)
+ AM_RANGE(0xf000, 0xf3ff) AM_READWRITE(system1_mixer_collision_r, system1_mixer_collision_w)
+ AM_RANGE(0xf400, 0xf7ff) AM_WRITE(system1_mixer_collision_reset_w)
+ AM_RANGE(0xf800, 0xfbff) AM_READWRITE(system1_sprite_collision_r, system1_sprite_collision_w)
+ AM_RANGE(0xfc00, 0xffff) AM_WRITE(system1_sprite_collision_reset_w)
ADDRESS_MAP_END
/* same as normal System 1 except address map is shuffled (RAM/collision are swapped) */
static ADDRESS_MAP_START( nobo_map, AS_PROGRAM, 8, system1_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xc3ff) AM_READWRITE_LEGACY(system1_mixer_collision_r, system1_mixer_collision_w)
- AM_RANGE(0xc400, 0xc7ff) AM_WRITE_LEGACY(system1_mixer_collision_reset_w)
- AM_RANGE(0xc800, 0xcbff) AM_READWRITE_LEGACY(system1_sprite_collision_r, system1_sprite_collision_w)
- AM_RANGE(0xcc00, 0xcfff) AM_WRITE_LEGACY(system1_sprite_collision_reset_w)
+ AM_RANGE(0xc000, 0xc3ff) AM_READWRITE(system1_mixer_collision_r, system1_mixer_collision_w)
+ AM_RANGE(0xc400, 0xc7ff) AM_WRITE(system1_mixer_collision_reset_w)
+ AM_RANGE(0xc800, 0xcbff) AM_READWRITE(system1_sprite_collision_r, system1_sprite_collision_w)
+ AM_RANGE(0xcc00, 0xcfff) AM_WRITE(system1_sprite_collision_reset_w)
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(system1_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0xe000, 0xefff) AM_READWRITE_LEGACY(system1_videoram_r, system1_videoram_w)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(system1_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe000, 0xefff) AM_READWRITE(system1_videoram_r, system1_videoram_w)
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE(m_ram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index 2d214e1c394..bbe7a9dfbff 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -135,11 +135,11 @@ static ADDRESS_MAP_START( shinobib_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0xc42002, 0xc42003) AM_READ_PORT("DSW2")
AM_RANGE(0xC43000, 0xC43001) AM_WRITENOP
AM_RANGE(0xC44000, 0xC44001) AM_WRITENOP
- AM_RANGE(0xc46000, 0xc46001) AM_WRITE_LEGACY(s16a_bootleg_bgscrolly_w)
- AM_RANGE(0xc46002, 0xc46003) AM_WRITE_LEGACY(s16a_bootleg_bgscrollx_w)
- AM_RANGE(0xc46004, 0xc46005) AM_WRITE_LEGACY(s16a_bootleg_fgscrolly_w)
- AM_RANGE(0xc46006, 0xc46007) AM_WRITE_LEGACY(s16a_bootleg_fgscrollx_w)
- AM_RANGE(0xc46008, 0xc46009) AM_WRITE_LEGACY(s16a_bootleg_tilemapselect_w)
+ AM_RANGE(0xc46000, 0xc46001) AM_WRITE(s16a_bootleg_bgscrolly_w)
+ AM_RANGE(0xc46002, 0xc46003) AM_WRITE(s16a_bootleg_bgscrollx_w)
+ AM_RANGE(0xc46004, 0xc46005) AM_WRITE(s16a_bootleg_fgscrolly_w)
+ AM_RANGE(0xc46006, 0xc46007) AM_WRITE(s16a_bootleg_fgscrollx_w)
+ AM_RANGE(0xc46008, 0xc46009) AM_WRITE(s16a_bootleg_tilemapselect_w)
AM_RANGE(0xC60000, 0xC60001) AM_READNOP
AM_RANGE(0xffc000, 0xffffff) AM_RAM // work ram
ADDRESS_MAP_END
@@ -190,11 +190,11 @@ static ADDRESS_MAP_START( passshtb_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0xc42002, 0xc42003) AM_READ_PORT("DSW1")
AM_RANGE(0xc42000, 0xc42001) AM_READ_PORT("DSW2")
AM_RANGE(0xc42006, 0xc42007) AM_WRITE(sound_command_w)
- AM_RANGE(0xc46000, 0xc46001) AM_WRITE_LEGACY(s16a_bootleg_bgscrolly_w)
- AM_RANGE(0xc46002, 0xc46003) AM_WRITE_LEGACY(s16a_bootleg_bgscrollx_w)
- AM_RANGE(0xc46004, 0xc46005) AM_WRITE_LEGACY(s16a_bootleg_fgscrolly_w)
- AM_RANGE(0xc46006, 0xc46007) AM_WRITE_LEGACY(s16a_bootleg_fgscrollx_w)
- AM_RANGE(0xc46008, 0xc46009) AM_WRITE_LEGACY(s16a_bootleg_tilemapselect_w)
+ AM_RANGE(0xc46000, 0xc46001) AM_WRITE(s16a_bootleg_bgscrolly_w)
+ AM_RANGE(0xc46002, 0xc46003) AM_WRITE(s16a_bootleg_bgscrollx_w)
+ AM_RANGE(0xc46004, 0xc46005) AM_WRITE(s16a_bootleg_fgscrolly_w)
+ AM_RANGE(0xc46006, 0xc46007) AM_WRITE(s16a_bootleg_fgscrollx_w)
+ AM_RANGE(0xc46008, 0xc46009) AM_WRITE(s16a_bootleg_tilemapselect_w)
AM_RANGE(0xffc000, 0xffffff) AM_RAM // work ram
ADDRESS_MAP_END
@@ -273,11 +273,11 @@ static ADDRESS_MAP_START( passht4b_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0xc43004, 0xc43005) AM_READ_PORT("P3")
AM_RANGE(0xc43006, 0xc43007) AM_READ_PORT("P4")
AM_RANGE(0xc4600a, 0xc4600b) AM_WRITE(sys16_coinctrl_w) /* coin counter doesn't work */
- AM_RANGE(0xc46000, 0xc46001) AM_WRITE_LEGACY(s16a_bootleg_bgscrolly_w)
- AM_RANGE(0xc46002, 0xc46003) AM_WRITE_LEGACY(s16a_bootleg_bgscrollx_w)
- AM_RANGE(0xc46004, 0xc46005) AM_WRITE_LEGACY(s16a_bootleg_fgscrolly_w)
- AM_RANGE(0xc46006, 0xc46007) AM_WRITE_LEGACY(s16a_bootleg_fgscrollx_w)
- AM_RANGE(0xc46008, 0xc46009) AM_WRITE_LEGACY(s16a_bootleg_tilemapselect_w)
+ AM_RANGE(0xc46000, 0xc46001) AM_WRITE(s16a_bootleg_bgscrolly_w)
+ AM_RANGE(0xc46002, 0xc46003) AM_WRITE(s16a_bootleg_bgscrollx_w)
+ AM_RANGE(0xc46004, 0xc46005) AM_WRITE(s16a_bootleg_fgscrolly_w)
+ AM_RANGE(0xc46006, 0xc46007) AM_WRITE(s16a_bootleg_fgscrollx_w)
+ AM_RANGE(0xc46008, 0xc46009) AM_WRITE(s16a_bootleg_tilemapselect_w)
AM_RANGE(0xffc000, 0xffffff) AM_RAM // work ram
ADDRESS_MAP_END
@@ -318,11 +318,11 @@ static ADDRESS_MAP_START( wb3bbl_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0xc42002, 0xc42003) AM_READ_PORT("DSW1")
AM_RANGE(0xc42006, 0xc42007) AM_WRITE(sound_command_w)
AM_RANGE(0xC44000, 0xC44001) AM_WRITENOP
- AM_RANGE(0xc46000, 0xc46001) AM_WRITE_LEGACY(s16a_bootleg_bgscrolly_w)
- AM_RANGE(0xc46002, 0xc46003) AM_WRITE_LEGACY(s16a_bootleg_bgscrollx_w)
- AM_RANGE(0xc46004, 0xc46005) AM_WRITE_LEGACY(s16a_bootleg_fgscrolly_w)
- AM_RANGE(0xc46006, 0xc46007) AM_WRITE_LEGACY(s16a_bootleg_fgscrollx_w)
- AM_RANGE(0xc46008, 0xc46009) AM_WRITE_LEGACY(s16a_bootleg_tilemapselect_w)
+ AM_RANGE(0xc46000, 0xc46001) AM_WRITE(s16a_bootleg_bgscrolly_w)
+ AM_RANGE(0xc46002, 0xc46003) AM_WRITE(s16a_bootleg_bgscrollx_w)
+ AM_RANGE(0xc46004, 0xc46005) AM_WRITE(s16a_bootleg_fgscrolly_w)
+ AM_RANGE(0xc46006, 0xc46007) AM_WRITE(s16a_bootleg_fgscrollx_w)
+ AM_RANGE(0xc46008, 0xc46009) AM_WRITE(s16a_bootleg_tilemapselect_w)
AM_RANGE(0xff0000, 0xffffff) AM_RAM // work ram
ADDRESS_MAP_END
@@ -510,8 +510,8 @@ static ADDRESS_MAP_START( bayroute_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0x100000, 0x100003) AM_WRITENOP // tilebank control?
AM_RANGE(0x500000, 0x503fff) AM_RAM // work ram
AM_RANGE(0x600000, 0x600fff) AM_RAM AM_BASE_LEGACY(&segaic16_spriteram_0)
- AM_RANGE(0x700000, 0x70ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x710000, 0x710fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x700000, 0x70ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x710000, 0x710fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE_LEGACY(segaic16_paletteram_w) AM_BASE_LEGACY(&segaic16_paletteram)
AM_RANGE(0x900000, 0x900001) AM_WRITE(sys16_coinctrl_w)
AM_RANGE(0x901002, 0x901003) AM_READ_PORT("P1")
@@ -597,8 +597,8 @@ WRITE16_MEMBER(segas1x_bootleg_state::s16bl_bgscrolly_w)
static ADDRESS_MAP_START( goldnaxeb1_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
- AM_RANGE(0x100000, 0x10ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x100000, 0x10ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x118000, 0x118001) AM_WRITE(s16bl_fgscrolly_w)
AM_RANGE(0x118008, 0x118009) AM_WRITE(s16bl_fgscrollx_bank_w) // and tile bank
AM_RANGE(0x118010, 0x118011) AM_WRITE(s16bl_bgscrolly_w)
@@ -624,8 +624,8 @@ static ADDRESS_MAP_START( bayrouteb1_map, AS_PROGRAM, 16, segas1x_bootleg_state
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x500000, 0x503fff) AM_RAM // work ram
AM_RANGE(0x600000, 0x600fff) AM_RAM AM_BASE_LEGACY(&segaic16_spriteram_0)
- AM_RANGE(0x700000, 0x70ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x710000, 0x710fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x700000, 0x70ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x710000, 0x710fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x718000, 0x718001) AM_WRITE(s16bl_fgscrolly_w)
AM_RANGE(0x718008, 0x718009) AM_WRITE(s16bl_fgscrollx_bank_w) // and tile bank
AM_RANGE(0x718010, 0x718011) AM_WRITE(s16bl_bgscrolly_w)
@@ -693,8 +693,8 @@ static ADDRESS_MAP_START( bayrouteb2_map, AS_PROGRAM, 16, segas1x_bootleg_state
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x500000, 0x503fff) AM_RAM // work ram
AM_RANGE(0x600000, 0x600fff) AM_RAM AM_BASE_LEGACY(&segaic16_spriteram_0)
- AM_RANGE(0x700000, 0x70ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x710000, 0x710fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x700000, 0x70ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x710000, 0x710fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x718000, 0x718001) AM_WRITE(s16bl_fgscrolly_w)
AM_RANGE(0x718008, 0x718009) AM_WRITE(s16bl_fgscrollx_bank_w) // and tile bank
AM_RANGE(0x718010, 0x718011) AM_WRITE(s16bl_bgscrolly_w)
@@ -716,8 +716,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dduxbl_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x3f0000, 0x3fffff) AM_WRITE(sys16_tilebank_w)
- AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE_LEGACY(&segaic16_spriteram_0)
AM_RANGE(0x840000, 0x840fff) AM_RAM_WRITE_LEGACY(segaic16_paletteram_w) AM_BASE_LEGACY(&segaic16_paletteram)
AM_RANGE(0xc40000, 0xc40001) AM_WRITE(sys16_coinctrl_w)
@@ -808,8 +808,8 @@ WRITE16_MEMBER(segas1x_bootleg_state::goldnaxeb2_bgpage_w)
static ADDRESS_MAP_START( goldnaxeb2_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
- AM_RANGE(0x100000, 0x10ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x100000, 0x10ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x140000, 0x143fff) AM_RAM_WRITE_LEGACY(segaic16_paletteram_w) AM_BASE_LEGACY(&segaic16_paletteram)
AM_RANGE(0x200000, 0x200fff) AM_RAM AM_BASE_LEGACY(&segaic16_spriteram_0)
AM_RANGE(0xc40000, 0xc40001) AM_READ_PORT("DSW2") AM_WRITENOP
@@ -837,8 +837,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( fpointbl_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
- AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE_LEGACY(&segaic16_spriteram_0)
AM_RANGE(0x600006, 0x600007) AM_WRITE(sound_command_w)
@@ -879,8 +879,8 @@ static ADDRESS_MAP_START( eswatbl_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0x3e2000, 0x3e2001) AM_WRITE(eswat_tilebank0_w) // external tile bank ( > 0x4000 tiles )
- AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x418000, 0x418001) AM_WRITE(s16bl_bgscrolly_w)
AM_RANGE(0x418008, 0x418009) AM_WRITE(s16bl_bgscrollx_w) // and tile bank
AM_RANGE(0x418010, 0x418011) AM_WRITE(s16bl_fgscrolly_w)
@@ -905,8 +905,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( tetrisbl_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x418000, 0x418001) AM_WRITE(s16bl_fgscrolly_w)
AM_RANGE(0x418008, 0x418009) AM_WRITE(s16bl_fgscrollx_w)
@@ -945,8 +945,8 @@ static ADDRESS_MAP_START( beautyb_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0x0280D6, 0x0280D7) AM_READ(beautyb_unkx_r)
AM_RANGE(0x0280D8, 0x0280D9) AM_READ(beautyb_unkx_r)
- AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x410000, 0x413fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x410000, 0x413fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x418000, 0x418001) AM_WRITE(s16bl_bgscrolly_w)
AM_RANGE(0x418008, 0x418009) AM_WRITE(s16bl_bgscrollx_w)
@@ -973,8 +973,8 @@ static ADDRESS_MAP_START( tturfbl_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM // work ram
AM_RANGE(0x300000, 0x300fff) AM_RAM AM_BASE_LEGACY(&segaic16_spriteram_0)
- AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE_LEGACY(segaic16_paletteram_w) AM_BASE_LEGACY(&segaic16_paletteram)
AM_RANGE(0x600000, 0x600001) AM_WRITE(sys16_coinctrl_w)
AM_RANGE(0x600000, 0x600001) AM_READ_PORT("DSW2")
@@ -1114,8 +1114,8 @@ WRITE16_MEMBER(segas1x_bootleg_state::sound_command_irq_w)
static ADDRESS_MAP_START( shdancbl_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE_LEGACY(&segaic16_spriteram_0)
AM_RANGE(0x840000, 0x840fff) AM_RAM_WRITE_LEGACY(segaic16_paletteram_w) AM_BASE_LEGACY(&segaic16_paletteram)
AM_RANGE(0xc00000, 0xc0ffff) AM_NOP
@@ -1255,8 +1255,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mwalkbl_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE_LEGACY(&segaic16_spriteram_0)
AM_RANGE(0x840000, 0x840fff) AM_RAM_WRITE_LEGACY(segaic16_paletteram_w) AM_BASE_LEGACY(&segaic16_paletteram)
@@ -1297,8 +1297,8 @@ ADDRESS_MAP_END
/* bootleg doesn't have real vdp or i/o */
static ADDRESS_MAP_START( astormbl_map, AS_PROGRAM, 16, segas1x_bootleg_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x100000, 0x10ffff) AM_RAM_WRITE_LEGACY(sys16_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE_LEGACY(sys16_textram_w) AM_BASE(m_textram)
+ AM_RANGE(0x100000, 0x10ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE(m_tileram)
+ AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE(m_textram)
AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE_LEGACY(segaic16_paletteram_w) AM_BASE_LEGACY(&segaic16_paletteram)
AM_RANGE(0x200000, 0x200fff) AM_RAM AM_BASE_LEGACY(&segaic16_spriteram_0)
AM_RANGE(0xa00000, 0xa00001) AM_READ_PORT("COINAGE")
diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c
index 1e5493c3a18..9285e125e65 100644
--- a/src/mame/drivers/tagteam.c
+++ b/src/mame/drivers/tagteam.c
@@ -43,15 +43,15 @@ WRITE8_MEMBER(tagteam_state::irq_clear_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, tagteam_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
- AM_RANGE(0x2000, 0x2000) AM_READ_PORT("P2") AM_WRITE_LEGACY(tagteam_flipscreen_w)
- AM_RANGE(0x2001, 0x2001) AM_READ_PORT("P1") AM_WRITE_LEGACY(tagteam_control_w)
+ AM_RANGE(0x2000, 0x2000) AM_READ_PORT("P2") AM_WRITE(tagteam_flipscreen_w)
+ AM_RANGE(0x2001, 0x2001) AM_READ_PORT("P1") AM_WRITE(tagteam_control_w)
AM_RANGE(0x2002, 0x2002) AM_READ_PORT("DSW1") AM_WRITE(sound_command_w)
AM_RANGE(0x2003, 0x2003) AM_READ_PORT("DSW2") AM_WRITE(irq_clear_w)
- AM_RANGE(0x4000, 0x43ff) AM_READWRITE_LEGACY(tagteam_mirrorvideoram_r, tagteam_mirrorvideoram_w)
- AM_RANGE(0x4400, 0x47ff) AM_READWRITE_LEGACY(tagteam_mirrorcolorram_r, tagteam_mirrorcolorram_w)
+ AM_RANGE(0x4000, 0x43ff) AM_READWRITE(tagteam_mirrorvideoram_r, tagteam_mirrorvideoram_w)
+ AM_RANGE(0x4400, 0x47ff) AM_READWRITE(tagteam_mirrorcolorram_r, tagteam_mirrorcolorram_w)
AM_RANGE(0x4800, 0x4fff) AM_READONLY
- AM_RANGE(0x4800, 0x4bff) AM_WRITE_LEGACY(tagteam_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4c00, 0x4fff) AM_WRITE_LEGACY(tagteam_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4800, 0x4bff) AM_WRITE(tagteam_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4c00, 0x4fff) AM_WRITE(tagteam_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index 2153874c244..9ee5e5705eb 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -36,15 +36,15 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, tail2nos_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x200000, 0x27ffff) AM_ROMBANK("bank1") /* extra ROM */
AM_RANGE(0x2c0000, 0x2dffff) AM_ROMBANK("bank2")
- AM_RANGE(0x400000, 0x41ffff) AM_READWRITE_LEGACY(tail2nos_zoomdata_r, tail2nos_zoomdata_w)
+ AM_RANGE(0x400000, 0x41ffff) AM_READWRITE(tail2nos_zoomdata_r, tail2nos_zoomdata_w)
AM_RANGE(0x500000, 0x500fff) AM_DEVREADWRITE8_LEGACY("k051316", k051316_r, k051316_w, 0x00ff)
AM_RANGE(0x510000, 0x51001f) AM_DEVWRITE8_LEGACY("k051316", k051316_ctrl_w, 0x00ff)
AM_RANGE(0xff8000, 0xffbfff) AM_RAM /* work RAM */
AM_RANGE(0xffc000, 0xffc2ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xffc300, 0xffcfff) AM_RAM
- AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE_LEGACY(tail2nos_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE(tail2nos_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
- AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("INPUTS") AM_WRITE_LEGACY(tail2nos_gfxbank_w)
+ AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("INPUTS") AM_WRITE(tail2nos_gfxbank_w)
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW")
AM_RANGE(0xfff008, 0xfff009) AM_WRITE(sound_command_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 4d42bcda13a..2fe1b8f17b4 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -510,7 +510,7 @@ WRITE16_MEMBER(taitob_state::realpunc_output_w)
AM_RANGE(ADDR+0x11980, ADDR+0x137ff) AM_RAM \
AM_RANGE(ADDR+0x13800, ADDR+0x13fff) AM_DEVREADWRITE_LEGACY("tc0180vcu", tc0180vcu_scroll_r, tc0180vcu_scroll_w) \
AM_RANGE(ADDR+0x18000, ADDR+0x1801f) AM_DEVREADWRITE_LEGACY("tc0180vcu", tc0180vcu_ctrl_r, tc0180vcu_ctrl_w) \
- AM_RANGE(ADDR+0x40000, ADDR+0x7ffff) AM_READWRITE_LEGACY(tc0180vcu_framebuffer_word_r, tc0180vcu_framebuffer_word_w)
+ AM_RANGE(ADDR+0x40000, ADDR+0x7ffff) AM_READWRITE(tc0180vcu_framebuffer_word_r, tc0180vcu_framebuffer_word_w)
static ADDRESS_MAP_START( rastsag2_map, AS_PROGRAM, 16, taitob_state )
@@ -566,9 +566,9 @@ static ADDRESS_MAP_START( hitice_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x700002, 0x700003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
AM_RANGE(0x800000, 0x803fff) AM_RAM /* Main RAM */
AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
- AM_RANGE(0xb00000, 0xb7ffff) AM_RAM_WRITE_LEGACY(hitice_pixelram_w) AM_BASE(m_pixelram)
+ AM_RANGE(0xb00000, 0xb7ffff) AM_RAM_WRITE(hitice_pixelram_w) AM_BASE(m_pixelram)
// { 0xbffff0, 0xbffff1, ???
- AM_RANGE(0xbffff2, 0xbffff5) AM_WRITE_LEGACY(hitice_pixel_scroll_w)
+ AM_RANGE(0xbffff2, 0xbffff5) AM_WRITE(hitice_pixel_scroll_w)
// { 0xbffffa, 0xbffffb, ???
ADDRESS_MAP_END
@@ -723,7 +723,7 @@ static ADDRESS_MAP_START( realpunc_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x110000, 0x12ffff) AM_RAM
AM_RANGE(0x130000, 0x13ffff) AM_RAM // Check me
AM_RANGE(0x180000, 0x18000f) AM_DEVREADWRITE_LEGACY("tc0510nio", tc0510nio_halfword_wordswap_r, tc0510nio_halfword_wordswap_w)
- AM_RANGE(0x184000, 0x184001) AM_WRITE_LEGACY(realpunc_video_ctrl_w)
+ AM_RANGE(0x184000, 0x184001) AM_WRITE(realpunc_video_ctrl_w)
AM_RANGE(0x188000, 0x188001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x188002, 0x188003) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_comm_w, 0xff00)
AM_RANGE(0x18c000, 0x18c001) AM_WRITE(realpunc_output_w)
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index 2a63eb3e66e..5fc23b6cb77 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -847,7 +847,7 @@ static ADDRESS_MAP_START( growl_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x340000, 0x340001) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x400000, 0x400001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x400002, 0x400003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
- AM_RANGE(0x500000, 0x50000f) AM_WRITE_LEGACY(taitof2_spritebank_w)
+ AM_RANGE(0x500000, 0x50000f) AM_WRITE(taitof2_spritebank_w)
AM_RANGE(0x504000, 0x504001) AM_WRITENOP /* unknown... various values */
AM_RANGE(0x508000, 0x50800f) AM_READ_PORT("IN3")
AM_RANGE(0x50c000, 0x50c00f) AM_READ_PORT("IN4")
@@ -879,7 +879,7 @@ static ADDRESS_MAP_START( footchmp_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x300000, 0x30000f) AM_WRITE_LEGACY(taitof2_spritebank_w) /* updated at $a6e, off irq5 */
+ AM_RANGE(0x300000, 0x30000f) AM_WRITE(taitof2_spritebank_w) /* updated at $a6e, off irq5 */
AM_RANGE(0x400000, 0x40ffff) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_word_r, tc0480scp_word_w) /* tilemaps */
AM_RANGE(0x430000, 0x43002f) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_ctrl_word_r, tc0480scp_ctrl_word_w)
AM_RANGE(0x500000, 0x50001f) AM_DEVWRITE8_LEGACY("tc0360pri", tc0360pri_w, 0x00ff) /* 500002 written like a watchdog?! */
@@ -907,7 +907,7 @@ static ADDRESS_MAP_START( koshien_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x800000, 0x80ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x820000, 0x82000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xa20000, 0xa20001) AM_WRITE_LEGACY(koshien_spritebank_w)
+ AM_RANGE(0xa20000, 0xa20001) AM_WRITE(koshien_spritebank_w)
AM_RANGE(0xb00000, 0xb0001f) AM_DEVWRITE8_LEGACY("tc0360pri", tc0360pri_w, 0xff00)
ADDRESS_MAP_END
@@ -921,7 +921,7 @@ static ADDRESS_MAP_START( yuyugogo_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0xb00000, 0xb10fff) AM_RAM /* deliberate writes to $b10xxx, I think */
- AM_RANGE(0xc00000, 0xc01fff) AM_WRITE_LEGACY(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
+ AM_RANGE(0xc00000, 0xc01fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
AM_RANGE(0xd00000, 0xdfffff) AM_ROM AM_REGION("extra", 0)
ADDRESS_MAP_END
@@ -934,7 +934,7 @@ static ADDRESS_MAP_START( ninjak_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x380000, 0x380001) AM_WRITE(watchdog_reset16_w) /* ??? */
AM_RANGE(0x400000, 0x400001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x400002, 0x400003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
- AM_RANGE(0x600000, 0x60000f) AM_WRITE_LEGACY(taitof2_spritebank_w)
+ AM_RANGE(0x600000, 0x60000f) AM_WRITE(taitof2_spritebank_w)
AM_RANGE(0x800000, 0x80ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x820000, 0x82000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
@@ -954,7 +954,7 @@ static ADDRESS_MAP_START( solfigtr_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x340000, 0x340001) AM_WRITE(watchdog_reset16_w) /* NOT VERIFIED */
AM_RANGE(0x400000, 0x400001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x400002, 0x400003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
- AM_RANGE(0x500000, 0x50000f) AM_WRITE_LEGACY(taitof2_spritebank_w)
+ AM_RANGE(0x500000, 0x50000f) AM_WRITE(taitof2_spritebank_w)
AM_RANGE(0x504000, 0x504001) AM_WRITENOP /* unknown... various values */
AM_RANGE(0x800000, 0x80ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x820000, 0x82000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
@@ -982,7 +982,7 @@ static ADDRESS_MAP_START( pulirula_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x400000, 0x401fff) AM_DEVREADWRITE_LEGACY("tc0430grw", tc0430grw_word_r, tc0430grw_word_w) /* ROZ tilemap */
AM_RANGE(0x402000, 0x40200f) AM_DEVWRITE_LEGACY("tc0430grw", tc0430grw_ctrl_word_w)
// AM_RANGE(0x500000, 0x500001) AM_WRITENOP /* ??? */
- AM_RANGE(0x600000, 0x603fff) AM_WRITE_LEGACY(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
+ AM_RANGE(0x600000, 0x603fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x800000, 0x80ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x820000, 0x82000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
@@ -1041,7 +1041,7 @@ static ADDRESS_MAP_START( deadconx_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x300000, 0x30000f) AM_WRITE_LEGACY(taitof2_spritebank_w)
+ AM_RANGE(0x300000, 0x30000f) AM_WRITE(taitof2_spritebank_w)
AM_RANGE(0x400000, 0x40ffff) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_word_r, tc0480scp_word_w) /* tilemaps */
// AM_RANGE(0x42000c, 0x42000f) AM_WRITENOP /* zeroed */
AM_RANGE(0x430000, 0x43002f) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_ctrl_word_r, tc0480scp_ctrl_word_w)
@@ -1061,7 +1061,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dinorex_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x2fffff) AM_ROM
AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE_LEGACY("tc0510nio", tc0510nio_halfword_r, tc0510nio_halfword_w)
- AM_RANGE(0x400000, 0x400fff) AM_WRITE_LEGACY(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
+ AM_RANGE(0x400000, 0x400fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x600000, 0x60ffff) AM_RAM
AM_RANGE(0x700000, 0x70001f) AM_DEVWRITE8_LEGACY("tc0360pri", tc0360pri_w, 0x00ff) /* ?? */
@@ -1079,7 +1079,7 @@ static ADDRESS_MAP_START( qjinsei_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
AM_RANGE(0x300000, 0x30ffff) AM_RAM
AM_RANGE(0x500000, 0x500001) AM_WRITENOP /* watchdog ? */
- AM_RANGE(0x600000, 0x603fff) AM_WRITE_LEGACY(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
+ AM_RANGE(0x600000, 0x603fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x800000, 0x80ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x820000, 0x82000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
@@ -1095,7 +1095,7 @@ static ADDRESS_MAP_START( qcrayon_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x300000, 0x3fffff) AM_ROM AM_REGION("extra", 0) /* extra data rom */
AM_RANGE(0x500000, 0x500001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x500002, 0x500003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
- AM_RANGE(0x600000, 0x603fff) AM_WRITE_LEGACY(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
+ AM_RANGE(0x600000, 0x603fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x900000, 0x90ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
@@ -1116,7 +1116,7 @@ static ADDRESS_MAP_START( qcrayon2_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x900000, 0x90001f) AM_DEVWRITE8_LEGACY("tc0360pri", tc0360pri_w, 0x00ff) /* ?? */
AM_RANGE(0xa00000, 0xa00001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0xa00002, 0xa00003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
- AM_RANGE(0xb00000, 0xb017ff) AM_WRITE_LEGACY(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
+ AM_RANGE(0xb00000, 0xb017ff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
ADDRESS_MAP_END
static ADDRESS_MAP_START( driftout_map, AS_PROGRAM, 16, taitof2_state )
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index 4159ecd4144..e2b0293ec62 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -191,17 +191,17 @@ static ADDRESS_MAP_START( f3_map, AS_PROGRAM, 32, taito_f3_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x300000, 0x30007f) AM_WRITE(f3_sound_bankswitch_w)
AM_RANGE(0x400000, 0x41ffff) AM_MIRROR(0x20000) AM_RAM AM_BASE(m_f3_ram)
- AM_RANGE(0x440000, 0x447fff) AM_RAM_WRITE_LEGACY(f3_palette_24bit_w) AM_SHARE("paletteram")
+ AM_RANGE(0x440000, 0x447fff) AM_RAM_WRITE(f3_palette_24bit_w) AM_SHARE("paletteram")
AM_RANGE(0x4a0000, 0x4a001f) AM_READWRITE(f3_control_r, f3_control_w)
AM_RANGE(0x4c0000, 0x4c0003) AM_WRITE16(f3_unk_w,0xffffffff)
- AM_RANGE(0x600000, 0x60ffff) AM_READWRITE16_LEGACY(f3_spriteram_r,f3_spriteram_w,0xffffffff) //AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x610000, 0x61bfff) AM_READWRITE16_LEGACY(f3_pf_data_r,f3_pf_data_w,0xffffffff) //AM_BASE(m_f3_pf_data)
- AM_RANGE(0x61c000, 0x61dfff) AM_READWRITE16_LEGACY(f3_videoram_r,f3_videoram_w,0xffffffff) //AM_BASE(m_videoram)
- AM_RANGE(0x61e000, 0x61ffff) AM_READWRITE16_LEGACY(f3_vram_r,f3_vram_w,0xffffffff) //AM_BASE(m_f3_vram)
- AM_RANGE(0x620000, 0x62ffff) AM_READWRITE16_LEGACY(f3_lineram_r,f3_lineram_w,0xffffffff) //AM_BASE(m_f3_line_ram)
- AM_RANGE(0x630000, 0x63ffff) AM_READWRITE16_LEGACY(f3_pivot_r,f3_pivot_w,0xffffffff) //AM_BASE(m_f3_pivot_ram)
- AM_RANGE(0x660000, 0x66000f) AM_WRITE16_LEGACY(f3_control_0_w,0xffffffff)
- AM_RANGE(0x660010, 0x66001f) AM_WRITE16_LEGACY(f3_control_1_w,0xffffffff)
+ AM_RANGE(0x600000, 0x60ffff) AM_READWRITE16(f3_spriteram_r,f3_spriteram_w,0xffffffff) //AM_BASE_SIZE(m_spriteram, m_spriteram_size)
+ AM_RANGE(0x610000, 0x61bfff) AM_READWRITE16(f3_pf_data_r,f3_pf_data_w,0xffffffff) //AM_BASE(m_f3_pf_data)
+ AM_RANGE(0x61c000, 0x61dfff) AM_READWRITE16(f3_videoram_r,f3_videoram_w,0xffffffff) //AM_BASE(m_videoram)
+ AM_RANGE(0x61e000, 0x61ffff) AM_READWRITE16(f3_vram_r,f3_vram_w,0xffffffff) //AM_BASE(m_f3_vram)
+ AM_RANGE(0x620000, 0x62ffff) AM_READWRITE16(f3_lineram_r,f3_lineram_w,0xffffffff) //AM_BASE(m_f3_line_ram)
+ AM_RANGE(0x630000, 0x63ffff) AM_READWRITE16(f3_pivot_r,f3_pivot_w,0xffffffff) //AM_BASE(m_f3_pivot_ram)
+ AM_RANGE(0x660000, 0x66000f) AM_WRITE16(f3_control_0_w,0xffffffff)
+ AM_RANGE(0x660010, 0x66001f) AM_WRITE16(f3_control_1_w,0xffffffff)
AM_RANGE(0xc00000, 0xc007ff) AM_RAM AM_SHARE("f3_shared")
AM_RANGE(0xc80000, 0xc80003) AM_WRITE(f3_sound_reset_0_w)
AM_RANGE(0xc80100, 0xc80103) AM_WRITE(f3_sound_reset_1_w)
@@ -3860,12 +3860,12 @@ static DRIVER_INIT( bubsymph )
READ32_MEMBER(taito_f3_state::bubsympb_oki_r)
{
- return machine().device<okim6295_device>("oki")->read(*&space,0);
+ return machine().device<okim6295_device>("oki")->read(space,0);
}
WRITE32_MEMBER(taito_f3_state::bubsympb_oki_w)
{
//printf("write %08x %08x\n",data,mem_mask);
- if (ACCESSING_BITS_0_7) machine().device<okim6295_device>("oki")->write(*&space, 0,data&0xff);
+ if (ACCESSING_BITS_0_7) machine().device<okim6295_device>("oki")->write(space, 0,data&0xff);
//if (mem_mask==0x000000ff) downcast<okim6295_device *>(device)->write(0,data&0xff);
if (ACCESSING_BITS_16_23)
{
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index f2bdbd336e4..ae0cb86ac64 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -676,8 +676,8 @@ READ8_MEMBER(taitol_state::horshoes_trackx_hi_r)
AM_RANGE(0xd000, 0xdfff) AM_ROMBANK("bank3") AM_WRITE(bank1_w) \
AM_RANGE(0xe000, 0xefff) AM_ROMBANK("bank4") AM_WRITE(bank2_w) \
AM_RANGE(0xf000, 0xfdff) AM_ROMBANK("bank5") AM_WRITE(bank3_w) \
- AM_RANGE(0xfe00, 0xfe03) AM_READWRITE_LEGACY(taitol_bankc_r, taitol_bankc_w) \
- AM_RANGE(0xfe04, 0xfe04) AM_READWRITE_LEGACY(taitol_control_r, taitol_control_w) \
+ AM_RANGE(0xfe00, 0xfe03) AM_READWRITE(taitol_bankc_r, taitol_bankc_w) \
+ AM_RANGE(0xfe04, 0xfe04) AM_READWRITE(taitol_control_r, taitol_control_w) \
AM_RANGE(0xff00, 0xff02) AM_READWRITE(irq_adr_r, irq_adr_w) \
AM_RANGE(0xff03, 0xff03) AM_READWRITE(irq_enable_r, irq_enable_w) \
AM_RANGE(0xff04, 0xff07) AM_READWRITE(rambankswitch_r, rambankswitch_w) \
@@ -889,7 +889,7 @@ static ADDRESS_MAP_START( horshoes_map, AS_PROGRAM, 8, taitol_state )
AM_RANGE(0xa808, 0xa808) AM_READ(horshoes_trackx_lo_r)
AM_RANGE(0xa80c, 0xa80c) AM_READ(horshoes_trackx_hi_r)
AM_RANGE(0xb801, 0xb801) AM_READNOP // Watchdog or interrupt ack
- AM_RANGE(0xb802, 0xb802) AM_WRITE_LEGACY(horshoes_bankg_w)
+ AM_RANGE(0xb802, 0xb802) AM_WRITE(horshoes_bankg_w)
AM_RANGE(0xbc00, 0xbc00) AM_WRITENOP
ADDRESS_MAP_END
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index adf72eb02ef..186d558a4bb 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -1515,7 +1515,7 @@ static ADDRESS_MAP_START( contcirc_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM
AM_RANGE(0x084000, 0x087fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x090000, 0x090001) AM_WRITE_LEGACY(contcirc_out_w) /* road palette bank, sub CPU reset, 3d glasses control */
+ AM_RANGE(0x090000, 0x090001) AM_WRITE(contcirc_out_w) /* road palette bank, sub CPU reset, 3d glasses control */
AM_RANGE(0x100000, 0x100007) AM_DEVREADWRITE_LEGACY("tc0110pcr", tc0110pcr_word_r, tc0110pcr_step1_rbswap_word_w) /* palette */
AM_RANGE(0x200000, 0x20ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x220000, 0x22000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
@@ -1631,7 +1631,7 @@ static ADDRESS_MAP_START( sci_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0xa00000, 0xa0ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0xa20000, 0xa2000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xc08000, 0xc08001) AM_READWRITE_LEGACY(sci_spriteframe_r, sci_spriteframe_w)
+ AM_RANGE(0xc08000, 0xc08001) AM_READWRITE(sci_spriteframe_r, sci_spriteframe_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( sci_cpub_map, AS_PROGRAM, 16, taitoz_state )
@@ -1726,7 +1726,7 @@ static ADDRESS_MAP_START( dblaxle_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0xa00000, 0xa0ffff) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_word_r, tc0480scp_word_w) /* tilemaps */
AM_RANGE(0xa30000, 0xa3002f) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_ctrl_word_r, tc0480scp_ctrl_word_w)
AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* mostly unused ? */
- AM_RANGE(0xc08000, 0xc08001) AM_READWRITE_LEGACY(sci_spriteframe_r, sci_spriteframe_w) /* set in int6, seems to stay zero */
+ AM_RANGE(0xc08000, 0xc08001) AM_READWRITE(sci_spriteframe_r, sci_spriteframe_w) /* set in int6, seems to stay zero */
ADDRESS_MAP_END
static ADDRESS_MAP_START( dblaxle_cpub_map, AS_PROGRAM, 16, taitoz_state )
@@ -1750,7 +1750,7 @@ static ADDRESS_MAP_START( racingb_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0x900000, 0x90ffff) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_word_r, tc0480scp_word_w) /* tilemaps */
AM_RANGE(0x930000, 0x93002f) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_ctrl_word_r, tc0480scp_ctrl_word_w)
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* mostly unused ? */
- AM_RANGE(0xb08000, 0xb08001) AM_READWRITE_LEGACY(sci_spriteframe_r, sci_spriteframe_w) /* alternates 0/0x100 */
+ AM_RANGE(0xb08000, 0xb08001) AM_READWRITE(sci_spriteframe_r, sci_spriteframe_w) /* alternates 0/0x100 */
ADDRESS_MAP_END
static ADDRESS_MAP_START( racingb_cpub_map, AS_PROGRAM, 16, taitoz_state )
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index a6a45e20806..514576b6f7d 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -464,15 +464,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( DSP_map_data, AS_DATA, 16, taitoair_state )
AM_RANGE(0x2003, 0x2003) AM_READNOP //bit 0 DMA status flag or vblank
- AM_RANGE(0x3000, 0x3002) AM_WRITE_LEGACY(dsp_flags_w)
- AM_RANGE(0x3404, 0x3404) AM_WRITE_LEGACY(dsp_frustum_left_w)
- AM_RANGE(0x3405, 0x3405) AM_WRITE_LEGACY(dsp_x_eyecoord_w)
- AM_RANGE(0x3406, 0x3406) AM_WRITE_LEGACY(dsp_z_eyecoord_w)
- AM_RANGE(0x3407, 0x3407) AM_READ_LEGACY(dsp_x_return_r)
- AM_RANGE(0x3408, 0x3408) AM_WRITE_LEGACY(dsp_frustum_bottom_w)
- AM_RANGE(0x3409, 0x3409) AM_WRITE_LEGACY(dsp_y_eyecoord_w)
- AM_RANGE(0x340a, 0x340a) AM_WRITE_LEGACY(dsp_rasterize_w) /* Just a (lame) guess */
- AM_RANGE(0x340b, 0x340b) AM_READ_LEGACY(dsp_y_return_r)
+ AM_RANGE(0x3000, 0x3002) AM_WRITE(dsp_flags_w)
+ AM_RANGE(0x3404, 0x3404) AM_WRITE(dsp_frustum_left_w)
+ AM_RANGE(0x3405, 0x3405) AM_WRITE(dsp_x_eyecoord_w)
+ AM_RANGE(0x3406, 0x3406) AM_WRITE(dsp_z_eyecoord_w)
+ AM_RANGE(0x3407, 0x3407) AM_READ(dsp_x_return_r)
+ AM_RANGE(0x3408, 0x3408) AM_WRITE(dsp_frustum_bottom_w)
+ AM_RANGE(0x3409, 0x3409) AM_WRITE(dsp_y_eyecoord_w)
+ AM_RANGE(0x340a, 0x340a) AM_WRITE(dsp_rasterize_w) /* Just a (lame) guess */
+ AM_RANGE(0x340b, 0x340b) AM_READ(dsp_y_return_r)
// AM_RANGE(0x3418, 0x341a) AM_WRITE_LEGACY(dsp_sqrt_w)
// AM_RANGE(0x341b, 0x341b) AM_WRITE_LEGACY(dsp_sqrt_r)
// AM_RANGE(0x341c, 0x341c) AM_READ_LEGACY(dsp_sqrt_flags1_r)
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index 3431b082521..11a4c4d1f26 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -845,8 +845,8 @@ static ADDRESS_MAP_START( taitojc_map, AS_PROGRAM, 32, taitojc_state )
AM_RANGE(0x00000000, 0x001fffff) AM_ROM AM_MIRROR(0x200000)
AM_RANGE(0x00400000, 0x01bfffff) AM_ROM AM_REGION("gfx1", 0)
AM_RANGE(0x04000000, 0x040f7fff) AM_RAM AM_BASE(m_vram)
- AM_RANGE(0x040f8000, 0x040fbfff) AM_READWRITE_LEGACY(taitojc_tile_r, taitojc_tile_w)
- AM_RANGE(0x040fc000, 0x040fefff) AM_READWRITE_LEGACY(taitojc_char_r, taitojc_char_w)
+ AM_RANGE(0x040f8000, 0x040fbfff) AM_READWRITE(taitojc_tile_r, taitojc_tile_w)
+ AM_RANGE(0x040fc000, 0x040fefff) AM_READWRITE(taitojc_char_r, taitojc_char_w)
AM_RANGE(0x040ff000, 0x040fffff) AM_RAM AM_BASE(m_objlist)
AM_RANGE(0x05800000, 0x0580003f) AM_READ8(jc_pcbid_r,0xffffffff)
AM_RANGE(0x05900000, 0x05900007) AM_READWRITE(mcu_comm_r, mcu_comm_w)
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index 4a48b2b6ceb..c90d6213b5e 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -201,9 +201,9 @@ static ADDRESS_MAP_START( taitosj_main_nomcu_map, AS_PROGRAM, 8, taitosj_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x07fe) AM_READWRITE_LEGACY(taitosj_fake_data_r, taitosj_fake_data_w)
- AM_RANGE(0x8801, 0x8801) AM_MIRROR(0x07fe) AM_READ_LEGACY(taitosj_fake_status_r)
- AM_RANGE(0x9000, 0xbfff) AM_WRITE_LEGACY(taitosj_characterram_w) AM_BASE(m_characterram)
+ AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x07fe) AM_READWRITE(taitosj_fake_data_r, taitosj_fake_data_w)
+ AM_RANGE(0x8801, 0x8801) AM_MIRROR(0x07fe) AM_READ(taitosj_fake_status_r)
+ AM_RANGE(0x9000, 0xbfff) AM_WRITE(taitosj_characterram_w) AM_BASE(m_characterram)
AM_RANGE(0xc000, 0xc3ff) AM_RAM
AM_RANGE(0xc400, 0xc7ff) AM_RAM AM_BASE(m_videoram_1)
AM_RANGE(0xc800, 0xcbff) AM_RAM AM_BASE(m_videoram_2)
@@ -213,7 +213,7 @@ static ADDRESS_MAP_START( taitosj_main_nomcu_map, AS_PROGRAM, 8, taitosj_state )
AM_RANGE(0xd200, 0xd27f) AM_MIRROR(0x0080) AM_RAM AM_BASE(m_paletteram)
AM_RANGE(0xd300, 0xd300) AM_MIRROR(0x00ff) AM_WRITEONLY AM_BASE(m_video_priority)
AM_RANGE(0xd400, 0xd403) AM_MIRROR(0x00f0) AM_READONLY AM_BASE(m_collision_reg)
- AM_RANGE(0xd404, 0xd404) AM_MIRROR(0x00f3) AM_READ_LEGACY(taitosj_gfxrom_r)
+ AM_RANGE(0xd404, 0xd404) AM_MIRROR(0x00f3) AM_READ(taitosj_gfxrom_r)
AM_RANGE(0xd408, 0xd408) AM_MIRROR(0x00f0) AM_READ_PORT("IN0")
AM_RANGE(0xd409, 0xd409) AM_MIRROR(0x00f0) AM_READ_PORT("IN1")
AM_RANGE(0xd40a, 0xd40a) AM_MIRROR(0x00f0) AM_READ_PORT("DSW1") /* DSW1 */
@@ -224,11 +224,11 @@ static ADDRESS_MAP_START( taitosj_main_nomcu_map, AS_PROGRAM, 8, taitosj_state )
AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_DEVREAD_LEGACY("ay1", ay8910_r) /* DSW2 and DSW3 */
AM_RANGE(0xd500, 0xd505) AM_MIRROR(0x00f0) AM_WRITEONLY AM_BASE(m_scroll)
AM_RANGE(0xd506, 0xd507) AM_MIRROR(0x00f0) AM_WRITEONLY AM_BASE(m_colorbank)
- AM_RANGE(0xd508, 0xd508) AM_MIRROR(0x00f0) AM_WRITE_LEGACY(taitosj_collision_reg_clear_w)
+ AM_RANGE(0xd508, 0xd508) AM_MIRROR(0x00f0) AM_WRITE(taitosj_collision_reg_clear_w)
AM_RANGE(0xd509, 0xd50a) AM_MIRROR(0x00f0) AM_WRITEONLY AM_BASE(m_gfxpointer)
AM_RANGE(0xd50b, 0xd50b) AM_MIRROR(0x00f0) AM_WRITE(taitosj_soundcommand_w)
AM_RANGE(0xd50d, 0xd50d) AM_MIRROR(0x00f0) AM_WRITEONLY /*watchdog_reset_w*/ /* Bio Attack sometimes resets after you die */
- AM_RANGE(0xd50e, 0xd50e) AM_MIRROR(0x00f0) AM_WRITE_LEGACY(taitosj_bankswitch_w)
+ AM_RANGE(0xd50e, 0xd50e) AM_MIRROR(0x00f0) AM_WRITE(taitosj_bankswitch_w)
AM_RANGE(0xd50f, 0xd50f) AM_MIRROR(0x00f0) AM_WRITENOP
AM_RANGE(0xd600, 0xd600) AM_MIRROR(0x00ff) AM_WRITEONLY AM_BASE(m_video_mode)
AM_RANGE(0xd700, 0xdfff) AM_NOP
@@ -241,9 +241,9 @@ static ADDRESS_MAP_START( taitosj_main_mcu_map, AS_PROGRAM, 8, taitosj_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x07fe) AM_READWRITE_LEGACY(taitosj_mcu_data_r, taitosj_mcu_data_w)
- AM_RANGE(0x8801, 0x8801) AM_MIRROR(0x07fe) AM_READ_LEGACY(taitosj_mcu_status_r)
- AM_RANGE(0x9000, 0xbfff) AM_WRITE_LEGACY(taitosj_characterram_w) AM_BASE(m_characterram)
+ AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x07fe) AM_READWRITE(taitosj_mcu_data_r, taitosj_mcu_data_w)
+ AM_RANGE(0x8801, 0x8801) AM_MIRROR(0x07fe) AM_READ(taitosj_mcu_status_r)
+ AM_RANGE(0x9000, 0xbfff) AM_WRITE(taitosj_characterram_w) AM_BASE(m_characterram)
AM_RANGE(0xc000, 0xc3ff) AM_RAM
AM_RANGE(0xc400, 0xc7ff) AM_RAM AM_BASE(m_videoram_1)
AM_RANGE(0xc800, 0xcbff) AM_RAM AM_BASE(m_videoram_2)
@@ -253,7 +253,7 @@ static ADDRESS_MAP_START( taitosj_main_mcu_map, AS_PROGRAM, 8, taitosj_state )
AM_RANGE(0xd200, 0xd27f) AM_MIRROR(0x0080) AM_RAM AM_BASE(m_paletteram)
AM_RANGE(0xd300, 0xd300) AM_MIRROR(0x00ff) AM_WRITEONLY AM_BASE(m_video_priority)
AM_RANGE(0xd400, 0xd403) AM_MIRROR(0x00f0) AM_READONLY AM_BASE(m_collision_reg)
- AM_RANGE(0xd404, 0xd404) AM_MIRROR(0x00f3) AM_READ_LEGACY(taitosj_gfxrom_r)
+ AM_RANGE(0xd404, 0xd404) AM_MIRROR(0x00f3) AM_READ(taitosj_gfxrom_r)
AM_RANGE(0xd408, 0xd408) AM_MIRROR(0x00f0) AM_READ_PORT("IN0")
AM_RANGE(0xd409, 0xd409) AM_MIRROR(0x00f0) AM_READ_PORT("IN1")
AM_RANGE(0xd40a, 0xd40a) AM_MIRROR(0x00f0) AM_READ_PORT("DSW1") /* DSW1 */
@@ -264,11 +264,11 @@ static ADDRESS_MAP_START( taitosj_main_mcu_map, AS_PROGRAM, 8, taitosj_state )
AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_DEVREAD_LEGACY("ay1", ay8910_r) /* DSW2 and DSW3 */
AM_RANGE(0xd500, 0xd505) AM_MIRROR(0x00f0) AM_WRITEONLY AM_BASE(m_scroll)
AM_RANGE(0xd506, 0xd507) AM_MIRROR(0x00f0) AM_WRITEONLY AM_BASE(m_colorbank)
- AM_RANGE(0xd508, 0xd508) AM_MIRROR(0x00f0) AM_WRITE_LEGACY(taitosj_collision_reg_clear_w)
+ AM_RANGE(0xd508, 0xd508) AM_MIRROR(0x00f0) AM_WRITE(taitosj_collision_reg_clear_w)
AM_RANGE(0xd509, 0xd50a) AM_MIRROR(0x00f0) AM_WRITEONLY AM_BASE(m_gfxpointer)
AM_RANGE(0xd50b, 0xd50b) AM_MIRROR(0x00f0) AM_WRITE(taitosj_soundcommand_w)
AM_RANGE(0xd50d, 0xd50d) AM_MIRROR(0x00f0) AM_WRITEONLY /*watchdog_reset_w*/ /* Bio Attack sometimes resets after you die */
- AM_RANGE(0xd50e, 0xd50e) AM_MIRROR(0x00f0) AM_WRITE_LEGACY(taitosj_bankswitch_w)
+ AM_RANGE(0xd50e, 0xd50e) AM_MIRROR(0x00f0) AM_WRITE(taitosj_bankswitch_w)
AM_RANGE(0xd50f, 0xd50f) AM_MIRROR(0x00f0) AM_WRITENOP
AM_RANGE(0xd600, 0xd600) AM_MIRROR(0x00ff) AM_WRITEONLY AM_BASE(m_video_mode)
AM_RANGE(0xd700, 0xdfff) AM_NOP
@@ -304,11 +304,11 @@ static ADDRESS_MAP_START( kikstart_main_map, AS_PROGRAM, 8, taitosj_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x8800) AM_READWRITE_LEGACY(taitosj_mcu_data_r, taitosj_mcu_data_w)
- AM_RANGE(0x8801, 0x8801) AM_READ_LEGACY(taitosj_mcu_status_r)
+ AM_RANGE(0x8800, 0x8800) AM_READWRITE(taitosj_mcu_data_r, taitosj_mcu_data_w)
+ AM_RANGE(0x8801, 0x8801) AM_READ(taitosj_mcu_status_r)
AM_RANGE(0x8802, 0x8802) AM_NOP
AM_RANGE(0x8a00, 0x8a5f) AM_WRITEONLY AM_BASE(m_colscrolly)
- AM_RANGE(0x9000, 0xbfff) AM_WRITE_LEGACY(taitosj_characterram_w) AM_BASE(m_characterram)
+ AM_RANGE(0x9000, 0xbfff) AM_WRITE(taitosj_characterram_w) AM_BASE(m_characterram)
AM_RANGE(0xc000, 0xc3ff) AM_RAM
AM_RANGE(0xc400, 0xc7ff) AM_RAM AM_BASE(m_videoram_1)
AM_RANGE(0xc800, 0xcbff) AM_RAM AM_BASE(m_videoram_2)
@@ -319,7 +319,7 @@ static ADDRESS_MAP_START( kikstart_main_map, AS_PROGRAM, 8, taitosj_state )
AM_RANGE(0xd200, 0xd27f) AM_RAM AM_BASE(m_paletteram)
AM_RANGE(0xd300, 0xd300) AM_WRITEONLY AM_BASE(m_video_priority)
AM_RANGE(0xd400, 0xd403) AM_READONLY AM_BASE(m_collision_reg)
- AM_RANGE(0xd404, 0xd404) AM_READ_LEGACY(taitosj_gfxrom_r)
+ AM_RANGE(0xd404, 0xd404) AM_READ(taitosj_gfxrom_r)
AM_RANGE(0xd408, 0xd408) AM_MIRROR(0x00f0) AM_READ_PORT("IN0")
AM_RANGE(0xd409, 0xd409) AM_MIRROR(0x00f0) AM_READ_PORT("IN1")
AM_RANGE(0xd40a, 0xd40a) AM_MIRROR(0x00f0) AM_READ_PORT("DSW1") /* DSW1 */
@@ -328,11 +328,11 @@ static ADDRESS_MAP_START( kikstart_main_map, AS_PROGRAM, 8, taitosj_state )
AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ_PORT("IN4")
AM_RANGE(0xd40e, 0xd40f) AM_DEVWRITE_LEGACY("ay1", ay8910_address_data_w)
AM_RANGE(0xd40f, 0xd40f) AM_DEVREAD_LEGACY("ay1", ay8910_r) /* DSW2 and DSW3 */
- AM_RANGE(0xd508, 0xd508) AM_WRITE_LEGACY(taitosj_collision_reg_clear_w)
+ AM_RANGE(0xd508, 0xd508) AM_WRITE(taitosj_collision_reg_clear_w)
AM_RANGE(0xd509, 0xd50a) AM_WRITEONLY AM_BASE(m_gfxpointer)
AM_RANGE(0xd50b, 0xd50b) AM_WRITE(taitosj_soundcommand_w)
AM_RANGE(0xd50d, 0xd50d) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0xd50e, 0xd50e) AM_WRITE_LEGACY(taitosj_bankswitch_w)
+ AM_RANGE(0xd50e, 0xd50e) AM_WRITE(taitosj_bankswitch_w)
AM_RANGE(0xd600, 0xd600) AM_WRITEONLY AM_BASE(m_video_mode)
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_BASE(m_kikstart_scrollram)// scroll ram + ???
AM_RANGE(0xe000, 0xefff) AM_ROM
@@ -355,9 +355,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( taitosj_mcu_map, AS_PROGRAM, 8, taitosj_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0000) AM_READWRITE_LEGACY(taitosj_68705_portA_r, taitosj_68705_portA_w)
- AM_RANGE(0x0001, 0x0001) AM_READWRITE_LEGACY(taitosj_68705_portB_r, taitosj_68705_portB_w)
- AM_RANGE(0x0002, 0x0002) AM_READ_LEGACY(taitosj_68705_portC_r)
+ AM_RANGE(0x0000, 0x0000) AM_READWRITE(taitosj_68705_portA_r, taitosj_68705_portA_w)
+ AM_RANGE(0x0001, 0x0001) AM_READWRITE(taitosj_68705_portB_r, taitosj_68705_portB_w)
+ AM_RANGE(0x0002, 0x0002) AM_READ(taitosj_68705_portC_r)
AM_RANGE(0x0003, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
@@ -2772,7 +2772,8 @@ static DRIVER_INIT( spacecr )
init_common(machine);
/* install protection handler */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xd48b, 0xd48b, FUNC(spacecr_prot_r));
+ taitosj_state *state = machine.driver_data<taitosj_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd48b, 0xd48b, read8_delegate(FUNC(taitosj_state::spacecr_prot_r),state));
}
static DRIVER_INIT( alpine )
@@ -2780,8 +2781,9 @@ static DRIVER_INIT( alpine )
init_common(machine);
/* install protection handlers */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xd40b, 0xd40b, FUNC(alpine_port_2_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xd50f, 0xd50f, FUNC(alpine_protection_w));
+ taitosj_state *state = machine.driver_data<taitosj_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd40b, 0xd40b, read8_delegate(FUNC(taitosj_state::alpine_port_2_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xd50f, 0xd50f, write8_delegate(FUNC(taitosj_state::alpine_protection_w),state));
}
static DRIVER_INIT( alpinea )
@@ -2789,8 +2791,9 @@ static DRIVER_INIT( alpinea )
init_common(machine);
/* install protection handlers */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xd40b, 0xd40b, FUNC(alpine_port_2_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xd50e, 0xd50e, FUNC(alpinea_bankswitch_w));
+ taitosj_state *state = machine.driver_data<taitosj_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd40b, 0xd40b, read8_delegate(FUNC(taitosj_state::alpine_port_2_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xd50e, 0xd50e, write8_delegate(FUNC(taitosj_state::alpinea_bankswitch_w),state));
}
static DRIVER_INIT( junglhbr )
@@ -2798,7 +2801,8 @@ static DRIVER_INIT( junglhbr )
init_common(machine);
/* inverter on bits 0 and 1 */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x9000, 0xbfff, FUNC(junglhbr_characterram_w));
+ taitosj_state *state = machine.driver_data<taitosj_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x9000, 0xbfff, write8_delegate(FUNC(taitosj_state::junglhbr_characterram_w),state));
}
GAME( 1981, spaceskr, 0, nomcu, spaceskr, taitosj, ROT0, "Taito Corporation", "Space Seeker", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c
index d636e5d4a09..cf306a589c5 100644
--- a/src/mame/drivers/tank8.c
+++ b/src/mame/drivers/tank8.c
@@ -114,7 +114,7 @@ static ADDRESS_MAP_START( tank8_cpu_map, AS_PROGRAM, 8, tank8_state )
AM_RANGE(0x1c0b, 0x1c0b) AM_READ_PORT("RC")
AM_RANGE(0x1c0f, 0x1c0f) AM_READ_PORT("VBLANK")
- AM_RANGE(0x1800, 0x1bff) AM_WRITE_LEGACY(tank8_video_ram_w) AM_BASE(m_video_ram)
+ AM_RANGE(0x1800, 0x1bff) AM_WRITE(tank8_video_ram_w) AM_BASE(m_video_ram)
AM_RANGE(0x1c00, 0x1c0f) AM_WRITEONLY AM_BASE(m_pos_h_ram)
AM_RANGE(0x1c10, 0x1c1f) AM_WRITEONLY AM_BASE(m_pos_v_ram)
AM_RANGE(0x1c20, 0x1c2f) AM_WRITEONLY AM_BASE(m_pos_d_ram)
diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c
index 37860b86e41..1ceb1955229 100644
--- a/src/mame/drivers/tankbatt.c
+++ b/src/mame/drivers/tankbatt.c
@@ -158,7 +158,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, tankbatt_state )
AM_RANGE(0x0000, 0x000f) AM_RAM AM_BASE(m_bulletsram) AM_SIZE(m_bulletsram_size)
AM_RANGE(0x0010, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x07ff) AM_RAM
- AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE_LEGACY(tankbatt_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(tankbatt_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x0c00, 0x0c07) AM_READ(tankbatt_in0_r)
AM_RANGE(0x0c00, 0x0c01) AM_WRITE(tankbatt_led_w)
AM_RANGE(0x0c02, 0x0c02) AM_WRITE(tankbatt_coin_counter_w)
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index 076a90e7d16..01d531580ba 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -178,15 +178,15 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, tankbust_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank2")
- AM_RANGE(0xc000, 0xc7ff) AM_READWRITE_LEGACY(tankbust_background_videoram_r, tankbust_background_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xc800, 0xcfff) AM_READWRITE_LEGACY(tankbust_background_colorram_r, tankbust_background_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xd000, 0xd7ff) AM_READWRITE_LEGACY(tankbust_txtram_r, tankbust_txtram_w) AM_BASE(m_txtram)
+ AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(tankbust_background_videoram_r, tankbust_background_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xc800, 0xcfff) AM_READWRITE(tankbust_background_colorram_r, tankbust_background_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(tankbust_txtram_r, tankbust_txtram_w) AM_BASE(m_txtram)
AM_RANGE(0xd800, 0xd8ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe000, 0xe007) AM_READWRITE(debug_output_area_r, tankbust_e0xx_w)
- AM_RANGE(0xe800, 0xe800) AM_READ_PORT("INPUTS") AM_WRITE_LEGACY(tankbust_yscroll_w)
+ AM_RANGE(0xe800, 0xe800) AM_READ_PORT("INPUTS") AM_WRITE(tankbust_yscroll_w)
AM_RANGE(0xe801, 0xe801) AM_READ_PORT("SYSTEM")
AM_RANGE(0xe802, 0xe802) AM_READ_PORT("DSW")
- AM_RANGE(0xe801, 0xe802) AM_WRITE_LEGACY(tankbust_xscroll_w)
+ AM_RANGE(0xe801, 0xe802) AM_WRITE(tankbust_xscroll_w)
AM_RANGE(0xe803, 0xe803) AM_READWRITE(some_changing_input, tankbust_soundlatch_w) /*unknown. Game expects this to change so this is not player input */
AM_RANGE(0xe804, 0xe804) AM_WRITENOP /* watchdog ? ; written in long-lasting loops */
AM_RANGE(0xf000, 0xf7ff) AM_RAM
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index 3343da89420..8b6712098be 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -89,7 +89,7 @@ WRITE16_MEMBER(taotaido_state::sound_command_w)
}
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, taotaido_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(taotaido_bgvideoram_w) AM_BASE(m_bgram) // bg ram?
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(taotaido_bgvideoram_w) AM_BASE(m_bgram) // bg ram?
AM_RANGE(0xa00000, 0xa01fff) AM_RAM AM_BASE(m_spriteram) // sprite ram
AM_RANGE(0xc00000, 0xc0ffff) AM_RAM AM_BASE(m_spriteram2) // sprite tile lookup ram
AM_RANGE(0xfe0000, 0xfeffff) AM_RAM // main ram
@@ -105,10 +105,10 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, taotaido_state )
AM_RANGE(0xffff8e, 0xffff8f) AM_READ_PORT("JP")
AM_RANGE(0xffffa0, 0xffffa1) AM_READ_PORT("P3") // used only by taotaida
AM_RANGE(0xffffa2, 0xffffa3) AM_READ_PORT("P4") // used only by taotaida
- AM_RANGE(0xffff00, 0xffff0f) AM_WRITE_LEGACY(taotaido_tileregs_w)
+ AM_RANGE(0xffff00, 0xffff0f) AM_WRITE(taotaido_tileregs_w)
AM_RANGE(0xffff10, 0xffff11) AM_WRITENOP // unknown
AM_RANGE(0xffff20, 0xffff21) AM_WRITENOP // unknown - flip screen related
- AM_RANGE(0xffff40, 0xffff47) AM_WRITE_LEGACY(taotaido_sprite_character_bank_select_w)
+ AM_RANGE(0xffff40, 0xffff47) AM_WRITE(taotaido_sprite_character_bank_select_w)
AM_RANGE(0xffffc0, 0xffffc1) AM_WRITE(sound_command_w) // seems right
AM_RANGE(0xffffe0, 0xffffe1) AM_READ(pending_command_r) // guess - seems to be needed for all the sounds to work
ADDRESS_MAP_END
diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c
index 986d72d2623..c59464e76fb 100644
--- a/src/mame/drivers/targeth.c
+++ b/src/mame/drivers/targeth.c
@@ -65,7 +65,7 @@ WRITE16_MEMBER(targeth_state::targeth_coin_counter_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, targeth_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
- AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE_LEGACY(targeth_vram_w) AM_BASE(m_videoram) /* Video RAM */
+ AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(targeth_vram_w) AM_BASE(m_videoram) /* Video RAM */
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x108000, 0x108001) AM_READ_PORT("GUNX1")
AM_RANGE(0x108002, 0x108003) AM_READ_PORT("GUNY1")
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index 492e92ec7d5..b79cbdb68bb 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -208,14 +208,14 @@ WRITE16_MEMBER(tatsumi_state::cyclwarr_sound_w)
static ADDRESS_MAP_START( apache3_v30_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x00000, 0x03fff) AM_RAM
AM_RANGE(0x04000, 0x07fff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x08000, 0x08fff) AM_RAM_WRITE_LEGACY(apache3_palette_w) AM_SHARE("paletteram")
- AM_RANGE(0x0c000, 0x0dfff) AM_RAM_WRITE_LEGACY(roundup5_text_w) AM_BASE(m_videoram)
+ AM_RANGE(0x08000, 0x08fff) AM_RAM_WRITE(apache3_palette_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c000, 0x0dfff) AM_RAM_WRITE(roundup5_text_w) AM_BASE(m_videoram)
AM_RANGE(0x0e800, 0x0e803) AM_WRITENOP // CRT
AM_RANGE(0x0f000, 0x0f001) AM_READ_PORT("DSW")
AM_RANGE(0x0f000, 0x0f001) AM_WRITENOP // todo
- AM_RANGE(0x0f800, 0x0f801) AM_READWRITE_LEGACY(apache3_bank_r, apache3_bank_w)
- AM_RANGE(0x10000, 0x1ffff) AM_READWRITE_LEGACY(apache3_v30_v20_r, apache3_v30_v20_w)
- AM_RANGE(0x20000, 0x2ffff) AM_READWRITE_LEGACY(tatsumi_v30_68000_r, tatsumi_v30_68000_w)
+ AM_RANGE(0x0f800, 0x0f801) AM_READWRITE(apache3_bank_r, apache3_bank_w)
+ AM_RANGE(0x10000, 0x1ffff) AM_READWRITE(apache3_v30_v20_r, apache3_v30_v20_w)
+ AM_RANGE(0x20000, 0x2ffff) AM_READWRITE(tatsumi_v30_68000_r, tatsumi_v30_68000_w)
AM_RANGE(0xa0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -223,12 +223,12 @@ static ADDRESS_MAP_START( apache3_68000_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0x80000, 0x83fff) AM_RAM AM_BASE(m_68k_ram)
AM_RANGE(0x90000, 0x93fff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x9a000, 0x9a1ff) AM_WRITE_LEGACY(tatsumi_sprite_control_w) AM_BASE(m_sprite_control_ram)
- AM_RANGE(0xa0000, 0xa0001) AM_WRITE_LEGACY(apache3_rotate_w) // /BNKCS
- AM_RANGE(0xb0000, 0xb0001) AM_WRITE_LEGACY(apache3_z80_ctrl_w)
- AM_RANGE(0xc0000, 0xc0001) AM_WRITE_LEGACY(apache3_road_z_w) // /LINCS
+ AM_RANGE(0x9a000, 0x9a1ff) AM_WRITE(tatsumi_sprite_control_w) AM_BASE(m_sprite_control_ram)
+ AM_RANGE(0xa0000, 0xa0001) AM_WRITE(apache3_rotate_w) // /BNKCS
+ AM_RANGE(0xb0000, 0xb0001) AM_WRITE(apache3_z80_ctrl_w)
+ AM_RANGE(0xc0000, 0xc0001) AM_WRITE(apache3_road_z_w) // /LINCS
AM_RANGE(0xd0000, 0xdffff) AM_RAM AM_BASE(m_apache3_g_ram) // /GRDCS
- AM_RANGE(0xe0000, 0xe7fff) AM_READWRITE_LEGACY(apache3_z80_r, apache3_z80_w)
+ AM_RANGE(0xe0000, 0xe7fff) AM_READWRITE(apache3_z80_r, apache3_z80_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( apache3_v20_map, AS_PROGRAM, 8, tatsumi_state )
@@ -237,30 +237,30 @@ static ADDRESS_MAP_START( apache3_v20_map, AS_PROGRAM, 8, tatsumi_state )
AM_RANGE(0x06000, 0x06001) AM_READ_PORT("IN0") // esw
AM_RANGE(0x08000, 0x08001) AM_DEVREADWRITE_LEGACY("ymsnd", tatsumi_hack_ym2151_r, ym2151_w)
AM_RANGE(0x0a000, 0x0a000) AM_DEVREAD_LEGACY("oki", tatsumi_hack_oki_r) AM_DEVWRITE("oki", okim6295_device, write)
- AM_RANGE(0x0e000, 0x0e007) AM_READWRITE_LEGACY(apache3_adc_r, apache3_adc_w) //adc select
+ AM_RANGE(0x0e000, 0x0e007) AM_READWRITE(apache3_adc_r, apache3_adc_w) //adc select
AM_RANGE(0xf0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( apache3_z80_map, AS_PROGRAM, 8, tatsumi_state )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE(m_apache3_z80_ram)
- AM_RANGE(0x8000, 0xffff) AM_WRITE_LEGACY(apache3_road_x_w)
+ AM_RANGE(0x8000, 0xffff) AM_WRITE(apache3_road_x_w)
ADDRESS_MAP_END
/*****************************************************************/
static ADDRESS_MAP_START( roundup5_v30_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x00000, 0x07fff) AM_RAM
- AM_RANGE(0x08000, 0x0bfff) AM_RAM_WRITE_LEGACY(roundup5_text_w) AM_BASE(m_videoram)
- AM_RANGE(0x0c000, 0x0c003) AM_WRITE_LEGACY(roundup5_crt_w)
+ AM_RANGE(0x08000, 0x0bfff) AM_RAM_WRITE(roundup5_text_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0c000, 0x0c003) AM_WRITE(roundup5_crt_w)
AM_RANGE(0x0d000, 0x0d001) AM_READ_PORT("DSW")
AM_RANGE(0x0d400, 0x0d40f) AM_WRITEONLY AM_BASE(m_roundup5_unknown0)
AM_RANGE(0x0d800, 0x0d801) AM_WRITEONLY AM_BASE(m_roundup5_unknown1) // VRAM2 X scroll (todo)
AM_RANGE(0x0dc00, 0x0dc01) AM_WRITEONLY AM_BASE(m_roundup5_unknown2) // VRAM2 Y scroll (todo)
- AM_RANGE(0x0e000, 0x0e001) AM_WRITE_LEGACY(roundup5_control_w)
- AM_RANGE(0x0f000, 0x0ffff) AM_RAM_WRITE_LEGACY(roundup5_palette_w) AM_SHARE("paletteram")
- AM_RANGE(0x10000, 0x1ffff) AM_READWRITE_LEGACY(roundup_v30_z80_r, roundup_v30_z80_w)
- AM_RANGE(0x20000, 0x2ffff) AM_READWRITE_LEGACY(tatsumi_v30_68000_r, tatsumi_v30_68000_w)
- AM_RANGE(0x30000, 0x3ffff) AM_READWRITE_LEGACY(roundup5_vram_r, roundup5_vram_w)
+ AM_RANGE(0x0e000, 0x0e001) AM_WRITE(roundup5_control_w)
+ AM_RANGE(0x0f000, 0x0ffff) AM_RAM_WRITE(roundup5_palette_w) AM_SHARE("paletteram")
+ AM_RANGE(0x10000, 0x1ffff) AM_READWRITE(roundup_v30_z80_r, roundup_v30_z80_w)
+ AM_RANGE(0x20000, 0x2ffff) AM_READWRITE(tatsumi_v30_68000_r, tatsumi_v30_68000_w)
+ AM_RANGE(0x30000, 0x3ffff) AM_READWRITE(roundup5_vram_r, roundup5_vram_w)
AM_RANGE(0x80000, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -268,12 +268,12 @@ static ADDRESS_MAP_START( roundup5_68000_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0x80000, 0x83fff) AM_RAM AM_BASE(m_68k_ram)
AM_RANGE(0x90000, 0x93fff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x9a000, 0x9a1ff) AM_WRITE_LEGACY(tatsumi_sprite_control_w) AM_BASE(m_sprite_control_ram)
+ AM_RANGE(0x9a000, 0x9a1ff) AM_WRITE(tatsumi_sprite_control_w) AM_BASE(m_sprite_control_ram)
AM_RANGE(0xa0000, 0xa0fff) AM_RAM AM_BASE(m_roundup_r_ram) // Road control data
AM_RANGE(0xb0000, 0xb0fff) AM_RAM AM_BASE(m_roundup_p_ram) // Road pixel data
AM_RANGE(0xc0000, 0xc0fff) AM_RAM AM_BASE(m_roundup_l_ram) // Road colour data
- AM_RANGE(0xd0002, 0xd0003) AM_WRITE_LEGACY(roundup5_d0000_w) AM_BASE(m_roundup5_d0000_ram)
- AM_RANGE(0xe0000, 0xe0001) AM_WRITE_LEGACY(roundup5_e0000_w) AM_BASE(m_roundup5_e0000_ram)
+ AM_RANGE(0xd0002, 0xd0003) AM_WRITE(roundup5_d0000_w) AM_BASE(m_roundup5_d0000_ram)
+ AM_RANGE(0xe0000, 0xe0001) AM_WRITE(roundup5_e0000_w) AM_BASE(m_roundup5_e0000_ram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( roundup5_z80_map, AS_PROGRAM, 8, tatsumi_state )
@@ -294,8 +294,8 @@ static ADDRESS_MAP_START( cyclwarr_68000a_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_BASE(m_cyclwarr_cpua_ram)
AM_RANGE(0x03e000, 0x03efff) AM_RAM
AM_RANGE(0x040000, 0x043fff) AM_READWRITE(cyclwarr_cpu_bb_r, cyclwarr_cpu_bb_w)
- AM_RANGE(0x080000, 0x08ffff) AM_READWRITE_LEGACY(cyclwarr_videoram1_r, cyclwarr_videoram1_w) AM_BASE(m_cyclwarr_videoram1)
- AM_RANGE(0x090000, 0x09ffff) AM_READWRITE_LEGACY(cyclwarr_videoram0_r, cyclwarr_videoram0_w) AM_BASE(m_cyclwarr_videoram0)
+ AM_RANGE(0x080000, 0x08ffff) AM_READWRITE(cyclwarr_videoram1_r, cyclwarr_videoram1_w) AM_BASE(m_cyclwarr_videoram1)
+ AM_RANGE(0x090000, 0x09ffff) AM_READWRITE(cyclwarr_videoram0_r, cyclwarr_videoram0_w) AM_BASE(m_cyclwarr_videoram0)
AM_RANGE(0x0a2000, 0x0a2007) AM_WRITE(bigfight_a20000_w)
AM_RANGE(0x0a4000, 0x0a4001) AM_WRITE(bigfight_a40000_w)
@@ -304,9 +304,9 @@ static ADDRESS_MAP_START( cyclwarr_68000a_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x0b8000, 0x0b8001) AM_WRITE(cyclwarr_sound_w)
AM_RANGE(0x0b9002, 0x0b9009) AM_READ(cyclwarr_input_r) /* Coins, P1 input, P2 input, dip 3 */
AM_RANGE(0x0ba000, 0x0ba007) AM_READ(cyclwarr_input2_r) /* Dip 1, Dip 2, P3 input, P4 input */
- AM_RANGE(0x0ba008, 0x0ba009) AM_READWRITE_LEGACY(cyclwarr_control_r, cyclwarr_control_w)
+ AM_RANGE(0x0ba008, 0x0ba009) AM_READWRITE(cyclwarr_control_r, cyclwarr_control_w)
AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(cyclwarr_sprite_r, cyclwarr_sprite_w) AM_BASE(m_spriteram)
- AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE_LEGACY(tatsumi_sprite_control_w) AM_BASE(m_sprite_control_ram)
+ AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE(tatsumi_sprite_control_w) AM_BASE(m_sprite_control_ram)
AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x140000, 0x1bffff) AM_ROMBANK("bank2") /* CPU B ROM */
AM_RANGE(0x2c0000, 0x33ffff) AM_ROMBANK("bank1") /* CPU A ROM */
@@ -315,8 +315,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cyclwarr_68000b_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_BASE(m_cyclwarr_cpub_ram)
- AM_RANGE(0x080000, 0x08ffff) AM_READWRITE_LEGACY(cyclwarr_videoram1_r, cyclwarr_videoram1_w)
- AM_RANGE(0x090000, 0x09ffff) AM_READWRITE_LEGACY(cyclwarr_videoram0_r, cyclwarr_videoram0_w)
+ AM_RANGE(0x080000, 0x08ffff) AM_READWRITE(cyclwarr_videoram1_r, cyclwarr_videoram1_w)
+ AM_RANGE(0x090000, 0x09ffff) AM_READWRITE(cyclwarr_videoram0_r, cyclwarr_videoram0_w)
AM_RANGE(0x0a2000, 0x0a2007) AM_WRITE(bigfight_a20000_w)
AM_RANGE(0x0a4000, 0x0a4001) AM_WRITE(bigfight_a40000_w)
@@ -324,10 +324,10 @@ static ADDRESS_MAP_START( cyclwarr_68000b_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x0b9002, 0x0b9009) AM_READ(cyclwarr_input_r) /* Coins, P1 input, P2 input, dip 3 */
AM_RANGE(0x0ba000, 0x0ba007) AM_READ(cyclwarr_input2_r) /* Dip 1, Dip 2, P3 input, P4 input */
- AM_RANGE(0x0ba008, 0x0ba009) AM_READ_LEGACY(cyclwarr_control_r)
+ AM_RANGE(0x0ba008, 0x0ba009) AM_READ(cyclwarr_control_r)
AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(cyclwarr_sprite_r, cyclwarr_sprite_w)
- AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE_LEGACY(tatsumi_sprite_control_w)
+ AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE(tatsumi_sprite_control_w)
AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram16_xRRRRRGGGGGBBBBB_word_w)
AM_RANGE(0x140000, 0x1bffff) AM_ROMBANK("bank2") /* CPU B ROM */
AM_RANGE(0x2c0000, 0x33ffff) AM_ROMBANK("bank1") /* CPU A ROM */
@@ -350,8 +350,8 @@ static ADDRESS_MAP_START( bigfight_68000a_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x03e000, 0x03efff) AM_RAM
AM_RANGE(0x040000, 0x04ffff) AM_READWRITE(cyclwarr_cpu_bb_r, cyclwarr_cpu_bb_w)
- AM_RANGE(0x080000, 0x08ffff) AM_READWRITE_LEGACY(cyclwarr_videoram1_r, cyclwarr_videoram1_w) AM_BASE(m_cyclwarr_videoram1)
- AM_RANGE(0x090000, 0x09ffff) AM_READWRITE_LEGACY(cyclwarr_videoram0_r, cyclwarr_videoram0_w) AM_BASE(m_cyclwarr_videoram0)
+ AM_RANGE(0x080000, 0x08ffff) AM_READWRITE(cyclwarr_videoram1_r, cyclwarr_videoram1_w) AM_BASE(m_cyclwarr_videoram1)
+ AM_RANGE(0x090000, 0x09ffff) AM_READWRITE(cyclwarr_videoram0_r, cyclwarr_videoram0_w) AM_BASE(m_cyclwarr_videoram0)
AM_RANGE(0x0a2000, 0x0a2007) AM_WRITE(bigfight_a20000_w)
AM_RANGE(0x0a4000, 0x0a4001) AM_WRITE(bigfight_a40000_w)
@@ -360,9 +360,9 @@ static ADDRESS_MAP_START( bigfight_68000a_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x0b8000, 0x0b8001) AM_WRITE(cyclwarr_sound_w)
AM_RANGE(0x0b9002, 0x0b9009) AM_READ(cyclwarr_input_r) /* Coins, P1 input, P2 input, dip 3 */
AM_RANGE(0x0ba000, 0x0ba007) AM_READ(cyclwarr_input2_r) /* Dip 1, Dip 2, P3 input, P4 input */
- AM_RANGE(0x0ba008, 0x0ba009) AM_READWRITE_LEGACY(cyclwarr_control_r, cyclwarr_control_w)
+ AM_RANGE(0x0ba008, 0x0ba009) AM_READWRITE(cyclwarr_control_r, cyclwarr_control_w)
AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(cyclwarr_sprite_r, cyclwarr_sprite_w) AM_BASE(m_spriteram)
- AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE_LEGACY(tatsumi_sprite_control_w) AM_BASE(m_sprite_control_ram)
+ AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE(tatsumi_sprite_control_w) AM_BASE(m_sprite_control_ram)
AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x100000, 0x17ffff) AM_ROMBANK("bank2") /* CPU A ROM */
AM_RANGE(0x200000, 0x27ffff) AM_ROMBANK("bank1") /* CPU B ROM */
@@ -370,18 +370,18 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bigfight_68000b_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_BASE(m_cyclwarr_cpub_ram)
- AM_RANGE(0x080000, 0x08ffff) AM_READWRITE_LEGACY(cyclwarr_videoram1_r, cyclwarr_videoram1_w)
- AM_RANGE(0x090000, 0x09ffff) AM_READWRITE_LEGACY(cyclwarr_videoram0_r, cyclwarr_videoram0_w)
+ AM_RANGE(0x080000, 0x08ffff) AM_READWRITE(cyclwarr_videoram1_r, cyclwarr_videoram1_w)
+ AM_RANGE(0x090000, 0x09ffff) AM_READWRITE(cyclwarr_videoram0_r, cyclwarr_videoram0_w)
AM_RANGE(0x0a2000, 0x0a2007) AM_WRITE(bigfight_a20000_w)
AM_RANGE(0x0a4000, 0x0a4001) AM_WRITE(bigfight_a40000_w)
AM_RANGE(0x0a6000, 0x0a6001) AM_WRITE(bigfight_a60000_w)
AM_RANGE(0x0b9002, 0x0b9009) AM_READ(cyclwarr_input_r) /* Coins, P1 input, P2 input, dip 3 */
AM_RANGE(0x0ba000, 0x0ba007) AM_READ(cyclwarr_input2_r) /* Dip 1, Dip 2, P3 input, P4 input */
- AM_RANGE(0x0ba008, 0x0ba009) AM_READ_LEGACY(cyclwarr_control_r)
+ AM_RANGE(0x0ba008, 0x0ba009) AM_READ(cyclwarr_control_r)
AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(cyclwarr_sprite_r, cyclwarr_sprite_w)
- AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE_LEGACY(tatsumi_sprite_control_w)
+ AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE(tatsumi_sprite_control_w)
AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram16_xRRRRRGGGGGBBBBB_word_w)
AM_RANGE(0x100000, 0x17ffff) AM_ROMBANK("bank2") /* CPU A ROM */
AM_RANGE(0x200000, 0x27ffff) AM_ROMBANK("bank1") /* CPU B ROM */
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index 35617725424..5805376392c 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -88,9 +88,9 @@ WRITE8_MEMBER(tbowl_state::tbowl_sound_command_w)
static ADDRESS_MAP_START( 6206B_map, AS_PROGRAM, 8, tbowl_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM
- AM_RANGE(0xa000, 0xbfff) AM_RAM_WRITE_LEGACY(tbowl_bg2videoram_w) AM_BASE(m_bg2videoram)
- AM_RANGE(0xc000, 0xdfff) AM_RAM_WRITE_LEGACY(tbowl_bgvideoram_w) AM_BASE(m_bgvideoram)
- AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE_LEGACY(tbowl_txvideoram_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xa000, 0xbfff) AM_RAM_WRITE(tbowl_bg2videoram_w) AM_BASE(m_bg2videoram)
+ AM_RANGE(0xc000, 0xdfff) AM_RAM_WRITE(tbowl_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(tbowl_txvideoram_w) AM_BASE(m_txvideoram)
// AM_RANGE(0xf000, 0xf000) AM_WRITE_LEGACY(unknown_write) * written during start-up, not again */
AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1")
AM_RANGE(0xf800, 0xfbff) AM_READWRITE(shared_r, shared_w) AM_BASE(m_shared_ram) /* check */
@@ -109,14 +109,14 @@ static ADDRESS_MAP_START( 6206B_map, AS_PROGRAM, 8, tbowl_state )
AM_RANGE(0xfc0a, 0xfc0a) AM_READ_PORT("DSW3")
// AM_RANGE(0xfc0a, 0xfc0a) AM_WRITE_LEGACY(unknown_write) /* hardly used .. */
AM_RANGE(0xfc0d, 0xfc0d) AM_WRITE(tbowl_sound_command_w) /* not sure, used quite a bit */
- AM_RANGE(0xfc10, 0xfc10) AM_WRITE_LEGACY(tbowl_bg2xscroll_lo)
- AM_RANGE(0xfc11, 0xfc11) AM_WRITE_LEGACY(tbowl_bg2xscroll_hi)
- AM_RANGE(0xfc12, 0xfc12) AM_WRITE_LEGACY(tbowl_bg2yscroll_lo)
- AM_RANGE(0xfc13, 0xfc13) AM_WRITE_LEGACY(tbowl_bg2yscroll_hi)
- AM_RANGE(0xfc14, 0xfc14) AM_WRITE_LEGACY(tbowl_bgxscroll_lo)
- AM_RANGE(0xfc15, 0xfc15) AM_WRITE_LEGACY(tbowl_bgxscroll_hi)
- AM_RANGE(0xfc16, 0xfc16) AM_WRITE_LEGACY(tbowl_bgyscroll_lo)
- AM_RANGE(0xfc17, 0xfc17) AM_WRITE_LEGACY(tbowl_bgyscroll_hi)
+ AM_RANGE(0xfc10, 0xfc10) AM_WRITE(tbowl_bg2xscroll_lo)
+ AM_RANGE(0xfc11, 0xfc11) AM_WRITE(tbowl_bg2xscroll_hi)
+ AM_RANGE(0xfc12, 0xfc12) AM_WRITE(tbowl_bg2yscroll_lo)
+ AM_RANGE(0xfc13, 0xfc13) AM_WRITE(tbowl_bg2yscroll_hi)
+ AM_RANGE(0xfc14, 0xfc14) AM_WRITE(tbowl_bgxscroll_lo)
+ AM_RANGE(0xfc15, 0xfc15) AM_WRITE(tbowl_bgxscroll_hi)
+ AM_RANGE(0xfc16, 0xfc16) AM_WRITE(tbowl_bgyscroll_lo)
+ AM_RANGE(0xfc17, 0xfc17) AM_WRITE(tbowl_bgyscroll_hi)
ADDRESS_MAP_END
/* Board C */
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index 99bda2033c7..6553dd41b1f 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -158,9 +158,9 @@ READ8_MEMBER(tceptor_state::readFF)
static ADDRESS_MAP_START( m6809_map, AS_PROGRAM, 8, tceptor_state )
AM_RANGE(0x0000, 0x17ff) AM_RAM
- AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE_LEGACY(tceptor_tile_ram_w) AM_BASE(m_tile_ram)
- AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE_LEGACY(tceptor_tile_attr_w) AM_BASE(m_tile_attr)
- AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE_LEGACY(tceptor_bg_ram_w) AM_BASE(m_bg_ram) // background (VIEW RAM)
+ AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(tceptor_tile_ram_w) AM_BASE(m_tile_ram)
+ AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(tceptor_tile_attr_w) AM_BASE(m_tile_attr)
+ AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(tceptor_bg_ram_w) AM_BASE(m_bg_ram) // background (VIEW RAM)
AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE_LEGACY("namco", namcos1_cus30_r, namcos1_cus30_w)
AM_RANGE(0x4800, 0x4800) AM_WRITENOP // 3D scope left/right?
AM_RANGE(0x4f00, 0x4f00) AM_READNOP // unknown
@@ -168,7 +168,7 @@ static ADDRESS_MAP_START( m6809_map, AS_PROGRAM, 8, tceptor_state )
AM_RANGE(0x4f02, 0x4f02) AM_READ_PORT("STICKX") // analog input (left/right)
AM_RANGE(0x4f03, 0x4f03) AM_READ_PORT("STICKY") // analog input (up/down)
AM_RANGE(0x4f00, 0x4f03) AM_WRITENOP // analog input control?
- AM_RANGE(0x5000, 0x5006) AM_WRITE_LEGACY(tceptor_bg_scroll_w) // bg scroll
+ AM_RANGE(0x5000, 0x5006) AM_WRITE(tceptor_bg_scroll_w) // bg scroll
AM_RANGE(0x6000, 0x7fff) AM_RAM AM_SHARE("share1") AM_BASE(m_m68k_shared_ram) // COM RAM
AM_RANGE(0x8000, 0x8000) AM_WRITE(m6809_irq_disable_w)
AM_RANGE(0x8800, 0x8800) AM_WRITE(m6809_irq_enable_w)
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index 098690509e2..a9abc50e76f 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -135,9 +135,9 @@ READ8_MEMBER(tecmo_state::tecmo_dswb_h_r)
static ADDRESS_MAP_START( rygar_map, AS_PROGRAM, 8, tecmo_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(tecmo_txvideoram_w) AM_BASE(m_txvideoram)
- AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE_LEGACY(tecmo_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE_LEGACY(tecmo_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(tecmo_txvideoram_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(tecmo_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(tecmo_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_SHARE("paletteram")
AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1")
@@ -152,10 +152,10 @@ static ADDRESS_MAP_START( rygar_map, AS_PROGRAM, 8, tecmo_state )
AM_RANGE(0xf808, 0xf808) AM_READ(tecmo_dswb_l_r )
AM_RANGE(0xf809, 0xf809) AM_READ(tecmo_dswb_h_r )
AM_RANGE(0xf80f, 0xf80f) AM_READ_PORT("SYS_2")
- AM_RANGE(0xf800, 0xf802) AM_WRITE_LEGACY(tecmo_fgscroll_w)
- AM_RANGE(0xf803, 0xf805) AM_WRITE_LEGACY(tecmo_bgscroll_w)
+ AM_RANGE(0xf800, 0xf802) AM_WRITE(tecmo_fgscroll_w)
+ AM_RANGE(0xf803, 0xf805) AM_WRITE(tecmo_bgscroll_w)
AM_RANGE(0xf806, 0xf806) AM_WRITE(tecmo_sound_command_w)
- AM_RANGE(0xf807, 0xf807) AM_WRITE_LEGACY(tecmo_flipscreen_w)
+ AM_RANGE(0xf807, 0xf807) AM_WRITE(tecmo_flipscreen_w)
AM_RANGE(0xf808, 0xf808) AM_WRITE(tecmo_bankswitch_w)
AM_RANGE(0xf80b, 0xf80b) AM_WRITE(watchdog_reset_w)
ADDRESS_MAP_END
@@ -163,9 +163,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gemini_map, AS_PROGRAM, 8, tecmo_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(tecmo_txvideoram_w) AM_BASE(m_txvideoram)
- AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE_LEGACY(tecmo_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE_LEGACY(tecmo_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(tecmo_txvideoram_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(tecmo_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(tecmo_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_SHARE("paletteram")
AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1")
@@ -180,19 +180,19 @@ static ADDRESS_MAP_START( gemini_map, AS_PROGRAM, 8, tecmo_state )
AM_RANGE(0xf808, 0xf808) AM_READ(tecmo_dswb_l_r )
AM_RANGE(0xf809, 0xf809) AM_READ(tecmo_dswb_h_r )
AM_RANGE(0xf80f, 0xf80f) AM_READ_PORT("SYS_2")
- AM_RANGE(0xf800, 0xf802) AM_WRITE_LEGACY(tecmo_fgscroll_w)
- AM_RANGE(0xf803, 0xf805) AM_WRITE_LEGACY(tecmo_bgscroll_w)
+ AM_RANGE(0xf800, 0xf802) AM_WRITE(tecmo_fgscroll_w)
+ AM_RANGE(0xf803, 0xf805) AM_WRITE(tecmo_bgscroll_w)
AM_RANGE(0xf806, 0xf806) AM_WRITE(tecmo_sound_command_w)
- AM_RANGE(0xf807, 0xf807) AM_WRITE_LEGACY(tecmo_flipscreen_w)
+ AM_RANGE(0xf807, 0xf807) AM_WRITE(tecmo_flipscreen_w)
AM_RANGE(0xf808, 0xf808) AM_WRITE(tecmo_bankswitch_w)
AM_RANGE(0xf80b, 0xf80b) AM_WRITE(watchdog_reset_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( silkworm_map, AS_PROGRAM, 8, tecmo_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE_LEGACY(tecmo_bgvideoram_w) AM_BASE(m_bgvideoram)
- AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE_LEGACY(tecmo_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(tecmo_txvideoram_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(tecmo_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(tecmo_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(tecmo_txvideoram_w) AM_BASE(m_txvideoram)
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_SHARE("paletteram")
@@ -208,10 +208,10 @@ static ADDRESS_MAP_START( silkworm_map, AS_PROGRAM, 8, tecmo_state )
AM_RANGE(0xf808, 0xf808) AM_READ(tecmo_dswb_l_r )
AM_RANGE(0xf809, 0xf809) AM_READ(tecmo_dswb_h_r )
AM_RANGE(0xf80f, 0xf80f) AM_READ_PORT("SYS_2")
- AM_RANGE(0xf800, 0xf802) AM_WRITE_LEGACY(tecmo_fgscroll_w)
- AM_RANGE(0xf803, 0xf805) AM_WRITE_LEGACY(tecmo_bgscroll_w)
+ AM_RANGE(0xf800, 0xf802) AM_WRITE(tecmo_fgscroll_w)
+ AM_RANGE(0xf803, 0xf805) AM_WRITE(tecmo_bgscroll_w)
AM_RANGE(0xf806, 0xf806) AM_WRITE(tecmo_sound_command_w)
- AM_RANGE(0xf807, 0xf807) AM_WRITE_LEGACY(tecmo_flipscreen_w)
+ AM_RANGE(0xf807, 0xf807) AM_WRITE(tecmo_flipscreen_w)
AM_RANGE(0xf808, 0xf808) AM_WRITE(tecmo_bankswitch_w)
AM_RANGE(0xf809, 0xf809) AM_WRITENOP /* ? */
AM_RANGE(0xf80b, 0xf80b) AM_WRITENOP /* ? if mapped to watchdog like in the others, causes reset */
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index 9df6f7c1dff..3622d68118d 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -46,49 +46,49 @@ WRITE16_MEMBER(tecmo16_state::tecmo16_sound_command_w)
static ADDRESS_MAP_START( fstarfrc_map, AS_PROGRAM, 16, tecmo16_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM /* Main RAM */
- AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE_LEGACY(tecmo16_charram_w) AM_BASE(m_charram)
- AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE_LEGACY(tecmo16_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x120800, 0x120fff) AM_RAM_WRITE_LEGACY(tecmo16_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x121000, 0x1217ff) AM_RAM_WRITE_LEGACY(tecmo16_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x121800, 0x121fff) AM_RAM_WRITE_LEGACY(tecmo16_colorram2_w) AM_BASE(m_colorram2)
+ AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE(tecmo16_charram_w) AM_BASE(m_charram)
+ AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(tecmo16_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x120800, 0x120fff) AM_RAM_WRITE(tecmo16_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x121000, 0x1217ff) AM_RAM_WRITE(tecmo16_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x121800, 0x121fff) AM_RAM_WRITE(tecmo16_colorram2_w) AM_BASE(m_colorram2)
AM_RANGE(0x122000, 0x127fff) AM_RAM /* work area */
AM_RANGE(0x130000, 0x130fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x140000, 0x141fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x150000, 0x150001) AM_WRITE_LEGACY(tecmo16_flipscreen_w)
+ AM_RANGE(0x150000, 0x150001) AM_WRITE(tecmo16_flipscreen_w)
AM_RANGE(0x150010, 0x150011) AM_WRITE(tecmo16_sound_command_w)
AM_RANGE(0x150030, 0x150031) AM_READ_PORT("DSW2") AM_WRITENOP /* ??? */
AM_RANGE(0x150040, 0x150041) AM_READ_PORT("DSW1")
AM_RANGE(0x150050, 0x150051) AM_READ_PORT("P1_P2")
- AM_RANGE(0x160000, 0x160001) AM_WRITE_LEGACY(tecmo16_scroll_char_x_w)
- AM_RANGE(0x16000c, 0x16000d) AM_WRITE_LEGACY(tecmo16_scroll_x_w)
- AM_RANGE(0x160012, 0x160013) AM_WRITE_LEGACY(tecmo16_scroll_y_w)
- AM_RANGE(0x160018, 0x160019) AM_WRITE_LEGACY(tecmo16_scroll2_x_w)
- AM_RANGE(0x16001e, 0x16001f) AM_WRITE_LEGACY(tecmo16_scroll2_y_w)
+ AM_RANGE(0x160000, 0x160001) AM_WRITE(tecmo16_scroll_char_x_w)
+ AM_RANGE(0x16000c, 0x16000d) AM_WRITE(tecmo16_scroll_x_w)
+ AM_RANGE(0x160012, 0x160013) AM_WRITE(tecmo16_scroll_y_w)
+ AM_RANGE(0x160018, 0x160019) AM_WRITE(tecmo16_scroll2_x_w)
+ AM_RANGE(0x16001e, 0x16001f) AM_WRITE(tecmo16_scroll2_y_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( ginkun_map, AS_PROGRAM, 16, tecmo16_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM /* Main RAM */
- AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE_LEGACY(tecmo16_charram_w) AM_BASE(m_charram)
- AM_RANGE(0x120000, 0x120fff) AM_RAM_WRITE_LEGACY(tecmo16_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x121000, 0x121fff) AM_RAM_WRITE_LEGACY(tecmo16_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x122000, 0x122fff) AM_RAM_WRITE_LEGACY(tecmo16_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0x123000, 0x123fff) AM_RAM_WRITE_LEGACY(tecmo16_colorram2_w) AM_BASE(m_colorram2)
+ AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE(tecmo16_charram_w) AM_BASE(m_charram)
+ AM_RANGE(0x120000, 0x120fff) AM_RAM_WRITE(tecmo16_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x121000, 0x121fff) AM_RAM_WRITE(tecmo16_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x122000, 0x122fff) AM_RAM_WRITE(tecmo16_videoram2_w) AM_BASE(m_videoram2)
+ AM_RANGE(0x123000, 0x123fff) AM_RAM_WRITE(tecmo16_colorram2_w) AM_BASE(m_colorram2)
AM_RANGE(0x124000, 0x124fff) AM_RAM /* extra RAM for Riot */
AM_RANGE(0x130000, 0x130fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x140000, 0x141fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x150000, 0x150001) AM_WRITE_LEGACY(tecmo16_flipscreen_w)
+ AM_RANGE(0x150000, 0x150001) AM_WRITE(tecmo16_flipscreen_w)
AM_RANGE(0x150010, 0x150011) AM_WRITE(tecmo16_sound_command_w)
AM_RANGE(0x150020, 0x150021) AM_READ_PORT("EXTRA") AM_WRITENOP /* ??? */
AM_RANGE(0x150030, 0x150031) AM_READ_PORT("DSW2") AM_WRITENOP /* ??? */
AM_RANGE(0x150040, 0x150041) AM_READ_PORT("DSW1")
AM_RANGE(0x150050, 0x150051) AM_READ_PORT("P1_P2")
- AM_RANGE(0x160000, 0x160001) AM_WRITE_LEGACY(tecmo16_scroll_char_x_w)
- AM_RANGE(0x160006, 0x160007) AM_WRITE_LEGACY(tecmo16_scroll_char_y_w)
- AM_RANGE(0x16000c, 0x16000d) AM_WRITE_LEGACY(tecmo16_scroll_x_w)
- AM_RANGE(0x160012, 0x160013) AM_WRITE_LEGACY(tecmo16_scroll_y_w)
- AM_RANGE(0x160018, 0x160019) AM_WRITE_LEGACY(tecmo16_scroll2_x_w)
- AM_RANGE(0x16001e, 0x16001f) AM_WRITE_LEGACY(tecmo16_scroll2_y_w)
+ AM_RANGE(0x160000, 0x160001) AM_WRITE(tecmo16_scroll_char_x_w)
+ AM_RANGE(0x160006, 0x160007) AM_WRITE(tecmo16_scroll_char_y_w)
+ AM_RANGE(0x16000c, 0x16000d) AM_WRITE(tecmo16_scroll_x_w)
+ AM_RANGE(0x160012, 0x160013) AM_WRITE(tecmo16_scroll_y_w)
+ AM_RANGE(0x160018, 0x160019) AM_WRITE(tecmo16_scroll2_x_w)
+ AM_RANGE(0x16001e, 0x16001f) AM_WRITE(tecmo16_scroll2_y_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, tecmo16_state )
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index 782ab4e273f..86bfc92e6ca 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -288,16 +288,16 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, tecmosys_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // work ram
AM_RANGE(0x210000, 0x210001) AM_READNOP // single byte overflow on stack defined as 0x210000
- AM_RANGE(0x300000, 0x300fff) AM_RAM_WRITE_LEGACY(bg0_tilemap_w) AM_BASE(m_bg0tilemap_ram) // bg0 ram
- AM_RANGE(0x301000, 0x3013ff) AM_RAM_WRITE_LEGACY(bg0_tilemap_lineram_w) AM_BASE(m_bg0tilemap_lineram)// bg0 linescroll? (guess)
+ AM_RANGE(0x300000, 0x300fff) AM_RAM_WRITE(bg0_tilemap_w) AM_BASE(m_bg0tilemap_ram) // bg0 ram
+ AM_RANGE(0x301000, 0x3013ff) AM_RAM_WRITE(bg0_tilemap_lineram_w) AM_BASE(m_bg0tilemap_lineram)// bg0 linescroll? (guess)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE_LEGACY(bg1_tilemap_w) AM_BASE(m_bg1tilemap_ram) // bg1 ram
- AM_RANGE(0x401000, 0x4013ff) AM_RAM_WRITE_LEGACY(bg1_tilemap_lineram_w) AM_BASE(m_bg1tilemap_lineram)// bg1 linescroll? (guess)
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(bg1_tilemap_w) AM_BASE(m_bg1tilemap_ram) // bg1 ram
+ AM_RANGE(0x401000, 0x4013ff) AM_RAM_WRITE(bg1_tilemap_lineram_w) AM_BASE(m_bg1tilemap_lineram)// bg1 linescroll? (guess)
- AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE_LEGACY(bg2_tilemap_w) AM_BASE(m_bg2tilemap_ram) // bg2 ram
- AM_RANGE(0x501000, 0x5013ff) AM_RAM_WRITE_LEGACY(bg2_tilemap_lineram_w) AM_BASE(m_bg2tilemap_lineram) // bg2 linescroll? (guess)
+ AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(bg2_tilemap_w) AM_BASE(m_bg2tilemap_ram) // bg2 ram
+ AM_RANGE(0x501000, 0x5013ff) AM_RAM_WRITE(bg2_tilemap_lineram_w) AM_BASE(m_bg2tilemap_lineram) // bg2 linescroll? (guess)
- AM_RANGE(0x700000, 0x703fff) AM_RAM_WRITE_LEGACY(fg_tilemap_w) AM_BASE(m_fgtilemap_ram) // fix ram
+ AM_RANGE(0x700000, 0x703fff) AM_RAM_WRITE(fg_tilemap_w) AM_BASE(m_fgtilemap_ram) // fix ram
AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE(m_spriteram) // obj ram
AM_RANGE(0x880000, 0x88000b) AM_READ(unk880000_r)
AM_RANGE(0x900000, 0x907fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // AM_WRITEONLY // obj pal
@@ -305,22 +305,22 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, tecmosys_state )
//AM_RANGE(0x980000, 0x9807ff) AM_WRITEONLY // bg pal
//AM_RANGE(0x980800, 0x980fff) AM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // fix pal
// the two above are as tested by the game code, I've only rolled them into one below to get colours to show right.
- AM_RANGE(0x980000, 0x980fff) AM_RAM_WRITE_LEGACY(tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(m_tilemap_paletteram16)
+ AM_RANGE(0x980000, 0x980fff) AM_RAM_WRITE(tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(m_tilemap_paletteram16)
AM_RANGE(0x880000, 0x88002f) AM_WRITE(unk880000_w ) AM_BASE(m_880000regs) // 10 byte dta@88000c, 880022=watchdog?
AM_RANGE(0xa00000, 0xa00001) AM_DEVWRITE_LEGACY("eeprom", eeprom_w )
AM_RANGE(0xa80000, 0xa80005) AM_WRITEONLY AM_BASE(m_a80000regs) // a80000-3 scroll? a80004 inverted ? 3 : 0
AM_RANGE(0xb00000, 0xb00005) AM_WRITEONLY AM_BASE(m_b00000regs) // b00000-3 scrool?, b00004 inverted ? 3 : 0
- AM_RANGE(0xb80000, 0xb80001) AM_READWRITE_LEGACY(tecmosys_prot_status_r, tecmosys_prot_status_w)
+ AM_RANGE(0xb80000, 0xb80001) AM_READWRITE(tecmosys_prot_status_r, tecmosys_prot_status_w)
AM_RANGE(0xc00000, 0xc00005) AM_WRITEONLY AM_BASE(m_c00000regs) // c00000-3 scroll? c00004 inverted ? 13 : 10
AM_RANGE(0xc80000, 0xc80005) AM_WRITEONLY AM_BASE(m_c80000regs) // c80000-3 scrool? c80004 inverted ? 3 : 0
AM_RANGE(0xd00000, 0xd00001) AM_READ_PORT("P1")
AM_RANGE(0xd00002, 0xd00003) AM_READ_PORT("P2")
AM_RANGE(0xd80000, 0xd80001) AM_DEVREAD_LEGACY("eeprom", eeprom_r)
AM_RANGE(0xe00000, 0xe00001) AM_WRITE(sound_w )
- AM_RANGE(0xe80000, 0xe80001) AM_WRITE_LEGACY(tecmosys_prot_data_w)
+ AM_RANGE(0xe80000, 0xe80001) AM_WRITE(tecmosys_prot_data_w)
AM_RANGE(0xf00000, 0xf00001) AM_READ(sound_r)
- AM_RANGE(0xf80000, 0xf80001) AM_READ_LEGACY(tecmosys_prot_data_r)
+ AM_RANGE(0xf80000, 0xf80001) AM_READ(tecmosys_prot_data_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index 3cfddb2207d..8f3a348dd12 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -217,40 +217,40 @@ static ADDRESS_MAP_START( main_mem, AS_PROGRAM, 8, tehkanwc_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(tehkanwc_videoram_w) AM_SHARE("share2") AM_BASE(m_videoram)
- AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE_LEGACY(tehkanwc_colorram_w) AM_SHARE("share3") AM_BASE(m_colorram)
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(tehkanwc_videoram_w) AM_SHARE("share2") AM_BASE(m_videoram)
+ AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(tehkanwc_colorram_w) AM_SHARE("share3") AM_BASE(m_colorram)
AM_RANGE(0xd800, 0xddff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_be_w) AM_SHARE("share4") AM_SHARE("paletteram")
AM_RANGE(0xde00, 0xdfff) AM_RAM AM_SHARE("share5") /* unused part of the palette RAM, I think? Gridiron uses it */
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(tehkanwc_videoram2_w) AM_SHARE("share6") AM_BASE(m_videoram2)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(tehkanwc_videoram2_w) AM_SHARE("share6") AM_BASE(m_videoram2)
AM_RANGE(0xe800, 0xebff) AM_RAM AM_SHARE("share7") AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* sprites */
- AM_RANGE(0xec00, 0xec01) AM_RAM_WRITE_LEGACY(tehkanwc_scroll_x_w)
- AM_RANGE(0xec02, 0xec02) AM_RAM_WRITE_LEGACY(tehkanwc_scroll_y_w)
+ AM_RANGE(0xec00, 0xec01) AM_RAM_WRITE(tehkanwc_scroll_x_w)
+ AM_RANGE(0xec02, 0xec02) AM_RAM_WRITE(tehkanwc_scroll_y_w)
AM_RANGE(0xf800, 0xf801) AM_READWRITE(tehkanwc_track_0_r, tehkanwc_track_0_reset_w) /* track 0 x/y */
- AM_RANGE(0xf802, 0xf802) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(gridiron_led0_w)
+ AM_RANGE(0xf802, 0xf802) AM_READ_PORT("SYSTEM") AM_WRITE(gridiron_led0_w)
AM_RANGE(0xf803, 0xf803) AM_READ_PORT("P1BUT")
AM_RANGE(0xf806, 0xf806) AM_READ_PORT("SYSTEM")
AM_RANGE(0xf810, 0xf811) AM_READWRITE(tehkanwc_track_1_r, tehkanwc_track_1_reset_w) /* track 1 x/y */
- AM_RANGE(0xf812, 0xf812) AM_WRITE_LEGACY(gridiron_led1_w)
+ AM_RANGE(0xf812, 0xf812) AM_WRITE(gridiron_led1_w)
AM_RANGE(0xf813, 0xf813) AM_READ_PORT("P2BUT")
AM_RANGE(0xf820, 0xf820) AM_READ(soundlatch2_r) AM_WRITE(sound_command_w) /* answer from the sound CPU */
AM_RANGE(0xf840, 0xf840) AM_READ_PORT("DSW1") AM_WRITE(sub_cpu_halt_w)
AM_RANGE(0xf850, 0xf850) AM_READ_PORT("DSW2") AM_WRITENOP /* ?? writes 0x00 or 0xff */
- AM_RANGE(0xf860, 0xf860) AM_READ(watchdog_reset_r) AM_WRITE_LEGACY(tehkanwc_flipscreen_x_w)
- AM_RANGE(0xf870, 0xf870) AM_READ_PORT("DSW3") AM_WRITE_LEGACY(tehkanwc_flipscreen_y_w)
+ AM_RANGE(0xf860, 0xf860) AM_READ(watchdog_reset_r) AM_WRITE(tehkanwc_flipscreen_x_w)
+ AM_RANGE(0xf870, 0xf870) AM_READ_PORT("DSW3") AM_WRITE(tehkanwc_flipscreen_y_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( sub_mem, AS_PROGRAM, 8, tehkanwc_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE_LEGACY(tehkanwc_videoram_w) AM_SHARE("share2")
- AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE_LEGACY(tehkanwc_colorram_w) AM_SHARE("share3")
+ AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(tehkanwc_videoram_w) AM_SHARE("share2")
+ AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(tehkanwc_colorram_w) AM_SHARE("share3")
AM_RANGE(0xd800, 0xddff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_be_w) AM_SHARE("share4") AM_SHARE("paletteram")
AM_RANGE(0xde00, 0xdfff) AM_RAM AM_SHARE("share5") /* unused part of the palette RAM, I think? Gridiron uses it */
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(tehkanwc_videoram2_w) AM_SHARE("share6")
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(tehkanwc_videoram2_w) AM_SHARE("share6")
AM_RANGE(0xe800, 0xebff) AM_RAM AM_SHARE("share7") /* sprites */
- AM_RANGE(0xec00, 0xec01) AM_RAM_WRITE_LEGACY(tehkanwc_scroll_x_w)
- AM_RANGE(0xec02, 0xec02) AM_RAM_WRITE_LEGACY(tehkanwc_scroll_y_w)
+ AM_RANGE(0xec00, 0xec01) AM_RAM_WRITE(tehkanwc_scroll_x_w)
+ AM_RANGE(0xec02, 0xec02) AM_RAM_WRITE(tehkanwc_scroll_y_w)
AM_RANGE(0xf860, 0xf860) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index 09df5f03cae..8513da4659e 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -198,33 +198,33 @@ static ADDRESS_MAP_START( terracre_map, AS_PROGRAM, 16, terracre_state )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x020000, 0x0201ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x020200, 0x021fff) AM_RAM
- AM_RANGE(0x022000, 0x022fff) AM_WRITE_LEGACY(amazon_background_w) AM_BASE(m_amazon_videoram)
+ AM_RANGE(0x022000, 0x022fff) AM_WRITE(amazon_background_w) AM_BASE(m_amazon_videoram)
AM_RANGE(0x023000, 0x023fff) AM_RAM
AM_RANGE(0x024000, 0x024001) AM_READ_PORT("P1")
AM_RANGE(0x024002, 0x024003) AM_READ_PORT("P2")
AM_RANGE(0x024004, 0x024005) AM_READ_PORT("SYSTEM")
AM_RANGE(0x024006, 0x024007) AM_READ_PORT("DSW")
- AM_RANGE(0x026000, 0x026001) AM_WRITE_LEGACY(amazon_flipscreen_w) /* flip screen & coin counters */
- AM_RANGE(0x026002, 0x026003) AM_WRITE_LEGACY(amazon_scrollx_w)
- AM_RANGE(0x026004, 0x026005) AM_WRITE_LEGACY(amazon_scrolly_w)
+ AM_RANGE(0x026000, 0x026001) AM_WRITE(amazon_flipscreen_w) /* flip screen & coin counters */
+ AM_RANGE(0x026002, 0x026003) AM_WRITE(amazon_scrollx_w)
+ AM_RANGE(0x026004, 0x026005) AM_WRITE(amazon_scrolly_w)
AM_RANGE(0x02600c, 0x02600d) AM_WRITE(amazon_sound_w)
- AM_RANGE(0x028000, 0x0287ff) AM_WRITE_LEGACY(amazon_foreground_w) AM_BASE(m_videoram)
+ AM_RANGE(0x028000, 0x0287ff) AM_WRITE(amazon_foreground_w) AM_BASE(m_videoram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( amazon_map, AS_PROGRAM, 16, terracre_state )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x040000, 0x0401ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x040200, 0x040fff) AM_RAM
- AM_RANGE(0x042000, 0x042fff) AM_WRITE_LEGACY(amazon_background_w) AM_BASE(m_amazon_videoram)
+ AM_RANGE(0x042000, 0x042fff) AM_WRITE(amazon_background_w) AM_BASE(m_amazon_videoram)
AM_RANGE(0x044000, 0x044001) AM_READ_PORT("IN0")
AM_RANGE(0x044002, 0x044003) AM_READ_PORT("IN1")
AM_RANGE(0x044004, 0x044005) AM_READ_PORT("IN2")
AM_RANGE(0x044006, 0x044007) AM_READ_PORT("IN3")
- AM_RANGE(0x046000, 0x046001) AM_WRITE_LEGACY(amazon_flipscreen_w) /* flip screen & coin counters */
- AM_RANGE(0x046002, 0x046003) AM_WRITE_LEGACY(amazon_scrollx_w)
- AM_RANGE(0x046004, 0x046005) AM_WRITE_LEGACY(amazon_scrolly_w)
+ AM_RANGE(0x046000, 0x046001) AM_WRITE(amazon_flipscreen_w) /* flip screen & coin counters */
+ AM_RANGE(0x046002, 0x046003) AM_WRITE(amazon_scrollx_w)
+ AM_RANGE(0x046004, 0x046005) AM_WRITE(amazon_scrolly_w)
AM_RANGE(0x04600c, 0x04600d) AM_WRITE(amazon_sound_w)
- AM_RANGE(0x050000, 0x050fff) AM_WRITE_LEGACY(amazon_foreground_w) AM_BASE(m_videoram)
+ AM_RANGE(0x050000, 0x050fff) AM_WRITE(amazon_foreground_w) AM_BASE(m_videoram)
AM_RANGE(0x070000, 0x070003) AM_READWRITE(amazon_protection_r, amazon_protection_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index 695650262f6..25d81e67f4f 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -285,14 +285,14 @@ static ADDRESS_MAP_START( tetrisp2_map, AS_PROGRAM, 16, tetrisp2_state )
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram") // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
AM_RANGE(0x108000, 0x10ffff) AM_RAM // Work RAM
- AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8_LEGACY(tetrisp2_priority_r, tetrisp2_priority_w, 0x00ff)
- AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE_LEGACY(tetrisp2_palette_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_fg_w) AM_BASE(m_vram_fg) // Foreground
- AM_RANGE(0x404000, 0x407fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_bg_w) AM_BASE(m_vram_bg) // Background
+ AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8(tetrisp2_priority_r, tetrisp2_priority_w, 0x00ff)
+ AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(tetrisp2_palette_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE(tetrisp2_vram_fg_w) AM_BASE(m_vram_fg) // Foreground
+ AM_RANGE(0x404000, 0x407fff) AM_RAM_WRITE(tetrisp2_vram_bg_w) AM_BASE(m_vram_bg) // Background
AM_RANGE(0x408000, 0x409fff) AM_RAM // ???
AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line
- AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_rot_w) AM_BASE(m_vram_rot) // Rotation
- AM_RANGE(0x650000, 0x651fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_rot_w) // Rotation (mirror)
+ AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(tetrisp2_vram_rot_w) AM_BASE(m_vram_rot) // Rotation
+ AM_RANGE(0x650000, 0x651fff) AM_RAM_WRITE(tetrisp2_vram_rot_w) // Rotation (mirror)
AM_RANGE(0x800000, 0x800003) AM_DEVREADWRITE8_LEGACY("ymz", ymz280b_r, ymz280b_w, 0x00ff) // Sound
AM_RANGE(0x900000, 0x903fff) AM_READ(tetrisp2_nvram_r) AM_WRITE(tetrisp2_nvram_w) AM_BASE(m_nvram) AM_SHARE("nvram") // NVRAM
AM_RANGE(0x904000, 0x907fff) AM_READ(tetrisp2_nvram_r) AM_WRITE(tetrisp2_nvram_w) // NVRAM (mirror)
@@ -342,17 +342,17 @@ static ADDRESS_MAP_START( nndmseal_map, AS_PROGRAM, 16, tetrisp2_state )
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram") // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
AM_RANGE(0x108000, 0x10ffff) AM_RAM // Work RAM
- AM_RANGE(0x200000, 0x23ffff) AM_WRITE8_LEGACY(tetrisp2_priority_w, 0x00ff) // Priority
- AM_RANGE(0x200000, 0x23ffff) AM_READ_LEGACY(nndmseal_priority_r)
- AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE_LEGACY(tetrisp2_palette_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_fg_w) AM_BASE(m_vram_fg ) // Foreground
- AM_RANGE(0x404000, 0x407fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_bg_w) AM_BASE(m_vram_bg ) // Background
+ AM_RANGE(0x200000, 0x23ffff) AM_WRITE8(tetrisp2_priority_w, 0x00ff) // Priority
+ AM_RANGE(0x200000, 0x23ffff) AM_READ(nndmseal_priority_r)
+ AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(tetrisp2_palette_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE(tetrisp2_vram_fg_w) AM_BASE(m_vram_fg ) // Foreground
+ AM_RANGE(0x404000, 0x407fff) AM_RAM_WRITE(tetrisp2_vram_bg_w) AM_BASE(m_vram_bg ) // Background
AM_RANGE(0x408000, 0x409fff) AM_RAM // ???
AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line
- AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_rot_w) AM_BASE(m_vram_rot ) // Rotation
- AM_RANGE(0x650000, 0x651fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_rot_w) // Rotation (mirror)
+ AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(tetrisp2_vram_rot_w) AM_BASE(m_vram_rot ) // Rotation
+ AM_RANGE(0x650000, 0x651fff) AM_RAM_WRITE(tetrisp2_vram_rot_w) // Rotation (mirror)
AM_RANGE(0x800000, 0x800003) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff ) // Sound
@@ -388,13 +388,13 @@ static ADDRESS_MAP_START( rockn1_map, AS_PROGRAM, 16, tetrisp2_state )
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram") // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
AM_RANGE(0x108000, 0x10ffff) AM_RAM // Work RAM
- AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8_LEGACY(tetrisp2_priority_r, rockn_priority_w, 0x00ff) // Priority
- AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE_LEGACY(tetrisp2_palette_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_fg_w) AM_BASE(m_vram_fg) // Foreground
- AM_RANGE(0x404000, 0x407fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_bg_w) AM_BASE(m_vram_bg) // Background
+ AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8(tetrisp2_priority_r, rockn_priority_w, 0x00ff) // Priority
+ AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(tetrisp2_palette_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE(tetrisp2_vram_fg_w) AM_BASE(m_vram_fg) // Foreground
+ AM_RANGE(0x404000, 0x407fff) AM_RAM_WRITE(tetrisp2_vram_bg_w) AM_BASE(m_vram_bg) // Background
AM_RANGE(0x408000, 0x409fff) AM_RAM // ???
AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line
- AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_rot_w) AM_BASE(m_vram_rot) // Rotation
+ AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(tetrisp2_vram_rot_w) AM_BASE(m_vram_rot) // Rotation
AM_RANGE(0x900000, 0x903fff) AM_READ(rockn_nvram_r) AM_WRITE(tetrisp2_nvram_w) AM_BASE(m_nvram) AM_SHARE("nvram") // NVRAM
AM_RANGE(0xa30000, 0xa30001) AM_READWRITE(rockn_soundvolume_r, rockn_soundvolume_w) // Sound Volume
AM_RANGE(0xa40000, 0xa40003) AM_DEVREADWRITE8_LEGACY("ymz", ymz280b_r, ymz280b_w, 0x00ff) // Sound
@@ -422,12 +422,12 @@ static ADDRESS_MAP_START( rockn2_map, AS_PROGRAM, 16, tetrisp2_state )
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram") // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
AM_RANGE(0x108000, 0x10ffff) AM_RAM // Work RAM
- AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8_LEGACY(tetrisp2_priority_r, rockn_priority_w, 0x00ff) // Priority
- AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE_LEGACY(tetrisp2_palette_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8(tetrisp2_priority_r, rockn_priority_w, 0x00ff) // Priority
+ AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(tetrisp2_palette_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line
- AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_rot_w) AM_BASE(m_vram_rot) // Rotation
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_fg_w) AM_BASE(m_vram_fg) // Foreground
- AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_bg_w) AM_BASE(m_vram_bg) // Background
+ AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(tetrisp2_vram_rot_w) AM_BASE(m_vram_rot) // Rotation
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(tetrisp2_vram_fg_w) AM_BASE(m_vram_fg) // Foreground
+ AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE(tetrisp2_vram_bg_w) AM_BASE(m_vram_bg) // Background
AM_RANGE(0x808000, 0x809fff) AM_RAM // ???
AM_RANGE(0x900000, 0x903fff) AM_READ(rockn_nvram_r) AM_WRITE(tetrisp2_nvram_w) AM_BASE(m_nvram) AM_SHARE("nvram") // NVRAM
AM_RANGE(0xa30000, 0xa30001) AM_READWRITE(rockn_soundvolume_r, rockn_soundvolume_w) // Sound Volume
@@ -456,12 +456,12 @@ static ADDRESS_MAP_START( rocknms_main_map, AS_PROGRAM, 16, tetrisp2_state )
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram") // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
AM_RANGE(0x108000, 0x10ffff) AM_RAM // Work RAM
- AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8_LEGACY(tetrisp2_priority_r, rockn_priority_w, 0x00ff) // Priority
- AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE_LEGACY(tetrisp2_palette_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8(tetrisp2_priority_r, rockn_priority_w, 0x00ff) // Priority
+ AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(tetrisp2_palette_w) AM_SHARE("paletteram") // Palette
// AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line
- AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_rot_w) AM_BASE(m_vram_rot) // Rotation
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_fg_w) AM_BASE(m_vram_fg) // Foreground
- AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE_LEGACY(tetrisp2_vram_bg_w) AM_BASE(m_vram_bg) // Background
+ AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(tetrisp2_vram_rot_w) AM_BASE(m_vram_rot) // Rotation
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(tetrisp2_vram_fg_w) AM_BASE(m_vram_fg) // Foreground
+ AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE(tetrisp2_vram_bg_w) AM_BASE(m_vram_bg) // Background
// AM_RANGE(0x808000, 0x809fff) AM_RAM // ???
AM_RANGE(0x900000, 0x903fff) AM_READ(rockn_nvram_r) AM_WRITE(tetrisp2_nvram_w) AM_BASE(m_nvram) AM_SHARE("nvram") // NVRAM
AM_RANGE(0xa30000, 0xa30001) AM_READWRITE(rockn_soundvolume_r, rockn_soundvolume_w) // Sound Volume
@@ -491,12 +491,12 @@ static ADDRESS_MAP_START( rocknms_sub_map, AS_PROGRAM, 16, tetrisp2_state )
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram2") // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
AM_RANGE(0x108000, 0x10ffff) AM_RAM // Work RAM
- AM_RANGE(0x200000, 0x23ffff) AM_RAM_WRITE_LEGACY(rocknms_sub_priority_w) AM_BASE(m_rocknms_sub_priority) // Priority
- AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE_LEGACY(rocknms_sub_palette_w) AM_SHARE("paletteram2") // Palette
+ AM_RANGE(0x200000, 0x23ffff) AM_RAM_WRITE(rocknms_sub_priority_w) AM_BASE(m_rocknms_sub_priority) // Priority
+ AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(rocknms_sub_palette_w) AM_SHARE("paletteram2") // Palette
// AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line
- AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE_LEGACY(rocknms_sub_vram_rot_w) AM_BASE(m_rocknms_sub_vram_rot) // Rotation
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE_LEGACY(rocknms_sub_vram_fg_w) AM_BASE(m_rocknms_sub_vram_fg) // Foreground
- AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE_LEGACY(rocknms_sub_vram_bg_w) AM_BASE(m_rocknms_sub_vram_bg) // Background
+ AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(rocknms_sub_vram_rot_w) AM_BASE(m_rocknms_sub_vram_rot) // Rotation
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(rocknms_sub_vram_fg_w) AM_BASE(m_rocknms_sub_vram_fg) // Foreground
+ AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE(rocknms_sub_vram_bg_w) AM_BASE(m_rocknms_sub_vram_bg) // Background
// AM_RANGE(0x808000, 0x809fff) AM_RAM // ???
AM_RANGE(0x900000, 0x907fff) AM_RAM // NVRAM
AM_RANGE(0xa30000, 0xa30001) AM_WRITE(rockn_soundvolume_w) // Sound Volume
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index e970e55bf2b..41657977f4c 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -161,8 +161,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, thedeep_state )
AM_RANGE(0xe100, 0xe100) AM_WRITE(thedeep_e100_w) // ?
AM_RANGE(0xe210, 0xe213) AM_WRITEONLY AM_BASE(m_scroll) // Scroll
AM_RANGE(0xe400, 0xe7ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(thedeep_vram_1_w) AM_BASE(m_vram_1) // Text Layer
- AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE_LEGACY(thedeep_vram_0_w) AM_BASE(m_vram_0) // Background Layer
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(thedeep_vram_1_w) AM_BASE(m_vram_1) // Text Layer
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(thedeep_vram_0_w) AM_BASE(m_vram_0) // Background Layer
AM_RANGE(0xf800, 0xf83f) AM_RAM AM_BASE(m_scroll2 ) // Column Scroll
AM_RANGE(0xf840, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index ff264dbff90..b3de2d18d32 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -155,42 +155,42 @@ WRITE8_MEMBER(thepit_state::nmi_mask_w)
static ADDRESS_MAP_START( thepit_main_map, AS_PROGRAM, 8, thepit_state )
AM_RANGE(0x0000, 0x4fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8800, 0x8bff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(thepit_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_RAM_WRITE_LEGACY(thepit_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8800, 0x8bff) AM_MIRROR(0x0400) AM_RAM_WRITE(thepit_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_RAM_WRITE(thepit_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x9800, 0x983f) AM_MIRROR(0x0700) AM_RAM AM_BASE(m_attributesram)
AM_RANGE(0x9840, 0x985f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9860, 0x98ff) AM_RAM
- AM_RANGE(0xa000, 0xa000) AM_READ_LEGACY(thepit_input_port_0_r) AM_WRITENOP // Not hooked up according to the schematics
+ AM_RANGE(0xa000, 0xa000) AM_READ(thepit_input_port_0_r) AM_WRITENOP // Not hooked up according to the schematics
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN1")
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW") AM_WRITE(nmi_mask_w)
AM_RANGE(0xb001, 0xb001) AM_WRITENOP // Unused, but initialized
AM_RANGE(0xb002, 0xb002) AM_WRITENOP // coin_lockout_w
AM_RANGE(0xb003, 0xb003) AM_WRITE(thepit_sound_enable_w)
AM_RANGE(0xb004, 0xb005) AM_WRITENOP // Unused, but initialized
- AM_RANGE(0xb006, 0xb006) AM_WRITE_LEGACY(thepit_flip_screen_x_w)
- AM_RANGE(0xb007, 0xb007) AM_WRITE_LEGACY(thepit_flip_screen_y_w)
+ AM_RANGE(0xb006, 0xb006) AM_WRITE(thepit_flip_screen_x_w)
+ AM_RANGE(0xb007, 0xb007) AM_WRITE(thepit_flip_screen_y_w)
AM_RANGE(0xb800, 0xb800) AM_READWRITE(watchdog_reset_r, soundlatch_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( intrepid_main_map, AS_PROGRAM, 8, thepit_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x8c00, 0x8fff) AM_READ(thepit_colorram_r) AM_WRITE_LEGACY(thepit_colorram_w) /* mirror for intrepi2 */
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(thepit_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE_LEGACY(thepit_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x8c00, 0x8fff) AM_READ(thepit_colorram_r) AM_WRITE(thepit_colorram_w) /* mirror for intrepi2 */
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(thepit_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE(thepit_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x9800, 0x983f) AM_MIRROR(0x0700) AM_RAM AM_BASE(m_attributesram)
AM_RANGE(0x9840, 0x985f) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x9860, 0x98ff) AM_RAM
- AM_RANGE(0xa000, 0xa000) AM_READ_LEGACY(thepit_input_port_0_r)
+ AM_RANGE(0xa000, 0xa000) AM_READ(thepit_input_port_0_r)
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN1")
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW") AM_WRITE(nmi_mask_w)
AM_RANGE(0xb001, 0xb001) AM_WRITENOP // Unused, but initialized
AM_RANGE(0xb002, 0xb002) AM_WRITENOP // coin_lockout_w
AM_RANGE(0xb003, 0xb003) AM_WRITE(thepit_sound_enable_w)
AM_RANGE(0xb004, 0xb004) AM_WRITENOP // Unused, but initialized
- AM_RANGE(0xb005, 0xb005) AM_WRITE_LEGACY(intrepid_graphics_bank_w)
- AM_RANGE(0xb006, 0xb006) AM_WRITE_LEGACY(thepit_flip_screen_x_w)
- AM_RANGE(0xb007, 0xb007) AM_WRITE_LEGACY(thepit_flip_screen_y_w)
+ AM_RANGE(0xb005, 0xb005) AM_WRITE(intrepid_graphics_bank_w)
+ AM_RANGE(0xb006, 0xb006) AM_WRITE(thepit_flip_screen_x_w)
+ AM_RANGE(0xb007, 0xb007) AM_WRITE(thepit_flip_screen_y_w)
AM_RANGE(0xb800, 0xb800) AM_READWRITE(watchdog_reset_r, soundlatch_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c
index cb526b0f81f..3c9fb6e2f0a 100644
--- a/src/mame/drivers/thief.c
+++ b/src/mame/drivers/thief.c
@@ -152,26 +152,26 @@ READ8_MEMBER(thief_state::thief_io_r)
static ADDRESS_MAP_START( sharkatt_main_map, AS_PROGRAM, 8, thief_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM /* 2114 */
- AM_RANGE(0xc000, 0xdfff) AM_READWRITE_LEGACY(thief_videoram_r, thief_videoram_w) /* 4116 */
+ AM_RANGE(0xc000, 0xdfff) AM_READWRITE(thief_videoram_r, thief_videoram_w) /* 4116 */
ADDRESS_MAP_END
static ADDRESS_MAP_START( thief_main_map, AS_PROGRAM, 8, thief_state )
- AM_RANGE(0x0000, 0x0000) AM_WRITE_LEGACY(thief_blit_w)
+ AM_RANGE(0x0000, 0x0000) AM_WRITE(thief_blit_w)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM /* 2114 */
AM_RANGE(0xa000, 0xafff) AM_ROM /* NATO Defense diagnostic ROM */
- AM_RANGE(0xc000, 0xdfff) AM_READWRITE_LEGACY(thief_videoram_r, thief_videoram_w) /* 4116 */
- AM_RANGE(0xe000, 0xe008) AM_READWRITE_LEGACY(thief_coprocessor_r, thief_coprocessor_w)
+ AM_RANGE(0xc000, 0xdfff) AM_READWRITE(thief_videoram_r, thief_videoram_w) /* 4116 */
+ AM_RANGE(0xe000, 0xe008) AM_READWRITE(thief_coprocessor_r, thief_coprocessor_w)
AM_RANGE(0xe010, 0xe02f) AM_ROM
- AM_RANGE(0xe080, 0xe0bf) AM_READWRITE_LEGACY(thief_context_ram_r, thief_context_ram_w)
- AM_RANGE(0xe0c0, 0xe0c0) AM_WRITE_LEGACY(thief_context_bank_w)
+ AM_RANGE(0xe080, 0xe0bf) AM_READWRITE(thief_context_ram_r, thief_context_ram_w)
+ AM_RANGE(0xe0c0, 0xe0c0) AM_WRITE(thief_context_bank_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( io_map, AS_IO, 8, thief_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP /* watchdog */
- AM_RANGE(0x10, 0x10) AM_WRITE_LEGACY(thief_video_control_w)
+ AM_RANGE(0x10, 0x10) AM_WRITE(thief_video_control_w)
AM_RANGE(0x30, 0x30) AM_WRITE(thief_input_select_w) /* 8255 */
AM_RANGE(0x31, 0x31) AM_READ(thief_io_r) /* 8255 */
AM_RANGE(0x33, 0x33) AM_DEVWRITE_LEGACY("samples", tape_control_w)
@@ -179,9 +179,9 @@ static ADDRESS_MAP_START( io_map, AS_IO, 8, thief_state )
AM_RANGE(0x41, 0x41) AM_DEVREAD_LEGACY("ay1", ay8910_r)
AM_RANGE(0x42, 0x43) AM_DEVWRITE_LEGACY("ay2", ay8910_address_data_w)
AM_RANGE(0x43, 0x43) AM_DEVREAD_LEGACY("ay2", ay8910_r)
- AM_RANGE(0x50, 0x50) AM_WRITE_LEGACY(thief_color_plane_w)
+ AM_RANGE(0x50, 0x50) AM_WRITE(thief_color_plane_w)
AM_RANGE(0x60, 0x6f) AM_DEVREADWRITE_LEGACY("tms", tms9927_r, tms9927_w)
- AM_RANGE(0x70, 0x7f) AM_WRITE_LEGACY(thief_color_map_w)
+ AM_RANGE(0x70, 0x7f) AM_WRITE(thief_color_map_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c
index 55c8879f3ef..fdc771181c3 100644
--- a/src/mame/drivers/thoop2.c
+++ b/src/mame/drivers/thoop2.c
@@ -86,7 +86,7 @@ READ16_MEMBER(thoop2_state::DS5002FP_R)
static ADDRESS_MAP_START( thoop2_map, AS_PROGRAM, 16, thoop2_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
- AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE_LEGACY(thoop2_vram_w) AM_BASE(m_videoram) /* Video RAM */
+ AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(thoop2_vram_w) AM_BASE(m_videoram) /* Video RAM */
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset16_w) /* INT 6 ACK/Watchdog timer */
AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")/* Palette */
diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c
index 18eff38f764..361d45a5499 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -120,8 +120,9 @@
static MACHINE_RESET( tiamc1 )
{
+ tiamc1_state *state = machine.driver_data<tiamc1_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- tiamc1_bankswitch_w(space, 0, 0);
+ state->tiamc1_bankswitch_w(*space, 0, 0);
}
WRITE8_MEMBER(tiamc1_state::tiamc1_control_w)
@@ -132,21 +133,21 @@ WRITE8_MEMBER(tiamc1_state::tiamc1_control_w)
static ADDRESS_MAP_START( tiamc1_map, AS_PROGRAM, 8, tiamc1_state )
- AM_RANGE(0xb000, 0xb7ff) AM_WRITE_LEGACY(tiamc1_videoram_w)
+ AM_RANGE(0xb000, 0xb7ff) AM_WRITE(tiamc1_videoram_w)
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( tiamc1_io_map, AS_IO, 8, tiamc1_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x40, 0x4f) AM_WRITE_LEGACY(tiamc1_sprite_y_w) /* sprites Y */
- AM_RANGE(0x50, 0x5f) AM_WRITE_LEGACY(tiamc1_sprite_x_w) /* sprites X */
- AM_RANGE(0x60, 0x6f) AM_WRITE_LEGACY(tiamc1_sprite_n_w) /* sprites # */
- AM_RANGE(0x70, 0x7f) AM_WRITE_LEGACY(tiamc1_sprite_a_w) /* sprites attributes */
- AM_RANGE(0xa0, 0xaf) AM_WRITE_LEGACY(tiamc1_palette_w) /* color ram */
- AM_RANGE(0xbc, 0xbc) AM_WRITE_LEGACY(tiamc1_bg_hshift_w)/* background H scroll */
- AM_RANGE(0xbd, 0xbd) AM_WRITE_LEGACY(tiamc1_bg_vshift_w)/* background V scroll */
- AM_RANGE(0xbe, 0xbe) AM_WRITE_LEGACY(tiamc1_bankswitch_w) /* VRAM selector */
+ AM_RANGE(0x40, 0x4f) AM_WRITE(tiamc1_sprite_y_w) /* sprites Y */
+ AM_RANGE(0x50, 0x5f) AM_WRITE(tiamc1_sprite_x_w) /* sprites X */
+ AM_RANGE(0x60, 0x6f) AM_WRITE(tiamc1_sprite_n_w) /* sprites # */
+ AM_RANGE(0x70, 0x7f) AM_WRITE(tiamc1_sprite_a_w) /* sprites attributes */
+ AM_RANGE(0xa0, 0xaf) AM_WRITE(tiamc1_palette_w) /* color ram */
+ AM_RANGE(0xbc, 0xbc) AM_WRITE(tiamc1_bg_hshift_w)/* background H scroll */
+ AM_RANGE(0xbd, 0xbd) AM_WRITE(tiamc1_bg_vshift_w)/* background V scroll */
+ AM_RANGE(0xbe, 0xbe) AM_WRITE(tiamc1_bankswitch_w) /* VRAM selector */
AM_RANGE(0xbf, 0xbf) AM_WRITENOP /* charset control */
AM_RANGE(0xc0, 0xc3) AM_DEVWRITE_LEGACY("2x8253", tiamc1_timer0_w) /* timer 0 */
AM_RANGE(0xd0, 0xd0) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index 75189e834f6..04728afc046 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -170,12 +170,12 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, tigeroad_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0xfe0800, 0xfe0cff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xfe0d00, 0xfe1807) AM_RAM /* still part of OBJ RAM */
- AM_RANGE(0xfe4000, 0xfe4001) AM_READ_PORT("P1_P2") AM_WRITE_LEGACY(tigeroad_videoctrl_w) /* char bank, coin counters, + ? */
+ AM_RANGE(0xfe4000, 0xfe4001) AM_READ_PORT("P1_P2") AM_WRITE(tigeroad_videoctrl_w) /* char bank, coin counters, + ? */
AM_RANGE(0xfe4002, 0xfe4003) AM_READ_PORT("SYSTEM")
/* AM_RANGE(0xfe4002, 0xfe4003) AM_WRITE(tigeroad_soundcmd_w) added by init_tigeroad() */
AM_RANGE(0xfe4004, 0xfe4005) AM_READ_PORT("DSW")
- AM_RANGE(0xfec000, 0xfec7ff) AM_RAM_WRITE_LEGACY(tigeroad_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xfe8000, 0xfe8003) AM_WRITE_LEGACY(tigeroad_scroll_w)
+ AM_RANGE(0xfec000, 0xfec7ff) AM_RAM_WRITE(tigeroad_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xfe8000, 0xfe8003) AM_WRITE(tigeroad_scroll_w)
AM_RANGE(0xfe800e, 0xfe800f) AM_WRITEONLY /* fe800e = watchdog or IRQ acknowledge */
AM_RANGE(0xff8200, 0xff867f) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffc000, 0xffffff) AM_RAM AM_BASE(m_ram16)
diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c
index 220dc702058..b919857696a 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -46,8 +46,8 @@ WRITE8_MEMBER(timelimt_state::sound_reset_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, timelimt_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* rom */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* ram */
- AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE_LEGACY(timelimt_videoram_w) AM_BASE(m_videoram) /* video ram */
- AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE_LEGACY(timelimt_bg_videoram_w) AM_BASE(m_bg_videoram) AM_SIZE(m_bg_videoram_size)/* background ram */
+ AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(timelimt_videoram_w) AM_BASE(m_videoram) /* video ram */
+ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(timelimt_bg_videoram_w) AM_BASE(m_bg_videoram) AM_SIZE(m_bg_videoram_size)/* background ram */
AM_RANGE(0x9800, 0x98ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* sprite ram */
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("INPUTS")
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("SYSTEM")
@@ -56,9 +56,9 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, timelimt_state )
AM_RANGE(0xb003, 0xb003) AM_WRITE(sound_reset_w)/* sound reset ? */
AM_RANGE(0xb800, 0xb800) AM_WRITE(soundlatch_w) /* sound write */
AM_RANGE(0xb800, 0xb800) AM_READNOP /* NMI ack? */
- AM_RANGE(0xc800, 0xc800) AM_WRITE_LEGACY(timelimt_scroll_x_lsb_w)
- AM_RANGE(0xc801, 0xc801) AM_WRITE_LEGACY(timelimt_scroll_x_msb_w)
- AM_RANGE(0xc802, 0xc802) AM_WRITE_LEGACY(timelimt_scroll_y_w)
+ AM_RANGE(0xc800, 0xc800) AM_WRITE(timelimt_scroll_x_lsb_w)
+ AM_RANGE(0xc801, 0xc801) AM_WRITE(timelimt_scroll_x_msb_w)
+ AM_RANGE(0xc802, 0xc802) AM_WRITE(timelimt_scroll_y_w)
AM_RANGE(0xc803, 0xc803) AM_WRITENOP /* ???? bit 0 used only */
AM_RANGE(0xc804, 0xc804) AM_WRITENOP /* ???? not used */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c
index 75058fdec2e..1e14efa6386 100644
--- a/src/mame/drivers/timeplt.c
+++ b/src/mame/drivers/timeplt.c
@@ -115,18 +115,18 @@ READ8_MEMBER(timeplt_state::psurge_protection_r)
static ADDRESS_MAP_START( timeplt_main_map, AS_PROGRAM, 8, timeplt_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x5fff) AM_ROM
- AM_RANGE(0xa000, 0xa3ff) AM_RAM_WRITE_LEGACY(timeplt_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xa400, 0xa7ff) AM_RAM_WRITE_LEGACY(timeplt_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xa000, 0xa3ff) AM_RAM_WRITE(timeplt_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xa400, 0xa7ff) AM_RAM_WRITE(timeplt_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xa800, 0xafff) AM_RAM
AM_RANGE(0xb000, 0xb0ff) AM_MIRROR(0x0b00) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xb400, 0xb4ff) AM_MIRROR(0x0b00) AM_RAM AM_BASE(m_spriteram2)
AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0cff) AM_WRITE(soundlatch_w)
AM_RANGE(0xc200, 0xc200) AM_MIRROR(0x0cff) AM_WRITE(watchdog_reset_w)
AM_RANGE(0xc300, 0xc300) AM_MIRROR(0x0cf1) AM_WRITE(timeplt_nmi_enable_w)
- AM_RANGE(0xc302, 0xc302) AM_MIRROR(0x0cf1) AM_WRITE_LEGACY(timeplt_flipscreen_w)
+ AM_RANGE(0xc302, 0xc302) AM_MIRROR(0x0cf1) AM_WRITE(timeplt_flipscreen_w)
AM_RANGE(0xc304, 0xc304) AM_MIRROR(0x0cf1) AM_WRITE_LEGACY(timeplt_sh_irqtrigger_w)
AM_RANGE(0xc30a, 0xc30c) AM_MIRROR(0x0cf1) AM_WRITE(timeplt_coin_counter_w)
- AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0cff) AM_READ_LEGACY(timeplt_scanline_r)
+ AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0cff) AM_READ(timeplt_scanline_r)
AM_RANGE(0xc200, 0xc200) AM_MIRROR(0x0cff) AM_READ_PORT("DSW1")
AM_RANGE(0xc300, 0xc300) AM_MIRROR(0x0c9f) AM_READ_PORT("IN0")
AM_RANGE(0xc320, 0xc320) AM_MIRROR(0x0c9f) AM_READ_PORT("IN1")
@@ -139,17 +139,17 @@ static ADDRESS_MAP_START( psurge_main_map, AS_PROGRAM, 8, timeplt_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6004, 0x6004) AM_READ(psurge_protection_r)
- AM_RANGE(0xa000, 0xa3ff) AM_RAM_WRITE_LEGACY(timeplt_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xa400, 0xa7ff) AM_RAM_WRITE_LEGACY(timeplt_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xa000, 0xa3ff) AM_RAM_WRITE(timeplt_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xa400, 0xa7ff) AM_RAM_WRITE(timeplt_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xa800, 0xafff) AM_RAM
AM_RANGE(0xb000, 0xb0ff) AM_MIRROR(0x0b00) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xb400, 0xb4ff) AM_MIRROR(0x0b00) AM_RAM AM_BASE(m_spriteram2)
AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0cff) AM_WRITE(soundlatch_w)
AM_RANGE(0xc200, 0xc200) AM_MIRROR(0x0cff) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0xc302, 0xc302) AM_MIRROR(0x0cf1) AM_WRITE_LEGACY(timeplt_flipscreen_w)
+ AM_RANGE(0xc302, 0xc302) AM_MIRROR(0x0cf1) AM_WRITE(timeplt_flipscreen_w)
AM_RANGE(0xc304, 0xc304) AM_MIRROR(0x0cf1) AM_WRITE_LEGACY(timeplt_sh_irqtrigger_w)
AM_RANGE(0xc30a, 0xc30c) AM_MIRROR(0x0cf1) AM_WRITE(timeplt_coin_counter_w)
- AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0cff) AM_READ_LEGACY(timeplt_scanline_r)
+ AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0cff) AM_READ(timeplt_scanline_r)
AM_RANGE(0xc200, 0xc200) AM_MIRROR(0x0cff) AM_READ_PORT("DSW1")
AM_RANGE(0xc300, 0xc300) AM_MIRROR(0x0c9f) AM_READ_PORT("IN0")
AM_RANGE(0xc320, 0xc320) AM_MIRROR(0x0c9f) AM_READ_PORT("IN1")
@@ -161,18 +161,18 @@ static ADDRESS_MAP_START( chkun_main_map, AS_PROGRAM, 8, timeplt_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM
- AM_RANGE(0xa000, 0xa3ff) AM_RAM_WRITE_LEGACY(timeplt_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xa400, 0xa7ff) AM_RAM_WRITE_LEGACY(timeplt_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xa000, 0xa3ff) AM_RAM_WRITE(timeplt_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xa400, 0xa7ff) AM_RAM_WRITE(timeplt_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xa800, 0xafff) AM_RAM
AM_RANGE(0xb000, 0xb0ff) AM_MIRROR(0x0b00) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xb400, 0xb4ff) AM_MIRROR(0x0b00) AM_RAM AM_BASE(m_spriteram2)
AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0cff) AM_WRITE(soundlatch_w)
AM_RANGE(0xc200, 0xc200) AM_MIRROR(0x0cff) AM_WRITE(watchdog_reset_w)
AM_RANGE(0xc300, 0xc300) AM_MIRROR(0x0cf1) AM_WRITE(timeplt_nmi_enable_w)
- AM_RANGE(0xc302, 0xc302) AM_MIRROR(0x0cf1) AM_WRITE_LEGACY(timeplt_flipscreen_w)
+ AM_RANGE(0xc302, 0xc302) AM_MIRROR(0x0cf1) AM_WRITE(timeplt_flipscreen_w)
AM_RANGE(0xc304, 0xc304) AM_MIRROR(0x0cf1) AM_WRITE_LEGACY(timeplt_sh_irqtrigger_w)
AM_RANGE(0xc30a, 0xc30c) AM_MIRROR(0x0cf1) AM_WRITE(timeplt_coin_counter_w)
- AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0cff) AM_READ_LEGACY(timeplt_scanline_r)
+ AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0cff) AM_READ(timeplt_scanline_r)
AM_RANGE(0xc200, 0xc200) AM_MIRROR(0x0cff) AM_READ_PORT("DSW1")
AM_RANGE(0xc300, 0xc300) AM_MIRROR(0x0c9f) AM_READ_PORT("IN0")
AM_RANGE(0xc320, 0xc320) AM_MIRROR(0x0c9f) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 7067e2112b1..7627cdca8fb 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -527,7 +527,7 @@ WRITE16_MEMBER(tmnt_state::prmrsocr_eeprom_w)
{
if (ACCESSING_BITS_0_7)
{
- prmrsocr_122000_w(&space, offset, data, mem_mask);
+ prmrsocr_122000_w(space, offset, data, mem_mask);
}
if (ACCESSING_BITS_8_15)
@@ -558,8 +558,8 @@ static ADDRESS_MAP_START( cuebrick_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_RAM /* main RAM */
AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE_LEGACY(tmnt_paletteram_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x0a0000, 0x0a0001) AM_READ_PORT("COINS") AM_WRITE_LEGACY(tmnt_0a0000_w)
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(tmnt_paletteram_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0a0000, 0x0a0001) AM_READ_PORT("COINS") AM_WRITE(tmnt_0a0000_w)
AM_RANGE(0x0a0002, 0x0a0003) AM_READ_PORT("P1")
AM_RANGE(0x0a0004, 0x0a0005) AM_READ_PORT("P2")
AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(tmnt_sound_command_w)
@@ -579,8 +579,8 @@ static ADDRESS_MAP_START( mia_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_RAM /* main RAM */
AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE_LEGACY(tmnt_paletteram_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x0a0000, 0x0a0001) AM_READ_PORT("COINS") AM_WRITE_LEGACY(tmnt_0a0000_w)
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(tmnt_paletteram_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0a0000, 0x0a0001) AM_READ_PORT("COINS") AM_WRITE(tmnt_0a0000_w)
AM_RANGE(0x0a0002, 0x0a0003) AM_READ_PORT("P1")
AM_RANGE(0x0a0004, 0x0a0005) AM_READ_PORT("P2")
AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(tmnt_sound_command_w)
@@ -588,7 +588,7 @@ static ADDRESS_MAP_START( mia_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x0a0012, 0x0a0013) AM_READ_PORT("DSW2")
AM_RANGE(0x0a0018, 0x0a0019) AM_READ_PORT("DSW3")
#if 0
- AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE_LEGACY(tmnt_priority_w)
+ AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(tmnt_priority_w)
#endif
AM_RANGE(0x100000, 0x107fff) AM_READWRITE(k052109_word_noA12_r, k052109_word_noA12_w)
// AM_RANGE(0x10e800, 0x10e801) AM_WRITENOP ???
@@ -600,8 +600,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( tmnt_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE_LEGACY(tmnt_paletteram_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x0a0000, 0x0a0001) AM_READ_PORT("COINS") AM_WRITE_LEGACY(tmnt_0a0000_w)
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(tmnt_paletteram_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0a0000, 0x0a0001) AM_READ_PORT("COINS") AM_WRITE(tmnt_0a0000_w)
AM_RANGE(0x0a0002, 0x0a0003) AM_READ_PORT("P1")
AM_RANGE(0x0a0004, 0x0a0005) AM_READ_PORT("P2")
AM_RANGE(0x0a0006, 0x0a0007) AM_READ_PORT("P3")
@@ -610,7 +610,7 @@ static ADDRESS_MAP_START( tmnt_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x0a0012, 0x0a0013) AM_READ_PORT("DSW2")
AM_RANGE(0x0a0014, 0x0a0015) AM_READ_PORT("P4")
AM_RANGE(0x0a0018, 0x0a0019) AM_READ_PORT("DSW3")
- AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE_LEGACY(tmnt_priority_w)
+ AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(tmnt_priority_w)
AM_RANGE(0x100000, 0x107fff) AM_READWRITE(k052109_word_noA12_r, k052109_word_noA12_w)
// AM_RANGE(0x10e800, 0x10e801) AM_WRITENOP ???
AM_RANGE(0x140000, 0x140007) AM_DEVREADWRITE_LEGACY("k051960", k051937_word_r, k051937_word_w)
@@ -626,7 +626,7 @@ static ADDRESS_MAP_START( punkshot_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x0a0002, 0x0a0003) AM_READ_PORT("COINS/DSW3")
AM_RANGE(0x0a0004, 0x0a0005) AM_READ_PORT("P3/P4")
AM_RANGE(0x0a0006, 0x0a0007) AM_READ_PORT("P1/P2")
- AM_RANGE(0x0a0020, 0x0a0021) AM_WRITE_LEGACY(punkshot_0a0020_w)
+ AM_RANGE(0x0a0020, 0x0a0021) AM_WRITE(punkshot_0a0020_w)
AM_RANGE(0x0a0040, 0x0a0043) AM_DEVREAD8_LEGACY("k053260", punkshot_sound_r, 0x00ff) /* K053260 */
AM_RANGE(0x0a0040, 0x0a0041) AM_DEVWRITE8_LEGACY("k053260", k053260_w, 0x00ff)
AM_RANGE(0x0a0060, 0x0a007f) AM_DEVWRITE_LEGACY("k053251", k053251_lsb_w)
@@ -648,7 +648,7 @@ static ADDRESS_MAP_START( lgtnfght_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x0a0006, 0x0a0007) AM_READ_PORT("DSW1")
AM_RANGE(0x0a0008, 0x0a0009) AM_READ_PORT("DSW2")
AM_RANGE(0x0a0010, 0x0a0011) AM_READ_PORT("DSW3")
- AM_RANGE(0x0a0018, 0x0a0019) AM_WRITE_LEGACY(lgtnfght_0a0018_w)
+ AM_RANGE(0x0a0018, 0x0a0019) AM_WRITE(lgtnfght_0a0018_w)
AM_RANGE(0x0a0020, 0x0a0023) AM_DEVREAD8_LEGACY("k053260", punkshot_sound_r, 0x00ff) /* K053260 */
AM_RANGE(0x0a0020, 0x0a0021) AM_DEVWRITE8_LEGACY("k053260", k053260_w, 0x00ff)
AM_RANGE(0x0a0028, 0x0a0029) AM_WRITE(watchdog_reset16_w)
@@ -679,7 +679,7 @@ static ADDRESS_MAP_START( blswhstl_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x700004, 0x700005) AM_READ(blswhstl_coin_r)
AM_RANGE(0x700006, 0x700007) AM_READ_PORT("EEPROM")
AM_RANGE(0x700200, 0x700201) AM_WRITE(blswhstl_eeprom_w)
- AM_RANGE(0x700300, 0x700301) AM_WRITE_LEGACY(blswhstl_700300_w)
+ AM_RANGE(0x700300, 0x700301) AM_WRITE(blswhstl_700300_w)
AM_RANGE(0x700400, 0x700401) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x780600, 0x780603) AM_DEVREAD8_LEGACY("k053260", punkshot_sound_r, 0x00ff) /* K053260 */
AM_RANGE(0x780600, 0x780601) AM_DEVWRITE8_LEGACY("k053260", k053260_w, 0x00ff)
@@ -724,12 +724,12 @@ static ADDRESS_MAP_START( glfgreat_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x120002, 0x120003) AM_READ_PORT("P3/P4")
AM_RANGE(0x120004, 0x120005) AM_READ_PORT("COINS/DSW3")
AM_RANGE(0x120006, 0x120007) AM_READ_PORT("DSW1/DSW2")
- AM_RANGE(0x121000, 0x121001) AM_READ_LEGACY(glfgreat_ball_r) /* returns the color of the center pixel of the roz layer */
- AM_RANGE(0x122000, 0x122001) AM_WRITE_LEGACY(glfgreat_122000_w)
+ AM_RANGE(0x121000, 0x121001) AM_READ(glfgreat_ball_r) /* returns the color of the center pixel of the roz layer */
+ AM_RANGE(0x122000, 0x122001) AM_WRITE(glfgreat_122000_w)
AM_RANGE(0x124000, 0x124001) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x125000, 0x125003) AM_DEVREADWRITE8_LEGACY("k053260", punkshot_sound_r, glfgreat_sound_w, 0xff00) /* K053260 */
AM_RANGE(0x200000, 0x207fff) AM_READWRITE(k052109_word_noA12_r, k052109_word_noA12_w)
- AM_RANGE(0x300000, 0x3fffff) AM_READ_LEGACY(glfgreat_rom_r)
+ AM_RANGE(0x300000, 0x3fffff) AM_READ(glfgreat_rom_r)
ADDRESS_MAP_END
@@ -752,7 +752,7 @@ static ADDRESS_MAP_START( prmrsocr_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x123000, 0x123001) AM_WRITE(prmrsocr_sound_irq_w)
AM_RANGE(0x200000, 0x207fff) AM_READWRITE(k052109_word_noA12_r, k052109_word_noA12_w)
AM_RANGE(0x280000, 0x280001) AM_WRITE(watchdog_reset16_w)
- AM_RANGE(0x300000, 0x33ffff) AM_READ_LEGACY(prmrsocr_rom_r)
+ AM_RANGE(0x300000, 0x33ffff) AM_READ(prmrsocr_rom_r)
ADDRESS_MAP_END
@@ -1007,8 +1007,8 @@ static ADDRESS_MAP_START( tmnt2_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x1c0006, 0x1c0007) AM_READ_PORT("P4")
AM_RANGE(0x1c0100, 0x1c0101) AM_READ_PORT("COINS")
AM_RANGE(0x1c0102, 0x1c0103) AM_READ(ssriders_eeprom_r)
- AM_RANGE(0x1c0200, 0x1c0201) AM_WRITE_LEGACY(ssriders_eeprom_w) /* EEPROM and gfx control */
- AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE_LEGACY(ssriders_1c0300_w)
+ AM_RANGE(0x1c0200, 0x1c0201) AM_WRITE(ssriders_eeprom_w) /* EEPROM and gfx control */
+ AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE(ssriders_1c0300_w)
AM_RANGE(0x1c0400, 0x1c0401) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w)
AM_RANGE(0x1c0500, 0x1c057f) AM_RAM /* TMNT2 only (1J) unknown, mostly MCU blit offsets */
// AM_RANGE(0x1c0800, 0x1c0801) AM_READ(ssriders_protection_r) /* protection device */
@@ -1033,8 +1033,8 @@ static ADDRESS_MAP_START( ssriders_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x1c0006, 0x1c0007) AM_READ_PORT("P4")
AM_RANGE(0x1c0100, 0x1c0101) AM_READ_PORT("COINS")
AM_RANGE(0x1c0102, 0x1c0103) AM_READ(ssriders_eeprom_r)
- AM_RANGE(0x1c0200, 0x1c0201) AM_WRITE_LEGACY(ssriders_eeprom_w) /* EEPROM and gfx control */
- AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE_LEGACY(ssriders_1c0300_w)
+ AM_RANGE(0x1c0200, 0x1c0201) AM_WRITE(ssriders_eeprom_w) /* EEPROM and gfx control */
+ AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE(ssriders_1c0300_w)
AM_RANGE(0x1c0400, 0x1c0401) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w)
AM_RANGE(0x1c0500, 0x1c057f) AM_RAM /* TMNT2 only (1J) unknown */
AM_RANGE(0x1c0800, 0x1c0801) AM_READ(ssriders_protection_r)
@@ -1055,7 +1055,7 @@ static ADDRESS_MAP_START( sunsetbl_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x14e700, 0x14e71f) AM_DEVWRITE_LEGACY("k053251", k053251_lsb_w)
AM_RANGE(0x180000, 0x183fff) AM_READWRITE(k053245_scattered_word_r, k053245_scattered_word_w) AM_BASE(m_spriteram)
AM_RANGE(0x184000, 0x18ffff) AM_RAM
- AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE_LEGACY(ssriders_1c0300_w)
+ AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE(ssriders_1c0300_w)
AM_RANGE(0x1c0400, 0x1c0401) AM_WRITENOP
AM_RANGE(0x5a0000, 0x5a001f) AM_READWRITE(k053244_word_noA1_r, k053244_word_noA1_w)
AM_RANGE(0x600000, 0x603fff) AM_DEVREADWRITE_LEGACY("k052109", k052109_word_r, k052109_word_w)
@@ -1066,7 +1066,7 @@ static ADDRESS_MAP_START( sunsetbl_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("P2")
AM_RANGE(0xc00004, 0xc00005) AM_READ_PORT("P3")
AM_RANGE(0xc00006, 0xc00007) AM_READ_PORT("P4")
- AM_RANGE(0xc00200, 0xc00201) AM_WRITE_LEGACY(ssriders_eeprom_w) /* EEPROM and gfx control */
+ AM_RANGE(0xc00200, 0xc00201) AM_WRITE(ssriders_eeprom_w) /* EEPROM and gfx control */
AM_RANGE(0xc00404, 0xc00405) AM_READ_PORT("COINS")
AM_RANGE(0xc00406, 0xc00407) AM_READ(sunsetbl_eeprom_r)
AM_RANGE(0xc00600, 0xc00601) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
@@ -1160,12 +1160,12 @@ ADDRESS_MAP_END
READ8_MEMBER(tmnt_state::k054539_ctrl_r)
{
- return machine().device<k054539_device>("k054539")->read(*&space, 0x200 + offset, 0xff);
+ return machine().device<k054539_device>("k054539")->read(space, 0x200 + offset, 0xff);
}
WRITE8_MEMBER(tmnt_state::k054539_ctrl_w)
{
- machine().device<k054539_device>("k054539")->write(*&space, 0x200 + offset, data, 0xff);
+ machine().device<k054539_device>("k054539")->write(space, 0x200 + offset, data, 0xff);
}
static ADDRESS_MAP_START( prmrsocr_audio_map, AS_PROGRAM, 8, tmnt_state )
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index a821397c3af..c77a0d240d9 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -757,7 +757,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, tnzs_state )
AM_RANGE(0xf000, 0xf2ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r8, spriteylow_w8)
AM_RANGE(0xf300, 0xf303) AM_MIRROR(0xfc) AM_DEVWRITE_LEGACY("spritegen", spritectrl_w8) /* control registers (0x80 mirror used by Arkanoid 2) */
AM_RANGE(0xf400, 0xf400) AM_DEVWRITE_LEGACY("spritegen", spritebgflag_w8) /* enable / disable background transparency */
- AM_RANGE(0xf600, 0xf600) AM_READNOP AM_WRITE_LEGACY(tnzs_bankswitch_w)
+ AM_RANGE(0xf600, 0xf600) AM_READNOP AM_WRITE(tnzs_bankswitch_w)
/* arknoid2, extrmatn, plumppop and drtoppel have PROMs instead of RAM */
/* drtoppel writes here anyway! (maybe leftover from tests during development) */
/* so the handler is patched out in init_drtopple() */
@@ -773,7 +773,7 @@ static ADDRESS_MAP_START( cpu0_type2, AS_PROGRAM, 8, tnzs_state )
AM_RANGE(0xf000, 0xf2ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r8, spriteylow_w8)
AM_RANGE(0xf300, 0xf303) AM_MIRROR(0xfc) AM_DEVWRITE_LEGACY("spritegen", spritectrl_w8) /* control registers (0x80 mirror used by Arkanoid 2) */
AM_RANGE(0xf400, 0xf400) AM_DEVWRITE_LEGACY("spritegen", spritebgflag_w8) /* enable / disable background transparency */
- AM_RANGE(0xf600, 0xf600) AM_WRITE_LEGACY(tnzs_bankswitch_w)
+ AM_RANGE(0xf600, 0xf600) AM_WRITE(tnzs_bankswitch_w)
/* kabukiz still writes here but it's not used (it's paletteram in type1 map) */
AM_RANGE(0xf800, 0xfbff) AM_WRITENOP
ADDRESS_MAP_END
@@ -781,12 +781,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8, tnzs_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2")
- AM_RANGE(0xa000, 0xa000) AM_WRITE_LEGACY(tnzs_bankswitch1_w)
+ AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w)
AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
- AM_RANGE(0xc000, 0xc001) AM_READWRITE_LEGACY(tnzs_mcu_r, tnzs_mcu_w) /* not present in insectx */
+ AM_RANGE(0xc000, 0xc001) AM_READWRITE(tnzs_mcu_r, tnzs_mcu_w) /* not present in insectx */
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xf000, 0xf003) AM_READ_LEGACY(arknoid2_sh_f000_r) /* paddles in arkanoid2/plumppop. The ports are */
+ AM_RANGE(0xf000, 0xf003) AM_READ(arknoid2_sh_f000_r) /* paddles in arkanoid2/plumppop. The ports are */
/* read but not used by the other games, and are not read at */
/* all by insectx. */
ADDRESS_MAP_END
@@ -794,7 +794,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( kageki_sub_map, AS_PROGRAM, 8, tnzs_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2")
- AM_RANGE(0xa000, 0xa000) AM_WRITE_LEGACY(tnzs_bankswitch1_w)
+ AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w)
AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE_LEGACY("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0")
AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN1")
@@ -814,7 +814,7 @@ WRITE8_MEMBER(tnzs_state::tnzsb_sound_command_w)
static ADDRESS_MAP_START( tnzsb_cpu1_map, AS_PROGRAM, 8, tnzs_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2")
- AM_RANGE(0xa000, 0xa000) AM_WRITE_LEGACY(tnzs_bankswitch1_w)
+ AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w)
AM_RANGE(0xb002, 0xb002) AM_READ_PORT("DSWA")
AM_RANGE(0xb003, 0xb003) AM_READ_PORT("DSWB")
AM_RANGE(0xb004, 0xb004) AM_WRITE(tnzsb_sound_command_w)
@@ -830,7 +830,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( kabukiz_cpu1_map, AS_PROGRAM, 8, tnzs_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2")
- AM_RANGE(0xa000, 0xa000) AM_WRITE_LEGACY(tnzs_bankswitch1_w)
+ AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w)
AM_RANGE(0xb002, 0xb002) AM_READ_PORT("DSWA")
AM_RANGE(0xb003, 0xb003) AM_READ_PORT("DSWB")
AM_RANGE(0xb004, 0xb004) AM_WRITE(tnzsb_sound_command_w)
@@ -860,8 +860,8 @@ static ADDRESS_MAP_START( tnzsb_io_map, AS_IO, 8, tnzs_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( i8742_io_map, AS_IO, 8, tnzs_state )
- AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READ_LEGACY(tnzs_port1_r)
- AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READWRITE_LEGACY(tnzs_port2_r, tnzs_port2_w)
+ AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READ(tnzs_port1_r)
+ AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READWRITE(tnzs_port2_r, tnzs_port2_w)
AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ_PORT("COIN1")
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ_PORT("COIN2")
ADDRESS_MAP_END
@@ -896,7 +896,7 @@ static ADDRESS_MAP_START( jpopnics_main_map, AS_PROGRAM, 8, tnzs_state )
AM_RANGE(0xf000, 0xf2ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r8, spriteylow_w8)
AM_RANGE(0xf300, 0xf303) AM_MIRROR(0xfc) AM_DEVWRITE_LEGACY("spritegen", spritectrl_w8) /* control registers (0x80 mirror used by Arkanoid 2) */
AM_RANGE(0xf400, 0xf400) AM_DEVWRITE_LEGACY("spritegen", spritebgflag_w8) /* enable / disable background transparency */
- AM_RANGE(0xf600, 0xf600) AM_READNOP AM_WRITE_LEGACY(tnzs_bankswitch_w)
+ AM_RANGE(0xf600, 0xf600) AM_READNOP AM_WRITE(tnzs_bankswitch_w)
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(jpopnics_palette_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
@@ -920,7 +920,7 @@ static ADDRESS_MAP_START( jpopnics_sub_map, AS_PROGRAM, 8, tnzs_state )
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xf000, 0xf003) AM_READ_LEGACY(arknoid2_sh_f000_r)
+ AM_RANGE(0xf000, 0xf003) AM_READ(arknoid2_sh_f000_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index 9872f8936eb..3466f252f98 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -374,42 +374,42 @@ static ADDRESS_MAP_START( rallybik_main_map, AS_PROGRAM, 16, toaplan1_state )
AM_RANGE(0x040000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM
AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x100000, 0x100001) AM_WRITE_LEGACY(rallybik_bcu_flipscreen_w)
- AM_RANGE(0x100002, 0x100003) AM_READWRITE_LEGACY(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
- AM_RANGE(0x100004, 0x100007) AM_READWRITE_LEGACY(rallybik_tileram16_r, toaplan1_tileram16_w)
- AM_RANGE(0x100010, 0x10001f) AM_READWRITE_LEGACY(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
+ AM_RANGE(0x100000, 0x100001) AM_WRITE(rallybik_bcu_flipscreen_w)
+ AM_RANGE(0x100002, 0x100003) AM_READWRITE(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
+ AM_RANGE(0x100004, 0x100007) AM_READWRITE(rallybik_tileram16_r, toaplan1_tileram16_w)
+ AM_RANGE(0x100010, 0x10001f) AM_READWRITE(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
AM_RANGE(0x140000, 0x140001) AM_READ_PORT("VBLANK")
// AM_RANGE(0x140000, 0x140001) AM_WRITE_LEGACY(?? video frame related ??)
- AM_RANGE(0x140002, 0x140003) AM_WRITE_LEGACY(toaplan1_intenable_w)
- AM_RANGE(0x140008, 0x14000f) AM_WRITE_LEGACY(toaplan1_bcu_control_w)
- AM_RANGE(0x144000, 0x1447ff) AM_READWRITE_LEGACY(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
- AM_RANGE(0x146000, 0x1467ff) AM_READWRITE_LEGACY(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
- AM_RANGE(0x180000, 0x180fff) AM_READWRITE_LEGACY(toaplan1_shared_r, toaplan1_shared_w)
- AM_RANGE(0x1c0000, 0x1c0003) AM_WRITE_LEGACY(toaplan1_tile_offsets_w)
- AM_RANGE(0x1c8000, 0x1c8001) AM_WRITE_LEGACY(toaplan1_reset_sound)
+ AM_RANGE(0x140002, 0x140003) AM_WRITE(toaplan1_intenable_w)
+ AM_RANGE(0x140008, 0x14000f) AM_WRITE(toaplan1_bcu_control_w)
+ AM_RANGE(0x144000, 0x1447ff) AM_READWRITE(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
+ AM_RANGE(0x146000, 0x1467ff) AM_READWRITE(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
+ AM_RANGE(0x180000, 0x180fff) AM_READWRITE(toaplan1_shared_r, toaplan1_shared_w)
+ AM_RANGE(0x1c0000, 0x1c0003) AM_WRITE(toaplan1_tile_offsets_w)
+ AM_RANGE(0x1c8000, 0x1c8001) AM_WRITE(toaplan1_reset_sound)
ADDRESS_MAP_END
static ADDRESS_MAP_START( truxton_main_map, AS_PROGRAM, 16, toaplan1_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM
- AM_RANGE(0x0c0000, 0x0c0001) AM_READ_LEGACY(toaplan1_frame_done_r)
- AM_RANGE(0x0c0002, 0x0c0003) AM_READWRITE_LEGACY(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
- AM_RANGE(0x0c0004, 0x0c0005) AM_READWRITE_LEGACY(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
- AM_RANGE(0x0c0006, 0x0c0007) AM_READWRITE_LEGACY(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
- AM_RANGE(0x100000, 0x100001) AM_WRITE_LEGACY(toaplan1_bcu_flipscreen_w)
- AM_RANGE(0x100002, 0x100003) AM_READWRITE_LEGACY(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
- AM_RANGE(0x100004, 0x100007) AM_READWRITE_LEGACY(toaplan1_tileram16_r, toaplan1_tileram16_w)
- AM_RANGE(0x100010, 0x10001f) AM_READWRITE_LEGACY(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
+ AM_RANGE(0x0c0000, 0x0c0001) AM_READ(toaplan1_frame_done_r)
+ AM_RANGE(0x0c0002, 0x0c0003) AM_READWRITE(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
+ AM_RANGE(0x0c0004, 0x0c0005) AM_READWRITE(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
+ AM_RANGE(0x0c0006, 0x0c0007) AM_READWRITE(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
+ AM_RANGE(0x100000, 0x100001) AM_WRITE(toaplan1_bcu_flipscreen_w)
+ AM_RANGE(0x100002, 0x100003) AM_READWRITE(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
+ AM_RANGE(0x100004, 0x100007) AM_READWRITE(toaplan1_tileram16_r, toaplan1_tileram16_w)
+ AM_RANGE(0x100010, 0x10001f) AM_READWRITE(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
AM_RANGE(0x140000, 0x140001) AM_READ_PORT("VBLANK")
// AM_RANGE(0x140000, 0x140001) AM_WRITE_LEGACY(?? video frame related ??)
- AM_RANGE(0x140002, 0x140003) AM_WRITE_LEGACY(toaplan1_intenable_w)
- AM_RANGE(0x140008, 0x14000f) AM_WRITE_LEGACY(toaplan1_bcu_control_w)
- AM_RANGE(0x144000, 0x1447ff) AM_READWRITE_LEGACY(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
- AM_RANGE(0x146000, 0x1467ff) AM_READWRITE_LEGACY(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
- AM_RANGE(0x180000, 0x180fff) AM_READWRITE_LEGACY(toaplan1_shared_r, toaplan1_shared_w)
- AM_RANGE(0x1c0000, 0x1c0003) AM_WRITE_LEGACY(toaplan1_tile_offsets_w)
- AM_RANGE(0x1c0006, 0x1c0007) AM_WRITE_LEGACY(toaplan1_fcu_flipscreen_w)
- AM_RANGE(0x1d0000, 0x1d0001) AM_WRITE_LEGACY(toaplan1_reset_sound)
+ AM_RANGE(0x140002, 0x140003) AM_WRITE(toaplan1_intenable_w)
+ AM_RANGE(0x140008, 0x14000f) AM_WRITE(toaplan1_bcu_control_w)
+ AM_RANGE(0x144000, 0x1447ff) AM_READWRITE(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
+ AM_RANGE(0x146000, 0x1467ff) AM_READWRITE(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
+ AM_RANGE(0x180000, 0x180fff) AM_READWRITE(toaplan1_shared_r, toaplan1_shared_w)
+ AM_RANGE(0x1c0000, 0x1c0003) AM_WRITE(toaplan1_tile_offsets_w)
+ AM_RANGE(0x1c0006, 0x1c0007) AM_WRITE(toaplan1_fcu_flipscreen_w)
+ AM_RANGE(0x1d0000, 0x1d0001) AM_WRITE(toaplan1_reset_sound)
ADDRESS_MAP_END
static ADDRESS_MAP_START( hellfire_main_map, AS_PROGRAM, 16, toaplan1_state )
@@ -417,150 +417,150 @@ static ADDRESS_MAP_START( hellfire_main_map, AS_PROGRAM, 16, toaplan1_state )
AM_RANGE(0x040000, 0x047fff) AM_RAM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("VBLANK")
// AM_RANGE(0x080000, 0x080001) AM_WRITE_LEGACY(?? video frame related ??)
- AM_RANGE(0x080002, 0x080003) AM_WRITE_LEGACY(toaplan1_intenable_w)
- AM_RANGE(0x080008, 0x08000f) AM_WRITE_LEGACY(toaplan1_bcu_control_w)
- AM_RANGE(0x084000, 0x0847ff) AM_READWRITE_LEGACY(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
- AM_RANGE(0x086000, 0x0867ff) AM_READWRITE_LEGACY(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
- AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE_LEGACY(toaplan1_shared_r, toaplan1_shared_w)
- AM_RANGE(0x100000, 0x100001) AM_WRITE_LEGACY(toaplan1_bcu_flipscreen_w)
- AM_RANGE(0x100002, 0x100003) AM_READWRITE_LEGACY(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
- AM_RANGE(0x100004, 0x100007) AM_READWRITE_LEGACY(toaplan1_tileram16_r, toaplan1_tileram16_w)
- AM_RANGE(0x100010, 0x10001f) AM_READWRITE_LEGACY(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
- AM_RANGE(0x140000, 0x140001) AM_READ_LEGACY(toaplan1_frame_done_r)
- AM_RANGE(0x140002, 0x140003) AM_READWRITE_LEGACY(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
- AM_RANGE(0x140004, 0x140005) AM_READWRITE_LEGACY(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
- AM_RANGE(0x140006, 0x140007) AM_READWRITE_LEGACY(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
- AM_RANGE(0x180000, 0x180003) AM_WRITE_LEGACY(toaplan1_tile_offsets_w)
- AM_RANGE(0x180006, 0x180007) AM_WRITE_LEGACY(toaplan1_fcu_flipscreen_w)
- AM_RANGE(0x180008, 0x180009) AM_WRITE_LEGACY(toaplan1_reset_sound)
+ AM_RANGE(0x080002, 0x080003) AM_WRITE(toaplan1_intenable_w)
+ AM_RANGE(0x080008, 0x08000f) AM_WRITE(toaplan1_bcu_control_w)
+ AM_RANGE(0x084000, 0x0847ff) AM_READWRITE(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
+ AM_RANGE(0x086000, 0x0867ff) AM_READWRITE(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
+ AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(toaplan1_shared_r, toaplan1_shared_w)
+ AM_RANGE(0x100000, 0x100001) AM_WRITE(toaplan1_bcu_flipscreen_w)
+ AM_RANGE(0x100002, 0x100003) AM_READWRITE(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
+ AM_RANGE(0x100004, 0x100007) AM_READWRITE(toaplan1_tileram16_r, toaplan1_tileram16_w)
+ AM_RANGE(0x100010, 0x10001f) AM_READWRITE(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
+ AM_RANGE(0x140000, 0x140001) AM_READ(toaplan1_frame_done_r)
+ AM_RANGE(0x140002, 0x140003) AM_READWRITE(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
+ AM_RANGE(0x140004, 0x140005) AM_READWRITE(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
+ AM_RANGE(0x140006, 0x140007) AM_READWRITE(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
+ AM_RANGE(0x180000, 0x180003) AM_WRITE(toaplan1_tile_offsets_w)
+ AM_RANGE(0x180006, 0x180007) AM_WRITE(toaplan1_fcu_flipscreen_w)
+ AM_RANGE(0x180008, 0x180009) AM_WRITE(toaplan1_reset_sound)
ADDRESS_MAP_END
static ADDRESS_MAP_START( zerowing_main_map, AS_PROGRAM, 16, toaplan1_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x087fff) AM_RAM
- AM_RANGE(0x0c0000, 0x0c0003) AM_WRITE_LEGACY(toaplan1_tile_offsets_w)
- AM_RANGE(0x0c0006, 0x0c0007) AM_WRITE_LEGACY(toaplan1_fcu_flipscreen_w)
+ AM_RANGE(0x0c0000, 0x0c0003) AM_WRITE(toaplan1_tile_offsets_w)
+ AM_RANGE(0x0c0006, 0x0c0007) AM_WRITE(toaplan1_fcu_flipscreen_w)
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("VBLANK")
// AM_RANGE(0x400000, 0x400001) AM_WRITE_LEGACY(?? video frame related ??)
- AM_RANGE(0x400002, 0x400003) AM_WRITE_LEGACY(toaplan1_intenable_w)
- AM_RANGE(0x400008, 0x40000f) AM_WRITE_LEGACY(toaplan1_bcu_control_w)
- AM_RANGE(0x404000, 0x4047ff) AM_READWRITE_LEGACY(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
- AM_RANGE(0x406000, 0x4067ff) AM_READWRITE_LEGACY(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
- AM_RANGE(0x440000, 0x440fff) AM_READWRITE_LEGACY(toaplan1_shared_r, toaplan1_shared_w)
- AM_RANGE(0x480000, 0x480001) AM_WRITE_LEGACY(toaplan1_bcu_flipscreen_w)
- AM_RANGE(0x480002, 0x480003) AM_READWRITE_LEGACY(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
- AM_RANGE(0x480004, 0x480007) AM_READWRITE_LEGACY(toaplan1_tileram16_r, toaplan1_tileram16_w)
- AM_RANGE(0x480010, 0x48001f) AM_READWRITE_LEGACY(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
- AM_RANGE(0x4c0000, 0x4c0001) AM_READ_LEGACY(toaplan1_frame_done_r)
- AM_RANGE(0x4c0002, 0x4c0003) AM_READWRITE_LEGACY(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
- AM_RANGE(0x4c0004, 0x4c0005) AM_READWRITE_LEGACY(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
- AM_RANGE(0x4c0006, 0x4c0007) AM_READWRITE_LEGACY(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
+ AM_RANGE(0x400002, 0x400003) AM_WRITE(toaplan1_intenable_w)
+ AM_RANGE(0x400008, 0x40000f) AM_WRITE(toaplan1_bcu_control_w)
+ AM_RANGE(0x404000, 0x4047ff) AM_READWRITE(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
+ AM_RANGE(0x406000, 0x4067ff) AM_READWRITE(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
+ AM_RANGE(0x440000, 0x440fff) AM_READWRITE(toaplan1_shared_r, toaplan1_shared_w)
+ AM_RANGE(0x480000, 0x480001) AM_WRITE(toaplan1_bcu_flipscreen_w)
+ AM_RANGE(0x480002, 0x480003) AM_READWRITE(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
+ AM_RANGE(0x480004, 0x480007) AM_READWRITE(toaplan1_tileram16_r, toaplan1_tileram16_w)
+ AM_RANGE(0x480010, 0x48001f) AM_READWRITE(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
+ AM_RANGE(0x4c0000, 0x4c0001) AM_READ(toaplan1_frame_done_r)
+ AM_RANGE(0x4c0002, 0x4c0003) AM_READWRITE(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
+ AM_RANGE(0x4c0004, 0x4c0005) AM_READWRITE(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
+ AM_RANGE(0x4c0006, 0x4c0007) AM_READWRITE(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( demonwld_main_map, AS_PROGRAM, 16, toaplan1_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("VBLANK")
// AM_RANGE(0x400000, 0x400001) AM_WRITE_LEGACY(?? video frame related ??)
- AM_RANGE(0x400002, 0x400003) AM_WRITE_LEGACY(toaplan1_intenable_w)
- AM_RANGE(0x400008, 0x40000f) AM_WRITE_LEGACY(toaplan1_bcu_control_w)
- AM_RANGE(0x404000, 0x4047ff) AM_READWRITE_LEGACY(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
- AM_RANGE(0x406000, 0x4067ff) AM_READWRITE_LEGACY(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
- AM_RANGE(0x600000, 0x600fff) AM_READWRITE_LEGACY(toaplan1_shared_r, toaplan1_shared_w)
- AM_RANGE(0x800000, 0x800001) AM_WRITE_LEGACY(toaplan1_bcu_flipscreen_w)
- AM_RANGE(0x800002, 0x800003) AM_READWRITE_LEGACY(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
- AM_RANGE(0x800004, 0x800007) AM_READWRITE_LEGACY(toaplan1_tileram16_r, toaplan1_tileram16_w)
- AM_RANGE(0x800010, 0x80001f) AM_READWRITE_LEGACY(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
- AM_RANGE(0xa00000, 0xa00001) AM_READ_LEGACY(toaplan1_frame_done_r)
- AM_RANGE(0xa00002, 0xa00003) AM_READWRITE_LEGACY(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
- AM_RANGE(0xa00004, 0xa00005) AM_READWRITE_LEGACY(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
- AM_RANGE(0xa00006, 0xa00007) AM_READWRITE_LEGACY(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
+ AM_RANGE(0x400002, 0x400003) AM_WRITE(toaplan1_intenable_w)
+ AM_RANGE(0x400008, 0x40000f) AM_WRITE(toaplan1_bcu_control_w)
+ AM_RANGE(0x404000, 0x4047ff) AM_READWRITE(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
+ AM_RANGE(0x406000, 0x4067ff) AM_READWRITE(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
+ AM_RANGE(0x600000, 0x600fff) AM_READWRITE(toaplan1_shared_r, toaplan1_shared_w)
+ AM_RANGE(0x800000, 0x800001) AM_WRITE(toaplan1_bcu_flipscreen_w)
+ AM_RANGE(0x800002, 0x800003) AM_READWRITE(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
+ AM_RANGE(0x800004, 0x800007) AM_READWRITE(toaplan1_tileram16_r, toaplan1_tileram16_w)
+ AM_RANGE(0x800010, 0x80001f) AM_READWRITE(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
+ AM_RANGE(0xa00000, 0xa00001) AM_READ(toaplan1_frame_done_r)
+ AM_RANGE(0xa00002, 0xa00003) AM_READWRITE(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
+ AM_RANGE(0xa00004, 0xa00005) AM_READWRITE(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
+ AM_RANGE(0xa00006, 0xa00007) AM_READWRITE(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
AM_RANGE(0xc00000, 0xc03fff) AM_RAM
- AM_RANGE(0xe00000, 0xe00003) AM_WRITE_LEGACY(toaplan1_tile_offsets_w)
- AM_RANGE(0xe00006, 0xe00007) AM_WRITE_LEGACY(toaplan1_fcu_flipscreen_w)
- AM_RANGE(0xe00008, 0xe00009) AM_WRITE_LEGACY(toaplan1_reset_sound)
- AM_RANGE(0xe0000a, 0xe0000b) AM_WRITE_LEGACY(demonwld_dsp_ctrl_w) /* DSP Comms control */
+ AM_RANGE(0xe00000, 0xe00003) AM_WRITE(toaplan1_tile_offsets_w)
+ AM_RANGE(0xe00006, 0xe00007) AM_WRITE(toaplan1_fcu_flipscreen_w)
+ AM_RANGE(0xe00008, 0xe00009) AM_WRITE(toaplan1_reset_sound)
+ AM_RANGE(0xe0000a, 0xe0000b) AM_WRITE(demonwld_dsp_ctrl_w) /* DSP Comms control */
ADDRESS_MAP_END
static ADDRESS_MAP_START( samesame_main_map, AS_PROGRAM, 16, toaplan1_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x07ffff) AM_ROM
- AM_RANGE(0x080000, 0x080003) AM_WRITE_LEGACY(toaplan1_tile_offsets_w)
- AM_RANGE(0x080006, 0x080007) AM_WRITE_LEGACY(toaplan1_fcu_flipscreen_w)
+ AM_RANGE(0x080000, 0x080003) AM_WRITE(toaplan1_tile_offsets_w)
+ AM_RANGE(0x080006, 0x080007) AM_WRITE(toaplan1_fcu_flipscreen_w)
AM_RANGE(0x0c0000, 0x0c3fff) AM_RAM /* Frame done at $c1ada */
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("VBLANK")
// AM_RANGE(0x100000, 0x100001) AM_WRITE_LEGACY(?? video frame related ??)
- AM_RANGE(0x100002, 0x100003) AM_WRITE_LEGACY(toaplan1_intenable_w)
- AM_RANGE(0x100008, 0x10000f) AM_WRITE_LEGACY(toaplan1_bcu_control_w)
- AM_RANGE(0x104000, 0x1047ff) AM_READWRITE_LEGACY(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
- AM_RANGE(0x106000, 0x1067ff) AM_READWRITE_LEGACY(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
+ AM_RANGE(0x100002, 0x100003) AM_WRITE(toaplan1_intenable_w)
+ AM_RANGE(0x100008, 0x10000f) AM_WRITE(toaplan1_bcu_control_w)
+ AM_RANGE(0x104000, 0x1047ff) AM_READWRITE(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
+ AM_RANGE(0x106000, 0x1067ff) AM_READWRITE(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
AM_RANGE(0x140000, 0x140001) AM_READ_PORT("P1")
AM_RANGE(0x140002, 0x140003) AM_READ_PORT("P2")
AM_RANGE(0x140004, 0x140005) AM_READ_PORT("DSWA")
AM_RANGE(0x140006, 0x140007) AM_READ_PORT("DSWB")
AM_RANGE(0x140008, 0x140009) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x14000a, 0x14000b) AM_READ_LEGACY(samesame_port_6_word_r) /* Territory, and MCU ready */
- AM_RANGE(0x14000c, 0x14000d) AM_WRITE_LEGACY(samesame_coin_w) /* Coin counter/lockout */
+ AM_RANGE(0x14000a, 0x14000b) AM_READ(samesame_port_6_word_r) /* Territory, and MCU ready */
+ AM_RANGE(0x14000c, 0x14000d) AM_WRITE(samesame_coin_w) /* Coin counter/lockout */
// AM_RANGE(0x14000e, 0x14000f) AM_WRITE_LEGACY(samesame_mcu_w) /* Commands sent to HD647180 */
- AM_RANGE(0x180000, 0x180001) AM_WRITE_LEGACY(toaplan1_bcu_flipscreen_w)
- AM_RANGE(0x180002, 0x180003) AM_READWRITE_LEGACY(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
- AM_RANGE(0x180004, 0x180007) AM_READWRITE_LEGACY(toaplan1_tileram16_r, toaplan1_tileram16_w)
- AM_RANGE(0x180010, 0x18001f) AM_READWRITE_LEGACY(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
- AM_RANGE(0x1c0000, 0x1c0001) AM_READ_LEGACY(toaplan1_frame_done_r)
+ AM_RANGE(0x180000, 0x180001) AM_WRITE(toaplan1_bcu_flipscreen_w)
+ AM_RANGE(0x180002, 0x180003) AM_READWRITE(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
+ AM_RANGE(0x180004, 0x180007) AM_READWRITE(toaplan1_tileram16_r, toaplan1_tileram16_w)
+ AM_RANGE(0x180010, 0x18001f) AM_READWRITE(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
+ AM_RANGE(0x1c0000, 0x1c0001) AM_READ(toaplan1_frame_done_r)
// AM_RANGE(0x1c0000, 0x1c0001) AM_WRITE_LEGACY(?? disable sprite refresh ??)
- AM_RANGE(0x1c0002, 0x1c0003) AM_READWRITE_LEGACY(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
- AM_RANGE(0x1c0004, 0x1c0005) AM_READWRITE_LEGACY(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
- AM_RANGE(0x1c0006, 0x1c0007) AM_READWRITE_LEGACY(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
+ AM_RANGE(0x1c0002, 0x1c0003) AM_READWRITE(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
+ AM_RANGE(0x1c0004, 0x1c0005) AM_READWRITE(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
+ AM_RANGE(0x1c0006, 0x1c0007) AM_READWRITE(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( outzone_main_map, AS_PROGRAM, 16, toaplan1_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x100000, 0x100001) AM_READ_LEGACY(toaplan1_frame_done_r)
- AM_RANGE(0x100002, 0x100003) AM_READWRITE_LEGACY(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
- AM_RANGE(0x100004, 0x100005) AM_READWRITE_LEGACY(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
- AM_RANGE(0x100006, 0x100007) AM_READWRITE_LEGACY(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
- AM_RANGE(0x140000, 0x140fff) AM_READWRITE_LEGACY(toaplan1_shared_r, toaplan1_shared_w)
- AM_RANGE(0x200000, 0x200001) AM_WRITE_LEGACY(toaplan1_bcu_flipscreen_w)
- AM_RANGE(0x200002, 0x200003) AM_READWRITE_LEGACY(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
- AM_RANGE(0x200004, 0x200007) AM_READWRITE_LEGACY(toaplan1_tileram16_r, toaplan1_tileram16_w)
- AM_RANGE(0x200010, 0x20001f) AM_READWRITE_LEGACY(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
+ AM_RANGE(0x100000, 0x100001) AM_READ(toaplan1_frame_done_r)
+ AM_RANGE(0x100002, 0x100003) AM_READWRITE(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
+ AM_RANGE(0x100004, 0x100005) AM_READWRITE(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
+ AM_RANGE(0x100006, 0x100007) AM_READWRITE(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
+ AM_RANGE(0x140000, 0x140fff) AM_READWRITE(toaplan1_shared_r, toaplan1_shared_w)
+ AM_RANGE(0x200000, 0x200001) AM_WRITE(toaplan1_bcu_flipscreen_w)
+ AM_RANGE(0x200002, 0x200003) AM_READWRITE(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
+ AM_RANGE(0x200004, 0x200007) AM_READWRITE(toaplan1_tileram16_r, toaplan1_tileram16_w)
+ AM_RANGE(0x200010, 0x20001f) AM_READWRITE(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
AM_RANGE(0x240000, 0x243fff) AM_RAM
AM_RANGE(0x300000, 0x300001) AM_READ_PORT("VBLANK")
// AM_RANGE(0x300000, 0x300001) AM_WRITE_LEGACY(?? video frame related ??)
- AM_RANGE(0x300002, 0x300003) AM_WRITE_LEGACY(toaplan1_intenable_w)
- AM_RANGE(0x300008, 0x30000f) AM_WRITE_LEGACY(toaplan1_bcu_control_w)
- AM_RANGE(0x304000, 0x3047ff) AM_READWRITE_LEGACY(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
- AM_RANGE(0x306000, 0x3067ff) AM_READWRITE_LEGACY(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
- AM_RANGE(0x340000, 0x340003) AM_WRITE_LEGACY(toaplan1_tile_offsets_w)
- AM_RANGE(0x340006, 0x340007) AM_WRITE_LEGACY(toaplan1_fcu_flipscreen_w)
+ AM_RANGE(0x300002, 0x300003) AM_WRITE(toaplan1_intenable_w)
+ AM_RANGE(0x300008, 0x30000f) AM_WRITE(toaplan1_bcu_control_w)
+ AM_RANGE(0x304000, 0x3047ff) AM_READWRITE(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
+ AM_RANGE(0x306000, 0x3067ff) AM_READWRITE(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
+ AM_RANGE(0x340000, 0x340003) AM_WRITE(toaplan1_tile_offsets_w)
+ AM_RANGE(0x340006, 0x340007) AM_WRITE(toaplan1_fcu_flipscreen_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( vimana_main_map, AS_PROGRAM, 16, toaplan1_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x080000, 0x080003) AM_WRITE_LEGACY(toaplan1_tile_offsets_w)
- AM_RANGE(0x080006, 0x080007) AM_WRITE_LEGACY(toaplan1_fcu_flipscreen_w)
- AM_RANGE(0x0c0000, 0x0c0001) AM_READ_LEGACY(toaplan1_frame_done_r)
- AM_RANGE(0x0c0002, 0x0c0003) AM_READWRITE_LEGACY(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
- AM_RANGE(0x0c0004, 0x0c0005) AM_READWRITE_LEGACY(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
- AM_RANGE(0x0c0006, 0x0c0007) AM_READWRITE_LEGACY(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
+ AM_RANGE(0x080000, 0x080003) AM_WRITE(toaplan1_tile_offsets_w)
+ AM_RANGE(0x080006, 0x080007) AM_WRITE(toaplan1_fcu_flipscreen_w)
+ AM_RANGE(0x0c0000, 0x0c0001) AM_READ(toaplan1_frame_done_r)
+ AM_RANGE(0x0c0002, 0x0c0003) AM_READWRITE(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
+ AM_RANGE(0x0c0004, 0x0c0005) AM_READWRITE(toaplan1_spriteram16_r, toaplan1_spriteram16_w)
+ AM_RANGE(0x0c0006, 0x0c0007) AM_READWRITE(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("VBLANK")
// AM_RANGE(0x400000, 0x400001) AM_WRITE_LEGACY(?? video frame related ??)
- AM_RANGE(0x400002, 0x400003) AM_WRITE_LEGACY(toaplan1_intenable_w)
- AM_RANGE(0x400008, 0x40000f) AM_WRITE_LEGACY(toaplan1_bcu_control_w)
- AM_RANGE(0x404000, 0x4047ff) AM_READWRITE_LEGACY(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
- AM_RANGE(0x406000, 0x4067ff) AM_READWRITE_LEGACY(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
- AM_RANGE(0x440000, 0x440005) AM_READWRITE_LEGACY(vimana_mcu_r, vimana_mcu_w) /* shared memory from 0x440000 to 0x44ffff ? */
+ AM_RANGE(0x400002, 0x400003) AM_WRITE(toaplan1_intenable_w)
+ AM_RANGE(0x400008, 0x40000f) AM_WRITE(toaplan1_bcu_control_w)
+ AM_RANGE(0x404000, 0x4047ff) AM_READWRITE(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE_SIZE(m_colorram1, m_colorram1_size)
+ AM_RANGE(0x406000, 0x4067ff) AM_READWRITE(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE_SIZE(m_colorram2, m_colorram2_size)
+ AM_RANGE(0x440000, 0x440005) AM_READWRITE(vimana_mcu_r, vimana_mcu_w) /* shared memory from 0x440000 to 0x44ffff ? */
AM_RANGE(0x440006, 0x440007) AM_READ_PORT("DSWA")
- AM_RANGE(0x440008, 0x440009) AM_READ_LEGACY(vimana_system_port_r) /* "SYSTEM" + coinage simulation */
+ AM_RANGE(0x440008, 0x440009) AM_READ(vimana_system_port_r) /* "SYSTEM" + coinage simulation */
AM_RANGE(0x44000a, 0x44000b) AM_READ_PORT("P1")
AM_RANGE(0x44000c, 0x44000d) AM_READ_PORT("P2")
AM_RANGE(0x44000e, 0x44000f) AM_READ_PORT("DSWB")
AM_RANGE(0x440010, 0x440011) AM_READ_PORT("TJUMP")
AM_RANGE(0x480000, 0x487fff) AM_RAM
- AM_RANGE(0x4c0000, 0x4c0001) AM_WRITE_LEGACY(toaplan1_bcu_flipscreen_w)
- AM_RANGE(0x4c0002, 0x4c0003) AM_READWRITE_LEGACY(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
- AM_RANGE(0x4c0004, 0x4c0007) AM_READWRITE_LEGACY(toaplan1_tileram16_r, toaplan1_tileram16_w)
- AM_RANGE(0x4c0010, 0x4c001f) AM_READWRITE_LEGACY(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
+ AM_RANGE(0x4c0000, 0x4c0001) AM_WRITE(toaplan1_bcu_flipscreen_w)
+ AM_RANGE(0x4c0002, 0x4c0003) AM_READWRITE(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w)
+ AM_RANGE(0x4c0004, 0x4c0007) AM_READWRITE(toaplan1_tileram16_r, toaplan1_tileram16_w)
+ AM_RANGE(0x4c0010, 0x4c001f) AM_READWRITE(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w)
ADDRESS_MAP_END
@@ -576,7 +576,7 @@ static ADDRESS_MAP_START( rallybik_sound_io_map, AS_IO, 8, toaplan1_state )
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
AM_RANGE(0x10, 0x10) AM_READ_PORT("P2")
AM_RANGE(0x20, 0x20) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x30, 0x30) AM_WRITE_LEGACY(rallybik_coin_w) /* Coin counter/lockout */
+ AM_RANGE(0x30, 0x30) AM_WRITE(rallybik_coin_w) /* Coin counter/lockout */
AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWA")
AM_RANGE(0x50, 0x50) AM_READ_PORT("DSWB")
AM_RANGE(0x60, 0x61) AM_DEVREADWRITE_LEGACY("ymsnd", ym3812_r, ym3812_w)
@@ -587,7 +587,7 @@ static ADDRESS_MAP_START( truxton_sound_io_map, AS_IO, 8, toaplan1_state )
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
AM_RANGE(0x10, 0x10) AM_READ_PORT("P2")
AM_RANGE(0x20, 0x20) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x30, 0x30) AM_WRITE_LEGACY(toaplan1_coin_w) /* Coin counter/lockout */
+ AM_RANGE(0x30, 0x30) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */
AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWA")
AM_RANGE(0x50, 0x50) AM_READ_PORT("DSWB")
AM_RANGE(0x60, 0x61) AM_DEVREADWRITE_LEGACY("ymsnd", ym3812_r, ym3812_w)
@@ -599,7 +599,7 @@ static ADDRESS_MAP_START( hellfire_sound_io_map, AS_IO, 8, toaplan1_state )
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSWA")
AM_RANGE(0x10, 0x10) AM_READ_PORT("DSWB")
AM_RANGE(0x20, 0x20) AM_READ_PORT("TJUMP")
- AM_RANGE(0x30, 0x30) AM_WRITE_LEGACY(toaplan1_coin_w) /* Coin counter/lockout */
+ AM_RANGE(0x30, 0x30) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */
AM_RANGE(0x40, 0x40) AM_READ_PORT("P1")
AM_RANGE(0x50, 0x50) AM_READ_PORT("P2")
AM_RANGE(0x60, 0x60) AM_READ_PORT("SYSTEM")
@@ -614,7 +614,7 @@ static ADDRESS_MAP_START( zerowing_sound_io_map, AS_IO, 8, toaplan1_state )
AM_RANGE(0x28, 0x28) AM_READ_PORT("DSWB")
AM_RANGE(0x80, 0x80) AM_READ_PORT("SYSTEM")
AM_RANGE(0x88, 0x88) AM_READ_PORT("TJUMP")
- AM_RANGE(0xa0, 0xa0) AM_WRITE_LEGACY(toaplan1_coin_w) /* Coin counter/lockout */
+ AM_RANGE(0xa0, 0xa0) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */
AM_RANGE(0xa8, 0xa9) AM_DEVREADWRITE_LEGACY("ymsnd", ym3812_r, ym3812_w)
ADDRESS_MAP_END
@@ -622,7 +622,7 @@ static ADDRESS_MAP_START( demonwld_sound_io_map, AS_IO, 8, toaplan1_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym3812_r, ym3812_w)
AM_RANGE(0x20, 0x20) AM_READ_PORT("TJUMP")
- AM_RANGE(0x40, 0x40) AM_WRITE_LEGACY(toaplan1_coin_w) /* Coin counter/lockout */
+ AM_RANGE(0x40, 0x40) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */
AM_RANGE(0x60, 0x60) AM_READ_PORT("SYSTEM")
AM_RANGE(0x80, 0x80) AM_READ_PORT("P1")
AM_RANGE(0xa0, 0xa0) AM_READ_PORT("DSWB")
@@ -633,7 +633,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( outzone_sound_io_map, AS_IO, 8, toaplan1_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym3812_r, ym3812_w)
- AM_RANGE(0x04, 0x04) AM_WRITE_LEGACY(toaplan1_coin_w) /* Coin counter/lockout */
+ AM_RANGE(0x04, 0x04) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */
AM_RANGE(0x08, 0x08) AM_READ_PORT("DSWA")
AM_RANGE(0x0c, 0x0c) AM_READ_PORT("DSWB")
AM_RANGE(0x10, 0x10) AM_READ_PORT("SYSTEM")
@@ -652,10 +652,10 @@ ADDRESS_MAP_END
/* $000 - 08F TMS32010 Internal Data RAM in Data Address Space */
static ADDRESS_MAP_START( DSP_io_map, AS_IO, 16, toaplan1_state )
- AM_RANGE(0, 0) AM_WRITE_LEGACY(demonwld_dsp_addrsel_w)
- AM_RANGE(1, 1) AM_READWRITE_LEGACY(demonwld_dsp_r, demonwld_dsp_w)
- AM_RANGE(3, 3) AM_WRITE_LEGACY(demonwld_dsp_bio_w)
- AM_RANGE(TMS32010_BIO, TMS32010_BIO) AM_READ_LEGACY(demonwld_BIO_r)
+ AM_RANGE(0, 0) AM_WRITE(demonwld_dsp_addrsel_w)
+ AM_RANGE(1, 1) AM_READWRITE(demonwld_dsp_r, demonwld_dsp_w)
+ AM_RANGE(3, 3) AM_WRITE(demonwld_dsp_bio_w)
+ AM_RANGE(TMS32010_BIO, TMS32010_BIO) AM_READ(demonwld_BIO_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index f130bc74e03..b0ef8d92102 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -1115,12 +1115,12 @@ static ADDRESS_MAP_START( truxton2_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x20000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
AM_RANGE(0x300000, 0x300fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x400000, 0x401fff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
- AM_RANGE(0x402000, 0x4021ff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
+ AM_RANGE(0x400000, 0x401fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
+ AM_RANGE(0x402000, 0x4021ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
AM_RANGE(0x402200, 0x402fff) AM_RAM
- AM_RANGE(0x403000, 0x4031ff) AM_RAM_WRITE_LEGACY(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
+ AM_RANGE(0x403000, 0x4031ff) AM_RAM_WRITE(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
AM_RANGE(0x403200, 0x403fff) AM_RAM
- AM_RANGE(0x500000, 0x50ffff) AM_RAM_WRITE_LEGACY(toaplan2_tx_gfxram16_w) AM_BASE(m_tx_gfxram16)
+ AM_RANGE(0x500000, 0x50ffff) AM_RAM_WRITE(toaplan2_tx_gfxram16_w) AM_BASE(m_tx_gfxram16)
AM_RANGE(0x600000, 0x600001) AM_READ(video_count_r)
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSWA")
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSWB")
@@ -1183,10 +1183,10 @@ static ADDRESS_MAP_START( fixeight_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x280000, 0x28ffff) AM_READWRITE(shared_ram_r, shared_ram_w )
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
- AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
- AM_RANGE(0x503000, 0x5031ff) AM_RAM_WRITE_LEGACY(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
- AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE_LEGACY(toaplan2_tx_gfxram16_w) AM_BASE(m_tx_gfxram16)
+ AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
+ AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
+ AM_RANGE(0x503000, 0x5031ff) AM_RAM_WRITE(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
+ AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(toaplan2_tx_gfxram16_w) AM_BASE(m_tx_gfxram16)
AM_RANGE(0x700000, 0x700001) AM_WRITE(fixeight_subcpu_ctrl_w)
AM_RANGE(0x800000, 0x800001) AM_READ(video_count_r)
ADDRESS_MAP_END
@@ -1205,9 +1205,9 @@ static ADDRESS_MAP_START( fixeightbl_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x20001c, 0x20001d) AM_READ_PORT("DSWA")
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
- AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
- AM_RANGE(0x503000, 0x5031ff) AM_RAM_WRITE_LEGACY(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
+ AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
+ AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
+ AM_RANGE(0x503000, 0x5031ff) AM_RAM_WRITE(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
AM_RANGE(0x700000, 0x700001) AM_READ(video_count_r)
AM_RANGE(0x800000, 0x87ffff) AM_ROM AM_REGION("maincpu", 0x80000)
ADDRESS_MAP_END
@@ -1278,10 +1278,10 @@ static ADDRESS_MAP_START( mahoudai_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x401000, 0x4017ff) AM_RAM // Unused palette RAM
- AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
- AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
+ AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
+ AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
AM_RANGE(0x502200, 0x502fff) AM_RAM
- AM_RANGE(0x503000, 0x5031ff) AM_RAM_WRITE_LEGACY(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
+ AM_RANGE(0x503000, 0x5031ff) AM_RAM_WRITE(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
AM_RANGE(0x503200, 0x503fff) AM_RAM
ADDRESS_MAP_END
@@ -1302,10 +1302,10 @@ static ADDRESS_MAP_START( shippumd_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x401000, 0x4017ff) AM_RAM // Unused palette RAM
- AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
- AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
+ AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
+ AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
AM_RANGE(0x502200, 0x502fff) AM_RAM
- AM_RANGE(0x503000, 0x5031ff) AM_RAM_WRITE_LEGACY(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
+ AM_RANGE(0x503000, 0x5031ff) AM_RAM_WRITE(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
AM_RANGE(0x503200, 0x503fff) AM_RAM
ADDRESS_MAP_END
@@ -1324,10 +1324,10 @@ static ADDRESS_MAP_START( bgaregga_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x21c03c, 0x21c03d) AM_READ(video_count_r)
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
- AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
+ AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
+ AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
AM_RANGE(0x502200, 0x502fff) AM_RAM
- AM_RANGE(0x503000, 0x5031ff) AM_RAM_WRITE_LEGACY(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
+ AM_RANGE(0x503000, 0x5031ff) AM_RAM_WRITE(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
AM_RANGE(0x503200, 0x503fff) AM_RAM
AM_RANGE(0x600000, 0x600001) AM_WRITE(bgaregga_soundlatch_w)
ADDRESS_MAP_END
@@ -1336,10 +1336,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( batrider_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
// actually 200000 - 20ffff is probably all main RAM, and the text and palette RAM are written via DMA
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
AM_RANGE(0x202000, 0x202fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") AM_SIZE(m_paletteram_size)
- AM_RANGE(0x203000, 0x2031ff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
- AM_RANGE(0x203200, 0x2033ff) AM_RAM_WRITE_LEGACY(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
+ AM_RANGE(0x203000, 0x2031ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
+ AM_RANGE(0x203200, 0x2033ff) AM_RAM_WRITE(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
AM_RANGE(0x203400, 0x207fff) AM_RAM AM_BASE_SIZE(m_mainram16, m_mainram_overlap_size)
AM_RANGE(0x208000, 0x20ffff) AM_RAM
AM_RANGE(0x300000, 0x37ffff) AM_READ(batrider_z80rom_r)
@@ -1357,19 +1357,19 @@ static ADDRESS_MAP_START( batrider_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x500024, 0x500025) AM_WRITE(batrider_unknown_sound_w)
AM_RANGE(0x500026, 0x500027) AM_WRITE(batrider_clear_sndirq_w)
AM_RANGE(0x500060, 0x500061) AM_WRITE(batrider_z80_busreq_w)
- AM_RANGE(0x500080, 0x500081) AM_WRITE_LEGACY(batrider_textdata_dma_w)
- AM_RANGE(0x500082, 0x500083) AM_WRITE_LEGACY(batrider_unknown_dma_w)
- AM_RANGE(0x5000c0, 0x5000cf) AM_WRITE_LEGACY(batrider_objectbank_w)
+ AM_RANGE(0x500080, 0x500081) AM_WRITE(batrider_textdata_dma_w)
+ AM_RANGE(0x500082, 0x500083) AM_WRITE(batrider_unknown_dma_w)
+ AM_RANGE(0x5000c0, 0x5000cf) AM_WRITE(batrider_objectbank_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bbakraid_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
// actually 200000 - 20ffff is probably all main RAM, and the text and palette RAM are written via DMA
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
AM_RANGE(0x202000, 0x202fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") AM_SIZE(m_paletteram_size)
- AM_RANGE(0x203000, 0x2031ff) AM_RAM_WRITE_LEGACY(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
- AM_RANGE(0x203200, 0x2033ff) AM_RAM_WRITE_LEGACY(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
+ AM_RANGE(0x203000, 0x2031ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
+ AM_RANGE(0x203200, 0x2033ff) AM_RAM_WRITE(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
AM_RANGE(0x203400, 0x207fff) AM_RAM AM_BASE_SIZE(m_mainram16, m_mainram_overlap_size)
AM_RANGE(0x208000, 0x20ffff) AM_RAM
AM_RANGE(0x300000, 0x33ffff) AM_READ(batrider_z80rom_r)
@@ -1387,9 +1387,9 @@ static ADDRESS_MAP_START( bbakraid_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x50001a, 0x50001b) AM_WRITE(batrider_unknown_sound_w)
AM_RANGE(0x50001c, 0x50001d) AM_WRITE(batrider_clear_sndirq_w)
AM_RANGE(0x50001e, 0x50001f) AM_WRITE(bbakraid_eeprom_w)
- AM_RANGE(0x500080, 0x500081) AM_WRITE_LEGACY(batrider_textdata_dma_w)
- AM_RANGE(0x500082, 0x500083) AM_WRITE_LEGACY(batrider_unknown_dma_w)
- AM_RANGE(0x5000c0, 0x5000cf) AM_WRITE_LEGACY(batrider_objectbank_w)
+ AM_RANGE(0x500080, 0x500081) AM_WRITE(batrider_textdata_dma_w)
+ AM_RANGE(0x500082, 0x500083) AM_WRITE(batrider_unknown_dma_w)
+ AM_RANGE(0x5000c0, 0x5000cf) AM_WRITE(batrider_objectbank_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index d10808af6f8..b1a3ddf2a3a 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -94,11 +94,11 @@ static ADDRESS_MAP_START( toki_map, AS_PROGRAM, 16, toki_state )
AM_RANGE(0x060000, 0x06d7ff) AM_RAM
AM_RANGE(0x06d800, 0x06dfff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x06e000, 0x06e7ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x06e800, 0x06efff) AM_RAM_WRITE_LEGACY(toki_background1_videoram16_w) AM_BASE(m_background1_videoram16)
- AM_RANGE(0x06f000, 0x06f7ff) AM_RAM_WRITE_LEGACY(toki_background2_videoram16_w) AM_BASE(m_background2_videoram16)
- AM_RANGE(0x06f800, 0x06ffff) AM_RAM_WRITE_LEGACY(toki_foreground_videoram16_w) AM_BASE(m_videoram)
+ AM_RANGE(0x06e800, 0x06efff) AM_RAM_WRITE(toki_background1_videoram16_w) AM_BASE(m_background1_videoram16)
+ AM_RANGE(0x06f000, 0x06f7ff) AM_RAM_WRITE(toki_background2_videoram16_w) AM_BASE(m_background2_videoram16)
+ AM_RANGE(0x06f800, 0x06ffff) AM_RAM_WRITE(toki_foreground_videoram16_w) AM_BASE(m_videoram)
AM_RANGE(0x080000, 0x08000d) AM_READWRITE_LEGACY(seibu_main_word_r, seibu_main_word_w)
- AM_RANGE(0x0a0000, 0x0a005f) AM_WRITE_LEGACY(toki_control_w) AM_BASE(m_scrollram16)
+ AM_RANGE(0x0a0000, 0x0a005f) AM_WRITE(toki_control_w) AM_BASE(m_scrollram16)
AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("DSW")
AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("INPUTS")
AM_RANGE(0x0c0004, 0x0c0005) AM_READ_PORT("SYSTEM")
@@ -109,9 +109,9 @@ static ADDRESS_MAP_START( tokib_map, AS_PROGRAM, 16, toki_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x06dfff) AM_RAM
AM_RANGE(0x06e000, 0x06e7ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x06e800, 0x06efff) AM_RAM_WRITE_LEGACY(toki_background1_videoram16_w) AM_BASE(m_background1_videoram16)
- AM_RANGE(0x06f000, 0x06f7ff) AM_RAM_WRITE_LEGACY(toki_background2_videoram16_w) AM_BASE(m_background2_videoram16)
- AM_RANGE(0x06f800, 0x06ffff) AM_RAM_WRITE_LEGACY(toki_foreground_videoram16_w) AM_BASE(m_videoram)
+ AM_RANGE(0x06e800, 0x06efff) AM_RAM_WRITE(toki_background1_videoram16_w) AM_BASE(m_background1_videoram16)
+ AM_RANGE(0x06f000, 0x06f7ff) AM_RAM_WRITE(toki_background2_videoram16_w) AM_BASE(m_background2_videoram16)
+ AM_RANGE(0x06f800, 0x06ffff) AM_RAM_WRITE(toki_foreground_videoram16_w) AM_BASE(m_videoram)
AM_RANGE(0x071000, 0x071001) AM_WRITENOP /* sprite related? seems another scroll register */
/* gets written the same value as 75000a (bg2 scrollx) */
AM_RANGE(0x071804, 0x071807) AM_WRITENOP /* sprite related, always 01be0100 */
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index 482cb20523f..5c2d367df64 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -187,7 +187,7 @@ WRITE16_MEMBER(toypop_state::toypop_m68000_interrupt_disable_w)
*************************************/
static ADDRESS_MAP_START( liblrabl_map, AS_PROGRAM, 8, toypop_state )
- AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE_LEGACY(toypop_videoram_w) AM_BASE(m_videoram) /* video RAM */
+ AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(toypop_videoram_w) AM_BASE(m_videoram) /* video RAM */
AM_RANGE(0x0800, 0x1fff) AM_RAM AM_BASE(m_spriteram) /* general RAM, area 1 */
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_BASE(m_m68000_sharedram) /* shared RAM with the 68000 CPU */
AM_RANGE(0x6000, 0x63ff) AM_DEVREADWRITE_LEGACY("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with sound CPU */
@@ -200,12 +200,12 @@ static ADDRESS_MAP_START( liblrabl_map, AS_PROGRAM, 8, toypop_state )
AM_RANGE(0x8800, 0x8800) AM_WRITE(toypop_m68000_assert_w) /* reset 68000 */
AM_RANGE(0x9000, 0x9000) AM_WRITE(toypop_sound_clear_w) /* sound CPU reset */
AM_RANGE(0x9800, 0x9800) AM_WRITE(toypop_sound_assert_w) /* sound CPU reset */
- AM_RANGE(0xa000, 0xa001) AM_WRITE_LEGACY(toypop_palettebank_w) /* background image palette */
+ AM_RANGE(0xa000, 0xa001) AM_WRITE(toypop_palettebank_w) /* background image palette */
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM code */
ADDRESS_MAP_END
static ADDRESS_MAP_START( toypop_map, AS_PROGRAM, 8, toypop_state )
- AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE_LEGACY(toypop_videoram_w) AM_BASE(m_videoram) /* video RAM */
+ AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(toypop_videoram_w) AM_BASE(m_videoram) /* video RAM */
AM_RANGE(0x0800, 0x1fff) AM_RAM AM_BASE(m_spriteram) /* general RAM, area 1 */
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_BASE(m_m68000_sharedram) /* shared RAM with the 68000 CPU */
AM_RANGE(0x6000, 0x600f) AM_DEVREADWRITE_LEGACY("58xx", namcoio_r, namcoio_w) /* custom I/O */
@@ -217,7 +217,7 @@ static ADDRESS_MAP_START( toypop_map, AS_PROGRAM, 8, toypop_state )
AM_RANGE(0x8800, 0x8800) AM_WRITE(toypop_m68000_assert_w) /* reset 68000 */
AM_RANGE(0x9000, 0x9000) AM_WRITE(toypop_sound_clear_w) /* sound CPU reset */
AM_RANGE(0x9800, 0x9800) AM_WRITE(toypop_sound_assert_w) /* sound CPU reset */
- AM_RANGE(0xa000, 0xa001) AM_WRITE_LEGACY(toypop_palettebank_w) /* background image palette */
+ AM_RANGE(0xa000, 0xa001) AM_WRITE(toypop_palettebank_w) /* background image palette */
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM code */
ADDRESS_MAP_END
@@ -248,8 +248,8 @@ static ADDRESS_MAP_START( m68k_map, AS_PROGRAM, 16, toypop_state )
AM_RANGE(0x000000, 0x007fff) AM_ROM /* ROM code */
AM_RANGE(0x080000, 0x0bffff) AM_RAM /* RAM */
AM_RANGE(0x100000, 0x100fff) AM_READWRITE(toypop_m68000_sharedram_r, toypop_m68000_sharedram_w) /* shared RAM with the main CPU */
- AM_RANGE(0x180000, 0x187fff) AM_READWRITE_LEGACY(toypop_merged_background_r, toypop_merged_background_w) /* RAM that has to be merged with the background image */
- AM_RANGE(0x18fffc, 0x18ffff) AM_WRITE_LEGACY(toypop_flipscreen_w) /* flip mode */
+ AM_RANGE(0x180000, 0x187fff) AM_READWRITE(toypop_merged_background_r, toypop_merged_background_w) /* RAM that has to be merged with the background image */
+ AM_RANGE(0x18fffc, 0x18ffff) AM_WRITE(toypop_flipscreen_w) /* flip mode */
AM_RANGE(0x190000, 0x1dffff) AM_RAM AM_BASE(m_bg_image) /* RAM containing the background image */
AM_RANGE(0x300000, 0x300001) AM_WRITE(toypop_m68000_interrupt_enable_w) /* interrupt enable */
AM_RANGE(0x380000, 0x380001) AM_WRITE(toypop_m68000_interrupt_disable_w)/* interrupt disable */
diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c
index f6cf3db8721..91db77cfba7 100644
--- a/src/mame/drivers/tp84.c
+++ b/src/mame/drivers/tp84.c
@@ -177,10 +177,10 @@ WRITE8_MEMBER(tp84_state::sub_irq_mask_w)
static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8, tp84_state )
// AM_RANGE(0x0000, 0x0000) AM_RAM /* Watch dog ?*/
- AM_RANGE(0x2000, 0x2000) AM_READ_LEGACY(tp84_scanline_r) /* beam position */
+ AM_RANGE(0x2000, 0x2000) AM_READ(tp84_scanline_r) /* beam position */
AM_RANGE(0x4000, 0x4000) AM_WRITE(sub_irq_mask_w)
AM_RANGE(0x6000, 0x679f) AM_RAM
- AM_RANGE(0x67a0, 0x67ff) AM_RAM_WRITE_LEGACY(tp84_spriteram_w) AM_BASE(m_spriteram)
+ AM_RANGE(0x67a0, 0x67ff) AM_RAM_WRITE(tp84_spriteram_w) AM_BASE(m_spriteram)
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index 8a583ee474a..4a0e5e29df1 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -225,7 +225,7 @@ WRITE8_MEMBER(trackfld_state::irq_mask_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, trackfld_state )
AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x007f) AM_WRITE(watchdog_reset_w) /* AFE */
- AM_RANGE(0x1080, 0x1080) AM_MIRROR(0x0078) AM_WRITE_LEGACY(trackfld_flipscreen_w) /* FLIP */
+ AM_RANGE(0x1080, 0x1080) AM_MIRROR(0x0078) AM_WRITE(trackfld_flipscreen_w) /* FLIP */
AM_RANGE(0x1081, 0x1081) AM_MIRROR(0x0078) AM_WRITE_LEGACY(konami_sh_irqtrigger_w) /* 26 */ /* cause interrupt on audio CPU */
AM_RANGE(0x1082, 0x1082) AM_MIRROR(0x0078) AM_WRITENOP /* 25 */
AM_RANGE(0x1083, 0x1084) AM_MIRROR(0x0078) AM_WRITE(coin_w) /* 24, 23 */
@@ -246,8 +246,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, trackfld_state )
AM_RANGE(0x1c40, 0x1c5f) AM_RAM AM_BASE(m_scroll2)
AM_RANGE(0x1c60, 0x1fff) AM_RAM
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE_LEGACY(trackfld_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE_LEGACY(trackfld_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(trackfld_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE(trackfld_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -264,7 +264,7 @@ static ADDRESS_MAP_START( yieartf_map, AS_PROGRAM, 8, trackfld_state )
AM_RANGE(0x0002, 0x0002) AM_DEVWRITE_LEGACY("vlm", yiear_VLM5030_control_w)
AM_RANGE(0x0003, 0x0003) AM_DEVWRITE_LEGACY("vlm", vlm5030_data_w)
AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x007f) AM_WRITE(watchdog_reset_w) /* AFE */
- AM_RANGE(0x1080, 0x1080) AM_MIRROR(0x0078) AM_WRITE_LEGACY(trackfld_flipscreen_w) /* FLIP */
+ AM_RANGE(0x1080, 0x1080) AM_MIRROR(0x0078) AM_WRITE(trackfld_flipscreen_w) /* FLIP */
AM_RANGE(0x1081, 0x1081) AM_MIRROR(0x0078) AM_WRITE_LEGACY(konami_sh_irqtrigger_w) /* 26 */ /* cause interrupt on audio CPU */
AM_RANGE(0x1082, 0x1082) AM_MIRROR(0x0078) AM_WRITE(yieartf_nmi_mask_w) /* 25 */
AM_RANGE(0x1083, 0x1084) AM_MIRROR(0x0078) AM_WRITE(coin_w) /* 24, 23 */
@@ -285,8 +285,8 @@ static ADDRESS_MAP_START( yieartf_map, AS_PROGRAM, 8, trackfld_state )
AM_RANGE(0x1c40, 0x1c5f) AM_RAM AM_BASE(m_scroll2)
AM_RANGE(0x1c60, 0x1fff) AM_RAM
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE_LEGACY(trackfld_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE_LEGACY(trackfld_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(trackfld_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE(trackfld_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -294,7 +294,7 @@ static ADDRESS_MAP_START( reaktor_map, AS_PROGRAM, 8, trackfld_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
/* all usual addresses +0x8000 */
AM_RANGE(0x9000, 0x9000) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x9080, 0x9080) AM_WRITE_LEGACY(trackfld_flipscreen_w)
+ AM_RANGE(0x9080, 0x9080) AM_WRITE(trackfld_flipscreen_w)
AM_RANGE(0x9081, 0x9081) AM_WRITE_LEGACY(konami_sh_irqtrigger_w) /* cause interrupt on audio CPU */
AM_RANGE(0x9083, 0x9084) AM_WRITE(coin_w)
AM_RANGE(0x9087, 0x9087) AM_WRITE(irq_mask_w)
@@ -312,8 +312,8 @@ static ADDRESS_MAP_START( reaktor_map, AS_PROGRAM, 8, trackfld_state )
AM_RANGE(0x9c60, 0x9fff) AM_RAM
AM_RANGE(0xa800, 0xabff) AM_RAM
AM_RANGE(0xac00, 0xafff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0xb000, 0xb7ff) AM_RAM_WRITE_LEGACY(trackfld_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xb800, 0xbfff) AM_RAM_WRITE_LEGACY(trackfld_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xb000, 0xb7ff) AM_RAM_WRITE(trackfld_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xb800, 0xbfff) AM_RAM_WRITE(trackfld_colorram_w) AM_BASE(m_colorram)
ADDRESS_MAP_END
/* Reaktor reads / writes some I/O ports, no idea what they're connected to, if anything */
@@ -327,7 +327,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mastkin_map, AS_PROGRAM, 8, trackfld_state )
AM_RANGE(0x1000, 0x1000) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x10b0, 0x10b0) AM_WRITE_LEGACY(trackfld_flipscreen_w)
+ AM_RANGE(0x10b0, 0x10b0) AM_WRITE(trackfld_flipscreen_w)
AM_RANGE(0x10b1, 0x10b1) AM_READNOP AM_WRITE_LEGACY(konami_sh_irqtrigger_w)
AM_RANGE(0x10b3, 0x10b4) AM_WRITE(coin_w) // actually not used
AM_RANGE(0x10b7, 0x10b7) AM_READNOP AM_WRITE(irq_mask_w)
@@ -346,15 +346,15 @@ static ADDRESS_MAP_START( mastkin_map, AS_PROGRAM, 8, trackfld_state )
AM_RANGE(0x2000, 0x27ff) AM_RAM // initialized at POST
AM_RANGE(0x2800, 0x2bff) AM_RAM
AM_RANGE(0x2c00, 0x2fff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE_LEGACY(trackfld_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE_LEGACY(trackfld_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(trackfld_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE(trackfld_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( wizzquiz_map, AS_PROGRAM, 8, trackfld_state )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x1000, 0x1000) AM_READWRITE(watchdog_reset_r, watchdog_reset_w)
- AM_RANGE(0x1080, 0x1080) AM_WRITE_LEGACY(trackfld_flipscreen_w)
+ AM_RANGE(0x1080, 0x1080) AM_WRITE(trackfld_flipscreen_w)
AM_RANGE(0x1081, 0x1081) AM_WRITE_LEGACY(konami_sh_irqtrigger_w) /* cause interrupt on audio CPU */
AM_RANGE(0x1083, 0x1084) AM_WRITE(coin_w)
AM_RANGE(0x1087, 0x1087) AM_WRITE(irq_mask_w)
@@ -372,8 +372,8 @@ static ADDRESS_MAP_START( wizzquiz_map, AS_PROGRAM, 8, trackfld_state )
AM_RANGE(0x1c60, 0x1fff) AM_RAM
AM_RANGE(0x2800, 0x2bff) AM_RAM
AM_RANGE(0x2c00, 0x2fff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE_LEGACY(trackfld_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE_LEGACY(trackfld_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(trackfld_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE(trackfld_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xc000, 0xc000) AM_WRITE(questions_bank_w)
AM_RANGE(0x6000, 0xdfff) AM_ROMBANK("bank1")
AM_RANGE(0xe000, 0xffff) AM_ROM
@@ -1437,7 +1437,8 @@ static DRIVER_INIT( atlantol )
space->set_decrypted_region(0x0000, 0xffff, decrypt);
- space->install_legacy_write_handler(0x0800, 0x0800, FUNC(atlantol_gfxbank_w));
+ trackfld_state *state = machine.driver_data<trackfld_state>();
+ space->install_write_handler(0x0800, 0x0800, write8_delegate(FUNC(trackfld_state::atlantol_gfxbank_w),state));
space->nop_write(0x1000, 0x1000);
/* unmapped areas read as ROM */
diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c
index c6cbeff6acc..982a0f2614c 100644
--- a/src/mame/drivers/travrusa.c
+++ b/src/mame/drivers/travrusa.c
@@ -55,12 +55,12 @@ and 2764 eprom (swapped D3/D4 and D5/D6 data lines)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, travrusa_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE_LEGACY(travrusa_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x9000, 0x9000) AM_WRITE_LEGACY(travrusa_scroll_x_low_w)
- AM_RANGE(0xa000, 0xa000) AM_WRITE_LEGACY(travrusa_scroll_x_high_w)
+ AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(travrusa_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x9000, 0x9000) AM_WRITE(travrusa_scroll_x_low_w)
+ AM_RANGE(0xa000, 0xa000) AM_WRITE(travrusa_scroll_x_high_w)
AM_RANGE(0xc800, 0xc9ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd000, 0xd000) AM_WRITE_LEGACY(irem_sound_cmd_w)
- AM_RANGE(0xd001, 0xd001) AM_WRITE_LEGACY(travrusa_flipscreen_w) /* + coin counters - not written by shtrider */
+ AM_RANGE(0xd001, 0xd001) AM_WRITE(travrusa_flipscreen_w) /* + coin counters - not written by shtrider */
AM_RANGE(0xd000, 0xd000) AM_READ_PORT("SYSTEM") /* IN0 */
AM_RANGE(0xd001, 0xd001) AM_READ_PORT("P1") /* IN1 */
AM_RANGE(0xd002, 0xd002) AM_READ_PORT("P2") /* IN2 */
diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c
index ec0c8551c93..ef1c7e380c7 100644
--- a/src/mame/drivers/trucocl.c
+++ b/src/mame/drivers/trucocl.c
@@ -81,8 +81,8 @@ static WRITE8_DEVICE_HANDLER( audio_dac_w )
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, trucocl_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE_LEGACY(trucocl_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x4400, 0x47ff) AM_RAM_WRITE_LEGACY(trucocl_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(trucocl_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4400, 0x47ff) AM_RAM_WRITE(trucocl_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x4c00, 0x4fff) AM_RAM
AM_RANGE(0x5000, 0x5000) AM_WRITE(irq_enable_w)
AM_RANGE(0x5000, 0x503f) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index 84e528a938e..c7322ddc84d 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -54,19 +54,19 @@ WRITE8_MEMBER(tryout_state::tryout_bankswitch_w)
static ADDRESS_MAP_START( main_cpu, AS_PROGRAM, 8, tryout_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM
- AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE_LEGACY(tryout_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE(tryout_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0xbfff) AM_ROM
AM_RANGE(0xc800, 0xc87f) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xcc00, 0xcc7f) AM_RAM AM_BASE(m_spriteram2)
- AM_RANGE(0xd000, 0xd7ff) AM_READWRITE_LEGACY(tryout_vram_r, tryout_vram_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(tryout_vram_r, tryout_vram_w)
AM_RANGE(0xe000, 0xe000) AM_READ_PORT("DSW")
AM_RANGE(0xe001, 0xe001) AM_READ_PORT("P1")
AM_RANGE(0xe002, 0xe002) AM_READ_PORT("P2")
AM_RANGE(0xe003, 0xe003) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xe301, 0xe301) AM_WRITE_LEGACY(tryout_flipscreen_w)
+ AM_RANGE(0xe301, 0xe301) AM_WRITE(tryout_flipscreen_w)
AM_RANGE(0xe302, 0xe302) AM_WRITE(tryout_bankswitch_w)
- AM_RANGE(0xe401, 0xe401) AM_WRITE_LEGACY(tryout_vram_bankswitch_w)
+ AM_RANGE(0xe401, 0xe401) AM_WRITE(tryout_vram_bankswitch_w)
AM_RANGE(0xe402, 0xe404) AM_WRITEONLY AM_BASE(m_gfx_control)
AM_RANGE(0xe414, 0xe414) AM_WRITE(tryout_sound_w)
AM_RANGE(0xe417, 0xe417) AM_WRITE(tryout_nmi_ack_w)
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index 862c2c7db31..74d1330fa6a 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -116,10 +116,10 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, tsamurai_state )
AM_RANGE(0xd900, 0xd900) AM_READ(unknown_d900_r)
AM_RANGE(0xd938, 0xd938) AM_READ(unknown_d938_r)
- AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE_LEGACY(tsamurai_fg_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xe400, 0xe43f) AM_RAM_WRITE_LEGACY(tsamurai_fg_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(tsamurai_fg_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe400, 0xe43f) AM_RAM_WRITE(tsamurai_fg_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xe440, 0xe7ff) AM_RAM
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(tsamurai_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(tsamurai_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0xf000, 0xf3ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xf400, 0xf400) AM_WRITENOP
@@ -127,15 +127,15 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, tsamurai_state )
AM_RANGE(0xf402, 0xf402) AM_WRITE(sound_command2_w)
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("P1")
- AM_RANGE(0xf801, 0xf801) AM_READ_PORT("P2") AM_WRITE_LEGACY(tsamurai_bgcolor_w)
- AM_RANGE(0xf802, 0xf802) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(tsamurai_scrolly_w)
- AM_RANGE(0xf803, 0xf803) AM_WRITE_LEGACY(tsamurai_scrollx_w)
+ AM_RANGE(0xf801, 0xf801) AM_READ_PORT("P2") AM_WRITE(tsamurai_bgcolor_w)
+ AM_RANGE(0xf802, 0xf802) AM_READ_PORT("SYSTEM") AM_WRITE(tsamurai_scrolly_w)
+ AM_RANGE(0xf803, 0xf803) AM_WRITE(tsamurai_scrollx_w)
AM_RANGE(0xf804, 0xf804) AM_READ_PORT("DSW1")
AM_RANGE(0xf805, 0xf805) AM_READ_PORT("DSW2")
AM_RANGE(0xfc00, 0xfc00) AM_WRITE(flip_screen_w)
AM_RANGE(0xfc01, 0xfc01) AM_WRITE(nmi_enable_w)
- AM_RANGE(0xfc02, 0xfc02) AM_WRITE_LEGACY(tsamurai_textbank1_w)
+ AM_RANGE(0xfc02, 0xfc02) AM_WRITE(tsamurai_textbank1_w)
AM_RANGE(0xfc03, 0xfc04) AM_WRITE(tsamurai_coin_counter_w)
ADDRESS_MAP_END
@@ -149,10 +149,10 @@ static ADDRESS_MAP_START( m660_map, AS_PROGRAM, 8, tsamurai_state )
AM_RANGE(0xd900, 0xd900) AM_READ(unknown_d900_r)
AM_RANGE(0xd938, 0xd938) AM_READ(unknown_d938_r)
- AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE_LEGACY(tsamurai_fg_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xe400, 0xe43f) AM_RAM_WRITE_LEGACY(tsamurai_fg_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(tsamurai_fg_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe400, 0xe43f) AM_RAM_WRITE(tsamurai_fg_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xe440, 0xe7ff) AM_RAM
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE_LEGACY(tsamurai_bg_videoram_w) AM_BASE(m_bg_videoram)
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(tsamurai_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0xf000, 0xf3ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xf400, 0xf400) AM_WRITENOP/* This is always written with F401, F402 & F403 data */
@@ -161,17 +161,17 @@ static ADDRESS_MAP_START( m660_map, AS_PROGRAM, 8, tsamurai_state )
AM_RANGE(0xf403, 0xf403) AM_WRITE(sound_command1_w)
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("P1")
- AM_RANGE(0xf801, 0xf801) AM_READ_PORT("P2") AM_WRITE_LEGACY(tsamurai_bgcolor_w)
- AM_RANGE(0xf802, 0xf802) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(tsamurai_scrolly_w)
- AM_RANGE(0xf803, 0xf803) AM_WRITE_LEGACY(tsamurai_scrollx_w)
+ AM_RANGE(0xf801, 0xf801) AM_READ_PORT("P2") AM_WRITE(tsamurai_bgcolor_w)
+ AM_RANGE(0xf802, 0xf802) AM_READ_PORT("SYSTEM") AM_WRITE(tsamurai_scrolly_w)
+ AM_RANGE(0xf803, 0xf803) AM_WRITE(tsamurai_scrollx_w)
AM_RANGE(0xf804, 0xf804) AM_READ_PORT("DSW1")
AM_RANGE(0xf805, 0xf805) AM_READ_PORT("DSW2")
AM_RANGE(0xfc00, 0xfc00) AM_WRITE(flip_screen_w)
AM_RANGE(0xfc01, 0xfc01) AM_WRITE(nmi_enable_w)
- AM_RANGE(0xfc02, 0xfc02) AM_WRITE_LEGACY(tsamurai_textbank1_w)
+ AM_RANGE(0xfc02, 0xfc02) AM_WRITE(tsamurai_textbank1_w)
AM_RANGE(0xfc03, 0xfc04) AM_WRITE(tsamurai_coin_counter_w)
- AM_RANGE(0xfc07, 0xfc07) AM_WRITE_LEGACY(tsamurai_textbank2_w)/* Mission 660 uses a bit here */
+ AM_RANGE(0xfc07, 0xfc07) AM_WRITE(tsamurai_textbank2_w)/* Mission 660 uses a bit here */
ADDRESS_MAP_END
static ADDRESS_MAP_START( z80_io_map, AS_IO, 8, tsamurai_state )
@@ -309,12 +309,12 @@ static ADDRESS_MAP_START( vsgongf_map, AS_PROGRAM, 8, tsamurai_state )
AM_RANGE(0xa006, 0xa006) AM_READ(vsgongf_a006_r) /* protection */
AM_RANGE(0xa100, 0xa100) AM_READ(vsgongf_a100_r) /* protection */
AM_RANGE(0xc000, 0xc7ff) AM_RAM /* work ram */
- AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE_LEGACY(tsamurai_fg_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(tsamurai_fg_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xe400, 0xe43f) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xe440, 0xe47b) AM_RAM
AM_RANGE(0xe800, 0xe800) AM_WRITE(vsgongf_sound_command_w)
AM_RANGE(0xec00, 0xec06) AM_WRITEONLY
- AM_RANGE(0xf000, 0xf000) AM_WRITE_LEGACY(vsgongf_color_w)
+ AM_RANGE(0xf000, 0xf000) AM_WRITE(vsgongf_color_w)
AM_RANGE(0xf400, 0xf400) AM_WRITEONLY /* vreg? always 0 */
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("P1")
AM_RANGE(0xf801, 0xf801) AM_READ_PORT("P2")
@@ -327,7 +327,7 @@ static ADDRESS_MAP_START( vsgongf_map, AS_PROGRAM, 8, tsamurai_state )
AM_RANGE(0xfc00, 0xfc00) AM_RAM /* vreg? always 0 */
AM_RANGE(0xfc01, 0xfc01) AM_RAM_WRITE(nmi_enable_w)
AM_RANGE(0xfc02, 0xfc03) AM_RAM_WRITE(tsamurai_coin_counter_w)
- AM_RANGE(0xfc04, 0xfc04) AM_RAM_WRITE_LEGACY(tsamurai_textbank1_w)
+ AM_RANGE(0xfc04, 0xfc04) AM_RAM_WRITE(tsamurai_textbank1_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_vsgongf_map, AS_PROGRAM, 8, tsamurai_state )
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index b3cf6124152..5c6867870a4 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -133,10 +133,10 @@ WRITE8_MEMBER(tubep_state::tubep_LS259_w)
//screen_flip_w(offset,data&1); /* bit 0 = screen flip, active high */
break;
case 6:
- tubep_background_romselect_w(&space,offset,data); /* bit0 = 0->select roms: B1,B3,B5; bit0 = 1->select roms: B2,B4,B6 */
+ tubep_background_romselect_w(space,offset,data); /* bit0 = 0->select roms: B1,B3,B5; bit0 = 1->select roms: B2,B4,B6 */
break;
case 7:
- tubep_colorproms_A4_line_w(&space,offset,data); /* bit0 = line A4 (color proms address) state */
+ tubep_colorproms_A4_line_w(space,offset,data); /* bit0 = line A4 (color proms address) state */
break;
default:
break;
@@ -147,7 +147,7 @@ WRITE8_MEMBER(tubep_state::tubep_LS259_w)
static ADDRESS_MAP_START( tubep_main_map, AS_PROGRAM, 8, tubep_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa7ff) AM_RAM
- AM_RANGE(0xc000, 0xc7ff) AM_WRITE_LEGACY(tubep_textram_w) AM_BASE(m_textram) /* RAM on GFX PCB @B13 */
+ AM_RANGE(0xc000, 0xc7ff) AM_WRITE(tubep_textram_w) AM_BASE(m_textram) /* RAM on GFX PCB @B13 */
AM_RANGE(0xe000, 0xe7ff) AM_WRITEONLY AM_SHARE("share1")
AM_RANGE(0xe800, 0xebff) AM_WRITEONLY AM_SHARE("share4") /* row of 8 x 2147 RAMs on main PCB */
ADDRESS_MAP_END
@@ -199,8 +199,8 @@ WRITE8_MEMBER(tubep_state::second_cpu_irq_line_clear_w)
static ADDRESS_MAP_START( tubep_second_map, AS_PROGRAM, 8, tubep_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0xa000, 0xa000) AM_WRITE_LEGACY(tubep_background_a000_w)
- AM_RANGE(0xc000, 0xc000) AM_WRITE_LEGACY(tubep_background_c000_w)
+ AM_RANGE(0xa000, 0xa000) AM_WRITE(tubep_background_a000_w)
+ AM_RANGE(0xc000, 0xc000) AM_WRITE(tubep_background_c000_w)
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("share1") /* 6116 #1 */
AM_RANGE(0xe800, 0xebff) AM_WRITEONLY AM_SHARE("share4") AM_BASE(m_backgroundram) /* row of 8 x 2147 RAMs on main PCB */
AM_RANGE(0xf000, 0xf3ff) AM_WRITEONLY AM_SHARE("share3") /* sprites color lookup table */
@@ -363,7 +363,7 @@ static MACHINE_RESET( tubep )
static ADDRESS_MAP_START( nsc_map, AS_PROGRAM, 8, tubep_state )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_SHARE("share3") AM_BASE(m_sprite_colorsharedram)
AM_RANGE(0x0800, 0x0fff) AM_RAM AM_SHARE("share2")
- AM_RANGE(0x2000, 0x2009) AM_WRITE_LEGACY(tubep_sprite_control_w)
+ AM_RANGE(0x2000, 0x2009) AM_WRITE(tubep_sprite_control_w)
AM_RANGE(0x200a, 0x200b) AM_WRITENOP /* not used by the games - perhaps designed for debugging */
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -403,7 +403,7 @@ WRITE8_MEMBER(tubep_state::rjammer_soundlatch_w)
static ADDRESS_MAP_START( rjammer_main_map, AS_PROGRAM, 8, tubep_state )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa7ff) AM_RAM /* MB8416 SRAM on daughterboard on main PCB (there are two SRAMs, this is the one on the left) */
- AM_RANGE(0xc000, 0xc7ff) AM_WRITE_LEGACY(tubep_textram_w) AM_BASE(m_textram)/* RAM on GFX PCB @B13 */
+ AM_RANGE(0xc000, 0xc7ff) AM_WRITE(tubep_textram_w) AM_BASE(m_textram)/* RAM on GFX PCB @B13 */
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("share1") /* MB8416 SRAM on daughterboard (the one on the right) */
ADDRESS_MAP_END
@@ -434,8 +434,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( rjammer_second_portmap, AS_IO, 8, tubep_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0xb0, 0xb0) AM_WRITE_LEGACY(rjammer_background_page_w)
- AM_RANGE(0xd0, 0xd0) AM_WRITE_LEGACY(rjammer_background_LS377_w)
+ AM_RANGE(0xb0, 0xb0) AM_WRITE(rjammer_background_page_w)
+ AM_RANGE(0xd0, 0xd0) AM_WRITE(rjammer_background_LS377_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index b730a793101..83f4550c192 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -332,12 +332,12 @@ WRITE16_MEMBER(tumbleb_state::tumblepb_oki_w)
okim6295_device *oki = machine().device<okim6295_device>("oki");
if (mem_mask == 0xffff)
{
- oki->write(*&space, 0, data & 0xff);
+ oki->write(space, 0, data & 0xff);
//printf("tumbleb_oki_w %04x %04x\n", data, mem_mask);
}
else
{
- oki->write(*&space, 0, (data >> 8) & 0xff);
+ oki->write(space, 0, (data >> 8) & 0xff);
//printf("tumbleb_oki_w %04x %04x\n", data, mem_mask);
}
/* STUFF IN OTHER BYTE TOO..*/
@@ -660,9 +660,9 @@ static ADDRESS_MAP_START( tumblepopb_main_map, AS_PROGRAM, 16, tumbleb_state )
AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r)
AM_RANGE(0x18000c, 0x18000d) AM_WRITENOP
AM_RANGE(0x1a0000, 0x1a07ff) AM_RAM
- AM_RANGE(0x300000, 0x30000f) AM_WRITE_LEGACY(tumblepb_control_0_w)
- AM_RANGE(0x320000, 0x320fff) AM_WRITE_LEGACY(tumblepb_pf1_data_w) AM_BASE(m_pf1_data)
- AM_RANGE(0x322000, 0x322fff) AM_WRITE_LEGACY(tumblepb_pf2_data_w) AM_BASE(m_pf2_data)
+ AM_RANGE(0x300000, 0x30000f) AM_WRITE(tumblepb_control_0_w)
+ AM_RANGE(0x320000, 0x320fff) AM_WRITE(tumblepb_pf1_data_w) AM_BASE(m_pf1_data)
+ AM_RANGE(0x322000, 0x322fff) AM_WRITE(tumblepb_pf2_data_w) AM_BASE(m_pf2_data)
AM_RANGE(0x340000, 0x3401ff) AM_WRITENOP /* Unused row scroll */
AM_RANGE(0x340400, 0x34047f) AM_WRITENOP /* Unused col scroll */
AM_RANGE(0x342000, 0x3421ff) AM_WRITENOP
@@ -682,9 +682,9 @@ static ADDRESS_MAP_START( fncywld_main_map, AS_PROGRAM, 16, tumbleb_state )
AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r)
AM_RANGE(0x18000c, 0x18000d) AM_WRITENOP
AM_RANGE(0x1a0000, 0x1a07ff) AM_RAM
- AM_RANGE(0x300000, 0x30000f) AM_WRITE_LEGACY(tumblepb_control_0_w)
- AM_RANGE(0x320000, 0x321fff) AM_RAM_WRITE_LEGACY(fncywld_pf1_data_w) AM_BASE(m_pf1_data)
- AM_RANGE(0x322000, 0x323fff) AM_RAM_WRITE_LEGACY(fncywld_pf2_data_w) AM_BASE(m_pf2_data)
+ AM_RANGE(0x300000, 0x30000f) AM_WRITE(tumblepb_control_0_w)
+ AM_RANGE(0x320000, 0x321fff) AM_RAM_WRITE(fncywld_pf1_data_w) AM_BASE(m_pf1_data)
+ AM_RANGE(0x322000, 0x323fff) AM_RAM_WRITE(fncywld_pf2_data_w) AM_BASE(m_pf2_data)
AM_RANGE(0x340000, 0x3401ff) AM_WRITENOP /* Unused row scroll */
AM_RANGE(0x340400, 0x34047f) AM_WRITENOP /* Unused col scroll */
AM_RANGE(0x342000, 0x3421ff) AM_WRITENOP
@@ -702,16 +702,16 @@ static ADDRESS_MAP_START( htchctch_main_map, AS_PROGRAM, 16, tumbleb_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10000f) AM_READ(semibase_unknown_r)
AM_RANGE(0x100000, 0x100001) AM_WRITE(semicom_soundcmd_w)
- AM_RANGE(0x100002, 0x100003) AM_WRITE_LEGACY(bcstory_tilebank_w)
+ AM_RANGE(0x100002, 0x100003) AM_WRITE(bcstory_tilebank_w)
AM_RANGE(0x120000, 0x123fff) AM_RAM AM_BASE(m_mainram)
AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x160000, 0x160fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* Bootleg sprite buffer */
AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r)
AM_RANGE(0x18000c, 0x18000d) AM_WRITENOP
AM_RANGE(0x1a0000, 0x1a0fff) AM_RAM
- AM_RANGE(0x300000, 0x30000f) AM_WRITE_LEGACY(tumblepb_control_0_w)
- AM_RANGE(0x320000, 0x321fff) AM_WRITE_LEGACY(tumblepb_pf1_data_w) AM_BASE(m_pf1_data)
- AM_RANGE(0x322000, 0x322fff) AM_WRITE_LEGACY(tumblepb_pf2_data_w) AM_BASE(m_pf2_data)
+ AM_RANGE(0x300000, 0x30000f) AM_WRITE(tumblepb_control_0_w)
+ AM_RANGE(0x320000, 0x321fff) AM_WRITE(tumblepb_pf1_data_w) AM_BASE(m_pf1_data)
+ AM_RANGE(0x322000, 0x322fff) AM_WRITE(tumblepb_pf2_data_w) AM_BASE(m_pf2_data)
AM_RANGE(0x323000, 0x331fff) AM_NOP // metal saver writes there when clearing the above tilemaps, flaw in the program routine
AM_RANGE(0x341000, 0x342fff) AM_RAM // Extra ram?
ADDRESS_MAP_END
@@ -728,8 +728,8 @@ static ADDRESS_MAP_START( jumppop_main_map, AS_PROGRAM, 16, tumbleb_state )
AM_RANGE(0x180006, 0x180007) AM_READ_PORT("DSW")
AM_RANGE(0x18000c, 0x18000d) AM_WRITE(jumppop_sound_w)
AM_RANGE(0x1a0000, 0x1a7fff) AM_RAM
- AM_RANGE(0x300000, 0x303fff) AM_RAM_WRITE_LEGACY(tumblepb_pf2_data_w) AM_BASE(m_pf2_data)
- AM_RANGE(0x320000, 0x323fff) AM_RAM_WRITE_LEGACY(tumblepb_pf1_data_w) AM_BASE(m_pf1_data)
+ AM_RANGE(0x300000, 0x303fff) AM_RAM_WRITE(tumblepb_pf2_data_w) AM_BASE(m_pf2_data)
+ AM_RANGE(0x320000, 0x323fff) AM_RAM_WRITE(tumblepb_pf1_data_w) AM_BASE(m_pf1_data)
AM_RANGE(0x380000, 0x38000f) AM_WRITEONLY AM_BASE(m_control)
ADDRESS_MAP_END
@@ -743,10 +743,10 @@ static ADDRESS_MAP_START( suprtrio_main_map, AS_PROGRAM, 16, tumbleb_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x700000, 0x700fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xa00000, 0xa0000f) AM_RAM AM_BASE(m_control)
- AM_RANGE(0xa20000, 0xa20fff) AM_RAM_WRITE_LEGACY(tumblepb_pf1_data_w) AM_BASE(m_pf1_data)
- AM_RANGE(0xa22000, 0xa22fff) AM_RAM_WRITE_LEGACY(tumblepb_pf2_data_w) AM_BASE(m_pf2_data)
+ AM_RANGE(0xa20000, 0xa20fff) AM_RAM_WRITE(tumblepb_pf1_data_w) AM_BASE(m_pf1_data)
+ AM_RANGE(0xa22000, 0xa22fff) AM_RAM_WRITE(tumblepb_pf2_data_w) AM_BASE(m_pf2_data)
AM_RANGE(0xcf0000, 0xcf05ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0xe00000, 0xe00001) AM_READ_PORT("PLAYERS") AM_WRITE_LEGACY(suprtrio_tilebank_w)
+ AM_RANGE(0xe00000, 0xe00001) AM_READ_PORT("PLAYERS") AM_WRITE(suprtrio_tilebank_w)
AM_RANGE(0xe40000, 0xe40001) AM_READ_PORT("SYSTEM")
AM_RANGE(0xe80002, 0xe80003) AM_READ_PORT("DSW")
AM_RANGE(0xec0000, 0xec0001) AM_WRITE(semicom_soundcmd_w)
@@ -761,9 +761,9 @@ static ADDRESS_MAP_START( pangpang_main_map, AS_PROGRAM, 16, tumbleb_state )
AM_RANGE(0x160800, 0x160807) AM_WRITEONLY // writes past the end of spriteram
AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r)
AM_RANGE(0x1a0000, 0x1a07ff) AM_RAM
- AM_RANGE(0x300000, 0x30000f) AM_WRITE_LEGACY(tumblepb_control_0_w)
- AM_RANGE(0x320000, 0x321fff) AM_RAM_WRITE_LEGACY(pangpang_pf1_data_w) AM_BASE(m_pf1_data)
- AM_RANGE(0x340000, 0x341fff) AM_RAM_WRITE_LEGACY(pangpang_pf2_data_w) AM_BASE(m_pf2_data)
+ AM_RANGE(0x300000, 0x30000f) AM_WRITE(tumblepb_control_0_w)
+ AM_RANGE(0x320000, 0x321fff) AM_RAM_WRITE(pangpang_pf1_data_w) AM_BASE(m_pf1_data)
+ AM_RANGE(0x340000, 0x341fff) AM_RAM_WRITE(pangpang_pf2_data_w) AM_BASE(m_pf2_data)
ADDRESS_MAP_END
@@ -845,9 +845,9 @@ static ADDRESS_MAP_START( jumpkids_main_map, AS_PROGRAM, 16, tumbleb_state )
AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r)
AM_RANGE(0x18000c, 0x18000d) AM_WRITENOP
AM_RANGE(0x1a0000, 0x1a07ff) AM_RAM
- AM_RANGE(0x300000, 0x30000f) AM_WRITE_LEGACY(tumblepb_control_0_w)
- AM_RANGE(0x320000, 0x320fff) AM_WRITE_LEGACY(tumblepb_pf1_data_w) AM_BASE(m_pf1_data)
- AM_RANGE(0x322000, 0x322fff) AM_WRITE_LEGACY(tumblepb_pf2_data_w) AM_BASE(m_pf2_data)
+ AM_RANGE(0x300000, 0x30000f) AM_WRITE(tumblepb_control_0_w)
+ AM_RANGE(0x320000, 0x320fff) AM_WRITE(tumblepb_pf1_data_w) AM_BASE(m_pf1_data)
+ AM_RANGE(0x322000, 0x322fff) AM_WRITE(tumblepb_pf2_data_w) AM_BASE(m_pf2_data)
AM_RANGE(0x340000, 0x3401ff) AM_WRITENOP /* Unused row scroll */
AM_RANGE(0x340400, 0x34047f) AM_WRITENOP /* Unused col scroll */
AM_RANGE(0x342000, 0x3421ff) AM_WRITENOP
@@ -3758,7 +3758,7 @@ static DRIVER_INIT( chokchok )
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x140000, 0x140fff, write16_delegate(FUNC(tumbleb_state::paletteram16_xxxxBBBBGGGGRRRR_word_w), state));
/* slightly different banking */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x100002, 0x100003, FUNC(chokchok_tilebank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x100002, 0x100003, write16_delegate(FUNC(tumbleb_state::chokchok_tilebank_w),state));
}
static DRIVER_INIT( wlstar )
@@ -3767,7 +3767,7 @@ static DRIVER_INIT( wlstar )
tumblepb_gfx1_rearrange(machine);
/* slightly different banking */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x100002, 0x100003, FUNC(wlstar_tilebank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x100002, 0x100003, write16_delegate(FUNC(tumbleb_state::wlstar_tilebank_w),state));
state->m_protbase = 0x0000;
}
diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c
index 8ef09471dc8..f8fd4eece03 100644
--- a/src/mame/drivers/tunhunt.c
+++ b/src/mame/drivers/tunhunt.c
@@ -139,7 +139,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, tunhunt_state )
AM_RANGE(0x1800, 0x1800) AM_WRITEONLY /* SHEL0H */
AM_RANGE(0x1a00, 0x1a00) AM_WRITEONLY /* SHEL1H */
AM_RANGE(0x1c00, 0x1c00) AM_WRITEONLY /* MOBJV */
- AM_RANGE(0x1e00, 0x1eff) AM_WRITE_LEGACY(tunhunt_videoram_w) AM_BASE(m_videoram) /* ALPHA */
+ AM_RANGE(0x1e00, 0x1eff) AM_WRITE(tunhunt_videoram_w) AM_BASE(m_videoram) /* ALPHA */
AM_RANGE(0x2000, 0x2000) AM_WRITENOP /* watchdog */
AM_RANGE(0x2000, 0x2007) AM_READ(tunhunt_button_r)
AM_RANGE(0x2400, 0x2400) AM_WRITENOP /* INT ACK */
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index fc4e0689d56..5a975d6bd46 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -738,7 +738,7 @@ static ADDRESS_MAP_START( turbo_map, AS_PROGRAM, 8, turbo_state )
AM_RANGE(0xa800, 0xa807) AM_MIRROR(0x07f8) AM_WRITE(turbo_coin_and_lamp_w)
AM_RANGE(0xb000, 0xb3ff) AM_MIRROR(0x0400) AM_RAM AM_BASE(m_sprite_position)
AM_RANGE(0xb800, 0xbfff) AM_WRITE(turbo_analog_reset_w)
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(turbo_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(turbo_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xe800, 0xefff) AM_WRITE(turbo_collision_clear_w)
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf803) AM_MIRROR(0x00fc) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w)
@@ -768,7 +768,7 @@ static ADDRESS_MAP_START( subroc3d_map, AS_PROGRAM, 8, turbo_state )
AM_RANGE(0xa803, 0xa803) AM_MIRROR(0x07fc) AM_READ_PORT("DSW3") // INPUT 253
AM_RANGE(0xb000, 0xb7ff) AM_RAM // SCRATCH
AM_RANGE(0xb800, 0xbfff) // HANDLE CL
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE_LEGACY(turbo_videoram_w) AM_BASE(m_videoram) // FIX PAGE
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(turbo_videoram_w) AM_BASE(m_videoram) // FIX PAGE
AM_RANGE(0xe800, 0xe803) AM_MIRROR(0x07fc) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0xf000, 0xf003) AM_MIRROR(0x07fc) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w)
AM_RANGE(0xf800, 0xf801) AM_MIRROR(0x07fe) AM_READWRITE(turbo_8279_r, turbo_8279_w)
@@ -785,7 +785,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( buckrog_map, AS_PROGRAM, 8, turbo_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(turbo_videoram_w) AM_BASE(m_videoram) // FIX PAGE
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(turbo_videoram_w) AM_BASE(m_videoram) // FIX PAGE
AM_RANGE(0xc800, 0xc803) AM_MIRROR(0x07fc) AM_DEVREADWRITE_LEGACY("ppi8255_0", ppi8255_r, buckrog_ppi8255_0_w) // 8255
AM_RANGE(0xd000, 0xd003) AM_MIRROR(0x07fc) AM_DEVREADWRITE_LEGACY("ppi8255_1", ppi8255_r, ppi8255_w) // 8255
AM_RANGE(0xd800, 0xd801) AM_MIRROR(0x07fe) AM_READWRITE(turbo_8279_r, turbo_8279_w) // 8279
@@ -802,7 +802,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( buckrog_cpu2_map, AS_PROGRAM, 8, turbo_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x0000, 0xdfff) AM_WRITE_LEGACY(buckrog_bitmap_w)
+ AM_RANGE(0x0000, 0xdfff) AM_WRITE(buckrog_bitmap_w)
AM_RANGE(0xe000, 0xe7ff) AM_MIRROR(0x1800) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c
index d8fac8179d9..abbdc962ae1 100644
--- a/src/mame/drivers/tutankhm.c
+++ b/src/mame/drivers/tutankhm.c
@@ -131,8 +131,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, tutankhm_state )
AM_RANGE(0x8202, 0x8203) AM_MIRROR(0x00f8) AM_WRITE(tutankhm_coin_counter_w)
AM_RANGE(0x8204, 0x8204) AM_MIRROR(0x00f8) AM_WRITENOP // starfield?
AM_RANGE(0x8205, 0x8205) AM_MIRROR(0x00f8) AM_WRITE(sound_mute_w)
- AM_RANGE(0x8206, 0x8206) AM_MIRROR(0x00f8) AM_WRITE_LEGACY(tutankhm_flip_screen_x_w)
- AM_RANGE(0x8207, 0x8207) AM_MIRROR(0x00f8) AM_WRITE_LEGACY(tutankhm_flip_screen_y_w)
+ AM_RANGE(0x8206, 0x8206) AM_MIRROR(0x00f8) AM_WRITE(tutankhm_flip_screen_x_w)
+ AM_RANGE(0x8207, 0x8207) AM_MIRROR(0x00f8) AM_WRITE(tutankhm_flip_screen_y_w)
AM_RANGE(0x8300, 0x8300) AM_MIRROR(0x00ff) AM_WRITE(tutankhm_bankselect_w)
AM_RANGE(0x8600, 0x8600) AM_MIRROR(0x00ff) AM_WRITE_LEGACY(timeplt_sh_irqtrigger_w)
AM_RANGE(0x8700, 0x8700) AM_MIRROR(0x00ff) AM_WRITE(soundlatch_w)
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index 64c1a113616..45eee737ba9 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -237,7 +237,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, twin16_state )
AM_RANGE(0x040000, 0x043fff) AM_READ_BANK(COMRAM_r) AM_WRITE_BANK(COMRAM_w)
// AM_RANGE(0x044000, 0x04ffff) AM_NOP // miaj
AM_RANGE(0x060000, 0x063fff) AM_RAM
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE_LEGACY(twin16_paletteram_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(twin16_paletteram_word_w) AM_SHARE("paletteram")
AM_RANGE(0x081000, 0x081fff) AM_WRITENOP
AM_RANGE(0x0a0000, 0x0a001b) AM_READ(twin16_input_r)
AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(twin16_CPUA_register_w)
@@ -245,9 +245,9 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, twin16_state )
AM_RANGE(0x0a0010, 0x0a0011) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x0b0000, 0x0b03ff) AM_READWRITE(cuebrickj_nvram_r, cuebrickj_nvram_w) AM_SHARE("nvram")
AM_RANGE(0x0b0400, 0x0b0401) AM_WRITE(cuebrickj_nvram_bank_w)
- AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE_LEGACY(twin16_video_register_w)
- AM_RANGE(0x0c000e, 0x0c000f) AM_READ_LEGACY(twin16_sprite_status_r)
- AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE_LEGACY(twin16_text_ram_w) AM_BASE(m_text_ram)
+ AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE(twin16_video_register_w)
+ AM_RANGE(0x0c000e, 0x0c000f) AM_READ(twin16_sprite_status_r)
+ AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(twin16_text_ram_w) AM_BASE(m_text_ram)
// AM_RANGE(0x104000, 0x105fff) AM_NOP // miaj
AM_RANGE(0x120000, 0x123fff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0x140000, 0x143fff) AM_RAM AM_SHARE("spriteram")
@@ -272,15 +272,15 @@ static ADDRESS_MAP_START( fround_map, AS_PROGRAM, 16, twin16_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_READ_BANK(COMRAM_r) AM_WRITE_BANK(COMRAM_w)
AM_RANGE(0x060000, 0x063fff) AM_RAM
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE_LEGACY(twin16_paletteram_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(twin16_paletteram_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0a0000, 0x0a001b) AM_READ(twin16_input_r)
AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(fround_CPU_register_w)
AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(sound_command_w)
AM_RANGE(0x0a0010, 0x0a0011) AM_WRITE(watchdog_reset16_w)
- AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE_LEGACY(twin16_video_register_w)
- AM_RANGE(0x0c000e, 0x0c000f) AM_READ_LEGACY(twin16_sprite_status_r)
- AM_RANGE(0x0e0000, 0x0e0001) AM_WRITE_LEGACY(fround_gfx_bank_w)
- AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE_LEGACY(twin16_text_ram_w) AM_BASE(m_text_ram)
+ AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE(twin16_video_register_w)
+ AM_RANGE(0x0c000e, 0x0c000f) AM_READ(twin16_sprite_status_r)
+ AM_RANGE(0x0e0000, 0x0e0001) AM_WRITE(fround_gfx_bank_w)
+ AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(twin16_text_ram_w) AM_BASE(m_text_ram)
AM_RANGE(0x120000, 0x123fff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0x140000, 0x143fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x500000, 0x6fffff) AM_READ(twin16_gfx_rom1_r)
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index 9f23e6c7404..10d10822c6f 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -281,24 +281,24 @@ static ADDRESS_MAP_START( main_program_map, AS_PROGRAM, 16, twincobr_state )
AM_RANGE(0x050000, 0x050dff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x060000, 0x060001) AM_DEVWRITE8("crtc", mc6845_device, address_w, 0x00ff)
AM_RANGE(0x060002, 0x060003) AM_DEVWRITE8("crtc", mc6845_device, register_w, 0x00ff)
- AM_RANGE(0x070000, 0x070003) AM_WRITE_LEGACY(twincobr_txscroll_w) /* text layer scroll */
- AM_RANGE(0x070004, 0x070005) AM_WRITE_LEGACY(twincobr_txoffs_w) /* offset in text video RAM */
- AM_RANGE(0x072000, 0x072003) AM_WRITE_LEGACY(twincobr_bgscroll_w) /* bg layer scroll */
- AM_RANGE(0x072004, 0x072005) AM_WRITE_LEGACY(twincobr_bgoffs_w) /* offset in bg video RAM */
- AM_RANGE(0x074000, 0x074003) AM_WRITE_LEGACY(twincobr_fgscroll_w) /* fg layer scroll */
- AM_RANGE(0x074004, 0x074005) AM_WRITE_LEGACY(twincobr_fgoffs_w) /* offset in fg video RAM */
- AM_RANGE(0x076000, 0x076003) AM_WRITE_LEGACY(twincobr_exscroll_w) /* Spare layer scroll */
+ AM_RANGE(0x070000, 0x070003) AM_WRITE(twincobr_txscroll_w) /* text layer scroll */
+ AM_RANGE(0x070004, 0x070005) AM_WRITE(twincobr_txoffs_w) /* offset in text video RAM */
+ AM_RANGE(0x072000, 0x072003) AM_WRITE(twincobr_bgscroll_w) /* bg layer scroll */
+ AM_RANGE(0x072004, 0x072005) AM_WRITE(twincobr_bgoffs_w) /* offset in bg video RAM */
+ AM_RANGE(0x074000, 0x074003) AM_WRITE(twincobr_fgscroll_w) /* fg layer scroll */
+ AM_RANGE(0x074004, 0x074005) AM_WRITE(twincobr_fgoffs_w) /* offset in fg video RAM */
+ AM_RANGE(0x076000, 0x076003) AM_WRITE(twincobr_exscroll_w) /* Spare layer scroll */
AM_RANGE(0x078000, 0x078001) AM_READ_PORT("DSWA")
AM_RANGE(0x078002, 0x078003) AM_READ_PORT("DSWB")
AM_RANGE(0x078004, 0x078005) AM_READ_PORT("P1")
AM_RANGE(0x078006, 0x078007) AM_READ_PORT("P2")
AM_RANGE(0x078008, 0x078009) AM_READ_PORT("VBLANK") /* V-Blank & FShark Coin/Start */
- AM_RANGE(0x07800a, 0x07800b) AM_WRITE_LEGACY(fshark_coin_dsp_w) /* Flying Shark DSP Comms & coin stuff */
- AM_RANGE(0x07800c, 0x07800d) AM_WRITE_LEGACY(twincobr_control_w) /* Twin Cobra DSP Comms & system control */
- AM_RANGE(0x07a000, 0x07afff) AM_READWRITE_LEGACY(twincobr_sharedram_r, twincobr_sharedram_w) /* 16-bit on 68000 side, 8-bit on Z80 side */
- AM_RANGE(0x07e000, 0x07e001) AM_READWRITE_LEGACY(twincobr_txram_r, twincobr_txram_w) /* data for text video RAM */
- AM_RANGE(0x07e002, 0x07e003) AM_READWRITE_LEGACY(twincobr_bgram_r, twincobr_bgram_w) /* data for bg video RAM */
- AM_RANGE(0x07e004, 0x07e005) AM_READWRITE_LEGACY(twincobr_fgram_r, twincobr_fgram_w) /* data for fg video RAM */
+ AM_RANGE(0x07800a, 0x07800b) AM_WRITE(fshark_coin_dsp_w) /* Flying Shark DSP Comms & coin stuff */
+ AM_RANGE(0x07800c, 0x07800d) AM_WRITE(twincobr_control_w) /* Twin Cobra DSP Comms & system control */
+ AM_RANGE(0x07a000, 0x07afff) AM_READWRITE(twincobr_sharedram_r, twincobr_sharedram_w) /* 16-bit on 68000 side, 8-bit on Z80 side */
+ AM_RANGE(0x07e000, 0x07e001) AM_READWRITE(twincobr_txram_r, twincobr_txram_w) /* data for text video RAM */
+ AM_RANGE(0x07e002, 0x07e003) AM_READWRITE(twincobr_bgram_r, twincobr_bgram_w) /* data for bg video RAM */
+ AM_RANGE(0x07e004, 0x07e005) AM_READWRITE(twincobr_fgram_r, twincobr_fgram_w) /* data for fg video RAM */
ADDRESS_MAP_END
@@ -313,7 +313,7 @@ static ADDRESS_MAP_START( sound_io_map, AS_IO, 8, twincobr_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE_LEGACY("ymsnd", ym3812_r, ym3812_w)
AM_RANGE(0x10, 0x10) AM_READ_PORT("SYSTEM") /* Twin Cobra - Coin/Start */
- AM_RANGE(0x20, 0x20) AM_WRITE_LEGACY(twincobr_coin_w) /* Twin Cobra coin count-lockout */
+ AM_RANGE(0x20, 0x20) AM_WRITE(twincobr_coin_w) /* Twin Cobra coin count-lockout */
AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWA")
AM_RANGE(0x50, 0x50) AM_READ_PORT("DSWB")
ADDRESS_MAP_END
@@ -328,11 +328,11 @@ ADDRESS_MAP_END
/* $000 - 08F TMS32010 Internal Data RAM in Data Address Space */
static ADDRESS_MAP_START( DSP_io_map, AS_IO, 16, twincobr_state )
- AM_RANGE(0, 0) AM_WRITE_LEGACY(twincobr_dsp_addrsel_w)
- AM_RANGE(1, 1) AM_READWRITE_LEGACY(twincobr_dsp_r, twincobr_dsp_w)
- AM_RANGE(2, 2) AM_READWRITE_LEGACY(fsharkbt_dsp_r, fsharkbt_dsp_w)
- AM_RANGE(3, 3) AM_WRITE_LEGACY(twincobr_dsp_bio_w)
- AM_RANGE(TMS32010_BIO, TMS32010_BIO) AM_READ_LEGACY(twincobr_BIO_r)
+ AM_RANGE(0, 0) AM_WRITE(twincobr_dsp_addrsel_w)
+ AM_RANGE(1, 1) AM_READWRITE(twincobr_dsp_r, twincobr_dsp_w)
+ AM_RANGE(2, 2) AM_READWRITE(fsharkbt_dsp_r, fsharkbt_dsp_w)
+ AM_RANGE(3, 3) AM_WRITE(twincobr_dsp_bio_w)
+ AM_RANGE(TMS32010_BIO, TMS32010_BIO) AM_READ(twincobr_BIO_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index 8018419d99e..8682e65dcc6 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -503,13 +503,13 @@ static ADDRESS_MAP_START( tx1_main, AS_PROGRAM, 16, tx1_state )
AM_RANGE(0x00000, 0x00fff) AM_MIRROR(0x1000) AM_RAM
AM_RANGE(0x02000, 0x02fff) AM_MIRROR(0x1000) AM_RAM
AM_RANGE(0x04000, 0x04fff) AM_MIRROR(0x1000) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x06000, 0x06fff) AM_READWRITE_LEGACY(tx1_crtc_r, tx1_crtc_w)
+ AM_RANGE(0x06000, 0x06fff) AM_READWRITE(tx1_crtc_r, tx1_crtc_w)
AM_RANGE(0x08000, 0x09fff) AM_RAM AM_BASE(m_vram)
AM_RANGE(0x0a000, 0x0afff) AM_RAM AM_SHARE("share1") AM_BASE(m_rcram)
AM_RANGE(0x0b000, 0x0b001) AM_READWRITE_LEGACY(dipswitches_r, z80_busreq_w)
- AM_RANGE(0x0c000, 0x0c001) AM_WRITE_LEGACY(tx1_scolst_w)
- AM_RANGE(0x0d000, 0x0d003) AM_WRITE_LEGACY(tx1_slincs_w)
- AM_RANGE(0x0e000, 0x0e001) AM_WRITE_LEGACY(tx1_slock_w)
+ AM_RANGE(0x0c000, 0x0c001) AM_WRITE(tx1_scolst_w)
+ AM_RANGE(0x0d000, 0x0d003) AM_WRITE(tx1_slincs_w)
+ AM_RANGE(0x0e000, 0x0e001) AM_WRITE(tx1_slock_w)
AM_RANGE(0x0f000, 0x0f001) AM_READ(watchdog_reset16_r) AM_WRITE_LEGACY(resume_math_w)
AM_RANGE(0x10000, 0x1ffff) AM_READWRITE_LEGACY(z80_shared_r, z80_shared_w)
AM_RANGE(0xf0000, 0xfffff) AM_ROM
@@ -517,14 +517,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( tx1_math, AS_PROGRAM, 16, tx1_state )
AM_RANGE(0x00000, 0x007ff) AM_RAM AM_BASE(m_math_ram)
- AM_RANGE(0x00800, 0x00fff) AM_READWRITE_LEGACY(tx1_spcs_ram_r, tx1_spcs_ram_w)
+ AM_RANGE(0x00800, 0x00fff) AM_READWRITE(tx1_spcs_ram_r, tx1_spcs_ram_w)
AM_RANGE(0x01000, 0x01fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x02000, 0x022ff) AM_RAM AM_BASE(m_objram)
- AM_RANGE(0x02400, 0x027ff) AM_WRITE_LEGACY(tx1_bankcs_w)
+ AM_RANGE(0x02400, 0x027ff) AM_WRITE(tx1_bankcs_w)
AM_RANGE(0x02800, 0x02bff) AM_WRITE_LEGACY(halt_math_w)
- AM_RANGE(0x02C00, 0x02fff) AM_WRITE_LEGACY(tx1_flgcs_w)
- AM_RANGE(0x03000, 0x03fff) AM_READWRITE_LEGACY(tx1_math_r, tx1_math_w)
- AM_RANGE(0x05000, 0x07fff) AM_READ_LEGACY(tx1_spcs_rom_r)
+ AM_RANGE(0x02C00, 0x02fff) AM_WRITE(tx1_flgcs_w)
+ AM_RANGE(0x03000, 0x03fff) AM_READWRITE(tx1_math_r, tx1_math_w)
+ AM_RANGE(0x05000, 0x07fff) AM_READ(tx1_spcs_rom_r)
AM_RANGE(0x08000, 0x0bfff) AM_ROM
AM_RANGE(0x0c000, 0x0ffff) AM_ROM
AM_RANGE(0xfc000, 0xfffff) AM_ROM
@@ -554,13 +554,13 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( buggyboy_main, AS_PROGRAM, 16, tx1_state )
AM_RANGE(0x00000, 0x03fff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x04000, 0x04fff) AM_READWRITE_LEGACY(tx1_crtc_r, tx1_crtc_w)
+ AM_RANGE(0x04000, 0x04fff) AM_READWRITE(tx1_crtc_r, tx1_crtc_w)
AM_RANGE(0x08000, 0x09fff) AM_RAM AM_BASE(m_vram)
AM_RANGE(0x0a000, 0x0afff) AM_RAM AM_SHARE("share1") AM_BASE(m_rcram)
AM_RANGE(0x0b000, 0x0b001) AM_READWRITE_LEGACY(dipswitches_r, z80_busreq_w)
- AM_RANGE(0x0c000, 0x0c001) AM_WRITE_LEGACY(buggyboy_scolst_w)
- AM_RANGE(0x0d000, 0x0d003) AM_WRITE_LEGACY(tx1_slincs_w)
- AM_RANGE(0x0e000, 0x0e001) AM_WRITE_LEGACY(buggyboy_sky_w)
+ AM_RANGE(0x0c000, 0x0c001) AM_WRITE(buggyboy_scolst_w)
+ AM_RANGE(0x0d000, 0x0d003) AM_WRITE(tx1_slincs_w)
+ AM_RANGE(0x0e000, 0x0e001) AM_WRITE(buggyboy_sky_w)
AM_RANGE(0x0f000, 0x0f003) AM_READ(watchdog_reset16_r) AM_WRITE_LEGACY(resume_math_w)
AM_RANGE(0x10000, 0x1ffff) AM_READWRITE_LEGACY(z80_shared_r, z80_shared_w)
AM_RANGE(0x20000, 0x2ffff) AM_ROM
@@ -569,13 +569,13 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( buggybjr_main, AS_PROGRAM, 16, tx1_state )
AM_RANGE(0x00000, 0x03fff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x04000, 0x04fff) AM_READWRITE_LEGACY(tx1_crtc_r, tx1_crtc_w)
+ AM_RANGE(0x04000, 0x04fff) AM_READWRITE(tx1_crtc_r, tx1_crtc_w)
AM_RANGE(0x08000, 0x08fff) AM_RAM AM_BASE(m_vram)
AM_RANGE(0x0a000, 0x0afff) AM_RAM AM_SHARE("share1") AM_BASE(m_rcram)
AM_RANGE(0x0b000, 0x0b001) AM_READWRITE_LEGACY(dipswitches_r, z80_busreq_w)
- AM_RANGE(0x0c000, 0x0c001) AM_WRITE_LEGACY(buggyboy_scolst_w)
- AM_RANGE(0x0d000, 0x0d003) AM_WRITE_LEGACY(tx1_slincs_w)
- AM_RANGE(0x0e000, 0x0e001) AM_WRITE_LEGACY(buggyboy_sky_w)
+ AM_RANGE(0x0c000, 0x0c001) AM_WRITE(buggyboy_scolst_w)
+ AM_RANGE(0x0d000, 0x0d003) AM_WRITE(tx1_slincs_w)
+ AM_RANGE(0x0e000, 0x0e001) AM_WRITE(buggyboy_sky_w)
AM_RANGE(0x0f000, 0x0f003) AM_READ(watchdog_reset16_r) AM_WRITE_LEGACY(resume_math_w)
AM_RANGE(0x10000, 0x1ffff) AM_READWRITE_LEGACY(z80_shared_r, z80_shared_w)
AM_RANGE(0x20000, 0x2ffff) AM_ROM
@@ -584,13 +584,13 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( buggyboy_math, AS_PROGRAM, 16, tx1_state )
AM_RANGE(0x00000, 0x007ff) AM_RAM AM_BASE(m_math_ram)
- AM_RANGE(0x00800, 0x00fff) AM_READWRITE_LEGACY(buggyboy_spcs_ram_r, buggyboy_spcs_ram_w)
+ AM_RANGE(0x00800, 0x00fff) AM_READWRITE(buggyboy_spcs_ram_r, buggyboy_spcs_ram_w)
AM_RANGE(0x01000, 0x01fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x02000, 0x022ff) AM_RAM AM_BASE(m_objram)
- AM_RANGE(0x02400, 0x024ff) AM_WRITE_LEGACY(buggyboy_gas_w)
- AM_RANGE(0x03000, 0x03fff) AM_READWRITE_LEGACY(buggyboy_math_r, buggyboy_math_w)
+ AM_RANGE(0x02400, 0x024ff) AM_WRITE(buggyboy_gas_w)
+ AM_RANGE(0x03000, 0x03fff) AM_READWRITE(buggyboy_math_r, buggyboy_math_w)
AM_RANGE(0x04000, 0x04fff) AM_ROM
- AM_RANGE(0x05000, 0x07fff) AM_READ_LEGACY(buggyboy_spcs_rom_r)
+ AM_RANGE(0x05000, 0x07fff) AM_READ(buggyboy_spcs_rom_r)
AM_RANGE(0x08000, 0x0bfff) AM_ROM
AM_RANGE(0x0c000, 0x0ffff) AM_ROM
AM_RANGE(0xfc000, 0xfffff) AM_ROM
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index c79ee35734c..6e8b6a04418 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -40,7 +40,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, ultraman_state )
AM_RANGE(0x1c0004, 0x1c0005) AM_READ_PORT("P2")
AM_RANGE(0x1c0006, 0x1c0007) AM_READ_PORT("DSW1")
AM_RANGE(0x1c0008, 0x1c0009) AM_READ_PORT("DSW2")
- AM_RANGE(0x1c0018, 0x1c0019) AM_WRITE_LEGACY(ultraman_gfxctrl_w) /* counters + gfx ctrl */
+ AM_RANGE(0x1c0018, 0x1c0019) AM_WRITE(ultraman_gfxctrl_w) /* counters + gfx ctrl */
AM_RANGE(0x1c0020, 0x1c0021) AM_WRITE(sound_cmd_w)
AM_RANGE(0x1c0028, 0x1c0029) AM_WRITE(sound_irq_trigger_w)
AM_RANGE(0x1c0030, 0x1c0031) AM_WRITE(watchdog_reset16_w)
diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c
index 5d0562a2e10..100ee3a30ba 100644
--- a/src/mame/drivers/ultratnk.c
+++ b/src/mame/drivers/ultratnk.c
@@ -153,7 +153,7 @@ static ADDRESS_MAP_START( ultratnk_cpu_map, AS_PROGRAM, 8, ultratnk_state )
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x700) AM_RAM
AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x700) AM_READWRITE(ultratnk_wram_r, ultratnk_wram_w)
- AM_RANGE(0x0800, 0x0bff) AM_MIRROR(0x400) AM_RAM_WRITE_LEGACY(ultratnk_video_ram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x0800, 0x0bff) AM_MIRROR(0x400) AM_RAM_WRITE(ultratnk_video_ram_w) AM_BASE(m_videoram)
AM_RANGE(0x1000, 0x17ff) AM_READ_PORT("IN0")
AM_RANGE(0x1800, 0x1fff) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 359366c51b4..99eaf7e3ec2 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -71,10 +71,10 @@ static ADDRESS_MAP_START( burglarx_map, AS_PROGRAM, 16, unico_state )
AM_RANGE(0x80018c, 0x80018d) AM_DEVREADWRITE8_LEGACY("ymsnd", ym3812_status_port_r, ym3812_control_port_w, 0xff00 ) //
AM_RANGE(0x80018e, 0x80018f) AM_DEVWRITE_LEGACY("oki", burglarx_sound_bank_w) //
AM_RANGE(0x8001e0, 0x8001e1) AM_WRITENOP // IRQ Ack
- AM_RANGE(0x904000, 0x90ffff) AM_RAM_WRITE_LEGACY(unico_vram_w) AM_BASE(m_vram) // Layers 1, 2, 0
+ AM_RANGE(0x904000, 0x90ffff) AM_RAM_WRITE(unico_vram_w) AM_BASE(m_vram) // Layers 1, 2, 0
AM_RANGE(0x920000, 0x923fff) AM_RAM // ? 0
AM_RANGE(0x930000, 0x9307ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE(0x940000, 0x947fff) AM_RAM_WRITE_LEGACY(unico_palette_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x940000, 0x947fff) AM_RAM_WRITE(unico_palette_w) AM_SHARE("paletteram") // Palette
ADDRESS_MAP_END
@@ -159,10 +159,10 @@ static ADDRESS_MAP_START( zeropnt_map, AS_PROGRAM, 16, unico_state )
AM_RANGE(0x80018c, 0x80018d) AM_DEVREADWRITE8_LEGACY("ymsnd", ym3812_status_port_r, ym3812_control_port_w, 0xff00 ) //
AM_RANGE(0x80018e, 0x80018f) AM_WRITE(zeropnt_sound_bank_w ) //
AM_RANGE(0x8001e0, 0x8001e1) AM_WRITEONLY // ? IRQ Ack
- AM_RANGE(0x904000, 0x90ffff) AM_RAM_WRITE_LEGACY(unico_vram_w) AM_BASE(m_vram) // Layers 1, 2, 0
+ AM_RANGE(0x904000, 0x90ffff) AM_RAM_WRITE(unico_vram_w) AM_BASE(m_vram) // Layers 1, 2, 0
AM_RANGE(0x920000, 0x923fff) AM_RAM // ? 0
AM_RANGE(0x930000, 0x9307ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE(0x940000, 0x947fff) AM_RAM_WRITE_LEGACY(unico_palette_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x940000, 0x947fff) AM_RAM_WRITE(unico_palette_w) AM_SHARE("paletteram") // Palette
ADDRESS_MAP_END
@@ -233,10 +233,10 @@ static ADDRESS_MAP_START( zeropnt2_map, AS_PROGRAM, 32, unico_state )
AM_RANGE(0x80015c, 0x80015f) AM_READ_PORT("BUTTONS")
AM_RANGE(0x8001e0, 0x8001e3) AM_WRITENOP // ? IRQ Ack
AM_RANGE(0x8001f0, 0x8001f3) AM_DEVWRITE_LEGACY("eeprom", zeropnt2_eeprom_w) // EEPROM
- AM_RANGE(0x904000, 0x90ffff) AM_RAM_WRITE_LEGACY(unico_vram32_w) AM_BASE(m_vram32) // Layers 1, 2, 0
+ AM_RANGE(0x904000, 0x90ffff) AM_RAM_WRITE(unico_vram32_w) AM_BASE(m_vram32) // Layers 1, 2, 0
AM_RANGE(0x920000, 0x923fff) AM_RAM // ? 0
AM_RANGE(0x930000, 0x9307ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE(0x940000, 0x947fff) AM_RAM_WRITE_LEGACY(unico_palette32_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x940000, 0x947fff) AM_RAM_WRITE(unico_palette32_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xfe0000, 0xffffff) AM_RAM // RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c
index 2922dbb3534..1c43fd25122 100644
--- a/src/mame/drivers/usgames.c
+++ b/src/mame/drivers/usgames.c
@@ -72,8 +72,8 @@ static ADDRESS_MAP_START( usgames_map, AS_PROGRAM, 8, usgames_state )
AM_RANGE(0x2060, 0x2060) AM_WRITE(usgames_rombank_w)
AM_RANGE(0x2070, 0x2070) AM_READ_PORT("UNK2")
AM_RANGE(0x2400, 0x2401) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_data_w)
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE_LEGACY(usgames_charram_w) AM_BASE(m_charram)
- AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE_LEGACY(usgames_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(usgames_charram_w) AM_BASE(m_charram)
+ AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE(usgames_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -91,8 +91,8 @@ static ADDRESS_MAP_START( usg185_map, AS_PROGRAM, 8, usgames_state )
AM_RANGE(0x2441, 0x2441) AM_DEVWRITE("crtc", mc6845_device, register_w)
AM_RANGE(0x2460, 0x2460) AM_WRITE(usgames_rombank_w)
AM_RANGE(0x2470, 0x2470) AM_READ_PORT("UNK2")
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE_LEGACY(usgames_charram_w) AM_BASE(m_charram)
- AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE_LEGACY(usgames_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(usgames_charram_w) AM_BASE(m_charram)
+ AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE(usgames_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c
index c2c6588705c..a7478430ecc 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -49,7 +49,7 @@ READ16_MEMBER(vaportra_state::vaportra_control_r)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, vaportra_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x100000, 0x100003) AM_WRITE_LEGACY(vaportra_priority_w)
+ AM_RANGE(0x100000, 0x100003) AM_WRITE(vaportra_priority_w)
AM_RANGE(0x100006, 0x100007) AM_WRITE(vaportra_sound_w)
AM_RANGE(0x100000, 0x10000f) AM_READ(vaportra_control_r)
AM_RANGE(0x200000, 0x201fff) AM_DEVREADWRITE_LEGACY("tilegen2", deco16ic_pf1_data_r, deco16ic_pf1_data_w)
@@ -58,8 +58,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, vaportra_state )
AM_RANGE(0x280000, 0x281fff) AM_DEVREADWRITE_LEGACY("tilegen1", deco16ic_pf1_data_r, deco16ic_pf1_data_w)
AM_RANGE(0x282000, 0x283fff) AM_DEVREADWRITE_LEGACY("tilegen1", deco16ic_pf2_data_r, deco16ic_pf2_data_w)
AM_RANGE(0x2c0000, 0x2c000f) AM_DEVWRITE_LEGACY("tilegen1", deco16ic_pf_control_w)
- AM_RANGE(0x300000, 0x3009ff) AM_RAM_WRITE_LEGACY(vaportra_palette_24bit_rg_w) AM_SHARE("paletteram")
- AM_RANGE(0x304000, 0x3049ff) AM_RAM_WRITE_LEGACY(vaportra_palette_24bit_b_w) AM_SHARE("paletteram2")
+ AM_RANGE(0x300000, 0x3009ff) AM_RAM_WRITE(vaportra_palette_24bit_rg_w) AM_SHARE("paletteram")
+ AM_RANGE(0x304000, 0x3049ff) AM_RAM_WRITE(vaportra_palette_24bit_b_w) AM_SHARE("paletteram2")
AM_RANGE(0x308000, 0x308001) AM_NOP
AM_RANGE(0x30c000, 0x30c001) AM_DEVWRITE("spriteram", buffered_spriteram16_device, write)
AM_RANGE(0xff8000, 0xff87ff) AM_RAM AM_SHARE("spriteram")
diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c
index 0971fe884b3..6500d43fb66 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -104,12 +104,12 @@ WRITE8_MEMBER(vastar_state::nmi_mask_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, vastar_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x8fff) AM_READWRITE_LEGACY(vastar_bg2videoram_r, vastar_bg2videoram_w) AM_BASE(m_bg2videoram)
- AM_RANGE(0x9000, 0x9fff) AM_READWRITE_LEGACY(vastar_bg1videoram_r, vastar_bg1videoram_w) AM_BASE(m_bg1videoram)
- AM_RANGE(0xa000, 0xafff) AM_READWRITE_LEGACY(vastar_bg2videoram_r, vastar_bg2videoram_w) /* mirror address */
- AM_RANGE(0xb000, 0xbfff) AM_READWRITE_LEGACY(vastar_bg1videoram_r, vastar_bg1videoram_w) /* mirror address */
+ AM_RANGE(0x8000, 0x8fff) AM_READWRITE(vastar_bg2videoram_r, vastar_bg2videoram_w) AM_BASE(m_bg2videoram)
+ AM_RANGE(0x9000, 0x9fff) AM_READWRITE(vastar_bg1videoram_r, vastar_bg1videoram_w) AM_BASE(m_bg1videoram)
+ AM_RANGE(0xa000, 0xafff) AM_READWRITE(vastar_bg2videoram_r, vastar_bg2videoram_w) /* mirror address */
+ AM_RANGE(0xb000, 0xbfff) AM_READWRITE(vastar_bg1videoram_r, vastar_bg1videoram_w) /* mirror address */
AM_RANGE(0xc000, 0xc000) AM_WRITEONLY AM_BASE(m_sprite_priority) /* sprite/BG priority */
- AM_RANGE(0xc400, 0xcfff) AM_RAM_WRITE_LEGACY(vastar_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xc400, 0xcfff) AM_RAM_WRITE(vastar_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0xe000, 0xe000) AM_READWRITE(watchdog_reset_r, watchdog_reset_w)
AM_RANGE(0xf000, 0xf0ff) AM_READWRITE(vastar_sharedram_r, vastar_sharedram_w) AM_BASE(m_sharedram)
AM_RANGE(0xf100, 0xf7ff) AM_RAM
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index ac965472c47..f220e688a41 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -218,8 +218,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, vball_state )
AM_RANGE(0x100c, 0x100c) AM_WRITE(vb_scrollx_lo_w)
AM_RANGE(0x100d, 0x100d) AM_WRITE(cpu_sound_command_w)
AM_RANGE(0x100e, 0x100e) AM_WRITEONLY AM_BASE(m_vb_scrolly_lo)
- AM_RANGE(0x2000, 0x2fff) AM_WRITE_LEGACY(vb_videoram_w) AM_BASE(m_vb_videoram)
- AM_RANGE(0x3000, 0x3fff) AM_WRITE_LEGACY(vb_attrib_w) AM_BASE(m_vb_attribram)
+ AM_RANGE(0x2000, 0x2fff) AM_WRITE(vb_videoram_w) AM_BASE(m_vb_videoram)
+ AM_RANGE(0x3000, 0x3fff) AM_WRITE(vb_attrib_w) AM_BASE(m_vb_attribram)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/vectrex.c b/src/mame/drivers/vectrex.c
index a7a8dcf77bb..be178bcb844 100644
--- a/src/mame/drivers/vectrex.c
+++ b/src/mame/drivers/vectrex.c
@@ -22,7 +22,7 @@ Bruce Tomlin (hardware info)
static ADDRESS_MAP_START(vectrex_map, AS_PROGRAM, 8, vectrex_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc800, 0xcbff) AM_RAM AM_MIRROR(0x0400) AM_BASE(m_gce_vectorram) AM_SIZE(m_gce_vectorram_size)
- AM_RANGE(0xd000, 0xd7ff) AM_READWRITE_LEGACY(vectrex_via_r, vectrex_via_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(vectrex_via_r, vectrex_via_w)
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -92,7 +92,7 @@ static const ay8910_interface vectrex_ay8910_interface =
AY8910_DEFAULT_LOADS,
DEVCB_INPUT_PORT("BUTTONS"),
DEVCB_NULL,
- DEVCB_MEMORY_HANDLER("maincpu", PROGRAM, vectrex_psg_port_w),
+ DEVCB_DRIVER_MEMBER(vectrex_state, vectrex_psg_port_w),
DEVCB_NULL
};
@@ -176,9 +176,9 @@ ROM_END
static ADDRESS_MAP_START(raaspec_map , AS_PROGRAM, 8, vectrex_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0xa000, 0xa000) AM_WRITE_LEGACY(raaspec_led_w)
+ AM_RANGE(0xa000, 0xa000) AM_WRITE(raaspec_led_w)
AM_RANGE(0xc800, 0xcbff) AM_RAM AM_MIRROR(0x0400) AM_BASE(m_gce_vectorram) AM_SIZE(m_gce_vectorram_size)
- AM_RANGE(0xd000, 0xd7ff) AM_READWRITE_LEGACY(vectrex_via_r, vectrex_via_w)
+ AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(vectrex_via_r, vectrex_via_w)
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/vertigo.c b/src/mame/drivers/vertigo.c
index 8d27608a5e8..e2b879abc83 100644
--- a/src/mame/drivers/vertigo.c
+++ b/src/mame/drivers/vertigo.c
@@ -34,14 +34,14 @@ static ADDRESS_MAP_START( vertigo_map, AS_PROGRAM, 16, vertigo_state )
AM_RANGE(0x000000, 0x000007) AM_ROM
AM_RANGE(0x000008, 0x001fff) AM_RAM AM_MIRROR(0x010000)
AM_RANGE(0x002000, 0x003fff) AM_RAM AM_BASE(m_vectorram)
- AM_RANGE(0x004000, 0x00400f) AM_READ_LEGACY(vertigo_io_convert) AM_MIRROR(0x001000)
- AM_RANGE(0x004010, 0x00401f) AM_READ_LEGACY(vertigo_io_adc) AM_MIRROR(0x001000)
- AM_RANGE(0x004020, 0x00402f) AM_READ_LEGACY(vertigo_coin_r) AM_MIRROR(0x001000)
+ AM_RANGE(0x004000, 0x00400f) AM_READ(vertigo_io_convert) AM_MIRROR(0x001000)
+ AM_RANGE(0x004010, 0x00401f) AM_READ(vertigo_io_adc) AM_MIRROR(0x001000)
+ AM_RANGE(0x004020, 0x00402f) AM_READ(vertigo_coin_r) AM_MIRROR(0x001000)
AM_RANGE(0x004030, 0x00403f) AM_READ_PORT("GIO") AM_MIRROR(0x001000)
- AM_RANGE(0x004040, 0x00404f) AM_READ_LEGACY(vertigo_sio_r) AM_MIRROR(0x001000)
- AM_RANGE(0x004050, 0x00405f) AM_RAM_WRITE_LEGACY(vertigo_audio_w) AM_MIRROR(0x001000)
- AM_RANGE(0x004060, 0x00406f) AM_WRITE_LEGACY(vertigo_motor_w) AM_MIRROR(0x001000)
- AM_RANGE(0x004070, 0x00407f) AM_WRITE_LEGACY(vertigo_wsot_w) AM_MIRROR(0x001000)
+ AM_RANGE(0x004040, 0x00404f) AM_READ(vertigo_sio_r) AM_MIRROR(0x001000)
+ AM_RANGE(0x004050, 0x00405f) AM_RAM_WRITE(vertigo_audio_w) AM_MIRROR(0x001000)
+ AM_RANGE(0x004060, 0x00406f) AM_WRITE(vertigo_motor_w) AM_MIRROR(0x001000)
+ AM_RANGE(0x004070, 0x00407f) AM_WRITE(vertigo_wsot_w) AM_MIRROR(0x001000)
AM_RANGE(0x006000, 0x006007) AM_DEVREADWRITE_LEGACY("pit8254", vertigo_pit8254_lsb_r, vertigo_pit8254_lsb_w)
AM_RANGE(0x007000, 0x0073ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x800000, 0x81ffff) AM_ROM
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index b0d34728f93..7e73a604ad9 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -732,7 +732,7 @@ WRITE8_MEMBER(vicdual_state::headon2_io_w)
{
if (offset & 0x01) assert_coin_status(machine());
if (offset & 0x02) headon_audio_w(&space, 0, data);
- if (offset & 0x04) vicdual_palette_bank_w(&space, 0, data);
+ if (offset & 0x04) vicdual_palette_bank_w(space, 0, data);
if (offset & 0x08) { /* schematics show this as going into a shifer circuit, but never written to */ }
if (offset & 0x10) { /* schematics show this as going to an edge connector, but never written to */ }
if (offset & 0x18) logerror("********* Write to port %x\n", offset);
@@ -745,7 +745,7 @@ WRITE8_MEMBER(vicdual_state::digger_io_w)
if (offset & 0x02) { /* digger_audio_1_w(0, data) */ }
if (offset & 0x04)
{
- vicdual_palette_bank_w(&space, 0, data & 0x03);
+ vicdual_palette_bank_w(space, 0, data & 0x03);
/* digger_audio_2_w(0, data & 0xfc); */
}
@@ -947,7 +947,7 @@ WRITE8_MEMBER(vicdual_state::invho2_io_w)
if (offset & 0x01) invho2_audio_w(&space, 0, data);
if (offset & 0x02) invinco_audio_w(&space, 0, data);
if (offset & 0x08) assert_coin_status(machine());
- if (offset & 0x40) vicdual_palette_bank_w(&space, 0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(space, 0, data);
}
@@ -956,7 +956,7 @@ WRITE8_MEMBER(vicdual_state::invds_io_w)
if (offset & 0x01) invinco_audio_w(&space, 0, data);
if (offset & 0x02) { /* deepscan_audio_w(0, data) */ }
if (offset & 0x08) assert_coin_status(machine());
- if (offset & 0x40) vicdual_palette_bank_w(&space, 0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(space, 0, data);
}
@@ -965,14 +965,14 @@ WRITE8_MEMBER(vicdual_state::sspacaho_io_w)
if (offset & 0x01) invho2_audio_w(&space, 0, data);
if (offset & 0x02) { /* s&spaceatt_audio_w(&space, 0, data) */ }
if (offset & 0x08) assert_coin_status(machine());
- if (offset & 0x40) vicdual_palette_bank_w(&space, 0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(space, 0, data);
}
WRITE8_MEMBER(vicdual_state::tranqgun_io_w)
{
if (offset & 0x01) { /* tranqgun_audio_w(&space, 0, data) */ }
- if (offset & 0x02) vicdual_palette_bank_w(&space, 0, data);
+ if (offset & 0x02) vicdual_palette_bank_w(space, 0, data);
if (offset & 0x08) assert_coin_status(machine());
}
@@ -982,7 +982,7 @@ WRITE8_MEMBER(vicdual_state::spacetrk_io_w)
if (offset & 0x01) { /* &spacetrk_audio_w(&space, 0, data) */ }
if (offset & 0x02) { /* &spacetrk_audio_w(&space, 0, data) */ }
if (offset & 0x08) assert_coin_status(machine());
- if (offset & 0x40) vicdual_palette_bank_w(&space, 0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(space, 0, data);
}
@@ -991,14 +991,14 @@ WRITE8_MEMBER(vicdual_state::carnival_io_w)
if (offset & 0x01) carnival_audio_1_w(&space, 0, data);
if (offset & 0x02) carnival_audio_2_w(&space, 0, data);
if (offset & 0x08) assert_coin_status(machine());
- if (offset & 0x40) vicdual_palette_bank_w(&space, 0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(space, 0, data);
}
WRITE8_MEMBER(vicdual_state::brdrline_io_w)
{
if (offset & 0x01) { /* brdrline_audio_w(&space, 0, data) */ }
- if (offset & 0x02) vicdual_palette_bank_w(&space, 0, data);
+ if (offset & 0x02) vicdual_palette_bank_w(space, 0, data);
if (offset & 0x08) assert_coin_status(machine());
}
@@ -1008,7 +1008,7 @@ WRITE8_MEMBER(vicdual_state::pulsar_io_w)
if (offset & 0x01) pulsar_audio_1_w(&space, 0, data);
if (offset & 0x02) pulsar_audio_2_w(&space, 0, data);
if (offset & 0x08) assert_coin_status(machine());
- if (offset & 0x40) vicdual_palette_bank_w(&space, 0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(space, 0, data);
}
@@ -1018,7 +1018,7 @@ WRITE8_MEMBER(vicdual_state::heiankyo_io_w)
if (offset & 0x02)
{
- vicdual_palette_bank_w(&space, 0, data >> 6);
+ vicdual_palette_bank_w(space, 0, data >> 6);
/* heiankyo_audio_2_w(0, data & 0x3f); */
}
@@ -1031,7 +1031,7 @@ WRITE8_MEMBER(vicdual_state::alphaho_io_w)
if (offset & 0x01) { /* headon_audio_w(0, data) */ }
if (offset & 0x02) { /* alphaf_audio_w(0, data) */ }
if (offset & 0x08) assert_coin_status(machine());
- if (offset & 0x40) vicdual_palette_bank_w(&space, 0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(space, 0, data);
}
@@ -2066,7 +2066,7 @@ WRITE8_MEMBER(vicdual_state::samurai_io_w)
{
if (offset & 0x02) { /* samurai_audio_w(0, data) */ }
if (offset & 0x08) assert_coin_status(machine());
- if (offset & 0x40) vicdual_palette_bank_w(&space, 0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(space, 0, data);
}
@@ -2180,7 +2180,7 @@ WRITE8_MEMBER(vicdual_state::nsub_io_w)
{
if (offset & 0x01) assert_coin_status(machine());
if (offset & 0x02) { /* nsub_audio_w(0, data) */ }
- if (offset & 0x04) vicdual_palette_bank_w(&space, 0, data);
+ if (offset & 0x04) vicdual_palette_bank_w(space, 0, data);
}
@@ -2276,7 +2276,7 @@ WRITE8_MEMBER(vicdual_state::invinco_io_w)
{
if (offset & 0x01) assert_coin_status(machine());
if (offset & 0x02) invinco_audio_w(&space, 0, data);
- if (offset & 0x04) vicdual_palette_bank_w(&space, 0, data);
+ if (offset & 0x04) vicdual_palette_bank_w(space, 0, data);
}
diff --git a/src/mame/drivers/victory.c b/src/mame/drivers/victory.c
index b4b384c4707..c3087af7e7e 100644
--- a/src/mame/drivers/victory.c
+++ b/src/mame/drivers/victory.c
@@ -126,9 +126,9 @@ WRITE8_MEMBER(victory_state::lamp_control_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, victory_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc0ff) AM_READ_LEGACY(victory_video_control_r)
- AM_RANGE(0xc100, 0xc1ff) AM_WRITE_LEGACY(victory_video_control_w)
- AM_RANGE(0xc200, 0xc3ff) AM_WRITE_LEGACY(victory_paletteram_w)
+ AM_RANGE(0xc000, 0xc0ff) AM_READ(victory_video_control_r)
+ AM_RANGE(0xc100, 0xc1ff) AM_WRITE(victory_video_control_w)
+ AM_RANGE(0xc200, 0xc3ff) AM_WRITE(victory_paletteram_w)
AM_RANGE(0xc400, 0xc7ff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0xc800, 0xdfff) AM_RAM AM_BASE(m_charram)
AM_RANGE(0xe000, 0xefff) AM_RAM
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index 57127042f5a..35256746ab5 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -195,11 +195,11 @@ static WRITE8_DEVICE_HANDLER( videopin_note_dvsr_w )
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, videopin_state )
AM_RANGE(0x0000, 0x01ff) AM_RAM
- AM_RANGE(0x0200, 0x07ff) AM_RAM_WRITE_LEGACY(videopin_video_ram_w) AM_BASE(m_video_ram)
+ AM_RANGE(0x0200, 0x07ff) AM_RAM_WRITE(videopin_video_ram_w) AM_BASE(m_video_ram)
AM_RANGE(0x0800, 0x0800) AM_READ(videopin_misc_r) AM_DEVWRITE_LEGACY("discrete", videopin_note_dvsr_w)
AM_RANGE(0x0801, 0x0801) AM_WRITE(videopin_led_w)
AM_RANGE(0x0802, 0x0802) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x0804, 0x0804) AM_WRITE_LEGACY(videopin_ball_w)
+ AM_RANGE(0x0804, 0x0804) AM_WRITE(videopin_ball_w)
AM_RANGE(0x0805, 0x0805) AM_DEVWRITE_LEGACY("discrete", videopin_out1_w)
AM_RANGE(0x0806, 0x0806) AM_DEVWRITE_LEGACY("discrete", videopin_out2_w)
AM_RANGE(0x1000, 0x1000) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index 1f4174ca092..5d885906dab 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -65,7 +65,7 @@ static ADDRESS_MAP_START( vigilant_map, AS_PROGRAM, 8, vigilant_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* Fallthrough */
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc020, 0xc0df) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE_LEGACY(vigilant_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(vigilant_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0xd000, 0xdfff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
@@ -77,16 +77,16 @@ static ADDRESS_MAP_START( vigilant_io_map, AS_IO, 8, vigilant_state )
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2")
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2") AM_WRITE(vigilant_bank_select_w) /* PBANK */
- AM_RANGE(0x80, 0x81) AM_WRITE_LEGACY(vigilant_horiz_scroll_w) /* HSPL, HSPH */
- AM_RANGE(0x82, 0x83) AM_WRITE_LEGACY(vigilant_rear_horiz_scroll_w) /* RHSPL, RHSPH */
- AM_RANGE(0x84, 0x84) AM_WRITE_LEGACY(vigilant_rear_color_w) /* RCOD */
+ AM_RANGE(0x80, 0x81) AM_WRITE(vigilant_horiz_scroll_w) /* HSPL, HSPH */
+ AM_RANGE(0x82, 0x83) AM_WRITE(vigilant_rear_horiz_scroll_w) /* RHSPL, RHSPH */
+ AM_RANGE(0x84, 0x84) AM_WRITE(vigilant_rear_color_w) /* RCOD */
ADDRESS_MAP_END
static ADDRESS_MAP_START( kikcubic_map, AS_PROGRAM, 8, vigilant_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* Fallthrough */
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc0ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xc800, 0xcaff) AM_RAM_WRITE_LEGACY(vigilant_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc800, 0xcaff) AM_RAM_WRITE(vigilant_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0xd000, 0xdfff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index 5f06c1dce9d..7226812c6fb 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -66,16 +66,16 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, volfied_state )
AM_RANGE(0x080000, 0x0fffff) AM_ROM /* tiles */
AM_RANGE(0x100000, 0x103fff) AM_RAM /* main */
AM_RANGE(0x200000, 0x203fff) AM_DEVREADWRITE_LEGACY("pc090oj", pc090oj_word_r, pc090oj_word_w)
- AM_RANGE(0x400000, 0x47ffff) AM_READWRITE_LEGACY(volfied_video_ram_r, volfied_video_ram_w)
+ AM_RANGE(0x400000, 0x47ffff) AM_READWRITE(volfied_video_ram_r, volfied_video_ram_w)
AM_RANGE(0x500000, 0x503fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x600000, 0x600001) AM_WRITE_LEGACY(volfied_video_mask_w)
- AM_RANGE(0x700000, 0x700001) AM_WRITE_LEGACY(volfied_sprite_ctrl_w)
- AM_RANGE(0xd00000, 0xd00001) AM_READWRITE_LEGACY(volfied_video_ctrl_r, volfied_video_ctrl_w)
+ AM_RANGE(0x600000, 0x600001) AM_WRITE(volfied_video_mask_w)
+ AM_RANGE(0x700000, 0x700001) AM_WRITE(volfied_sprite_ctrl_w)
+ AM_RANGE(0xd00000, 0xd00001) AM_READWRITE(volfied_video_ctrl_r, volfied_video_ctrl_w)
AM_RANGE(0xe00000, 0xe00001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0xe00002, 0xe00003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
- AM_RANGE(0xf00000, 0xf007ff) AM_READWRITE_LEGACY(volfied_cchip_ram_r, volfied_cchip_ram_w)
- AM_RANGE(0xf00802, 0xf00803) AM_READWRITE_LEGACY(volfied_cchip_ctrl_r, volfied_cchip_ctrl_w)
- AM_RANGE(0xf00c00, 0xf00c01) AM_WRITE_LEGACY(volfied_cchip_bank_w)
+ AM_RANGE(0xf00000, 0xf007ff) AM_READWRITE(volfied_cchip_ram_r, volfied_cchip_ram_w)
+ AM_RANGE(0xf00802, 0xf00803) AM_READWRITE(volfied_cchip_ctrl_r, volfied_cchip_ctrl_w)
+ AM_RANGE(0xf00c00, 0xf00c01) AM_WRITE(volfied_cchip_bank_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( z80_map, AS_PROGRAM, 8, volfied_state )
diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c
index 55a0b1a60d8..9672c984027 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -215,8 +215,8 @@ static ADDRESS_MAP_START( vsnes_cpu1_map, AS_PROGRAM, 8, vsnes_state )
AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE_LEGACY("nes1", nes_psg_r, nes_psg_w)
AM_RANGE(0x4014, 0x4014) AM_WRITE(sprite_dma_0_w)
AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE_LEGACY("nes1", psg_4015_r, psg_4015_w) /* PSG status / first control register */
- AM_RANGE(0x4016, 0x4016) AM_READWRITE_LEGACY(vsnes_in0_r, vsnes_in0_w)
- AM_RANGE(0x4017, 0x4017) AM_READ_LEGACY(vsnes_in1_r) AM_DEVWRITE_LEGACY("nes1", psg_4017_w) /* IN1 - input port 2 / PSG second control register */
+ AM_RANGE(0x4016, 0x4016) AM_READWRITE(vsnes_in0_r, vsnes_in0_w)
+ AM_RANGE(0x4017, 0x4017) AM_READ(vsnes_in1_r) AM_DEVWRITE_LEGACY("nes1", psg_4017_w) /* IN1 - input port 2 / PSG second control register */
AM_RANGE(0x4020, 0x4020) AM_READWRITE(vsnes_coin_counter_r, vsnes_coin_counter_w)
AM_RANGE(0x6000, 0x7fff) AM_RAMBANK("extra1")
AM_RANGE(0x8000, 0xffff) AM_ROM
@@ -229,8 +229,8 @@ static ADDRESS_MAP_START( vsnes_cpu2_map, AS_PROGRAM, 8, vsnes_state )
AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE_LEGACY("nes2", nes_psg_r, nes_psg_w)
AM_RANGE(0x4014, 0x4014) AM_WRITE(sprite_dma_1_w)
AM_RANGE(0x4015, 0x4015) AM_DEVREADWRITE_LEGACY("nes2", psg_4015_r, psg_4015_w) /* PSG status / first control register */
- AM_RANGE(0x4016, 0x4016) AM_READWRITE_LEGACY(vsnes_in0_1_r, vsnes_in0_1_w)
- AM_RANGE(0x4017, 0x4017) AM_READ_LEGACY(vsnes_in1_1_r) AM_DEVWRITE_LEGACY("nes2", psg_4017_w) /* IN1 - input port 2 / PSG second control register */
+ AM_RANGE(0x4016, 0x4016) AM_READWRITE(vsnes_in0_1_r, vsnes_in0_1_w)
+ AM_RANGE(0x4017, 0x4017) AM_READ(vsnes_in1_1_r) AM_DEVWRITE_LEGACY("nes2", psg_4017_w) /* IN1 - input port 2 / PSG second control register */
AM_RANGE(0x4020, 0x4020) AM_WRITE(vsnes_coin_counter_1_w)
AM_RANGE(0x6000, 0x7fff) AM_RAMBANK("extra2")
AM_RANGE(0x8000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c
index 389f470931f..e0e4f123a88 100644
--- a/src/mame/drivers/vulgus.c
+++ b/src/mame/drivers/vulgus.c
@@ -59,12 +59,12 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, vulgus_state )
AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSW2")
AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w)
AM_RANGE(0xc802, 0xc803) AM_RAM AM_BASE(m_scroll_low)
- AM_RANGE(0xc804, 0xc804) AM_WRITE_LEGACY(vulgus_c804_w)
- AM_RANGE(0xc805, 0xc805) AM_WRITE_LEGACY(vulgus_palette_bank_w)
+ AM_RANGE(0xc804, 0xc804) AM_WRITE(vulgus_c804_w)
+ AM_RANGE(0xc805, 0xc805) AM_WRITE(vulgus_palette_bank_w)
AM_RANGE(0xc902, 0xc903) AM_RAM AM_BASE(m_scroll_high)
AM_RANGE(0xcc00, 0xcc7f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE_LEGACY(vulgus_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE_LEGACY(vulgus_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(vulgus_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(vulgus_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index b5ffeddb734..21bb97bc3b6 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -173,7 +173,7 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw )
}
else
{
- mainspace->install_legacy_read_handler(0x8000, 0x8fff, FUNC(wardner_sprite_r));
+ mainspace->install_read_handler(0x8000, 0x8fff, read8_delegate(FUNC(wardner_state::wardner_sprite_r),state));
mainspace->install_read_bank(0xa000, 0xadff, "bank4");
mainspace->install_read_bank(0xae00, 0xafff, "bank2");
mainspace->install_read_bank(0xc000, 0xc7ff, "bank3");
@@ -203,7 +203,7 @@ static ADDRESS_MAP_START( main_program_map, AS_PROGRAM, 8, wardner_state )
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") /* Overlapped RAM/Banked ROM - See below */
- AM_RANGE(0x8000, 0x8fff) AM_WRITE_LEGACY(wardner_sprite_w) AM_SHARE("spriteram")
+ AM_RANGE(0x8000, 0x8fff) AM_WRITE(wardner_sprite_w) AM_SHARE("spriteram")
AM_RANGE(0x9000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xadff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_le_w) AM_SHARE("paletteram")
AM_RANGE(0xae00, 0xafff) AM_RAM AM_BASE(m_rambase_ae00)
@@ -216,21 +216,21 @@ static ADDRESS_MAP_START( main_io_map, AS_IO, 8, wardner_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("crtc", mc6845_device, address_w)
AM_RANGE(0x02, 0x02) AM_DEVWRITE("crtc", mc6845_device, register_w)
- AM_RANGE(0x10, 0x13) AM_WRITE_LEGACY(wardner_txscroll_w) /* scroll text layer */
- AM_RANGE(0x14, 0x15) AM_WRITE_LEGACY(wardner_txlayer_w) /* offset in text video RAM */
- AM_RANGE(0x20, 0x23) AM_WRITE_LEGACY(wardner_bgscroll_w) /* scroll bg layer */
- AM_RANGE(0x24, 0x25) AM_WRITE_LEGACY(wardner_bglayer_w) /* offset in bg video RAM */
- AM_RANGE(0x30, 0x33) AM_WRITE_LEGACY(wardner_fgscroll_w) /* scroll fg layer */
- AM_RANGE(0x34, 0x35) AM_WRITE_LEGACY(wardner_fglayer_w) /* offset in fg video RAM */
- AM_RANGE(0x40, 0x43) AM_WRITE_LEGACY(wardner_exscroll_w) /* scroll extra layer (not used) */
+ AM_RANGE(0x10, 0x13) AM_WRITE(wardner_txscroll_w) /* scroll text layer */
+ AM_RANGE(0x14, 0x15) AM_WRITE(wardner_txlayer_w) /* offset in text video RAM */
+ AM_RANGE(0x20, 0x23) AM_WRITE(wardner_bgscroll_w) /* scroll bg layer */
+ AM_RANGE(0x24, 0x25) AM_WRITE(wardner_bglayer_w) /* offset in bg video RAM */
+ AM_RANGE(0x30, 0x33) AM_WRITE(wardner_fgscroll_w) /* scroll fg layer */
+ AM_RANGE(0x34, 0x35) AM_WRITE(wardner_fglayer_w) /* offset in fg video RAM */
+ AM_RANGE(0x40, 0x43) AM_WRITE(wardner_exscroll_w) /* scroll extra layer (not used) */
AM_RANGE(0x50, 0x50) AM_READ_PORT("DSWA")
AM_RANGE(0x52, 0x52) AM_READ_PORT("DSWB")
AM_RANGE(0x54, 0x54) AM_READ_PORT("P1")
AM_RANGE(0x56, 0x56) AM_READ_PORT("P2")
AM_RANGE(0x58, 0x58) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x5a, 0x5a) AM_WRITE_LEGACY(wardner_coin_dsp_w) /* Machine system control */
- AM_RANGE(0x5c, 0x5c) AM_WRITE_LEGACY(wardner_control_w) /* Machine system control */
- AM_RANGE(0x60, 0x65) AM_READWRITE_LEGACY(wardner_videoram_r, wardner_videoram_w) /* data from video layer RAM */
+ AM_RANGE(0x5a, 0x5a) AM_WRITE(wardner_coin_dsp_w) /* Machine system control */
+ AM_RANGE(0x5c, 0x5c) AM_WRITE(wardner_control_w) /* Machine system control */
+ AM_RANGE(0x60, 0x65) AM_READWRITE(wardner_videoram_r, wardner_videoram_w) /* data from video layer RAM */
AM_RANGE(0x70, 0x70) AM_WRITE_LEGACY(wardner_ramrom_bank_sw) /* ROM bank select */
ADDRESS_MAP_END
@@ -260,10 +260,10 @@ ADDRESS_MAP_END
/* $000 - 08F TMS32010 Internal Data RAM in Data Address Space */
static ADDRESS_MAP_START( DSP_io_map, AS_IO, 16, wardner_state )
- AM_RANGE(0, 0) AM_WRITE_LEGACY(wardner_dsp_addrsel_w)
- AM_RANGE(1, 1) AM_READWRITE_LEGACY(wardner_dsp_r, wardner_dsp_w)
- AM_RANGE(3, 3) AM_WRITE_LEGACY(twincobr_dsp_bio_w)
- AM_RANGE(TMS32010_BIO, TMS32010_BIO) AM_READ_LEGACY(twincobr_BIO_r)
+ AM_RANGE(0, 0) AM_WRITE(wardner_dsp_addrsel_w)
+ AM_RANGE(1, 1) AM_READWRITE(wardner_dsp_r, wardner_dsp_w)
+ AM_RANGE(3, 3) AM_WRITE(twincobr_dsp_bio_w)
+ AM_RANGE(TMS32010_BIO, TMS32010_BIO) AM_READ(twincobr_BIO_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index 57b9c832631..c29b17c1a0b 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -314,7 +314,7 @@ WRITE8_MEMBER(warpwarp_state::warpwarp_out3_w)
static ADDRESS_MAP_START( geebee_map, AS_PROGRAM, 8, warpwarp_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x400) AM_RAM_WRITE_LEGACY(geebee_videoram_w) AM_BASE(m_geebee_videoram) // mirror used by kaitei due to a bug
+ AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x400) AM_RAM_WRITE(geebee_videoram_w) AM_BASE(m_geebee_videoram) // mirror used by kaitei due to a bug
AM_RANGE(0x3000, 0x37ff) AM_ROM AM_REGION("gfx1", 0) // 3000-33ff in geebee
AM_RANGE(0x4000, 0x40ff) AM_RAM
AM_RANGE(0x5000, 0x53ff) AM_READ(geebee_in_r)
@@ -332,7 +332,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bombbee_map, AS_PROGRAM, 8, warpwarp_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
- AM_RANGE(0x4000, 0x47ff) AM_RAM_WRITE_LEGACY(warpwarp_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4000, 0x47ff) AM_RAM_WRITE(warpwarp_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4800, 0x4fff) AM_ROM AM_REGION("gfx1", 0)
AM_RANGE(0x6000, 0x600f) AM_READWRITE(warpwarp_sw_r, warpwarp_out0_w)
AM_RANGE(0x6010, 0x601f) AM_DEVREADWRITE_LEGACY("warpwarp", warpwarp_vol_r, warpwarp_music1_w)
@@ -343,7 +343,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( warpwarp_map, AS_PROGRAM, 8, warpwarp_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
- AM_RANGE(0x4000, 0x47ff) AM_RAM_WRITE_LEGACY(warpwarp_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x4000, 0x47ff) AM_RAM_WRITE(warpwarp_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x4800, 0x4fff) AM_ROM AM_REGION("gfx1", 0)
AM_RANGE(0xc000, 0xc00f) AM_READWRITE(warpwarp_sw_r, warpwarp_out0_w)
AM_RANGE(0xc010, 0xc01f) AM_DEVREADWRITE_LEGACY("warpwarp", warpwarp_vol_r, warpwarp_music1_w)
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index 9dda932eb36..f903efeb31d 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -111,11 +111,11 @@ WRITE8_MEMBER(wc90_state::wc90_sound_command_w)
static ADDRESS_MAP_START( wc90_map_1, AS_PROGRAM, 8, wc90_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM /* Main RAM */
- AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE_LEGACY(wc90_fgvideoram_w) AM_BASE(m_fgvideoram) /* fg video ram */
+ AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(wc90_fgvideoram_w) AM_BASE(m_fgvideoram) /* fg video ram */
AM_RANGE(0xb000, 0xbfff) AM_RAM
- AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE_LEGACY(wc90_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(wc90_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0xd000, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE_LEGACY(wc90_txvideoram_w) AM_BASE(m_txvideoram) /* tx video ram */
+ AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(wc90_txvideoram_w) AM_BASE(m_txvideoram) /* tx video ram */
AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1")
AM_RANGE(0xf800, 0xfbff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xfc00, 0xfc00) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index 1a24abec2f0..deb84694d59 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -141,9 +141,9 @@ WRITE8_MEMBER(wc90b_state::adpcm_data_w)
static ADDRESS_MAP_START( wc90b_map1, AS_PROGRAM, 8, wc90b_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM /* Main RAM */
- AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE_LEGACY(wc90b_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE_LEGACY(wc90b_bgvideoram_w) AM_BASE(m_bgvideoram)
- AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE_LEGACY(wc90b_txvideoram_w) AM_BASE(m_txvideoram)
+ AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(wc90b_fgvideoram_w) AM_BASE(m_fgvideoram)
+ AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(wc90b_bgvideoram_w) AM_BASE(m_bgvideoram)
+ AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(wc90b_txvideoram_w) AM_BASE(m_txvideoram)
AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1")
AM_RANGE(0xf800, 0xfbff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xfc00, 0xfc00) AM_WRITE(wc90b_bankswitch_w)
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index 4d16ae01096..7b34bf435f8 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -494,14 +494,14 @@ WRITE16_MEMBER(wecleman_state::blitter_w)
static ADDRESS_MAP_START( wecleman_map, AS_PROGRAM, 16, wecleman_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM (03c000-03ffff used as RAM sometimes!)
- AM_RANGE(0x040494, 0x040495) AM_WRITE_LEGACY(wecleman_videostatus_w) AM_BASE(m_videostatus) // cloud blending control (HACK)
+ AM_RANGE(0x040494, 0x040495) AM_WRITE(wecleman_videostatus_w) AM_BASE(m_videostatus) // cloud blending control (HACK)
AM_RANGE(0x040000, 0x043fff) AM_RAM // RAM
AM_RANGE(0x060000, 0x060005) AM_WRITE(wecleman_protection_w) AM_BASE(m_protection_ram)
AM_RANGE(0x060006, 0x060007) AM_READ(wecleman_protection_r) // MCU read
AM_RANGE(0x080000, 0x080011) AM_RAM_WRITE(blitter_w) AM_BASE(m_blitter_regs) // Blitter
- AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE_LEGACY(wecleman_pageram_w) AM_BASE(m_pageram) // Background Layers
- AM_RANGE(0x108000, 0x108fff) AM_RAM_WRITE_LEGACY(wecleman_txtram_w) AM_BASE(m_txtram) // Text Layer
- AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE_LEGACY(wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(wecleman_pageram_w) AM_BASE(m_pageram) // Background Layers
+ AM_RANGE(0x108000, 0x108fff) AM_RAM_WRITE(wecleman_txtram_w) AM_BASE(m_txtram) // Text Layer
+ AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE(wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x124000, 0x127fff) AM_RAM AM_SHARE("share1") // Shared with main CPU
AM_RANGE(0x130000, 0x130fff) AM_RAM AM_BASE(m_spriteram) // Sprites
AM_RANGE(0x140000, 0x140001) AM_WRITE(wecleman_soundlatch_w) // To sound CPU
@@ -533,7 +533,7 @@ static ADDRESS_MAP_START( hotchase_map, AS_PROGRAM, 16, wecleman_state )
AM_RANGE(0x101000, 0x10101f) AM_DEVWRITE8_LEGACY("k051316_1", k051316_ctrl_w, 0x00ff) // Background Ctrl
AM_RANGE(0x102000, 0x102fff) AM_DEVREADWRITE8_LEGACY("k051316_2", k051316_r, k051316_w, 0x00ff) // Foreground
AM_RANGE(0x103000, 0x10301f) AM_DEVWRITE8_LEGACY("k051316_2", k051316_ctrl_w, 0x00ff) // Foreground Ctrl
- AM_RANGE(0x110000, 0x111fff) AM_RAM_WRITE_LEGACY(hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x110000, 0x111fff) AM_RAM_WRITE(hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x120000, 0x123fff) AM_RAM AM_SHARE("share1") // Shared with sub CPU
AM_RANGE(0x130000, 0x130fff) AM_RAM AM_BASE(m_spriteram) // Sprites
AM_RANGE(0x140000, 0x140001) AM_WRITE(hotchase_soundlatch_w) // To sound CPU
@@ -583,7 +583,7 @@ WRITE16_MEMBER(wecleman_state::wecleman_soundlatch_w)
{
if (ACCESSING_BITS_0_7)
{
- soundlatch_w(*&space, 0, data & 0xFF);
+ soundlatch_w(space, 0, data & 0xFF);
cputag_set_input_line(machine(), "audiocpu", 0, HOLD_LINE);
}
}
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index bde41eda9ff..b617571091e 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -357,15 +357,15 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, welltris_state )
AM_RANGE(0x100000, 0x17ffff) AM_ROM
AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_BASE(m_pixelram) /* Graph_1 & 2*/
AM_RANGE(0xff8000, 0xffbfff) AM_RAM /* work */
- AM_RANGE(0xffc000, 0xffc3ff) AM_RAM_WRITE_LEGACY(welltris_spriteram_w) AM_BASE(m_spriteram) /* Sprite */
- AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE_LEGACY(welltris_charvideoram_w) AM_BASE(m_charvideoram) /* Char */
+ AM_RANGE(0xffc000, 0xffc3ff) AM_RAM_WRITE(welltris_spriteram_w) AM_BASE(m_spriteram) /* Sprite */
+ AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE(welltris_charvideoram_w) AM_BASE(m_charvideoram) /* Char */
AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("P1") /* Bottom Controls */
- AM_RANGE(0xfff000, 0xfff001) AM_WRITE_LEGACY(welltris_palette_bank_w)
+ AM_RANGE(0xfff000, 0xfff001) AM_WRITE(welltris_palette_bank_w)
AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("P2") /* Top Controls */
- AM_RANGE(0xfff002, 0xfff003) AM_WRITE_LEGACY(welltris_gfxbank_w)
+ AM_RANGE(0xfff002, 0xfff003) AM_WRITE(welltris_gfxbank_w)
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("P3") /* Left Side Ctrls */
- AM_RANGE(0xfff004, 0xfff007) AM_WRITE_LEGACY(welltris_scrollreg_w)
+ AM_RANGE(0xfff004, 0xfff007) AM_WRITE(welltris_scrollreg_w)
AM_RANGE(0xfff006, 0xfff007) AM_READ_PORT("P4") /* Right Side Ctrls */
AM_RANGE(0xfff008, 0xfff009) AM_READ_PORT("SYSTEM") /* Bit 5 Tested at start of irq 1 */
AM_RANGE(0xfff008, 0xfff009) AM_WRITE(sound_command_w)
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index 0fce8c605f7..47437ca9207 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -653,8 +653,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, wgp_state )
AM_RANGE(0x40c000, 0x40dfff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* sprite ram */
AM_RANGE(0x40fff0, 0x40fff1) AM_WRITENOP /* ?? (writes 0x8000 and 0 alternately - Wgp2 just 0) */
AM_RANGE(0x500000, 0x501fff) AM_RAM /* unknown/unused */
- AM_RANGE(0x502000, 0x517fff) AM_READWRITE_LEGACY(wgp_pivram_word_r, wgp_pivram_word_w) AM_BASE(m_pivram) /* piv tilemaps */
- AM_RANGE(0x520000, 0x52001f) AM_READWRITE_LEGACY(wgp_piv_ctrl_word_r, wgp_piv_ctrl_word_w) AM_BASE(m_piv_ctrlram)
+ AM_RANGE(0x502000, 0x517fff) AM_READWRITE(wgp_pivram_word_r, wgp_pivram_word_w) AM_BASE(m_pivram) /* piv tilemaps */
+ AM_RANGE(0x520000, 0x52001f) AM_READWRITE(wgp_piv_ctrl_word_r, wgp_piv_ctrl_word_w) AM_BASE(m_piv_ctrlram)
AM_RANGE(0x600000, 0x600003) AM_WRITE(rotate_port_w) /* rotation control ? */
AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index fd5a23d5214..8536a523f0e 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -515,23 +515,24 @@ static ADDRESS_MAP_START( defender_map, AS_PROGRAM, 8, williams_state )
AM_RANGE(0xc000, 0xc00f) AM_SHARE("paletteram")
AM_RANGE(0xc400, 0xc4ff) AM_SHARE("nvram")
AM_RANGE(0xc000, 0xcfff) AM_ROMBANK("bank1")
- AM_RANGE(0xd000, 0xdfff) AM_WRITE_LEGACY(defender_bank_select_w)
+ AM_RANGE(0xd000, 0xdfff) AM_WRITE(defender_bank_select_w)
AM_RANGE(0xd000, 0xffff) AM_ROM
ADDRESS_MAP_END
void defender_install_io_space(address_space *space)
{
+ williams_state *state = space->machine().driver_data<williams_state>();
pia6821_device *pia_0 = space->machine().device<pia6821_device>("pia_0");
pia6821_device *pia_1 = space->machine().device<pia6821_device>("pia_1");
/* this routine dynamically installs the memory mapped above from c000-cfff */
space->install_write_bank (0xc000, 0xc00f, 0, 0x03e0, "bank4");
- space->install_legacy_write_handler (0xc010, 0xc01f, 0, 0x03e0, FUNC(defender_video_control_w));
- space->install_legacy_write_handler (0xc3ff, 0xc3ff, FUNC(williams_watchdog_reset_w));
+ space->install_write_handler (0xc010, 0xc01f, 0, 0x03e0, write8_delegate(FUNC(williams_state::defender_video_control_w),state));
+ space->install_write_handler (0xc3ff, 0xc3ff, write8_delegate(FUNC(williams_state::williams_watchdog_reset_w),state));
space->install_read_bank(0xc400, 0xc4ff, 0, 0x0300, "bank3");
- space->install_legacy_write_handler(0xc400, 0xc4ff, 0, 0x0300, FUNC(williams_cmos_w));
- space->install_legacy_read_handler (0xc800, 0xcbff, 0, 0x03e0, FUNC(williams_video_counter_r));
+ space->install_write_handler(0xc400, 0xc4ff, 0, 0x0300, write8_delegate(FUNC(williams_state::williams_cmos_w),state));
+ space->install_read_handler (0xc800, 0xcbff, 0, 0x03e0, read8_delegate(FUNC(williams_state::williams_video_counter_r),state));
space->install_readwrite_handler(0xcc00, 0xcc03, 0, 0x03e0, read8_delegate(FUNC(pia6821_device::read), pia_1), write8_delegate(FUNC(pia6821_device::write), pia_1));
space->install_readwrite_handler(0xcc04, 0xcc07, 0, 0x03e0, read8_delegate(FUNC(pia6821_device::read), pia_0), write8_delegate(FUNC(pia6821_device::write), pia_0));
memory_set_bankptr(space->machine(), "bank3", space->machine().driver_data<williams_state>()->m_nvram);
@@ -552,11 +553,11 @@ static ADDRESS_MAP_START( williams_map, AS_PROGRAM, 8, williams_state )
AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITEONLY AM_SHARE("paletteram")
AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_0", pia6821_device, read, write)
AM_RANGE(0xc80c, 0xc80f) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_1", pia6821_device, read, write)
- AM_RANGE(0xc900, 0xc9ff) AM_WRITE_LEGACY(williams_vram_select_w)
- AM_RANGE(0xca00, 0xca07) AM_MIRROR(0x00f8) AM_WRITE_LEGACY(williams_blitter_w)
- AM_RANGE(0xcb00, 0xcbff) AM_READ_LEGACY(williams_video_counter_r)
- AM_RANGE(0xcbff, 0xcbff) AM_WRITE_LEGACY(williams_watchdog_reset_w)
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE_LEGACY(williams_cmos_w) AM_SHARE("nvram")
+ AM_RANGE(0xc900, 0xc9ff) AM_WRITE(williams_vram_select_w)
+ AM_RANGE(0xca00, 0xca07) AM_MIRROR(0x00f8) AM_WRITE(williams_blitter_w)
+ AM_RANGE(0xcb00, 0xcbff) AM_READ(williams_video_counter_r)
+ AM_RANGE(0xcbff, 0xcbff) AM_WRITE(williams_watchdog_reset_w)
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_SHARE("nvram")
AM_RANGE(0xd000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -567,11 +568,11 @@ static ADDRESS_MAP_START( williams_extra_ram_map, AS_PROGRAM, 8, williams_state
AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITEONLY AM_SHARE("paletteram")
AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_0", pia6821_device, read, write)
AM_RANGE(0xc80c, 0xc80f) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_1", pia6821_device, read, write)
- AM_RANGE(0xc900, 0xc9ff) AM_WRITE_LEGACY(sinistar_vram_select_w)
- AM_RANGE(0xca00, 0xca07) AM_MIRROR(0x00f8) AM_WRITE_LEGACY(williams_blitter_w)
- AM_RANGE(0xcb00, 0xcbff) AM_READ_LEGACY(williams_video_counter_r)
- AM_RANGE(0xcbff, 0xcbff) AM_WRITE_LEGACY(williams_watchdog_reset_w)
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE_LEGACY(williams_cmos_w) AM_SHARE("nvram")
+ AM_RANGE(0xc900, 0xc9ff) AM_WRITE(sinistar_vram_select_w)
+ AM_RANGE(0xca00, 0xca07) AM_MIRROR(0x00f8) AM_WRITE(williams_blitter_w)
+ AM_RANGE(0xcb00, 0xcbff) AM_READ(williams_video_counter_r)
+ AM_RANGE(0xcbff, 0xcbff) AM_WRITE(williams_watchdog_reset_w)
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_SHARE("nvram")
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -593,14 +594,14 @@ static ADDRESS_MAP_START( blaster_map, AS_PROGRAM, 8, williams_state )
AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITEONLY AM_SHARE("paletteram")
AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_0", pia6821_device, read, write)
AM_RANGE(0xc80c, 0xc80f) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_1", pia6821_device, read, write)
- AM_RANGE(0xc900, 0xc93f) AM_WRITE_LEGACY(blaster_vram_select_w)
- AM_RANGE(0xc940, 0xc97f) AM_WRITE_LEGACY(blaster_remap_select_w)
- AM_RANGE(0xc980, 0xc9bf) AM_WRITE_LEGACY(blaster_bank_select_w)
- AM_RANGE(0xc9c0, 0xc9ff) AM_WRITE_LEGACY(blaster_video_control_w)
- AM_RANGE(0xca00, 0xca07) AM_MIRROR(0x00f8) AM_WRITE_LEGACY(williams_blitter_w)
- AM_RANGE(0xcb00, 0xcbff) AM_READ_LEGACY(williams_video_counter_r)
- AM_RANGE(0xcbff, 0xcbff) AM_WRITE_LEGACY(williams_watchdog_reset_w)
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE_LEGACY(williams_cmos_w) AM_SHARE("nvram")
+ AM_RANGE(0xc900, 0xc93f) AM_WRITE(blaster_vram_select_w)
+ AM_RANGE(0xc940, 0xc97f) AM_WRITE(blaster_remap_select_w)
+ AM_RANGE(0xc980, 0xc9bf) AM_WRITE(blaster_bank_select_w)
+ AM_RANGE(0xc9c0, 0xc9ff) AM_WRITE(blaster_video_control_w)
+ AM_RANGE(0xca00, 0xca07) AM_MIRROR(0x00f8) AM_WRITE(williams_blitter_w)
+ AM_RANGE(0xcb00, 0xcbff) AM_READ(williams_video_counter_r)
+ AM_RANGE(0xcbff, 0xcbff) AM_WRITE(williams_watchdog_reset_w)
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_SHARE("nvram")
AM_RANGE(0xd000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -615,21 +616,21 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( williams2_map, AS_PROGRAM, 8, williams_state )
AM_RANGE(0x0000, 0x7fff) AM_READ_BANK("bank1") AM_WRITEONLY AM_BASE(m_videoram)
AM_RANGE(0x8000, 0xbfff) AM_RAM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(williams2_tileram_w) AM_BASE(m_williams2_tileram)
- AM_RANGE(0xc800, 0xc87f) AM_WRITE_LEGACY(williams2_bank_select_w)
- AM_RANGE(0xc880, 0xc887) AM_MIRROR(0x0078) AM_WRITE_LEGACY(williams_blitter_w)
- AM_RANGE(0xc900, 0xc97f) AM_WRITE_LEGACY(williams2_watchdog_reset_w)
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(williams2_tileram_w) AM_BASE(m_williams2_tileram)
+ AM_RANGE(0xc800, 0xc87f) AM_WRITE(williams2_bank_select_w)
+ AM_RANGE(0xc880, 0xc887) AM_MIRROR(0x0078) AM_WRITE(williams_blitter_w)
+ AM_RANGE(0xc900, 0xc97f) AM_WRITE(williams2_watchdog_reset_w)
AM_RANGE(0xc980, 0xc983) AM_MIRROR(0x0070) AM_DEVREADWRITE("pia_1", pia6821_device, read, write)
AM_RANGE(0xc984, 0xc987) AM_MIRROR(0x0070) AM_DEVREADWRITE("pia_0", pia6821_device, read, write)
- AM_RANGE(0xc98c, 0xc98f) AM_MIRROR(0x0070) AM_WRITE_LEGACY(williams2_7segment_w)
- AM_RANGE(0xcb00, 0xcb1f) AM_WRITE_LEGACY(williams2_fg_select_w)
- AM_RANGE(0xcb20, 0xcb3f) AM_WRITE_LEGACY(williams2_bg_select_w)
- AM_RANGE(0xcb40, 0xcb5f) AM_WRITE_LEGACY(williams2_xscroll_low_w)
- AM_RANGE(0xcb60, 0xcb7f) AM_WRITE_LEGACY(williams2_xscroll_high_w)
- AM_RANGE(0xcb80, 0xcb9f) AM_WRITE_LEGACY(defender_video_control_w)
- AM_RANGE(0xcba0, 0xcbbf) AM_WRITE_LEGACY(williams2_blit_window_enable_w)
- AM_RANGE(0xcbe0, 0xcbef) AM_READ_LEGACY(williams2_video_counter_r)
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE_LEGACY(williams_cmos_w) AM_SHARE("nvram")
+ AM_RANGE(0xc98c, 0xc98f) AM_MIRROR(0x0070) AM_WRITE(williams2_7segment_w)
+ AM_RANGE(0xcb00, 0xcb1f) AM_WRITE(williams2_fg_select_w)
+ AM_RANGE(0xcb20, 0xcb3f) AM_WRITE(williams2_bg_select_w)
+ AM_RANGE(0xcb40, 0xcb5f) AM_WRITE(williams2_xscroll_low_w)
+ AM_RANGE(0xcb60, 0xcb7f) AM_WRITE(williams2_xscroll_high_w)
+ AM_RANGE(0xcb80, 0xcb9f) AM_WRITE(defender_video_control_w)
+ AM_RANGE(0xcba0, 0xcbbf) AM_WRITE(williams2_blit_window_enable_w)
+ AM_RANGE(0xcbe0, 0xcbef) AM_READ(williams2_video_counter_r)
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_SHARE("nvram")
AM_RANGE(0xd000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -637,21 +638,21 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( williams2_extra_ram_map, AS_PROGRAM, 8, williams_state )
AM_RANGE(0x0000, 0x7fff) AM_READ_BANK("bank1") AM_WRITEONLY AM_BASE(m_videoram)
AM_RANGE(0x8000, 0xbfff) AM_RAM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE_LEGACY(williams2_tileram_w) AM_BASE(m_williams2_tileram)
- AM_RANGE(0xc800, 0xc87f) AM_WRITE_LEGACY(williams2_bank_select_w)
- AM_RANGE(0xc880, 0xc887) AM_MIRROR(0x0078) AM_WRITE_LEGACY(williams_blitter_w)
- AM_RANGE(0xc900, 0xc97f) AM_WRITE_LEGACY(williams2_watchdog_reset_w)
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(williams2_tileram_w) AM_BASE(m_williams2_tileram)
+ AM_RANGE(0xc800, 0xc87f) AM_WRITE(williams2_bank_select_w)
+ AM_RANGE(0xc880, 0xc887) AM_MIRROR(0x0078) AM_WRITE(williams_blitter_w)
+ AM_RANGE(0xc900, 0xc97f) AM_WRITE(williams2_watchdog_reset_w)
AM_RANGE(0xc980, 0xc983) AM_MIRROR(0x0070) AM_DEVREADWRITE("pia_1", pia6821_device, read, write)
AM_RANGE(0xc984, 0xc987) AM_MIRROR(0x0070) AM_DEVREADWRITE("pia_0", pia6821_device, read, write)
- AM_RANGE(0xc98c, 0xc98f) AM_MIRROR(0x0070) AM_WRITE_LEGACY(williams2_7segment_w)
- AM_RANGE(0xcb00, 0xcb1f) AM_WRITE_LEGACY(williams2_fg_select_w)
- AM_RANGE(0xcb20, 0xcb3f) AM_WRITE_LEGACY(williams2_bg_select_w)
- AM_RANGE(0xcb40, 0xcb5f) AM_WRITE_LEGACY(williams2_xscroll_low_w)
- AM_RANGE(0xcb60, 0xcb7f) AM_WRITE_LEGACY(williams2_xscroll_high_w)
- AM_RANGE(0xcb80, 0xcb9f) AM_WRITE_LEGACY(defender_video_control_w)
- AM_RANGE(0xcba0, 0xcbbf) AM_WRITE_LEGACY(williams2_blit_window_enable_w)
- AM_RANGE(0xcbe0, 0xcbef) AM_READ_LEGACY(williams2_video_counter_r)
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE_LEGACY(williams_cmos_w) AM_SHARE("nvram")
+ AM_RANGE(0xc98c, 0xc98f) AM_MIRROR(0x0070) AM_WRITE(williams2_7segment_w)
+ AM_RANGE(0xcb00, 0xcb1f) AM_WRITE(williams2_fg_select_w)
+ AM_RANGE(0xcb20, 0xcb3f) AM_WRITE(williams2_bg_select_w)
+ AM_RANGE(0xcb40, 0xcb5f) AM_WRITE(williams2_xscroll_low_w)
+ AM_RANGE(0xcb60, 0xcb7f) AM_WRITE(williams2_xscroll_high_w)
+ AM_RANGE(0xcb80, 0xcb9f) AM_WRITE(defender_video_control_w)
+ AM_RANGE(0xcba0, 0xcbbf) AM_WRITE(williams2_blit_window_enable_w)
+ AM_RANGE(0xcbe0, 0xcbef) AM_READ(williams2_video_counter_r)
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(williams_cmos_w) AM_SHARE("nvram")
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -2747,7 +2748,7 @@ static DRIVER_INIT( mayday )
CONFIGURE_BLITTER(WILLIAMS_BLITTER_NONE, 0x0000);
/* install a handler to catch protection checks */
- state->m_mayday_protection = machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa190, 0xa191, FUNC(mayday_protection_r));
+ state->m_mayday_protection = machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xa190, 0xa191, read8_delegate(FUNC(williams_state::mayday_protection_r),state));
}
@@ -2785,7 +2786,7 @@ static DRIVER_INIT( bubbles )
CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000);
/* bubbles has a full 8-bit-wide CMOS */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xcc00, 0xcfff, FUNC(bubbles_cmos_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xcc00, 0xcfff, write8_delegate(FUNC(williams_state::bubbles_cmos_w),state));
}
diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c
index 0a04a648a4a..4652cfeeaa7 100644
--- a/src/mame/drivers/wiping.c
+++ b/src/mame/drivers/wiping.c
@@ -78,7 +78,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, wiping_state )
AM_RANGE(0x9000, 0x93ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x9800, 0x9bff) AM_RAM AM_SHARE("share2")
AM_RANGE(0xa000, 0xa000) AM_WRITE(main_irq_mask_w)
- AM_RANGE(0xa002, 0xa002) AM_WRITE_LEGACY(wiping_flipscreen_w)
+ AM_RANGE(0xa002, 0xa002) AM_WRITE(wiping_flipscreen_w)
AM_RANGE(0xa003, 0xa003) AM_WRITE(subcpu_reset_w)
AM_RANGE(0xa800, 0xa807) AM_READ(ports_r)
AM_RANGE(0xb000, 0xb7ff) AM_RAM
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index b6466cd40d8..995a2492697 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -237,17 +237,17 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, wiz_state )
AM_RANGE(0xf000, 0xf000) AM_READ_PORT("DSW0")
AM_RANGE(0xf000, 0xf000) AM_RAM AM_BASE(m_sprite_bank)
AM_RANGE(0xf001, 0xf001) AM_WRITE(wiz_main_nmi_mask_w)
- AM_RANGE(0xf002, 0xf003) AM_WRITE_LEGACY(wiz_palettebank_w)
- AM_RANGE(0xf004, 0xf005) AM_WRITE_LEGACY(wiz_char_bank_select_w)
- AM_RANGE(0xf006, 0xf006) AM_WRITE_LEGACY(wiz_flipx_w)
- AM_RANGE(0xf007, 0xf007) AM_WRITE_LEGACY(wiz_flipy_w)
+ AM_RANGE(0xf002, 0xf003) AM_WRITE(wiz_palettebank_w)
+ AM_RANGE(0xf004, 0xf005) AM_WRITE(wiz_char_bank_select_w)
+ AM_RANGE(0xf006, 0xf006) AM_WRITE(wiz_flipx_w)
+ AM_RANGE(0xf007, 0xf007) AM_WRITE(wiz_flipy_w)
AM_RANGE(0xf008, 0xf008) AM_READ_PORT("DSW1")
AM_RANGE(0xf008, 0xf00f) AM_WRITENOP /* initialized by Stinger/Scion */
AM_RANGE(0xf010, 0xf010) AM_READ_PORT("IN0")
AM_RANGE(0xf018, 0xf018) AM_READ_PORT("IN1")
AM_RANGE(0xf800, 0xf800) AM_READ(watchdog_reset_r)
AM_RANGE(0xf800, 0xf80f) AM_WRITE(sound_command_w) /* sound registers */
- AM_RANGE(0xf818, 0xf818) AM_WRITE_LEGACY(wiz_bgcolor_w)
+ AM_RANGE(0xf818, 0xf818) AM_WRITE(wiz_bgcolor_w)
ADDRESS_MAP_END
WRITE8_MEMBER(wiz_state::wiz_sound_nmi_mask_w)
diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c
index ae54a1e1374..fa7e0b84a40 100644
--- a/src/mame/drivers/wolfpack.c
+++ b/src/mame/drivers/wolfpack.c
@@ -120,26 +120,26 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, wolfpack_state )
AM_RANGE(0x2005, 0x2005) AM_WRITE(wolfpack_launch_torpedo_w)
AM_RANGE(0x2006, 0x2006) AM_WRITE(wolfpack_low_explo_w)
AM_RANGE(0x2007, 0x2007) AM_WRITE(wolfpack_screw_cont_w)
- AM_RANGE(0x2008, 0x2008) AM_WRITE_LEGACY(wolfpack_video_invert_w)
- AM_RANGE(0x2009, 0x2009) AM_WRITE_LEGACY(wolfpack_ship_reflect_w)
+ AM_RANGE(0x2008, 0x2008) AM_WRITE(wolfpack_video_invert_w)
+ AM_RANGE(0x2009, 0x2009) AM_WRITE(wolfpack_ship_reflect_w)
AM_RANGE(0x200a, 0x200a) AM_WRITE(wolfpack_lamp_flash_w)
AM_RANGE(0x200c, 0x200c) AM_WRITE(wolfpack_credit_w)
AM_RANGE(0x200d, 0x200d) AM_WRITE(wolfpack_attract_w)
- AM_RANGE(0x200e, 0x200e) AM_WRITE_LEGACY(wolfpack_pt_pos_select_w)
+ AM_RANGE(0x200e, 0x200e) AM_WRITE(wolfpack_pt_pos_select_w)
AM_RANGE(0x200f, 0x200f) AM_WRITE(wolfpack_warning_light_w)
AM_RANGE(0x3000, 0x3000) AM_READ_PORT("DSW")
AM_RANGE(0x3000, 0x3000) AM_WRITE(wolfpack_audamp_w)
- AM_RANGE(0x3001, 0x3001) AM_WRITE_LEGACY(wolfpack_pt_horz_w)
- AM_RANGE(0x3003, 0x3003) AM_WRITE_LEGACY(wolfpack_pt_pic_w)
+ AM_RANGE(0x3001, 0x3001) AM_WRITE(wolfpack_pt_horz_w)
+ AM_RANGE(0x3003, 0x3003) AM_WRITE(wolfpack_pt_pic_w)
AM_RANGE(0x3004, 0x3004) AM_DEVWRITE_LEGACY("speech", wolfpack_word_w)
AM_RANGE(0x3007, 0x3007) AM_WRITE(wolfpack_coldetres_w)
- AM_RANGE(0x4000, 0x4000) AM_WRITE_LEGACY(wolfpack_ship_h_w)
- AM_RANGE(0x4001, 0x4001) AM_WRITE_LEGACY(wolfpack_torpedo_pic_w)
- AM_RANGE(0x4002, 0x4002) AM_WRITE_LEGACY(wolfpack_ship_size_w)
- AM_RANGE(0x4003, 0x4003) AM_WRITE_LEGACY(wolfpack_ship_h_precess_w)
- AM_RANGE(0x4004, 0x4004) AM_WRITE_LEGACY(wolfpack_ship_pic_w)
- AM_RANGE(0x4005, 0x4005) AM_WRITE_LEGACY(wolfpack_torpedo_h_w)
- AM_RANGE(0x4006, 0x4006) AM_WRITE_LEGACY(wolfpack_torpedo_v_w)
+ AM_RANGE(0x4000, 0x4000) AM_WRITE(wolfpack_ship_h_w)
+ AM_RANGE(0x4001, 0x4001) AM_WRITE(wolfpack_torpedo_pic_w)
+ AM_RANGE(0x4002, 0x4002) AM_WRITE(wolfpack_ship_size_w)
+ AM_RANGE(0x4003, 0x4003) AM_WRITE(wolfpack_ship_h_precess_w)
+ AM_RANGE(0x4004, 0x4004) AM_WRITE(wolfpack_ship_pic_w)
+ AM_RANGE(0x4005, 0x4005) AM_WRITE(wolfpack_torpedo_h_w)
+ AM_RANGE(0x4006, 0x4006) AM_WRITE(wolfpack_torpedo_v_w)
AM_RANGE(0x5000, 0x5fff) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x7000, 0x7fff) AM_ROM
AM_RANGE(0x9000, 0x9000) AM_READNOP /* debugger ROM location? */
diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c
index e8870430ede..43551af4b95 100644
--- a/src/mame/drivers/wrally.c
+++ b/src/mame/drivers/wrally.c
@@ -103,7 +103,7 @@ produces a high clock frequency, slow movements a low freq.
static ADDRESS_MAP_START( wrally_map, AS_PROGRAM, 16, wrally_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
- AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE_LEGACY(wrally_vram_w) AM_BASE(m_videoram) /* encrypted Video RAM */
+ AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(wrally_vram_w) AM_BASE(m_videoram) /* encrypted Video RAM */
AM_RANGE(0x108000, 0x108007) AM_RAM AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x10800c, 0x10800d) AM_WRITENOP /* CLR INT Video */
AM_RANGE(0x200000, 0x203fff) AM_RAM_WRITE(paletteram16_xxxxBBBBRRRRGGGG_word_w) AM_SHARE("paletteram") /* Palette */
@@ -112,12 +112,12 @@ static ADDRESS_MAP_START( wrally_map, AS_PROGRAM, 16, wrally_state )
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("P1_P2")
AM_RANGE(0x700004, 0x700005) AM_READ_PORT("WHEEL")
AM_RANGE(0x700008, 0x700009) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x70000c, 0x70000d) AM_WRITE_LEGACY(OKIM6295_bankswitch_w) /* OKI6295 bankswitch */
+ AM_RANGE(0x70000c, 0x70000d) AM_WRITE(OKIM6295_bankswitch_w) /* OKI6295 bankswitch */
AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) /* OKI6295 status/data register */
- AM_RANGE(0x70000a, 0x70001b) AM_WRITE_LEGACY(wrally_coin_lockout_w) /* Coin lockouts */
- AM_RANGE(0x70002a, 0x70003b) AM_WRITE_LEGACY(wrally_coin_counter_w) /* Coin counters */
+ AM_RANGE(0x70000a, 0x70001b) AM_WRITE(wrally_coin_lockout_w) /* Coin lockouts */
+ AM_RANGE(0x70002a, 0x70003b) AM_WRITE(wrally_coin_counter_w) /* Coin counters */
AM_RANGE(0x70004a, 0x70004b) AM_WRITENOP /* Sound muting */
- AM_RANGE(0x70005a, 0x70005b) AM_WRITE_LEGACY(wrally_flipscreen_w) /* Flip screen */
+ AM_RANGE(0x70005a, 0x70005b) AM_WRITE(wrally_flipscreen_w) /* Flip screen */
AM_RANGE(0x70006a, 0x70007b) AM_WRITENOP /* ??? */
AM_RANGE(0xfec000, 0xfeffff) AM_RAM AM_BASE(m_shareram) /* Work RAM (shared with DS5002FP) */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index 372e11f75df..50b620fc2aa 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -161,8 +161,8 @@ Notes:
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, wwfsstar_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE_LEGACY(wwfsstar_fg0_videoram_w) AM_BASE(m_fg0_videoram) /* FG0 Ram */
- AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE_LEGACY(wwfsstar_bg0_videoram_w) AM_BASE(m_bg0_videoram) /* BG0 Ram */
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(wwfsstar_fg0_videoram_w) AM_BASE(m_fg0_videoram) /* FG0 Ram */
+ AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE(wwfsstar_bg0_videoram_w) AM_BASE(m_bg0_videoram) /* BG0 Ram */
AM_RANGE(0x100000, 0x1003ff) AM_RAM AM_BASE(m_spriteram) /* SPR Ram */
AM_RANGE(0x140000, 0x140fff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x180000, 0x180003) AM_WRITE(wwfsstar_irqack_w)
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index 6f2852f0372..78545ab5b7b 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -66,10 +66,10 @@ static WRITE8_DEVICE_HANDLER( oki_bankswitch_w );
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, wwfwfest_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x0c0000, 0x0c1fff) AM_RAM_WRITE_LEGACY(wwfwfest_fg0_videoram_w) AM_BASE(m_fg0_videoram) /* FG0 Ram - 4 bytes per tile */
+ AM_RANGE(0x0c0000, 0x0c1fff) AM_RAM_WRITE(wwfwfest_fg0_videoram_w) AM_BASE(m_fg0_videoram) /* FG0 Ram - 4 bytes per tile */
AM_RANGE(0x0c2000, 0x0c3fff) AM_RAM AM_SHARE("spriteram") /* SPR Ram */
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE_LEGACY(wwfwfest_bg0_videoram_w) AM_BASE(m_bg0_videoram) /* BG0 Ram - 4 bytes per tile */
- AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE_LEGACY(wwfwfest_bg1_videoram_w) AM_BASE(m_bg1_videoram) /* BG1 Ram - 2 bytes per tile */
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(wwfwfest_bg0_videoram_w) AM_BASE(m_bg0_videoram) /* BG0 Ram - 4 bytes per tile */
+ AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE(wwfwfest_bg1_videoram_w) AM_BASE(m_bg1_videoram) /* BG1 Ram - 2 bytes per tile */
AM_RANGE(0x100000, 0x100007) AM_WRITE(wwfwfest_scroll_write)
AM_RANGE(0x10000a, 0x10000b) AM_WRITE(wwfwfest_flipscreen_w)
AM_RANGE(0x140000, 0x140003) AM_WRITE(wwfwfest_irq_ack_w)
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index 2d24aab70a7..db9980720e1 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -388,24 +388,24 @@ READ8_MEMBER(xain_state::mcu_comm_reset_r)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, xain_state )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE_LEGACY(xain_charram_w) AM_BASE(m_charram)
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE_LEGACY(xain_bgram1_w) AM_BASE(m_bgram1)
- AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE_LEGACY(xain_bgram0_w) AM_BASE(m_bgram0)
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(xain_charram_w) AM_BASE(m_charram)
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(xain_bgram1_w) AM_BASE(m_bgram1)
+ AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(xain_bgram0_w) AM_BASE(m_bgram0)
AM_RANGE(0x3800, 0x397f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x3a00, 0x3a00) AM_READ_PORT("P1")
- AM_RANGE(0x3a00, 0x3a01) AM_WRITE_LEGACY(xain_scrollxP1_w)
+ AM_RANGE(0x3a00, 0x3a01) AM_WRITE(xain_scrollxP1_w)
AM_RANGE(0x3a01, 0x3a01) AM_READ_PORT("P2")
AM_RANGE(0x3a02, 0x3a02) AM_READ_PORT("DSW0")
- AM_RANGE(0x3a02, 0x3a03) AM_WRITE_LEGACY(xain_scrollyP1_w)
+ AM_RANGE(0x3a02, 0x3a03) AM_WRITE(xain_scrollyP1_w)
AM_RANGE(0x3a03, 0x3a03) AM_READ_PORT("DSW1")
AM_RANGE(0x3a04, 0x3a04) AM_READ(xain_68705_r)
- AM_RANGE(0x3a04, 0x3a05) AM_WRITE_LEGACY(xain_scrollxP0_w)
+ AM_RANGE(0x3a04, 0x3a05) AM_WRITE(xain_scrollxP0_w)
AM_RANGE(0x3a05, 0x3a05) AM_READ_PORT("VBLANK")
AM_RANGE(0x3a06, 0x3a06) AM_READ(mcu_comm_reset_r)
- AM_RANGE(0x3a06, 0x3a07) AM_WRITE_LEGACY(xain_scrollyP0_w)
+ AM_RANGE(0x3a06, 0x3a07) AM_WRITE(xain_scrollyP0_w)
AM_RANGE(0x3a08, 0x3a08) AM_WRITE(xain_sound_command_w)
AM_RANGE(0x3a09, 0x3a0c) AM_WRITE(xain_main_irq_w)
- AM_RANGE(0x3a0d, 0x3a0d) AM_WRITE_LEGACY(xain_flipscreen_w)
+ AM_RANGE(0x3a0d, 0x3a0d) AM_WRITE(xain_flipscreen_w)
AM_RANGE(0x3a0e, 0x3a0e) AM_WRITE(xain_68705_w)
AM_RANGE(0x3a0f, 0x3a0f) AM_WRITE(xainCPUA_bankswitch_w)
AM_RANGE(0x3c00, 0x3dff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c
index ca0a3137e28..e7f85f239d2 100644
--- a/src/mame/drivers/xorworld.c
+++ b/src/mame/drivers/xorworld.c
@@ -85,7 +85,7 @@ static ADDRESS_MAP_START( xorworld_map, AS_PROGRAM, 16, xorworld_state )
AM_RANGE(0xa00008, 0xa00009) AM_DEVWRITE_LEGACY("eeprom", eeprom_chip_select_w)
AM_RANGE(0xa0000a, 0xa0000b) AM_DEVWRITE_LEGACY("eeprom", eeprom_serial_clock_w)
AM_RANGE(0xa0000c, 0xa0000d) AM_DEVWRITE_LEGACY("eeprom", eeprom_data_w)
- AM_RANGE(0xffc000, 0xffc7ff) AM_RAM_WRITE_LEGACY(xorworld_videoram16_w) AM_BASE(m_videoram)
+ AM_RANGE(0xffc000, 0xffc7ff) AM_RAM_WRITE(xorworld_videoram16_w) AM_BASE(m_videoram)
AM_RANGE(0xffc800, 0xffc87f) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xffc880, 0xffc881) AM_WRITE(xorworld_irq2_ack_w)
AM_RANGE(0xffc882, 0xffc883) AM_WRITE(xorworld_irq6_ack_w)
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index 36e8c8bc3a1..377ebf8fe59 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -96,13 +96,13 @@ static ADDRESS_MAP_START( map1, AS_PROGRAM, 8, xxmissio_state )
AM_RANGE(0xa001, 0xa001) AM_READ_PORT("P2")
AM_RANGE(0xa002, 0xa002) AM_READ_PORT("STATUS")
AM_RANGE(0xa002, 0xa002) AM_WRITE(xxmissio_status_m_w)
- AM_RANGE(0xa003, 0xa003) AM_WRITE_LEGACY(xxmissio_flipscreen_w)
+ AM_RANGE(0xa003, 0xa003) AM_WRITE(xxmissio_flipscreen_w)
AM_RANGE(0xc000, 0xc7ff) AM_SHARE("share1") AM_RAM AM_BASE(m_fgram)
- AM_RANGE(0xc800, 0xcfff) AM_SHARE("share2") AM_READWRITE_LEGACY(xxmissio_bgram_r, xxmissio_bgram_w) AM_BASE(m_bgram)
+ AM_RANGE(0xc800, 0xcfff) AM_SHARE("share2") AM_READWRITE(xxmissio_bgram_r, xxmissio_bgram_w) AM_BASE(m_bgram)
AM_RANGE(0xd000, 0xd7ff) AM_SHARE("share3") AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0xd800, 0xdaff) AM_SHARE("share4") AM_RAM_WRITE_LEGACY(xxmissio_paletteram_w) AM_SHARE("paletteram")
+ AM_RANGE(0xd800, 0xdaff) AM_SHARE("share4") AM_RAM_WRITE(xxmissio_paletteram_w) AM_SHARE("paletteram")
AM_RANGE(0xe000, 0xefff) AM_SHARE("share5") AM_RAM
AM_RANGE(0xf000, 0xffff) AM_SHARE("share6") AM_RAM
@@ -121,13 +121,13 @@ static ADDRESS_MAP_START( map2, AS_PROGRAM, 8, xxmissio_state )
AM_RANGE(0xa001, 0xa001) AM_READ_PORT("P2")
AM_RANGE(0xa002, 0xa002) AM_READ_PORT("STATUS")
AM_RANGE(0xa002, 0xa002) AM_WRITE(xxmissio_status_s_w)
- AM_RANGE(0xa003, 0xa003) AM_WRITE_LEGACY(xxmissio_flipscreen_w)
+ AM_RANGE(0xa003, 0xa003) AM_WRITE(xxmissio_flipscreen_w)
AM_RANGE(0xc000, 0xc7ff) AM_SHARE("share1") AM_RAM
- AM_RANGE(0xc800, 0xcfff) AM_SHARE("share2") AM_READWRITE_LEGACY(xxmissio_bgram_r, xxmissio_bgram_w)
+ AM_RANGE(0xc800, 0xcfff) AM_SHARE("share2") AM_READWRITE(xxmissio_bgram_r, xxmissio_bgram_w)
AM_RANGE(0xd000, 0xd7ff) AM_SHARE("share3") AM_RAM
- AM_RANGE(0xd800, 0xdaff) AM_SHARE("share4") AM_RAM_WRITE_LEGACY(xxmissio_paletteram_w)
+ AM_RANGE(0xd800, 0xdaff) AM_SHARE("share4") AM_RAM_WRITE(xxmissio_paletteram_w)
AM_RANGE(0xe000, 0xefff) AM_SHARE("share6") AM_RAM
AM_RANGE(0xf000, 0xffff) AM_SHARE("share5") AM_RAM
diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c
index 4f9b1abfab2..52d8e5feaf8 100644
--- a/src/mame/drivers/xyonix.c
+++ b/src/mame/drivers/xyonix.c
@@ -135,7 +135,7 @@ WRITE8_MEMBER(xyonix_state::xyonix_io_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, xyonix_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xffff) AM_RAM_WRITE_LEGACY(xyonix_vidram_w) AM_BASE(m_vidram)
+ AM_RANGE(0xe000, 0xffff) AM_RAM_WRITE(xyonix_vidram_w) AM_BASE(m_vidram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( port_map, AS_IO, 8, xyonix_state )
diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c
index 6659f29ee3c..2b5effbba9d 100644
--- a/src/mame/drivers/yiear.c
+++ b/src/mame/drivers/yiear.c
@@ -129,7 +129,7 @@ static INTERRUPT_GEN( yiear_nmi_interrupt )
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, yiear_state )
AM_RANGE(0x0000, 0x0000) AM_DEVREAD_LEGACY("vlm", yiear_speech_r)
- AM_RANGE(0x4000, 0x4000) AM_WRITE_LEGACY(yiear_control_w)
+ AM_RANGE(0x4000, 0x4000) AM_WRITE(yiear_control_w)
AM_RANGE(0x4800, 0x4800) AM_WRITE_LEGACY(konami_SN76496_latch_w)
AM_RANGE(0x4900, 0x4900) AM_DEVWRITE_LEGACY("snsnd", konami_SN76496_w)
AM_RANGE(0x4a00, 0x4a00) AM_DEVWRITE_LEGACY("vlm", yiear_VLM5030_control_w)
@@ -143,7 +143,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, yiear_state )
AM_RANGE(0x4f00, 0x4f00) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x5000, 0x502f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x5400, 0x542f) AM_RAM AM_BASE(m_spriteram2)
- AM_RANGE(0x5800, 0x5fff) AM_WRITE_LEGACY(yiear_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x5800, 0x5fff) AM_WRITE(yiear_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x5000, 0x5fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index bc23362b0d9..d345201772d 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -130,8 +130,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, yunsun16_state )
AM_RANGE(0x800188, 0x800189) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) // Sound
AM_RANGE(0x8001fe, 0x8001ff) AM_WRITENOP // ? 0 (during int)
AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
- AM_RANGE(0x908000, 0x90bfff) AM_RAM_WRITE_LEGACY(yunsun16_vram_1_w) AM_BASE(m_vram_1) // Layer 1
- AM_RANGE(0x90c000, 0x90ffff) AM_RAM_WRITE_LEGACY(yunsun16_vram_0_w) AM_BASE(m_vram_0) // Layer 0
+ AM_RANGE(0x908000, 0x90bfff) AM_RAM_WRITE(yunsun16_vram_1_w) AM_BASE(m_vram_1) // Layer 1
+ AM_RANGE(0x90c000, 0x90ffff) AM_RAM_WRITE(yunsun16_vram_0_w) AM_BASE(m_vram_0) // Layer 0
AM_RANGE(0x910000, 0x910fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c
index 24e0e7f5c97..55ba3ccc5bc 100644
--- a/src/mame/drivers/yunsung8.c
+++ b/src/mame/drivers/yunsung8.c
@@ -68,19 +68,19 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, yunsung8_state )
AM_RANGE(0x0001, 0x0001) AM_WRITE(yunsung8_bankswitch_w) // ROM Bank (again?)
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xdfff) AM_READWRITE_LEGACY(yunsung8_videoram_r, yunsung8_videoram_w) // Video RAM (Banked)
+ AM_RANGE(0xc000, 0xdfff) AM_READWRITE(yunsung8_videoram_r, yunsung8_videoram_w) // Video RAM (Banked)
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START( port_map, AS_IO, 8, yunsung8_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE_LEGACY(yunsung8_videobank_w) // video RAM bank
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE(yunsung8_videobank_w) // video RAM bank
AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(yunsung8_bankswitch_w) // ROM Bank + Layers Enable
AM_RANGE(0x02, 0x02) AM_READ_PORT("P2") AM_WRITE(soundlatch_w) // To Sound CPU
AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
- AM_RANGE(0x06, 0x06) AM_WRITE_LEGACY(yunsung8_flipscreen_w) // Flip Screen
+ AM_RANGE(0x06, 0x06) AM_WRITE(yunsung8_flipscreen_w) // Flip Screen
AM_RANGE(0x07, 0x07) AM_WRITENOP // ? (end of IRQ, random value)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/zac2650.c b/src/mame/drivers/zac2650.c
index bc43a6c6eaa..feb6120da1f 100644
--- a/src/mame/drivers/zac2650.c
+++ b/src/mame/drivers/zac2650.c
@@ -19,15 +19,15 @@
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, zac2650_state )
AM_RANGE(0x0000, 0x17ff) AM_ROM
- AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE_LEGACY(tinvader_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(tinvader_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x1c00, 0x1cff) AM_RAM
AM_RANGE(0x1d00, 0x1dff) AM_RAM
- AM_RANGE(0x1e80, 0x1e80) AM_READ_LEGACY(tinvader_port_0_r) AM_WRITE(tinvader_sound_w)
+ AM_RANGE(0x1e80, 0x1e80) AM_READ(tinvader_port_0_r) AM_WRITE(tinvader_sound_w)
AM_RANGE(0x1e81, 0x1e81) AM_READ_PORT("1E81")
AM_RANGE(0x1e82, 0x1e82) AM_READ_PORT("1E82")
AM_RANGE(0x1e85, 0x1e85) AM_READ_PORT("1E85") /* Dodgem Only */
AM_RANGE(0x1e86, 0x1e86) AM_READ_PORT("1E86") AM_WRITENOP /* Dodgem Only */
- AM_RANGE(0x1f00, 0x1fff) AM_READWRITE_LEGACY(zac_s2636_r, zac_s2636_w) AM_BASE(m_s2636_0_ram)
+ AM_RANGE(0x1f00, 0x1fff) AM_READWRITE(zac_s2636_r, zac_s2636_w) AM_BASE(m_s2636_0_ram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( port_map, AS_IO, 8, zac2650_state )
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index 928a2dd4fde..4bbdf668458 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -260,12 +260,12 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, zaccaria_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_READONLY
AM_RANGE(0x6400, 0x6407) AM_READ(zaccaria_prot1_r)
- AM_RANGE(0x6000, 0x67ff) AM_WRITE_LEGACY(zaccaria_videoram_w) AM_BASE(m_videoram) /* 6400-67ff is 4 bits wide */
- AM_RANGE(0x6800, 0x683f) AM_WRITE_LEGACY(zaccaria_attributes_w) AM_BASE(m_attributesram)
+ AM_RANGE(0x6000, 0x67ff) AM_WRITE(zaccaria_videoram_w) AM_BASE(m_videoram) /* 6400-67ff is 4 bits wide */
+ AM_RANGE(0x6800, 0x683f) AM_WRITE(zaccaria_attributes_w) AM_BASE(m_attributesram)
AM_RANGE(0x6840, 0x685f) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x6881, 0x68c0) AM_RAM AM_BASE(m_spriteram2)
- AM_RANGE(0x6c00, 0x6c00) AM_WRITE_LEGACY(zaccaria_flip_screen_x_w)
- AM_RANGE(0x6c01, 0x6c01) AM_WRITE_LEGACY(zaccaria_flip_screen_y_w)
+ AM_RANGE(0x6c00, 0x6c00) AM_WRITE(zaccaria_flip_screen_x_w)
+ AM_RANGE(0x6c01, 0x6c01) AM_WRITE(zaccaria_flip_screen_y_w)
AM_RANGE(0x6c02, 0x6c02) AM_WRITENOP /* sound reset */
AM_RANGE(0x6c06, 0x6c06) AM_WRITE(coin_w)
AM_RANGE(0x6c07, 0x6c07) AM_WRITE(nmi_mask_w)
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index 63b1ab11b6d..65460be190d 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -430,7 +430,7 @@ static CUSTOM_INPUT( zaxxon_coin_r )
static ADDRESS_MAP_START( zaxxon_map, AS_PROGRAM, 8, zaxxon_state )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
- AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x1c00) AM_RAM_WRITE_LEGACY(zaxxon_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x1c00) AM_RAM_WRITE(zaxxon_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xa000, 0xa0ff) AM_MIRROR(0x1f00) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x18fc) AM_READ_PORT("SW00")
AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x18fc) AM_READ_PORT("SW01")
@@ -439,13 +439,13 @@ static ADDRESS_MAP_START( zaxxon_map, AS_PROGRAM, 8, zaxxon_state )
AM_RANGE(0xc100, 0xc100) AM_MIRROR(0x18ff) AM_READ_PORT("SW100")
AM_RANGE(0xc000, 0xc002) AM_MIRROR(0x18f8) AM_WRITE(zaxxon_coin_enable_w)
AM_RANGE(0xc003, 0xc004) AM_MIRROR(0x18f8) AM_WRITE(zaxxon_coin_counter_w)
- AM_RANGE(0xc006, 0xc006) AM_MIRROR(0x18f8) AM_WRITE_LEGACY(zaxxon_flipscreen_w)
+ AM_RANGE(0xc006, 0xc006) AM_MIRROR(0x18f8) AM_WRITE(zaxxon_flipscreen_w)
AM_RANGE(0xe03c, 0xe03f) AM_MIRROR(0x1f00) AM_DEVREADWRITE_LEGACY("ppi8255", ppi8255_r, ppi8255_w)
AM_RANGE(0xe0f0, 0xe0f0) AM_MIRROR(0x1f00) AM_WRITE(int_enable_w)
- AM_RANGE(0xe0f1, 0xe0f1) AM_MIRROR(0x1f00) AM_WRITE_LEGACY(zaxxon_fg_color_w)
- AM_RANGE(0xe0f8, 0xe0f9) AM_MIRROR(0x1f00) AM_WRITE_LEGACY(zaxxon_bg_position_w)
- AM_RANGE(0xe0fa, 0xe0fa) AM_MIRROR(0x1f00) AM_WRITE_LEGACY(zaxxon_bg_color_w)
- AM_RANGE(0xe0fb, 0xe0fb) AM_MIRROR(0x1f00) AM_WRITE_LEGACY(zaxxon_bg_enable_w)
+ AM_RANGE(0xe0f1, 0xe0f1) AM_MIRROR(0x1f00) AM_WRITE(zaxxon_fg_color_w)
+ AM_RANGE(0xe0f8, 0xe0f9) AM_MIRROR(0x1f00) AM_WRITE(zaxxon_bg_position_w)
+ AM_RANGE(0xe0fa, 0xe0fa) AM_MIRROR(0x1f00) AM_WRITE(zaxxon_bg_color_w)
+ AM_RANGE(0xe0fb, 0xe0fb) AM_MIRROR(0x1f00) AM_WRITE(zaxxon_bg_enable_w)
ADDRESS_MAP_END
@@ -453,8 +453,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( congo_map, AS_PROGRAM, 8, zaxxon_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
- AM_RANGE(0xa000, 0xa3ff) AM_MIRROR(0x1800) AM_RAM_WRITE_LEGACY(zaxxon_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xa400, 0xa7ff) AM_MIRROR(0x1800) AM_RAM_WRITE_LEGACY(congo_colorram_w) AM_BASE(m_colorram)
+ AM_RANGE(0xa000, 0xa3ff) AM_MIRROR(0x1800) AM_RAM_WRITE(zaxxon_videoram_w) AM_BASE(m_videoram)
+ AM_RANGE(0xa400, 0xa7ff) AM_MIRROR(0x1800) AM_RAM_WRITE(congo_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x1fc4) AM_READ_PORT("SW00")
AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x1fc4) AM_READ_PORT("SW01")
AM_RANGE(0xc002, 0xc002) AM_MIRROR(0x1fc4) AM_READ_PORT("DSW02")
@@ -462,15 +462,15 @@ static ADDRESS_MAP_START( congo_map, AS_PROGRAM, 8, zaxxon_state )
AM_RANGE(0xc008, 0xc008) AM_MIRROR(0x1fc7) AM_READ_PORT("SW100")
AM_RANGE(0xc018, 0xc01a) AM_MIRROR(0x1fc0) AM_WRITE(zaxxon_coin_enable_w)
AM_RANGE(0xc01b, 0xc01c) AM_MIRROR(0x1fc0) AM_WRITE(zaxxon_coin_counter_w)
- AM_RANGE(0xc01d, 0xc01d) AM_MIRROR(0x1fc0) AM_WRITE_LEGACY(zaxxon_bg_enable_w)
- AM_RANGE(0xc01e, 0xc01e) AM_MIRROR(0x1fc0) AM_WRITE_LEGACY(zaxxon_flipscreen_w)
+ AM_RANGE(0xc01d, 0xc01d) AM_MIRROR(0x1fc0) AM_WRITE(zaxxon_bg_enable_w)
+ AM_RANGE(0xc01e, 0xc01e) AM_MIRROR(0x1fc0) AM_WRITE(zaxxon_flipscreen_w)
AM_RANGE(0xc01f, 0xc01f) AM_MIRROR(0x1fc0) AM_WRITE(int_enable_w)
- AM_RANGE(0xc021, 0xc021) AM_MIRROR(0x1fc0) AM_WRITE_LEGACY(zaxxon_fg_color_w)
- AM_RANGE(0xc023, 0xc023) AM_MIRROR(0x1fc0) AM_WRITE_LEGACY(zaxxon_bg_color_w)
- AM_RANGE(0xc026, 0xc026) AM_MIRROR(0x1fc0) AM_WRITE_LEGACY(congo_fg_bank_w)
- AM_RANGE(0xc027, 0xc027) AM_MIRROR(0x1fc0) AM_WRITE_LEGACY(congo_color_bank_w)
- AM_RANGE(0xc028, 0xc029) AM_MIRROR(0x1fc4) AM_WRITE_LEGACY(zaxxon_bg_position_w)
- AM_RANGE(0xc030, 0xc033) AM_MIRROR(0x1fc4) AM_WRITE_LEGACY(congo_sprite_custom_w)
+ AM_RANGE(0xc021, 0xc021) AM_MIRROR(0x1fc0) AM_WRITE(zaxxon_fg_color_w)
+ AM_RANGE(0xc023, 0xc023) AM_MIRROR(0x1fc0) AM_WRITE(zaxxon_bg_color_w)
+ AM_RANGE(0xc026, 0xc026) AM_MIRROR(0x1fc0) AM_WRITE(congo_fg_bank_w)
+ AM_RANGE(0xc027, 0xc027) AM_MIRROR(0x1fc0) AM_WRITE(congo_color_bank_w)
+ AM_RANGE(0xc028, 0xc029) AM_MIRROR(0x1fc4) AM_WRITE(zaxxon_bg_position_w)
+ AM_RANGE(0xc030, 0xc033) AM_MIRROR(0x1fc4) AM_WRITE(congo_sprite_custom_w)
AM_RANGE(0xc038, 0xc03f) AM_MIRROR(0x1fc0) AM_WRITE(soundlatch_w)
ADDRESS_MAP_END
diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h
index 9b2ba5d45cb..f311f28d93c 100644
--- a/src/mame/includes/1942.h
+++ b/src/mame/includes/1942.h
@@ -25,17 +25,17 @@ public:
/* devices */
device_t *m_audiocpu;
DECLARE_WRITE8_MEMBER(c1942_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(c1942_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(c1942_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(c1942_palette_bank_w);
+ DECLARE_WRITE8_MEMBER(c1942_scroll_w);
+ DECLARE_WRITE8_MEMBER(c1942_c804_w);
};
/*----------- defined in video/1942.c -----------*/
-extern WRITE8_HANDLER( c1942_fgvideoram_w );
-extern WRITE8_HANDLER( c1942_bgvideoram_w );
-extern WRITE8_HANDLER( c1942_scroll_w );
-extern WRITE8_HANDLER( c1942_c804_w );
-extern WRITE8_HANDLER( c1942_palette_bank_w );
extern PALETTE_INIT( 1942 );
extern VIDEO_START( 1942 );
diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h
index ab75f48bcad..2ade3f7438f 100644
--- a/src/mame/includes/1943.h
+++ b/src/mame/includes/1943.h
@@ -29,16 +29,16 @@ public:
int m_bg2_on;
DECLARE_READ8_MEMBER(c1943_protection_r);
DECLARE_READ8_MEMBER(_1943b_c007_r);
+ DECLARE_WRITE8_MEMBER(c1943_videoram_w);
+ DECLARE_WRITE8_MEMBER(c1943_colorram_w);
+ DECLARE_WRITE8_MEMBER(c1943_c804_w);
+ DECLARE_WRITE8_MEMBER(c1943_d806_w);
};
/*----------- defined in video/1943.c -----------*/
-extern WRITE8_HANDLER( c1943_c804_w );
-extern WRITE8_HANDLER( c1943_d806_w );
-extern WRITE8_HANDLER( c1943_videoram_w );
-extern WRITE8_HANDLER( c1943_colorram_w );
extern PALETTE_INIT( 1943 );
extern VIDEO_START( 1943 );
diff --git a/src/mame/includes/3do.h b/src/mame/includes/3do.h
index 1a08ddd0b8f..d3d9f78b3e0 100644
--- a/src/mame/includes/3do.h
+++ b/src/mame/includes/3do.h
@@ -173,26 +173,26 @@ public:
CLIO m_clio;
SVF m_svf;
UINT8 m_video_bits[512];
+ DECLARE_READ32_MEMBER(_3do_nvarea_r);
+ DECLARE_WRITE32_MEMBER(_3do_nvarea_w);
+ DECLARE_READ32_MEMBER(_3do_slow2_r);
+ DECLARE_WRITE32_MEMBER(_3do_slow2_w);
+ DECLARE_READ32_MEMBER(_3do_svf_r);
+ DECLARE_WRITE32_MEMBER(_3do_svf_w);
+ DECLARE_READ32_MEMBER(_3do_madam_r);
+ DECLARE_WRITE32_MEMBER(_3do_madam_w);
+ DECLARE_READ32_MEMBER(_3do_clio_r);
+ DECLARE_WRITE32_MEMBER(_3do_clio_w);
};
/*----------- defined in machine/3do.c -----------*/
-READ32_HANDLER( _3do_nvarea_r );
-WRITE32_HANDLER( _3do_nvarea_w );
-READ32_HANDLER( _3do_slow2_r );
-WRITE32_HANDLER( _3do_slow2_w );
void _3do_slow2_init( running_machine &machine );
-READ32_HANDLER( _3do_svf_r );
-WRITE32_HANDLER( _3do_svf_w );
-READ32_HANDLER( _3do_madam_r );
-WRITE32_HANDLER( _3do_madam_w );
void _3do_madam_init( running_machine &machine );
-READ32_HANDLER( _3do_clio_r );
-WRITE32_HANDLER( _3do_clio_w );
void _3do_clio_init( running_machine &machine, screen_device *screen );
diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h
index ba4e8a465e1..e695c01aca7 100644
--- a/src/mame/includes/40love.h
+++ b/src/mame/includes/40love.h
@@ -68,18 +68,18 @@ public:
DECLARE_READ8_MEMBER(from_snd_r);
DECLARE_READ8_MEMBER(snd_flag_r);
DECLARE_WRITE8_MEMBER(to_main_w);
+ DECLARE_WRITE8_MEMBER(fortyl_pixram_sel_w);
+ DECLARE_READ8_MEMBER(fortyl_pixram_r);
+ DECLARE_WRITE8_MEMBER(fortyl_pixram_w);
+ DECLARE_WRITE8_MEMBER(fortyl_bg_videoram_w);
+ DECLARE_READ8_MEMBER(fortyl_bg_videoram_r);
+ DECLARE_WRITE8_MEMBER(fortyl_bg_colorram_w);
+ DECLARE_READ8_MEMBER(fortyl_bg_colorram_r);
};
/*----------- defined in video/40love.c -----------*/
-WRITE8_HANDLER( fortyl_bg_videoram_w );
-WRITE8_HANDLER( fortyl_bg_colorram_w );
-READ8_HANDLER ( fortyl_bg_videoram_r );
-READ8_HANDLER ( fortyl_bg_colorram_r );
-WRITE8_HANDLER( fortyl_pixram_sel_w );
-READ8_HANDLER( fortyl_pixram_r );
-WRITE8_HANDLER( fortyl_pixram_w );
VIDEO_START( fortyl );
SCREEN_UPDATE_IND16( fortyl );
diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h
index 669a9130a52..6eb948bab90 100644
--- a/src/mame/includes/4enraya.h
+++ b/src/mame/includes/4enraya.h
@@ -26,12 +26,12 @@ public:
DECLARE_WRITE8_MEMBER(sound_data_w);
DECLARE_READ8_MEMBER(fenraya_custom_map_r);
DECLARE_WRITE8_MEMBER(fenraya_custom_map_w);
+ DECLARE_WRITE8_MEMBER(fenraya_videoram_w);
};
/*----------- defined in video/4enraya.c -----------*/
-WRITE8_HANDLER( fenraya_videoram_w );
VIDEO_START( 4enraya );
SCREEN_UPDATE_IND16( 4enraya );
diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h
index 9aa63892b25..6c59a2e33c9 100644
--- a/src/mame/includes/aeroboto.h
+++ b/src/mame/includes/aeroboto.h
@@ -42,6 +42,10 @@ public:
DECLARE_READ8_MEMBER(aeroboto_irq_ack_r);
DECLARE_READ8_MEMBER(aeroboto_2973_r);
DECLARE_WRITE8_MEMBER(aeroboto_1a2_w);
+ DECLARE_READ8_MEMBER(aeroboto_in0_r);
+ DECLARE_WRITE8_MEMBER(aeroboto_3000_w);
+ DECLARE_WRITE8_MEMBER(aeroboto_videoram_w);
+ DECLARE_WRITE8_MEMBER(aeroboto_tilecolor_w);
};
@@ -50,7 +54,3 @@ public:
VIDEO_START( aeroboto );
SCREEN_UPDATE_IND16( aeroboto );
-READ8_HANDLER( aeroboto_in0_r );
-WRITE8_HANDLER( aeroboto_3000_w );
-WRITE8_HANDLER( aeroboto_videoram_w );
-WRITE8_HANDLER( aeroboto_tilecolor_w );
diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h
index 561851f786f..1eaa2161d99 100644
--- a/src/mame/includes/aerofgt.h
+++ b/src/mame/includes/aerofgt.h
@@ -46,27 +46,27 @@ public:
DECLARE_WRITE8_MEMBER(pending_command_clear_w);
DECLARE_WRITE8_MEMBER(aerofgt_sh_bankswitch_w);
DECLARE_WRITE8_MEMBER(aerfboot_okim6295_banking_w);
+ DECLARE_WRITE16_MEMBER(aerofgt_bg1videoram_w);
+ DECLARE_WRITE16_MEMBER(aerofgt_bg2videoram_w);
+ DECLARE_WRITE16_MEMBER(pspikes_gfxbank_w);
+ DECLARE_WRITE16_MEMBER(pspikesb_gfxbank_w);
+ DECLARE_WRITE16_MEMBER(spikes91_lookup_w);
+ DECLARE_WRITE16_MEMBER(karatblz_gfxbank_w);
+ DECLARE_WRITE16_MEMBER(spinlbrk_gfxbank_w);
+ DECLARE_WRITE16_MEMBER(turbofrc_gfxbank_w);
+ DECLARE_WRITE16_MEMBER(aerofgt_gfxbank_w);
+ DECLARE_WRITE16_MEMBER(aerofgt_bg1scrollx_w);
+ DECLARE_WRITE16_MEMBER(aerofgt_bg1scrolly_w);
+ DECLARE_WRITE16_MEMBER(aerofgt_bg2scrollx_w);
+ DECLARE_WRITE16_MEMBER(aerofgt_bg2scrolly_w);
+ DECLARE_WRITE16_MEMBER(pspikes_palette_bank_w);
+ DECLARE_WRITE16_MEMBER(wbbc97_bitmap_enable_w);
};
/*----------- defined in video/aerofgt.c -----------*/
-WRITE16_HANDLER( aerofgt_bg1videoram_w );
-WRITE16_HANDLER( aerofgt_bg2videoram_w );
-WRITE16_HANDLER( pspikes_gfxbank_w );
-WRITE16_HANDLER( pspikesb_gfxbank_w );
-WRITE16_HANDLER( spikes91_lookup_w );
-WRITE16_HANDLER( karatblz_gfxbank_w );
-WRITE16_HANDLER( spinlbrk_gfxbank_w );
-WRITE16_HANDLER( turbofrc_gfxbank_w );
-WRITE16_HANDLER( aerofgt_gfxbank_w );
-WRITE16_HANDLER( aerofgt_bg1scrollx_w );
-WRITE16_HANDLER( aerofgt_bg1scrolly_w );
-WRITE16_HANDLER( aerofgt_bg2scrollx_w );
-WRITE16_HANDLER( aerofgt_bg2scrolly_w );
-WRITE16_HANDLER( pspikes_palette_bank_w );
-WRITE16_HANDLER( wbbc97_bitmap_enable_w );
VIDEO_START( pspikes );
VIDEO_START( karatblz );
diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h
index 60013078310..1b3320cb236 100644
--- a/src/mame/includes/airbustr.h
+++ b/src/mame/includes/airbustr.h
@@ -49,16 +49,16 @@ public:
DECLARE_WRITE8_MEMBER(soundcommand2_w);
DECLARE_WRITE8_MEMBER(airbustr_paletteram_w);
DECLARE_WRITE8_MEMBER(airbustr_coin_counter_w);
+ DECLARE_WRITE8_MEMBER(airbustr_videoram_w);
+ DECLARE_WRITE8_MEMBER(airbustr_colorram_w);
+ DECLARE_WRITE8_MEMBER(airbustr_videoram2_w);
+ DECLARE_WRITE8_MEMBER(airbustr_colorram2_w);
+ DECLARE_WRITE8_MEMBER(airbustr_scrollregs_w);
};
/*----------- defined in video/airbustr.c -----------*/
-WRITE8_HANDLER( airbustr_videoram_w );
-WRITE8_HANDLER( airbustr_colorram_w );
-WRITE8_HANDLER( airbustr_videoram2_w );
-WRITE8_HANDLER( airbustr_colorram2_w );
-WRITE8_HANDLER( airbustr_scrollregs_w );
VIDEO_START( airbustr );
SCREEN_UPDATE_IND16( airbustr );
diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h
index c55238c5e68..1cbcab0b0a6 100644
--- a/src/mame/includes/ajax.h
+++ b/src/mame/includes/ajax.h
@@ -27,14 +27,16 @@ public:
device_t *m_k051960;
device_t *m_k051316;
DECLARE_WRITE8_MEMBER(sound_bank_w);
+ DECLARE_READ8_MEMBER(ajax_ls138_f10_r);
+ DECLARE_WRITE8_MEMBER(ajax_ls138_f10_w);
+ DECLARE_WRITE8_MEMBER(ajax_bankswitch_2_w);
+ DECLARE_WRITE8_MEMBER(ajax_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(ajax_lamps_w);
};
/*----------- defined in machine/ajax.c -----------*/
-WRITE8_HANDLER( ajax_bankswitch_2_w );
-READ8_HANDLER( ajax_ls138_f10_r );
-WRITE8_HANDLER( ajax_ls138_f10_w );
MACHINE_START( ajax );
MACHINE_RESET( ajax );
INTERRUPT_GEN( ajax_interrupt );
diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h
index 6b8c15e3880..2e5eeed6e62 100644
--- a/src/mame/includes/alpha68k.h
+++ b/src/mame/includes/alpha68k.h
@@ -63,6 +63,10 @@ public:
DECLARE_READ16_MEMBER(sound_cpu_r);
DECLARE_WRITE8_MEMBER(sound_bank_w);
DECLARE_WRITE8_MEMBER(porta_w);
+ DECLARE_WRITE16_MEMBER(alpha68k_paletteram_w);
+ DECLARE_WRITE16_MEMBER(alpha68k_videoram_w);
+ DECLARE_WRITE16_MEMBER(alpha68k_II_video_bank_w);
+ DECLARE_WRITE16_MEMBER(alpha68k_V_video_control_w);
};
/* game_id - used to deal with a few game specific situations */
@@ -91,7 +95,3 @@ SCREEN_UPDATE_IND16( alpha68k_V_sb );
void alpha68k_V_video_bank_w(running_machine &machine, int bank);
void alpha68k_flipscreen_w(running_machine &machine, int flip);
-WRITE16_HANDLER( alpha68k_paletteram_w );
-WRITE16_HANDLER( alpha68k_videoram_w );
-WRITE16_HANDLER( alpha68k_II_video_bank_w );
-WRITE16_HANDLER( alpha68k_V_video_control_w );
diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h
index e94d1b8d2d2..83c2858ca05 100644
--- a/src/mame/includes/ampoker2.h
+++ b/src/mame/includes/ampoker2.h
@@ -14,12 +14,12 @@ public:
DECLARE_WRITE8_MEMBER(ampoker2_port35_w);
DECLARE_WRITE8_MEMBER(ampoker2_port36_w);
DECLARE_WRITE8_MEMBER(ampoker2_watchdog_reset_w);
+ DECLARE_WRITE8_MEMBER(ampoker2_videoram_w);
};
/*----------- defined in video/ampoker2.c -----------*/
-WRITE8_HANDLER( ampoker2_videoram_w );
PALETTE_INIT( ampoker2 );
VIDEO_START( ampoker2 );
VIDEO_START( sigma2k );
diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h
index ded31c74e29..345244e3182 100644
--- a/src/mame/includes/amspdwy.h
+++ b/src/mame/includes/amspdwy.h
@@ -31,15 +31,15 @@ public:
DECLARE_READ8_MEMBER(amspdwy_wheel_1_r);
DECLARE_WRITE8_MEMBER(amspdwy_sound_w);
DECLARE_READ8_MEMBER(amspdwy_port_r);
+ DECLARE_WRITE8_MEMBER(amspdwy_paletteram_w);
+ DECLARE_WRITE8_MEMBER(amspdwy_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(amspdwy_videoram_w);
+ DECLARE_WRITE8_MEMBER(amspdwy_colorram_w);
};
/*----------- defined in video/amspdwy.c -----------*/
-WRITE8_HANDLER( amspdwy_videoram_w );
-WRITE8_HANDLER( amspdwy_colorram_w );
-WRITE8_HANDLER( amspdwy_paletteram_w );
-WRITE8_HANDLER( amspdwy_flipscreen_w );
VIDEO_START( amspdwy );
SCREEN_UPDATE_IND16( amspdwy );
diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h
index a6b1b852ed3..c2ed8405c30 100644
--- a/src/mame/includes/angelkds.h
+++ b/src/mame/includes/angelkds.h
@@ -36,23 +36,23 @@ public:
DECLARE_READ8_MEMBER(angelkds_main_sound_r);
DECLARE_WRITE8_MEMBER(angelkds_sub_sound_w);
DECLARE_READ8_MEMBER(angelkds_sub_sound_r);
+ DECLARE_WRITE8_MEMBER(angelkds_txvideoram_w);
+ DECLARE_WRITE8_MEMBER(angelkds_txbank_write);
+ DECLARE_WRITE8_MEMBER(angelkds_bgtopvideoram_w);
+ DECLARE_WRITE8_MEMBER(angelkds_bgtopbank_write);
+ DECLARE_WRITE8_MEMBER(angelkds_bgtopscroll_write);
+ DECLARE_WRITE8_MEMBER(angelkds_bgbotvideoram_w);
+ DECLARE_WRITE8_MEMBER(angelkds_bgbotbank_write);
+ DECLARE_WRITE8_MEMBER(angelkds_bgbotscroll_write);
+ DECLARE_WRITE8_MEMBER(angelkds_layer_ctrl_write);
+ DECLARE_WRITE8_MEMBER(angelkds_paletteram_w);
};
/*----------- defined in video/angelkds.c -----------*/
-WRITE8_HANDLER( angelkds_bgtopvideoram_w );
-WRITE8_HANDLER( angelkds_bgbotvideoram_w );
-WRITE8_HANDLER( angelkds_txvideoram_w );
-WRITE8_HANDLER( angelkds_bgtopbank_write );
-WRITE8_HANDLER( angelkds_bgtopscroll_write );
-WRITE8_HANDLER( angelkds_bgbotbank_write );
-WRITE8_HANDLER( angelkds_bgbotscroll_write );
-WRITE8_HANDLER( angelkds_txbank_write );
-WRITE8_HANDLER( angelkds_paletteram_w );
-WRITE8_HANDLER( angelkds_layer_ctrl_write );
VIDEO_START( angelkds );
SCREEN_UPDATE_IND16( angelkds );
diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h
index 77ec3818349..c73ccad6fab 100644
--- a/src/mame/includes/appoooh.h
+++ b/src/mame/includes/appoooh.h
@@ -29,6 +29,12 @@ public:
UINT8 m_nmi_mask;
DECLARE_WRITE8_MEMBER(appoooh_adpcm_w);
+ DECLARE_WRITE8_MEMBER(appoooh_scroll_w);
+ DECLARE_WRITE8_MEMBER(appoooh_fg_videoram_w);
+ DECLARE_WRITE8_MEMBER(appoooh_fg_colorram_w);
+ DECLARE_WRITE8_MEMBER(appoooh_bg_videoram_w);
+ DECLARE_WRITE8_MEMBER(appoooh_bg_colorram_w);
+ DECLARE_WRITE8_MEMBER(appoooh_out_w);
};
#define CHR1_OFST 0x00 /* palette page of char set #1 */
@@ -37,14 +43,8 @@ public:
/* ----------- defined in video/appoooh.c -----------*/
-WRITE8_HANDLER( appoooh_fg_videoram_w );
-WRITE8_HANDLER( appoooh_fg_colorram_w );
-WRITE8_HANDLER( appoooh_bg_videoram_w );
-WRITE8_HANDLER( appoooh_bg_colorram_w );
PALETTE_INIT( appoooh );
PALETTE_INIT( robowres );
-WRITE8_HANDLER( appoooh_scroll_w );
-WRITE8_HANDLER( appoooh_out_w );
VIDEO_START( appoooh );
SCREEN_UPDATE_IND16( appoooh );
SCREEN_UPDATE_IND16( robowres );
diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h
index ec492c3d5ea..3c4c3567240 100644
--- a/src/mame/includes/aquarium.h
+++ b/src/mame/includes/aquarium.h
@@ -32,14 +32,14 @@ public:
DECLARE_WRITE8_MEMBER(aquarium_z80_bank_w);
DECLARE_READ8_MEMBER(aquarium_oki_r);
DECLARE_WRITE8_MEMBER(aquarium_oki_w);
+ DECLARE_WRITE16_MEMBER(aquarium_txt_videoram_w);
+ DECLARE_WRITE16_MEMBER(aquarium_mid_videoram_w);
+ DECLARE_WRITE16_MEMBER(aquarium_bak_videoram_w);
};
/*----------- defined in video/aquarium.c -----------*/
-WRITE16_HANDLER( aquarium_txt_videoram_w );
-WRITE16_HANDLER( aquarium_mid_videoram_w );
-WRITE16_HANDLER( aquarium_bak_videoram_w );
VIDEO_START(aquarium);
SCREEN_UPDATE_IND16(aquarium);
diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h
index 61ce101d8f8..f9266a1e743 100644
--- a/src/mame/includes/arabian.h
+++ b/src/mame/includes/arabian.h
@@ -32,13 +32,13 @@ public:
DECLARE_READ8_MEMBER(mcu_portk_r);
DECLARE_WRITE8_MEMBER(mcu_port_o_w);
DECLARE_WRITE8_MEMBER(mcu_port_p_w);
+ DECLARE_WRITE8_MEMBER(arabian_blitter_w);
+ DECLARE_WRITE8_MEMBER(arabian_videoram_w);
};
/*----------- defined in video/arabian.c -----------*/
-WRITE8_HANDLER( arabian_blitter_w );
-WRITE8_HANDLER( arabian_videoram_w );
PALETTE_INIT( arabian );
VIDEO_START( arabian );
diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h
index a8dfdbc2fdd..f1038bf5b86 100644
--- a/src/mame/includes/argus.h
+++ b/src/mame/includes/argus.h
@@ -36,6 +36,27 @@ public:
UINT8 *m_spriteram;
size_t m_spriteram_size;
DECLARE_WRITE8_MEMBER(argus_bankselect_w);
+ DECLARE_WRITE8_MEMBER(valtric_mosaic_w);
+ DECLARE_READ8_MEMBER(argus_txram_r);
+ DECLARE_WRITE8_MEMBER(argus_txram_w);
+ DECLARE_READ8_MEMBER(argus_bg1ram_r);
+ DECLARE_WRITE8_MEMBER(argus_bg1ram_w);
+ DECLARE_WRITE8_MEMBER(argus_bg_status_w);
+ DECLARE_WRITE8_MEMBER(valtric_bg_status_w);
+ DECLARE_WRITE8_MEMBER(butasan_bg0_status_w);
+ DECLARE_WRITE8_MEMBER(butasan_bg1_status_w);
+ DECLARE_WRITE8_MEMBER(argus_flipscreen_w);
+ DECLARE_READ8_MEMBER(argus_paletteram_r);
+ DECLARE_WRITE8_MEMBER(argus_paletteram_w);
+ DECLARE_WRITE8_MEMBER(valtric_paletteram_w);
+ DECLARE_WRITE8_MEMBER(butasan_paletteram_w);
+ DECLARE_READ8_MEMBER(butasan_bg1ram_r);
+ DECLARE_WRITE8_MEMBER(butasan_bg1ram_w);
+ DECLARE_WRITE8_MEMBER(butasan_pageselect_w);
+ DECLARE_READ8_MEMBER(butasan_pagedram_r);
+ DECLARE_WRITE8_MEMBER(butasan_pagedram_w);
+ DECLARE_WRITE8_MEMBER(valtric_unknown_w);
+ DECLARE_WRITE8_MEMBER(butasan_unknown_w);
};
@@ -51,27 +72,6 @@ SCREEN_UPDATE_RGB32( argus );
SCREEN_UPDATE_RGB32( valtric );
SCREEN_UPDATE_RGB32( butasan );
-READ8_HANDLER( argus_txram_r );
-READ8_HANDLER( argus_bg1ram_r );
-READ8_HANDLER( argus_paletteram_r );
-WRITE8_HANDLER( argus_txram_w );
-WRITE8_HANDLER( argus_bg1ram_w );
-WRITE8_HANDLER( argus_bg_status_w );
-WRITE8_HANDLER( argus_flipscreen_w );
-WRITE8_HANDLER( argus_paletteram_w );
-WRITE8_HANDLER( valtric_bg_status_w );
-WRITE8_HANDLER( valtric_paletteram_w );
-WRITE8_HANDLER( valtric_mosaic_w );
-WRITE8_HANDLER( valtric_unknown_w );
-READ8_HANDLER( butasan_pagedram_r );
-READ8_HANDLER( butasan_bg1ram_r );
-WRITE8_HANDLER( butasan_pageselect_w );
-WRITE8_HANDLER( butasan_pagedram_w );
-WRITE8_HANDLER( butasan_bg1ram_w );
-WRITE8_HANDLER( butasan_bg0_status_w );
-WRITE8_HANDLER( butasan_paletteram_w );
-WRITE8_HANDLER( butasan_bg1_status_w );
-WRITE8_HANDLER( butasan_unknown_w );
diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h
index 1380e0c0f25..1ebf8fd59ee 100644
--- a/src/mame/includes/arkanoid.h
+++ b/src/mame/includes/arkanoid.h
@@ -45,17 +45,30 @@ public:
/* devices */
device_t *m_mcu;
+ DECLARE_READ8_MEMBER(arkanoid_Z80_mcu_r);
+ DECLARE_WRITE8_MEMBER(arkanoid_Z80_mcu_w);
+ DECLARE_READ8_MEMBER(arkanoid_68705_port_a_r);
+ DECLARE_WRITE8_MEMBER(arkanoid_68705_port_a_w);
+ DECLARE_WRITE8_MEMBER(arkanoid_68705_ddr_a_w);
+ DECLARE_READ8_MEMBER(arkanoid_68705_port_c_r);
+ DECLARE_WRITE8_MEMBER(arkanoid_68705_port_c_w);
+ DECLARE_WRITE8_MEMBER(arkanoid_68705_ddr_c_w);
+ DECLARE_READ8_MEMBER(arkanoid_bootleg_f000_r);
+ DECLARE_READ8_MEMBER(arkanoid_bootleg_f002_r);
+ DECLARE_WRITE8_MEMBER(arkanoid_bootleg_d018_w);
+ DECLARE_READ8_MEMBER(block2_bootleg_f000_r);
+ DECLARE_READ8_MEMBER(arkanoid_bootleg_d008_r);
+ DECLARE_WRITE8_MEMBER(arkanoid_videoram_w);
+ DECLARE_WRITE8_MEMBER(arkanoid_d008_w);
+ DECLARE_WRITE8_MEMBER(tetrsark_d008_w);
+ DECLARE_WRITE8_MEMBER(hexa_d008_w);
};
/*----------- defined in video/arkanoid.c -----------*/
-extern WRITE8_HANDLER( arkanoid_videoram_w );
-extern WRITE8_HANDLER( arkanoid_d008_w );
-extern WRITE8_HANDLER( tetrsark_d008_w );
-extern WRITE8_HANDLER( hexa_d008_w );
extern VIDEO_START( arkanoid );
extern SCREEN_UPDATE_IND16( arkanoid );
@@ -64,21 +77,9 @@ extern SCREEN_UPDATE_IND16( hexa );
/*----------- defined in machine/arkanoid.c -----------*/
-extern READ8_HANDLER( arkanoid_Z80_mcu_r );
-extern WRITE8_HANDLER( arkanoid_Z80_mcu_w );
-extern READ8_HANDLER( arkanoid_68705_port_a_r );
-extern WRITE8_HANDLER( arkanoid_68705_port_a_w );
-extern WRITE8_HANDLER( arkanoid_68705_ddr_a_w );
-extern READ8_HANDLER( arkanoid_68705_port_c_r );
-extern WRITE8_HANDLER( arkanoid_68705_port_c_w );
-extern WRITE8_HANDLER( arkanoid_68705_ddr_c_w );
extern CUSTOM_INPUT( arkanoid_68705_input_r );
extern CUSTOM_INPUT( arkanoid_input_mux );
-extern READ8_HANDLER( arkanoid_bootleg_f000_r );
-extern READ8_HANDLER( arkanoid_bootleg_f002_r );
-extern WRITE8_HANDLER( arkanoid_bootleg_d018_w );
-extern READ8_HANDLER( arkanoid_bootleg_d008_r );
diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h
index ebe838a405e..c0156439c24 100644
--- a/src/mame/includes/armedf.h
+++ b/src/mame/includes/armedf.h
@@ -44,6 +44,19 @@ public:
DECLARE_WRITE8_MEMBER(fg_scrollx_w);
DECLARE_WRITE8_MEMBER(fg_scrolly_w);
DECLARE_WRITE8_MEMBER(fg_scroll_msb_w);
+ DECLARE_READ8_MEMBER(nb1414m4_text_videoram_r);
+ DECLARE_WRITE8_MEMBER(nb1414m4_text_videoram_w);
+ DECLARE_READ8_MEMBER(armedf_text_videoram_r);
+ DECLARE_WRITE8_MEMBER(armedf_text_videoram_w);
+ DECLARE_WRITE16_MEMBER(armedf_fg_videoram_w);
+ DECLARE_WRITE16_MEMBER(armedf_bg_videoram_w);
+ DECLARE_WRITE16_MEMBER(terraf_fg_scrolly_w);
+ DECLARE_WRITE16_MEMBER(terraf_fg_scrollx_w);
+ DECLARE_WRITE16_MEMBER(terraf_fg_scroll_msb_arm_w);
+ DECLARE_WRITE16_MEMBER(armedf_fg_scrollx_w);
+ DECLARE_WRITE16_MEMBER(armedf_fg_scrolly_w);
+ DECLARE_WRITE16_MEMBER(armedf_bg_scrollx_w);
+ DECLARE_WRITE16_MEMBER(armedf_bg_scrolly_w);
};
class bigfghtr_state : public armedf_state
@@ -70,16 +83,3 @@ SCREEN_UPDATE_IND16( armedf );
VIDEO_START( armedf );
VIDEO_START( terraf );
-WRITE16_HANDLER( armedf_bg_videoram_w );
-WRITE16_HANDLER( armedf_fg_videoram_w );
-READ8_HANDLER( armedf_text_videoram_r );
-WRITE8_HANDLER( armedf_text_videoram_w );
-READ8_HANDLER( nb1414m4_text_videoram_r );
-WRITE8_HANDLER( nb1414m4_text_videoram_w );
-WRITE16_HANDLER( terraf_fg_scrollx_w );
-WRITE16_HANDLER( terraf_fg_scrolly_w );
-WRITE16_HANDLER( terraf_fg_scroll_msb_arm_w );
-WRITE16_HANDLER( armedf_fg_scrollx_w );
-WRITE16_HANDLER( armedf_fg_scrolly_w );
-WRITE16_HANDLER( armedf_bg_scrollx_w );
-WRITE16_HANDLER( armedf_bg_scrolly_w );
diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h
index db7e28b90b2..6dbc95225a8 100644
--- a/src/mame/includes/artmagic.h
+++ b/src/mame/includes/artmagic.h
@@ -36,6 +36,8 @@ public:
DECLARE_READ16_MEMBER(ultennis_hack_r);
DECLARE_WRITE16_MEMBER(protection_bit_w);
DECLARE_READ16_MEMBER(unk_r);
+ DECLARE_READ16_MEMBER(artmagic_blitter_r);
+ DECLARE_WRITE16_MEMBER(artmagic_blitter_w);
};
@@ -46,7 +48,5 @@ VIDEO_START( artmagic );
void artmagic_to_shiftreg(address_space *space, offs_t address, UINT16 *data);
void artmagic_from_shiftreg(address_space *space, offs_t address, UINT16 *data);
-READ16_HANDLER( artmagic_blitter_r );
-WRITE16_HANDLER( artmagic_blitter_w );
void artmagic_scanline(screen_device &screen, bitmap_rgb32 &bitmap, int scanline, const tms34010_display_params *params);
diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h
index 1926847cd89..734c2d16aed 100644
--- a/src/mame/includes/ashnojoe.h
+++ b/src/mame/includes/ashnojoe.h
@@ -43,20 +43,20 @@ public:
DECLARE_WRITE8_MEMBER(adpcm_w);
DECLARE_READ8_MEMBER(sound_latch_r);
DECLARE_READ8_MEMBER(sound_latch_status_r);
+ DECLARE_WRITE16_MEMBER(ashnojoe_tileram_w);
+ DECLARE_WRITE16_MEMBER(ashnojoe_tileram2_w);
+ DECLARE_WRITE16_MEMBER(ashnojoe_tileram3_w);
+ DECLARE_WRITE16_MEMBER(ashnojoe_tileram4_w);
+ DECLARE_WRITE16_MEMBER(ashnojoe_tileram5_w);
+ DECLARE_WRITE16_MEMBER(ashnojoe_tileram6_w);
+ DECLARE_WRITE16_MEMBER(ashnojoe_tileram7_w);
+ DECLARE_WRITE16_MEMBER(joe_tilemaps_xscroll_w);
+ DECLARE_WRITE16_MEMBER(joe_tilemaps_yscroll_w);
};
/*----------- defined in video/ashnojoe.c -----------*/
-WRITE16_HANDLER( ashnojoe_tileram_w );
-WRITE16_HANDLER( ashnojoe_tileram2_w );
-WRITE16_HANDLER( ashnojoe_tileram3_w );
-WRITE16_HANDLER( ashnojoe_tileram4_w );
-WRITE16_HANDLER( ashnojoe_tileram5_w );
-WRITE16_HANDLER( ashnojoe_tileram6_w );
-WRITE16_HANDLER( ashnojoe_tileram7_w );
-WRITE16_HANDLER( joe_tilemaps_xscroll_w );
-WRITE16_HANDLER( joe_tilemaps_yscroll_w );
VIDEO_START( ashnojoe );
SCREEN_UPDATE_IND16( ashnojoe );
diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h
index cdc6768970c..6d29a4633b0 100644
--- a/src/mame/includes/asterix.h
+++ b/src/mame/includes/asterix.h
@@ -37,6 +37,7 @@ public:
DECLARE_WRITE8_MEMBER(sound_arm_nmi_w);
DECLARE_WRITE16_MEMBER(sound_irq_w);
DECLARE_WRITE16_MEMBER(protection_w);
+ DECLARE_WRITE16_MEMBER(asterix_spritebank_w);
};
@@ -44,7 +45,6 @@ public:
/*----------- defined in video/asterix.c -----------*/
SCREEN_UPDATE_IND16( asterix );
-WRITE16_HANDLER( asterix_spritebank_w );
extern void asterix_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags);
extern void asterix_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask);
diff --git a/src/mame/includes/asteroid.h b/src/mame/includes/asteroid.h
index df4e2c38f69..b2a005b02e6 100644
--- a/src/mame/includes/asteroid.h
+++ b/src/mame/includes/asteroid.h
@@ -16,6 +16,13 @@ public:
UINT8 *m_ram2;
DECLARE_WRITE8_MEMBER(astdelux_coin_counter_w);
DECLARE_WRITE8_MEMBER(llander_led_w);
+ DECLARE_READ8_MEMBER(asteroid_IN0_r);
+ DECLARE_READ8_MEMBER(asterock_IN0_r);
+ DECLARE_READ8_MEMBER(asteroid_IN1_r);
+ DECLARE_READ8_MEMBER(asteroid_DSW1_r);
+ DECLARE_WRITE8_MEMBER(asteroid_bank_switch_w);
+ DECLARE_WRITE8_MEMBER(astdelux_bank_switch_w);
+ DECLARE_WRITE8_MEMBER(astdelux_led_w);
};
@@ -25,14 +32,7 @@ INTERRUPT_GEN( asteroid_interrupt );
INTERRUPT_GEN( asterock_interrupt );
INTERRUPT_GEN( llander_interrupt );
-READ8_HANDLER( asteroid_IN0_r );
-READ8_HANDLER( asterock_IN0_r );
-READ8_HANDLER( asteroid_IN1_r );
-READ8_HANDLER( asteroid_DSW1_r );
-WRITE8_HANDLER( asteroid_bank_switch_w );
-WRITE8_HANDLER( astdelux_bank_switch_w );
-WRITE8_HANDLER( astdelux_led_w );
MACHINE_RESET( asteroid );
diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h
index ec62a36a9ce..655f0eadafd 100644
--- a/src/mame/includes/astrocde.h
+++ b/src/mame/includes/astrocde.h
@@ -91,6 +91,15 @@ public:
DECLARE_WRITE8_MEMBER(tenpindx_lamp_w);
DECLARE_WRITE8_MEMBER(tenpindx_counter_w);
DECLARE_WRITE8_MEMBER(tenpindx_lights_w);
+ DECLARE_READ8_MEMBER(astrocade_data_chip_register_r);
+ DECLARE_WRITE8_MEMBER(astrocade_data_chip_register_w);
+ DECLARE_WRITE8_MEMBER(astrocade_funcgen_w);
+ DECLARE_WRITE8_MEMBER(astrocade_pattern_board_w);
+ DECLARE_WRITE8_MEMBER(profpac_page_select_w);
+ DECLARE_READ8_MEMBER(profpac_intercept_r);
+ DECLARE_WRITE8_MEMBER(profpac_screenram_ctrl_w);
+ DECLARE_READ8_MEMBER(profpac_videoram_r);
+ DECLARE_WRITE8_MEMBER(profpac_videoram_w);
};
@@ -105,16 +114,7 @@ VIDEO_START( profpac );
SCREEN_UPDATE_IND16( astrocde );
SCREEN_UPDATE_IND16( profpac );
-WRITE8_HANDLER( astrocade_pattern_board_w );
-READ8_HANDLER( astrocade_data_chip_register_r );
-WRITE8_HANDLER( astrocade_data_chip_register_w );
-WRITE8_HANDLER( astrocade_funcgen_w );
-READ8_HANDLER( profpac_videoram_r );
-WRITE8_HANDLER( profpac_videoram_w );
-READ8_HANDLER( profpac_intercept_r );
-WRITE8_HANDLER( profpac_page_select_w );
-WRITE8_HANDLER( profpac_screenram_ctrl_w );
/*----------- defined in audio/wow.c -----------*/
diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h
index e6eaca7494d..ef5f3cd9b84 100644
--- a/src/mame/includes/asuka.h
+++ b/src/mame/includes/asuka.h
@@ -38,6 +38,7 @@ public:
DECLARE_WRITE8_MEMBER(asuka_msm5205_address_w);
DECLARE_READ16_MEMBER(cadash_share_r);
DECLARE_WRITE16_MEMBER(cadash_share_w);
+ DECLARE_WRITE16_MEMBER(asuka_spritectrl_w);
};
@@ -53,7 +54,6 @@ WRITE16_HANDLER( bonzeadv_cchip_ram_w );
/*----------- defined in video/asuka.c -----------*/
-WRITE16_HANDLER( asuka_spritectrl_w );
SCREEN_UPDATE_IND16( asuka );
SCREEN_UPDATE_IND16( bonzeadv );
diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h
index b26cf9d16a3..8f49e866085 100644
--- a/src/mame/includes/atarifb.h
+++ b/src/mame/includes/atarifb.h
@@ -54,25 +54,28 @@ public:
/* devices */
device_t *m_maincpu;
+ DECLARE_WRITE8_MEMBER(atarifb_out1_w);
+ DECLARE_WRITE8_MEMBER(atarifb4_out1_w);
+ DECLARE_WRITE8_MEMBER(abaseb_out1_w);
+ DECLARE_WRITE8_MEMBER(soccer_out1_w);
+ DECLARE_WRITE8_MEMBER(atarifb_out2_w);
+ DECLARE_WRITE8_MEMBER(soccer_out2_w);
+ DECLARE_WRITE8_MEMBER(atarifb_out3_w);
+ DECLARE_READ8_MEMBER(atarifb_in0_r);
+ DECLARE_READ8_MEMBER(atarifb_in2_r);
+ DECLARE_READ8_MEMBER(atarifb4_in0_r);
+ DECLARE_READ8_MEMBER(atarifb4_in2_r);
+ DECLARE_WRITE8_MEMBER(atarifb_alpha1_videoram_w);
+ DECLARE_WRITE8_MEMBER(atarifb_alpha2_videoram_w);
+ DECLARE_WRITE8_MEMBER(atarifb_field_videoram_w);
};
/*----------- defined in machine/atarifb.c -----------*/
-WRITE8_HANDLER( atarifb_out1_w );
-WRITE8_HANDLER( atarifb4_out1_w );
-WRITE8_HANDLER( abaseb_out1_w );
-WRITE8_HANDLER( soccer_out1_w );
-WRITE8_HANDLER( atarifb_out2_w );
-WRITE8_HANDLER( soccer_out2_w );
-WRITE8_HANDLER( atarifb_out3_w );
-READ8_HANDLER( atarifb_in0_r );
-READ8_HANDLER( atarifb_in2_r );
-READ8_HANDLER( atarifb4_in0_r );
-READ8_HANDLER( atarifb4_in2_r );
/*----------- defined in audio/atarifb.c -----------*/
@@ -88,6 +91,3 @@ SCREEN_UPDATE_IND16( atarifb );
SCREEN_UPDATE_IND16( abaseb );
SCREEN_UPDATE_IND16( soccer );
-WRITE8_HANDLER( atarifb_alpha1_videoram_w );
-WRITE8_HANDLER( atarifb_alpha2_videoram_w );
-WRITE8_HANDLER( atarifb_field_videoram_w );
diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h
index 4474bffe9d6..0efd85ff306 100644
--- a/src/mame/includes/atetris.h
+++ b/src/mame/includes/atetris.h
@@ -24,6 +24,7 @@ public:
DECLARE_WRITE8_MEMBER(coincount_w);
DECLARE_WRITE8_MEMBER(nvram_w);
DECLARE_WRITE8_MEMBER(nvram_enable_w);
+ DECLARE_WRITE8_MEMBER(atetris_videoram_w);
};
/*----------- defined in video/atetris.c -----------*/
@@ -31,4 +32,3 @@ public:
VIDEO_START( atetris );
SCREEN_UPDATE_IND16( atetris );
-WRITE8_HANDLER( atetris_videoram_w );
diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h
index 910361b5858..a0a9b2371aa 100644
--- a/src/mame/includes/aztarac.h
+++ b/src/mame/includes/aztarac.h
@@ -18,6 +18,7 @@ public:
int m_ycenter;
DECLARE_READ16_MEMBER(nvram_r);
DECLARE_READ16_MEMBER(joystick_r);
+ DECLARE_WRITE16_MEMBER(aztarac_ubr_w);
};
/*----------- defined in audio/aztarac.c -----------*/
@@ -34,7 +35,6 @@ INTERRUPT_GEN( aztarac_snd_timed_irq );
/*----------- defined in video/aztarac.c -----------*/
-WRITE16_HANDLER( aztarac_ubr_w );
VIDEO_START( aztarac );
diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h
index 53012c4acbc..153a091b6b4 100644
--- a/src/mame/includes/bagman.h
+++ b/src/mame/includes/bagman.h
@@ -30,6 +30,12 @@ public:
UINT8 m_irq_mask;
DECLARE_WRITE8_MEMBER(bagman_coin_counter_w);
DECLARE_WRITE8_MEMBER(irq_mask_w);
+ DECLARE_WRITE8_MEMBER(bagman_pal16r6_w);
+ DECLARE_READ8_MEMBER(bagman_pal16r6_r);
+ void update_pal();
+ DECLARE_WRITE8_MEMBER(bagman_videoram_w);
+ DECLARE_WRITE8_MEMBER(bagman_colorram_w);
+ DECLARE_WRITE8_MEMBER(bagman_flipscreen_w);
};
@@ -55,16 +61,11 @@ public:
/*----------- defined in machine/bagman.c -----------*/
-READ8_HANDLER( bagman_pal16r6_r );
MACHINE_RESET( bagman );
-WRITE8_HANDLER( bagman_pal16r6_w );
/*----------- defined in video/bagman.c -----------*/
-WRITE8_HANDLER( bagman_videoram_w );
-WRITE8_HANDLER( bagman_colorram_w );
-WRITE8_HANDLER( bagman_flipscreen_w );
PALETTE_INIT( bagman );
VIDEO_START( bagman );
diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h
index c19fcf0cb57..71019a48fb7 100644
--- a/src/mame/includes/balsente.h
+++ b/src/mame/includes/balsente.h
@@ -123,6 +123,41 @@ public:
UINT8 m_palettebank_vis;
UINT8 *m_spriteram;
+ DECLARE_WRITE8_MEMBER(balsente_random_reset_w);
+ DECLARE_READ8_MEMBER(balsente_random_num_r);
+ DECLARE_WRITE8_MEMBER(balsente_rombank_select_w);
+ DECLARE_WRITE8_MEMBER(balsente_rombank2_select_w);
+ DECLARE_WRITE8_MEMBER(balsente_misc_output_w);
+ DECLARE_READ8_MEMBER(balsente_m6850_r);
+ DECLARE_WRITE8_MEMBER(balsente_m6850_w);
+ DECLARE_READ8_MEMBER(balsente_m6850_sound_r);
+ DECLARE_WRITE8_MEMBER(balsente_m6850_sound_w);
+ DECLARE_READ8_MEMBER(balsente_adc_data_r);
+ DECLARE_WRITE8_MEMBER(balsente_adc_select_w);
+ DECLARE_READ8_MEMBER(balsente_counter_8253_r);
+ DECLARE_WRITE8_MEMBER(balsente_counter_8253_w);
+ DECLARE_READ8_MEMBER(balsente_counter_state_r);
+ DECLARE_WRITE8_MEMBER(balsente_counter_control_w);
+ DECLARE_WRITE8_MEMBER(balsente_chip_select_w);
+ DECLARE_WRITE8_MEMBER(balsente_dac_data_w);
+ DECLARE_WRITE8_MEMBER(balsente_register_addr_w);
+ DECLARE_WRITE8_MEMBER(spiker_expand_w);
+ DECLARE_READ8_MEMBER(spiker_expand_r);
+ DECLARE_READ8_MEMBER(grudge_steering_r);
+ DECLARE_READ8_MEMBER(shrike_shared_6809_r);
+ DECLARE_WRITE8_MEMBER(shrike_shared_6809_w);
+ DECLARE_WRITE16_MEMBER(shrike_io_68k_w);
+ DECLARE_READ16_MEMBER(shrike_io_68k_r);
+ void counter_set_out(int which, int out);
+ void counter_start(int which);
+ void counter_stop( int which);
+ void counter_update_count(int which);
+ void counter_set_gate(int which, int gate);
+ void update_counter_0_timer();
+ DECLARE_WRITE8_MEMBER(balsente_videoram_w);
+ DECLARE_WRITE8_MEMBER(balsente_palette_select_w);
+ DECLARE_WRITE8_MEMBER(balsente_paletteram_w);
+ DECLARE_WRITE8_MEMBER(shrike_sprite_select_w);
};
@@ -135,48 +170,23 @@ MACHINE_RESET( balsente );
void balsente_noise_gen(device_t *device, int count, short *buffer);
-WRITE8_HANDLER( balsente_random_reset_w );
-READ8_HANDLER( balsente_random_num_r );
-WRITE8_HANDLER( balsente_rombank_select_w );
-WRITE8_HANDLER( balsente_rombank2_select_w );
-WRITE8_HANDLER( balsente_misc_output_w );
-READ8_HANDLER( balsente_m6850_r );
-WRITE8_HANDLER( balsente_m6850_w );
-READ8_HANDLER( balsente_m6850_sound_r );
-WRITE8_HANDLER( balsente_m6850_sound_w );
INTERRUPT_GEN( balsente_update_analog_inputs );
-READ8_HANDLER( balsente_adc_data_r );
-WRITE8_HANDLER( balsente_adc_select_w );
TIMER_DEVICE_CALLBACK( balsente_counter_callback );
-READ8_HANDLER( balsente_counter_8253_r );
-WRITE8_HANDLER( balsente_counter_8253_w );
TIMER_DEVICE_CALLBACK( balsente_clock_counter_0_ff );
-READ8_HANDLER( balsente_counter_state_r );
-WRITE8_HANDLER( balsente_counter_control_w );
-WRITE8_HANDLER( balsente_chip_select_w );
-WRITE8_HANDLER( balsente_dac_data_w );
-WRITE8_HANDLER( balsente_register_addr_w );
CUSTOM_INPUT( nstocker_bits_r );
-WRITE8_HANDLER( spiker_expand_w );
-READ8_HANDLER( spiker_expand_r );
-READ8_HANDLER( grudge_steering_r );
-READ8_HANDLER( shrike_shared_6809_r );
-WRITE8_HANDLER( shrike_shared_6809_w );
-READ16_HANDLER( shrike_io_68k_r );
-WRITE16_HANDLER( shrike_io_68k_w );
/*----------- defined in video/balsente.c -----------*/
@@ -184,7 +194,3 @@ WRITE16_HANDLER( shrike_io_68k_w );
VIDEO_START( balsente );
SCREEN_UPDATE_IND16( balsente );
-WRITE8_HANDLER( balsente_videoram_w );
-WRITE8_HANDLER( balsente_paletteram_w );
-WRITE8_HANDLER( balsente_palette_select_w );
-WRITE8_HANDLER( shrike_sprite_select_w );
diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h
index 0f5ccf842bd..9699c8ca0da 100644
--- a/src/mame/includes/bankp.h
+++ b/src/mame/includes/bankp.h
@@ -28,17 +28,17 @@ public:
int m_priority;
UINT8 m_nmi_mask;
+ DECLARE_WRITE8_MEMBER(bankp_scroll_w);
+ DECLARE_WRITE8_MEMBER(bankp_videoram_w);
+ DECLARE_WRITE8_MEMBER(bankp_colorram_w);
+ DECLARE_WRITE8_MEMBER(bankp_videoram2_w);
+ DECLARE_WRITE8_MEMBER(bankp_colorram2_w);
+ DECLARE_WRITE8_MEMBER(bankp_out_w);
};
/*----------- defined in video/bankp.c -----------*/
-WRITE8_HANDLER( bankp_videoram_w );
-WRITE8_HANDLER( bankp_colorram_w );
-WRITE8_HANDLER( bankp_videoram2_w );
-WRITE8_HANDLER( bankp_colorram2_w );
-WRITE8_HANDLER( bankp_scroll_w );
-WRITE8_HANDLER( bankp_out_w );
PALETTE_INIT( bankp );
VIDEO_START( bankp );
diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h
index f4a50af14d7..ef952277e04 100644
--- a/src/mame/includes/baraduke.h
+++ b/src/mame/includes/baraduke.h
@@ -20,6 +20,14 @@ public:
DECLARE_WRITE8_MEMBER(baraduke_irq_ack_w);
DECLARE_READ8_MEMBER(soundkludge_r);
DECLARE_READ8_MEMBER(readFF);
+ DECLARE_READ8_MEMBER(baraduke_videoram_r);
+ DECLARE_WRITE8_MEMBER(baraduke_videoram_w);
+ DECLARE_READ8_MEMBER(baraduke_textram_r);
+ DECLARE_WRITE8_MEMBER(baraduke_textram_w);
+ DECLARE_WRITE8_MEMBER(baraduke_scroll0_w);
+ DECLARE_WRITE8_MEMBER(baraduke_scroll1_w);
+ DECLARE_READ8_MEMBER(baraduke_spriteram_r);
+ DECLARE_WRITE8_MEMBER(baraduke_spriteram_w);
};
@@ -28,12 +36,4 @@ public:
VIDEO_START( baraduke );
SCREEN_UPDATE_IND16( baraduke );
SCREEN_VBLANK( baraduke );
-READ8_HANDLER( baraduke_videoram_r );
-WRITE8_HANDLER( baraduke_videoram_w );
-READ8_HANDLER( baraduke_textram_r );
-WRITE8_HANDLER( baraduke_textram_w );
-WRITE8_HANDLER( baraduke_scroll0_w );
-WRITE8_HANDLER( baraduke_scroll1_w );
-READ8_HANDLER( baraduke_spriteram_r );
-WRITE8_HANDLER( baraduke_spriteram_w );
PALETTE_INIT( baraduke );
diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h
index c42e72d598b..8c109df2598 100644
--- a/src/mame/includes/battlane.h
+++ b/src/mame/includes/battlane.h
@@ -24,18 +24,18 @@ public:
device_t *m_maincpu;
device_t *m_subcpu;
DECLARE_WRITE8_MEMBER(battlane_cpu_command_w);
+ DECLARE_WRITE8_MEMBER(battlane_palette_w);
+ DECLARE_WRITE8_MEMBER(battlane_scrollx_w);
+ DECLARE_WRITE8_MEMBER(battlane_scrolly_w);
+ DECLARE_WRITE8_MEMBER(battlane_tileram_w);
+ DECLARE_WRITE8_MEMBER(battlane_spriteram_w);
+ DECLARE_WRITE8_MEMBER(battlane_bitmap_w);
+ DECLARE_WRITE8_MEMBER(battlane_video_ctrl_w);
};
/*----------- defined in video/battlane.c -----------*/
-WRITE8_HANDLER( battlane_palette_w );
-WRITE8_HANDLER( battlane_scrollx_w );
-WRITE8_HANDLER( battlane_scrolly_w );
-WRITE8_HANDLER( battlane_tileram_w );
-WRITE8_HANDLER( battlane_spriteram_w );
-WRITE8_HANDLER( battlane_bitmap_w );
-WRITE8_HANDLER( battlane_video_ctrl_w );
VIDEO_START( battlane );
SCREEN_UPDATE_IND16( battlane );
diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h
index bf24dc57839..b6ff36ba161 100644
--- a/src/mame/includes/battlera.h
+++ b/src/mame/includes/battlera.h
@@ -31,6 +31,13 @@ public:
DECLARE_WRITE8_MEMBER(control_data_w);
DECLARE_READ8_MEMBER(control_data_r);
DECLARE_WRITE8_MEMBER(battlera_adpcm_data_w);
+ DECLARE_WRITE8_MEMBER(battlera_palette_w);
+ DECLARE_READ8_MEMBER(HuC6270_debug_r);
+ DECLARE_WRITE8_MEMBER(HuC6270_debug_w);
+ DECLARE_READ8_MEMBER(HuC6270_register_r);
+ DECLARE_WRITE8_MEMBER(HuC6270_register_w);
+ DECLARE_READ8_MEMBER(HuC6270_data_r);
+ DECLARE_WRITE8_MEMBER(HuC6270_data_w);
};
@@ -40,11 +47,4 @@ SCREEN_UPDATE_IND16( battlera );
VIDEO_START( battlera );
TIMER_DEVICE_CALLBACK( battlera_irq );
-READ8_HANDLER( HuC6270_register_r );
-WRITE8_HANDLER( HuC6270_register_w );
-//READ8_HANDLER( HuC6270_data_r );
-WRITE8_HANDLER( HuC6270_data_w );
-WRITE8_HANDLER( battlera_palette_w );
-READ8_HANDLER( HuC6270_debug_r );
-WRITE8_HANDLER( HuC6270_debug_w );
diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h
index c81c9471d55..7d2a60af252 100644
--- a/src/mame/includes/battlex.h
+++ b/src/mame/includes/battlex.h
@@ -21,17 +21,17 @@ public:
UINT8 m_scroll_lsb;
UINT8 m_scroll_msb;
UINT8 m_starfield_enabled;
+ DECLARE_WRITE8_MEMBER(battlex_palette_w);
+ DECLARE_WRITE8_MEMBER(battlex_scroll_x_lsb_w);
+ DECLARE_WRITE8_MEMBER(battlex_scroll_x_msb_w);
+ DECLARE_WRITE8_MEMBER(battlex_scroll_starfield_w);
+ DECLARE_WRITE8_MEMBER(battlex_videoram_w);
+ DECLARE_WRITE8_MEMBER(battlex_flipscreen_w);
};
/*----------- defined in video/battlex.c -----------*/
-extern WRITE8_HANDLER( battlex_palette_w );
-extern WRITE8_HANDLER( battlex_videoram_w );
-extern WRITE8_HANDLER( battlex_scroll_x_lsb_w );
-extern WRITE8_HANDLER( battlex_scroll_x_msb_w );
-extern WRITE8_HANDLER( battlex_scroll_starfield_w );
-extern WRITE8_HANDLER( battlex_flipscreen_w );
extern VIDEO_START( battlex );
extern SCREEN_UPDATE_IND16( battlex );
diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h
index 5f00d210842..fa8d28e38ef 100644
--- a/src/mame/includes/battlnts.h
+++ b/src/mame/includes/battlnts.h
@@ -24,11 +24,11 @@ public:
device_t *m_k007420;
DECLARE_WRITE8_MEMBER(battlnts_sh_irqtrigger_w);
DECLARE_WRITE8_MEMBER(battlnts_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(battlnts_spritebank_w);
};
/*----------- defined in video/battlnts.c -----------*/
-WRITE8_HANDLER( battlnts_spritebank_w );
SCREEN_UPDATE_IND16( battlnts );
diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h
index 503cfee1165..660f1b20c4e 100644
--- a/src/mame/includes/bbusters.h
+++ b/src/mame/includes/bbusters.h
@@ -38,6 +38,9 @@ public:
DECLARE_WRITE16_MEMBER(three_gun_output_w);
DECLARE_READ16_MEMBER(kludge_r);
DECLARE_READ16_MEMBER(mechatt_gun_r);
+ DECLARE_WRITE16_MEMBER(bbusters_video_w);
+ DECLARE_WRITE16_MEMBER(bbusters_pf1_w);
+ DECLARE_WRITE16_MEMBER(bbusters_pf2_w);
};
@@ -48,6 +51,3 @@ VIDEO_START( mechatt );
SCREEN_UPDATE_IND16( bbuster );
SCREEN_UPDATE_IND16( mechatt );
-WRITE16_HANDLER( bbusters_pf1_w );
-WRITE16_HANDLER( bbusters_pf2_w );
-WRITE16_HANDLER( bbusters_video_w );
diff --git a/src/mame/includes/beezer.h b/src/mame/includes/beezer.h
index 531d1c96bb9..e823dad61ea 100644
--- a/src/mame/includes/beezer.h
+++ b/src/mame/includes/beezer.h
@@ -11,6 +11,9 @@ public:
int m_banklatch;
device_t *m_maincpu;
+ DECLARE_WRITE8_MEMBER(beezer_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(beezer_map_w);
+ DECLARE_READ8_MEMBER(beezer_line_r);
};
@@ -20,7 +23,6 @@ extern const via6522_interface b_via_0_interface;
extern const via6522_interface b_via_1_interface;
DRIVER_INIT( beezer );
-WRITE8_HANDLER( beezer_bankswitch_w );
/*----------- defined in audio/beezer.c -----------*/
@@ -36,5 +38,3 @@ READ8_DEVICE_HANDLER( beezer_noise_r );
TIMER_DEVICE_CALLBACK( beezer_interrupt );
SCREEN_UPDATE_IND16( beezer );
-WRITE8_HANDLER( beezer_map_w );
-READ8_HANDLER( beezer_line_r );
diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h
index e4a7fefe1be..7561a7f6cbd 100644
--- a/src/mame/includes/bigevglf.h
+++ b/src/mame/includes/bigevglf.h
@@ -65,24 +65,29 @@ public:
DECLARE_READ8_MEMBER(beg_trackball_y_r);
DECLARE_WRITE8_MEMBER(beg_port08_w);
DECLARE_READ8_MEMBER(sub_cpu_mcu_coin_port_r);
+ DECLARE_READ8_MEMBER(bigevglf_68705_port_a_r);
+ DECLARE_WRITE8_MEMBER(bigevglf_68705_port_a_w);
+ DECLARE_WRITE8_MEMBER(bigevglf_68705_ddr_a_w);
+ DECLARE_READ8_MEMBER(bigevglf_68705_port_b_r);
+ DECLARE_WRITE8_MEMBER(bigevglf_68705_port_b_w);
+ DECLARE_WRITE8_MEMBER(bigevglf_68705_ddr_b_w);
+ DECLARE_READ8_MEMBER(bigevglf_68705_port_c_r);
+ DECLARE_WRITE8_MEMBER(bigevglf_68705_port_c_w);
+ DECLARE_WRITE8_MEMBER(bigevglf_68705_ddr_c_w);
+ DECLARE_WRITE8_MEMBER(bigevglf_mcu_w);
+ DECLARE_READ8_MEMBER(bigevglf_mcu_r);
+ DECLARE_READ8_MEMBER(bigevglf_mcu_status_r);
+ DECLARE_WRITE8_MEMBER(bigevglf_palette_w);
+ DECLARE_WRITE8_MEMBER(bigevglf_gfxcontrol_w);
+ DECLARE_WRITE8_MEMBER(bigevglf_vidram_addr_w);
+ DECLARE_WRITE8_MEMBER(bigevglf_vidram_w);
+ DECLARE_READ8_MEMBER(bigevglf_vidram_r);
};
/*----------- defined in machine/bigevglf.c -----------*/
-READ8_HANDLER( bigevglf_68705_port_a_r );
-WRITE8_HANDLER( bigevglf_68705_port_a_w );
-READ8_HANDLER( bigevglf_68705_port_b_r );
-WRITE8_HANDLER( bigevglf_68705_port_b_w );
-READ8_HANDLER( bigevglf_68705_port_c_r );
-WRITE8_HANDLER( bigevglf_68705_port_c_w );
-WRITE8_HANDLER( bigevglf_68705_ddr_a_w );
-WRITE8_HANDLER( bigevglf_68705_ddr_b_w );
-WRITE8_HANDLER( bigevglf_68705_ddr_c_w );
-WRITE8_HANDLER( bigevglf_mcu_w );
-READ8_HANDLER( bigevglf_mcu_r );
-READ8_HANDLER( bigevglf_mcu_status_r );
/*----------- defined in video/bigevglf.c -----------*/
@@ -90,9 +95,4 @@ READ8_HANDLER( bigevglf_mcu_status_r );
VIDEO_START( bigevglf );
SCREEN_UPDATE_IND16( bigevglf );
-READ8_HANDLER( bigevglf_vidram_r );
-WRITE8_HANDLER( bigevglf_vidram_w );
-WRITE8_HANDLER( bigevglf_vidram_addr_w );
-WRITE8_HANDLER( bigevglf_gfxcontrol_w );
-WRITE8_HANDLER( bigevglf_palette_w );
diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h
index 29b3e132c41..24b517d9c42 100644
--- a/src/mame/includes/bigstrkb.h
+++ b/src/mame/includes/bigstrkb.h
@@ -15,13 +15,13 @@ public:
UINT16 *m_vidreg1;
UINT16 *m_vidreg2;
UINT16 *m_spriteram;
+ DECLARE_WRITE16_MEMBER(bsb_videoram_w);
+ DECLARE_WRITE16_MEMBER(bsb_videoram2_w);
+ DECLARE_WRITE16_MEMBER(bsb_videoram3_w);
};
/*----------- defined in video/bigstrkb.c -----------*/
-WRITE16_HANDLER( bsb_videoram_w );
-WRITE16_HANDLER( bsb_videoram2_w );
-WRITE16_HANDLER( bsb_videoram3_w );
VIDEO_START(bigstrkb);
SCREEN_UPDATE_IND16(bigstrkb);
diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h
index 68681463b51..1ca94f11958 100644
--- a/src/mame/includes/bionicc.h
+++ b/src/mame/includes/bionicc.h
@@ -34,17 +34,17 @@ public:
DECLARE_WRITE16_MEMBER(bionicc_mpu_trigger_w);
DECLARE_WRITE16_MEMBER(hacked_soundcommand_w);
DECLARE_READ16_MEMBER(hacked_soundcommand_r);
+ DECLARE_WRITE16_MEMBER(bionicc_bgvideoram_w);
+ DECLARE_WRITE16_MEMBER(bionicc_fgvideoram_w);
+ DECLARE_WRITE16_MEMBER(bionicc_txvideoram_w);
+ DECLARE_WRITE16_MEMBER(bionicc_paletteram_w);
+ DECLARE_WRITE16_MEMBER(bionicc_scroll_w);
+ DECLARE_WRITE16_MEMBER(bionicc_gfxctrl_w);
};
/*----------- defined in video/bionicc.c -----------*/
-WRITE16_HANDLER( bionicc_fgvideoram_w );
-WRITE16_HANDLER( bionicc_bgvideoram_w );
-WRITE16_HANDLER( bionicc_txvideoram_w );
-WRITE16_HANDLER( bionicc_paletteram_w );
-WRITE16_HANDLER( bionicc_scroll_w );
-WRITE16_HANDLER( bionicc_gfxctrl_w );
VIDEO_START( bionicc );
SCREEN_UPDATE_IND16( bionicc );
diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h
index b9704424aac..4fc954b16c7 100644
--- a/src/mame/includes/bking.h
+++ b/src/mame/includes/bking.h
@@ -61,27 +61,27 @@ public:
DECLARE_WRITE8_MEMBER(bking3_68705_port_b_w);
DECLARE_WRITE8_MEMBER(bking3_68705_ddr_b_w);
DECLARE_READ8_MEMBER(bking3_68705_port_c_r);
+ DECLARE_WRITE8_MEMBER(bking_xld1_w);
+ DECLARE_WRITE8_MEMBER(bking_yld1_w);
+ DECLARE_WRITE8_MEMBER(bking_xld2_w);
+ DECLARE_WRITE8_MEMBER(bking_yld2_w);
+ DECLARE_WRITE8_MEMBER(bking_xld3_w);
+ DECLARE_WRITE8_MEMBER(bking_yld3_w);
+ DECLARE_WRITE8_MEMBER(bking_cont1_w);
+ DECLARE_WRITE8_MEMBER(bking_cont2_w);
+ DECLARE_WRITE8_MEMBER(bking_cont3_w);
+ DECLARE_WRITE8_MEMBER(bking_msk_w);
+ DECLARE_WRITE8_MEMBER(bking_hitclr_w);
+ DECLARE_WRITE8_MEMBER(bking_playfield_w);
+ DECLARE_READ8_MEMBER(bking_input_port_5_r);
+ DECLARE_READ8_MEMBER(bking_input_port_6_r);
+ DECLARE_READ8_MEMBER(bking_pos_r);
};
/*----------- defined in video/bking.c -----------*/
-WRITE8_HANDLER( bking_xld1_w );
-WRITE8_HANDLER( bking_yld1_w );
-WRITE8_HANDLER( bking_xld2_w );
-WRITE8_HANDLER( bking_yld2_w );
-WRITE8_HANDLER( bking_xld3_w );
-WRITE8_HANDLER( bking_yld3_w );
-WRITE8_HANDLER( bking_msk_w );
-WRITE8_HANDLER( bking_cont1_w );
-WRITE8_HANDLER( bking_cont2_w );
-WRITE8_HANDLER( bking_cont3_w );
-WRITE8_HANDLER( bking_hitclr_w );
-WRITE8_HANDLER( bking_playfield_w );
-READ8_HANDLER( bking_input_port_5_r );
-READ8_HANDLER( bking_input_port_6_r );
-READ8_HANDLER( bking_pos_r );
PALETTE_INIT( bking );
VIDEO_START( bking );
diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h
index b8804e938f8..4c54c114133 100644
--- a/src/mame/includes/blktiger.h
+++ b/src/mame/includes/blktiger.h
@@ -45,21 +45,21 @@ public:
DECLARE_WRITE8_MEMBER(blktiger_to_main_w);
DECLARE_WRITE8_MEMBER(blktiger_bankswitch_w);
DECLARE_WRITE8_MEMBER(blktiger_coinlockout_w);
+ DECLARE_WRITE8_MEMBER(blktiger_txvideoram_w);
+ DECLARE_READ8_MEMBER(blktiger_bgvideoram_r);
+ DECLARE_WRITE8_MEMBER(blktiger_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(blktiger_bgvideoram_bank_w);
+ DECLARE_WRITE8_MEMBER(blktiger_scrolly_w);
+ DECLARE_WRITE8_MEMBER(blktiger_scrollx_w);
+ DECLARE_WRITE8_MEMBER(blktiger_video_control_w);
+ DECLARE_WRITE8_MEMBER(blktiger_video_enable_w);
+ DECLARE_WRITE8_MEMBER(blktiger_screen_layout_w);
};
/*----------- defined in video/blktiger.c -----------*/
-WRITE8_HANDLER( blktiger_screen_layout_w );
-READ8_HANDLER( blktiger_bgvideoram_r );
-WRITE8_HANDLER( blktiger_bgvideoram_w );
-WRITE8_HANDLER( blktiger_txvideoram_w );
-WRITE8_HANDLER( blktiger_video_control_w );
-WRITE8_HANDLER( blktiger_video_enable_w );
-WRITE8_HANDLER( blktiger_bgvideoram_bank_w );
-WRITE8_HANDLER( blktiger_scrollx_w );
-WRITE8_HANDLER( blktiger_scrolly_w );
VIDEO_START( blktiger );
SCREEN_UPDATE_IND16( blktiger );
diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h
index 9a92ac297f3..643ca3b7680 100644
--- a/src/mame/includes/blmbycar.h
+++ b/src/mame/includes/blmbycar.h
@@ -33,15 +33,15 @@ public:
DECLARE_READ16_MEMBER(blmbycar_pot_wheel_r);
DECLARE_READ16_MEMBER(blmbycar_opt_wheel_r);
DECLARE_READ16_MEMBER(waterball_unk_r);
+ DECLARE_WRITE16_MEMBER(blmbycar_palette_w);
+ DECLARE_WRITE16_MEMBER(blmbycar_vram_0_w);
+ DECLARE_WRITE16_MEMBER(blmbycar_vram_1_w);
};
/*----------- defined in video/blmbycar.c -----------*/
-WRITE16_HANDLER( blmbycar_palette_w );
-WRITE16_HANDLER( blmbycar_vram_0_w );
-WRITE16_HANDLER( blmbycar_vram_1_w );
VIDEO_START( blmbycar );
SCREEN_UPDATE_IND16( blmbycar );
diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h
index f06a2ea03ae..8d1951ceac7 100644
--- a/src/mame/includes/blockade.h
+++ b/src/mame/includes/blockade.h
@@ -17,12 +17,12 @@ public:
UINT8 m_just_been_reset;
DECLARE_READ8_MEMBER(blockade_input_port_0_r);
DECLARE_WRITE8_MEMBER(blockade_coin_latch_w);
+ DECLARE_WRITE8_MEMBER(blockade_videoram_w);
};
/*----------- defined in video/blockade.c -----------*/
-WRITE8_HANDLER( blockade_videoram_w );
VIDEO_START( blockade );
SCREEN_UPDATE_IND16( blockade );
diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h
index 336ecc33a22..2e15eaffc03 100644
--- a/src/mame/includes/blockout.h
+++ b/src/mame/includes/blockout.h
@@ -25,14 +25,14 @@ public:
DECLARE_WRITE16_MEMBER(blockout_sound_command_w);
DECLARE_WRITE16_MEMBER(blockout_irq6_ack_w);
DECLARE_WRITE16_MEMBER(blockout_irq5_ack_w);
+ DECLARE_WRITE16_MEMBER(blockout_paletteram_w);
+ DECLARE_WRITE16_MEMBER(blockout_frontcolor_w);
+ DECLARE_WRITE16_MEMBER(blockout_videoram_w);
};
/*----------- defined in video/blockout.c -----------*/
-WRITE16_HANDLER( blockout_videoram_w );
-WRITE16_HANDLER( blockout_paletteram_w );
-WRITE16_HANDLER( blockout_frontcolor_w );
VIDEO_START( blockout );
SCREEN_UPDATE_IND16( blockout );
diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h
index eb2d5ee7bc8..0cb268a94ee 100644
--- a/src/mame/includes/bloodbro.h
+++ b/src/mame/includes/bloodbro.h
@@ -13,14 +13,14 @@ public:
tilemap_t *m_tx_tilemap;
UINT16 *m_spriteram;
size_t m_spriteram_size;
+ DECLARE_WRITE16_MEMBER(bloodbro_bgvideoram_w);
+ DECLARE_WRITE16_MEMBER(bloodbro_fgvideoram_w);
+ DECLARE_WRITE16_MEMBER(bloodbro_txvideoram_w);
};
/*----------- defined in video/bloodbro.c -----------*/
-WRITE16_HANDLER( bloodbro_bgvideoram_w );
-WRITE16_HANDLER( bloodbro_fgvideoram_w );
-WRITE16_HANDLER( bloodbro_txvideoram_w );
SCREEN_UPDATE_IND16( bloodbro );
SCREEN_UPDATE_IND16( weststry );
diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h
index 3ee80b325a8..5847cb31300 100644
--- a/src/mame/includes/blueprnt.h
+++ b/src/mame/includes/blueprnt.h
@@ -29,14 +29,14 @@ public:
DECLARE_READ8_MEMBER(blueprnt_sh_dipsw_r);
DECLARE_WRITE8_MEMBER(blueprnt_sound_command_w);
DECLARE_WRITE8_MEMBER(blueprnt_coin_counter_w);
+ DECLARE_WRITE8_MEMBER(blueprnt_videoram_w);
+ DECLARE_WRITE8_MEMBER(blueprnt_colorram_w);
+ DECLARE_WRITE8_MEMBER(blueprnt_flipscreen_w);
};
/*----------- defined in video/blueprnt.c -----------*/
-WRITE8_HANDLER( blueprnt_videoram_w );
-WRITE8_HANDLER( blueprnt_colorram_w );
-WRITE8_HANDLER( blueprnt_flipscreen_w );
PALETTE_INIT( blueprnt );
VIDEO_START( blueprnt );
diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h
index e42c5e517ce..2e047117588 100644
--- a/src/mame/includes/bogeyman.h
+++ b/src/mame/includes/bogeyman.h
@@ -29,16 +29,16 @@ public:
int m_colbank;
DECLARE_WRITE8_MEMBER(bogeyman_8910_latch_w);
DECLARE_WRITE8_MEMBER(bogeyman_8910_control_w);
+ DECLARE_WRITE8_MEMBER(bogeyman_videoram_w);
+ DECLARE_WRITE8_MEMBER(bogeyman_colorram_w);
+ DECLARE_WRITE8_MEMBER(bogeyman_videoram2_w);
+ DECLARE_WRITE8_MEMBER(bogeyman_colorram2_w);
+ DECLARE_WRITE8_MEMBER(bogeyman_paletteram_w);
};
/*----------- defined in video/bogeyman.c -----------*/
-WRITE8_HANDLER( bogeyman_videoram_w );
-WRITE8_HANDLER( bogeyman_colorram_w );
-WRITE8_HANDLER( bogeyman_videoram2_w );
-WRITE8_HANDLER( bogeyman_colorram2_w );
-WRITE8_HANDLER( bogeyman_paletteram_w );
PALETTE_INIT( bogeyman );
VIDEO_START( bogeyman );
diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h
index c15b51222e0..c0580c41638 100644
--- a/src/mame/includes/bombjack.h
+++ b/src/mame/includes/bombjack.h
@@ -29,15 +29,15 @@ public:
DECLARE_WRITE8_MEMBER(bombjack_soundlatch_w);
DECLARE_READ8_MEMBER(bombjack_soundlatch_r);
DECLARE_WRITE8_MEMBER(irq_mask_w);
+ DECLARE_WRITE8_MEMBER(bombjack_videoram_w);
+ DECLARE_WRITE8_MEMBER(bombjack_colorram_w);
+ DECLARE_WRITE8_MEMBER(bombjack_background_w);
+ DECLARE_WRITE8_MEMBER(bombjack_flipscreen_w);
};
/*----------- defined in video/bombjack.c -----------*/
-WRITE8_HANDLER( bombjack_videoram_w );
-WRITE8_HANDLER( bombjack_colorram_w );
-WRITE8_HANDLER( bombjack_background_w );
-WRITE8_HANDLER( bombjack_flipscreen_w );
VIDEO_START( bombjack );
SCREEN_UPDATE_IND16( bombjack );
diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h
index 31e3b49d6ac..baff9965d7e 100644
--- a/src/mame/includes/brkthru.h
+++ b/src/mame/includes/brkthru.h
@@ -34,14 +34,14 @@ public:
DECLARE_WRITE8_MEMBER(brkthru_1803_w);
DECLARE_WRITE8_MEMBER(darwin_0803_w);
DECLARE_WRITE8_MEMBER(brkthru_soundlatch_w);
+ DECLARE_WRITE8_MEMBER(brkthru_bgram_w);
+ DECLARE_WRITE8_MEMBER(brkthru_fgram_w);
+ DECLARE_WRITE8_MEMBER(brkthru_1800_w);
};
/*----------- defined in video/brkthru.c -----------*/
-WRITE8_HANDLER( brkthru_1800_w );
-WRITE8_HANDLER( brkthru_bgram_w );
-WRITE8_HANDLER( brkthru_fgram_w );
VIDEO_START( brkthru );
PALETTE_INIT( brkthru );
SCREEN_UPDATE_IND16( brkthru );
diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h
index c64fe3a0096..78ccc021e92 100644
--- a/src/mame/includes/bsktball.h
+++ b/src/mame/includes/bsktball.h
@@ -41,19 +41,20 @@ public:
int m_last_p1_vert;
int m_last_p2_horiz;
int m_last_p2_vert;
+ DECLARE_WRITE8_MEMBER(bsktball_nmion_w);
+ DECLARE_WRITE8_MEMBER(bsktball_ld1_w);
+ DECLARE_WRITE8_MEMBER(bsktball_ld2_w);
+ DECLARE_READ8_MEMBER(bsktball_in0_r);
+ DECLARE_WRITE8_MEMBER(bsktball_led1_w);
+ DECLARE_WRITE8_MEMBER(bsktball_led2_w);
+ DECLARE_WRITE8_MEMBER(bsktball_videoram_w);
};
/*----------- defined in machine/bsktball.c -----------*/
-WRITE8_HANDLER( bsktball_nmion_w );
TIMER_DEVICE_CALLBACK( bsktball_scanline );
-WRITE8_HANDLER( bsktball_ld1_w );
-WRITE8_HANDLER( bsktball_ld2_w );
-READ8_HANDLER( bsktball_in0_r );
-WRITE8_HANDLER( bsktball_led1_w );
-WRITE8_HANDLER( bsktball_led2_w );
/*----------- defined in audio/bsktball.c -----------*/
@@ -68,5 +69,4 @@ DISCRETE_SOUND_EXTERN( bsktball );
VIDEO_START( bsktball );
SCREEN_UPDATE_IND16( bsktball );
-WRITE8_HANDLER( bsktball_videoram_w );
diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h
index 6fb179a02e0..49957dc8f2c 100644
--- a/src/mame/includes/btime.h
+++ b/src/mame/includes/btime.h
@@ -53,13 +53,28 @@ public:
DECLARE_READ8_MEMBER(audio_command_r);
DECLARE_READ8_MEMBER(zoar_dsw1_read);
DECLARE_READ8_MEMBER(wtennis_reset_hack_r);
+ DECLARE_READ8_MEMBER(mmonkey_protection_r);
+ DECLARE_WRITE8_MEMBER(mmonkey_protection_w);
+ DECLARE_WRITE8_MEMBER(btime_paletteram_w);
+ DECLARE_WRITE8_MEMBER(lnc_videoram_w);
+ DECLARE_READ8_MEMBER(btime_mirrorvideoram_r);
+ DECLARE_READ8_MEMBER(btime_mirrorcolorram_r);
+ DECLARE_WRITE8_MEMBER(btime_mirrorvideoram_w);
+ DECLARE_WRITE8_MEMBER(lnc_mirrorvideoram_w);
+ DECLARE_WRITE8_MEMBER(btime_mirrorcolorram_w);
+ DECLARE_WRITE8_MEMBER(deco_charram_w);
+ DECLARE_WRITE8_MEMBER(bnj_background_w);
+ DECLARE_WRITE8_MEMBER(bnj_scroll1_w);
+ DECLARE_WRITE8_MEMBER(bnj_scroll2_w);
+ DECLARE_WRITE8_MEMBER(btime_video_control_w);
+ DECLARE_WRITE8_MEMBER(bnj_video_control_w);
+ DECLARE_WRITE8_MEMBER(zoar_video_control_w);
+ DECLARE_WRITE8_MEMBER(disco_video_control_w);
};
/*----------- defined in machine/btime.c -----------*/
-READ8_HANDLER( mmonkey_protection_r );
-WRITE8_HANDLER( mmonkey_protection_w );
/*----------- defined in video/btime.c -----------*/
@@ -78,19 +93,4 @@ SCREEN_UPDATE_IND16( zoar );
SCREEN_UPDATE_IND16( disco );
SCREEN_UPDATE_IND16( eggs );
-WRITE8_HANDLER( btime_paletteram_w );
-WRITE8_HANDLER( bnj_background_w );
-WRITE8_HANDLER( bnj_scroll1_w );
-WRITE8_HANDLER( bnj_scroll2_w );
-READ8_HANDLER( btime_mirrorvideoram_r );
-WRITE8_HANDLER( btime_mirrorvideoram_w );
-READ8_HANDLER( btime_mirrorcolorram_r );
-WRITE8_HANDLER( btime_mirrorcolorram_w );
-WRITE8_HANDLER( lnc_videoram_w );
-WRITE8_HANDLER( lnc_mirrorvideoram_w );
-WRITE8_HANDLER( deco_charram_w );
-
-WRITE8_HANDLER( zoar_video_control_w );
-WRITE8_HANDLER( btime_video_control_w );
-WRITE8_HANDLER( bnj_video_control_w );
-WRITE8_HANDLER( disco_video_control_w );
+
diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h
index cec0a6db771..1429a7e5763 100644
--- a/src/mame/includes/bublbobl.h
+++ b/src/mame/includes/bublbobl.h
@@ -55,54 +55,54 @@ public:
device_t *m_mcu;
device_t *m_audiocpu;
device_t *m_slave;
+ DECLARE_WRITE8_MEMBER(bublbobl_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(tokio_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(tokio_videoctrl_w);
+ DECLARE_WRITE8_MEMBER(bublbobl_nmitrigger_w);
+ DECLARE_READ8_MEMBER(tokio_mcu_r);
+ DECLARE_READ8_MEMBER(tokiob_mcu_r);
+ DECLARE_WRITE8_MEMBER(bublbobl_sound_command_w);
+ DECLARE_WRITE8_MEMBER(bublbobl_sh_nmi_disable_w);
+ DECLARE_WRITE8_MEMBER(bublbobl_sh_nmi_enable_w);
+ DECLARE_WRITE8_MEMBER(bublbobl_soundcpu_reset_w);
+ DECLARE_READ8_MEMBER(bublbobl_sound_status_r);
+ DECLARE_WRITE8_MEMBER(bublbobl_sound_status_w);
+ DECLARE_READ8_MEMBER(bublbobl_mcu_ddr1_r);
+ DECLARE_WRITE8_MEMBER(bublbobl_mcu_ddr1_w);
+ DECLARE_READ8_MEMBER(bublbobl_mcu_ddr2_r);
+ DECLARE_WRITE8_MEMBER(bublbobl_mcu_ddr2_w);
+ DECLARE_READ8_MEMBER(bublbobl_mcu_ddr3_r);
+ DECLARE_WRITE8_MEMBER(bublbobl_mcu_ddr3_w);
+ DECLARE_READ8_MEMBER(bublbobl_mcu_ddr4_r);
+ DECLARE_WRITE8_MEMBER(bublbobl_mcu_ddr4_w);
+ DECLARE_READ8_MEMBER(bublbobl_mcu_port1_r);
+ DECLARE_WRITE8_MEMBER(bublbobl_mcu_port1_w);
+ DECLARE_READ8_MEMBER(bublbobl_mcu_port2_r);
+ DECLARE_WRITE8_MEMBER(bublbobl_mcu_port2_w);
+ DECLARE_READ8_MEMBER(bublbobl_mcu_port3_r);
+ DECLARE_WRITE8_MEMBER(bublbobl_mcu_port3_w);
+ DECLARE_READ8_MEMBER(bublbobl_mcu_port4_r);
+ DECLARE_WRITE8_MEMBER(bublbobl_mcu_port4_w);
+ DECLARE_READ8_MEMBER(boblbobl_ic43_a_r);
+ DECLARE_WRITE8_MEMBER(boblbobl_ic43_a_w);
+ DECLARE_WRITE8_MEMBER(boblbobl_ic43_b_w);
+ DECLARE_READ8_MEMBER(boblbobl_ic43_b_r);
+ DECLARE_READ8_MEMBER(bublbobl_68705_port_a_r);
+ DECLARE_WRITE8_MEMBER(bublbobl_68705_port_a_w);
+ DECLARE_WRITE8_MEMBER(bublbobl_68705_ddr_a_w);
+ DECLARE_READ8_MEMBER(bublbobl_68705_port_b_r);
+ DECLARE_WRITE8_MEMBER(bublbobl_68705_port_b_w);
+ DECLARE_WRITE8_MEMBER(bublbobl_68705_ddr_b_w);
};
/*----------- defined in machine/bublbobl.c -----------*/
-WRITE8_HANDLER( bublbobl_bankswitch_w );
-WRITE8_HANDLER( tokio_bankswitch_w );
-WRITE8_HANDLER( tokio_videoctrl_w );
-WRITE8_HANDLER( bublbobl_nmitrigger_w );
-READ8_HANDLER( tokio_mcu_r );
-READ8_HANDLER( tokiob_mcu_r );
-WRITE8_HANDLER( bublbobl_sound_command_w );
-WRITE8_HANDLER( bublbobl_sh_nmi_disable_w );
-WRITE8_HANDLER( bublbobl_sh_nmi_enable_w );
-WRITE8_HANDLER( bublbobl_soundcpu_reset_w );
-WRITE8_HANDLER( bublbobl_sound_status_w );
-READ8_HANDLER( bublbobl_sound_status_r );
-READ8_HANDLER( boblbobl_ic43_a_r );
-WRITE8_HANDLER( boblbobl_ic43_a_w );
-READ8_HANDLER( boblbobl_ic43_b_r );
-WRITE8_HANDLER( boblbobl_ic43_b_w );
-READ8_HANDLER( bublbobl_mcu_ddr1_r );
-WRITE8_HANDLER( bublbobl_mcu_ddr1_w );
-READ8_HANDLER( bublbobl_mcu_ddr2_r );
-WRITE8_HANDLER( bublbobl_mcu_ddr2_w );
-READ8_HANDLER( bublbobl_mcu_ddr3_r );
-WRITE8_HANDLER( bublbobl_mcu_ddr3_w );
-READ8_HANDLER( bublbobl_mcu_ddr4_r );
-WRITE8_HANDLER( bublbobl_mcu_ddr4_w );
-READ8_HANDLER( bublbobl_mcu_port1_r );
-WRITE8_HANDLER( bublbobl_mcu_port1_w );
-READ8_HANDLER( bublbobl_mcu_port2_r );
-WRITE8_HANDLER( bublbobl_mcu_port2_w );
-READ8_HANDLER( bublbobl_mcu_port3_r );
-WRITE8_HANDLER( bublbobl_mcu_port3_w );
-READ8_HANDLER( bublbobl_mcu_port4_r );
-WRITE8_HANDLER( bublbobl_mcu_port4_w );
// for 68705 bootleg
INTERRUPT_GEN( bublbobl_m68705_interrupt );
-READ8_HANDLER( bublbobl_68705_port_a_r );
-WRITE8_HANDLER( bublbobl_68705_port_a_w );
-WRITE8_HANDLER( bublbobl_68705_ddr_a_w );
-READ8_HANDLER( bublbobl_68705_port_b_r );
-WRITE8_HANDLER( bublbobl_68705_port_b_w );
-WRITE8_HANDLER( bublbobl_68705_ddr_b_w );
/*----------- defined in video/bublbobl.c -----------*/
diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h
index 625f4153b4d..ba6563877f7 100644
--- a/src/mame/includes/buggychl.h
+++ b/src/mame/includes/buggychl.h
@@ -39,16 +39,16 @@ public:
DECLARE_WRITE8_MEMBER(nmi_disable_w);
DECLARE_WRITE8_MEMBER(nmi_enable_w);
DECLARE_WRITE8_MEMBER(sound_enable_w);
+ DECLARE_WRITE8_MEMBER(buggychl_chargen_w);
+ DECLARE_WRITE8_MEMBER(buggychl_sprite_lookup_bank_w);
+ DECLARE_WRITE8_MEMBER(buggychl_sprite_lookup_w);
+ DECLARE_WRITE8_MEMBER(buggychl_ctrl_w);
+ DECLARE_WRITE8_MEMBER(buggychl_bg_scrollx_w);
};
/*----------- defined in video/buggychl.c -----------*/
-WRITE8_HANDLER( buggychl_chargen_w );
-WRITE8_HANDLER( buggychl_sprite_lookup_bank_w );
-WRITE8_HANDLER( buggychl_sprite_lookup_w );
-WRITE8_HANDLER( buggychl_ctrl_w );
-WRITE8_HANDLER( buggychl_bg_scrollx_w );
PALETTE_INIT( buggychl );
VIDEO_START( buggychl );
diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h
index f1bd989cbd0..3d0ea2d7d06 100644
--- a/src/mame/includes/bwing.h
+++ b/src/mame/includes/bwing.h
@@ -53,6 +53,12 @@ public:
DECLARE_READ8_MEMBER(bwp1_io_r);
DECLARE_WRITE8_MEMBER(bwp1_ctrl_w);
DECLARE_WRITE8_MEMBER(bwp2_ctrl_w);
+ DECLARE_WRITE8_MEMBER(bwing_spriteram_w);
+ DECLARE_WRITE8_MEMBER(bwing_videoram_w);
+ DECLARE_READ8_MEMBER(bwing_scrollram_r);
+ DECLARE_WRITE8_MEMBER(bwing_scrollram_w);
+ DECLARE_WRITE8_MEMBER(bwing_scrollreg_w);
+ DECLARE_WRITE8_MEMBER(bwing_paletteram_w);
};
@@ -60,12 +66,6 @@ public:
extern const gfx_layout bwing_tilelayout;
-WRITE8_HANDLER( bwing_paletteram_w );
-WRITE8_HANDLER( bwing_videoram_w );
-WRITE8_HANDLER( bwing_spriteram_w );
-WRITE8_HANDLER( bwing_scrollreg_w );
-WRITE8_HANDLER( bwing_scrollram_w );
-READ8_HANDLER( bwing_scrollram_r );
VIDEO_START( bwing );
SCREEN_UPDATE_IND16( bwing );
diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h
index 2ed7485a131..d1e71d490e6 100644
--- a/src/mame/includes/cabal.h
+++ b/src/mame/includes/cabal.h
@@ -21,6 +21,9 @@ public:
DECLARE_READ8_MEMBER(cabalbl_snd2_r);
DECLARE_READ8_MEMBER(cabalbl_snd1_r);
DECLARE_WRITE8_MEMBER(cabalbl_coin_w);
+ DECLARE_WRITE16_MEMBER(cabal_flipscreen_w);
+ DECLARE_WRITE16_MEMBER(cabal_background_videoram16_w);
+ DECLARE_WRITE16_MEMBER(cabal_text_videoram16_w);
};
@@ -28,6 +31,3 @@ public:
extern VIDEO_START( cabal );
extern SCREEN_UPDATE_IND16( cabal );
-WRITE16_HANDLER( cabal_flipscreen_w );
-WRITE16_HANDLER( cabal_background_videoram16_w );
-WRITE16_HANDLER( cabal_text_videoram16_w );
diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h
index d36028aea3e..faf774dbd0d 100644
--- a/src/mame/includes/calomega.h
+++ b/src/mame/includes/calomega.h
@@ -11,13 +11,13 @@ public:
UINT8 *m_videoram;
UINT8 *m_colorram;
tilemap_t *m_bg_tilemap;
+ DECLARE_WRITE8_MEMBER(calomega_videoram_w);
+ DECLARE_WRITE8_MEMBER(calomega_colorram_w);
};
/*----------- defined in video/calomega.c -----------*/
-WRITE8_HANDLER( calomega_videoram_w );
-WRITE8_HANDLER( calomega_colorram_w );
PALETTE_INIT( calomega );
VIDEO_START( calomega );
SCREEN_UPDATE_IND16( calomega );
diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h
index 3654a80128a..884777df7f9 100644
--- a/src/mame/includes/canyon.h
+++ b/src/mame/includes/canyon.h
@@ -31,6 +31,7 @@ public:
DECLARE_READ8_MEMBER(canyon_switches_r);
DECLARE_READ8_MEMBER(canyon_options_r);
DECLARE_WRITE8_MEMBER(canyon_led_w);
+ DECLARE_WRITE8_MEMBER(canyon_videoram_w);
};
@@ -49,4 +50,3 @@ DISCRETE_SOUND_EXTERN( canyon );
VIDEO_START( canyon );
SCREEN_UPDATE_IND16( canyon );
-WRITE8_HANDLER( canyon_videoram_w );
diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h
index 672ad2b560a..84923892bd4 100644
--- a/src/mame/includes/capbowl.h
+++ b/src/mame/includes/capbowl.h
@@ -31,6 +31,10 @@ public:
DECLARE_READ8_MEMBER(track_1_r);
DECLARE_WRITE8_MEMBER(track_reset_w);
DECLARE_WRITE8_MEMBER(capbowl_sndcmd_w);
+ DECLARE_WRITE8_MEMBER(capbowl_tms34061_w);
+ DECLARE_READ8_MEMBER(capbowl_tms34061_r);
+ DECLARE_WRITE8_MEMBER(bowlrama_blitter_w);
+ DECLARE_READ8_MEMBER(bowlrama_blitter_r);
};
/*----------- defined in video/capbowl.c -----------*/
@@ -38,8 +42,4 @@ public:
VIDEO_START( capbowl );
SCREEN_UPDATE_RGB32( capbowl );
-WRITE8_HANDLER( bowlrama_blitter_w );
-READ8_HANDLER( bowlrama_blitter_r );
-WRITE8_HANDLER( capbowl_tms34061_w );
-READ8_HANDLER( capbowl_tms34061_r );
diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h
index 4c2d325f18e..b594967f035 100644
--- a/src/mame/includes/carjmbre.h
+++ b/src/mame/includes/carjmbre.h
@@ -22,16 +22,16 @@ public:
UINT8 m_nmi_mask;
DECLARE_WRITE8_MEMBER(nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(carjmbre_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(carjmbre_bgcolor_w);
+ DECLARE_WRITE8_MEMBER(carjmbre_8806_w);
+ DECLARE_WRITE8_MEMBER(carjmbre_videoram_w);
};
/*----------- defined in video/carjmbre.c -----------*/
-WRITE8_HANDLER( carjmbre_flipscreen_w );
-WRITE8_HANDLER( carjmbre_bgcolor_w );
-WRITE8_HANDLER( carjmbre_8806_w );
-WRITE8_HANDLER( carjmbre_videoram_w );
PALETTE_INIT( carjmbre );
VIDEO_START( carjmbre );
diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h
index 6afc52fc318..a24048ef55e 100644
--- a/src/mame/includes/carpolo.h
+++ b/src/mame/includes/carpolo.h
@@ -45,6 +45,20 @@ public:
bitmap_ind16 *m_sprite_goal_collision_bitmap1;
bitmap_ind16 *m_sprite_goal_collision_bitmap2;
bitmap_ind16 *m_sprite_border_collision_bitmap;
+ DECLARE_READ8_MEMBER(carpolo_ball_screen_collision_cause_r);
+ DECLARE_READ8_MEMBER(carpolo_car_ball_collision_x_r);
+ DECLARE_READ8_MEMBER(carpolo_car_ball_collision_y_r);
+ DECLARE_READ8_MEMBER(carpolo_car_car_collision_cause_r);
+ DECLARE_READ8_MEMBER(carpolo_car_goal_collision_cause_r);
+ DECLARE_READ8_MEMBER(carpolo_car_ball_collision_cause_r);
+ DECLARE_READ8_MEMBER(carpolo_car_border_collision_cause_r);
+ DECLARE_READ8_MEMBER(carpolo_interrupt_cause_r);
+ DECLARE_WRITE8_MEMBER(carpolo_ball_screen_interrupt_clear_w);
+ DECLARE_WRITE8_MEMBER(carpolo_car_car_interrupt_clear_w);
+ DECLARE_WRITE8_MEMBER(carpolo_car_goal_interrupt_clear_w);
+ DECLARE_WRITE8_MEMBER(carpolo_car_ball_interrupt_clear_w);
+ DECLARE_WRITE8_MEMBER(carpolo_car_border_interrupt_clear_w);
+ DECLARE_WRITE8_MEMBER(carpolo_timer_interrupt_clear_w);
};
@@ -63,24 +77,10 @@ WRITE_LINE_DEVICE_HANDLER( carpolo_7474_2u_2_q_cb );
MACHINE_START( carpolo );
MACHINE_RESET( carpolo );
-READ8_HANDLER( carpolo_interrupt_cause_r );
-READ8_HANDLER( carpolo_ball_screen_collision_cause_r );
-READ8_HANDLER( carpolo_car_ball_collision_x_r );
-READ8_HANDLER( carpolo_car_ball_collision_y_r );
-READ8_HANDLER( carpolo_car_car_collision_cause_r );
-READ8_HANDLER( carpolo_car_goal_collision_cause_r );
-READ8_HANDLER( carpolo_car_ball_collision_cause_r );
-READ8_HANDLER( carpolo_car_border_collision_cause_r );
INTERRUPT_GEN( carpolo_timer_interrupt );
-WRITE8_HANDLER( carpolo_ball_screen_interrupt_clear_w );
-WRITE8_HANDLER( carpolo_car_car_interrupt_clear_w );
-WRITE8_HANDLER( carpolo_car_goal_interrupt_clear_w );
-WRITE8_HANDLER( carpolo_car_ball_interrupt_clear_w );
-WRITE8_HANDLER( carpolo_car_border_interrupt_clear_w );
-WRITE8_HANDLER( carpolo_timer_interrupt_clear_w );
void carpolo_generate_car_car_interrupt(running_machine &machine, int car1, int car2);
void carpolo_generate_ball_screen_interrupt(running_machine &machine, UINT8 cause);
diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h
index 52f56f66196..718090a3d99 100644
--- a/src/mame/includes/cave.h
+++ b/src/mame/includes/cave.h
@@ -140,19 +140,19 @@ public:
DECLARE_WRITE8_MEMBER(sailormn_okibank0_w);
DECLARE_WRITE8_MEMBER(sailormn_okibank1_w);
DECLARE_WRITE16_MEMBER(donpachi_videoregs_w);
+ DECLARE_WRITE16_MEMBER(cave_vram_0_w);
+ DECLARE_WRITE16_MEMBER(cave_vram_1_w);
+ DECLARE_WRITE16_MEMBER(cave_vram_2_w);
+ DECLARE_WRITE16_MEMBER(cave_vram_3_w);
+ DECLARE_WRITE16_MEMBER(cave_vram_0_8x8_w);
+ DECLARE_WRITE16_MEMBER(cave_vram_1_8x8_w);
+ DECLARE_WRITE16_MEMBER(cave_vram_2_8x8_w);
+ DECLARE_WRITE16_MEMBER(cave_vram_3_8x8_w);
};
/*----------- defined in video/cave.c -----------*/
-WRITE16_HANDLER( cave_vram_0_w );
-WRITE16_HANDLER( cave_vram_1_w );
-WRITE16_HANDLER( cave_vram_2_w );
-WRITE16_HANDLER( cave_vram_3_w );
-WRITE16_HANDLER( cave_vram_0_8x8_w );
-WRITE16_HANDLER( cave_vram_1_8x8_w );
-WRITE16_HANDLER( cave_vram_2_8x8_w );
-WRITE16_HANDLER( cave_vram_3_8x8_w );
PALETTE_INIT( cave );
PALETTE_INIT( ddonpach );
diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h
index 79426c910eb..38cda8f6d57 100644
--- a/src/mame/includes/cbasebal.h
+++ b/src/mame/includes/cbasebal.h
@@ -35,17 +35,17 @@ public:
DECLARE_READ8_MEMBER(bankedram_r);
DECLARE_WRITE8_MEMBER(bankedram_w);
DECLARE_WRITE8_MEMBER(cbasebal_coinctrl_w);
+ DECLARE_WRITE8_MEMBER(cbasebal_textram_w);
+ DECLARE_READ8_MEMBER(cbasebal_textram_r);
+ DECLARE_WRITE8_MEMBER(cbasebal_scrollram_w);
+ DECLARE_READ8_MEMBER(cbasebal_scrollram_r);
+ DECLARE_WRITE8_MEMBER(cbasebal_gfxctrl_w);
+ DECLARE_WRITE8_MEMBER(cbasebal_scrollx_w);
+ DECLARE_WRITE8_MEMBER(cbasebal_scrolly_w);
};
/*----------- defined in video/cbasebal.c -----------*/
-WRITE8_HANDLER( cbasebal_textram_w );
-READ8_HANDLER( cbasebal_textram_r );
-WRITE8_HANDLER( cbasebal_scrollram_w );
-READ8_HANDLER( cbasebal_scrollram_r );
-WRITE8_HANDLER( cbasebal_gfxctrl_w );
-WRITE8_HANDLER( cbasebal_scrollx_w );
-WRITE8_HANDLER( cbasebal_scrolly_w );
VIDEO_START( cbasebal );
SCREEN_UPDATE_IND16( cbasebal );
diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h
index cd6a3b62a72..8f1f2b0f56a 100644
--- a/src/mame/includes/cbuster.h
+++ b/src/mame/includes/cbuster.h
@@ -30,14 +30,14 @@ public:
device_t *m_deco_tilegen2;
DECLARE_WRITE16_MEMBER(twocrude_control_w);
DECLARE_READ16_MEMBER(twocrude_control_r);
+ DECLARE_WRITE16_MEMBER(twocrude_palette_24bit_rg_w);
+ DECLARE_WRITE16_MEMBER(twocrude_palette_24bit_b_w);
};
/*----------- defined in video/cbuster.c -----------*/
-WRITE16_HANDLER( twocrude_palette_24bit_rg_w );
-WRITE16_HANDLER( twocrude_palette_24bit_b_w );
VIDEO_START( twocrude );
SCREEN_UPDATE_RGB32( twocrude );
diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h
index 29a7e259684..9c8c301b3dd 100644
--- a/src/mame/includes/ccastles.h
+++ b/src/mame/includes/ccastles.h
@@ -53,6 +53,14 @@ public:
DECLARE_WRITE8_MEMBER(nvram_store_w);
DECLARE_READ8_MEMBER(nvram_r);
DECLARE_WRITE8_MEMBER(nvram_w);
+ DECLARE_WRITE8_MEMBER(ccastles_hscroll_w);
+ DECLARE_WRITE8_MEMBER(ccastles_vscroll_w);
+ DECLARE_WRITE8_MEMBER(ccastles_video_control_w);
+ DECLARE_WRITE8_MEMBER(ccastles_paletteram_w);
+ DECLARE_WRITE8_MEMBER(ccastles_videoram_w);
+ DECLARE_READ8_MEMBER(ccastles_bitmode_r);
+ DECLARE_WRITE8_MEMBER(ccastles_bitmode_w);
+ DECLARE_WRITE8_MEMBER(ccastles_bitmode_addr_w);
};
@@ -62,13 +70,5 @@ public:
VIDEO_START( ccastles );
SCREEN_UPDATE_IND16( ccastles );
-WRITE8_HANDLER( ccastles_hscroll_w );
-WRITE8_HANDLER( ccastles_vscroll_w );
-WRITE8_HANDLER( ccastles_video_control_w );
-WRITE8_HANDLER( ccastles_paletteram_w );
-WRITE8_HANDLER( ccastles_videoram_w );
-READ8_HANDLER( ccastles_bitmode_r );
-WRITE8_HANDLER( ccastles_bitmode_w );
-WRITE8_HANDLER( ccastles_bitmode_addr_w );
diff --git a/src/mame/includes/cchasm.h b/src/mame/includes/cchasm.h
index dd6b48234f5..591e626753c 100644
--- a/src/mame/includes/cchasm.h
+++ b/src/mame/includes/cchasm.h
@@ -20,12 +20,13 @@ public:
UINT16 *m_ram;
int m_xcenter;
int m_ycenter;
+ DECLARE_WRITE16_MEMBER(cchasm_led_w);
+ DECLARE_WRITE16_MEMBER(cchasm_refresh_control_w);
};
/*----------- defined in machine/cchasm.c -----------*/
-WRITE16_HANDLER( cchasm_led_w );
/*----------- defined in audio/cchasm.c -----------*/
@@ -45,6 +46,5 @@ SOUND_START( cchasm );
/*----------- defined in video/cchasm.c -----------*/
-WRITE16_HANDLER( cchasm_refresh_control_w );
VIDEO_START( cchasm );
diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h
index 3fcf7cf3dff..82db24a59a0 100644
--- a/src/mame/includes/cclimber.h
+++ b/src/mame/includes/cclimber.h
@@ -30,6 +30,8 @@ public:
DECLARE_READ8_MEMBER(yamato_p1_r);
DECLARE_WRITE8_MEMBER(toprollr_rombank_w);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(cclimber_colorram_w);
+ DECLARE_WRITE8_MEMBER(cannonb_flip_screen_w);
};
@@ -43,8 +45,6 @@ DRIVER_INIT( ckongb );
/*----------- defined in video/cclimber.c -----------*/
-WRITE8_HANDLER( cclimber_colorram_w );
-WRITE8_HANDLER( cannonb_flip_screen_w );
PALETTE_INIT( cclimber );
VIDEO_START( cclimber );
diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h
index bc860a5c74d..59fd2b9b718 100644
--- a/src/mame/includes/centiped.h
+++ b/src/mame/includes/centiped.h
@@ -35,6 +35,13 @@ public:
DECLARE_WRITE8_MEMBER(led_w);
DECLARE_WRITE8_MEMBER(coin_count_w);
DECLARE_WRITE8_MEMBER(bullsdrt_coin_count_w);
+ DECLARE_WRITE8_MEMBER(centiped_videoram_w);
+ DECLARE_WRITE8_MEMBER(centiped_flip_screen_w);
+ DECLARE_WRITE8_MEMBER(bullsdrt_tilesbank_w);
+ DECLARE_WRITE8_MEMBER(bullsdrt_sprites_bank_w);
+ DECLARE_WRITE8_MEMBER(centiped_paletteram_w);
+ DECLARE_WRITE8_MEMBER(milliped_paletteram_w);
+ DECLARE_WRITE8_MEMBER(mazeinv_paletteram_w);
};
@@ -52,12 +59,5 @@ SCREEN_UPDATE_IND16( milliped );
SCREEN_UPDATE_IND16( warlords );
SCREEN_UPDATE_IND16( bullsdrt );
-WRITE8_HANDLER( centiped_paletteram_w );
-WRITE8_HANDLER( milliped_paletteram_w );
-WRITE8_HANDLER( centiped_videoram_w );
-WRITE8_HANDLER( centiped_flip_screen_w );
-WRITE8_HANDLER( bullsdrt_tilesbank_w );
-WRITE8_HANDLER( bullsdrt_sprites_bank_w );
-WRITE8_HANDLER( mazeinv_paletteram_w );
diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h
index bbe5d60c95b..ff5d47e165b 100644
--- a/src/mame/includes/chaknpop.h
+++ b/src/mame/includes/chaknpop.h
@@ -32,18 +32,22 @@ public:
UINT8 m_flip_x;
UINT8 m_flip_y;
DECLARE_WRITE8_MEMBER(coinlock_w);
+ DECLARE_READ8_MEMBER(chaknpop_mcu_port_a_r);
+ DECLARE_READ8_MEMBER(chaknpop_mcu_port_b_r);
+ DECLARE_READ8_MEMBER(chaknpop_mcu_port_c_r);
+ DECLARE_WRITE8_MEMBER(chaknpop_mcu_port_a_w);
+ DECLARE_WRITE8_MEMBER(chaknpop_mcu_port_b_w);
+ DECLARE_WRITE8_MEMBER(chaknpop_mcu_port_c_w);
+ DECLARE_READ8_MEMBER(chaknpop_gfxmode_r);
+ DECLARE_WRITE8_MEMBER(chaknpop_gfxmode_w);
+ DECLARE_WRITE8_MEMBER(chaknpop_txram_w);
+ DECLARE_WRITE8_MEMBER(chaknpop_attrram_w);
};
/*----------- defined in machine/chaknpop.c -----------*/
-READ8_HANDLER( chaknpop_mcu_port_a_r );
-READ8_HANDLER( chaknpop_mcu_port_b_r );
-READ8_HANDLER( chaknpop_mcu_port_c_r );
-WRITE8_HANDLER( chaknpop_mcu_port_a_w );
-WRITE8_HANDLER( chaknpop_mcu_port_b_w );
-WRITE8_HANDLER( chaknpop_mcu_port_c_w );
/*----------- defined in video/chaknpop.c -----------*/
@@ -52,7 +56,3 @@ PALETTE_INIT( chaknpop );
VIDEO_START( chaknpop );
SCREEN_UPDATE_IND16( chaknpop );
-READ8_HANDLER( chaknpop_gfxmode_r );
-WRITE8_HANDLER( chaknpop_gfxmode_w );
-WRITE8_HANDLER( chaknpop_txram_w );
-WRITE8_HANDLER( chaknpop_attrram_w );
diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h
index 903f2dbb617..1eba0c44051 100644
--- a/src/mame/includes/champbas.h
+++ b/src/mame/includes/champbas.h
@@ -39,15 +39,15 @@ public:
DECLARE_WRITE8_MEMBER(champbas_mcu_switch_w);
DECLARE_WRITE8_MEMBER(champbas_mcu_halt_w);
DECLARE_READ8_MEMBER(champbja_alt_protection_r);
+ DECLARE_WRITE8_MEMBER(champbas_bg_videoram_w);
+ DECLARE_WRITE8_MEMBER(champbas_gfxbank_w);
+ DECLARE_WRITE8_MEMBER(champbas_palette_bank_w);
+ DECLARE_WRITE8_MEMBER(champbas_flipscreen_w);
};
/*----------- defined in video/champbas.c -----------*/
-WRITE8_HANDLER( champbas_bg_videoram_w );
-WRITE8_HANDLER( champbas_gfxbank_w );
-WRITE8_HANDLER( champbas_palette_bank_w );
-WRITE8_HANDLER( champbas_flipscreen_w );
PALETTE_INIT( champbas );
PALETTE_INIT( exctsccr );
diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h
index ee801777d84..d0a8bb92a96 100644
--- a/src/mame/includes/changela.h
+++ b/src/mame/includes/changela.h
@@ -76,6 +76,12 @@ public:
DECLARE_WRITE8_MEMBER(changela_collision_reset_0);
DECLARE_WRITE8_MEMBER(changela_collision_reset_1);
DECLARE_WRITE8_MEMBER(changela_coin_counter_w);
+ DECLARE_WRITE8_MEMBER(changela_colors_w);
+ DECLARE_WRITE8_MEMBER(changela_mem_device_select_w);
+ DECLARE_WRITE8_MEMBER(changela_mem_device_w);
+ DECLARE_READ8_MEMBER(changela_mem_device_r);
+ DECLARE_WRITE8_MEMBER(changela_slope_rom_addr_hi_w);
+ DECLARE_WRITE8_MEMBER(changela_slope_rom_addr_lo_w);
};
/*----------- defined in video/changela.c -----------*/
@@ -83,9 +89,3 @@ public:
VIDEO_START( changela );
SCREEN_UPDATE_IND16( changela );
-WRITE8_HANDLER( changela_colors_w );
-WRITE8_HANDLER( changela_mem_device_select_w );
-WRITE8_HANDLER( changela_mem_device_w );
-READ8_HANDLER( changela_mem_device_r );
-WRITE8_HANDLER( changela_slope_rom_addr_hi_w );
-WRITE8_HANDLER( changela_slope_rom_addr_lo_w );
diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h
index b6e290daaf7..08dea9e7f74 100644
--- a/src/mame/includes/cheekyms.h
+++ b/src/mame/includes/cheekyms.h
@@ -25,6 +25,8 @@ public:
device_t *m_dac;
UINT8 m_irq_mask;
+ DECLARE_WRITE8_MEMBER(cheekyms_port_40_w);
+ DECLARE_WRITE8_MEMBER(cheekyms_port_80_w);
};
@@ -33,5 +35,3 @@ public:
PALETTE_INIT( cheekyms );
VIDEO_START( cheekyms );
SCREEN_UPDATE_IND16( cheekyms );
-WRITE8_HANDLER( cheekyms_port_40_w );
-WRITE8_HANDLER( cheekyms_port_80_w );
diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h
index 6350e694761..c5efd1ad65d 100644
--- a/src/mame/includes/cinemat.h
+++ b/src/mame/includes/cinemat.h
@@ -47,6 +47,7 @@ public:
DECLARE_READ8_MEMBER(boxingb_dial_r);
DECLARE_READ8_MEMBER(qb3_frame_r);
DECLARE_WRITE8_MEMBER(qb3_ram_bank_w);
+ DECLARE_WRITE8_MEMBER(cinemat_vector_control_w);
};
@@ -80,7 +81,6 @@ MACHINE_CONFIG_EXTERN( qb3_sound );
/*----------- defined in video/cinemat.c -----------*/
void cinemat_vector_callback(device_t *device, INT16 sx, INT16 sy, INT16 ex, INT16 ey, UINT8 shift);
-WRITE8_HANDLER( cinemat_vector_control_w );
VIDEO_START( cinemat_bilevel );
VIDEO_START( cinemat_16level );
diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h
index c6f96bc6110..698d98d702c 100644
--- a/src/mame/includes/circus.h
+++ b/src/mame/includes/circus.h
@@ -23,6 +23,9 @@ public:
/* game id */
int m_game_id;
DECLARE_READ8_MEMBER(circus_paddle_r);
+ DECLARE_WRITE8_MEMBER(circus_videoram_w);
+ DECLARE_WRITE8_MEMBER(circus_clown_x_w);
+ DECLARE_WRITE8_MEMBER(circus_clown_y_w);
};
@@ -41,10 +44,7 @@ extern const samples_interface robotbwl_samples_interface;
/*----------- defined in video/circus.c -----------*/
-extern WRITE8_HANDLER( circus_clown_x_w );
-extern WRITE8_HANDLER( circus_clown_y_w );
-extern WRITE8_HANDLER( circus_videoram_w );
extern VIDEO_START( circus );
extern SCREEN_UPDATE_IND16( crash );
diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h
index c332f403ccb..71876d51e37 100644
--- a/src/mame/includes/circusc.h
+++ b/src/mame/includes/circusc.h
@@ -38,15 +38,15 @@ public:
DECLARE_WRITE8_MEMBER(circusc_coin_counter_w);
DECLARE_WRITE8_MEMBER(circusc_sound_w);
DECLARE_WRITE8_MEMBER(irq_mask_w);
+ DECLARE_WRITE8_MEMBER(circusc_videoram_w);
+ DECLARE_WRITE8_MEMBER(circusc_colorram_w);
+ DECLARE_WRITE8_MEMBER(circusc_flipscreen_w);
};
/*----------- defined in video/circusc.c -----------*/
-WRITE8_HANDLER( circusc_videoram_w );
-WRITE8_HANDLER( circusc_colorram_w );
VIDEO_START( circusc );
-WRITE8_HANDLER( circusc_flipscreen_w );
PALETTE_INIT( circusc );
SCREEN_UPDATE_IND16( circusc );
diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h
index f575ff18ed9..5412c9958fd 100644
--- a/src/mame/includes/cischeat.h
+++ b/src/mame/includes/cischeat.h
@@ -47,26 +47,27 @@ public:
DECLARE_READ16_MEMBER(scudhamm_motor_status_r);
DECLARE_READ16_MEMBER(scudhamm_motor_pos_r);
DECLARE_READ16_MEMBER(scudhamm_analog_r);
+ DECLARE_WRITE16_MEMBER(cischeat_scrollram_0_w);
+ DECLARE_WRITE16_MEMBER(cischeat_scrollram_1_w);
+ DECLARE_WRITE16_MEMBER(cischeat_scrollram_2_w);
+ DECLARE_READ16_MEMBER(bigrun_vregs_r);
+ DECLARE_WRITE16_MEMBER(bigrun_vregs_w);
+ DECLARE_READ16_MEMBER(cischeat_vregs_r);
+ DECLARE_WRITE16_MEMBER(cischeat_vregs_w);
+ DECLARE_READ16_MEMBER(f1gpstar_vregs_r);
+ DECLARE_READ16_MEMBER(f1gpstr2_vregs_r);
+ DECLARE_READ16_MEMBER(wildplt_vregs_r);
+ DECLARE_WRITE16_MEMBER(f1gpstar_vregs_w);
+ DECLARE_WRITE16_MEMBER(f1gpstr2_vregs_w);
+ DECLARE_WRITE16_MEMBER(scudhamm_vregs_w);
+ void cischeat_set_vreg_flag(int which, int data);
};
/*----------- defined in video/cischeat.c -----------*/
-WRITE16_HANDLER( cischeat_scrollram_0_w );
-WRITE16_HANDLER( cischeat_scrollram_1_w );
-WRITE16_HANDLER( cischeat_scrollram_2_w );
-READ16_HANDLER( bigrun_vregs_r );
-READ16_HANDLER( cischeat_vregs_r );
-READ16_HANDLER( f1gpstar_vregs_r );
-READ16_HANDLER( f1gpstr2_vregs_r );
-READ16_HANDLER( wildplt_vregs_r );
-WRITE16_HANDLER( bigrun_vregs_w );
-WRITE16_HANDLER( cischeat_vregs_w );
-WRITE16_HANDLER( f1gpstar_vregs_w );
-WRITE16_HANDLER( f1gpstr2_vregs_w );
-WRITE16_HANDLER( scudhamm_vregs_w );
VIDEO_START( bigrun );
VIDEO_START( cischeat );
diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h
index 8e65fddf196..b1e94f1a19e 100644
--- a/src/mame/includes/citycon.h
+++ b/src/mame/includes/citycon.h
@@ -27,14 +27,14 @@ public:
device_t *m_maincpu;
DECLARE_READ8_MEMBER(citycon_in_r);
DECLARE_READ8_MEMBER(citycon_irq_ack_r);
+ DECLARE_WRITE8_MEMBER(citycon_videoram_w);
+ DECLARE_WRITE8_MEMBER(citycon_linecolor_w);
+ DECLARE_WRITE8_MEMBER(citycon_background_w);
};
/*----------- defined in video/citycon.c -----------*/
-WRITE8_HANDLER( citycon_videoram_w );
-WRITE8_HANDLER( citycon_linecolor_w );
-WRITE8_HANDLER( citycon_background_w );
SCREEN_UPDATE_IND16( citycon );
VIDEO_START( citycon );
diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h
index aef57dd325f..579aab178bd 100644
--- a/src/mame/includes/cloak.h
+++ b/src/mame/includes/cloak.h
@@ -28,18 +28,20 @@ public:
DECLARE_WRITE8_MEMBER(cloak_irq_reset_0_w);
DECLARE_WRITE8_MEMBER(cloak_irq_reset_1_w);
DECLARE_WRITE8_MEMBER(cloak_nvram_enable_w);
+ DECLARE_WRITE8_MEMBER(cloak_paletteram_w);
+ DECLARE_WRITE8_MEMBER(cloak_clearbmp_w);
+ DECLARE_READ8_MEMBER(graph_processor_r);
+ DECLARE_WRITE8_MEMBER(graph_processor_w);
+ DECLARE_WRITE8_MEMBER(cloak_videoram_w);
+ DECLARE_WRITE8_MEMBER(cloak_flipscreen_w);
+ void set_current_bitmap_videoram_pointer();
+ void adjust_xy(int offset);
};
/*----------- defined in video/cloak.c -----------*/
-WRITE8_HANDLER( cloak_videoram_w );
-WRITE8_HANDLER( cloak_flipscreen_w );
-WRITE8_HANDLER( cloak_paletteram_w );
-READ8_HANDLER( graph_processor_r );
-WRITE8_HANDLER( graph_processor_w );
-WRITE8_HANDLER( cloak_clearbmp_w );
VIDEO_START( cloak );
SCREEN_UPDATE_IND16( cloak );
diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h
index 834d1052805..b30cccf806f 100644
--- a/src/mame/includes/cloud9.h
+++ b/src/mame/includes/cloud9.h
@@ -46,6 +46,12 @@ public:
DECLARE_READ8_MEMBER(leta_r);
DECLARE_WRITE8_MEMBER(nvram_recall_w);
DECLARE_WRITE8_MEMBER(nvram_store_w);
+ DECLARE_WRITE8_MEMBER(cloud9_video_control_w);
+ DECLARE_WRITE8_MEMBER(cloud9_paletteram_w);
+ DECLARE_WRITE8_MEMBER(cloud9_videoram_w);
+ DECLARE_READ8_MEMBER(cloud9_bitmode_r);
+ DECLARE_WRITE8_MEMBER(cloud9_bitmode_w);
+ DECLARE_WRITE8_MEMBER(cloud9_bitmode_addr_w);
};
@@ -54,11 +60,5 @@ public:
VIDEO_START( cloud9 );
SCREEN_UPDATE_IND16( cloud9 );
-WRITE8_HANDLER( cloud9_video_control_w );
-WRITE8_HANDLER( cloud9_paletteram_w );
-WRITE8_HANDLER( cloud9_videoram_w );
-READ8_HANDLER( cloud9_bitmode_r );
-WRITE8_HANDLER( cloud9_bitmode_w );
-WRITE8_HANDLER( cloud9_bitmode_addr_w );
diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h
index 136682fa7da..5b8f76b30e9 100644
--- a/src/mame/includes/clshroad.h
+++ b/src/mame/includes/clshroad.h
@@ -13,14 +13,14 @@ public:
UINT8 *m_spriteram;
size_t m_spriteram_size;
DECLARE_READ8_MEMBER(clshroad_input_r);
+ DECLARE_WRITE8_MEMBER(clshroad_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(clshroad_vram_0_w);
+ DECLARE_WRITE8_MEMBER(clshroad_vram_1_w);
};
/*----------- defined in video/clshroad.c -----------*/
-WRITE8_HANDLER( clshroad_vram_0_w );
-WRITE8_HANDLER( clshroad_vram_1_w );
-WRITE8_HANDLER( clshroad_flipscreen_w );
PALETTE_INIT( firebatl );
PALETTE_INIT( clshroad );
diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h
index bf1308e497d..7807b167dd3 100644
--- a/src/mame/includes/combatsc.h
+++ b/src/mame/includes/combatsc.h
@@ -54,17 +54,17 @@ public:
DECLARE_READ8_MEMBER(protection_r);
DECLARE_WRITE8_MEMBER(protection_clock_w);
DECLARE_WRITE8_MEMBER(combatsc_sh_irqtrigger_w);
+ DECLARE_READ8_MEMBER(combatsc_video_r);
+ DECLARE_WRITE8_MEMBER(combatsc_video_w);
+ DECLARE_WRITE8_MEMBER(combatsc_pf_control_w);
+ DECLARE_READ8_MEMBER(combatsc_scrollram_r);
+ DECLARE_WRITE8_MEMBER(combatsc_scrollram_w);
};
/*----------- defined in video/combatsc.c -----------*/
-READ8_HANDLER( combatsc_video_r );
-WRITE8_HANDLER( combatsc_video_w );
-WRITE8_HANDLER( combatsc_pf_control_w );
-READ8_HANDLER( combatsc_scrollram_r );
-WRITE8_HANDLER( combatsc_scrollram_w );
PALETTE_INIT( combatsc );
PALETTE_INIT( combatscb );
diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h
index eb5bb02e78d..f82e7dc32fb 100644
--- a/src/mame/includes/commando.h
+++ b/src/mame/includes/commando.h
@@ -28,19 +28,19 @@ public:
/* devices */
device_t *m_audiocpu;
required_device<buffered_spriteram8_device> m_spriteram;
+ DECLARE_WRITE8_MEMBER(commando_videoram_w);
+ DECLARE_WRITE8_MEMBER(commando_colorram_w);
+ DECLARE_WRITE8_MEMBER(commando_videoram2_w);
+ DECLARE_WRITE8_MEMBER(commando_colorram2_w);
+ DECLARE_WRITE8_MEMBER(commando_scrollx_w);
+ DECLARE_WRITE8_MEMBER(commando_scrolly_w);
+ DECLARE_WRITE8_MEMBER(commando_c804_w);
};
/*----------- defined in video/commando.c -----------*/
-WRITE8_HANDLER( commando_videoram_w );
-WRITE8_HANDLER( commando_colorram_w );
-WRITE8_HANDLER( commando_videoram2_w );
-WRITE8_HANDLER( commando_colorram2_w );
-WRITE8_HANDLER( commando_scrollx_w );
-WRITE8_HANDLER( commando_scrolly_w );
-WRITE8_HANDLER( commando_c804_w );
VIDEO_START( commando );
SCREEN_UPDATE_IND16( commando );
diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h
index af9cdbb892a..d69ba41a641 100644
--- a/src/mame/includes/compgolf.h
+++ b/src/mame/includes/compgolf.h
@@ -26,13 +26,13 @@ public:
/* misc */
int m_bank;
DECLARE_WRITE8_MEMBER(compgolf_ctrl_w);
+ DECLARE_WRITE8_MEMBER(compgolf_video_w);
+ DECLARE_WRITE8_MEMBER(compgolf_back_w);
};
/*----------- defined in video/compgolf.c -----------*/
-WRITE8_HANDLER( compgolf_video_w );
-WRITE8_HANDLER( compgolf_back_w );
PALETTE_INIT ( compgolf );
VIDEO_START ( compgolf );
SCREEN_UPDATE_IND16( compgolf );
diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h
index b5b5f4e22ec..96ec1ff2ce9 100644
--- a/src/mame/includes/contra.h
+++ b/src/mame/includes/contra.h
@@ -38,6 +38,14 @@ public:
DECLARE_WRITE8_MEMBER(contra_sh_irqtrigger_w);
DECLARE_WRITE8_MEMBER(contra_coin_counter_w);
DECLARE_WRITE8_MEMBER(cpu_sound_command_w);
+ DECLARE_WRITE8_MEMBER(contra_fg_vram_w);
+ DECLARE_WRITE8_MEMBER(contra_fg_cram_w);
+ DECLARE_WRITE8_MEMBER(contra_bg_vram_w);
+ DECLARE_WRITE8_MEMBER(contra_bg_cram_w);
+ DECLARE_WRITE8_MEMBER(contra_text_vram_w);
+ DECLARE_WRITE8_MEMBER(contra_text_cram_w);
+ DECLARE_WRITE8_MEMBER(contra_K007121_ctrl_0_w);
+ DECLARE_WRITE8_MEMBER(contra_K007121_ctrl_1_w);
};
@@ -45,15 +53,7 @@ public:
PALETTE_INIT( contra );
-WRITE8_HANDLER( contra_fg_vram_w );
-WRITE8_HANDLER( contra_fg_cram_w );
-WRITE8_HANDLER( contra_bg_vram_w );
-WRITE8_HANDLER( contra_bg_cram_w );
-WRITE8_HANDLER( contra_text_vram_w );
-WRITE8_HANDLER( contra_text_cram_w );
-WRITE8_HANDLER( contra_K007121_ctrl_0_w );
-WRITE8_HANDLER( contra_K007121_ctrl_1_w );
SCREEN_UPDATE_IND16( contra );
VIDEO_START( contra );
diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h
index 8ec32c49678..b07beae6701 100644
--- a/src/mame/includes/cop01.h
+++ b/src/mame/includes/cop01.h
@@ -33,6 +33,9 @@ public:
DECLARE_WRITE8_MEMBER(cop01_irq_ack_w);
DECLARE_READ8_MEMBER(cop01_sound_irq_ack_w);
DECLARE_READ8_MEMBER(kludge);
+ DECLARE_WRITE8_MEMBER(cop01_background_w);
+ DECLARE_WRITE8_MEMBER(cop01_foreground_w);
+ DECLARE_WRITE8_MEMBER(cop01_vreg_w);
};
@@ -44,6 +47,3 @@ PALETTE_INIT( cop01 );
VIDEO_START( cop01 );
SCREEN_UPDATE_IND16( cop01 );
-WRITE8_HANDLER( cop01_background_w );
-WRITE8_HANDLER( cop01_foreground_w );
-WRITE8_HANDLER( cop01_vreg_w );
diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h
index 17ccbee0dcc..a0b1fc5d00a 100644
--- a/src/mame/includes/cosmic.h
+++ b/src/mame/includes/cosmic.h
@@ -49,13 +49,13 @@ public:
DECLARE_READ8_MEMBER(magspot_coinage_dip_r);
DECLARE_READ8_MEMBER(nomnlnd_port_0_1_r);
DECLARE_WRITE8_MEMBER(flip_screen_w);
+ DECLARE_WRITE8_MEMBER(cosmic_color_register_w);
+ DECLARE_WRITE8_MEMBER(cosmic_background_enable_w);
};
/*----------- defined in video/cosmic.c -----------*/
-WRITE8_HANDLER( cosmic_color_register_w );
-WRITE8_HANDLER( cosmic_background_enable_w );
PALETTE_INIT( panic );
PALETTE_INIT( cosmica );
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h
index 1dee180fc08..7f1d864e53b 100644
--- a/src/mame/includes/cps1.h
+++ b/src/mame/includes/cps1.h
@@ -157,6 +157,15 @@ public:
DECLARE_WRITE16_MEMBER(cps1_coinctrl_w);
DECLARE_READ16_MEMBER(qsound_sharedram1_r);
DECLARE_WRITE16_MEMBER(qsound_sharedram1_w);
+ DECLARE_WRITE16_MEMBER(cps1_cps_a_w);
+ DECLARE_READ16_MEMBER(cps1_cps_b_r);
+ DECLARE_WRITE16_MEMBER(cps1_cps_b_w);
+ DECLARE_WRITE16_MEMBER(cps1_gfxram_w);
+ DECLARE_WRITE16_MEMBER(cps2_objram_bank_w);
+ DECLARE_READ16_MEMBER(cps2_objram1_r);
+ DECLARE_READ16_MEMBER(cps2_objram2_r);
+ DECLARE_WRITE16_MEMBER(cps2_objram1_w);
+ DECLARE_WRITE16_MEMBER(cps2_objram2_w);
};
/*----------- defined in drivers/cps1.c -----------*/
@@ -170,19 +179,10 @@ GFXDECODE_EXTERN( cps1 );
/*----------- defined in video/cps1.c -----------*/
-WRITE16_HANDLER( cps1_cps_a_w );
-WRITE16_HANDLER( cps1_cps_b_w );
-READ16_HANDLER( cps1_cps_b_r );
-WRITE16_HANDLER( cps1_gfxram_w );
DRIVER_INIT( cps1 );
DRIVER_INIT( cps2_video );
-WRITE16_HANDLER( cps2_objram_bank_w );
-READ16_HANDLER( cps2_objram1_r );
-READ16_HANDLER( cps2_objram2_r );
-WRITE16_HANDLER( cps2_objram1_w );
-WRITE16_HANDLER( cps2_objram2_w );
VIDEO_START( cps1 );
VIDEO_START( cps2 );
diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h
index 9896bb17995..ea88221d073 100644
--- a/src/mame/includes/crbaloon.h
+++ b/src/mame/includes/crbaloon.h
@@ -25,6 +25,8 @@ public:
DECLARE_WRITE8_MEMBER(pc3092_w);
DECLARE_READ8_MEMBER(pc3259_r);
DECLARE_WRITE8_MEMBER(port_sound_w);
+ DECLARE_WRITE8_MEMBER(crbaloon_videoram_w);
+ DECLARE_WRITE8_MEMBER(crbaloon_colorram_w);
};
@@ -46,8 +48,6 @@ PALETTE_INIT( crbaloon );
VIDEO_START( crbaloon );
SCREEN_UPDATE_IND16( crbaloon );
-WRITE8_HANDLER( crbaloon_videoram_w );
-WRITE8_HANDLER( crbaloon_colorram_w );
UINT16 crbaloon_get_collision_address(running_machine &machine);
void crbaloon_set_clear_collision_address(running_machine &machine, int _crbaloon_collision_address_clear);
diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h
index 760d64c0d07..22c0311710b 100644
--- a/src/mame/includes/crgolf.h
+++ b/src/mame/includes/crgolf.h
@@ -41,11 +41,11 @@ public:
DECLARE_READ8_MEMBER(main_to_sound_r);
DECLARE_WRITE8_MEMBER(sound_to_main_w);
DECLARE_READ8_MEMBER(sound_to_main_r);
+ DECLARE_WRITE8_MEMBER(crgolf_videoram_w);
+ DECLARE_READ8_MEMBER(crgolf_videoram_r);
};
/*----------- defined in video/crgolf.c -----------*/
-WRITE8_HANDLER( crgolf_videoram_w );
-READ8_HANDLER( crgolf_videoram_r );
MACHINE_CONFIG_EXTERN( crgolf_video );
diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h
index 5e6324d14d0..bda6dbaba49 100644
--- a/src/mame/includes/crospang.h
+++ b/src/mame/includes/crospang.h
@@ -25,6 +25,17 @@ public:
/* devices */
device_t *m_audiocpu;
DECLARE_WRITE16_MEMBER(crospang_soundlatch_w);
+ DECLARE_WRITE16_MEMBER(bestri_tilebank_w);
+ DECLARE_WRITE16_MEMBER(bestri_bg_scrolly_w);
+ DECLARE_WRITE16_MEMBER(bestri_fg_scrolly_w);
+ DECLARE_WRITE16_MEMBER(bestri_fg_scrollx_w);
+ DECLARE_WRITE16_MEMBER(bestri_bg_scrollx_w);
+ DECLARE_WRITE16_MEMBER(crospang_fg_scrolly_w);
+ DECLARE_WRITE16_MEMBER(crospang_bg_scrolly_w);
+ DECLARE_WRITE16_MEMBER(crospang_fg_scrollx_w);
+ DECLARE_WRITE16_MEMBER(crospang_bg_scrollx_w);
+ DECLARE_WRITE16_MEMBER(crospang_fg_videoram_w);
+ DECLARE_WRITE16_MEMBER(crospang_bg_videoram_w);
};
@@ -33,16 +44,5 @@ public:
VIDEO_START( crospang );
SCREEN_UPDATE_IND16( crospang );
-WRITE16_HANDLER ( crospang_fg_scrolly_w );
-WRITE16_HANDLER ( crospang_bg_scrolly_w );
-WRITE16_HANDLER ( crospang_fg_scrollx_w );
-WRITE16_HANDLER ( crospang_bg_scrollx_w );
-WRITE16_HANDLER ( bestri_fg_scrolly_w );
-WRITE16_HANDLER ( bestri_bg_scrolly_w );
-WRITE16_HANDLER ( bestri_fg_scrollx_w );
-WRITE16_HANDLER ( bestri_bg_scrollx_w );
-WRITE16_HANDLER ( crospang_fg_videoram_w );
-WRITE16_HANDLER ( crospang_bg_videoram_w );
-WRITE16_HANDLER ( bestri_tilebank_w );
diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h
index fc27503a0a9..5b5e3e6bfe7 100644
--- a/src/mame/includes/crshrace.h
+++ b/src/mame/includes/crshrace.h
@@ -36,14 +36,14 @@ public:
DECLARE_WRITE8_MEMBER(crshrace_sh_bankswitch_w);
DECLARE_WRITE16_MEMBER(sound_command_w);
DECLARE_WRITE8_MEMBER(pending_command_clear_w);
+ DECLARE_WRITE16_MEMBER(crshrace_videoram1_w);
+ DECLARE_WRITE16_MEMBER(crshrace_videoram2_w);
+ DECLARE_WRITE16_MEMBER(crshrace_roz_bank_w);
+ DECLARE_WRITE16_MEMBER(crshrace_gfxctrl_w);
};
/*----------- defined in video/crshrace.c -----------*/
-WRITE16_HANDLER( crshrace_videoram1_w );
-WRITE16_HANDLER( crshrace_videoram2_w );
-WRITE16_HANDLER( crshrace_roz_bank_w );
-WRITE16_HANDLER( crshrace_gfxctrl_w );
VIDEO_START( crshrace );
SCREEN_VBLANK( crshrace );
diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h
index d817fd46732..17bb9ccd472 100644
--- a/src/mame/includes/cvs.h
+++ b/src/mame/includes/cvs.h
@@ -79,6 +79,10 @@ public:
DECLARE_WRITE8_MEMBER(cvs_s2636_1_or_character_ram_w);
DECLARE_READ8_MEMBER(cvs_s2636_2_or_character_ram_r);
DECLARE_WRITE8_MEMBER(cvs_s2636_2_or_character_ram_w);
+ DECLARE_WRITE8_MEMBER(cvs_video_fx_w);
+ DECLARE_READ8_MEMBER(cvs_collision_r);
+ DECLARE_READ8_MEMBER(cvs_collision_clear);
+ DECLARE_WRITE8_MEMBER(cvs_scroll_w);
};
@@ -89,11 +93,7 @@ MACHINE_RESET( cvs );
/*----------- defined in video/cvs.c -----------*/
-WRITE8_HANDLER( cvs_scroll_w );
-WRITE8_HANDLER( cvs_video_fx_w );
-READ8_HANDLER( cvs_collision_r );
-READ8_HANDLER( cvs_collision_clear );
void cvs_init_stars( running_machine &machine );
void cvs_scroll_stars( running_machine &machine );
diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h
index 8844307b713..de6c300f7af 100644
--- a/src/mame/includes/darius.h
+++ b/src/mame/includes/darius.h
@@ -78,12 +78,12 @@ public:
DECLARE_READ8_MEMBER(readport3);
DECLARE_WRITE8_MEMBER(adpcm_nmi_disable);
DECLARE_WRITE8_MEMBER(adpcm_nmi_enable);
+ DECLARE_WRITE16_MEMBER(darius_fg_layer_w);
};
/*----------- defined in video/darius.c -----------*/
-WRITE16_HANDLER( darius_fg_layer_w );
VIDEO_START( darius );
SCREEN_UPDATE_IND16( darius_left );
diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h
index 9dcee8ec321..cdc35cacf19 100644
--- a/src/mame/includes/darkseal.h
+++ b/src/mame/includes/darkseal.h
@@ -23,6 +23,8 @@ public:
int m_flipscreen;
DECLARE_WRITE16_MEMBER(darkseal_control_w);
DECLARE_READ16_MEMBER(darkseal_control_r);
+ DECLARE_WRITE16_MEMBER(darkseal_palette_24bit_rg_w);
+ DECLARE_WRITE16_MEMBER(darkseal_palette_24bit_b_w);
};
@@ -31,5 +33,3 @@ public:
VIDEO_START( darkseal );
SCREEN_UPDATE_IND16( darkseal );
-WRITE16_HANDLER( darkseal_palette_24bit_rg_w );
-WRITE16_HANDLER( darkseal_palette_24bit_b_w );
diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h
index 7a2a990bf63..cb65cb790f1 100644
--- a/src/mame/includes/dbz.h
+++ b/src/mame/includes/dbz.h
@@ -37,6 +37,8 @@ public:
DECLARE_WRITE16_MEMBER(dbzcontrol_w);
DECLARE_WRITE16_MEMBER(dbz_sound_command_w);
DECLARE_WRITE16_MEMBER(dbz_sound_cause_nmi);
+ DECLARE_WRITE16_MEMBER(dbz_bg2_videoram_w);
+ DECLARE_WRITE16_MEMBER(dbz_bg1_videoram_w);
};
@@ -45,8 +47,6 @@ public:
extern void dbz_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask);
extern void dbz_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags);
-WRITE16_HANDLER(dbz_bg1_videoram_w);
-WRITE16_HANDLER(dbz_bg2_videoram_w);
VIDEO_START(dbz);
SCREEN_UPDATE_IND16(dbz);
diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h
index af013133dbc..ea3c8e67f1d 100644
--- a/src/mame/includes/dcheese.h
+++ b/src/mame/includes/dcheese.h
@@ -36,6 +36,12 @@ public:
DECLARE_READ8_MEMBER(sound_status_r);
DECLARE_WRITE8_MEMBER(sound_control_w);
DECLARE_WRITE8_MEMBER(bsmt_data_w);
+ DECLARE_WRITE16_MEMBER(madmax_blitter_color_w);
+ DECLARE_WRITE16_MEMBER(madmax_blitter_xparam_w);
+ DECLARE_WRITE16_MEMBER(madmax_blitter_yparam_w);
+ DECLARE_WRITE16_MEMBER(madmax_blitter_vidparam_w);
+ DECLARE_WRITE16_MEMBER(madmax_blitter_unknown_w);
+ DECLARE_READ16_MEMBER(madmax_blitter_vidparam_r);
};
@@ -50,10 +56,4 @@ PALETTE_INIT( dcheese );
VIDEO_START( dcheese );
SCREEN_UPDATE_IND16( dcheese );
-WRITE16_HANDLER( madmax_blitter_color_w );
-WRITE16_HANDLER( madmax_blitter_xparam_w );
-WRITE16_HANDLER( madmax_blitter_yparam_w );
-WRITE16_HANDLER( madmax_blitter_vidparam_w );
-WRITE16_HANDLER( madmax_blitter_unknown_w );
-READ16_HANDLER( madmax_blitter_vidparam_r );
diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h
index e4b6d7f30ef..e1b7bd35900 100644
--- a/src/mame/includes/dcon.h
+++ b/src/mame/includes/dcon.h
@@ -18,18 +18,18 @@ public:
int m_last_gfx_bank;
UINT16 *m_spriteram;
size_t m_spriteram_size;
+ DECLARE_READ16_MEMBER(dcon_control_r);
+ DECLARE_WRITE16_MEMBER(dcon_control_w);
+ DECLARE_WRITE16_MEMBER(dcon_gfxbank_w);
+ DECLARE_WRITE16_MEMBER(dcon_background_w);
+ DECLARE_WRITE16_MEMBER(dcon_foreground_w);
+ DECLARE_WRITE16_MEMBER(dcon_midground_w);
+ DECLARE_WRITE16_MEMBER(dcon_text_w);
};
/*----------- defined in video/dcon.c -----------*/
-WRITE16_HANDLER( dcon_gfxbank_w );
-WRITE16_HANDLER( dcon_background_w );
-WRITE16_HANDLER( dcon_foreground_w );
-WRITE16_HANDLER( dcon_midground_w );
-WRITE16_HANDLER( dcon_text_w );
-WRITE16_HANDLER( dcon_control_w );
-READ16_HANDLER( dcon_control_r );
VIDEO_START( dcon );
SCREEN_UPDATE_IND16( dcon );
diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h
index ba392a0fbfc..866b76d72fd 100644
--- a/src/mame/includes/dday.h
+++ b/src/mame/includes/dday.h
@@ -30,6 +30,14 @@ public:
/* devices */
device_t *m_ay1;
+ DECLARE_READ8_MEMBER(dday_countdown_timer_r);
+ DECLARE_WRITE8_MEMBER(dday_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(dday_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(dday_textvideoram_w);
+ DECLARE_WRITE8_MEMBER(dday_colorram_w);
+ DECLARE_READ8_MEMBER(dday_colorram_r);
+ DECLARE_WRITE8_MEMBER(dday_sl_control_w);
+ DECLARE_WRITE8_MEMBER(dday_control_w);
};
@@ -39,11 +47,3 @@ PALETTE_INIT( dday );
VIDEO_START( dday );
SCREEN_UPDATE_IND16( dday );
-WRITE8_HANDLER( dday_bgvideoram_w );
-WRITE8_HANDLER( dday_fgvideoram_w );
-WRITE8_HANDLER( dday_textvideoram_w );
-WRITE8_HANDLER( dday_colorram_w );
-READ8_HANDLER( dday_colorram_r );
-WRITE8_HANDLER( dday_control_w );
-WRITE8_HANDLER( dday_sl_control_w );
-READ8_HANDLER( dday_countdown_timer_r );
diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h
index 1480cdaa19f..f51e2dc68c1 100644
--- a/src/mame/includes/ddragon.h
+++ b/src/mame/includes/ddragon.h
@@ -58,13 +58,13 @@ public:
device_t *m_sub_cpu;
device_t *m_adpcm_1;
device_t *m_adpcm_2;
+ DECLARE_WRITE8_MEMBER(ddragon_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(ddragon_fgvideoram_w);
};
/*----------- defined in video/ddragon.c -----------*/
-WRITE8_HANDLER( ddragon_bgvideoram_w );
-WRITE8_HANDLER( ddragon_fgvideoram_w );
VIDEO_START( chinagat );
VIDEO_START( ddragon );
diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h
index 08917feabf6..a8df233089a 100644
--- a/src/mame/includes/ddragon3.h
+++ b/src/mame/includes/ddragon3.h
@@ -34,15 +34,15 @@ public:
device_t *m_maincpu;
device_t *m_audiocpu;
DECLARE_WRITE16_MEMBER(ddragon3_io_w);
+ DECLARE_WRITE16_MEMBER(ddragon3_scroll_w);
+ DECLARE_READ16_MEMBER(ddragon3_scroll_r);
+ DECLARE_WRITE16_MEMBER(ddragon3_bg_videoram_w);
+ DECLARE_WRITE16_MEMBER(ddragon3_fg_videoram_w);
};
/*----------- defined in video/ddragon3.c -----------*/
-extern WRITE16_HANDLER( ddragon3_bg_videoram_w );
-extern WRITE16_HANDLER( ddragon3_fg_videoram_w );
-extern WRITE16_HANDLER( ddragon3_scroll_w );
-extern READ16_HANDLER( ddragon3_scroll_r );
extern VIDEO_START( ddragon3 );
extern SCREEN_UPDATE_IND16( ddragon3 );
diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h
index 504ef3d47a5..dbe05a1194b 100644
--- a/src/mame/includes/ddribble.h
+++ b/src/mame/includes/ddribble.h
@@ -39,14 +39,14 @@ public:
DECLARE_READ8_MEMBER(ddribble_snd_sharedram_r);
DECLARE_WRITE8_MEMBER(ddribble_snd_sharedram_w);
DECLARE_WRITE8_MEMBER(ddribble_coin_counter_w);
+ DECLARE_WRITE8_MEMBER(K005885_0_w);
+ DECLARE_WRITE8_MEMBER(K005885_1_w);
+ DECLARE_WRITE8_MEMBER(ddribble_fg_videoram_w);
+ DECLARE_WRITE8_MEMBER(ddribble_bg_videoram_w);
};
/*----------- defined in video/ddribble.c -----------*/
-WRITE8_HANDLER( ddribble_fg_videoram_w );
-WRITE8_HANDLER( ddribble_bg_videoram_w );
-WRITE8_HANDLER( K005885_0_w );
-WRITE8_HANDLER( K005885_1_w );
PALETTE_INIT( ddribble );
VIDEO_START( ddribble );
diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h
index b787074cbfc..5a1bbf71e8d 100644
--- a/src/mame/includes/deadang.h
+++ b/src/mame/includes/deadang.h
@@ -16,14 +16,14 @@ public:
UINT16 *m_spriteram;
DECLARE_READ16_MEMBER(ghunter_trackball_low_r);
DECLARE_READ16_MEMBER(ghunter_trackball_high_r);
+ DECLARE_WRITE16_MEMBER(deadang_foreground_w);
+ DECLARE_WRITE16_MEMBER(deadang_text_w);
+ DECLARE_WRITE16_MEMBER(deadang_bank_w);
};
/*----------- defined in video/deadang.c -----------*/
-WRITE16_HANDLER( deadang_foreground_w );
-WRITE16_HANDLER( deadang_text_w );
-WRITE16_HANDLER( deadang_bank_w );
VIDEO_START( deadang );
SCREEN_UPDATE_IND16( deadang );
diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h
index 81e0bcb7e7d..c7ed5172731 100644
--- a/src/mame/includes/dec0.h
+++ b/src/mame/includes/dec0.h
@@ -31,6 +31,24 @@ public:
DECLARE_READ16_MEMBER(slyspy_protection_r);
DECLARE_WRITE16_MEMBER(slyspy_state_w);
DECLARE_READ16_MEMBER(slyspy_state_r);
+ DECLARE_READ16_MEMBER(dec0_controls_r);
+ DECLARE_READ16_MEMBER(dec0_rotary_r);
+ DECLARE_READ16_MEMBER(midres_controls_r);
+ DECLARE_READ8_MEMBER(hippodrm_prot_r);
+ DECLARE_WRITE8_MEMBER(hippodrm_prot_w);
+ DECLARE_READ8_MEMBER(hippodrm_shared_r);
+ DECLARE_WRITE8_MEMBER(hippodrm_shared_w);
+ DECLARE_READ8_MEMBER(dec0_mcu_port_r);
+ DECLARE_WRITE8_MEMBER(dec0_mcu_port_w);
+ DECLARE_READ16_MEMBER(hippodrm_68000_share_r);
+ DECLARE_WRITE16_MEMBER(hippodrm_68000_share_w);
+ DECLARE_WRITE16_MEMBER(sprite_mirror_w);
+ DECLARE_READ16_MEMBER(robocop_68000_share_r);
+ DECLARE_WRITE16_MEMBER(robocop_68000_share_w);
+ DECLARE_WRITE16_MEMBER(dec0_update_sprites_w);
+ DECLARE_WRITE16_MEMBER(dec0_paletteram_rg_w);
+ DECLARE_WRITE16_MEMBER(dec0_paletteram_b_w);
+ DECLARE_WRITE16_MEMBER(dec0_priority_w);
};
@@ -47,11 +65,7 @@ SCREEN_UPDATE_IND16( hippodrm );
SCREEN_UPDATE_IND16( slyspy );
SCREEN_UPDATE_IND16( midres );
-WRITE16_HANDLER( dec0_priority_w );
-WRITE16_HANDLER( dec0_update_sprites_w );
-WRITE16_HANDLER( dec0_paletteram_rg_w );
-WRITE16_HANDLER( dec0_paletteram_b_w );
READ8_HANDLER( dec0_pf3_data_8bit_r );
WRITE8_HANDLER( dec0_pf3_data_8bit_w );
@@ -59,9 +73,6 @@ WRITE8_HANDLER( dec0_pf3_control_8bit_w );
/*----------- defined in machine/dec0.c -----------*/
-READ16_HANDLER( dec0_controls_r );
-READ16_HANDLER( dec0_rotary_r );
-READ16_HANDLER( midres_controls_r );
READ16_HANDLER( slyspy_controls_r );
DRIVER_INIT( slyspy );
@@ -73,10 +84,4 @@ DRIVER_INIT( birdtry );
extern void dec0_i8751_write(running_machine &machine, int data);
extern void dec0_i8751_reset(running_machine &machine);
-READ8_HANDLER( hippodrm_prot_r );
-WRITE8_HANDLER( dec0_mcu_port_w );
-READ8_HANDLER( dec0_mcu_port_r );
-WRITE8_HANDLER( hippodrm_prot_w );
-READ8_HANDLER( hippodrm_shared_r );
-WRITE8_HANDLER( hippodrm_shared_w );
diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h
index 6f23f910caa..ee1491331be 100644
--- a/src/mame/includes/dec8.h
+++ b/src/mame/includes/dec8.h
@@ -74,6 +74,17 @@ public:
DECLARE_WRITE8_MEMBER(flip_screen_w);
DECLARE_READ8_MEMBER(dec8_mcu_from_main_r);
DECLARE_WRITE8_MEMBER(dec8_mcu_to_main_w);
+ DECLARE_WRITE8_MEMBER(dec8_bg_data_w);
+ DECLARE_READ8_MEMBER(dec8_bg_data_r);
+ DECLARE_WRITE8_MEMBER(dec8_videoram_w);
+ DECLARE_WRITE8_MEMBER(srdarwin_videoram_w);
+ DECLARE_WRITE8_MEMBER(dec8_scroll2_w);
+ DECLARE_WRITE8_MEMBER(srdarwin_control_w);
+ DECLARE_WRITE8_MEMBER(lastmisn_control_w);
+ DECLARE_WRITE8_MEMBER(shackled_control_w);
+ DECLARE_WRITE8_MEMBER(lastmisn_scrollx_w);
+ DECLARE_WRITE8_MEMBER(lastmisn_scrolly_w);
+ DECLARE_WRITE8_MEMBER(gondo_scroll_w);
};
/*----------- defined in video/dec8.c -----------*/
@@ -99,16 +110,5 @@ VIDEO_START( garyoret );
WRITE8_HANDLER( dec8_bac06_0_w );
WRITE8_HANDLER( dec8_bac06_1_w );
-WRITE8_HANDLER( dec8_bg_data_w );
WRITE8_HANDLER( dec8_pf1_data_w );
-READ8_HANDLER( dec8_bg_data_r );
READ8_HANDLER( dec8_pf1_data_r );
-WRITE8_HANDLER( srdarwin_videoram_w );
-WRITE8_HANDLER( dec8_scroll2_w );
-WRITE8_HANDLER( srdarwin_control_w );
-WRITE8_HANDLER( gondo_scroll_w );
-WRITE8_HANDLER( shackled_control_w );
-WRITE8_HANDLER( lastmisn_control_w );
-WRITE8_HANDLER( lastmisn_scrollx_w );
-WRITE8_HANDLER( lastmisn_scrolly_w );
-WRITE8_HANDLER( dec8_videoram_w );
diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h
index 304f8e9b14f..d04bac29877 100644
--- a/src/mame/includes/deco32.h
+++ b/src/mame/includes/deco32.h
@@ -83,6 +83,11 @@ public:
DECLARE_WRITE32_MEMBER(deco32_pf3_rowscroll_w);
DECLARE_WRITE32_MEMBER(deco32_pf4_rowscroll_w);
DECLARE_READ8_MEMBER(latch_r);
+ DECLARE_WRITE32_MEMBER(deco32_pri_w);
+ DECLARE_WRITE32_MEMBER(deco32_ace_ram_w);
+ DECLARE_WRITE32_MEMBER(deco32_nonbuffered_palette_w);
+ DECLARE_WRITE32_MEMBER(deco32_buffered_palette_w);
+ DECLARE_WRITE32_MEMBER(deco32_palette_dma_w);
};
class dragngun_state : public deco32_state
@@ -99,6 +104,8 @@ public:
int m_dragngun_lightgun_port;
DECLARE_READ32_MEMBER(dragngun_lightgun_r);
DECLARE_WRITE32_MEMBER(dragngun_lightgun_w);
+ DECLARE_WRITE32_MEMBER(dragngun_sprite_control_w);
+ DECLARE_WRITE32_MEMBER(dragngun_spriteram_dma_w);
};
@@ -125,11 +132,4 @@ WRITE32_HANDLER( deco32_pf2_data_w );
WRITE32_HANDLER( deco32_pf3_data_w );
WRITE32_HANDLER( deco32_pf4_data_w );
-WRITE32_HANDLER( deco32_nonbuffered_palette_w );
-WRITE32_HANDLER( deco32_buffered_palette_w );
-WRITE32_HANDLER( deco32_palette_dma_w );
-WRITE32_HANDLER( deco32_pri_w );
-WRITE32_HANDLER( dragngun_sprite_control_w );
-WRITE32_HANDLER( dragngun_spriteram_dma_w );
-WRITE32_HANDLER( deco32_ace_ram_w );
diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h
index c66d9410bf2..b44b9af208e 100644
--- a/src/mame/includes/deniam.h
+++ b/src/mame/includes/deniam.h
@@ -41,16 +41,16 @@ public:
device_t *m_audio_cpu; // system 16c does not have sound CPU
DECLARE_WRITE16_MEMBER(sound_command_w);
DECLARE_WRITE16_MEMBER(deniam_irq_ack_w);
+ DECLARE_WRITE16_MEMBER(deniam_videoram_w);
+ DECLARE_WRITE16_MEMBER(deniam_textram_w);
+ DECLARE_WRITE16_MEMBER(deniam_palette_w);
+ DECLARE_READ16_MEMBER(deniam_coinctrl_r);
+ DECLARE_WRITE16_MEMBER(deniam_coinctrl_w);
};
/*----------- defined in video/deniam.c -----------*/
-WRITE16_HANDLER( deniam_videoram_w );
-WRITE16_HANDLER( deniam_textram_w );
-WRITE16_HANDLER( deniam_palette_w );
-READ16_HANDLER( deniam_coinctrl_r );
-WRITE16_HANDLER( deniam_coinctrl_w );
VIDEO_START( deniam );
SCREEN_UPDATE_IND16( deniam );
diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h
index 6e5db4adb98..7784c6df693 100644
--- a/src/mame/includes/djboy.h
+++ b/src/mame/includes/djboy.h
@@ -59,15 +59,15 @@ public:
DECLARE_WRITE8_MEMBER(beast_p2_w);
DECLARE_READ8_MEMBER(beast_p3_r);
DECLARE_WRITE8_MEMBER(beast_p3_w);
+ DECLARE_WRITE8_MEMBER(djboy_scrollx_w);
+ DECLARE_WRITE8_MEMBER(djboy_scrolly_w);
+ DECLARE_WRITE8_MEMBER(djboy_videoram_w);
+ DECLARE_WRITE8_MEMBER(djboy_paletteram_w);
};
/*----------- defined in video/djboy.c -----------*/
-WRITE8_HANDLER( djboy_scrollx_w );
-WRITE8_HANDLER( djboy_scrolly_w );
-WRITE8_HANDLER( djboy_videoram_w );
-WRITE8_HANDLER( djboy_paletteram_w );
VIDEO_START( djboy );
SCREEN_UPDATE_IND16( djboy );
diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h
index 358d63b5ae1..6a8d4ce3b5d 100644
--- a/src/mame/includes/dkong.h
+++ b/src/mame/includes/dkong.h
@@ -215,19 +215,19 @@ public:
DECLARE_READ8_MEMBER(strtheat_inputport_1_r);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
DECLARE_WRITE8_MEMBER(braze_a15_w);
+ DECLARE_WRITE8_MEMBER(dkong_videoram_w);
+ DECLARE_WRITE8_MEMBER(dkongjr_gfxbank_w);
+ DECLARE_WRITE8_MEMBER(dkong3_gfxbank_w);
+ DECLARE_WRITE8_MEMBER(dkong_palettebank_w);
+ DECLARE_WRITE8_MEMBER(radarscp_grid_enable_w);
+ DECLARE_WRITE8_MEMBER(radarscp_grid_color_w);
+ DECLARE_WRITE8_MEMBER(dkong_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(dkong_spritebank_w);
};
/*----------- defined in video/dkong.c -----------*/
-WRITE8_HANDLER( radarscp_grid_enable_w );
-WRITE8_HANDLER( radarscp_grid_color_w );
-WRITE8_HANDLER( dkong_flipscreen_w );
-WRITE8_HANDLER( dkongjr_gfxbank_w );
-WRITE8_HANDLER( dkong3_gfxbank_w );
-WRITE8_HANDLER( dkong_spritebank_w );
-WRITE8_HANDLER( dkong_palettebank_w );
-WRITE8_HANDLER( dkong_videoram_w );
PALETTE_INIT( dkong2b );
PALETTE_INIT( radarscp );
diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h
index c7c00bf3610..1a3705af600 100644
--- a/src/mame/includes/docastle.h
+++ b/src/mame/includes/docastle.h
@@ -26,25 +26,25 @@ public:
/* devices */
cpu_device *m_maincpu;
cpu_device *m_slave;
+ DECLARE_READ8_MEMBER(docastle_shared0_r);
+ DECLARE_READ8_MEMBER(docastle_shared1_r);
+ DECLARE_WRITE8_MEMBER(docastle_shared0_w);
+ DECLARE_WRITE8_MEMBER(docastle_shared1_w);
+ DECLARE_WRITE8_MEMBER(docastle_nmitrigger_w);
+ DECLARE_WRITE8_MEMBER(docastle_videoram_w);
+ DECLARE_WRITE8_MEMBER(docastle_colorram_w);
+ DECLARE_READ8_MEMBER(docastle_flipscreen_off_r);
+ DECLARE_READ8_MEMBER(docastle_flipscreen_on_r);
+ DECLARE_WRITE8_MEMBER(docastle_flipscreen_off_w);
+ DECLARE_WRITE8_MEMBER(docastle_flipscreen_on_w);
};
/*----------- defined in machine/docastle.c -----------*/
-READ8_HANDLER( docastle_shared0_r );
-READ8_HANDLER( docastle_shared1_r );
-WRITE8_HANDLER( docastle_shared0_w );
-WRITE8_HANDLER( docastle_shared1_w );
-WRITE8_HANDLER( docastle_nmitrigger_w );
/*----------- defined in video/docastle.c -----------*/
-WRITE8_HANDLER( docastle_videoram_w );
-WRITE8_HANDLER( docastle_colorram_w );
-READ8_HANDLER( docastle_flipscreen_off_r );
-READ8_HANDLER( docastle_flipscreen_on_r );
-WRITE8_HANDLER( docastle_flipscreen_off_w );
-WRITE8_HANDLER( docastle_flipscreen_on_w );
PALETTE_INIT( docastle );
VIDEO_START( docastle );
diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h
index 807a0857216..dd49a6a3d6e 100644
--- a/src/mame/includes/dogfgt.h
+++ b/src/mame/includes/dogfgt.h
@@ -38,17 +38,18 @@ public:
DECLARE_WRITE8_MEMBER(sub_irqack_w);
DECLARE_WRITE8_MEMBER(dogfgt_soundlatch_w);
DECLARE_WRITE8_MEMBER(dogfgt_soundcontrol_w);
+ DECLARE_WRITE8_MEMBER(dogfgt_plane_select_w);
+ DECLARE_READ8_MEMBER(dogfgt_bitmapram_r);
+ DECLARE_WRITE8_MEMBER(internal_bitmapram_w);
+ DECLARE_WRITE8_MEMBER(dogfgt_bitmapram_w);
+ DECLARE_WRITE8_MEMBER(dogfgt_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(dogfgt_scroll_w);
+ DECLARE_WRITE8_MEMBER(dogfgt_1800_w);
};
/*----------- defined in video/dogfgt.c -----------*/
-WRITE8_HANDLER( dogfgt_plane_select_w );
-READ8_HANDLER( dogfgt_bitmapram_r );
-WRITE8_HANDLER( dogfgt_bitmapram_w );
-WRITE8_HANDLER( dogfgt_bgvideoram_w );
-WRITE8_HANDLER( dogfgt_scroll_w );
-WRITE8_HANDLER( dogfgt_1800_w );
PALETTE_INIT( dogfgt );
VIDEO_START( dogfgt );
diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h
index 1a2cedefcea..4ec2eb91db9 100644
--- a/src/mame/includes/dooyong.h
+++ b/src/mame/includes/dooyong.h
@@ -44,28 +44,29 @@ public:
optional_device<buffered_spriteram16_device> m_spriteram16;
DECLARE_WRITE8_MEMBER(lastday_bankswitch_w);
DECLARE_WRITE8_MEMBER(flip_screen_w);
+ DECLARE_WRITE8_MEMBER(dooyong_bgscroll8_w);
+ DECLARE_WRITE8_MEMBER(dooyong_bg2scroll8_w);
+ DECLARE_WRITE8_MEMBER(dooyong_fgscroll8_w);
+ DECLARE_WRITE8_MEMBER(dooyong_fg2scroll8_w);
+ DECLARE_WRITE16_MEMBER(dooyong_bgscroll16_w);
+ DECLARE_WRITE16_MEMBER(dooyong_bg2scroll16_w);
+ DECLARE_WRITE16_MEMBER(dooyong_fgscroll16_w);
+ DECLARE_WRITE16_MEMBER(dooyong_fg2scroll16_w);
+ DECLARE_WRITE8_MEMBER(dooyong_txvideoram8_w);
+ DECLARE_WRITE8_MEMBER(lastday_ctrl_w);
+ DECLARE_WRITE8_MEMBER(pollux_ctrl_w);
+ DECLARE_WRITE8_MEMBER(primella_ctrl_w);
+ DECLARE_WRITE8_MEMBER(paletteram_flytiger_w);
+ DECLARE_WRITE8_MEMBER(flytiger_ctrl_w);
+ DECLARE_WRITE16_MEMBER(rshark_ctrl_w);
};
/*----------- defined in video/dooyong.c -----------*/
-WRITE8_HANDLER( dooyong_bgscroll8_w );
-WRITE8_HANDLER( dooyong_fgscroll8_w );
-WRITE8_HANDLER( dooyong_fg2scroll8_w );
-WRITE16_HANDLER( dooyong_bgscroll16_w );
-WRITE16_HANDLER( dooyong_bg2scroll16_w );
-WRITE16_HANDLER( dooyong_fgscroll16_w );
-WRITE16_HANDLER( dooyong_fg2scroll16_w );
-WRITE8_HANDLER( dooyong_txvideoram8_w );
-WRITE8_HANDLER( lastday_ctrl_w );
-WRITE8_HANDLER( pollux_ctrl_w );
-WRITE8_HANDLER( primella_ctrl_w );
-WRITE8_HANDLER( paletteram_flytiger_w );
-WRITE8_HANDLER( flytiger_ctrl_w );
-WRITE16_HANDLER( rshark_ctrl_w );
SCREEN_UPDATE_IND16( lastday );
SCREEN_UPDATE_IND16( gulfstrm );
diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h
index 1ea3506c315..e102026569b 100644
--- a/src/mame/includes/drgnmst.h
+++ b/src/mame/includes/drgnmst.h
@@ -47,14 +47,14 @@ public:
DECLARE_WRITE8_MEMBER(drgnmst_oki_w);
DECLARE_WRITE8_MEMBER(drgnmst_snd_control_w);
DECLARE_READ8_MEMBER(PIC16C5X_T0_clk_r);
+ DECLARE_WRITE16_MEMBER(drgnmst_fg_videoram_w);
+ DECLARE_WRITE16_MEMBER(drgnmst_bg_videoram_w);
+ DECLARE_WRITE16_MEMBER(drgnmst_md_videoram_w);
};
/*----------- defined in video/drgnmst.c -----------*/
-WRITE16_HANDLER( drgnmst_fg_videoram_w );
-WRITE16_HANDLER( drgnmst_bg_videoram_w );
-WRITE16_HANDLER( drgnmst_md_videoram_w );
VIDEO_START(drgnmst);
SCREEN_UPDATE_IND16(drgnmst);
diff --git a/src/mame/includes/dribling.h b/src/mame/includes/dribling.h
index 880035f2b92..cbfc75c7569 100644
--- a/src/mame/includes/dribling.h
+++ b/src/mame/includes/dribling.h
@@ -30,11 +30,11 @@ public:
device_t *m_ppi_1;
DECLARE_READ8_MEMBER(ioread);
DECLARE_WRITE8_MEMBER(iowrite);
+ DECLARE_WRITE8_MEMBER(dribling_colorram_w);
};
/*----------- defined in video/dribling.c -----------*/
PALETTE_INIT( dribling );
-WRITE8_HANDLER( dribling_colorram_w );
SCREEN_UPDATE_IND16( dribling );
diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h
index 7cb8c719bfc..1e9408ddf4a 100644
--- a/src/mame/includes/drmicro.h
+++ b/src/mame/includes/drmicro.h
@@ -27,6 +27,7 @@ public:
device_t *m_msm;
DECLARE_WRITE8_MEMBER(nmi_enable_w);
DECLARE_WRITE8_MEMBER(pcm_set_w);
+ DECLARE_WRITE8_MEMBER(drmicro_videoram_w);
};
@@ -36,4 +37,3 @@ PALETTE_INIT( drmicro );
VIDEO_START( drmicro );
SCREEN_UPDATE_IND16( drmicro );
-WRITE8_HANDLER( drmicro_videoram_w );
diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h
index 1b6d3cf217c..8945caf6474 100644
--- a/src/mame/includes/dynax.h
+++ b/src/mame/includes/dynax.h
@@ -232,6 +232,40 @@ public:
DECLARE_WRITE8_MEMBER(gekisha_p4_w);
DECLARE_READ8_MEMBER(gekisha_8000_r);
DECLARE_WRITE8_MEMBER(gekisha_8000_w);
+ DECLARE_WRITE8_MEMBER(dynax_extra_scrollx_w);
+ DECLARE_WRITE8_MEMBER(dynax_extra_scrolly_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit_pen_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit2_pen_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit_dest_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit2_dest_w);
+ DECLARE_WRITE8_MEMBER(tenkai_blit_dest_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit_backpen_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit_palette01_w);
+ DECLARE_WRITE8_MEMBER(tenkai_blit_palette01_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit_palette45_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit_palette23_w);
+ DECLARE_WRITE8_MEMBER(tenkai_blit_palette23_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit_palette67_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit_palbank_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit2_palbank_w);
+ DECLARE_WRITE8_MEMBER(hanamai_layer_half_w);
+ DECLARE_WRITE8_MEMBER(hnoridur_layer_half2_w);
+ DECLARE_WRITE8_MEMBER(mjdialq2_blit_dest_w);
+ DECLARE_WRITE8_MEMBER(dynax_layer_enable_w);
+ DECLARE_WRITE8_MEMBER(jantouki_layer_enable_w);
+ DECLARE_WRITE8_MEMBER(mjdialq2_layer_enable_w);
+ DECLARE_WRITE8_MEMBER(dynax_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit_romregion_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit2_romregion_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit_scroll_w);
+ DECLARE_WRITE8_MEMBER(tenkai_blit_scroll_w);
+ DECLARE_WRITE8_MEMBER(dynax_blit2_scroll_w);
+ DECLARE_WRITE8_MEMBER(dynax_blitter_rev2_w);
+ DECLARE_WRITE8_MEMBER(tenkai_blitter_rev2_w);
+ DECLARE_WRITE8_MEMBER(jantouki_blitter_rev2_w);
+ DECLARE_WRITE8_MEMBER(jantouki_blitter2_rev2_w);
+ DECLARE_WRITE8_MEMBER(hanamai_priority_w);
+ DECLARE_WRITE8_MEMBER(tenkai_priority_w);
};
//----------- defined in drivers/dynax.c -----------
@@ -243,43 +277,12 @@ void neruton_update_irq(running_machine &machine);
//----------- defined in video/dynax.c -----------
-WRITE8_HANDLER( dynax_blitter_rev2_w );
-WRITE8_HANDLER( jantouki_blitter_rev2_w );
-WRITE8_HANDLER( jantouki_blitter2_rev2_w );
-WRITE8_HANDLER( tenkai_blitter_rev2_w );
-
-WRITE8_HANDLER( dynax_blit_pen_w );
-WRITE8_HANDLER( dynax_blit2_pen_w );
-WRITE8_HANDLER( dynax_blit_backpen_w );
-WRITE8_HANDLER( dynax_blit_dest_w );
-WRITE8_HANDLER( dynax_blit2_dest_w );
-WRITE8_HANDLER( dynax_blit_palbank_w );
-WRITE8_HANDLER( dynax_blit2_palbank_w );
-WRITE8_HANDLER( dynax_blit_palette01_w );
-WRITE8_HANDLER( dynax_blit_palette23_w );
-WRITE8_HANDLER( dynax_blit_palette45_w );
-WRITE8_HANDLER( dynax_blit_palette67_w );
-WRITE8_HANDLER( dynax_layer_enable_w );
-WRITE8_HANDLER( jantouki_layer_enable_w );
-WRITE8_HANDLER( dynax_flipscreen_w );
-WRITE8_HANDLER( dynax_extra_scrollx_w );
-WRITE8_HANDLER( dynax_extra_scrolly_w );
-WRITE8_HANDLER( dynax_blit_romregion_w );
-WRITE8_HANDLER( dynax_blit2_romregion_w );
-
-WRITE8_HANDLER( hanamai_layer_half_w );
-WRITE8_HANDLER( hnoridur_layer_half2_w );
-
-WRITE8_HANDLER( hanamai_priority_w );
-WRITE8_HANDLER( tenkai_priority_w );
-
-WRITE8_HANDLER( mjdialq2_blit_dest_w );
-WRITE8_HANDLER( tenkai_blit_dest_w );
-
-WRITE8_HANDLER( mjdialq2_layer_enable_w );
-
-WRITE8_HANDLER( tenkai_blit_palette01_w );
-WRITE8_HANDLER( tenkai_blit_palette23_w );
+
+
+
+
+
+
VIDEO_START( hanamai );
VIDEO_START( hnoridur );
diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h
index 4e4e56253e8..91f13b9b744 100644
--- a/src/mame/includes/dynduke.h
+++ b/src/mame/includes/dynduke.h
@@ -23,16 +23,16 @@ public:
int m_old_back;
int m_old_fore;
required_device<buffered_spriteram16_device> m_spriteram;
+ DECLARE_WRITE16_MEMBER(dynduke_paletteram_w);
+ DECLARE_WRITE16_MEMBER(dynduke_background_w);
+ DECLARE_WRITE16_MEMBER(dynduke_foreground_w);
+ DECLARE_WRITE16_MEMBER(dynduke_text_w);
+ DECLARE_WRITE16_MEMBER(dynduke_gfxbank_w);
+ DECLARE_WRITE16_MEMBER(dynduke_control_w);
};
/*----------- defined in video/dynduke.c -----------*/
-WRITE16_HANDLER( dynduke_background_w );
-WRITE16_HANDLER( dynduke_foreground_w );
-WRITE16_HANDLER( dynduke_text_w );
-WRITE16_HANDLER( dynduke_gfxbank_w );
-WRITE16_HANDLER( dynduke_control_w );
-WRITE16_HANDLER( dynduke_paletteram_w );
VIDEO_START( dynduke );
SCREEN_UPDATE_IND16( dynduke );
diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h
index 101b78d2428..8ec49bc85ab 100644
--- a/src/mame/includes/eolith.h
+++ b/src/mame/includes/eolith.h
@@ -15,12 +15,12 @@ public:
DECLARE_WRITE32_MEMBER(systemcontrol_w);
DECLARE_READ32_MEMBER(hidctch3_pen1_r);
DECLARE_READ32_MEMBER(hidctch3_pen2_r);
+ DECLARE_WRITE32_MEMBER(eolith_vram_w);
+ DECLARE_READ32_MEMBER(eolith_vram_r);
};
/*----------- defined in video/eolith.c -----------*/
-READ32_HANDLER( eolith_vram_r );
-WRITE32_HANDLER( eolith_vram_w );
VIDEO_START( eolith );
SCREEN_UPDATE_IND16( eolith );
diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h
index 5ac564e10f8..0cf519f3185 100644
--- a/src/mame/includes/epos.h
+++ b/src/mame/includes/epos.h
@@ -20,10 +20,10 @@ public:
/* misc */
int m_counter;
DECLARE_WRITE8_MEMBER(dealer_decrypt_rom);
+ DECLARE_WRITE8_MEMBER(epos_port_1_w);
};
/*----------- defined in video/epos.c -----------*/
-WRITE8_HANDLER( epos_port_1_w );
SCREEN_UPDATE_RGB32( epos );
diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h
index 5fa09f6c605..ba97c208fe5 100644
--- a/src/mame/includes/equites.h
+++ b/src/mame/includes/equites.h
@@ -66,24 +66,24 @@ public:
DECLARE_WRITE16_MEMBER(mcu_w);
DECLARE_WRITE16_MEMBER(mcu_halt_assert_w);
DECLARE_WRITE16_MEMBER(mcu_halt_clear_w);
+ DECLARE_READ16_MEMBER(equites_fg_videoram_r);
+ DECLARE_WRITE16_MEMBER(equites_fg_videoram_w);
+ DECLARE_WRITE16_MEMBER(equites_bg_videoram_w);
+ DECLARE_WRITE16_MEMBER(equites_bgcolor_w);
+ DECLARE_WRITE16_MEMBER(equites_scrollreg_w);
+ DECLARE_WRITE16_MEMBER(splndrbt_selchar0_w);
+ DECLARE_WRITE16_MEMBER(splndrbt_selchar1_w);
+ DECLARE_WRITE16_MEMBER(equites_flip0_w);
+ DECLARE_WRITE16_MEMBER(equites_flip1_w);
+ DECLARE_WRITE16_MEMBER(splndrbt_flip0_w);
+ DECLARE_WRITE16_MEMBER(splndrbt_flip1_w);
+ DECLARE_WRITE16_MEMBER(splndrbt_bg_scrollx_w);
+ DECLARE_WRITE16_MEMBER(splndrbt_bg_scrolly_w);
};
/*----------- defined in video/equites.c -----------*/
-extern READ16_HANDLER(equites_fg_videoram_r);
-extern WRITE16_HANDLER(equites_fg_videoram_w);
-extern WRITE16_HANDLER(equites_bg_videoram_w);
-extern WRITE16_HANDLER(equites_scrollreg_w);
-extern WRITE16_HANDLER(equites_bgcolor_w);
-extern WRITE16_HANDLER(splndrbt_selchar0_w);
-extern WRITE16_HANDLER(splndrbt_selchar1_w);
-extern WRITE16_HANDLER(equites_flip0_w);
-extern WRITE16_HANDLER(equites_flip1_w);
-extern WRITE16_HANDLER(splndrbt_flip0_w);
-extern WRITE16_HANDLER(splndrbt_flip1_w);
-extern WRITE16_HANDLER(splndrbt_bg_scrollx_w);
-extern WRITE16_HANDLER(splndrbt_bg_scrolly_w);
extern PALETTE_INIT( equites );
extern VIDEO_START( equites );
diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h
index b5483477297..274a0a42983 100644
--- a/src/mame/includes/esd16.h
+++ b/src/mame/includes/esd16.h
@@ -41,14 +41,14 @@ public:
DECLARE_WRITE16_MEMBER(esd_eeprom_w);
DECLARE_WRITE8_MEMBER(esd16_sound_rombank_w);
DECLARE_READ8_MEMBER(esd16_sound_command_r);
+ DECLARE_WRITE16_MEMBER(esd16_vram_0_w);
+ DECLARE_WRITE16_MEMBER(esd16_vram_1_w);
+ DECLARE_WRITE16_MEMBER(esd16_tilemap0_color_w);
};
/*----------- defined in video/esd16.c -----------*/
-WRITE16_HANDLER( esd16_vram_0_w );
-WRITE16_HANDLER( esd16_vram_1_w );
-WRITE16_HANDLER( esd16_tilemap0_color_w );
VIDEO_START( esd16 );
SCREEN_UPDATE_IND16( hedpanic );
diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h
index 26350a5f913..4dd96934e29 100644
--- a/src/mame/includes/espial.h
+++ b/src/mame/includes/espial.h
@@ -33,6 +33,11 @@ public:
DECLARE_WRITE8_MEMBER(espial_master_interrupt_mask_w);
DECLARE_WRITE8_MEMBER(espial_master_soundlatch_w);
DECLARE_WRITE8_MEMBER(espial_sound_nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(espial_videoram_w);
+ DECLARE_WRITE8_MEMBER(espial_colorram_w);
+ DECLARE_WRITE8_MEMBER(espial_attributeram_w);
+ DECLARE_WRITE8_MEMBER(espial_scrollram_w);
+ DECLARE_WRITE8_MEMBER(espial_flipscreen_w);
};
/*----------- defined in video/espial.c -----------*/
@@ -40,9 +45,4 @@ public:
PALETTE_INIT( espial );
VIDEO_START( espial );
VIDEO_START( netwars );
-WRITE8_HANDLER( espial_videoram_w );
-WRITE8_HANDLER( espial_colorram_w );
-WRITE8_HANDLER( espial_attributeram_w );
-WRITE8_HANDLER( espial_scrollram_w );
-WRITE8_HANDLER( espial_flipscreen_w );
SCREEN_UPDATE_IND16( espial );
diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h
index 8fa5e093f93..c196f00b29c 100644
--- a/src/mame/includes/esripsys.h
+++ b/src/mame/includes/esripsys.h
@@ -84,6 +84,7 @@ public:
DECLARE_WRITE8_MEMBER(tms5220_w);
DECLARE_WRITE8_MEMBER(control_w);
DECLARE_WRITE8_MEMBER(volume_dac_w);
+ DECLARE_WRITE8_MEMBER(esripsys_bg_intensity_w);
};
@@ -92,7 +93,6 @@ public:
VIDEO_START( esripsys );
SCREEN_UPDATE_RGB32( esripsys );
-WRITE8_HANDLER( esripsys_bg_intensity_w );
INTERRUPT_GEN( esripsys_vblank_irq );
int esripsys_draw(running_machine &machine, int l, int r, int fig, int attr, int addr, int col, int x_scale, int bank);
diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h
index 596dfa6cd00..3b0f3bbb92d 100644
--- a/src/mame/includes/exedexes.h
+++ b/src/mame/includes/exedexes.h
@@ -30,16 +30,16 @@ public:
int m_sc2on;
required_device<buffered_spriteram8_device> m_spriteram;
+ DECLARE_WRITE8_MEMBER(exedexes_videoram_w);
+ DECLARE_WRITE8_MEMBER(exedexes_colorram_w);
+ DECLARE_WRITE8_MEMBER(exedexes_c804_w);
+ DECLARE_WRITE8_MEMBER(exedexes_gfxctrl_w);
};
/*----------- defined in video/exedexes.c -----------*/
-extern WRITE8_HANDLER( exedexes_videoram_w );
-extern WRITE8_HANDLER( exedexes_colorram_w );
-extern WRITE8_HANDLER( exedexes_c804_w );
-extern WRITE8_HANDLER( exedexes_gfxctrl_w );
extern PALETTE_INIT( exedexes );
extern VIDEO_START( exedexes );
diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h
index 321a80dcb4d..279fdb2f4df 100644
--- a/src/mame/includes/exerion.h
+++ b/src/mame/includes/exerion.h
@@ -47,6 +47,9 @@ public:
/* devices */
device_t *m_maincpu;
DECLARE_READ8_MEMBER(exerion_protection_r);
+ DECLARE_WRITE8_MEMBER(exerion_videoreg_w);
+ DECLARE_WRITE8_MEMBER(exerion_video_latch_w);
+ DECLARE_READ8_MEMBER(exerion_video_timing_r);
};
@@ -57,6 +60,3 @@ PALETTE_INIT( exerion );
VIDEO_START( exerion );
SCREEN_UPDATE_IND16( exerion );
-WRITE8_HANDLER( exerion_videoreg_w );
-WRITE8_HANDLER( exerion_video_latch_w );
-READ8_HANDLER( exerion_video_timing_r );
diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h
index 989f208efec..0cca66ad70c 100644
--- a/src/mame/includes/exidy.h
+++ b/src/mame/includes/exidy.h
@@ -44,6 +44,7 @@ public:
bitmap_ind16 m_motion_object_2_vid;
bitmap_ind16 m_motion_object_2_clip;
DECLARE_WRITE8_MEMBER(fax_bank_select_w);
+ DECLARE_READ8_MEMBER(exidy_interrupt_r);
};
@@ -55,4 +56,3 @@ SCREEN_UPDATE_IND16( exidy );
INTERRUPT_GEN( exidy_vblank_interrupt );
-READ8_HANDLER( exidy_interrupt_r );
diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h
index 59b76eae8bb..e3f304481da 100644
--- a/src/mame/includes/exidy440.h
+++ b/src/mame/includes/exidy440.h
@@ -41,6 +41,15 @@ public:
DECLARE_READ8_MEMBER(claypign_protection_r);
DECLARE_READ8_MEMBER(topsecex_input_port_5_r);
DECLARE_WRITE8_MEMBER(topsecex_yscroll_w);
+ DECLARE_READ8_MEMBER(exidy440_videoram_r);
+ DECLARE_WRITE8_MEMBER(exidy440_videoram_w);
+ DECLARE_READ8_MEMBER(exidy440_paletteram_r);
+ DECLARE_WRITE8_MEMBER(exidy440_paletteram_w);
+ DECLARE_READ8_MEMBER(exidy440_horizontal_pos_r);
+ DECLARE_READ8_MEMBER(exidy440_vertical_pos_r);
+ DECLARE_WRITE8_MEMBER(exidy440_spriteram_w);
+ DECLARE_WRITE8_MEMBER(exidy440_control_w);
+ DECLARE_WRITE8_MEMBER(exidy440_interrupt_clear_w);
};
@@ -53,15 +62,6 @@ void exidy440_bank_select(running_machine &machine, UINT8 bank);
INTERRUPT_GEN( exidy440_vblank_interrupt );
-READ8_HANDLER( exidy440_videoram_r );
-WRITE8_HANDLER( exidy440_videoram_w );
-READ8_HANDLER( exidy440_paletteram_r );
-WRITE8_HANDLER( exidy440_paletteram_w );
-WRITE8_HANDLER( exidy440_spriteram_w );
-WRITE8_HANDLER( exidy440_control_w );
-READ8_HANDLER( exidy440_vertical_pos_r );
-READ8_HANDLER( exidy440_horizontal_pos_r );
-WRITE8_HANDLER( exidy440_interrupt_clear_w );
MACHINE_CONFIG_EXTERN( exidy440_video );
MACHINE_CONFIG_EXTERN( topsecex_video );
diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h
index 7ff803b620c..dfb00574424 100644
--- a/src/mame/includes/exprraid.h
+++ b/src/mame/includes/exprraid.h
@@ -32,17 +32,17 @@ public:
DECLARE_READ8_MEMBER(exprraid_protection_r);
DECLARE_WRITE8_MEMBER(sound_cpu_command_w);
DECLARE_READ8_MEMBER(vblank_r);
+ DECLARE_WRITE8_MEMBER(exprraid_videoram_w);
+ DECLARE_WRITE8_MEMBER(exprraid_colorram_w);
+ DECLARE_WRITE8_MEMBER(exprraid_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(exprraid_bgselect_w);
+ DECLARE_WRITE8_MEMBER(exprraid_scrollx_w);
+ DECLARE_WRITE8_MEMBER(exprraid_scrolly_w);
};
/*----------- defined in video/exprraid.c -----------*/
-extern WRITE8_HANDLER( exprraid_videoram_w );
-extern WRITE8_HANDLER( exprraid_colorram_w );
-extern WRITE8_HANDLER( exprraid_flipscreen_w );
-extern WRITE8_HANDLER( exprraid_bgselect_w );
-extern WRITE8_HANDLER( exprraid_scrollx_w );
-extern WRITE8_HANDLER( exprraid_scrolly_w );
extern VIDEO_START( exprraid );
extern SCREEN_UPDATE_IND16( exprraid );
diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h
index 642b6ff88d2..b6cb911bd7b 100644
--- a/src/mame/includes/exzisus.h
+++ b/src/mame/includes/exzisus.h
@@ -22,19 +22,19 @@ public:
DECLARE_WRITE8_MEMBER(exzisus_sharedram_ab_w);
DECLARE_WRITE8_MEMBER(exzisus_sharedram_ac_w);
DECLARE_WRITE8_MEMBER(exzisus_cpub_reset_w);
+ DECLARE_READ8_MEMBER(exzisus_videoram_0_r);
+ DECLARE_READ8_MEMBER(exzisus_videoram_1_r);
+ DECLARE_READ8_MEMBER(exzisus_objectram_0_r);
+ DECLARE_READ8_MEMBER(exzisus_objectram_1_r);
+ DECLARE_WRITE8_MEMBER(exzisus_videoram_0_w);
+ DECLARE_WRITE8_MEMBER(exzisus_videoram_1_w);
+ DECLARE_WRITE8_MEMBER(exzisus_objectram_0_w);
+ DECLARE_WRITE8_MEMBER(exzisus_objectram_1_w);
};
/*----------- defined in video/exzisus.c -----------*/
-READ8_HANDLER( exzisus_videoram_0_r );
-READ8_HANDLER( exzisus_videoram_1_r );
-READ8_HANDLER( exzisus_objectram_0_r );
-READ8_HANDLER( exzisus_objectram_1_r );
-WRITE8_HANDLER( exzisus_videoram_0_w );
-WRITE8_HANDLER( exzisus_videoram_1_w );
-WRITE8_HANDLER( exzisus_objectram_0_w );
-WRITE8_HANDLER( exzisus_objectram_1_w );
SCREEN_UPDATE_IND16( exzisus );
diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h
index 2dd1972370a..9422a69d32b 100644
--- a/src/mame/includes/f1gp.h
+++ b/src/mame/includes/f1gp.h
@@ -47,18 +47,18 @@ public:
DECLARE_READ16_MEMBER(command_pending_r);
DECLARE_WRITE8_MEMBER(pending_command_clear_w);
DECLARE_WRITE16_MEMBER(f1gpb_misc_w);
+ DECLARE_READ16_MEMBER(f1gp_zoomdata_r);
+ DECLARE_WRITE16_MEMBER(f1gp_zoomdata_w);
+ DECLARE_READ16_MEMBER(f1gp_rozvideoram_r);
+ DECLARE_WRITE16_MEMBER(f1gp_rozvideoram_w);
+ DECLARE_WRITE16_MEMBER(f1gp_fgvideoram_w);
+ DECLARE_WRITE16_MEMBER(f1gp_fgscroll_w);
+ DECLARE_WRITE16_MEMBER(f1gp_gfxctrl_w);
+ DECLARE_WRITE16_MEMBER(f1gp2_gfxctrl_w);
};
/*----------- defined in video/f1gp.c -----------*/
-READ16_HANDLER( f1gp_zoomdata_r );
-WRITE16_HANDLER( f1gp_zoomdata_w );
-READ16_HANDLER( f1gp_rozvideoram_r );
-WRITE16_HANDLER( f1gp_rozvideoram_w );
-WRITE16_HANDLER( f1gp_fgvideoram_w );
-WRITE16_HANDLER( f1gp_fgscroll_w );
-WRITE16_HANDLER( f1gp_gfxctrl_w );
-WRITE16_HANDLER( f1gp2_gfxctrl_w );
VIDEO_START( f1gp );
VIDEO_START( f1gpb );
diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h
index 3263fde172e..a8367889dda 100644
--- a/src/mame/includes/fastlane.h
+++ b/src/mame/includes/fastlane.h
@@ -32,6 +32,8 @@ public:
required_device<cpu_device> m_maincpu;
DECLARE_WRITE8_MEMBER(k007121_registers_w);
DECLARE_WRITE8_MEMBER(fastlane_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(fastlane_vram1_w);
+ DECLARE_WRITE8_MEMBER(fastlane_vram2_w);
};
@@ -39,8 +41,6 @@ public:
/*----------- defined in video/fastlane.c -----------*/
-WRITE8_HANDLER( fastlane_vram1_w );
-WRITE8_HANDLER( fastlane_vram2_w );
PALETTE_INIT( fastlane );
VIDEO_START( fastlane );
diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h
index b7934f7187e..7be2a17bcc6 100644
--- a/src/mame/includes/fcombat.h
+++ b/src/mame/includes/fcombat.h
@@ -58,6 +58,7 @@ public:
DECLARE_WRITE8_MEMBER(ed00_w);
DECLARE_READ8_MEMBER(e300_r);
DECLARE_WRITE8_MEMBER(ee00_w);
+ DECLARE_WRITE8_MEMBER(fcombat_videoreg_w);
};
@@ -68,4 +69,3 @@ PALETTE_INIT( fcombat );
VIDEO_START( fcombat );
SCREEN_UPDATE_IND16( fcombat );
-WRITE8_HANDLER( fcombat_videoreg_w );
diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h
index c63239f1054..171a2a42917 100644
--- a/src/mame/includes/fgoal.h
+++ b/src/mame/includes/fgoal.h
@@ -37,6 +37,9 @@ public:
DECLARE_READ8_MEMBER(fgoal_shifter_reverse_r);
DECLARE_WRITE8_MEMBER(fgoal_sound1_w);
DECLARE_WRITE8_MEMBER(fgoal_sound2_w);
+ DECLARE_WRITE8_MEMBER(fgoal_color_w);
+ DECLARE_WRITE8_MEMBER(fgoal_ypos_w);
+ DECLARE_WRITE8_MEMBER(fgoal_xpos_w);
};
@@ -45,7 +48,4 @@ public:
VIDEO_START( fgoal );
SCREEN_UPDATE_IND16( fgoal );
-WRITE8_HANDLER( fgoal_color_w );
-WRITE8_HANDLER( fgoal_xpos_w );
-WRITE8_HANDLER( fgoal_ypos_w );
diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h
index f6982f6e48c..d5888a1c610 100644
--- a/src/mame/includes/finalizr.h
+++ b/src/mame/includes/finalizr.h
@@ -40,12 +40,12 @@ public:
DECLARE_WRITE8_MEMBER(i8039_irqen_w);
DECLARE_READ8_MEMBER(i8039_T1_r);
DECLARE_WRITE8_MEMBER(i8039_T0_w);
+ DECLARE_WRITE8_MEMBER(finalizr_videoctrl_w);
};
/*----------- defined in video/finalizr.c -----------*/
-WRITE8_HANDLER( finalizr_videoctrl_w );
PALETTE_INIT( finalizr );
VIDEO_START( finalizr );
diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h
index a2b07b9bd96..23417f0d284 100644
--- a/src/mame/includes/firetrap.h
+++ b/src/mame/includes/firetrap.h
@@ -50,18 +50,18 @@ public:
DECLARE_WRITE8_MEMBER(firetrap_sound_bankselect_w);
DECLARE_WRITE8_MEMBER(firetrap_adpcm_data_w);
DECLARE_WRITE8_MEMBER(flip_screen_w);
+ DECLARE_WRITE8_MEMBER(firetrap_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(firetrap_bg1videoram_w);
+ DECLARE_WRITE8_MEMBER(firetrap_bg2videoram_w);
+ DECLARE_WRITE8_MEMBER(firetrap_bg1_scrollx_w);
+ DECLARE_WRITE8_MEMBER(firetrap_bg1_scrolly_w);
+ DECLARE_WRITE8_MEMBER(firetrap_bg2_scrollx_w);
+ DECLARE_WRITE8_MEMBER(firetrap_bg2_scrolly_w);
};
/*----------- defined in video/firetrap.c -----------*/
-WRITE8_HANDLER( firetrap_fgvideoram_w );
-WRITE8_HANDLER( firetrap_bg1videoram_w );
-WRITE8_HANDLER( firetrap_bg2videoram_w );
-WRITE8_HANDLER( firetrap_bg1_scrollx_w );
-WRITE8_HANDLER( firetrap_bg1_scrolly_w );
-WRITE8_HANDLER( firetrap_bg2_scrollx_w );
-WRITE8_HANDLER( firetrap_bg2_scrolly_w );
PALETTE_INIT( firetrap );
VIDEO_START( firetrap );
diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h
index 90e1b6ebf42..d841b556276 100644
--- a/src/mame/includes/fitfight.h
+++ b/src/mame/includes/fitfight.h
@@ -36,14 +36,14 @@ public:
DECLARE_WRITE8_MEMBER(snd_porta_w);
DECLARE_WRITE8_MEMBER(snd_portb_w);
DECLARE_WRITE8_MEMBER(snd_portc_w);
+ DECLARE_WRITE16_MEMBER(fof_bak_tileram_w);
+ DECLARE_WRITE16_MEMBER(fof_mid_tileram_w);
+ DECLARE_WRITE16_MEMBER(fof_txt_tileram_w);
};
/*----------- defined in video/fitfight.c -----------*/
-WRITE16_HANDLER( fof_bak_tileram_w );
-WRITE16_HANDLER( fof_mid_tileram_w );
-WRITE16_HANDLER( fof_txt_tileram_w );
VIDEO_START(fitfight);
SCREEN_UPDATE_IND16(fitfight);
diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h
index 9bd62578e87..ac9aadf7c3c 100644
--- a/src/mame/includes/flkatck.h
+++ b/src/mame/includes/flkatck.h
@@ -30,6 +30,8 @@ public:
DECLARE_WRITE8_MEMBER(flkatck_ls138_w);
DECLARE_READ8_MEMBER(multiply_r);
DECLARE_WRITE8_MEMBER(multiply_w);
+ DECLARE_WRITE8_MEMBER(flkatck_k007121_w);
+ DECLARE_WRITE8_MEMBER(flkatck_k007121_regs_w);
};
@@ -38,8 +40,6 @@ public:
/*----------- defined in video/flkatck.c -----------*/
-WRITE8_HANDLER( flkatck_k007121_w );
-WRITE8_HANDLER( flkatck_k007121_regs_w );
VIDEO_START( flkatck );
SCREEN_UPDATE_IND16( flkatck );
diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h
index 1b442d9a334..0b6448bad27 100644
--- a/src/mame/includes/flower.h
+++ b/src/mame/includes/flower.h
@@ -23,6 +23,10 @@ public:
DECLARE_WRITE8_MEMBER(flower_coin_counter_w);
DECLARE_WRITE8_MEMBER(flower_coin_lockout_w);
DECLARE_WRITE8_MEMBER(sound_command_w);
+ DECLARE_WRITE8_MEMBER(flower_textram_w);
+ DECLARE_WRITE8_MEMBER(flower_bg0ram_w);
+ DECLARE_WRITE8_MEMBER(flower_bg1ram_w);
+ DECLARE_WRITE8_MEMBER(flower_flipscreen_w);
};
@@ -36,10 +40,6 @@ DECLARE_LEGACY_SOUND_DEVICE(FLOWER, flower_sound);
/*----------- defined in video/flower.c -----------*/
-WRITE8_HANDLER( flower_textram_w );
-WRITE8_HANDLER( flower_bg0ram_w );
-WRITE8_HANDLER( flower_bg1ram_w );
-WRITE8_HANDLER( flower_flipscreen_w );
SCREEN_UPDATE_IND16( flower );
VIDEO_START( flower );
diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h
index 0b51760074a..eee181bfe0a 100644
--- a/src/mame/includes/flstory.h
+++ b/src/mame/includes/flstory.h
@@ -72,29 +72,36 @@ public:
DECLARE_WRITE8_MEMBER(nmi_enable_w);
DECLARE_READ8_MEMBER(rumba_mcu_r);
DECLARE_WRITE8_MEMBER(rumba_mcu_w);
+ DECLARE_READ8_MEMBER(flstory_68705_port_a_r);
+ DECLARE_WRITE8_MEMBER(flstory_68705_port_a_w);
+ DECLARE_WRITE8_MEMBER(flstory_68705_ddr_a_w);
+ DECLARE_READ8_MEMBER(flstory_68705_port_b_r);
+ DECLARE_WRITE8_MEMBER(flstory_68705_port_b_w);
+ DECLARE_WRITE8_MEMBER(flstory_68705_ddr_b_w);
+ DECLARE_READ8_MEMBER(flstory_68705_port_c_r);
+ DECLARE_WRITE8_MEMBER(flstory_68705_port_c_w);
+ DECLARE_WRITE8_MEMBER(flstory_68705_ddr_c_w);
+ DECLARE_WRITE8_MEMBER(flstory_mcu_w);
+ DECLARE_READ8_MEMBER(flstory_mcu_r);
+ DECLARE_READ8_MEMBER(flstory_mcu_status_r);
+ DECLARE_WRITE8_MEMBER(onna34ro_mcu_w);
+ DECLARE_READ8_MEMBER(onna34ro_mcu_r);
+ DECLARE_READ8_MEMBER(onna34ro_mcu_status_r);
+ DECLARE_WRITE8_MEMBER(victnine_mcu_w);
+ DECLARE_READ8_MEMBER(victnine_mcu_r);
+ DECLARE_READ8_MEMBER(victnine_mcu_status_r);
+ DECLARE_WRITE8_MEMBER(flstory_videoram_w);
+ DECLARE_WRITE8_MEMBER(flstory_palette_w);
+ DECLARE_READ8_MEMBER(flstory_palette_r);
+ DECLARE_WRITE8_MEMBER(flstory_gfxctrl_w);
+ DECLARE_READ8_MEMBER(victnine_gfxctrl_r);
+ DECLARE_WRITE8_MEMBER(victnine_gfxctrl_w);
+ DECLARE_WRITE8_MEMBER(flstory_scrlram_w);
};
/*----------- defined in machine/flstory.c -----------*/
-READ8_HANDLER( flstory_68705_port_a_r );
-WRITE8_HANDLER( flstory_68705_port_a_w );
-READ8_HANDLER( flstory_68705_port_b_r );
-WRITE8_HANDLER( flstory_68705_port_b_w );
-READ8_HANDLER( flstory_68705_port_c_r );
-WRITE8_HANDLER( flstory_68705_port_c_w );
-WRITE8_HANDLER( flstory_68705_ddr_a_w );
-WRITE8_HANDLER( flstory_68705_ddr_b_w );
-WRITE8_HANDLER( flstory_68705_ddr_c_w );
-WRITE8_HANDLER( flstory_mcu_w );
-READ8_HANDLER( flstory_mcu_r );
-READ8_HANDLER( flstory_mcu_status_r );
-WRITE8_HANDLER( onna34ro_mcu_w );
-READ8_HANDLER( onna34ro_mcu_r );
-READ8_HANDLER( onna34ro_mcu_status_r );
-WRITE8_HANDLER( victnine_mcu_w );
-READ8_HANDLER( victnine_mcu_r );
-READ8_HANDLER( victnine_mcu_status_r );
/*----------- defined in video/flstory.c -----------*/
@@ -106,10 +113,3 @@ SCREEN_UPDATE_IND16( victnine );
VIDEO_START( rumba );
SCREEN_UPDATE_IND16( rumba );
-WRITE8_HANDLER( flstory_videoram_w );
-READ8_HANDLER( flstory_palette_r );
-WRITE8_HANDLER( flstory_palette_w );
-WRITE8_HANDLER( flstory_gfxctrl_w );
-WRITE8_HANDLER( flstory_scrlram_w );
-READ8_HANDLER( victnine_gfxctrl_r );
-WRITE8_HANDLER( victnine_gfxctrl_w );
diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h
index 6161692788e..bf741bd4660 100644
--- a/src/mame/includes/freekick.h
+++ b/src/mame/includes/freekick.h
@@ -33,6 +33,7 @@ public:
DECLARE_READ8_MEMBER(oigas_2_r);
DECLARE_READ8_MEMBER(freekick_ff_r);
DECLARE_WRITE8_MEMBER(freekick_ff_w);
+ DECLARE_WRITE8_MEMBER(freek_videoram_w);
};
@@ -42,4 +43,3 @@ VIDEO_START(freekick);
SCREEN_UPDATE_IND16(gigas);
SCREEN_UPDATE_IND16(pbillrd);
SCREEN_UPDATE_IND16(freekick);
-WRITE8_HANDLER( freek_videoram_w );
diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h
index 8477a16ff17..fd86e9ebd6b 100644
--- a/src/mame/includes/fromanc2.h
+++ b/src/mame/includes/fromanc2.h
@@ -45,6 +45,39 @@ public:
DECLARE_WRITE8_MEMBER(fromanc2_subcpu_nmi_clr);
DECLARE_READ8_MEMBER(fromanc2_sndcpu_nmi_clr);
DECLARE_WRITE8_MEMBER(fromanc2_subcpu_rombank_w);
+ DECLARE_READ16_MEMBER(fromanc2_paletteram_0_r);
+ DECLARE_READ16_MEMBER(fromanc2_paletteram_1_r);
+ DECLARE_WRITE16_MEMBER(fromanc2_paletteram_0_w);
+ DECLARE_WRITE16_MEMBER(fromanc2_paletteram_1_w);
+ DECLARE_READ16_MEMBER(fromancr_paletteram_0_r);
+ DECLARE_READ16_MEMBER(fromancr_paletteram_1_r);
+ DECLARE_WRITE16_MEMBER(fromancr_paletteram_0_w);
+ DECLARE_WRITE16_MEMBER(fromancr_paletteram_1_w);
+ DECLARE_READ16_MEMBER(fromanc4_paletteram_0_r);
+ DECLARE_READ16_MEMBER(fromanc4_paletteram_1_r);
+ DECLARE_WRITE16_MEMBER(fromanc4_paletteram_0_w);
+ DECLARE_WRITE16_MEMBER(fromanc4_paletteram_1_w);
+ DECLARE_WRITE16_MEMBER(fromanc2_videoram_0_w);
+ DECLARE_WRITE16_MEMBER(fromanc2_videoram_1_w);
+ DECLARE_WRITE16_MEMBER(fromanc2_videoram_2_w);
+ DECLARE_WRITE16_MEMBER(fromanc2_videoram_3_w);
+ DECLARE_WRITE16_MEMBER(fromanc2_gfxreg_0_w);
+ DECLARE_WRITE16_MEMBER(fromanc2_gfxreg_1_w);
+ DECLARE_WRITE16_MEMBER(fromanc2_gfxreg_2_w);
+ DECLARE_WRITE16_MEMBER(fromanc2_gfxreg_3_w);
+ DECLARE_WRITE16_MEMBER(fromanc2_gfxbank_0_w);
+ DECLARE_WRITE16_MEMBER(fromanc2_gfxbank_1_w);
+ DECLARE_WRITE16_MEMBER(fromancr_videoram_0_w);
+ DECLARE_WRITE16_MEMBER(fromancr_videoram_1_w);
+ DECLARE_WRITE16_MEMBER(fromancr_videoram_2_w);
+ DECLARE_WRITE16_MEMBER(fromancr_gfxreg_0_w);
+ DECLARE_WRITE16_MEMBER(fromancr_gfxreg_1_w);
+ DECLARE_WRITE16_MEMBER(fromanc4_videoram_0_w);
+ DECLARE_WRITE16_MEMBER(fromanc4_videoram_1_w);
+ DECLARE_WRITE16_MEMBER(fromanc4_videoram_2_w);
+ DECLARE_WRITE16_MEMBER(fromanc4_gfxreg_0_w);
+ DECLARE_WRITE16_MEMBER(fromanc4_gfxreg_1_w);
+ DECLARE_WRITE16_MEMBER(fromanc4_gfxreg_2_w);
};
@@ -58,37 +91,4 @@ VIDEO_START( fromanc2 );
VIDEO_START( fromancr );
VIDEO_START( fromanc4 );
-READ16_HANDLER( fromanc2_paletteram_0_r );
-READ16_HANDLER( fromanc2_paletteram_1_r );
-WRITE16_HANDLER( fromanc2_paletteram_0_w );
-WRITE16_HANDLER( fromanc2_paletteram_1_w );
-READ16_HANDLER( fromancr_paletteram_0_r );
-READ16_HANDLER( fromancr_paletteram_1_r );
-WRITE16_HANDLER( fromancr_paletteram_0_w );
-WRITE16_HANDLER( fromancr_paletteram_1_w );
-READ16_HANDLER( fromanc4_paletteram_0_r );
-READ16_HANDLER( fromanc4_paletteram_1_r );
-WRITE16_HANDLER( fromanc4_paletteram_0_w );
-WRITE16_HANDLER( fromanc4_paletteram_1_w );
-WRITE16_HANDLER( fromanc2_videoram_0_w );
-WRITE16_HANDLER( fromanc2_videoram_1_w );
-WRITE16_HANDLER( fromanc2_videoram_2_w );
-WRITE16_HANDLER( fromanc2_videoram_3_w );
-WRITE16_HANDLER( fromancr_videoram_0_w );
-WRITE16_HANDLER( fromancr_videoram_1_w );
-WRITE16_HANDLER( fromancr_videoram_2_w );
-WRITE16_HANDLER( fromanc4_videoram_0_w );
-WRITE16_HANDLER( fromanc4_videoram_1_w );
-WRITE16_HANDLER( fromanc4_videoram_2_w );
-WRITE16_HANDLER( fromanc2_gfxreg_0_w );
-WRITE16_HANDLER( fromanc2_gfxreg_1_w );
-WRITE16_HANDLER( fromanc2_gfxreg_2_w );
-WRITE16_HANDLER( fromanc2_gfxreg_3_w );
-WRITE16_HANDLER( fromancr_gfxreg_0_w );
-WRITE16_HANDLER( fromancr_gfxreg_1_w );
-WRITE16_HANDLER( fromanc2_gfxbank_0_w );
-WRITE16_HANDLER( fromanc2_gfxbank_1_w );
void fromancr_gfxbank_w(running_machine &machine, int data);
-WRITE16_HANDLER( fromanc4_gfxreg_0_w );
-WRITE16_HANDLER( fromanc4_gfxreg_1_w );
-WRITE16_HANDLER( fromanc4_gfxreg_2_w );
diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h
index 2eae78bdf95..077d7da7814 100644
--- a/src/mame/includes/fromance.h
+++ b/src/mame/includes/fromance.h
@@ -61,6 +61,14 @@ public:
DECLARE_WRITE8_MEMBER(fromance_portselect_w);
DECLARE_READ8_MEMBER(fromance_keymatrix_r);
DECLARE_WRITE8_MEMBER(fromance_coinctr_w);
+ DECLARE_WRITE8_MEMBER(fromance_gfxreg_w);
+ DECLARE_READ8_MEMBER(fromance_paletteram_r);
+ DECLARE_WRITE8_MEMBER(fromance_paletteram_w);
+ DECLARE_READ8_MEMBER(fromance_videoram_r);
+ DECLARE_WRITE8_MEMBER(fromance_videoram_w);
+ DECLARE_WRITE8_MEMBER(fromance_scroll_w);
+ DECLARE_WRITE8_MEMBER(fromance_crtc_data_w);
+ DECLARE_WRITE8_MEMBER(fromance_crtc_register_w);
};
@@ -73,15 +81,7 @@ VIDEO_START( hatris );
SCREEN_UPDATE_IND16( fromance );
SCREEN_UPDATE_IND16( pipedrm );
-WRITE8_HANDLER( fromance_crtc_data_w );
-WRITE8_HANDLER( fromance_crtc_register_w );
-WRITE8_HANDLER( fromance_gfxreg_w );
-WRITE8_HANDLER( fromance_scroll_w );
-READ8_HANDLER( fromance_paletteram_r );
-WRITE8_HANDLER( fromance_paletteram_w );
-READ8_HANDLER( fromance_videoram_r );
-WRITE8_HANDLER( fromance_videoram_w );
diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h
index 26db086709e..a137a2e75b7 100644
--- a/src/mame/includes/funkybee.h
+++ b/src/mame/includes/funkybee.h
@@ -15,16 +15,16 @@ public:
int m_gfx_bank;
DECLARE_READ8_MEMBER(funkybee_input_port_0_r);
DECLARE_WRITE8_MEMBER(funkybee_coin_counter_w);
+ DECLARE_WRITE8_MEMBER(funkybee_videoram_w);
+ DECLARE_WRITE8_MEMBER(funkybee_colorram_w);
+ DECLARE_WRITE8_MEMBER(funkybee_gfx_bank_w);
+ DECLARE_WRITE8_MEMBER(funkybee_scroll_w);
+ DECLARE_WRITE8_MEMBER(funkybee_flipscreen_w);
};
/*----------- defined in video/funkybee.c -----------*/
-WRITE8_HANDLER( funkybee_videoram_w );
-WRITE8_HANDLER( funkybee_colorram_w );
-WRITE8_HANDLER( funkybee_gfx_bank_w );
-WRITE8_HANDLER( funkybee_scroll_w );
-WRITE8_HANDLER( funkybee_flipscreen_w );
PALETTE_INIT( funkybee );
VIDEO_START( funkybee );
diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h
index 8451372433d..ec50024c937 100644
--- a/src/mame/includes/funworld.h
+++ b/src/mame/includes/funworld.h
@@ -9,13 +9,13 @@ public:
tilemap_t *m_bg_tilemap;
DECLARE_READ8_MEMBER(questions_r);
DECLARE_WRITE8_MEMBER(question_bank_w);
+ DECLARE_WRITE8_MEMBER(funworld_videoram_w);
+ DECLARE_WRITE8_MEMBER(funworld_colorram_w);
};
/*----------- defined in video/funworld.c -----------*/
-WRITE8_HANDLER( funworld_videoram_w );
-WRITE8_HANDLER( funworld_colorram_w );
PALETTE_INIT( funworld );
VIDEO_START( funworld );
VIDEO_START( magicrd2 );
diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h
index 5d26c7fef70..8b6f786f34a 100644
--- a/src/mame/includes/funybubl.h
+++ b/src/mame/includes/funybubl.h
@@ -17,13 +17,13 @@ public:
DECLARE_WRITE8_MEMBER(funybubl_vidram_bank_w);
DECLARE_WRITE8_MEMBER(funybubl_cpurombank_w);
DECLARE_WRITE8_MEMBER(funybubl_soundcommand_w);
+ DECLARE_WRITE8_MEMBER(funybubl_paldatawrite);
};
/*----------- defined in video/funybubl.c -----------*/
-WRITE8_HANDLER ( funybubl_paldatawrite );
VIDEO_START(funybubl);
SCREEN_UPDATE_IND16(funybubl);
diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h
index 0cb47493e89..43291a117d7 100644
--- a/src/mame/includes/fuukifg2.h
+++ b/src/mame/includes/fuukifg2.h
@@ -27,15 +27,15 @@ public:
DECLARE_WRITE16_MEMBER(fuuki16_vregs_w);
DECLARE_WRITE16_MEMBER(fuuki16_sound_command_w);
DECLARE_WRITE8_MEMBER(fuuki16_sound_rombank_w);
+ DECLARE_WRITE16_MEMBER(fuuki16_vram_0_w);
+ DECLARE_WRITE16_MEMBER(fuuki16_vram_1_w);
+ DECLARE_WRITE16_MEMBER(fuuki16_vram_2_w);
+ DECLARE_WRITE16_MEMBER(fuuki16_vram_3_w);
};
/*----------- defined in video/fuukifg2.c -----------*/
-WRITE16_HANDLER( fuuki16_vram_0_w );
-WRITE16_HANDLER( fuuki16_vram_1_w );
-WRITE16_HANDLER( fuuki16_vram_2_w );
-WRITE16_HANDLER( fuuki16_vram_3_w );
VIDEO_START( fuuki16 );
SCREEN_UPDATE_IND16( fuuki16 );
diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h
index 710f5dcbd62..5c58b631f0c 100644
--- a/src/mame/includes/fuukifg3.h
+++ b/src/mame/includes/fuukifg3.h
@@ -45,15 +45,15 @@ public:
DECLARE_READ8_MEMBER(snd_z80_r);
DECLARE_WRITE8_MEMBER(snd_z80_w);
DECLARE_WRITE8_MEMBER(snd_ymf278b_w);
+ DECLARE_WRITE32_MEMBER(fuuki32_vram_0_w);
+ DECLARE_WRITE32_MEMBER(fuuki32_vram_1_w);
+ DECLARE_WRITE32_MEMBER(fuuki32_vram_2_w);
+ DECLARE_WRITE32_MEMBER(fuuki32_vram_3_w);
};
/*----------- defined in video/fuuki32.c -----------*/
-WRITE32_HANDLER( fuuki32_vram_0_w );
-WRITE32_HANDLER( fuuki32_vram_1_w );
-WRITE32_HANDLER( fuuki32_vram_2_w );
-WRITE32_HANDLER( fuuki32_vram_3_w );
VIDEO_START( fuuki32 );
SCREEN_UPDATE_IND16( fuuki32 );
diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h
index 1f451f5ed35..eb0f6c5e1c9 100644
--- a/src/mame/includes/gaelco.h
+++ b/src/mame/includes/gaelco.h
@@ -29,13 +29,13 @@ public:
DECLARE_WRITE16_MEMBER(gaelco_encrypted_w);
DECLARE_WRITE16_MEMBER(thoop_vram_encrypted_w);
DECLARE_WRITE16_MEMBER(thoop_encrypted_w);
+ DECLARE_WRITE16_MEMBER(gaelco_vram_w);
};
/*----------- defined in video/gaelco.c -----------*/
-WRITE16_HANDLER( gaelco_vram_w );
VIDEO_START( bigkarnk );
VIDEO_START( maniacsq );
diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h
index 18a8574906d..c89e081cc7e 100644
--- a/src/mame/includes/gaelco2.h
+++ b/src/mame/includes/gaelco2.h
@@ -25,6 +25,17 @@ public:
DECLARE_READ16_MEMBER(p2_gun_x);
DECLARE_READ16_MEMBER(p2_gun_y);
DECLARE_READ16_MEMBER(dallas_kludge_r);
+ DECLARE_WRITE16_MEMBER(gaelco2_coin_w);
+ DECLARE_WRITE16_MEMBER(gaelco2_coin2_w);
+ DECLARE_WRITE16_MEMBER(wrally2_coin_w);
+ DECLARE_WRITE16_MEMBER(touchgo_coin_w);
+ DECLARE_WRITE16_MEMBER(bang_clr_gun_int_w);
+ DECLARE_WRITE16_MEMBER(wrally2_adc_clk);
+ DECLARE_WRITE16_MEMBER(wrally2_adc_cs);
+ DECLARE_READ16_MEMBER(snowboar_protection_r);
+ DECLARE_WRITE16_MEMBER(snowboar_protection_w);
+ DECLARE_WRITE16_MEMBER(gaelco2_vram_w);
+ DECLARE_WRITE16_MEMBER(gaelco2_palette_w);
};
@@ -34,25 +45,14 @@ DRIVER_INIT( alighunt );
DRIVER_INIT( touchgo );
DRIVER_INIT( snowboar );
DRIVER_INIT( bang );
-WRITE16_HANDLER( gaelco2_coin_w );
-WRITE16_HANDLER( gaelco2_coin2_w );
-WRITE16_HANDLER( wrally2_coin_w );
-WRITE16_HANDLER( touchgo_coin_w );
-WRITE16_HANDLER( bang_clr_gun_int_w );
TIMER_DEVICE_CALLBACK( bang_irq );
CUSTOM_INPUT( wrally2_analog_bit_r );
-WRITE16_HANDLER( wrally2_adc_clk );
-WRITE16_HANDLER( wrally2_adc_cs );
WRITE16_DEVICE_HANDLER( gaelco2_eeprom_cs_w );
WRITE16_DEVICE_HANDLER( gaelco2_eeprom_sk_w );
WRITE16_DEVICE_HANDLER( gaelco2_eeprom_data_w );
-READ16_HANDLER( snowboar_protection_r );
-WRITE16_HANDLER( snowboar_protection_w );
/*----------- defined in video/gaelco2.c -----------*/
-WRITE16_HANDLER( gaelco2_vram_w );
-WRITE16_HANDLER( gaelco2_palette_w );
SCREEN_UPDATE_IND16( gaelco2 );
VIDEO_START( gaelco2 );
SCREEN_UPDATE_IND16( gaelco2_left );
diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h
index d0e6fd44307..37718ca2919 100644
--- a/src/mame/includes/gaelco3d.h
+++ b/src/mame/includes/gaelco3d.h
@@ -94,16 +94,16 @@ public:
DECLARE_WRITE32_MEMBER(radikalb_lamp_w);
DECLARE_WRITE32_MEMBER(unknown_137_w);
DECLARE_WRITE32_MEMBER(unknown_13a_w);
+ DECLARE_WRITE32_MEMBER(gaelco3d_render_w);
+ DECLARE_WRITE16_MEMBER(gaelco3d_paletteram_w);
+ DECLARE_WRITE32_MEMBER(gaelco3d_paletteram_020_w);
};
/*----------- defined in video/gaelco3d.c -----------*/
void gaelco3d_render(screen_device &screen);
-WRITE32_HANDLER( gaelco3d_render_w );
-WRITE16_HANDLER( gaelco3d_paletteram_w );
-WRITE32_HANDLER( gaelco3d_paletteram_020_w );
VIDEO_START( gaelco3d );
SCREEN_UPDATE_IND16( gaelco3d );
diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h
index 6659fca35b0..684b083a44e 100644
--- a/src/mame/includes/gaiden.h
+++ b/src/mame/includes/gaiden.h
@@ -49,6 +49,22 @@ public:
DECLARE_READ16_MEMBER(wildfang_protection_r);
DECLARE_WRITE16_MEMBER(raiga_protection_w);
DECLARE_READ16_MEMBER(raiga_protection_r);
+ DECLARE_WRITE16_MEMBER(gaiden_flip_w);
+ DECLARE_WRITE16_MEMBER(gaiden_txscrollx_w);
+ DECLARE_WRITE16_MEMBER(gaiden_txscrolly_w);
+ DECLARE_WRITE16_MEMBER(gaiden_fgscrollx_w);
+ DECLARE_WRITE16_MEMBER(gaiden_fgscrolly_w);
+ DECLARE_WRITE16_MEMBER(gaiden_bgscrollx_w);
+ DECLARE_WRITE16_MEMBER(gaiden_bgscrolly_w);
+ DECLARE_WRITE16_MEMBER(gaiden_txoffsety_w);
+ DECLARE_WRITE16_MEMBER(gaiden_fgoffsety_w);
+ DECLARE_WRITE16_MEMBER(gaiden_bgoffsety_w);
+ DECLARE_WRITE16_MEMBER(gaiden_sproffsety_w);
+ DECLARE_WRITE16_MEMBER(gaiden_videoram3_w);
+ DECLARE_READ16_MEMBER(gaiden_videoram3_r);
+ DECLARE_WRITE16_MEMBER(gaiden_videoram2_w);
+ DECLARE_READ16_MEMBER(gaiden_videoram2_r);
+ DECLARE_WRITE16_MEMBER(gaiden_videoram_w);
};
@@ -63,20 +79,4 @@ SCREEN_UPDATE_RGB32( gaiden );
SCREEN_UPDATE_RGB32( raiga );
SCREEN_UPDATE_IND16( drgnbowl );
-WRITE16_HANDLER( gaiden_videoram_w );
-WRITE16_HANDLER( gaiden_videoram2_w );
-READ16_HANDLER( gaiden_videoram2_r );
-WRITE16_HANDLER( gaiden_videoram3_w );
-READ16_HANDLER( gaiden_videoram3_r );
-WRITE16_HANDLER( gaiden_flip_w );
-WRITE16_HANDLER( gaiden_txscrollx_w );
-WRITE16_HANDLER( gaiden_txscrolly_w );
-WRITE16_HANDLER( gaiden_fgscrollx_w );
-WRITE16_HANDLER( gaiden_fgscrolly_w );
-WRITE16_HANDLER( gaiden_bgscrollx_w );
-WRITE16_HANDLER( gaiden_bgscrolly_w );
-WRITE16_HANDLER( gaiden_txoffsety_w );
-WRITE16_HANDLER( gaiden_fgoffsety_w );
-WRITE16_HANDLER( gaiden_bgoffsety_w );
-WRITE16_HANDLER( gaiden_sproffsety_w );
diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h
index 5e9b61a90e8..5679c4f5c73 100644
--- a/src/mame/includes/galaga.h
+++ b/src/mame/includes/galaga.h
@@ -35,6 +35,8 @@ public:
DECLARE_READ8_MEMBER(bosco_dsw_r);
DECLARE_WRITE8_MEMBER(galaga_flip_screen_w);
DECLARE_WRITE8_MEMBER(bosco_latch_w);
+ DECLARE_WRITE8_MEMBER(galaga_videoram_w);
+ DECLARE_WRITE8_MEMBER(gatsbee_bank_w);
};
class xevious_state : public galaga_state
@@ -121,8 +123,6 @@ struct star
extern const struct star star_seed_tab[];
PALETTE_INIT( galaga );
-WRITE8_HANDLER( galaga_videoram_w );
-WRITE8_HANDLER( gatsbee_bank_w );
VIDEO_START( galaga );
SCREEN_UPDATE_IND16( galaga );
SCREEN_VBLANK( galaga ); /* update starfield */
diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h
index f9e79e977e6..80e215294b7 100644
--- a/src/mame/includes/galaxian.h
+++ b/src/mame/includes/galaxian.h
@@ -79,6 +79,17 @@ public:
rgb_t m_bullet_color[8];
UINT8 m_gfxbank[5];
required_shared_ptr<UINT8> m_spriteram;
+ DECLARE_WRITE8_MEMBER(galaxian_videoram_w);
+ DECLARE_WRITE8_MEMBER(galaxian_objram_w);
+ DECLARE_WRITE8_MEMBER(galaxian_flip_screen_x_w);
+ DECLARE_WRITE8_MEMBER(galaxian_flip_screen_y_w);
+ DECLARE_WRITE8_MEMBER(galaxian_flip_screen_xy_w);
+ DECLARE_WRITE8_MEMBER(galaxian_stars_enable_w);
+ DECLARE_WRITE8_MEMBER(scramble_background_enable_w);
+ DECLARE_WRITE8_MEMBER(scramble_background_red_w);
+ DECLARE_WRITE8_MEMBER(scramble_background_green_w);
+ DECLARE_WRITE8_MEMBER(scramble_background_blue_w);
+ DECLARE_WRITE8_MEMBER(galaxian_gfxbank_w);
};
@@ -90,20 +101,9 @@ PALETTE_INIT( moonwar );
VIDEO_START( galaxian );
SCREEN_UPDATE_RGB32( galaxian );
-WRITE8_HANDLER( galaxian_videoram_w );
-WRITE8_HANDLER( galaxian_objram_w );
-WRITE8_HANDLER( galaxian_flip_screen_x_w );
-WRITE8_HANDLER( galaxian_flip_screen_y_w );
-WRITE8_HANDLER( galaxian_flip_screen_xy_w );
-WRITE8_HANDLER( galaxian_stars_enable_w );
-WRITE8_HANDLER( scramble_background_enable_w );
-WRITE8_HANDLER( scramble_background_red_w );
-WRITE8_HANDLER( scramble_background_green_w );
-WRITE8_HANDLER( scramble_background_blue_w );
-WRITE8_HANDLER( galaxian_gfxbank_w );
TIMER_DEVICE_CALLBACK( galaxian_stars_blink_timer );
diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h
index f07133244c7..2cab16a3d52 100644
--- a/src/mame/includes/galaxold.h
+++ b/src/mame/includes/galaxold.h
@@ -88,6 +88,41 @@ public:
DECLARE_READ8_MEMBER(scramb2_port2_r);
DECLARE_WRITE8_MEMBER(harem_nmi_mask_w);
DECLARE_READ8_MEMBER(hexpoola_data_port_r);
+ DECLARE_WRITE8_MEMBER(galaxold_nmi_enable_w);
+ DECLARE_WRITE8_MEMBER(galaxold_coin_lockout_w);
+ DECLARE_WRITE8_MEMBER(galaxold_coin_counter_w);
+ DECLARE_WRITE8_MEMBER(galaxold_coin_counter_1_w);
+ DECLARE_WRITE8_MEMBER(galaxold_coin_counter_2_w);
+ DECLARE_WRITE8_MEMBER(galaxold_leds_w);
+ DECLARE_WRITE8_MEMBER(zigzag_sillyprotection_w);
+ DECLARE_READ8_MEMBER(scramblb_protection_1_r);
+ DECLARE_READ8_MEMBER(scramblb_protection_2_r);
+ DECLARE_WRITE8_MEMBER(_4in1_bank_w);
+ DECLARE_READ8_MEMBER(checkmaj_protection_r);
+ DECLARE_READ8_MEMBER(dingo_3000_r);
+ DECLARE_READ8_MEMBER(dingo_3035_r);
+ DECLARE_READ8_MEMBER(dingoe_3001_r);
+ DECLARE_WRITE8_MEMBER(racknrol_tiles_bank_w);
+ DECLARE_WRITE8_MEMBER(galaxold_videoram_w);
+ DECLARE_READ8_MEMBER(galaxold_videoram_r);
+ DECLARE_WRITE8_MEMBER(galaxold_attributesram_w);
+ DECLARE_WRITE8_MEMBER(galaxold_flip_screen_x_w);
+ DECLARE_WRITE8_MEMBER(galaxold_flip_screen_y_w);
+ DECLARE_WRITE8_MEMBER(gteikob2_flip_screen_x_w);
+ DECLARE_WRITE8_MEMBER(gteikob2_flip_screen_y_w);
+ DECLARE_WRITE8_MEMBER(hotshock_flip_screen_w);
+ DECLARE_WRITE8_MEMBER(scrambold_background_enable_w);
+ DECLARE_WRITE8_MEMBER(scrambold_background_red_w);
+ DECLARE_WRITE8_MEMBER(scrambold_background_green_w);
+ DECLARE_WRITE8_MEMBER(scrambold_background_blue_w);
+ DECLARE_WRITE8_MEMBER(galaxold_stars_enable_w);
+ DECLARE_WRITE8_MEMBER(darkplnt_bullet_color_w);
+ DECLARE_WRITE8_MEMBER(galaxold_gfxbank_w);
+ DECLARE_WRITE8_MEMBER(rockclim_videoram_w);
+ DECLARE_WRITE8_MEMBER(rockclim_scroll_w);
+ DECLARE_READ8_MEMBER(rockclim_videoram_r);
+ DECLARE_WRITE8_MEMBER(dambustr_bg_split_line_w);
+ DECLARE_WRITE8_MEMBER(dambustr_bg_color_w);
};
@@ -106,25 +141,9 @@ PALETTE_INIT( turtles );
VIDEO_START( dambustr );
-WRITE8_HANDLER( galaxold_videoram_w );
-READ8_HANDLER( galaxold_videoram_r );
-WRITE8_HANDLER( rockclim_videoram_w );
-WRITE8_HANDLER( rockclim_scroll_w );
-READ8_HANDLER( rockclim_videoram_r );
-WRITE8_HANDLER( dambustr_bg_split_line_w );
-WRITE8_HANDLER( dambustr_bg_color_w );
-WRITE8_HANDLER( galaxold_attributesram_w );
-WRITE8_HANDLER( galaxold_stars_enable_w );
-WRITE8_HANDLER( scrambold_background_enable_w );
-WRITE8_HANDLER( scrambold_background_red_w );
-WRITE8_HANDLER( scrambold_background_green_w );
-WRITE8_HANDLER( scrambold_background_blue_w );
-WRITE8_HANDLER( hotshock_flip_screen_w );
-WRITE8_HANDLER( darkplnt_bullet_color_w );
-WRITE8_HANDLER( racknrol_tiles_bank_w );
VIDEO_START( galaxold_plain );
VIDEO_START( galaxold );
@@ -153,9 +172,6 @@ void galaxold_draw_stars(running_machine &machine, bitmap_ind16 &bitmap, const r
SCREEN_UPDATE_IND16( galaxold );
SCREEN_UPDATE_IND16( dambustr );
-WRITE8_HANDLER( galaxold_gfxbank_w );
-WRITE8_HANDLER( galaxold_flip_screen_x_w );
-WRITE8_HANDLER( galaxold_flip_screen_y_w );
/*----------- defined in machine/galaxold.c -----------*/
@@ -168,23 +184,14 @@ WRITE_LINE_DEVICE_HANDLER( galaxold_7474_9m_1_callback );
DRIVER_INIT( 4in1 );
DRIVER_INIT( ladybugg );
-WRITE8_HANDLER( galaxold_nmi_enable_w );
MACHINE_RESET( galaxold );
MACHINE_RESET( devilfsg );
MACHINE_RESET( hunchbkg );
-WRITE8_HANDLER( galaxold_coin_lockout_w );
-WRITE8_HANDLER( galaxold_coin_counter_w );
#define galaxold_coin_counter_0_w galaxold_coin_counter_w
-WRITE8_HANDLER( galaxold_coin_counter_1_w );
-WRITE8_HANDLER( galaxold_coin_counter_2_w );
-WRITE8_HANDLER( galaxold_leds_w );
-READ8_HANDLER( scramblb_protection_1_r );
-READ8_HANDLER( scramblb_protection_2_r );
-WRITE8_HANDLER( _4in1_bank_w );
CUSTOM_INPUT( _4in1_fake_port_r );
INTERRUPT_GEN( hunchbks_vh_interrupt );
diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h
index 3a3342a42ed..7aff1704272 100644
--- a/src/mame/includes/galivan.h
+++ b/src/mame/includes/galivan.h
@@ -39,19 +39,19 @@ public:
DECLARE_WRITE8_MEMBER(youmab_81_w);
DECLARE_WRITE8_MEMBER(youmab_84_w);
DECLARE_WRITE8_MEMBER(youmab_86_w);
+ DECLARE_WRITE8_MEMBER(galivan_videoram_w);
+ DECLARE_WRITE8_MEMBER(galivan_gfxbank_w);
+ DECLARE_WRITE8_MEMBER(ninjemak_gfxbank_w);
+ DECLARE_WRITE8_MEMBER(galivan_scrollx_w);
+ DECLARE_WRITE8_MEMBER(galivan_scrolly_w);
};
/*----------- defined in video/galivan.c -----------*/
-WRITE8_HANDLER( galivan_scrollx_w );
-WRITE8_HANDLER( galivan_scrolly_w );
-WRITE8_HANDLER( galivan_videoram_w );
-WRITE8_HANDLER( galivan_gfxbank_w );
WRITE8_HANDLER( ninjemak_scrollx_w );
WRITE8_HANDLER( ninjemak_scrolly_w );
-WRITE8_HANDLER( ninjemak_gfxbank_w );
PALETTE_INIT( galivan );
diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h
index 0f6b859b6fe..b1f52042c49 100644
--- a/src/mame/includes/gaplus.h
+++ b/src/mame/includes/gaplus.h
@@ -29,20 +29,20 @@ public:
DECLARE_WRITE8_MEMBER(gaplus_irq_3_ctrl_w);
DECLARE_WRITE8_MEMBER(gaplus_sreset_w);
DECLARE_WRITE8_MEMBER(gaplus_freset_w);
+ DECLARE_WRITE8_MEMBER(gaplus_customio_3_w);
+ DECLARE_READ8_MEMBER(gaplus_customio_3_r);
+ DECLARE_READ8_MEMBER(gaplus_videoram_r);
+ DECLARE_WRITE8_MEMBER(gaplus_videoram_w);
+ DECLARE_WRITE8_MEMBER(gaplus_starfield_control_w);
};
/*----------- defined in machine/gaplus.c -----------*/
-WRITE8_HANDLER( gaplus_customio_3_w );
-READ8_HANDLER( gaplus_customio_3_r );
/*----------- defined in video/gaplus.c -----------*/
-READ8_HANDLER( gaplus_videoram_r );
-WRITE8_HANDLER( gaplus_videoram_w );
-WRITE8_HANDLER( gaplus_starfield_control_w );
VIDEO_START( gaplus );
PALETTE_INIT( gaplus );
SCREEN_UPDATE_IND16( gaplus );
diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h
index 6b54fec46ca..8a9de22ce4f 100644
--- a/src/mame/includes/gatron.h
+++ b/src/mame/includes/gatron.h
@@ -7,12 +7,12 @@ public:
UINT8 *m_videoram;
tilemap_t *m_bg_tilemap;
DECLARE_WRITE8_MEMBER(output_port_0_w);
+ DECLARE_WRITE8_MEMBER(gat_videoram_w);
};
/*----------- defined in video/gatron.c -----------*/
-WRITE8_HANDLER( gat_videoram_w );
PALETTE_INIT( gat );
VIDEO_START( gat );
SCREEN_UPDATE_IND16( gat );
diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h
index 438b8fc2338..9bbc65e46c1 100644
--- a/src/mame/includes/gberet.h
+++ b/src/mame/includes/gberet.h
@@ -33,16 +33,16 @@ public:
DECLARE_WRITE8_MEMBER(gberetb_flipscreen_w);
DECLARE_READ8_MEMBER(gberetb_irq_ack_r);
DECLARE_WRITE8_MEMBER(gberetb_nmi_ack_w);
+ DECLARE_WRITE8_MEMBER(gberet_videoram_w);
+ DECLARE_WRITE8_MEMBER(gberet_colorram_w);
+ DECLARE_WRITE8_MEMBER(gberet_scroll_w);
+ DECLARE_WRITE8_MEMBER(gberet_sprite_bank_w);
+ DECLARE_WRITE8_MEMBER(gberetb_scroll_w);
};
/*----------- defined in video/gberet.c -----------*/
-WRITE8_HANDLER( gberet_videoram_w );
-WRITE8_HANDLER( gberet_colorram_w );
-WRITE8_HANDLER( gberet_scroll_w );
-WRITE8_HANDLER( gberetb_scroll_w );
-WRITE8_HANDLER( gberet_sprite_bank_w );
PALETTE_INIT( gberet );
VIDEO_START( gberet );
diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h
index 03234575a7f..06245d9e0fe 100644
--- a/src/mame/includes/gcpinbal.h
+++ b/src/mame/includes/gcpinbal.h
@@ -44,6 +44,10 @@ public:
required_device<msm5205_device> m_msm;
DECLARE_READ16_MEMBER(ioc_r);
DECLARE_WRITE16_MEMBER(ioc_w);
+ DECLARE_READ16_MEMBER(gcpinbal_tilemaps_word_r);
+ DECLARE_WRITE16_MEMBER(gcpinbal_tilemaps_word_w);
+ DECLARE_READ16_MEMBER(gcpinbal_ctrl_word_r);
+ DECLARE_WRITE16_MEMBER(gcpinbal_ctrl_word_w);
};
@@ -52,5 +56,3 @@ public:
VIDEO_START( gcpinbal );
SCREEN_UPDATE_IND16( gcpinbal );
-READ16_HANDLER ( gcpinbal_tilemaps_word_r );
-WRITE16_HANDLER( gcpinbal_tilemaps_word_w );
diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h
index 66f0fca3cd0..ad5e49e7a74 100644
--- a/src/mame/includes/ginganin.h
+++ b/src/mame/includes/ginganin.h
@@ -31,15 +31,15 @@ public:
/* devices */
device_t *m_audiocpu;
+ DECLARE_WRITE16_MEMBER(ginganin_fgram16_w);
+ DECLARE_WRITE16_MEMBER(ginganin_txtram16_w);
+ DECLARE_WRITE16_MEMBER(ginganin_vregs16_w);
};
/*----------- defined in video/ginganin.c -----------*/
-WRITE16_HANDLER( ginganin_fgram16_w );
-WRITE16_HANDLER( ginganin_txtram16_w );
-WRITE16_HANDLER( ginganin_vregs16_w );
VIDEO_START( ginganin );
SCREEN_UPDATE_IND16( ginganin );
diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h
index 771115b9d52..bae570e125a 100644
--- a/src/mame/includes/gladiatr.h
+++ b/src/mame/includes/gladiatr.h
@@ -25,18 +25,18 @@ public:
int m_fg_tile_bank;
int m_bg_tile_bank;
UINT8 *m_spriteram;
+ DECLARE_WRITE8_MEMBER(gladiatr_videoram_w);
+ DECLARE_WRITE8_MEMBER(gladiatr_colorram_w);
+ DECLARE_WRITE8_MEMBER(gladiatr_textram_w);
+ DECLARE_WRITE8_MEMBER(gladiatr_paletteram_w);
+ DECLARE_WRITE8_MEMBER(gladiatr_spritebuffer_w);
+ DECLARE_WRITE8_MEMBER(gladiatr_spritebank_w);
+ DECLARE_WRITE8_MEMBER(ppking_video_registers_w);
+ DECLARE_WRITE8_MEMBER(gladiatr_video_registers_w);
};
/*----------- defined in video/gladiatr.c -----------*/
-WRITE8_HANDLER( gladiatr_videoram_w );
-WRITE8_HANDLER( gladiatr_colorram_w );
-WRITE8_HANDLER( gladiatr_textram_w );
-WRITE8_HANDLER( gladiatr_paletteram_w );
-WRITE8_HANDLER( ppking_video_registers_w );
-WRITE8_HANDLER( gladiatr_video_registers_w );
-WRITE8_HANDLER( gladiatr_spritebuffer_w );
-WRITE8_HANDLER( gladiatr_spritebank_w );
VIDEO_START( ppking );
SCREEN_UPDATE_IND16( ppking );
VIDEO_START( gladiatr );
diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h
index c0321932f35..44ed3eeac69 100644
--- a/src/mame/includes/glass.h
+++ b/src/mame/includes/glass.h
@@ -28,13 +28,13 @@ public:
DECLARE_WRITE16_MEMBER(clr_int_w);
DECLARE_WRITE16_MEMBER(OKIM6295_bankswitch_w);
DECLARE_WRITE16_MEMBER(glass_coin_w);
+ DECLARE_WRITE16_MEMBER(glass_blitter_w);
+ DECLARE_WRITE16_MEMBER(glass_vram_w);
};
/*----------- defined in video/glass.c -----------*/
-WRITE16_HANDLER( glass_vram_w );
-WRITE16_HANDLER( glass_blitter_w );
VIDEO_START( glass );
SCREEN_UPDATE_IND16( glass );
diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h
index b1491315563..8f9e93dc996 100644
--- a/src/mame/includes/gng.h
+++ b/src/mame/includes/gng.h
@@ -29,16 +29,16 @@ public:
DECLARE_WRITE8_MEMBER(gng_bankswitch_w);
DECLARE_WRITE8_MEMBER(gng_coin_counter_w);
DECLARE_READ8_MEMBER(diamond_hack_r);
+ DECLARE_WRITE8_MEMBER(gng_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(gng_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(gng_bgscrollx_w);
+ DECLARE_WRITE8_MEMBER(gng_bgscrolly_w);
+ DECLARE_WRITE8_MEMBER(gng_flipscreen_w);
};
/*----------- defined in video/gng.c -----------*/
-WRITE8_HANDLER( gng_fgvideoram_w );
-WRITE8_HANDLER( gng_bgvideoram_w );
-WRITE8_HANDLER( gng_bgscrollx_w );
-WRITE8_HANDLER( gng_bgscrolly_w );
-WRITE8_HANDLER( gng_flipscreen_w );
VIDEO_START( gng );
SCREEN_UPDATE_IND16( gng );
diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h
index cd247b24cef..4a74bd0e3fd 100644
--- a/src/mame/includes/goal92.h
+++ b/src/mame/includes/goal92.h
@@ -34,6 +34,11 @@ public:
DECLARE_WRITE16_MEMBER(goal92_sound_command_w);
DECLARE_READ16_MEMBER(goal92_inputs_r);
DECLARE_WRITE8_MEMBER(adpcm_data_w);
+ DECLARE_READ16_MEMBER(goal92_fg_bank_r);
+ DECLARE_WRITE16_MEMBER(goal92_fg_bank_w);
+ DECLARE_WRITE16_MEMBER(goal92_text_w);
+ DECLARE_WRITE16_MEMBER(goal92_background_w);
+ DECLARE_WRITE16_MEMBER(goal92_foreground_w);
};
@@ -42,11 +47,6 @@ public:
/*----------- defined in video/goal92.c -----------*/
-WRITE16_HANDLER( goal92_background_w );
-WRITE16_HANDLER( goal92_foreground_w );
-WRITE16_HANDLER( goal92_text_w );
-WRITE16_HANDLER( goal92_fg_bank_w );
-READ16_HANDLER( goal92_fg_bank_r );
VIDEO_START( goal92 );
SCREEN_UPDATE_IND16( goal92 );
diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h
index 91a778b740f..ddb5f6c517b 100644
--- a/src/mame/includes/goindol.h
+++ b/src/mame/includes/goindol.h
@@ -35,14 +35,14 @@ public:
DECLARE_WRITE8_MEMBER(prot_fd99_w);
DECLARE_WRITE8_MEMBER(prot_fc66_w);
DECLARE_WRITE8_MEMBER(prot_fcb0_w);
+ DECLARE_WRITE8_MEMBER(goindol_fg_videoram_w);
+ DECLARE_WRITE8_MEMBER(goindol_bg_videoram_w);
};
/*----------- defined in video/goindol.c -----------*/
-WRITE8_HANDLER( goindol_fg_videoram_w );
-WRITE8_HANDLER( goindol_bg_videoram_w );
VIDEO_START( goindol );
SCREEN_UPDATE_IND16( goindol );
diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h
index 1f732674114..495c33bbff4 100644
--- a/src/mame/includes/goldstar.h
+++ b/src/mame/includes/goldstar.h
@@ -68,26 +68,26 @@ public:
DECLARE_READ8_MEMBER(fixedval74_r);
DECLARE_READ8_MEMBER(fixedvale4_r);
DECLARE_READ8_MEMBER(fixedvalc7_r);
+ DECLARE_WRITE8_MEMBER(cm_girl_scroll_w);
+ DECLARE_WRITE8_MEMBER(cm_outport0_w);
+ DECLARE_WRITE8_MEMBER(goldstar_fg_vidram_w);
+ DECLARE_WRITE8_MEMBER(goldstar_fg_atrram_w);
+ DECLARE_WRITE8_MEMBER(goldstar_reel1_ram_w);
+ DECLARE_WRITE8_MEMBER(goldstar_reel2_ram_w);
+ DECLARE_WRITE8_MEMBER(goldstar_reel3_ram_w);
+ DECLARE_WRITE8_MEMBER(unkch_reel1_attrram_w);
+ DECLARE_WRITE8_MEMBER(unkch_reel2_attrram_w);
+ DECLARE_WRITE8_MEMBER(unkch_reel3_attrram_w);
+ DECLARE_WRITE8_MEMBER(goldstar_fa00_w);
+ DECLARE_WRITE8_MEMBER(cm_background_col_w);
};
/*----------- defined in video/goldstar.c -----------*/
-WRITE8_HANDLER( goldstar_reel1_ram_w );
-WRITE8_HANDLER( goldstar_reel2_ram_w );
-WRITE8_HANDLER( goldstar_reel3_ram_w );
-WRITE8_HANDLER( unkch_reel1_attrram_w );
-WRITE8_HANDLER( unkch_reel2_attrram_w );
-WRITE8_HANDLER( unkch_reel3_attrram_w );
-WRITE8_HANDLER( goldstar_fg_vidram_w );
-WRITE8_HANDLER( goldstar_fg_atrram_w );
-WRITE8_HANDLER( cm_girl_scroll_w );
-WRITE8_HANDLER( goldstar_fa00_w );
-WRITE8_HANDLER( cm_background_col_w );
-WRITE8_HANDLER( cm_outport0_w );
VIDEO_START( goldstar );
VIDEO_START( bingowng );
VIDEO_START( cherrym );
diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h
index 431af90c774..7776818f704 100644
--- a/src/mame/includes/gomoku.h
+++ b/src/mame/includes/gomoku.h
@@ -14,6 +14,11 @@ public:
tilemap_t *m_fg_tilemap;
bitmap_ind16 m_bg_bitmap;
DECLARE_READ8_MEMBER(input_port_r);
+ DECLARE_WRITE8_MEMBER(gomoku_videoram_w);
+ DECLARE_WRITE8_MEMBER(gomoku_colorram_w);
+ DECLARE_WRITE8_MEMBER(gomoku_bgram_w);
+ DECLARE_WRITE8_MEMBER(gomoku_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(gomoku_bg_dispsw_w);
};
@@ -31,8 +36,3 @@ PALETTE_INIT( gomoku );
VIDEO_START( gomoku );
SCREEN_UPDATE_IND16( gomoku );
-WRITE8_HANDLER( gomoku_videoram_w );
-WRITE8_HANDLER( gomoku_colorram_w );
-WRITE8_HANDLER( gomoku_bgram_w );
-WRITE8_HANDLER( gomoku_flipscreen_w );
-WRITE8_HANDLER( gomoku_bg_dispsw_w );
diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h
index fa377ba033f..47aae31e859 100644
--- a/src/mame/includes/gotcha.h
+++ b/src/mame/includes/gotcha.h
@@ -27,6 +27,11 @@ public:
/* devices */
device_t *m_audiocpu;
DECLARE_WRITE16_MEMBER(gotcha_lamps_w);
+ DECLARE_WRITE16_MEMBER(gotcha_fgvideoram_w);
+ DECLARE_WRITE16_MEMBER(gotcha_bgvideoram_w);
+ DECLARE_WRITE16_MEMBER(gotcha_gfxbank_select_w);
+ DECLARE_WRITE16_MEMBER(gotcha_gfxbank_w);
+ DECLARE_WRITE16_MEMBER(gotcha_scroll_w);
};
@@ -36,8 +41,3 @@ public:
VIDEO_START( gotcha );
SCREEN_UPDATE_IND16( gotcha );
-WRITE16_HANDLER( gotcha_fgvideoram_w );
-WRITE16_HANDLER( gotcha_bgvideoram_w );
-WRITE16_HANDLER( gotcha_gfxbank_select_w );
-WRITE16_HANDLER( gotcha_gfxbank_w );
-WRITE16_HANDLER( gotcha_scroll_w );
diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h
index 7db22f33185..0a4fca58b02 100644
--- a/src/mame/includes/gottlieb.h
+++ b/src/mame/includes/gottlieb.h
@@ -248,16 +248,16 @@ public:
DECLARE_WRITE8_MEMBER(laserdisc_select_w);
DECLARE_WRITE8_MEMBER(laserdisc_command_w);
DECLARE_WRITE8_MEMBER(gottlieb_sh_w);
+ DECLARE_WRITE8_MEMBER(gottlieb_paletteram_w);
+ DECLARE_WRITE8_MEMBER(gottlieb_video_control_w);
+ DECLARE_WRITE8_MEMBER(gottlieb_laserdisc_video_control_w);
+ DECLARE_WRITE8_MEMBER(gottlieb_videoram_w);
+ DECLARE_WRITE8_MEMBER(gottlieb_charram_w);
};
/*----------- defined in video/gottlieb.c -----------*/
-extern WRITE8_HANDLER( gottlieb_videoram_w );
-extern WRITE8_HANDLER( gottlieb_charram_w );
-extern WRITE8_HANDLER( gottlieb_video_control_w );
-extern WRITE8_HANDLER( gottlieb_laserdisc_video_control_w );
-extern WRITE8_HANDLER( gottlieb_paletteram_w );
VIDEO_START( gottlieb );
VIDEO_START( screwloo );
diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h
index 9ef7c59ae24..f4a90ad8ba3 100644
--- a/src/mame/includes/gotya.h
+++ b/src/mame/includes/gotya.h
@@ -22,6 +22,9 @@ public:
/* devices */
samples_device *m_samples;
+ DECLARE_WRITE8_MEMBER(gotya_videoram_w);
+ DECLARE_WRITE8_MEMBER(gotya_colorram_w);
+ DECLARE_WRITE8_MEMBER(gotya_video_control_w);
};
@@ -32,9 +35,6 @@ WRITE8_HANDLER( gotya_soundlatch_w );
/*----------- defined in video/gotya.c -----------*/
-WRITE8_HANDLER( gotya_videoram_w );
-WRITE8_HANDLER( gotya_colorram_w );
-WRITE8_HANDLER( gotya_video_control_w );
PALETTE_INIT( gotya );
VIDEO_START( gotya );
diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h
index 18eb210e6f8..9a01e7aa3fb 100644
--- a/src/mame/includes/gradius3.h
+++ b/src/mame/includes/gradius3.h
@@ -41,6 +41,8 @@ public:
DECLARE_WRITE16_MEMBER(cpuB_irqtrigger_w);
DECLARE_WRITE16_MEMBER(sound_command_w);
DECLARE_WRITE16_MEMBER(sound_irq_w);
+ DECLARE_READ16_MEMBER(gradius3_gfxrom_r);
+ DECLARE_WRITE16_MEMBER(gradius3_gfxram_w);
};
/*----------- defined in video/gradius3.c -----------*/
@@ -48,8 +50,6 @@ public:
extern void gradius3_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask,int *shadow);
extern void gradius3_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags,int *priority);
-READ16_HANDLER( gradius3_gfxrom_r );
-WRITE16_HANDLER( gradius3_gfxram_w );
VIDEO_START( gradius3 );
SCREEN_UPDATE_IND16( gradius3 );
diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h
index c039f9de00d..b069e799bf5 100644
--- a/src/mame/includes/grchamp.h
+++ b/src/mame/includes/grchamp.h
@@ -50,6 +50,9 @@ public:
DECLARE_WRITE8_MEMBER(main_to_sub_comm_w);
DECLARE_READ8_MEMBER(main_to_sub_comm_r);
UINT8 get_pc3259_bits(int offs);
+ DECLARE_WRITE8_MEMBER(grchamp_left_w);
+ DECLARE_WRITE8_MEMBER(grchamp_center_w);
+ DECLARE_WRITE8_MEMBER(grchamp_right_w);
};
/* Discrete Sound Input Nodes */
@@ -72,6 +75,3 @@ DISCRETE_SOUND_EXTERN( grchamp );
PALETTE_INIT( grchamp );
VIDEO_START( grchamp );
SCREEN_UPDATE_RGB32( grchamp );
-WRITE8_HANDLER( grchamp_left_w );
-WRITE8_HANDLER( grchamp_center_w );
-WRITE8_HANDLER( grchamp_right_w );
diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h
index 6c4cc5d9bea..4a8e83c6025 100644
--- a/src/mame/includes/gridlee.h
+++ b/src/mame/includes/gridlee.h
@@ -45,6 +45,9 @@ public:
DECLARE_WRITE8_MEMBER(led_0_w);
DECLARE_WRITE8_MEMBER(led_1_w);
DECLARE_WRITE8_MEMBER(gridlee_coin_counter_w);
+ DECLARE_WRITE8_MEMBER(gridlee_cocktail_flip_w);
+ DECLARE_WRITE8_MEMBER(gridlee_videoram_w);
+ DECLARE_WRITE8_MEMBER(gridlee_palette_select_w);
};
@@ -63,6 +66,3 @@ PALETTE_INIT( gridlee );
VIDEO_START( gridlee );
SCREEN_UPDATE_IND16( gridlee );
-WRITE8_HANDLER( gridlee_cocktail_flip_w );
-WRITE8_HANDLER( gridlee_videoram_w );
-WRITE8_HANDLER( gridlee_palette_select_w );
diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h
index 49fc4a7fd55..561c96e2524 100644
--- a/src/mame/includes/gstriker.h
+++ b/src/mame/includes/gstriker.h
@@ -72,17 +72,19 @@ public:
DECLARE_READ16_MEMBER(twrldc94_prot_reg_r);
DECLARE_READ16_MEMBER(vbl_toggle_r);
DECLARE_WRITE16_MEMBER(vbl_toggle_w);
+ DECLARE_WRITE16_MEMBER(VS920A_0_vram_w);
+ DECLARE_WRITE16_MEMBER(VS920A_1_vram_w);
+ DECLARE_WRITE16_MEMBER(MB60553_0_regs_w);
+ DECLARE_WRITE16_MEMBER(MB60553_1_regs_w);
+ DECLARE_WRITE16_MEMBER(MB60553_0_vram_w);
+ DECLARE_WRITE16_MEMBER(MB60553_1_vram_w);
+ DECLARE_WRITE16_MEMBER(gsx_videoram3_w);
+ void MB60553_reg_written(int numchip, int num_reg);
};
/*----------- defined in video/gstriker.c -----------*/
-WRITE16_HANDLER( VS920A_0_vram_w );
-WRITE16_HANDLER( VS920A_1_vram_w );
-WRITE16_HANDLER( MB60553_0_regs_w );
-WRITE16_HANDLER( MB60553_1_regs_w );
-WRITE16_HANDLER( MB60553_0_vram_w );
-WRITE16_HANDLER( MB60553_1_vram_w );
SCREEN_UPDATE_IND16( gstriker );
VIDEO_START( gstriker );
diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h
index 87945f64284..e9eaa3aee44 100644
--- a/src/mame/includes/gsword.h
+++ b/src/mame/includes/gsword.h
@@ -19,15 +19,15 @@ public:
int m_charpalbank;
int m_flipscreen;
tilemap_t *m_bg_tilemap;
+ DECLARE_WRITE8_MEMBER(gsword_videoram_w);
+ DECLARE_WRITE8_MEMBER(gsword_charbank_w);
+ DECLARE_WRITE8_MEMBER(gsword_videoctrl_w);
+ DECLARE_WRITE8_MEMBER(gsword_scroll_w);
};
/*----------- defined in video/gsword.c -----------*/
-WRITE8_HANDLER( gsword_charbank_w );
-WRITE8_HANDLER( gsword_videoctrl_w );
-WRITE8_HANDLER( gsword_videoram_w );
-WRITE8_HANDLER( gsword_scroll_w );
PALETTE_INIT( josvolly );
PALETTE_INIT( gsword );
diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h
index 53821b69fd3..094fbe39771 100644
--- a/src/mame/includes/gumbo.h
+++ b/src/mame/includes/gumbo.h
@@ -18,13 +18,13 @@ public:
/* video-related */
tilemap_t *m_bg_tilemap;
tilemap_t *m_fg_tilemap;
+ DECLARE_WRITE16_MEMBER(gumbo_bg_videoram_w);
+ DECLARE_WRITE16_MEMBER(gumbo_fg_videoram_w);
};
/*----------- defined in video/gumbo.c -----------*/
-WRITE16_HANDLER( gumbo_bg_videoram_w );
-WRITE16_HANDLER( gumbo_fg_videoram_w );
VIDEO_START( gumbo );
SCREEN_UPDATE_IND16( gumbo );
diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h
index b6cd782cb35..10cfc3f7dc4 100644
--- a/src/mame/includes/gundealr.h
+++ b/src/mame/includes/gundealr.h
@@ -25,18 +25,18 @@ public:
/* misc */
int m_input_ports_hack;
DECLARE_WRITE8_MEMBER(yamyam_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(gundealr_bg_videoram_w);
+ DECLARE_WRITE8_MEMBER(gundealr_fg_videoram_w);
+ DECLARE_WRITE8_MEMBER(gundealr_paletteram_w);
+ DECLARE_WRITE8_MEMBER(gundealr_fg_scroll_w);
+ DECLARE_WRITE8_MEMBER(yamyam_fg_scroll_w);
+ DECLARE_WRITE8_MEMBER(gundealr_flipscreen_w);
};
/*----------- defined in video/gundealr.c -----------*/
-WRITE8_HANDLER( gundealr_paletteram_w );
-WRITE8_HANDLER( gundealr_bg_videoram_w );
-WRITE8_HANDLER( gundealr_fg_videoram_w );
-WRITE8_HANDLER( gundealr_fg_scroll_w );
-WRITE8_HANDLER( yamyam_fg_scroll_w );
-WRITE8_HANDLER( gundealr_flipscreen_w );
SCREEN_UPDATE_IND16( gundealr );
VIDEO_START( gundealr );
diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h
index 92211268998..578782d7dca 100644
--- a/src/mame/includes/gunsmoke.h
+++ b/src/mame/includes/gunsmoke.h
@@ -26,15 +26,15 @@ public:
UINT8 m_bgon;
UINT8 m_sprite3bank;
DECLARE_READ8_MEMBER(gunsmoke_protection_r);
+ DECLARE_WRITE8_MEMBER(gunsmoke_videoram_w);
+ DECLARE_WRITE8_MEMBER(gunsmoke_colorram_w);
+ DECLARE_WRITE8_MEMBER(gunsmoke_c804_w);
+ DECLARE_WRITE8_MEMBER(gunsmoke_d806_w);
};
/*----------- defined in video/gunsmoke.c -----------*/
-WRITE8_HANDLER( gunsmoke_c804_w );
-WRITE8_HANDLER( gunsmoke_d806_w );
-WRITE8_HANDLER( gunsmoke_videoram_w );
-WRITE8_HANDLER( gunsmoke_colorram_w );
PALETTE_INIT( gunsmoke );
VIDEO_START( gunsmoke );
diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h
index 9aabfa001f3..7f5e7a2f64e 100644
--- a/src/mame/includes/gyruss.h
+++ b/src/mame/includes/gyruss.h
@@ -30,13 +30,13 @@ public:
DECLARE_WRITE8_MEMBER(gyruss_i8039_irq_w);
DECLARE_WRITE8_MEMBER(master_nmi_mask_w);
DECLARE_WRITE8_MEMBER(slave_irq_mask_w);
+ DECLARE_WRITE8_MEMBER(gyruss_spriteram_w);
+ DECLARE_READ8_MEMBER(gyruss_scanline_r);
};
/*----------- defined in video/gyruss.c -----------*/
-WRITE8_HANDLER( gyruss_spriteram_w );
-READ8_HANDLER( gyruss_scanline_r );
PALETTE_INIT( gyruss );
VIDEO_START( gyruss );
diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h
index 8666a2ef2de..627f0f81a30 100644
--- a/src/mame/includes/hanaawas.h
+++ b/src/mame/includes/hanaawas.h
@@ -21,13 +21,13 @@ public:
int m_mux;
DECLARE_READ8_MEMBER(hanaawas_input_port_0_r);
DECLARE_WRITE8_MEMBER(hanaawas_inputs_mux_w);
+ DECLARE_WRITE8_MEMBER(hanaawas_videoram_w);
+ DECLARE_WRITE8_MEMBER(hanaawas_colorram_w);
};
/*----------- defined in video/hanaawas.c -----------*/
-WRITE8_HANDLER( hanaawas_videoram_w );
-WRITE8_HANDLER( hanaawas_colorram_w );
WRITE8_DEVICE_HANDLER( hanaawas_portB_w );
PALETTE_INIT( hanaawas );
diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h
index 5b7dd4aa36e..c0019aea02d 100644
--- a/src/mame/includes/hcastle.h
+++ b/src/mame/includes/hcastle.h
@@ -38,17 +38,17 @@ public:
DECLARE_WRITE8_MEMBER(hcastle_bankswitch_w);
DECLARE_WRITE8_MEMBER(hcastle_soundirq_w);
DECLARE_WRITE8_MEMBER(hcastle_coin_w);
+ DECLARE_WRITE8_MEMBER(hcastle_pf1_video_w);
+ DECLARE_WRITE8_MEMBER(hcastle_pf2_video_w);
+ DECLARE_WRITE8_MEMBER(hcastle_gfxbank_w);
+ DECLARE_READ8_MEMBER(hcastle_gfxbank_r);
+ DECLARE_WRITE8_MEMBER(hcastle_pf1_control_w);
+ DECLARE_WRITE8_MEMBER(hcastle_pf2_control_w);
};
/*----------- defined in video/hcastle.c -----------*/
-WRITE8_HANDLER( hcastle_pf1_video_w );
-WRITE8_HANDLER( hcastle_pf2_video_w );
-READ8_HANDLER( hcastle_gfxbank_r );
-WRITE8_HANDLER( hcastle_gfxbank_w );
-WRITE8_HANDLER( hcastle_pf1_control_w );
-WRITE8_HANDLER( hcastle_pf2_control_w );
PALETTE_INIT( hcastle );
SCREEN_UPDATE_IND16( hcastle );
diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h
index da9c864e9f8..ed2b7671d79 100644
--- a/src/mame/includes/hexion.h
+++ b/src/mame/includes/hexion.h
@@ -12,6 +12,11 @@ public:
int m_gfxrom_select;
tilemap_t *m_bg_tilemap[2];
DECLARE_WRITE8_MEMBER(coincntr_w);
+ DECLARE_WRITE8_MEMBER(hexion_bankswitch_w);
+ DECLARE_READ8_MEMBER(hexion_bankedram_r);
+ DECLARE_WRITE8_MEMBER(hexion_bankedram_w);
+ DECLARE_WRITE8_MEMBER(hexion_bankctrl_w);
+ DECLARE_WRITE8_MEMBER(hexion_gfxrom_select_w);
};
@@ -20,8 +25,3 @@ public:
VIDEO_START( hexion );
SCREEN_UPDATE_IND16( hexion );
-WRITE8_HANDLER( hexion_bankswitch_w );
-READ8_HANDLER( hexion_bankedram_r );
-WRITE8_HANDLER( hexion_bankedram_w );
-WRITE8_HANDLER( hexion_bankctrl_w );
-WRITE8_HANDLER( hexion_gfxrom_select_w );
diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h
index 4b3508c7957..29382d80638 100644
--- a/src/mame/includes/higemaru.h
+++ b/src/mame/includes/higemaru.h
@@ -18,14 +18,14 @@ public:
/* video-related */
tilemap_t *m_bg_tilemap;
+ DECLARE_WRITE8_MEMBER(higemaru_videoram_w);
+ DECLARE_WRITE8_MEMBER(higemaru_colorram_w);
+ DECLARE_WRITE8_MEMBER(higemaru_c800_w);
};
/*----------- defined in video/higemaru.c -----------*/
-WRITE8_HANDLER( higemaru_videoram_w );
-WRITE8_HANDLER( higemaru_colorram_w );
-WRITE8_HANDLER( higemaru_c800_w );
PALETTE_INIT( higemaru );
VIDEO_START( higemaru );
diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h
index 1a1db1c8c19..48b77eb9127 100644
--- a/src/mame/includes/himesiki.h
+++ b/src/mame/includes/himesiki.h
@@ -24,6 +24,9 @@ public:
device_t *m_subcpu;
DECLARE_WRITE8_MEMBER(himesiki_rombank_w);
DECLARE_WRITE8_MEMBER(himesiki_sound_w);
+ DECLARE_WRITE8_MEMBER(himesiki_bg_ram_w);
+ DECLARE_WRITE8_MEMBER(himesiki_scrollx_w);
+ DECLARE_WRITE8_MEMBER(himesiki_flip_w);
};
@@ -32,6 +35,3 @@ public:
VIDEO_START( himesiki );
SCREEN_UPDATE_IND16( himesiki );
-WRITE8_HANDLER( himesiki_bg_ram_w );
-WRITE8_HANDLER( himesiki_scrollx_w );
-WRITE8_HANDLER( himesiki_flip_w );
diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h
index d77eaa910aa..c69392ef3f9 100644
--- a/src/mame/includes/hnayayoi.h
+++ b/src/mame/includes/hnayayoi.h
@@ -23,6 +23,10 @@ public:
DECLARE_READ8_MEMBER(keyboard_0_r);
DECLARE_READ8_MEMBER(keyboard_1_r);
DECLARE_WRITE8_MEMBER(keyboard_w);
+ DECLARE_WRITE8_MEMBER(dynax_blitter_rev1_param_w);
+ DECLARE_WRITE8_MEMBER(dynax_blitter_rev1_start_w);
+ DECLARE_WRITE8_MEMBER(dynax_blitter_rev1_clear_w);
+ DECLARE_WRITE8_MEMBER(hnayayoi_palbank_w);
};
@@ -32,7 +36,3 @@ VIDEO_START( hnayayoi );
VIDEO_START( untoucha );
SCREEN_UPDATE_IND16( hnayayoi );
-WRITE8_HANDLER( dynax_blitter_rev1_param_w );
-WRITE8_HANDLER( dynax_blitter_rev1_start_w );
-WRITE8_HANDLER( dynax_blitter_rev1_clear_w );
-WRITE8_HANDLER( hnayayoi_palbank_w );
diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h
index 7377bed2e28..32a84fa225f 100644
--- a/src/mame/includes/hng64.h
+++ b/src/mame/includes/hng64.h
@@ -133,12 +133,12 @@ public:
DECLARE_WRITE32_MEMBER(activate_3d_buffer);
DECLARE_READ8_MEMBER(hng64_comm_shared_r);
DECLARE_WRITE8_MEMBER(hng64_comm_shared_w);
+ DECLARE_WRITE32_MEMBER(hng64_videoram_w);
};
/*----------- defined in video/hng64.c -----------*/
-WRITE32_HANDLER( hng64_videoram_w );
void hng64_command3d(running_machine& machine, const UINT16* packet);
VIDEO_START( hng64 );
diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h
index 9cfba256f37..98c7fe37fae 100644
--- a/src/mame/includes/holeland.h
+++ b/src/mame/includes/holeland.h
@@ -21,6 +21,11 @@ public:
tilemap_t *m_bg_tilemap;
int m_palette_offset;
int m_po[2];
+ DECLARE_WRITE8_MEMBER(holeland_videoram_w);
+ DECLARE_WRITE8_MEMBER(holeland_colorram_w);
+ DECLARE_WRITE8_MEMBER(holeland_pal_offs_w);
+ DECLARE_WRITE8_MEMBER(holeland_scroll_w);
+ DECLARE_WRITE8_MEMBER(holeland_flipscreen_w);
};
@@ -31,8 +36,3 @@ VIDEO_START( crzrally );
SCREEN_UPDATE_IND16( holeland );
SCREEN_UPDATE_IND16( crzrally );
-WRITE8_HANDLER( holeland_videoram_w );
-WRITE8_HANDLER( holeland_colorram_w );
-WRITE8_HANDLER( holeland_flipscreen_w );
-WRITE8_HANDLER( holeland_pal_offs_w );
-WRITE8_HANDLER( holeland_scroll_w );
diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h
index 0fd376fdd1b..8b1ebf6b8ba 100644
--- a/src/mame/includes/homedata.h
+++ b/src/mame/includes/homedata.h
@@ -61,23 +61,23 @@ public:
DECLARE_WRITE8_MEMBER(bankswitch_w);
DECLARE_READ8_MEMBER(mirderby_prot_r);
DECLARE_WRITE8_MEMBER(mirderby_prot_w);
+ DECLARE_WRITE8_MEMBER(mrokumei_videoram_w);
+ DECLARE_WRITE8_MEMBER(reikaids_videoram_w);
+ DECLARE_WRITE8_MEMBER(reikaids_gfx_bank_w);
+ DECLARE_WRITE8_MEMBER(pteacher_gfx_bank_w);
+ DECLARE_WRITE8_MEMBER(homedata_blitter_param_w);
+ DECLARE_WRITE8_MEMBER(mrokumei_blitter_bank_w);
+ DECLARE_WRITE8_MEMBER(reikaids_blitter_bank_w);
+ DECLARE_WRITE8_MEMBER(pteacher_blitter_bank_w);
+ DECLARE_WRITE8_MEMBER(mrokumei_blitter_start_w);
+ DECLARE_WRITE8_MEMBER(reikaids_blitter_start_w);
+ DECLARE_WRITE8_MEMBER(pteacher_blitter_start_w);
};
/*----------- defined in video/homedata.c -----------*/
-WRITE8_HANDLER( mrokumei_videoram_w );
-WRITE8_HANDLER( reikaids_videoram_w );
-WRITE8_HANDLER( reikaids_gfx_bank_w );
-WRITE8_HANDLER( pteacher_gfx_bank_w );
-WRITE8_HANDLER( homedata_blitter_param_w );
-WRITE8_HANDLER( mrokumei_blitter_bank_w );
-WRITE8_HANDLER( reikaids_blitter_bank_w );
-WRITE8_HANDLER( pteacher_blitter_bank_w );
-WRITE8_HANDLER( mrokumei_blitter_start_w );
-WRITE8_HANDLER( reikaids_blitter_start_w );
-WRITE8_HANDLER( pteacher_blitter_start_w );
PALETTE_INIT( mrokumei );
PALETTE_INIT( reikaids );
diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h
index 2c31a799dfa..0dc237015e7 100644
--- a/src/mame/includes/homerun.h
+++ b/src/mame/includes/homerun.h
@@ -25,13 +25,13 @@ public:
int m_xpc;
int m_gc_up;
int m_gc_down;
+ DECLARE_WRITE8_MEMBER(homerun_videoram_w);
+ DECLARE_WRITE8_MEMBER(homerun_color_w);
};
/*----------- defined in video/homerun.c -----------*/
-WRITE8_HANDLER( homerun_videoram_w );
-WRITE8_HANDLER( homerun_color_w );
WRITE8_DEVICE_HANDLER( homerun_banking_w );
VIDEO_START(homerun);
diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h
index 87416719f6f..8bc03854337 100644
--- a/src/mame/includes/hyhoo.h
+++ b/src/mame/includes/hyhoo.h
@@ -17,6 +17,8 @@ public:
int m_highcolorflag;
int m_flipscreen;
bitmap_rgb32 m_tmpbitmap;
+ DECLARE_WRITE8_MEMBER(hyhoo_blitter_w);
+ DECLARE_WRITE8_MEMBER(hyhoo_romsel_w);
};
@@ -25,5 +27,3 @@ public:
SCREEN_UPDATE_RGB32( hyhoo );
VIDEO_START( hyhoo );
-WRITE8_HANDLER( hyhoo_blitter_w );
-WRITE8_HANDLER( hyhoo_romsel_w );
diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h
index 7ee7130c040..f73e79a4bef 100644
--- a/src/mame/includes/hyperspt.h
+++ b/src/mame/includes/hyperspt.h
@@ -20,13 +20,13 @@ public:
UINT8 m_irq_mask;
DECLARE_WRITE8_MEMBER(hyperspt_coin_counter_w);
DECLARE_WRITE8_MEMBER(irq_mask_w);
+ DECLARE_WRITE8_MEMBER(hyperspt_videoram_w);
+ DECLARE_WRITE8_MEMBER(hyperspt_colorram_w);
+ DECLARE_WRITE8_MEMBER(hyperspt_flipscreen_w);
};
/*----------- defined in video/hyperspt.c -----------*/
-WRITE8_HANDLER( hyperspt_videoram_w );
-WRITE8_HANDLER( hyperspt_colorram_w );
-WRITE8_HANDLER( hyperspt_flipscreen_w );
PALETTE_INIT( hyperspt );
VIDEO_START( hyperspt );
diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h
index 5d23b5a37ee..4836c701546 100644
--- a/src/mame/includes/hyprduel.h
+++ b/src/mame/includes/hyprduel.h
@@ -57,6 +57,14 @@ public:
DECLARE_WRITE16_MEMBER(hyprduel_cpusync_trigger2_w);
DECLARE_READ16_MEMBER(hyprduel_bankedrom_r);
DECLARE_WRITE16_MEMBER(hyprduel_blitter_w);
+ DECLARE_WRITE16_MEMBER(hyprduel_paletteram_w);
+ DECLARE_WRITE16_MEMBER(hyprduel_vram_0_w);
+ DECLARE_WRITE16_MEMBER(hyprduel_vram_1_w);
+ DECLARE_WRITE16_MEMBER(hyprduel_vram_2_w);
+ DECLARE_WRITE16_MEMBER(hyprduel_window_w);
+ DECLARE_WRITE16_MEMBER(hyprduel_scrollreg_w);
+ DECLARE_WRITE16_MEMBER(hyprduel_scrollreg_init_w);
+ void blt_write( address_space *space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask );
};
@@ -64,13 +72,6 @@ public:
/*----------- defined in video/hyprduel.c -----------*/
-WRITE16_HANDLER( hyprduel_paletteram_w );
-WRITE16_HANDLER( hyprduel_window_w );
-WRITE16_HANDLER( hyprduel_vram_0_w );
-WRITE16_HANDLER( hyprduel_vram_1_w );
-WRITE16_HANDLER( hyprduel_vram_2_w );
-WRITE16_HANDLER( hyprduel_scrollreg_w );
-WRITE16_HANDLER( hyprduel_scrollreg_init_w );
VIDEO_START( hyprduel_14220 );
VIDEO_START( magerror_14220 );
diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h
index 888ea74c5d8..4d03bd0ab3b 100644
--- a/src/mame/includes/ikki.h
+++ b/src/mame/includes/ikki.h
@@ -30,12 +30,12 @@ public:
required_device<cpu_device> m_subcpu;
DECLARE_READ8_MEMBER(ikki_e000_r);
DECLARE_WRITE8_MEMBER(ikki_coin_counters);
+ DECLARE_WRITE8_MEMBER(ikki_scrn_ctrl_w);
};
/*----------- defined in video/ikki.c -----------*/
-WRITE8_HANDLER( ikki_scrn_ctrl_w );
PALETTE_INIT( ikki );
VIDEO_START( ikki );
diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h
index 622833c7dd8..c56fb17c16a 100644
--- a/src/mame/includes/inufuku.h
+++ b/src/mame/includes/inufuku.h
@@ -33,17 +33,17 @@ public:
DECLARE_WRITE16_MEMBER(inufuku_soundcommand_w);
DECLARE_WRITE8_MEMBER(pending_command_clear_w);
DECLARE_WRITE8_MEMBER(inufuku_soundrombank_w);
+ DECLARE_WRITE16_MEMBER(inufuku_palettereg_w);
+ DECLARE_WRITE16_MEMBER(inufuku_scrollreg_w);
+ DECLARE_READ16_MEMBER(inufuku_bg_videoram_r);
+ DECLARE_WRITE16_MEMBER(inufuku_bg_videoram_w);
+ DECLARE_READ16_MEMBER(inufuku_tx_videoram_r);
+ DECLARE_WRITE16_MEMBER(inufuku_tx_videoram_w);
};
/*----------- defined in video/inufuku.c -----------*/
-READ16_HANDLER( inufuku_bg_videoram_r );
-WRITE16_HANDLER( inufuku_bg_videoram_w );
-READ16_HANDLER( inufuku_tx_videoram_r );
-WRITE16_HANDLER( inufuku_tx_videoram_w );
-WRITE16_HANDLER( inufuku_palettereg_w );
-WRITE16_HANDLER( inufuku_scrollreg_w );
SCREEN_UPDATE_IND16( inufuku );
VIDEO_START( inufuku );
diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h
index 44460dd0729..63a0c0f595f 100644
--- a/src/mame/includes/iqblock.h
+++ b/src/mame/includes/iqblock.h
@@ -19,15 +19,15 @@ public:
DECLARE_WRITE8_MEMBER(grndtour_prot_w);
DECLARE_WRITE8_MEMBER(iqblock_irqack_w);
DECLARE_READ8_MEMBER(extrarom_r);
+ DECLARE_WRITE8_MEMBER(iqblock_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(iqblock_bgvideoram_w);
+ DECLARE_READ8_MEMBER(iqblock_bgvideoram_r);
+ DECLARE_WRITE8_MEMBER(iqblock_fgscroll_w);
};
/*----------- defined in video/iqblock.c -----------*/
-WRITE8_HANDLER( iqblock_fgvideoram_w );
-WRITE8_HANDLER( iqblock_bgvideoram_w );
-READ8_HANDLER( iqblock_bgvideoram_r );
-WRITE8_HANDLER( iqblock_fgscroll_w );
VIDEO_START( iqblock );
SCREEN_UPDATE_IND16( iqblock );
diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h
index 6b63ebca34c..ad9837fe3ab 100644
--- a/src/mame/includes/irobot.h
+++ b/src/mame/includes/irobot.h
@@ -63,6 +63,15 @@ public:
DECLARE_WRITE8_MEMBER(irobot_nvram_w);
DECLARE_WRITE8_MEMBER(irobot_clearirq_w);
DECLARE_WRITE8_MEMBER(irobot_clearfirq_w);
+ DECLARE_READ8_MEMBER(irobot_sharedmem_r);
+ DECLARE_WRITE8_MEMBER(irobot_sharedmem_w);
+ DECLARE_WRITE8_MEMBER(irobot_statwr_w);
+ DECLARE_WRITE8_MEMBER(irobot_out0_w);
+ DECLARE_WRITE8_MEMBER(irobot_rom_banksel_w);
+ DECLARE_WRITE8_MEMBER(irobot_control_w);
+ DECLARE_READ8_MEMBER(irobot_control_r);
+ DECLARE_READ8_MEMBER(irobot_status_r);
+ DECLARE_WRITE8_MEMBER(irobot_paletteram_w);
};
/*----------- defined in machine/irobot.c -----------*/
@@ -73,14 +82,6 @@ MACHINE_RESET( irobot );
TIMER_DEVICE_CALLBACK( irobot_irvg_done_callback );
TIMER_DEVICE_CALLBACK( irobot_irmb_done_callback );
-READ8_HANDLER( irobot_status_r );
-WRITE8_HANDLER( irobot_statwr_w );
-WRITE8_HANDLER( irobot_out0_w );
-WRITE8_HANDLER( irobot_rom_banksel_w );
-READ8_HANDLER( irobot_control_r );
-WRITE8_HANDLER( irobot_control_w );
-READ8_HANDLER( irobot_sharedmem_r );
-WRITE8_HANDLER( irobot_sharedmem_w );
/*----------- defined in video/irobot.c -----------*/
@@ -89,7 +90,6 @@ PALETTE_INIT( irobot );
VIDEO_START( irobot );
SCREEN_UPDATE_IND16( irobot );
-WRITE8_HANDLER( irobot_paletteram_w );
void irobot_poly_clear(running_machine &machine);
void irobot_run_video(running_machine &machine);
diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h
index 90e87397918..c87d83ff4eb 100644
--- a/src/mame/includes/ironhors.h
+++ b/src/mame/includes/ironhors.h
@@ -29,16 +29,16 @@ public:
device_t *m_maincpu;
device_t *m_soundcpu;
DECLARE_WRITE8_MEMBER(ironhors_sh_irqtrigger_w);
+ DECLARE_WRITE8_MEMBER(ironhors_videoram_w);
+ DECLARE_WRITE8_MEMBER(ironhors_colorram_w);
+ DECLARE_WRITE8_MEMBER(ironhors_charbank_w);
+ DECLARE_WRITE8_MEMBER(ironhors_palettebank_w);
+ DECLARE_WRITE8_MEMBER(ironhors_flipscreen_w);
};
/*----------- defined in video/ironhors.c -----------*/
-WRITE8_HANDLER( ironhors_videoram_w );
-WRITE8_HANDLER( ironhors_colorram_w );
-WRITE8_HANDLER( ironhors_palettebank_w );
-WRITE8_HANDLER( ironhors_charbank_w );
-WRITE8_HANDLER( ironhors_flipscreen_w );
PALETTE_INIT( ironhors );
VIDEO_START( ironhors );
diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h
index 9047793a4bf..fa6d18ca876 100644
--- a/src/mame/includes/itech32.h
+++ b/src/mame/includes/itech32.h
@@ -102,6 +102,27 @@ public:
DECLARE_WRITE32_MEMBER(test1_w);
DECLARE_READ32_MEMBER(test2_r);
DECLARE_WRITE32_MEMBER(test2_w);
+ DECLARE_WRITE16_MEMBER(timekill_colora_w);
+ DECLARE_WRITE16_MEMBER(timekill_colorbc_w);
+ DECLARE_WRITE16_MEMBER(timekill_intensity_w);
+ DECLARE_WRITE16_MEMBER(bloodstm_color1_w);
+ DECLARE_WRITE16_MEMBER(bloodstm_color2_w);
+ DECLARE_WRITE16_MEMBER(bloodstm_plane_w);
+ DECLARE_WRITE32_MEMBER(drivedge_color0_w);
+ DECLARE_WRITE32_MEMBER(itech020_color1_w);
+ DECLARE_WRITE32_MEMBER(itech020_color2_w);
+ DECLARE_WRITE32_MEMBER(itech020_plane_w);
+ DECLARE_WRITE16_MEMBER(timekill_paletteram_w);
+ DECLARE_WRITE16_MEMBER(bloodstm_paletteram_w);
+ DECLARE_WRITE32_MEMBER(drivedge_paletteram_w);
+ DECLARE_WRITE32_MEMBER(itech020_paletteram_w);
+ DECLARE_WRITE16_MEMBER(itech32_video_w);
+ DECLARE_READ16_MEMBER(itech32_video_r);
+ DECLARE_WRITE16_MEMBER(bloodstm_video_w);
+ DECLARE_READ16_MEMBER(bloodstm_video_r);
+ DECLARE_WRITE32_MEMBER(itech020_video_w);
+ DECLARE_WRITE32_MEMBER(drivedge_zbuf_control_w);
+ DECLARE_READ32_MEMBER(itech020_video_r);
};
@@ -114,32 +135,11 @@ void itech32_update_interrupts(running_machine &machine, int vint, int xint, int
VIDEO_START( itech32 );
-WRITE16_HANDLER( timekill_colora_w );
-WRITE16_HANDLER( timekill_colorbc_w );
-WRITE16_HANDLER( timekill_intensity_w );
-WRITE16_HANDLER( bloodstm_color1_w );
-WRITE16_HANDLER( bloodstm_color2_w );
-WRITE16_HANDLER( bloodstm_plane_w );
-WRITE32_HANDLER( drivedge_color0_w );
-WRITE32_HANDLER( itech020_color1_w );
-WRITE32_HANDLER( itech020_color2_w );
-WRITE32_HANDLER( itech020_plane_w );
-WRITE16_HANDLER( timekill_paletteram_w );
-WRITE16_HANDLER( bloodstm_paletteram_w );
-WRITE32_HANDLER( drivedge_paletteram_w );
-WRITE32_HANDLER( itech020_paletteram_w );
-WRITE16_HANDLER( itech32_video_w );
-READ16_HANDLER( itech32_video_r );
-WRITE16_HANDLER( bloodstm_video_w );
-READ16_HANDLER( bloodstm_video_r );
-WRITE32_HANDLER( itech020_video_w );
-READ32_HANDLER( itech020_video_r );
-WRITE32_HANDLER( drivedge_zbuf_control_w );
SCREEN_UPDATE_IND16( itech32 );
diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h
index 11aafb2fb84..5e6e16c5c2f 100644
--- a/src/mame/includes/itech8.h
+++ b/src/mame/includes/itech8.h
@@ -63,6 +63,14 @@ public:
DECLARE_WRITE16_MEMBER(grom_bank16_w);
DECLARE_WRITE16_MEMBER(display_page16_w);
DECLARE_WRITE16_MEMBER(palette16_w);
+ DECLARE_WRITE8_MEMBER(itech8_palette_w);
+ DECLARE_WRITE8_MEMBER(itech8_page_w);
+ DECLARE_READ8_MEMBER(itech8_blitter_r);
+ DECLARE_WRITE8_MEMBER(itech8_blitter_w);
+ DECLARE_WRITE8_MEMBER(itech8_tms34061_w);
+ DECLARE_READ8_MEMBER(itech8_tms34061_r);
+ DECLARE_WRITE8_MEMBER(grmatch_palette_w);
+ DECLARE_WRITE8_MEMBER(grmatch_xscroll_w);
};
@@ -88,18 +96,10 @@ SCREEN_UPDATE_RGB32( slikshot );
VIDEO_START( itech8 );
-WRITE8_HANDLER( itech8_page_w );
-WRITE8_HANDLER( itech8_palette_w );
-READ8_HANDLER( itech8_blitter_r );
-WRITE8_HANDLER( itech8_blitter_w );
-WRITE8_HANDLER( itech8_tms34061_w );
-READ8_HANDLER( itech8_tms34061_r );
-WRITE8_HANDLER( grmatch_palette_w );
-WRITE8_HANDLER( grmatch_xscroll_w );
TIMER_DEVICE_CALLBACK( grmatch_palette_update );
SCREEN_UPDATE_RGB32( itech8_2layer );
diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h
index 6f3b2d96c03..2d175685656 100644
--- a/src/mame/includes/jack.h
+++ b/src/mame/includes/jack.h
@@ -33,16 +33,16 @@ public:
DECLARE_WRITE8_MEMBER(jack_sh_command_w);
DECLARE_WRITE8_MEMBER(joinem_misc_w);
DECLARE_READ8_MEMBER(striv_question_r);
+ DECLARE_WRITE8_MEMBER(jack_videoram_w);
+ DECLARE_WRITE8_MEMBER(jack_colorram_w);
+ DECLARE_WRITE8_MEMBER(jack_paletteram_w);
+ DECLARE_READ8_MEMBER(jack_flipscreen_r);
+ DECLARE_WRITE8_MEMBER(jack_flipscreen_w);
};
/*----------- defined in video/jack.c -----------*/
-WRITE8_HANDLER( jack_videoram_w );
-WRITE8_HANDLER( jack_colorram_w );
-WRITE8_HANDLER( jack_paletteram_w );
-READ8_HANDLER( jack_flipscreen_r );
-WRITE8_HANDLER( jack_flipscreen_w );
VIDEO_START( jack );
SCREEN_UPDATE_IND16( jack );
diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h
index 19425e039ae..f789a9e137f 100644
--- a/src/mame/includes/jailbrek.h
+++ b/src/mame/includes/jailbrek.h
@@ -28,13 +28,13 @@ public:
UINT8 m_irq_enable;
UINT8 m_nmi_enable;
DECLARE_WRITE8_MEMBER(ctrl_w);
+ DECLARE_WRITE8_MEMBER(jailbrek_videoram_w);
+ DECLARE_WRITE8_MEMBER(jailbrek_colorram_w);
};
/*----------- defined in video/jailbrek.c -----------*/
-WRITE8_HANDLER( jailbrek_videoram_w );
-WRITE8_HANDLER( jailbrek_colorram_w );
PALETTE_INIT( jailbrek );
VIDEO_START( jailbrek );
diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h
index 3aceec252eb..1fb5f4cda1c 100644
--- a/src/mame/includes/jedi.h
+++ b/src/mame/includes/jedi.h
@@ -52,6 +52,8 @@ public:
DECLARE_WRITE8_MEMBER(jedi_coin_counter_w);
DECLARE_WRITE8_MEMBER(nvram_data_w);
DECLARE_WRITE8_MEMBER(nvram_enable_w);
+ DECLARE_WRITE8_MEMBER(jedi_vscroll_w);
+ DECLARE_WRITE8_MEMBER(jedi_hscroll_w);
};
@@ -69,5 +71,3 @@ CUSTOM_INPUT( jedi_audio_comm_stat_r );
MACHINE_CONFIG_EXTERN( jedi_video );
-WRITE8_HANDLER( jedi_vscroll_w );
-WRITE8_HANDLER( jedi_hscroll_w );
diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h
index c3924878d34..d4a3eb1e933 100644
--- a/src/mame/includes/jpmimpct.h
+++ b/src/mame/includes/jpmimpct.h
@@ -90,13 +90,13 @@ public:
DECLARE_WRITE16_MEMBER(jpmioawp_w);
DECLARE_READ16_MEMBER(ump_r);
void jpm_draw_lamps(int data, int lamp_strobe);
+ DECLARE_WRITE16_MEMBER(jpmimpct_bt477_w);
+ DECLARE_READ16_MEMBER(jpmimpct_bt477_r);
};
/*----------- defined in video/jpmimpct.c -----------*/
-READ16_HANDLER( jpmimpct_bt477_r );
-WRITE16_HANDLER( jpmimpct_bt477_w );
void jpmimpct_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
void jpmimpct_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h
index d8201c3770b..d85b830a946 100644
--- a/src/mame/includes/kaneko16.h
+++ b/src/mame/includes/kaneko16.h
@@ -120,30 +120,47 @@ public:
DECLARE_READ16_MEMBER(gtmr2_IN1_r);
DECLARE_WRITE16_MEMBER(shogwarr_oki_bank_w);
DECLARE_WRITE16_MEMBER(brapboys_oki_bank_w);
+ DECLARE_READ16_MEMBER(galpanib_calc_r);
+ DECLARE_WRITE16_MEMBER(galpanib_calc_w);
+ DECLARE_WRITE16_MEMBER(bloodwar_calc_w);
+ DECLARE_READ16_MEMBER(bloodwar_calc_r);
+ DECLARE_WRITE16_MEMBER(calc3_mcu_ram_w);
+ DECLARE_WRITE16_MEMBER(calc3_mcu_com0_w);
+ DECLARE_WRITE16_MEMBER(calc3_mcu_com1_w);
+ DECLARE_WRITE16_MEMBER(calc3_mcu_com2_w);
+ DECLARE_WRITE16_MEMBER(calc3_mcu_com3_w);
+ DECLARE_WRITE16_MEMBER(toybox_mcu_com0_w);
+ DECLARE_WRITE16_MEMBER(toybox_mcu_com1_w);
+ DECLARE_WRITE16_MEMBER(toybox_mcu_com2_w);
+ DECLARE_WRITE16_MEMBER(toybox_mcu_com3_w);
+ DECLARE_READ16_MEMBER(toybox_mcu_status_r);
+ void calc3_mcu_com_w(offs_t offset, UINT16 data, UINT16 mem_mask, int _n_);
+ void toybox_mcu_com_w(offs_t offset, UINT16 data, UINT16 mem_mask, int _n_);
+ DECLARE_WRITE16_MEMBER(shogwarr_calc_w);
+ DECLARE_READ16_MEMBER(shogwarr_calc_r);
+ DECLARE_WRITE16_MEMBER(kaneko16_display_enable);
+ DECLARE_WRITE16_MEMBER(kaneko16_vram_0_w);
+ DECLARE_WRITE16_MEMBER(kaneko16_vram_1_w);
+ DECLARE_WRITE16_MEMBER(kaneko16_vram_2_w);
+ DECLARE_WRITE16_MEMBER(kaneko16_vram_3_w);
+ DECLARE_READ16_MEMBER(kaneko16_sprites_regs_r);
+ DECLARE_WRITE16_MEMBER(kaneko16_sprites_regs_w);
+ DECLARE_WRITE16_MEMBER(kaneko16_layers_0_regs_w);
+ DECLARE_WRITE16_MEMBER(kaneko16_layers_1_regs_w);
+ DECLARE_READ16_MEMBER(kaneko16_bg15_select_r);
+ DECLARE_WRITE16_MEMBER(kaneko16_bg15_select_w);
+ DECLARE_READ16_MEMBER(kaneko16_bg15_reg_r);
+ DECLARE_WRITE16_MEMBER(kaneko16_bg15_reg_w);
};
/*----------- defined in machine/kaneko16.c -----------*/
-READ16_HANDLER( galpanib_calc_r );
-WRITE16_HANDLER( galpanib_calc_w );
-READ16_HANDLER( bloodwar_calc_r );
-WRITE16_HANDLER( bloodwar_calc_w );
void calc3_mcu_init(running_machine &machine);
-WRITE16_HANDLER( calc3_mcu_ram_w );
-WRITE16_HANDLER( calc3_mcu_com0_w );
-WRITE16_HANDLER( calc3_mcu_com1_w );
-WRITE16_HANDLER( calc3_mcu_com2_w );
-WRITE16_HANDLER( calc3_mcu_com3_w );
void toybox_mcu_init(running_machine &machine);
-WRITE16_HANDLER( toybox_mcu_com0_w );
-WRITE16_HANDLER( toybox_mcu_com1_w );
-WRITE16_HANDLER( toybox_mcu_com2_w );
-WRITE16_HANDLER( toybox_mcu_com3_w );
-READ16_HANDLER( toybox_mcu_status_r );
void bloodwar_mcu_run(running_machine &machine);
void bonkadv_mcu_run(running_machine &machine);
@@ -164,26 +181,13 @@ MACHINE_RESET( kaneko16 );
/*----------- defined in video/kaneko16.c -----------*/
-WRITE16_HANDLER( kaneko16_display_enable );
-WRITE16_HANDLER( kaneko16_vram_0_w );
-WRITE16_HANDLER( kaneko16_vram_1_w );
-WRITE16_HANDLER( kaneko16_vram_2_w );
-WRITE16_HANDLER( kaneko16_vram_3_w );
-WRITE16_HANDLER( kaneko16_layers_0_regs_w );
-WRITE16_HANDLER( kaneko16_layers_1_regs_w );
-READ16_HANDLER ( kaneko16_sprites_regs_r );
-WRITE16_HANDLER( kaneko16_sprites_regs_w );
void kaneko16_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect);
-READ16_HANDLER ( kaneko16_bg15_select_r );
-WRITE16_HANDLER( kaneko16_bg15_select_w );
-READ16_HANDLER ( kaneko16_bg15_reg_r );
-WRITE16_HANDLER( kaneko16_bg15_reg_w );
PALETTE_INIT( berlwall );
diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h
index 7e469f1d167..5846cd11518 100644
--- a/src/mame/includes/kangaroo.h
+++ b/src/mame/includes/kangaroo.h
@@ -23,6 +23,8 @@ public:
DECLARE_READ8_MEMBER(mcu_sim_r);
DECLARE_WRITE8_MEMBER(mcu_sim_w);
DECLARE_WRITE8_MEMBER(kangaroo_coin_counter_w);
+ DECLARE_WRITE8_MEMBER(kangaroo_videoram_w);
+ DECLARE_WRITE8_MEMBER(kangaroo_video_control_w);
};
@@ -33,5 +35,3 @@ public:
VIDEO_START( kangaroo );
SCREEN_UPDATE_RGB32( kangaroo );
-WRITE8_HANDLER( kangaroo_videoram_w );
-WRITE8_HANDLER( kangaroo_video_control_w );
diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h
index 581cf3b6d81..41c21221b26 100644
--- a/src/mame/includes/karnov.h
+++ b/src/mame/includes/karnov.h
@@ -40,6 +40,8 @@ public:
required_device<buffered_spriteram16_device> m_spriteram;
DECLARE_WRITE16_MEMBER(karnov_control_w);
DECLARE_READ16_MEMBER(karnov_control_r);
+ DECLARE_WRITE16_MEMBER(karnov_videoram_w);
+ DECLARE_WRITE16_MEMBER(karnov_playfield_swap_w);
};
enum {
@@ -54,8 +56,6 @@ enum {
/*----------- defined in video/karnov.c -----------*/
-WRITE16_HANDLER( karnov_playfield_swap_w );
-WRITE16_HANDLER( karnov_videoram_w );
void karnov_flipscreen_w(running_machine &machine, int data);
diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h
index cd771829ddc..f2c1c53ff14 100644
--- a/src/mame/includes/kchamp.h
+++ b/src/mame/includes/kchamp.h
@@ -34,14 +34,14 @@ public:
DECLARE_WRITE8_MEMBER(sound_msm_w);
DECLARE_READ8_MEMBER(sound_reset_r);
DECLARE_WRITE8_MEMBER(kc_sound_control_w);
+ DECLARE_WRITE8_MEMBER(kchamp_videoram_w);
+ DECLARE_WRITE8_MEMBER(kchamp_colorram_w);
+ DECLARE_WRITE8_MEMBER(kchamp_flipscreen_w);
};
/*----------- defined in video/kchamp.c -----------*/
-WRITE8_HANDLER( kchamp_videoram_w );
-WRITE8_HANDLER( kchamp_colorram_w );
-WRITE8_HANDLER( kchamp_flipscreen_w );
PALETTE_INIT( kchamp );
VIDEO_START( kchamp );
diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h
index f304f59d6b3..ef030155bbf 100644
--- a/src/mame/includes/kickgoal.h
+++ b/src/mame/includes/kickgoal.h
@@ -42,14 +42,14 @@ public:
required_device<eeprom_device> m_eeprom;
DECLARE_READ16_MEMBER(kickgoal_eeprom_r);
DECLARE_WRITE16_MEMBER(kickgoal_eeprom_w);
+ DECLARE_WRITE16_MEMBER(kickgoal_fgram_w);
+ DECLARE_WRITE16_MEMBER(kickgoal_bgram_w);
+ DECLARE_WRITE16_MEMBER(kickgoal_bg2ram_w);
};
/*----------- defined in video/kickgoal.c -----------*/
-WRITE16_HANDLER( kickgoal_fgram_w );
-WRITE16_HANDLER( kickgoal_bgram_w );
-WRITE16_HANDLER( kickgoal_bg2ram_w );
VIDEO_START( kickgoal );
SCREEN_UPDATE_IND16( kickgoal );
diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h
index d33ec3f93e9..288ad806692 100644
--- a/src/mame/includes/kingobox.h
+++ b/src/mame/includes/kingobox.h
@@ -35,16 +35,16 @@ public:
DECLARE_WRITE8_MEMBER(sprite_interrupt_w);
DECLARE_WRITE8_MEMBER(scroll_interrupt_w);
DECLARE_WRITE8_MEMBER(sound_command_w);
+ DECLARE_WRITE8_MEMBER(kingofb_videoram_w);
+ DECLARE_WRITE8_MEMBER(kingofb_colorram_w);
+ DECLARE_WRITE8_MEMBER(kingofb_videoram2_w);
+ DECLARE_WRITE8_MEMBER(kingofb_colorram2_w);
+ DECLARE_WRITE8_MEMBER(kingofb_f800_w);
};
/*----------- defined in video/kingobox.c -----------*/
-WRITE8_HANDLER( kingofb_videoram_w );
-WRITE8_HANDLER( kingofb_colorram_w );
-WRITE8_HANDLER( kingofb_videoram2_w );
-WRITE8_HANDLER( kingofb_colorram2_w );
-WRITE8_HANDLER( kingofb_f800_w );
PALETTE_INIT( kingofb );
VIDEO_START( kingofb );
diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h
index 77a5d3953e2..b7d10675929 100644
--- a/src/mame/includes/kncljoe.h
+++ b/src/mame/includes/kncljoe.h
@@ -30,15 +30,15 @@ public:
device_t *m_soundcpu;
DECLARE_WRITE8_MEMBER(sound_cmd_w);
DECLARE_WRITE8_MEMBER(sound_irq_ack_w);
+ DECLARE_WRITE8_MEMBER(kncljoe_videoram_w);
+ DECLARE_WRITE8_MEMBER(kncljoe_control_w);
+ DECLARE_WRITE8_MEMBER(kncljoe_scroll_w);
};
/*----------- defined in video/kncljoe.c -----------*/
-WRITE8_HANDLER(kncljoe_videoram_w);
-WRITE8_HANDLER(kncljoe_control_w);
-WRITE8_HANDLER(kncljoe_scroll_w);
PALETTE_INIT( kncljoe );
VIDEO_START( kncljoe );
diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h
index 220b141bef2..a4b528770ce 100644
--- a/src/mame/includes/konamigx.h
+++ b/src/mame/includes/konamigx.h
@@ -30,6 +30,18 @@ public:
DECLARE_WRITE16_MEMBER(tms57002_data_word_w);
DECLARE_READ16_MEMBER(tms57002_status_word_r);
DECLARE_WRITE16_MEMBER(tms57002_control_word_w);
+ DECLARE_READ16_MEMBER(K055550_word_r);
+ DECLARE_WRITE16_MEMBER(K055550_word_w);
+ DECLARE_WRITE16_MEMBER(K053990_martchmp_word_w);
+ DECLARE_WRITE32_MEMBER(fantjour_dma_w);
+ DECLARE_WRITE32_MEMBER(konamigx_type3_psac2_bank_w);
+ DECLARE_WRITE32_MEMBER(konamigx_palette_w);
+ DECLARE_WRITE32_MEMBER(konamigx_palette2_w);
+ DECLARE_WRITE32_MEMBER(konamigx_555_palette_w);
+ DECLARE_WRITE32_MEMBER(konamigx_555_palette2_w);
+ DECLARE_WRITE32_MEMBER(konamigx_tilebank_w);
+ DECLARE_WRITE32_MEMBER(konamigx_t1_psacmap_w);
+ DECLARE_WRITE32_MEMBER(konamigx_t4_psacmap_w);
};
@@ -124,27 +136,16 @@ SCREEN_UPDATE_RGB32(konamigx);
SCREEN_UPDATE_RGB32(konamigx_left);
SCREEN_UPDATE_RGB32(konamigx_right);
-WRITE32_HANDLER( konamigx_palette_w );
#ifdef UNUSED_FUNCTION
-WRITE32_HANDLER( konamigx_palette2_w );
-WRITE32_HANDLER( konamigx_555_palette_w );
-WRITE32_HANDLER( konamigx_555_palette2_w );
#endif
-WRITE32_HANDLER( konamigx_tilebank_w );
-WRITE32_HANDLER( konamigx_t1_psacmap_w );
-WRITE32_HANDLER( konamigx_t4_psacmap_w );
extern int konamigx_current_frame;
-WRITE32_HANDLER( konamigx_type3_psac2_bank_w );
extern UINT32* konamigx_type3_psac2_bank;
/*----------- defined in machine/konamigx.c -----------*/
// K055550/K053990/ESC protection devices handlers
-READ16_HANDLER ( K055550_word_r );
-WRITE16_HANDLER( K055550_word_w );
-WRITE16_HANDLER( K053990_martchmp_word_w );
void konamigx_esc_alert(UINT32 *srcbase, int srcoffs, int count, int mode);
void fantjour_dma_install(running_machine &machine);
diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h
index a0f06f95f6e..dea20fff97e 100644
--- a/src/mame/includes/kopunch.h
+++ b/src/mame/includes/kopunch.h
@@ -27,15 +27,15 @@ public:
DECLARE_READ8_MEMBER(kopunch_in_r);
DECLARE_WRITE8_MEMBER(kopunch_lamp_w);
DECLARE_WRITE8_MEMBER(kopunch_coin_w);
+ DECLARE_WRITE8_MEMBER(kopunch_videoram_w);
+ DECLARE_WRITE8_MEMBER(kopunch_videoram2_w);
+ DECLARE_WRITE8_MEMBER(kopunch_scroll_x_w);
+ DECLARE_WRITE8_MEMBER(kopunch_scroll_y_w);
+ DECLARE_WRITE8_MEMBER(kopunch_gfxbank_w);
};
/*----------- defined in video/kopunch.c -----------*/
-WRITE8_HANDLER( kopunch_videoram_w );
-WRITE8_HANDLER( kopunch_videoram2_w );
-WRITE8_HANDLER( kopunch_scroll_x_w );
-WRITE8_HANDLER( kopunch_scroll_y_w );
-WRITE8_HANDLER( kopunch_gfxbank_w );
PALETTE_INIT( kopunch );
VIDEO_START( kopunch );
diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h
index b095346182d..bbfeb89bc72 100644
--- a/src/mame/includes/ksayakyu.h
+++ b/src/mame/includes/ksayakyu.h
@@ -27,13 +27,13 @@ public:
DECLARE_WRITE8_MEMBER(latch_w);
DECLARE_READ8_MEMBER(sound_status_r);
DECLARE_WRITE8_MEMBER(tomaincpu_w);
+ DECLARE_WRITE8_MEMBER(ksayakyu_videoram_w);
+ DECLARE_WRITE8_MEMBER(ksayakyu_videoctrl_w);
};
/*----------- defined in video/ksayakyu.c -----------*/
-WRITE8_HANDLER( ksayakyu_videoram_w );
-WRITE8_HANDLER( ksayakyu_videoctrl_w );
PALETTE_INIT( ksayakyu );
VIDEO_START( ksayakyu );
SCREEN_UPDATE_IND16( ksayakyu );
diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h
index b79109ca47f..5c11a8937ea 100644
--- a/src/mame/includes/kyugo.h
+++ b/src/mame/includes/kyugo.h
@@ -37,20 +37,20 @@ public:
DECLARE_WRITE8_MEMBER(kyugo_nmi_mask_w);
DECLARE_WRITE8_MEMBER(kyugo_sub_cpu_control_w);
DECLARE_WRITE8_MEMBER(kyugo_coin_counter_w);
+ DECLARE_WRITE8_MEMBER(kyugo_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(kyugo_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(kyugo_bgattribram_w);
+ DECLARE_READ8_MEMBER(kyugo_spriteram_2_r);
+ DECLARE_WRITE8_MEMBER(kyugo_scroll_x_lo_w);
+ DECLARE_WRITE8_MEMBER(kyugo_gfxctrl_w);
+ DECLARE_WRITE8_MEMBER(kyugo_scroll_y_w);
+ DECLARE_WRITE8_MEMBER(kyugo_flipscreen_w);
};
/*----------- defined in video/kyugo.c -----------*/
-READ8_HANDLER( kyugo_spriteram_2_r );
-WRITE8_HANDLER( kyugo_fgvideoram_w );
-WRITE8_HANDLER( kyugo_bgvideoram_w );
-WRITE8_HANDLER( kyugo_bgattribram_w );
-WRITE8_HANDLER( kyugo_scroll_x_lo_w );
-WRITE8_HANDLER( kyugo_gfxctrl_w );
-WRITE8_HANDLER( kyugo_scroll_y_w );
-WRITE8_HANDLER( kyugo_flipscreen_w );
VIDEO_START( kyugo );
SCREEN_UPDATE_IND16( kyugo );
diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h
index 7625f6ad015..e9e421c78c6 100644
--- a/src/mame/includes/labyrunr.h
+++ b/src/mame/includes/labyrunr.h
@@ -30,14 +30,14 @@ public:
required_device<cpu_device> m_maincpu;
DECLARE_WRITE8_MEMBER(labyrunr_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(labyrunr_vram1_w);
+ DECLARE_WRITE8_MEMBER(labyrunr_vram2_w);
};
/*----------- defined in video/labyrunr.c -----------*/
-WRITE8_HANDLER( labyrunr_vram1_w );
-WRITE8_HANDLER( labyrunr_vram2_w );
PALETTE_INIT( labyrunr );
VIDEO_START( labyrunr );
diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h
index 8d2b1b224e6..9fb25465ddd 100644
--- a/src/mame/includes/ladybug.h
+++ b/src/mame/includes/ladybug.h
@@ -47,15 +47,15 @@ public:
DECLARE_WRITE8_MEMBER(sraider_sound_high_w);
DECLARE_READ8_MEMBER(sraider_8005_r);
DECLARE_WRITE8_MEMBER(sraider_misc_w);
+ DECLARE_WRITE8_MEMBER(ladybug_videoram_w);
+ DECLARE_WRITE8_MEMBER(ladybug_colorram_w);
+ DECLARE_WRITE8_MEMBER(ladybug_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(sraider_io_w);
};
/*----------- defined in video/ladybug.c -----------*/
-WRITE8_HANDLER( ladybug_videoram_w );
-WRITE8_HANDLER( ladybug_colorram_w );
-WRITE8_HANDLER( ladybug_flipscreen_w );
-WRITE8_HANDLER( sraider_io_w );
PALETTE_INIT( ladybug );
VIDEO_START( ladybug );
diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h
index cf59aeed57b..8bc8f58a31a 100644
--- a/src/mame/includes/ladyfrog.h
+++ b/src/mame/includes/ladyfrog.h
@@ -39,22 +39,23 @@ public:
DECLARE_WRITE8_MEMBER(nmi_disable_w);
DECLARE_WRITE8_MEMBER(nmi_enable_w);
DECLARE_READ8_MEMBER(snd_flag_r);
+ DECLARE_WRITE8_MEMBER(ladyfrog_spriteram_w);
+ DECLARE_READ8_MEMBER(ladyfrog_spriteram_r);
+ DECLARE_WRITE8_MEMBER(ladyfrog_videoram_w);
+ DECLARE_READ8_MEMBER(ladyfrog_videoram_r);
+ DECLARE_WRITE8_MEMBER(ladyfrog_palette_w);
+ DECLARE_READ8_MEMBER(ladyfrog_palette_r);
+ DECLARE_WRITE8_MEMBER(ladyfrog_gfxctrl_w);
+ DECLARE_WRITE8_MEMBER(ladyfrog_gfxctrl2_w);
+ DECLARE_READ8_MEMBER(ladyfrog_gfxctrl_r);
+ DECLARE_READ8_MEMBER(ladyfrog_scrlram_r);
+ DECLARE_WRITE8_MEMBER(ladyfrog_scrlram_w);
};
/*----------- defined in video/ladyfrog.c -----------*/
-WRITE8_HANDLER( ladyfrog_videoram_w );
-WRITE8_HANDLER( ladyfrog_spriteram_w );
-WRITE8_HANDLER( ladyfrog_palette_w );
-WRITE8_HANDLER( ladyfrog_gfxctrl_w );
-WRITE8_HANDLER( ladyfrog_gfxctrl2_w );
-WRITE8_HANDLER( ladyfrog_scrlram_w );
-
-READ8_HANDLER( ladyfrog_spriteram_r );
-READ8_HANDLER( ladyfrog_palette_r );
-READ8_HANDLER( ladyfrog_scrlram_r );
-READ8_HANDLER( ladyfrog_videoram_r );
+
VIDEO_START( ladyfrog );
VIDEO_START( toucheme );
diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h
index 99cb1a2e1c2..56a6ebd2e96 100644
--- a/src/mame/includes/lasso.h
+++ b/src/mame/includes/lasso.h
@@ -36,16 +36,17 @@ public:
DECLARE_WRITE8_MEMBER(pinbo_sound_command_w);
DECLARE_READ8_MEMBER(sound_status_r);
DECLARE_WRITE8_MEMBER(sound_select_w);
+ DECLARE_WRITE8_MEMBER(lasso_videoram_w);
+ DECLARE_WRITE8_MEMBER(lasso_colorram_w);
+ DECLARE_WRITE8_MEMBER(lasso_flip_screen_w);
+ DECLARE_WRITE8_MEMBER(lasso_video_control_w);
+ DECLARE_WRITE8_MEMBER(wwjgtin_video_control_w);
+ DECLARE_WRITE8_MEMBER(pinbo_video_control_w);
};
/*----------- defined in video/lasso.c -----------*/
-WRITE8_HANDLER( lasso_videoram_w );
-WRITE8_HANDLER( lasso_colorram_w );
-WRITE8_HANDLER( lasso_video_control_w );
-WRITE8_HANDLER( wwjgtin_video_control_w );
-WRITE8_HANDLER( pinbo_video_control_w );
PALETTE_INIT( lasso );
PALETTE_INIT( wwjgtin );
diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h
index 35561bb87f9..4a03a4b62bd 100644
--- a/src/mame/includes/lastduel.h
+++ b/src/mame/includes/lastduel.h
@@ -37,18 +37,18 @@ public:
required_device<buffered_spriteram16_device> m_spriteram;
DECLARE_WRITE16_MEMBER(lastduel_sound_w);
DECLARE_WRITE8_MEMBER(mg_bankswitch_w);
+ DECLARE_WRITE16_MEMBER(lastduel_flip_w);
+ DECLARE_WRITE16_MEMBER(lastduel_scroll_w);
+ DECLARE_WRITE16_MEMBER(lastduel_scroll1_w);
+ DECLARE_WRITE16_MEMBER(lastduel_scroll2_w);
+ DECLARE_WRITE16_MEMBER(lastduel_vram_w);
+ DECLARE_WRITE16_MEMBER(madgear_scroll1_w);
+ DECLARE_WRITE16_MEMBER(madgear_scroll2_w);
+ DECLARE_WRITE16_MEMBER(lastduel_palette_word_w);
};
/*----------- defined in video/lastduel.c -----------*/
-WRITE16_HANDLER( lastduel_vram_w );
-WRITE16_HANDLER( lastduel_flip_w );
-WRITE16_HANDLER( lastduel_scroll1_w );
-WRITE16_HANDLER( lastduel_scroll2_w );
-WRITE16_HANDLER( madgear_scroll1_w );
-WRITE16_HANDLER( madgear_scroll2_w );
-WRITE16_HANDLER( lastduel_scroll_w );
-WRITE16_HANDLER( lastduel_palette_word_w );
VIDEO_START( lastduel );
VIDEO_START( madgear );
diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h
index bf3a9e022bf..b2a14699ad6 100644
--- a/src/mame/includes/legionna.h
+++ b/src/mame/includes/legionna.h
@@ -24,6 +24,10 @@ public:
UINT16 m_mid_gfx_bank;
required_shared_ptr<UINT16> m_spriteram;
DECLARE_WRITE16_MEMBER(denjin_paletteram16_xBBBBBGGGGGRRRRR_word_w);
+ DECLARE_WRITE16_MEMBER(legionna_background_w);
+ DECLARE_WRITE16_MEMBER(legionna_midground_w);
+ DECLARE_WRITE16_MEMBER(legionna_foreground_w);
+ DECLARE_WRITE16_MEMBER(legionna_text_w);
};
@@ -31,10 +35,6 @@ public:
void heatbrl_setgfxbank(running_machine &machine, UINT16 data);
void denjinmk_setgfxbank(running_machine &machine, UINT16 data);
-WRITE16_HANDLER( legionna_background_w );
-WRITE16_HANDLER( legionna_foreground_w );
-WRITE16_HANDLER( legionna_midground_w );
-WRITE16_HANDLER( legionna_text_w );
VIDEO_START( legionna );
VIDEO_START( cupsoc );
diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h
index c035da5386b..f9e6aff5264 100644
--- a/src/mame/includes/leland.h
+++ b/src/mame/includes/leland.h
@@ -63,6 +63,51 @@ public:
UINT8 m_gfxbank;
UINT16 m_last_scanline;
emu_timer *m_scanline_timer;
+ DECLARE_READ8_MEMBER(cerberus_dial_1_r);
+ DECLARE_READ8_MEMBER(cerberus_dial_2_r);
+ DECLARE_WRITE8_MEMBER(alleymas_joystick_kludge);
+ DECLARE_READ8_MEMBER(dangerz_input_y_r);
+ DECLARE_READ8_MEMBER(dangerz_input_x_r);
+ DECLARE_READ8_MEMBER(dangerz_input_upper_r);
+ DECLARE_READ8_MEMBER(redline_pedal_1_r);
+ DECLARE_READ8_MEMBER(redline_pedal_2_r);
+ DECLARE_READ8_MEMBER(redline_wheel_1_r);
+ DECLARE_READ8_MEMBER(redline_wheel_2_r);
+ DECLARE_READ8_MEMBER(offroad_wheel_1_r);
+ DECLARE_READ8_MEMBER(offroad_wheel_2_r);
+ DECLARE_READ8_MEMBER(offroad_wheel_3_r);
+ DECLARE_READ8_MEMBER(ataxx_trackball_r);
+ DECLARE_READ8_MEMBER(indyheat_wheel_r);
+ DECLARE_READ8_MEMBER(indyheat_analog_r);
+ DECLARE_WRITE8_MEMBER(indyheat_analog_w);
+ DECLARE_WRITE8_MEMBER(leland_master_alt_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(leland_battery_ram_w);
+ DECLARE_WRITE8_MEMBER(ataxx_battery_ram_w);
+ DECLARE_READ8_MEMBER(leland_master_analog_key_r);
+ DECLARE_WRITE8_MEMBER(leland_master_analog_key_w);
+ DECLARE_READ8_MEMBER(leland_master_input_r);
+ DECLARE_WRITE8_MEMBER(leland_master_output_w);
+ DECLARE_READ8_MEMBER(ataxx_master_input_r);
+ DECLARE_WRITE8_MEMBER(ataxx_master_output_w);
+ DECLARE_WRITE8_MEMBER(leland_gated_paletteram_w);
+ DECLARE_READ8_MEMBER(leland_gated_paletteram_r);
+ DECLARE_WRITE8_MEMBER(ataxx_paletteram_and_misc_w);
+ DECLARE_READ8_MEMBER(ataxx_paletteram_and_misc_r);
+ DECLARE_WRITE8_MEMBER(leland_slave_small_banksw_w);
+ DECLARE_WRITE8_MEMBER(leland_slave_large_banksw_w);
+ DECLARE_WRITE8_MEMBER(ataxx_slave_banksw_w);
+ DECLARE_READ8_MEMBER(leland_raster_r);
+ DECLARE_WRITE8_MEMBER(leland_scroll_w);
+ DECLARE_WRITE8_MEMBER(leland_master_video_addr_w);
+ DECLARE_WRITE8_MEMBER(leland_mvram_port_w);
+ DECLARE_READ8_MEMBER(leland_mvram_port_r);
+ DECLARE_WRITE8_MEMBER(leland_slave_video_addr_w);
+ DECLARE_WRITE8_MEMBER(leland_svram_port_w);
+ DECLARE_READ8_MEMBER(leland_svram_port_r);
+ DECLARE_WRITE8_MEMBER(ataxx_mvram_port_w);
+ DECLARE_WRITE8_MEMBER(ataxx_svram_port_w);
+ DECLARE_READ8_MEMBER(ataxx_mvram_port_r);
+ DECLARE_READ8_MEMBER(ataxx_svram_port_r);
};
@@ -74,29 +119,12 @@ public:
#define SERIAL_TYPE_ENCRYPT 3
#define SERIAL_TYPE_ENCRYPT_XOR 4
-READ8_HANDLER( cerberus_dial_1_r );
-READ8_HANDLER( cerberus_dial_2_r );
-WRITE8_HANDLER( alleymas_joystick_kludge );
-READ8_HANDLER( dangerz_input_y_r );
-READ8_HANDLER( dangerz_input_x_r );
-READ8_HANDLER( dangerz_input_upper_r );
-READ8_HANDLER( redline_pedal_1_r );
-READ8_HANDLER( redline_pedal_2_r );
-READ8_HANDLER( redline_wheel_1_r );
-READ8_HANDLER( redline_wheel_2_r );
-READ8_HANDLER( offroad_wheel_1_r );
-READ8_HANDLER( offroad_wheel_2_r );
-READ8_HANDLER( offroad_wheel_3_r );
-READ8_HANDLER( ataxx_trackball_r );
-READ8_HANDLER( indyheat_wheel_r );
-READ8_HANDLER( indyheat_analog_r );
-WRITE8_HANDLER( indyheat_analog_w );
MACHINE_START( leland );
MACHINE_RESET( leland );
@@ -105,7 +133,6 @@ MACHINE_RESET( ataxx );
INTERRUPT_GEN( leland_master_interrupt );
-WRITE8_HANDLER( leland_master_alt_bankswitch_w );
void cerberus_bankswitch(running_machine &machine);
void mayhem_bankswitch(running_machine &machine);
void dangerz_bankswitch(running_machine &machine);
@@ -121,30 +148,14 @@ void ataxx_init_eeprom(running_machine &machine, const UINT16 *data);
READ8_DEVICE_HANDLER( ataxx_eeprom_r );
WRITE8_DEVICE_HANDLER( ataxx_eeprom_w );
-WRITE8_HANDLER( leland_battery_ram_w );
-WRITE8_HANDLER( ataxx_battery_ram_w );
-READ8_HANDLER( leland_master_analog_key_r );
-WRITE8_HANDLER( leland_master_analog_key_w );
-READ8_HANDLER( leland_master_input_r );
-WRITE8_HANDLER( leland_master_output_w );
-READ8_HANDLER( ataxx_master_input_r );
-WRITE8_HANDLER( ataxx_master_output_w );
-WRITE8_HANDLER( leland_gated_paletteram_w );
-READ8_HANDLER( leland_gated_paletteram_r );
-WRITE8_HANDLER( ataxx_paletteram_and_misc_w );
-READ8_HANDLER( ataxx_paletteram_and_misc_r );
READ8_DEVICE_HANDLER( leland_sound_port_r );
WRITE8_DEVICE_HANDLER( leland_sound_port_w );
-WRITE8_HANDLER( leland_slave_small_banksw_w );
-WRITE8_HANDLER( leland_slave_large_banksw_w );
-WRITE8_HANDLER( ataxx_slave_banksw_w );
-READ8_HANDLER( leland_raster_r );
void leland_rotate_memory(running_machine &machine, const char *cpuname);
@@ -172,21 +183,10 @@ ADDRESS_MAP_EXTERN(ataxx_80186_map_io, 16);
/*----------- defined in video/leland.c -----------*/
-WRITE8_HANDLER( leland_scroll_w );
WRITE8_DEVICE_HANDLER( leland_gfx_port_w );
-WRITE8_HANDLER( leland_master_video_addr_w );
-WRITE8_HANDLER( leland_mvram_port_w );
-READ8_HANDLER( leland_mvram_port_r );
-WRITE8_HANDLER( leland_slave_video_addr_w );
-WRITE8_HANDLER( leland_svram_port_w );
-READ8_HANDLER( leland_svram_port_r );
-WRITE8_HANDLER( ataxx_mvram_port_w );
-WRITE8_HANDLER( ataxx_svram_port_w );
-READ8_HANDLER( ataxx_mvram_port_r );
-READ8_HANDLER( ataxx_svram_port_r );
MACHINE_CONFIG_EXTERN( leland_video );
MACHINE_CONFIG_EXTERN( ataxx_video );
diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h
index ddb6b262e46..028e63ab929 100644
--- a/src/mame/includes/lemmings.h
+++ b/src/mame/includes/lemmings.h
@@ -33,14 +33,14 @@ public:
DECLARE_WRITE16_MEMBER(lemmings_palette_24bit_w);
DECLARE_WRITE16_MEMBER(lemmings_sound_w);
DECLARE_WRITE8_MEMBER(lemmings_sound_ack_w);
+ DECLARE_WRITE16_MEMBER(lemmings_pixel_0_w);
+ DECLARE_WRITE16_MEMBER(lemmings_pixel_1_w);
+ DECLARE_WRITE16_MEMBER(lemmings_vram_w);
};
/*----------- defined in video/lemmings.c -----------*/
-WRITE16_HANDLER( lemmings_pixel_0_w );
-WRITE16_HANDLER( lemmings_pixel_1_w );
-WRITE16_HANDLER( lemmings_vram_w );
VIDEO_START( lemmings );
SCREEN_VBLANK( lemmings );
diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h
index 3ed332d55a6..d47fb6a4b6d 100644
--- a/src/mame/includes/lethal.h
+++ b/src/mame/includes/lethal.h
@@ -34,6 +34,7 @@ public:
DECLARE_WRITE8_MEMBER(le_bgcolor_w);
DECLARE_READ8_MEMBER(guns_r);
DECLARE_READ8_MEMBER(gunsaux_r);
+ DECLARE_WRITE8_MEMBER(lethalen_palette_control);
};
/*----------- defined in video/lethal.c -----------*/
@@ -41,7 +42,6 @@ public:
extern void lethalen_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask);
extern void lethalen_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags);
-WRITE8_HANDLER(lethalen_palette_control);
VIDEO_START(lethalen);
SCREEN_UPDATE_IND16(lethalen);
diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h
index 56be8e67e3c..37dfaf469a5 100644
--- a/src/mame/includes/lethalj.h
+++ b/src/mame/includes/lethalj.h
@@ -21,15 +21,16 @@ public:
DECLARE_WRITE16_MEMBER(ripribit_control_w);
DECLARE_WRITE16_MEMBER(cfarm_control_w);
DECLARE_WRITE16_MEMBER(cclownz_control_w);
+ DECLARE_READ16_MEMBER(lethalj_gun_r);
+ DECLARE_WRITE16_MEMBER(lethalj_blitter_w);
+ void do_blit();
};
/*----------- defined in video/lethalj.c -----------*/
-READ16_HANDLER( lethalj_gun_r );
VIDEO_START( lethalj );
-WRITE16_HANDLER( lethalj_blitter_w );
void lethalj_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params);
diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h
index cbab7e7dfa3..90b7c03c4c3 100644
--- a/src/mame/includes/liberate.h
+++ b/src/mame/includes/liberate.h
@@ -35,6 +35,13 @@ public:
DECLARE_WRITE8_MEMBER(prosoccr_io_bank_w);
DECLARE_READ8_MEMBER(prosport_charram_r);
DECLARE_WRITE8_MEMBER(prosport_charram_w);
+ DECLARE_WRITE8_MEMBER(deco16_io_w);
+ DECLARE_WRITE8_MEMBER(prosoccr_io_w);
+ DECLARE_WRITE8_MEMBER(prosport_io_w);
+ DECLARE_WRITE8_MEMBER(liberate_videoram_w);
+ DECLARE_WRITE8_MEMBER(liberate_colorram_w);
+ DECLARE_WRITE8_MEMBER(prosport_bg_vram_w);
+ DECLARE_WRITE8_MEMBER(prosport_paletteram_w);
};
@@ -50,11 +57,4 @@ VIDEO_START( prosport );
VIDEO_START( boomrang );
VIDEO_START( liberate );
-WRITE8_HANDLER( deco16_io_w );
-WRITE8_HANDLER( prosoccr_io_w );
-WRITE8_HANDLER( prosport_io_w );
-WRITE8_HANDLER( prosport_paletteram_w );
-WRITE8_HANDLER( prosport_bg_vram_w );
-WRITE8_HANDLER( liberate_videoram_w );
-WRITE8_HANDLER( liberate_colorram_w );
diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h
index 254751c543f..a6e1607fe03 100644
--- a/src/mame/includes/lkage.h
+++ b/src/mame/includes/lkage.h
@@ -56,27 +56,27 @@ public:
DECLARE_READ8_MEMBER(fake_mcu_r);
DECLARE_WRITE8_MEMBER(fake_mcu_w);
DECLARE_READ8_MEMBER(fake_status_r);
+ DECLARE_READ8_MEMBER(lkage_68705_port_a_r);
+ DECLARE_WRITE8_MEMBER(lkage_68705_port_a_w);
+ DECLARE_WRITE8_MEMBER(lkage_68705_ddr_a_w);
+ DECLARE_READ8_MEMBER(lkage_68705_port_b_r);
+ DECLARE_WRITE8_MEMBER(lkage_68705_port_b_w);
+ DECLARE_WRITE8_MEMBER(lkage_68705_ddr_b_w);
+ DECLARE_READ8_MEMBER(lkage_68705_port_c_r);
+ DECLARE_WRITE8_MEMBER(lkage_68705_port_c_w);
+ DECLARE_WRITE8_MEMBER(lkage_68705_ddr_c_w);
+ DECLARE_WRITE8_MEMBER(lkage_mcu_w);
+ DECLARE_READ8_MEMBER(lkage_mcu_r);
+ DECLARE_READ8_MEMBER(lkage_mcu_status_r);
+ DECLARE_WRITE8_MEMBER(lkage_videoram_w);
};
/*----------- defined in machine/lkage.c -----------*/
-READ8_HANDLER( lkage_68705_port_a_r );
-WRITE8_HANDLER( lkage_68705_port_a_w );
-READ8_HANDLER( lkage_68705_port_b_r );
-WRITE8_HANDLER( lkage_68705_port_b_w );
-READ8_HANDLER( lkage_68705_port_c_r );
-WRITE8_HANDLER( lkage_68705_port_c_w );
-WRITE8_HANDLER( lkage_68705_ddr_a_w );
-WRITE8_HANDLER( lkage_68705_ddr_b_w );
-WRITE8_HANDLER( lkage_68705_ddr_c_w );
-WRITE8_HANDLER( lkage_mcu_w );
-READ8_HANDLER( lkage_mcu_r );
-READ8_HANDLER( lkage_mcu_status_r );
/*----------- defined in video/lkage.c -----------*/
-WRITE8_HANDLER( lkage_videoram_w );
VIDEO_START( lkage );
SCREEN_UPDATE_IND16( lkage );
diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h
index e046e09c0ec..287a1f13630 100644
--- a/src/mame/includes/lockon.h
+++ b/src/mame/includes/lockon.h
@@ -73,6 +73,17 @@ public:
device_t *m_f2203_1r;
device_t *m_f2203_2r;
device_t *m_f2203_3r;
+ DECLARE_READ16_MEMBER(lockon_crtc_r);
+ DECLARE_WRITE16_MEMBER(lockon_crtc_w);
+ DECLARE_WRITE16_MEMBER(lockon_char_w);
+ DECLARE_WRITE16_MEMBER(lockon_scene_h_scr_w);
+ DECLARE_WRITE16_MEMBER(lockon_scene_v_scr_w);
+ DECLARE_WRITE16_MEMBER(lockon_ground_ctrl_w);
+ DECLARE_WRITE16_MEMBER(lockon_tza112_w);
+ DECLARE_READ16_MEMBER(lockon_obj_4000_r);
+ DECLARE_WRITE16_MEMBER(lockon_obj_4000_w);
+ DECLARE_WRITE16_MEMBER(lockon_fb_clut_w);
+ DECLARE_WRITE16_MEMBER(lockon_rotate_w);
};
@@ -82,15 +93,4 @@ PALETTE_INIT( lockon );
VIDEO_START( lockon );
SCREEN_UPDATE_IND16( lockon );
SCREEN_VBLANK( lockon );
-READ16_HANDLER( lockon_crtc_r );
-WRITE16_HANDLER( lockon_crtc_w );
-WRITE16_HANDLER( lockon_rotate_w );
-WRITE16_HANDLER( lockon_fb_clut_w );
-WRITE16_HANDLER( lockon_scene_h_scr_w );
-WRITE16_HANDLER( lockon_scene_v_scr_w );
-WRITE16_HANDLER( lockon_ground_ctrl_w );
-WRITE16_HANDLER( lockon_char_w );
-
-WRITE16_HANDLER( lockon_tza112_w );
-READ16_HANDLER( lockon_obj_4000_r );
-WRITE16_HANDLER( lockon_obj_4000_w );
+
diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h
index 0d0c0f8e09b..2ea0f42d0b1 100644
--- a/src/mame/includes/lordgun.h
+++ b/src/mame/includes/lordgun.h
@@ -37,16 +37,16 @@ public:
DECLARE_READ16_MEMBER(lordgun_gun_1_x_r);
DECLARE_READ16_MEMBER(lordgun_gun_1_y_r);
DECLARE_WRITE16_MEMBER(lordgun_soundlatch_w);
+ DECLARE_WRITE16_MEMBER(lordgun_paletteram_w);
+ DECLARE_WRITE16_MEMBER(lordgun_vram_0_w);
+ DECLARE_WRITE16_MEMBER(lordgun_vram_1_w);
+ DECLARE_WRITE16_MEMBER(lordgun_vram_2_w);
+ DECLARE_WRITE16_MEMBER(lordgun_vram_3_w);
};
/*----------- defined in video/lordgun.c -----------*/
-WRITE16_HANDLER( lordgun_paletteram_w );
-WRITE16_HANDLER( lordgun_vram_0_w );
-WRITE16_HANDLER( lordgun_vram_1_w );
-WRITE16_HANDLER( lordgun_vram_2_w );
-WRITE16_HANDLER( lordgun_vram_3_w );
float lordgun_crosshair_mapper(const input_field_config *field, float linear_value);
void lordgun_update_gun(running_machine &machine, int i);
diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h
index fe51430c845..c04ab6326b2 100644
--- a/src/mame/includes/lsasquad.h
+++ b/src/mame/includes/lsasquad.h
@@ -36,31 +36,31 @@ public:
device_t *m_audiocpu;
device_t *m_mcu;
DECLARE_WRITE8_MEMBER(lsasquad_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(lsasquad_sh_nmi_disable_w);
+ DECLARE_WRITE8_MEMBER(lsasquad_sh_nmi_enable_w);
+ DECLARE_WRITE8_MEMBER(lsasquad_sound_command_w);
+ DECLARE_READ8_MEMBER(lsasquad_sh_sound_command_r);
+ DECLARE_WRITE8_MEMBER(lsasquad_sh_result_w);
+ DECLARE_READ8_MEMBER(lsasquad_sound_result_r);
+ DECLARE_READ8_MEMBER(lsasquad_sound_status_r);
+ DECLARE_READ8_MEMBER(daikaiju_sh_sound_command_r);
+ DECLARE_READ8_MEMBER(daikaiju_sound_status_r);
+ DECLARE_READ8_MEMBER(lsasquad_68705_port_a_r);
+ DECLARE_WRITE8_MEMBER(lsasquad_68705_port_a_w);
+ DECLARE_WRITE8_MEMBER(lsasquad_68705_ddr_a_w);
+ DECLARE_READ8_MEMBER(lsasquad_68705_port_b_r);
+ DECLARE_WRITE8_MEMBER(lsasquad_68705_port_b_w);
+ DECLARE_WRITE8_MEMBER(lsasquad_68705_ddr_b_w);
+ DECLARE_WRITE8_MEMBER(lsasquad_mcu_w);
+ DECLARE_READ8_MEMBER(lsasquad_mcu_r);
+ DECLARE_READ8_MEMBER(lsasquad_mcu_status_r);
+ DECLARE_READ8_MEMBER(daikaiju_mcu_status_r);
};
/*----------- defined in machine/lsasquad.c -----------*/
-WRITE8_HANDLER( lsasquad_sh_nmi_disable_w );
-WRITE8_HANDLER( lsasquad_sh_nmi_enable_w );
-WRITE8_HANDLER( lsasquad_sound_command_w );
-READ8_HANDLER( lsasquad_sh_sound_command_r );
-WRITE8_HANDLER( lsasquad_sh_result_w );
-READ8_HANDLER( lsasquad_sound_result_r );
-READ8_HANDLER( lsasquad_sound_status_r );
-READ8_HANDLER( lsasquad_68705_port_a_r );
-WRITE8_HANDLER( lsasquad_68705_port_a_w );
-WRITE8_HANDLER( lsasquad_68705_ddr_a_w );
-READ8_HANDLER( lsasquad_68705_port_b_r );
-WRITE8_HANDLER( lsasquad_68705_port_b_w );
-WRITE8_HANDLER( lsasquad_68705_ddr_b_w );
-WRITE8_HANDLER( lsasquad_mcu_w );
-READ8_HANDLER( lsasquad_mcu_r );
-READ8_HANDLER( lsasquad_mcu_status_r );
-READ8_HANDLER( daikaiju_sound_status_r );
-READ8_HANDLER( daikaiju_sh_sound_command_r );
-READ8_HANDLER( daikaiju_mcu_status_r );
/*----------- defined in video/lsasquad.c -----------*/
diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h
index 44305fced2d..1b0df79e294 100644
--- a/src/mame/includes/lucky74.h
+++ b/src/mame/includes/lucky74.h
@@ -24,15 +24,15 @@ public:
DECLARE_WRITE8_MEMBER(usart_8251_w);
DECLARE_READ8_MEMBER(copro_sm7831_r);
DECLARE_WRITE8_MEMBER(copro_sm7831_w);
+ DECLARE_WRITE8_MEMBER(lucky74_fg_videoram_w);
+ DECLARE_WRITE8_MEMBER(lucky74_fg_colorram_w);
+ DECLARE_WRITE8_MEMBER(lucky74_bg_videoram_w);
+ DECLARE_WRITE8_MEMBER(lucky74_bg_colorram_w);
};
/*----------- defined in video/lucky74.c -----------*/
-WRITE8_HANDLER( lucky74_fg_videoram_w );
-WRITE8_HANDLER( lucky74_fg_colorram_w );
-WRITE8_HANDLER( lucky74_bg_videoram_w );
-WRITE8_HANDLER( lucky74_bg_colorram_w );
PALETTE_INIT( lucky74 );
VIDEO_START( lucky74 );
SCREEN_UPDATE_IND16( lucky74 );
diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h
index 609ddf00825..293160599f4 100644
--- a/src/mame/includes/lvcards.h
+++ b/src/mame/includes/lvcards.h
@@ -13,13 +13,13 @@ public:
DECLARE_WRITE8_MEMBER(control_port_2_w);
DECLARE_WRITE8_MEMBER(control_port_2a_w);
DECLARE_READ8_MEMBER(payout_r);
+ DECLARE_WRITE8_MEMBER(lvcards_videoram_w);
+ DECLARE_WRITE8_MEMBER(lvcards_colorram_w);
};
/*----------- defined in video/lvcards.c -----------*/
-WRITE8_HANDLER( lvcards_videoram_w );
-WRITE8_HANDLER( lvcards_colorram_w );
PALETTE_INIT( lvcards );
PALETTE_INIT( ponttehk );
diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h
index c5b620d1d1a..a511d5e40b5 100644
--- a/src/mame/includes/lwings.h
+++ b/src/mame/includes/lwings.h
@@ -38,17 +38,17 @@ public:
DECLARE_WRITE8_MEMBER(avengers_prot_bank_w);
DECLARE_READ8_MEMBER(avengers_protection_r);
DECLARE_READ8_MEMBER(avengers_soundlatch2_r);
+ DECLARE_WRITE8_MEMBER(lwings_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(lwings_bg1videoram_w);
+ DECLARE_WRITE8_MEMBER(lwings_bg1_scrollx_w);
+ DECLARE_WRITE8_MEMBER(lwings_bg1_scrolly_w);
+ DECLARE_WRITE8_MEMBER(trojan_bg2_scrollx_w);
+ DECLARE_WRITE8_MEMBER(trojan_bg2_image_w);
};
/*----------- defined in video/lwings.c -----------*/
-WRITE8_HANDLER( lwings_fgvideoram_w );
-WRITE8_HANDLER( lwings_bg1videoram_w );
-WRITE8_HANDLER( lwings_bg1_scrollx_w );
-WRITE8_HANDLER( lwings_bg1_scrolly_w );
-WRITE8_HANDLER( trojan_bg2_scrollx_w );
-WRITE8_HANDLER( trojan_bg2_image_w );
VIDEO_START( lwings );
VIDEO_START( trojan );
diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h
index 80b76debbf3..fbcdf6676cd 100644
--- a/src/mame/includes/m10.h
+++ b/src/mame/includes/m10.h
@@ -69,15 +69,15 @@ public:
DECLARE_WRITE8_MEMBER(m15_a100_w);
DECLARE_READ8_MEMBER(m10_a700_r);
DECLARE_READ8_MEMBER(m11_a700_r);
+ DECLARE_WRITE8_MEMBER(m10_colorram_w);
+ DECLARE_WRITE8_MEMBER(m10_chargen_w);
+ DECLARE_WRITE8_MEMBER(m15_chargen_w);
};
/*----------- defined in video/m10.c -----------*/
-WRITE8_HANDLER( m10_colorram_w );
-WRITE8_HANDLER( m10_chargen_w );
-WRITE8_HANDLER( m15_chargen_w );
SCREEN_UPDATE_IND16( m10 );
SCREEN_UPDATE_IND16( m15 );
diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h
index a7e13f8afe3..03d6b047e8d 100644
--- a/src/mame/includes/m107.h
+++ b/src/mame/includes/m107.h
@@ -38,13 +38,13 @@ public:
DECLARE_WRITE16_MEMBER(m107_sound_status_w);
DECLARE_WRITE16_MEMBER(m107_sound_reset_w);
DECLARE_WRITE16_MEMBER(wpksoc_output_w);
+ DECLARE_WRITE16_MEMBER(m107_vram_w);
+ DECLARE_WRITE16_MEMBER(m107_control_w);
+ DECLARE_WRITE16_MEMBER(m107_spritebuffer_w);
};
/*----------- defined in video/m107.c -----------*/
-WRITE16_HANDLER( m107_spritebuffer_w );
SCREEN_UPDATE_IND16( m107 );
VIDEO_START( m107 );
-WRITE16_HANDLER( m107_control_w );
-WRITE16_HANDLER( m107_vram_w );
diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h
index 8ed1ec80f8e..eb84579541c 100644
--- a/src/mame/includes/m52.h
+++ b/src/mame/includes/m52.h
@@ -18,21 +18,21 @@ public:
UINT8 m_bg2xpos;
UINT8 m_bg2ypos;
UINT8 m_bgcontrol;
+ DECLARE_WRITE8_MEMBER(m52_scroll_w);
+ DECLARE_WRITE8_MEMBER(m52_videoram_w);
+ DECLARE_WRITE8_MEMBER(m52_colorram_w);
+ DECLARE_READ8_MEMBER(m52_protection_r);
+ DECLARE_WRITE8_MEMBER(m52_bg1ypos_w);
+ DECLARE_WRITE8_MEMBER(m52_bg1xpos_w);
+ DECLARE_WRITE8_MEMBER(m52_bg2xpos_w);
+ DECLARE_WRITE8_MEMBER(m52_bg2ypos_w);
+ DECLARE_WRITE8_MEMBER(m52_bgcontrol_w);
+ DECLARE_WRITE8_MEMBER(m52_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(alpha1v_flipscreen_w);
};
/*----------- defined in video/m52.c -----------*/
-READ8_HANDLER( m52_protection_r );
-WRITE8_HANDLER( m52_scroll_w );
-WRITE8_HANDLER( m52_bg1xpos_w );
-WRITE8_HANDLER( m52_bg1ypos_w );
-WRITE8_HANDLER( m52_bg2xpos_w );
-WRITE8_HANDLER( m52_bg2ypos_w );
-WRITE8_HANDLER( m52_bgcontrol_w );
-WRITE8_HANDLER( m52_flipscreen_w );
-WRITE8_HANDLER( alpha1v_flipscreen_w );
-WRITE8_HANDLER( m52_videoram_w );
-WRITE8_HANDLER( m52_colorram_w );
PALETTE_INIT( m52 );
VIDEO_START( m52 );
diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h
index 53031d181c7..46a456ebb8c 100644
--- a/src/mame/includes/m57.h
+++ b/src/mame/includes/m57.h
@@ -14,12 +14,12 @@ public:
/* video-related */
tilemap_t* m_bg_tilemap;
int m_flipscreen;
+ DECLARE_WRITE8_MEMBER(m57_videoram_w);
+ DECLARE_WRITE8_MEMBER(m57_flipscreen_w);
};
/*----------- defined in video/m57.c -----------*/
-WRITE8_HANDLER( m57_videoram_w );
-WRITE8_HANDLER( m57_flipscreen_w );
PALETTE_INIT( m57 );
VIDEO_START( m57 );
diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h
index 87daed4f77d..68a7c527502 100644
--- a/src/mame/includes/m58.h
+++ b/src/mame/includes/m58.h
@@ -17,13 +17,13 @@ public:
UINT8 *m_yard_scroll_y_low;
UINT8 *m_yard_score_panel_disabled;
bitmap_ind16 *m_scroll_panel_bitmap;
+ DECLARE_WRITE8_MEMBER(yard_videoram_w);
+ DECLARE_WRITE8_MEMBER(yard_scroll_panel_w);
+ DECLARE_WRITE8_MEMBER(yard_flipscreen_w);
};
/*----------- defined in video/m58.c -----------*/
-WRITE8_HANDLER( yard_videoram_w );
-WRITE8_HANDLER( yard_scroll_panel_w );
-WRITE8_HANDLER( yard_flipscreen_w );
PALETTE_INIT( yard );
VIDEO_START( yard );
diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h
index 59e63720581..da108bfbc4b 100644
--- a/src/mame/includes/m62.h
+++ b/src/mame/includes/m62.h
@@ -37,27 +37,27 @@ public:
DECLARE_WRITE8_MEMBER(spelunkr_bankswitch_w);
DECLARE_WRITE8_MEMBER(spelunk2_bankswitch_w);
DECLARE_WRITE8_MEMBER(youjyudn_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(m62_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(m62_hscroll_low_w);
+ DECLARE_WRITE8_MEMBER(m62_hscroll_high_w);
+ DECLARE_WRITE8_MEMBER(m62_vscroll_low_w);
+ DECLARE_WRITE8_MEMBER(m62_vscroll_high_w);
+ DECLARE_WRITE8_MEMBER(m62_tileram_w);
+ DECLARE_WRITE8_MEMBER(m62_textram_w);
+ DECLARE_WRITE8_MEMBER(kungfum_tileram_w);
+ DECLARE_WRITE8_MEMBER(ldrun3_topbottom_mask_w);
+ DECLARE_WRITE8_MEMBER(kidniki_text_vscroll_low_w);
+ DECLARE_WRITE8_MEMBER(kidniki_text_vscroll_high_w);
+ DECLARE_WRITE8_MEMBER(kidniki_background_bank_w);
+ DECLARE_WRITE8_MEMBER(spelunkr_palbank_w);
+ DECLARE_WRITE8_MEMBER(spelunk2_gfxport_w);
+ DECLARE_WRITE8_MEMBER(horizon_scrollram_w);
};
/*----------- defined in video/m62.c -----------*/
-WRITE8_HANDLER( m62_tileram_w );
-WRITE8_HANDLER( m62_textram_w );
-WRITE8_HANDLER( m62_flipscreen_w );
-WRITE8_HANDLER( m62_hscroll_low_w );
-WRITE8_HANDLER( m62_hscroll_high_w );
-WRITE8_HANDLER( m62_vscroll_low_w );
-WRITE8_HANDLER( m62_vscroll_high_w );
-WRITE8_HANDLER( horizon_scrollram_w );
-WRITE8_HANDLER( kidniki_text_vscroll_low_w );
-WRITE8_HANDLER( kidniki_text_vscroll_high_w );
-WRITE8_HANDLER( kidniki_background_bank_w );
-WRITE8_HANDLER( kungfum_tileram_w );
-WRITE8_HANDLER( ldrun3_topbottom_mask_w );
-WRITE8_HANDLER( spelunkr_palbank_w );
-WRITE8_HANDLER( spelunk2_gfxport_w );
PALETTE_INIT( m62 );
PALETTE_INIT( lotlot );
diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h
index 0df896d4013..83343e5c75c 100644
--- a/src/mame/includes/m72.h
+++ b/src/mame/includes/m72.h
@@ -64,6 +64,21 @@ public:
DECLARE_READ16_MEMBER(soundram_r);
DECLARE_WRITE16_MEMBER(soundram_w);
DECLARE_READ16_MEMBER(poundfor_trackball_r);
+ DECLARE_READ16_MEMBER(m72_palette1_r);
+ DECLARE_READ16_MEMBER(m72_palette2_r);
+ DECLARE_WRITE16_MEMBER(m72_palette1_w);
+ DECLARE_WRITE16_MEMBER(m72_palette2_w);
+ DECLARE_WRITE16_MEMBER(m72_videoram1_w);
+ DECLARE_WRITE16_MEMBER(m72_videoram2_w);
+ DECLARE_WRITE16_MEMBER(m72_irq_line_w);
+ DECLARE_WRITE16_MEMBER(m72_scrollx1_w);
+ DECLARE_WRITE16_MEMBER(m72_scrollx2_w);
+ DECLARE_WRITE16_MEMBER(m72_scrolly1_w);
+ DECLARE_WRITE16_MEMBER(m72_scrolly2_w);
+ DECLARE_WRITE16_MEMBER(m72_dmaon_w);
+ DECLARE_WRITE16_MEMBER(m72_port02_w);
+ DECLARE_WRITE16_MEMBER(rtype2_port02_w);
+ DECLARE_WRITE16_MEMBER(majtitle_gfx_ctrl_w);
};
@@ -77,21 +92,6 @@ VIDEO_START( poundfor );
VIDEO_START( xmultipl );
VIDEO_START( hharryu );
-READ16_HANDLER( m72_palette1_r );
-READ16_HANDLER( m72_palette2_r );
-WRITE16_HANDLER( m72_palette1_w );
-WRITE16_HANDLER( m72_palette2_w );
-WRITE16_HANDLER( m72_videoram1_w );
-WRITE16_HANDLER( m72_videoram2_w );
-WRITE16_HANDLER( m72_irq_line_w );
-WRITE16_HANDLER( m72_scrollx1_w );
-WRITE16_HANDLER( m72_scrollx2_w );
-WRITE16_HANDLER( m72_scrolly1_w );
-WRITE16_HANDLER( m72_scrolly2_w );
-WRITE16_HANDLER( m72_dmaon_w );
-WRITE16_HANDLER( m72_port02_w );
-WRITE16_HANDLER( rtype2_port02_w );
-WRITE16_HANDLER( majtitle_gfx_ctrl_w );
SCREEN_UPDATE_IND16( m72 );
SCREEN_UPDATE_IND16( majtitle );
diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h
index 134d0bb981a..ed57b6db5a1 100644
--- a/src/mame/includes/m90.h
+++ b/src/mame/includes/m90.h
@@ -19,6 +19,8 @@ public:
DECLARE_WRITE16_MEMBER(quizf1_bankswitch_w);
DECLARE_WRITE16_MEMBER(dynablsb_sound_command_w);
DECLARE_WRITE16_MEMBER(unknown_w);
+ DECLARE_WRITE16_MEMBER(m90_video_control_w);
+ DECLARE_WRITE16_MEMBER(m90_video_w);
};
@@ -30,5 +32,3 @@ VIDEO_START( bomblord );
SCREEN_UPDATE_IND16( m90 );
SCREEN_UPDATE_IND16( dynablsb );
SCREEN_UPDATE_IND16( bomblord );
-WRITE16_HANDLER( m90_video_w );
-WRITE16_HANDLER( m90_video_control_w );
diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h
index 48fb6745df8..5e2a11e74e0 100644
--- a/src/mame/includes/m92.h
+++ b/src/mame/includes/m92.h
@@ -45,6 +45,15 @@ public:
DECLARE_WRITE16_MEMBER(m92_sound_irq_ack_w);
DECLARE_WRITE16_MEMBER(m92_sound_status_w);
DECLARE_WRITE16_MEMBER(m92_sound_reset_w);
+ DECLARE_WRITE16_MEMBER(m92_spritecontrol_w);
+ DECLARE_WRITE16_MEMBER(m92_videocontrol_w);
+ DECLARE_READ16_MEMBER(m92_paletteram_r);
+ DECLARE_WRITE16_MEMBER(m92_paletteram_w);
+ DECLARE_WRITE16_MEMBER(m92_vram_w);
+ DECLARE_WRITE16_MEMBER(m92_pf1_control_w);
+ DECLARE_WRITE16_MEMBER(m92_pf2_control_w);
+ DECLARE_WRITE16_MEMBER(m92_pf3_control_w);
+ DECLARE_WRITE16_MEMBER(m92_master_control_w);
};
@@ -55,15 +64,6 @@ extern void m92_sprite_interrupt(running_machine &machine);
/*----------- defined in video/m92.c -----------*/
-WRITE16_HANDLER( m92_spritecontrol_w );
-WRITE16_HANDLER( m92_videocontrol_w );
-READ16_HANDLER( m92_paletteram_r );
-WRITE16_HANDLER( m92_paletteram_w );
-WRITE16_HANDLER( m92_vram_w );
-WRITE16_HANDLER( m92_pf1_control_w );
-WRITE16_HANDLER( m92_pf2_control_w );
-WRITE16_HANDLER( m92_pf3_control_w );
-WRITE16_HANDLER( m92_master_control_w );
VIDEO_START( m92 );
SCREEN_UPDATE_IND16( m92 );
diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h
index 08f236c2e4d..91b51ad53e4 100644
--- a/src/mame/includes/macrossp.h
+++ b/src/mame/includes/macrossp.h
@@ -48,14 +48,14 @@ public:
DECLARE_WRITE32_MEMBER(macrossp_palette_fade_w);
DECLARE_WRITE32_MEMBER(macrossp_speedup_w);
DECLARE_WRITE32_MEMBER(quizmoon_speedup_w);
+ DECLARE_WRITE32_MEMBER(macrossp_scra_videoram_w);
+ DECLARE_WRITE32_MEMBER(macrossp_scrb_videoram_w);
+ DECLARE_WRITE32_MEMBER(macrossp_scrc_videoram_w);
+ DECLARE_WRITE32_MEMBER(macrossp_text_videoram_w);
};
/*----------- defined in video/macrossp.c -----------*/
-WRITE32_HANDLER( macrossp_scra_videoram_w );
-WRITE32_HANDLER( macrossp_scrb_videoram_w );
-WRITE32_HANDLER( macrossp_scrc_videoram_w );
-WRITE32_HANDLER( macrossp_text_videoram_w );
VIDEO_START(macrossp);
SCREEN_UPDATE_RGB32(macrossp);
diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h
index dbcb54b2f6c..6501e1be76d 100644
--- a/src/mame/includes/madalien.h
+++ b/src/mame/includes/madalien.h
@@ -37,6 +37,8 @@ public:
DECLARE_WRITE8_MEMBER(madalien_output_w);
DECLARE_WRITE8_MEMBER(madalien_sound_command_w);
DECLARE_READ8_MEMBER(madalien_sound_command_r);
+ DECLARE_WRITE8_MEMBER(madalien_videoram_w);
+ DECLARE_WRITE8_MEMBER(madalien_charram_w);
};
@@ -44,8 +46,6 @@ public:
MACHINE_CONFIG_EXTERN( madalien_video );
-WRITE8_HANDLER( madalien_videoram_w );
-WRITE8_HANDLER( madalien_charram_w );
/*----------- defined in audio/madalien.c -----------*/
diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h
index 7f9aa9188a7..f1692ffd8c5 100644
--- a/src/mame/includes/mainsnk.h
+++ b/src/mame/includes/mainsnk.h
@@ -15,14 +15,14 @@ public:
DECLARE_WRITE8_MEMBER(sound_command_w);
DECLARE_READ8_MEMBER(sound_command_r);
DECLARE_READ8_MEMBER(sound_ack_r);
+ DECLARE_WRITE8_MEMBER(mainsnk_c600_w);
+ DECLARE_WRITE8_MEMBER(mainsnk_fgram_w);
+ DECLARE_WRITE8_MEMBER(mainsnk_bgram_w);
};
/*----------- defined in video/mainsnk.c -----------*/
PALETTE_INIT(mainsnk);
-WRITE8_HANDLER(mainsnk_c600_w);
-WRITE8_HANDLER(mainsnk_fgram_w);
-WRITE8_HANDLER(mainsnk_bgram_w);
VIDEO_START(mainsnk);
SCREEN_UPDATE_IND16(mainsnk);
diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h
index aa966526565..dc172400aa9 100644
--- a/src/mame/includes/malzak.h
+++ b/src/mame/includes/malzak.h
@@ -30,11 +30,11 @@ public:
DECLARE_WRITE8_MEMBER(port60_w);
DECLARE_WRITE8_MEMBER(portc0_w);
DECLARE_READ8_MEMBER(collision_r);
+ DECLARE_WRITE8_MEMBER(malzak_playfield_w);
};
/*----------- defined in video/malzak.c -----------*/
-WRITE8_HANDLER( malzak_playfield_w );
SCREEN_UPDATE_IND16( malzak );
diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h
index 588413b019d..ba3f335aa17 100644
--- a/src/mame/includes/mappy.h
+++ b/src/mame/includes/mappy.h
@@ -18,6 +18,11 @@ public:
DECLARE_WRITE8_MEMBER(superpac_latch_w);
DECLARE_WRITE8_MEMBER(phozon_latch_w);
DECLARE_WRITE8_MEMBER(mappy_latch_w);
+ DECLARE_WRITE8_MEMBER(superpac_videoram_w);
+ DECLARE_WRITE8_MEMBER(mappy_videoram_w);
+ DECLARE_WRITE8_MEMBER(superpac_flipscreen_w);
+ DECLARE_READ8_MEMBER(superpac_flipscreen_r);
+ DECLARE_WRITE8_MEMBER(mappy_scroll_w);
};
@@ -33,8 +38,3 @@ VIDEO_START( superpac );
VIDEO_START( mappy );
SCREEN_UPDATE_IND16( superpac );
SCREEN_UPDATE_IND16( mappy );
-WRITE8_HANDLER( superpac_videoram_w );
-WRITE8_HANDLER( mappy_videoram_w );
-WRITE8_HANDLER( mappy_scroll_w );
-READ8_HANDLER( superpac_flipscreen_r );
-WRITE8_HANDLER( superpac_flipscreen_w );
diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h
index e23753b4b25..dd02a13f6c8 100644
--- a/src/mame/includes/marineb.h
+++ b/src/mame/includes/marineb.h
@@ -23,18 +23,18 @@ public:
UINT8 m_irq_mask;
DECLARE_WRITE8_MEMBER(irq_mask_w);
+ DECLARE_WRITE8_MEMBER(marineb_videoram_w);
+ DECLARE_WRITE8_MEMBER(marineb_colorram_w);
+ DECLARE_WRITE8_MEMBER(marineb_column_scroll_w);
+ DECLARE_WRITE8_MEMBER(marineb_palette_bank_0_w);
+ DECLARE_WRITE8_MEMBER(marineb_palette_bank_1_w);
+ DECLARE_WRITE8_MEMBER(marineb_flipscreen_x_w);
+ DECLARE_WRITE8_MEMBER(marineb_flipscreen_y_w);
};
/*----------- defined in video/marineb.c -----------*/
-WRITE8_HANDLER( marineb_videoram_w );
-WRITE8_HANDLER( marineb_colorram_w );
-WRITE8_HANDLER( marineb_column_scroll_w );
-WRITE8_HANDLER( marineb_palette_bank_0_w );
-WRITE8_HANDLER( marineb_palette_bank_1_w );
-WRITE8_HANDLER( marineb_flipscreen_x_w );
-WRITE8_HANDLER( marineb_flipscreen_y_w );
PALETTE_INIT( marineb );
VIDEO_START( marineb );
diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h
index c7a81c66a98..2c3affc5ed1 100644
--- a/src/mame/includes/mario.h
+++ b/src/mame/includes/mario.h
@@ -61,15 +61,15 @@ public:
UINT8 m_nmi_mask;
DECLARE_WRITE8_MEMBER(nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(mario_videoram_w);
+ DECLARE_WRITE8_MEMBER(mario_gfxbank_w);
+ DECLARE_WRITE8_MEMBER(mario_palettebank_w);
+ DECLARE_WRITE8_MEMBER(mario_scroll_w);
+ DECLARE_WRITE8_MEMBER(mario_flip_w);
};
/*----------- defined in video/mario.c -----------*/
-WRITE8_HANDLER( mario_videoram_w );
-WRITE8_HANDLER( mario_gfxbank_w );
-WRITE8_HANDLER( mario_palettebank_w );
-WRITE8_HANDLER( mario_scroll_w );
-WRITE8_HANDLER( mario_flip_w );
PALETTE_INIT( mario );
VIDEO_START( mario );
diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h
index c6f01fb06d7..6e1a9aa35b1 100644
--- a/src/mame/includes/markham.h
+++ b/src/mame/includes/markham.h
@@ -19,13 +19,13 @@ public:
/* video-related */
tilemap_t *m_bg_tilemap;
DECLARE_READ8_MEMBER(markham_e004_r);
+ DECLARE_WRITE8_MEMBER(markham_videoram_w);
+ DECLARE_WRITE8_MEMBER(markham_flipscreen_w);
};
/*----------- defined in video/markham.c -----------*/
-WRITE8_HANDLER( markham_videoram_w );
-WRITE8_HANDLER( markham_flipscreen_w );
PALETTE_INIT( markham );
VIDEO_START( markham );
diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h
index f31b3f7c88b..ff557717cbc 100644
--- a/src/mame/includes/matmania.h
+++ b/src/mame/includes/matmania.h
@@ -47,6 +47,7 @@ public:
device_t *m_mcu;
DECLARE_WRITE8_MEMBER(matmania_sh_command_w);
DECLARE_WRITE8_MEMBER(maniach_sh_command_w);
+ DECLARE_WRITE8_MEMBER(matmania_paletteram_w);
};
/*----------- defined in machine/maniach.c -----------*/
@@ -67,7 +68,6 @@ READ8_HANDLER( maniach_mcu_status_r );
/*----------- defined in video/matmania.c -----------*/
-WRITE8_HANDLER( matmania_paletteram_w );
PALETTE_INIT( matmania );
SCREEN_UPDATE_IND16( maniach );
VIDEO_START( matmania );
diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h
index 82be0db3cc9..2ed49f4a7b6 100644
--- a/src/mame/includes/mcatadv.h
+++ b/src/mame/includes/mcatadv.h
@@ -30,6 +30,8 @@ public:
DECLARE_WRITE16_MEMBER(mcat_coin_w);
DECLARE_READ16_MEMBER(mcat_wd_r);
DECLARE_WRITE8_MEMBER(mcatadv_sound_bw_w);
+ DECLARE_WRITE16_MEMBER(mcatadv_videoram1_w);
+ DECLARE_WRITE16_MEMBER(mcatadv_videoram2_w);
};
/*----------- defined in video/mcatadv.c -----------*/
@@ -38,5 +40,3 @@ SCREEN_UPDATE_IND16( mcatadv );
VIDEO_START( mcatadv );
SCREEN_VBLANK( mcatadv );
-WRITE16_HANDLER( mcatadv_videoram1_w );
-WRITE16_HANDLER( mcatadv_videoram2_w );
diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h
index 80aeae772c9..f76e7f364a1 100644
--- a/src/mame/includes/mcr.h
+++ b/src/mame/includes/mcr.h
@@ -26,6 +26,16 @@ public:
required_device<z80_device> m_maincpu;
required_shared_ptr<UINT8> m_spriteram;
+ DECLARE_WRITE8_MEMBER(mcr_control_port_w);
+ DECLARE_WRITE8_MEMBER(mcr_ipu_laserdisk_w);
+ DECLARE_READ8_MEMBER(mcr_ipu_watchdog_r);
+ DECLARE_WRITE8_MEMBER(mcr_ipu_watchdog_w);
+ DECLARE_WRITE8_MEMBER(mcr_91490_paletteram_w);
+ DECLARE_WRITE8_MEMBER(mcr_90009_videoram_w);
+ DECLARE_WRITE8_MEMBER(mcr_90010_videoram_w);
+ DECLARE_READ8_MEMBER(twotiger_videoram_r);
+ DECLARE_WRITE8_MEMBER(twotiger_videoram_w);
+ DECLARE_WRITE8_MEMBER(mcr_91490_videoram_w);
};
@@ -57,11 +67,7 @@ MACHINE_START( nflfoot );
TIMER_DEVICE_CALLBACK( mcr_interrupt );
TIMER_DEVICE_CALLBACK( mcr_ipu_interrupt );
-WRITE8_HANDLER( mcr_control_port_w );
-WRITE8_HANDLER( mcr_ipu_laserdisk_w );
-READ8_HANDLER( mcr_ipu_watchdog_r );
-WRITE8_HANDLER( mcr_ipu_watchdog_w );
/*----------- defined in video/mcr.c -----------*/
@@ -71,12 +77,6 @@ extern INT8 mcr12_sprite_xoffs_flip;
VIDEO_START( mcr );
-WRITE8_HANDLER( mcr_91490_paletteram_w );
-WRITE8_HANDLER( mcr_90009_videoram_w );
-WRITE8_HANDLER( mcr_90010_videoram_w );
-READ8_HANDLER( twotiger_videoram_r );
-WRITE8_HANDLER( twotiger_videoram_w );
-WRITE8_HANDLER( mcr_91490_videoram_w );
SCREEN_UPDATE_IND16( mcr );
diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h
index d7744e652e1..6689d6bdad2 100644
--- a/src/mame/includes/mcr3.h
+++ b/src/mame/includes/mcr3.h
@@ -22,16 +22,16 @@ public:
INT16 m_spyhunt_scrolly;
tilemap_t *m_bg_tilemap;
tilemap_t *m_alpha_tilemap;
+ DECLARE_WRITE8_MEMBER(mcr3_paletteram_w);
+ DECLARE_WRITE8_MEMBER(mcr3_videoram_w);
+ DECLARE_WRITE8_MEMBER(spyhunt_videoram_w);
+ DECLARE_WRITE8_MEMBER(spyhunt_alpharam_w);
+ DECLARE_WRITE8_MEMBER(spyhunt_scroll_value_w);
};
/*----------- defined in video/mcr3.c -----------*/
-WRITE8_HANDLER( mcr3_paletteram_w );
-WRITE8_HANDLER( mcr3_videoram_w );
-WRITE8_HANDLER( spyhunt_videoram_w );
-WRITE8_HANDLER( spyhunt_alpharam_w );
-WRITE8_HANDLER( spyhunt_scroll_value_w );
VIDEO_START( mcrmono );
VIDEO_START( spyhunt );
diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h
index 3a4538d91ec..536862c4b02 100644
--- a/src/mame/includes/mcr68.h
+++ b/src/mame/includes/mcr68.h
@@ -53,6 +53,19 @@ public:
DECLARE_READ16_MEMBER(pigskin_port_1_r);
DECLARE_READ16_MEMBER(pigskin_port_2_r);
DECLARE_READ16_MEMBER(trisport_port_1_r);
+ DECLARE_WRITE16_MEMBER(mcr68_6840_upper_w);
+ DECLARE_WRITE16_MEMBER(mcr68_6840_lower_w);
+ DECLARE_READ16_MEMBER(mcr68_6840_upper_r);
+ DECLARE_READ16_MEMBER(mcr68_6840_lower_r);
+ DECLARE_WRITE8_MEMBER(mcr68_6840_w_common);
+ DECLARE_READ16_MEMBER(mcr68_6840_r_common);
+ void reload_count(int counter);
+ UINT16 compute_counter(int counter);
+ DECLARE_WRITE16_MEMBER(mcr68_paletteram_w);
+ DECLARE_WRITE16_MEMBER(zwackery_paletteram_w);
+ DECLARE_WRITE16_MEMBER(mcr68_videoram_w);
+ DECLARE_WRITE16_MEMBER(zwackery_videoram_w);
+ DECLARE_WRITE16_MEMBER(zwackery_spriteram_w);
};
@@ -73,25 +86,16 @@ MACHINE_RESET( mcr68 );
MACHINE_START( zwackery );
MACHINE_RESET( zwackery );
-WRITE16_HANDLER( mcr68_6840_upper_w );
-WRITE16_HANDLER( mcr68_6840_lower_w );
-READ16_HANDLER( mcr68_6840_upper_r );
-READ16_HANDLER( mcr68_6840_lower_r );
INTERRUPT_GEN( mcr68_interrupt );
/*----------- defined in video/mcr68.c -----------*/
-WRITE16_HANDLER( mcr68_paletteram_w );
-WRITE16_HANDLER( mcr68_videoram_w );
VIDEO_START( mcr68 );
SCREEN_UPDATE_IND16( mcr68 );
-WRITE16_HANDLER( zwackery_paletteram_w );
-WRITE16_HANDLER( zwackery_videoram_w );
-WRITE16_HANDLER( zwackery_spriteram_w );
VIDEO_START( zwackery );
SCREEN_UPDATE_IND16( zwackery );
diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h
index 9f9228bcf9a..5c907b7e9d4 100644
--- a/src/mame/includes/meadows.h
+++ b/src/mame/includes/meadows.h
@@ -35,6 +35,8 @@ public:
DECLARE_WRITE8_MEMBER(meadows_audio_w);
DECLARE_WRITE8_MEMBER(audio_hardware_w);
DECLARE_READ8_MEMBER(audio_hardware_r);
+ DECLARE_WRITE8_MEMBER(meadows_videoram_w);
+ DECLARE_WRITE8_MEMBER(meadows_spriteram_w);
};
@@ -49,6 +51,4 @@ void meadows_sh_update(running_machine &machine);
VIDEO_START( meadows );
SCREEN_UPDATE_IND16( meadows );
-WRITE8_HANDLER( meadows_videoram_w );
-WRITE8_HANDLER( meadows_spriteram_w );
diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h
index 585cd5f31ec..d0d3bf10f69 100644
--- a/src/mame/includes/megasys1.h
+++ b/src/mame/includes/megasys1.h
@@ -65,6 +65,14 @@ public:
DECLARE_READ16_MEMBER(stdragon_mcu_hs_r);
DECLARE_WRITE16_MEMBER(stdragon_mcu_hs_w);
DECLARE_READ16_MEMBER(monkelf_input_r);
+ DECLARE_WRITE16_MEMBER(megasys1_scrollram_0_w);
+ DECLARE_WRITE16_MEMBER(megasys1_scrollram_1_w);
+ DECLARE_WRITE16_MEMBER(megasys1_scrollram_2_w);
+ DECLARE_WRITE16_MEMBER(megasys1_vregs_A_w);
+ DECLARE_READ16_MEMBER(megasys1_vregs_C_r);
+ DECLARE_WRITE16_MEMBER(megasys1_vregs_C_w);
+ DECLARE_WRITE16_MEMBER(megasys1_vregs_D_w);
+ void megasys1_set_vreg_flag(int which, int data);
};
@@ -76,12 +84,5 @@ SCREEN_VBLANK( megasys1 );
PALETTE_INIT( megasys1 );
-READ16_HANDLER( megasys1_vregs_C_r );
-WRITE16_HANDLER( megasys1_vregs_A_w );
-WRITE16_HANDLER( megasys1_vregs_C_w );
-WRITE16_HANDLER( megasys1_vregs_D_w );
-WRITE16_HANDLER( megasys1_scrollram_0_w );
-WRITE16_HANDLER( megasys1_scrollram_1_w );
-WRITE16_HANDLER( megasys1_scrollram_2_w );
diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h
index f68a5aa3727..1f258df5f17 100644
--- a/src/mame/includes/megazone.h
+++ b/src/mame/includes/megazone.h
@@ -39,13 +39,13 @@ public:
DECLARE_WRITE8_MEMBER(i8039_irqen_and_status_w);
DECLARE_WRITE8_MEMBER(megazone_coin_counter_w);
DECLARE_WRITE8_MEMBER(irq_mask_w);
+ DECLARE_WRITE8_MEMBER(megazone_flipscreen_w);
};
/*----------- defined in video/megazone.c -----------*/
-WRITE8_HANDLER( megazone_flipscreen_w );
PALETTE_INIT( megazone );
VIDEO_START( megazone );
diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h
index df37856ef77..397491f3ccc 100644
--- a/src/mame/includes/mermaid.h
+++ b/src/mame/includes/mermaid.h
@@ -54,22 +54,22 @@ public:
DECLARE_WRITE8_MEMBER(rougien_sample_rom_lo_w);
DECLARE_WRITE8_MEMBER(rougien_sample_rom_hi_w);
DECLARE_WRITE8_MEMBER(rougien_sample_playback_w);
+ DECLARE_WRITE8_MEMBER(mermaid_videoram2_w);
+ DECLARE_WRITE8_MEMBER(mermaid_videoram_w);
+ DECLARE_WRITE8_MEMBER(mermaid_colorram_w);
+ DECLARE_WRITE8_MEMBER(mermaid_flip_screen_x_w);
+ DECLARE_WRITE8_MEMBER(mermaid_flip_screen_y_w);
+ DECLARE_WRITE8_MEMBER(mermaid_bg_scroll_w);
+ DECLARE_WRITE8_MEMBER(mermaid_fg_scroll_w);
+ DECLARE_WRITE8_MEMBER(rougien_gfxbankswitch1_w);
+ DECLARE_WRITE8_MEMBER(rougien_gfxbankswitch2_w);
+ DECLARE_READ8_MEMBER(mermaid_collision_r);
};
/*----------- defined in video/mermaid.c -----------*/
-WRITE8_HANDLER( mermaid_videoram2_w );
-WRITE8_HANDLER( mermaid_videoram_w );
-WRITE8_HANDLER( mermaid_colorram_w );
-WRITE8_HANDLER( mermaid_flip_screen_x_w );
-WRITE8_HANDLER( mermaid_flip_screen_y_w );
-WRITE8_HANDLER( mermaid_bg_scroll_w );
-WRITE8_HANDLER( mermaid_fg_scroll_w );
-WRITE8_HANDLER( rougien_gfxbankswitch1_w );
-WRITE8_HANDLER( rougien_gfxbankswitch2_w );
-READ8_HANDLER( mermaid_collision_r );
PALETTE_INIT( mermaid );
PALETTE_INIT( rougien );
diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h
index 0552005f72f..be572f3e730 100644
--- a/src/mame/includes/metlclsh.h
+++ b/src/mame/includes/metlclsh.h
@@ -35,15 +35,15 @@ public:
DECLARE_WRITE8_MEMBER(metlclsh_ack_irq2);
DECLARE_WRITE8_MEMBER(metlclsh_ack_nmi2);
DECLARE_WRITE8_MEMBER(metlclsh_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(metlclsh_rambank_w);
+ DECLARE_WRITE8_MEMBER(metlclsh_gfxbank_w);
+ DECLARE_WRITE8_MEMBER(metlclsh_bgram_w);
+ DECLARE_WRITE8_MEMBER(metlclsh_fgram_w);
};
/*----------- defined in video/metlclsh.c -----------*/
-WRITE8_HANDLER( metlclsh_bgram_w );
-WRITE8_HANDLER( metlclsh_fgram_w );
-WRITE8_HANDLER( metlclsh_gfxbank_w );
-WRITE8_HANDLER( metlclsh_rambank_w );
VIDEO_START( metlclsh );
SCREEN_UPDATE_IND16( metlclsh );
diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h
index fc0226ba6e3..7470b2484cb 100644
--- a/src/mame/includes/metro.h
+++ b/src/mame/includes/metro.h
@@ -112,16 +112,17 @@ public:
DECLARE_WRITE16_MEMBER(vram_1_clr_w);
DECLARE_WRITE16_MEMBER(vram_2_clr_w);
DECLARE_WRITE8_MEMBER(puzzlet_portb_w);
+ DECLARE_WRITE16_MEMBER(metro_k053936_w);
+ DECLARE_WRITE16_MEMBER(metro_vram_0_w);
+ DECLARE_WRITE16_MEMBER(metro_vram_1_w);
+ DECLARE_WRITE16_MEMBER(metro_vram_2_w);
+ DECLARE_WRITE16_MEMBER(metro_window_w);
+ void blt_write( address_space *space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask );
};
/*----------- defined in video/metro.c -----------*/
-WRITE16_HANDLER( metro_window_w );
-WRITE16_HANDLER( metro_vram_0_w );
-WRITE16_HANDLER( metro_vram_1_w );
-WRITE16_HANDLER( metro_vram_2_w );
-WRITE16_HANDLER( metro_k053936_w );
VIDEO_START( metro_14100 );
VIDEO_START( metro_14220 );
diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h
index 271522c8d3b..925bf211aa8 100644
--- a/src/mame/includes/mexico86.h
+++ b/src/mame/includes/mexico86.h
@@ -40,25 +40,25 @@ public:
int m_qfront;
int m_qstate;
DECLARE_WRITE8_MEMBER(mexico86_sub_output_w);
+ DECLARE_WRITE8_MEMBER(mexico86_f008_w);
+ DECLARE_READ8_MEMBER(mexico86_68705_port_a_r);
+ DECLARE_WRITE8_MEMBER(mexico86_68705_port_a_w);
+ DECLARE_WRITE8_MEMBER(mexico86_68705_ddr_a_w);
+ DECLARE_READ8_MEMBER(mexico86_68705_port_b_r);
+ DECLARE_WRITE8_MEMBER(mexico86_68705_port_b_w);
+ DECLARE_WRITE8_MEMBER(mexico86_68705_ddr_b_w);
+ DECLARE_WRITE8_MEMBER(mexico86_bankswitch_w);
};
/*----------- defined in machine/mexico86.c -----------*/
-WRITE8_HANDLER( mexico86_f008_w );
INTERRUPT_GEN( kikikai_interrupt );
INTERRUPT_GEN( mexico86_m68705_interrupt );
-READ8_HANDLER( mexico86_68705_port_a_r );
-WRITE8_HANDLER( mexico86_68705_port_a_w );
-WRITE8_HANDLER( mexico86_68705_ddr_a_w );
-READ8_HANDLER( mexico86_68705_port_b_r );
-WRITE8_HANDLER( mexico86_68705_port_b_w );
-WRITE8_HANDLER( mexico86_68705_ddr_b_w );
/*----------- defined in video/mexico86.c -----------*/
-WRITE8_HANDLER( mexico86_bankswitch_w );
SCREEN_UPDATE_IND16( mexico86 );
SCREEN_UPDATE_IND16( kikikai );
diff --git a/src/mame/includes/mhavoc.h b/src/mame/includes/mhavoc.h
index e6463674a1e..d3dc45022cc 100644
--- a/src/mame/includes/mhavoc.h
+++ b/src/mame/includes/mhavoc.h
@@ -37,6 +37,19 @@ public:
UINT8 m_speech_write_buffer;
DECLARE_READ8_MEMBER(dual_pokey_r);
DECLARE_WRITE8_MEMBER(dual_pokey_w);
+ DECLARE_WRITE8_MEMBER(mhavoc_alpha_irq_ack_w);
+ DECLARE_WRITE8_MEMBER(mhavoc_gamma_irq_ack_w);
+ DECLARE_WRITE8_MEMBER(mhavoc_gamma_w);
+ DECLARE_READ8_MEMBER(mhavoc_alpha_r);
+ DECLARE_WRITE8_MEMBER(mhavoc_alpha_w);
+ DECLARE_READ8_MEMBER(mhavoc_gamma_r);
+ DECLARE_WRITE8_MEMBER(mhavoc_ram_banksel_w);
+ DECLARE_WRITE8_MEMBER(mhavoc_rom_banksel_w);
+ DECLARE_WRITE8_MEMBER(mhavoc_out_0_w);
+ DECLARE_WRITE8_MEMBER(alphaone_out_0_w);
+ DECLARE_WRITE8_MEMBER(mhavoc_out_1_w);
+ DECLARE_WRITE8_MEMBER(mhavocrv_speech_data_w);
+ DECLARE_WRITE8_MEMBER(mhavocrv_speech_strobe_w);
};
@@ -44,21 +57,13 @@ public:
TIMER_DEVICE_CALLBACK( mhavoc_cpu_irq_clock );
-WRITE8_HANDLER( mhavoc_alpha_irq_ack_w );
-WRITE8_HANDLER( mhavoc_gamma_irq_ack_w );
MACHINE_START( mhavoc );
MACHINE_RESET( mhavoc );
DRIVER_INIT( mhavocrv );
-WRITE8_HANDLER( mhavoc_gamma_w );
-READ8_HANDLER( mhavoc_alpha_r );
-WRITE8_HANDLER( mhavoc_alpha_w );
-READ8_HANDLER( mhavoc_gamma_r );
-WRITE8_HANDLER( mhavoc_ram_banksel_w );
-WRITE8_HANDLER( mhavoc_rom_banksel_w );
CUSTOM_INPUT( tms5220_r );
CUSTOM_INPUT( gamma_rcvd_r );
@@ -67,8 +72,5 @@ CUSTOM_INPUT( alpha_rcvd_r );
CUSTOM_INPUT( alpha_xmtd_r );
CUSTOM_INPUT( mhavoc_bit67_r );
-WRITE8_HANDLER( mhavoc_out_0_w );
-WRITE8_HANDLER( alphaone_out_0_w );
-WRITE8_HANDLER( mhavoc_out_1_w );
diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h
index a5a8c2139de..24ee926eb1a 100644
--- a/src/mame/includes/micro3d.h
+++ b/src/mame/includes/micro3d.h
@@ -72,6 +72,33 @@ public:
UINT16 *m_tmp_buffer;
int m_drawing_buffer;
int m_display_buffer;
+ DECLARE_WRITE16_MEMBER(micro3d_ti_uart_w);
+ DECLARE_READ16_MEMBER(micro3d_ti_uart_r);
+ DECLARE_WRITE32_MEMBER(micro3d_scc_w);
+ DECLARE_READ32_MEMBER(micro3d_scc_r);
+ DECLARE_READ16_MEMBER(micro3d_tms_host_r);
+ DECLARE_WRITE16_MEMBER(micro3d_tms_host_w);
+ DECLARE_WRITE32_MEMBER(micro3d_mac1_w);
+ DECLARE_READ32_MEMBER(micro3d_mac2_r);
+ DECLARE_WRITE32_MEMBER(micro3d_mac2_w);
+ DECLARE_READ16_MEMBER(micro3d_encoder_h_r);
+ DECLARE_READ16_MEMBER(micro3d_encoder_l_r);
+ DECLARE_READ16_MEMBER(micro3d_adc_r);
+ DECLARE_WRITE16_MEMBER(micro3d_adc_w);
+ DECLARE_READ16_MEMBER(botssa_140000_r);
+ DECLARE_READ16_MEMBER(botssa_180000_r);
+ DECLARE_WRITE16_MEMBER(micro3d_reset_w);
+ DECLARE_WRITE16_MEMBER(host_drmath_int_w);
+ DECLARE_WRITE32_MEMBER(micro3d_shared_w);
+ DECLARE_READ32_MEMBER(micro3d_shared_r);
+ DECLARE_WRITE32_MEMBER(drmath_int_w);
+ DECLARE_WRITE32_MEMBER(drmath_intr2_ack);
+ DECLARE_WRITE16_MEMBER(micro3d_clut_w);
+ DECLARE_WRITE16_MEMBER(micro3d_creg_w);
+ DECLARE_WRITE16_MEMBER(micro3d_xfer3dk_w);
+ DECLARE_WRITE32_MEMBER(micro3d_fifo_w);
+ DECLARE_WRITE32_MEMBER(micro3d_alt_fifo_w);
+ DECLARE_READ32_MEMBER(micro3d_pipe_r);
};
typedef struct _micro3d_vtx_
@@ -82,37 +109,16 @@ typedef struct _micro3d_vtx_
/*----------- defined in machine/micro3d.c -----------*/
-READ16_HANDLER( micro3d_ti_uart_r );
-WRITE16_HANDLER( micro3d_ti_uart_w );
-READ32_HANDLER( micro3d_scc_r );
-WRITE32_HANDLER( micro3d_scc_w );
-READ16_HANDLER( micro3d_tms_host_r );
-WRITE16_HANDLER( micro3d_tms_host_w );
-READ16_HANDLER( micro3d_adc_r );
-WRITE16_HANDLER( micro3d_adc_w );
-WRITE16_HANDLER( host_drmath_int_w );
-WRITE16_HANDLER( micro3d_reset_w );
-READ16_HANDLER( micro3d_encoder_l_r );
-READ16_HANDLER( micro3d_encoder_h_r );
CUSTOM_INPUT( botssa_hwchk_r );
-READ16_HANDLER( botssa_140000_r );
-READ16_HANDLER( botssa_180000_r );
-READ32_HANDLER( micro3d_shared_r );
-WRITE32_HANDLER( micro3d_shared_w );
-WRITE32_HANDLER( drmath_int_w );
-WRITE32_HANDLER( drmath_intr2_ack );
-WRITE32_HANDLER( micro3d_mac1_w );
-WRITE32_HANDLER( micro3d_mac2_w );
-READ32_HANDLER( micro3d_mac2_r );
void micro3d_duart_irq_handler(device_t *device, UINT8 vector);
UINT8 micro3d_duart_input_r(device_t *device);
@@ -145,11 +151,5 @@ VIDEO_RESET( micro3d );
void micro3d_tms_interrupt(device_t *device, int state);
void micro3d_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params);
-WRITE16_HANDLER( micro3d_clut_w );
-WRITE16_HANDLER( micro3d_creg_w );
-WRITE16_HANDLER( micro3d_xfer3dk_w );
-READ32_HANDLER( micro3d_pipe_r );
-WRITE32_HANDLER( micro3d_fifo_w );
-WRITE32_HANDLER( micro3d_alt_fifo_w );
INTERRUPT_GEN( micro3d_vblank );
diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h
index 276776a8b99..1c5c06d4535 100644
--- a/src/mame/includes/midtunit.h
+++ b/src/mame/includes/midtunit.h
@@ -12,15 +12,46 @@ public:
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT16> m_nvram;
+ DECLARE_WRITE16_MEMBER(midtunit_cmos_enable_w);
+ DECLARE_WRITE16_MEMBER(midtunit_cmos_w);
+ DECLARE_READ16_MEMBER(midtunit_cmos_r);
+ DECLARE_READ16_MEMBER(midtunit_input_r);
+ DECLARE_READ16_MEMBER(midtunit_sound_state_r);
+ DECLARE_READ16_MEMBER(midtunit_sound_r);
+ DECLARE_WRITE16_MEMBER(midtunit_sound_w);
+ DECLARE_READ16_MEMBER(mk_prot_r);
+ DECLARE_WRITE16_MEMBER(mk_prot_w);
+ DECLARE_READ16_MEMBER(mkturbo_prot_r);
+ DECLARE_READ16_MEMBER(mk2_prot_const_r);
+ DECLARE_READ16_MEMBER(mk2_prot_r);
+ DECLARE_READ16_MEMBER(mk2_prot_shift_r);
+ DECLARE_WRITE16_MEMBER(mk2_prot_w);
+ DECLARE_READ16_MEMBER(nbajam_prot_r);
+ DECLARE_WRITE16_MEMBER(nbajam_prot_w);
+ DECLARE_WRITE16_MEMBER(jdredd_prot_w);
+ DECLARE_READ16_MEMBER(jdredd_prot_r);
+ DECLARE_READ16_MEMBER(jdredd_hack_r);
+ DECLARE_READ16_MEMBER(midtunit_gfxrom_r);
+ DECLARE_READ16_MEMBER(midwunit_gfxrom_r);
+ DECLARE_WRITE16_MEMBER(midtunit_vram_w);
+ DECLARE_WRITE16_MEMBER(midtunit_vram_data_w);
+ DECLARE_WRITE16_MEMBER(midtunit_vram_color_w);
+ DECLARE_READ16_MEMBER(midtunit_vram_r);
+ DECLARE_READ16_MEMBER(midtunit_vram_data_r);
+ DECLARE_READ16_MEMBER(midtunit_vram_color_r);
+ DECLARE_WRITE16_MEMBER(midtunit_control_w);
+ DECLARE_WRITE16_MEMBER(midwunit_control_w);
+ DECLARE_READ16_MEMBER(midwunit_control_r);
+ DECLARE_WRITE16_MEMBER(midtunit_paletteram_w);
+ DECLARE_WRITE16_MEMBER(midxunit_paletteram_w);
+ DECLARE_READ16_MEMBER(midxunit_paletteram_r);
+ DECLARE_READ16_MEMBER(midtunit_dma_r);
+ DECLARE_WRITE16_MEMBER(midtunit_dma_w);
};
/*----------- defined in machine/midtunit.c -----------*/
-WRITE16_HANDLER( midtunit_cmos_enable_w );
-WRITE16_HANDLER( midtunit_cmos_w );
-READ16_HANDLER( midtunit_cmos_r );
-READ16_HANDLER( midtunit_input_r );
DRIVER_INIT( mktunit );
DRIVER_INIT( mkturbo );
@@ -31,9 +62,6 @@ DRIVER_INIT( mk2 );
MACHINE_RESET( midtunit );
-READ16_HANDLER( midtunit_sound_state_r );
-READ16_HANDLER( midtunit_sound_r );
-WRITE16_HANDLER( midtunit_sound_w );
/*----------- defined in video/midtunit.c -----------*/
@@ -46,30 +74,14 @@ VIDEO_START( midtunit );
VIDEO_START( midwunit );
VIDEO_START( midxunit );
-READ16_HANDLER( midtunit_gfxrom_r );
-READ16_HANDLER( midwunit_gfxrom_r );
-WRITE16_HANDLER( midtunit_vram_w );
-WRITE16_HANDLER( midtunit_vram_data_w );
-WRITE16_HANDLER( midtunit_vram_color_w );
-READ16_HANDLER( midtunit_vram_r );
-READ16_HANDLER( midtunit_vram_data_r );
-READ16_HANDLER( midtunit_vram_color_r );
void midtunit_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
void midtunit_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
-WRITE16_HANDLER( midtunit_control_w );
-WRITE16_HANDLER( midwunit_control_w );
-READ16_HANDLER( midwunit_control_r );
-WRITE16_HANDLER( midtunit_paletteram_w );
-WRITE16_HANDLER( midxunit_paletteram_w );
-READ16_HANDLER( midxunit_paletteram_r );
-READ16_HANDLER( midtunit_dma_r );
-WRITE16_HANDLER( midtunit_dma_w );
void midtunit_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params);
void midxunit_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params);
diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h
index cce627bedff..bd33ffc0a54 100644
--- a/src/mame/includes/midvunit.h
+++ b/src/mame/includes/midvunit.h
@@ -66,29 +66,29 @@ public:
UINT8 m_video_changed;
emu_timer *m_scanline_timer;
midvunit_renderer *m_poly;
+ DECLARE_WRITE32_MEMBER(midvunit_dma_queue_w);
+ DECLARE_READ32_MEMBER(midvunit_dma_queue_entries_r);
+ DECLARE_READ32_MEMBER(midvunit_dma_trigger_r);
+ DECLARE_WRITE32_MEMBER(midvunit_page_control_w);
+ DECLARE_READ32_MEMBER(midvunit_page_control_r);
+ DECLARE_WRITE32_MEMBER(midvunit_video_control_w);
+ DECLARE_READ32_MEMBER(midvunit_scanline_r);
+ DECLARE_WRITE32_MEMBER(midvunit_videoram_w);
+ DECLARE_READ32_MEMBER(midvunit_videoram_r);
+ DECLARE_WRITE32_MEMBER(midvunit_paletteram_w);
+ DECLARE_WRITE32_MEMBER(midvunit_textureram_w);
+ DECLARE_READ32_MEMBER(midvunit_textureram_r);
};
/*----------- defined in video/midvunit.c -----------*/
-WRITE32_HANDLER( midvunit_dma_queue_w );
-READ32_HANDLER( midvunit_dma_queue_entries_r );
-READ32_HANDLER( midvunit_dma_trigger_r );
-WRITE32_HANDLER( midvunit_page_control_w );
-READ32_HANDLER( midvunit_page_control_r );
-WRITE32_HANDLER( midvunit_video_control_w );
-READ32_HANDLER( midvunit_scanline_r );
-WRITE32_HANDLER( midvunit_videoram_w );
-READ32_HANDLER( midvunit_videoram_r );
-WRITE32_HANDLER( midvunit_paletteram_w );
-WRITE32_HANDLER( midvunit_textureram_w );
-READ32_HANDLER( midvunit_textureram_r );
VIDEO_START( midvunit );
SCREEN_UPDATE_IND16( midvunit );
diff --git a/src/mame/includes/midwunit.h b/src/mame/includes/midwunit.h
index 188e039d8f0..68027dd8ff8 100644
--- a/src/mame/includes/midwunit.h
+++ b/src/mame/includes/midwunit.h
@@ -4,11 +4,11 @@
**************************************************************************/
-class midwunit_state : public driver_device
+class midwunit_state : public midtunit_state
{
public:
midwunit_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ : midtunit_state(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT16> m_nvram;
@@ -19,17 +19,24 @@ public:
UINT8 m_uart[8];
UINT8 m_security_bits;
UINT16 *m_umk3_palette;
+ DECLARE_WRITE16_MEMBER(midwunit_cmos_enable_w);
+ DECLARE_WRITE16_MEMBER(midwunit_cmos_w);
+ DECLARE_READ16_MEMBER(midwunit_cmos_r);
+ DECLARE_WRITE16_MEMBER(midwunit_io_w);
+ DECLARE_READ16_MEMBER(midwunit_io_r);
+ DECLARE_READ16_MEMBER(midwunit_security_r);
+ DECLARE_WRITE16_MEMBER(midwunit_security_w);
+ DECLARE_READ16_MEMBER(midwunit_sound_r);
+ DECLARE_READ16_MEMBER(midwunit_sound_state_r);
+ DECLARE_WRITE16_MEMBER(midwunit_sound_w);
+ DECLARE_WRITE16_MEMBER(umk3_palette_hack_w);
+ DECLARE_WRITE16_MEMBER(wwfmania_io_0_w);
};
/*----------- defined in machine/midwunit.c -----------*/
-WRITE16_HANDLER( midwunit_cmos_enable_w );
-WRITE16_HANDLER( midwunit_cmos_w );
-READ16_HANDLER( midwunit_cmos_r );
-WRITE16_HANDLER( midwunit_io_w );
-READ16_HANDLER( midwunit_io_r );
DRIVER_INIT( mk3 );
DRIVER_INIT( mk3r20 );
@@ -44,8 +51,4 @@ DRIVER_INIT( rmpgwt );
MACHINE_RESET( midwunit );
-READ16_HANDLER( midwunit_security_r );
-WRITE16_HANDLER( midwunit_security_w );
-READ16_HANDLER( midwunit_sound_r );
-WRITE16_HANDLER( midwunit_sound_w );
diff --git a/src/mame/includes/midxunit.h b/src/mame/includes/midxunit.h
index 9e30d17069c..4f1d255b8ab 100644
--- a/src/mame/includes/midxunit.h
+++ b/src/mame/includes/midxunit.h
@@ -4,11 +4,11 @@
**************************************************************************/
-class midxunit_state : public driver_device
+class midxunit_state : public midtunit_state
{
public:
midxunit_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ : midtunit_state(mconfig, type, tag),
m_nvram(*this, "nvram") { }
required_shared_ptr<UINT16> m_nvram;
@@ -19,32 +19,33 @@ public:
UINT8 m_analog_port;
UINT8 m_uart[8];
UINT8 m_security_bits;
+ DECLARE_READ16_MEMBER(midxunit_cmos_r);
+ DECLARE_WRITE16_MEMBER(midxunit_cmos_w);
+ DECLARE_WRITE16_MEMBER(midxunit_io_w);
+ DECLARE_WRITE16_MEMBER(midxunit_unknown_w);
+ DECLARE_READ16_MEMBER(midxunit_io_r);
+ DECLARE_READ16_MEMBER(midxunit_analog_r);
+ DECLARE_WRITE16_MEMBER(midxunit_analog_select_w);
+ DECLARE_READ16_MEMBER(midxunit_status_r);
+ DECLARE_READ16_MEMBER(midxunit_uart_r);
+ DECLARE_WRITE16_MEMBER(midxunit_uart_w);
+ DECLARE_READ16_MEMBER(midxunit_security_r);
+ DECLARE_WRITE16_MEMBER(midxunit_security_w);
+ DECLARE_WRITE16_MEMBER(midxunit_security_clock_w);
+ DECLARE_READ16_MEMBER(midxunit_sound_r);
+ DECLARE_READ16_MEMBER(midxunit_sound_state_r);
+ DECLARE_WRITE16_MEMBER(midxunit_sound_w);
};
/*----------- defined in machine/midxunit.c -----------*/
-READ16_HANDLER( midxunit_cmos_r );
-WRITE16_HANDLER( midxunit_cmos_w );
-WRITE16_HANDLER( midxunit_io_w );
-WRITE16_HANDLER( midxunit_unknown_w );
-READ16_HANDLER( midxunit_io_r );
-READ16_HANDLER( midxunit_analog_r );
-WRITE16_HANDLER( midxunit_analog_select_w );
-READ16_HANDLER( midxunit_status_r );
-READ16_HANDLER( midxunit_uart_r );
-WRITE16_HANDLER( midxunit_uart_w );
DRIVER_INIT( revx );
MACHINE_RESET( midxunit );
-READ16_HANDLER( midxunit_security_r );
-WRITE16_HANDLER( midxunit_security_w );
-WRITE16_HANDLER( midxunit_security_clock_w );
-READ16_HANDLER( midxunit_sound_r );
-WRITE16_HANDLER( midxunit_sound_w );
diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h
index 319d90a4495..ed0a4189d08 100644
--- a/src/mame/includes/midyunit.h
+++ b/src/mame/includes/midyunit.h
@@ -54,18 +54,34 @@ public:
UINT8 m_yawdim_dma;
UINT16 m_dma_register[16];
dma_state_t m_dma_state;
+ DECLARE_WRITE16_MEMBER(midyunit_cmos_w);
+ DECLARE_READ16_MEMBER(midyunit_cmos_r);
+ DECLARE_WRITE16_MEMBER(midyunit_cmos_enable_w);
+ DECLARE_READ16_MEMBER(midyunit_protection_r);
+ DECLARE_READ16_MEMBER(midyunit_input_r);
+ DECLARE_WRITE16_MEMBER(midyunit_sound_w);
+ DECLARE_READ16_MEMBER(term2_input_r);
+ DECLARE_WRITE16_MEMBER(term2_sound_w);
+ DECLARE_WRITE16_MEMBER(term2_hack_w);
+ DECLARE_WRITE16_MEMBER(term2la3_hack_w);
+ DECLARE_WRITE16_MEMBER(term2la2_hack_w);
+ DECLARE_WRITE16_MEMBER(term2la1_hack_w);
+ DECLARE_WRITE8_MEMBER(cvsd_protection_w);
+ DECLARE_READ16_MEMBER(mkturbo_prot_r);
+ DECLARE_READ16_MEMBER(midyunit_gfxrom_r);
+ DECLARE_WRITE16_MEMBER(midyunit_vram_w);
+ DECLARE_READ16_MEMBER(midyunit_vram_r);
+ DECLARE_WRITE16_MEMBER(midyunit_control_w);
+ DECLARE_WRITE16_MEMBER(midyunit_paletteram_w);
+ DECLARE_READ16_MEMBER(midyunit_dma_r);
+ DECLARE_WRITE16_MEMBER(midyunit_dma_w);
};
/*----------- defined in machine/midyunit.c -----------*/
-WRITE16_HANDLER( midyunit_cmos_w );
-READ16_HANDLER( midyunit_cmos_r );
-WRITE16_HANDLER( midyunit_cmos_enable_w );
-READ16_HANDLER( midyunit_protection_r );
-READ16_HANDLER( midyunit_input_r );
DRIVER_INIT( narc );
DRIVER_INIT( trog );
@@ -84,7 +100,6 @@ DRIVER_INIT( totcarn );
MACHINE_RESET( midyunit );
-WRITE16_HANDLER( midyunit_sound_w );
/*----------- defined in video/midyunit.c -----------*/
@@ -94,18 +109,11 @@ VIDEO_START( midyunit_6bit );
VIDEO_START( mkyawdim );
VIDEO_START( midzunit );
-READ16_HANDLER( midyunit_gfxrom_r );
-WRITE16_HANDLER( midyunit_vram_w );
-READ16_HANDLER( midyunit_vram_r );
void midyunit_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
void midyunit_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
-WRITE16_HANDLER( midyunit_control_w );
-WRITE16_HANDLER( midyunit_paletteram_w );
-READ16_HANDLER( midyunit_dma_r );
-WRITE16_HANDLER( midyunit_dma_w );
void midyunit_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params);
diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h
index 45d8759c112..0adf610b22e 100644
--- a/src/mame/includes/midzeus.h
+++ b/src/mame/includes/midzeus.h
@@ -33,6 +33,8 @@ public:
DECLARE_WRITE32_MEMBER(invasn_gun_w);
DECLARE_READ32_MEMBER(invasn_gun_r);
DECLARE_READ8_MEMBER(PIC16C5X_T0_clk_r);
+ DECLARE_READ32_MEMBER(zeus_r);
+ DECLARE_WRITE32_MEMBER(zeus_w);
};
@@ -43,8 +45,6 @@ extern UINT32 *zeusbase;
VIDEO_START( midzeus );
SCREEN_UPDATE_IND16( midzeus );
-READ32_HANDLER( zeus_r );
-WRITE32_HANDLER( zeus_w );
/*----------- defined in video/midzeus2.c -----------*/
diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h
index 0a6d015c084..4ee07d44ba9 100644
--- a/src/mame/includes/mikie.h
+++ b/src/mame/includes/mikie.h
@@ -32,15 +32,15 @@ public:
DECLARE_WRITE8_MEMBER(mikie_sh_irqtrigger_w);
DECLARE_WRITE8_MEMBER(mikie_coin_counter_w);
DECLARE_WRITE8_MEMBER(irq_mask_w);
+ DECLARE_WRITE8_MEMBER(mikie_videoram_w);
+ DECLARE_WRITE8_MEMBER(mikie_colorram_w);
+ DECLARE_WRITE8_MEMBER(mikie_palettebank_w);
+ DECLARE_WRITE8_MEMBER(mikie_flipscreen_w);
};
/*----------- defined in video/mikie.c -----------*/
-WRITE8_HANDLER( mikie_videoram_w );
-WRITE8_HANDLER( mikie_colorram_w );
-WRITE8_HANDLER( mikie_palettebank_w );
-WRITE8_HANDLER( mikie_flipscreen_w );
PALETTE_INIT( mikie );
VIDEO_START( mikie );
diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h
index 16d4484b1fb..d1517782c29 100644
--- a/src/mame/includes/mitchell.h
+++ b/src/mame/includes/mitchell.h
@@ -55,30 +55,30 @@ public:
DECLARE_WRITE8_MEMBER(input_w);
DECLARE_WRITE8_MEMBER(spangbl_msm5205_data_w);
DECLARE_WRITE8_MEMBER(mstworld_sound_w);
+ DECLARE_WRITE8_MEMBER(pang_video_bank_w);
+ DECLARE_WRITE8_MEMBER(mstworld_video_bank_w);
+ DECLARE_WRITE8_MEMBER(mgakuen_videoram_w);
+ DECLARE_READ8_MEMBER(mgakuen_videoram_r);
+ DECLARE_WRITE8_MEMBER(mgakuen_objram_w);
+ DECLARE_READ8_MEMBER(mgakuen_objram_r);
+ DECLARE_WRITE8_MEMBER(pang_videoram_w);
+ DECLARE_READ8_MEMBER(pang_videoram_r);
+ DECLARE_WRITE8_MEMBER(pang_colorram_w);
+ DECLARE_READ8_MEMBER(pang_colorram_r);
+ DECLARE_WRITE8_MEMBER(pang_gfxctrl_w);
+ DECLARE_WRITE8_MEMBER(pangbl_gfxctrl_w);
+ DECLARE_WRITE8_MEMBER(mstworld_gfxctrl_w);
+ DECLARE_WRITE8_MEMBER(pang_paletteram_w);
+ DECLARE_READ8_MEMBER(pang_paletteram_r);
+ DECLARE_WRITE8_MEMBER(mgakuen_paletteram_w);
+ DECLARE_READ8_MEMBER(mgakuen_paletteram_r);
};
/*----------- defined in video/mitchell.c -----------*/
-WRITE8_HANDLER( mgakuen_paletteram_w );
-READ8_HANDLER( mgakuen_paletteram_r );
-WRITE8_HANDLER( mgakuen_videoram_w );
-READ8_HANDLER( mgakuen_videoram_r );
-WRITE8_HANDLER( mgakuen_objram_w );
-READ8_HANDLER( mgakuen_objram_r );
-WRITE8_HANDLER( pang_video_bank_w );
-WRITE8_HANDLER( pang_videoram_w );
-READ8_HANDLER( pang_videoram_r );
-WRITE8_HANDLER( pang_colorram_w );
-READ8_HANDLER( pang_colorram_r );
-WRITE8_HANDLER( pang_gfxctrl_w );
-WRITE8_HANDLER( pangbl_gfxctrl_w );
-WRITE8_HANDLER( pang_paletteram_w );
-READ8_HANDLER( pang_paletteram_r );
-WRITE8_HANDLER( mstworld_gfxctrl_w );
-WRITE8_HANDLER( mstworld_video_bank_w );
VIDEO_START( pang );
SCREEN_UPDATE_IND16( pang );
diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h
index 9a5a03e04f1..5932e678afc 100644
--- a/src/mame/includes/mjkjidai.h
+++ b/src/mame/includes/mjkjidai.h
@@ -19,6 +19,8 @@ public:
UINT8 m_nmi_mask;
DECLARE_READ8_MEMBER(keyboard_r);
DECLARE_WRITE8_MEMBER(keyboard_select_w);
+ DECLARE_WRITE8_MEMBER(mjkjidai_videoram_w);
+ DECLARE_WRITE8_MEMBER(mjkjidai_ctrl_w);
};
@@ -26,7 +28,5 @@ public:
VIDEO_START( mjkjidai );
SCREEN_UPDATE_IND16( mjkjidai );
-WRITE8_HANDLER( mjkjidai_videoram_w );
-WRITE8_HANDLER( mjkjidai_ctrl_w );
diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h
index 18677b37248..52f190d6b1f 100644
--- a/src/mame/includes/model1.h
+++ b/src/mame/includes/model1.h
@@ -106,6 +106,22 @@ public:
DECLARE_READ16_MEMBER(m1_snd_v60_ready_r);
DECLARE_WRITE16_MEMBER(m1_snd_68k_latch1_w);
DECLARE_WRITE16_MEMBER(m1_snd_68k_latch2_w);
+ DECLARE_READ16_MEMBER(model1_tgp_copro_r);
+ DECLARE_WRITE16_MEMBER(model1_tgp_copro_w);
+ DECLARE_READ16_MEMBER(model1_tgp_copro_adr_r);
+ DECLARE_WRITE16_MEMBER(model1_tgp_copro_adr_w);
+ DECLARE_READ16_MEMBER(model1_tgp_copro_ram_r);
+ DECLARE_WRITE16_MEMBER(model1_tgp_copro_ram_w);
+ DECLARE_READ16_MEMBER(model1_tgp_vr_adr_r);
+ DECLARE_WRITE16_MEMBER(model1_tgp_vr_adr_w);
+ DECLARE_READ16_MEMBER(model1_vr_tgp_ram_r);
+ DECLARE_WRITE16_MEMBER(model1_vr_tgp_ram_w);
+ DECLARE_READ16_MEMBER(model1_vr_tgp_r);
+ DECLARE_WRITE16_MEMBER(model1_vr_tgp_w);
+ DECLARE_READ32_MEMBER(copro_ram_r);
+ DECLARE_WRITE32_MEMBER(copro_ram_w);
+ DECLARE_READ16_MEMBER(model1_listctl_r);
+ DECLARE_WRITE16_MEMBER(model1_listctl_w);
};
@@ -113,19 +129,7 @@ public:
extern const mb86233_cpu_core model1_vr_tgp_config;
-READ16_HANDLER( model1_tgp_copro_r );
-WRITE16_HANDLER( model1_tgp_copro_w );
-READ16_HANDLER( model1_tgp_copro_adr_r );
-WRITE16_HANDLER( model1_tgp_copro_adr_w );
-READ16_HANDLER( model1_tgp_copro_ram_r );
-WRITE16_HANDLER( model1_tgp_copro_ram_w );
-READ16_HANDLER( model1_vr_tgp_r );
-WRITE16_HANDLER( model1_vr_tgp_w );
-READ16_HANDLER( model1_tgp_vr_adr_r );
-WRITE16_HANDLER( model1_tgp_vr_adr_w );
-READ16_HANDLER( model1_vr_tgp_ram_r );
-WRITE16_HANDLER( model1_vr_tgp_ram_w );
ADDRESS_MAP_EXTERN( model1_vr_tgp_map, 32 );
@@ -141,5 +145,3 @@ VIDEO_START(model1);
SCREEN_UPDATE_RGB32(model1);
SCREEN_VBLANK(model1);
-READ16_HANDLER( model1_listctl_r );
-WRITE16_HANDLER( model1_listctl_w );
diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h
index a299786a8c9..c5d78ad76a0 100644
--- a/src/mame/includes/model3.h
+++ b/src/mame/includes/model3.h
@@ -103,6 +103,19 @@ public:
cached_texture *m_texcache[2][1024/32][2048/32];
required_device<cpu_device> m_maincpu;
+ DECLARE_READ32_MEMBER(rtc72421_r);
+ DECLARE_WRITE32_MEMBER(rtc72421_w);
+ DECLARE_READ64_MEMBER(model3_char_r);
+ DECLARE_WRITE64_MEMBER(model3_char_w);
+ DECLARE_READ64_MEMBER(model3_tile_r);
+ DECLARE_WRITE64_MEMBER(model3_tile_w);
+ DECLARE_READ64_MEMBER(model3_vid_reg_r);
+ DECLARE_WRITE64_MEMBER(model3_vid_reg_w);
+ DECLARE_WRITE64_MEMBER(model3_palette_w);
+ DECLARE_READ64_MEMBER(model3_palette_r);
+ DECLARE_WRITE64_MEMBER(real3d_display_list_w);
+ DECLARE_WRITE64_MEMBER(real3d_polygon_ram_w);
+ DECLARE_WRITE64_MEMBER(real3d_cmd_w);
};
@@ -117,27 +130,14 @@ void model3_machine_init(running_machine &machine, int step);
int model3_tap_read(running_machine &machine);
void model3_tap_write(running_machine &machine, int tck, int tms, int tdi, int trst);
void model3_tap_reset(running_machine &machine);
-READ32_HANDLER(rtc72421_r);
-WRITE32_HANDLER(rtc72421_w);
/*----------- defined in video/model3.c -----------*/
-READ64_HANDLER(model3_char_r);
-WRITE64_HANDLER(model3_char_w);
-READ64_HANDLER(model3_tile_r);
-WRITE64_HANDLER(model3_tile_w);
-READ64_HANDLER(model3_vid_reg_r);
-WRITE64_HANDLER(model3_vid_reg_w);
-READ64_HANDLER(model3_palette_r);
-WRITE64_HANDLER(model3_palette_w);
VIDEO_START(model3);
SCREEN_UPDATE_IND16(model3);
-WRITE64_HANDLER(real3d_cmd_w);
-WRITE64_HANDLER(real3d_display_list_w);
-WRITE64_HANDLER(real3d_polygon_ram_w);
void real3d_display_list_end(running_machine &machine);
void real3d_display_list1_dma(address_space *space, UINT32 src, UINT32 dst, int length, int byteswap);
void real3d_display_list2_dma(address_space *space, UINT32 src, UINT32 dst, int length, int byteswap);
diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h
index 5164d10a6f0..b4f57e5048c 100644
--- a/src/mame/includes/momoko.h
+++ b/src/mame/includes/momoko.h
@@ -31,20 +31,20 @@ public:
UINT8 m_fg_mask;
UINT8 m_flipscreen;
DECLARE_WRITE8_MEMBER(momoko_bg_read_bank_w);
+ DECLARE_WRITE8_MEMBER(momoko_fg_scrollx_w);
+ DECLARE_WRITE8_MEMBER(momoko_fg_scrolly_w);
+ DECLARE_WRITE8_MEMBER(momoko_fg_select_w);
+ DECLARE_WRITE8_MEMBER(momoko_text_scrolly_w);
+ DECLARE_WRITE8_MEMBER(momoko_text_mode_w);
+ DECLARE_WRITE8_MEMBER(momoko_bg_scrollx_w);
+ DECLARE_WRITE8_MEMBER(momoko_bg_scrolly_w);
+ DECLARE_WRITE8_MEMBER(momoko_bg_select_w);
+ DECLARE_WRITE8_MEMBER(momoko_bg_priority_w);
+ DECLARE_WRITE8_MEMBER(momoko_flipscreen_w);
};
/*----------- defined in video/momoko.c -----------*/
-WRITE8_HANDLER( momoko_fg_scrollx_w );
-WRITE8_HANDLER( momoko_fg_scrolly_w );
-WRITE8_HANDLER( momoko_text_scrolly_w );
-WRITE8_HANDLER( momoko_text_mode_w );
-WRITE8_HANDLER( momoko_bg_scrollx_w );
-WRITE8_HANDLER( momoko_bg_scrolly_w );
-WRITE8_HANDLER( momoko_flipscreen_w );
-WRITE8_HANDLER( momoko_fg_select_w);
-WRITE8_HANDLER( momoko_bg_select_w);
-WRITE8_HANDLER( momoko_bg_priority_w);
SCREEN_UPDATE_IND16( momoko );
diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h
index 045009f61da..ee7c1c6f227 100644
--- a/src/mame/includes/mosaic.h
+++ b/src/mame/includes/mosaic.h
@@ -25,13 +25,13 @@ public:
DECLARE_READ8_MEMBER(protection_r);
DECLARE_WRITE8_MEMBER(gfire2_protection_w);
DECLARE_READ8_MEMBER(gfire2_protection_r);
+ DECLARE_WRITE8_MEMBER(mosaic_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(mosaic_bgvideoram_w);
};
/*----------- defined in video/mosaic.c -----------*/
-WRITE8_HANDLER( mosaic_fgvideoram_w );
-WRITE8_HANDLER( mosaic_bgvideoram_w );
VIDEO_START( mosaic );
SCREEN_UPDATE_IND16( mosaic );
diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h
index a071d773a30..6a75a9217cf 100644
--- a/src/mame/includes/mouser.h
+++ b/src/mame/includes/mouser.h
@@ -27,12 +27,12 @@ public:
DECLARE_WRITE8_MEMBER(mouser_sound_interrupt_w);
DECLARE_READ8_MEMBER(mouser_sound_byte_r);
DECLARE_WRITE8_MEMBER(mouser_sound_nmi_clear_w);
+ DECLARE_WRITE8_MEMBER(mouser_flip_screen_x_w);
+ DECLARE_WRITE8_MEMBER(mouser_flip_screen_y_w);
};
/*----------- defined in video/mouser.c -----------*/
-WRITE8_HANDLER( mouser_flip_screen_x_w );
-WRITE8_HANDLER( mouser_flip_screen_y_w );
PALETTE_INIT( mouser );
SCREEN_UPDATE_IND16( mouser );
diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h
index 4388bed842e..138b74df34e 100644
--- a/src/mame/includes/mrdo.h
+++ b/src/mame/includes/mrdo.h
@@ -21,16 +21,16 @@ public:
tilemap_t *m_fg_tilemap;
int m_flipscreen;
DECLARE_READ8_MEMBER(mrdo_SECRE_r);
+ DECLARE_WRITE8_MEMBER(mrdo_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(mrdo_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(mrdo_scrollx_w);
+ DECLARE_WRITE8_MEMBER(mrdo_scrolly_w);
+ DECLARE_WRITE8_MEMBER(mrdo_flipscreen_w);
};
/*----------- defined in video/mrdo.c -----------*/
-WRITE8_HANDLER( mrdo_bgvideoram_w );
-WRITE8_HANDLER( mrdo_fgvideoram_w );
-WRITE8_HANDLER( mrdo_scrollx_w );
-WRITE8_HANDLER( mrdo_scrolly_w );
-WRITE8_HANDLER( mrdo_flipscreen_w );
PALETTE_INIT( mrdo );
VIDEO_START( mrdo );
diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h
index 00c299a79af..a21b060c70b 100644
--- a/src/mame/includes/mrflea.h
+++ b/src/mame/includes/mrflea.h
@@ -37,13 +37,13 @@ public:
DECLARE_WRITE8_MEMBER(mrflea_select1_w);
DECLARE_READ8_MEMBER(mrflea_input1_r);
DECLARE_WRITE8_MEMBER(mrflea_data1_w);
+ DECLARE_WRITE8_MEMBER(mrflea_gfx_bank_w);
+ DECLARE_WRITE8_MEMBER(mrflea_videoram_w);
+ DECLARE_WRITE8_MEMBER(mrflea_spriteram_w);
};
/*----------- defined in video/mrflea.c -----------*/
-WRITE8_HANDLER( mrflea_gfx_bank_w );
-WRITE8_HANDLER( mrflea_videoram_w );
-WRITE8_HANDLER( mrflea_spriteram_w );
SCREEN_UPDATE_IND16( mrflea );
diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h
index 9337653130f..a17d8227b61 100644
--- a/src/mame/includes/mrjong.h
+++ b/src/mame/includes/mrjong.h
@@ -17,14 +17,14 @@ public:
/* video-related */
tilemap_t *m_bg_tilemap;
DECLARE_READ8_MEMBER(io_0x03_r);
+ DECLARE_WRITE8_MEMBER(mrjong_videoram_w);
+ DECLARE_WRITE8_MEMBER(mrjong_colorram_w);
+ DECLARE_WRITE8_MEMBER(mrjong_flipscreen_w);
};
/*----------- defined in video/mrjong.c -----------*/
-WRITE8_HANDLER( mrjong_videoram_w );
-WRITE8_HANDLER( mrjong_colorram_w );
-WRITE8_HANDLER( mrjong_flipscreen_w );
PALETTE_INIT( mrjong );
VIDEO_START( mrjong );
diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h
index 2e85077a7c6..0bd6dfd70da 100644
--- a/src/mame/includes/ms32.h
+++ b/src/mame/includes/ms32.h
@@ -63,6 +63,8 @@ public:
DECLARE_READ8_MEMBER(latch_r);
DECLARE_WRITE8_MEMBER(ms32_snd_bank_w);
DECLARE_WRITE8_MEMBER(to_main_w);
+ DECLARE_WRITE32_MEMBER(ms32_brightness_w);
+ DECLARE_WRITE32_MEMBER(ms32_gfxctrl_w);
};
@@ -71,9 +73,7 @@ public:
//extern UINT32 *ms32_fce00000;
-WRITE32_HANDLER( ms32_brightness_w );
-WRITE32_HANDLER( ms32_gfxctrl_w );
VIDEO_START( ms32 );
VIDEO_START( f1superb );
SCREEN_UPDATE_RGB32( ms32 );
diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h
index b24bb6e7d53..f825b6c9c24 100644
--- a/src/mame/includes/msisaac.h
+++ b/src/mame/includes/msisaac.h
@@ -52,22 +52,23 @@ public:
DECLARE_READ8_MEMBER(msisaac_mcu_status_r);
DECLARE_WRITE8_MEMBER(msisaac_mcu_w);
DECLARE_WRITE8_MEMBER(sound_control_1_w);
+ DECLARE_WRITE8_MEMBER(msisaac_fg_scrolly_w);
+ DECLARE_WRITE8_MEMBER(msisaac_fg_scrollx_w);
+ DECLARE_WRITE8_MEMBER(msisaac_bg2_scrolly_w);
+ DECLARE_WRITE8_MEMBER(msisaac_bg2_scrollx_w);
+ DECLARE_WRITE8_MEMBER(msisaac_bg_scrolly_w);
+ DECLARE_WRITE8_MEMBER(msisaac_bg_scrollx_w);
+ DECLARE_WRITE8_MEMBER(msisaac_textbank1_w);
+ DECLARE_WRITE8_MEMBER(msisaac_bg2_textbank_w);
+ DECLARE_WRITE8_MEMBER(msisaac_bg_videoram_w);
+ DECLARE_WRITE8_MEMBER(msisaac_bg2_videoram_w);
+ DECLARE_WRITE8_MEMBER(msisaac_fg_videoram_w);
};
/*----------- defined in video/msisaac.c -----------*/
-WRITE8_HANDLER( msisaac_fg_scrolly_w );
-WRITE8_HANDLER( msisaac_fg_scrollx_w );
-WRITE8_HANDLER( msisaac_bg_scrolly_w );
-WRITE8_HANDLER( msisaac_bg_scrollx_w );
-WRITE8_HANDLER( msisaac_bg2_scrolly_w );
-WRITE8_HANDLER( msisaac_bg2_scrollx_w );
-WRITE8_HANDLER( msisaac_bg2_textbank_w );
-WRITE8_HANDLER( msisaac_bg_videoram_w );
-WRITE8_HANDLER( msisaac_bg2_videoram_w );
-WRITE8_HANDLER( msisaac_fg_videoram_w );
SCREEN_UPDATE_IND16( msisaac );
VIDEO_START( msisaac );
diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h
index d2110bc1dca..ade6f95e711 100644
--- a/src/mame/includes/mugsmash.h
+++ b/src/mame/includes/mugsmash.h
@@ -18,6 +18,9 @@ public:
device_t *m_audiocpu;
DECLARE_WRITE16_MEMBER(mugsmash_reg2_w);
DECLARE_READ16_MEMBER(mugsmash_input_ports_r);
+ DECLARE_WRITE16_MEMBER(mugsmash_videoram1_w);
+ DECLARE_WRITE16_MEMBER(mugsmash_videoram2_w);
+ DECLARE_WRITE16_MEMBER(mugsmash_reg_w);
};
@@ -26,6 +29,3 @@ public:
VIDEO_START( mugsmash );
SCREEN_UPDATE_IND16( mugsmash );
-WRITE16_HANDLER( mugsmash_reg_w );
-WRITE16_HANDLER( mugsmash_videoram2_w );
-WRITE16_HANDLER( mugsmash_videoram1_w );
diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h
index 30a00a53add..9c934f04215 100644
--- a/src/mame/includes/munchmo.h
+++ b/src/mame/includes/munchmo.h
@@ -32,13 +32,13 @@ public:
DECLARE_WRITE8_MEMBER(mnchmobl_nmi_enable_w);
DECLARE_WRITE8_MEMBER(mnchmobl_soundlatch_w);
DECLARE_WRITE8_MEMBER(sound_nmi_ack_w);
+ DECLARE_WRITE8_MEMBER(mnchmobl_palette_bank_w);
+ DECLARE_WRITE8_MEMBER(mnchmobl_flipscreen_w);
};
/*----------- defined in video/munchmo.c -----------*/
-WRITE8_HANDLER( mnchmobl_palette_bank_w );
-WRITE8_HANDLER( mnchmobl_flipscreen_w );
PALETTE_INIT( mnchmobl );
VIDEO_START( mnchmobl );
diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h
index a8625909101..6cb78509bf6 100644
--- a/src/mame/includes/mustache.h
+++ b/src/mame/includes/mustache.h
@@ -10,14 +10,14 @@ public:
int m_control_byte;
UINT8 *m_spriteram;
size_t m_spriteram_size;
+ DECLARE_WRITE8_MEMBER(mustache_videoram_w);
+ DECLARE_WRITE8_MEMBER(mustache_video_control_w);
+ DECLARE_WRITE8_MEMBER(mustache_scroll_w);
};
/*----------- defined in video/mustache.c -----------*/
-WRITE8_HANDLER( mustache_videoram_w );
-WRITE8_HANDLER( mustache_scroll_w );
-WRITE8_HANDLER( mustache_video_control_w );
VIDEO_START( mustache );
SCREEN_UPDATE_IND16( mustache );
PALETTE_INIT( mustache );
diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h
index 66d2501ef62..9c2552495ed 100644
--- a/src/mame/includes/mystston.h
+++ b/src/mame/includes/mystston.h
@@ -32,6 +32,7 @@ public:
UINT8 *m_video_control;
DECLARE_WRITE8_MEMBER(irq_clear_w);
DECLARE_WRITE8_MEMBER(mystston_ay8910_select_w);
+ DECLARE_WRITE8_MEMBER(mystston_video_control_w);
};
@@ -43,4 +44,3 @@ void mystston_on_scanline_interrupt(running_machine &machine);
/*----------- defined in video/mystston.c -----------*/
MACHINE_CONFIG_EXTERN( mystston_video );
-WRITE8_HANDLER( mystston_video_control_w );
diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h
index ce4d9ef3e26..a520e48214c 100644
--- a/src/mame/includes/mystwarr.h
+++ b/src/mame/includes/mystwarr.h
@@ -1,8 +1,8 @@
-class mystwarr_state : public driver_device
+class mystwarr_state : public konamigx_state
{
public:
mystwarr_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ : konamigx_state(mconfig, type, tag),
m_maincpu(*this,"maincpu")
{ }
@@ -42,6 +42,14 @@ public:
DECLARE_READ16_MEMBER(mccontrol_r);
DECLARE_WRITE16_MEMBER(mccontrol_w);
DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
+
+ DECLARE_WRITE16_MEMBER(ddd_053936_enable_w);
+ DECLARE_WRITE16_MEMBER(ddd_053936_clip_w);
+ DECLARE_READ16_MEMBER(gai_053936_tilerom_0_r);
+ DECLARE_READ16_MEMBER(ddd_053936_tilerom_0_r);
+ DECLARE_READ16_MEMBER(ddd_053936_tilerom_1_r);
+ DECLARE_READ16_MEMBER(gai_053936_tilerom_2_r);
+ DECLARE_READ16_MEMBER(ddd_053936_tilerom_2_r);
};
@@ -58,10 +66,3 @@ SCREEN_UPDATE_RGB32( mystwarr );
SCREEN_UPDATE_RGB32( metamrph );
SCREEN_UPDATE_RGB32( martchmp );
-WRITE16_HANDLER( ddd_053936_enable_w );
-WRITE16_HANDLER( ddd_053936_clip_w );
-READ16_HANDLER( gai_053936_tilerom_0_r );
-READ16_HANDLER( ddd_053936_tilerom_0_r );
-READ16_HANDLER( ddd_053936_tilerom_1_r );
-READ16_HANDLER( gai_053936_tilerom_2_r );
-READ16_HANDLER( ddd_053936_tilerom_2_r );
diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h
index fab85da868f..9f1f2d62d1b 100644
--- a/src/mame/includes/n8080.h
+++ b/src/mame/includes/n8080.h
@@ -41,13 +41,13 @@ public:
DECLARE_WRITE8_MEMBER(n8080_shift_bits_w);
DECLARE_WRITE8_MEMBER(n8080_shift_data_w);
DECLARE_READ8_MEMBER(n8080_shift_r);
+ DECLARE_WRITE8_MEMBER(n8080_video_control_w);
};
/*----------- defined in video/n8080.c -----------*/
-WRITE8_HANDLER( n8080_video_control_w );
PALETTE_INIT( n8080 );
PALETTE_INIT( helifire );
diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h
index d5487e659e5..030330c9e6b 100644
--- a/src/mame/includes/namcofl.h
+++ b/src/mame/includes/namcofl.h
@@ -49,6 +49,7 @@ public:
DECLARE_READ8_MEMBER(dac2_r);
DECLARE_READ8_MEMBER(dac1_r);
DECLARE_READ8_MEMBER(dac0_r);
+ DECLARE_WRITE32_MEMBER(namcofl_spritebank_w);
};
@@ -57,4 +58,3 @@ public:
VIDEO_START( namcofl );
SCREEN_UPDATE_IND16( namcofl );
-WRITE32_HANDLER( namcofl_spritebank_w );
diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h
index ca29ebadefc..a7f89b2624c 100644
--- a/src/mame/includes/namcona1.h
+++ b/src/mame/includes/namcona1.h
@@ -77,20 +77,20 @@ public:
DECLARE_WRITE8_MEMBER(port8_w);
DECLARE_READ8_MEMBER(portana_r);
void write_version_info();
+ DECLARE_WRITE16_MEMBER(namcona1_videoram_w);
+ DECLARE_READ16_MEMBER(namcona1_videoram_r);
+ DECLARE_READ16_MEMBER(namcona1_paletteram_r);
+ DECLARE_WRITE16_MEMBER(namcona1_paletteram_w);
+ DECLARE_READ16_MEMBER(namcona1_gfxram_r);
+ DECLARE_WRITE16_MEMBER(namcona1_gfxram_w);
};
/*----------- defined in video/namcona1.c -----------*/
-extern WRITE16_HANDLER( namcona1_videoram_w );
-extern READ16_HANDLER( namcona1_videoram_r );
-extern READ16_HANDLER( namcona1_gfxram_r );
-extern WRITE16_HANDLER( namcona1_gfxram_w );
-extern READ16_HANDLER( namcona1_paletteram_r );
-extern WRITE16_HANDLER( namcona1_paletteram_w );
extern SCREEN_UPDATE_IND16( namcona1 );
extern VIDEO_START( namcona1 );
diff --git a/src/mame/includes/namcond1.h b/src/mame/includes/namcond1.h
index f8796b76912..5bc19bdd4d9 100644
--- a/src/mame/includes/namcond1.h
+++ b/src/mame/includes/namcond1.h
@@ -20,15 +20,15 @@ public:
DECLARE_READ8_MEMBER(mcu_p7_read);
DECLARE_READ8_MEMBER(mcu_pa_read);
DECLARE_WRITE8_MEMBER(mcu_pa_write);
+ DECLARE_READ16_MEMBER(namcond1_shared_ram_r);
+ DECLARE_READ16_MEMBER(namcond1_cuskey_r);
+ DECLARE_WRITE16_MEMBER(namcond1_shared_ram_w);
+ DECLARE_WRITE16_MEMBER(namcond1_cuskey_w);
};
/*----------- defined in machine/namcond1.c -----------*/
-READ16_HANDLER( namcond1_shared_ram_r );
-READ16_HANDLER( namcond1_cuskey_r );
-WRITE16_HANDLER( namcond1_shared_ram_w );
-WRITE16_HANDLER( namcond1_cuskey_w );
MACHINE_START( namcond1 );
MACHINE_RESET( namcond1 );
diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h
index f762b1d3fc4..443bfb34bc7 100644
--- a/src/mame/includes/namcos1.h
+++ b/src/mame/includes/namcos1.h
@@ -55,6 +55,13 @@ public:
DECLARE_WRITE8_MEMBER(namcos1_dac_gain_w);
DECLARE_WRITE8_MEMBER(namcos1_dac0_w);
DECLARE_WRITE8_MEMBER(namcos1_dac1_w);
+ DECLARE_WRITE8_MEMBER(namcos1_sound_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(namcos1_cpu_control_w);
+ DECLARE_WRITE8_MEMBER(namcos1_watchdog_w);
+ DECLARE_WRITE8_MEMBER(namcos1_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(namcos1_subcpu_bank_w);
+ DECLARE_WRITE8_MEMBER(namcos1_mcu_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(namcos1_mcu_patch_w);
};
@@ -65,15 +72,8 @@ void namcos1_init_DACs(running_machine &machine);
/*----------- defined in machine/namcos1.c -----------*/
-WRITE8_HANDLER( namcos1_bankswitch_w );
-WRITE8_HANDLER( namcos1_subcpu_bank_w );
-WRITE8_HANDLER( namcos1_cpu_control_w );
-WRITE8_HANDLER( namcos1_watchdog_w );
-WRITE8_HANDLER( namcos1_sound_bankswitch_w );
-WRITE8_HANDLER( namcos1_mcu_bankswitch_w );
-WRITE8_HANDLER( namcos1_mcu_patch_w );
MACHINE_RESET( namcos1 );
diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h
index 3d66ca11a6a..9e3a487e37e 100644
--- a/src/mame/includes/namcos21.h
+++ b/src/mame/includes/namcos21.h
@@ -130,6 +130,12 @@ public:
DECLARE_WRITE16_MEMBER(winrun_68k_dspcomram_w);
DECLARE_READ16_MEMBER(winrun_dspcomram_control_r);
DECLARE_WRITE16_MEMBER(winrun_dspcomram_control_w);
+ DECLARE_READ16_MEMBER(winrun_gpu_color_r);
+ DECLARE_WRITE16_MEMBER(winrun_gpu_color_w);
+ DECLARE_READ16_MEMBER(winrun_gpu_register_r);
+ DECLARE_WRITE16_MEMBER(winrun_gpu_register_w);
+ DECLARE_WRITE16_MEMBER(winrun_gpu_videoram_w);
+ DECLARE_READ16_MEMBER(winrun_gpu_videoram_r);
};
@@ -138,14 +144,8 @@ public:
extern void namcos21_ClearPolyFrameBuffer( running_machine &machine );
extern void namcos21_DrawQuad( running_machine &machine, int sx[4], int sy[4], int zcode[4], int color );
-extern READ16_HANDLER(winrun_gpu_color_r);
-extern WRITE16_HANDLER(winrun_gpu_color_w);
-extern READ16_HANDLER(winrun_gpu_videoram_r);
-extern WRITE16_HANDLER(winrun_gpu_videoram_w);
-extern READ16_HANDLER(winrun_gpu_register_r);
-extern WRITE16_HANDLER(winrun_gpu_register_w);
extern VIDEO_START( namcos21 ) ;
extern SCREEN_UPDATE_IND16( namcos21 );
diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h
index 672cbae38d6..790e750d6e9 100644
--- a/src/mame/includes/namcos22.h
+++ b/src/mame/includes/namcos22.h
@@ -106,41 +106,41 @@ public:
UINT8 *m_dirtypal;
bitmap_ind16 *m_mix_bitmap;
tilemap_t *m_bgtilemap;
+ DECLARE_READ32_MEMBER(namcos22_gamma_r);
+ DECLARE_WRITE32_MEMBER(namcos22_gamma_w);
+ DECLARE_WRITE32_MEMBER(namcos22s_czram_w);
+ DECLARE_READ32_MEMBER(namcos22s_czram_r);
+ DECLARE_READ32_MEMBER(namcos22s_vics_control_r);
+ DECLARE_WRITE32_MEMBER(namcos22s_vics_control_w);
+ DECLARE_READ32_MEMBER(namcos22_textram_r);
+ DECLARE_WRITE32_MEMBER(namcos22_textram_w);
+ DECLARE_READ32_MEMBER(namcos22_tilemapattr_r);
+ DECLARE_WRITE32_MEMBER(namcos22_tilemapattr_w);
+ DECLARE_READ32_MEMBER(namcos22s_spotram_r);
+ DECLARE_WRITE32_MEMBER(namcos22s_spotram_w);
+ DECLARE_READ32_MEMBER(namcos22_dspram_r);
+ DECLARE_WRITE32_MEMBER(namcos22_dspram_w);
+ DECLARE_READ32_MEMBER(namcos22_cgram_r);
+ DECLARE_WRITE32_MEMBER(namcos22_cgram_w);
+ DECLARE_READ32_MEMBER(namcos22_paletteram_r);
+ DECLARE_WRITE32_MEMBER(namcos22_paletteram_w);
+ DECLARE_WRITE16_MEMBER(namcos22_dspram16_bank_w);
+ DECLARE_READ16_MEMBER(namcos22_dspram16_r);
+ DECLARE_WRITE16_MEMBER(namcos22_dspram16_w);
};
/*----------- defined in video/namcos22.c -----------*/
-WRITE16_HANDLER( namcos22_dspram16_bank_w );
-READ16_HANDLER( namcos22_dspram16_r );
-WRITE16_HANDLER( namcos22_dspram16_w );
-READ32_HANDLER( namcos22_cgram_r );
-WRITE32_HANDLER( namcos22_cgram_w );
-READ32_HANDLER( namcos22s_czram_r );
-WRITE32_HANDLER( namcos22s_czram_w );
-READ32_HANDLER( namcos22s_spotram_r );
-WRITE32_HANDLER( namcos22s_spotram_w );
-READ32_HANDLER( namcos22_paletteram_r );
-WRITE32_HANDLER( namcos22_paletteram_w );
-READ32_HANDLER( namcos22_textram_r );
-WRITE32_HANDLER( namcos22_textram_w );
-READ32_HANDLER( namcos22s_vics_control_r );
-WRITE32_HANDLER( namcos22s_vics_control_w );
-READ32_HANDLER( namcos22_gamma_r );
-WRITE32_HANDLER( namcos22_gamma_w );
-READ32_HANDLER( namcos22_tilemapattr_r );
-WRITE32_HANDLER( namcos22_tilemapattr_w );
-READ32_HANDLER( namcos22_dspram_r );
-WRITE32_HANDLER( namcos22_dspram_w );
VIDEO_START( namcos22 );
diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h
index 9fd7f2a59e7..fb82c8f2620 100644
--- a/src/mame/includes/namcos86.h
+++ b/src/mame/includes/namcos86.h
@@ -29,6 +29,18 @@ public:
DECLARE_WRITE8_MEMBER(namcos86_led_w);
DECLARE_WRITE8_MEMBER(cus115_w);
DECLARE_READ8_MEMBER(readFF);
+ DECLARE_READ8_MEMBER(rthunder_videoram1_r);
+ DECLARE_WRITE8_MEMBER(rthunder_videoram1_w);
+ DECLARE_READ8_MEMBER(rthunder_videoram2_r);
+ DECLARE_WRITE8_MEMBER(rthunder_videoram2_w);
+ DECLARE_WRITE8_MEMBER(rthunder_tilebank_select_w);
+ DECLARE_WRITE8_MEMBER(rthunder_scroll0_w);
+ DECLARE_WRITE8_MEMBER(rthunder_scroll1_w);
+ DECLARE_WRITE8_MEMBER(rthunder_scroll2_w);
+ DECLARE_WRITE8_MEMBER(rthunder_scroll3_w);
+ DECLARE_WRITE8_MEMBER(rthunder_backcolor_w);
+ DECLARE_READ8_MEMBER(rthunder_spriteram_r);
+ DECLARE_WRITE8_MEMBER(rthunder_spriteram_w);
};
@@ -39,15 +51,3 @@ VIDEO_START( namcos86 );
SCREEN_UPDATE_IND16( namcos86 );
SCREEN_VBLANK( namcos86 );
-READ8_HANDLER( rthunder_videoram1_r );
-WRITE8_HANDLER( rthunder_videoram1_w );
-READ8_HANDLER( rthunder_videoram2_r );
-WRITE8_HANDLER( rthunder_videoram2_w );
-WRITE8_HANDLER( rthunder_scroll0_w );
-WRITE8_HANDLER( rthunder_scroll1_w );
-WRITE8_HANDLER( rthunder_scroll2_w );
-WRITE8_HANDLER( rthunder_scroll3_w );
-WRITE8_HANDLER( rthunder_backcolor_w );
-WRITE8_HANDLER( rthunder_tilebank_select_w );
-READ8_HANDLER( rthunder_spriteram_r );
-WRITE8_HANDLER( rthunder_spriteram_w );
diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h
index 3bfb5694b11..acef37e386c 100644
--- a/src/mame/includes/naughtyb.h
+++ b/src/mame/includes/naughtyb.h
@@ -21,13 +21,13 @@ public:
DECLARE_WRITE8_MEMBER(popflame_protection_w);
DECLARE_READ8_MEMBER(trvmstr_questions_r);
DECLARE_WRITE8_MEMBER(trvmstr_questions_w);
+ DECLARE_WRITE8_MEMBER(naughtyb_videoreg_w);
+ DECLARE_WRITE8_MEMBER(popflame_videoreg_w);
};
/*----------- defined in video/naughtyb.c -----------*/
-WRITE8_HANDLER( naughtyb_videoreg_w );
-WRITE8_HANDLER( popflame_videoreg_w );
VIDEO_START( naughtyb );
PALETTE_INIT( naughtyb );
diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h
index c11548cf876..84d70fef3f4 100644
--- a/src/mame/includes/nbmj8688.h
+++ b/src/mame/includes/nbmj8688.h
@@ -28,6 +28,22 @@ public:
int m_mjsikaku_flipscreen_old;
DECLARE_READ8_MEMBER(ff_r);
DECLARE_WRITE8_MEMBER(barline_output_w);
+ DECLARE_WRITE8_MEMBER(nbmj8688_clut_w);
+ DECLARE_WRITE8_MEMBER(nbmj8688_blitter_w);
+ DECLARE_WRITE8_MEMBER(mjsikaku_gfxflag2_w);
+ DECLARE_WRITE8_MEMBER(mjsikaku_gfxflag3_w);
+ DECLARE_WRITE8_MEMBER(mjsikaku_scrolly_w);
+ DECLARE_WRITE8_MEMBER(mjsikaku_romsel_w);
+ DECLARE_WRITE8_MEMBER(secolove_romsel_w);
+ DECLARE_WRITE8_MEMBER(crystalg_romsel_w);
+ DECLARE_WRITE8_MEMBER(seiha_romsel_w);
+ DECLARE_WRITE8_MEMBER(nbmj8688_HD61830B_0_instr_w);
+ DECLARE_WRITE8_MEMBER(nbmj8688_HD61830B_1_instr_w);
+ DECLARE_WRITE8_MEMBER(nbmj8688_HD61830B_both_instr_w);
+ DECLARE_WRITE8_MEMBER(nbmj8688_HD61830B_0_data_w);
+ DECLARE_WRITE8_MEMBER(nbmj8688_HD61830B_1_data_w);
+ DECLARE_WRITE8_MEMBER(nbmj8688_HD61830B_both_data_w);
+ void mjsikaku_vramflip();
};
@@ -46,18 +62,4 @@ VIDEO_START( mbmj8688_hybrid_16bit );
VIDEO_START( mbmj8688_pure_16bit );
VIDEO_START( mbmj8688_pure_16bit_LCD );
-WRITE8_HANDLER( nbmj8688_clut_w );
-WRITE8_HANDLER( nbmj8688_blitter_w );
-WRITE8_HANDLER( mjsikaku_gfxflag2_w );
-WRITE8_HANDLER( mjsikaku_scrolly_w );
-WRITE8_HANDLER( mjsikaku_romsel_w );
-WRITE8_HANDLER( secolove_romsel_w );
-WRITE8_HANDLER( seiha_romsel_w );
-WRITE8_HANDLER( crystalg_romsel_w );
-WRITE8_HANDLER( nbmj8688_HD61830B_0_instr_w );
-WRITE8_HANDLER( nbmj8688_HD61830B_0_data_w );
-WRITE8_HANDLER( nbmj8688_HD61830B_1_instr_w );
-WRITE8_HANDLER( nbmj8688_HD61830B_1_data_w );
-WRITE8_HANDLER( nbmj8688_HD61830B_both_instr_w );
-WRITE8_HANDLER( nbmj8688_HD61830B_both_data_w );
diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h
index 17407d83993..0babd377257 100644
--- a/src/mame/includes/nbmj8891.h
+++ b/src/mame/includes/nbmj8891.h
@@ -29,6 +29,23 @@ public:
int m_param_cnt;
int m_flipscreen_old;
DECLARE_READ8_MEMBER(taiwanmb_unk_r);
+ DECLARE_READ8_MEMBER(nbmj8891_palette_type1_r);
+ DECLARE_WRITE8_MEMBER(nbmj8891_palette_type1_w);
+ DECLARE_READ8_MEMBER(nbmj8891_palette_type2_r);
+ DECLARE_WRITE8_MEMBER(nbmj8891_palette_type2_w);
+ DECLARE_READ8_MEMBER(nbmj8891_palette_type3_r);
+ DECLARE_WRITE8_MEMBER(nbmj8891_palette_type3_w);
+ DECLARE_WRITE8_MEMBER(nbmj8891_clutsel_w);
+ DECLARE_READ8_MEMBER(nbmj8891_clut_r);
+ DECLARE_WRITE8_MEMBER(nbmj8891_clut_w);
+ DECLARE_WRITE8_MEMBER(nbmj8891_blitter_w);
+ DECLARE_WRITE8_MEMBER(nbmj8891_taiwanmb_blitter_w);
+ DECLARE_WRITE8_MEMBER(nbmj8891_taiwanmb_gfxdraw_w);
+ DECLARE_WRITE8_MEMBER(nbmj8891_taiwanmb_gfxflag_w);
+ DECLARE_WRITE8_MEMBER(nbmj8891_taiwanmb_mcu_w);
+ DECLARE_WRITE8_MEMBER(nbmj8891_scrolly_w);
+ DECLARE_WRITE8_MEMBER(nbmj8891_vramsel_w);
+ DECLARE_WRITE8_MEMBER(nbmj8891_romsel_w);
};
@@ -38,20 +55,3 @@ SCREEN_UPDATE_IND16( nbmj8891 );
VIDEO_START( nbmj8891_1layer );
VIDEO_START( nbmj8891_2layer );
-READ8_HANDLER( nbmj8891_palette_type1_r );
-WRITE8_HANDLER( nbmj8891_palette_type1_w );
-READ8_HANDLER( nbmj8891_palette_type2_r );
-WRITE8_HANDLER( nbmj8891_palette_type2_w );
-READ8_HANDLER( nbmj8891_palette_type3_r );
-WRITE8_HANDLER( nbmj8891_palette_type3_w );
-WRITE8_HANDLER( nbmj8891_blitter_w );
-WRITE8_HANDLER( nbmj8891_scrolly_w );
-WRITE8_HANDLER( nbmj8891_vramsel_w );
-WRITE8_HANDLER( nbmj8891_romsel_w );
-WRITE8_HANDLER( nbmj8891_clutsel_w );
-READ8_HANDLER( nbmj8891_clut_r );
-WRITE8_HANDLER( nbmj8891_clut_w );
-WRITE8_HANDLER( nbmj8891_taiwanmb_blitter_w );
-WRITE8_HANDLER( nbmj8891_taiwanmb_gfxflag_w );
-WRITE8_HANDLER( nbmj8891_taiwanmb_gfxdraw_w );
-WRITE8_HANDLER( nbmj8891_taiwanmb_mcu_w );
diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h
index a5a0d0aac83..83eefd192c9 100644
--- a/src/mame/includes/nbmj8900.h
+++ b/src/mame/includes/nbmj8900.h
@@ -28,6 +28,19 @@ public:
UINT8 *m_palette;
UINT8 *m_clut;
int m_flipscreen_old;
+ DECLARE_READ8_MEMBER(nbmj8900_palette_type1_r);
+ DECLARE_WRITE8_MEMBER(nbmj8900_palette_type1_w);
+ DECLARE_READ8_MEMBER(nbmj8900_palette_type2_r);
+ DECLARE_WRITE8_MEMBER(nbmj8900_palette_type2_w);
+ DECLARE_READ8_MEMBER(nbmj8900_palette_type3_r);
+ DECLARE_WRITE8_MEMBER(nbmj8900_palette_type3_w);
+ DECLARE_WRITE8_MEMBER(nbmj8900_clutsel_w);
+ DECLARE_READ8_MEMBER(nbmj8900_clut_r);
+ DECLARE_WRITE8_MEMBER(nbmj8900_clut_w);
+ DECLARE_WRITE8_MEMBER(nbmj8900_blitter_w);
+ DECLARE_WRITE8_MEMBER(nbmj8900_scrolly_w);
+ DECLARE_WRITE8_MEMBER(nbmj8900_vramsel_w);
+ DECLARE_WRITE8_MEMBER(nbmj8900_romsel_w);
};
@@ -36,12 +49,3 @@ public:
SCREEN_UPDATE_IND16( nbmj8900 );
VIDEO_START( nbmj8900_2layer );
-READ8_HANDLER( nbmj8900_palette_type1_r );
-WRITE8_HANDLER( nbmj8900_palette_type1_w );
-WRITE8_HANDLER( nbmj8900_blitter_w );
-WRITE8_HANDLER( nbmj8900_scrolly_w );
-WRITE8_HANDLER( nbmj8900_vramsel_w );
-WRITE8_HANDLER( nbmj8900_romsel_w );
-WRITE8_HANDLER( nbmj8900_clutsel_w );
-READ8_HANDLER( nbmj8900_clut_r );
-WRITE8_HANDLER( nbmj8900_clut_w );
diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h
index fd4da2dba40..ceccad4863d 100644
--- a/src/mame/includes/nbmj8991.h
+++ b/src/mame/includes/nbmj8991.h
@@ -25,6 +25,12 @@ public:
DECLARE_WRITE8_MEMBER(nbmj8991_soundbank_w);
DECLARE_WRITE8_MEMBER(nbmj8991_sound_w);
DECLARE_READ8_MEMBER(nbmj8991_sound_r);
+ DECLARE_WRITE8_MEMBER(nbmj8991_palette_type1_w);
+ DECLARE_WRITE8_MEMBER(nbmj8991_palette_type2_w);
+ DECLARE_WRITE8_MEMBER(nbmj8991_palette_type3_w);
+ DECLARE_WRITE8_MEMBER(nbmj8991_blitter_w);
+ DECLARE_READ8_MEMBER(nbmj8991_clut_r);
+ DECLARE_WRITE8_MEMBER(nbmj8991_clut_w);
};
@@ -34,9 +40,3 @@ SCREEN_UPDATE_IND16( nbmj8991_type1 );
SCREEN_UPDATE_IND16( nbmj8991_type2 );
VIDEO_START( nbmj8991 );
-WRITE8_HANDLER( nbmj8991_palette_type1_w );
-WRITE8_HANDLER( nbmj8991_palette_type2_w );
-WRITE8_HANDLER( nbmj8991_palette_type3_w );
-WRITE8_HANDLER( nbmj8991_blitter_w );
-READ8_HANDLER( nbmj8991_clut_r );
-WRITE8_HANDLER( nbmj8991_clut_w );
diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h
index 456afbecac7..381baeef5c1 100644
--- a/src/mame/includes/nbmj9195.h
+++ b/src/mame/includes/nbmj9195.h
@@ -95,6 +95,16 @@ public:
DECLARE_WRITE8_MEMBER(tmpz84c011_1_dir_pc_w);
DECLARE_WRITE8_MEMBER(tmpz84c011_1_dir_pd_w);
DECLARE_WRITE8_MEMBER(tmpz84c011_1_dir_pe_w);
+ DECLARE_READ8_MEMBER(nbmj9195_palette_r);
+ DECLARE_WRITE8_MEMBER(nbmj9195_palette_w);
+ DECLARE_READ8_MEMBER(nbmj9195_nb22090_palette_r);
+ DECLARE_WRITE8_MEMBER(nbmj9195_nb22090_palette_w);
+ DECLARE_WRITE8_MEMBER(nbmj9195_blitter_0_w);
+ DECLARE_WRITE8_MEMBER(nbmj9195_blitter_1_w);
+ DECLARE_READ8_MEMBER(nbmj9195_blitter_0_r);
+ DECLARE_READ8_MEMBER(nbmj9195_blitter_1_r);
+ DECLARE_WRITE8_MEMBER(nbmj9195_clut_0_w);
+ DECLARE_WRITE8_MEMBER(nbmj9195_clut_1_w);
};
@@ -105,17 +115,7 @@ VIDEO_START( nbmj9195_1layer );
VIDEO_START( nbmj9195_2layer );
VIDEO_START( nbmj9195_nb22090 );
-READ8_HANDLER( nbmj9195_palette_r );
-WRITE8_HANDLER( nbmj9195_palette_w );
-READ8_HANDLER( nbmj9195_nb22090_palette_r );
-WRITE8_HANDLER( nbmj9195_nb22090_palette_w );
-READ8_HANDLER( nbmj9195_blitter_0_r );
-READ8_HANDLER( nbmj9195_blitter_1_r );
-WRITE8_HANDLER( nbmj9195_blitter_0_w );
-WRITE8_HANDLER( nbmj9195_blitter_1_w );
-WRITE8_HANDLER( nbmj9195_clut_0_w );
-WRITE8_HANDLER( nbmj9195_clut_1_w );
void nbmj9195_clutsel_w(address_space *space, int data);
void nbmj9195_gfxflag2_w(address_space *space, int data);
diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h
index 03fd53c1345..1ddfb9ff980 100644
--- a/src/mame/includes/nemesis.h
+++ b/src/mame/includes/nemesis.h
@@ -56,22 +56,22 @@ public:
DECLARE_READ16_MEMBER(selected_ip_word_r);
DECLARE_WRITE16_MEMBER(nemesis_soundlatch_word_w);
DECLARE_READ8_MEMBER(wd_r);
+ DECLARE_WRITE16_MEMBER(nemesis_gfx_flipx_word_w);
+ DECLARE_WRITE16_MEMBER(nemesis_gfx_flipy_word_w);
+ DECLARE_WRITE16_MEMBER(salamand_control_port_word_w);
+ DECLARE_WRITE16_MEMBER(nemesis_palette_word_w);
+ DECLARE_WRITE16_MEMBER(salamander_palette_word_w);
+ DECLARE_WRITE16_MEMBER(nemesis_videoram1_word_w);
+ DECLARE_WRITE16_MEMBER(nemesis_videoram2_word_w);
+ DECLARE_WRITE16_MEMBER(nemesis_colorram1_word_w);
+ DECLARE_WRITE16_MEMBER(nemesis_colorram2_word_w);
+ DECLARE_WRITE16_MEMBER(nemesis_charram_word_w);
};
/*----------- defined in video/nemesis.c -----------*/
-WRITE16_HANDLER( nemesis_gfx_flipx_word_w );
-WRITE16_HANDLER( nemesis_gfx_flipy_word_w );
-WRITE16_HANDLER( salamand_control_port_word_w );
-WRITE16_HANDLER( salamander_palette_word_w );
-WRITE16_HANDLER( nemesis_palette_word_w );
-WRITE16_HANDLER( nemesis_videoram1_word_w );
-WRITE16_HANDLER( nemesis_videoram2_word_w );
-WRITE16_HANDLER( nemesis_colorram1_word_w );
-WRITE16_HANDLER( nemesis_colorram2_word_w );
-WRITE16_HANDLER( nemesis_charram_word_w );
VIDEO_START( nemesis );
SCREEN_UPDATE_IND16( nemesis );
diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h
index c4443939f5c..0c9fa165f22 100644
--- a/src/mame/includes/neogeo.h
+++ b/src/mame/includes/neogeo.h
@@ -124,6 +124,10 @@ public:
DECLARE_WRITE16_MEMBER(system_control_w);
DECLARE_WRITE16_MEMBER(watchdog_w);
DECLARE_READ16_MEMBER(neogeo_unmapped_r);
+ DECLARE_READ16_MEMBER(neogeo_paletteram_r);
+ DECLARE_WRITE16_MEMBER(neogeo_paletteram_w);
+ DECLARE_READ16_MEMBER(neogeo_video_register_r);
+ DECLARE_WRITE16_MEMBER(neogeo_video_register_w);
};
@@ -229,13 +233,9 @@ VIDEO_START( neogeo );
VIDEO_RESET( neogeo );
SCREEN_UPDATE_RGB32( neogeo );
-READ16_HANDLER( neogeo_video_register_r );
-WRITE16_HANDLER( neogeo_video_register_w );
void neogeo_set_palette_bank(running_machine &machine, UINT8 data);
void neogeo_set_screen_dark(running_machine &machine, UINT8 data);
-READ16_HANDLER( neogeo_paletteram_r );
-WRITE16_HANDLER( neogeo_paletteram_w );
void neogeo_set_fixed_layer_source(running_machine &machine, UINT8 data);
diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h
index f103b75f602..308ebc43b53 100644
--- a/src/mame/includes/news.h
+++ b/src/mame/includes/news.h
@@ -14,14 +14,14 @@ public:
tilemap_t *m_fg_tilemap;
tilemap_t *m_bg_tilemap;
int m_bgpic;
+ DECLARE_WRITE8_MEMBER(news_fgram_w);
+ DECLARE_WRITE8_MEMBER(news_bgram_w);
+ DECLARE_WRITE8_MEMBER(news_bgpic_w);
};
/*----------- defined in video/news.c -----------*/
-WRITE8_HANDLER( news_fgram_w );
-WRITE8_HANDLER( news_bgram_w );
-WRITE8_HANDLER( news_bgpic_w );
VIDEO_START( news );
SCREEN_UPDATE_IND16( news );
diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h
index 9f9acf532eb..7162592ac26 100644
--- a/src/mame/includes/ninjakd2.h
+++ b/src/mame/includes/ninjakd2.h
@@ -34,28 +34,28 @@ public:
DECLARE_WRITE8_MEMBER(ninjakd2_pcm_play_w);
DECLARE_READ8_MEMBER(omegaf_io_protection_r);
DECLARE_WRITE8_MEMBER(omegaf_io_protection_w);
+ DECLARE_WRITE8_MEMBER(ninjakd2_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(ninjakd2_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(robokid_bg0_bank_w);
+ DECLARE_WRITE8_MEMBER(robokid_bg1_bank_w);
+ DECLARE_WRITE8_MEMBER(robokid_bg2_bank_w);
+ DECLARE_READ8_MEMBER(robokid_bg0_videoram_r);
+ DECLARE_READ8_MEMBER(robokid_bg1_videoram_r);
+ DECLARE_READ8_MEMBER(robokid_bg2_videoram_r);
+ DECLARE_WRITE8_MEMBER(robokid_bg0_videoram_w);
+ DECLARE_WRITE8_MEMBER(robokid_bg1_videoram_w);
+ DECLARE_WRITE8_MEMBER(robokid_bg2_videoram_w);
+ DECLARE_WRITE8_MEMBER(ninjakd2_bg_ctrl_w);
+ DECLARE_WRITE8_MEMBER(robokid_bg0_ctrl_w);
+ DECLARE_WRITE8_MEMBER(robokid_bg1_ctrl_w);
+ DECLARE_WRITE8_MEMBER(robokid_bg2_ctrl_w);
+ DECLARE_WRITE8_MEMBER(ninjakd2_sprite_overdraw_w);
};
/*----------- defined in video/ninjakd2.c -----------*/
-extern WRITE8_HANDLER( ninjakd2_bgvideoram_w );
-extern WRITE8_HANDLER( ninjakd2_fgvideoram_w );
-extern WRITE8_HANDLER( ninjakd2_bg_ctrl_w );
-extern WRITE8_HANDLER( ninjakd2_sprite_overdraw_w );
-extern READ8_HANDLER( robokid_bg0_videoram_r );
-extern READ8_HANDLER( robokid_bg1_videoram_r );
-extern READ8_HANDLER( robokid_bg2_videoram_r );
-extern WRITE8_HANDLER( robokid_bg0_videoram_w );
-extern WRITE8_HANDLER( robokid_bg1_videoram_w );
-extern WRITE8_HANDLER( robokid_bg2_videoram_w );
-extern WRITE8_HANDLER( robokid_bg0_ctrl_w );
-extern WRITE8_HANDLER( robokid_bg1_ctrl_w );
-extern WRITE8_HANDLER( robokid_bg2_ctrl_w );
-extern WRITE8_HANDLER( robokid_bg0_bank_w );
-extern WRITE8_HANDLER( robokid_bg1_bank_w );
-extern WRITE8_HANDLER( robokid_bg2_bank_w );
extern VIDEO_START( ninjakd2 );
extern VIDEO_START( mnight );
diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h
index 0e7125c6fb1..334dfc685aa 100644
--- a/src/mame/includes/nitedrvr.h
+++ b/src/mame/includes/nitedrvr.h
@@ -42,17 +42,19 @@ public:
/* devices */
device_t *m_maincpu;
device_t *m_discrete;
+ DECLARE_READ8_MEMBER(nitedrvr_steering_reset_r);
+ DECLARE_WRITE8_MEMBER(nitedrvr_steering_reset_w);
+ DECLARE_READ8_MEMBER(nitedrvr_in0_r);
+ DECLARE_READ8_MEMBER(nitedrvr_in1_r);
+ DECLARE_WRITE8_MEMBER(nitedrvr_out0_w);
+ DECLARE_WRITE8_MEMBER(nitedrvr_out1_w);
+ DECLARE_WRITE8_MEMBER(nitedrvr_videoram_w);
+ DECLARE_WRITE8_MEMBER(nitedrvr_hvc_w);
};
/*----------- defined in machine/nitedrvr.c -----------*/
-READ8_HANDLER( nitedrvr_in0_r );
-READ8_HANDLER( nitedrvr_in1_r );
-READ8_HANDLER( nitedrvr_steering_reset_r );
-WRITE8_HANDLER( nitedrvr_steering_reset_w );
-WRITE8_HANDLER( nitedrvr_out0_w );
-WRITE8_HANDLER( nitedrvr_out1_w );
TIMER_DEVICE_CALLBACK( nitedrvr_crash_toggle_callback );
@@ -67,8 +69,6 @@ DISCRETE_SOUND_EXTERN( nitedrvr );
/*----------- defined in video/nitedrvr.c -----------*/
-WRITE8_HANDLER( nitedrvr_hvc_w );
-WRITE8_HANDLER( nitedrvr_videoram_w );
VIDEO_START( nitedrvr );
SCREEN_UPDATE_IND16( nitedrvr );
diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h
index 62edb6c563c..cde22ec330f 100644
--- a/src/mame/includes/niyanpai.h
+++ b/src/mame/includes/niyanpai.h
@@ -61,6 +61,20 @@ public:
DECLARE_READ16_MEMBER(niyanpai_dipsw_r);
DECLARE_READ16_MEMBER(musobana_inputport_0_r);
DECLARE_WRITE16_MEMBER(musobana_inputport_w);
+ DECLARE_READ16_MEMBER(niyanpai_palette_r);
+ DECLARE_WRITE16_MEMBER(niyanpai_palette_w);
+ DECLARE_WRITE16_MEMBER(niyanpai_blitter_0_w);
+ DECLARE_WRITE16_MEMBER(niyanpai_blitter_1_w);
+ DECLARE_WRITE16_MEMBER(niyanpai_blitter_2_w);
+ DECLARE_READ16_MEMBER(niyanpai_blitter_0_r);
+ DECLARE_READ16_MEMBER(niyanpai_blitter_1_r);
+ DECLARE_READ16_MEMBER(niyanpai_blitter_2_r);
+ DECLARE_WRITE16_MEMBER(niyanpai_clut_0_w);
+ DECLARE_WRITE16_MEMBER(niyanpai_clut_1_w);
+ DECLARE_WRITE16_MEMBER(niyanpai_clut_2_w);
+ DECLARE_WRITE16_MEMBER(niyanpai_clutsel_0_w);
+ DECLARE_WRITE16_MEMBER(niyanpai_clutsel_1_w);
+ DECLARE_WRITE16_MEMBER(niyanpai_clutsel_2_w);
};
@@ -69,18 +83,4 @@ public:
SCREEN_UPDATE_IND16( niyanpai );
VIDEO_START( niyanpai );
-READ16_HANDLER( niyanpai_palette_r );
-WRITE16_HANDLER( niyanpai_palette_w );
-READ16_HANDLER( niyanpai_blitter_0_r );
-READ16_HANDLER( niyanpai_blitter_1_r );
-READ16_HANDLER( niyanpai_blitter_2_r );
-WRITE16_HANDLER( niyanpai_blitter_0_w );
-WRITE16_HANDLER( niyanpai_blitter_1_w );
-WRITE16_HANDLER( niyanpai_blitter_2_w );
-WRITE16_HANDLER( niyanpai_clut_0_w );
-WRITE16_HANDLER( niyanpai_clut_1_w );
-WRITE16_HANDLER( niyanpai_clut_2_w );
-WRITE16_HANDLER( niyanpai_clutsel_0_w );
-WRITE16_HANDLER( niyanpai_clutsel_1_w );
-WRITE16_HANDLER( niyanpai_clutsel_2_w );
diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h
index 9d14122af2a..ba162184646 100644
--- a/src/mame/includes/nmk16.h
+++ b/src/mame/includes/nmk16.h
@@ -65,29 +65,29 @@ public:
DECLARE_WRITE16_MEMBER(twinactn_scroll0_w);
DECLARE_WRITE16_MEMBER(twinactn_scroll1_w);
DECLARE_WRITE16_MEMBER(twinactn_flipscreen_w);
+ DECLARE_WRITE16_MEMBER(nmk_bgvideoram0_w);
+ DECLARE_WRITE16_MEMBER(nmk_bgvideoram1_w);
+ DECLARE_WRITE16_MEMBER(nmk_bgvideoram2_w);
+ DECLARE_WRITE16_MEMBER(nmk_bgvideoram3_w);
+ DECLARE_WRITE16_MEMBER(nmk_fgvideoram_w);
+ DECLARE_WRITE16_MEMBER(nmk_txvideoram_w);
+ DECLARE_WRITE16_MEMBER(mustang_scroll_w);
+ DECLARE_WRITE16_MEMBER(bioshipbg_scroll_w);
+ DECLARE_WRITE16_MEMBER(nmk_scroll_w);
+ DECLARE_WRITE16_MEMBER(nmk_scroll_2_w);
+ DECLARE_WRITE16_MEMBER(vandyke_scroll_w);
+ DECLARE_WRITE16_MEMBER(vandykeb_scroll_w);
+ DECLARE_WRITE16_MEMBER(manybloc_scroll_w);
+ DECLARE_WRITE16_MEMBER(nmk_flipscreen_w);
+ DECLARE_WRITE16_MEMBER(nmk_tilebank_w);
+ DECLARE_WRITE16_MEMBER(bioship_scroll_w);
+ DECLARE_WRITE16_MEMBER(bioship_bank_w);
};
/*----------- defined in video/nmk16.c -----------*/
-WRITE16_HANDLER( nmk_bgvideoram0_w );
-WRITE16_HANDLER( nmk_bgvideoram1_w );
-WRITE16_HANDLER( nmk_bgvideoram2_w );
-WRITE16_HANDLER( nmk_bgvideoram3_w );
-WRITE16_HANDLER( nmk_fgvideoram_w );
-WRITE16_HANDLER( nmk_txvideoram_w );
-WRITE16_HANDLER( nmk_scroll_w );
-WRITE16_HANDLER( nmk_scroll_2_w );
-WRITE16_HANDLER( nmk_flipscreen_w );
-WRITE16_HANDLER( nmk_tilebank_w );
-WRITE16_HANDLER( bioship_scroll_w );
-WRITE16_HANDLER( bioship_bank_w );
-WRITE16_HANDLER( mustang_scroll_w );
-WRITE16_HANDLER( bioshipbg_scroll_w );
-WRITE16_HANDLER( vandyke_scroll_w );
-WRITE16_HANDLER( vandykeb_scroll_w );
-WRITE16_HANDLER( manybloc_scroll_w );
VIDEO_START( macross );
VIDEO_START( gunnail );
diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h
index edc58c65ff0..69bb7a011d3 100644
--- a/src/mame/includes/nova2001.h
+++ b/src/mame/includes/nova2001.h
@@ -12,20 +12,20 @@ public:
UINT8 *m_spriteram;
DECLARE_WRITE8_MEMBER(ninjakun_cpu1_io_A002_w);
DECLARE_WRITE8_MEMBER(ninjakun_cpu2_io_A002_w);
+ DECLARE_WRITE8_MEMBER(ninjakun_paletteram_w);
+ DECLARE_WRITE8_MEMBER(nova2001_fg_videoram_w);
+ DECLARE_WRITE8_MEMBER(nova2001_bg_videoram_w);
+ DECLARE_WRITE8_MEMBER(ninjakun_bg_videoram_w);
+ DECLARE_READ8_MEMBER(ninjakun_bg_videoram_r);
+ DECLARE_WRITE8_MEMBER(nova2001_scroll_x_w);
+ DECLARE_WRITE8_MEMBER(nova2001_scroll_y_w);
+ DECLARE_WRITE8_MEMBER(nova2001_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(pkunwar_flipscreen_w);
};
/*----------- defined in video/nova2001.c -----------*/
-extern WRITE8_HANDLER( nova2001_fg_videoram_w );
-extern WRITE8_HANDLER( nova2001_bg_videoram_w );
-extern WRITE8_HANDLER( ninjakun_bg_videoram_w );
-extern READ8_HANDLER( ninjakun_bg_videoram_r );
-extern WRITE8_HANDLER( nova2001_scroll_x_w );
-extern WRITE8_HANDLER( nova2001_scroll_y_w );
-extern WRITE8_HANDLER( nova2001_flipscreen_w );
-extern WRITE8_HANDLER( pkunwar_flipscreen_w );
-extern WRITE8_HANDLER( ninjakun_paletteram_w );
extern PALETTE_INIT( nova2001 );
extern VIDEO_START( nova2001 );
diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h
index 6c679ede83b..9f64a2afde0 100644
--- a/src/mame/includes/nycaptor.h
+++ b/src/mame/includes/nycaptor.h
@@ -67,40 +67,40 @@ public:
DECLARE_READ8_MEMBER(cyclshtg_mcu_status_r1);
DECLARE_WRITE8_MEMBER(cyclshtg_generic_control_w);
DECLARE_READ8_MEMBER(unk_r);
+ DECLARE_READ8_MEMBER(nycaptor_68705_port_a_r);
+ DECLARE_WRITE8_MEMBER(nycaptor_68705_port_a_w);
+ DECLARE_WRITE8_MEMBER(nycaptor_68705_ddr_a_w);
+ DECLARE_READ8_MEMBER(nycaptor_68705_port_b_r);
+ DECLARE_WRITE8_MEMBER(nycaptor_68705_port_b_w);
+ DECLARE_WRITE8_MEMBER(nycaptor_68705_ddr_b_w);
+ DECLARE_READ8_MEMBER(nycaptor_68705_port_c_r);
+ DECLARE_WRITE8_MEMBER(nycaptor_68705_port_c_w);
+ DECLARE_WRITE8_MEMBER(nycaptor_68705_ddr_c_w);
+ DECLARE_WRITE8_MEMBER(nycaptor_mcu_w);
+ DECLARE_READ8_MEMBER(nycaptor_mcu_r);
+ DECLARE_READ8_MEMBER(nycaptor_mcu_status_r1);
+ DECLARE_READ8_MEMBER(nycaptor_mcu_status_r2);
+ DECLARE_WRITE8_MEMBER(nycaptor_spriteram_w);
+ DECLARE_READ8_MEMBER(nycaptor_spriteram_r);
+ DECLARE_WRITE8_MEMBER(nycaptor_videoram_w);
+ DECLARE_READ8_MEMBER(nycaptor_videoram_r);
+ DECLARE_WRITE8_MEMBER(nycaptor_palette_w);
+ DECLARE_READ8_MEMBER(nycaptor_palette_r);
+ DECLARE_WRITE8_MEMBER(nycaptor_gfxctrl_w);
+ DECLARE_READ8_MEMBER(nycaptor_gfxctrl_r);
+ DECLARE_READ8_MEMBER(nycaptor_scrlram_r);
+ DECLARE_WRITE8_MEMBER(nycaptor_scrlram_w);
};
/*----------- defined in machine/nycaptor.c -----------*/
-READ8_HANDLER( nycaptor_mcu_r );
-READ8_HANDLER( nycaptor_mcu_status_r1 );
-READ8_HANDLER( nycaptor_mcu_status_r2 );
-READ8_HANDLER( nycaptor_68705_port_c_r );
-READ8_HANDLER( nycaptor_68705_port_b_r );
-READ8_HANDLER( nycaptor_68705_port_a_r );
-WRITE8_HANDLER( nycaptor_mcu_w );
-WRITE8_HANDLER( nycaptor_68705_port_a_w );
-WRITE8_HANDLER( nycaptor_68705_port_b_w );
-WRITE8_HANDLER( nycaptor_68705_port_c_w );
-WRITE8_HANDLER( nycaptor_68705_ddr_a_w );
-WRITE8_HANDLER( nycaptor_68705_ddr_b_w );
-WRITE8_HANDLER( nycaptor_68705_ddr_c_w );
/*----------- defined in video/nycaptor.c -----------*/
-READ8_HANDLER( nycaptor_videoram_r );
-READ8_HANDLER( nycaptor_spriteram_r );
-READ8_HANDLER( nycaptor_palette_r );
-READ8_HANDLER( nycaptor_gfxctrl_r );
-READ8_HANDLER( nycaptor_scrlram_r );
-WRITE8_HANDLER( nycaptor_videoram_w );
-WRITE8_HANDLER( nycaptor_spriteram_w );
-WRITE8_HANDLER( nycaptor_palette_w );
-WRITE8_HANDLER( nycaptor_gfxctrl_w );
-WRITE8_HANDLER( nycaptor_scrlram_w );
VIDEO_START( nycaptor );
SCREEN_UPDATE_IND16( nycaptor );
diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h
index b2f2ba97aac..8f040fdfadb 100644
--- a/src/mame/includes/ohmygod.h
+++ b/src/mame/includes/ohmygod.h
@@ -26,15 +26,15 @@ public:
int m_adpcm_bank_shift;
int m_sndbank;
DECLARE_WRITE16_MEMBER(ohmygod_ctrl_w);
+ DECLARE_WRITE16_MEMBER(ohmygod_videoram_w);
+ DECLARE_WRITE16_MEMBER(ohmygod_spritebank_w);
+ DECLARE_WRITE16_MEMBER(ohmygod_scrollx_w);
+ DECLARE_WRITE16_MEMBER(ohmygod_scrolly_w);
};
/*----------- defined in video/ohmygod.c -----------*/
-WRITE16_HANDLER( ohmygod_videoram_w );
-WRITE16_HANDLER( ohmygod_spritebank_w );
-WRITE16_HANDLER( ohmygod_scrollx_w );
-WRITE16_HANDLER( ohmygod_scrolly_w );
VIDEO_START( ohmygod );
SCREEN_UPDATE_IND16( ohmygod );
diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h
index 96f3dc90f91..0f111bf8418 100644
--- a/src/mame/includes/ojankohs.h
+++ b/src/mame/includes/ojankohs.h
@@ -45,19 +45,19 @@ public:
DECLARE_READ8_MEMBER(ccasino_dipsw4_r);
DECLARE_WRITE8_MEMBER(ojankoy_coinctr_w);
DECLARE_WRITE8_MEMBER(ccasino_coinctr_w);
+ DECLARE_WRITE8_MEMBER(ojankohs_palette_w);
+ DECLARE_WRITE8_MEMBER(ccasino_palette_w);
+ DECLARE_WRITE8_MEMBER(ojankoc_palette_w);
+ DECLARE_WRITE8_MEMBER(ojankohs_videoram_w);
+ DECLARE_WRITE8_MEMBER(ojankohs_colorram_w);
+ DECLARE_WRITE8_MEMBER(ojankohs_gfxreg_w);
+ DECLARE_WRITE8_MEMBER(ojankohs_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(ojankoc_videoram_w);
};
/*----------- defined in video/ojankohs.c -----------*/
-WRITE8_HANDLER( ojankohs_palette_w );
-WRITE8_HANDLER( ccasino_palette_w );
-WRITE8_HANDLER( ojankohs_videoram_w );
-WRITE8_HANDLER( ojankohs_colorram_w );
-WRITE8_HANDLER( ojankohs_gfxreg_w );
-WRITE8_HANDLER( ojankohs_flipscreen_w );
-WRITE8_HANDLER( ojankoc_palette_w );
-WRITE8_HANDLER( ojankoc_videoram_w );
PALETTE_INIT( ojankoy );
diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h
index 84bb158d0d3..293b6f31826 100644
--- a/src/mame/includes/oneshot.h
+++ b/src/mame/includes/oneshot.h
@@ -34,13 +34,13 @@ public:
DECLARE_READ16_MEMBER(oneshot_gun_y_p1_r);
DECLARE_READ16_MEMBER(oneshot_gun_x_p2_r);
DECLARE_READ16_MEMBER(oneshot_gun_y_p2_r);
+ DECLARE_WRITE16_MEMBER(oneshot_bg_videoram_w);
+ DECLARE_WRITE16_MEMBER(oneshot_mid_videoram_w);
+ DECLARE_WRITE16_MEMBER(oneshot_fg_videoram_w);
};
/*----------- defined in video/oneshot.c -----------*/
-WRITE16_HANDLER( oneshot_bg_videoram_w );
-WRITE16_HANDLER( oneshot_mid_videoram_w );
-WRITE16_HANDLER( oneshot_fg_videoram_w );
VIDEO_START( oneshot );
SCREEN_UPDATE_IND16( oneshot );
diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h
index 0080fd08f6c..dcecf8399dc 100644
--- a/src/mame/includes/opwolf.h
+++ b/src/mame/includes/opwolf.h
@@ -58,6 +58,12 @@ public:
DECLARE_READ8_MEMBER(z80_input2_r);
DECLARE_WRITE8_MEMBER(opwolf_adpcm_d_w);
DECLARE_WRITE8_MEMBER(opwolf_adpcm_e_w);
+ DECLARE_WRITE16_MEMBER(opwolf_cchip_status_w);
+ DECLARE_WRITE16_MEMBER(opwolf_cchip_bank_w);
+ DECLARE_WRITE16_MEMBER(opwolf_cchip_data_w);
+ DECLARE_READ16_MEMBER(opwolf_cchip_status_r);
+ DECLARE_READ16_MEMBER(opwolf_cchip_data_r);
+ DECLARE_WRITE16_MEMBER(opwolf_spritectrl_w);
};
@@ -65,15 +71,9 @@ public:
void opwolf_cchip_init(running_machine &machine);
-READ16_HANDLER( opwolf_cchip_status_r );
-READ16_HANDLER( opwolf_cchip_data_r );
-WRITE16_HANDLER( opwolf_cchip_status_w );
-WRITE16_HANDLER( opwolf_cchip_data_w );
-WRITE16_HANDLER( opwolf_cchip_bank_w );
/*----------- defined in video/opwolf.c -----------*/
-WRITE16_HANDLER( opwolf_spritectrl_w );
SCREEN_UPDATE_IND16( opwolf );
diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h
index cd0b7fbfc33..285fb9a6788 100644
--- a/src/mame/includes/orbit.h
+++ b/src/mame/includes/orbit.h
@@ -36,6 +36,7 @@ public:
device_t *m_maincpu;
device_t *m_discrete;
DECLARE_WRITE8_MEMBER(orbit_misc_w);
+ DECLARE_WRITE8_MEMBER(orbit_playfield_w);
};
@@ -53,4 +54,3 @@ DISCRETE_SOUND_EXTERN( orbit );
VIDEO_START( orbit );
SCREEN_UPDATE_IND16( orbit );
-WRITE8_HANDLER( orbit_playfield_w );
diff --git a/src/mame/includes/othldrby.h b/src/mame/includes/othldrby.h
index 1fe8feecb39..2d7b9e5489e 100644
--- a/src/mame/includes/othldrby.h
+++ b/src/mame/includes/othldrby.h
@@ -29,16 +29,16 @@ public:
DECLARE_WRITE16_MEMBER(coinctrl_w);
DECLARE_WRITE16_MEMBER(calendar_w);
DECLARE_READ16_MEMBER(calendar_r);
+ DECLARE_WRITE16_MEMBER(othldrby_videoram_addr_w);
+ DECLARE_READ16_MEMBER(othldrby_videoram_r);
+ DECLARE_WRITE16_MEMBER(othldrby_videoram_w);
+ DECLARE_WRITE16_MEMBER(othldrby_vreg_addr_w);
+ DECLARE_WRITE16_MEMBER(othldrby_vreg_w);
};
/*----------- defined in video/othldrby.c -----------*/
-WRITE16_HANDLER( othldrby_videoram_addr_w );
-READ16_HANDLER( othldrby_videoram_r );
-WRITE16_HANDLER( othldrby_videoram_w );
-WRITE16_HANDLER( othldrby_vreg_addr_w );
-WRITE16_HANDLER( othldrby_vreg_w );
VIDEO_START( othldrby );
SCREEN_VBLANK( othldrby );
diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h
index a8d5afbbe4f..d2929a6b31d 100644
--- a/src/mame/includes/pacland.h
+++ b/src/mame/includes/pacland.h
@@ -25,16 +25,16 @@ public:
DECLARE_WRITE8_MEMBER(pacland_irq_1_ctrl_w);
DECLARE_WRITE8_MEMBER(pacland_irq_2_ctrl_w);
DECLARE_READ8_MEMBER(readFF);
+ DECLARE_WRITE8_MEMBER(pacland_videoram_w);
+ DECLARE_WRITE8_MEMBER(pacland_videoram2_w);
+ DECLARE_WRITE8_MEMBER(pacland_scroll0_w);
+ DECLARE_WRITE8_MEMBER(pacland_scroll1_w);
+ DECLARE_WRITE8_MEMBER(pacland_bankswitch_w);
};
/*----------- defined in video/pacland.c -----------*/
-WRITE8_HANDLER( pacland_videoram_w );
-WRITE8_HANDLER( pacland_videoram2_w );
-WRITE8_HANDLER( pacland_scroll0_w );
-WRITE8_HANDLER( pacland_scroll1_w );
-WRITE8_HANDLER( pacland_bankswitch_w );
PALETTE_INIT( pacland );
VIDEO_START( pacland );
diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h
index 737daebc48e..261cfaf5eb4 100644
--- a/src/mame/includes/pacman.h
+++ b/src/mame/includes/pacman.h
@@ -75,6 +75,21 @@ public:
DECLARE_WRITE8_MEMBER(mspacman_enable_decode_w);
DECLARE_WRITE8_MEMBER(irq_mask_w);
DECLARE_READ8_MEMBER(cannonbp_protection_r);
+ DECLARE_WRITE8_MEMBER(pacman_videoram_w);
+ DECLARE_WRITE8_MEMBER(pacman_colorram_w);
+ DECLARE_WRITE8_MEMBER(pacman_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(pengo_palettebank_w);
+ DECLARE_WRITE8_MEMBER(pengo_colortablebank_w);
+ DECLARE_WRITE8_MEMBER(pengo_gfxbank_w);
+ DECLARE_WRITE8_MEMBER(s2650games_videoram_w);
+ DECLARE_WRITE8_MEMBER(s2650games_colorram_w);
+ DECLARE_WRITE8_MEMBER(s2650games_scroll_w);
+ DECLARE_WRITE8_MEMBER(s2650games_tilesbank_w);
+ DECLARE_WRITE8_MEMBER(jrpacman_videoram_w);
+ DECLARE_WRITE8_MEMBER(jrpacman_charbank_w);
+ DECLARE_WRITE8_MEMBER(jrpacman_spritebank_w);
+ DECLARE_WRITE8_MEMBER(jrpacman_scroll_w);
+ DECLARE_WRITE8_MEMBER(jrpacman_bgpriority_w);
};
@@ -84,35 +99,20 @@ PALETTE_INIT( pacman );
VIDEO_START( pacman );
SCREEN_UPDATE_IND16( pacman );
-WRITE8_HANDLER( pacman_videoram_w );
-WRITE8_HANDLER( pacman_colorram_w );
-WRITE8_HANDLER( pacman_flipscreen_w );
VIDEO_START( pengo );
-WRITE8_HANDLER( pengo_palettebank_w );
-WRITE8_HANDLER( pengo_colortablebank_w );
-WRITE8_HANDLER( pengo_gfxbank_w );
VIDEO_START( s2650games );
SCREEN_UPDATE_IND16( s2650games );
-WRITE8_HANDLER( s2650games_videoram_w );
-WRITE8_HANDLER( s2650games_colorram_w );
-WRITE8_HANDLER( s2650games_scroll_w );
-WRITE8_HANDLER( s2650games_tilesbank_w );
VIDEO_START( jrpacman );
-WRITE8_HANDLER( jrpacman_videoram_w );
-WRITE8_HANDLER( jrpacman_charbank_w );
-WRITE8_HANDLER( jrpacman_spritebank_w );
-WRITE8_HANDLER( jrpacman_scroll_w );
-WRITE8_HANDLER( jrpacman_bgpriority_w );
VIDEO_START( birdiy );
diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h
index 00b9e7d5fa9..33f8d450cae 100644
--- a/src/mame/includes/pandoras.h
+++ b/src/mame/includes/pandoras.h
@@ -36,6 +36,10 @@ public:
DECLARE_WRITE8_MEMBER(pandoras_i8039_irqtrigger_w);
DECLARE_WRITE8_MEMBER(i8039_irqen_and_status_w);
DECLARE_WRITE8_MEMBER(pandoras_z80_irqtrigger_w);
+ DECLARE_WRITE8_MEMBER(pandoras_vram_w);
+ DECLARE_WRITE8_MEMBER(pandoras_cram_w);
+ DECLARE_WRITE8_MEMBER(pandoras_scrolly_w);
+ DECLARE_WRITE8_MEMBER(pandoras_flipscreen_w);
};
@@ -43,10 +47,6 @@ public:
PALETTE_INIT( pandoras );
-WRITE8_HANDLER( pandoras_vram_w );
-WRITE8_HANDLER( pandoras_cram_w );
-WRITE8_HANDLER( pandoras_flipscreen_w );
-WRITE8_HANDLER( pandoras_scrolly_w );
VIDEO_START( pandoras );
SCREEN_UPDATE_IND16( pandoras );
diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h
index a2bb743eaed..3e548501caf 100644
--- a/src/mame/includes/paradise.h
+++ b/src/mame/includes/paradise.h
@@ -27,21 +27,21 @@ public:
int irq_count;
DECLARE_WRITE8_MEMBER(paradise_rombank_w);
DECLARE_WRITE8_MEMBER(torus_coin_counter_w);
+ DECLARE_WRITE8_MEMBER(paradise_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(tgtball_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(paradise_palette_w);
+ DECLARE_WRITE8_MEMBER(paradise_vram_0_w);
+ DECLARE_WRITE8_MEMBER(paradise_palbank_w);
+ DECLARE_WRITE8_MEMBER(paradise_vram_1_w);
+ DECLARE_WRITE8_MEMBER(paradise_vram_2_w);
+ DECLARE_WRITE8_MEMBER(paradise_pixmap_w);
+ DECLARE_WRITE8_MEMBER(paradise_priority_w);
};
/*----------- defined in video/paradise.c -----------*/
-WRITE8_HANDLER( paradise_vram_0_w );
-WRITE8_HANDLER( paradise_vram_1_w );
-WRITE8_HANDLER( paradise_vram_2_w );
-WRITE8_HANDLER( paradise_flipscreen_w );
-WRITE8_HANDLER( tgtball_flipscreen_w );
-WRITE8_HANDLER( paradise_palette_w );
-WRITE8_HANDLER( paradise_pixmap_w );
-WRITE8_HANDLER( paradise_priority_w );
-WRITE8_HANDLER( paradise_palbank_w );
VIDEO_START( paradise );
diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h
index b55131f4ba2..b8e7dac356b 100644
--- a/src/mame/includes/pass.h
+++ b/src/mame/includes/pass.h
@@ -9,13 +9,13 @@ public:
UINT16 *m_bg_videoram;
UINT16 *m_fg_videoram;
+ DECLARE_WRITE16_MEMBER(pass_bg_videoram_w);
+ DECLARE_WRITE16_MEMBER(pass_fg_videoram_w);
};
/*----------- defined in video/pass.c -----------*/
-WRITE16_HANDLER( pass_fg_videoram_w );
-WRITE16_HANDLER( pass_bg_videoram_w );
VIDEO_START( pass );
SCREEN_UPDATE_IND16( pass );
diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h
index d518fdbc739..b6665035fb5 100644
--- a/src/mame/includes/pastelg.h
+++ b/src/mame/includes/pastelg.h
@@ -24,6 +24,12 @@ public:
DECLARE_READ8_MEMBER(threeds_inputport1_r);
DECLARE_READ8_MEMBER(threeds_inputport2_r);
DECLARE_WRITE8_MEMBER(threeds_inputportsel_w);
+ DECLARE_WRITE8_MEMBER(pastelg_clut_w);
+ DECLARE_WRITE8_MEMBER(pastelg_blitter_w);
+ DECLARE_WRITE8_MEMBER(threeds_romsel_w);
+ DECLARE_WRITE8_MEMBER(threeds_output_w);
+ DECLARE_READ8_MEMBER(threeds_rom_readback_r);
+ DECLARE_WRITE8_MEMBER(pastelg_romsel_w);
};
@@ -33,11 +39,5 @@ PALETTE_INIT( pastelg );
SCREEN_UPDATE_IND16( pastelg );
VIDEO_START( pastelg );
-WRITE8_HANDLER( pastelg_clut_w );
-WRITE8_HANDLER( pastelg_romsel_w );
-WRITE8_HANDLER( threeds_romsel_w );
-WRITE8_HANDLER( threeds_output_w );
-WRITE8_HANDLER( pastelg_blitter_w );
-READ8_HANDLER( threeds_rom_readback_r );
int pastelg_blitter_src_addr_r(address_space *space);
diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h
index 736ec212800..04b9b087556 100644
--- a/src/mame/includes/pbaction.h
+++ b/src/mame/includes/pbaction.h
@@ -33,17 +33,17 @@ public:
DECLARE_WRITE8_MEMBER(pbaction_sh_command_w);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
DECLARE_READ8_MEMBER(pbactio3_prot_kludge_r);
+ DECLARE_WRITE8_MEMBER(pbaction_videoram_w);
+ DECLARE_WRITE8_MEMBER(pbaction_colorram_w);
+ DECLARE_WRITE8_MEMBER(pbaction_videoram2_w);
+ DECLARE_WRITE8_MEMBER(pbaction_colorram2_w);
+ DECLARE_WRITE8_MEMBER(pbaction_scroll_w);
+ DECLARE_WRITE8_MEMBER(pbaction_flipscreen_w);
};
/*----------- defined in video/pbaction.c -----------*/
-extern WRITE8_HANDLER( pbaction_videoram_w );
-extern WRITE8_HANDLER( pbaction_colorram_w );
-extern WRITE8_HANDLER( pbaction_videoram2_w );
-extern WRITE8_HANDLER( pbaction_colorram2_w );
-extern WRITE8_HANDLER( pbaction_flipscreen_w );
-extern WRITE8_HANDLER( pbaction_scroll_w );
extern VIDEO_START( pbaction );
extern SCREEN_UPDATE_IND16( pbaction );
diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h
index ea44908e1b4..66a44c9fd4b 100644
--- a/src/mame/includes/pgm.h
+++ b/src/mame/includes/pgm.h
@@ -67,6 +67,8 @@ public:
DECLARE_WRITE16_MEMBER(z80_ctrl_w);
DECLARE_WRITE16_MEMBER(m68k_l1_w);
DECLARE_WRITE8_MEMBER(z80_l3_w);
+ DECLARE_WRITE16_MEMBER(pgm_tx_videoram_w);
+ DECLARE_WRITE16_MEMBER(pgm_bg_videoram_w);
};
@@ -369,8 +371,6 @@ INPUT_PORTS_EXTERN( olds );
/*----------- defined in video/pgm.c -----------*/
-WRITE16_HANDLER( pgm_tx_videoram_w );
-WRITE16_HANDLER( pgm_bg_videoram_w );
VIDEO_START( pgm );
SCREEN_VBLANK( pgm );
diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h
index f0edde19333..91c9f05dbb5 100644
--- a/src/mame/includes/phoenix.h
+++ b/src/mame/includes/phoenix.h
@@ -20,6 +20,11 @@ public:
tilemap_t *m_bg_tilemap;
UINT8 m_survival_input_latches[2];
UINT8 m_survival_input_readc;
+ DECLARE_WRITE8_MEMBER(phoenix_videoram_w);
+ DECLARE_WRITE8_MEMBER(phoenix_videoreg_w);
+ DECLARE_WRITE8_MEMBER(pleiads_videoreg_w);
+ DECLARE_WRITE8_MEMBER(phoenix_scroll_w);
+ DECLARE_READ8_MEMBER(survival_input_port_0_r);
};
@@ -54,14 +59,9 @@ PALETTE_INIT( pleiads );
VIDEO_START( phoenix );
SCREEN_UPDATE_IND16( phoenix );
-WRITE8_HANDLER( phoenix_videoram_w );
-WRITE8_HANDLER( phoenix_videoreg_w );
-WRITE8_HANDLER( pleiads_videoreg_w );
-WRITE8_HANDLER( phoenix_scroll_w );
CUSTOM_INPUT( player_input_r );
CUSTOM_INPUT( pleiads_protection_r );
-READ8_HANDLER( survival_input_port_0_r );
READ8_DEVICE_HANDLER( survival_protection_r );
READ_LINE_DEVICE_HANDLER( survival_sid_callback );
diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h
index 82865f4896b..a8d16473cfb 100644
--- a/src/mame/includes/pingpong.h
+++ b/src/mame/includes/pingpong.h
@@ -18,13 +18,13 @@ public:
DECLARE_WRITE8_MEMBER(cashquiz_question_bank_high_w);
DECLARE_WRITE8_MEMBER(cashquiz_question_bank_low_w);
DECLARE_WRITE8_MEMBER(coin_w);
+ DECLARE_WRITE8_MEMBER(pingpong_videoram_w);
+ DECLARE_WRITE8_MEMBER(pingpong_colorram_w);
};
/*----------- defined in video/pingpong.c -----------*/
-WRITE8_HANDLER( pingpong_videoram_w );
-WRITE8_HANDLER( pingpong_colorram_w );
PALETTE_INIT( pingpong );
VIDEO_START( pingpong );
diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h
index b54fc5001f7..47a5fc0a1ad 100644
--- a/src/mame/includes/pirates.h
+++ b/src/mame/includes/pirates.h
@@ -14,14 +14,14 @@ public:
tilemap_t *m_bg_tilemap;
DECLARE_WRITE16_MEMBER(pirates_out_w);
DECLARE_READ16_MEMBER(genix_prot_r);
+ DECLARE_WRITE16_MEMBER(pirates_tx_tileram_w);
+ DECLARE_WRITE16_MEMBER(pirates_fg_tileram_w);
+ DECLARE_WRITE16_MEMBER(pirates_bg_tileram_w);
};
/*----------- defined in video/pirates.c -----------*/
-WRITE16_HANDLER( pirates_tx_tileram_w );
-WRITE16_HANDLER( pirates_fg_tileram_w );
-WRITE16_HANDLER( pirates_bg_tileram_w );
VIDEO_START( pirates );
SCREEN_UPDATE_IND16( pirates );
diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h
index 15128bdf4ed..71e3ad38817 100644
--- a/src/mame/includes/pitnrun.h
+++ b/src/mame/includes/pitnrun.h
@@ -28,35 +28,35 @@ public:
DECLARE_WRITE8_MEMBER(nmi_enable_w);
DECLARE_WRITE8_MEMBER(pitnrun_hflip_w);
DECLARE_WRITE8_MEMBER(pitnrun_vflip_w);
+ DECLARE_READ8_MEMBER(pitnrun_mcu_data_r);
+ DECLARE_WRITE8_MEMBER(pitnrun_mcu_data_w);
+ DECLARE_READ8_MEMBER(pitnrun_mcu_status_r);
+ DECLARE_READ8_MEMBER(pitnrun_68705_portA_r);
+ DECLARE_WRITE8_MEMBER(pitnrun_68705_portA_w);
+ DECLARE_READ8_MEMBER(pitnrun_68705_portB_r);
+ DECLARE_WRITE8_MEMBER(pitnrun_68705_portB_w);
+ DECLARE_READ8_MEMBER(pitnrun_68705_portC_r);
+ DECLARE_WRITE8_MEMBER(pitnrun_videoram_w);
+ DECLARE_WRITE8_MEMBER(pitnrun_videoram2_w);
+ DECLARE_WRITE8_MEMBER(pitnrun_char_bank_select);
+ DECLARE_WRITE8_MEMBER(pitnrun_scroll_w);
+ DECLARE_WRITE8_MEMBER(pitnrun_ha_w);
+ DECLARE_WRITE8_MEMBER(pitnrun_h_heed_w);
+ DECLARE_WRITE8_MEMBER(pitnrun_v_heed_w);
+ DECLARE_WRITE8_MEMBER(pitnrun_color_select_w);
};
/*----------- defined in machine/pitnrun.c -----------*/
-WRITE8_HANDLER (pitnrun_68705_portA_w);
-WRITE8_HANDLER (pitnrun_68705_portB_w);
-READ8_HANDLER (pitnrun_68705_portA_r);
-READ8_HANDLER (pitnrun_68705_portB_r);
-READ8_HANDLER (pitnrun_68705_portC_r);
MACHINE_RESET( pitnrun );
-READ8_HANDLER( pitnrun_mcu_data_r );
-READ8_HANDLER( pitnrun_mcu_status_r );
-WRITE8_HANDLER( pitnrun_mcu_data_w );
/*----------- defined in video/pitnrun.c -----------*/
-WRITE8_HANDLER( pitnrun_videoram_w );
-WRITE8_HANDLER( pitnrun_videoram2_w );
-WRITE8_HANDLER(pitnrun_ha_w);
-WRITE8_HANDLER(pitnrun_h_heed_w);
-WRITE8_HANDLER(pitnrun_v_heed_w);
-WRITE8_HANDLER(pitnrun_color_select_w);
-WRITE8_HANDLER( pitnrun_char_bank_select );
-WRITE8_HANDLER( pitnrun_scroll_w );
PALETTE_INIT(pitnrun);
VIDEO_START(pitnrun);
diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h
index b08a8a9fdc1..c767a89d2c2 100644
--- a/src/mame/includes/playch10.h
+++ b/src/mame/includes/playch10.h
@@ -50,6 +50,36 @@ public:
DECLARE_WRITE8_MEMBER(ram_8w_w);
DECLARE_WRITE8_MEMBER(sprite_dma_w);
DECLARE_WRITE8_MEMBER(time_w);
+ DECLARE_WRITE8_MEMBER(pc10_SDCS_w);
+ DECLARE_WRITE8_MEMBER(pc10_CNTRLMASK_w);
+ DECLARE_WRITE8_MEMBER(pc10_DISPMASK_w);
+ DECLARE_WRITE8_MEMBER(pc10_SOUNDMASK_w);
+ DECLARE_WRITE8_MEMBER(pc10_NMIENABLE_w);
+ DECLARE_WRITE8_MEMBER(pc10_DOGDI_w);
+ DECLARE_WRITE8_MEMBER(pc10_GAMERES_w);
+ DECLARE_WRITE8_MEMBER(pc10_GAMESTOP_w);
+ DECLARE_WRITE8_MEMBER(pc10_PPURES_w);
+ DECLARE_READ8_MEMBER(pc10_detectclr_r);
+ DECLARE_WRITE8_MEMBER(pc10_CARTSEL_w);
+ DECLARE_READ8_MEMBER(pc10_prot_r);
+ DECLARE_WRITE8_MEMBER(pc10_prot_w);
+ DECLARE_WRITE8_MEMBER(pc10_in0_w);
+ DECLARE_READ8_MEMBER(pc10_in0_r);
+ DECLARE_READ8_MEMBER(pc10_in1_r);
+ DECLARE_WRITE8_MEMBER(pc10_nt_w);
+ DECLARE_READ8_MEMBER(pc10_nt_r);
+ DECLARE_WRITE8_MEMBER(pc10_chr_w);
+ DECLARE_READ8_MEMBER(pc10_chr_r);
+ DECLARE_WRITE8_MEMBER(mmc1_rom_switch_w);
+ DECLARE_WRITE8_MEMBER(aboard_vrom_switch_w);
+ DECLARE_WRITE8_MEMBER(bboard_rom_switch_w);
+ DECLARE_WRITE8_MEMBER(cboard_vrom_switch_w);
+ DECLARE_WRITE8_MEMBER(eboard_rom_switch_w);
+ DECLARE_WRITE8_MEMBER(gboard_rom_switch_w);
+ DECLARE_WRITE8_MEMBER(iboard_rom_switch_w);
+ DECLARE_WRITE8_MEMBER(hboard_rom_switch_w);
+ void pc10_set_mirroring(int mirroring);
+ DECLARE_WRITE8_MEMBER(playch10_videoram_w);
};
@@ -75,22 +105,6 @@ DRIVER_INIT( pchboard ); /* h-board games */
DRIVER_INIT( pciboard ); /* i-board games */
DRIVER_INIT( pckboard ); /* k-board games */
CUSTOM_INPUT( pc10_int_detect_r );
-READ8_HANDLER( pc10_prot_r );
-READ8_HANDLER( pc10_detectclr_r );
-READ8_HANDLER( pc10_in0_r );
-READ8_HANDLER( pc10_in1_r );
-WRITE8_HANDLER( pc10_SDCS_w );
-WRITE8_HANDLER( pc10_CNTRLMASK_w );
-WRITE8_HANDLER( pc10_DISPMASK_w );
-WRITE8_HANDLER( pc10_SOUNDMASK_w );
-WRITE8_HANDLER( pc10_NMIENABLE_w );
-WRITE8_HANDLER( pc10_DOGDI_w );
-WRITE8_HANDLER( pc10_GAMERES_w );
-WRITE8_HANDLER( pc10_GAMESTOP_w );
-WRITE8_HANDLER( pc10_PPURES_w );
-WRITE8_HANDLER( pc10_prot_w );
-WRITE8_HANDLER( pc10_CARTSEL_w );
-WRITE8_HANDLER( pc10_in0_w );
@@ -99,7 +113,6 @@ WRITE8_HANDLER( pc10_in0_w );
extern const ppu2c0x_interface playch10_ppu_interface;
extern const ppu2c0x_interface playch10_ppu_interface_hboard;
-WRITE8_HANDLER( playch10_videoram_w );
PALETTE_INIT( playch10 );
VIDEO_START( playch10 );
VIDEO_START( playch10_hboard );
diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h
index 12f0e907543..efecfc00567 100644
--- a/src/mame/includes/playmark.h
+++ b/src/mame/includes/playmark.h
@@ -58,21 +58,21 @@ public:
DECLARE_WRITE8_MEMBER(playmark_oki_w);
DECLARE_WRITE8_MEMBER(playmark_snd_control_w);
DECLARE_READ8_MEMBER(PIC16C5X_T0_clk_r);
+ DECLARE_WRITE16_MEMBER(wbeachvl_txvideoram_w);
+ DECLARE_WRITE16_MEMBER(wbeachvl_fgvideoram_w);
+ DECLARE_WRITE16_MEMBER(wbeachvl_bgvideoram_w);
+ DECLARE_WRITE16_MEMBER(hrdtimes_txvideoram_w);
+ DECLARE_WRITE16_MEMBER(hrdtimes_fgvideoram_w);
+ DECLARE_WRITE16_MEMBER(hrdtimes_bgvideoram_w);
+ DECLARE_WRITE16_MEMBER(bigtwin_paletteram_w);
+ DECLARE_WRITE16_MEMBER(bigtwin_scroll_w);
+ DECLARE_WRITE16_MEMBER(wbeachvl_scroll_w);
+ DECLARE_WRITE16_MEMBER(excelsr_scroll_w);
+ DECLARE_WRITE16_MEMBER(hrdtimes_scroll_w);
};
/*----------- defined in video/playmark.c -----------*/
-WRITE16_HANDLER( wbeachvl_txvideoram_w );
-WRITE16_HANDLER( wbeachvl_fgvideoram_w );
-WRITE16_HANDLER( wbeachvl_bgvideoram_w );
-WRITE16_HANDLER( hrdtimes_txvideoram_w );
-WRITE16_HANDLER( hrdtimes_fgvideoram_w );
-WRITE16_HANDLER( hrdtimes_bgvideoram_w );
-WRITE16_HANDLER( bigtwin_paletteram_w );
-WRITE16_HANDLER( bigtwin_scroll_w );
-WRITE16_HANDLER( wbeachvl_scroll_w );
-WRITE16_HANDLER( excelsr_scroll_w );
-WRITE16_HANDLER( hrdtimes_scroll_w );
VIDEO_START( bigtwin );
VIDEO_START( bigtwinb );
diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h
index cfc7d320d15..7d9dff8039a 100644
--- a/src/mame/includes/plygonet.h
+++ b/src/mame/includes/plygonet.h
@@ -56,6 +56,10 @@ public:
DECLARE_READ16_MEMBER(dsp56k_ram_bank04_read);
DECLARE_WRITE16_MEMBER(dsp56k_ram_bank04_write);
DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
+ DECLARE_READ32_MEMBER(polygonet_ttl_ram_r);
+ DECLARE_WRITE32_MEMBER(polygonet_ttl_ram_w);
+ DECLARE_READ32_MEMBER(polygonet_roz_ram_r);
+ DECLARE_WRITE32_MEMBER(polygonet_roz_ram_w);
};
/*----------- defined in video/plygonet.c -----------*/
@@ -63,7 +67,3 @@ public:
VIDEO_START( polygonet );
SCREEN_UPDATE_IND16( polygonet );
-READ32_HANDLER( polygonet_ttl_ram_r );
-WRITE32_HANDLER( polygonet_ttl_ram_w );
-READ32_HANDLER( polygonet_roz_ram_r );
-WRITE32_HANDLER( polygonet_roz_ram_w );
diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h
index 6d6b42f14a1..266fe5dba75 100644
--- a/src/mame/includes/pokechmp.h
+++ b/src/mame/includes/pokechmp.h
@@ -12,13 +12,13 @@ public:
DECLARE_WRITE8_MEMBER(pokechmp_sound_bank_w);
DECLARE_WRITE8_MEMBER(pokechmp_sound_w);
DECLARE_WRITE8_MEMBER(pokechmp_paletteram_w);
+ DECLARE_WRITE8_MEMBER(pokechmp_videoram_w);
+ DECLARE_WRITE8_MEMBER(pokechmp_flipscreen_w);
};
/*----------- defined in video/pokechmp.c -----------*/
-WRITE8_HANDLER( pokechmp_videoram_w );
-WRITE8_HANDLER( pokechmp_flipscreen_w );
VIDEO_START( pokechmp );
SCREEN_UPDATE_IND16( pokechmp );
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index cf35677e318..11295d84b22 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -39,6 +39,25 @@ public:
DECLARE_READ8_MEMBER(polepos_ready_r);
DECLARE_WRITE8_MEMBER(polepos_latch_w);
DECLARE_WRITE16_MEMBER(polepos_z8002_nvi_enable_w);
+ DECLARE_READ16_MEMBER(polepos_sprite16_r);
+ DECLARE_WRITE16_MEMBER(polepos_sprite16_w);
+ DECLARE_READ8_MEMBER(polepos_sprite_r);
+ DECLARE_WRITE8_MEMBER(polepos_sprite_w);
+ DECLARE_READ16_MEMBER(polepos_road16_r);
+ DECLARE_WRITE16_MEMBER(polepos_road16_w);
+ DECLARE_READ8_MEMBER(polepos_road_r);
+ DECLARE_WRITE8_MEMBER(polepos_road_w);
+ DECLARE_WRITE16_MEMBER(polepos_road16_vscroll_w);
+ DECLARE_READ16_MEMBER(polepos_view16_r);
+ DECLARE_WRITE16_MEMBER(polepos_view16_w);
+ DECLARE_READ8_MEMBER(polepos_view_r);
+ DECLARE_WRITE8_MEMBER(polepos_view_w);
+ DECLARE_WRITE16_MEMBER(polepos_view16_hscroll_w);
+ DECLARE_WRITE8_MEMBER(polepos_chacl_w);
+ DECLARE_READ16_MEMBER(polepos_alpha16_r);
+ DECLARE_WRITE16_MEMBER(polepos_alpha16_w);
+ DECLARE_READ8_MEMBER(polepos_alpha_r);
+ DECLARE_WRITE8_MEMBER(polepos_alpha_w);
};
@@ -58,23 +77,4 @@ VIDEO_START( polepos );
PALETTE_INIT( polepos );
SCREEN_UPDATE_IND16( polepos );
-WRITE16_HANDLER( polepos_view16_w );
-WRITE16_HANDLER( polepos_road16_w );
-WRITE16_HANDLER( polepos_alpha16_w );
-WRITE16_HANDLER( polepos_sprite16_w );
-WRITE8_HANDLER( polepos_view_w );
-WRITE8_HANDLER( polepos_road_w );
-WRITE8_HANDLER( polepos_alpha_w );
-WRITE8_HANDLER( polepos_sprite_w );
-WRITE8_HANDLER( polepos_chacl_w );
-
-READ16_HANDLER( polepos_view16_r );
-READ16_HANDLER( polepos_road16_r );
-READ16_HANDLER( polepos_alpha16_r );
-READ16_HANDLER( polepos_sprite16_r );
-READ8_HANDLER( polepos_view_r );
-READ8_HANDLER( polepos_road_r );
-READ8_HANDLER( polepos_alpha_r );
-READ8_HANDLER( polepos_sprite_r );
-WRITE16_HANDLER( polepos_view16_hscroll_w );
-WRITE16_HANDLER( polepos_road16_vscroll_w );
+
diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h
index 2c479d61d75..a2faad21e6c 100644
--- a/src/mame/includes/policetr.h
+++ b/src/mame/includes/policetr.h
@@ -35,16 +35,16 @@ public:
DECLARE_WRITE32_MEMBER(policetr_bsmt2000_data_w);
DECLARE_READ32_MEMBER(bsmt2000_data_r);
DECLARE_WRITE32_MEMBER(speedup_w);
+ DECLARE_WRITE32_MEMBER(policetr_video_w);
+ DECLARE_READ32_MEMBER(policetr_video_r);
+ DECLARE_WRITE32_MEMBER(policetr_palette_offset_w);
+ DECLARE_WRITE32_MEMBER(policetr_palette_data_w);
};
/*----------- defined in video/policetr.c -----------*/
-WRITE32_HANDLER( policetr_video_w );
-READ32_HANDLER( policetr_video_r );
-WRITE32_HANDLER( policetr_palette_offset_w );
-WRITE32_HANDLER( policetr_palette_data_w );
VIDEO_START( policetr );
SCREEN_UPDATE_IND16( policetr );
diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h
index ca74c592387..9ada62dee25 100644
--- a/src/mame/includes/polyplay.h
+++ b/src/mame/includes/polyplay.h
@@ -26,6 +26,7 @@ public:
DECLARE_WRITE8_MEMBER(polyplay_sound_channel);
DECLARE_WRITE8_MEMBER(polyplay_start_timer2);
DECLARE_READ8_MEMBER(polyplay_random_read);
+ DECLARE_WRITE8_MEMBER(polyplay_characterram_w);
};
@@ -43,4 +44,3 @@ SAMPLES_START( polyplay_sh_start );
PALETTE_INIT( polyplay );
VIDEO_START( polyplay );
SCREEN_UPDATE_IND16( polyplay );
-WRITE8_HANDLER( polyplay_characterram_w );
diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h
index 8dd0eb11d0d..165372f8135 100644
--- a/src/mame/includes/pooyan.h
+++ b/src/mame/includes/pooyan.h
@@ -20,14 +20,14 @@ public:
/* devices */
cpu_device *m_maincpu;
DECLARE_WRITE8_MEMBER(irq_enable_w);
+ DECLARE_WRITE8_MEMBER(pooyan_videoram_w);
+ DECLARE_WRITE8_MEMBER(pooyan_colorram_w);
+ DECLARE_WRITE8_MEMBER(pooyan_flipscreen_w);
};
/*----------- defined in video/pooyan.c -----------*/
-WRITE8_HANDLER( pooyan_videoram_w );
-WRITE8_HANDLER( pooyan_colorram_w );
-WRITE8_HANDLER( pooyan_flipscreen_w );
PALETTE_INIT( pooyan );
VIDEO_START( pooyan );
diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h
index d54605c9636..b7fba42d2fe 100644
--- a/src/mame/includes/popeye.h
+++ b/src/mame/includes/popeye.h
@@ -22,15 +22,15 @@ public:
size_t m_spriteram_size;
DECLARE_READ8_MEMBER(protection_r);
DECLARE_WRITE8_MEMBER(protection_w);
+ DECLARE_WRITE8_MEMBER(popeye_videoram_w);
+ DECLARE_WRITE8_MEMBER(popeye_colorram_w);
+ DECLARE_WRITE8_MEMBER(popeye_bitmap_w);
+ DECLARE_WRITE8_MEMBER(skyskipr_bitmap_w);
};
/*----------- defined in video/popeye.c -----------*/
-WRITE8_HANDLER( popeye_videoram_w );
-WRITE8_HANDLER( popeye_colorram_w );
-WRITE8_HANDLER( popeye_bitmap_w );
-WRITE8_HANDLER( skyskipr_bitmap_w );
PALETTE_INIT( popeye );
PALETTE_INIT( popeyebl );
diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h
index 5c8dd6e8ca5..ca2634c85c3 100644
--- a/src/mame/includes/popper.h
+++ b/src/mame/includes/popper.h
@@ -35,18 +35,18 @@ public:
DECLARE_READ8_MEMBER(popper_input_ports_r);
DECLARE_READ8_MEMBER(popper_soundcpu_nmi_r);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(popper_ol_videoram_w);
+ DECLARE_WRITE8_MEMBER(popper_videoram_w);
+ DECLARE_WRITE8_MEMBER(popper_ol_attribram_w);
+ DECLARE_WRITE8_MEMBER(popper_attribram_w);
+ DECLARE_WRITE8_MEMBER(popper_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(popper_e002_w);
+ DECLARE_WRITE8_MEMBER(popper_gfx_bank_w);
};
/*----------- defined in video/popper.c -----------*/
-WRITE8_HANDLER( popper_videoram_w );
-WRITE8_HANDLER( popper_attribram_w );
-WRITE8_HANDLER( popper_ol_videoram_w );
-WRITE8_HANDLER( popper_ol_attribram_w );
-WRITE8_HANDLER( popper_flipscreen_w );
-WRITE8_HANDLER( popper_e002_w );
-WRITE8_HANDLER( popper_gfx_bank_w );
PALETTE_INIT( popper );
VIDEO_START( popper );
diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h
index c0667b76e10..376ecae2ac4 100644
--- a/src/mame/includes/portrait.h
+++ b/src/mame/includes/portrait.h
@@ -14,6 +14,8 @@ public:
DECLARE_WRITE8_MEMBER(portrait_ctrl_w);
DECLARE_WRITE8_MEMBER(portrait_positive_scroll_w);
DECLARE_WRITE8_MEMBER(portrait_negative_scroll_w);
+ DECLARE_WRITE8_MEMBER(portrait_bgvideo_write);
+ DECLARE_WRITE8_MEMBER(portrait_fgvideo_write);
};
@@ -22,5 +24,3 @@ public:
PALETTE_INIT( portrait );
VIDEO_START( portrait );
SCREEN_UPDATE_IND16( portrait );
-WRITE8_HANDLER( portrait_bgvideo_write );
-WRITE8_HANDLER( portrait_fgvideo_write );
diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h
index 100c8a8b374..a084cd5d26d 100644
--- a/src/mame/includes/powerins.h
+++ b/src/mame/includes/powerins.h
@@ -16,18 +16,18 @@ public:
DECLARE_WRITE16_MEMBER(powerins_okibank_w);
DECLARE_WRITE16_MEMBER(powerins_soundlatch_w);
DECLARE_READ8_MEMBER(powerinb_fake_ym2203_r);
+ DECLARE_WRITE16_MEMBER(powerins_flipscreen_w);
+ DECLARE_WRITE16_MEMBER(powerins_tilebank_w);
+ DECLARE_WRITE16_MEMBER(powerins_paletteram16_w);
+ DECLARE_WRITE16_MEMBER(powerins_vram_0_w);
+ DECLARE_WRITE16_MEMBER(powerins_vram_1_w);
};
/*----------- defined in video/powerins.c -----------*/
-WRITE16_HANDLER( powerins_flipscreen_w );
-WRITE16_HANDLER( powerins_tilebank_w );
-WRITE16_HANDLER( powerins_paletteram16_w );
-WRITE16_HANDLER( powerins_vram_0_w );
-WRITE16_HANDLER( powerins_vram_1_w );
VIDEO_START( powerins );
SCREEN_UPDATE_IND16( powerins );
diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h
index cf58ac85daa..cd362ac7745 100644
--- a/src/mame/includes/prehisle.h
+++ b/src/mame/includes/prehisle.h
@@ -14,15 +14,15 @@ public:
tilemap_t *m_bg_tilemap;
tilemap_t *m_fg_tilemap;
DECLARE_WRITE16_MEMBER(prehisle_sound16_w);
+ DECLARE_WRITE16_MEMBER(prehisle_bg_videoram16_w);
+ DECLARE_WRITE16_MEMBER(prehisle_fg_videoram16_w);
+ DECLARE_READ16_MEMBER(prehisle_control16_r);
+ DECLARE_WRITE16_MEMBER(prehisle_control16_w);
};
/*----------- defined in video/prehisle.c -----------*/
-WRITE16_HANDLER( prehisle_bg_videoram16_w );
-WRITE16_HANDLER( prehisle_fg_videoram16_w );
-WRITE16_HANDLER( prehisle_control16_w );
-READ16_HANDLER( prehisle_control16_r );
VIDEO_START( prehisle );
SCREEN_UPDATE_IND16( prehisle );
diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h
index 0e0836a8e91..5258cb098ae 100644
--- a/src/mame/includes/psikyo.h
+++ b/src/mame/includes/psikyo.h
@@ -68,6 +68,8 @@ public:
DECLARE_WRITE8_MEMBER(psikyo_clear_nmi_w);
DECLARE_WRITE8_MEMBER(sngkace_sound_bankswitch_w);
DECLARE_WRITE8_MEMBER(gunbird_sound_bankswitch_w);
+ DECLARE_WRITE32_MEMBER(psikyo_vram_0_w);
+ DECLARE_WRITE32_MEMBER(psikyo_vram_1_w);
};
@@ -75,8 +77,6 @@ public:
void psikyo_switch_banks(running_machine &machine, int tmap, int bank);
-WRITE32_HANDLER( psikyo_vram_0_w );
-WRITE32_HANDLER( psikyo_vram_1_w );
VIDEO_START( sngkace );
VIDEO_START( psikyo );
diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h
index 030da767162..6083cc4d643 100644
--- a/src/mame/includes/psychic5.h
+++ b/src/mame/includes/psychic5.h
@@ -31,24 +31,24 @@ public:
DECLARE_WRITE8_MEMBER(bombsa_bankselect_w);
DECLARE_WRITE8_MEMBER(psychic5_coin_counter_w);
DECLARE_WRITE8_MEMBER(bombsa_flipscreen_w);
+ DECLARE_READ8_MEMBER(psychic5_vram_page_select_r);
+ DECLARE_WRITE8_MEMBER(psychic5_vram_page_select_w);
+ DECLARE_WRITE8_MEMBER(psychic5_title_screen_w);
+ DECLARE_READ8_MEMBER(psychic5_paged_ram_r);
+ DECLARE_WRITE8_MEMBER(psychic5_paged_ram_w);
+ DECLARE_WRITE8_MEMBER(bombsa_paged_ram_w);
+ DECLARE_WRITE8_MEMBER(bombsa_unknown_w);
};
/*----------- defined in video/psychic5.c -----------*/
-WRITE8_HANDLER( psychic5_paged_ram_w );
-WRITE8_HANDLER( psychic5_vram_page_select_w );
-WRITE8_HANDLER( psychic5_title_screen_w );
-READ8_HANDLER( psychic5_paged_ram_r );
-READ8_HANDLER( psychic5_vram_page_select_r );
VIDEO_START( psychic5 );
VIDEO_RESET( psychic5 );
SCREEN_UPDATE_RGB32( psychic5 );
-WRITE8_HANDLER( bombsa_paged_ram_w );
-WRITE8_HANDLER( bombsa_unknown_w );
VIDEO_START( bombsa );
VIDEO_RESET( bombsa );
diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h
index 0fcb2637291..10b62ebf651 100644
--- a/src/mame/includes/punchout.h
+++ b/src/mame/includes/punchout.h
@@ -30,16 +30,16 @@ public:
DECLARE_READ8_MEMBER(spunchout_exp_r);
DECLARE_WRITE8_MEMBER(spunchout_exp_w);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(punchout_bg_top_videoram_w);
+ DECLARE_WRITE8_MEMBER(punchout_bg_bot_videoram_w);
+ DECLARE_WRITE8_MEMBER(armwrest_fg_videoram_w);
+ DECLARE_WRITE8_MEMBER(punchout_spr1_videoram_w);
+ DECLARE_WRITE8_MEMBER(punchout_spr2_videoram_w);
};
/*----------- defined in video/punchout.c -----------*/
-WRITE8_HANDLER( punchout_bg_top_videoram_w );
-WRITE8_HANDLER( punchout_bg_bot_videoram_w );
-WRITE8_HANDLER( armwrest_fg_videoram_w );
-WRITE8_HANDLER( punchout_spr1_videoram_w );
-WRITE8_HANDLER( punchout_spr2_videoram_w );
VIDEO_START( punchout );
VIDEO_START( armwrest );
diff --git a/src/mame/includes/pushman.h b/src/mame/includes/pushman.h
index 5eef1e92ab4..39030a5c39c 100644
--- a/src/mame/includes/pushman.h
+++ b/src/mame/includes/pushman.h
@@ -37,13 +37,13 @@ public:
DECLARE_WRITE16_MEMBER(bballs_68705_w);
DECLARE_READ8_MEMBER(pushman_68000_r);
DECLARE_WRITE8_MEMBER(pushman_68000_w);
+ DECLARE_WRITE16_MEMBER(pushman_scroll_w);
+ DECLARE_WRITE16_MEMBER(pushman_videoram_w);
};
/*----------- defined in video/pushman.c -----------*/
-WRITE16_HANDLER( pushman_scroll_w );
-WRITE16_HANDLER( pushman_videoram_w );
VIDEO_START( pushman );
diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h
index ecd1aac4f02..2420f8d50e6 100644
--- a/src/mame/includes/qix.h
+++ b/src/mame/includes/qix.h
@@ -41,6 +41,29 @@ public:
UINT8 m_leds;
UINT8 *m_scanline_latch;
pen_t m_pens[NUM_PENS];
+ DECLARE_WRITE8_MEMBER(zookeep_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(qix_data_firq_w);
+ DECLARE_WRITE8_MEMBER(qix_data_firq_ack_w);
+ DECLARE_READ8_MEMBER(qix_data_firq_r);
+ DECLARE_READ8_MEMBER(qix_data_firq_ack_r);
+ DECLARE_WRITE8_MEMBER(qix_video_firq_w);
+ DECLARE_WRITE8_MEMBER(qix_video_firq_ack_w);
+ DECLARE_READ8_MEMBER(qix_video_firq_r);
+ DECLARE_READ8_MEMBER(qix_video_firq_ack_r);
+ DECLARE_READ8_MEMBER(qix_68705_portA_r);
+ DECLARE_READ8_MEMBER(qix_68705_portB_r);
+ DECLARE_READ8_MEMBER(qix_68705_portC_r);
+ DECLARE_WRITE8_MEMBER(qix_68705_portA_w);
+ DECLARE_WRITE8_MEMBER(qix_68705_portB_w);
+ DECLARE_WRITE8_MEMBER(qix_68705_portC_w);
+ DECLARE_READ8_MEMBER(qix_videoram_r);
+ DECLARE_WRITE8_MEMBER(qix_videoram_w);
+ DECLARE_WRITE8_MEMBER(slither_videoram_w);
+ DECLARE_READ8_MEMBER(qix_addresslatch_r);
+ DECLARE_WRITE8_MEMBER(qix_addresslatch_w);
+ DECLARE_WRITE8_MEMBER(slither_addresslatch_w);
+ DECLARE_WRITE8_MEMBER(qix_paletteram_w);
+ DECLARE_WRITE8_MEMBER(qix_palettebank_w);
};
@@ -57,24 +80,9 @@ extern const pia6821_interface slither_pia_2_intf;
MACHINE_START( qixmcu );
MACHINE_RESET( qix );
-WRITE8_HANDLER( zookeep_bankswitch_w );
-READ8_HANDLER( qix_data_firq_r );
-READ8_HANDLER( qix_data_firq_ack_r );
-WRITE8_HANDLER( qix_data_firq_w );
-WRITE8_HANDLER( qix_data_firq_ack_w );
-READ8_HANDLER( qix_video_firq_r );
-READ8_HANDLER( qix_video_firq_ack_r );
-WRITE8_HANDLER( qix_video_firq_w );
-WRITE8_HANDLER( qix_video_firq_ack_w );
-READ8_HANDLER( qix_68705_portA_r );
-READ8_HANDLER( qix_68705_portB_r );
-READ8_HANDLER( qix_68705_portC_r );
-WRITE8_HANDLER( qix_68705_portA_w );
-WRITE8_HANDLER( qix_68705_portB_w );
-WRITE8_HANDLER( qix_68705_portC_w );
WRITE8_DEVICE_HANDLER( qix_pia_w );
@@ -88,7 +96,6 @@ MACHINE_CONFIG_EXTERN( zookeep_video );
MACHINE_CONFIG_EXTERN( slither_video );
WRITE8_DEVICE_HANDLER( qix_flip_screen_w );
-WRITE8_HANDLER( qix_palettebank_w );
/*----------- defined in audio/qix.c -----------*/
diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h
index a4f8bdcbf2c..485e6479e7d 100644
--- a/src/mame/includes/quizdna.h
+++ b/src/mame/includes/quizdna.h
@@ -15,6 +15,12 @@ public:
size_t m_spriteram_size;
DECLARE_WRITE8_MEMBER(quizdna_rombank_w);
DECLARE_WRITE8_MEMBER(gekiretu_rombank_w);
+ DECLARE_WRITE8_MEMBER(quizdna_bg_ram_w);
+ DECLARE_WRITE8_MEMBER(quizdna_fg_ram_w);
+ DECLARE_WRITE8_MEMBER(quizdna_bg_yscroll_w);
+ DECLARE_WRITE8_MEMBER(quizdna_bg_xscroll_w);
+ DECLARE_WRITE8_MEMBER(quizdna_screen_ctrl_w);
+ DECLARE_WRITE8_MEMBER(paletteram_xBGR_RRRR_GGGG_BBBB_w);
};
@@ -23,10 +29,4 @@ public:
VIDEO_START( quizdna );
SCREEN_UPDATE_IND16( quizdna );
-WRITE8_HANDLER( quizdna_fg_ram_w );
-WRITE8_HANDLER( quizdna_bg_ram_w );
-WRITE8_HANDLER( quizdna_bg_yscroll_w );
-WRITE8_HANDLER( quizdna_bg_xscroll_w );
-WRITE8_HANDLER( quizdna_screen_ctrl_w );
-WRITE8_HANDLER( paletteram_xBGR_RRRR_GGGG_BBBB_w );
diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h
index cb84ab6807d..fb2c819cbda 100644
--- a/src/mame/includes/quizpani.h
+++ b/src/mame/includes/quizpani.h
@@ -11,14 +11,14 @@ public:
tilemap_t *m_txt_tilemap;
int m_bgbank;
int m_txtbank;
+ DECLARE_WRITE16_MEMBER(quizpani_bg_videoram_w);
+ DECLARE_WRITE16_MEMBER(quizpani_txt_videoram_w);
+ DECLARE_WRITE16_MEMBER(quizpani_tilesbank_w);
};
/*----------- defined in video/quizpani.c -----------*/
-WRITE16_HANDLER( quizpani_bg_videoram_w );
-WRITE16_HANDLER( quizpani_txt_videoram_w );
-WRITE16_HANDLER( quizpani_tilesbank_w );
VIDEO_START( quizpani );
SCREEN_UPDATE_IND16( quizpani );
diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h
index 0f6fdf72fcc..dd49752cd5e 100644
--- a/src/mame/includes/raiden.h
+++ b/src/mame/includes/raiden.h
@@ -19,16 +19,16 @@ public:
int m_alternate;
required_device<buffered_spriteram16_device> m_spriteram;
DECLARE_READ16_MEMBER(sub_cpu_spin_r);
+ DECLARE_WRITE16_MEMBER(raiden_background_w);
+ DECLARE_WRITE16_MEMBER(raiden_foreground_w);
+ DECLARE_WRITE16_MEMBER(raiden_text_w);
+ DECLARE_WRITE16_MEMBER(raiden_control_w);
+ DECLARE_WRITE16_MEMBER(raidena_control_w);
};
/*----------- defined in video/raiden.c -----------*/
-WRITE16_HANDLER( raiden_background_w );
-WRITE16_HANDLER( raiden_foreground_w );
-WRITE16_HANDLER( raiden_text_w );
VIDEO_START( raiden );
VIDEO_START( raidena );
-WRITE16_HANDLER( raiden_control_w );
-WRITE16_HANDLER( raidena_control_w );
SCREEN_UPDATE_IND16( raiden );
diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h
index 411d8fc7297..d49b9504f93 100644
--- a/src/mame/includes/rainbow.h
+++ b/src/mame/includes/rainbow.h
@@ -34,17 +34,19 @@ public:
device_t *m_pc090oj;
DECLARE_WRITE16_MEMBER(jumping_sound_w);
DECLARE_READ8_MEMBER(jumping_latch_r);
+ DECLARE_WRITE16_MEMBER(rbisland_cchip_ctrl_w);
+ DECLARE_WRITE16_MEMBER(rbisland_cchip_bank_w);
+ DECLARE_WRITE16_MEMBER(rbisland_cchip_ram_w);
+ DECLARE_READ16_MEMBER(rbisland_cchip_ctrl_r);
+ DECLARE_READ16_MEMBER(rbisland_cchip_ram_r);
+ DECLARE_WRITE16_MEMBER(rbisland_spritectrl_w);
+ DECLARE_WRITE16_MEMBER(jumping_spritectrl_w);
};
/*----------- defined in machine/rainbow.c -----------*/
void rbisland_cchip_init(running_machine &machine, int version);
-READ16_HANDLER( rbisland_cchip_ctrl_r );
-READ16_HANDLER( rbisland_cchip_ram_r );
-WRITE16_HANDLER( rbisland_cchip_ctrl_w );
-WRITE16_HANDLER( rbisland_cchip_bank_w );
-WRITE16_HANDLER( rbisland_cchip_ram_w );
/*----------- defined in video/rainbow.c -----------*/
@@ -53,5 +55,3 @@ SCREEN_UPDATE_IND16( rainbow );
VIDEO_START( jumping );
SCREEN_UPDATE_IND16( jumping );
-WRITE16_HANDLER( jumping_spritectrl_w );
-WRITE16_HANDLER( rbisland_spritectrl_w );
diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h
index 9b1bdbbb30c..babdac6e6d6 100644
--- a/src/mame/includes/rallyx.h
+++ b/src/mame/includes/rallyx.h
@@ -42,15 +42,15 @@ public:
DECLARE_WRITE8_MEMBER(rallyx_bang_w);
DECLARE_WRITE8_MEMBER(rallyx_latch_w);
DECLARE_WRITE8_MEMBER(locomotn_latch_w);
+ DECLARE_WRITE8_MEMBER(rallyx_videoram_w);
+ DECLARE_WRITE8_MEMBER(rallyx_scrollx_w);
+ DECLARE_WRITE8_MEMBER(rallyx_scrolly_w);
+ DECLARE_WRITE8_MEMBER(tactcian_starson_w);
};
/*----------- defined in video/rallyx.c -----------*/
-WRITE8_HANDLER( rallyx_videoram_w );
-WRITE8_HANDLER( rallyx_scrollx_w );
-WRITE8_HANDLER( rallyx_scrolly_w );
-WRITE8_HANDLER( tactcian_starson_w );
PALETTE_INIT( rallyx );
PALETTE_INIT( jungler );
diff --git a/src/mame/includes/rastan.h b/src/mame/includes/rastan.h
index da561ddd18c..5705d07620a 100644
--- a/src/mame/includes/rastan.h
+++ b/src/mame/includes/rastan.h
@@ -27,11 +27,11 @@ public:
device_t *m_pc090oj;
device_t *m_pc080sn;
DECLARE_WRITE8_MEMBER(rastan_msm5205_address_w);
+ DECLARE_WRITE16_MEMBER(rastan_spritectrl_w);
};
/*----------- defined in video/rastan.c -----------*/
-WRITE16_HANDLER( rastan_spritectrl_w );
SCREEN_UPDATE_IND16( rastan );
diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h
index 7b9c637de4b..75ac4158bc1 100644
--- a/src/mame/includes/realbrk.h
+++ b/src/mame/includes/realbrk.h
@@ -25,6 +25,12 @@ public:
DECLARE_READ16_MEMBER(backup_ram_r);
DECLARE_READ16_MEMBER(backup_ram_dx_r);
DECLARE_WRITE16_MEMBER(backup_ram_w);
+ DECLARE_WRITE16_MEMBER(realbrk_flipscreen_w);
+ DECLARE_WRITE16_MEMBER(dai2kaku_flipscreen_w);
+ DECLARE_WRITE16_MEMBER(realbrk_vram_0_w);
+ DECLARE_WRITE16_MEMBER(realbrk_vram_1_w);
+ DECLARE_WRITE16_MEMBER(realbrk_vram_2_w);
+ DECLARE_WRITE16_MEMBER(realbrk_vregs_w);
};
@@ -37,12 +43,6 @@ VIDEO_START(realbrk);
SCREEN_UPDATE_IND16(realbrk);
SCREEN_UPDATE_IND16(dai2kaku);
-WRITE16_HANDLER( realbrk_vram_0_w );
-WRITE16_HANDLER( realbrk_vram_1_w );
-WRITE16_HANDLER( realbrk_vram_2_w );
-WRITE16_HANDLER( realbrk_vregs_w );
-WRITE16_HANDLER( realbrk_flipscreen_w );
-WRITE16_HANDLER( dai2kaku_flipscreen_w );
#endif
diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h
index 4785e2a4350..8558070e924 100644
--- a/src/mame/includes/redalert.h
+++ b/src/mame/includes/redalert.h
@@ -25,6 +25,7 @@ public:
DECLARE_WRITE8_MEMBER(redalert_interrupt_clear_w);
DECLARE_READ8_MEMBER(panther_interrupt_clear_r);
DECLARE_READ8_MEMBER(panther_unk_r);
+ DECLARE_WRITE8_MEMBER(redalert_bitmap_videoram_w);
};
@@ -42,7 +43,6 @@ MACHINE_CONFIG_EXTERN( demoneye_audio );
/*----------- defined in video/redalert.c -----------*/
-WRITE8_HANDLER( redalert_bitmap_videoram_w );
MACHINE_CONFIG_EXTERN( ww3_video );
MACHINE_CONFIG_EXTERN( panther_video );
diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h
index c63e9279276..3a45ee9cf61 100644
--- a/src/mame/includes/renegade.h
+++ b/src/mame/includes/renegade.h
@@ -55,6 +55,11 @@ public:
DECLARE_READ8_MEMBER(renegade_68705_port_c_r);
DECLARE_WRITE8_MEMBER(renegade_68705_port_c_w);
DECLARE_WRITE8_MEMBER(renegade_68705_ddr_c_w);
+ DECLARE_WRITE8_MEMBER(renegade_videoram_w);
+ DECLARE_WRITE8_MEMBER(renegade_videoram2_w);
+ DECLARE_WRITE8_MEMBER(renegade_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(renegade_scroll0_w);
+ DECLARE_WRITE8_MEMBER(renegade_scroll1_w);
};
@@ -62,8 +67,3 @@ public:
SCREEN_UPDATE_IND16( renegade );
VIDEO_START( renegade );
-WRITE8_HANDLER( renegade_scroll0_w );
-WRITE8_HANDLER( renegade_scroll1_w );
-WRITE8_HANDLER( renegade_videoram_w );
-WRITE8_HANDLER( renegade_videoram2_w );
-WRITE8_HANDLER( renegade_flipscreen_w );
diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h
index 815a7ea6782..dee331efdd8 100644
--- a/src/mame/includes/retofinv.h
+++ b/src/mame/includes/retofinv.h
@@ -38,23 +38,26 @@ public:
DECLARE_WRITE8_MEMBER(irq1_ack_w);
DECLARE_WRITE8_MEMBER(coincounter_w);
DECLARE_WRITE8_MEMBER(coinlockout_w);
+ DECLARE_READ8_MEMBER(retofinv_68705_portA_r);
+ DECLARE_WRITE8_MEMBER(retofinv_68705_portA_w);
+ DECLARE_WRITE8_MEMBER(retofinv_68705_ddrA_w);
+ DECLARE_READ8_MEMBER(retofinv_68705_portB_r);
+ DECLARE_WRITE8_MEMBER(retofinv_68705_portB_w);
+ DECLARE_WRITE8_MEMBER(retofinv_68705_ddrB_w);
+ DECLARE_READ8_MEMBER(retofinv_68705_portC_r);
+ DECLARE_WRITE8_MEMBER(retofinv_68705_portC_w);
+ DECLARE_WRITE8_MEMBER(retofinv_68705_ddrC_w);
+ DECLARE_WRITE8_MEMBER(retofinv_mcu_w);
+ DECLARE_READ8_MEMBER(retofinv_mcu_r);
+ DECLARE_READ8_MEMBER(retofinv_mcu_status_r);
+ DECLARE_WRITE8_MEMBER(retofinv_bg_videoram_w);
+ DECLARE_WRITE8_MEMBER(retofinv_fg_videoram_w);
+ DECLARE_WRITE8_MEMBER(retofinv_gfx_ctrl_w);
};
/*----------- defined in machine/retofinv.c -----------*/
-READ8_HANDLER( retofinv_68705_portA_r );
-WRITE8_HANDLER( retofinv_68705_portA_w );
-WRITE8_HANDLER( retofinv_68705_ddrA_w );
-READ8_HANDLER( retofinv_68705_portB_r );
-WRITE8_HANDLER( retofinv_68705_portB_w );
-WRITE8_HANDLER( retofinv_68705_ddrB_w );
-READ8_HANDLER( retofinv_68705_portC_r );
-WRITE8_HANDLER( retofinv_68705_portC_w );
-WRITE8_HANDLER( retofinv_68705_ddrC_w );
-WRITE8_HANDLER( retofinv_mcu_w );
-READ8_HANDLER( retofinv_mcu_r );
-READ8_HANDLER( retofinv_mcu_status_r );
/*----------- defined in video/retofinv.c -----------*/
@@ -62,6 +65,3 @@ READ8_HANDLER( retofinv_mcu_status_r );
VIDEO_START( retofinv );
PALETTE_INIT( retofinv );
SCREEN_UPDATE_IND16( retofinv );
-WRITE8_HANDLER( retofinv_bg_videoram_w );
-WRITE8_HANDLER( retofinv_fg_videoram_w );
-WRITE8_HANDLER( retofinv_gfx_ctrl_w );
diff --git a/src/mame/includes/rltennis.h b/src/mame/includes/rltennis.h
index 25fb00d22e9..3536fc024bf 100644
--- a/src/mame/includes/rltennis.h
+++ b/src/mame/includes/rltennis.h
@@ -39,11 +39,11 @@ public:
DECLARE_READ16_MEMBER(rlt_io_r);
DECLARE_WRITE16_MEMBER(rlt_snd1_w);
DECLARE_WRITE16_MEMBER(rlt_snd2_w);
+ DECLARE_WRITE16_MEMBER(rlt_blitter_w);
};
-WRITE16_HANDLER( rlt_blitter_w );
VIDEO_START( rltennis );
SCREEN_UPDATE_IND16( rltennis );
diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h
index 39edb343d7a..455a30b2b90 100644
--- a/src/mame/includes/rockrage.h
+++ b/src/mame/includes/rockrage.h
@@ -23,12 +23,12 @@ public:
device_t *m_k007420;
DECLARE_WRITE8_MEMBER(rockrage_bankswitch_w);
DECLARE_WRITE8_MEMBER(rockrage_sh_irqtrigger_w);
+ DECLARE_WRITE8_MEMBER(rockrage_vreg_w);
};
/*----------- defined in video/rockrage.c -----------*/
-WRITE8_HANDLER( rockrage_vreg_w );
SCREEN_UPDATE_IND16( rockrage );
PALETTE_INIT( rockrage );
diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h
index de5f03d8197..3955ebf45d4 100644
--- a/src/mame/includes/rocnrope.h
+++ b/src/mame/includes/rocnrope.h
@@ -17,13 +17,13 @@ public:
UINT8 m_irq_mask;
DECLARE_WRITE8_MEMBER(rocnrope_interrupt_vector_w);
DECLARE_WRITE8_MEMBER(irq_mask_w);
+ DECLARE_WRITE8_MEMBER(rocnrope_videoram_w);
+ DECLARE_WRITE8_MEMBER(rocnrope_colorram_w);
+ DECLARE_WRITE8_MEMBER(rocnrope_flipscreen_w);
};
/*----------- defined in video/rocnrope.c -----------*/
-WRITE8_HANDLER( rocnrope_videoram_w );
-WRITE8_HANDLER( rocnrope_colorram_w );
-WRITE8_HANDLER( rocnrope_flipscreen_w );
PALETTE_INIT( rocnrope );
VIDEO_START( rocnrope );
diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h
index c5a4fd1123e..46726e3cc91 100644
--- a/src/mame/includes/rohga.h
+++ b/src/mame/includes/rohga.h
@@ -42,13 +42,13 @@ public:
optional_device<buffered_spriteram16_device> m_spriteram2;
DECLARE_READ16_MEMBER(rohga_irq_ack_r);
DECLARE_WRITE16_MEMBER(wizdfire_irq_ack_w);
+ DECLARE_WRITE16_MEMBER(rohga_buffer_spriteram16_w);
};
/*----------- defined in video/rohga.c -----------*/
-WRITE16_HANDLER( rohga_buffer_spriteram16_w );
VIDEO_START( rohga );
VIDEO_START( schmeisr );
diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h
index b4909e7bd0d..82885c94e36 100644
--- a/src/mame/includes/rollrace.h
+++ b/src/mame/includes/rollrace.h
@@ -24,6 +24,13 @@ public:
DECLARE_WRITE8_MEMBER(ra_fake_d800_w);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
DECLARE_WRITE8_MEMBER(sound_nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(rollrace_charbank_w);
+ DECLARE_WRITE8_MEMBER(rollrace_bkgpen_w);
+ DECLARE_WRITE8_MEMBER(rollrace_spritebank_w);
+ DECLARE_WRITE8_MEMBER(rollrace_backgroundpage_w);
+ DECLARE_WRITE8_MEMBER(rollrace_backgroundcolor_w);
+ DECLARE_WRITE8_MEMBER(rollrace_flipy_w);
+ DECLARE_WRITE8_MEMBER(rollrace_flipx_w);
};
@@ -32,11 +39,4 @@ public:
PALETTE_INIT( rollrace );
SCREEN_UPDATE_IND16( rollrace );
-WRITE8_HANDLER( rollrace_charbank_w );
-WRITE8_HANDLER( rollrace_backgroundpage_w );
-WRITE8_HANDLER( rollrace_backgroundcolor_w );
-WRITE8_HANDLER( rollrace_bkgpen_w );
-WRITE8_HANDLER( rollrace_flipy_w );
-WRITE8_HANDLER( rollrace_spritebank_w );
-WRITE8_HANDLER( rollrace_flipx_w );
diff --git a/src/mame/includes/route16.h b/src/mame/includes/route16.h
index c38fefb1f75..a32b3952f6f 100644
--- a/src/mame/includes/route16.h
+++ b/src/mame/includes/route16.h
@@ -21,13 +21,13 @@ public:
DECLARE_READ8_MEMBER(speakres_in3_r);
DECLARE_WRITE8_MEMBER(speakres_out2_w);
DECLARE_READ8_MEMBER(routex_prot_read);
+ DECLARE_WRITE8_MEMBER(route16_out0_w);
+ DECLARE_WRITE8_MEMBER(route16_out1_w);
};
/*----------- defined in video/route16.c -----------*/
-WRITE8_HANDLER( route16_out0_w );
-WRITE8_HANDLER( route16_out1_w );
SCREEN_UPDATE_RGB32( route16 );
SCREEN_UPDATE_RGB32( stratvox );
SCREEN_UPDATE_RGB32( ttmahjng );
diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h
index 94d6f2031c0..eb18fa0b344 100644
--- a/src/mame/includes/rpunch.h
+++ b/src/mame/includes/rpunch.h
@@ -22,6 +22,12 @@ public:
DECLARE_WRITE16_MEMBER(sound_command_w);
DECLARE_READ8_MEMBER(sound_command_r);
DECLARE_READ16_MEMBER(sound_busy_r);
+ DECLARE_WRITE16_MEMBER(rpunch_videoram_w);
+ DECLARE_WRITE16_MEMBER(rpunch_videoreg_w);
+ DECLARE_WRITE16_MEMBER(rpunch_scrollreg_w);
+ DECLARE_WRITE16_MEMBER(rpunch_crtc_data_w);
+ DECLARE_WRITE16_MEMBER(rpunch_crtc_register_w);
+ DECLARE_WRITE16_MEMBER(rpunch_ins_w);
};
@@ -30,9 +36,3 @@ public:
VIDEO_START( rpunch );
SCREEN_UPDATE_IND16( rpunch );
-WRITE16_HANDLER( rpunch_videoram_w );
-WRITE16_HANDLER( rpunch_videoreg_w );
-WRITE16_HANDLER( rpunch_scrollreg_w );
-WRITE16_HANDLER( rpunch_ins_w );
-WRITE16_HANDLER( rpunch_crtc_data_w );
-WRITE16_HANDLER( rpunch_crtc_register_w );
diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h
index 05ac95e3506..6cba3a3fa68 100644
--- a/src/mame/includes/runaway.h
+++ b/src/mame/includes/runaway.h
@@ -12,6 +12,9 @@ public:
DECLARE_READ8_MEMBER(runaway_input_r);
DECLARE_WRITE8_MEMBER(runaway_led_w);
DECLARE_WRITE8_MEMBER(runaway_irq_ack_w);
+ DECLARE_WRITE8_MEMBER(runaway_paletteram_w);
+ DECLARE_WRITE8_MEMBER(runaway_video_ram_w);
+ DECLARE_WRITE8_MEMBER(runaway_tile_bank_w);
};
@@ -22,6 +25,3 @@ VIDEO_START( qwak );
SCREEN_UPDATE_IND16( runaway );
SCREEN_UPDATE_IND16( qwak );
-WRITE8_HANDLER( runaway_paletteram_w );
-WRITE8_HANDLER( runaway_video_ram_w );
-WRITE8_HANDLER( runaway_tile_bank_w );
diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h
index ff08b4a1fde..01d7e893e83 100644
--- a/src/mame/includes/rungun.h
+++ b/src/mame/includes/rungun.h
@@ -42,6 +42,9 @@ public:
DECLARE_READ16_MEMBER(sound_status_msb_r);
DECLARE_WRITE8_MEMBER(sound_status_w);
DECLARE_WRITE8_MEMBER(z80ctrl_w);
+ DECLARE_READ16_MEMBER(rng_ttl_ram_r);
+ DECLARE_WRITE16_MEMBER(rng_ttl_ram_w);
+ DECLARE_WRITE16_MEMBER(rng_936_videoram_w);
};
@@ -51,9 +54,6 @@ public:
extern void rng_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask);
-READ16_HANDLER( rng_ttl_ram_r );
-WRITE16_HANDLER( rng_ttl_ram_w );
-WRITE16_HANDLER( rng_936_videoram_w );
VIDEO_START( rng );
SCREEN_UPDATE_IND16( rng );
diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h
index 762c1025566..431f328d148 100644
--- a/src/mame/includes/sauro.h
+++ b/src/mame/includes/sauro.h
@@ -19,18 +19,18 @@ public:
DECLARE_WRITE8_MEMBER(sauro_coin1_w);
DECLARE_WRITE8_MEMBER(sauro_coin2_w);
DECLARE_WRITE8_MEMBER(flip_screen_w);
+ DECLARE_WRITE8_MEMBER(tecfri_videoram_w);
+ DECLARE_WRITE8_MEMBER(tecfri_colorram_w);
+ DECLARE_WRITE8_MEMBER(tecfri_videoram2_w);
+ DECLARE_WRITE8_MEMBER(tecfri_colorram2_w);
+ DECLARE_WRITE8_MEMBER(tecfri_scroll_bg_w);
+ DECLARE_WRITE8_MEMBER(sauro_palette_bank_w);
+ DECLARE_WRITE8_MEMBER(sauro_scroll_fg_w);
};
/*----------- defined in video/sauro.c -----------*/
-WRITE8_HANDLER( tecfri_videoram_w );
-WRITE8_HANDLER( tecfri_colorram_w );
-WRITE8_HANDLER( tecfri_videoram2_w );
-WRITE8_HANDLER( tecfri_colorram2_w );
-WRITE8_HANDLER( tecfri_scroll_bg_w );
-WRITE8_HANDLER( sauro_scroll_fg_w );
-WRITE8_HANDLER( sauro_palette_bank_w );
VIDEO_START( sauro );
VIDEO_START( trckydoc );
diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h
index 60f92eaa5aa..81f330d23e8 100644
--- a/src/mame/includes/sbasketb.h
+++ b/src/mame/includes/sbasketb.h
@@ -19,13 +19,13 @@ public:
DECLARE_WRITE8_MEMBER(sbasketb_sh_irqtrigger_w);
DECLARE_WRITE8_MEMBER(sbasketb_coin_counter_w);
DECLARE_WRITE8_MEMBER(irq_mask_w);
+ DECLARE_WRITE8_MEMBER(sbasketb_videoram_w);
+ DECLARE_WRITE8_MEMBER(sbasketb_colorram_w);
+ DECLARE_WRITE8_MEMBER(sbasketb_flipscreen_w);
};
/*----------- defined in video/sbasketb.c -----------*/
-WRITE8_HANDLER( sbasketb_videoram_w );
-WRITE8_HANDLER( sbasketb_colorram_w );
-WRITE8_HANDLER( sbasketb_flipscreen_w );
PALETTE_INIT( sbasketb );
VIDEO_START( sbasketb );
diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h
index 2e1b0854943..31cdad4fd6c 100644
--- a/src/mame/includes/sbugger.h
+++ b/src/mame/includes/sbugger.h
@@ -8,6 +8,8 @@ public:
UINT8 *m_videoram_attr;
tilemap_t *m_tilemap;
+ DECLARE_WRITE8_MEMBER(sbugger_videoram_w);
+ DECLARE_WRITE8_MEMBER(sbugger_videoram_attr_w);
};
@@ -16,5 +18,3 @@ public:
PALETTE_INIT(sbugger);
SCREEN_UPDATE_IND16(sbugger);
VIDEO_START(sbugger);
-WRITE8_HANDLER( sbugger_videoram_attr_w );
-WRITE8_HANDLER( sbugger_videoram_w );
diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h
index 9cddd33465c..8732e892aa3 100644
--- a/src/mame/includes/scotrsht.h
+++ b/src/mame/includes/scotrsht.h
@@ -16,15 +16,15 @@ public:
int m_palette_bank;
DECLARE_WRITE8_MEMBER(ctrl_w);
DECLARE_WRITE8_MEMBER(scotrsht_soundlatch_w);
+ DECLARE_WRITE8_MEMBER(scotrsht_videoram_w);
+ DECLARE_WRITE8_MEMBER(scotrsht_colorram_w);
+ DECLARE_WRITE8_MEMBER(scotrsht_charbank_w);
+ DECLARE_WRITE8_MEMBER(scotrsht_palettebank_w);
};
/*----------- defined in video/scotrsht.c -----------*/
-WRITE8_HANDLER( scotrsht_videoram_w );
-WRITE8_HANDLER( scotrsht_colorram_w );
-WRITE8_HANDLER( scotrsht_charbank_w );
-WRITE8_HANDLER( scotrsht_palettebank_w );
PALETTE_INIT( scotrsht );
VIDEO_START( scotrsht );
diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h
index 1bb7a68024e..c35d85247be 100644
--- a/src/mame/includes/sderby.h
+++ b/src/mame/includes/sderby.h
@@ -23,15 +23,15 @@ public:
DECLARE_WRITE16_MEMBER(sderby_out_w);
DECLARE_WRITE16_MEMBER(scmatto_out_w);
DECLARE_WRITE16_MEMBER(roulette_out_w);
+ DECLARE_WRITE16_MEMBER(sderby_videoram_w);
+ DECLARE_WRITE16_MEMBER(sderby_md_videoram_w);
+ DECLARE_WRITE16_MEMBER(sderby_fg_videoram_w);
+ DECLARE_WRITE16_MEMBER(sderby_scroll_w);
};
/*----------- defined in video/sderby.c -----------*/
-WRITE16_HANDLER( sderby_videoram_w );
-WRITE16_HANDLER( sderby_md_videoram_w );
-WRITE16_HANDLER( sderby_fg_videoram_w );
VIDEO_START( sderby );
SCREEN_UPDATE_IND16( sderby );
SCREEN_UPDATE_IND16( pmroulet );
-WRITE16_HANDLER( sderby_scroll_w );
diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h
index 9a7c57b6cd7..658a089c696 100644
--- a/src/mame/includes/segag80r.h
+++ b/src/mame/includes/segag80r.h
@@ -54,6 +54,18 @@ public:
DECLARE_READ8_MEMBER(spaceod_mangled_ports_r);
DECLARE_READ8_MEMBER(spaceod_port_fc_r);
DECLARE_WRITE8_MEMBER(coin_count_w);
+ DECLARE_WRITE8_MEMBER(segag80r_videoram_w);
+ DECLARE_READ8_MEMBER(segag80r_video_port_r);
+ DECLARE_WRITE8_MEMBER(segag80r_video_port_w);
+ DECLARE_READ8_MEMBER(spaceod_back_port_r);
+ DECLARE_WRITE8_MEMBER(spaceod_back_port_w);
+ DECLARE_WRITE8_MEMBER(monsterb_videoram_w);
+ DECLARE_WRITE8_MEMBER(monsterb_back_port_w);
+ DECLARE_WRITE8_MEMBER(pignewt_videoram_w);
+ DECLARE_WRITE8_MEMBER(pignewt_back_color_w);
+ DECLARE_WRITE8_MEMBER(pignewt_back_port_w);
+ DECLARE_WRITE8_MEMBER(sindbadm_videoram_w);
+ DECLARE_WRITE8_MEMBER(sindbadm_back_port_w);
};
@@ -80,29 +92,17 @@ WRITE8_HANDLER( spaceod_sound_w );
INTERRUPT_GEN( segag80r_vblank_start );
-WRITE8_HANDLER( segag80r_videoram_w );
-READ8_HANDLER( segag80r_video_port_r );
-WRITE8_HANDLER( segag80r_video_port_w );
VIDEO_START( segag80r );
SCREEN_UPDATE_IND16( segag80r );
-READ8_HANDLER( spaceod_back_port_r );
-WRITE8_HANDLER( spaceod_back_port_w );
-WRITE8_HANDLER( monsterb_videoram_w );
-WRITE8_HANDLER( monsterb_back_port_w );
-WRITE8_HANDLER( pignewt_videoram_w );
-WRITE8_HANDLER( pignewt_back_port_w );
-WRITE8_HANDLER( pignewt_back_color_w );
INTERRUPT_GEN( sindbadm_vblank_start );
-WRITE8_HANDLER( sindbadm_videoram_w );
-WRITE8_HANDLER( sindbadm_back_port_w );
diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h
index 795ab466ca2..91af4504d54 100644
--- a/src/mame/includes/segas32.h
+++ b/src/mame/includes/segas32.h
@@ -57,35 +57,59 @@ public:
UINT32 *m_spriteram_32bit;
void (*m_system32_prot_vblank)(device_t *device);
int m_print_count;
+ DECLARE_WRITE16_MEMBER(ga2_dpram_w);
+ DECLARE_READ16_MEMBER(ga2_dpram_r);
+ DECLARE_READ16_MEMBER(ga2_sprite_protection_r);
+ DECLARE_READ16_MEMBER(ga2_wakeup_protection_r);
+ DECLARE_WRITE16_MEMBER(sonic_level_load_protection);
+ DECLARE_READ16_MEMBER(brival_protection_r);
+ DECLARE_WRITE16_MEMBER(brival_protection_w);
+ DECLARE_WRITE16_MEMBER(darkedge_protection_w);
+ DECLARE_READ16_MEMBER(darkedge_protection_r);
+ DECLARE_WRITE16_MEMBER(dbzvrvs_protection_w);
+ DECLARE_READ16_MEMBER(dbzvrvs_protection_r);
+ DECLARE_READ16_MEMBER(arabfgt_protection_r);
+ DECLARE_WRITE16_MEMBER(arabfgt_protection_w);
+ DECLARE_READ16_MEMBER(arf_wakeup_protection_r);
+ DECLARE_WRITE16_MEMBER(jleague_protection_w);
+ DECLARE_READ16_MEMBER(arescue_dsp_r);
+ DECLARE_WRITE16_MEMBER(arescue_dsp_w);
+ DECLARE_READ16_MEMBER(system32_paletteram_r);
+ DECLARE_WRITE16_MEMBER(system32_paletteram_w);
+ DECLARE_READ32_MEMBER(multi32_paletteram_0_r);
+ DECLARE_WRITE32_MEMBER(multi32_paletteram_0_w);
+ DECLARE_READ32_MEMBER(multi32_paletteram_1_r);
+ DECLARE_WRITE32_MEMBER(multi32_paletteram_1_w);
+ DECLARE_READ16_MEMBER(system32_videoram_r);
+ DECLARE_WRITE16_MEMBER(system32_videoram_w);
+ DECLARE_READ32_MEMBER(multi32_videoram_r);
+ DECLARE_WRITE32_MEMBER(multi32_videoram_w);
+ DECLARE_READ16_MEMBER(system32_sprite_control_r);
+ DECLARE_WRITE16_MEMBER(system32_sprite_control_w);
+ DECLARE_READ32_MEMBER(multi32_sprite_control_r);
+ DECLARE_WRITE32_MEMBER(multi32_sprite_control_w);
+ DECLARE_READ16_MEMBER(system32_spriteram_r);
+ DECLARE_WRITE16_MEMBER(system32_spriteram_w);
+ DECLARE_READ32_MEMBER(multi32_spriteram_r);
+ DECLARE_WRITE32_MEMBER(multi32_spriteram_w);
+ DECLARE_READ16_MEMBER(system32_mixer_r);
+ DECLARE_WRITE16_MEMBER(system32_mixer_w);
+ DECLARE_WRITE32_MEMBER(multi32_mixer_0_w);
+ DECLARE_WRITE32_MEMBER(multi32_mixer_1_w);
};
/*----------- defined in machine/segas32.c -----------*/
-READ16_HANDLER( arabfgt_protection_r );
-READ16_HANDLER( arf_wakeup_protection_r );
-WRITE16_HANDLER( arabfgt_protection_w );
-READ16_HANDLER( brival_protection_r );
-WRITE16_HANDLER( brival_protection_w );
-READ16_HANDLER( darkedge_protection_r );
-WRITE16_HANDLER( darkedge_protection_w );
void darkedge_fd1149_vblank(device_t *device);
-WRITE16_HANDLER( jleague_protection_w );
-READ16_HANDLER( dbzvrvs_protection_r );
-WRITE16_HANDLER( dbzvrvs_protection_w );
extern const UINT8 ga2_v25_opcode_table[];
void decrypt_ga2_protrom(running_machine &machine);
-READ16_HANDLER( ga2_dpram_r );
-WRITE16_HANDLER( ga2_dpram_w );
-WRITE16_HANDLER(sonic_level_load_protection);
-READ16_HANDLER( arescue_dsp_r );
-WRITE16_HANDLER( arescue_dsp_w );
/*----------- defined in video/segas32.c -----------*/
@@ -97,29 +121,7 @@ SCREEN_UPDATE_RGB32(multi32_left);
SCREEN_UPDATE_RGB32(multi32_right);
void system32_set_vblank(running_machine &machine, int state);
-READ16_HANDLER( system32_videoram_r );
-WRITE16_HANDLER( system32_videoram_w );
-READ32_HANDLER( multi32_videoram_r );
-WRITE32_HANDLER( multi32_videoram_w );
-
-READ16_HANDLER( system32_spriteram_r );
-WRITE16_HANDLER( system32_spriteram_w );
-READ32_HANDLER( multi32_spriteram_r );
-WRITE32_HANDLER( multi32_spriteram_w );
-
-READ16_HANDLER( system32_paletteram_r );
-WRITE16_HANDLER( system32_paletteram_w );
-READ32_HANDLER( multi32_paletteram_0_r );
-WRITE32_HANDLER( multi32_paletteram_0_w );
-READ32_HANDLER( multi32_paletteram_1_r );
-WRITE32_HANDLER( multi32_paletteram_1_w );
-
-READ16_HANDLER( system32_sprite_control_r );
-WRITE16_HANDLER( system32_sprite_control_w );
-READ32_HANDLER( multi32_sprite_control_r );
-WRITE32_HANDLER( multi32_sprite_control_w );
-
-WRITE16_HANDLER( system32_mixer_w );
-READ16_HANDLER( system32_mixer_r );
-WRITE32_HANDLER( multi32_mixer_0_w );
-WRITE32_HANDLER( multi32_mixer_1_w );
+
+
+
+
diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h
index 83697c828d7..0e441b843e2 100644
--- a/src/mame/includes/seibuspi.h
+++ b/src/mame/includes/seibuspi.h
@@ -44,6 +44,15 @@ public:
UINT8 m_alpha_table[8192];
UINT8 m_sprite_bpp;
DECLARE_READ32_MEMBER(ejanhs_speedup_r);
+ DECLARE_READ32_MEMBER(spi_layer_bank_r);
+ DECLARE_WRITE32_MEMBER(spi_layer_bank_w);
+ DECLARE_READ32_MEMBER(spi_layer_enable_r);
+ DECLARE_WRITE32_MEMBER(spi_layer_enable_w);
+ DECLARE_WRITE32_MEMBER(tilemap_dma_start_w);
+ DECLARE_WRITE32_MEMBER(palette_dma_start_w);
+ DECLARE_WRITE32_MEMBER(sprite_dma_start_w);
+ DECLARE_WRITE32_MEMBER(video_dma_length_w);
+ DECLARE_WRITE32_MEMBER(video_dma_address_w);
};
@@ -60,14 +69,6 @@ SCREEN_UPDATE_RGB32( spi );
VIDEO_START( sys386f2 );
SCREEN_UPDATE_RGB32( sys386f2 );
-READ32_HANDLER( spi_layer_bank_r );
-WRITE32_HANDLER( spi_layer_bank_w );
-WRITE32_HANDLER( spi_layer_enable_w );
void rf2_set_layer_banks(running_machine &machine, int banks);
-WRITE32_HANDLER( tilemap_dma_start_w );
-WRITE32_HANDLER( palette_dma_start_w );
-WRITE32_HANDLER( video_dma_length_w );
-WRITE32_HANDLER( video_dma_address_w );
-WRITE32_HANDLER( sprite_dma_start_w );
diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h
index 6e2aea766bc..d241b98c413 100644
--- a/src/mame/includes/seicross.h
+++ b/src/mame/includes/seicross.h
@@ -19,13 +19,13 @@ public:
UINT8 *m_row_scroll;
UINT8 m_irq_mask;
+ DECLARE_WRITE8_MEMBER(seicross_videoram_w);
+ DECLARE_WRITE8_MEMBER(seicross_colorram_w);
};
/*----------- defined in video/seicross.c -----------*/
-WRITE8_HANDLER( seicross_videoram_w );
-WRITE8_HANDLER( seicross_colorram_w );
PALETTE_INIT( seicross );
VIDEO_START( seicross );
diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h
index 68a82815a78..aa43aa7db57 100644
--- a/src/mame/includes/senjyo.h
+++ b/src/mame/includes/senjyo.h
@@ -43,6 +43,12 @@ public:
DECLARE_WRITE8_MEMBER(senjyo_paletteram_w);
DECLARE_WRITE8_MEMBER(starforb_scrolly2);
DECLARE_WRITE8_MEMBER(starforb_scrollx2);
+ DECLARE_WRITE8_MEMBER(senjyo_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(senjyo_fgcolorram_w);
+ DECLARE_WRITE8_MEMBER(senjyo_bg1videoram_w);
+ DECLARE_WRITE8_MEMBER(senjyo_bg2videoram_w);
+ DECLARE_WRITE8_MEMBER(senjyo_bg3videoram_w);
+ DECLARE_WRITE8_MEMBER(senjyo_bgstripes_w);
};
@@ -58,12 +64,6 @@ WRITE8_HANDLER( senjyo_volume_w );
/*----------- defined in video/senjyo.c -----------*/
-WRITE8_HANDLER( senjyo_fgvideoram_w );
-WRITE8_HANDLER( senjyo_fgcolorram_w );
-WRITE8_HANDLER( senjyo_bg1videoram_w );
-WRITE8_HANDLER( senjyo_bg2videoram_w );
-WRITE8_HANDLER( senjyo_bg3videoram_w );
-WRITE8_HANDLER( senjyo_bgstripes_w );
VIDEO_START( senjyo );
SCREEN_UPDATE_IND16( senjyo );
diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h
index 818ebbbd032..5668ed54dbd 100644
--- a/src/mame/includes/seta.h
+++ b/src/mame/includes/seta.h
@@ -88,17 +88,17 @@ public:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_subcpu;
+ DECLARE_WRITE16_MEMBER(seta_vregs_w);
+ DECLARE_WRITE16_MEMBER(seta_vram_0_w);
+ DECLARE_WRITE16_MEMBER(seta_vram_2_w);
+ DECLARE_WRITE16_MEMBER(twineagl_tilebank_w);
};
/*----------- defined in video/seta.c -----------*/
void seta_coin_lockout_w(running_machine &machine, int data);
-WRITE16_HANDLER( twineagl_tilebank_w );
-WRITE16_HANDLER( seta_vram_0_w );
-WRITE16_HANDLER( seta_vram_2_w );
-WRITE16_HANDLER( seta_vregs_w );
PALETTE_INIT( blandia );
PALETTE_INIT( gundhara );
diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h
index 0b9ab2bb3fb..a0d2bb9711c 100644
--- a/src/mame/includes/seta2.h
+++ b/src/mame/includes/seta2.h
@@ -28,11 +28,11 @@ public:
UINT8 m_funcube_serial_fifo[4];
UINT8 m_funcube_serial_count;
+ DECLARE_WRITE16_MEMBER(seta2_vregs_w);
};
/*----------- defined in video/seta2.c -----------*/
-WRITE16_HANDLER( seta2_vregs_w );
VIDEO_START( seta2 );
VIDEO_START( seta2_xoffset );
diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h
index de41f922f3e..1492a7e9e05 100644
--- a/src/mame/includes/sf.h
+++ b/src/mame/includes/sf.h
@@ -34,15 +34,15 @@ public:
DECLARE_READ16_MEMBER(button1_r);
DECLARE_READ16_MEMBER(button2_r);
DECLARE_WRITE8_MEMBER(sound2_bank_w);
+ DECLARE_WRITE16_MEMBER(sf_videoram_w);
+ DECLARE_WRITE16_MEMBER(sf_bg_scroll_w);
+ DECLARE_WRITE16_MEMBER(sf_fg_scroll_w);
+ DECLARE_WRITE16_MEMBER(sf_gfxctrl_w);
};
/*----------- defined in video/sf.c -----------*/
-WRITE16_HANDLER( sf_bg_scroll_w );
-WRITE16_HANDLER( sf_fg_scroll_w );
-WRITE16_HANDLER( sf_videoram_w );
-WRITE16_HANDLER( sf_gfxctrl_w );
VIDEO_START( sf );
SCREEN_UPDATE_IND16( sf );
diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h
index 3ee932bd331..dde71510e11 100644
--- a/src/mame/includes/shadfrce.h
+++ b/src/mame/includes/shadfrce.h
@@ -27,18 +27,18 @@ public:
DECLARE_WRITE16_MEMBER(shadfrce_irq_ack_w);
DECLARE_WRITE16_MEMBER(shadfrce_irq_w);
DECLARE_WRITE16_MEMBER(shadfrce_scanline_w);
+ DECLARE_WRITE16_MEMBER(shadfrce_fgvideoram_w);
+ DECLARE_WRITE16_MEMBER(shadfrce_bg0videoram_w);
+ DECLARE_WRITE16_MEMBER(shadfrce_bg1videoram_w);
+ DECLARE_WRITE16_MEMBER(shadfrce_bg0scrollx_w);
+ DECLARE_WRITE16_MEMBER(shadfrce_bg0scrolly_w);
+ DECLARE_WRITE16_MEMBER(shadfrce_bg1scrollx_w);
+ DECLARE_WRITE16_MEMBER(shadfrce_bg1scrolly_w);
};
/*----------- defined in video/shadfrce.c -----------*/
-WRITE16_HANDLER ( shadfrce_bg0scrollx_w );
-WRITE16_HANDLER ( shadfrce_bg1scrollx_w );
-WRITE16_HANDLER ( shadfrce_bg0scrolly_w );
-WRITE16_HANDLER ( shadfrce_bg1scrolly_w );
VIDEO_START( shadfrce );
SCREEN_VBLANK(shadfrce);
SCREEN_UPDATE_IND16( shadfrce );
-WRITE16_HANDLER( shadfrce_fgvideoram_w );
-WRITE16_HANDLER( shadfrce_bg0videoram_w );
-WRITE16_HANDLER( shadfrce_bg1videoram_w );
diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h
index a559e70427b..83051cff268 100644
--- a/src/mame/includes/shangha3.h
+++ b/src/mame/includes/shangha3.h
@@ -21,13 +21,13 @@ public:
DECLARE_WRITE16_MEMBER(heberpop_coinctrl_w);
DECLARE_WRITE16_MEMBER(blocken_coinctrl_w);
DECLARE_WRITE16_MEMBER(heberpop_sound_command_w);
+ DECLARE_WRITE16_MEMBER(shangha3_flipscreen_w);
+ DECLARE_WRITE16_MEMBER(shangha3_gfxlist_addr_w);
+ DECLARE_WRITE16_MEMBER(shangha3_blitter_go_w);
};
/*----------- defined in video/shangha3.c -----------*/
-WRITE16_HANDLER( shangha3_flipscreen_w );
-WRITE16_HANDLER( shangha3_gfxlist_addr_w );
-WRITE16_HANDLER( shangha3_blitter_go_w );
VIDEO_START( shangha3 );
SCREEN_UPDATE_IND16( shangha3 );
diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h
index c610bb49be3..e28936b4430 100644
--- a/src/mame/includes/shangkid.h
+++ b/src/mame/includes/shangkid.h
@@ -16,6 +16,7 @@ public:
DECLARE_WRITE8_MEMBER(shangkid_cpu_reset_w);
DECLARE_WRITE8_MEMBER(shangkid_sound_enable_w);
DECLARE_READ8_MEMBER(shangkid_soundlatch_r);
+ DECLARE_WRITE8_MEMBER(shangkid_videoram_w);
};
@@ -23,7 +24,6 @@ public:
VIDEO_START( shangkid );
SCREEN_UPDATE_IND16( shangkid );
-WRITE8_HANDLER( shangkid_videoram_w );
PALETTE_INIT( dynamski );
SCREEN_UPDATE_IND16( dynamski );
diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h
index d7fc09548d8..54ab992f8ce 100644
--- a/src/mame/includes/shaolins.h
+++ b/src/mame/includes/shaolins.h
@@ -16,16 +16,16 @@ public:
UINT8 m_nmi_enable;
required_device<cpu_device> m_maincpu;
+ DECLARE_WRITE8_MEMBER(shaolins_videoram_w);
+ DECLARE_WRITE8_MEMBER(shaolins_colorram_w);
+ DECLARE_WRITE8_MEMBER(shaolins_palettebank_w);
+ DECLARE_WRITE8_MEMBER(shaolins_scroll_w);
+ DECLARE_WRITE8_MEMBER(shaolins_nmi_w);
};
/*----------- defined in video/sauro.c -----------*/
-WRITE8_HANDLER( shaolins_videoram_w );
-WRITE8_HANDLER( shaolins_colorram_w );
-WRITE8_HANDLER( shaolins_palettebank_w );
-WRITE8_HANDLER( shaolins_scroll_w );
-WRITE8_HANDLER( shaolins_nmi_w );
PALETTE_INIT( shaolins );
VIDEO_START( shaolins );
diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h
index 095f565a5b2..b40786f0cca 100644
--- a/src/mame/includes/shisen.h
+++ b/src/mame/includes/shisen.h
@@ -10,14 +10,14 @@ public:
UINT8 *m_videoram;
DECLARE_READ8_MEMBER(sichuan2_dsw1_r);
DECLARE_WRITE8_MEMBER(sichuan2_coin_w);
+ DECLARE_WRITE8_MEMBER(sichuan2_videoram_w);
+ DECLARE_WRITE8_MEMBER(sichuan2_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(sichuan2_paletteram_w);
};
/*----------- defined in video/shisen.c -----------*/
-WRITE8_HANDLER( sichuan2_videoram_w );
-WRITE8_HANDLER( sichuan2_bankswitch_w );
-WRITE8_HANDLER( sichuan2_paletteram_w );
VIDEO_START( sichuan2 );
SCREEN_UPDATE_IND16( sichuan2 );
diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h
index 88eb9c429a3..26b42451337 100644
--- a/src/mame/includes/shootout.h
+++ b/src/mame/includes/shootout.h
@@ -14,13 +14,13 @@ public:
DECLARE_WRITE8_MEMBER(sound_cpu_command_w);
DECLARE_WRITE8_MEMBER(shootout_flipscreen_w);
DECLARE_WRITE8_MEMBER(shootout_coin_counter_w);
+ DECLARE_WRITE8_MEMBER(shootout_videoram_w);
+ DECLARE_WRITE8_MEMBER(shootout_textram_w);
};
/*----------- defined in video/shootout.c -----------*/
-WRITE8_HANDLER( shootout_videoram_w );
-WRITE8_HANDLER( shootout_textram_w );
PALETTE_INIT( shootout );
VIDEO_START( shootout );
diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h
index 08f593344ac..b125669eda8 100644
--- a/src/mame/includes/sidearms.h
+++ b/src/mame/includes/sidearms.h
@@ -32,16 +32,16 @@ public:
DECLARE_WRITE8_MEMBER(sidearms_bankswitch_w);
DECLARE_READ8_MEMBER(turtship_ports_r);
DECLARE_WRITE8_MEMBER(whizz_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(sidearms_videoram_w);
+ DECLARE_WRITE8_MEMBER(sidearms_colorram_w);
+ DECLARE_WRITE8_MEMBER(sidearms_c804_w);
+ DECLARE_WRITE8_MEMBER(sidearms_gfxctrl_w);
+ DECLARE_WRITE8_MEMBER(sidearms_star_scrollx_w);
+ DECLARE_WRITE8_MEMBER(sidearms_star_scrolly_w);
};
/*----------- defined in video/sidearms.c -----------*/
-WRITE8_HANDLER( sidearms_videoram_w );
-WRITE8_HANDLER( sidearms_colorram_w );
-WRITE8_HANDLER( sidearms_star_scrollx_w );
-WRITE8_HANDLER( sidearms_star_scrolly_w );
-WRITE8_HANDLER( sidearms_c804_w );
-WRITE8_HANDLER( sidearms_gfxctrl_w );
VIDEO_START( sidearms );
SCREEN_UPDATE_IND16( sidearms );
diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h
index 0cf0856df0f..1056d428082 100644
--- a/src/mame/includes/sidepckt.h
+++ b/src/mame/includes/sidepckt.h
@@ -19,6 +19,9 @@ public:
DECLARE_READ8_MEMBER(sidepckt_i8751_r);
DECLARE_WRITE8_MEMBER(sidepckt_i8751_w);
DECLARE_WRITE8_MEMBER(sidepctj_i8751_w);
+ DECLARE_WRITE8_MEMBER(sidepckt_videoram_w);
+ DECLARE_WRITE8_MEMBER(sidepckt_colorram_w);
+ DECLARE_WRITE8_MEMBER(sidepckt_flipscreen_w);
};
@@ -28,6 +31,3 @@ PALETTE_INIT( sidepckt );
VIDEO_START( sidepckt );
SCREEN_UPDATE_IND16( sidepckt );
-WRITE8_HANDLER( sidepckt_flipscreen_w );
-WRITE8_HANDLER( sidepckt_videoram_w );
-WRITE8_HANDLER( sidepckt_colorram_w );
diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h
index 673d4912fff..eca93eff06a 100644
--- a/src/mame/includes/silkroad.h
+++ b/src/mame/includes/silkroad.h
@@ -14,13 +14,13 @@ public:
tilemap_t *m_fg3_tilemap;
DECLARE_WRITE32_MEMBER(paletteram32_xRRRRRGGGGGBBBBB_dword_w);
DECLARE_WRITE32_MEMBER(silk_coin_counter_w);
+ DECLARE_WRITE32_MEMBER(silkroad_fgram_w);
+ DECLARE_WRITE32_MEMBER(silkroad_fgram2_w);
+ DECLARE_WRITE32_MEMBER(silkroad_fgram3_w);
};
/*----------- defined in video/silkroad.c -----------*/
-WRITE32_HANDLER( silkroad_fgram_w );
-WRITE32_HANDLER( silkroad_fgram2_w );
-WRITE32_HANDLER( silkroad_fgram3_w );
VIDEO_START(silkroad);
SCREEN_UPDATE_IND16(silkroad);
diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h
index 14950803d02..8b4beebe25e 100644
--- a/src/mame/includes/simpsons.h
+++ b/src/mame/includes/simpsons.h
@@ -30,13 +30,17 @@ public:
device_t *m_k053251;
DECLARE_WRITE8_MEMBER(z80_bankswitch_w);
DECLARE_WRITE8_MEMBER(z80_arm_nmi_w);
+ DECLARE_WRITE8_MEMBER(simpsons_eeprom_w);
+ DECLARE_WRITE8_MEMBER(simpsons_coin_counter_w);
+ DECLARE_READ8_MEMBER(simpsons_sound_interrupt_r);
+ DECLARE_READ8_MEMBER(simpsons_k052109_r);
+ DECLARE_WRITE8_MEMBER(simpsons_k052109_w);
+ DECLARE_READ8_MEMBER(simpsons_k053247_r);
+ DECLARE_WRITE8_MEMBER(simpsons_k053247_w);
};
/*----------- defined in machine/simpsons.c -----------*/
-WRITE8_HANDLER( simpsons_eeprom_w );
-WRITE8_HANDLER( simpsons_coin_counter_w );
-READ8_HANDLER( simpsons_sound_interrupt_r );
READ8_DEVICE_HANDLER( simpsons_sound_r );
MACHINE_RESET( simpsons );
MACHINE_START( simpsons );
diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h
index 5d9ecb22a95..72cc5400ed9 100644
--- a/src/mame/includes/skydiver.h
+++ b/src/mame/includes/skydiver.h
@@ -30,6 +30,18 @@ public:
tilemap_t *m_bg_tilemap;
int m_width;
DECLARE_WRITE8_MEMBER(skydiver_nmion_w);
+ DECLARE_WRITE8_MEMBER(skydiver_videoram_w);
+ DECLARE_READ8_MEMBER(skydiver_wram_r);
+ DECLARE_WRITE8_MEMBER(skydiver_wram_w);
+ DECLARE_WRITE8_MEMBER(skydiver_width_w);
+ DECLARE_WRITE8_MEMBER(skydiver_coin_lockout_w);
+ DECLARE_WRITE8_MEMBER(skydiver_start_lamp_1_w);
+ DECLARE_WRITE8_MEMBER(skydiver_start_lamp_2_w);
+ DECLARE_WRITE8_MEMBER(skydiver_lamp_s_w);
+ DECLARE_WRITE8_MEMBER(skydiver_lamp_k_w);
+ DECLARE_WRITE8_MEMBER(skydiver_lamp_y_w);
+ DECLARE_WRITE8_MEMBER(skydiver_lamp_d_w);
+ DECLARE_WRITE8_MEMBER(skydiver_2000_201F_w);
};
@@ -41,17 +53,5 @@ DISCRETE_SOUND_EXTERN( skydiver );
/*----------- defined in video/skydiver.c -----------*/
MACHINE_RESET( skydiver );
-WRITE8_HANDLER( skydiver_videoram_w );
-WRITE8_HANDLER( skydiver_wram_w ); /* the signal is WRAM, presumably Work RAM */
-READ8_HANDLER( skydiver_wram_r );
-WRITE8_HANDLER( skydiver_start_lamp_1_w );
-WRITE8_HANDLER( skydiver_start_lamp_2_w );
-WRITE8_HANDLER( skydiver_lamp_s_w );
-WRITE8_HANDLER( skydiver_lamp_k_w );
-WRITE8_HANDLER( skydiver_lamp_y_w );
-WRITE8_HANDLER( skydiver_lamp_d_w );
-WRITE8_HANDLER( skydiver_2000_201F_w );
-WRITE8_HANDLER( skydiver_width_w );
-WRITE8_HANDLER( skydiver_coin_lockout_w );
VIDEO_START( skydiver );
SCREEN_UPDATE_IND16( skydiver );
diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h
index 1f7915cada1..518df562acb 100644
--- a/src/mame/includes/skyfox.h
+++ b/src/mame/includes/skyfox.h
@@ -24,11 +24,12 @@ public:
/* devices */
device_t *m_maincpu;
+ DECLARE_READ8_MEMBER(skyfox_vregs_r);
+ DECLARE_WRITE8_MEMBER(skyfox_vregs_w);
};
/*----------- defined in video/skyfox.c -----------*/
-WRITE8_HANDLER( skyfox_vregs_w );
PALETTE_INIT( skyfox );
diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h
index 27fe3feb4cf..3fa0db39600 100644
--- a/src/mame/includes/skykid.h
+++ b/src/mame/includes/skykid.h
@@ -23,6 +23,13 @@ public:
DECLARE_WRITE8_MEMBER(skykid_irq_1_ctrl_w);
DECLARE_WRITE8_MEMBER(skykid_irq_2_ctrl_w);
DECLARE_READ8_MEMBER(readFF);
+ DECLARE_READ8_MEMBER(skykid_videoram_r);
+ DECLARE_WRITE8_MEMBER(skykid_videoram_w);
+ DECLARE_READ8_MEMBER(skykid_textram_r);
+ DECLARE_WRITE8_MEMBER(skykid_textram_w);
+ DECLARE_WRITE8_MEMBER(skykid_scroll_x_w);
+ DECLARE_WRITE8_MEMBER(skykid_scroll_y_w);
+ DECLARE_WRITE8_MEMBER(skykid_flipscreen_priority_w);
};
@@ -32,10 +39,3 @@ VIDEO_START( skykid );
SCREEN_UPDATE_IND16( skykid );
PALETTE_INIT( skykid );
-READ8_HANDLER( skykid_videoram_r );
-WRITE8_HANDLER( skykid_videoram_w );
-READ8_HANDLER( skykid_textram_r );
-WRITE8_HANDLER( skykid_textram_w );
-WRITE8_HANDLER( skykid_scroll_x_w );
-WRITE8_HANDLER( skykid_scroll_y_w );
-WRITE8_HANDLER( skykid_flipscreen_priority_w );
diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h
index 5de267f83dd..8b1586f804d 100644
--- a/src/mame/includes/slapfght.h
+++ b/src/mame/includes/slapfght.h
@@ -58,6 +58,50 @@ public:
required_device<buffered_spriteram8_device> m_spriteram;
DECLARE_READ8_MEMBER(tigerh_status_r);
DECLARE_READ8_MEMBER(gtstarb1_port_0_read);
+ DECLARE_WRITE8_MEMBER(slapfight_port_00_w);
+ DECLARE_WRITE8_MEMBER(slapfight_port_01_w);
+ DECLARE_WRITE8_MEMBER(slapfight_port_06_w);
+ DECLARE_WRITE8_MEMBER(slapfight_port_07_w);
+ DECLARE_WRITE8_MEMBER(slapfight_port_08_w);
+ DECLARE_WRITE8_MEMBER(slapfight_port_09_w);
+ DECLARE_READ8_MEMBER(slapfight_port_00_r);
+ DECLARE_READ8_MEMBER(slapfight_68705_portA_r);
+ DECLARE_WRITE8_MEMBER(slapfight_68705_portA_w);
+ DECLARE_WRITE8_MEMBER(slapfight_68705_ddrA_w);
+ DECLARE_READ8_MEMBER(slapfight_68705_portB_r);
+ DECLARE_WRITE8_MEMBER(slapfight_68705_portB_w);
+ DECLARE_WRITE8_MEMBER(slapfight_68705_ddrB_w);
+ DECLARE_READ8_MEMBER(slapfight_68705_portC_r);
+ DECLARE_WRITE8_MEMBER(slapfight_68705_portC_w);
+ DECLARE_WRITE8_MEMBER(slapfight_68705_ddrC_w);
+ DECLARE_WRITE8_MEMBER(slapfight_mcu_w);
+ DECLARE_READ8_MEMBER(slapfight_mcu_r);
+ DECLARE_READ8_MEMBER(slapfight_mcu_status_r);
+ DECLARE_READ8_MEMBER(getstar_e803_r);
+ DECLARE_WRITE8_MEMBER(getstar_e803_w);
+ DECLARE_WRITE8_MEMBER(getstar_sh_intenable_w);
+ DECLARE_WRITE8_MEMBER(getstar_port_04_w);
+ DECLARE_READ8_MEMBER(tigerh_68705_portA_r);
+ DECLARE_WRITE8_MEMBER(tigerh_68705_portA_w);
+ DECLARE_WRITE8_MEMBER(tigerh_68705_ddrA_w);
+ DECLARE_READ8_MEMBER(tigerh_68705_portB_r);
+ DECLARE_WRITE8_MEMBER(tigerh_68705_portB_w);
+ DECLARE_WRITE8_MEMBER(tigerh_68705_ddrB_w);
+ DECLARE_READ8_MEMBER(tigerh_68705_portC_r);
+ DECLARE_WRITE8_MEMBER(tigerh_68705_portC_w);
+ DECLARE_WRITE8_MEMBER(tigerh_68705_ddrC_w);
+ DECLARE_WRITE8_MEMBER(tigerh_mcu_w);
+ DECLARE_READ8_MEMBER(tigerh_mcu_r);
+ DECLARE_READ8_MEMBER(tigerh_mcu_status_r);
+ DECLARE_READ8_MEMBER(tigerhb_e803_r);
+ DECLARE_WRITE8_MEMBER(tigerhb_e803_w);
+ DECLARE_READ8_MEMBER(perfrman_port_00_r);
+ DECLARE_WRITE8_MEMBER(slapfight_videoram_w);
+ DECLARE_WRITE8_MEMBER(slapfight_colorram_w);
+ DECLARE_WRITE8_MEMBER(slapfight_fixram_w);
+ DECLARE_WRITE8_MEMBER(slapfight_fixcol_w);
+ DECLARE_WRITE8_MEMBER(slapfight_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(slapfight_palette_bank_w);
};
@@ -66,63 +110,26 @@ public:
/* due to code at 0x108d (GUARDIAN) or 0x1152 (GETSTARJ),
register C is a unaltered copy of register A */
-#define GS_SAVE_REGS state->m_gs_a = cpu_get_reg(&space->device(), Z80_BC) >> 0; \
- state->m_gs_d = cpu_get_reg(&space->device(), Z80_DE) >> 8; \
- state->m_gs_e = cpu_get_reg(&space->device(), Z80_DE) >> 0;
+#define GS_SAVE_REGS m_gs_a = cpu_get_reg(&space.device(), Z80_BC) >> 0; \
+ m_gs_d = cpu_get_reg(&space.device(), Z80_DE) >> 8; \
+ m_gs_e = cpu_get_reg(&space.device(), Z80_DE) >> 0;
-#define GS_RESET_REGS state->m_gs_a = 0; \
- state->m_gs_d = 0; \
- state->m_gs_e = 0;
+#define GS_RESET_REGS m_gs_a = 0; \
+ m_gs_d = 0; \
+ m_gs_e = 0;
/*----------- defined in machine/slapfght.c -----------*/
MACHINE_RESET( slapfight );
-READ8_HANDLER( slapfight_port_00_r );
-WRITE8_HANDLER( slapfight_port_00_w );
-WRITE8_HANDLER( slapfight_port_01_w );
-WRITE8_HANDLER( slapfight_port_06_w );
-WRITE8_HANDLER( slapfight_port_07_w );
-WRITE8_HANDLER( slapfight_port_08_w );
-WRITE8_HANDLER( slapfight_port_09_w );
-
-READ8_HANDLER ( slapfight_68705_portA_r );
-WRITE8_HANDLER( slapfight_68705_portA_w );
-READ8_HANDLER ( slapfight_68705_portB_r );
-WRITE8_HANDLER( slapfight_68705_portB_w );
-READ8_HANDLER ( slapfight_68705_portC_r );
-WRITE8_HANDLER( slapfight_68705_portC_w );
-WRITE8_HANDLER( slapfight_68705_ddrA_w );
-WRITE8_HANDLER( slapfight_68705_ddrB_w );
-WRITE8_HANDLER( slapfight_68705_ddrC_w );
-WRITE8_HANDLER( slapfight_mcu_w );
-READ8_HANDLER ( slapfight_mcu_r );
-READ8_HANDLER ( slapfight_mcu_status_r );
-
-READ8_HANDLER( getstar_e803_r );
-WRITE8_HANDLER( getstar_e803_w );
-
-READ8_HANDLER( perfrman_port_00_r );
-
-READ8_HANDLER ( tigerh_68705_portA_r );
-WRITE8_HANDLER( tigerh_68705_portA_w );
-READ8_HANDLER ( tigerh_68705_portB_r );
-WRITE8_HANDLER( tigerh_68705_portB_w );
-READ8_HANDLER ( tigerh_68705_portC_r );
-WRITE8_HANDLER( tigerh_68705_portC_w );
-WRITE8_HANDLER( tigerh_68705_ddrA_w );
-WRITE8_HANDLER( tigerh_68705_ddrB_w );
-WRITE8_HANDLER( tigerh_68705_ddrC_w );
-WRITE8_HANDLER( tigerh_mcu_w );
-READ8_HANDLER ( tigerh_mcu_r );
-READ8_HANDLER ( tigerh_mcu_status_r );
-
-READ8_HANDLER( tigerhb_e803_r );
-WRITE8_HANDLER( tigerhb_e803_w );
-
-
-WRITE8_HANDLER( getstar_sh_intenable_w );
+
+
+
+
+
+
+
INTERRUPT_GEN( getstar_interrupt );
@@ -133,9 +140,3 @@ SCREEN_UPDATE_IND16( perfrman );
VIDEO_START( slapfight );
VIDEO_START( perfrman );
-WRITE8_HANDLER( slapfight_flipscreen_w );
-WRITE8_HANDLER( slapfight_fixram_w );
-WRITE8_HANDLER( slapfight_fixcol_w );
-WRITE8_HANDLER( slapfight_videoram_w );
-WRITE8_HANDLER( slapfight_colorram_w );
-WRITE8_HANDLER( slapfight_palette_bank_w );
diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h
index fc92d23b8fa..79d2a3e0edd 100644
--- a/src/mame/includes/snk.h
+++ b/src/mame/includes/snk.h
@@ -97,6 +97,38 @@ public:
DECLARE_WRITE8_MEMBER(ikari_coin_counter_w);
DECLARE_WRITE8_MEMBER(tdfever_coin_counter_w);
DECLARE_WRITE8_MEMBER(countryc_trackball_w);
+ DECLARE_WRITE8_MEMBER(snk_tx_videoram_w);
+ DECLARE_WRITE8_MEMBER(marvins_fg_videoram_w);
+ DECLARE_WRITE8_MEMBER(marvins_bg_videoram_w);
+ DECLARE_WRITE8_MEMBER(snk_bg_videoram_w);
+ DECLARE_WRITE8_MEMBER(snk_fg_scrollx_w);
+ DECLARE_WRITE8_MEMBER(snk_fg_scrolly_w);
+ DECLARE_WRITE8_MEMBER(snk_bg_scrollx_w);
+ DECLARE_WRITE8_MEMBER(snk_bg_scrolly_w);
+ DECLARE_WRITE8_MEMBER(snk_sp16_scrollx_w);
+ DECLARE_WRITE8_MEMBER(snk_sp16_scrolly_w);
+ DECLARE_WRITE8_MEMBER(snk_sp32_scrollx_w);
+ DECLARE_WRITE8_MEMBER(snk_sp32_scrolly_w);
+ DECLARE_WRITE8_MEMBER(snk_sprite_split_point_w);
+ DECLARE_WRITE8_MEMBER(marvins_palette_bank_w);
+ DECLARE_WRITE8_MEMBER(marvins_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(sgladiat_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(hal21_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(marvins_scroll_msb_w);
+ DECLARE_WRITE8_MEMBER(jcross_scroll_msb_w);
+ DECLARE_WRITE8_MEMBER(sgladiat_scroll_msb_w);
+ DECLARE_WRITE8_MEMBER(aso_videoattrs_w);
+ DECLARE_WRITE8_MEMBER(tnk3_videoattrs_w);
+ DECLARE_WRITE8_MEMBER(aso_bg_bank_w);
+ DECLARE_WRITE8_MEMBER(ikari_bg_scroll_msb_w);
+ DECLARE_WRITE8_MEMBER(ikari_sp_scroll_msb_w);
+ DECLARE_WRITE8_MEMBER(ikari_unknown_video_w);
+ DECLARE_WRITE8_MEMBER(gwar_tx_bank_w);
+ DECLARE_WRITE8_MEMBER(gwar_videoattrs_w);
+ DECLARE_WRITE8_MEMBER(gwara_videoattrs_w);
+ DECLARE_WRITE8_MEMBER(gwara_sp_scroll_msb_w);
+ DECLARE_WRITE8_MEMBER(tdfever_sp_scroll_msb_w);
+ DECLARE_WRITE8_MEMBER(tdfever_spriteram_w);
};
@@ -121,37 +153,5 @@ extern SCREEN_UPDATE_IND16( ikari );
extern SCREEN_UPDATE_IND16( gwar );
extern SCREEN_UPDATE_IND16( tdfever );
-extern WRITE8_HANDLER( snk_fg_scrollx_w );
-extern WRITE8_HANDLER( snk_fg_scrolly_w );
-extern WRITE8_HANDLER( snk_bg_scrollx_w );
-extern WRITE8_HANDLER( snk_bg_scrolly_w );
-extern WRITE8_HANDLER( snk_sp16_scrollx_w );
-extern WRITE8_HANDLER( snk_sp16_scrolly_w );
-extern WRITE8_HANDLER( snk_sp32_scrollx_w );
-extern WRITE8_HANDLER( snk_sp32_scrolly_w );
-
-extern WRITE8_HANDLER( snk_sprite_split_point_w );
-extern WRITE8_HANDLER( marvins_palette_bank_w );
-extern WRITE8_HANDLER( marvins_scroll_msb_w );
-extern WRITE8_HANDLER( jcross_scroll_msb_w );
-extern WRITE8_HANDLER( sgladiat_scroll_msb_w );
-extern WRITE8_HANDLER( marvins_flipscreen_w );
-extern WRITE8_HANDLER( sgladiat_flipscreen_w );
-extern WRITE8_HANDLER( hal21_flipscreen_w );
-extern WRITE8_HANDLER( tnk3_videoattrs_w );
-extern WRITE8_HANDLER( aso_videoattrs_w );
-extern WRITE8_HANDLER( aso_bg_bank_w );
-extern WRITE8_HANDLER( ikari_bg_scroll_msb_w );
-extern WRITE8_HANDLER( ikari_sp_scroll_msb_w );
-extern WRITE8_HANDLER( ikari_unknown_video_w );
-extern WRITE8_HANDLER( gwar_tx_bank_w );
-extern WRITE8_HANDLER( gwar_videoattrs_w );
-extern WRITE8_HANDLER( gwara_videoattrs_w );
-extern WRITE8_HANDLER( gwara_sp_scroll_msb_w );
-extern WRITE8_HANDLER( tdfever_sp_scroll_msb_w );
-extern WRITE8_HANDLER( tdfever_spriteram_w );
-
-extern WRITE8_HANDLER( snk_tx_videoram_w );
-extern WRITE8_HANDLER( snk_bg_videoram_w );
-extern WRITE8_HANDLER( marvins_fg_videoram_w );
-extern WRITE8_HANDLER( marvins_bg_videoram_w );
+
+
diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h
index 4b560bc08bb..2fcfcc47fda 100644
--- a/src/mame/includes/snk6502.h
+++ b/src/mame/includes/snk6502.h
@@ -31,6 +31,15 @@ public:
rgb_t m_palette[64];
UINT8 m_irq_mask;
+ DECLARE_WRITE8_MEMBER(snk6502_videoram_w);
+ DECLARE_WRITE8_MEMBER(snk6502_videoram2_w);
+ DECLARE_WRITE8_MEMBER(snk6502_colorram_w);
+ DECLARE_WRITE8_MEMBER(snk6502_charram_w);
+ DECLARE_WRITE8_MEMBER(snk6502_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(snk6502_scrollx_w);
+ DECLARE_WRITE8_MEMBER(snk6502_scrolly_w);
+ DECLARE_WRITE8_MEMBER(satansat_b002_w);
+ DECLARE_WRITE8_MEMBER(satansat_backcolor_w);
};
@@ -65,21 +74,12 @@ DISCRETE_SOUND_EXTERN( fantasy );
/*----------- defined in video/snk6502.c -----------*/
-WRITE8_HANDLER( snk6502_videoram_w );
-WRITE8_HANDLER( snk6502_videoram2_w );
-WRITE8_HANDLER( snk6502_colorram_w );
-WRITE8_HANDLER( snk6502_charram_w );
-WRITE8_HANDLER( snk6502_flipscreen_w );
-WRITE8_HANDLER( snk6502_scrollx_w );
-WRITE8_HANDLER( snk6502_scrolly_w );
PALETTE_INIT( snk6502 );
VIDEO_START( snk6502 );
SCREEN_UPDATE_IND16( snk6502 );
VIDEO_START( pballoon );
-WRITE8_HANDLER( satansat_b002_w );
-WRITE8_HANDLER( satansat_backcolor_w );
PALETTE_INIT( satansat );
VIDEO_START( satansat );
diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h
index 1d0aaa94a84..a1b5d65733a 100644
--- a/src/mame/includes/snk68.h
+++ b/src/mame/includes/snk68.h
@@ -25,6 +25,14 @@ public:
DECLARE_READ16_MEMBER(protcontrols_r);
DECLARE_WRITE16_MEMBER(protection_w);
DECLARE_WRITE16_MEMBER(sound_w);
+ DECLARE_READ16_MEMBER(pow_spriteram_r);
+ DECLARE_WRITE16_MEMBER(pow_spriteram_w);
+ DECLARE_READ16_MEMBER(pow_fg_videoram_r);
+ DECLARE_WRITE16_MEMBER(pow_fg_videoram_w);
+ DECLARE_WRITE16_MEMBER(searchar_fg_videoram_w);
+ DECLARE_WRITE16_MEMBER(pow_flipscreen16_w);
+ DECLARE_WRITE16_MEMBER(searchar_flipscreen16_w);
+ DECLARE_WRITE16_MEMBER(pow_paletteram16_word_w);
};
@@ -33,11 +41,3 @@ public:
VIDEO_START( pow );
VIDEO_START( searchar );
SCREEN_UPDATE_IND16( pow );
-WRITE16_HANDLER( pow_paletteram16_word_w );
-WRITE16_HANDLER( pow_flipscreen16_w );
-WRITE16_HANDLER( searchar_flipscreen16_w );
-READ16_HANDLER( pow_spriteram_r );
-WRITE16_HANDLER( pow_spriteram_w );
-READ16_HANDLER( pow_fg_videoram_r );
-WRITE16_HANDLER( pow_fg_videoram_w );
-WRITE16_HANDLER( searchar_fg_videoram_w );
diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h
index 459e9b516c1..40612b16536 100644
--- a/src/mame/includes/snookr10.h
+++ b/src/mame/includes/snookr10.h
@@ -18,13 +18,13 @@ public:
DECLARE_READ8_MEMBER(dsw_port_1_r);
DECLARE_WRITE8_MEMBER(output_port_0_w);
DECLARE_WRITE8_MEMBER(output_port_1_w);
+ DECLARE_WRITE8_MEMBER(snookr10_videoram_w);
+ DECLARE_WRITE8_MEMBER(snookr10_colorram_w);
};
/*----------- defined in video/snookr10.c -----------*/
-WRITE8_HANDLER( snookr10_videoram_w );
-WRITE8_HANDLER( snookr10_colorram_w );
PALETTE_INIT( snookr10 );
PALETTE_INIT( apple10 );
VIDEO_START( snookr10 );
diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h
index cd1dc2f2263..6906c26a093 100644
--- a/src/mame/includes/solomon.h
+++ b/src/mame/includes/solomon.h
@@ -18,16 +18,16 @@ public:
DECLARE_WRITE8_MEMBER(solomon_sh_command_w);
DECLARE_READ8_MEMBER(solomon_0xe603_r);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(solomon_videoram_w);
+ DECLARE_WRITE8_MEMBER(solomon_colorram_w);
+ DECLARE_WRITE8_MEMBER(solomon_videoram2_w);
+ DECLARE_WRITE8_MEMBER(solomon_colorram2_w);
+ DECLARE_WRITE8_MEMBER(solomon_flipscreen_w);
};
/*----------- defined in video/solomon.c -----------*/
-WRITE8_HANDLER( solomon_videoram_w );
-WRITE8_HANDLER( solomon_colorram_w );
-WRITE8_HANDLER( solomon_videoram2_w );
-WRITE8_HANDLER( solomon_colorram2_w );
-WRITE8_HANDLER( solomon_flipscreen_w );
VIDEO_START( solomon );
SCREEN_UPDATE_IND16( solomon );
diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h
index b7646721077..52a3963c394 100644
--- a/src/mame/includes/sonson.h
+++ b/src/mame/includes/sonson.h
@@ -28,15 +28,15 @@ public:
DECLARE_WRITE8_MEMBER(sonson_sh_irqtrigger_w);
DECLARE_WRITE8_MEMBER(sonson_coin1_counter_w);
DECLARE_WRITE8_MEMBER(sonson_coin2_counter_w);
+ DECLARE_WRITE8_MEMBER(sonson_videoram_w);
+ DECLARE_WRITE8_MEMBER(sonson_colorram_w);
+ DECLARE_WRITE8_MEMBER(sonson_scrollx_w);
+ DECLARE_WRITE8_MEMBER(sonson_flipscreen_w);
};
/*----------- defined in video/sonson.c -----------*/
-WRITE8_HANDLER( sonson_videoram_w );
-WRITE8_HANDLER( sonson_colorram_w );
-WRITE8_HANDLER( sonson_scrollx_w );
-WRITE8_HANDLER( sonson_flipscreen_w );
PALETTE_INIT( sonson );
VIDEO_START( sonson );
diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h
index 8b5705f350d..6ed91d55011 100644
--- a/src/mame/includes/spacefb.h
+++ b/src/mame/includes/spacefb.h
@@ -40,6 +40,8 @@ public:
UINT32 m_star_shift_reg;
double m_color_weights_rg[3];
double m_color_weights_b[2];
+ DECLARE_WRITE8_MEMBER(spacefb_port_0_w);
+ DECLARE_WRITE8_MEMBER(spacefb_port_2_w);
};
@@ -58,5 +60,3 @@ WRITE8_HANDLER( spacefb_port_1_w );
VIDEO_START( spacefb );
SCREEN_UPDATE_RGB32( spacefb );
-WRITE8_HANDLER( spacefb_port_0_w );
-WRITE8_HANDLER( spacefb_port_2_w );
diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h
index b3eb22aea95..02f8145f2cf 100644
--- a/src/mame/includes/spcforce.h
+++ b/src/mame/includes/spcforce.h
@@ -18,10 +18,10 @@ public:
DECLARE_READ8_MEMBER(spcforce_t0_r);
DECLARE_WRITE8_MEMBER(spcforce_soundtrigger_w);
DECLARE_WRITE8_MEMBER(irq_mask_w);
+ DECLARE_WRITE8_MEMBER(spcforce_flip_screen_w);
};
/*----------- defined in video/spcforce.c -----------*/
-WRITE8_HANDLER( spcforce_flip_screen_w );
SCREEN_UPDATE_IND16( spcforce );
diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h
index bd34c1e2251..d959ed5f64a 100644
--- a/src/mame/includes/spdodgeb.h
+++ b/src/mame/includes/spdodgeb.h
@@ -38,6 +38,9 @@ public:
DECLARE_READ8_MEMBER(mcu63701_r);
DECLARE_WRITE8_MEMBER(mcu63701_w);
DECLARE_READ8_MEMBER(port_0_r);
+ DECLARE_WRITE8_MEMBER(spdodgeb_scrollx_lo_w);
+ DECLARE_WRITE8_MEMBER(spdodgeb_ctrl_w);
+ DECLARE_WRITE8_MEMBER(spdodgeb_videoram_w);
};
@@ -47,6 +50,3 @@ PALETTE_INIT( spdodgeb );
VIDEO_START( spdodgeb );
SCREEN_UPDATE_IND16( spdodgeb );
TIMER_DEVICE_CALLBACK( spdodgeb_interrupt );
-WRITE8_HANDLER( spdodgeb_scrollx_lo_w );
-WRITE8_HANDLER( spdodgeb_ctrl_w );
-WRITE8_HANDLER( spdodgeb_videoram_w );
diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h
index 1cedd7243ba..2e3f2b2e02a 100644
--- a/src/mame/includes/speedatk.h
+++ b/src/mame/includes/speedatk.h
@@ -18,14 +18,14 @@ public:
DECLARE_WRITE8_MEMBER(key_matrix_w);
DECLARE_READ8_MEMBER(key_matrix_status_r);
DECLARE_WRITE8_MEMBER(key_matrix_status_w);
+ DECLARE_WRITE8_MEMBER(speedatk_videoram_w);
+ DECLARE_WRITE8_MEMBER(speedatk_colorram_w);
+ DECLARE_WRITE8_MEMBER(speedatk_6845_w);
};
/*----------- defined in video/speedatk.c -----------*/
-WRITE8_HANDLER( speedatk_videoram_w );
-WRITE8_HANDLER( speedatk_colorram_w );
-WRITE8_HANDLER( speedatk_6845_w );
PALETTE_INIT( speedatk );
VIDEO_START( speedatk );
SCREEN_UPDATE_IND16( speedatk );
diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h
index 787c1a05174..76a9be90fa5 100644
--- a/src/mame/includes/speedbal.h
+++ b/src/mame/includes/speedbal.h
@@ -11,6 +11,8 @@ public:
UINT8 *m_spriteram;
size_t m_spriteram_size;
DECLARE_WRITE8_MEMBER(speedbal_coincounter_w);
+ DECLARE_WRITE8_MEMBER(speedbal_foreground_videoram_w);
+ DECLARE_WRITE8_MEMBER(speedbal_background_videoram_w);
};
@@ -18,5 +20,3 @@ public:
VIDEO_START( speedbal );
SCREEN_UPDATE_IND16( speedbal );
-WRITE8_HANDLER( speedbal_foreground_videoram_w );
-WRITE8_HANDLER( speedbal_background_videoram_w );
diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h
index b21826dc6f7..caf8244719a 100644
--- a/src/mame/includes/speedspn.h
+++ b/src/mame/includes/speedspn.h
@@ -12,6 +12,11 @@ public:
DECLARE_READ8_MEMBER(speedspn_irq_ack_r);
DECLARE_WRITE8_MEMBER(speedspn_banked_rom_change);
DECLARE_WRITE8_MEMBER(speedspn_sound_w);
+ DECLARE_WRITE8_MEMBER(speedspn_vidram_w);
+ DECLARE_WRITE8_MEMBER(speedspn_attram_w);
+ DECLARE_READ8_MEMBER(speedspn_vidram_r);
+ DECLARE_WRITE8_MEMBER(speedspn_banked_vidram_change);
+ DECLARE_WRITE8_MEMBER(speedspn_global_display_w);
};
@@ -20,9 +25,4 @@ public:
VIDEO_START( speedspn );
SCREEN_UPDATE_IND16( speedspn );
-WRITE8_HANDLER( speedspn_vidram_w );
-WRITE8_HANDLER( speedspn_attram_w );
-READ8_HANDLER( speedspn_vidram_r );
-WRITE8_HANDLER( speedspn_banked_vidram_change );
-WRITE8_HANDLER( speedspn_global_display_w );
diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h
index 15d243a7ced..b304b74dc85 100644
--- a/src/mame/includes/splash.h
+++ b/src/mame/includes/splash.h
@@ -44,12 +44,12 @@ public:
DECLARE_WRITE8_MEMBER(msm1_interrupt_w);
DECLARE_WRITE8_MEMBER(msm2_interrupt_w);
DECLARE_WRITE8_MEMBER(msm2_data_w);
+ DECLARE_WRITE16_MEMBER(splash_vram_w);
};
/*----------- defined in video/splash.c -----------*/
-WRITE16_HANDLER( splash_vram_w );
VIDEO_START( splash );
SCREEN_UPDATE_IND16( splash );
SCREEN_UPDATE_IND16( funystrp );
diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h
index 0b90bfcafc1..70150083717 100644
--- a/src/mame/includes/sprcros2.h
+++ b/src/mame/includes/sprcros2.h
@@ -20,15 +20,15 @@ public:
required_device<cpu_device> m_slave;
DECLARE_WRITE8_MEMBER(sprcros2_m_port7_w);
DECLARE_WRITE8_MEMBER(sprcros2_s_port3_w);
+ DECLARE_WRITE8_MEMBER(sprcros2_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(sprcros2_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(sprcros2_bgscrollx_w);
+ DECLARE_WRITE8_MEMBER(sprcros2_bgscrolly_w);
};
/*----------- defined in video/sprcros2.c -----------*/
-WRITE8_HANDLER( sprcros2_fgvideoram_w );
-WRITE8_HANDLER( sprcros2_bgvideoram_w );
-WRITE8_HANDLER( sprcros2_bgscrollx_w );
-WRITE8_HANDLER( sprcros2_bgscrolly_w );
PALETTE_INIT( sprcros2 );
VIDEO_START( sprcros2 );
diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h
index f5dcdfd631f..0a259cc9fd4 100644
--- a/src/mame/includes/sprint2.h
+++ b/src/mame/includes/sprint2.h
@@ -48,6 +48,11 @@ public:
DECLARE_WRITE8_MEMBER(sprint2_wram_w);
DECLARE_WRITE8_MEMBER(sprint2_lamp1_w);
DECLARE_WRITE8_MEMBER(sprint2_lamp2_w);
+ DECLARE_READ8_MEMBER(sprint2_collision1_r);
+ DECLARE_READ8_MEMBER(sprint2_collision2_r);
+ DECLARE_WRITE8_MEMBER(sprint2_collision_reset1_w);
+ DECLARE_WRITE8_MEMBER(sprint2_collision_reset2_w);
+ DECLARE_WRITE8_MEMBER(sprint2_video_ram_w);
};
@@ -60,12 +65,7 @@ DISCRETE_SOUND_EXTERN( dominos );
/*----------- defined in video/sprint2.c -----------*/
-READ8_HANDLER( sprint2_collision1_r );
-READ8_HANDLER( sprint2_collision2_r );
-WRITE8_HANDLER( sprint2_collision_reset1_w );
-WRITE8_HANDLER( sprint2_collision_reset2_w );
-WRITE8_HANDLER( sprint2_video_ram_w );
PALETTE_INIT( sprint2 );
SCREEN_UPDATE_IND16( sprint2 );
diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h
index 1622dd4bb48..d36d7fe55f3 100644
--- a/src/mame/includes/sprint4.h
+++ b/src/mame/includes/sprint4.h
@@ -23,6 +23,7 @@ public:
DECLARE_WRITE8_MEMBER(sprint4_da_latch_w);
DECLARE_WRITE8_MEMBER(sprint4_lamp_w);
DECLARE_WRITE8_MEMBER(sprint4_lockout_w);
+ DECLARE_WRITE8_MEMBER(sprint4_video_ram_w);
};
@@ -34,4 +35,3 @@ SCREEN_VBLANK( sprint4 );
VIDEO_START( sprint4 );
SCREEN_UPDATE_IND16( sprint4 );
-WRITE8_HANDLER( sprint4_video_ram_w );
diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h
index 4f388ed8136..4668d1a3d04 100644
--- a/src/mame/includes/sprint8.h
+++ b/src/mame/includes/sprint8.h
@@ -24,6 +24,7 @@ public:
DECLARE_READ8_MEMBER(sprint8_input_r);
DECLARE_WRITE8_MEMBER(sprint8_lockout_w);
DECLARE_WRITE8_MEMBER(sprint8_int_reset_w);
+ DECLARE_WRITE8_MEMBER(sprint8_video_ram_w);
};
@@ -39,7 +40,6 @@ SCREEN_VBLANK( sprint8 );
VIDEO_START( sprint8 );
SCREEN_UPDATE_IND16( sprint8 );
-WRITE8_HANDLER( sprint8_video_ram_w );
/*----------- defined in audio/sprint8.c -----------*/
diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h
index b3a1c06702d..87941b6ca6e 100644
--- a/src/mame/includes/srumbler.h
+++ b/src/mame/includes/srumbler.h
@@ -18,15 +18,15 @@ public:
required_device<cpu_device> m_maincpu;
required_device<buffered_spriteram8_device> m_spriteram;
DECLARE_WRITE8_MEMBER(srumbler_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(srumbler_foreground_w);
+ DECLARE_WRITE8_MEMBER(srumbler_background_w);
+ DECLARE_WRITE8_MEMBER(srumbler_4009_w);
+ DECLARE_WRITE8_MEMBER(srumbler_scroll_w);
};
/*----------- defined in video/srumbler.c -----------*/
-WRITE8_HANDLER( srumbler_background_w );
-WRITE8_HANDLER( srumbler_foreground_w );
-WRITE8_HANDLER( srumbler_scroll_w );
-WRITE8_HANDLER( srumbler_4009_w );
VIDEO_START( srumbler );
SCREEN_UPDATE_IND16( srumbler );
diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h
index bf9111f15de..5177ffd73da 100644
--- a/src/mame/includes/sshangha.h
+++ b/src/mame/includes/sshangha.h
@@ -35,6 +35,7 @@ public:
DECLARE_WRITE16_MEMBER(paletteram16_xbgr_word_be_sprites_w);
DECLARE_WRITE16_MEMBER(paletteram16_xbgr_word_be_tilelow_w);
DECLARE_WRITE16_MEMBER(paletteram16_xbgr_word_be_tilehigh_w);
+ DECLARE_WRITE16_MEMBER(sshangha_video_w);
};
@@ -43,4 +44,3 @@ public:
VIDEO_START( sshangha );
SCREEN_UPDATE_RGB32( sshangha );
-WRITE16_HANDLER( sshangha_video_w );
diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h
index 809e11ef6cb..99223dab479 100644
--- a/src/mame/includes/sslam.h
+++ b/src/mame/includes/sslam.h
@@ -31,16 +31,16 @@ public:
DECLARE_READ8_MEMBER(playmark_snd_command_r);
DECLARE_WRITE8_MEMBER(playmark_oki_w);
DECLARE_WRITE8_MEMBER(playmark_snd_control_w);
+ DECLARE_WRITE16_MEMBER(sslam_paletteram_w);
+ DECLARE_WRITE16_MEMBER(sslam_tx_tileram_w);
+ DECLARE_WRITE16_MEMBER(sslam_md_tileram_w);
+ DECLARE_WRITE16_MEMBER(sslam_bg_tileram_w);
+ DECLARE_WRITE16_MEMBER(powerbls_bg_tileram_w);
};
/*----------- defined in video/sslam.c -----------*/
-WRITE16_HANDLER( sslam_paletteram_w );
-WRITE16_HANDLER( sslam_tx_tileram_w );
-WRITE16_HANDLER( sslam_md_tileram_w );
-WRITE16_HANDLER( sslam_bg_tileram_w );
-WRITE16_HANDLER( powerbls_bg_tileram_w );
VIDEO_START(sslam);
VIDEO_START(powerbls);
SCREEN_UPDATE_IND16(sslam);
diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h
index b4db1d46a2b..45676709743 100644
--- a/src/mame/includes/ssozumo.h
+++ b/src/mame/includes/ssozumo.h
@@ -18,18 +18,18 @@ public:
UINT8 m_sound_nmi_mask;
DECLARE_WRITE8_MEMBER(ssozumo_sh_command_w);
DECLARE_WRITE8_MEMBER(sound_nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(ssozumo_videoram_w);
+ DECLARE_WRITE8_MEMBER(ssozumo_colorram_w);
+ DECLARE_WRITE8_MEMBER(ssozumo_videoram2_w);
+ DECLARE_WRITE8_MEMBER(ssozumo_colorram2_w);
+ DECLARE_WRITE8_MEMBER(ssozumo_paletteram_w);
+ DECLARE_WRITE8_MEMBER(ssozumo_scroll_w);
+ DECLARE_WRITE8_MEMBER(ssozumo_flipscreen_w);
};
/*----------- defined in video/ssozumo.c -----------*/
-WRITE8_HANDLER( ssozumo_videoram_w );
-WRITE8_HANDLER( ssozumo_colorram_w );
-WRITE8_HANDLER( ssozumo_videoram2_w );
-WRITE8_HANDLER( ssozumo_colorram2_w );
-WRITE8_HANDLER( ssozumo_paletteram_w );
-WRITE8_HANDLER( ssozumo_scroll_w );
-WRITE8_HANDLER( ssozumo_flipscreen_w );
PALETTE_INIT( ssozumo );
VIDEO_START( ssozumo );
diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h
index 9f6fdb046a4..fddcef2fdf2 100644
--- a/src/mame/includes/sspeedr.h
+++ b/src/mame/includes/sspeedr.h
@@ -21,25 +21,25 @@ public:
DECLARE_WRITE8_MEMBER(sspeedr_time_w);
DECLARE_WRITE8_MEMBER(sspeedr_score_w);
DECLARE_WRITE8_MEMBER(sspeedr_sound_w);
+ DECLARE_WRITE8_MEMBER(sspeedr_driver_horz_w);
+ DECLARE_WRITE8_MEMBER(sspeedr_driver_horz_2_w);
+ DECLARE_WRITE8_MEMBER(sspeedr_driver_vert_w);
+ DECLARE_WRITE8_MEMBER(sspeedr_driver_pic_w);
+ DECLARE_WRITE8_MEMBER(sspeedr_drones_horz_w);
+ DECLARE_WRITE8_MEMBER(sspeedr_drones_horz_2_w);
+ DECLARE_WRITE8_MEMBER(sspeedr_drones_mask_w);
+ DECLARE_WRITE8_MEMBER(sspeedr_drones_vert_w);
+ DECLARE_WRITE8_MEMBER(sspeedr_track_horz_w);
+ DECLARE_WRITE8_MEMBER(sspeedr_track_horz_2_w);
+ DECLARE_WRITE8_MEMBER(sspeedr_track_vert_w);
+ DECLARE_WRITE8_MEMBER(sspeedr_track_ice_w);
};
/*----------- defined in video/sspeedr.c -----------*/
-WRITE8_HANDLER( sspeedr_driver_horz_w );
-WRITE8_HANDLER( sspeedr_driver_horz_2_w );
-WRITE8_HANDLER( sspeedr_driver_vert_w );
-WRITE8_HANDLER( sspeedr_driver_pic_w );
-WRITE8_HANDLER( sspeedr_drones_horz_w );
-WRITE8_HANDLER( sspeedr_drones_horz_2_w );
-WRITE8_HANDLER( sspeedr_drones_vert_w );
-WRITE8_HANDLER( sspeedr_drones_mask_w );
-WRITE8_HANDLER( sspeedr_track_horz_w );
-WRITE8_HANDLER( sspeedr_track_horz_2_w );
-WRITE8_HANDLER( sspeedr_track_vert_w );
-WRITE8_HANDLER( sspeedr_track_ice_w );
VIDEO_START( sspeedr );
SCREEN_UPDATE_IND16( sspeedr );
diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h
index cb3f6154c00..55df5ab87fd 100644
--- a/src/mame/includes/ssrj.h
+++ b/src/mame/includes/ssrj.h
@@ -15,14 +15,14 @@ public:
UINT8 *m_scrollram;
UINT8 *m_buffer_spriteram;
DECLARE_READ8_MEMBER(ssrj_wheel_r);
+ DECLARE_WRITE8_MEMBER(ssrj_vram1_w);
+ DECLARE_WRITE8_MEMBER(ssrj_vram2_w);
+ DECLARE_WRITE8_MEMBER(ssrj_vram4_w);
};
/*----------- defined in video/ssrj.c -----------*/
-WRITE8_HANDLER(ssrj_vram1_w);
-WRITE8_HANDLER(ssrj_vram2_w);
-WRITE8_HANDLER(ssrj_vram4_w);
VIDEO_START( ssrj );
SCREEN_UPDATE_IND16( ssrj );
diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h
index 300e13edf6b..7f5c67f8831 100644
--- a/src/mame/includes/ssv.h
+++ b/src/mame/includes/ssv.h
@@ -84,14 +84,14 @@ public:
DECLARE_WRITE16_MEMBER(eaglshot_trackball_w);
DECLARE_READ16_MEMBER(eaglshot_gfxram_r);
DECLARE_WRITE16_MEMBER(eaglshot_gfxram_w);
+ DECLARE_WRITE16_MEMBER(gdfs_tmapram_w);
+ DECLARE_READ16_MEMBER(ssv_vblank_r);
+ DECLARE_WRITE16_MEMBER(ssv_scroll_w);
+ DECLARE_WRITE16_MEMBER(paletteram16_xrgb_swap_word_w);
};
/*----------- defined in video/ssv.c -----------*/
-READ16_HANDLER( ssv_vblank_r );
-WRITE16_HANDLER( ssv_scroll_w );
-WRITE16_HANDLER( paletteram16_xrgb_swap_word_w );
-WRITE16_HANDLER( gdfs_tmapram_w );
void ssv_enable_video(running_machine &machine, int enable);
VIDEO_START( ssv );
diff --git a/src/mame/includes/st0016.h b/src/mame/includes/st0016.h
index c1a6fde067f..988c1050b2b 100644
--- a/src/mame/includes/st0016.h
+++ b/src/mame/includes/st0016.h
@@ -15,6 +15,20 @@ public:
DECLARE_WRITE32_MEMBER(latch32_w);
DECLARE_READ8_MEMBER(latch8_r);
DECLARE_WRITE8_MEMBER(latch8_w);
+ DECLARE_WRITE8_MEMBER(st0016_sprite_bank_w);
+ DECLARE_WRITE8_MEMBER(st0016_palette_bank_w);
+ DECLARE_WRITE8_MEMBER(st0016_character_bank_w);
+ DECLARE_READ8_MEMBER(st0016_sprite_ram_r);
+ DECLARE_WRITE8_MEMBER(st0016_sprite_ram_w);
+ DECLARE_READ8_MEMBER(st0016_sprite2_ram_r);
+ DECLARE_WRITE8_MEMBER(st0016_sprite2_ram_w);
+ DECLARE_READ8_MEMBER(st0016_palette_ram_r);
+ DECLARE_WRITE8_MEMBER(st0016_palette_ram_w);
+ DECLARE_READ8_MEMBER(st0016_character_ram_r);
+ DECLARE_WRITE8_MEMBER(st0016_character_ram_w);
+ DECLARE_READ8_MEMBER(st0016_vregs_r);
+ DECLARE_READ8_MEMBER(st0016_dma_r);
+ DECLARE_WRITE8_MEMBER(st0016_vregs_w);
};
#define ISMACS (st0016_game&0x80)
@@ -48,20 +62,6 @@ extern UINT8 macs_cart_slot;
extern UINT32 st0016_game;
extern UINT8 *st0016_charram;
-READ8_HANDLER(st0016_dma_r);
-WRITE8_HANDLER (st0016_sprite_bank_w);
-WRITE8_HANDLER (st0016_palette_bank_w);
-WRITE8_HANDLER (st0016_character_bank_w);
-READ8_HANDLER (st0016_sprite_ram_r);
-WRITE8_HANDLER (st0016_sprite_ram_w);
-READ8_HANDLER (st0016_sprite2_ram_r);
-WRITE8_HANDLER (st0016_sprite2_ram_w);
-READ8_HANDLER (st0016_palette_ram_r);
-WRITE8_HANDLER (st0016_palette_ram_w);
-READ8_HANDLER (st0016_character_ram_r);
-WRITE8_HANDLER (st0016_character_ram_w);
-READ8_HANDLER (st0016_vregs_r);
-WRITE8_HANDLER (st0016_vregs_w);
void st0016_draw_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
VIDEO_START(st0016);
diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h
index 6ce55da9dc4..778b4c65dcd 100644
--- a/src/mame/includes/stactics.h
+++ b/src/mame/includes/stactics.h
@@ -39,6 +39,10 @@ public:
DECLARE_READ8_MEMBER(vert_pos_r);
DECLARE_READ8_MEMBER(horiz_pos_r);
DECLARE_WRITE8_MEMBER(stactics_coin_lockout_w);
+ DECLARE_WRITE8_MEMBER(stactics_scroll_ram_w);
+ DECLARE_WRITE8_MEMBER(stactics_speed_latch_w);
+ DECLARE_WRITE8_MEMBER(stactics_shot_trigger_w);
+ DECLARE_WRITE8_MEMBER(stactics_shot_flag_clear_w);
};
@@ -46,10 +50,6 @@ public:
MACHINE_CONFIG_EXTERN( stactics_video );
-WRITE8_HANDLER( stactics_scroll_ram_w );
-WRITE8_HANDLER( stactics_speed_latch_w );
-WRITE8_HANDLER( stactics_shot_trigger_w );
-WRITE8_HANDLER( stactics_shot_flag_clear_w );
CUSTOM_INPUT( stactics_get_frame_count_d3 );
CUSTOM_INPUT( stactics_get_shot_standby );
CUSTOM_INPUT( stactics_get_not_shot_arrive );
diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h
index e822da07f46..9bee223fe53 100644
--- a/src/mame/includes/stadhero.h
+++ b/src/mame/includes/stadhero.h
@@ -10,6 +10,7 @@ public:
UINT16 *m_spriteram;
DECLARE_READ16_MEMBER(stadhero_control_r);
DECLARE_WRITE16_MEMBER(stadhero_control_w);
+ DECLARE_WRITE16_MEMBER(stadhero_pf1_data_w);
};
@@ -18,4 +19,3 @@ public:
VIDEO_START( stadhero );
SCREEN_UPDATE_IND16( stadhero );
-WRITE16_HANDLER( stadhero_pf1_data_w );
diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h
index 09bf0506de2..e542c2a909f 100644
--- a/src/mame/includes/starcrus.h
+++ b/src/mame/includes/starcrus.h
@@ -36,23 +36,23 @@ public:
int m_explode_sound_playing;
int m_launch1_sound_playing;
int m_launch2_sound_playing;
+ DECLARE_WRITE8_MEMBER(starcrus_s1_x_w);
+ DECLARE_WRITE8_MEMBER(starcrus_s1_y_w);
+ DECLARE_WRITE8_MEMBER(starcrus_s2_x_w);
+ DECLARE_WRITE8_MEMBER(starcrus_s2_y_w);
+ DECLARE_WRITE8_MEMBER(starcrus_p1_x_w);
+ DECLARE_WRITE8_MEMBER(starcrus_p1_y_w);
+ DECLARE_WRITE8_MEMBER(starcrus_p2_x_w);
+ DECLARE_WRITE8_MEMBER(starcrus_p2_y_w);
+ DECLARE_WRITE8_MEMBER(starcrus_ship_parm_1_w);
+ DECLARE_WRITE8_MEMBER(starcrus_ship_parm_2_w);
+ DECLARE_WRITE8_MEMBER(starcrus_proj_parm_1_w);
+ DECLARE_WRITE8_MEMBER(starcrus_proj_parm_2_w);
+ DECLARE_READ8_MEMBER(starcrus_coll_det_r);
};
/*----------- defined in video/starcrus.c -----------*/
-WRITE8_HANDLER( starcrus_s1_x_w );
-WRITE8_HANDLER( starcrus_s1_y_w );
-WRITE8_HANDLER( starcrus_s2_x_w );
-WRITE8_HANDLER( starcrus_s2_y_w );
-WRITE8_HANDLER( starcrus_p1_x_w );
-WRITE8_HANDLER( starcrus_p1_y_w );
-WRITE8_HANDLER( starcrus_p2_x_w );
-WRITE8_HANDLER( starcrus_p2_y_w );
-WRITE8_HANDLER( starcrus_ship_parm_1_w );
-WRITE8_HANDLER( starcrus_ship_parm_2_w );
-WRITE8_HANDLER( starcrus_proj_parm_1_w );
-WRITE8_HANDLER( starcrus_proj_parm_2_w );
-READ8_HANDLER( starcrus_coll_det_r );
VIDEO_START( starcrus );
SCREEN_UPDATE_IND16( starcrus );
diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h
index 7a2d5774315..d50b8a4e7cd 100644
--- a/src/mame/includes/starfire.h
+++ b/src/mame/includes/starfire.h
@@ -34,6 +34,10 @@ public:
DECLARE_READ8_MEMBER(starfire_scratch_r);
DECLARE_READ8_MEMBER(starfire_input_r);
DECLARE_READ8_MEMBER(fireone_input_r);
+ DECLARE_WRITE8_MEMBER(starfire_colorram_w);
+ DECLARE_READ8_MEMBER(starfire_colorram_r);
+ DECLARE_WRITE8_MEMBER(starfire_videoram_w);
+ DECLARE_READ8_MEMBER(starfire_videoram_r);
};
/*----------- defined in video/starfire.c -----------*/
@@ -41,8 +45,4 @@ public:
SCREEN_UPDATE_RGB32( starfire );
VIDEO_START( starfire );
-WRITE8_HANDLER( starfire_videoram_w );
-READ8_HANDLER( starfire_videoram_r );
-WRITE8_HANDLER( starfire_colorram_w );
-READ8_HANDLER( starfire_colorram_r );
diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h
index c291179d8c5..c35a318953c 100644
--- a/src/mame/includes/starshp1.h
+++ b/src/mame/includes/starshp1.h
@@ -63,16 +63,16 @@ public:
DECLARE_WRITE8_MEMBER(starshp1_collision_reset_w);
DECLARE_WRITE8_MEMBER(starshp1_analog_in_w);
DECLARE_WRITE8_MEMBER(starshp1_misc_w);
+ DECLARE_READ8_MEMBER(starshp1_rng_r);
+ DECLARE_WRITE8_MEMBER(starshp1_ssadd_w);
+ DECLARE_WRITE8_MEMBER(starshp1_sspic_w);
+ DECLARE_WRITE8_MEMBER(starshp1_playfield_w);
};
/*----------- defined in video/starshp1.c -----------*/
-READ8_HANDLER( starshp1_rng_r );
-WRITE8_HANDLER( starshp1_sspic_w );
-WRITE8_HANDLER( starshp1_ssadd_w );
-WRITE8_HANDLER( starshp1_playfield_w );
PALETTE_INIT( starshp1 );
SCREEN_UPDATE_IND16( starshp1 );
diff --git a/src/mame/includes/starwars.h b/src/mame/includes/starwars.h
index 78e1a8af7b9..f65d63d2fad 100644
--- a/src/mame/includes/starwars.h
+++ b/src/mame/includes/starwars.h
@@ -42,27 +42,27 @@ public:
DECLARE_WRITE8_MEMBER(irq_ack_w);
DECLARE_READ8_MEMBER(esb_slapstic_r);
DECLARE_WRITE8_MEMBER(esb_slapstic_w);
+ DECLARE_WRITE8_MEMBER(starwars_nstore_w);
+ DECLARE_WRITE8_MEMBER(starwars_out_w);
+ DECLARE_READ8_MEMBER(starwars_adc_r);
+ DECLARE_WRITE8_MEMBER(starwars_adc_select_w);
+ DECLARE_READ8_MEMBER(starwars_prng_r);
+ DECLARE_READ8_MEMBER(starwars_div_reh_r);
+ DECLARE_READ8_MEMBER(starwars_div_rel_r);
+ DECLARE_WRITE8_MEMBER(starwars_math_w);
};
/*----------- defined in machine/starwars.c -----------*/
-WRITE8_HANDLER( starwars_nstore_w );
-WRITE8_HANDLER( starwars_out_w );
CUSTOM_INPUT( matrix_flag_r );
-READ8_HANDLER( starwars_adc_r );
-WRITE8_HANDLER( starwars_adc_select_w );
void starwars_mproc_init(running_machine &machine);
void starwars_mproc_reset(running_machine &machine);
-READ8_HANDLER( starwars_prng_r );
-READ8_HANDLER( starwars_div_reh_r );
-READ8_HANDLER( starwars_div_rel_r );
-WRITE8_HANDLER( starwars_math_w );
/*----------- defined in audio/starwars.c -----------*/
diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h
index 6c5c5224b44..30247749901 100644
--- a/src/mame/includes/stfight.h
+++ b/src/mame/includes/stfight.h
@@ -20,6 +20,17 @@ public:
tilemap_t *m_bg_tilemap;
tilemap_t *m_tx_tilemap;
int m_sprite_base;
+ DECLARE_READ8_MEMBER(stfight_dsw_r);
+ DECLARE_READ8_MEMBER(stfight_coin_r);
+ DECLARE_WRITE8_MEMBER(stfight_coin_w);
+ DECLARE_WRITE8_MEMBER(stfight_e800_w);
+ DECLARE_WRITE8_MEMBER(stfight_fm_w);
+ DECLARE_READ8_MEMBER(stfight_fm_r);
+ DECLARE_WRITE8_MEMBER(stfight_bank_w);
+ DECLARE_WRITE8_MEMBER(stfight_text_char_w);
+ DECLARE_WRITE8_MEMBER(stfight_text_attr_w);
+ DECLARE_WRITE8_MEMBER(stfight_sprite_bank_w);
+ DECLARE_WRITE8_MEMBER(stfight_vh_latch_w);
};
@@ -29,12 +40,6 @@ DRIVER_INIT( empcity );
DRIVER_INIT( stfight );
MACHINE_RESET( stfight );
INTERRUPT_GEN( stfight_vb_interrupt );
-READ8_HANDLER( stfight_dsw_r );
-WRITE8_HANDLER( stfight_fm_w );
-READ8_HANDLER( stfight_coin_r );
-WRITE8_HANDLER( stfight_coin_w );
-WRITE8_HANDLER( stfight_e800_w );
-READ8_HANDLER( stfight_fm_r );
void stfight_adpcm_int(device_t *device);
WRITE8_DEVICE_HANDLER( stfight_adpcm_control_w );
@@ -42,9 +47,5 @@ WRITE8_DEVICE_HANDLER( stfight_adpcm_control_w );
/*----------- defined in video/stfight.c -----------*/
PALETTE_INIT( stfight );
-WRITE8_HANDLER( stfight_text_char_w );
-WRITE8_HANDLER( stfight_text_attr_w );
-WRITE8_HANDLER( stfight_vh_latch_w );
-WRITE8_HANDLER( stfight_sprite_bank_w );
VIDEO_START( stfight );
SCREEN_UPDATE_IND16( stfight );
diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h
index 7216da61183..552d0fbb3e0 100644
--- a/src/mame/includes/stlforce.h
+++ b/src/mame/includes/stlforce.h
@@ -21,6 +21,10 @@ public:
UINT16 *m_spriteram;
int m_sprxoffs;
+ DECLARE_WRITE16_MEMBER(stlforce_bg_videoram_w);
+ DECLARE_WRITE16_MEMBER(stlforce_mlow_videoram_w);
+ DECLARE_WRITE16_MEMBER(stlforce_mhigh_videoram_w);
+ DECLARE_WRITE16_MEMBER(stlforce_tx_videoram_w);
};
@@ -28,7 +32,3 @@ public:
VIDEO_START( stlforce );
SCREEN_UPDATE_IND16( stlforce );
-WRITE16_HANDLER( stlforce_tx_videoram_w );
-WRITE16_HANDLER( stlforce_mhigh_videoram_w );
-WRITE16_HANDLER( stlforce_mlow_videoram_w );
-WRITE16_HANDLER( stlforce_bg_videoram_w );
diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h
index d2f1c9c20e2..1e707630587 100644
--- a/src/mame/includes/strnskil.h
+++ b/src/mame/includes/strnskil.h
@@ -21,13 +21,13 @@ public:
DECLARE_READ8_MEMBER(pettanp_protection_r);
DECLARE_READ8_MEMBER(banbam_protection_r);
DECLARE_WRITE8_MEMBER(protection_w);
+ DECLARE_WRITE8_MEMBER(strnskil_videoram_w);
+ DECLARE_WRITE8_MEMBER(strnskil_scrl_ctrl_w);
};
/*----------- defined in video/strnskil.c -----------*/
-WRITE8_HANDLER( strnskil_videoram_w );
-WRITE8_HANDLER( strnskil_scrl_ctrl_w );
PALETTE_INIT( strnskil );
VIDEO_START( strnskil );
diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h
index f155ce6b762..d77ffc4b547 100644
--- a/src/mame/includes/subs.h
+++ b/src/mame/includes/subs.h
@@ -30,6 +30,14 @@ public:
int m_steering_val2;
int m_last_val_1;
int m_last_val_2;
+ DECLARE_WRITE8_MEMBER(subs_steer_reset_w);
+ DECLARE_READ8_MEMBER(subs_control_r);
+ DECLARE_READ8_MEMBER(subs_coin_r);
+ DECLARE_READ8_MEMBER(subs_options_r);
+ DECLARE_WRITE8_MEMBER(subs_lamp1_w);
+ DECLARE_WRITE8_MEMBER(subs_lamp2_w);
+ DECLARE_WRITE8_MEMBER(subs_invert1_w);
+ DECLARE_WRITE8_MEMBER(subs_invert2_w);
};
@@ -37,12 +45,6 @@ public:
MACHINE_RESET( subs );
INTERRUPT_GEN( subs_interrupt );
-WRITE8_HANDLER( subs_steer_reset_w );
-READ8_HANDLER( subs_control_r );
-READ8_HANDLER( subs_coin_r );
-READ8_HANDLER( subs_options_r );
-WRITE8_HANDLER( subs_lamp1_w );
-WRITE8_HANDLER( subs_lamp2_w );
/*----------- defined in audio/subs.c -----------*/
@@ -61,5 +63,3 @@ DISCRETE_SOUND_EXTERN( subs );
SCREEN_UPDATE_IND16( subs_left );
SCREEN_UPDATE_IND16( subs_right );
-WRITE8_HANDLER( subs_invert1_w );
-WRITE8_HANDLER( subs_invert2_w );
diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h
index 6deaeed9c2a..79d9323b8e5 100644
--- a/src/mame/includes/suna16.h
+++ b/src/mame/includes/suna16.h
@@ -22,16 +22,16 @@ public:
DECLARE_WRITE8_MEMBER(bssoccer_pcm_1_bankswitch_w);
DECLARE_WRITE8_MEMBER(bssoccer_pcm_2_bankswitch_w);
DECLARE_WRITE8_MEMBER(uballoon_pcm_1_bankswitch_w);
+ DECLARE_WRITE16_MEMBER(suna16_flipscreen_w);
+ DECLARE_WRITE16_MEMBER(bestbest_flipscreen_w);
+ DECLARE_READ16_MEMBER(suna16_paletteram16_r);
+ DECLARE_WRITE16_MEMBER(suna16_paletteram16_w);
};
/*----------- defined in video/suna16.c -----------*/
-WRITE16_HANDLER( suna16_flipscreen_w );
-WRITE16_HANDLER( bestbest_flipscreen_w );
-READ16_HANDLER ( suna16_paletteram16_r );
-WRITE16_HANDLER( suna16_paletteram16_w );
VIDEO_START( suna16 );
SCREEN_UPDATE_IND16( suna16 );
diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h
index a53f42d8755..cf101f9a312 100644
--- a/src/mame/includes/suna8.h
+++ b/src/mame/includes/suna8.h
@@ -74,6 +74,9 @@ public:
DECLARE_READ8_MEMBER(banked_paletteram_r);
DECLARE_WRITE8_MEMBER( brickzn_banked_paletteram_w );
+ DECLARE_READ8_MEMBER(suna8_banked_spriteram_r);
+ DECLARE_WRITE8_MEMBER(suna8_spriteram_w);
+ DECLARE_WRITE8_MEMBER(suna8_banked_spriteram_w);
};
@@ -87,10 +90,7 @@ SAMPLES_START( suna8_sh_start );
/*----------- defined in video/suna8.c -----------*/
-WRITE8_HANDLER( suna8_spriteram_w ); // for debug
-WRITE8_HANDLER( suna8_banked_spriteram_w ); // for debug
-READ8_HANDLER( suna8_banked_spriteram_r );
VIDEO_START( suna8_textdim0 );
VIDEO_START( suna8_textdim8 );
diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h
index 571e43d5f8a..8fe578093b3 100644
--- a/src/mame/includes/superqix.h
+++ b/src/mame/includes/superqix.h
@@ -53,16 +53,16 @@ public:
DECLARE_READ8_MEMBER(hotsmash_from_mcu_r);
DECLARE_WRITE8_MEMBER(pbillian_z80_mcu_w);
DECLARE_READ8_MEMBER(pbillian_from_mcu_r);
+ DECLARE_WRITE8_MEMBER(superqix_videoram_w);
+ DECLARE_WRITE8_MEMBER(superqix_bitmapram_w);
+ DECLARE_WRITE8_MEMBER(superqix_bitmapram2_w);
+ DECLARE_WRITE8_MEMBER(pbillian_0410_w);
+ DECLARE_WRITE8_MEMBER(superqix_0410_w);
};
/*----------- defined in video/superqix.c -----------*/
-WRITE8_HANDLER( superqix_videoram_w );
-WRITE8_HANDLER( superqix_bitmapram_w );
-WRITE8_HANDLER( superqix_bitmapram2_w );
-WRITE8_HANDLER( pbillian_0410_w );
-WRITE8_HANDLER( superqix_0410_w );
VIDEO_START( pbillian );
SCREEN_UPDATE_IND16( pbillian );
diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h
index c8a0ec49f12..d2681eb6605 100644
--- a/src/mame/includes/suprloco.h
+++ b/src/mame/includes/suprloco.h
@@ -11,6 +11,10 @@ public:
UINT8 *m_spriteram;
size_t m_spriteram_size;
DECLARE_WRITE8_MEMBER(suprloco_soundport_w);
+ DECLARE_WRITE8_MEMBER(suprloco_videoram_w);
+ DECLARE_WRITE8_MEMBER(suprloco_scrollram_w);
+ DECLARE_WRITE8_MEMBER(suprloco_control_w);
+ DECLARE_READ8_MEMBER(suprloco_control_r);
};
@@ -19,7 +23,3 @@ public:
PALETTE_INIT( suprloco );
VIDEO_START( suprloco );
SCREEN_UPDATE_IND16( suprloco );
-WRITE8_HANDLER( suprloco_videoram_w );
-WRITE8_HANDLER( suprloco_scrollram_w );
-WRITE8_HANDLER( suprloco_control_w );
-READ8_HANDLER( suprloco_control_r );
diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h
index 904681cf639..428e05bfd58 100644
--- a/src/mame/includes/suprnova.h
+++ b/src/mame/includes/suprnova.h
@@ -89,6 +89,11 @@ public:
DECLARE_READ32_MEMBER(panicstr_speedup_r);
DECLARE_READ32_MEMBER(sengekis_speedup_r);
DECLARE_READ32_MEMBER(sengekij_speedup_r);
+ DECLARE_WRITE32_MEMBER(skns_pal_regs_w);
+ DECLARE_WRITE32_MEMBER(skns_palette_ram_w);
+ DECLARE_WRITE32_MEMBER(skns_tilemapA_w);
+ DECLARE_WRITE32_MEMBER(skns_tilemapB_w);
+ DECLARE_WRITE32_MEMBER(skns_v3_regs_w);
};
@@ -101,11 +106,6 @@ void skns_draw_sprites(
UINT8* gfx_source, size_t gfx_length,
UINT32* sprite_regs );
-WRITE32_HANDLER ( skns_tilemapA_w );
-WRITE32_HANDLER ( skns_tilemapB_w );
-WRITE32_HANDLER ( skns_v3_regs_w );
-WRITE32_HANDLER ( skns_pal_regs_w );
-WRITE32_HANDLER ( skns_palette_ram_w );
VIDEO_START(skns);
VIDEO_RESET(skns);
SCREEN_VBLANK(skns);
diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h
index 124173f40bf..9abdda06d4c 100644
--- a/src/mame/includes/suprridr.h
+++ b/src/mame/includes/suprridr.h
@@ -24,6 +24,13 @@ public:
DECLARE_WRITE8_MEMBER(sound_data_w);
DECLARE_WRITE8_MEMBER(sound_irq_ack_w);
DECLARE_WRITE8_MEMBER(coin_lock_w);
+ DECLARE_WRITE8_MEMBER(suprridr_flipx_w);
+ DECLARE_WRITE8_MEMBER(suprridr_flipy_w);
+ DECLARE_WRITE8_MEMBER(suprridr_fgdisable_w);
+ DECLARE_WRITE8_MEMBER(suprridr_fgscrolly_w);
+ DECLARE_WRITE8_MEMBER(suprridr_bgscrolly_w);
+ DECLARE_WRITE8_MEMBER(suprridr_bgram_w);
+ DECLARE_WRITE8_MEMBER(suprridr_fgram_w);
};
@@ -32,14 +39,7 @@ public:
VIDEO_START( suprridr );
PALETTE_INIT( suprridr );
-WRITE8_HANDLER( suprridr_flipx_w );
-WRITE8_HANDLER( suprridr_flipy_w );
-WRITE8_HANDLER( suprridr_fgdisable_w );
-WRITE8_HANDLER( suprridr_fgscrolly_w );
-WRITE8_HANDLER( suprridr_bgscrolly_w );
int suprridr_is_screen_flipped(running_machine &machine);
-WRITE8_HANDLER( suprridr_fgram_w );
-WRITE8_HANDLER( suprridr_bgram_w );
SCREEN_UPDATE_IND16( suprridr );
diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h
index b6ea769ea72..ef39d43767d 100644
--- a/src/mame/includes/suprslam.h
+++ b/src/mame/includes/suprslam.h
@@ -35,14 +35,14 @@ public:
DECLARE_READ16_MEMBER(pending_command_r);
DECLARE_WRITE8_MEMBER(pending_command_clear_w);
DECLARE_WRITE8_MEMBER(suprslam_sh_bankswitch_w);
+ DECLARE_WRITE16_MEMBER(suprslam_screen_videoram_w);
+ DECLARE_WRITE16_MEMBER(suprslam_bg_videoram_w);
+ DECLARE_WRITE16_MEMBER(suprslam_bank_w);
};
/*----------- defined in video/suprslam.c -----------*/
-WRITE16_HANDLER( suprslam_screen_videoram_w );
-WRITE16_HANDLER( suprslam_bg_videoram_w );
-WRITE16_HANDLER( suprslam_bank_w );
VIDEO_START( suprslam );
SCREEN_UPDATE_IND16( suprslam );
diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h
index d7aabe1edff..804537726fb 100644
--- a/src/mame/includes/system1.h
+++ b/src/mame/includes/system1.h
@@ -40,6 +40,16 @@ public:
DECLARE_READ8_MEMBER(nobb_inport23_r);
DECLARE_WRITE8_MEMBER(nobb_outport24_w);
DECLARE_READ8_MEMBER(nob_start_r);
+ DECLARE_WRITE8_MEMBER(system1_videomode_w);
+ DECLARE_READ8_MEMBER(system1_mixer_collision_r);
+ DECLARE_WRITE8_MEMBER(system1_mixer_collision_w);
+ DECLARE_WRITE8_MEMBER(system1_mixer_collision_reset_w);
+ DECLARE_READ8_MEMBER(system1_sprite_collision_r);
+ DECLARE_WRITE8_MEMBER(system1_sprite_collision_w);
+ DECLARE_WRITE8_MEMBER(system1_sprite_collision_reset_w);
+ DECLARE_READ8_MEMBER(system1_videoram_r);
+ DECLARE_WRITE8_MEMBER(system1_videoram_w);
+ DECLARE_WRITE8_MEMBER(system1_paletteram_w);
};
@@ -48,20 +58,10 @@ public:
VIDEO_START( system1 );
VIDEO_START( system2 );
-WRITE8_HANDLER( system1_videomode_w );
-WRITE8_HANDLER( system1_paletteram_w );
-READ8_HANDLER( system1_videoram_r );
-WRITE8_HANDLER( system1_videoram_w );
WRITE8_DEVICE_HANDLER( system1_videoram_bank_w );
-READ8_HANDLER( system1_mixer_collision_r );
-WRITE8_HANDLER( system1_mixer_collision_w );
-WRITE8_HANDLER( system1_mixer_collision_reset_w );
-READ8_HANDLER( system1_sprite_collision_r );
-WRITE8_HANDLER( system1_sprite_collision_w );
-WRITE8_HANDLER( system1_sprite_collision_reset_w );
SCREEN_UPDATE_IND16( system1 );
SCREEN_UPDATE_IND16( system2 );
diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h
index ca8acce5292..56761d2aab6 100644
--- a/src/mame/includes/system16.h
+++ b/src/mame/includes/system16.h
@@ -136,6 +136,14 @@ public:
DECLARE_WRITE8_MEMBER(shdancbl_msm5205_data_w);
DECLARE_READ8_MEMBER(shdancbl_soundbank_r);
DECLARE_WRITE8_MEMBER(shdancbl_bankctrl_w);
+ DECLARE_WRITE16_MEMBER(sys16_paletteram_w);
+ DECLARE_WRITE16_MEMBER(sys16_tileram_w);
+ DECLARE_WRITE16_MEMBER(sys16_textram_w);
+ DECLARE_WRITE16_MEMBER(s16a_bootleg_bgscrolly_w);
+ DECLARE_WRITE16_MEMBER(s16a_bootleg_bgscrollx_w);
+ DECLARE_WRITE16_MEMBER(s16a_bootleg_fgscrolly_w);
+ DECLARE_WRITE16_MEMBER(s16a_bootleg_fgscrollx_w);
+ DECLARE_WRITE16_MEMBER(s16a_bootleg_tilemapselect_w);
};
/*----------- defined in video/system16.c -----------*/
@@ -146,15 +154,8 @@ extern VIDEO_START( s16a_bootleg_shinobi );
extern VIDEO_START( s16a_bootleg_passsht );
extern SCREEN_UPDATE_IND16( s16a_bootleg );
extern SCREEN_UPDATE_IND16( s16a_bootleg_passht4b );
-extern WRITE16_HANDLER( s16a_bootleg_tilemapselect_w );
-extern WRITE16_HANDLER( s16a_bootleg_bgscrolly_w );
-extern WRITE16_HANDLER( s16a_bootleg_bgscrollx_w );
-extern WRITE16_HANDLER( s16a_bootleg_fgscrolly_w );
-extern WRITE16_HANDLER( s16a_bootleg_fgscrollx_w );
/* video hardware */
-extern WRITE16_HANDLER( sys16_tileram_w );
-extern WRITE16_HANDLER( sys16_textram_w );
/* "normal" video hardware */
extern VIDEO_START( system16 );
diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h
index 7a205c8dcaf..29839e2c728 100644
--- a/src/mame/includes/tagteam.h
+++ b/src/mame/includes/tagteam.h
@@ -13,19 +13,19 @@ public:
DECLARE_WRITE8_MEMBER(sound_command_w);
DECLARE_WRITE8_MEMBER(irq_clear_w);
DECLARE_WRITE8_MEMBER(sound_nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(tagteam_videoram_w);
+ DECLARE_WRITE8_MEMBER(tagteam_colorram_w);
+ DECLARE_READ8_MEMBER(tagteam_mirrorvideoram_r);
+ DECLARE_READ8_MEMBER(tagteam_mirrorcolorram_r);
+ DECLARE_WRITE8_MEMBER(tagteam_mirrorvideoram_w);
+ DECLARE_WRITE8_MEMBER(tagteam_mirrorcolorram_w);
+ DECLARE_WRITE8_MEMBER(tagteam_control_w);
+ DECLARE_WRITE8_MEMBER(tagteam_flipscreen_w);
};
/*----------- defined in video/tagteam.c -----------*/
-WRITE8_HANDLER( tagteam_videoram_w );
-WRITE8_HANDLER( tagteam_colorram_w );
-READ8_HANDLER( tagteam_mirrorvideoram_r );
-WRITE8_HANDLER( tagteam_mirrorvideoram_w );
-READ8_HANDLER( tagteam_mirrorcolorram_r );
-WRITE8_HANDLER( tagteam_mirrorcolorram_w );
-WRITE8_HANDLER( tagteam_control_w );
-WRITE8_HANDLER( tagteam_flipscreen_w );
PALETTE_INIT( tagteam );
VIDEO_START( tagteam );
diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h
index 8a403985e0f..4c25cb23515 100644
--- a/src/mame/includes/tail2nos.h
+++ b/src/mame/includes/tail2nos.h
@@ -28,6 +28,10 @@ public:
device_t *m_audiocpu;
device_t *m_k051316;
DECLARE_WRITE16_MEMBER(sound_command_w);
+ DECLARE_WRITE16_MEMBER(tail2nos_bgvideoram_w);
+ DECLARE_READ16_MEMBER(tail2nos_zoomdata_r);
+ DECLARE_WRITE16_MEMBER(tail2nos_zoomdata_w);
+ DECLARE_WRITE16_MEMBER(tail2nos_gfxbank_w);
};
@@ -35,10 +39,6 @@ public:
extern void tail2nos_zoom_callback(running_machine &machine, int *code,int *color,int *flags);
-WRITE16_HANDLER( tail2nos_bgvideoram_w );
-READ16_HANDLER( tail2nos_zoomdata_r );
-WRITE16_HANDLER( tail2nos_zoomdata_w );
-WRITE16_HANDLER( tail2nos_gfxbank_w );
VIDEO_START( tail2nos );
SCREEN_UPDATE_IND16( tail2nos );
diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h
index 5ec58e55928..0b32e42a7ba 100644
--- a/src/mame/includes/taito_b.h
+++ b/src/mame/includes/taito_b.h
@@ -52,18 +52,18 @@ public:
DECLARE_READ16_MEMBER(pbobble_input_bypass_r);
DECLARE_WRITE16_MEMBER(spacedxo_tc0220ioc_w);
DECLARE_WRITE16_MEMBER(realpunc_output_w);
+ DECLARE_WRITE16_MEMBER(hitice_pixelram_w);
+ DECLARE_WRITE16_MEMBER(hitice_pixel_scroll_w);
+ DECLARE_WRITE16_MEMBER(realpunc_video_ctrl_w);
+ DECLARE_READ16_MEMBER(tc0180vcu_framebuffer_word_r);
+ DECLARE_WRITE16_MEMBER(tc0180vcu_framebuffer_word_w);
};
/*----------- defined in video/taito_b.c -----------*/
-READ16_HANDLER( tc0180vcu_framebuffer_word_r );
-WRITE16_HANDLER( tc0180vcu_framebuffer_word_w );
-WRITE16_HANDLER( hitice_pixelram_w );
-WRITE16_HANDLER( hitice_pixel_scroll_w );
-WRITE16_HANDLER( realpunc_video_ctrl_w );
VIDEO_START( taitob_color_order0 );
VIDEO_START( taitob_color_order1 );
diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h
index 72fb22775a0..7f467a7f0ff 100644
--- a/src/mame/includes/taito_f2.h
+++ b/src/mame/includes/taito_f2.h
@@ -94,6 +94,9 @@ public:
DECLARE_WRITE16_MEMBER(driveout_sound_command_w);
DECLARE_WRITE16_MEMBER(cchip2_word_w);
DECLARE_READ16_MEMBER(cchip2_word_r);
+ DECLARE_WRITE16_MEMBER(taitof2_sprite_extension_w);
+ DECLARE_WRITE16_MEMBER(taitof2_spritebank_w);
+ DECLARE_WRITE16_MEMBER(koshien_spritebank_w);
};
/*----------- defined in video/taito_f2.c -----------*/
@@ -137,6 +140,3 @@ SCREEN_UPDATE_IND16( taitof2_deadconx );
SCREEN_UPDATE_IND16( taitof2_metalb );
SCREEN_UPDATE_IND16( taitof2_yesnoj );
-WRITE16_HANDLER( taitof2_spritebank_w );
-WRITE16_HANDLER( koshien_spritebank_w );
-WRITE16_HANDLER( taitof2_sprite_extension_w );
diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h
index 93500688ee8..fe2099678ed 100644
--- a/src/mame/includes/taito_f3.h
+++ b/src/mame/includes/taito_f3.h
@@ -201,6 +201,21 @@ public:
DECLARE_WRITE16_MEMBER(f3_unk_w);
DECLARE_READ32_MEMBER(bubsympb_oki_r);
DECLARE_WRITE32_MEMBER(bubsympb_oki_w);
+ DECLARE_READ16_MEMBER(f3_pf_data_r);
+ DECLARE_WRITE16_MEMBER(f3_pf_data_w);
+ DECLARE_WRITE16_MEMBER(f3_control_0_w);
+ DECLARE_WRITE16_MEMBER(f3_control_1_w);
+ DECLARE_READ16_MEMBER(f3_spriteram_r);
+ DECLARE_WRITE16_MEMBER(f3_spriteram_w);
+ DECLARE_READ16_MEMBER(f3_videoram_r);
+ DECLARE_WRITE16_MEMBER(f3_videoram_w);
+ DECLARE_READ16_MEMBER(f3_vram_r);
+ DECLARE_WRITE16_MEMBER(f3_vram_w);
+ DECLARE_READ16_MEMBER(f3_pivot_r);
+ DECLARE_WRITE16_MEMBER(f3_pivot_w);
+ DECLARE_READ16_MEMBER(f3_lineram_r);
+ DECLARE_WRITE16_MEMBER(f3_lineram_w);
+ DECLARE_WRITE32_MEMBER(f3_palette_24bit_w);
};
@@ -210,19 +225,4 @@ VIDEO_START( f3 );
SCREEN_UPDATE_RGB32( f3 );
SCREEN_VBLANK( f3 );
-WRITE16_HANDLER( f3_control_0_w );
-WRITE16_HANDLER( f3_control_1_w );
-WRITE32_HANDLER( f3_palette_24bit_w );
-WRITE16_HANDLER( f3_pf_data_w );
-WRITE16_HANDLER( f3_vram_w );
-WRITE16_HANDLER( f3_pivot_w );
-WRITE16_HANDLER( f3_lineram_w );
-WRITE16_HANDLER( f3_videoram_w );
-WRITE16_HANDLER( f3_spriteram_w );
-READ16_HANDLER( f3_pf_data_r );
-READ16_HANDLER( f3_vram_r );
-READ16_HANDLER( f3_pivot_r );
-READ16_HANDLER( f3_lineram_r );
-READ16_HANDLER( f3_videoram_r );
-READ16_HANDLER( f3_spriteram_r );
diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h
index 7d53e212fd6..89e525b20e0 100644
--- a/src/mame/includes/taito_l.h
+++ b/src/mame/includes/taito_l.h
@@ -91,6 +91,11 @@ public:
DECLARE_READ8_MEMBER(horshoes_trackx_lo_r);
DECLARE_READ8_MEMBER(horshoes_trackx_hi_r);
DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(horshoes_bankg_w);
+ DECLARE_WRITE8_MEMBER(taitol_bankc_w);
+ DECLARE_READ8_MEMBER(taitol_bankc_r);
+ DECLARE_WRITE8_MEMBER(taitol_control_w);
+ DECLARE_READ8_MEMBER(taitol_control_r);
};
/*----------- defined in video/taito_l.c -----------*/
@@ -112,8 +117,3 @@ void taitol_bg19_m(running_machine &machine, int offset);
void taitol_char1a_m(running_machine &machine, int offset);
void taitol_obj1b_m(running_machine &machine, int offset);
-WRITE8_HANDLER( taitol_control_w );
-READ8_HANDLER( taitol_control_r );
-WRITE8_HANDLER( horshoes_bankg_w );
-WRITE8_HANDLER( taitol_bankc_w );
-READ8_HANDLER( taitol_bankc_r );
diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h
index c76259eead7..7023ccfd7d6 100644
--- a/src/mame/includes/taito_z.h
+++ b/src/mame/includes/taito_z.h
@@ -71,13 +71,13 @@ public:
DECLARE_READ16_MEMBER(taitoz_msb_sound_r);
DECLARE_WRITE8_MEMBER(taitoz_pancontrol);
DECLARE_WRITE16_MEMBER(spacegun_pancontrol);
+ DECLARE_READ16_MEMBER(sci_spriteframe_r);
+ DECLARE_WRITE16_MEMBER(sci_spriteframe_w);
+ DECLARE_WRITE16_MEMBER(contcirc_out_w);
};
/*----------- defined in video/taito_z.c -----------*/
-WRITE16_HANDLER( contcirc_out_w );
-READ16_HANDLER ( sci_spriteframe_r );
-WRITE16_HANDLER( sci_spriteframe_w );
VIDEO_START( taitoz );
diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h
index 7e68d5527b3..64f1dd5bdee 100644
--- a/src/mame/includes/taitoair.h
+++ b/src/mame/includes/taitoair.h
@@ -64,6 +64,15 @@ public:
DECLARE_READ16_MEMBER(stick_input_r);
DECLARE_READ16_MEMBER(stick2_input_r);
DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
+ DECLARE_WRITE16_MEMBER(dsp_flags_w);
+ DECLARE_WRITE16_MEMBER(dsp_x_eyecoord_w);
+ DECLARE_WRITE16_MEMBER(dsp_y_eyecoord_w);
+ DECLARE_WRITE16_MEMBER(dsp_z_eyecoord_w);
+ DECLARE_WRITE16_MEMBER(dsp_frustum_left_w);
+ DECLARE_WRITE16_MEMBER(dsp_frustum_bottom_w);
+ DECLARE_WRITE16_MEMBER(dsp_rasterize_w);
+ DECLARE_READ16_MEMBER(dsp_x_return_r);
+ DECLARE_READ16_MEMBER(dsp_y_return_r);
};
@@ -72,13 +81,4 @@ public:
SCREEN_UPDATE_IND16( taitoair );
VIDEO_START( taitoair );
-WRITE16_HANDLER( dsp_flags_w );
-WRITE16_HANDLER( dsp_x_eyecoord_w );
-WRITE16_HANDLER( dsp_y_eyecoord_w );
-WRITE16_HANDLER( dsp_z_eyecoord_w );
-WRITE16_HANDLER( dsp_rasterize_w );
-WRITE16_HANDLER( dsp_frustum_left_w );
-WRITE16_HANDLER( dsp_frustum_bottom_w );
-READ16_HANDLER( dsp_x_return_r );
-READ16_HANDLER( dsp_y_return_r );
diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h
index e3236c011a5..1c29ae8a2ef 100644
--- a/src/mame/includes/taitojc.h
+++ b/src/mame/includes/taitojc.h
@@ -98,15 +98,15 @@ public:
DECLARE_READ16_MEMBER(taitojc_dsp_idle_skip_r);
DECLARE_READ16_MEMBER(dendego2_dsp_idle_skip_r);
DECLARE_WRITE16_MEMBER(dsp_idle_skip_w);
+ DECLARE_READ32_MEMBER(taitojc_tile_r);
+ DECLARE_READ32_MEMBER(taitojc_char_r);
+ DECLARE_WRITE32_MEMBER(taitojc_tile_w);
+ DECLARE_WRITE32_MEMBER(taitojc_char_w);
};
/*----------- defined in video/taitojc.c -----------*/
-READ32_HANDLER(taitojc_tile_r);
-WRITE32_HANDLER(taitojc_tile_w);
-READ32_HANDLER(taitojc_char_r);
-WRITE32_HANDLER(taitojc_char_w);
void taitojc_clear_frame(running_machine &machine);
void taitojc_render_polygons(running_machine &machine, UINT16 *polygon_fifo, int length);
diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h
index fcb18d13e7b..637eeb00cf0 100644
--- a/src/mame/includes/taitosj.h
+++ b/src/mame/includes/taitosj.h
@@ -40,6 +40,26 @@ public:
bitmap_ind16 m_sprite_layer_collbitmap2[3];
int m_draw_order[32][4];
DECLARE_WRITE8_MEMBER(taitosj_soundcommand_w);
+ DECLARE_WRITE8_MEMBER(taitosj_bankswitch_w);
+ DECLARE_READ8_MEMBER(taitosj_fake_data_r);
+ DECLARE_WRITE8_MEMBER(taitosj_fake_data_w);
+ DECLARE_READ8_MEMBER(taitosj_fake_status_r);
+ DECLARE_READ8_MEMBER(taitosj_mcu_data_r);
+ DECLARE_WRITE8_MEMBER(taitosj_mcu_data_w);
+ DECLARE_READ8_MEMBER(taitosj_mcu_status_r);
+ DECLARE_READ8_MEMBER(taitosj_68705_portA_r);
+ DECLARE_WRITE8_MEMBER(taitosj_68705_portA_w);
+ DECLARE_READ8_MEMBER(taitosj_68705_portB_r);
+ DECLARE_WRITE8_MEMBER(taitosj_68705_portB_w);
+ DECLARE_READ8_MEMBER(taitosj_68705_portC_r);
+ DECLARE_READ8_MEMBER(spacecr_prot_r);
+ DECLARE_WRITE8_MEMBER(alpine_protection_w);
+ DECLARE_WRITE8_MEMBER(alpinea_bankswitch_w);
+ DECLARE_READ8_MEMBER(alpine_port_2_r);
+ DECLARE_READ8_MEMBER(taitosj_gfxrom_r);
+ DECLARE_WRITE8_MEMBER(taitosj_characterram_w);
+ DECLARE_WRITE8_MEMBER(junglhbr_characterram_w);
+ DECLARE_WRITE8_MEMBER(taitosj_collision_reg_clear_w);
};
@@ -47,31 +67,11 @@ public:
MACHINE_START( taitosj );
MACHINE_RESET( taitosj );
-WRITE8_HANDLER( taitosj_bankswitch_w );
-READ8_HANDLER( taitosj_fake_data_r );
-READ8_HANDLER( taitosj_fake_status_r );
-WRITE8_HANDLER( taitosj_fake_data_w );
-READ8_HANDLER( taitosj_mcu_data_r );
-READ8_HANDLER( taitosj_mcu_status_r );
-WRITE8_HANDLER( taitosj_mcu_data_w );
-READ8_HANDLER( taitosj_68705_portA_r );
-READ8_HANDLER( taitosj_68705_portB_r );
-READ8_HANDLER( taitosj_68705_portC_r );
-WRITE8_HANDLER( taitosj_68705_portA_w );
-WRITE8_HANDLER( taitosj_68705_portB_w );
-READ8_HANDLER( spacecr_prot_r );
-WRITE8_HANDLER( alpine_protection_w );
-WRITE8_HANDLER( alpinea_bankswitch_w );
-READ8_HANDLER( alpine_port_2_r );
/*----------- defined in video/taitosj.c -----------*/
-READ8_HANDLER( taitosj_gfxrom_r );
-WRITE8_HANDLER( taitosj_characterram_w );
-WRITE8_HANDLER( junglhbr_characterram_w );
-WRITE8_HANDLER( taitosj_collision_reg_clear_w );
VIDEO_START( taitosj );
SCREEN_UPDATE_IND16( taitosj );
SCREEN_UPDATE_IND16( kikstart );
diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h
index bb8bf29443c..80beae35e22 100644
--- a/src/mame/includes/tank8.h
+++ b/src/mame/includes/tank8.h
@@ -42,6 +42,7 @@ public:
DECLARE_READ8_MEMBER(tank8_collision_r);
DECLARE_WRITE8_MEMBER(tank8_lockout_w);
DECLARE_WRITE8_MEMBER(tank8_int_reset_w);
+ DECLARE_WRITE8_MEMBER(tank8_video_ram_w);
};
@@ -62,6 +63,5 @@ SCREEN_VBLANK( tank8 );
VIDEO_START( tank8 );
SCREEN_UPDATE_IND16( tank8 );
-WRITE8_HANDLER( tank8_video_ram_w );
diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h
index 7841c972287..ee5d89ddc38 100644
--- a/src/mame/includes/tankbatt.h
+++ b/src/mame/includes/tankbatt.h
@@ -22,12 +22,12 @@ public:
DECLARE_WRITE8_MEMBER(tankbatt_irq_ack_w);
DECLARE_WRITE8_MEMBER(tankbatt_coin_counter_w);
DECLARE_WRITE8_MEMBER(tankbatt_coin_lockout_w);
+ DECLARE_WRITE8_MEMBER(tankbatt_videoram_w);
};
/*----------- defined in video/tankbatt.c -----------*/
-WRITE8_HANDLER( tankbatt_videoram_w );
PALETTE_INIT( tankbatt );
VIDEO_START( tankbatt );
diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h
index 5ffd849578d..12539f5c6a5 100644
--- a/src/mame/includes/tankbust.h
+++ b/src/mame/includes/tankbust.h
@@ -24,6 +24,14 @@ public:
DECLARE_READ8_MEMBER(debug_output_area_r);
DECLARE_READ8_MEMBER(read_from_unmapped_memory);
DECLARE_READ8_MEMBER(some_changing_input);
+ DECLARE_WRITE8_MEMBER(tankbust_background_videoram_w);
+ DECLARE_READ8_MEMBER(tankbust_background_videoram_r);
+ DECLARE_WRITE8_MEMBER(tankbust_background_colorram_w);
+ DECLARE_READ8_MEMBER(tankbust_background_colorram_r);
+ DECLARE_WRITE8_MEMBER(tankbust_txtram_w);
+ DECLARE_READ8_MEMBER(tankbust_txtram_r);
+ DECLARE_WRITE8_MEMBER(tankbust_xscroll_w);
+ DECLARE_WRITE8_MEMBER(tankbust_yscroll_w);
};
@@ -32,14 +40,6 @@ public:
VIDEO_START( tankbust );
SCREEN_UPDATE_IND16( tankbust );
-WRITE8_HANDLER( tankbust_background_videoram_w );
-READ8_HANDLER( tankbust_background_videoram_r );
-WRITE8_HANDLER( tankbust_background_colorram_w );
-READ8_HANDLER( tankbust_background_colorram_r );
-WRITE8_HANDLER( tankbust_txtram_w );
-READ8_HANDLER( tankbust_txtram_r );
-WRITE8_HANDLER( tankbust_xscroll_w );
-WRITE8_HANDLER( tankbust_yscroll_w );
diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h
index 91da10abbd7..211ba24313c 100644
--- a/src/mame/includes/taotaido.h
+++ b/src/mame/includes/taotaido.h
@@ -20,14 +20,14 @@ public:
DECLARE_WRITE16_MEMBER(sound_command_w);
DECLARE_WRITE8_MEMBER(pending_command_clear_w);
DECLARE_WRITE8_MEMBER(taotaido_sh_bankswitch_w);
+ DECLARE_WRITE16_MEMBER(taotaido_sprite_character_bank_select_w);
+ DECLARE_WRITE16_MEMBER(taotaido_tileregs_w);
+ DECLARE_WRITE16_MEMBER(taotaido_bgvideoram_w);
};
/*----------- defined in video/taotaido.c -----------*/
-WRITE16_HANDLER( taotaido_sprite_character_bank_select_w );
-WRITE16_HANDLER( taotaido_tileregs_w );
-WRITE16_HANDLER( taotaido_bgvideoram_w );
VIDEO_START( taotaido );
SCREEN_UPDATE_IND16( taotaido );
SCREEN_VBLANK( taotaido );
diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h
index 1f50525ebb8..1424a185e69 100644
--- a/src/mame/includes/targeth.h
+++ b/src/mame/includes/targeth.h
@@ -14,11 +14,11 @@ public:
required_device<cpu_device> m_maincpu;
DECLARE_WRITE16_MEMBER(OKIM6295_bankswitch_w);
DECLARE_WRITE16_MEMBER(targeth_coin_counter_w);
+ DECLARE_WRITE16_MEMBER(targeth_vram_w);
};
/*----------- defined in video/targeth.c -----------*/
-WRITE16_HANDLER( targeth_vram_w );
VIDEO_START( targeth );
SCREEN_UPDATE_IND16( targeth );
diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h
index eca3f428a49..3827bcb36b2 100644
--- a/src/mame/includes/tatsumi.h
+++ b/src/mame/includes/tatsumi.h
@@ -59,30 +59,43 @@ public:
DECLARE_READ16_MEMBER(cyclwarr_input_r);
DECLARE_READ16_MEMBER(cyclwarr_input2_r);
DECLARE_WRITE16_MEMBER(cyclwarr_sound_w);
+ DECLARE_READ16_MEMBER(apache3_bank_r);
+ DECLARE_WRITE16_MEMBER(apache3_bank_w);
+ DECLARE_WRITE16_MEMBER(apache3_z80_ctrl_w);
+ DECLARE_READ16_MEMBER(apache3_v30_v20_r);
+ DECLARE_WRITE16_MEMBER(apache3_v30_v20_w);
+ DECLARE_READ16_MEMBER(apache3_z80_r);
+ DECLARE_WRITE16_MEMBER(apache3_z80_w);
+ DECLARE_READ8_MEMBER(apache3_adc_r);
+ DECLARE_WRITE8_MEMBER(apache3_adc_w);
+ DECLARE_WRITE16_MEMBER(apache3_rotate_w);
+ DECLARE_READ16_MEMBER(roundup_v30_z80_r);
+ DECLARE_WRITE16_MEMBER(roundup_v30_z80_w);
+ DECLARE_WRITE16_MEMBER(roundup5_control_w);
+ DECLARE_WRITE16_MEMBER(roundup5_d0000_w);
+ DECLARE_WRITE16_MEMBER(roundup5_e0000_w);
+ DECLARE_READ16_MEMBER(cyclwarr_control_r);
+ DECLARE_WRITE16_MEMBER(cyclwarr_control_w);
+ DECLARE_READ16_MEMBER(tatsumi_v30_68000_r);
+ DECLARE_WRITE16_MEMBER(tatsumi_v30_68000_w);
+ DECLARE_WRITE16_MEMBER(tatsumi_sprite_control_w);
+ DECLARE_WRITE16_MEMBER(apache3_road_z_w);
+ DECLARE_WRITE8_MEMBER(apache3_road_x_w);
+ DECLARE_READ16_MEMBER(roundup5_vram_r);
+ DECLARE_WRITE16_MEMBER(roundup5_vram_w);
+ DECLARE_WRITE16_MEMBER(roundup5_palette_w);
+ DECLARE_WRITE16_MEMBER(apache3_palette_w);
+ DECLARE_WRITE16_MEMBER(roundup5_text_w);
+ DECLARE_READ16_MEMBER(cyclwarr_videoram0_r);
+ DECLARE_READ16_MEMBER(cyclwarr_videoram1_r);
+ DECLARE_WRITE16_MEMBER(cyclwarr_videoram0_w);
+ DECLARE_WRITE16_MEMBER(cyclwarr_videoram1_w);
+ DECLARE_WRITE16_MEMBER(roundup5_crt_w);
};
/*----------- defined in machine/tatsumi.c -----------*/
-READ16_HANDLER( apache3_bank_r );
-WRITE16_HANDLER( apache3_bank_w );
-WRITE16_HANDLER( apache3_z80_ctrl_w );
-READ16_HANDLER( apache3_v30_v20_r );
-WRITE16_HANDLER( apache3_v30_v20_w );
-READ16_HANDLER( roundup_v30_z80_r );
-WRITE16_HANDLER( roundup_v30_z80_w );
-READ16_HANDLER( tatsumi_v30_68000_r );
-WRITE16_HANDLER( tatsumi_v30_68000_w ) ;
-READ16_HANDLER( apache3_z80_r );
-WRITE16_HANDLER( apache3_z80_w );
-READ8_HANDLER( apache3_adc_r );
-WRITE8_HANDLER( apache3_adc_w );
-WRITE16_HANDLER( apache3_rotate_w );
-WRITE16_HANDLER( cyclwarr_control_w );
-READ16_HANDLER( cyclwarr_control_r );
-WRITE16_HANDLER( roundup5_control_w );
-WRITE16_HANDLER( roundup5_d0000_w );
-WRITE16_HANDLER( roundup5_e0000_w );
READ8_DEVICE_HANDLER(tatsumi_hack_ym2151_r);
READ8_DEVICE_HANDLER(tatsumi_hack_oki_r);
@@ -92,19 +105,6 @@ void tatsumi_reset(running_machine &machine);
/*----------- defined in video/tatsumi.c -----------*/
-WRITE16_HANDLER( roundup5_palette_w );
-WRITE16_HANDLER( tatsumi_sprite_control_w );
-WRITE16_HANDLER( roundup5_text_w );
-WRITE16_HANDLER( roundup5_crt_w );
-READ16_HANDLER( cyclwarr_videoram0_r );
-WRITE16_HANDLER( cyclwarr_videoram0_w );
-READ16_HANDLER( cyclwarr_videoram1_r );
-WRITE16_HANDLER( cyclwarr_videoram1_w );
-READ16_HANDLER( roundup5_vram_r );
-WRITE16_HANDLER( roundup5_vram_w );
-WRITE16_HANDLER( apache3_palette_w );
-WRITE8_HANDLER( apache3_road_x_w );
-WRITE16_HANDLER( apache3_road_z_w );
VIDEO_START( apache3 );
diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h
index edbcbc581d9..2996b23fe0e 100644
--- a/src/mame/includes/tbowl.h
+++ b/src/mame/includes/tbowl.h
@@ -29,23 +29,23 @@ public:
DECLARE_WRITE8_MEMBER(tbowl_adpcm_start_w);
DECLARE_WRITE8_MEMBER(tbowl_adpcm_end_w);
DECLARE_WRITE8_MEMBER(tbowl_adpcm_vol_w);
+ DECLARE_WRITE8_MEMBER(tbowl_txvideoram_w);
+ DECLARE_WRITE8_MEMBER(tbowl_bg2videoram_w);
+ DECLARE_WRITE8_MEMBER(tbowl_bgxscroll_lo);
+ DECLARE_WRITE8_MEMBER(tbowl_bgxscroll_hi);
+ DECLARE_WRITE8_MEMBER(tbowl_bgyscroll_lo);
+ DECLARE_WRITE8_MEMBER(tbowl_bgyscroll_hi);
+ DECLARE_WRITE8_MEMBER(tbowl_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(tbowl_bg2xscroll_lo);
+ DECLARE_WRITE8_MEMBER(tbowl_bg2xscroll_hi);
+ DECLARE_WRITE8_MEMBER(tbowl_bg2yscroll_lo);
+ DECLARE_WRITE8_MEMBER(tbowl_bg2yscroll_hi);
};
/*----------- defined in video/tbowl.c -----------*/
-WRITE8_HANDLER( tbowl_bg2videoram_w );
-WRITE8_HANDLER( tbowl_bgvideoram_w );
-WRITE8_HANDLER( tbowl_txvideoram_w );
-WRITE8_HANDLER( tbowl_bg2xscroll_lo );
-WRITE8_HANDLER( tbowl_bg2xscroll_hi );
-WRITE8_HANDLER( tbowl_bg2yscroll_lo );
-WRITE8_HANDLER( tbowl_bg2yscroll_hi );
-WRITE8_HANDLER( tbowl_bgxscroll_lo );
-WRITE8_HANDLER( tbowl_bgxscroll_hi );
-WRITE8_HANDLER( tbowl_bgyscroll_lo );
-WRITE8_HANDLER( tbowl_bgyscroll_hi );
VIDEO_START( tbowl );
SCREEN_UPDATE_IND16( tbowl_left );
diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h
index c0f41ba0208..56865c814ea 100644
--- a/src/mame/includes/tceptor.h
+++ b/src/mame/includes/tceptor.h
@@ -37,6 +37,11 @@ public:
DECLARE_READ8_MEMBER(input0_r);
DECLARE_READ8_MEMBER(input1_r);
DECLARE_READ8_MEMBER(readFF);
+ DECLARE_WRITE8_MEMBER(tceptor_tile_ram_w);
+ DECLARE_WRITE8_MEMBER(tceptor_tile_attr_w);
+ DECLARE_WRITE8_MEMBER(tceptor_bg_ram_w);
+ DECLARE_WRITE8_MEMBER(tceptor_bg_scroll_w);
+ void tile_mark_dirty(int offset);
};
@@ -49,8 +54,4 @@ SCREEN_UPDATE_IND16( tceptor_3d_left );
SCREEN_UPDATE_IND16( tceptor_3d_right );
SCREEN_VBLANK( tceptor );
-WRITE8_HANDLER( tceptor_tile_ram_w );
-WRITE8_HANDLER( tceptor_tile_attr_w );
-WRITE8_HANDLER( tceptor_bg_ram_w );
-WRITE8_HANDLER( tceptor_bg_scroll_w );
diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h
index d99fe3f8c9f..d27dcc7b862 100644
--- a/src/mame/includes/tecmo.h
+++ b/src/mame/includes/tecmo.h
@@ -25,17 +25,17 @@ public:
DECLARE_READ8_MEMBER(tecmo_dswa_h_r);
DECLARE_READ8_MEMBER(tecmo_dswb_l_r);
DECLARE_READ8_MEMBER(tecmo_dswb_h_r);
+ DECLARE_WRITE8_MEMBER(tecmo_txvideoram_w);
+ DECLARE_WRITE8_MEMBER(tecmo_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(tecmo_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(tecmo_fgscroll_w);
+ DECLARE_WRITE8_MEMBER(tecmo_bgscroll_w);
+ DECLARE_WRITE8_MEMBER(tecmo_flipscreen_w);
};
/*----------- defined in video/tecmo.c -----------*/
-WRITE8_HANDLER( tecmo_txvideoram_w );
-WRITE8_HANDLER( tecmo_fgvideoram_w );
-WRITE8_HANDLER( tecmo_bgvideoram_w );
-WRITE8_HANDLER( tecmo_fgscroll_w );
-WRITE8_HANDLER( tecmo_bgscroll_w );
-WRITE8_HANDLER( tecmo_flipscreen_w );
VIDEO_START( tecmo );
SCREEN_UPDATE_IND16( tecmo );
diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h
index 5b5407f82b2..431b9d8601a 100644
--- a/src/mame/includes/tecmo16.h
+++ b/src/mame/includes/tecmo16.h
@@ -26,24 +26,24 @@ public:
UINT16 *m_spriteram;
size_t m_spriteram_size;
DECLARE_WRITE16_MEMBER(tecmo16_sound_command_w);
+ DECLARE_WRITE16_MEMBER(tecmo16_videoram_w);
+ DECLARE_WRITE16_MEMBER(tecmo16_colorram_w);
+ DECLARE_WRITE16_MEMBER(tecmo16_videoram2_w);
+ DECLARE_WRITE16_MEMBER(tecmo16_colorram2_w);
+ DECLARE_WRITE16_MEMBER(tecmo16_charram_w);
+ DECLARE_WRITE16_MEMBER(tecmo16_flipscreen_w);
+ DECLARE_WRITE16_MEMBER(tecmo16_scroll_x_w);
+ DECLARE_WRITE16_MEMBER(tecmo16_scroll_y_w);
+ DECLARE_WRITE16_MEMBER(tecmo16_scroll2_x_w);
+ DECLARE_WRITE16_MEMBER(tecmo16_scroll2_y_w);
+ DECLARE_WRITE16_MEMBER(tecmo16_scroll_char_x_w);
+ DECLARE_WRITE16_MEMBER(tecmo16_scroll_char_y_w);
};
/*----------- defined in video/tecmo16.c -----------*/
-WRITE16_HANDLER( tecmo16_videoram_w );
-WRITE16_HANDLER( tecmo16_colorram_w );
-WRITE16_HANDLER( tecmo16_videoram2_w );
-WRITE16_HANDLER( tecmo16_colorram2_w );
-WRITE16_HANDLER( tecmo16_charram_w );
-WRITE16_HANDLER( tecmo16_flipscreen_w );
-WRITE16_HANDLER( tecmo16_scroll_x_w );
-WRITE16_HANDLER( tecmo16_scroll_y_w );
-WRITE16_HANDLER( tecmo16_scroll2_x_w );
-WRITE16_HANDLER( tecmo16_scroll2_y_w );
-WRITE16_HANDLER( tecmo16_scroll_char_x_w );
-WRITE16_HANDLER( tecmo16_scroll_char_y_w );
VIDEO_START( fstarfrc );
VIDEO_START( ginkun );
diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h
index c9451b4c223..6626f04ef19 100644
--- a/src/mame/includes/tecmosys.h
+++ b/src/mame/includes/tecmosys.h
@@ -42,6 +42,18 @@ public:
DECLARE_READ16_MEMBER(unk880000_r);
DECLARE_WRITE8_MEMBER(tecmosys_z80_bank_w);
DECLARE_WRITE8_MEMBER(tecmosys_oki_bank_w);
+ DECLARE_READ16_MEMBER(tecmosys_prot_status_r);
+ DECLARE_WRITE16_MEMBER(tecmosys_prot_status_w);
+ DECLARE_READ16_MEMBER(tecmosys_prot_data_r);
+ DECLARE_WRITE16_MEMBER(tecmosys_prot_data_w);
+ DECLARE_WRITE16_MEMBER(bg0_tilemap_w);
+ DECLARE_WRITE16_MEMBER(bg1_tilemap_w);
+ DECLARE_WRITE16_MEMBER(bg2_tilemap_w);
+ DECLARE_WRITE16_MEMBER(fg_tilemap_w);
+ DECLARE_WRITE16_MEMBER(tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w);
+ DECLARE_WRITE16_MEMBER(bg0_tilemap_lineram_w);
+ DECLARE_WRITE16_MEMBER(bg1_tilemap_lineram_w);
+ DECLARE_WRITE16_MEMBER(bg2_tilemap_lineram_w);
};
@@ -49,22 +61,10 @@ public:
void tecmosys_prot_init(running_machine &machine, int which);
-READ16_HANDLER(tecmosys_prot_status_r);
-WRITE16_HANDLER(tecmosys_prot_status_w);
-READ16_HANDLER(tecmosys_prot_data_r);
-WRITE16_HANDLER(tecmosys_prot_data_w);
/*----------- defined in video/tecmosys.c -----------*/
-WRITE16_HANDLER( bg0_tilemap_w );
-WRITE16_HANDLER( bg1_tilemap_w );
-WRITE16_HANDLER( bg2_tilemap_w );
-WRITE16_HANDLER( fg_tilemap_w );
-WRITE16_HANDLER( tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w );
-WRITE16_HANDLER( bg0_tilemap_lineram_w );
-WRITE16_HANDLER( bg1_tilemap_lineram_w );
-WRITE16_HANDLER( bg2_tilemap_lineram_w );
SCREEN_UPDATE_RGB32(tecmosys);
VIDEO_START(tecmosys);
diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h
index 19b6da2e6b6..d1f6da1b14d 100644
--- a/src/mame/includes/tehkanwc.h
+++ b/src/mame/includes/tehkanwc.h
@@ -25,20 +25,20 @@ public:
DECLARE_WRITE8_MEMBER(tehkanwc_track_1_reset_w);
DECLARE_WRITE8_MEMBER(sound_command_w);
DECLARE_WRITE8_MEMBER(sound_answer_w);
+ DECLARE_WRITE8_MEMBER(tehkanwc_videoram_w);
+ DECLARE_WRITE8_MEMBER(tehkanwc_colorram_w);
+ DECLARE_WRITE8_MEMBER(tehkanwc_videoram2_w);
+ DECLARE_WRITE8_MEMBER(tehkanwc_scroll_x_w);
+ DECLARE_WRITE8_MEMBER(tehkanwc_scroll_y_w);
+ DECLARE_WRITE8_MEMBER(tehkanwc_flipscreen_x_w);
+ DECLARE_WRITE8_MEMBER(tehkanwc_flipscreen_y_w);
+ DECLARE_WRITE8_MEMBER(gridiron_led0_w);
+ DECLARE_WRITE8_MEMBER(gridiron_led1_w);
};
/*----------- defined in video/tehkanwc.c -----------*/
-extern WRITE8_HANDLER( tehkanwc_videoram_w );
-extern WRITE8_HANDLER( tehkanwc_colorram_w );
-extern WRITE8_HANDLER( tehkanwc_videoram2_w );
-extern WRITE8_HANDLER( tehkanwc_scroll_x_w );
-extern WRITE8_HANDLER( tehkanwc_scroll_y_w );
-extern WRITE8_HANDLER( tehkanwc_flipscreen_x_w );
-extern WRITE8_HANDLER( tehkanwc_flipscreen_y_w );
-extern WRITE8_HANDLER( gridiron_led0_w );
-extern WRITE8_HANDLER( gridiron_led1_w );
extern VIDEO_START( tehkanwc );
extern SCREEN_UPDATE_IND16( tehkanwc );
diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h
index 7df685ee8b9..b06c7e2bf01 100644
--- a/src/mame/includes/terracre.h
+++ b/src/mame/includes/terracre.h
@@ -19,16 +19,16 @@ public:
DECLARE_READ8_MEMBER(soundlatch_clear_r);
DECLARE_READ16_MEMBER(amazon_protection_r);
DECLARE_WRITE16_MEMBER(amazon_protection_w);
+ DECLARE_WRITE16_MEMBER(amazon_background_w);
+ DECLARE_WRITE16_MEMBER(amazon_foreground_w);
+ DECLARE_WRITE16_MEMBER(amazon_flipscreen_w);
+ DECLARE_WRITE16_MEMBER(amazon_scrolly_w);
+ DECLARE_WRITE16_MEMBER(amazon_scrollx_w);
};
/*----------- defined in video/terracre.c -----------*/
PALETTE_INIT( amazon );
-WRITE16_HANDLER( amazon_background_w );
-WRITE16_HANDLER( amazon_foreground_w );
-WRITE16_HANDLER( amazon_scrolly_w );
-WRITE16_HANDLER( amazon_scrollx_w );
-WRITE16_HANDLER( amazon_flipscreen_w );
VIDEO_START( amazon );
SCREEN_UPDATE_IND16( amazon );
diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h
index 0cf843a6e94..8bee9a87bc1 100644
--- a/src/mame/includes/tetrisp2.h
+++ b/src/mame/includes/tetrisp2.h
@@ -60,25 +60,25 @@ public:
DECLARE_WRITE16_MEMBER(tetrisp2_systemregs_w);
DECLARE_READ16_MEMBER(tetrisp2_nvram_r);
DECLARE_WRITE16_MEMBER(tetrisp2_nvram_w);
+ DECLARE_WRITE16_MEMBER(tetrisp2_palette_w);
+ DECLARE_WRITE16_MEMBER(rocknms_sub_palette_w);
+ DECLARE_WRITE8_MEMBER(tetrisp2_priority_w);
+ DECLARE_WRITE8_MEMBER(rockn_priority_w);
+ DECLARE_WRITE16_MEMBER(rocknms_sub_priority_w);
+ DECLARE_READ16_MEMBER(nndmseal_priority_r);
+ DECLARE_READ8_MEMBER(tetrisp2_priority_r);
+ DECLARE_WRITE16_MEMBER(tetrisp2_vram_bg_w);
+ DECLARE_WRITE16_MEMBER(tetrisp2_vram_fg_w);
+ DECLARE_WRITE16_MEMBER(tetrisp2_vram_rot_w);
+ DECLARE_WRITE16_MEMBER(rocknms_sub_vram_bg_w);
+ DECLARE_WRITE16_MEMBER(rocknms_sub_vram_fg_w);
+ DECLARE_WRITE16_MEMBER(rocknms_sub_vram_rot_w);
};
/*----------- defined in video/tetrisp2.c -----------*/
-WRITE16_HANDLER( tetrisp2_palette_w );
-WRITE16_HANDLER( rocknms_sub_palette_w );
-WRITE8_HANDLER( tetrisp2_priority_w );
-WRITE8_HANDLER( rockn_priority_w );
-READ8_HANDLER( tetrisp2_priority_r );
-WRITE16_HANDLER( rocknms_sub_priority_w );
-READ16_HANDLER( nndmseal_priority_r );
-WRITE16_HANDLER( tetrisp2_vram_bg_w );
-WRITE16_HANDLER( tetrisp2_vram_fg_w );
-WRITE16_HANDLER( tetrisp2_vram_rot_w );
-WRITE16_HANDLER( rocknms_sub_vram_bg_w );
-WRITE16_HANDLER( rocknms_sub_vram_fg_w );
-WRITE16_HANDLER( rocknms_sub_vram_rot_w );
VIDEO_START( tetrisp2 );
SCREEN_UPDATE_IND16( tetrisp2 );
diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h
index 23957db938a..e0d2a19009e 100644
--- a/src/mame/includes/thedeep.h
+++ b/src/mame/includes/thedeep.h
@@ -38,13 +38,13 @@ public:
DECLARE_WRITE8_MEMBER(thedeep_to_main_w);
DECLARE_WRITE8_MEMBER(thedeep_p3_w);
DECLARE_READ8_MEMBER(thedeep_p0_r);
+ DECLARE_WRITE8_MEMBER(thedeep_vram_0_w);
+ DECLARE_WRITE8_MEMBER(thedeep_vram_1_w);
};
/*----------- defined in video/thedeep.c -----------*/
-WRITE8_HANDLER( thedeep_vram_0_w );
-WRITE8_HANDLER( thedeep_vram_1_w );
PALETTE_INIT( thedeep );
VIDEO_START( thedeep );
diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h
index 6b62dbc9caf..cf10bd81eaa 100644
--- a/src/mame/includes/thepit.h
+++ b/src/mame/includes/thepit.h
@@ -23,6 +23,12 @@ public:
DECLARE_WRITE8_MEMBER(thepit_sound_enable_w);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
DECLARE_READ8_MEMBER(rtriv_question_r);
+ DECLARE_WRITE8_MEMBER(thepit_videoram_w);
+ DECLARE_WRITE8_MEMBER(thepit_colorram_w);
+ DECLARE_WRITE8_MEMBER(thepit_flip_screen_x_w);
+ DECLARE_WRITE8_MEMBER(thepit_flip_screen_y_w);
+ DECLARE_WRITE8_MEMBER(intrepid_graphics_bank_w);
+ DECLARE_READ8_MEMBER(thepit_input_port_0_r);
};
@@ -32,9 +38,3 @@ PALETTE_INIT( thepit );
PALETTE_INIT( suprmous );
VIDEO_START( thepit );
SCREEN_UPDATE_IND16( thepit );
-WRITE8_HANDLER( thepit_videoram_w );
-WRITE8_HANDLER( thepit_colorram_w );
-WRITE8_HANDLER( thepit_flip_screen_x_w );
-WRITE8_HANDLER( thepit_flip_screen_y_w );
-READ8_HANDLER( thepit_input_port_0_r );
-WRITE8_HANDLER( intrepid_graphics_bank_w );
diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h
index 848f5be7da9..9136bb12ac2 100644
--- a/src/mame/includes/thief.h
+++ b/src/mame/includes/thief.h
@@ -19,22 +19,22 @@ public:
coprocessor_t m_coprocessor;
DECLARE_WRITE8_MEMBER(thief_input_select_w);
DECLARE_READ8_MEMBER(thief_io_r);
+ DECLARE_READ8_MEMBER(thief_context_ram_r);
+ DECLARE_WRITE8_MEMBER(thief_context_ram_w);
+ DECLARE_WRITE8_MEMBER(thief_context_bank_w);
+ DECLARE_WRITE8_MEMBER(thief_video_control_w);
+ DECLARE_WRITE8_MEMBER(thief_color_map_w);
+ DECLARE_WRITE8_MEMBER(thief_color_plane_w);
+ DECLARE_READ8_MEMBER(thief_videoram_r);
+ DECLARE_WRITE8_MEMBER(thief_videoram_w);
+ DECLARE_WRITE8_MEMBER(thief_blit_w);
+ DECLARE_READ8_MEMBER(thief_coprocessor_r);
+ DECLARE_WRITE8_MEMBER(thief_coprocessor_w);
};
/*----------- defined in video/thief.c -----------*/
-READ8_HANDLER( thief_context_ram_r );
-WRITE8_HANDLER( thief_context_ram_w );
-WRITE8_HANDLER( thief_context_bank_w );
-WRITE8_HANDLER( thief_video_control_w );
-WRITE8_HANDLER( thief_color_map_w );
-WRITE8_HANDLER( thief_color_plane_w );
-READ8_HANDLER( thief_videoram_r );
-WRITE8_HANDLER( thief_videoram_w );
-WRITE8_HANDLER( thief_blit_w );
-READ8_HANDLER( thief_coprocessor_r );
-WRITE8_HANDLER( thief_coprocessor_w );
VIDEO_START( thief );
SCREEN_UPDATE_IND16( thief );
diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h
index 240c2254e57..7d66e6ef8a7 100644
--- a/src/mame/includes/thoop2.h
+++ b/src/mame/includes/thoop2.h
@@ -13,11 +13,11 @@ public:
DECLARE_WRITE16_MEMBER(OKIM6295_bankswitch_w);
DECLARE_WRITE16_MEMBER(thoop2_coin_w);
DECLARE_READ16_MEMBER(DS5002FP_R);
+ DECLARE_WRITE16_MEMBER(thoop2_vram_w);
};
/*----------- defined in video/thoop2.c -----------*/
-WRITE16_HANDLER( thoop2_vram_w );
VIDEO_START( thoop2 );
SCREEN_UPDATE_IND16( thoop2 );
diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h
index 05d5682c8b8..1bc06158e12 100644
--- a/src/mame/includes/tiamc1.h
+++ b/src/mame/includes/tiamc1.h
@@ -19,6 +19,15 @@ public:
tilemap_t *m_bg_tilemap2;
rgb_t *m_palette;
DECLARE_WRITE8_MEMBER(tiamc1_control_w);
+ DECLARE_WRITE8_MEMBER(tiamc1_videoram_w);
+ DECLARE_WRITE8_MEMBER(tiamc1_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(tiamc1_sprite_x_w);
+ DECLARE_WRITE8_MEMBER(tiamc1_sprite_y_w);
+ DECLARE_WRITE8_MEMBER(tiamc1_sprite_a_w);
+ DECLARE_WRITE8_MEMBER(tiamc1_sprite_n_w);
+ DECLARE_WRITE8_MEMBER(tiamc1_bg_vshift_w);
+ DECLARE_WRITE8_MEMBER(tiamc1_bg_hshift_w);
+ DECLARE_WRITE8_MEMBER(tiamc1_palette_w);
};
@@ -37,12 +46,3 @@ PALETTE_INIT( tiamc1 );
VIDEO_START( tiamc1 );
SCREEN_UPDATE_IND16( tiamc1 );
-WRITE8_HANDLER( tiamc1_palette_w );
-WRITE8_HANDLER( tiamc1_videoram_w );
-WRITE8_HANDLER( tiamc1_bankswitch_w );
-WRITE8_HANDLER( tiamc1_sprite_x_w );
-WRITE8_HANDLER( tiamc1_sprite_y_w );
-WRITE8_HANDLER( tiamc1_sprite_a_w );
-WRITE8_HANDLER( tiamc1_sprite_n_w );
-WRITE8_HANDLER( tiamc1_bg_vshift_w );
-WRITE8_HANDLER( tiamc1_bg_hshift_w );
diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h
index c0703be1c2a..11deee794b1 100644
--- a/src/mame/includes/tigeroad.h
+++ b/src/mame/includes/tigeroad.h
@@ -15,13 +15,13 @@ public:
required_device<buffered_spriteram16_device> m_spriteram;
DECLARE_WRITE16_MEMBER(f1dream_control_w);
DECLARE_WRITE16_MEMBER(tigeroad_soundcmd_w);
+ DECLARE_WRITE16_MEMBER(tigeroad_videoram_w);
+ DECLARE_WRITE16_MEMBER(tigeroad_videoctrl_w);
+ DECLARE_WRITE16_MEMBER(tigeroad_scroll_w);
};
/*----------- defined in video/tigeroad.c -----------*/
-WRITE16_HANDLER( tigeroad_videoram_w );
-WRITE16_HANDLER( tigeroad_videoctrl_w );
-WRITE16_HANDLER( tigeroad_scroll_w );
VIDEO_START( tigeroad );
SCREEN_UPDATE_IND16( tigeroad );
diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h
index d848b050274..a163ddb97ec 100644
--- a/src/mame/includes/timelimt.h
+++ b/src/mame/includes/timelimt.h
@@ -16,6 +16,11 @@ public:
size_t m_spriteram_size;
DECLARE_WRITE8_MEMBER(nmi_enable_w);
DECLARE_WRITE8_MEMBER(sound_reset_w);
+ DECLARE_WRITE8_MEMBER(timelimt_videoram_w);
+ DECLARE_WRITE8_MEMBER(timelimt_bg_videoram_w);
+ DECLARE_WRITE8_MEMBER(timelimt_scroll_x_lsb_w);
+ DECLARE_WRITE8_MEMBER(timelimt_scroll_x_msb_w);
+ DECLARE_WRITE8_MEMBER(timelimt_scroll_y_w);
};
@@ -25,8 +30,3 @@ VIDEO_START( timelimt );
PALETTE_INIT( timelimt );
SCREEN_UPDATE_IND16( timelimt );
-WRITE8_HANDLER( timelimt_videoram_w );
-WRITE8_HANDLER( timelimt_bg_videoram_w );
-WRITE8_HANDLER( timelimt_scroll_y_w );
-WRITE8_HANDLER( timelimt_scroll_x_msb_w );
-WRITE8_HANDLER( timelimt_scroll_x_lsb_w );
diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h
index b9d898ec364..a085acc8eeb 100644
--- a/src/mame/includes/timeplt.h
+++ b/src/mame/includes/timeplt.h
@@ -27,15 +27,15 @@ public:
DECLARE_WRITE8_MEMBER(timeplt_nmi_enable_w);
DECLARE_WRITE8_MEMBER(timeplt_coin_counter_w);
DECLARE_READ8_MEMBER(psurge_protection_r);
+ DECLARE_WRITE8_MEMBER(timeplt_videoram_w);
+ DECLARE_WRITE8_MEMBER(timeplt_colorram_w);
+ DECLARE_WRITE8_MEMBER(timeplt_flipscreen_w);
+ DECLARE_READ8_MEMBER(timeplt_scanline_r);
};
/*----------- defined in video/timeplt.c -----------*/
-READ8_HANDLER( timeplt_scanline_r );
-WRITE8_HANDLER( timeplt_videoram_w );
-WRITE8_HANDLER( timeplt_colorram_w );
-WRITE8_HANDLER( timeplt_flipscreen_w );
PALETTE_INIT( timeplt );
VIDEO_START( timeplt );
diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h
index 93c5e524ee5..59d431fd7cd 100644
--- a/src/mame/includes/tmnt.h
+++ b/src/mame/includes/tmnt.h
@@ -95,6 +95,19 @@ public:
DECLARE_WRITE16_MEMBER(tmnt2_1c0800_w);
DECLARE_READ8_MEMBER(k054539_ctrl_r);
DECLARE_WRITE8_MEMBER(k054539_ctrl_w);
+ DECLARE_WRITE16_MEMBER(tmnt_paletteram_word_w);
+ DECLARE_WRITE16_MEMBER(tmnt_0a0000_w);
+ DECLARE_WRITE16_MEMBER(punkshot_0a0020_w);
+ DECLARE_WRITE16_MEMBER(lgtnfght_0a0018_w);
+ DECLARE_WRITE16_MEMBER(blswhstl_700300_w);
+ DECLARE_READ16_MEMBER(glfgreat_rom_r);
+ DECLARE_WRITE16_MEMBER(glfgreat_122000_w);
+ DECLARE_WRITE16_MEMBER(ssriders_eeprom_w);
+ DECLARE_WRITE16_MEMBER(ssriders_1c0300_w);
+ DECLARE_WRITE16_MEMBER(prmrsocr_122000_w);
+ DECLARE_READ16_MEMBER(prmrsocr_rom_r);
+ DECLARE_WRITE16_MEMBER(tmnt_priority_w);
+ DECLARE_READ16_MEMBER(glfgreat_ball_r);
};
@@ -113,19 +126,6 @@ extern void lgtnfght_sprite_callback(running_machine &machine, int *code,int *co
extern void blswhstl_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask);
extern void prmrsocr_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask);
-WRITE16_HANDLER( tmnt_paletteram_word_w );
-WRITE16_HANDLER( tmnt_0a0000_w );
-WRITE16_HANDLER( punkshot_0a0020_w );
-WRITE16_HANDLER( lgtnfght_0a0018_w );
-WRITE16_HANDLER( blswhstl_700300_w );
-READ16_HANDLER( glfgreat_rom_r );
-WRITE16_HANDLER( glfgreat_122000_w );
-WRITE16_HANDLER( ssriders_eeprom_w );
-WRITE16_HANDLER( ssriders_1c0300_w );
-WRITE16_HANDLER( prmrsocr_122000_w );
-WRITE16_HANDLER( tmnt_priority_w );
-READ16_HANDLER( glfgreat_ball_r );
-READ16_HANDLER( prmrsocr_rom_r );
VIDEO_START( cuebrick );
VIDEO_START( mia );
diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h
index 5f8525ce559..c673df1d26f 100644
--- a/src/mame/includes/tnzs.h
+++ b/src/mame/includes/tnzs.h
@@ -55,19 +55,26 @@ public:
DECLARE_WRITE8_MEMBER(tnzsb_sound_command_w);
DECLARE_WRITE8_MEMBER(jpopnics_palette_w);
DECLARE_WRITE8_MEMBER(jpopnics_subbankswitch_w);
+ DECLARE_READ8_MEMBER(tnzs_port1_r);
+ DECLARE_READ8_MEMBER(tnzs_port2_r);
+ DECLARE_WRITE8_MEMBER(tnzs_port2_w);
+ DECLARE_READ8_MEMBER(arknoid2_sh_f000_r);
+ DECLARE_READ8_MEMBER(tnzs_mcu_r);
+ DECLARE_WRITE8_MEMBER(tnzs_mcu_w);
+ DECLARE_WRITE8_MEMBER(tnzs_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(tnzs_bankswitch1_w);
+ DECLARE_READ8_MEMBER(mcu_tnzs_r);
+ DECLARE_WRITE8_MEMBER(mcu_tnzs_w);
+ DECLARE_READ8_MEMBER(mcu_arknoid2_r);
+ DECLARE_WRITE8_MEMBER(mcu_arknoid2_w);
+ DECLARE_READ8_MEMBER(mcu_extrmatn_r);
+ DECLARE_WRITE8_MEMBER(mcu_extrmatn_w);
+ DECLARE_WRITE8_MEMBER(tnzs_sync_kludge_w);
};
/*----------- defined in machine/tnzs.c -----------*/
-READ8_HANDLER( tnzs_port1_r );
-READ8_HANDLER( tnzs_port2_r );
-WRITE8_HANDLER( tnzs_port2_w );
-READ8_HANDLER( arknoid2_sh_f000_r );
-READ8_HANDLER( tnzs_mcu_r );
-WRITE8_HANDLER( tnzs_mcu_w );
-WRITE8_HANDLER( tnzs_bankswitch_w );
-WRITE8_HANDLER( tnzs_bankswitch1_w );
INTERRUPT_GEN( arknoid2_interrupt );
DRIVER_INIT( plumpop );
diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h
index 9c9cfebb6d1..176b13ff50a 100644
--- a/src/mame/includes/toaplan1.h
+++ b/src/mame/includes/toaplan1.h
@@ -84,30 +84,53 @@ public:
// an empty tile, so that we can safely disable tiles
UINT8 m_empty_tile[8*8];
+ DECLARE_WRITE16_MEMBER(toaplan1_intenable_w);
+ DECLARE_WRITE16_MEMBER(demonwld_dsp_addrsel_w);
+ DECLARE_READ16_MEMBER(demonwld_dsp_r);
+ DECLARE_WRITE16_MEMBER(demonwld_dsp_w);
+ DECLARE_WRITE16_MEMBER(demonwld_dsp_bio_w);
+ DECLARE_READ16_MEMBER(demonwld_BIO_r);
+ DECLARE_WRITE16_MEMBER(demonwld_dsp_ctrl_w);
+ DECLARE_READ16_MEMBER(samesame_port_6_word_r);
+ DECLARE_READ16_MEMBER(vimana_system_port_r);
+ DECLARE_READ16_MEMBER(vimana_mcu_r);
+ DECLARE_WRITE16_MEMBER(vimana_mcu_w);
+ DECLARE_READ16_MEMBER(toaplan1_shared_r);
+ DECLARE_WRITE16_MEMBER(toaplan1_shared_w);
+ DECLARE_WRITE16_MEMBER(toaplan1_reset_sound);
+ DECLARE_WRITE8_MEMBER(rallybik_coin_w);
+ DECLARE_WRITE8_MEMBER(toaplan1_coin_w);
+ DECLARE_WRITE16_MEMBER(samesame_coin_w);
+ DECLARE_READ16_MEMBER(toaplan1_frame_done_r);
+ DECLARE_WRITE16_MEMBER(toaplan1_tile_offsets_w);
+ DECLARE_WRITE16_MEMBER(rallybik_bcu_flipscreen_w);
+ DECLARE_WRITE16_MEMBER(toaplan1_bcu_flipscreen_w);
+ DECLARE_WRITE16_MEMBER(toaplan1_fcu_flipscreen_w);
+ DECLARE_READ16_MEMBER(toaplan1_spriteram_offs_r);
+ DECLARE_WRITE16_MEMBER(toaplan1_spriteram_offs_w);
+ DECLARE_READ16_MEMBER(toaplan1_colorram1_r);
+ DECLARE_WRITE16_MEMBER(toaplan1_colorram1_w);
+ DECLARE_READ16_MEMBER(toaplan1_colorram2_r);
+ DECLARE_WRITE16_MEMBER(toaplan1_colorram2_w);
+ DECLARE_READ16_MEMBER(toaplan1_spriteram16_r);
+ DECLARE_WRITE16_MEMBER(toaplan1_spriteram16_w);
+ DECLARE_READ16_MEMBER(toaplan1_spritesizeram16_r);
+ DECLARE_WRITE16_MEMBER(toaplan1_spritesizeram16_w);
+ DECLARE_WRITE16_MEMBER(toaplan1_bcu_control_w);
+ DECLARE_READ16_MEMBER(toaplan1_tileram_offs_r);
+ DECLARE_WRITE16_MEMBER(toaplan1_tileram_offs_w);
+ DECLARE_READ16_MEMBER(toaplan1_tileram16_r);
+ DECLARE_READ16_MEMBER(rallybik_tileram16_r);
+ DECLARE_WRITE16_MEMBER(toaplan1_tileram16_w);
+ DECLARE_READ16_MEMBER(toaplan1_scroll_regs_r);
+ DECLARE_WRITE16_MEMBER(toaplan1_scroll_regs_w);
};
/*----------- defined in machine/toaplan1.c -----------*/
INTERRUPT_GEN( toaplan1_interrupt );
-WRITE16_HANDLER( toaplan1_intenable_w );
-READ16_HANDLER ( toaplan1_shared_r );
-WRITE16_HANDLER( toaplan1_shared_w );
-WRITE16_HANDLER( toaplan1_reset_sound );
-WRITE16_HANDLER( demonwld_dsp_addrsel_w );
-READ16_HANDLER ( demonwld_dsp_r );
-WRITE16_HANDLER( demonwld_dsp_w );
-WRITE16_HANDLER( demonwld_dsp_bio_w );
-WRITE16_HANDLER( demonwld_dsp_ctrl_w );
-READ16_HANDLER ( demonwld_BIO_r );
-READ16_HANDLER ( samesame_port_6_word_r );
-READ16_HANDLER ( vimana_system_port_r );
-READ16_HANDLER ( vimana_mcu_r );
-WRITE16_HANDLER( vimana_mcu_w );
-
-WRITE8_HANDLER( rallybik_coin_w );
-WRITE8_HANDLER( toaplan1_coin_w );
-WRITE16_HANDLER( samesame_coin_w );
+
MACHINE_RESET( toaplan1 );
MACHINE_RESET( demonwld );
@@ -121,31 +144,8 @@ void vimana_driver_savestate(running_machine &machine);
/*----------- defined in video/toaplan1.c -----------*/
-READ16_HANDLER ( toaplan1_frame_done_r );
-WRITE16_HANDLER( toaplan1_bcu_control_w );
-WRITE16_HANDLER( rallybik_bcu_flipscreen_w );
-WRITE16_HANDLER( toaplan1_bcu_flipscreen_w );
-WRITE16_HANDLER( toaplan1_fcu_flipscreen_w );
-
-READ16_HANDLER ( rallybik_tileram16_r );
-READ16_HANDLER ( toaplan1_tileram16_r );
-WRITE16_HANDLER( toaplan1_tileram16_w );
-READ16_HANDLER ( toaplan1_spriteram16_r );
-WRITE16_HANDLER( toaplan1_spriteram16_w );
-READ16_HANDLER ( toaplan1_spritesizeram16_r );
-WRITE16_HANDLER( toaplan1_spritesizeram16_w );
-READ16_HANDLER ( toaplan1_colorram1_r );
-WRITE16_HANDLER( toaplan1_colorram1_w );
-READ16_HANDLER ( toaplan1_colorram2_r );
-WRITE16_HANDLER( toaplan1_colorram2_w );
-
-READ16_HANDLER ( toaplan1_scroll_regs_r );
-WRITE16_HANDLER( toaplan1_scroll_regs_w );
-WRITE16_HANDLER( toaplan1_tile_offsets_w );
-READ16_HANDLER ( toaplan1_tileram_offs_r );
-WRITE16_HANDLER( toaplan1_tileram_offs_w );
-READ16_HANDLER ( toaplan1_spriteram_offs_r );
-WRITE16_HANDLER( toaplan1_spriteram_offs_w );
+
+
SCREEN_VBLANK( rallybik );
SCREEN_VBLANK( toaplan1 );
diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h
index 97f23719966..9a210ec262f 100644
--- a/src/mame/includes/toaplan2.h
+++ b/src/mame/includes/toaplan2.h
@@ -89,6 +89,13 @@ public:
DECLARE_WRITE8_MEMBER(batrider_clear_nmi_w);
DECLARE_READ16_MEMBER(bbakraid_eeprom_r);
DECLARE_WRITE16_MEMBER(bbakraid_eeprom_w);
+ DECLARE_WRITE16_MEMBER(toaplan2_txvideoram16_w);
+ DECLARE_WRITE16_MEMBER(toaplan2_txvideoram16_offs_w);
+ DECLARE_WRITE16_MEMBER(toaplan2_txscrollram16_w);
+ DECLARE_WRITE16_MEMBER(toaplan2_tx_gfxram16_w);
+ DECLARE_WRITE16_MEMBER(batrider_textdata_dma_w);
+ DECLARE_WRITE16_MEMBER(batrider_unknown_dma_w);
+ DECLARE_WRITE16_MEMBER(batrider_objectbank_w);
};
/*----------- defined in video/toaplan2.c -----------*/
@@ -109,11 +116,4 @@ SCREEN_UPDATE_IND16( batsugun );
SCREEN_VBLANK( toaplan2 );
/* non-vdp text layer */
-WRITE16_HANDLER( toaplan2_txvideoram16_w );
-WRITE16_HANDLER( toaplan2_txvideoram16_offs_w );
-WRITE16_HANDLER( toaplan2_txscrollram16_w );
-WRITE16_HANDLER( toaplan2_tx_gfxram16_w );
-
-WRITE16_HANDLER( batrider_textdata_dma_w );
-WRITE16_HANDLER( batrider_unknown_dma_w );
-WRITE16_HANDLER( batrider_objectbank_w );
+
diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h
index aabc2021016..07afd6d4c54 100644
--- a/src/mame/includes/toki.h
+++ b/src/mame/includes/toki.h
@@ -20,6 +20,10 @@ public:
DECLARE_WRITE16_MEMBER(tokib_soundcommand16_w);
DECLARE_READ16_MEMBER(pip16_r);
DECLARE_WRITE8_MEMBER(toki_adpcm_data_w);
+ DECLARE_WRITE16_MEMBER(toki_control_w);
+ DECLARE_WRITE16_MEMBER(toki_foreground_videoram16_w);
+ DECLARE_WRITE16_MEMBER(toki_background1_videoram16_w);
+ DECLARE_WRITE16_MEMBER(toki_background2_videoram16_w);
};
@@ -28,7 +32,3 @@ public:
VIDEO_START( toki );
SCREEN_UPDATE_IND16( toki );
SCREEN_UPDATE_IND16( tokib );
-WRITE16_HANDLER( toki_background1_videoram16_w );
-WRITE16_HANDLER( toki_background2_videoram16_w );
-WRITE16_HANDLER( toki_control_w );
-WRITE16_HANDLER( toki_foreground_videoram16_w );
diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h
index 9f3c85e7f63..f8eb316f153 100644
--- a/src/mame/includes/toypop.h
+++ b/src/mame/includes/toypop.h
@@ -28,16 +28,16 @@ public:
DECLARE_WRITE8_MEMBER(toypop_m68000_assert_w);
DECLARE_WRITE16_MEMBER(toypop_m68000_interrupt_enable_w);
DECLARE_WRITE16_MEMBER(toypop_m68000_interrupt_disable_w);
+ DECLARE_WRITE8_MEMBER(toypop_videoram_w);
+ DECLARE_WRITE8_MEMBER(toypop_palettebank_w);
+ DECLARE_WRITE16_MEMBER(toypop_flipscreen_w);
+ DECLARE_READ16_MEMBER(toypop_merged_background_r);
+ DECLARE_WRITE16_MEMBER(toypop_merged_background_w);
};
/*----------- defined in video/toypop.c -----------*/
-WRITE8_HANDLER( toypop_videoram_w );
-READ16_HANDLER( toypop_merged_background_r );
-WRITE16_HANDLER( toypop_merged_background_w );
-WRITE8_HANDLER( toypop_palettebank_w );
-WRITE16_HANDLER( toypop_flipscreen_w );
VIDEO_START( toypop );
SCREEN_UPDATE_IND16( toypop );
PALETTE_INIT( toypop );
diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h
index a2c7ec14882..f4fc3f10277 100644
--- a/src/mame/includes/tp84.h
+++ b/src/mame/includes/tp84.h
@@ -23,13 +23,13 @@ public:
DECLARE_WRITE8_MEMBER(tp84_filter_w);
DECLARE_WRITE8_MEMBER(tp84_sh_irqtrigger_w);
DECLARE_WRITE8_MEMBER(sub_irq_mask_w);
+ DECLARE_WRITE8_MEMBER(tp84_spriteram_w);
+ DECLARE_READ8_MEMBER(tp84_scanline_r);
};
/*----------- defined in video/tp84.c -----------*/
-WRITE8_HANDLER( tp84_spriteram_w );
-READ8_HANDLER( tp84_scanline_r );
PALETTE_INIT( tp84 );
VIDEO_START( tp84 );
diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h
index f9b0afc5c12..cc3bd1c0a9c 100644
--- a/src/mame/includes/trackfld.h
+++ b/src/mame/includes/trackfld.h
@@ -34,15 +34,15 @@ public:
DECLARE_WRITE8_MEMBER(questions_bank_w);
DECLARE_WRITE8_MEMBER(irq_mask_w);
DECLARE_WRITE8_MEMBER(yieartf_nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(trackfld_videoram_w);
+ DECLARE_WRITE8_MEMBER(trackfld_colorram_w);
+ DECLARE_WRITE8_MEMBER(trackfld_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(atlantol_gfxbank_w);
};
/*----------- defined in video/trackfld.c -----------*/
-WRITE8_HANDLER( trackfld_videoram_w );
-WRITE8_HANDLER( trackfld_colorram_w );
-WRITE8_HANDLER( trackfld_flipscreen_w );
-WRITE8_HANDLER( atlantol_gfxbank_w );
PALETTE_INIT( trackfld );
VIDEO_START( trackfld );
diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h
index 58ad881bbaa..47ddd8e9f6a 100644
--- a/src/mame/includes/travrusa.h
+++ b/src/mame/includes/travrusa.h
@@ -12,14 +12,14 @@ public:
/* video-related */
tilemap_t* m_bg_tilemap;
int m_scrollx[2];
+ DECLARE_WRITE8_MEMBER(travrusa_videoram_w);
+ DECLARE_WRITE8_MEMBER(travrusa_scroll_x_low_w);
+ DECLARE_WRITE8_MEMBER(travrusa_scroll_x_high_w);
+ DECLARE_WRITE8_MEMBER(travrusa_flipscreen_w);
};
/*----------- defined in video/travrusa.c -----------*/
-WRITE8_HANDLER( travrusa_videoram_w );
-WRITE8_HANDLER( travrusa_scroll_x_low_w );
-WRITE8_HANDLER( travrusa_scroll_x_high_w );
-WRITE8_HANDLER( travrusa_flipscreen_w );
PALETTE_INIT( travrusa );
PALETTE_INIT( shtrider );
diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h
index 682bdd2046a..f159bed1b17 100644
--- a/src/mame/includes/trucocl.h
+++ b/src/mame/includes/trucocl.h
@@ -12,13 +12,13 @@ public:
UINT8 m_irq_mask;
DECLARE_WRITE8_MEMBER(irq_enable_w);
+ DECLARE_WRITE8_MEMBER(trucocl_videoram_w);
+ DECLARE_WRITE8_MEMBER(trucocl_colorram_w);
};
/*----------- defined in video/trucocl.c -----------*/
-WRITE8_HANDLER( trucocl_videoram_w );
-WRITE8_HANDLER( trucocl_colorram_w );
PALETTE_INIT( trucocl );
VIDEO_START( trucocl );
SCREEN_UPDATE_IND16( trucocl );
diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h
index 67fbbb5a0c5..ce24ab840d1 100644
--- a/src/mame/includes/tryout.h
+++ b/src/mame/includes/tryout.h
@@ -17,16 +17,16 @@ public:
DECLARE_WRITE8_MEMBER(tryout_sound_w);
DECLARE_WRITE8_MEMBER(tryout_sound_irq_ack_w);
DECLARE_WRITE8_MEMBER(tryout_bankswitch_w);
+ DECLARE_READ8_MEMBER(tryout_vram_r);
+ DECLARE_WRITE8_MEMBER(tryout_videoram_w);
+ DECLARE_WRITE8_MEMBER(tryout_vram_w);
+ DECLARE_WRITE8_MEMBER(tryout_vram_bankswitch_w);
+ DECLARE_WRITE8_MEMBER(tryout_flipscreen_w);
};
/*----------- defined in video/tryout.c -----------*/
-READ8_HANDLER( tryout_vram_r );
-WRITE8_HANDLER( tryout_videoram_w );
-WRITE8_HANDLER( tryout_vram_w );
-WRITE8_HANDLER( tryout_vram_bankswitch_w );
-WRITE8_HANDLER( tryout_flipscreen_w );
PALETTE_INIT( tryout );
VIDEO_START( tryout );
diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h
index 3c0b67ae680..3d4e75d9f91 100644
--- a/src/mame/includes/tsamurai.h
+++ b/src/mame/includes/tsamurai.h
@@ -39,22 +39,22 @@ public:
DECLARE_READ8_MEMBER(vsgongf_a006_r);
DECLARE_READ8_MEMBER(vsgongf_a100_r);
DECLARE_WRITE8_MEMBER(vsgongf_sound_command_w);
+ DECLARE_WRITE8_MEMBER(tsamurai_scrolly_w);
+ DECLARE_WRITE8_MEMBER(tsamurai_scrollx_w);
+ DECLARE_WRITE8_MEMBER(tsamurai_bgcolor_w);
+ DECLARE_WRITE8_MEMBER(tsamurai_textbank1_w);
+ DECLARE_WRITE8_MEMBER(tsamurai_textbank2_w);
+ DECLARE_WRITE8_MEMBER(tsamurai_bg_videoram_w);
+ DECLARE_WRITE8_MEMBER(tsamurai_fg_videoram_w);
+ DECLARE_WRITE8_MEMBER(tsamurai_fg_colorram_w);
+ DECLARE_WRITE8_MEMBER(vsgongf_color_w);
};
/*----------- defined in video/tsamurai.c -----------*/
-WRITE8_HANDLER( vsgongf_color_w );
-WRITE8_HANDLER( tsamurai_bgcolor_w );
-WRITE8_HANDLER( tsamurai_textbank1_w );
-WRITE8_HANDLER( tsamurai_textbank2_w );
-WRITE8_HANDLER( tsamurai_scrolly_w );
-WRITE8_HANDLER( tsamurai_scrollx_w );
-WRITE8_HANDLER( tsamurai_bg_videoram_w );
-WRITE8_HANDLER( tsamurai_fg_videoram_w );
-WRITE8_HANDLER( tsamurai_fg_colorram_w );
VIDEO_START( tsamurai );
SCREEN_UPDATE_IND16( tsamurai );
diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h
index 814e55ac03c..5171f95562c 100644
--- a/src/mame/includes/tubep.h
+++ b/src/mame/includes/tubep.h
@@ -48,6 +48,14 @@ public:
DECLARE_READ8_MEMBER(rjammer_soundlatch_r);
DECLARE_WRITE8_MEMBER(rjammer_voice_input_w);
DECLARE_WRITE8_MEMBER(rjammer_voice_intensity_control_w);
+ DECLARE_WRITE8_MEMBER(tubep_textram_w);
+ DECLARE_WRITE8_MEMBER(tubep_background_romselect_w);
+ DECLARE_WRITE8_MEMBER(tubep_colorproms_A4_line_w);
+ DECLARE_WRITE8_MEMBER(tubep_background_a000_w);
+ DECLARE_WRITE8_MEMBER(tubep_background_c000_w);
+ DECLARE_WRITE8_MEMBER(tubep_sprite_control_w);
+ DECLARE_WRITE8_MEMBER(rjammer_background_LS377_w);
+ DECLARE_WRITE8_MEMBER(rjammer_background_page_w);
};
@@ -62,14 +70,6 @@ VIDEO_START( tubep );
VIDEO_RESET( tubep );
-extern WRITE8_HANDLER( tubep_textram_w );
-extern WRITE8_HANDLER( rjammer_background_LS377_w );
-extern WRITE8_HANDLER( rjammer_background_page_w );
-extern WRITE8_HANDLER( tubep_colorproms_A4_line_w );
-extern WRITE8_HANDLER( tubep_background_romselect_w );
-extern WRITE8_HANDLER( tubep_background_a000_w );
-extern WRITE8_HANDLER( tubep_background_c000_w );
-extern WRITE8_HANDLER( tubep_sprite_control_w );
diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h
index 04a845b154f..e7fa323eff3 100644
--- a/src/mame/includes/tumbleb.h
+++ b/src/mame/includes/tumbleb.h
@@ -48,22 +48,22 @@ public:
DECLARE_READ8_MEMBER(prot_io_r);
DECLARE_WRITE8_MEMBER(prot_io_w);
DECLARE_READ16_MEMBER(bcstory_1a0_read);
+ DECLARE_WRITE16_MEMBER(bcstory_tilebank_w);
+ DECLARE_WRITE16_MEMBER(chokchok_tilebank_w);
+ DECLARE_WRITE16_MEMBER(wlstar_tilebank_w);
+ DECLARE_WRITE16_MEMBER(suprtrio_tilebank_w);
+ DECLARE_WRITE16_MEMBER(tumblepb_pf1_data_w);
+ DECLARE_WRITE16_MEMBER(tumblepb_pf2_data_w);
+ DECLARE_WRITE16_MEMBER(fncywld_pf1_data_w);
+ DECLARE_WRITE16_MEMBER(fncywld_pf2_data_w);
+ DECLARE_WRITE16_MEMBER(tumblepb_control_0_w);
+ DECLARE_WRITE16_MEMBER(pangpang_pf1_data_w);
+ DECLARE_WRITE16_MEMBER(pangpang_pf2_data_w);
};
/*----------- defined in video/tumbleb.c -----------*/
-WRITE16_HANDLER( tumblepb_pf1_data_w );
-WRITE16_HANDLER( tumblepb_pf2_data_w );
-WRITE16_HANDLER( fncywld_pf1_data_w );
-WRITE16_HANDLER( fncywld_pf2_data_w );
-WRITE16_HANDLER( tumblepb_control_0_w );
-WRITE16_HANDLER( pangpang_pf1_data_w );
-WRITE16_HANDLER( pangpang_pf2_data_w );
-WRITE16_HANDLER( bcstory_tilebank_w );
-WRITE16_HANDLER( suprtrio_tilebank_w );
-WRITE16_HANDLER( chokchok_tilebank_w );
-WRITE16_HANDLER( wlstar_tilebank_w );
VIDEO_START( tumblepb );
VIDEO_START( fncywld );
diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h
index 715ae966c97..cbe6b8f0840 100644
--- a/src/mame/includes/tunhunt.h
+++ b/src/mame/includes/tunhunt.h
@@ -12,12 +12,12 @@ public:
bitmap_ind16 m_tmpbitmap;
DECLARE_WRITE8_MEMBER(tunhunt_control_w);
DECLARE_READ8_MEMBER(tunhunt_button_r);
+ DECLARE_WRITE8_MEMBER(tunhunt_videoram_w);
};
/*----------- defined in video/tunhunt.c -----------*/
-WRITE8_HANDLER( tunhunt_videoram_w );
PALETTE_INIT( tunhunt );
VIDEO_START( tunhunt );
diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h
index ec5dab7ee8d..080b7d854ca 100644
--- a/src/mame/includes/turbo.h
+++ b/src/mame/includes/turbo.h
@@ -88,6 +88,8 @@ public:
DECLARE_READ8_MEMBER(buckrog_cpu2_command_r);
DECLARE_READ8_MEMBER(buckrog_port_2_r);
DECLARE_READ8_MEMBER(buckrog_port_3_r);
+ DECLARE_WRITE8_MEMBER(turbo_videoram_w);
+ DECLARE_WRITE8_MEMBER(buckrog_bitmap_w);
};
@@ -122,5 +124,3 @@ PALETTE_INIT( buckrog );
VIDEO_START( buckrog );
SCREEN_UPDATE_IND16( buckrog );
-WRITE8_HANDLER( turbo_videoram_w );
-WRITE8_HANDLER( buckrog_bitmap_w );
diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h
index 311e9ba35df..c432e659b71 100644
--- a/src/mame/includes/tutankhm.h
+++ b/src/mame/includes/tutankhm.h
@@ -24,12 +24,12 @@ public:
DECLARE_WRITE8_MEMBER(tutankhm_bankselect_w);
DECLARE_WRITE8_MEMBER(sound_mute_w);
DECLARE_WRITE8_MEMBER(tutankhm_coin_counter_w);
+ DECLARE_WRITE8_MEMBER(tutankhm_flip_screen_x_w);
+ DECLARE_WRITE8_MEMBER(tutankhm_flip_screen_y_w);
};
/*----------- defined in video/tutankhm.c -----------*/
-WRITE8_HANDLER( tutankhm_flip_screen_x_w );
-WRITE8_HANDLER( tutankhm_flip_screen_y_w );
SCREEN_UPDATE_RGB32( tutankhm );
diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h
index 075cd18707a..c6e93f22b67 100644
--- a/src/mame/includes/twin16.h
+++ b/src/mame/includes/twin16.h
@@ -41,6 +41,11 @@ public:
DECLARE_READ16_MEMBER(cuebrickj_nvram_r);
DECLARE_WRITE16_MEMBER(cuebrickj_nvram_w);
DECLARE_WRITE16_MEMBER(cuebrickj_nvram_bank_w);
+ DECLARE_WRITE16_MEMBER(twin16_text_ram_w);
+ DECLARE_WRITE16_MEMBER(twin16_paletteram_word_w);
+ DECLARE_WRITE16_MEMBER(fround_gfx_bank_w);
+ DECLARE_WRITE16_MEMBER(twin16_video_register_w);
+ DECLARE_READ16_MEMBER(twin16_sprite_status_r);
};
@@ -51,11 +56,6 @@ int twin16_spriteram_process_enable( running_machine &machine );
/*----------- defined in video/twin16.c -----------*/
-WRITE16_HANDLER( twin16_text_ram_w );
-WRITE16_HANDLER( twin16_paletteram_word_w );
-WRITE16_HANDLER( fround_gfx_bank_w );
-WRITE16_HANDLER( twin16_video_register_w );
-READ16_HANDLER( twin16_sprite_status_r );
VIDEO_START( twin16 );
SCREEN_UPDATE_IND16( twin16 );
diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h
index d3286dd6e7d..c0dab619c13 100644
--- a/src/mame/includes/twincobr.h
+++ b/src/mame/includes/twincobr.h
@@ -51,6 +51,47 @@ public:
tilemap_t *m_fg_tilemap;
tilemap_t *m_tx_tilemap;
required_device<buffered_spriteram16_device> m_spriteram;
+ DECLARE_WRITE16_MEMBER(twincobr_dsp_addrsel_w);
+ DECLARE_READ16_MEMBER(twincobr_dsp_r);
+ DECLARE_WRITE16_MEMBER(twincobr_dsp_w);
+ DECLARE_WRITE16_MEMBER(wardner_dsp_addrsel_w);
+ DECLARE_READ16_MEMBER(wardner_dsp_r);
+ DECLARE_WRITE16_MEMBER(wardner_dsp_w);
+ DECLARE_WRITE16_MEMBER(twincobr_dsp_bio_w);
+ DECLARE_READ16_MEMBER(fsharkbt_dsp_r);
+ DECLARE_WRITE16_MEMBER(fsharkbt_dsp_w);
+ DECLARE_READ16_MEMBER(twincobr_BIO_r);
+ DECLARE_WRITE16_MEMBER(twincobr_control_w);
+ DECLARE_WRITE8_MEMBER(wardner_control_w);
+ DECLARE_READ16_MEMBER(twincobr_sharedram_r);
+ DECLARE_WRITE16_MEMBER(twincobr_sharedram_w);
+ DECLARE_WRITE16_MEMBER(fshark_coin_dsp_w);
+ DECLARE_WRITE8_MEMBER(twincobr_coin_w);
+ DECLARE_WRITE8_MEMBER(wardner_coin_dsp_w);
+ DECLARE_WRITE16_MEMBER(twincobr_txoffs_w);
+ DECLARE_READ16_MEMBER(twincobr_txram_r);
+ DECLARE_WRITE16_MEMBER(twincobr_txram_w);
+ DECLARE_WRITE16_MEMBER(twincobr_bgoffs_w);
+ DECLARE_READ16_MEMBER(twincobr_bgram_r);
+ DECLARE_WRITE16_MEMBER(twincobr_bgram_w);
+ DECLARE_WRITE16_MEMBER(twincobr_fgoffs_w);
+ DECLARE_READ16_MEMBER(twincobr_fgram_r);
+ DECLARE_WRITE16_MEMBER(twincobr_fgram_w);
+ DECLARE_WRITE16_MEMBER(twincobr_txscroll_w);
+ DECLARE_WRITE16_MEMBER(twincobr_bgscroll_w);
+ DECLARE_WRITE16_MEMBER(twincobr_fgscroll_w);
+ DECLARE_WRITE16_MEMBER(twincobr_exscroll_w);
+ DECLARE_WRITE8_MEMBER(wardner_txlayer_w);
+ DECLARE_WRITE8_MEMBER(wardner_bglayer_w);
+ DECLARE_WRITE8_MEMBER(wardner_fglayer_w);
+ DECLARE_WRITE8_MEMBER(wardner_txscroll_w);
+ DECLARE_WRITE8_MEMBER(wardner_bgscroll_w);
+ DECLARE_WRITE8_MEMBER(wardner_fgscroll_w);
+ DECLARE_WRITE8_MEMBER(wardner_exscroll_w);
+ DECLARE_READ8_MEMBER(wardner_videoram_r);
+ DECLARE_WRITE8_MEMBER(wardner_videoram_w);
+ DECLARE_READ8_MEMBER(wardner_sprite_r);
+ DECLARE_WRITE8_MEMBER(wardner_sprite_w);
};
@@ -63,23 +104,6 @@ void wardner_restore_bank(running_machine &machine);
INTERRUPT_GEN( twincobr_interrupt );
INTERRUPT_GEN( wardner_interrupt );
-WRITE16_HANDLER( twincobr_dsp_addrsel_w );
-READ16_HANDLER( twincobr_dsp_r );
-WRITE16_HANDLER( twincobr_dsp_w );
-WRITE16_HANDLER( twincobr_dsp_bio_w );
-READ16_HANDLER ( twincobr_BIO_r );
-WRITE16_HANDLER( twincobr_control_w );
-READ16_HANDLER( twincobr_sharedram_r );
-WRITE16_HANDLER( twincobr_sharedram_w );
-WRITE8_HANDLER( twincobr_coin_w );
-READ16_HANDLER( fsharkbt_dsp_r );
-WRITE16_HANDLER( fsharkbt_dsp_w );
-WRITE16_HANDLER( fshark_coin_dsp_w );
-WRITE16_HANDLER( wardner_dsp_addrsel_w );
-READ16_HANDLER( wardner_dsp_r );
-WRITE16_HANDLER( wardner_dsp_w );
-WRITE8_HANDLER( wardner_control_w );
-WRITE8_HANDLER( wardner_coin_dsp_w );
MACHINE_RESET( twincobr );
MACHINE_RESET( fsharkbt );
@@ -97,30 +121,6 @@ extern const mc6845_interface twincobr_mc6845_intf;
extern void twincobr_flipscreen(running_machine &machine, int flip);
extern void twincobr_display(running_machine &machine, int enable);
-READ16_HANDLER( twincobr_txram_r );
-READ16_HANDLER( twincobr_bgram_r );
-READ16_HANDLER( twincobr_fgram_r );
-WRITE16_HANDLER( twincobr_txram_w );
-WRITE16_HANDLER( twincobr_bgram_w );
-WRITE16_HANDLER( twincobr_fgram_w );
-WRITE16_HANDLER( twincobr_txscroll_w );
-WRITE16_HANDLER( twincobr_bgscroll_w );
-WRITE16_HANDLER( twincobr_fgscroll_w );
-WRITE16_HANDLER( twincobr_exscroll_w );
-WRITE16_HANDLER( twincobr_txoffs_w );
-WRITE16_HANDLER( twincobr_bgoffs_w );
-WRITE16_HANDLER( twincobr_fgoffs_w );
-WRITE8_HANDLER( wardner_videoram_w );
-READ8_HANDLER( wardner_videoram_r );
-WRITE8_HANDLER( wardner_bglayer_w );
-WRITE8_HANDLER( wardner_fglayer_w );
-WRITE8_HANDLER( wardner_txlayer_w );
-WRITE8_HANDLER( wardner_bgscroll_w );
-WRITE8_HANDLER( wardner_fgscroll_w );
-WRITE8_HANDLER( wardner_txscroll_w );
-WRITE8_HANDLER( wardner_exscroll_w );
-READ8_HANDLER( wardner_sprite_r );
-WRITE8_HANDLER( wardner_sprite_w );
VIDEO_START( toaplan0 );
diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h
index 12bc99d93e7..ea0cd59aa4b 100644
--- a/src/mame/includes/tx1.h
+++ b/src/mame/includes/tx1.h
@@ -120,23 +120,33 @@ public:
UINT8 *m_obj_bmp;
UINT8 *m_rod_bmp;
bitmap_ind16 *m_bitmap;
+ DECLARE_READ16_MEMBER(tx1_math_r);
+ DECLARE_WRITE16_MEMBER(tx1_math_w);
+ DECLARE_READ16_MEMBER(tx1_spcs_rom_r);
+ DECLARE_READ16_MEMBER(tx1_spcs_ram_r);
+ DECLARE_WRITE16_MEMBER(tx1_spcs_ram_w);
+ DECLARE_READ16_MEMBER(buggyboy_math_r);
+ DECLARE_WRITE16_MEMBER(buggyboy_math_w);
+ DECLARE_READ16_MEMBER(buggyboy_spcs_rom_r);
+ DECLARE_WRITE16_MEMBER(buggyboy_spcs_ram_w);
+ DECLARE_READ16_MEMBER(buggyboy_spcs_ram_r);
+ DECLARE_READ16_MEMBER(tx1_crtc_r);
+ DECLARE_WRITE16_MEMBER(tx1_crtc_w);
+ DECLARE_WRITE16_MEMBER(tx1_bankcs_w);
+ DECLARE_WRITE16_MEMBER(tx1_slincs_w);
+ DECLARE_WRITE16_MEMBER(tx1_slock_w);
+ DECLARE_WRITE16_MEMBER(tx1_scolst_w);
+ DECLARE_WRITE16_MEMBER(tx1_flgcs_w);
+ DECLARE_WRITE16_MEMBER(buggyboy_gas_w);
+ DECLARE_WRITE16_MEMBER(buggyboy_sky_w);
+ DECLARE_WRITE16_MEMBER(buggyboy_scolst_w);
};
/*----------- defined in machine/tx1.c -----------*/
-READ16_HANDLER( tx1_spcs_rom_r );
-READ16_HANDLER( tx1_spcs_ram_r );
-WRITE16_HANDLER( tx1_spcs_ram_w );
-READ16_HANDLER( tx1_math_r );
-WRITE16_HANDLER( tx1_math_w );
MACHINE_RESET( tx1 );
-READ16_HANDLER( buggyboy_spcs_rom_r );
-READ16_HANDLER( buggyboy_spcs_ram_r );
-WRITE16_HANDLER( buggyboy_spcs_ram_w );
-READ16_HANDLER( buggyboy_math_r );
-WRITE16_HANDLER( buggyboy_math_w );
MACHINE_RESET( buggyboy );
/*----------- defined in audio/tx1.c -----------*/
@@ -156,8 +166,6 @@ DECLARE_LEGACY_SOUND_DEVICE(TX1, tx1_sound);
/*----------- defined in video/tx1.c -----------*/
-READ16_HANDLER( tx1_crtc_r );
-WRITE16_HANDLER( tx1_crtc_w );
PALETTE_INIT( tx1 );
VIDEO_START( tx1 );
@@ -165,11 +173,6 @@ SCREEN_UPDATE_IND16( tx1_left );
SCREEN_UPDATE_IND16( tx1_middle );
SCREEN_UPDATE_IND16( tx1_right );
SCREEN_VBLANK( tx1 );
-WRITE16_HANDLER( tx1_slincs_w );
-WRITE16_HANDLER( tx1_slock_w );
-WRITE16_HANDLER( tx1_scolst_w );
-WRITE16_HANDLER( tx1_bankcs_w );
-WRITE16_HANDLER( tx1_flgcs_w );
PALETTE_INIT( buggyboy );
VIDEO_START( buggyboy );
@@ -180,6 +183,3 @@ SCREEN_VBLANK( buggyboy );
VIDEO_START( buggybjr );
SCREEN_UPDATE_IND16( buggybjr );
-WRITE16_HANDLER( buggyboy_gas_w );
-WRITE16_HANDLER( buggyboy_sky_w );
-WRITE16_HANDLER( buggyboy_scolst_w );
diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h
index 60d6df45d08..1c179b645c7 100644
--- a/src/mame/includes/ultraman.h
+++ b/src/mame/includes/ultraman.h
@@ -29,6 +29,7 @@ public:
device_t *m_k051960;
DECLARE_WRITE16_MEMBER(sound_cmd_w);
DECLARE_WRITE16_MEMBER(sound_irq_trigger_w);
+ DECLARE_WRITE16_MEMBER(ultraman_gfxctrl_w);
};
@@ -40,7 +41,6 @@ extern void ultraman_zoom_callback_0(running_machine &machine, int *code,int *co
extern void ultraman_zoom_callback_1(running_machine &machine, int *code,int *color,int *flags);
extern void ultraman_zoom_callback_2(running_machine &machine, int *code,int *color,int *flags);
-WRITE16_HANDLER( ultraman_gfxctrl_w );
VIDEO_START( ultraman );
SCREEN_UPDATE_IND16( ultraman );
diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h
index 9c342f135b8..1536759e34a 100644
--- a/src/mame/includes/ultratnk.h
+++ b/src/mame/includes/ultratnk.h
@@ -27,6 +27,7 @@ public:
DECLARE_WRITE8_MEMBER(ultratnk_led_1_w);
DECLARE_WRITE8_MEMBER(ultratnk_led_2_w);
DECLARE_WRITE8_MEMBER(ultratnk_lockout_w);
+ DECLARE_WRITE8_MEMBER(ultratnk_video_ram_w);
};
@@ -37,4 +38,3 @@ VIDEO_START( ultratnk );
SCREEN_UPDATE_IND16( ultratnk );
SCREEN_VBLANK( ultratnk );
-WRITE8_HANDLER( ultratnk_video_ram_w );
diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h
index 3d2fbe6093c..28ea81cd6d8 100644
--- a/src/mame/includes/unico.h
+++ b/src/mame/includes/unico.h
@@ -24,16 +24,16 @@ public:
DECLARE_READ32_MEMBER(zeropnt2_guny_1_msb_r);
DECLARE_WRITE32_MEMBER(zeropnt2_sound_bank_w);
DECLARE_WRITE32_MEMBER(zeropnt2_leds_w);
+ DECLARE_WRITE16_MEMBER(unico_palette_w);
+ DECLARE_WRITE32_MEMBER(unico_palette32_w);
+ DECLARE_WRITE16_MEMBER(unico_vram_w);
+ DECLARE_WRITE32_MEMBER(unico_vram32_w);
};
/*----------- defined in video/unico.c -----------*/
-WRITE16_HANDLER( unico_vram_w );
-WRITE16_HANDLER( unico_palette_w );
-WRITE32_HANDLER( unico_vram32_w );
-WRITE32_HANDLER( unico_palette32_w );
VIDEO_START( unico );
SCREEN_UPDATE_IND16( unico );
diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h
index 9468691e997..97093ed512e 100644
--- a/src/mame/includes/usgames.h
+++ b/src/mame/includes/usgames.h
@@ -10,13 +10,13 @@ public:
DECLARE_WRITE8_MEMBER(usgames_rombank_w);
DECLARE_WRITE8_MEMBER(lamps1_w);
DECLARE_WRITE8_MEMBER(lamps2_w);
+ DECLARE_WRITE8_MEMBER(usgames_videoram_w);
+ DECLARE_WRITE8_MEMBER(usgames_charram_w);
};
/*----------- defined in video/usgames.c -----------*/
-WRITE8_HANDLER( usgames_videoram_w );
-WRITE8_HANDLER( usgames_charram_w );
VIDEO_START( usgames );
PALETTE_INIT( usgames );
SCREEN_UPDATE_IND16( usgames );
diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h
index b7dc5627e4b..4cd2bd83279 100644
--- a/src/mame/includes/vaportra.h
+++ b/src/mame/includes/vaportra.h
@@ -31,14 +31,14 @@ public:
DECLARE_WRITE16_MEMBER(vaportra_sound_w);
DECLARE_READ16_MEMBER(vaportra_control_r);
DECLARE_READ8_MEMBER(vaportra_soundlatch_r);
+ DECLARE_WRITE16_MEMBER(vaportra_priority_w);
+ DECLARE_WRITE16_MEMBER(vaportra_palette_24bit_rg_w);
+ DECLARE_WRITE16_MEMBER(vaportra_palette_24bit_b_w);
};
/*----------- defined in video/vaportra.c -----------*/
-WRITE16_HANDLER( vaportra_priority_w );
-WRITE16_HANDLER( vaportra_palette_24bit_rg_w );
-WRITE16_HANDLER( vaportra_palette_24bit_b_w );
SCREEN_UPDATE_IND16( vaportra );
diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h
index 762974b6c5c..6c8b019ffb5 100644
--- a/src/mame/includes/vastar.h
+++ b/src/mame/includes/vastar.h
@@ -27,16 +27,16 @@ public:
DECLARE_WRITE8_MEMBER(vastar_sharedram_w);
DECLARE_WRITE8_MEMBER(flip_screen_w);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(vastar_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(vastar_bg1videoram_w);
+ DECLARE_WRITE8_MEMBER(vastar_bg2videoram_w);
+ DECLARE_READ8_MEMBER(vastar_bg1videoram_r);
+ DECLARE_READ8_MEMBER(vastar_bg2videoram_r);
};
/*----------- defined in video/vastar.c -----------*/
-WRITE8_HANDLER( vastar_bg1videoram_w );
-WRITE8_HANDLER( vastar_bg2videoram_w );
-WRITE8_HANDLER( vastar_fgvideoram_w );
-READ8_HANDLER( vastar_bg1videoram_r );
-READ8_HANDLER( vastar_bg2videoram_r );
VIDEO_START( vastar );
SCREEN_UPDATE_IND16( vastar );
diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h
index 2ab7b257442..f96434914d8 100644
--- a/src/mame/includes/vball.h
+++ b/src/mame/includes/vball.h
@@ -22,6 +22,9 @@ public:
DECLARE_WRITE8_MEMBER(cpu_sound_command_w);
DECLARE_WRITE8_MEMBER(vb_scrollx_hi_w);
DECLARE_WRITE8_MEMBER(vb_scrollx_lo_w);
+ DECLARE_WRITE8_MEMBER(vb_videoram_w);
+ DECLARE_READ8_MEMBER(vb_attrib_r);
+ DECLARE_WRITE8_MEMBER(vb_attrib_w);
};
@@ -31,6 +34,4 @@ VIDEO_START( vb );
SCREEN_UPDATE_IND16( vb );
void vb_bgprombank_w(running_machine &machine, int bank);
void vb_spprombank_w(running_machine &machine, int bank);
-WRITE8_HANDLER( vb_attrib_w );
-WRITE8_HANDLER( vb_videoram_w );
void vb_mark_all_dirty(running_machine &machine);
diff --git a/src/mame/includes/vectrex.h b/src/mame/includes/vectrex.h
index e40564276d4..18978bee8f5 100644
--- a/src/mame/includes/vectrex.h
+++ b/src/mame/includes/vectrex.h
@@ -61,6 +61,10 @@ public:
attotime m_vector_start_time;
UINT8 m_cb2;
void (*vector_add_point_function) (running_machine &, int, int, rgb_t, int);
+ DECLARE_WRITE8_MEMBER(vectrex_psg_port_w);
+ DECLARE_READ8_MEMBER(vectrex_via_r);
+ DECLARE_WRITE8_MEMBER(vectrex_via_w);
+ DECLARE_WRITE8_MEMBER(raaspec_led_w);
};
@@ -74,7 +78,6 @@ void vectrex_configuration(running_machine &machine);
READ8_DEVICE_HANDLER (vectrex_via_pa_r);
READ8_DEVICE_HANDLER(vectrex_via_pb_r );
void vectrex_via_irq (device_t *device, int level);
-WRITE8_HANDLER ( vectrex_psg_port_w );
DRIVER_INIT( vectrex );
@@ -92,10 +95,7 @@ SCREEN_UPDATE_RGB32( vectrex );
VIDEO_START( raaspec );
-WRITE8_HANDLER ( raaspec_led_w );
-READ8_HANDLER ( vectrex_via_r );
-WRITE8_HANDLER ( vectrex_via_w );
void vectrex_add_point_stereo (running_machine &machine, int x, int y, rgb_t color, int intensity);
void vectrex_add_point (running_machine &machine, int x, int y, rgb_t color, int intensity);
diff --git a/src/mame/includes/vertigo.h b/src/mame/includes/vertigo.h
index 2949e53e80b..b7202b21990 100644
--- a/src/mame/includes/vertigo.h
+++ b/src/mame/includes/vertigo.h
@@ -98,6 +98,13 @@ public:
vector_generator m_vgen;
UINT16 *m_vectorrom;
microcode m_mc[MC_LENGTH];
+ DECLARE_READ16_MEMBER(vertigo_io_convert);
+ DECLARE_READ16_MEMBER(vertigo_io_adc);
+ DECLARE_READ16_MEMBER(vertigo_coin_r);
+ DECLARE_WRITE16_MEMBER(vertigo_wsot_w);
+ DECLARE_WRITE16_MEMBER(vertigo_audio_w);
+ DECLARE_READ16_MEMBER(vertigo_sio_r);
+ DECLARE_WRITE16_MEMBER(vertigo_motor_w);
};
@@ -107,13 +114,6 @@ void vertigo_update_irq(device_t *device);
extern const struct pit8253_config vertigo_pit8254_config;
-READ16_HANDLER( vertigo_io_convert );
-READ16_HANDLER( vertigo_io_adc );
-READ16_HANDLER( vertigo_coin_r );
-READ16_HANDLER( vertigo_sio_r );
-WRITE16_HANDLER( vertigo_audio_w );
-WRITE16_HANDLER( vertigo_motor_w );
-WRITE16_HANDLER( vertigo_wsot_w );
INTERRUPT_GEN( vertigo_interrupt );
MACHINE_START( vertigo );
diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h
index 8b8ec52dfae..d369a610080 100644
--- a/src/mame/includes/vicdual.h
+++ b/src/mame/includes/vicdual.h
@@ -63,6 +63,7 @@ public:
DECLARE_WRITE8_MEMBER(nsub_io_w);
DECLARE_READ8_MEMBER(invinco_io_r);
DECLARE_WRITE8_MEMBER(invinco_io_w);
+ DECLARE_WRITE8_MEMBER(vicdual_palette_bank_w);
};
@@ -73,7 +74,6 @@ int vicdual_is_cabinet_color(running_machine &machine);
/*----------- defined in video/vicdual.c -----------*/
-WRITE8_HANDLER( vicdual_palette_bank_w );
SCREEN_UPDATE_RGB32( vicdual_bw );
SCREEN_UPDATE_RGB32( vicdual_color );
diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h
index 066f0f3ccf4..0afb1ca61d3 100644
--- a/src/mame/includes/victory.h
+++ b/src/mame/includes/victory.h
@@ -55,6 +55,9 @@ public:
UINT8 m_video_control;
struct micro_t m_micro;
DECLARE_WRITE8_MEMBER(lamp_control_w);
+ DECLARE_WRITE8_MEMBER(victory_paletteram_w);
+ DECLARE_READ8_MEMBER(victory_video_control_r);
+ DECLARE_WRITE8_MEMBER(victory_video_control_w);
};
@@ -64,6 +67,3 @@ VIDEO_START( victory );
SCREEN_UPDATE_IND16( victory );
INTERRUPT_GEN( victory_vblank_interrupt );
-READ8_HANDLER( victory_video_control_r );
-WRITE8_HANDLER( victory_video_control_w );
-WRITE8_HANDLER( victory_paletteram_w );
diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h
index bb62e4f959d..ce830043b19 100644
--- a/src/mame/includes/videopin.h
+++ b/src/mame/includes/videopin.h
@@ -31,6 +31,8 @@ public:
tilemap_t* m_bg_tilemap;
DECLARE_READ8_MEMBER(videopin_misc_r);
DECLARE_WRITE8_MEMBER(videopin_led_w);
+ DECLARE_WRITE8_MEMBER(videopin_ball_w);
+ DECLARE_WRITE8_MEMBER(videopin_video_ram_w);
};
@@ -41,8 +43,6 @@ DISCRETE_SOUND_EXTERN( videopin );
/*----------- defined in video/videopin.c -----------*/
-WRITE8_HANDLER( videopin_video_ram_w );
-WRITE8_HANDLER( videopin_ball_w );
VIDEO_START( videopin );
SCREEN_UPDATE_IND16( videopin );
diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h
index 1a368e0ad7a..187683f25d8 100644
--- a/src/mame/includes/vigilant.h
+++ b/src/mame/includes/vigilant.h
@@ -18,6 +18,10 @@ public:
DECLARE_WRITE8_MEMBER(vigilant_bank_select_w);
DECLARE_WRITE8_MEMBER(vigilant_out2_w);
DECLARE_WRITE8_MEMBER(kikcubic_coin_w);
+ DECLARE_WRITE8_MEMBER(vigilant_paletteram_w);
+ DECLARE_WRITE8_MEMBER(vigilant_horiz_scroll_w);
+ DECLARE_WRITE8_MEMBER(vigilant_rear_horiz_scroll_w);
+ DECLARE_WRITE8_MEMBER(vigilant_rear_color_w);
};
@@ -25,9 +29,5 @@ public:
VIDEO_START( vigilant );
VIDEO_RESET( vigilant );
-WRITE8_HANDLER( vigilant_paletteram_w );
-WRITE8_HANDLER( vigilant_horiz_scroll_w );
-WRITE8_HANDLER( vigilant_rear_horiz_scroll_w );
-WRITE8_HANDLER( vigilant_rear_color_w );
SCREEN_UPDATE_IND16( vigilant );
SCREEN_UPDATE_IND16( kikcubic );
diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h
index f01370a1c71..ee5a517c267 100644
--- a/src/mame/includes/volfied.h
+++ b/src/mame/includes/volfied.h
@@ -29,6 +29,17 @@ public:
device_t *m_maincpu;
device_t *m_audiocpu;
device_t *m_pc090oj;
+ DECLARE_WRITE16_MEMBER(volfied_cchip_ctrl_w);
+ DECLARE_WRITE16_MEMBER(volfied_cchip_bank_w);
+ DECLARE_WRITE16_MEMBER(volfied_cchip_ram_w);
+ DECLARE_READ16_MEMBER(volfied_cchip_ctrl_r);
+ DECLARE_READ16_MEMBER(volfied_cchip_ram_r);
+ DECLARE_READ16_MEMBER(volfied_video_ram_r);
+ DECLARE_WRITE16_MEMBER(volfied_video_ram_w);
+ DECLARE_WRITE16_MEMBER(volfied_video_ctrl_w);
+ DECLARE_READ16_MEMBER(volfied_video_ctrl_r);
+ DECLARE_WRITE16_MEMBER(volfied_video_mask_w);
+ DECLARE_WRITE16_MEMBER(volfied_sprite_ctrl_w);
};
@@ -37,22 +48,11 @@ public:
void volfied_cchip_init(running_machine &machine);
void volfied_cchip_reset(running_machine &machine);
-READ16_HANDLER( volfied_cchip_ctrl_r );
-READ16_HANDLER( volfied_cchip_ram_r );
-WRITE16_HANDLER( volfied_cchip_ctrl_w );
-WRITE16_HANDLER( volfied_cchip_bank_w );
-WRITE16_HANDLER( volfied_cchip_ram_w );
/*----------- defined in video/volfied.c -----------*/
-WRITE16_HANDLER( volfied_sprite_ctrl_w );
-WRITE16_HANDLER( volfied_video_ram_w );
-WRITE16_HANDLER( volfied_video_ctrl_w );
-WRITE16_HANDLER( volfied_video_mask_w );
-READ16_HANDLER( volfied_video_ram_r );
-READ16_HANDLER( volfied_video_ctrl_r );
SCREEN_UPDATE_IND16( volfied );
VIDEO_START( volfied );
diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h
index e958a1b9e50..68171b7594b 100644
--- a/src/mame/includes/vsnes.h
+++ b/src/mame/includes/vsnes.h
@@ -40,6 +40,35 @@ public:
DECLARE_WRITE8_MEMBER(vsnes_coin_counter_w);
DECLARE_READ8_MEMBER(vsnes_coin_counter_r);
DECLARE_WRITE8_MEMBER(vsnes_coin_counter_1_w);
+ DECLARE_WRITE8_MEMBER(vsnes_in0_w);
+ DECLARE_READ8_MEMBER(vsnes_in0_r);
+ DECLARE_READ8_MEMBER(vsnes_in1_r);
+ DECLARE_WRITE8_MEMBER(vsnes_in0_1_w);
+ DECLARE_READ8_MEMBER(vsnes_in0_1_r);
+ DECLARE_READ8_MEMBER(vsnes_in1_1_r);
+ DECLARE_READ8_MEMBER(gun_in0_r);
+ DECLARE_WRITE8_MEMBER(vsnes_nt0_w);
+ DECLARE_WRITE8_MEMBER(vsnes_nt1_w);
+ DECLARE_READ8_MEMBER(vsnes_nt0_r);
+ DECLARE_READ8_MEMBER(vsnes_nt1_r);
+ DECLARE_WRITE8_MEMBER(vsnormal_vrom_banking);
+ DECLARE_WRITE8_MEMBER(gun_in0_w);
+ DECLARE_WRITE8_MEMBER(vskonami_rom_banking);
+ DECLARE_WRITE8_MEMBER(vsgshoe_gun_in0_w);
+ DECLARE_WRITE8_MEMBER(drmario_rom_banking);
+ DECLARE_WRITE8_MEMBER(vsvram_rom_banking);
+ DECLARE_WRITE8_MEMBER(mapper4_w);
+ DECLARE_READ8_MEMBER(rbi_hack_r);
+ DECLARE_READ8_MEMBER(supxevs_read_prot_1_r);
+ DECLARE_READ8_MEMBER(supxevs_read_prot_2_r);
+ DECLARE_READ8_MEMBER(supxevs_read_prot_3_r);
+ DECLARE_READ8_MEMBER(supxevs_read_prot_4_r);
+ DECLARE_READ8_MEMBER(tko_security_r);
+ DECLARE_WRITE8_MEMBER(mapper68_rom_banking);
+ DECLARE_WRITE8_MEMBER(set_bnglngby_irq_w);
+ DECLARE_READ8_MEMBER(set_bnglngby_irq_r);
+ DECLARE_WRITE8_MEMBER(vsdual_vrom_banking);
+ void v_set_mirroring(int ppu, int mirroring);
};
@@ -78,9 +107,3 @@ DRIVER_INIT( vsgshoe );
DRIVER_INIT( vsfdf );
DRIVER_INIT( vsdual );
-READ8_HANDLER( vsnes_in0_r );
-READ8_HANDLER( vsnes_in1_r );
-READ8_HANDLER( vsnes_in0_1_r );
-READ8_HANDLER( vsnes_in1_1_r );
-WRITE8_HANDLER( vsnes_in0_w );
-WRITE8_HANDLER( vsnes_in0_1_w );
diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h
index d6e9e4006a7..a452a68759d 100644
--- a/src/mame/includes/vulgus.h
+++ b/src/mame/includes/vulgus.h
@@ -13,15 +13,15 @@ public:
tilemap_t *m_bg_tilemap;
UINT8 *m_spriteram;
size_t m_spriteram_size;
+ DECLARE_WRITE8_MEMBER(vulgus_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(vulgus_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(vulgus_c804_w);
+ DECLARE_WRITE8_MEMBER(vulgus_palette_bank_w);
};
/*----------- defined in video/vulgus.c -----------*/
-WRITE8_HANDLER( vulgus_fgvideoram_w );
-WRITE8_HANDLER( vulgus_bgvideoram_w );
-WRITE8_HANDLER( vulgus_c804_w );
-WRITE8_HANDLER( vulgus_palette_bank_w );
VIDEO_START( vulgus );
PALETTE_INIT( vulgus );
diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h
index 7866167c27a..33184cff325 100644
--- a/src/mame/includes/warpwarp.h
+++ b/src/mame/includes/warpwarp.h
@@ -23,6 +23,8 @@ public:
DECLARE_READ8_MEMBER(warpwarp_sw_r);
DECLARE_WRITE8_MEMBER(warpwarp_out0_w);
DECLARE_WRITE8_MEMBER(warpwarp_out3_w);
+ DECLARE_WRITE8_MEMBER(geebee_videoram_w);
+ DECLARE_WRITE8_MEMBER(warpwarp_videoram_w);
};
@@ -35,8 +37,6 @@ VIDEO_START( geebee );
VIDEO_START( navarone );
VIDEO_START( warpwarp );
SCREEN_UPDATE_IND16( geebee );
-WRITE8_HANDLER( warpwarp_videoram_w );
-WRITE8_HANDLER( geebee_videoram_w );
/*----------- defined in audio/geebee.c -----------*/
diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h
index e93ec322921..280f8a1417b 100644
--- a/src/mame/includes/wc90.h
+++ b/src/mame/includes/wc90.h
@@ -27,6 +27,9 @@ public:
DECLARE_WRITE8_MEMBER(wc90_bankswitch_w);
DECLARE_WRITE8_MEMBER(wc90_bankswitch1_w);
DECLARE_WRITE8_MEMBER(wc90_sound_command_w);
+ DECLARE_WRITE8_MEMBER(wc90_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(wc90_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(wc90_txvideoram_w);
};
@@ -34,7 +37,4 @@ public:
VIDEO_START( wc90 );
VIDEO_START( wc90t );
-WRITE8_HANDLER( wc90_fgvideoram_w );
-WRITE8_HANDLER( wc90_bgvideoram_w );
-WRITE8_HANDLER( wc90_txvideoram_w );
SCREEN_UPDATE_IND16( wc90 );
diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h
index 2c28c9a1311..74863e2485c 100644
--- a/src/mame/includes/wc90b.h
+++ b/src/mame/includes/wc90b.h
@@ -23,6 +23,9 @@ public:
DECLARE_WRITE8_MEMBER(wc90b_bankswitch1_w);
DECLARE_WRITE8_MEMBER(wc90b_sound_command_w);
DECLARE_WRITE8_MEMBER(adpcm_data_w);
+ DECLARE_WRITE8_MEMBER(wc90b_bgvideoram_w);
+ DECLARE_WRITE8_MEMBER(wc90b_fgvideoram_w);
+ DECLARE_WRITE8_MEMBER(wc90b_txvideoram_w);
};
@@ -31,6 +34,3 @@ public:
VIDEO_START( wc90b );
SCREEN_UPDATE_IND16( wc90b );
-WRITE8_HANDLER( wc90b_bgvideoram_w );
-WRITE8_HANDLER( wc90b_fgvideoram_w );
-WRITE8_HANDLER( wc90b_txvideoram_w );
diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h
index 98efc797826..ec1fbb142c1 100644
--- a/src/mame/includes/wecleman.h
+++ b/src/mame/includes/wecleman.h
@@ -48,16 +48,16 @@ public:
DECLARE_WRITE16_MEMBER(hotchase_soundlatch_w);
DECLARE_WRITE8_MEMBER(hotchase_sound_control_w);
DECLARE_WRITE16_MEMBER(wecleman_soundlatch_w);
+ DECLARE_WRITE16_MEMBER(wecleman_txtram_w);
+ DECLARE_WRITE16_MEMBER(wecleman_pageram_w);
+ DECLARE_WRITE16_MEMBER(wecleman_videostatus_w);
+ DECLARE_WRITE16_MEMBER(hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w);
+ DECLARE_WRITE16_MEMBER(wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w);
};
/*----------- defined in video/wecleman.c -----------*/
-WRITE16_HANDLER( hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w );
-WRITE16_HANDLER( wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w );
-WRITE16_HANDLER( wecleman_videostatus_w );
-WRITE16_HANDLER( wecleman_pageram_w );
-WRITE16_HANDLER( wecleman_txtram_w );
SCREEN_UPDATE_RGB32( wecleman );
VIDEO_START( wecleman );
SCREEN_UPDATE_IND16( hotchase );
diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h
index 929fd38d9aa..5a74642e938 100644
--- a/src/mame/includes/welltris.h
+++ b/src/mame/includes/welltris.h
@@ -20,17 +20,18 @@ public:
DECLARE_WRITE8_MEMBER(welltris_sh_bankswitch_w);
DECLARE_WRITE16_MEMBER(sound_command_w);
DECLARE_WRITE8_MEMBER(pending_command_clear_w);
+ DECLARE_READ16_MEMBER(welltris_spriteram_r);
+ DECLARE_WRITE16_MEMBER(welltris_spriteram_w);
+ DECLARE_WRITE16_MEMBER(welltris_palette_bank_w);
+ DECLARE_WRITE16_MEMBER(welltris_gfxbank_w);
+ DECLARE_WRITE16_MEMBER(welltris_scrollreg_w);
+ DECLARE_WRITE16_MEMBER(welltris_charvideoram_w);
+ void setbank(int num, int bank);
};
/*----------- defined in video/welltris.c -----------*/
-//READ16_HANDLER( welltris_spriteram_r );
-WRITE16_HANDLER( welltris_spriteram_w );
-WRITE16_HANDLER( welltris_palette_bank_w );
-WRITE16_HANDLER( welltris_gfxbank_w );
-WRITE16_HANDLER( welltris_charvideoram_w );
-WRITE16_HANDLER( welltris_scrollreg_w );
VIDEO_START( welltris );
SCREEN_UPDATE_IND16( welltris );
diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h
index 78d7c1e7b4f..3a8d47cbf1e 100644
--- a/src/mame/includes/wgp.h
+++ b/src/mame/includes/wgp.h
@@ -53,16 +53,16 @@ public:
DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
DECLARE_WRITE16_MEMBER(wgp_sound_w);
DECLARE_READ16_MEMBER(wgp_sound_r);
+ DECLARE_READ16_MEMBER(wgp_pivram_word_r);
+ DECLARE_WRITE16_MEMBER(wgp_pivram_word_w);
+ DECLARE_READ16_MEMBER(wgp_piv_ctrl_word_r);
+ DECLARE_WRITE16_MEMBER(wgp_piv_ctrl_word_w);
};
/*----------- defined in video/wgp.c -----------*/
-READ16_HANDLER ( wgp_pivram_word_r );
-WRITE16_HANDLER( wgp_pivram_word_w );
-READ16_HANDLER ( wgp_piv_ctrl_word_r );
-WRITE16_HANDLER( wgp_piv_ctrl_word_w );
VIDEO_START( wgp );
VIDEO_START( wgp2 );
diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h
index 3d26a5fd705..c2f5ce90595 100644
--- a/src/mame/includes/williams.h
+++ b/src/mame/includes/williams.h
@@ -40,6 +40,31 @@ public:
tilemap_t *m_bg_tilemap;
UINT16 m_tilemap_xscroll;
UINT8 m_williams2_fg_color;
+ DECLARE_WRITE8_MEMBER(williams_vram_select_w);
+ DECLARE_WRITE8_MEMBER(williams2_bank_select_w);
+ DECLARE_WRITE8_MEMBER(williams_cmos_w);
+ DECLARE_WRITE8_MEMBER(bubbles_cmos_w);
+ DECLARE_WRITE8_MEMBER(williams_watchdog_reset_w);
+ DECLARE_WRITE8_MEMBER(williams2_watchdog_reset_w);
+ DECLARE_WRITE8_MEMBER(williams2_7segment_w);
+ DECLARE_WRITE8_MEMBER(defender_video_control_w);
+ DECLARE_WRITE8_MEMBER(defender_bank_select_w);
+ DECLARE_READ8_MEMBER(mayday_protection_r);
+ DECLARE_WRITE8_MEMBER(sinistar_vram_select_w);
+ DECLARE_WRITE8_MEMBER(blaster_vram_select_w);
+ DECLARE_WRITE8_MEMBER(blaster_bank_select_w);
+ DECLARE_WRITE8_MEMBER(williams2_paletteram_w);
+ DECLARE_WRITE8_MEMBER(williams2_fg_select_w);
+ DECLARE_READ8_MEMBER(williams_video_counter_r);
+ DECLARE_READ8_MEMBER(williams2_video_counter_r);
+ DECLARE_WRITE8_MEMBER(williams2_bg_select_w);
+ DECLARE_WRITE8_MEMBER(williams2_tileram_w);
+ DECLARE_WRITE8_MEMBER(williams2_xscroll_low_w);
+ DECLARE_WRITE8_MEMBER(williams2_xscroll_high_w);
+ DECLARE_WRITE8_MEMBER(blaster_remap_select_w);
+ DECLARE_WRITE8_MEMBER(blaster_video_control_w);
+ DECLARE_WRITE8_MEMBER(williams_blitter_w);
+ DECLARE_WRITE8_MEMBER(williams2_blit_window_enable_w);
};
@@ -98,25 +123,12 @@ MACHINE_START( joust2 );
MACHINE_RESET( joust2 );
/* banking */
-WRITE8_HANDLER( defender_bank_select_w );
-WRITE8_HANDLER( williams_vram_select_w );
-WRITE8_HANDLER( sinistar_vram_select_w );
-WRITE8_HANDLER( blaster_bank_select_w );
-WRITE8_HANDLER( blaster_vram_select_w );
-WRITE8_HANDLER( williams2_bank_select_w );
/* misc */
-WRITE8_HANDLER( williams_cmos_w );
-WRITE8_HANDLER( bubbles_cmos_w );
-WRITE8_HANDLER( williams_watchdog_reset_w );
-WRITE8_HANDLER( williams2_watchdog_reset_w );
-WRITE8_HANDLER( williams2_7segment_w );
CUSTOM_INPUT( williams_mux_r );
/* Mayday protection */
-READ8_HANDLER( mayday_protection_r );
-WRITE8_HANDLER( defender_video_control_w );
/*----------- defined in video/williams.c -----------*/
@@ -128,11 +140,6 @@ WRITE8_HANDLER( defender_video_control_w );
#define WILLIAMS_TILEMAP_TSHOOT 1 /* IC79 is a 74LS157 selector jumpered to be enabled */
#define WILLIAMS_TILEMAP_JOUST2 2 /* IC79 is a 74LS157 selector jumpered to be disabled */
-WRITE8_HANDLER( williams_blitter_w );
-WRITE8_HANDLER( blaster_remap_select_w );
-WRITE8_HANDLER( blaster_video_control_w );
-READ8_HANDLER( williams_video_counter_r );
-READ8_HANDLER( williams2_video_counter_r );
VIDEO_START( williams );
VIDEO_START( blaster );
@@ -143,10 +150,3 @@ SCREEN_UPDATE_RGB32( blaster );
SCREEN_UPDATE_RGB32( williams2 );
-WRITE8_HANDLER( williams2_tileram_w );
-WRITE8_HANDLER( williams2_paletteram_w );
-WRITE8_HANDLER( williams2_fg_select_w );
-WRITE8_HANDLER( williams2_bg_select_w );
-WRITE8_HANDLER( williams2_xscroll_low_w );
-WRITE8_HANDLER( williams2_xscroll_high_w );
-WRITE8_HANDLER( williams2_blit_window_enable_w );
diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h
index fe41087b08c..24014d3ef7c 100644
--- a/src/mame/includes/wiping.h
+++ b/src/mame/includes/wiping.h
@@ -17,12 +17,12 @@ public:
DECLARE_WRITE8_MEMBER(subcpu_reset_w);
DECLARE_WRITE8_MEMBER(main_irq_mask_w);
DECLARE_WRITE8_MEMBER(sound_irq_mask_w);
+ DECLARE_WRITE8_MEMBER(wiping_flipscreen_w);
};
/*----------- defined in video/wiping.c -----------*/
-WRITE8_HANDLER( wiping_flipscreen_w );
PALETTE_INIT( wiping );
SCREEN_UPDATE_IND16( wiping );
diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h
index 7ce6c8c3fb5..cf17ce1ce22 100644
--- a/src/mame/includes/wiz.h
+++ b/src/mame/includes/wiz.h
@@ -28,16 +28,16 @@ public:
DECLARE_WRITE8_MEMBER(wiz_coin_counter_w);
DECLARE_WRITE8_MEMBER(wiz_main_nmi_mask_w);
DECLARE_WRITE8_MEMBER(wiz_sound_nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(wiz_palettebank_w);
+ DECLARE_WRITE8_MEMBER(wiz_bgcolor_w);
+ DECLARE_WRITE8_MEMBER(wiz_char_bank_select_w);
+ DECLARE_WRITE8_MEMBER(wiz_flipx_w);
+ DECLARE_WRITE8_MEMBER(wiz_flipy_w);
};
/*----------- defined in video/wiz.c -----------*/
-WRITE8_HANDLER( wiz_char_bank_select_w );
-WRITE8_HANDLER( wiz_palettebank_w );
-WRITE8_HANDLER( wiz_bgcolor_w );
-WRITE8_HANDLER( wiz_flipx_w );
-WRITE8_HANDLER( wiz_flipy_w );
VIDEO_START( wiz );
PALETTE_INIT( wiz );
diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h
index a510b6cecc2..df9865350ca 100644
--- a/src/mame/includes/wolfpack.h
+++ b/src/mame/includes/wolfpack.h
@@ -35,6 +35,18 @@ public:
DECLARE_WRITE8_MEMBER(wolfpack_attract_w);
DECLARE_WRITE8_MEMBER(wolfpack_credit_w);
DECLARE_WRITE8_MEMBER(wolfpack_coldetres_w);
+ DECLARE_WRITE8_MEMBER(wolfpack_ship_size_w);
+ DECLARE_WRITE8_MEMBER(wolfpack_video_invert_w);
+ DECLARE_WRITE8_MEMBER(wolfpack_ship_reflect_w);
+ DECLARE_WRITE8_MEMBER(wolfpack_pt_pos_select_w);
+ DECLARE_WRITE8_MEMBER(wolfpack_pt_horz_w);
+ DECLARE_WRITE8_MEMBER(wolfpack_pt_pic_w);
+ DECLARE_WRITE8_MEMBER(wolfpack_ship_h_w);
+ DECLARE_WRITE8_MEMBER(wolfpack_torpedo_pic_w);
+ DECLARE_WRITE8_MEMBER(wolfpack_ship_h_precess_w);
+ DECLARE_WRITE8_MEMBER(wolfpack_ship_pic_w);
+ DECLARE_WRITE8_MEMBER(wolfpack_torpedo_h_w);
+ DECLARE_WRITE8_MEMBER(wolfpack_torpedo_v_w);
};
@@ -45,15 +57,3 @@ SCREEN_UPDATE_IND16( wolfpack );
VIDEO_START( wolfpack );
SCREEN_VBLANK( wolfpack );
-WRITE8_HANDLER( wolfpack_video_invert_w );
-WRITE8_HANDLER( wolfpack_ship_reflect_w );
-WRITE8_HANDLER( wolfpack_pt_pos_select_w );
-WRITE8_HANDLER( wolfpack_pt_horz_w );
-WRITE8_HANDLER( wolfpack_pt_pic_w );
-WRITE8_HANDLER( wolfpack_ship_h_w );
-WRITE8_HANDLER( wolfpack_torpedo_pic_w );
-WRITE8_HANDLER( wolfpack_ship_size_w );
-WRITE8_HANDLER( wolfpack_ship_h_precess_w );
-WRITE8_HANDLER( wolfpack_ship_pic_w );
-WRITE8_HANDLER( wolfpack_torpedo_h_w );
-WRITE8_HANDLER( wolfpack_torpedo_v_w );
diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h
index 3eac64288fc..963ed676ceb 100644
--- a/src/mame/includes/wrally.h
+++ b/src/mame/includes/wrally.h
@@ -11,16 +11,16 @@ public:
UINT16 *m_spriteram;
DECLARE_READ8_MEMBER(dallas_share_r);
DECLARE_WRITE8_MEMBER(dallas_share_w);
+ DECLARE_WRITE16_MEMBER(wrally_vram_w);
+ DECLARE_WRITE16_MEMBER(wrally_flipscreen_w);
+ DECLARE_WRITE16_MEMBER(OKIM6295_bankswitch_w);
+ DECLARE_WRITE16_MEMBER(wrally_coin_counter_w);
+ DECLARE_WRITE16_MEMBER(wrally_coin_lockout_w);
};
/*----------- defined in machine/wrally.c -----------*/
-WRITE16_HANDLER( wrally_vram_w );
-WRITE16_HANDLER( wrally_flipscreen_w );
-WRITE16_HANDLER( OKIM6295_bankswitch_w );
-WRITE16_HANDLER( wrally_coin_counter_w );
-WRITE16_HANDLER( wrally_coin_lockout_w );
/*----------- defined in video/wrally.c -----------*/
diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h
index 9306c018e93..f1c94e11c71 100644
--- a/src/mame/includes/wwfsstar.h
+++ b/src/mame/includes/wwfsstar.h
@@ -16,6 +16,8 @@ public:
DECLARE_WRITE16_MEMBER(wwfsstar_soundwrite);
DECLARE_WRITE16_MEMBER(wwfsstar_flipscreen_w);
DECLARE_WRITE16_MEMBER(wwfsstar_irqack_w);
+ DECLARE_WRITE16_MEMBER(wwfsstar_fg0_videoram_w);
+ DECLARE_WRITE16_MEMBER(wwfsstar_bg0_videoram_w);
};
@@ -23,5 +25,3 @@ public:
VIDEO_START( wwfsstar );
SCREEN_UPDATE_IND16( wwfsstar );
-WRITE16_HANDLER( wwfsstar_fg0_videoram_w );
-WRITE16_HANDLER( wwfsstar_bg0_videoram_w );
diff --git a/src/mame/includes/wwfwfest.h b/src/mame/includes/wwfwfest.h
index 935592ac329..19223750fd5 100644
--- a/src/mame/includes/wwfwfest.h
+++ b/src/mame/includes/wwfwfest.h
@@ -29,6 +29,9 @@ public:
DECLARE_READ16_MEMBER(wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_r);
DECLARE_WRITE16_MEMBER(wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_w);
DECLARE_WRITE16_MEMBER(wwfwfest_soundwrite);
+ DECLARE_WRITE16_MEMBER(wwfwfest_fg0_videoram_w);
+ DECLARE_WRITE16_MEMBER(wwfwfest_bg0_videoram_w);
+ DECLARE_WRITE16_MEMBER(wwfwfest_bg1_videoram_w);
};
@@ -37,6 +40,3 @@ public:
VIDEO_START( wwfwfest );
VIDEO_START( wwfwfstb );
SCREEN_UPDATE_IND16( wwfwfest );
-WRITE16_HANDLER( wwfwfest_fg0_videoram_w );
-WRITE16_HANDLER( wwfwfest_bg0_videoram_w );
-WRITE16_HANDLER( wwfwfest_bg1_videoram_w );
diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h
index 00e595d81d0..5ecb73904b0 100644
--- a/src/mame/includes/xain.h
+++ b/src/mame/includes/xain.h
@@ -49,6 +49,14 @@ public:
DECLARE_WRITE8_MEMBER(xain_68705_port_c_w);
DECLARE_WRITE8_MEMBER(xain_68705_ddr_c_w);
DECLARE_READ8_MEMBER(mcu_comm_reset_r);
+ DECLARE_WRITE8_MEMBER(xain_bgram0_w);
+ DECLARE_WRITE8_MEMBER(xain_bgram1_w);
+ DECLARE_WRITE8_MEMBER(xain_charram_w);
+ DECLARE_WRITE8_MEMBER(xain_scrollxP0_w);
+ DECLARE_WRITE8_MEMBER(xain_scrollyP0_w);
+ DECLARE_WRITE8_MEMBER(xain_scrollxP1_w);
+ DECLARE_WRITE8_MEMBER(xain_scrollyP1_w);
+ DECLARE_WRITE8_MEMBER(xain_flipscreen_w);
};
@@ -56,11 +64,3 @@ public:
SCREEN_UPDATE_IND16( xain );
VIDEO_START( xain );
-WRITE8_HANDLER( xain_scrollxP0_w );
-WRITE8_HANDLER( xain_scrollyP0_w );
-WRITE8_HANDLER( xain_scrollxP1_w );
-WRITE8_HANDLER( xain_scrollyP1_w );
-WRITE8_HANDLER( xain_charram_w );
-WRITE8_HANDLER( xain_bgram0_w );
-WRITE8_HANDLER( xain_bgram1_w );
-WRITE8_HANDLER( xain_flipscreen_w );
diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h
index 41dccbff25f..01531d1a6da 100644
--- a/src/mame/includes/xorworld.h
+++ b/src/mame/includes/xorworld.h
@@ -9,12 +9,12 @@ public:
UINT16 *m_spriteram;
DECLARE_WRITE16_MEMBER(xorworld_irq2_ack_w);
DECLARE_WRITE16_MEMBER(xorworld_irq6_ack_w);
+ DECLARE_WRITE16_MEMBER(xorworld_videoram16_w);
};
/*----------- defined in video/xorworld.c -----------*/
-WRITE16_HANDLER( xorworld_videoram16_w );
PALETTE_INIT( xorworld );
VIDEO_START( xorworld );
diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h
index 5db6f1872b7..e335a4deb60 100644
--- a/src/mame/includes/xxmissio.h
+++ b/src/mame/includes/xxmissio.h
@@ -16,6 +16,10 @@ public:
DECLARE_WRITE8_MEMBER(xxmissio_bank_sel_w);
DECLARE_WRITE8_MEMBER(xxmissio_status_m_w);
DECLARE_WRITE8_MEMBER(xxmissio_status_s_w);
+ DECLARE_WRITE8_MEMBER(xxmissio_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(xxmissio_bgram_w);
+ DECLARE_READ8_MEMBER(xxmissio_bgram_r);
+ DECLARE_WRITE8_MEMBER(xxmissio_paletteram_w);
};
@@ -26,9 +30,5 @@ SCREEN_UPDATE_IND16( xxmissio );
WRITE8_DEVICE_HANDLER( xxmissio_scroll_x_w );
WRITE8_DEVICE_HANDLER( xxmissio_scroll_y_w );
-WRITE8_HANDLER( xxmissio_flipscreen_w );
-READ8_HANDLER( xxmissio_bgram_r );
-WRITE8_HANDLER( xxmissio_bgram_w );
-WRITE8_HANDLER( xxmissio_paletteram_w );
diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h
index 6a3a620d622..12309f82ec8 100644
--- a/src/mame/includes/xyonix.h
+++ b/src/mame/includes/xyonix.h
@@ -14,12 +14,12 @@ public:
DECLARE_WRITE8_MEMBER(xyonix_irqack_w);
DECLARE_READ8_MEMBER(xyonix_io_r);
DECLARE_WRITE8_MEMBER(xyonix_io_w);
+ DECLARE_WRITE8_MEMBER(xyonix_vidram_w);
};
/*----------- defined in video/xyonix.c -----------*/
PALETTE_INIT( xyonix );
-WRITE8_HANDLER( xyonix_vidram_w );
VIDEO_START(xyonix);
SCREEN_UPDATE_IND16(xyonix);
diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h
index 0e4c1fc60d3..73bf324e4ba 100644
--- a/src/mame/includes/yiear.h
+++ b/src/mame/includes/yiear.h
@@ -15,13 +15,13 @@ public:
UINT8 m_yiear_nmi_enable;
UINT8 m_yiear_irq_enable;
+ DECLARE_WRITE8_MEMBER(yiear_videoram_w);
+ DECLARE_WRITE8_MEMBER(yiear_control_w);
};
/*----------- defined in video/yiear.c -----------*/
-WRITE8_HANDLER( yiear_videoram_w );
-WRITE8_HANDLER( yiear_control_w );
PALETTE_INIT( yiear );
VIDEO_START( yiear );
diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h
index b19c58606cd..df3e0bfef47 100644
--- a/src/mame/includes/yunsun16.h
+++ b/src/mame/includes/yunsun16.h
@@ -30,13 +30,13 @@ public:
device_t *m_audiocpu;
DECLARE_WRITE16_MEMBER(yunsun16_sound_bank_w);
DECLARE_WRITE16_MEMBER(magicbub_sound_command_w);
+ DECLARE_WRITE16_MEMBER(yunsun16_vram_0_w);
+ DECLARE_WRITE16_MEMBER(yunsun16_vram_1_w);
};
/*----------- defined in video/yunsun16.c -----------*/
-WRITE16_HANDLER( yunsun16_vram_0_w );
-WRITE16_HANDLER( yunsun16_vram_1_w );
VIDEO_START( yunsun16 );
SCREEN_UPDATE_IND16( yunsun16 );
diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h
index 0cdbfd8bc0c..ef453d84bcf 100644
--- a/src/mame/includes/yunsung8.h
+++ b/src/mame/includes/yunsung8.h
@@ -29,15 +29,15 @@ public:
UINT8 m_videoram[0x4000];
DECLARE_WRITE8_MEMBER(yunsung8_bankswitch_w);
DECLARE_WRITE8_MEMBER(yunsung8_adpcm_w);
+ DECLARE_WRITE8_MEMBER(yunsung8_videobank_w);
+ DECLARE_READ8_MEMBER(yunsung8_videoram_r);
+ DECLARE_WRITE8_MEMBER(yunsung8_videoram_w);
+ DECLARE_WRITE8_MEMBER(yunsung8_flipscreen_w);
};
/*----------- defined in video/yunsung8.c -----------*/
-WRITE8_HANDLER( yunsung8_videobank_w );
-READ8_HANDLER ( yunsung8_videoram_r );
-WRITE8_HANDLER( yunsung8_videoram_w );
-WRITE8_HANDLER( yunsung8_flipscreen_w );
VIDEO_START( yunsung8 );
SCREEN_UPDATE_IND16( yunsung8 );
diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h
index 53924726824..12864a676d3 100644
--- a/src/mame/includes/zac2650.h
+++ b/src/mame/includes/zac2650.h
@@ -12,15 +12,15 @@ public:
int m_CollisionSprite;
tilemap_t *m_bg_tilemap;
DECLARE_WRITE8_MEMBER(tinvader_sound_w);
+ DECLARE_WRITE8_MEMBER(tinvader_videoram_w);
+ DECLARE_READ8_MEMBER(zac_s2636_r);
+ DECLARE_WRITE8_MEMBER(zac_s2636_w);
+ DECLARE_READ8_MEMBER(tinvader_port_0_r);
};
/*----------- defined in video/zac2650.c -----------*/
-WRITE8_HANDLER( tinvader_videoram_w );
-READ8_HANDLER( zac_s2636_r );
-WRITE8_HANDLER( zac_s2636_w );
-READ8_HANDLER( tinvader_port_0_r );
VIDEO_START( tinvader );
SCREEN_UPDATE_IND16( tinvader );
diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h
index 09b13eb8e4f..1f26ad1da25 100644
--- a/src/mame/includes/zaccaria.h
+++ b/src/mame/includes/zaccaria.h
@@ -23,6 +23,10 @@ public:
DECLARE_READ8_MEMBER(zaccaria_prot2_r);
DECLARE_WRITE8_MEMBER(coin_w);
DECLARE_WRITE8_MEMBER(nmi_mask_w);
+ DECLARE_WRITE8_MEMBER(zaccaria_videoram_w);
+ DECLARE_WRITE8_MEMBER(zaccaria_attributes_w);
+ DECLARE_WRITE8_MEMBER(zaccaria_flip_screen_x_w);
+ DECLARE_WRITE8_MEMBER(zaccaria_flip_screen_y_w);
};
@@ -30,8 +34,4 @@ public:
PALETTE_INIT( zaccaria );
VIDEO_START( zaccaria );
-WRITE8_HANDLER( zaccaria_videoram_w );
-WRITE8_HANDLER( zaccaria_attributes_w );
-WRITE8_HANDLER( zaccaria_flip_screen_x_w );
-WRITE8_HANDLER( zaccaria_flip_screen_y_w );
SCREEN_UPDATE_IND16( zaccaria );
diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h
index d4cd06ca59c..cc1497e4f7b 100644
--- a/src/mame/includes/zaxxon.h
+++ b/src/mame/includes/zaxxon.h
@@ -38,6 +38,16 @@ public:
DECLARE_READ8_MEMBER(razmataz_counter_r);
DECLARE_WRITE8_MEMBER(zaxxon_coin_counter_w);
DECLARE_WRITE8_MEMBER(zaxxon_coin_enable_w);
+ DECLARE_WRITE8_MEMBER(zaxxon_flipscreen_w);
+ DECLARE_WRITE8_MEMBER(zaxxon_fg_color_w);
+ DECLARE_WRITE8_MEMBER(zaxxon_bg_position_w);
+ DECLARE_WRITE8_MEMBER(zaxxon_bg_color_w);
+ DECLARE_WRITE8_MEMBER(zaxxon_bg_enable_w);
+ DECLARE_WRITE8_MEMBER(congo_fg_bank_w);
+ DECLARE_WRITE8_MEMBER(congo_color_bank_w);
+ DECLARE_WRITE8_MEMBER(zaxxon_videoram_w);
+ DECLARE_WRITE8_MEMBER(congo_colorram_w);
+ DECLARE_WRITE8_MEMBER(congo_sprite_custom_w);
};
@@ -56,18 +66,8 @@ MACHINE_CONFIG_EXTERN( congo_samples );
/*----------- defined in video/zaxxon.c -----------*/
-WRITE8_HANDLER( zaxxon_flipscreen_w );
-WRITE8_HANDLER( zaxxon_fg_color_w );
-WRITE8_HANDLER( zaxxon_bg_position_w );
-WRITE8_HANDLER( zaxxon_bg_color_w );
-WRITE8_HANDLER( zaxxon_bg_enable_w );
-WRITE8_HANDLER( zaxxon_videoram_w );
-WRITE8_HANDLER( congo_colorram_w );
-WRITE8_HANDLER( congo_fg_bank_w );
-WRITE8_HANDLER( congo_color_bank_w );
-WRITE8_HANDLER( congo_sprite_custom_w );
PALETTE_INIT( zaxxon );
diff --git a/src/mame/machine/3do.c b/src/mame/machine/3do.c
index ff420bb06ba..188fec67ecf 100644
--- a/src/mame/machine/3do.c
+++ b/src/mame/machine/3do.c
@@ -61,13 +61,13 @@ Expansion bus stuff:
-READ32_HANDLER( _3do_nvarea_r ) {
- logerror( "%08X: NVRAM read offset = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset );
+READ32_MEMBER(_3do_state::_3do_nvarea_r){
+ logerror( "%08X: NVRAM read offset = %08X\n", cpu_get_pc(machine().device("maincpu")), offset );
return 0;
}
-WRITE32_HANDLER( _3do_nvarea_w ) {
- logerror( "%08X: NVRAM write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset, data, mem_mask );
+WRITE32_MEMBER(_3do_state::_3do_nvarea_w){
+ logerror( "%08X: NVRAM write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(machine().device("maincpu")), offset, data, mem_mask );
}
@@ -97,37 +97,35 @@ WRITE32_HANDLER( _3do_nvarea_w ) {
3022630
*/
-READ32_HANDLER( _3do_slow2_r ) {
- _3do_state *state = space->machine().driver_data<_3do_state>();
+READ32_MEMBER(_3do_state::_3do_slow2_r){
UINT32 data = 0;
- logerror( "%08X: UNK_318 read offset = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset );
+ logerror( "%08X: UNK_318 read offset = %08X\n", cpu_get_pc(machine().device("maincpu")), offset );
switch( offset ) {
case 0: /* Boot ROM checks here and expects to read 1, 0, 1, 0 in the lowest bit */
- data = state->m_slow2.cg_output & 0x00000001;
- state->m_slow2.cg_output = state->m_slow2.cg_output >> 1;
- state->m_slow2.cg_w_count = 0;
+ data = m_slow2.cg_output & 0x00000001;
+ m_slow2.cg_output = m_slow2.cg_output >> 1;
+ m_slow2.cg_w_count = 0;
}
return data;
}
-WRITE32_HANDLER( _3do_slow2_w )
+WRITE32_MEMBER(_3do_state::_3do_slow2_w)
{
- _3do_state *state = space->machine().driver_data<_3do_state>();
- logerror( "%08X: UNK_318 write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset, data, mem_mask );
+ logerror( "%08X: UNK_318 write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(machine().device("maincpu")), offset, data, mem_mask );
switch( offset )
{
case 0: /* Boot ROM writes 03180000 here and then starts reading some things */
{
/* disable ROM overlay */
- memory_set_bank(space->machine(), "bank1", 0);
+ memory_set_bank(machine(), "bank1", 0);
}
- state->m_slow2.cg_input = state->m_slow2.cg_input << 1 | ( data & 0x00000001 );
- state->m_slow2.cg_w_count ++;
- if ( state->m_slow2.cg_w_count == 16 )
+ m_slow2.cg_input = m_slow2.cg_input << 1 | ( data & 0x00000001 );
+ m_slow2.cg_w_count ++;
+ if ( m_slow2.cg_w_count == 16 )
{
}
break;
@@ -143,24 +141,23 @@ void _3do_slow2_init( running_machine &machine )
}
-READ32_HANDLER( _3do_svf_r )
+READ32_MEMBER(_3do_state::_3do_svf_r)
{
- _3do_state *state = space->machine().driver_data<_3do_state>();
UINT32 addr = ( offset & ( 0x07fc / 4 ) ) << 9;
- UINT32 *p = state->m_vram + addr;
+ UINT32 *p = m_vram + addr;
- logerror( "%08X: SVF read offset = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset*4 );
+ logerror( "%08X: SVF read offset = %08X\n", cpu_get_pc(machine().device("maincpu")), offset*4 );
switch( offset & ( 0xE000 / 4 ) )
{
case 0x0000/4: /* SPORT transfer */
for ( int i = 0; i < 512; i++ )
{
- state->m_svf.sport[i] = p[i];
+ m_svf.sport[i] = p[i];
}
break;
case 0x2000/4: /* Write to color register */
- return state->m_svf.color;
+ return m_svf.color;
case 0x4000/4: /* Flash write */
break;
case 0x6000/4: /* CAS before RAS refresh/reset (CBR). Used to initialize VRAM mode during boot. */
@@ -169,13 +166,12 @@ READ32_HANDLER( _3do_svf_r )
return 0;
}
-WRITE32_HANDLER( _3do_svf_w )
+WRITE32_MEMBER(_3do_state::_3do_svf_w)
{
- _3do_state *state = space->machine().driver_data<_3do_state>();
UINT32 addr = ( offset & ( 0x07fc / 4 ) ) << 9;
- UINT32 *p = state->m_vram + addr;
+ UINT32 *p = m_vram + addr;
- logerror( "%08X: SVF write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset*4, data, mem_mask );
+ logerror( "%08X: SVF write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(machine().device("maincpu")), offset*4, data, mem_mask );
switch( offset & ( 0xe000 / 4 ) )
{
@@ -185,17 +181,17 @@ WRITE32_HANDLER( _3do_svf_w )
for ( int i = 0; i < 512; i++ )
{
- p[i] = ( p[i] & keep_bits ) | ( state->m_svf.sport[i] & data );
+ p[i] = ( p[i] & keep_bits ) | ( m_svf.sport[i] & data );
}
}
break;
case 0x2000/4: /* Write to color register */
- state->m_svf.color = data;
+ m_svf.color = data;
break;
case 0x4000/4: /* Flash write */
{
UINT32 keep_bits = data ^ 0xffffffff;
- UINT32 new_bits = state->m_svf.color & data;
+ UINT32 new_bits = m_svf.color & data;
for ( int i = 0; i < 512; i++ )
{
@@ -210,55 +206,54 @@ WRITE32_HANDLER( _3do_svf_w )
-READ32_HANDLER( _3do_madam_r ) {
- _3do_state *state = space->machine().driver_data<_3do_state>();
- logerror( "%08X: MADAM read offset = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset*4 );
+READ32_MEMBER(_3do_state::_3do_madam_r){
+ logerror( "%08X: MADAM read offset = %08X\n", cpu_get_pc(machine().device("maincpu")), offset*4 );
switch( offset ) {
case 0x0000/4: /* 03300000 - Revision */
- return state->m_madam.revision;
+ return m_madam.revision;
case 0x0004/4:
- return state->m_madam.msysbits;
+ return m_madam.msysbits;
case 0x0008/4:
- return state->m_madam.mctl;
+ return m_madam.mctl;
case 0x000c/4:
- return state->m_madam.sltime;
+ return m_madam.sltime;
case 0x0020/4:
- return state->m_madam.abortbits;
+ return m_madam.abortbits;
case 0x0024/4:
- return state->m_madam.privbits;
+ return m_madam.privbits;
case 0x0028/4:
- return state->m_madam.statbits;
+ return m_madam.statbits;
case 0x0040/4:
- return state->m_madam.diag;
+ return m_madam.diag;
case 0x0110/4:
- return state->m_madam.ccobctl0;
+ return m_madam.ccobctl0;
case 0x0120/4:
- return state->m_madam.ppmpc;
+ return m_madam.ppmpc;
case 0x0130/4:
- return state->m_madam.regctl0;
+ return m_madam.regctl0;
case 0x0134/4:
- return state->m_madam.regctl1;
+ return m_madam.regctl1;
case 0x0138/4:
- return state->m_madam.regctl2;
+ return m_madam.regctl2;
case 0x013c/4:
- return state->m_madam.regctl3;
+ return m_madam.regctl3;
case 0x0140/4:
- return state->m_madam.xyposh;
+ return m_madam.xyposh;
case 0x0144/4:
- return state->m_madam.xyposl;
+ return m_madam.xyposl;
case 0x0148/4:
- return state->m_madam.linedxyh;
+ return m_madam.linedxyh;
case 0x014c/4:
- return state->m_madam.linedxyl;
+ return m_madam.linedxyl;
case 0x0150/4:
- return state->m_madam.dxyh;
+ return m_madam.dxyh;
case 0x0154/4:
- return state->m_madam.dxyl;
+ return m_madam.dxyl;
case 0x0158/4:
- return state->m_madam.ddxyh;
+ return m_madam.ddxyh;
case 0x015c/4:
- return state->m_madam.ddxyl;
+ return m_madam.ddxyl;
case 0x0180/4: case 0x0188/4:
case 0x0190/4: case 0x0198/4:
case 0x01a0/4: case 0x01a8/4:
@@ -267,7 +262,7 @@ READ32_HANDLER( _3do_madam_r ) {
case 0x01d0/4: case 0x01d8/4:
case 0x01e0/4: case 0x01e8/4:
case 0x01f0/4: case 0x01f8/4:
- return state->m_madam.pip[(offset/2) & 0x0f] & 0xffff;
+ return m_madam.pip[(offset/2) & 0x0f] & 0xffff;
case 0x0184/4: case 0x018c/4:
case 0x0194/4: case 0x019c/4:
case 0x01a4/4: case 0x01ac/4:
@@ -276,7 +271,7 @@ READ32_HANDLER( _3do_madam_r ) {
case 0x01d4/4: case 0x01dc/4:
case 0x01e4/4: case 0x01ec/4:
case 0x01f4/4: case 0x01fc/4:
- return state->m_madam.pip[(offset/2) & 0x0f] >> 16;
+ return m_madam.pip[(offset/2) & 0x0f] >> 16;
case 0x0200/4: case 0x0208/4:
case 0x0210/4: case 0x0218/4:
case 0x0220/4: case 0x0228/4:
@@ -285,7 +280,7 @@ READ32_HANDLER( _3do_madam_r ) {
case 0x0250/4: case 0x0258/4:
case 0x0260/4: case 0x0268/4:
case 0x0270/4: case 0x0278/4:
- return state->m_madam.fence[(offset/2) & 0x0f] & 0xffff;
+ return m_madam.fence[(offset/2) & 0x0f] & 0xffff;
case 0x0204/4: case 0x020c/4:
case 0x0214/4: case 0x021c/4:
case 0x0224/4: case 0x022c/4:
@@ -294,7 +289,7 @@ READ32_HANDLER( _3do_madam_r ) {
case 0x0254/4: case 0x025c/4:
case 0x0264/4: case 0x026c/4:
case 0x0274/4: case 0x027c/4:
- return state->m_madam.fence[(offset/2) & 0x0f] >> 16;
+ return m_madam.fence[(offset/2) & 0x0f] >> 16;
case 0x0300/4: case 0x0304/4: case 0x0308/4: case 0x030c/4:
case 0x0310/4: case 0x0314/4: case 0x0318/4: case 0x031c/4:
case 0x0320/4: case 0x0324/4: case 0x0328/4: case 0x032c/4:
@@ -311,7 +306,7 @@ READ32_HANDLER( _3do_madam_r ) {
case 0x03d0/4: case 0x03d4/4: case 0x03d8/4: case 0x03dc/4:
case 0x03e0/4: case 0x03e4/4: case 0x03e8/4: case 0x03ec/4:
case 0x03f0/4: case 0x03f4/4: case 0x03f8/4: case 0x03fc/4:
- return state->m_madam.mmu[offset&0x3f];
+ return m_madam.mmu[offset&0x3f];
case 0x0400/4: case 0x0404/4: case 0x0408/4: case 0x040c/4:
case 0x0410/4: case 0x0414/4: case 0x0418/4: case 0x041c/4:
case 0x0420/4: case 0x0424/4: case 0x0428/4: case 0x042c/4:
@@ -344,7 +339,7 @@ READ32_HANDLER( _3do_madam_r ) {
case 0x05d0/4: case 0x05d4/4: case 0x05d8/4: case 0x05dc/4:
case 0x05e0/4: case 0x05e4/4: case 0x05e8/4: case 0x05ec/4:
case 0x05f0/4: case 0x05f4/4: case 0x05f8/4: case 0x05fc/4:
- return state->m_madam.dma[(offset/4) & 0x1f][offset & 0x03];
+ return m_madam.dma[(offset/4) & 0x1f][offset & 0x03];
/* Hardware multiplier */
case 0x0600/4: case 0x0604/4: case 0x0608/4: case 0x060c/4:
@@ -357,45 +352,44 @@ READ32_HANDLER( _3do_madam_r ) {
case 0x0670/4: case 0x0674/4: case 0x0678/4: case 0x067c/4:
case 0x0680/4: case 0x0684/4: case 0x0688/4: case 0x068c/4:
case 0x0690/4: case 0x0694/4: case 0x0698/4: case 0x069c/4:
- return state->m_madam.mult[offset & 0x3f];
+ return m_madam.mult[offset & 0x3f];
case 0x07f0/4:
- return state->m_madam.mult_control;
+ return m_madam.mult_control;
case 0x07f8/4:
- return state->m_madam.mult_status;
+ return m_madam.mult_status;
default:
- logerror( "%08X: unhandled MADAM read offset = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset*4 );
+ logerror( "%08X: unhandled MADAM read offset = %08X\n", cpu_get_pc(machine().device("maincpu")), offset*4 );
break;
}
return 0;
}
-WRITE32_HANDLER( _3do_madam_w ) {
- _3do_state *state = space->machine().driver_data<_3do_state>();
- logerror( "%08X: MADAM write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset*4, data, mem_mask );
+WRITE32_MEMBER(_3do_state::_3do_madam_w){
+ logerror( "%08X: MADAM write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(machine().device("maincpu")), offset*4, data, mem_mask );
switch( offset ) {
case 0x0000/4:
break;
case 0x0004/4: /* 03300004 - Memory configuration 29 = 2MB DRAM, 1MB VRAM */
- state->m_madam.msysbits = data;
+ m_madam.msysbits = data;
break;
case 0x0008/4:
- state->m_madam.mctl = data;
+ m_madam.mctl = data;
break;
case 0x000c/4:
- state->m_madam.sltime = data;
+ m_madam.sltime = data;
break;
case 0x0020/4:
- state->m_madam.abortbits = data;
+ m_madam.abortbits = data;
break;
case 0x0024/4:
- state->m_madam.privbits = data;
+ m_madam.privbits = data;
break;
case 0x0028/4:
- state->m_madam.statbits = data;
+ m_madam.statbits = data;
case 0x0040/4:
- state->m_madam.diag = 1;
+ m_madam.diag = 1;
break;
/* CEL */
@@ -405,48 +399,48 @@ WRITE32_HANDLER( _3do_madam_w ) {
case 0x010c/4: /* 0330010c - SPRPAUS - Pause the the CEL engine (W) */
break;
case 0x0110/4: /* 03300110 - CCOBCTL0 - CCoB control (RW) */
- state->m_madam.ccobctl0 = data;
+ m_madam.ccobctl0 = data;
break;
case 0x0129/4: /* 03300120 - PPMPC (RW) */
- state->m_madam.ppmpc = data;
+ m_madam.ppmpc = data;
break;
/* Regis */
case 0x0130/4:
- state->m_madam.regctl0 = data;
+ m_madam.regctl0 = data;
break;
case 0x0134/4:
- state->m_madam.regctl1 = data;
+ m_madam.regctl1 = data;
break;
case 0x0138/4:
- state->m_madam.regctl2 = data;
+ m_madam.regctl2 = data;
break;
case 0x013c/4:
- state->m_madam.regctl3 = data;
+ m_madam.regctl3 = data;
break;
case 0x0140/4:
- state->m_madam.xyposh = data;
+ m_madam.xyposh = data;
break;
case 0x0144/4:
- state->m_madam.xyposl = data;
+ m_madam.xyposl = data;
break;
case 0x0148/4:
- state->m_madam.linedxyh = data;
+ m_madam.linedxyh = data;
break;
case 0x014c/4:
- state->m_madam.linedxyl = data;
+ m_madam.linedxyl = data;
break;
case 0x0150/4:
- state->m_madam.dxyh = data;
+ m_madam.dxyh = data;
break;
case 0x0154/4:
- state->m_madam.dxyl = data;
+ m_madam.dxyl = data;
break;
case 0x0158/4:
- state->m_madam.ddxyh = data;
+ m_madam.ddxyh = data;
break;
case 0x015c/4:
- state->m_madam.ddxyl = data;
+ m_madam.ddxyl = data;
break;
/* Pip */
@@ -454,7 +448,7 @@ WRITE32_HANDLER( _3do_madam_w ) {
case 0x0190/4: case 0x0194/4: case 0x0198/4: case 0x019c/4:
case 0x01a0/4: case 0x01a4/4: case 0x01a8/4: case 0x01ac/4:
case 0x01b0/4: case 0x01b4/4: case 0x01b8/4: case 0x01bc/4:
- state->m_madam.pip[offset & 0x0f] = data;
+ m_madam.pip[offset & 0x0f] = data;
break;
/* Fence */
@@ -462,7 +456,7 @@ WRITE32_HANDLER( _3do_madam_w ) {
case 0x0210/4: case 0x0214/4: case 0x0218/4: case 0x021c/4:
case 0x0220/4: case 0x0224/4: case 0x0228/4: case 0x022c/4:
case 0x0230/4: case 0x0234/4: case 0x0238/4: case 0x023c/4:
- state->m_madam.fence[offset & 0x0f] = data;
+ m_madam.fence[offset & 0x0f] = data;
break;
/* MMU */
@@ -482,7 +476,7 @@ WRITE32_HANDLER( _3do_madam_w ) {
case 0x03d0/4: case 0x03d4/4: case 0x03d8/4: case 0x03dc/4:
case 0x03e0/4: case 0x03e4/4: case 0x03e8/4: case 0x03ec/4:
case 0x03f0/4: case 0x03f4/4: case 0x03f8/4: case 0x03fc/4:
- state->m_madam.mmu[offset&0x3f] = data;
+ m_madam.mmu[offset&0x3f] = data;
break;
/* DMA */
@@ -518,7 +512,7 @@ WRITE32_HANDLER( _3do_madam_w ) {
case 0x05d0/4: case 0x05d4/4: case 0x05d8/4: case 0x05dc/4:
case 0x05e0/4: case 0x05e4/4: case 0x05e8/4: case 0x05ec/4:
case 0x05f0/4: case 0x05f4/4: case 0x05f8/4: case 0x05fc/4:
- state->m_madam.dma[(offset/4) & 0x1f][offset & 0x03] = data;
+ m_madam.dma[(offset/4) & 0x1f][offset & 0x03] = data;
return;
/* Hardware multiplier */
@@ -532,18 +526,18 @@ WRITE32_HANDLER( _3do_madam_w ) {
case 0x0670/4: case 0x0674/4: case 0x0678/4: case 0x067c/4:
case 0x0680/4: case 0x0684/4: case 0x0688/4: case 0x068c/4:
case 0x0690/4: case 0x0694/4: case 0x0698/4: case 0x069c/4:
- state->m_madam.mult[offset & 0x3f] = data;
+ m_madam.mult[offset & 0x3f] = data;
case 0x07f0/4:
- state->m_madam.mult_control |= data;
+ m_madam.mult_control |= data;
break;
case 0x07f4/4:
- state->m_madam.mult_control &= ~data;
+ m_madam.mult_control &= ~data;
break;
case 0x07fc/4: /* Start process */
break;
default:
- logerror( "%08X: unhandled MADAM write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset*4, data, mem_mask );
+ logerror( "%08X: unhandled MADAM write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(machine().device("maincpu")), offset*4, data, mem_mask );
break;
}
}
@@ -558,371 +552,369 @@ void _3do_madam_init( running_machine &machine )
}
-READ32_HANDLER( _3do_clio_r )
+READ32_MEMBER(_3do_state::_3do_clio_r)
{
- _3do_state *state = space->machine().driver_data<_3do_state>();
- logerror( "%08X: CLIO read offset = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset * 4 );
+ logerror( "%08X: CLIO read offset = %08X\n", cpu_get_pc(machine().device("maincpu")), offset * 4 );
switch( offset )
{
case 0x0000/4:
- return state->m_clio.revision;
+ return m_clio.revision;
case 0x0020/4:
- return state->m_clio.audin;
+ return m_clio.audin;
case 0x0024/4:
- return state->m_clio.audout;
+ return m_clio.audout;
case 0x0028/4:
- return state->m_clio.cstatbits;
+ return m_clio.cstatbits;
case 0x0030/4:
- return state->m_clio.screen->hpos();
+ return m_clio.screen->hpos();
case 0x0034/4:
/* This needs to moved to a proper timer callback function */
- if ( state->m_clio.screen->vpos() == 0 )
+ if ( m_clio.screen->vpos() == 0 )
{
- state->m_clio.vcnt ^= 0x800;
+ m_clio.vcnt ^= 0x800;
}
- return ( state->m_clio.vcnt & 0x800 ) | state->m_clio.screen->vpos();
+ return ( m_clio.vcnt & 0x800 ) | m_clio.screen->vpos();
case 0x0038/4:
- return state->m_clio.seed;
+ return m_clio.seed;
case 0x003c/4:
- return state->m_clio.random;
+ return m_clio.random;
case 0x0080/4:
- return state->m_clio.hdelay;
+ return m_clio.hdelay;
case 0x0084/4:
- return state->m_clio.adbio;
+ return m_clio.adbio;
case 0x0088/4:
- return state->m_clio.adbctl;
+ return m_clio.adbctl;
case 0x0100/4:
- return state->m_clio.timer0;
+ return m_clio.timer0;
case 0x0104/4:
- return state->m_clio.timerback0;
+ return m_clio.timerback0;
case 0x0108/4:
- return state->m_clio.timer1;
+ return m_clio.timer1;
case 0x010c/4:
- return state->m_clio.timerback1;
+ return m_clio.timerback1;
case 0x0110/4:
- return state->m_clio.timer2;
+ return m_clio.timer2;
case 0x0114/4:
- return state->m_clio.timerback2;
+ return m_clio.timerback2;
case 0x0118/4:
- return state->m_clio.timer3;
+ return m_clio.timer3;
case 0x011c/4:
- return state->m_clio.timerback3;
+ return m_clio.timerback3;
case 0x0120/4:
- return state->m_clio.timer4;
+ return m_clio.timer4;
case 0x0124/4:
- return state->m_clio.timerback4;
+ return m_clio.timerback4;
case 0x0128/4:
- return state->m_clio.timer5;
+ return m_clio.timer5;
case 0x012c/4:
- return state->m_clio.timerback5;
+ return m_clio.timerback5;
case 0x0130/4:
- return state->m_clio.timer6;
+ return m_clio.timer6;
case 0x0134/4:
- return state->m_clio.timerback6;
+ return m_clio.timerback6;
case 0x0138/4:
- return state->m_clio.timer7;
+ return m_clio.timer7;
case 0x013c/4:
- return state->m_clio.timerback7;
+ return m_clio.timerback7;
case 0x0140/4:
- return state->m_clio.timer8;
+ return m_clio.timer8;
case 0x0144/4:
- return state->m_clio.timerback8;
+ return m_clio.timerback8;
case 0x0148/4:
- return state->m_clio.timer9;
+ return m_clio.timer9;
case 0x014c/4:
- return state->m_clio.timerback9;
+ return m_clio.timerback9;
case 0x0150/4:
- return state->m_clio.timer10;
+ return m_clio.timer10;
case 0x0154/4:
- return state->m_clio.timerback10;
+ return m_clio.timerback10;
case 0x0158/4:
- return state->m_clio.timer11;
+ return m_clio.timer11;
case 0x015c/4:
- return state->m_clio.timerback11;
+ return m_clio.timerback11;
case 0x0160/4:
- return state->m_clio.timer12;
+ return m_clio.timer12;
case 0x0164/4:
- return state->m_clio.timerback12;
+ return m_clio.timerback12;
case 0x0168/4:
- return state->m_clio.timer13;
+ return m_clio.timer13;
case 0x016c/4:
- return state->m_clio.timerback13;
+ return m_clio.timerback13;
case 0x0170/4:
- return state->m_clio.timer14;
+ return m_clio.timer14;
case 0x0174/4:
- return state->m_clio.timerback14;
+ return m_clio.timerback14;
case 0x0178/4:
- return state->m_clio.timer15;
+ return m_clio.timer15;
case 0x017c/4:
- return state->m_clio.timerback15;
+ return m_clio.timerback15;
case 0x0200/4:
- return state->m_clio.settm0;
+ return m_clio.settm0;
case 0x0204/4:
- return state->m_clio.clrtm0;
+ return m_clio.clrtm0;
case 0x0208/4:
- return state->m_clio.settm1;
+ return m_clio.settm1;
case 0x020c/4:
- return state->m_clio.clrtm1;
+ return m_clio.clrtm1;
case 0x0220/4:
- return state->m_clio.slack;
+ return m_clio.slack;
case 0x0400/4:
case 0x0404/4:
- return state->m_clio.expctl;
+ return m_clio.expctl;
case 0x0410/4:
- return state->m_clio.dipir1;
+ return m_clio.dipir1;
case 0x0414/4:
- return state->m_clio.dipir2;
+ return m_clio.dipir2;
case 0x0500/4: case 0x0504/4: case 0x0508/4: case 0x050c/4:
case 0x0510/4: case 0x0514/4: case 0x0518/4: case 0x051c/4:
case 0x0520/4: case 0x0524/4: case 0x0528/4: case 0x052c/4:
case 0x0530/4: case 0x0534/4: case 0x0538/4: case 0x053c/4:
- return state->m_clio.sel;
+ return m_clio.sel;
case 0x0540/4: case 0x0544/4: case 0x0548/4: case 0x054c/4:
case 0x0550/4: case 0x0554/4: case 0x0558/4: case 0x055c/4:
case 0x0560/4: case 0x0564/4: case 0x0568/4: case 0x056c/4:
case 0x0570/4: case 0x0574/4: case 0x0578/4: case 0x057c/4:
- return state->m_clio.poll;
+ return m_clio.poll;
case 0xc000/4:
- return state->m_clio.unclerev;
+ return m_clio.unclerev;
case 0xc004/4:
- return state->m_clio.uncle_soft_rev;
+ return m_clio.uncle_soft_rev;
case 0xc008/4:
- return state->m_clio.uncle_addr;
+ return m_clio.uncle_addr;
case 0xc00c/4:
- return state->m_clio.uncle_rom;
+ return m_clio.uncle_rom;
default:
- logerror( "%08X: unhandled CLIO read offset = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset * 4 );
+ logerror( "%08X: unhandled CLIO read offset = %08X\n", cpu_get_pc(machine().device("maincpu")), offset * 4 );
break;
}
return 0;
}
-WRITE32_HANDLER( _3do_clio_w )
+WRITE32_MEMBER(_3do_state::_3do_clio_w)
{
- _3do_state *state = space->machine().driver_data<_3do_state>();
- logerror( "%08X: CLIO write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset*4, data, mem_mask );
+ logerror( "%08X: CLIO write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(machine().device("maincpu")), offset*4, data, mem_mask );
switch( offset )
{
case 0x0000/4:
break;
case 0x0004/4:
- state->m_clio.csysbits = data;
+ m_clio.csysbits = data;
break;
case 0x0008/4:
- state->m_clio.vint0 = data;
+ m_clio.vint0 = data;
break;
case 0x000c/4:
- state->m_clio.vint1 = data;
+ m_clio.vint1 = data;
break;
case 0x0020/4:
- state->m_clio.audin = data;
+ m_clio.audin = data;
break;
case 0x0024/4: /* 03400024 - c0020f0f is written here during boot */
- state->m_clio.audout = data;
+ m_clio.audout = data;
break;
case 0x0028/4: /* 03400028 - bits 0,1, and 6 are tested (reset source) */
- state->m_clio.cstatbits = data;
+ m_clio.cstatbits = data;
break;
case 0x002c/4: /* 0340002C - ?? during boot 0000000B is written here counter reload related?? */
- state->m_clio.wdog = data;
+ m_clio.wdog = data;
break;
case 0x0030/4:
- state->m_clio.hcnt = data;
+ m_clio.hcnt = data;
break;
case 0x0034/4:
- state->m_clio.vcnt = data;
+ m_clio.vcnt = data;
break;
case 0x0038/4:
- state->m_clio.seed = data;
+ m_clio.seed = data;
break;
case 0x0040/4:
- state->m_clio.irq0 |= data;
+ m_clio.irq0 |= data;
break;
case 0x0044/4:
- state->m_clio.irq0 &= ~data;
+ m_clio.irq0 &= ~data;
break;
case 0x0048/4:
- state->m_clio.irq0_enable |= data;
+ m_clio.irq0_enable |= data;
break;
case 0x004c/4:
- state->m_clio.irq0_enable &= ~data;
+ m_clio.irq0_enable &= ~data;
break;
case 0x0050/4:
- state->m_clio.mode |= data;
+ m_clio.mode |= data;
break;
case 0x0054/4:
- state->m_clio.mode &= ~data;
+ m_clio.mode &= ~data;
break;
case 0x0058/4:
- state->m_clio.badbits = data;
+ m_clio.badbits = data;
break;
case 0x005c/4:
- state->m_clio.spare = data;
+ m_clio.spare = data;
break;
case 0x0060/4:
- state->m_clio.irq1 |= data;
+ m_clio.irq1 |= data;
break;
case 0x0064/4:
- state->m_clio.irq1 &= ~data;
+ m_clio.irq1 &= ~data;
break;
case 0x0068/4:
- state->m_clio.irq1_enable |= data;
+ m_clio.irq1_enable |= data;
break;
case 0x006c/4:
- state->m_clio.irq1_enable &= ~data;
+ m_clio.irq1_enable &= ~data;
break;
case 0x0080/4:
- state->m_clio.hdelay = data;
+ m_clio.hdelay = data;
break;
case 0x0084/4:
- state->m_clio.adbio = data;
+ m_clio.adbio = data;
break;
case 0x0088/4:
- state->m_clio.adbctl = data;
+ m_clio.adbctl = data;
break;
case 0x0100/4:
- state->m_clio.timer0 = data & 0x0000ffff;
+ m_clio.timer0 = data & 0x0000ffff;
break;
case 0x0104/4:
- state->m_clio.timerback0 = data & 0x0000ffff;
+ m_clio.timerback0 = data & 0x0000ffff;
break;
case 0x0108/4:
- state->m_clio.timer1 = data & 0x0000ffff;
+ m_clio.timer1 = data & 0x0000ffff;
break;
case 0x010c/4:
- state->m_clio.timerback1 = data & 0x0000ffff;
+ m_clio.timerback1 = data & 0x0000ffff;
break;
case 0x0110/4:
- state->m_clio.timer2 = data & 0x0000ffff;
+ m_clio.timer2 = data & 0x0000ffff;
break;
case 0x0114/4:
- state->m_clio.timerback2 = data & 0x0000ffff;
+ m_clio.timerback2 = data & 0x0000ffff;
break;
case 0x0118/4:
- state->m_clio.timer3 = data & 0x0000ffff;
+ m_clio.timer3 = data & 0x0000ffff;
break;
case 0x011c/4:
- state->m_clio.timerback3 = data & 0x0000ffff;
+ m_clio.timerback3 = data & 0x0000ffff;
break;
case 0x0120/4:
- state->m_clio.timer4 = data & 0x0000ffff;
+ m_clio.timer4 = data & 0x0000ffff;
break;
case 0x0124/4:
- state->m_clio.timerback4 = data & 0x0000ffff;
+ m_clio.timerback4 = data & 0x0000ffff;
break;
case 0x0128/4:
- state->m_clio.timer5 = data & 0x0000ffff;
+ m_clio.timer5 = data & 0x0000ffff;
break;
case 0x012c/4:
- state->m_clio.timerback5 = data & 0x0000ffff;
+ m_clio.timerback5 = data & 0x0000ffff;
break;
case 0x0130/4:
- state->m_clio.timer6 = data & 0x0000ffff;
+ m_clio.timer6 = data & 0x0000ffff;
break;
case 0x0134/4:
- state->m_clio.timerback6 = data & 0x0000ffff;
+ m_clio.timerback6 = data & 0x0000ffff;
break;
case 0x0138/4:
- state->m_clio.timer7 = data & 0x0000ffff;
+ m_clio.timer7 = data & 0x0000ffff;
break;
case 0x013c/4:
- state->m_clio.timerback7 = data & 0x0000ffff;
+ m_clio.timerback7 = data & 0x0000ffff;
break;
case 0x0140/4:
- state->m_clio.timer8 = data & 0x0000ffff;
+ m_clio.timer8 = data & 0x0000ffff;
break;
case 0x0144/4:
- state->m_clio.timerback8 = data & 0x0000ffff;
+ m_clio.timerback8 = data & 0x0000ffff;
break;
case 0x0148/4:
- state->m_clio.timer9 = data & 0x0000ffff;
+ m_clio.timer9 = data & 0x0000ffff;
break;
case 0x014c/4:
- state->m_clio.timerback9 = data & 0x0000ffff;
+ m_clio.timerback9 = data & 0x0000ffff;
break;
case 0x0150/4:
- state->m_clio.timer10 = data & 0x0000ffff;
+ m_clio.timer10 = data & 0x0000ffff;
break;
case 0x0154/4:
- state->m_clio.timerback10 = data & 0x0000ffff;
+ m_clio.timerback10 = data & 0x0000ffff;
break;
case 0x0158/4:
- state->m_clio.timer11 = data & 0x0000ffff;
+ m_clio.timer11 = data & 0x0000ffff;
break;
case 0x015c/4:
- state->m_clio.timerback11 = data & 0x0000ffff;
+ m_clio.timerback11 = data & 0x0000ffff;
break;
case 0x0160/4:
- state->m_clio.timer12 = data & 0x0000ffff;
+ m_clio.timer12 = data & 0x0000ffff;
break;
case 0x0164/4:
- state->m_clio.timerback12 = data & 0x0000ffff;
+ m_clio.timerback12 = data & 0x0000ffff;
break;
case 0x0168/4:
- state->m_clio.timer13 = data & 0x0000ffff;
+ m_clio.timer13 = data & 0x0000ffff;
break;
case 0x016c/4:
- state->m_clio.timerback13 = data & 0x0000ffff;
+ m_clio.timerback13 = data & 0x0000ffff;
break;
case 0x0170/4:
- state->m_clio.timer14 = data & 0x0000ffff;
+ m_clio.timer14 = data & 0x0000ffff;
break;
case 0x0174/4:
- state->m_clio.timerback14 = data & 0x0000ffff;
+ m_clio.timerback14 = data & 0x0000ffff;
break;
case 0x0178/4:
- state->m_clio.timer15 = data & 0x0000ffff;
+ m_clio.timer15 = data & 0x0000ffff;
break;
case 0x017c/4:
- state->m_clio.timerback15 = data & 0x0000ffff;
+ m_clio.timerback15 = data & 0x0000ffff;
break;
case 0x0200/4:
- state->m_clio.settm0 = data;
+ m_clio.settm0 = data;
break;
case 0x0204/4:
- state->m_clio.clrtm0 = data;
+ m_clio.clrtm0 = data;
break;
case 0x0208/4:
- state->m_clio.settm0 = data;
+ m_clio.settm0 = data;
break;
case 0x020c/4:
break;
case 0x0220/4:
- state->m_clio.slack = data & 0x000003ff;
+ m_clio.slack = data & 0x000003ff;
break;
case 0x0308/4:
- state->m_clio.dmareqdis = data;
+ m_clio.dmareqdis = data;
break;
case 0x0400/4:
- state->m_clio.expctl = state->m_clio.expctl | ( data & 0xca00 );
+ m_clio.expctl = m_clio.expctl | ( data & 0xca00 );
break;
case 0x0404/4:
- state->m_clio.expctl = state->m_clio.expctl & ~( data & 0xca00 );
+ m_clio.expctl = m_clio.expctl & ~( data & 0xca00 );
break;
case 0x0408/4:
- state->m_clio.type0_4 = data;
+ m_clio.type0_4 = data;
break;
case 0x0500/4: case 0x0504/4: case 0x0508/4: case 0x050c/4:
case 0x0510/4: case 0x0514/4: case 0x0518/4: case 0x051c/4:
case 0x0520/4: case 0x0524/4: case 0x0528/4: case 0x052c/4:
case 0x0530/4: case 0x0534/4: case 0x0538/4: case 0x053c/4:
- state->m_clio.sel = data & 0xff;
+ m_clio.sel = data & 0xff;
/* Start WRSEL cycle */
/* Detection of too many devices on the bus */
@@ -930,10 +922,10 @@ WRITE32_HANDLER( _3do_clio_w )
{
case 0x8f:
/* Everything is fine, there are not too many devices in the system */
- state->m_clio.poll = ( state->m_clio.poll & 0x0f );
+ m_clio.poll = ( m_clio.poll & 0x0f );
break;
default:
- state->m_clio.poll = ( state->m_clio.poll & 0x0f ) | 0x90;
+ m_clio.poll = ( m_clio.poll & 0x0f ) | 0x90;
}
break;
@@ -941,7 +933,7 @@ WRITE32_HANDLER( _3do_clio_w )
case 0x0550/4: case 0x0554/4: case 0x0558/4: case 0x055c/4:
case 0x0560/4: case 0x0564/4: case 0x0568/4: case 0x056c/4:
case 0x0570/4: case 0x0574/4: case 0x0578/4: case 0x057c/4:
- state->m_clio.poll = ( state->m_clio.poll & 0xf8 ) | ( data & 0x07 );
+ m_clio.poll = ( m_clio.poll & 0xf8 ) | ( data & 0x07 );
break;
case 0xc000/4:
@@ -949,11 +941,11 @@ WRITE32_HANDLER( _3do_clio_w )
case 0xc00c/4:
break;
case 0xc008/4:
- state->m_clio.uncle_addr = data;
+ m_clio.uncle_addr = data;
break;
default:
- logerror( "%08X: unhandled CLIO write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(space->machine().device("maincpu")), offset*4, data, mem_mask );
+ logerror( "%08X: unhandled CLIO write offset = %08X, data = %08X, mask = %08X\n", cpu_get_pc(machine().device("maincpu")), offset*4, data, mem_mask );
break;
}
}
diff --git a/src/mame/machine/ajax.c b/src/mame/machine/ajax.c
index a1849672c0e..104a071b6d9 100644
--- a/src/mame/machine/ajax.c
+++ b/src/mame/machine/ajax.c
@@ -31,9 +31,8 @@
(*) The Coin Counters are handled by the Konami Custom 051550
*/
-static WRITE8_HANDLER( ajax_bankswitch_w )
+WRITE8_MEMBER(ajax_state::ajax_bankswitch_w)
{
- ajax_state *state = space->machine().driver_data<ajax_state>();
int bank = 0;
/* rom select */
@@ -41,15 +40,15 @@ static WRITE8_HANDLER( ajax_bankswitch_w )
bank += 4;
/* coin counters */
- coin_counter_w(space->machine(), 0, data & 0x20);
- coin_counter_w(space->machine(), 1, data & 0x40);
+ coin_counter_w(machine(), 0, data & 0x20);
+ coin_counter_w(machine(), 1, data & 0x40);
/* priority */
- state->m_priority = data & 0x08;
+ m_priority = data & 0x08;
/* bank # (ROMS N11 and N12) */
bank += (data & 0x07);
- memory_set_bank(space->machine(), "bank2", bank);
+ memory_set_bank(machine(), "bank2", bank);
}
/* ajax_lamps_w:
@@ -76,16 +75,16 @@ static WRITE8_HANDLER( ajax_bankswitch_w )
LS393 C20 Dual -ve edge trigger 4-bit Binary Ripple Counter with Resets
*/
-static WRITE8_HANDLER( ajax_lamps_w )
+WRITE8_MEMBER(ajax_state::ajax_lamps_w)
{
- set_led_status(space->machine(), 1, data & 0x02); /* super weapon lamp */
- set_led_status(space->machine(), 2, data & 0x04); /* power up lamps */
- set_led_status(space->machine(), 5, data & 0x04); /* power up lamps */
- set_led_status(space->machine(), 0, data & 0x20); /* start lamp */
- set_led_status(space->machine(), 3, data & 0x40); /* game over lamps */
- set_led_status(space->machine(), 6, data & 0x40); /* game over lamps */
- set_led_status(space->machine(), 4, data & 0x80); /* game over lamps */
- set_led_status(space->machine(), 7, data & 0x80); /* game over lamps */
+ set_led_status(machine(), 1, data & 0x02); /* super weapon lamp */
+ set_led_status(machine(), 2, data & 0x04); /* power up lamps */
+ set_led_status(machine(), 5, data & 0x04); /* power up lamps */
+ set_led_status(machine(), 0, data & 0x20); /* start lamp */
+ set_led_status(machine(), 3, data & 0x40); /* game over lamps */
+ set_led_status(machine(), 6, data & 0x40); /* game over lamps */
+ set_led_status(machine(), 4, data & 0x80); /* game over lamps */
+ set_led_status(machine(), 7, data & 0x80); /* game over lamps */
}
/* ajax_ls138_f10:
@@ -105,7 +104,7 @@ static WRITE8_HANDLER( ajax_lamps_w )
0x01c0 (r) MIO2 Enables DIPSW #3 reading
*/
-READ8_HANDLER( ajax_ls138_f10_r )
+READ8_MEMBER(ajax_state::ajax_ls138_f10_r)
{
int data = 0, index;
static const char *const portnames[] = { "SYSTEM", "P1", "DSW1", "DSW2" };
@@ -113,45 +112,44 @@ READ8_HANDLER( ajax_ls138_f10_r )
switch ((offset & 0x01c0) >> 6)
{
case 0x00: /* ??? */
- data = space->machine().rand();
+ data = machine().rand();
break;
case 0x04: /* 2P inputs */
- data = input_port_read(space->machine(), "P2");
+ data = input_port_read(machine(), "P2");
break;
case 0x06: /* 1P inputs + DIPSW #1 & #2 */
index = offset & 0x01;
- data = input_port_read(space->machine(), (offset & 0x02) ? portnames[2 + index] : portnames[index]);
+ data = input_port_read(machine(), (offset & 0x02) ? portnames[2 + index] : portnames[index]);
break;
case 0x07: /* DIPSW #3 */
- data = input_port_read(space->machine(), "DSW3");
+ data = input_port_read(machine(), "DSW3");
break;
default:
- logerror("%04x: (ls138_f10) read from an unknown address %02x\n",cpu_get_pc(&space->device()), offset);
+ logerror("%04x: (ls138_f10) read from an unknown address %02x\n",cpu_get_pc(&space.device()), offset);
}
return data;
}
-WRITE8_HANDLER( ajax_ls138_f10_w )
+WRITE8_MEMBER(ajax_state::ajax_ls138_f10_w)
{
- ajax_state *state = space->machine().driver_data<ajax_state>();
switch ((offset & 0x01c0) >> 6)
{
case 0x00: /* NSFIRQ + AFR */
if (offset)
- state->watchdog_reset_w(*space, 0, data);
+ watchdog_reset_w(space, 0, data);
else{
- if (state->m_firq_enable) /* Cause interrupt on slave CPU */
- device_set_input_line(state->m_subcpu, M6809_FIRQ_LINE, HOLD_LINE);
+ if (m_firq_enable) /* Cause interrupt on slave CPU */
+ device_set_input_line(m_subcpu, M6809_FIRQ_LINE, HOLD_LINE);
}
break;
case 0x01: /* Cause interrupt on audio CPU */
- device_set_input_line(state->m_audiocpu, 0, HOLD_LINE);
+ device_set_input_line(m_audiocpu, 0, HOLD_LINE);
break;
case 0x02: /* Sound command number */
- state->soundlatch_w(*space, offset, data);
+ soundlatch_w(space, offset, data);
break;
case 0x03: /* Bankswitch + coin counters + priority*/
ajax_bankswitch_w(space, 0, data);
@@ -161,7 +159,7 @@ WRITE8_HANDLER( ajax_ls138_f10_w )
break;
default:
- logerror("%04x: (ls138_f10) write %02x to an unknown address %02x\n", cpu_get_pc(&space->device()), data, offset);
+ logerror("%04x: (ls138_f10) write %02x to an unknown address %02x\n", cpu_get_pc(&space.device()), data, offset);
}
}
@@ -180,21 +178,20 @@ WRITE8_HANDLER( ajax_ls138_f10_w )
0 SRB0 /
*/
-WRITE8_HANDLER( ajax_bankswitch_2_w )
+WRITE8_MEMBER(ajax_state::ajax_bankswitch_2_w)
{
- ajax_state *state = space->machine().driver_data<ajax_state>();
/* enable char ROM reading through the video RAM */
- k052109_set_rmrd_line(state->m_k052109, (data & 0x40) ? ASSERT_LINE : CLEAR_LINE);
+ k052109_set_rmrd_line(m_k052109, (data & 0x40) ? ASSERT_LINE : CLEAR_LINE);
/* bit 5 enables 051316 wraparound */
- k051316_wraparound_enable(state->m_k051316, data & 0x20);
+ k051316_wraparound_enable(m_k051316, data & 0x20);
/* FIRQ control */
- state->m_firq_enable = data & 0x10;
+ m_firq_enable = data & 0x10;
/* bank # (ROMS G16 and I16) */
- memory_set_bank(space->machine(), "bank1", data & 0x0f);
+ memory_set_bank(machine(), "bank1", data & 0x0f);
}
MACHINE_START( ajax )
diff --git a/src/mame/machine/arkanoid.c b/src/mame/machine/arkanoid.c
index be7bf7c3e6d..30d372c4023 100644
--- a/src/mame/machine/arkanoid.c
+++ b/src/mame/machine/arkanoid.c
@@ -15,13 +15,12 @@
#define ARKANOID_BOOTLEG_VERBOSE 1
-READ8_HANDLER( arkanoid_Z80_mcu_r )
+READ8_MEMBER(arkanoid_state::arkanoid_Z80_mcu_r)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
/* return the last value the 68705 wrote, and mark that we've read it */
- state->m_m68705write = 0;
- return state->m_toz80;
+ m_m68705write = 0;
+ return m_toz80;
}
static TIMER_CALLBACK( test )
@@ -32,76 +31,70 @@ static TIMER_CALLBACK( test )
state->m_fromz80 = param;
}
-WRITE8_HANDLER( arkanoid_Z80_mcu_w )
+WRITE8_MEMBER(arkanoid_state::arkanoid_Z80_mcu_w)
{
- space->machine().scheduler().synchronize(FUNC(test), data);
+ machine().scheduler().synchronize(FUNC(test), data);
/* boost the interleave for a few usecs to make sure it is read successfully */
- space->machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(10));
+ machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(10));
}
-READ8_HANDLER( arkanoid_68705_port_a_r )
+READ8_MEMBER(arkanoid_state::arkanoid_68705_port_a_r)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
- return (state->m_port_a_out & state->m_ddr_a) | (state->m_port_a_in & ~state->m_ddr_a);
+ return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a);
}
-WRITE8_HANDLER( arkanoid_68705_port_a_w )
+WRITE8_MEMBER(arkanoid_state::arkanoid_68705_port_a_w)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
- state->m_port_a_out = data;
+ m_port_a_out = data;
}
-WRITE8_HANDLER( arkanoid_68705_ddr_a_w )
+WRITE8_MEMBER(arkanoid_state::arkanoid_68705_ddr_a_w)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
- state->m_ddr_a = data;
+ m_ddr_a = data;
}
-READ8_HANDLER( arkanoid_68705_port_c_r )
+READ8_MEMBER(arkanoid_state::arkanoid_68705_port_c_r)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
int res = 0;
/* bit 0 is high on a write strobe; clear it once we've detected it */
- if (state->m_z80write)
+ if (m_z80write)
res |= 0x01;
/* bit 1 is high if the previous write has been read */
- if (!state->m_m68705write)
+ if (!m_m68705write)
res |= 0x02;
- return (state->m_port_c_out & state->m_ddr_c) | (res & ~state->m_ddr_c);
+ return (m_port_c_out & m_ddr_c) | (res & ~m_ddr_c);
}
-WRITE8_HANDLER( arkanoid_68705_port_c_w )
+WRITE8_MEMBER(arkanoid_state::arkanoid_68705_port_c_w)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
- if ((state->m_ddr_c & 0x04) && (~data & 0x04) && (state->m_port_c_out & 0x04))
+ if ((m_ddr_c & 0x04) && (~data & 0x04) && (m_port_c_out & 0x04))
{
/* return the last value the Z80 wrote */
- state->m_z80write = 0;
- state->m_port_a_in = state->m_fromz80;
+ m_z80write = 0;
+ m_port_a_in = m_fromz80;
}
- if ((state->m_ddr_c & 0x08) && (~data & 0x08) && (state->m_port_c_out & 0x08))
+ if ((m_ddr_c & 0x08) && (~data & 0x08) && (m_port_c_out & 0x08))
{
/* a write from the 68705 to the Z80; remember its value */
- state->m_m68705write = 1;
- state->m_toz80 = state->m_port_a_out;
+ m_m68705write = 1;
+ m_toz80 = m_port_a_out;
}
- state->m_port_c_out = data;
+ m_port_c_out = data;
}
-WRITE8_HANDLER( arkanoid_68705_ddr_c_w )
+WRITE8_MEMBER(arkanoid_state::arkanoid_68705_ddr_c_w)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
- state->m_ddr_c = data;
+ m_ddr_c = data;
}
CUSTOM_INPUT( arkanoid_68705_input_r )
@@ -182,19 +175,18 @@ TO DO (2006.09.12) :
*/
-#define LOG_F000_R if (ARKANOID_BOOTLEG_VERBOSE) logerror("%04x: arkanoid_bootleg_f000_r - cmd = %02x - val = %02x\n", cpu_get_pc(&space->device()), state->m_bootleg_cmd, arkanoid_bootleg_val);
-#define LOG_F002_R if (ARKANOID_BOOTLEG_VERBOSE) logerror("%04x: arkanoid_bootleg_f002_r - cmd = %02x - val = %02x\n", cpu_get_pc(&space->device()), state->m_bootleg_cmd, arkanoid_bootleg_val);
-#define LOG_D018_W if (ARKANOID_BOOTLEG_VERBOSE) logerror("%04x: arkanoid_bootleg_d018_w - data = %02x - cmd = %02x\n", cpu_get_pc(&space->device()), data, state->m_bootleg_cmd);
-#define LOG_D008_R if (ARKANOID_BOOTLEG_VERBOSE) logerror("%04x: arkanoid_bootleg_d008_r - val = %02x\n", cpu_get_pc(&space->device()), arkanoid_bootleg_d008_val);
+#define LOG_F000_R if (ARKANOID_BOOTLEG_VERBOSE) logerror("%04x: arkanoid_bootleg_f000_r - cmd = %02x - val = %02x\n", cpu_get_pc(&space.device()), m_bootleg_cmd, arkanoid_bootleg_val);
+#define LOG_F002_R if (ARKANOID_BOOTLEG_VERBOSE) logerror("%04x: arkanoid_bootleg_f002_r - cmd = %02x - val = %02x\n", cpu_get_pc(&space.device()), m_bootleg_cmd, arkanoid_bootleg_val);
+#define LOG_D018_W if (ARKANOID_BOOTLEG_VERBOSE) logerror("%04x: arkanoid_bootleg_d018_w - data = %02x - cmd = %02x\n", cpu_get_pc(&space.device()), data, m_bootleg_cmd);
+#define LOG_D008_R if (ARKANOID_BOOTLEG_VERBOSE) logerror("%04x: arkanoid_bootleg_d008_r - val = %02x\n", cpu_get_pc(&space.device()), arkanoid_bootleg_d008_val);
/* Kludge for some bootlegs that read this address */
-READ8_HANDLER( arkanoid_bootleg_f000_r )
+READ8_MEMBER(arkanoid_state::arkanoid_bootleg_f000_r)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
UINT8 arkanoid_bootleg_val = 0x00;
- switch (state->m_bootleg_id)
+ switch (m_bootleg_id)
{
case ARKANGC: /* There are no reads from 0xf000 in these bootlegs */
case ARKBLOCK:
@@ -202,7 +194,7 @@ READ8_HANDLER( arkanoid_bootleg_f000_r )
case ARKBLOC2:
case ARKGCBL:
case PADDLE2:
- switch (state->m_bootleg_cmd)
+ switch (m_bootleg_cmd)
{
default:
break;
@@ -210,7 +202,7 @@ READ8_HANDLER( arkanoid_bootleg_f000_r )
LOG_F000_R
break;
case BLOCK2:
- switch (state->m_bootleg_cmd)
+ switch (m_bootleg_cmd)
{
case 0x05: /* Check 1 */
arkanoid_bootleg_val = 0x05;
@@ -224,7 +216,7 @@ READ8_HANDLER( arkanoid_bootleg_f000_r )
LOG_F000_R
break;
default:
- logerror("%04x: arkanoid_bootleg_f000_r - cmd = %02x - unknown bootleg !\n", cpu_get_pc(&space->device()), state->m_bootleg_cmd);
+ logerror("%04x: arkanoid_bootleg_f000_r - cmd = %02x - unknown bootleg !\n", cpu_get_pc(&space.device()), m_bootleg_cmd);
break;
}
@@ -232,16 +224,15 @@ READ8_HANDLER( arkanoid_bootleg_f000_r )
}
/* Kludge for some bootlegs that read this address */
-READ8_HANDLER( arkanoid_bootleg_f002_r )
+READ8_MEMBER(arkanoid_state::arkanoid_bootleg_f002_r)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
UINT8 arkanoid_bootleg_val = 0x00;
- switch (state->m_bootleg_id)
+ switch (m_bootleg_id)
{
case ARKANGC:
case ARKBLOCK:
- switch (state->m_bootleg_cmd)
+ switch (m_bootleg_cmd)
{
default:
break;
@@ -250,7 +241,7 @@ READ8_HANDLER( arkanoid_bootleg_f002_r )
break;
case ARKANGC2: /* There are no reads from 0xf002 in these bootlegs */
case BLOCK2:
- switch (state->m_bootleg_cmd)
+ switch (m_bootleg_cmd)
{
default:
break;
@@ -258,7 +249,7 @@ READ8_HANDLER( arkanoid_bootleg_f002_r )
LOG_F002_R
break;
case ARKBLOC2:
- switch (state->m_bootleg_cmd)
+ switch (m_bootleg_cmd)
{
default:
break;
@@ -266,7 +257,7 @@ READ8_HANDLER( arkanoid_bootleg_f002_r )
LOG_F002_R
break;
case ARKGCBL:
- switch (state->m_bootleg_cmd)
+ switch (m_bootleg_cmd)
{
case 0x8a: /* Current level (fixed routine) */
arkanoid_bootleg_val = 0xa5;
@@ -280,7 +271,7 @@ READ8_HANDLER( arkanoid_bootleg_f002_r )
LOG_F002_R
break;
case PADDLE2:
- switch (state->m_bootleg_cmd)
+ switch (m_bootleg_cmd)
{
case 0x24: /* Avoid bad jump to 0x0066 */
arkanoid_bootleg_val = 0x9b;
@@ -312,7 +303,7 @@ READ8_HANDLER( arkanoid_bootleg_f002_r )
LOG_F002_R
break;
default:
- logerror("%04x: arkanoid_bootleg_f002_r - cmd = %02x - unknown bootleg !\n", cpu_get_pc(&space->device()), state->m_bootleg_cmd);
+ logerror("%04x: arkanoid_bootleg_f002_r - cmd = %02x - unknown bootleg !\n", cpu_get_pc(&space.device()), m_bootleg_cmd);
break;
}
@@ -320,43 +311,42 @@ READ8_HANDLER( arkanoid_bootleg_f002_r )
}
/* Kludge for some bootlegs that write this address */
-WRITE8_HANDLER( arkanoid_bootleg_d018_w )
+WRITE8_MEMBER(arkanoid_state::arkanoid_bootleg_d018_w)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
- state->m_bootleg_cmd = 0x00;
+ m_bootleg_cmd = 0x00;
- switch (state->m_bootleg_id)
+ switch (m_bootleg_id)
{
case ARKANGC:
case ARKBLOCK:
switch (data)
{
case 0x36: /* unneeded value : no call 0x2050, unused A and overwritten HL (0x0313 -> 0x0340) */
- if (cpu_get_pc(&space->device()) == 0x7c47)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x7c47)
+ m_bootleg_cmd = 0x00;
break;
case 0x38: /* unneeded value : no call 0x2050, unused A and fixed HL (0x7bd5) */
- if (cpu_get_pc(&space->device()) == 0x7b87)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x7b87)
+ m_bootleg_cmd = 0x00;
break;
case 0x8a: /* unneeded value : no call 0x2050, unused A and overwritten HL (0x7b77 -> 0x7c1c) */
- if (cpu_get_pc(&space->device()) == 0x9661)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x9661)
+ m_bootleg_cmd = 0x00;
break;
case 0xe3: /* unneeded value : call 0x2050 but fixed A (0x00) and fixed HL (0xed83) */
- if (cpu_get_pc(&space->device()) == 0x67e3)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e3)
+ m_bootleg_cmd = 0x00;
break;
case 0xf7: /* unneeded value : 3 * 'NOP' at 0x034f + 2 * 'NOP' at 0x35b */
- if (cpu_get_pc(&space->device()) == 0x0349)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x0349)
+ m_bootleg_cmd = 0x00;
break;
case 0xff: /* unneeded value : no call 0x2050, unused A and overwritten HL (0x7c4f -> 0x7d31) */
- if (cpu_get_pc(&space->device()) == 0x9670)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x9670)
+ m_bootleg_cmd = 0x00;
break;
default:
- state->m_bootleg_cmd = 0x00;
+ m_bootleg_cmd = 0x00;
break;
}
LOG_D018_W
@@ -365,41 +355,41 @@ WRITE8_HANDLER( arkanoid_bootleg_d018_w )
switch (data)
{
case 0x36: /* unneeded value : call 0x2050 but fixed A (0x2d) */
- if (cpu_get_pc(&space->device()) == 0x7c4c)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x7c4c)
+ m_bootleg_cmd = 0x00;
break;
case 0x38: /* unneeded value : call 0x2050 but fixed A (0xf3) */
- if (cpu_get_pc(&space->device()) == 0x7b87)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x7b87)
+ m_bootleg_cmd = 0x00;
break;
case 0x88: /* unneeded value : no read back */
- if (cpu_get_pc(&space->device()) == 0x67e3)
- state->m_bootleg_cmd = 0x00;
- if (cpu_get_pc(&space->device()) == 0x7c47)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e3)
+ m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x7c47)
+ m_bootleg_cmd = 0x00;
break;
case 0x89: /* unneeded value : no read back */
- if (cpu_get_pc(&space->device()) == 0x67e5)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e5)
+ m_bootleg_cmd = 0x00;
break;
case 0x8a: /* unneeded value : call 0x2050 but fixed A (0xa5) */
- if (cpu_get_pc(&space->device()) == 0x9661)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x9661)
+ m_bootleg_cmd = 0x00;
break;
case 0xc0: /* unneeded value : no read back */
- if (cpu_get_pc(&space->device()) == 0x67e7)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e7)
+ m_bootleg_cmd = 0x00;
break;
case 0xe3: /* unneeded value : call 0x2050 but fixed A (0x61) */
- if (cpu_get_pc(&space->device()) == 0x67e9)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e9)
+ m_bootleg_cmd = 0x00;
break;
case 0xff: /* unneeded value : call 0x2050 but fixed A (0xe2) */
- if (cpu_get_pc(&space->device()) == 0x9670)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x9670)
+ m_bootleg_cmd = 0x00;
break;
default:
- state->m_bootleg_cmd = 0x00;
+ m_bootleg_cmd = 0x00;
break;
}
LOG_D018_W
@@ -408,15 +398,15 @@ WRITE8_HANDLER( arkanoid_bootleg_d018_w )
switch (data)
{
case 0x05: /* Check 1 */
- if (cpu_get_pc(&space->device()) == 0x0363)
- state->m_bootleg_cmd = 0x05;
+ if (cpu_get_pc(&space.device()) == 0x0363)
+ m_bootleg_cmd = 0x05;
break;
case 0x0a: /* Check 2 */
- if (cpu_get_pc(&space->device()) == 0x0372)
- state->m_bootleg_cmd = 0x0a;
+ if (cpu_get_pc(&space.device()) == 0x0372)
+ m_bootleg_cmd = 0x0a;
break;
default:
- state->m_bootleg_cmd = 0x00;
+ m_bootleg_cmd = 0x00;
break;
}
LOG_D018_W
@@ -425,45 +415,45 @@ WRITE8_HANDLER( arkanoid_bootleg_d018_w )
switch (data)
{
case 0x36: /* unneeded value : call 0x2050 but fixed A (0x2d) */
- if (cpu_get_pc(&space->device()) == 0x7c4c)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x7c4c)
+ m_bootleg_cmd = 0x00;
break;
case 0x38: /* unneeded value : call 0x2050 but fixed A (0xf3) */
- if (cpu_get_pc(&space->device()) == 0x7b87)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x7b87)
+ m_bootleg_cmd = 0x00;
break;
case 0x88: /* unneeded value : no read back */
- if (cpu_get_pc(&space->device()) == 0x67e3)
- state->m_bootleg_cmd = 0x00;
- if (cpu_get_pc(&space->device()) == 0x7c47)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e3)
+ m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x7c47)
+ m_bootleg_cmd = 0x00;
break;
case 0x89: /* unneeded value : no read back */
- if (cpu_get_pc(&space->device()) == 0x67e5)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e5)
+ m_bootleg_cmd = 0x00;
break;
case 0x8a: /* unneeded value : call 0x2050 but unused HL and fixed DE (0x7c1c) */
- if (cpu_get_pc(&space->device()) == 0x9661)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x9661)
+ m_bootleg_cmd = 0x00;
break;
case 0xc0: /* unneeded value : no read back */
- if (cpu_get_pc(&space->device()) == 0x67e7)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e7)
+ m_bootleg_cmd = 0x00;
break;
case 0xe3: /* unneeded value : call 0x2050 but fixed A (0x61) */
- if (cpu_get_pc(&space->device()) == 0x67e9)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e9)
+ m_bootleg_cmd = 0x00;
break;
case 0xf7: /* unneeded value : call 0x2050 but never called (check code at 0x0340) */
- if (cpu_get_pc(&space->device()) == 0x0349)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x0349)
+ m_bootleg_cmd = 0x00;
break;
case 0xff: /* unneeded value : no call 0x2050, unused A and fixed HL (0x7d31) */
- if (cpu_get_pc(&space->device()) == 0x9670)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x9670)
+ m_bootleg_cmd = 0x00;
break;
default:
- state->m_bootleg_cmd = 0x00;
+ m_bootleg_cmd = 0x00;
break;
}
LOG_D018_W
@@ -472,44 +462,44 @@ WRITE8_HANDLER( arkanoid_bootleg_d018_w )
switch (data)
{
case 0x36: /* unneeded value : call 0x2050 but fixed A (0x2d) */
- if (cpu_get_pc(&space->device()) == 0x7c4c)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x7c4c)
+ m_bootleg_cmd = 0x00;
break;
case 0x38: /* unneeded value : call 0x2050 but fixed A (0xf3) */
- if (cpu_get_pc(&space->device()) == 0x7b87)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x7b87)
+ m_bootleg_cmd = 0x00;
break;
case 0x88: /* unneeded value : no read back */
- if (cpu_get_pc(&space->device()) == 0x67e3)
- state->m_bootleg_cmd = 0x00;
- if (cpu_get_pc(&space->device()) == 0x7c47)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e3)
+ m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x7c47)
+ m_bootleg_cmd = 0x00;
case 0x89: /* unneeded value : no read back */
- if (cpu_get_pc(&space->device()) == 0x67e5)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e5)
+ m_bootleg_cmd = 0x00;
break;
case 0x8a: /* call 0x2050 with A read from 0xf002 and wrong HL */
- if (cpu_get_pc(&space->device()) == 0x9661)
- state->m_bootleg_cmd = data;
+ if (cpu_get_pc(&space.device()) == 0x9661)
+ m_bootleg_cmd = data;
break;
case 0xc0: /* unneeded value : no read back */
- if (cpu_get_pc(&space->device()) == 0x67e7)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e7)
+ m_bootleg_cmd = 0x00;
break;
case 0xe3: /* unneeded value : call 0x2050 but fixed A (0x61) */
- if (cpu_get_pc(&space->device()) == 0x67e9)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e9)
+ m_bootleg_cmd = 0x00;
break;
case 0xf7: /* unneeded value : 3 * 'NOP' at 0x034f + 'JR NZ,$035D' at 0x35b */
- if (cpu_get_pc(&space->device()) == 0x0349)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x0349)
+ m_bootleg_cmd = 0x00;
break;
case 0xff: /* call 0x2050 with A read from 0xf002 and wrong HL */
- if (cpu_get_pc(&space->device()) == 0x9670)
- state->m_bootleg_cmd = data;
+ if (cpu_get_pc(&space.device()) == 0x9670)
+ m_bootleg_cmd = data;
break;
default:
- state->m_bootleg_cmd = 0x00;
+ m_bootleg_cmd = 0x00;
break;
}
LOG_D018_W
@@ -518,83 +508,81 @@ WRITE8_HANDLER( arkanoid_bootleg_d018_w )
switch (data)
{
case 0x24: /* A read from 0xf002 (expected to be 0x9b) */
- if (cpu_get_pc(&space->device()) == 0xbd7a)
- state->m_bootleg_cmd = data;
+ if (cpu_get_pc(&space.device()) == 0xbd7a)
+ m_bootleg_cmd = data;
break;
case 0x36: /* call 0x2050 with A read from 0xf002 and wrong HL */
- if (cpu_get_pc(&space->device()) == 0x7c4c)
- state->m_bootleg_cmd = data;
+ if (cpu_get_pc(&space.device()) == 0x7c4c)
+ m_bootleg_cmd = data;
break;
case 0x38: /* call 0x2050 with A read from 0xf002 and wrong HL */
- if (cpu_get_pc(&space->device()) == 0x7b87)
- state->m_bootleg_cmd = data;
+ if (cpu_get_pc(&space.device()) == 0x7b87)
+ m_bootleg_cmd = data;
break;
case 0x88: /* unneeded value : no read back */
- if (cpu_get_pc(&space->device()) == 0x67e3)
- state->m_bootleg_cmd = 0x00;
- if (cpu_get_pc(&space->device()) == 0x7c47)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e3)
+ m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x7c47)
+ m_bootleg_cmd = 0x00;
case 0x89: /* unneeded value : no read back */
- if (cpu_get_pc(&space->device()) == 0x67e5)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e5)
+ m_bootleg_cmd = 0x00;
break;
case 0x8a: /* call 0x2050 with A read from 0xf002 and wrong HL */
- if (cpu_get_pc(&space->device()) == 0x9661)
- state->m_bootleg_cmd = data;
+ if (cpu_get_pc(&space.device()) == 0x9661)
+ m_bootleg_cmd = data;
break;
case 0xc0: /* unneeded value : no read back */
- if (cpu_get_pc(&space->device()) == 0x67e7)
- state->m_bootleg_cmd = 0x00;
+ if (cpu_get_pc(&space.device()) == 0x67e7)
+ m_bootleg_cmd = 0x00;
break;
case 0xc3: /* A read from 0xf002 (expected to be 0x1d) */
- if (cpu_get_pc(&space->device()) == 0xbd8a)
- state->m_bootleg_cmd = data;
+ if (cpu_get_pc(&space.device()) == 0xbd8a)
+ m_bootleg_cmd = data;
break;
case 0xe3: /* call 0x2050 with A read from 0xf002 and wrong HL */
- if (cpu_get_pc(&space->device()) == 0x67e9)
- state->m_bootleg_cmd = data;
+ if (cpu_get_pc(&space.device()) == 0x67e9)
+ m_bootleg_cmd = data;
break;
case 0xf7: /* call 0x2050 with A read from 0xf002 and wrong HL */
- if (cpu_get_pc(&space->device()) == 0x0349)
- state->m_bootleg_cmd = data;
+ if (cpu_get_pc(&space.device()) == 0x0349)
+ m_bootleg_cmd = data;
break;
case 0xff: /* call 0x2050 with A read from 0xf002 and wrong HL */
- if (cpu_get_pc(&space->device()) == 0x9670)
- state->m_bootleg_cmd = data;
+ if (cpu_get_pc(&space.device()) == 0x9670)
+ m_bootleg_cmd = data;
break;
default:
- state->m_bootleg_cmd = 0x00;
+ m_bootleg_cmd = 0x00;
break;
}
LOG_D018_W
break;
default:
- logerror("%04x: arkanoid_bootleg_d018_w - data = %02x - unknown bootleg !\n", cpu_get_pc(&space->device()), data);
+ logerror("%04x: arkanoid_bootleg_d018_w - data = %02x - unknown bootleg !\n", cpu_get_pc(&space.device()), data);
break;
}
}
#ifdef UNUSED_CODE
-READ8_HANDLER( block2_bootleg_f000_r )
+READ8_MEMBER(arkanoid_state::block2_bootleg_f000_r)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
- return state->m_bootleg_cmd;
+ return m_bootleg_cmd;
}
#endif
/* Kludge for some bootlegs that read this address */
-READ8_HANDLER( arkanoid_bootleg_d008_r )
+READ8_MEMBER(arkanoid_state::arkanoid_bootleg_d008_r)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
UINT8 arkanoid_bootleg_d008_bit[8];
UINT8 arkanoid_bootleg_d008_val;
- UINT8 arkanoid_paddle_value = input_port_read(space->machine(), "MUX");
+ UINT8 arkanoid_paddle_value = input_port_read(machine(), "MUX");
int b;
arkanoid_bootleg_d008_bit[4] = arkanoid_bootleg_d008_bit[6] = arkanoid_bootleg_d008_bit[7] = 0; /* untested bits */
- switch (state->m_bootleg_id)
+ switch (m_bootleg_id)
{
case ARKANGC:
case ARKBLOCK:
@@ -639,7 +627,7 @@ READ8_HANDLER( arkanoid_bootleg_d008_r )
arkanoid_bootleg_d008_bit[2] = 0; /* untested bit */
arkanoid_bootleg_d008_bit[3] = 0; /* untested bit */
arkanoid_bootleg_d008_bit[5] = 0; /* untested bit */
- logerror("%04x: arkanoid_bootleg_d008_r - unknown bootleg !\n",cpu_get_pc(&space->device()));
+ logerror("%04x: arkanoid_bootleg_d008_r - unknown bootleg !\n",cpu_get_pc(&space.device()));
break;
}
diff --git a/src/mame/machine/asteroid.c b/src/mame/machine/asteroid.c
index b67a8b524eb..aa6b46ff66d 100644
--- a/src/mame/machine/asteroid.c
+++ b/src/mame/machine/asteroid.c
@@ -34,9 +34,9 @@ INTERRUPT_GEN( llander_interrupt )
device_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE);
}
-READ8_HANDLER( asteroid_IN0_r )
+READ8_MEMBER(asteroid_state::asteroid_IN0_r)
{
- int res = input_port_read(space->machine(), "IN0");
+ int res = input_port_read(machine(), "IN0");
int bitmask = (1 << offset);
if (res & bitmask)
@@ -48,9 +48,9 @@ READ8_HANDLER( asteroid_IN0_r )
}
-READ8_HANDLER( asterock_IN0_r )
+READ8_MEMBER(asteroid_state::asterock_IN0_r)
{
- int res = input_port_read(space->machine(), "IN0");
+ int res = input_port_read(machine(), "IN0");
int bitmask = (1 << offset);
if (res & bitmask)
@@ -66,9 +66,9 @@ READ8_HANDLER( asterock_IN0_r )
* Typically, only the high bit is used. This is handled by one input port.
*/
-READ8_HANDLER( asteroid_IN1_r )
+READ8_MEMBER(asteroid_state::asteroid_IN1_r)
{
- int res = input_port_read(space->machine(), "IN1");
+ int res = input_port_read(machine(), "IN1");
int bitmask = (1 << (offset & 0x7));
if (res & bitmask)
@@ -80,61 +80,60 @@ READ8_HANDLER( asteroid_IN1_r )
}
-READ8_HANDLER( asteroid_DSW1_r )
+READ8_MEMBER(asteroid_state::asteroid_DSW1_r)
{
int res;
int res1;
- res1 = input_port_read(space->machine(), "DSW1");
+ res1 = input_port_read(machine(), "DSW1");
res = 0xfc | ((res1 >> (2 * (3 - (offset & 0x3)))) & 0x3);
return res;
}
-WRITE8_HANDLER( asteroid_bank_switch_w )
+WRITE8_MEMBER(asteroid_state::asteroid_bank_switch_w)
{
- asteroid_state *state = space->machine().driver_data<asteroid_state>();
if (data & 4)
{
- memory_set_bankptr(space->machine(), "bank1", state->m_ram2);
- memory_set_bankptr(space->machine(), "bank2", state->m_ram1);
+ memory_set_bankptr(machine(), "bank1", m_ram2);
+ memory_set_bankptr(machine(), "bank2", m_ram1);
}
else
{
- memory_set_bankptr(space->machine(), "bank1", state->m_ram1);
- memory_set_bankptr(space->machine(), "bank2", state->m_ram2);
+ memory_set_bankptr(machine(), "bank1", m_ram1);
+ memory_set_bankptr(machine(), "bank2", m_ram2);
}
- set_led_status (space->machine(), 0, ~data & 0x02);
- set_led_status (space->machine(), 1, ~data & 0x01);
+ set_led_status (machine(), 0, ~data & 0x02);
+ set_led_status (machine(), 1, ~data & 0x01);
}
-WRITE8_HANDLER( astdelux_bank_switch_w )
+WRITE8_MEMBER(asteroid_state::astdelux_bank_switch_w)
{
- asteroid_state *state = space->machine().driver_data<asteroid_state>();
if (data & 0x80)
{
- memory_set_bankptr(space->machine(), "bank1", state->m_ram2);
- memory_set_bankptr(space->machine(), "bank2", state->m_ram1);
+ memory_set_bankptr(machine(), "bank1", m_ram2);
+ memory_set_bankptr(machine(), "bank2", m_ram1);
}
else
{
- memory_set_bankptr(space->machine(), "bank1", state->m_ram1);
- memory_set_bankptr(space->machine(), "bank2", state->m_ram2);
+ memory_set_bankptr(machine(), "bank1", m_ram1);
+ memory_set_bankptr(machine(), "bank2", m_ram2);
}
}
-WRITE8_HANDLER( astdelux_led_w )
+WRITE8_MEMBER(asteroid_state::astdelux_led_w)
{
- set_led_status(space->machine(), offset, (data & 0x80) ? 0 : 1);
+ set_led_status(machine(), offset, (data & 0x80) ? 0 : 1);
}
MACHINE_RESET( asteroid )
{
- asteroid_bank_switch_w(machine.device("maincpu")->memory().space(AS_PROGRAM), 0, 0);
+ asteroid_state *state = machine.driver_data<asteroid_state>();
+ state->asteroid_bank_switch_w(*machine.device("maincpu")->memory().space(AS_PROGRAM), 0, 0);
avgdvg_reset_w(machine.device("maincpu")->memory().space(AS_PROGRAM), 0, 0);
}
diff --git a/src/mame/machine/atarifb.c b/src/mame/machine/atarifb.c
index b47fb59147a..6b9d913fa2c 100644
--- a/src/mame/machine/atarifb.c
+++ b/src/mame/machine/atarifb.c
@@ -9,12 +9,11 @@
#include "sound/discrete.h"
-WRITE8_HANDLER( atarifb_out1_w )
+WRITE8_MEMBER(atarifb_state::atarifb_out1_w)
{
- atarifb_state *state = space->machine().driver_data<atarifb_state>();
- device_t *discrete = space->machine().device("discrete");
+ device_t *discrete = machine().device("discrete");
- state->m_CTRLD = data;
+ m_CTRLD = data;
discrete_sound_w(discrete, ATARIFB_WHISTLE_EN, data & 0x01); // Whistle
discrete_sound_w(discrete, ATARIFB_HIT_EN, data & 0x02); // Hit
@@ -23,28 +22,26 @@ WRITE8_HANDLER( atarifb_out1_w )
}
-WRITE8_HANDLER( atarifb4_out1_w )
+WRITE8_MEMBER(atarifb_state::atarifb4_out1_w)
{
- atarifb_state *state = space->machine().driver_data<atarifb_state>();
- device_t *discrete = space->machine().device("discrete");
+ device_t *discrete = machine().device("discrete");
- state->m_CTRLD = data;
+ m_CTRLD = data;
discrete_sound_w(discrete, ATARIFB_WHISTLE_EN, data & 0x01); // Whistle
discrete_sound_w(discrete, ATARIFB_HIT_EN, data & 0x02); // Hit
discrete_sound_w(discrete, ATARIFB_ATTRACT_EN, data & 0x10); // Attract
discrete_sound_w(discrete, ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
- coin_counter_w(space->machine(), 1, data & 0x80);
+ coin_counter_w(machine(), 1, data & 0x80);
}
-WRITE8_HANDLER( abaseb_out1_w )
+WRITE8_MEMBER(atarifb_state::abaseb_out1_w)
{
- atarifb_state *state = space->machine().driver_data<atarifb_state>();
- device_t *discrete = space->machine().device("discrete");
+ device_t *discrete = machine().device("discrete");
- state->m_CTRLD = data;
+ m_CTRLD = data;
discrete_sound_w(discrete, ATARIFB_WHISTLE_EN, data & 0x01); // Whistle
discrete_sound_w(discrete, ATARIFB_HIT_EN, data & 0x02); // Hit
@@ -54,24 +51,23 @@ WRITE8_HANDLER( abaseb_out1_w )
if (data & 0x80)
{
/* Invert video */
- palette_set_color(space->machine(), 1, MAKE_RGB(0x00,0x00,0x00)); /* black */
- palette_set_color(space->machine(), 0, MAKE_RGB(0xff,0xff,0xff)); /* white */
+ palette_set_color(machine(), 1, MAKE_RGB(0x00,0x00,0x00)); /* black */
+ palette_set_color(machine(), 0, MAKE_RGB(0xff,0xff,0xff)); /* white */
}
else
{
/* Regular video */
- palette_set_color(space->machine(), 0, MAKE_RGB(0x00,0x00,0x00)); /* black */
- palette_set_color(space->machine(), 1, MAKE_RGB(0xff,0xff,0xff)); /* white */
+ palette_set_color(machine(), 0, MAKE_RGB(0x00,0x00,0x00)); /* black */
+ palette_set_color(machine(), 1, MAKE_RGB(0xff,0xff,0xff)); /* white */
}
}
-WRITE8_HANDLER( soccer_out1_w )
+WRITE8_MEMBER(atarifb_state::soccer_out1_w)
{
- atarifb_state *state = space->machine().driver_data<atarifb_state>();
- device_t *discrete = space->machine().device("discrete");
+ device_t *discrete = machine().device("discrete");
- state->m_CTRLD = data;
+ m_CTRLD = data;
/* bit 0 = whistle */
/* bit 1 = hit */
@@ -86,30 +82,30 @@ WRITE8_HANDLER( soccer_out1_w )
discrete_sound_w(discrete, ATARIFB_ATTRACT_EN, data & 0x10); // Attract
discrete_sound_w(discrete, ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
-// set_led_status(space->machine(), 0, data & 0x10); // !!!!!!!!!! Is this correct????
- set_led_status(space->machine(), 1, data & 0x80);
+// set_led_status(machine(), 0, data & 0x10); // !!!!!!!!!! Is this correct????
+ set_led_status(machine(), 1, data & 0x80);
}
-WRITE8_HANDLER( atarifb_out2_w )
+WRITE8_MEMBER(atarifb_state::atarifb_out2_w)
{
- device_t *discrete = space->machine().device("discrete");
+ device_t *discrete = machine().device("discrete");
discrete_sound_w(discrete, ATARIFB_CROWD_DATA, data & 0x0f); // Crowd
- coin_counter_w (space->machine(), 0, data & 0x10);
+ coin_counter_w (machine(), 0, data & 0x10);
}
-WRITE8_HANDLER( soccer_out2_w )
+WRITE8_MEMBER(atarifb_state::soccer_out2_w)
{
- device_t *discrete = space->machine().device("discrete");
+ device_t *discrete = machine().device("discrete");
discrete_sound_w(discrete, ATARIFB_CROWD_DATA, data & 0x0f); // Crowd
- coin_counter_w (space->machine(), 0, data & 0x10);
- coin_counter_w (space->machine(), 1, data & 0x20);
- coin_counter_w (space->machine(), 2, data & 0x40);
+ coin_counter_w (machine(), 0, data & 0x10);
+ coin_counter_w (machine(), 1, data & 0x20);
+ coin_counter_w (machine(), 2, data & 0x40);
}
@@ -121,10 +117,9 @@ WRITE8_HANDLER( soccer_out2_w )
*************************************/
/* FIXME: almost surely not tied with screen vertical position */
-WRITE8_HANDLER( atarifb_out3_w )
+WRITE8_MEMBER(atarifb_state::atarifb_out3_w)
{
- //atarifb_state *state = space->machine().driver_data<atarifb_state>();
- int loop = space->machine().primary_screen->vpos() >= 123;
+ int loop = machine().primary_screen->vpos() >= 123;
switch (loop)
{
@@ -149,18 +144,17 @@ WRITE8_HANDLER( atarifb_out3_w )
}
-READ8_HANDLER( atarifb_in0_r )
+READ8_MEMBER(atarifb_state::atarifb_in0_r)
{
- atarifb_state *state = space->machine().driver_data<atarifb_state>();
- if ((state->m_CTRLD & 0x20) == 0x00)
+ if ((m_CTRLD & 0x20) == 0x00)
{
int val;
- val = (state->m_sign_y_2 >> 7) |
- (state->m_sign_x_2 >> 6) |
- (state->m_sign_y_1 >> 5) |
- (state->m_sign_x_1 >> 4) |
- input_port_read(space->machine(), "IN0");
+ val = (m_sign_y_2 >> 7) |
+ (m_sign_x_2 >> 6) |
+ (m_sign_y_1 >> 5) |
+ (m_sign_x_1 >> 4) |
+ input_port_read(machine(), "IN0");
return val;
}
else
@@ -168,175 +162,172 @@ READ8_HANDLER( atarifb_in0_r )
int new_x, new_y;
/* Read player 1 trackball */
- new_x = input_port_read(space->machine(), "IN3");
- if (new_x != state->m_counter_x_in0)
+ new_x = input_port_read(machine(), "IN3");
+ if (new_x != m_counter_x_in0)
{
- state->m_sign_x_1 = (new_x - state->m_counter_x_in0) & 0x80;
- state->m_counter_x_in0 = new_x;
+ m_sign_x_1 = (new_x - m_counter_x_in0) & 0x80;
+ m_counter_x_in0 = new_x;
}
- new_y = input_port_read(space->machine(), "IN2");
- if (new_y != state->m_counter_y_in0)
+ new_y = input_port_read(machine(), "IN2");
+ if (new_y != m_counter_y_in0)
{
- state->m_sign_y_1 = (new_y - state->m_counter_y_in0) & 0x80;
- state->m_counter_y_in0 = new_y;
+ m_sign_y_1 = (new_y - m_counter_y_in0) & 0x80;
+ m_counter_y_in0 = new_y;
}
- return (((state->m_counter_y_in0 & 0x0f) << 4) | (state->m_counter_x_in0 & 0x0f));
+ return (((m_counter_y_in0 & 0x0f) << 4) | (m_counter_x_in0 & 0x0f));
}
}
-READ8_HANDLER( atarifb_in2_r )
+READ8_MEMBER(atarifb_state::atarifb_in2_r)
{
- atarifb_state *state = space->machine().driver_data<atarifb_state>();
- if ((state->m_CTRLD & 0x20) == 0x00)
+ if ((m_CTRLD & 0x20) == 0x00)
{
- return input_port_read(space->machine(), "IN1");
+ return input_port_read(machine(), "IN1");
}
else
{
int new_x, new_y;
/* Read player 2 trackball */
- new_x = input_port_read(space->machine(), "IN5");
- if (new_x != state->m_counter_x_in2)
+ new_x = input_port_read(machine(), "IN5");
+ if (new_x != m_counter_x_in2)
{
- state->m_sign_x_2 = (new_x - state->m_counter_x_in2) & 0x80;
- state->m_counter_x_in2 = new_x;
+ m_sign_x_2 = (new_x - m_counter_x_in2) & 0x80;
+ m_counter_x_in2 = new_x;
}
- new_y = input_port_read(space->machine(), "IN4");
- if (new_y != state->m_counter_y_in2)
+ new_y = input_port_read(machine(), "IN4");
+ if (new_y != m_counter_y_in2)
{
- state->m_sign_y_2 = (new_y - state->m_counter_y_in2) & 0x80;
- state->m_counter_y_in2 = new_y;
+ m_sign_y_2 = (new_y - m_counter_y_in2) & 0x80;
+ m_counter_y_in2 = new_y;
}
- return (((state->m_counter_y_in2 & 0x0f) << 4) | (state->m_counter_x_in2 & 0x0f));
+ return (((m_counter_y_in2 & 0x0f) << 4) | (m_counter_x_in2 & 0x0f));
}
}
-READ8_HANDLER( atarifb4_in0_r )
+READ8_MEMBER(atarifb_state::atarifb4_in0_r)
{
- atarifb_state *state = space->machine().driver_data<atarifb_state>();
/* LD1 and LD2 low, return sign bits */
- if ((state->m_CTRLD & 0x60) == 0x00)
+ if ((m_CTRLD & 0x60) == 0x00)
{
int val;
- val = (state->m_sign_x_4 >> 7) |
- (state->m_sign_y_4 >> 6) |
- (state->m_sign_x_2 >> 5) |
- (state->m_sign_y_2 >> 4) |
- (state->m_sign_x_3 >> 3) |
- (state->m_sign_y_3 >> 2) |
- (state->m_sign_x_1 >> 1) |
- (state->m_sign_y_1 >> 0);
+ val = (m_sign_x_4 >> 7) |
+ (m_sign_y_4 >> 6) |
+ (m_sign_x_2 >> 5) |
+ (m_sign_y_2 >> 4) |
+ (m_sign_x_3 >> 3) |
+ (m_sign_y_3 >> 2) |
+ (m_sign_x_1 >> 1) |
+ (m_sign_y_1 >> 0);
return val;
}
- else if ((state->m_CTRLD & 0x60) == 0x60)
+ else if ((m_CTRLD & 0x60) == 0x60)
/* LD1 and LD2 both high, return Team 1 right player (player 1) */
{
int new_x, new_y;
/* Read player 1 trackball */
- new_x = input_port_read(space->machine(), "IN3");
- if (new_x != state->m_counter_x_in0)
+ new_x = input_port_read(machine(), "IN3");
+ if (new_x != m_counter_x_in0)
{
- state->m_sign_x_1 = (new_x - state->m_counter_x_in0) & 0x80;
- state->m_counter_x_in0 = new_x;
+ m_sign_x_1 = (new_x - m_counter_x_in0) & 0x80;
+ m_counter_x_in0 = new_x;
}
- new_y = input_port_read(space->machine(), "IN2");
- if (new_y != state->m_counter_y_in0)
+ new_y = input_port_read(machine(), "IN2");
+ if (new_y != m_counter_y_in0)
{
- state->m_sign_y_1 = (new_y - state->m_counter_y_in0) & 0x80;
- state->m_counter_y_in0 = new_y;
+ m_sign_y_1 = (new_y - m_counter_y_in0) & 0x80;
+ m_counter_y_in0 = new_y;
}
- return (((state->m_counter_y_in0 & 0x0f) << 4) | (state->m_counter_x_in0 & 0x0f));
+ return (((m_counter_y_in0 & 0x0f) << 4) | (m_counter_x_in0 & 0x0f));
}
- else if ((state->m_CTRLD & 0x60) == 0x40)
+ else if ((m_CTRLD & 0x60) == 0x40)
/* LD1 high, LD2 low, return Team 1 left player (player 2) */
{
int new_x, new_y;
/* Read player 2 trackball */
- new_x = input_port_read(space->machine(), "IN5");
- if (new_x != state->m_counter_x_in0b)
+ new_x = input_port_read(machine(), "IN5");
+ if (new_x != m_counter_x_in0b)
{
- state->m_sign_x_2 = (new_x - state->m_counter_x_in0b) & 0x80;
- state->m_counter_x_in0b = new_x;
+ m_sign_x_2 = (new_x - m_counter_x_in0b) & 0x80;
+ m_counter_x_in0b = new_x;
}
- new_y = input_port_read(space->machine(), "IN4");
- if (new_y != state->m_counter_y_in0b)
+ new_y = input_port_read(machine(), "IN4");
+ if (new_y != m_counter_y_in0b)
{
- state->m_sign_y_2 = (new_y - state->m_counter_y_in0b) & 0x80;
- state->m_counter_y_in0b = new_y;
+ m_sign_y_2 = (new_y - m_counter_y_in0b) & 0x80;
+ m_counter_y_in0b = new_y;
}
- return (((state->m_counter_y_in0b & 0x0f) << 4) | (state->m_counter_x_in0b & 0x0f));
+ return (((m_counter_y_in0b & 0x0f) << 4) | (m_counter_x_in0b & 0x0f));
}
else return 0;
}
-READ8_HANDLER( atarifb4_in2_r )
+READ8_MEMBER(atarifb_state::atarifb4_in2_r)
{
- atarifb_state *state = space->machine().driver_data<atarifb_state>();
- if ((state->m_CTRLD & 0x40) == 0x00)
+ if ((m_CTRLD & 0x40) == 0x00)
{
- return input_port_read(space->machine(), "IN1");
+ return input_port_read(machine(), "IN1");
}
- else if ((state->m_CTRLD & 0x60) == 0x60)
+ else if ((m_CTRLD & 0x60) == 0x60)
/* LD1 and LD2 both high, return Team 2 right player (player 3) */
{
int new_x, new_y;
/* Read player 3 trackball */
- new_x = input_port_read(space->machine(), "IN7");
- if (new_x != state->m_counter_x_in2)
+ new_x = input_port_read(machine(), "IN7");
+ if (new_x != m_counter_x_in2)
{
- state->m_sign_x_3 = (new_x - state->m_counter_x_in2) & 0x80;
- state->m_counter_x_in2 = new_x;
+ m_sign_x_3 = (new_x - m_counter_x_in2) & 0x80;
+ m_counter_x_in2 = new_x;
}
- new_y = input_port_read(space->machine(), "IN6");
- if (new_y != state->m_counter_y_in2)
+ new_y = input_port_read(machine(), "IN6");
+ if (new_y != m_counter_y_in2)
{
- state->m_sign_y_3 = (new_y - state->m_counter_y_in2) & 0x80;
- state->m_counter_y_in2 = new_y;
+ m_sign_y_3 = (new_y - m_counter_y_in2) & 0x80;
+ m_counter_y_in2 = new_y;
}
- return (((state->m_counter_y_in2 & 0x0f) << 4) | (state->m_counter_x_in2 & 0x0f));
+ return (((m_counter_y_in2 & 0x0f) << 4) | (m_counter_x_in2 & 0x0f));
}
- else if ((state->m_CTRLD & 0x60) == 0x40)
+ else if ((m_CTRLD & 0x60) == 0x40)
/* LD1 high, LD2 low, return Team 2 left player (player 4) */
{
int new_x, new_y;
/* Read player 4 trackball */
- new_x = input_port_read(space->machine(), "IN9");
- if (new_x != state->m_counter_x_in2b)
+ new_x = input_port_read(machine(), "IN9");
+ if (new_x != m_counter_x_in2b)
{
- state->m_sign_x_4 = (new_x - state->m_counter_x_in2b) & 0x80;
- state->m_counter_x_in2b = new_x;
+ m_sign_x_4 = (new_x - m_counter_x_in2b) & 0x80;
+ m_counter_x_in2b = new_x;
}
- new_y = input_port_read(space->machine(), "IN8");
- if (new_y != state->m_counter_y_in2b)
+ new_y = input_port_read(machine(), "IN8");
+ if (new_y != m_counter_y_in2b)
{
- state->m_sign_y_4 = (new_y - state->m_counter_y_in2b) & 0x80;
- state->m_counter_y_in2b = new_y;
+ m_sign_y_4 = (new_y - m_counter_y_in2b) & 0x80;
+ m_counter_y_in2b = new_y;
}
- return (((state->m_counter_y_in2b & 0x0f) << 4) | (state->m_counter_x_in2b & 0x0f));
+ return (((m_counter_y_in2b & 0x0f) << 4) | (m_counter_x_in2b & 0x0f));
}
else return 0;
diff --git a/src/mame/machine/bagman.c b/src/mame/machine/bagman.c
index 54b512e14b4..8df8a8770e6 100644
--- a/src/mame/machine/bagman.c
+++ b/src/mame/machine/bagman.c
@@ -96,7 +96,7 @@ static const UINT8 fusemap[64*32]=
};
-static void update_pal(bagman_state *state)
+void bagman_state::update_pal()
{
UINT16 rowoffs;
UINT8 row, column, val;
@@ -109,127 +109,125 @@ UINT8 row, column, val;
for (column = 0; column < 32; column++)
{
if ( fusemap[ rowoffs + column ] == 0 )
- val &= state->m_columnvalue[column];
+ val &= m_columnvalue[column];
}
- state->m_andmap[row] = val;
+ m_andmap[row] = val;
}
/* I/O pin #19 */
val = 0; /*prepare for OR*/
for (row = 1; row < 8; row++)
- val |= state->m_andmap[row];
- if (state->m_andmap[0] == 1)
+ val |= m_andmap[row];
+ if (m_andmap[0] == 1)
{
- state->m_columnvalue[2] = 1-val;
- state->m_columnvalue[3] = val;
- state->m_outvalue[0] = 1-val;
+ m_columnvalue[2] = 1-val;
+ m_columnvalue[3] = val;
+ m_outvalue[0] = 1-val;
}
else
{
/*pin is in INPUT configuration so it doesn't create output...*/
- state->m_columnvalue[2] = 0;
- state->m_columnvalue[3] = 1;
+ m_columnvalue[2] = 0;
+ m_columnvalue[3] = 1;
}
/* O pin #18 (D1) */
val = 0; /*prepare for OR*/
for (row = 8; row < 16; row++)
- val |= state->m_andmap[row];
- state->m_columnvalue[6] = 1-val;
- state->m_columnvalue[7] = val;
- state->m_outvalue[1] = 1-val;
+ val |= m_andmap[row];
+ m_columnvalue[6] = 1-val;
+ m_columnvalue[7] = val;
+ m_outvalue[1] = 1-val;
/* O pin #17 (D2) */
val = 0; /*prepare for OR*/
for (row = 16; row < 24; row++)
- val |= state->m_andmap[row];
- state->m_columnvalue[10] = 1-val;
- state->m_columnvalue[11] = val;
- state->m_outvalue[2] = 1-val;
+ val |= m_andmap[row];
+ m_columnvalue[10] = 1-val;
+ m_columnvalue[11] = val;
+ m_outvalue[2] = 1-val;
/* O pin #16 (D3) */
val = 0; /*prepare for OR*/
for (row = 24; row < 32; row++)
- val |= state->m_andmap[row];
- state->m_columnvalue[14] = 1-val;
- state->m_columnvalue[15] = val;
- state->m_outvalue[3] = 1-val;
+ val |= m_andmap[row];
+ m_columnvalue[14] = 1-val;
+ m_columnvalue[15] = val;
+ m_outvalue[3] = 1-val;
/* O pin #15 (D4) */
val = 0; /*prepare for OR*/
for (row = 32; row < 40; row++)
- val |= state->m_andmap[row];
- state->m_columnvalue[18] = 1-val;
- state->m_columnvalue[19] = val;
- state->m_outvalue[4] = 1-val;
+ val |= m_andmap[row];
+ m_columnvalue[18] = 1-val;
+ m_columnvalue[19] = val;
+ m_outvalue[4] = 1-val;
/* O pin #14 (D5) */
val = 0; /*prepare for OR*/
for (row = 40; row < 48; row++)
- val |= state->m_andmap[row];
- state->m_columnvalue[22] = 1-val;
- state->m_columnvalue[23] = val;
- state->m_outvalue[5] = 1-val;
+ val |= m_andmap[row];
+ m_columnvalue[22] = 1-val;
+ m_columnvalue[23] = val;
+ m_outvalue[5] = 1-val;
/* O pin #13 (D6) */
val = 0; /*prepare for OR*/
for (row = 48; row < 56; row++)
- val |= state->m_andmap[row];
- state->m_columnvalue[26] = 1-val;
- state->m_columnvalue[27] = val;
- state->m_outvalue[6] = 1-val;
+ val |= m_andmap[row];
+ m_columnvalue[26] = 1-val;
+ m_columnvalue[27] = val;
+ m_outvalue[6] = 1-val;
/* I/O pin #12 */
val = 0; /*prepare for OR*/
for (row = 57; row < 64; row++)
- val |= state->m_andmap[row];
- if (state->m_andmap[56] == 1)
+ val |= m_andmap[row];
+ if (m_andmap[56] == 1)
{
- state->m_columnvalue[30] = 1-val;
- state->m_columnvalue[31] = val;
- state->m_outvalue[7] = 1-val;
+ m_columnvalue[30] = 1-val;
+ m_columnvalue[31] = val;
+ m_outvalue[7] = 1-val;
}
else
{
/*pin is in INPUT configuration so it doesn't create output...*/
- state->m_columnvalue[30] = 0;
- state->m_columnvalue[31] = 1;
+ m_columnvalue[30] = 0;
+ m_columnvalue[31] = 1;
}
}
-WRITE8_HANDLER( bagman_pal16r6_w )
+WRITE8_MEMBER(bagman_state::bagman_pal16r6_w)
{
- bagman_state *state = space->machine().driver_data<bagman_state>();
UINT8 line;
line = offset * 4;
- state->m_columnvalue[line ] = data & 1;
- state->m_columnvalue[line + 1] = 1 - (data & 1);
+ m_columnvalue[line ] = data & 1;
+ m_columnvalue[line + 1] = 1 - (data & 1);
}
MACHINE_RESET( bagman )
{
bagman_state *state = machine.driver_data<bagman_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- bagman_pal16r6_w(space, 0, 1); /*pin 2*/
- bagman_pal16r6_w(space, 1, 1); /*pin 3*/
- bagman_pal16r6_w(space, 2, 1); /*pin 4*/
- bagman_pal16r6_w(space, 3, 1); /*pin 5*/
- bagman_pal16r6_w(space, 4, 1); /*pin 6*/
- bagman_pal16r6_w(space, 5, 1); /*pin 7*/
- bagman_pal16r6_w(space, 6, 1); /*pin 8*/
- bagman_pal16r6_w(space, 7, 1); /*pin 9*/
- update_pal(state);
+ state->bagman_pal16r6_w(*space, 0, 1); /*pin 2*/
+ state->bagman_pal16r6_w(*space, 1, 1); /*pin 3*/
+ state->bagman_pal16r6_w(*space, 2, 1); /*pin 4*/
+ state->bagman_pal16r6_w(*space, 3, 1); /*pin 5*/
+ state->bagman_pal16r6_w(*space, 4, 1); /*pin 6*/
+ state->bagman_pal16r6_w(*space, 5, 1); /*pin 7*/
+ state->bagman_pal16r6_w(*space, 6, 1); /*pin 8*/
+ state->bagman_pal16r6_w(*space, 7, 1); /*pin 9*/
+ state->update_pal();
}
-READ8_HANDLER( bagman_pal16r6_r )
+READ8_MEMBER(bagman_state::bagman_pal16r6_r)
{
- bagman_state *state = space->machine().driver_data<bagman_state>();
- update_pal(state);
- return (state->m_outvalue[6]) + (state->m_outvalue[5] << 1) + (state->m_outvalue[4] << 2) +
- (state->m_outvalue[3] << 3) + (state->m_outvalue[2] << 4) + (state->m_outvalue[1] << 5);
+ update_pal();
+ return (m_outvalue[6]) + (m_outvalue[5] << 1) + (m_outvalue[4] << 2) +
+ (m_outvalue[3] << 3) + (m_outvalue[2] << 4) + (m_outvalue[1] << 5);
/* Bagman schematics show that this is right mapping order of PAL outputs to bits.
** This is the PAL 16R6 shown almost in the middle of the schematics.
diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c
index 0a2bb602bea..a2a4b05f2c8 100644
--- a/src/mame/machine/balsente.c
+++ b/src/mame/machine/balsente.c
@@ -17,7 +17,6 @@
/* local prototypes */
static void poly17_init(running_machine &machine);
-static void counter_set_out(running_machine &machine, int which, int gate);
static void update_grudge_steering(running_machine &machine);
@@ -166,8 +165,8 @@ MACHINE_RESET( balsente )
state->m_grudge_steering_result = 0;
/* reset the 6850 chips */
- balsente_m6850_w(space, 0, 3);
- balsente_m6850_sound_w(space, 0, 3);
+ state->balsente_m6850_w(*space, 0, 3);
+ state->balsente_m6850_sound_w(*space, 0, 3);
/* reset the noise generator */
memset(state->m_noise_position, 0, sizeof(state->m_noise_position));
@@ -252,23 +251,22 @@ void balsente_noise_gen(device_t *device, int count, short *buffer)
*
*************************************/
-WRITE8_HANDLER( balsente_random_reset_w )
+WRITE8_MEMBER(balsente_state::balsente_random_reset_w)
{
/* reset random number generator */
}
-READ8_HANDLER( balsente_random_num_r )
+READ8_MEMBER(balsente_state::balsente_random_num_r)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
UINT32 cc;
/* CPU runs at 1.25MHz, noise source at 100kHz --> multiply by 12.5 */
- cc = space->machine().firstcpu->total_cycles();
+ cc = machine().firstcpu->total_cycles();
/* 12.5 = 8 + 4 + 0.5 */
cc = (cc << 3) + (cc << 2) + (cc >> 1);
- return state->m_rand17[cc & POLY17_SIZE];
+ return m_rand17[cc & POLY17_SIZE];
}
@@ -279,34 +277,34 @@ READ8_HANDLER( balsente_random_num_r )
*
*************************************/
-WRITE8_HANDLER( balsente_rombank_select_w )
+WRITE8_MEMBER(balsente_state::balsente_rombank_select_w)
{
/* the bank number comes from bits 4-6 */
- memory_set_bank(space->machine(), "bank1", (data >> 4) & 7);
- memory_set_bank(space->machine(), "bank2", (data >> 4) & 7);
+ memory_set_bank(machine(), "bank1", (data >> 4) & 7);
+ memory_set_bank(machine(), "bank2", (data >> 4) & 7);
}
-WRITE8_HANDLER( balsente_rombank2_select_w )
+WRITE8_MEMBER(balsente_state::balsente_rombank2_select_w)
{
/* Night Stocker and Name that Tune only so far.... */
int bank = data & 7;
/* top bit controls which half of the ROMs to use (Name that Tune only) */
- if (space->machine().region("maincpu")->bytes() > 0x40000) bank |= (data >> 4) & 8;
+ if (machine().region("maincpu")->bytes() > 0x40000) bank |= (data >> 4) & 8;
/* when they set the AB bank, it appears as though the CD bank is reset */
if (data & 0x20)
{
- memory_set_bank(space->machine(), "bank1", bank);
- memory_set_bank(space->machine(), "bank2", 6);
+ memory_set_bank(machine(), "bank1", bank);
+ memory_set_bank(machine(), "bank2", 6);
}
/* set both banks */
else
{
- memory_set_bank(space->machine(), "bank1", bank);
- memory_set_bank(space->machine(), "bank2", bank);
+ memory_set_bank(machine(), "bank1", bank);
+ memory_set_bank(machine(), "bank2", bank);
}
}
@@ -318,7 +316,7 @@ WRITE8_HANDLER( balsente_rombank2_select_w )
*
*************************************/
-WRITE8_HANDLER( balsente_misc_output_w )
+WRITE8_MEMBER(balsente_state::balsente_misc_output_w)
{
offset = (offset / 4) % 8;
data >>= 7;
@@ -331,7 +329,7 @@ WRITE8_HANDLER( balsente_misc_output_w )
}
else
{
-// set_led_status(space->machine(), offset, data);
+// set_led_status(machine(), offset, data);
}
}
@@ -436,25 +434,24 @@ static void m6850_update_io(running_machine &machine)
*
*************************************/
-READ8_HANDLER( balsente_m6850_r )
+READ8_MEMBER(balsente_state::balsente_m6850_r)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
int result;
/* status register is at offset 0 */
if (offset == 0)
{
- result = state->m_m6850_status;
+ result = m_m6850_status;
}
/* input register is at offset 1 */
else
{
- result = state->m_m6850_input;
+ result = m_m6850_input;
/* clear the overrun and receive buffer full bits */
- state->m_m6850_status &= ~0x21;
- m6850_update_io(space->machine());
+ m_m6850_status &= ~0x21;
+ m6850_update_io(machine());
}
return result;
@@ -486,22 +483,21 @@ static TIMER_CALLBACK( m6850_w_callback )
}
-WRITE8_HANDLER( balsente_m6850_w )
+WRITE8_MEMBER(balsente_state::balsente_m6850_w)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
/* control register is at offset 0 */
if (offset == 0)
{
- state->m_m6850_control = data;
+ m_m6850_control = data;
/* re-update since interrupt enables could have been modified */
- m6850_update_io(space->machine());
+ m6850_update_io(machine());
}
/* output register is at offset 1; set a timer to synchronize the CPUs */
else
- space->machine().scheduler().synchronize(FUNC(m6850_w_callback), data);
+ machine().scheduler().synchronize(FUNC(m6850_w_callback), data);
}
@@ -512,48 +508,46 @@ WRITE8_HANDLER( balsente_m6850_w )
*
*************************************/
-READ8_HANDLER( balsente_m6850_sound_r )
+READ8_MEMBER(balsente_state::balsente_m6850_sound_r)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
int result;
/* status register is at offset 0 */
if (offset == 0)
{
- result = state->m_m6850_sound_status;
+ result = m_m6850_sound_status;
}
/* input register is at offset 1 */
else
{
- result = state->m_m6850_sound_input;
+ result = m_m6850_sound_input;
/* clear the overrun and receive buffer full bits */
- state->m_m6850_sound_status &= ~0x21;
- m6850_update_io(space->machine());
+ m_m6850_sound_status &= ~0x21;
+ m6850_update_io(machine());
}
return result;
}
-WRITE8_HANDLER( balsente_m6850_sound_w )
+WRITE8_MEMBER(balsente_state::balsente_m6850_sound_w)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
/* control register is at offset 0 */
if (offset == 0)
- state->m_m6850_sound_control = data;
+ m_m6850_sound_control = data;
/* output register is at offset 1 */
else
{
- state->m_m6850_sound_output = data;
- state->m_m6850_sound_status &= ~0x02;
+ m_m6850_sound_output = data;
+ m_m6850_sound_status &= ~0x02;
}
/* re-update since interrupt enables could have been modified */
- m6850_update_io(space->machine());
+ m6850_update_io(machine());
}
@@ -614,21 +608,20 @@ static TIMER_CALLBACK( adc_finished )
}
-READ8_HANDLER( balsente_adc_data_r )
+READ8_MEMBER(balsente_state::balsente_adc_data_r)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
/* just return the last value read */
- return state->m_adc_value;
+ return m_adc_value;
}
-WRITE8_HANDLER( balsente_adc_select_w )
+WRITE8_MEMBER(balsente_state::balsente_adc_select_w)
{
/* set a timer to go off and read the value after 50us */
/* it's important that we do this for Mini Golf */
logerror("adc_select %d\n", offset & 7);
- space->machine().scheduler().timer_set(attotime::from_usec(50), FUNC(adc_finished), offset & 7);
+ machine().scheduler().timer_set(attotime::from_usec(50), FUNC(adc_finished), offset & 7);
}
@@ -641,38 +634,38 @@ logerror("adc_select %d\n", offset & 7);
*
*************************************/
-INLINE void counter_start(balsente_state *state, int which)
+void balsente_state::counter_start(int which)
{
/* don't start a timer for channel 0; it is clocked manually */
if (which != 0)
{
/* only start a timer if we're gated and there is none already */
- if (state->m_counter[which].gate && !state->m_counter[which].timer_active)
+ if (m_counter[which].gate && !m_counter[which].timer_active)
{
- state->m_counter[which].timer_active = 1;
- state->m_counter[which].timer->adjust(attotime::from_hz(2000000) * state->m_counter[which].count, which);
+ m_counter[which].timer_active = 1;
+ m_counter[which].timer->adjust(attotime::from_hz(2000000) * m_counter[which].count, which);
}
}
}
-INLINE void counter_stop(balsente_state *state, int which)
+void balsente_state::counter_stop( int which)
{
/* only stop the timer if it exists */
- if (state->m_counter[which].timer_active)
- state->m_counter[which].timer->reset();
- state->m_counter[which].timer_active = 0;
+ if (m_counter[which].timer_active)
+ m_counter[which].timer->reset();
+ m_counter[which].timer_active = 0;
}
-INLINE void counter_update_count(balsente_state *state, int which)
+void balsente_state::counter_update_count(int which)
{
/* only update if the timer is running */
- if (state->m_counter[which].timer_active)
+ if (m_counter[which].timer_active)
{
/* determine how many 2MHz cycles are remaining */
- int count = (state->m_counter[which].timer->time_left() * 2000000).as_double();
- state->m_counter[which].count = (count < 0) ? 0 : count;
+ int count = (m_counter[which].timer->time_left() * 2000000).as_double();
+ m_counter[which].count = (count < 0) ? 0 : count;
}
}
@@ -686,54 +679,51 @@ INLINE void counter_update_count(balsente_state *state, int which)
*
*************************************/
-static void counter_set_gate(running_machine &machine, int which, int gate)
+void balsente_state::counter_set_gate(int which, int gate)
{
- balsente_state *state = machine.driver_data<balsente_state>();
- int oldgate = state->m_counter[which].gate;
+ int oldgate = m_counter[which].gate;
/* remember the gate state */
- state->m_counter[which].gate = gate;
+ m_counter[which].gate = gate;
/* if the counter is being halted, update the count and remove the system timer */
if (!gate && oldgate)
{
- counter_update_count(state, which);
- counter_stop(state, which);
+ counter_update_count(which);
+ counter_stop(which);
}
/* if the counter is being started, create the timer */
else if (gate && !oldgate)
{
/* mode 1 waits for the gate to trigger the counter */
- if (state->m_counter[which].mode == 1)
+ if (m_counter[which].mode == 1)
{
- counter_set_out(machine, which, 0);
+ counter_set_out(which, 0);
/* add one to the count; technically, OUT goes low on the next clock pulse */
/* and then starts counting down; it's important that we don't count the first one */
- state->m_counter[which].count = state->m_counter[which].initial + 1;
+ m_counter[which].count = m_counter[which].initial + 1;
}
/* start the counter */
- counter_start(state, which);
+ counter_start(which);
}
}
-static void counter_set_out(running_machine &machine, int which, int out)
+void balsente_state::counter_set_out(int which, int out)
{
- balsente_state *state = machine.driver_data<balsente_state>();
-
/* OUT on counter 2 is hooked to the /INT line on the Z80 */
if (which == 2)
- cputag_set_input_line(machine, "audiocpu", 0, out ? ASSERT_LINE : CLEAR_LINE);
+ cputag_set_input_line(machine(), "audiocpu", 0, out ? ASSERT_LINE : CLEAR_LINE);
/* OUT on counter 0 is hooked to the GATE line on counter 1 */
else if (which == 0)
- counter_set_gate(machine, 1, !out);
+ counter_set_gate(1, !out);
/* remember the out state */
- state->m_counter[which].out = out;
+ m_counter[which].out = out;
}
@@ -748,7 +738,7 @@ TIMER_DEVICE_CALLBACK( balsente_counter_callback )
/* set the state of the OUT line */
/* mode 0 and 1: when firing, transition OUT to high */
if (state->m_counter[param].mode == 0 || state->m_counter[param].mode == 1)
- counter_set_out(timer.machine(), param, 1);
+ state->counter_set_out(param, 1);
/* no other modes handled currently */
}
@@ -763,9 +753,8 @@ TIMER_DEVICE_CALLBACK( balsente_counter_callback )
*
*************************************/
-READ8_HANDLER( balsente_counter_8253_r )
+READ8_MEMBER(balsente_state::balsente_counter_8253_r)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
int which;
switch (offset & 3)
@@ -777,20 +766,20 @@ READ8_HANDLER( balsente_counter_8253_r )
which = offset & 3;
/* update the count */
- counter_update_count(state, which);
+ counter_update_count(which);
/* return the LSB */
- if (state->m_counter[which].readbyte == 0)
+ if (m_counter[which].readbyte == 0)
{
- state->m_counter[which].readbyte = 1;
- return state->m_counter[which].count & 0xff;
+ m_counter[which].readbyte = 1;
+ return m_counter[which].count & 0xff;
}
/* write the MSB and reset the counter */
else
{
- state->m_counter[which].readbyte = 0;
- return (state->m_counter[which].count >> 8) & 0xff;
+ m_counter[which].readbyte = 0;
+ return (m_counter[which].count >> 8) & 0xff;
}
break;
}
@@ -798,9 +787,8 @@ READ8_HANDLER( balsente_counter_8253_r )
}
-WRITE8_HANDLER( balsente_counter_8253_w )
+WRITE8_MEMBER(balsente_state::balsente_counter_8253_w)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
int which;
switch (offset & 3)
@@ -812,37 +800,37 @@ WRITE8_HANDLER( balsente_counter_8253_w )
which = offset & 3;
/* if the counter is in mode 0, a write here will reset the OUT state */
- if (state->m_counter[which].mode == 0)
- counter_set_out(space->machine(), which, 0);
+ if (m_counter[which].mode == 0)
+ counter_set_out(which, 0);
/* write the LSB */
- if (state->m_counter[which].writebyte == 0)
+ if (m_counter[which].writebyte == 0)
{
- state->m_counter[which].count = (state->m_counter[which].count & 0xff00) | (data & 0x00ff);
- state->m_counter[which].initial = (state->m_counter[which].initial & 0xff00) | (data & 0x00ff);
- state->m_counter[which].writebyte = 1;
+ m_counter[which].count = (m_counter[which].count & 0xff00) | (data & 0x00ff);
+ m_counter[which].initial = (m_counter[which].initial & 0xff00) | (data & 0x00ff);
+ m_counter[which].writebyte = 1;
}
/* write the MSB and reset the counter */
else
{
- state->m_counter[which].count = (state->m_counter[which].count & 0x00ff) | ((data << 8) & 0xff00);
- state->m_counter[which].initial = (state->m_counter[which].initial & 0x00ff) | ((data << 8) & 0xff00);
- state->m_counter[which].writebyte = 0;
+ m_counter[which].count = (m_counter[which].count & 0x00ff) | ((data << 8) & 0xff00);
+ m_counter[which].initial = (m_counter[which].initial & 0x00ff) | ((data << 8) & 0xff00);
+ m_counter[which].writebyte = 0;
/* treat 0 as $10000 */
- if (state->m_counter[which].count == 0) state->m_counter[which].count = state->m_counter[which].initial = 0x10000;
+ if (m_counter[which].count == 0) m_counter[which].count = m_counter[which].initial = 0x10000;
/* remove any old timer and set a new one */
- counter_stop(state, which);
+ counter_stop(which);
/* note that in mode 1, we have to wait for a rising edge of a gate */
- if (state->m_counter[which].mode == 0)
- counter_start(state, which);
+ if (m_counter[which].mode == 0)
+ counter_start(which);
/* if the counter is in mode 1, a write here will set the OUT state */
- if (state->m_counter[which].mode == 1)
- counter_set_out(space->machine(), which, 1);
+ if (m_counter[which].mode == 1)
+ counter_set_out(which, 1);
}
break;
@@ -852,15 +840,15 @@ WRITE8_HANDLER( balsente_counter_8253_w )
if (which == 3) break;
/* if the counter was in mode 0, a write here will reset the OUT state */
- if (((state->m_counter[which].mode >> 1) & 7) == 0)
- counter_set_out(space->machine(), which, 0);
+ if (((m_counter[which].mode >> 1) & 7) == 0)
+ counter_set_out(which, 0);
/* set the mode */
- state->m_counter[which].mode = (data >> 1) & 7;
+ m_counter[which].mode = (data >> 1) & 7;
/* if the counter is in mode 0, a write here will reset the OUT state */
- if (state->m_counter[which].mode == 0)
- counter_set_out(space->machine(), which, 0);
+ if (m_counter[which].mode == 0)
+ counter_set_out(which, 0);
break;
}
}
@@ -903,30 +891,30 @@ TIMER_DEVICE_CALLBACK( balsente_clock_counter_0_ff )
}
-static void update_counter_0_timer(balsente_state *state)
+void balsente_state::update_counter_0_timer()
{
double maxfreq = 0.0;
int i;
/* if there's already a timer, remove it */
- if (state->m_counter_0_timer_active)
- state->m_counter_0_timer->reset();
- state->m_counter_0_timer_active = 0;
+ if (m_counter_0_timer_active)
+ m_counter_0_timer->reset();
+ m_counter_0_timer_active = 0;
/* find the counter with the maximum frequency */
/* this is used to calibrate the timers at startup */
for (i = 0; i < 6; i++)
- if (cem3394_get_parameter(state->m_cem_device[i], CEM3394_FINAL_GAIN) < 10.0)
+ if (cem3394_get_parameter(m_cem_device[i], CEM3394_FINAL_GAIN) < 10.0)
{
double tempfreq;
/* if the filter resonance is high, then they're calibrating the filter frequency */
- if (cem3394_get_parameter(state->m_cem_device[i], CEM3394_FILTER_RESONANCE) > 0.9)
- tempfreq = cem3394_get_parameter(state->m_cem_device[i], CEM3394_FILTER_FREQENCY);
+ if (cem3394_get_parameter(m_cem_device[i], CEM3394_FILTER_RESONANCE) > 0.9)
+ tempfreq = cem3394_get_parameter(m_cem_device[i], CEM3394_FILTER_FREQENCY);
/* otherwise, they're calibrating the VCO frequency */
else
- tempfreq = cem3394_get_parameter(state->m_cem_device[i], CEM3394_VCO_FREQUENCY);
+ tempfreq = cem3394_get_parameter(m_cem_device[i], CEM3394_VCO_FREQUENCY);
if (tempfreq > maxfreq) maxfreq = tempfreq;
}
@@ -934,8 +922,8 @@ static void update_counter_0_timer(balsente_state *state)
/* reprime the timer */
if (maxfreq > 0.0)
{
- state->m_counter_0_timer_active = 1;
- state->m_counter_0_timer->adjust(attotime::from_hz(maxfreq), 0, attotime::from_hz(maxfreq));
+ m_counter_0_timer_active = 1;
+ m_counter_0_timer->adjust(attotime::from_hz(maxfreq), 0, attotime::from_hz(maxfreq));
}
}
@@ -947,59 +935,57 @@ static void update_counter_0_timer(balsente_state *state)
*
*************************************/
-READ8_HANDLER( balsente_counter_state_r )
+READ8_MEMBER(balsente_state::balsente_counter_state_r)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
/* bit D0 is the inverse of the flip-flop state */
- int result = !state->m_counter_0_ff;
+ int result = !m_counter_0_ff;
/* bit D1 is the OUT value from counter 0 */
- if (state->m_counter[0].out) result |= 0x02;
+ if (m_counter[0].out) result |= 0x02;
return result;
}
-WRITE8_HANDLER( balsente_counter_control_w )
+WRITE8_MEMBER(balsente_state::balsente_counter_control_w)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
- UINT8 diff_counter_control = state->m_counter_control ^ data;
+ UINT8 diff_counter_control = m_counter_control ^ data;
/* set the new global value */
- state->m_counter_control = data;
+ m_counter_control = data;
/* bit D0 enables/disables audio */
if (diff_counter_control & 0x01)
{
int ch;
for (ch = 0; ch < 6; ch++)
- state->m_cem_device[ch]->set_output_gain(0, (data & 0x01) ? 1.0 : 0);
+ m_cem_device[ch]->set_output_gain(0, (data & 0x01) ? 1.0 : 0);
}
/* bit D1 is hooked to counter 0's gate */
/* if we gate on, start a pulsing timer to clock it */
- if (!state->m_counter[0].gate && (data & 0x02) && !state->m_counter_0_timer_active)
+ if (!m_counter[0].gate && (data & 0x02) && !m_counter_0_timer_active)
{
- update_counter_0_timer(state);
+ update_counter_0_timer();
}
/* if we gate off, remove the timer */
- else if (state->m_counter[0].gate && !(data & 0x02) && state->m_counter_0_timer_active)
+ else if (m_counter[0].gate && !(data & 0x02) && m_counter_0_timer_active)
{
- state->m_counter_0_timer->reset();
- state->m_counter_0_timer_active = 0;
+ m_counter_0_timer->reset();
+ m_counter_0_timer_active = 0;
}
/* set the actual gate afterwards, since we need to know the old value above */
- counter_set_gate(space->machine(), 0, (data >> 1) & 1);
+ counter_set_gate(0, (data >> 1) & 1);
/* bits D2 and D4 control the clear/reset flags on the flip-flop that feeds counter 0 */
- if (!(data & 0x04)) set_counter_0_ff(*state->m_counter_0_timer, 1);
- if (!(data & 0x10)) set_counter_0_ff(*state->m_counter_0_timer, 0);
+ if (!(data & 0x04)) set_counter_0_ff(*m_counter_0_timer, 1);
+ if (!(data & 0x10)) set_counter_0_ff(*m_counter_0_timer, 0);
/* bit 5 clears the NMI interrupt; recompute the I/O state now */
- m6850_update_io(space->machine());
+ m6850_update_io(machine());
}
@@ -1010,7 +996,7 @@ WRITE8_HANDLER( balsente_counter_control_w )
*
*************************************/
-WRITE8_HANDLER( balsente_chip_select_w )
+WRITE8_MEMBER(balsente_state::balsente_chip_select_w)
{
static const UINT8 register_map[8] =
{
@@ -1024,13 +1010,12 @@ WRITE8_HANDLER( balsente_chip_select_w )
CEM3394_WAVE_SELECT
};
- balsente_state *state = space->machine().driver_data<balsente_state>();
- double voltage = (double)state->m_dac_value * (8.0 / 4096.0) - 4.0;
- int diffchip = data ^ state->m_chip_select, i;
- int reg = register_map[state->m_dac_register];
+ double voltage = (double)m_dac_value * (8.0 / 4096.0) - 4.0;
+ int diffchip = data ^ m_chip_select, i;
+ int reg = register_map[m_dac_register];
/* remember the new select value */
- state->m_chip_select = data;
+ m_chip_select = data;
/* check all six chip enables */
for (i = 0; i < 6; i++)
@@ -1042,14 +1027,14 @@ WRITE8_HANDLER( balsente_chip_select_w )
/* remember the previous value */
temp =
#endif
- cem3394_get_parameter(state->m_cem_device[i], reg);
+ cem3394_get_parameter(m_cem_device[i], reg);
/* set the voltage */
- cem3394_set_voltage(state->m_cem_device[i], reg, voltage);
+ cem3394_set_voltage(m_cem_device[i], reg, voltage);
/* only log changes */
#if LOG_CEM_WRITES
- if (temp != cem3394_get_parameter(state->m_cem_device[i], reg))
+ if (temp != cem3394_get_parameter(m_cem_device[i], reg))
{
static const char *const names[] =
{
@@ -1062,42 +1047,40 @@ WRITE8_HANDLER( balsente_chip_select_w )
"PULSE_WIDTH",
"WAVE_SELECT"
};
- logerror("s%04X: CEM#%d:%s=%f\n", cpu_get_previouspc(&space->device()), i, names[state->m_dac_register], voltage);
+ logerror("s%04X: CEM#%d:%s=%f\n", cpu_get_previouspc(&space.device()), i, names[m_dac_register], voltage);
}
#endif
}
/* if a timer for counter 0 is running, recompute */
- if (state->m_counter_0_timer_active)
- update_counter_0_timer(state);
+ if (m_counter_0_timer_active)
+ update_counter_0_timer();
}
-WRITE8_HANDLER( balsente_dac_data_w )
+WRITE8_MEMBER(balsente_state::balsente_dac_data_w)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
/* LSB or MSB? */
if (offset & 1)
- state->m_dac_value = (state->m_dac_value & 0xfc0) | ((data >> 2) & 0x03f);
+ m_dac_value = (m_dac_value & 0xfc0) | ((data >> 2) & 0x03f);
else
- state->m_dac_value = (state->m_dac_value & 0x03f) | ((data << 6) & 0xfc0);
+ m_dac_value = (m_dac_value & 0x03f) | ((data << 6) & 0xfc0);
/* if there are open channels, force the values in */
- if ((state->m_chip_select & 0x3f) != 0x3f)
+ if ((m_chip_select & 0x3f) != 0x3f)
{
- UINT8 temp = state->m_chip_select;
+ UINT8 temp = m_chip_select;
balsente_chip_select_w(space, 0, 0x3f);
balsente_chip_select_w(space, 0, temp);
}
}
-WRITE8_HANDLER( balsente_register_addr_w )
+WRITE8_MEMBER(balsente_state::balsente_register_addr_w)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
- state->m_dac_register = data & 7;
+ m_dac_register = data & 7;
}
@@ -1115,38 +1098,36 @@ CUSTOM_INPUT( nstocker_bits_r )
}
-WRITE8_HANDLER( spiker_expand_w )
+WRITE8_MEMBER(balsente_state::spiker_expand_w)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
/* offset 0 is the bit pattern */
if (offset == 0)
- state->m_spiker_expand_bits = data;
+ m_spiker_expand_bits = data;
/* offset 1 is the background color (cleared on each read) */
else if (offset == 1)
- state->m_spiker_expand_bgcolor = data;
+ m_spiker_expand_bgcolor = data;
/* offset 2 is the color */
else if (offset == 2)
- state->m_spiker_expand_color = data;
+ m_spiker_expand_color = data;
}
-READ8_HANDLER( spiker_expand_r )
+READ8_MEMBER(balsente_state::spiker_expand_r)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
UINT8 left, right;
/* first rotate each nibble */
- state->m_spiker_expand_bits = ((state->m_spiker_expand_bits << 1) & 0xee) | ((state->m_spiker_expand_bits >> 3) & 0x11);
+ m_spiker_expand_bits = ((m_spiker_expand_bits << 1) & 0xee) | ((m_spiker_expand_bits >> 3) & 0x11);
/* compute left and right pixels */
- left = (state->m_spiker_expand_bits & 0x10) ? state->m_spiker_expand_color : state->m_spiker_expand_bgcolor;
- right = (state->m_spiker_expand_bits & 0x01) ? state->m_spiker_expand_color : state->m_spiker_expand_bgcolor;
+ left = (m_spiker_expand_bits & 0x10) ? m_spiker_expand_color : m_spiker_expand_bgcolor;
+ right = (m_spiker_expand_bits & 0x01) ? m_spiker_expand_color : m_spiker_expand_bgcolor;
/* reset the background color */
- state->m_spiker_expand_bgcolor = 0;
+ m_spiker_expand_bgcolor = 0;
/* return the combined result */
return (left & 0xf0) | (right & 0x0f);
@@ -1195,12 +1176,11 @@ static void update_grudge_steering(running_machine &machine)
}
-READ8_HANDLER( grudge_steering_r )
+READ8_MEMBER(balsente_state::grudge_steering_r)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
- logerror("%04X:grudge_steering_r(@%d)\n", cpu_get_pc(&space->device()), space->machine().primary_screen->vpos());
- state->m_grudge_steering_result |= 0x80;
- return state->m_grudge_steering_result;
+ logerror("%04X:grudge_steering_r(@%d)\n", cpu_get_pc(&space.device()), machine().primary_screen->vpos());
+ m_grudge_steering_result |= 0x80;
+ return m_grudge_steering_result;
}
@@ -1211,39 +1191,35 @@ READ8_HANDLER( grudge_steering_r )
*
*************************************/
-READ8_HANDLER( shrike_shared_6809_r )
+READ8_MEMBER(balsente_state::shrike_shared_6809_r)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
- UINT16 mem_mask = offset & 1 ? 0xff00 : 0x00ff;
+ UINT16 mem_mask_int = offset & 1 ? 0xff00 : 0x00ff;
switch( offset )
{
case 6: // return OK for 68k status register until motors hooked up
return 0;
default:
- return ( state->m_shrike_shared[offset >> 1] & ~mem_mask ) >> ( mem_mask & 8 );
+ return ( m_shrike_shared[offset >> 1] & ~mem_mask_int ) >> ( mem_mask_int & 8 );
}
}
-WRITE8_HANDLER( shrike_shared_6809_w )
+WRITE8_MEMBER(balsente_state::shrike_shared_6809_w)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
- UINT16 mem_mask = offset & 1 ? 0xff00 : 0x00ff;
- state->m_shrike_shared[offset >> 1] = ( state->m_shrike_shared[offset >> 1] & mem_mask ) | ( data << ( mem_mask & 0x8 ) );
+ UINT16 mem_mask_int = offset & 1 ? 0xff00 : 0x00ff;
+ m_shrike_shared[offset >> 1] = ( m_shrike_shared[offset >> 1] & mem_mask_int ) | ( data << ( mem_mask_int & 0x8 ) );
}
// uses movep, so writes even 8 bit addresses to odd 16 bit addresses, reads as 16 bit from odd addresses
// i.e. write 0xdeadbeef to 10000, read 0xde from 10001, 0xad from 10003, 0xbe from 10005...
-WRITE16_HANDLER( shrike_io_68k_w )
+WRITE16_MEMBER(balsente_state::shrike_io_68k_w)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
- COMBINE_DATA( &state->m_shrike_io[offset] );
+ COMBINE_DATA( &m_shrike_io[offset] );
}
-READ16_HANDLER( shrike_io_68k_r )
+READ16_MEMBER(balsente_state::shrike_io_68k_r)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
- return ( state->m_shrike_io[offset] & mem_mask ) >> ( 8 & ~mem_mask );
+ return ( m_shrike_io[offset] & mem_mask ) >> ( 8 & ~mem_mask );
}
diff --git a/src/mame/machine/beezer.c b/src/mame/machine/beezer.c
index b1917f9ad8a..6a87b5fb306 100644
--- a/src/mame/machine/beezer.c
+++ b/src/mame/machine/beezer.c
@@ -163,21 +163,20 @@ DRIVER_INIT( beezer )
state->m_banklatch = 0;
}
-WRITE8_HANDLER( beezer_bankswitch_w )
+WRITE8_MEMBER(beezer_state::beezer_bankswitch_w)
{
- beezer_state *state = space->machine().driver_data<beezer_state>();
- state->m_banklatch = data&0x3f; // latched 'x,y,z' plus bank bits in ls174 @ 4H
+ m_banklatch = data&0x3f; // latched 'x,y,z' plus bank bits in ls174 @ 4H
if ((data & 0x07) == 0)
{
- via6522_device *via_0 = space->machine().device<via6522_device>("via6522_0");
- space->install_write_handler(0xc600, 0xc7ff, write8_delegate(FUNC(beezer_state::watchdog_reset_w),state));
- space->install_legacy_write_handler(0xc800, 0xc9ff, FUNC(beezer_map_w));
- space->install_legacy_read_handler(0xca00, 0xcbff, FUNC(beezer_line_r));
- space->install_readwrite_handler(0xce00, 0xcfff, read8_delegate(FUNC(via6522_device::read), via_0), write8_delegate(FUNC(via6522_device::write), via_0));
+ via6522_device *via_0 = machine().device<via6522_device>("via6522_0");
+ space.install_write_handler(0xc600, 0xc7ff, write8_delegate(FUNC(beezer_state::watchdog_reset_w),this));
+ space.install_write_handler(0xc800, 0xc9ff, write8_delegate(FUNC(beezer_state::beezer_map_w),this));
+ space.install_read_handler(0xca00, 0xcbff, read8_delegate(FUNC(beezer_state::beezer_line_r),this));
+ space.install_readwrite_handler(0xce00, 0xcfff, read8_delegate(FUNC(via6522_device::read), via_0), write8_delegate(FUNC(via6522_device::write), via_0));
}
else
{
- UINT8 *rom = space->machine().region("maincpu")->base() + 0x10000;
- space->install_ram(0xc000, 0xcfff, rom + (data & 0x07) * 0x2000 + ((data & 0x08) ? 0x1000: 0));
+ UINT8 *rom = machine().region("maincpu")->base() + 0x10000;
+ space.install_ram(0xc000, 0xcfff, rom + (data & 0x07) * 0x2000 + ((data & 0x08) ? 0x1000: 0));
}
}
diff --git a/src/mame/machine/bigevglf.c b/src/mame/machine/bigevglf.c
index 76e0a31d20f..b3db98bb56f 100644
--- a/src/mame/machine/bigevglf.c
+++ b/src/mame/machine/bigevglf.c
@@ -11,106 +11,94 @@
#include "includes/bigevglf.h"
-READ8_HANDLER( bigevglf_68705_port_a_r )
+READ8_MEMBER(bigevglf_state::bigevglf_68705_port_a_r)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
- return (state->m_port_a_out & state->m_ddr_a) | (state->m_port_a_in & ~state->m_ddr_a);
+ return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a);
}
-WRITE8_HANDLER( bigevglf_68705_port_a_w )
+WRITE8_MEMBER(bigevglf_state::bigevglf_68705_port_a_w)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
- state->m_port_a_out = data;
+ m_port_a_out = data;
}
-WRITE8_HANDLER( bigevglf_68705_ddr_a_w )
+WRITE8_MEMBER(bigevglf_state::bigevglf_68705_ddr_a_w)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
- state->m_ddr_a = data;
+ m_ddr_a = data;
}
-READ8_HANDLER( bigevglf_68705_port_b_r )
+READ8_MEMBER(bigevglf_state::bigevglf_68705_port_b_r)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
- return (state->m_port_b_out & state->m_ddr_b) | (state->m_port_b_in & ~state->m_ddr_b);
+ return (m_port_b_out & m_ddr_b) | (m_port_b_in & ~m_ddr_b);
}
-WRITE8_HANDLER( bigevglf_68705_port_b_w )
+WRITE8_MEMBER(bigevglf_state::bigevglf_68705_port_b_w)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
- if ((state->m_ddr_b & 0x02) && (~state->m_port_b_out & 0x02) && (data & 0x02)) /* positive going transition of the clock */
+ if ((m_ddr_b & 0x02) && (~m_port_b_out & 0x02) && (data & 0x02)) /* positive going transition of the clock */
{
- device_set_input_line(state->m_mcu, 0, CLEAR_LINE);
- state->m_main_sent = 0;
+ device_set_input_line(m_mcu, 0, CLEAR_LINE);
+ m_main_sent = 0;
}
- if ((state->m_ddr_b & 0x04) && (~state->m_port_b_out & 0x04) && (data & 0x04) ) /* positive going transition of the clock */
+ if ((m_ddr_b & 0x04) && (~m_port_b_out & 0x04) && (data & 0x04) ) /* positive going transition of the clock */
{
- state->m_from_mcu = state->m_port_a_out;
- state->m_mcu_sent = 0;
+ m_from_mcu = m_port_a_out;
+ m_mcu_sent = 0;
}
- state->m_port_b_out = data;
+ m_port_b_out = data;
}
-WRITE8_HANDLER( bigevglf_68705_ddr_b_w )
+WRITE8_MEMBER(bigevglf_state::bigevglf_68705_ddr_b_w)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
- state->m_ddr_b = data;
+ m_ddr_b = data;
}
-READ8_HANDLER( bigevglf_68705_port_c_r )
+READ8_MEMBER(bigevglf_state::bigevglf_68705_port_c_r)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
- state->m_port_c_in = 0;
- if (state->m_main_sent)
- state->m_port_c_in |= 0x01;
- if (state->m_mcu_sent)
- state->m_port_c_in |= 0x02;
+ m_port_c_in = 0;
+ if (m_main_sent)
+ m_port_c_in |= 0x01;
+ if (m_mcu_sent)
+ m_port_c_in |= 0x02;
- return (state->m_port_c_out & state->m_ddr_c) | (state->m_port_c_in & ~state->m_ddr_c);
+ return (m_port_c_out & m_ddr_c) | (m_port_c_in & ~m_ddr_c);
}
-WRITE8_HANDLER( bigevglf_68705_port_c_w )
+WRITE8_MEMBER(bigevglf_state::bigevglf_68705_port_c_w)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
- state->m_port_c_out = data;
+ m_port_c_out = data;
}
-WRITE8_HANDLER( bigevglf_68705_ddr_c_w )
+WRITE8_MEMBER(bigevglf_state::bigevglf_68705_ddr_c_w)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
- state->m_ddr_c = data;
+ m_ddr_c = data;
}
-WRITE8_HANDLER( bigevglf_mcu_w )
+WRITE8_MEMBER(bigevglf_state::bigevglf_mcu_w)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
- state->m_port_a_in = data;
- state->m_main_sent = 1;
- device_set_input_line(state->m_mcu, 0, ASSERT_LINE);
+ m_port_a_in = data;
+ m_main_sent = 1;
+ device_set_input_line(m_mcu, 0, ASSERT_LINE);
}
-READ8_HANDLER( bigevglf_mcu_r )
+READ8_MEMBER(bigevglf_state::bigevglf_mcu_r)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
- state->m_mcu_sent = 1;
- return state->m_from_mcu;
+ m_mcu_sent = 1;
+ return m_from_mcu;
}
-READ8_HANDLER( bigevglf_mcu_status_r )
+READ8_MEMBER(bigevglf_state::bigevglf_mcu_status_r)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
int res = 0;
- if (!state->m_main_sent)
+ if (!m_main_sent)
res |= 0x08;
- if (!state->m_mcu_sent)
+ if (!m_mcu_sent)
res |= 0x10;
return res;
diff --git a/src/mame/machine/bsktball.c b/src/mame/machine/bsktball.c
index fe4cca3fa82..49d69ea11dc 100644
--- a/src/mame/machine/bsktball.c
+++ b/src/mame/machine/bsktball.c
@@ -10,10 +10,9 @@
/***************************************************************************
bsktball_nmion_w
***************************************************************************/
-WRITE8_HANDLER( bsktball_nmion_w )
+WRITE8_MEMBER(bsktball_state::bsktball_nmion_w)
{
- bsktball_state *state = space->machine().driver_data<bsktball_state>();
- state->m_nmi_on = offset & 0x01;
+ m_nmi_on = offset & 0x01;
}
/***************************************************************************
@@ -36,16 +35,14 @@ TIMER_DEVICE_CALLBACK( bsktball_scanline )
bsktball_ld_w
***************************************************************************/
-WRITE8_HANDLER( bsktball_ld1_w )
+WRITE8_MEMBER(bsktball_state::bsktball_ld1_w)
{
- bsktball_state *state = space->machine().driver_data<bsktball_state>();
- state->m_ld1 = (offset & 0x01);
+ m_ld1 = (offset & 0x01);
}
-WRITE8_HANDLER( bsktball_ld2_w )
+WRITE8_MEMBER(bsktball_state::bsktball_ld2_w)
{
- bsktball_state *state = space->machine().driver_data<bsktball_state>();
- state->m_ld2 = (offset & 0x01);
+ m_ld2 = (offset & 0x01);
}
@@ -53,118 +50,117 @@ WRITE8_HANDLER( bsktball_ld2_w )
bsktball_in0_r
***************************************************************************/
-READ8_HANDLER( bsktball_in0_r )
+READ8_MEMBER(bsktball_state::bsktball_in0_r)
{
- bsktball_state *state = space->machine().driver_data<bsktball_state>();
int p1_horiz;
int p1_vert;
int p2_horiz;
int p2_vert;
int temp;
- p1_horiz = input_port_read(space->machine(), "TRACK0_X");
- p1_vert = input_port_read(space->machine(), "TRACK0_Y");
- p2_horiz = input_port_read(space->machine(), "TRACK1_X");
- p2_vert = input_port_read(space->machine(), "TRACK1_Y");
+ p1_horiz = input_port_read(machine(), "TRACK0_X");
+ p1_vert = input_port_read(machine(), "TRACK0_Y");
+ p2_horiz = input_port_read(machine(), "TRACK1_X");
+ p2_vert = input_port_read(machine(), "TRACK1_Y");
/* Set direction bits */
/* P1 H DIR */
- if (p1_horiz > state->m_last_p1_horiz)
+ if (p1_horiz > m_last_p1_horiz)
{
- if ((p1_horiz - state->m_last_p1_horiz) > 128)
- state->m_dir2 = 0x40;
+ if ((p1_horiz - m_last_p1_horiz) > 128)
+ m_dir2 = 0x40;
else
- state->m_dir2 = 0;
+ m_dir2 = 0;
}
- else if (p1_horiz < state->m_last_p1_horiz)
+ else if (p1_horiz < m_last_p1_horiz)
{
- if ((state->m_last_p1_horiz - p1_horiz) > 128)
- state->m_dir2 = 0;
+ if ((m_last_p1_horiz - p1_horiz) > 128)
+ m_dir2 = 0;
else
- state->m_dir2 = 0x40;
+ m_dir2 = 0x40;
}
/* P1 V DIR */
- if (p1_vert > state->m_last_p1_vert)
+ if (p1_vert > m_last_p1_vert)
{
- if ((p1_vert - state->m_last_p1_vert) > 128)
- state->m_dir3 = 0;
+ if ((p1_vert - m_last_p1_vert) > 128)
+ m_dir3 = 0;
else
- state->m_dir3 = 0x80;
+ m_dir3 = 0x80;
}
- else if (p1_vert < state->m_last_p1_vert)
+ else if (p1_vert < m_last_p1_vert)
{
- if ((state->m_last_p1_vert - p1_vert) > 128)
- state->m_dir3 = 0x80;
+ if ((m_last_p1_vert - p1_vert) > 128)
+ m_dir3 = 0x80;
else
- state->m_dir3 = 0;
+ m_dir3 = 0;
}
/* P2 H DIR */
- if (p2_horiz > state->m_last_p2_horiz)
+ if (p2_horiz > m_last_p2_horiz)
{
- if ((p2_horiz - state->m_last_p2_horiz) > 128)
- state->m_dir0 = 0x10;
+ if ((p2_horiz - m_last_p2_horiz) > 128)
+ m_dir0 = 0x10;
else
- state->m_dir0 = 0;
+ m_dir0 = 0;
}
- else if (p2_horiz < state->m_last_p2_horiz)
+ else if (p2_horiz < m_last_p2_horiz)
{
- if ((state->m_last_p2_horiz - p2_horiz) > 128)
- state->m_dir0 = 0;
+ if ((m_last_p2_horiz - p2_horiz) > 128)
+ m_dir0 = 0;
else
- state->m_dir0 = 0x10;
+ m_dir0 = 0x10;
}
/* P2 V DIR */
- if (p2_vert > state->m_last_p2_vert)
+ if (p2_vert > m_last_p2_vert)
{
- if ((p2_vert - state->m_last_p2_vert) > 128)
- state->m_dir1 = 0;
+ if ((p2_vert - m_last_p2_vert) > 128)
+ m_dir1 = 0;
else
- state->m_dir1 = 0x20;
+ m_dir1 = 0x20;
}
- else if (p2_vert < state->m_last_p2_vert)
+ else if (p2_vert < m_last_p2_vert)
{
- if ((state->m_last_p2_vert - p2_vert) > 128)
- state->m_dir1 = 0x20;
+ if ((m_last_p2_vert - p2_vert) > 128)
+ m_dir1 = 0x20;
else
- state->m_dir1 = 0;
+ m_dir1 = 0;
}
- state->m_last_p1_horiz = p1_horiz;
- state->m_last_p1_vert = p1_vert;
- state->m_last_p2_horiz = p2_horiz;
- state->m_last_p2_vert = p2_vert;
+ m_last_p1_horiz = p1_horiz;
+ m_last_p1_vert = p1_vert;
+ m_last_p2_horiz = p2_horiz;
+ m_last_p2_vert = p2_vert;
/* D0-D3 = Plyr 1 Horiz, D4-D7 = Plyr 1 Vert */
- if ((state->m_ld1) & (state->m_ld2))
+ if ((m_ld1) & (m_ld2))
{
return ((p1_horiz & 0x0f) | ((p1_vert << 4) & 0xf0));
}
/* D0-D3 = Plyr 2 Horiz, D4-D7 = Plyr 2 Vert */
- else if (state->m_ld2)
+ else if (m_ld2)
{
return ((p2_horiz & 0x0f) | ((p2_vert << 4) & 0xf0));
}
else
{
- temp = input_port_read(space->machine(), "IN0") & 0x0f;
+ temp = input_port_read(machine(), "IN0") & 0x0f;
- return (temp | state->m_dir0 | state->m_dir1 | state->m_dir2 | state->m_dir3);
+ return (temp | m_dir0 | m_dir1 | m_dir2 | m_dir3);
}
}
/***************************************************************************
bsktball_led_w
***************************************************************************/
-WRITE8_HANDLER( bsktball_led1_w )
+WRITE8_MEMBER(bsktball_state::bsktball_led1_w)
{
- set_led_status(space->machine(), 0, offset & 0x01);
+ set_led_status(machine(), 0, offset & 0x01);
}
-WRITE8_HANDLER( bsktball_led2_w )
+WRITE8_MEMBER(bsktball_state::bsktball_led2_w)
{
- set_led_status(space->machine(), 1, offset & 0x01);
+ set_led_status(machine(), 1, offset & 0x01);
}
diff --git a/src/mame/machine/btime.c b/src/mame/machine/btime.c
index 6cea25adba7..8c87c64f10a 100644
--- a/src/mame/machine/btime.c
+++ b/src/mame/machine/btime.c
@@ -4,28 +4,26 @@
#define BASE 0xb000
-READ8_HANDLER( mmonkey_protection_r )
+READ8_MEMBER(btime_state::mmonkey_protection_r)
{
- btime_state *state = space->machine().driver_data<btime_state>();
- UINT8 *RAM = space->machine().region("maincpu")->base();
+ UINT8 *RAM = machine().region("maincpu")->base();
int ret = 0;
if (offset == 0x0000)
- ret = state->m_protection_status;
+ ret = m_protection_status;
else if (offset == 0x0e00)
- ret = state->m_protection_ret;
+ ret = m_protection_ret;
else if (offset >= 0x0d00 && offset <= 0x0d02)
ret = RAM[BASE + offset]; /* addition result */
else
- logerror("Unknown protection read. PC=%04X Offset=%04X\n", cpu_get_pc(&space->device()), offset);
+ logerror("Unknown protection read. PC=%04X Offset=%04X\n", cpu_get_pc(&space.device()), offset);
return ret;
}
-WRITE8_HANDLER( mmonkey_protection_w )
+WRITE8_MEMBER(btime_state::mmonkey_protection_w)
{
- btime_state *state = space->machine().driver_data<btime_state>();
- UINT8 *RAM = space->machine().region("maincpu")->base();
+ UINT8 *RAM = machine().region("maincpu")->base();
if (offset == 0)
{
@@ -34,7 +32,7 @@ WRITE8_HANDLER( mmonkey_protection_w )
{
int i, s1, s2, r;
- switch (state->m_protection_command)
+ switch (m_protection_command)
{
case 0: /* score addition */
@@ -64,31 +62,31 @@ WRITE8_HANDLER( mmonkey_protection_w )
/* instanteniously in emulation time */
for (i = 0; i < 0x100; i++)
{
- if (RAM[BASE + 0x0f00 + i] == state->m_protection_value)
+ if (RAM[BASE + 0x0f00 + i] == m_protection_value)
{
- state->m_protection_ret = i;
+ m_protection_ret = i;
break;
}
}
break;
default:
- logerror("Unemulated protection command=%02X. PC=%04X\n", state->m_protection_command, cpu_get_pc(&space->device()));
+ logerror("Unemulated protection command=%02X. PC=%04X\n", m_protection_command, cpu_get_pc(&space.device()));
break;
}
- state->m_protection_status = 0;
+ m_protection_status = 0;
}
}
else if (offset == 0x0c00)
- state->m_protection_command = data;
+ m_protection_command = data;
else if (offset == 0x0e00)
- state->m_protection_value = data;
+ m_protection_value = data;
else if (offset >= 0x0f00)
RAM[BASE + offset] = data; /* decrypt table */
else if (offset >= 0x0d00 && offset <= 0x0d05)
RAM[BASE + offset] = data; /* source table */
else
- logerror("Unknown protection write=%02X. PC=%04X Offset=%04X\n", data, cpu_get_pc(&space->device()), offset);
+ logerror("Unknown protection write=%02X. PC=%04X Offset=%04X\n", data, cpu_get_pc(&space.device()), offset);
}
diff --git a/src/mame/machine/bublbobl.c b/src/mame/machine/bublbobl.c
index b0daaac7d32..d2d47b94dc1 100644
--- a/src/mame/machine/bublbobl.c
+++ b/src/mame/machine/bublbobl.c
@@ -12,49 +12,47 @@
#include "includes/bublbobl.h"
-WRITE8_HANDLER( bublbobl_bankswitch_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_bankswitch_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
/* bits 0-2 select ROM bank */
- memory_set_bank(space->machine(), "bank1", (data ^ 4) & 7);
+ memory_set_bank(machine(), "bank1", (data ^ 4) & 7);
/* bit 3 n.c. */
/* bit 4 resets second Z80 */
- device_set_input_line(state->m_slave, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
+ device_set_input_line(m_slave, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
/* bit 5 resets mcu */
- if (state->m_mcu != NULL) // only if we have a MCU
- device_set_input_line(state->m_mcu, INPUT_LINE_RESET, (data & 0x20) ? CLEAR_LINE : ASSERT_LINE);
+ if (m_mcu != NULL) // only if we have a MCU
+ device_set_input_line(m_mcu, INPUT_LINE_RESET, (data & 0x20) ? CLEAR_LINE : ASSERT_LINE);
/* bit 6 enables display */
- state->m_video_enable = data & 0x40;
+ m_video_enable = data & 0x40;
/* bit 7 flips screen */
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
}
-WRITE8_HANDLER( tokio_bankswitch_w )
+WRITE8_MEMBER(bublbobl_state::tokio_bankswitch_w)
{
/* bits 0-2 select ROM bank */
- memory_set_bank(space->machine(), "bank1", data & 7);
+ memory_set_bank(machine(), "bank1", data & 7);
/* bits 3-7 unknown */
}
-WRITE8_HANDLER( tokio_videoctrl_w )
+WRITE8_MEMBER(bublbobl_state::tokio_videoctrl_w)
{
/* bit 7 flips screen */
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
/* other bits unknown */
}
-WRITE8_HANDLER( bublbobl_nmitrigger_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_nmitrigger_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- device_set_input_line(state->m_slave, INPUT_LINE_NMI, PULSE_LINE);
+ device_set_input_line(m_slave, INPUT_LINE_NMI, PULSE_LINE);
}
@@ -75,15 +73,14 @@ static const UINT8 tokio_prot_data[] =
0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x01
};
-READ8_HANDLER( tokio_mcu_r )
+READ8_MEMBER(bublbobl_state::tokio_mcu_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- state->m_tokio_prot_count %= sizeof(tokio_prot_data);
- return tokio_prot_data[state->m_tokio_prot_count++];
+ m_tokio_prot_count %= sizeof(tokio_prot_data);
+ return tokio_prot_data[m_tokio_prot_count++];
}
-READ8_HANDLER( tokiob_mcu_r )
+READ8_MEMBER(bublbobl_state::tokiob_mcu_r)
{
return 0xbf; /* ad-hoc value set to pass initial testing */
}
@@ -99,47 +96,41 @@ static TIMER_CALLBACK( nmi_callback )
state->m_pending_nmi = 1;
}
-WRITE8_HANDLER( bublbobl_sound_command_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_sound_command_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- state->soundlatch_w(*space, offset, data);
- space->machine().scheduler().synchronize(FUNC(nmi_callback), data);
+ soundlatch_w(space, offset, data);
+ machine().scheduler().synchronize(FUNC(nmi_callback), data);
}
-WRITE8_HANDLER( bublbobl_sh_nmi_disable_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_sh_nmi_disable_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- state->m_sound_nmi_enable = 0;
+ m_sound_nmi_enable = 0;
}
-WRITE8_HANDLER( bublbobl_sh_nmi_enable_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_sh_nmi_enable_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- state->m_sound_nmi_enable = 1;
- if (state->m_pending_nmi)
+ m_sound_nmi_enable = 1;
+ if (m_pending_nmi)
{
- device_set_input_line(state->m_audiocpu, INPUT_LINE_NMI, PULSE_LINE);
- state->m_pending_nmi = 0;
+ device_set_input_line(m_audiocpu, INPUT_LINE_NMI, PULSE_LINE);
+ m_pending_nmi = 0;
}
}
-WRITE8_HANDLER( bublbobl_soundcpu_reset_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_soundcpu_reset_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- device_set_input_line(state->m_audiocpu, INPUT_LINE_RESET, data ? ASSERT_LINE : CLEAR_LINE);
+ device_set_input_line(m_audiocpu, INPUT_LINE_RESET, data ? ASSERT_LINE : CLEAR_LINE);
}
-READ8_HANDLER( bublbobl_sound_status_r )
+READ8_MEMBER(bublbobl_state::bublbobl_sound_status_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- return state->m_sound_status;
+ return m_sound_status;
}
-WRITE8_HANDLER( bublbobl_sound_status_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_sound_status_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- state->m_sound_status = data;
+ m_sound_status = data;
}
@@ -150,159 +141,143 @@ Bubble Bobble MCU
***************************************************************************/
-READ8_HANDLER( bublbobl_mcu_ddr1_r )
+READ8_MEMBER(bublbobl_state::bublbobl_mcu_ddr1_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- return state->m_ddr1;
+ return m_ddr1;
}
-WRITE8_HANDLER( bublbobl_mcu_ddr1_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_ddr1_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- state->m_ddr1 = data;
+ m_ddr1 = data;
}
-READ8_HANDLER( bublbobl_mcu_ddr2_r )
+READ8_MEMBER(bublbobl_state::bublbobl_mcu_ddr2_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- return state->m_ddr2;
+ return m_ddr2;
}
-WRITE8_HANDLER( bublbobl_mcu_ddr2_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_ddr2_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- state->m_ddr2 = data;
+ m_ddr2 = data;
}
-READ8_HANDLER( bublbobl_mcu_ddr3_r )
+READ8_MEMBER(bublbobl_state::bublbobl_mcu_ddr3_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- return state->m_ddr3;
+ return m_ddr3;
}
-WRITE8_HANDLER( bublbobl_mcu_ddr3_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_ddr3_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- state->m_ddr3 = data;
+ m_ddr3 = data;
}
-READ8_HANDLER( bublbobl_mcu_ddr4_r )
+READ8_MEMBER(bublbobl_state::bublbobl_mcu_ddr4_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- return state->m_ddr4;
+ return m_ddr4;
}
-WRITE8_HANDLER( bublbobl_mcu_ddr4_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_ddr4_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- state->m_ddr4 = data;
+ m_ddr4 = data;
}
-READ8_HANDLER( bublbobl_mcu_port1_r )
+READ8_MEMBER(bublbobl_state::bublbobl_mcu_port1_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- //logerror("%04x: 6801U4 port 1 read\n", cpu_get_pc(&space->device()));
- state->m_port1_in = input_port_read(space->machine(), "IN0");
- return (state->m_port1_out & state->m_ddr1) | (state->m_port1_in & ~state->m_ddr1);
+ //logerror("%04x: 6801U4 port 1 read\n", cpu_get_pc(&space.device()));
+ m_port1_in = input_port_read(machine(), "IN0");
+ return (m_port1_out & m_ddr1) | (m_port1_in & ~m_ddr1);
}
-WRITE8_HANDLER( bublbobl_mcu_port1_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port1_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- //logerror("%04x: 6801U4 port 1 write %02x\n", cpu_get_pc(&space->device()), data);
+ //logerror("%04x: 6801U4 port 1 write %02x\n", cpu_get_pc(&space.device()), data);
// bit 4: coin lockout
- coin_lockout_global_w(space->machine(), ~data & 0x10);
+ coin_lockout_global_w(machine(), ~data & 0x10);
// bit 5: select 1-way or 2-way coin counter
// bit 6: trigger IRQ on main CPU (jumper switchable to vblank)
// trigger on high->low transition
- if ((state->m_port1_out & 0x40) && (~data & 0x40))
+ if ((m_port1_out & 0x40) && (~data & 0x40))
{
// logerror("triggering IRQ on main CPU\n");
- device_set_input_line_vector(state->m_maincpu, 0, state->m_mcu_sharedram[0]);
- device_set_input_line(state->m_maincpu, 0, HOLD_LINE);
+ device_set_input_line_vector(m_maincpu, 0, m_mcu_sharedram[0]);
+ device_set_input_line(m_maincpu, 0, HOLD_LINE);
}
// bit 7: select read or write shared RAM
- state->m_port1_out = data;
+ m_port1_out = data;
}
-READ8_HANDLER( bublbobl_mcu_port2_r )
+READ8_MEMBER(bublbobl_state::bublbobl_mcu_port2_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- //logerror("%04x: 6801U4 port 2 read\n", cpu_get_pc(&space->device()));
- return (state->m_port2_out & state->m_ddr2) | (state->m_port2_in & ~state->m_ddr2);
+ //logerror("%04x: 6801U4 port 2 read\n", cpu_get_pc(&space.device()));
+ return (m_port2_out & m_ddr2) | (m_port2_in & ~m_ddr2);
}
-WRITE8_HANDLER( bublbobl_mcu_port2_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port2_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- //logerror("%04x: 6801U4 port 2 write %02x\n", cpu_get_pc(&space->device()), data);
+ //logerror("%04x: 6801U4 port 2 write %02x\n", cpu_get_pc(&space.device()), data);
static const char *const portnames[] = { "DSW0", "DSW1", "IN1", "IN2" };
// bits 0-3: bits 8-11 of shared RAM address
// bit 4: clock (goes to PAL A78-04.12)
// latch on low->high transition
- if ((~state->m_port2_out & 0x10) && (data & 0x10))
+ if ((~m_port2_out & 0x10) && (data & 0x10))
{
- int address = state->m_port4_out | ((data & 0x0f) << 8);
+ int address = m_port4_out | ((data & 0x0f) << 8);
- if (state->m_port1_out & 0x80)
+ if (m_port1_out & 0x80)
{
// read
if ((address & 0x0800) == 0x0000)
- state->m_port3_in = input_port_read(space->machine(), portnames[address & 3]);
+ m_port3_in = input_port_read(machine(), portnames[address & 3]);
else if ((address & 0x0c00) == 0x0c00)
- state->m_port3_in = state->m_mcu_sharedram[address & 0x03ff];
- // logerror("reading %02x from shared RAM %04x\n", state->m_port3_in, address);
+ m_port3_in = m_mcu_sharedram[address & 0x03ff];
+ // logerror("reading %02x from shared RAM %04x\n", m_port3_in, address);
}
else
{
// write
- // logerror("writing %02x to shared RAM %04x\n", state->m_port3_out, address);
+ // logerror("writing %02x to shared RAM %04x\n", m_port3_out, address);
if ((address & 0x0c00) == 0x0c00)
- state->m_mcu_sharedram[address & 0x03ff] = state->m_port3_out;
+ m_mcu_sharedram[address & 0x03ff] = m_port3_out;
}
}
- state->m_port2_out = data;
+ m_port2_out = data;
}
-READ8_HANDLER( bublbobl_mcu_port3_r )
+READ8_MEMBER(bublbobl_state::bublbobl_mcu_port3_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- //logerror("%04x: 6801U4 port 3 read\n", cpu_get_pc(&space->device()));
- return (state->m_port3_out & state->m_ddr3) | (state->m_port3_in & ~state->m_ddr3);
+ //logerror("%04x: 6801U4 port 3 read\n", cpu_get_pc(&space.device()));
+ return (m_port3_out & m_ddr3) | (m_port3_in & ~m_ddr3);
}
-WRITE8_HANDLER( bublbobl_mcu_port3_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port3_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- //logerror("%04x: 6801U4 port 3 write %02x\n", cpu_get_pc(&space->device()), data);
- state->m_port3_out = data;
+ //logerror("%04x: 6801U4 port 3 write %02x\n", cpu_get_pc(&space.device()), data);
+ m_port3_out = data;
}
-READ8_HANDLER( bublbobl_mcu_port4_r )
+READ8_MEMBER(bublbobl_state::bublbobl_mcu_port4_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- //logerror("%04x: 6801U4 port 4 read\n", cpu_get_pc(&space->device()));
- return (state->m_port4_out & state->m_ddr4) | (state->m_port4_in & ~state->m_ddr4);
+ //logerror("%04x: 6801U4 port 4 read\n", cpu_get_pc(&space.device()));
+ return (m_port4_out & m_ddr4) | (m_port4_in & ~m_ddr4);
}
-WRITE8_HANDLER( bublbobl_mcu_port4_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port4_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- //logerror("%04x: 6801U4 port 4 write %02x\n", cpu_get_pc(&space->device()), data);
+ //logerror("%04x: 6801U4 port 4 write %02x\n", cpu_get_pc(&space.device()), data);
// bits 0-7 of shared RAM address
- state->m_port4_out = data;
+ m_port4_out = data;
}
/***************************************************************************
@@ -314,72 +289,68 @@ in boblbobl, so they don't matter. All checks are patched out in sboblbob.
***************************************************************************/
-READ8_HANDLER( boblbobl_ic43_a_r )
+READ8_MEMBER(bublbobl_state::boblbobl_ic43_a_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
// if (offset >= 2)
- // logerror("%04x: ic43_a_r (offs %d) res = %02x\n", cpu_get_pc(&space->device()), offset, res);
+ // logerror("%04x: ic43_a_r (offs %d) res = %02x\n", cpu_get_pc(&space.device()), offset, res);
if (offset == 0)
- return state->m_ic43_a << 4;
+ return m_ic43_a << 4;
else
- return space->machine().rand() & 0xff;
+ return machine().rand() & 0xff;
}
-WRITE8_HANDLER( boblbobl_ic43_a_w )
+WRITE8_MEMBER(bublbobl_state::boblbobl_ic43_a_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
int res = 0;
switch (offset)
{
case 0:
- if (~state->m_ic43_a & 8) res ^= 1;
- if (~state->m_ic43_a & 1) res ^= 2;
- if (~state->m_ic43_a & 1) res ^= 4;
- if (~state->m_ic43_a & 2) res ^= 4;
- if (~state->m_ic43_a & 4) res ^= 8;
+ if (~m_ic43_a & 8) res ^= 1;
+ if (~m_ic43_a & 1) res ^= 2;
+ if (~m_ic43_a & 1) res ^= 4;
+ if (~m_ic43_a & 2) res ^= 4;
+ if (~m_ic43_a & 4) res ^= 8;
break;
case 1:
- if (~state->m_ic43_a & 8) res ^= 1;
- if (~state->m_ic43_a & 2) res ^= 1;
- if (~state->m_ic43_a & 8) res ^= 2;
- if (~state->m_ic43_a & 1) res ^= 4;
- if (~state->m_ic43_a & 4) res ^= 8;
+ if (~m_ic43_a & 8) res ^= 1;
+ if (~m_ic43_a & 2) res ^= 1;
+ if (~m_ic43_a & 8) res ^= 2;
+ if (~m_ic43_a & 1) res ^= 4;
+ if (~m_ic43_a & 4) res ^= 8;
break;
case 2:
- if (~state->m_ic43_a & 4) res ^= 1;
- if (~state->m_ic43_a & 8) res ^= 2;
- if (~state->m_ic43_a & 2) res ^= 4;
- if (~state->m_ic43_a & 1) res ^= 8;
- if (~state->m_ic43_a & 4) res ^= 8;
+ if (~m_ic43_a & 4) res ^= 1;
+ if (~m_ic43_a & 8) res ^= 2;
+ if (~m_ic43_a & 2) res ^= 4;
+ if (~m_ic43_a & 1) res ^= 8;
+ if (~m_ic43_a & 4) res ^= 8;
break;
case 3:
- if (~state->m_ic43_a & 2) res ^= 1;
- if (~state->m_ic43_a & 4) res ^= 2;
- if (~state->m_ic43_a & 8) res ^= 2;
- if (~state->m_ic43_a & 8) res ^= 4;
- if (~state->m_ic43_a & 1) res ^= 8;
+ if (~m_ic43_a & 2) res ^= 1;
+ if (~m_ic43_a & 4) res ^= 2;
+ if (~m_ic43_a & 8) res ^= 2;
+ if (~m_ic43_a & 8) res ^= 4;
+ if (~m_ic43_a & 1) res ^= 8;
break;
}
- state->m_ic43_a = res;
+ m_ic43_a = res;
}
-WRITE8_HANDLER( boblbobl_ic43_b_w )
+WRITE8_MEMBER(bublbobl_state::boblbobl_ic43_b_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
static const int xorval[4] = { 4, 1, 8, 2 };
- // logerror("%04x: ic43_b_w (offs %d) %02x\n", cpu_get_pc(&space->device()), offset, data);
- state->m_ic43_b = (data >> 4) ^ xorval[offset];
+ // logerror("%04x: ic43_b_w (offs %d) %02x\n", cpu_get_pc(&space.device()), offset, data);
+ m_ic43_b = (data >> 4) ^ xorval[offset];
}
-READ8_HANDLER( boblbobl_ic43_b_r )
+READ8_MEMBER(bublbobl_state::boblbobl_ic43_b_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- // logerror("%04x: ic43_b_r (offs %d)\n", cpu_get_pc(&space->device()), offset);
+ // logerror("%04x: ic43_b_r (offs %d)\n", cpu_get_pc(&space.device()), offset);
if (offset == 0)
- return state->m_ic43_b << 4;
+ return m_ic43_b << 4;
else
return 0xff; // not used?
}
@@ -409,24 +380,21 @@ INTERRUPT_GEN( bublbobl_m68705_interrupt )
}
-READ8_HANDLER( bublbobl_68705_port_a_r )
+READ8_MEMBER(bublbobl_state::bublbobl_68705_port_a_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(&space->device()), state->m_port_a_in);
- return (state->m_port_a_out & state->m_ddr_a) | (state->m_port_a_in & ~state->m_ddr_a);
+ //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(&space.device()), m_port_a_in);
+ return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a);
}
-WRITE8_HANDLER( bublbobl_68705_port_a_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_68705_port_a_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(&space->device()), data);
- state->m_port_a_out = data;
+ //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(&space.device()), data);
+ m_port_a_out = data;
}
-WRITE8_HANDLER( bublbobl_68705_ddr_a_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_68705_ddr_a_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- state->m_ddr_a = data;
+ m_ddr_a = data;
}
@@ -450,82 +418,79 @@ WRITE8_HANDLER( bublbobl_68705_ddr_a_w )
* 7 W not used?
*/
-READ8_HANDLER( bublbobl_68705_port_b_r )
+READ8_MEMBER(bublbobl_state::bublbobl_68705_port_b_r)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- return (state->m_port_b_out & state->m_ddr_b) | (state->m_port_b_in & ~state->m_ddr_b);
+ return (m_port_b_out & m_ddr_b) | (m_port_b_in & ~m_ddr_b);
}
-WRITE8_HANDLER( bublbobl_68705_port_b_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_68705_port_b_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- //logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(&space->device()), data);
+ //logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(&space.device()), data);
static const char *const portnames[] = { "DSW0", "DSW1", "IN1", "IN2" };
- if ((state->m_ddr_b & 0x01) && (~data & 0x01) && (state->m_port_b_out & 0x01))
+ if ((m_ddr_b & 0x01) && (~data & 0x01) && (m_port_b_out & 0x01))
{
- state->m_port_a_in = state->m_latch;
+ m_port_a_in = m_latch;
}
- if ((state->m_ddr_b & 0x02) && (data & 0x02) && (~state->m_port_b_out & 0x02)) /* positive edge trigger */
+ if ((m_ddr_b & 0x02) && (data & 0x02) && (~m_port_b_out & 0x02)) /* positive edge trigger */
{
- state->m_address = (state->m_address & 0xff00) | state->m_port_a_out;
- //logerror("%04x: 68705 address %02x\n", cpu_get_pc(&space->device()), state->m_port_a_out);
+ m_address = (m_address & 0xff00) | m_port_a_out;
+ //logerror("%04x: 68705 address %02x\n", cpu_get_pc(&space.device()), m_port_a_out);
}
- if ((state->m_ddr_b & 0x04) && (data & 0x04) && (~state->m_port_b_out & 0x04)) /* positive edge trigger */
+ if ((m_ddr_b & 0x04) && (data & 0x04) && (~m_port_b_out & 0x04)) /* positive edge trigger */
{
- state->m_address = (state->m_address & 0x00ff) | ((state->m_port_a_out & 0x0f) << 8);
+ m_address = (m_address & 0x00ff) | ((m_port_a_out & 0x0f) << 8);
}
- if ((state->m_ddr_b & 0x10) && (~data & 0x10) && (state->m_port_b_out & 0x10))
+ if ((m_ddr_b & 0x10) && (~data & 0x10) && (m_port_b_out & 0x10))
{
if (data & 0x08) /* read */
{
- if ((state->m_address & 0x0800) == 0x0000)
+ if ((m_address & 0x0800) == 0x0000)
{
- //logerror("%04x: 68705 read input port %02x\n", cpu_get_pc(&space->device()), state->m_address);
- state->m_latch = input_port_read(space->machine(), portnames[state->m_address & 3]);
+ //logerror("%04x: 68705 read input port %02x\n", cpu_get_pc(&space.device()), m_address);
+ m_latch = input_port_read(machine(), portnames[m_address & 3]);
}
- else if ((state->m_address & 0x0c00) == 0x0c00)
+ else if ((m_address & 0x0c00) == 0x0c00)
{
- //logerror("%04x: 68705 read %02x from address %04x\n", cpu_get_pc(&space->device()), state->m_mcu_sharedram[state->m_address], state->m_address);
- state->m_latch = state->m_mcu_sharedram[state->m_address & 0x03ff];
+ //logerror("%04x: 68705 read %02x from address %04x\n", cpu_get_pc(&space.device()), m_mcu_sharedram[m_address], m_address);
+ m_latch = m_mcu_sharedram[m_address & 0x03ff];
}
else
- logerror("%04x: 68705 unknown read address %04x\n", cpu_get_pc(&space->device()), state->m_address);
+ logerror("%04x: 68705 unknown read address %04x\n", cpu_get_pc(&space.device()), m_address);
}
else /* write */
{
- if ((state->m_address & 0x0c00) == 0x0c00)
+ if ((m_address & 0x0c00) == 0x0c00)
{
- //logerror("%04x: 68705 write %02x to address %04x\n", cpu_get_pc(&space->device()), state->m_port_a_out, state->m_address);
- state->m_mcu_sharedram[state->m_address & 0x03ff] = state->m_port_a_out;
+ //logerror("%04x: 68705 write %02x to address %04x\n", cpu_get_pc(&space.device()), m_port_a_out, m_address);
+ m_mcu_sharedram[m_address & 0x03ff] = m_port_a_out;
}
else
- logerror("%04x: 68705 unknown write to address %04x\n", cpu_get_pc(&space->device()), state->m_address);
+ logerror("%04x: 68705 unknown write to address %04x\n", cpu_get_pc(&space.device()), m_address);
}
}
- if ((state->m_ddr_b & 0x20) && (~data & 0x20) && (state->m_port_b_out & 0x20))
+ if ((m_ddr_b & 0x20) && (~data & 0x20) && (m_port_b_out & 0x20))
{
/* hack to get random EXTEND letters (who is supposed to do this? 68705? PAL?) */
- state->m_mcu_sharedram[0x7c] = space->machine().rand() % 6;
+ m_mcu_sharedram[0x7c] = machine().rand() % 6;
- device_set_input_line_vector(state->m_maincpu, 0, state->m_mcu_sharedram[0]);
- device_set_input_line(state->m_maincpu, 0, HOLD_LINE);
+ device_set_input_line_vector(m_maincpu, 0, m_mcu_sharedram[0]);
+ device_set_input_line(m_maincpu, 0, HOLD_LINE);
}
- if ((state->m_ddr_b & 0x40) && (~data & 0x40) && (state->m_port_b_out & 0x40))
+ if ((m_ddr_b & 0x40) && (~data & 0x40) && (m_port_b_out & 0x40))
{
- logerror("%04x: 68705 unknown port B bit %02x\n", cpu_get_pc(&space->device()), data);
+ logerror("%04x: 68705 unknown port B bit %02x\n", cpu_get_pc(&space.device()), data);
}
- if ((state->m_ddr_b & 0x80) && (~data & 0x80) && (state->m_port_b_out & 0x80))
+ if ((m_ddr_b & 0x80) && (~data & 0x80) && (m_port_b_out & 0x80))
{
- logerror("%04x: 68705 unknown port B bit %02x\n", cpu_get_pc(&space->device()), data);
+ logerror("%04x: 68705 unknown port B bit %02x\n", cpu_get_pc(&space.device()), data);
}
- state->m_port_b_out = data;
+ m_port_b_out = data;
}
-WRITE8_HANDLER( bublbobl_68705_ddr_b_w )
+WRITE8_MEMBER(bublbobl_state::bublbobl_68705_ddr_b_w)
{
- bublbobl_state *state = space->machine().driver_data<bublbobl_state>();
- state->m_ddr_b = data;
+ m_ddr_b = data;
}
diff --git a/src/mame/machine/carpolo.c b/src/mame/machine/carpolo.c
index 6a8f9b3db97..2189b827542 100644
--- a/src/mame/machine/carpolo.c
+++ b/src/mame/machine/carpolo.c
@@ -142,71 +142,63 @@ void carpolo_generate_car_border_interrupt(running_machine &machine, int car, in
}
-READ8_HANDLER( carpolo_ball_screen_collision_cause_r )
+READ8_MEMBER(carpolo_state::carpolo_ball_screen_collision_cause_r)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
/* bit 0 - 0=ball collided with border
bit 1 - 0=ball collided with goal
bit 2 - 0=ball collided with score area
bit 3 - which goal/score collided (0=left, 1=right) */
- return state->m_ball_screen_collision_cause;
+ return m_ball_screen_collision_cause;
}
-READ8_HANDLER( carpolo_car_ball_collision_x_r )
+READ8_MEMBER(carpolo_state::carpolo_car_ball_collision_x_r)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
/* the x coordinate of the colliding pixel */
- return state->m_car_ball_collision_x;
+ return m_car_ball_collision_x;
}
-READ8_HANDLER( carpolo_car_ball_collision_y_r )
+READ8_MEMBER(carpolo_state::carpolo_car_ball_collision_y_r)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
/* the y coordinate of the colliding pixel */
- return state->m_car_ball_collision_y;
+ return m_car_ball_collision_y;
}
-READ8_HANDLER( carpolo_car_car_collision_cause_r )
+READ8_MEMBER(carpolo_state::carpolo_car_car_collision_cause_r)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
/* bit 0 - car 4 collided
bit 1 - car 3 collided
bit 2 - car 2 collided
bit 3 - car 1 collided */
- return state->m_car_car_collision_cause;
+ return m_car_car_collision_cause;
}
-READ8_HANDLER( carpolo_car_goal_collision_cause_r )
+READ8_MEMBER(carpolo_state::carpolo_car_goal_collision_cause_r)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
/* bit 0-1 - which car collided
bit 2 - horizontal timing bit 1TEC4 (not accessed)
bit 3 - which goal collided (0=left, 1=right) */
- return state->m_car_goal_collision_cause;
+ return m_car_goal_collision_cause;
}
-READ8_HANDLER( carpolo_car_ball_collision_cause_r )
+READ8_MEMBER(carpolo_state::carpolo_car_ball_collision_cause_r)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
/* bit 0-1 - which car collided
bit 2-3 - unconnected */
- return state->m_car_ball_collision_cause;
+ return m_car_ball_collision_cause;
}
-READ8_HANDLER( carpolo_car_border_collision_cause_r )
+READ8_MEMBER(carpolo_state::carpolo_car_border_collision_cause_r)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
/* bit 0-1 - which car collided
bit 2 - 0=vertical border, 1=horizontal border */
- return state->m_car_border_collision_cause;
+ return m_car_border_collision_cause;
}
-READ8_HANDLER( carpolo_interrupt_cause_r )
+READ8_MEMBER(carpolo_state::carpolo_interrupt_cause_r)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
/* the output of the 148 goes to bits 1-3 (which is priority ^ 7) */
- return (ttl74148_output_r(state->m_ttl74148_3s) << 1) | state->m_priority_0_extension;
+ return (ttl74148_output_r(m_ttl74148_3s) << 1) | m_priority_0_extension;
}
@@ -320,46 +312,40 @@ static WRITE_LINE_DEVICE_HANDLER( coin4_interrupt_clear_w )
drvstate->m_ttl7474_2u_2->clear_w(state);
}
-WRITE8_HANDLER( carpolo_ball_screen_interrupt_clear_w )
+WRITE8_MEMBER(carpolo_state::carpolo_ball_screen_interrupt_clear_w)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
- ttl74148_input_line_w(state->m_ttl74148_3s, BALL_SCREEN_PRIORITY_LINE, 1);
- ttl74148_update(state->m_ttl74148_3s);
+ ttl74148_input_line_w(m_ttl74148_3s, BALL_SCREEN_PRIORITY_LINE, 1);
+ ttl74148_update(m_ttl74148_3s);
}
-WRITE8_HANDLER( carpolo_car_car_interrupt_clear_w )
+WRITE8_MEMBER(carpolo_state::carpolo_car_car_interrupt_clear_w)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
- ttl74148_input_line_w(state->m_ttl74148_3s, CAR_CAR_PRIORITY_LINE, 1);
- ttl74148_update(state->m_ttl74148_3s);
+ ttl74148_input_line_w(m_ttl74148_3s, CAR_CAR_PRIORITY_LINE, 1);
+ ttl74148_update(m_ttl74148_3s);
}
-WRITE8_HANDLER( carpolo_car_goal_interrupt_clear_w )
+WRITE8_MEMBER(carpolo_state::carpolo_car_goal_interrupt_clear_w)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
- ttl74148_input_line_w(state->m_ttl74148_3s, CAR_GOAL_PRIORITY_LINE, 1);
- ttl74148_update(state->m_ttl74148_3s);
+ ttl74148_input_line_w(m_ttl74148_3s, CAR_GOAL_PRIORITY_LINE, 1);
+ ttl74148_update(m_ttl74148_3s);
}
-WRITE8_HANDLER( carpolo_car_ball_interrupt_clear_w )
+WRITE8_MEMBER(carpolo_state::carpolo_car_ball_interrupt_clear_w)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
- ttl74148_input_line_w(state->m_ttl74148_3s, PRI0_PRIORTITY_LINE, 1);
- ttl74148_update(state->m_ttl74148_3s);
+ ttl74148_input_line_w(m_ttl74148_3s, PRI0_PRIORTITY_LINE, 1);
+ ttl74148_update(m_ttl74148_3s);
}
-WRITE8_HANDLER( carpolo_car_border_interrupt_clear_w )
+WRITE8_MEMBER(carpolo_state::carpolo_car_border_interrupt_clear_w)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
- ttl74148_input_line_w(state->m_ttl74148_3s, PRI0_PRIORTITY_LINE, 1);
- ttl74148_update(state->m_ttl74148_3s);
+ ttl74148_input_line_w(m_ttl74148_3s, PRI0_PRIORTITY_LINE, 1);
+ ttl74148_update(m_ttl74148_3s);
}
-WRITE8_HANDLER( carpolo_timer_interrupt_clear_w )
+WRITE8_MEMBER(carpolo_state::carpolo_timer_interrupt_clear_w)
{
- carpolo_state *state = space->machine().driver_data<carpolo_state>();
- ttl74148_input_line_w(state->m_ttl74148_3s, PRI0_PRIORTITY_LINE, 1);
- ttl74148_update(state->m_ttl74148_3s);
+ ttl74148_input_line_w(m_ttl74148_3s, PRI0_PRIORTITY_LINE, 1);
+ ttl74148_update(m_ttl74148_3s);
}
diff --git a/src/mame/machine/cchasm.c b/src/mame/machine/cchasm.c
index 7b4de3a0380..47dd78db852 100644
--- a/src/mame/machine/cchasm.c
+++ b/src/mame/machine/cchasm.c
@@ -8,7 +8,7 @@
#include "video/vector.h"
#include "includes/cchasm.h"
-WRITE16_HANDLER( cchasm_led_w )
+WRITE16_MEMBER(cchasm_state::cchasm_led_w)
{
/*logerror("LED write %x to %x\n", data, offset);*/
}
diff --git a/src/mame/machine/chaknpop.c b/src/mame/machine/chaknpop.c
index 8f24a0f7d0c..80f80fbe25d 100644
--- a/src/mame/machine/chaknpop.c
+++ b/src/mame/machine/chaknpop.c
@@ -65,83 +65,81 @@ static void mcu_update_seed( running_machine &machine, UINT8 data )
Memory handlers
***************************************************************************/
-READ8_HANDLER( chaknpop_mcu_port_a_r )
+READ8_MEMBER(chaknpop_state::chaknpop_mcu_port_a_r)
{
- chaknpop_state *state = space->machine().driver_data<chaknpop_state>();
- //logerror("%04x: MCU port_a read\n", cpu_get_pc(&space->device()));
- return state->m_mcu_result;
+ //logerror("%04x: MCU port_a read\n", cpu_get_pc(&space.device()));
+ return m_mcu_result;
}
-READ8_HANDLER( chaknpop_mcu_port_b_r )
+READ8_MEMBER(chaknpop_state::chaknpop_mcu_port_b_r)
{
- //logerror("%04x: MCU port_b read\n", cpu_get_pc(&space->device()));
+ //logerror("%04x: MCU port_b read\n", cpu_get_pc(&space.device()));
return 0xff;
}
-READ8_HANDLER( chaknpop_mcu_port_c_r )
+READ8_MEMBER(chaknpop_state::chaknpop_mcu_port_c_r)
{
- //logerror("%04x: MCU port_c read\n", cpu_get_pc(&space->device()));
+ //logerror("%04x: MCU port_c read\n", cpu_get_pc(&space.device()));
return 0x00;
}
-WRITE8_HANDLER( chaknpop_mcu_port_a_w )
+WRITE8_MEMBER(chaknpop_state::chaknpop_mcu_port_a_w)
{
- chaknpop_state *state = space->machine().driver_data<chaknpop_state>();
UINT8 mcu_command;
- mcu_command = data + state->m_mcu_seed;
- state->m_mcu_result = 0;
+ mcu_command = data + m_mcu_seed;
+ m_mcu_result = 0;
if (mcu_command < 0x08)
{
- mcu_update_seed(space->machine(), data);
+ mcu_update_seed(machine(), data);
- state->m_mcu_result = mcu_data[state->m_mcu_select * 8 + mcu_command];
- state->m_mcu_result -= state->m_mcu_seed;
+ m_mcu_result = mcu_data[m_mcu_select * 8 + mcu_command];
+ m_mcu_result -= m_mcu_seed;
- mcu_update_seed(space->machine(), state->m_mcu_result);
+ mcu_update_seed(machine(), m_mcu_result);
- logerror("%04x: MCU command 0x%02x, result 0x%02x\n", cpu_get_pc(&space->device()), mcu_command, state->m_mcu_result);
+ logerror("%04x: MCU command 0x%02x, result 0x%02x\n", cpu_get_pc(&space.device()), mcu_command, m_mcu_result);
}
else if (mcu_command >= 0x28 && mcu_command <= 0x2a)
{
- mcu_update_seed(space->machine(), data);
+ mcu_update_seed(machine(), data);
- state->m_mcu_result = state->m_mcu_ram[0x380 + mcu_command];
- state->m_mcu_result -= state->m_mcu_seed;
+ m_mcu_result = m_mcu_ram[0x380 + mcu_command];
+ m_mcu_result -= m_mcu_seed;
- mcu_update_seed(space->machine(), state->m_mcu_result);
+ mcu_update_seed(machine(), m_mcu_result);
- logerror("%04x: MCU command 0x%02x, result 0x%02x\n", cpu_get_pc(&space->device()), mcu_command, state->m_mcu_result);
+ logerror("%04x: MCU command 0x%02x, result 0x%02x\n", cpu_get_pc(&space.device()), mcu_command, m_mcu_result);
}
else if (mcu_command < 0x80)
{
- mcu_update_seed(space->machine(), data);
+ mcu_update_seed(machine(), data);
if (mcu_command >= 0x40 && mcu_command < 0x60)
{
- state->m_mcu_select = mcu_command - 0x40;
+ m_mcu_select = mcu_command - 0x40;
- logerror("%04x: MCU select 0x%02x\n", cpu_get_pc(&space->device()), state->m_mcu_select);
+ logerror("%04x: MCU select 0x%02x\n", cpu_get_pc(&space.device()), m_mcu_select);
}
}
else if (mcu_command == 0x9c|| mcu_command == 0xde)
{
- mcu_update_seed(space->machine(), data);
+ mcu_update_seed(machine(), data);
- logerror("%04x: MCU command 0x%02x\n", cpu_get_pc(&space->device()), mcu_command);
+ logerror("%04x: MCU command 0x%02x\n", cpu_get_pc(&space.device()), mcu_command);
}
}
-WRITE8_HANDLER( chaknpop_mcu_port_b_w )
+WRITE8_MEMBER(chaknpop_state::chaknpop_mcu_port_b_w)
{
- //logerror("%04x: MCU port_b write 0x%02x\n", cpu_get_pc(&space->device()), data);
+ //logerror("%04x: MCU port_b write 0x%02x\n", cpu_get_pc(&space.device()), data);
}
-WRITE8_HANDLER( chaknpop_mcu_port_c_w )
+WRITE8_MEMBER(chaknpop_state::chaknpop_mcu_port_c_w)
{
- //logerror("%04x: MCU port_c write 0x%02x\n", cpu_get_pc(&space->device()), data);
+ //logerror("%04x: MCU port_c write 0x%02x\n", cpu_get_pc(&space.device()), data);
}
diff --git a/src/mame/machine/dec0.c b/src/mame/machine/dec0.c
index 64d8fdd3bd2..a915b743187 100644
--- a/src/mame/machine/dec0.c
+++ b/src/mame/machine/dec0.c
@@ -14,40 +14,39 @@ Data East machine functions - Bryan McPhail, mish@tendril.co.uk
/******************************************************************************/
-READ16_HANDLER( dec0_controls_r )
+READ16_MEMBER(dec0_state::dec0_controls_r)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
switch (offset<<1)
{
case 0: /* Player 1 & 2 joystick & buttons */
- return input_port_read(space->machine(), "INPUTS");
+ return input_port_read(machine(), "INPUTS");
case 2: /* Credits, start buttons */
- return input_port_read(space->machine(), "SYSTEM");
+ return input_port_read(machine(), "SYSTEM");
case 4: /* Byte 4: Dipswitch bank 2, Byte 5: Dipswitch Bank 1 */
- return input_port_read(space->machine(), "DSW");
+ return input_port_read(machine(), "DSW");
case 8: /* Intel 8751 mc, Bad Dudes & Heavy Barrel only */
- //logerror("CPU #0 PC %06x: warning - read i8751 %06x - %04x\n", cpu_get_pc(&space->device()), 0x30c000+offset, state->m_i8751_return);
- return state->m_i8751_return;
+ //logerror("CPU #0 PC %06x: warning - read i8751 %06x - %04x\n", cpu_get_pc(&space.device()), 0x30c000+offset, m_i8751_return);
+ return m_i8751_return;
}
- logerror("CPU #0 PC %06x: warning - read unmapped memory address %06x\n", cpu_get_pc(&space->device()), 0x30c000+offset);
+ logerror("CPU #0 PC %06x: warning - read unmapped memory address %06x\n", cpu_get_pc(&space.device()), 0x30c000+offset);
return ~0;
}
/******************************************************************************/
-READ16_HANDLER( dec0_rotary_r )
+READ16_MEMBER(dec0_state::dec0_rotary_r)
{
switch (offset<<1)
{
case 0: /* Player 1 rotary */
- return ~(1 << input_port_read(space->machine(), "AN0"));
+ return ~(1 << input_port_read(machine(), "AN0"));
case 8: /* Player 2 rotary */
- return ~(1 << input_port_read(space->machine(), "AN1"));
+ return ~(1 << input_port_read(machine(), "AN1"));
default:
logerror("Unknown rotary read at 300000 %02x\n", offset);
@@ -58,30 +57,30 @@ READ16_HANDLER( dec0_rotary_r )
/******************************************************************************/
-READ16_HANDLER( midres_controls_r )
+READ16_MEMBER(dec0_state::midres_controls_r)
{
switch (offset<<1)
{
case 0: /* Player 1 Joystick + start, Player 2 Joystick + start */
- return input_port_read(space->machine(), "INPUTS");
+ return input_port_read(machine(), "INPUTS");
case 2: /* Dipswitches */
- return input_port_read(space->machine(), "DSW");
+ return input_port_read(machine(), "DSW");
case 4: /* Player 1 rotary */
- return ~(1 << input_port_read(space->machine(), "AN0"));
+ return ~(1 << input_port_read(machine(), "AN0"));
case 6: /* Player 2 rotary */
- return ~(1 << input_port_read(space->machine(), "AN1"));
+ return ~(1 << input_port_read(machine(), "AN1"));
case 8: /* Credits, start buttons */
- return input_port_read(space->machine(), "SYSTEM");
+ return input_port_read(machine(), "SYSTEM");
case 12:
return 0; /* ?? watchdog ?? */
}
- logerror("PC %06x unknown control read at %02x\n", cpu_get_pc(&space->device()), 0x180000+offset);
+ logerror("PC %06x unknown control read at %02x\n", cpu_get_pc(&space.device()), 0x180000+offset);
return ~0;
}
@@ -90,48 +89,42 @@ READ16_HANDLER( midres_controls_r )
/******************************************************************************/
-READ8_HANDLER( hippodrm_prot_r )
+READ8_MEMBER(dec0_state::hippodrm_prot_r)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
//logerror("6280 PC %06x - Read %06x\n",cpu_getpc(),offset+0x1d0000);
- if (state->m_hippodrm_lsb==0x45) return 0x4e;
- if (state->m_hippodrm_lsb==0x92) return 0x15;
+ if (m_hippodrm_lsb==0x45) return 0x4e;
+ if (m_hippodrm_lsb==0x92) return 0x15;
return 0;
}
-WRITE8_HANDLER( hippodrm_prot_w )
+WRITE8_MEMBER(dec0_state::hippodrm_prot_w)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
switch (offset) {
- case 4: state->m_hippodrm_msb=data; break;
- case 5: state->m_hippodrm_lsb=data; break;
+ case 4: m_hippodrm_msb=data; break;
+ case 5: m_hippodrm_lsb=data; break;
}
//logerror("6280 PC %06x - Wrote %06x to %04x\n",cpu_getpc(),data,offset+0x1d0000);
}
-READ8_HANDLER( hippodrm_shared_r )
+READ8_MEMBER(dec0_state::hippodrm_shared_r)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
- return state->m_share[offset];
+ return m_share[offset];
}
-WRITE8_HANDLER( hippodrm_shared_w )
+WRITE8_MEMBER(dec0_state::hippodrm_shared_w)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
- state->m_share[offset]=data;
+ m_share[offset]=data;
}
-static READ16_HANDLER( hippodrm_68000_share_r )
+READ16_MEMBER(dec0_state::hippodrm_68000_share_r)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
- if (offset==0) device_yield(&space->device()); /* A wee helper */
- return state->m_share[offset]&0xff;
+ if (offset==0) device_yield(&space.device()); /* A wee helper */
+ return m_share[offset]&0xff;
}
-static WRITE16_HANDLER( hippodrm_68000_share_w )
+WRITE16_MEMBER(dec0_state::hippodrm_68000_share_w)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
- state->m_share[offset]=data&0xff;
+ m_share[offset]=data&0xff;
}
/******************************************************************************/
@@ -171,42 +164,40 @@ static WRITE16_HANDLER( hippodrm_68000_share_w )
*/
-READ8_HANDLER(dec0_mcu_port_r )
+READ8_MEMBER(dec0_state::dec0_mcu_port_r)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
- int latchEnable=state->m_i8751_ports[2]>>4;
+ int latchEnable=m_i8751_ports[2]>>4;
// P0 connected to 4 latches
if (offset==0)
{
if ((latchEnable&1)==0)
- return state->m_i8751_command>>8;
+ return m_i8751_command>>8;
else if ((latchEnable&2)==0)
- return state->m_i8751_command&0xff;
+ return m_i8751_command&0xff;
else if ((latchEnable&4)==0)
- return state->m_i8751_return>>8;
+ return m_i8751_return>>8;
else if ((latchEnable&8)==0)
- return state->m_i8751_return&0xff;
+ return m_i8751_return&0xff;
}
return 0xff;
}
-WRITE8_HANDLER(dec0_mcu_port_w )
+WRITE8_MEMBER(dec0_state::dec0_mcu_port_w)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
- state->m_i8751_ports[offset]=data;
+ m_i8751_ports[offset]=data;
if (offset==2)
{
if ((data&0x4)==0)
- cputag_set_input_line(space->machine(), "maincpu", 5, HOLD_LINE);
+ cputag_set_input_line(machine(), "maincpu", 5, HOLD_LINE);
if ((data&0x8)==0)
- cputag_set_input_line(space->machine(), "mcu", MCS51_INT1_LINE, CLEAR_LINE);
+ cputag_set_input_line(machine(), "mcu", MCS51_INT1_LINE, CLEAR_LINE);
if ((data&0x40)==0)
- state->m_i8751_return=(state->m_i8751_return&0xff00)|(state->m_i8751_ports[0]);
+ m_i8751_return=(m_i8751_return&0xff00)|(m_i8751_ports[0]);
if ((data&0x80)==0)
- state->m_i8751_return=(state->m_i8751_return&0xff)|(state->m_i8751_ports[0]<<8);
+ m_i8751_return=(m_i8751_return&0xff)|(m_i8751_ports[0]<<8);
}
}
@@ -331,31 +322,28 @@ void dec0_i8751_reset(running_machine &machine)
/******************************************************************************/
-static WRITE16_HANDLER( sprite_mirror_w )
+WRITE16_MEMBER(dec0_state::sprite_mirror_w)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
- COMBINE_DATA(&state->m_spriteram[offset]);
+ COMBINE_DATA(&m_spriteram[offset]);
}
/******************************************************************************/
-static READ16_HANDLER( robocop_68000_share_r )
+READ16_MEMBER(dec0_state::robocop_68000_share_r)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
-//logerror("%08x: Share read %04x\n",cpu_get_pc(&space->device()),offset);
+//logerror("%08x: Share read %04x\n",cpu_get_pc(&space.device()),offset);
- return state->m_robocop_shared_ram[offset];
+ return m_robocop_shared_ram[offset];
}
-static WRITE16_HANDLER( robocop_68000_share_w )
+WRITE16_MEMBER(dec0_state::robocop_68000_share_w)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
-// logerror("%08x: Share write %04x %04x\n",cpu_get_pc(&space->device()),offset,data);
+// logerror("%08x: Share write %04x %04x\n",cpu_get_pc(&space.device()),offset,data);
- state->m_robocop_shared_ram[offset]=data&0xff;
+ m_robocop_shared_ram[offset]=data&0xff;
if (offset == 0x7ff) /* A control address - not standard ram */
- cputag_set_input_line(space->machine(), "sub", 0, HOLD_LINE);
+ cputag_set_input_line(machine(), "sub", 0, HOLD_LINE);
}
/******************************************************************************/
@@ -373,9 +361,9 @@ static void h6280_decrypt(running_machine &machine, const char *cputag)
DRIVER_INIT( hippodrm )
{
UINT8 *RAM = machine.region("sub")->base();
-
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x180000, 0x180fff, FUNC(hippodrm_68000_share_r), FUNC(hippodrm_68000_share_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xffc800, 0xffcfff, FUNC(sprite_mirror_w));
+ dec0_state *state = machine.driver_data<dec0_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x180000, 0x180fff, read16_delegate(FUNC(dec0_state::hippodrm_68000_share_r),state), write16_delegate(FUNC(dec0_state::hippodrm_68000_share_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xffc800, 0xffcfff, write16_delegate(FUNC(dec0_state::sprite_mirror_w),state));
h6280_decrypt(machine, "sub");
@@ -399,7 +387,8 @@ DRIVER_INIT( slyspy )
DRIVER_INIT( robocop )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x180000, 0x180fff, FUNC(robocop_68000_share_r), FUNC(robocop_68000_share_w));
+ dec0_state *state = machine.driver_data<dec0_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x180000, 0x180fff, read16_delegate(FUNC(dec0_state::robocop_68000_share_r),state), write16_delegate(FUNC(dec0_state::robocop_68000_share_w),state));
}
DRIVER_INIT( baddudes )
diff --git a/src/mame/machine/docastle.c b/src/mame/machine/docastle.c
index bdddf3bb392..13843224b81 100644
--- a/src/mame/machine/docastle.c
+++ b/src/mame/machine/docastle.c
@@ -27,59 +27,54 @@ if it was a small shared buffer. The order of operations is:
bytes and write its own 9 bytes
4) resume execution of CPU 0.
*/
-READ8_HANDLER( docastle_shared0_r )
+READ8_MEMBER(docastle_state::docastle_shared0_r)
{
- docastle_state *state = space->machine().driver_data<docastle_state>();
- if (offset == 8) logerror("CPU #0 shared0r clock = %d\n", (UINT32)state->m_maincpu->total_cycles());
- return state->m_buffer0[offset];
+ if (offset == 8) logerror("CPU #0 shared0r clock = %d\n", (UINT32)m_maincpu->total_cycles());
+ return m_buffer0[offset];
}
-READ8_HANDLER( docastle_shared1_r )
+READ8_MEMBER(docastle_state::docastle_shared1_r)
{
- docastle_state *state = space->machine().driver_data<docastle_state>();
- if (offset == 8) logerror("CPU #1 shared1r clock = %d\n", (UINT32)state->m_slave->total_cycles());
- return state->m_buffer1[offset];
+ if (offset == 8) logerror("CPU #1 shared1r clock = %d\n", (UINT32)m_slave->total_cycles());
+ return m_buffer1[offset];
}
-WRITE8_HANDLER( docastle_shared0_w )
+WRITE8_MEMBER(docastle_state::docastle_shared0_w)
{
- docastle_state *state = space->machine().driver_data<docastle_state>();
if (offset == 8) logerror("CPU #1 shared0w %02x %02x %02x %02x %02x %02x %02x %02x %02x clock = %d\n",
- state->m_buffer0[0], state->m_buffer0[1], state->m_buffer0[2], state->m_buffer0[3],
- state->m_buffer0[4], state->m_buffer0[5], state->m_buffer0[6], state->m_buffer0[7],
- data, (UINT32)state->m_slave->total_cycles());
+ m_buffer0[0], m_buffer0[1], m_buffer0[2], m_buffer0[3],
+ m_buffer0[4], m_buffer0[5], m_buffer0[6], m_buffer0[7],
+ data, (UINT32)m_slave->total_cycles());
- state->m_buffer0[offset] = data;
+ m_buffer0[offset] = data;
if (offset == 8)
/* awake the master CPU */
- space->machine().scheduler().trigger(500);
+ machine().scheduler().trigger(500);
}
-WRITE8_HANDLER( docastle_shared1_w )
+WRITE8_MEMBER(docastle_state::docastle_shared1_w)
{
- docastle_state *state = space->machine().driver_data<docastle_state>();
- state->m_buffer1[offset] = data;
+ m_buffer1[offset] = data;
if (offset == 8)
{
logerror("CPU #0 shared1w %02x %02x %02x %02x %02x %02x %02x %02x %02x clock = %d\n",
- state->m_buffer1[0], state->m_buffer1[1], state->m_buffer1[2], state->m_buffer1[3],
- state->m_buffer1[4], state->m_buffer1[5], state->m_buffer1[6], state->m_buffer1[7],
- data, (UINT32)state->m_maincpu->total_cycles());
+ m_buffer1[0], m_buffer1[1], m_buffer1[2], m_buffer1[3],
+ m_buffer1[4], m_buffer1[5], m_buffer1[6], m_buffer1[7],
+ data, (UINT32)m_maincpu->total_cycles());
/* freeze execution of the master CPU until the slave has used the shared memory */
- device_spin_until_trigger(&space->device(), 500);
+ device_spin_until_trigger(&space.device(), 500);
}
}
-WRITE8_HANDLER( docastle_nmitrigger_w )
+WRITE8_MEMBER(docastle_state::docastle_nmitrigger_w)
{
- docastle_state *state = space->machine().driver_data<docastle_state>();
- device_set_input_line(state->m_slave, INPUT_LINE_NMI, PULSE_LINE);
+ device_set_input_line(m_slave, INPUT_LINE_NMI, PULSE_LINE);
}
diff --git a/src/mame/machine/flstory.c b/src/mame/machine/flstory.c
index 13c7a49a460..6cf2d3d3921 100644
--- a/src/mame/machine/flstory.c
+++ b/src/mame/machine/flstory.c
@@ -20,26 +20,23 @@
***************************************************************************/
-READ8_HANDLER( flstory_68705_port_a_r )
+READ8_MEMBER(flstory_state::flstory_68705_port_a_r)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(&space->device()), state->m_port_a_in);
- return (state->m_port_a_out & state->m_ddr_a) | (state->m_port_a_in & ~state->m_ddr_a);
+ //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(&space.device()), m_port_a_in);
+ return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a);
}
-WRITE8_HANDLER( flstory_68705_port_a_w )
+WRITE8_MEMBER(flstory_state::flstory_68705_port_a_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(&space->device()), data);
- state->m_port_a_out = data;
+ //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(&space.device()), data);
+ m_port_a_out = data;
}
-WRITE8_HANDLER( flstory_68705_ddr_a_w )
+WRITE8_MEMBER(flstory_state::flstory_68705_ddr_a_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- state->m_ddr_a = data;
+ m_ddr_a = data;
}
@@ -53,142 +50,131 @@ WRITE8_HANDLER( flstory_68705_ddr_a_w )
* 2 W when 0->1, copies port A to the latch for the main CPU
*/
-READ8_HANDLER( flstory_68705_port_b_r )
+READ8_MEMBER(flstory_state::flstory_68705_port_b_r)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- return (state->m_port_b_out & state->m_ddr_b) | (state->m_port_b_in & ~state->m_ddr_b);
+ return (m_port_b_out & m_ddr_b) | (m_port_b_in & ~m_ddr_b);
}
-WRITE8_HANDLER( flstory_68705_port_b_w )
+WRITE8_MEMBER(flstory_state::flstory_68705_port_b_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- //logerror("%04x: 68705 port B write %02x\n",cpu_get_pc(&space->device()),data);
+ //logerror("%04x: 68705 port B write %02x\n",cpu_get_pc(&space.device()),data);
- if ((state->m_ddr_b & 0x02) && (~data & 0x02) && (state->m_port_b_out & 0x02))
+ if ((m_ddr_b & 0x02) && (~data & 0x02) && (m_port_b_out & 0x02))
{
- state->m_port_a_in = state->m_from_main;
- if (state->m_main_sent)
- device_set_input_line(state->m_mcu, 0, CLEAR_LINE);
- state->m_main_sent = 0;
- logerror("read command %02x from main cpu\n", state->m_port_a_in);
+ m_port_a_in = m_from_main;
+ if (m_main_sent)
+ device_set_input_line(m_mcu, 0, CLEAR_LINE);
+ m_main_sent = 0;
+ logerror("read command %02x from main cpu\n", m_port_a_in);
}
- if ((state->m_ddr_b & 0x04) && (data & 0x04) && (~state->m_port_b_out & 0x04))
+ if ((m_ddr_b & 0x04) && (data & 0x04) && (~m_port_b_out & 0x04))
{
- logerror("send command %02x to main cpu\n", state->m_port_a_out);
- state->m_from_mcu = state->m_port_a_out;
- state->m_mcu_sent = 1;
+ logerror("send command %02x to main cpu\n", m_port_a_out);
+ m_from_mcu = m_port_a_out;
+ m_mcu_sent = 1;
}
- state->m_port_b_out = data;
+ m_port_b_out = data;
}
-WRITE8_HANDLER( flstory_68705_ddr_b_w )
+WRITE8_MEMBER(flstory_state::flstory_68705_ddr_b_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- state->m_ddr_b = data;
+ m_ddr_b = data;
}
-READ8_HANDLER( flstory_68705_port_c_r )
+READ8_MEMBER(flstory_state::flstory_68705_port_c_r)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- state->m_port_c_in = 0;
- if (state->m_main_sent)
- state->m_port_c_in |= 0x01;
+ m_port_c_in = 0;
+ if (m_main_sent)
+ m_port_c_in |= 0x01;
- if (!state->m_mcu_sent)
- state->m_port_c_in |= 0x02;
+ if (!m_mcu_sent)
+ m_port_c_in |= 0x02;
- //logerror("%04x: 68705 port C read %02x\n", cpu_get_pc(&space->device()), port_c_in);
- return (state->m_port_c_out & state->m_ddr_c) | (state->m_port_c_in & ~state->m_ddr_c);
+ //logerror("%04x: 68705 port C read %02x\n", cpu_get_pc(&space.device()), port_c_in);
+ return (m_port_c_out & m_ddr_c) | (m_port_c_in & ~m_ddr_c);
}
-WRITE8_HANDLER( flstory_68705_port_c_w )
+WRITE8_MEMBER(flstory_state::flstory_68705_port_c_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- logerror("%04x: 68705 port C write %02x\n", cpu_get_pc(&space->device()), data);
- state->m_port_c_out = data;
+ logerror("%04x: 68705 port C write %02x\n", cpu_get_pc(&space.device()), data);
+ m_port_c_out = data;
}
-WRITE8_HANDLER( flstory_68705_ddr_c_w )
+WRITE8_MEMBER(flstory_state::flstory_68705_ddr_c_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- state->m_ddr_c = data;
+ m_ddr_c = data;
}
-WRITE8_HANDLER( flstory_mcu_w )
+WRITE8_MEMBER(flstory_state::flstory_mcu_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- logerror("%04x: mcu_w %02x\n", cpu_get_pc(&space->device()), data);
- state->m_from_main = data;
- state->m_main_sent = 1;
- device_set_input_line(state->m_mcu, 0, ASSERT_LINE);
+ logerror("%04x: mcu_w %02x\n", cpu_get_pc(&space.device()), data);
+ m_from_main = data;
+ m_main_sent = 1;
+ device_set_input_line(m_mcu, 0, ASSERT_LINE);
}
-READ8_HANDLER( flstory_mcu_r )
+READ8_MEMBER(flstory_state::flstory_mcu_r)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- logerror("%04x: mcu_r %02x\n",cpu_get_pc(&space->device()), state->m_from_mcu);
- state->m_mcu_sent = 0;
- return state->m_from_mcu;
+ logerror("%04x: mcu_r %02x\n",cpu_get_pc(&space.device()), m_from_mcu);
+ m_mcu_sent = 0;
+ return m_from_mcu;
}
-READ8_HANDLER( flstory_mcu_status_r )
+READ8_MEMBER(flstory_state::flstory_mcu_status_r)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
int res = 0;
/* bit 0 = when 1, mcu is ready to receive data from main cpu */
/* bit 1 = when 1, mcu has sent data to the main cpu */
- //logerror("%04x: mcu_status_r\n", cpu_get_pc(&space->device()));
- if (!state->m_main_sent)
+ //logerror("%04x: mcu_status_r\n", cpu_get_pc(&space.device()));
+ if (!m_main_sent)
res |= 0x01;
- if (state->m_mcu_sent)
+ if (m_mcu_sent)
res |= 0x02;
return res;
}
-WRITE8_HANDLER( onna34ro_mcu_w )
+WRITE8_MEMBER(flstory_state::onna34ro_mcu_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- UINT16 score_adr = state->m_workram[0x29e] * 0x100 + state->m_workram[0x29d];
+ UINT16 score_adr = m_workram[0x29e] * 0x100 + m_workram[0x29d];
switch (data)
{
case 0x0e:
- state->m_from_mcu = 0xff;
+ m_from_mcu = 0xff;
break;
case 0x01:
- state->m_from_mcu = 0x6a;
+ m_from_mcu = 0x6a;
break;
case 0x40:
if(score_adr >= 0xe000 && score_adr < 0xe800)
- state->m_from_mcu = state->m_workram[score_adr - 0xe000]; /* score l*/
+ m_from_mcu = m_workram[score_adr - 0xe000]; /* score l*/
break;
case 0x41:
if(score_adr >= 0xe000 && score_adr < 0xe800)
- state->m_from_mcu = state->m_workram[(score_adr + 1) - 0xe000]; /* score m*/
+ m_from_mcu = m_workram[(score_adr + 1) - 0xe000]; /* score m*/
break;
case 0x42:
if(score_adr >= 0xe000 && score_adr < 0xe800)
- state->m_from_mcu = state->m_workram[(score_adr + 2) - 0xe000] & 0x0f; /* score h*/
+ m_from_mcu = m_workram[(score_adr + 2) - 0xe000] & 0x0f; /* score h*/
break;
default:
- state->m_from_mcu = 0x80;
+ m_from_mcu = 0x80;
}
}
-READ8_HANDLER( onna34ro_mcu_r )
+READ8_MEMBER(flstory_state::onna34ro_mcu_r)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- return state->m_from_mcu;
+ return m_from_mcu;
}
-READ8_HANDLER( onna34ro_mcu_status_r )
+READ8_MEMBER(flstory_state::onna34ro_mcu_status_r)
{
int res = 3;
@@ -196,7 +182,7 @@ READ8_HANDLER( onna34ro_mcu_status_r )
}
-#define VICTNINE_MCU_SEED (state->m_workram[0x685])
+#define VICTNINE_MCU_SEED (m_workram[0x685])
static const UINT8 victnine_mcu_data[0x100] =
{
@@ -234,14 +220,13 @@ static const UINT8 victnine_mcu_data[0x100] =
0x06, 0x07, 0x02, 0x03, 0x15, 0x17, 0x11, 0x13
};
-WRITE8_HANDLER( victnine_mcu_w )
+WRITE8_MEMBER(flstory_state::victnine_mcu_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
UINT8 seed = VICTNINE_MCU_SEED;
if (!seed && (data & 0x37) == 0x37)
{
- state->m_from_mcu = 0xa6;
+ m_from_mcu = 0xa6;
logerror("mcu initialize (%02x)\n", data);
}
else
@@ -250,19 +235,19 @@ WRITE8_HANDLER( victnine_mcu_w )
if ((data & ~0x1f) == 0xa0)
{
- state->m_mcu_select = data & 0x1f;
- //logerror("mcu select: 0x%02x\n", state->m_mcu_select);
+ m_mcu_select = data & 0x1f;
+ //logerror("mcu select: 0x%02x\n", m_mcu_select);
}
else if (data < 0x20)
{
- int offset = state->m_mcu_select * 8 + data;
+ int offset = m_mcu_select * 8 + data;
//logerror("mcu fetch: 0x%02x\n", offset);
- state->m_from_mcu = victnine_mcu_data[offset];
+ m_from_mcu = victnine_mcu_data[offset];
}
else if (data >= 0x38 && data <= 0x3a)
{
- state->m_from_mcu = state->m_workram[0x691 - 0x38 + data];
+ m_from_mcu = m_workram[0x691 - 0x38 + data];
}
else
{
@@ -271,15 +256,14 @@ WRITE8_HANDLER( victnine_mcu_w )
}
}
-READ8_HANDLER( victnine_mcu_r )
+READ8_MEMBER(flstory_state::victnine_mcu_r)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- //logerror("%04x: mcu read (0x%02x)\n", cpu_get_previouspc(&space->device()), state->m_from_mcu);
+ //logerror("%04x: mcu read (0x%02x)\n", cpu_get_previouspc(&space.device()), m_from_mcu);
- return state->m_from_mcu - VICTNINE_MCU_SEED;
+ return m_from_mcu - VICTNINE_MCU_SEED;
}
-READ8_HANDLER( victnine_mcu_status_r )
+READ8_MEMBER(flstory_state::victnine_mcu_status_r)
{
int res = 3;
diff --git a/src/mame/machine/gaelco2.c b/src/mame/machine/gaelco2.c
index a7df42c4f54..29f1f40e141 100644
--- a/src/mame/machine/gaelco2.c
+++ b/src/mame/machine/gaelco2.c
@@ -136,36 +136,36 @@ DRIVER_INIT( snowboar )
***************************************************************************/
-WRITE16_HANDLER( gaelco2_coin_w )
+WRITE16_MEMBER(gaelco2_state::gaelco2_coin_w)
{
/* Coin Lockouts */
- coin_lockout_w(space->machine(), 0, ~data & 0x01);
- coin_lockout_w(space->machine(), 1, ~data & 0x02);
+ coin_lockout_w(machine(), 0, ~data & 0x01);
+ coin_lockout_w(machine(), 1, ~data & 0x02);
/* Coin Counters */
- coin_counter_w(space->machine(), 0, data & 0x04);
- coin_counter_w(space->machine(), 1, data & 0x08);
+ coin_counter_w(machine(), 0, data & 0x04);
+ coin_counter_w(machine(), 1, data & 0x08);
}
-WRITE16_HANDLER( gaelco2_coin2_w )
+WRITE16_MEMBER(gaelco2_state::gaelco2_coin2_w)
{
/* coin counters */
- coin_counter_w(space->machine(), offset & 0x01, data & 0x01);
+ coin_counter_w(machine(), offset & 0x01, data & 0x01);
}
-WRITE16_HANDLER( wrally2_coin_w )
+WRITE16_MEMBER(gaelco2_state::wrally2_coin_w)
{
/* coin counters */
- coin_counter_w(space->machine(), (offset >> 3) & 0x01, data & 0x01);
+ coin_counter_w(machine(), (offset >> 3) & 0x01, data & 0x01);
}
-WRITE16_HANDLER( touchgo_coin_w )
+WRITE16_MEMBER(gaelco2_state::touchgo_coin_w)
{
if ((offset >> 2) == 0){
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02);
- coin_counter_w(space->machine(), 2, data & 0x04);
- coin_counter_w(space->machine(), 3, data & 0x08);
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 2, data & 0x04);
+ coin_counter_w(machine(), 3, data & 0x08);
}
}
@@ -182,10 +182,9 @@ DRIVER_INIT( bang )
state->m_clr_gun_int = 0;
}
-WRITE16_HANDLER( bang_clr_gun_int_w )
+WRITE16_MEMBER(gaelco2_state::bang_clr_gun_int_w)
{
- gaelco2_state *state = space->machine().driver_data<gaelco2_state>();
- state->m_clr_gun_int = 1;
+ m_clr_gun_int = 1;
}
TIMER_DEVICE_CALLBACK( bang_irq )
@@ -227,37 +226,35 @@ CUSTOM_INPUT( wrally2_analog_bit_r )
}
-WRITE16_HANDLER( wrally2_adc_clk )
+WRITE16_MEMBER(gaelco2_state::wrally2_adc_clk)
{
- gaelco2_state *state = space->machine().driver_data<gaelco2_state>();
/* a zero/one combo is written here to clock the next analog port bit */
if (ACCESSING_BITS_0_7)
{
if (!(data & 0xff))
{
- state->m_analog_ports[0] <<= 1;
- state->m_analog_ports[1] <<= 1;
+ m_analog_ports[0] <<= 1;
+ m_analog_ports[1] <<= 1;
}
}
else
- logerror("%06X:analog_port_clock_w(%02X) = %08X & %08X\n", cpu_get_pc(&space->device()), offset, data, mem_mask);
+ logerror("%06X:analog_port_clock_w(%02X) = %08X & %08X\n", cpu_get_pc(&space.device()), offset, data, mem_mask);
}
-WRITE16_HANDLER( wrally2_adc_cs )
+WRITE16_MEMBER(gaelco2_state::wrally2_adc_cs)
{
- gaelco2_state *state = space->machine().driver_data<gaelco2_state>();
/* a zero is written here to read the analog ports, and a one is written when finished */
if (ACCESSING_BITS_0_7)
{
if (!(data & 0xff))
{
- state->m_analog_ports[0] = input_port_read_safe(space->machine(), "ANALOG0", 0);
- state->m_analog_ports[1] = input_port_read_safe(space->machine(), "ANALOG1", 0);
+ m_analog_ports[0] = input_port_read_safe(machine(), "ANALOG0", 0);
+ m_analog_ports[1] = input_port_read_safe(machine(), "ANALOG1", 0);
}
}
else
- logerror("%06X:analog_port_latch_w(%02X) = %08X & %08X\n", cpu_get_pc(&space->device()), offset, data, mem_mask);
+ logerror("%06X:analog_port_latch_w(%02X) = %08X & %08X\n", cpu_get_pc(&space.device()), offset, data, mem_mask);
}
/***************************************************************************
@@ -303,16 +300,15 @@ WRITE16_DEVICE_HANDLER( gaelco2_eeprom_data_w )
The protection handles sound, controls, gameplay and some sprites
*/
-READ16_HANDLER( snowboar_protection_r )
+READ16_MEMBER(gaelco2_state::snowboar_protection_r)
{
- logerror("%06x: protection read from %04x\n", cpu_get_pc(&space->device()), offset*2);
+ logerror("%06x: protection read from %04x\n", cpu_get_pc(&space.device()), offset*2);
return 0x0000;
}
-WRITE16_HANDLER( snowboar_protection_w )
+WRITE16_MEMBER(gaelco2_state::snowboar_protection_w)
{
- gaelco2_state *state = space->machine().driver_data<gaelco2_state>();
- COMBINE_DATA(&state->m_snowboar_protection[offset]);
- logerror("%06x: protection write %04x to %04x\n", cpu_get_pc(&space->device()), data, offset*2);
+ COMBINE_DATA(&m_snowboar_protection[offset]);
+ logerror("%06x: protection write %04x to %04x\n", cpu_get_pc(&space.device()), data, offset*2);
}
diff --git a/src/mame/machine/galaxold.c b/src/mame/machine/galaxold.c
index 0d3d51d6b3d..e982b7f24c1 100644
--- a/src/mame/machine/galaxold.c
+++ b/src/mame/machine/galaxold.c
@@ -42,9 +42,9 @@ WRITE_LINE_DEVICE_HANDLER( galaxold_7474_9m_1_callback )
cputag_set_input_line(device->machine(), "maincpu", drvstate->m_irq_line, state ? CLEAR_LINE : ASSERT_LINE);
}
-WRITE8_HANDLER( galaxold_nmi_enable_w )
+WRITE8_MEMBER(galaxold_state::galaxold_nmi_enable_w)
{
- ttl7474_device *target = space->machine().device<ttl7474_device>("7474_9m_1");
+ ttl7474_device *target = machine().device<ttl7474_device>("7474_9m_1");
target->preset_w(data ? 1 : 0);
}
@@ -101,38 +101,38 @@ MACHINE_RESET( hunchbkg )
device_set_irq_callback(machine.device("maincpu"), hunchbkg_irq_callback);
}
-WRITE8_HANDLER( galaxold_coin_lockout_w )
+WRITE8_MEMBER(galaxold_state::galaxold_coin_lockout_w)
{
- coin_lockout_global_w(space->machine(), ~data & 1);
+ coin_lockout_global_w(machine(), ~data & 1);
}
-WRITE8_HANDLER( galaxold_coin_counter_w )
+WRITE8_MEMBER(galaxold_state::galaxold_coin_counter_w)
{
- coin_counter_w(space->machine(), offset, data & 0x01);
+ coin_counter_w(machine(), offset, data & 0x01);
}
-WRITE8_HANDLER( galaxold_coin_counter_1_w )
+WRITE8_MEMBER(galaxold_state::galaxold_coin_counter_1_w)
{
- coin_counter_w(space->machine(), 1, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x01);
}
-WRITE8_HANDLER( galaxold_coin_counter_2_w )
+WRITE8_MEMBER(galaxold_state::galaxold_coin_counter_2_w)
{
- coin_counter_w(space->machine(), 2, data & 0x01);
+ coin_counter_w(machine(), 2, data & 0x01);
}
-WRITE8_HANDLER( galaxold_leds_w )
+WRITE8_MEMBER(galaxold_state::galaxold_leds_w)
{
- set_led_status(space->machine(), offset,data & 1);
+ set_led_status(machine(), offset,data & 1);
}
#ifdef UNUSED_FUNCTION
-static READ8_HANDLER( checkmaj_protection_r )
+READ8_MEMBER(galaxold_state::checkmaj_protection_r)
{
- switch (cpu_get_pc(&space->device()))
+ switch (cpu_get_pc(&space.device()))
{
case 0x0f15: return 0xf5;
case 0x0f8f: return 0x7c;
@@ -141,7 +141,7 @@ static READ8_HANDLER( checkmaj_protection_r )
case 0x10f1: return 0xaa;
case 0x1402: return 0xaa;
default:
- logerror("Unknown protection read. PC=%04X\n",cpu_get_pc(&space->device()));
+ logerror("Unknown protection read. PC=%04X\n",cpu_get_pc(&space.device()));
}
return 0;
@@ -149,18 +149,18 @@ static READ8_HANDLER( checkmaj_protection_r )
/* Zig Zag can swap ROMs 2 and 3 as a form of copy protection */
-WRITE8_HANDLER( zigzag_sillyprotection_w )
+WRITE8_MEMBER(galaxold_state::zigzag_sillyprotection_w)
{
if (data)
{
/* swap ROM 2 and 3! */
- memory_set_bank(space->machine(), "bank1", 1);
- memory_set_bank(space->machine(), "bank2", 0);
+ memory_set_bank(machine(), "bank1", 1);
+ memory_set_bank(machine(), "bank2", 0);
}
else
{
- memory_set_bank(space->machine(), "bank1", 0);
- memory_set_bank(space->machine(), "bank2", 1);
+ memory_set_bank(machine(), "bank1", 0);
+ memory_set_bank(machine(), "bank2", 1);
}
}
@@ -175,17 +175,17 @@ DRIVER_INIT( zigzag )
-static READ8_HANDLER( dingo_3000_r )
+READ8_MEMBER(galaxold_state::dingo_3000_r)
{
return 0xaa;
}
-static READ8_HANDLER( dingo_3035_r )
+READ8_MEMBER(galaxold_state::dingo_3035_r)
{
return 0x8c;
}
-static READ8_HANDLER( dingoe_3001_r )
+READ8_MEMBER(galaxold_state::dingoe_3001_r)
{
return 0xaa;
}
@@ -223,36 +223,35 @@ DRIVER_INIT( dingoe )
#endif
-READ8_HANDLER( scramblb_protection_1_r )
+READ8_MEMBER(galaxold_state::scramblb_protection_1_r)
{
- switch (cpu_get_pc(&space->device()))
+ switch (cpu_get_pc(&space.device()))
{
case 0x01da: return 0x80;
case 0x01e4: return 0x00;
default:
- logerror("%04x: read protection 1\n",cpu_get_pc(&space->device()));
+ logerror("%04x: read protection 1\n",cpu_get_pc(&space.device()));
return 0;
}
}
-READ8_HANDLER( scramblb_protection_2_r )
+READ8_MEMBER(galaxold_state::scramblb_protection_2_r)
{
- switch (cpu_get_pc(&space->device()))
+ switch (cpu_get_pc(&space.device()))
{
case 0x01ca: return 0x90;
default:
- logerror("%04x: read protection 2\n",cpu_get_pc(&space->device()));
+ logerror("%04x: read protection 2\n",cpu_get_pc(&space.device()));
return 0;
}
}
-WRITE8_HANDLER( _4in1_bank_w )
+WRITE8_MEMBER(galaxold_state::_4in1_bank_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- state->m__4in1_bank = data & 0x03;
- galaxold_gfxbank_w(space, 0, state->m__4in1_bank);
- memory_set_bank(space->machine(), "bank1", state->m__4in1_bank);
+ m__4in1_bank = data & 0x03;
+ galaxold_gfxbank_w(space, 0, m__4in1_bank);
+ memory_set_bank(machine(), "bank1", m__4in1_bank);
}
CUSTOM_INPUT( _4in1_fake_port_r )
@@ -411,7 +410,7 @@ DRIVER_INIT( 4in1 )
/* games are banked at 0x0000 - 0x3fff */
memory_configure_bank(machine, "bank1", 0, 4, &RAM[0x10000], 0x4000);
- _4in1_bank_w(space, 0, 0); /* set the initial CPU bank */
+ state->_4in1_bank_w(*space, 0, 0); /* set the initial CPU bank */
state_save_register_global(machine, state->m__4in1_bank);
}
@@ -423,6 +422,7 @@ INTERRUPT_GEN( hunchbks_vh_interrupt )
DRIVER_INIT( ladybugg )
{
-/* Doesn't actually use the bank, but it mustn't have a coin lock! */
-machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x6002, 0x6002, FUNC(galaxold_gfxbank_w));
+ galaxold_state *state = machine.driver_data<galaxold_state>();
+ /* Doesn't actually use the bank, but it mustn't have a coin lock! */
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x6002, 0x6002, write8_delegate(FUNC(galaxold_state::galaxold_gfxbank_w),state));
}
diff --git a/src/mame/machine/gaplus.c b/src/mame/machine/gaplus.c
index cd5482ccea3..04e06169861 100644
--- a/src/mame/machine/gaplus.c
+++ b/src/mame/machine/gaplus.c
@@ -18,33 +18,31 @@
* *
************************************************************************************/
-WRITE8_HANDLER( gaplus_customio_3_w )
+WRITE8_MEMBER(gaplus_state::gaplus_customio_3_w)
{
- gaplus_state *state = space->machine().driver_data<gaplus_state>();
- samples_device *samples = space->machine().device<samples_device>("samples");
+ samples_device *samples = machine().device<samples_device>("samples");
if ((offset == 0x09) && (data >= 0x0f))
samples->start(0,0);
- state->m_customio_3[offset] = data;
+ m_customio_3[offset] = data;
}
-READ8_HANDLER( gaplus_customio_3_r )
+READ8_MEMBER(gaplus_state::gaplus_customio_3_r)
{
- gaplus_state *state = space->machine().driver_data<gaplus_state>();
- int mode = state->m_customio_3[8];
+ int mode = m_customio_3[8];
switch (offset)
{
case 0:
- return input_port_read(space->machine(), "IN2"); /* cabinet & test mode */
+ return input_port_read(machine(), "IN2"); /* cabinet & test mode */
case 1:
- return (mode == 2) ? state->m_customio_3[offset] : 0x0f;
+ return (mode == 2) ? m_customio_3[offset] : 0x0f;
case 2:
return (mode == 2) ? 0x0f : 0x0e;
case 3:
- return (mode == 2) ? state->m_customio_3[offset] : 0x01;
+ return (mode == 2) ? m_customio_3[offset] : 0x01;
default:
- return state->m_customio_3[offset];
+ return m_customio_3[offset];
}
}
diff --git a/src/mame/machine/irobot.c b/src/mame/machine/irobot.c
index 1a18172fdc1..eeb26770e26 100644
--- a/src/mame/machine/irobot.c
+++ b/src/mame/machine/irobot.c
@@ -34,33 +34,31 @@ static void irmb_run(running_machine &machine);
-READ8_HANDLER( irobot_sharedmem_r )
+READ8_MEMBER(irobot_state::irobot_sharedmem_r)
{
- irobot_state *state = space->machine().driver_data<irobot_state>();
- if (state->m_outx == 3)
- return state->m_mbRAM[BYTE_XOR_BE(offset)];
+ if (m_outx == 3)
+ return m_mbRAM[BYTE_XOR_BE(offset)];
- if (state->m_outx == 2)
- return state->m_combase[BYTE_XOR_BE(offset & 0xFFF)];
+ if (m_outx == 2)
+ return m_combase[BYTE_XOR_BE(offset & 0xFFF)];
- if (state->m_outx == 0)
- return state->m_mbROM[((state->m_mpage & 1) << 13) + BYTE_XOR_BE(offset)];
+ if (m_outx == 0)
+ return m_mbROM[((m_mpage & 1) << 13) + BYTE_XOR_BE(offset)];
- if (state->m_outx == 1)
- return state->m_mbROM[0x4000 + ((state->m_mpage & 3) << 13) + BYTE_XOR_BE(offset)];
+ if (m_outx == 1)
+ return m_mbROM[0x4000 + ((m_mpage & 3) << 13) + BYTE_XOR_BE(offset)];
return 0xFF;
}
/* Comment out the mbRAM =, comRAM2 = or comRAM1 = and it will start working */
-WRITE8_HANDLER( irobot_sharedmem_w )
+WRITE8_MEMBER(irobot_state::irobot_sharedmem_w)
{
- irobot_state *state = space->machine().driver_data<irobot_state>();
- if (state->m_outx == 3)
- state->m_mbRAM[BYTE_XOR_BE(offset)] = data;
+ if (m_outx == 3)
+ m_mbRAM[BYTE_XOR_BE(offset)] = data;
- if (state->m_outx == 2)
- state->m_combase[BYTE_XOR_BE(offset & 0xFFF)] = data;
+ if (m_outx == 2)
+ m_combase[BYTE_XOR_BE(offset & 0xFFF)] = data;
}
TIMER_DEVICE_CALLBACK( irobot_irvg_done_callback )
@@ -70,88 +68,86 @@ TIMER_DEVICE_CALLBACK( irobot_irvg_done_callback )
state->m_irvg_running = 0;
}
-WRITE8_HANDLER( irobot_statwr_w )
+WRITE8_MEMBER(irobot_state::irobot_statwr_w)
{
- irobot_state *state = space->machine().driver_data<irobot_state>();
logerror("write %2x ", data);
- IR_CPU_STATE(space->machine());
+ IR_CPU_STATE(machine());
- state->m_combase = state->m_comRAM[data >> 7];
- state->m_combase_mb = state->m_comRAM[(data >> 7) ^ 1];
- state->m_bufsel = data & 0x02;
- if (((data & 0x01) == 0x01) && (state->m_vg_clear == 0))
- irobot_poly_clear(space->machine());
+ m_combase = m_comRAM[data >> 7];
+ m_combase_mb = m_comRAM[(data >> 7) ^ 1];
+ m_bufsel = data & 0x02;
+ if (((data & 0x01) == 0x01) && (m_vg_clear == 0))
+ irobot_poly_clear(machine());
- state->m_vg_clear = data & 0x01;
+ m_vg_clear = data & 0x01;
- if ((data & 0x04) && !(state->m_statwr & 0x04))
+ if ((data & 0x04) && !(m_statwr & 0x04))
{
- irobot_run_video(space->machine());
+ irobot_run_video(machine());
#if IR_TIMING
- if (state->m_irvg_running == 0)
+ if (m_irvg_running == 0)
logerror("vg start ");
else
logerror("vg start [busy!] ");
- IR_CPU_STATE(space->machine());
- state->m_irvg_timer->adjust(attotime::from_msec(10));
+ IR_CPU_STATE(machine());
+ m_irvg_timer->adjust(attotime::from_msec(10));
#endif
- state->m_irvg_running=1;
+ m_irvg_running=1;
}
- if ((data & 0x10) && !(state->m_statwr & 0x10))
- irmb_run(space->machine());
- state->m_statwr = data;
+ if ((data & 0x10) && !(m_statwr & 0x10))
+ irmb_run(machine());
+ m_statwr = data;
}
-WRITE8_HANDLER( irobot_out0_w )
+WRITE8_MEMBER(irobot_state::irobot_out0_w)
{
- irobot_state *state = space->machine().driver_data<irobot_state>();
- UINT8 *RAM = space->machine().region("maincpu")->base();
+ UINT8 *RAM = machine().region("maincpu")->base();
- state->m_out0 = data;
+ m_out0 = data;
switch (data & 0x60)
{
case 0:
- memory_set_bankptr(space->machine(), "bank2", &RAM[0x1C000]);
+ memory_set_bankptr(machine(), "bank2", &RAM[0x1C000]);
break;
case 0x20:
- memory_set_bankptr(space->machine(), "bank2", &RAM[0x1C800]);
+ memory_set_bankptr(machine(), "bank2", &RAM[0x1C800]);
break;
case 0x40:
- memory_set_bankptr(space->machine(), "bank2", &RAM[0x1D000]);
+ memory_set_bankptr(machine(), "bank2", &RAM[0x1D000]);
break;
}
- state->m_outx = (data & 0x18) >> 3;
- state->m_mpage = (data & 0x06) >> 1;
- state->m_alphamap = (data & 0x80);
+ m_outx = (data & 0x18) >> 3;
+ m_mpage = (data & 0x06) >> 1;
+ m_alphamap = (data & 0x80);
}
-WRITE8_HANDLER( irobot_rom_banksel_w )
+WRITE8_MEMBER(irobot_state::irobot_rom_banksel_w)
{
- UINT8 *RAM = space->machine().region("maincpu")->base();
+ UINT8 *RAM = machine().region("maincpu")->base();
switch ((data & 0x0E) >> 1)
{
case 0:
- memory_set_bankptr(space->machine(), "bank1", &RAM[0x10000]);
+ memory_set_bankptr(machine(), "bank1", &RAM[0x10000]);
break;
case 1:
- memory_set_bankptr(space->machine(), "bank1", &RAM[0x12000]);
+ memory_set_bankptr(machine(), "bank1", &RAM[0x12000]);
break;
case 2:
- memory_set_bankptr(space->machine(), "bank1", &RAM[0x14000]);
+ memory_set_bankptr(machine(), "bank1", &RAM[0x14000]);
break;
case 3:
- memory_set_bankptr(space->machine(), "bank1", &RAM[0x16000]);
+ memory_set_bankptr(machine(), "bank1", &RAM[0x16000]);
break;
case 4:
- memory_set_bankptr(space->machine(), "bank1", &RAM[0x18000]);
+ memory_set_bankptr(machine(), "bank1", &RAM[0x18000]);
break;
case 5:
- memory_set_bankptr(space->machine(), "bank1", &RAM[0x1A000]);
+ memory_set_bankptr(machine(), "bank1", &RAM[0x1A000]);
break;
}
- set_led_status(space->machine(), 0,data & 0x10);
- set_led_status(space->machine(), 1,data & 0x20);
+ set_led_status(machine(), 0,data & 0x10);
+ set_led_status(machine(), 1,data & 0x20);
}
static TIMER_CALLBACK( scanline_callback )
@@ -191,52 +187,49 @@ MACHINE_RESET( irobot )
/* set an initial timer to go off on scanline 0 */
machine.scheduler().timer_set(machine.primary_screen->time_until_pos(0), FUNC(scanline_callback));
- irobot_rom_banksel_w(machine.device("maincpu")->memory().space(AS_PROGRAM),0,0);
- irobot_out0_w(machine.device("maincpu")->memory().space(AS_PROGRAM),0,0);
+ state->irobot_rom_banksel_w(*machine.device("maincpu")->memory().space(AS_PROGRAM),0,0);
+ state->irobot_out0_w(*machine.device("maincpu")->memory().space(AS_PROGRAM),0,0);
state->m_combase = state->m_comRAM[0];
state->m_combase_mb = state->m_comRAM[1];
state->m_outx = 0;
}
-WRITE8_HANDLER( irobot_control_w )
+WRITE8_MEMBER(irobot_state::irobot_control_w)
{
- irobot_state *state = space->machine().driver_data<irobot_state>();
- state->m_control_num = offset & 0x03;
+ m_control_num = offset & 0x03;
}
-READ8_HANDLER( irobot_control_r )
+READ8_MEMBER(irobot_state::irobot_control_r)
{
- irobot_state *state = space->machine().driver_data<irobot_state>();
- if (state->m_control_num == 0)
- return input_port_read(space->machine(), "AN0");
- else if (state->m_control_num == 1)
- return input_port_read(space->machine(), "AN1");
+ if (m_control_num == 0)
+ return input_port_read(machine(), "AN0");
+ else if (m_control_num == 1)
+ return input_port_read(machine(), "AN1");
return 0;
}
/* we allow irmb_running and irvg_running to appear running before clearing
them to simulate the mathbox and vector generator running in real time */
-READ8_HANDLER( irobot_status_r )
+READ8_MEMBER(irobot_state::irobot_status_r)
{
- irobot_state *state = space->machine().driver_data<irobot_state>();
int d=0;
logerror("status read. ");
- IR_CPU_STATE(space->machine());
+ IR_CPU_STATE(machine());
- if (!state->m_irmb_running) d |= 0x20;
- if (state->m_irvg_running) d |= 0x40;
+ if (!m_irmb_running) d |= 0x20;
+ if (m_irvg_running) d |= 0x40;
- // d = (state->m_irmb_running * 0x20) | (state->m_irvg_running * 0x40);
- if (state->m_irvg_vblank) d = d | 0x80;
+ // d = (m_irmb_running * 0x20) | (m_irvg_running * 0x40);
+ if (m_irvg_vblank) d = d | 0x80;
#if IR_TIMING
/* flags are cleared by callbacks */
#else
- state->m_irmb_running=0;
- state->m_irvg_running=0;
+ m_irmb_running=0;
+ m_irvg_running=0;
#endif
return d;
}
diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c
index e637db649a2..4df66810436 100644
--- a/src/mame/machine/kaneko16.c
+++ b/src/mame/machine/kaneko16.c
@@ -35,19 +35,18 @@ Currently none of the MCUs' internal roms are dumped so simulation is used
- see notes about this "calculator" implementation in drivers\galpanic.c
- bonkadv only uses Random Number, XY Overlap Collision bit and register '0x02'
*/
-static READ16_HANDLER(shogwarr_calc_r);
-static WRITE16_HANDLER(shogwarr_calc_w);
-READ16_HANDLER(galpanib_calc_r) /* Simulation of the CALC1 MCU */
+
+
+READ16_MEMBER(kaneko16_state::galpanib_calc_r)/* Simulation of the CALC1 MCU */
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- calc1_hit_t &hit = state->m_hit;
+ calc1_hit_t &hit = m_hit;
UINT16 data = 0;
switch (offset)
{
case 0x00/2: // watchdog
- return state->watchdog_reset_r(*space,0);
+ return watchdog_reset_r(space,0);
case 0x02/2: // unknown (yet!), used by *MANY* games !!!
//popmessage("unknown collision reg");
@@ -83,19 +82,18 @@ READ16_HANDLER(galpanib_calc_r) /* Simulation of the CALC1 MCU */
return (((UINT32)hit.mult_a * (UINT32)hit.mult_b) & 0xffff);
case 0x14/2:
- return (space->machine().rand() & 0xffff);
+ return (machine().rand() & 0xffff);
default:
- logerror("CPU #0 PC %06x: warning - read unmapped calc address %06x\n",cpu_get_pc(&space->device()),offset<<1);
+ logerror("CPU #0 PC %06x: warning - read unmapped calc address %06x\n",cpu_get_pc(&space.device()),offset<<1);
}
return 0;
}
-WRITE16_HANDLER(galpanib_calc_w)
+WRITE16_MEMBER(kaneko16_state::galpanib_calc_w)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- calc1_hit_t &hit = state->m_hit;
+ calc1_hit_t &hit = m_hit;
switch (offset)
{
@@ -112,15 +110,14 @@ WRITE16_HANDLER(galpanib_calc_w)
case 0x12/2: hit.mult_b = data; break;
default:
- logerror("CPU #0 PC %06x: warning - write unmapped hit address %06x\n",cpu_get_pc(&space->device()),offset<<1);
+ logerror("CPU #0 PC %06x: warning - write unmapped hit address %06x\n",cpu_get_pc(&space.device()),offset<<1);
}
}
-WRITE16_HANDLER(bloodwar_calc_w)
+WRITE16_MEMBER(kaneko16_state::bloodwar_calc_w)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- calc1_hit_t &hit = state->m_hit;
- int isbrap = ( !strcmp(space->machine().system().name,"brapboysj") || !strcmp(space->machine().system().name,"brapboysu") || !strcmp(space->machine().system().name,"brapboys"));
+ calc1_hit_t &hit = m_hit;
+ int isbrap = ( !strcmp(machine().system().name,"brapboysj") || !strcmp(machine().system().name,"brapboysu") || !strcmp(machine().system().name,"brapboys"));
/* our implementation is incomplete, b.rap boys requires some modifications */
if (isbrap)
@@ -147,7 +144,7 @@ WRITE16_HANDLER(bloodwar_calc_w)
case 0x38/2: break;
default:
- logerror("CPU #0 PC %06x: warning - write unmapped hit address %06x\n",cpu_get_pc(&space->device()),offset<<1);
+ logerror("CPU #0 PC %06x: warning - write unmapped hit address %06x\n",cpu_get_pc(&space.device()),offset<<1);
}
}
@@ -189,15 +186,14 @@ static INT16 calc_compute_y(calc1_hit_t &hit)
return y_coll;
}
-READ16_HANDLER(bloodwar_calc_r)
+READ16_MEMBER(kaneko16_state::bloodwar_calc_r)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- calc1_hit_t &hit = state->m_hit;
+ calc1_hit_t &hit = m_hit;
UINT16 data = 0;
INT16 x_coll, y_coll;
/* our implementation is incomplete, b.rap boys requires some modifications */
- int isbrap = ( !strcmp(space->machine().system().name,"brapboysj") || !strcmp(space->machine().system().name,"brapboysu") || !strcmp(space->machine().system().name,"brapboys"));
+ int isbrap = ( !strcmp(machine().system().name,"brapboysj") || !strcmp(machine().system().name,"brapboysu") || !strcmp(machine().system().name,"brapboys"));
if (isbrap)
{
@@ -240,7 +236,7 @@ READ16_HANDLER(bloodwar_calc_r)
return data;
case 0x14/2:
- return (space->machine().rand() & 0xffff);
+ return (machine().rand() & 0xffff);
case 0x20/2: return hit.x1p;
case 0x22/2: return hit.x1s;
@@ -253,7 +249,7 @@ READ16_HANDLER(bloodwar_calc_r)
case 0x32/2: return hit.y2s;
default:
- logerror("CPU #0 PC %06x: warning - read unmapped calc address %06x\n",cpu_get_pc(&space->device()),offset<<1);
+ logerror("CPU #0 PC %06x: warning - read unmapped calc address %06x\n",cpu_get_pc(&space.device()),offset<<1);
}
return 0;
@@ -369,10 +365,9 @@ static void shogwarr_recalc_collisions(calc3_hit_t &hit3)
}
-static WRITE16_HANDLER(shogwarr_calc_w)
+WRITE16_MEMBER(kaneko16_state::shogwarr_calc_w)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- calc3_hit_t &hit3 = state->m_hit3;
+ calc3_hit_t &hit3 = m_hit3;
int idx=offset*4;
switch (idx)
{
@@ -429,17 +424,16 @@ static WRITE16_HANDLER(shogwarr_calc_w)
hit3.mode=data;break;
default:
- logerror("CPU #0 PC %06x: warning - write unmapped hit address %06x [ %06x] = %06x\n",cpu_get_pc(&space->device()),offset<<1, idx, data);
+ logerror("CPU #0 PC %06x: warning - write unmapped hit address %06x [ %06x] = %06x\n",cpu_get_pc(&space.device()),offset<<1, idx, data);
}
shogwarr_recalc_collisions(hit3);
}
-static READ16_HANDLER(shogwarr_calc_r)
+READ16_MEMBER(kaneko16_state::shogwarr_calc_r)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- calc3_hit_t &hit3 = state->m_hit3;
+ calc3_hit_t &hit3 = m_hit3;
int idx=offset*4;
switch (idx)
@@ -461,7 +455,7 @@ static READ16_HANDLER(shogwarr_calc_r)
return hit3.flags;
case 0x28:
- return (space->machine().rand() & 0xffff);
+ return (machine().rand() & 0xffff);
case 0x40: return hit3.x1po;
case 0x44: return hit3.x1so;
@@ -482,7 +476,7 @@ static READ16_HANDLER(shogwarr_calc_r)
case 0x88: return hit3.z1toz2;
default:
- logerror("CPU #0 PC %06x: warning - read unmapped calc address %06x [ %06x]\n",cpu_get_pc(&space->device()),offset<<1, idx);
+ logerror("CPU #0 PC %06x: warning - read unmapped calc address %06x [ %06x]\n",cpu_get_pc(&space.device()),offset<<1, idx);
}
return 0;
@@ -530,25 +524,23 @@ void calc3_mcu_init(running_machine &machine)
calc3.mcu_command_offset = 0;
}
-WRITE16_HANDLER( calc3_mcu_ram_w )
+WRITE16_MEMBER(kaneko16_state::calc3_mcu_ram_w)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- COMBINE_DATA(&state->m_mcu_ram[offset]);
- //calc3_mcu_run(space->machine);
+ COMBINE_DATA(&m_mcu_ram[offset]);
+ //calc3_mcu_run(machine);
}
-INLINE void calc3_mcu_com_w(address_space *space, offs_t offset, UINT16 data, UINT16 mem_mask, int _n_)
+void kaneko16_state::calc3_mcu_com_w(offs_t offset, UINT16 data, UINT16 mem_mask, int _n_)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- calc3_t &calc3 = state->m_calc3;
+ calc3_t &calc3 = m_calc3;
logerror("calc3w %d %04x %04x\n", _n_, data, mem_mask);
calc3.mcu_status |= (1 << _n_);
}
-WRITE16_HANDLER( calc3_mcu_com0_w) { calc3_mcu_com_w(space, offset, data, mem_mask, 0); }
-WRITE16_HANDLER( calc3_mcu_com1_w) { calc3_mcu_com_w(space, offset, data, mem_mask, 1); }
-WRITE16_HANDLER( calc3_mcu_com2_w) { calc3_mcu_com_w(space, offset, data, mem_mask, 2); }
-WRITE16_HANDLER( calc3_mcu_com3_w) { calc3_mcu_com_w(space, offset, data, mem_mask, 3); }
+WRITE16_MEMBER(kaneko16_state::calc3_mcu_com0_w){ calc3_mcu_com_w(offset, data, mem_mask, 0); }
+WRITE16_MEMBER(kaneko16_state::calc3_mcu_com1_w){ calc3_mcu_com_w(offset, data, mem_mask, 1); }
+WRITE16_MEMBER(kaneko16_state::calc3_mcu_com2_w){ calc3_mcu_com_w(offset, data, mem_mask, 2); }
+WRITE16_MEMBER(kaneko16_state::calc3_mcu_com3_w){ calc3_mcu_com_w(offset, data, mem_mask, 3); }
/***************************************************************************
@@ -2357,30 +2349,29 @@ void toybox_mcu_init(running_machine &machine)
memset(state->m_toybox_mcu_com, 0, 4 * sizeof( UINT16) );
}
-INLINE void toybox_mcu_com_w(address_space *space, offs_t offset, UINT16 data, UINT16 mem_mask, int _n_)
+void kaneko16_state::toybox_mcu_com_w(offs_t offset, UINT16 data, UINT16 mem_mask, int _n_)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- COMBINE_DATA(&state->m_toybox_mcu_com[_n_]);
- if (state->m_toybox_mcu_com[0] != 0xFFFF) return;
- if (state->m_toybox_mcu_com[1] != 0xFFFF) return;
- if (state->m_toybox_mcu_com[2] != 0xFFFF) return;
- if (state->m_toybox_mcu_com[3] != 0xFFFF) return;
-
- memset(state->m_toybox_mcu_com, 0, 4 * sizeof( UINT16 ) );
- (*state->m_toybox_mcu_run)(space->machine());
+ COMBINE_DATA(&m_toybox_mcu_com[_n_]);
+ if (m_toybox_mcu_com[0] != 0xFFFF) return;
+ if (m_toybox_mcu_com[1] != 0xFFFF) return;
+ if (m_toybox_mcu_com[2] != 0xFFFF) return;
+ if (m_toybox_mcu_com[3] != 0xFFFF) return;
+
+ memset(m_toybox_mcu_com, 0, 4 * sizeof( UINT16 ) );
+ (*m_toybox_mcu_run)(machine());
}
-WRITE16_HANDLER( toybox_mcu_com0_w ) { toybox_mcu_com_w(space, offset, data, mem_mask, 0); }
-WRITE16_HANDLER( toybox_mcu_com1_w ) { toybox_mcu_com_w(space, offset, data, mem_mask, 1); }
-WRITE16_HANDLER( toybox_mcu_com2_w ) { toybox_mcu_com_w(space, offset, data, mem_mask, 2); }
-WRITE16_HANDLER( toybox_mcu_com3_w ) { toybox_mcu_com_w(space, offset, data, mem_mask, 3); }
+WRITE16_MEMBER(kaneko16_state::toybox_mcu_com0_w){ toybox_mcu_com_w(offset, data, mem_mask, 0); }
+WRITE16_MEMBER(kaneko16_state::toybox_mcu_com1_w){ toybox_mcu_com_w(offset, data, mem_mask, 1); }
+WRITE16_MEMBER(kaneko16_state::toybox_mcu_com2_w){ toybox_mcu_com_w(offset, data, mem_mask, 2); }
+WRITE16_MEMBER(kaneko16_state::toybox_mcu_com3_w){ toybox_mcu_com_w(offset, data, mem_mask, 3); }
/*
bonkadv and bloodwar test bit 0
*/
-READ16_HANDLER( toybox_mcu_status_r )
+READ16_MEMBER(kaneko16_state::toybox_mcu_status_r)
{
- logerror("CPU %s (PC=%06X) : read MCU status\n", space->device().tag(), cpu_get_previouspc(&space->device()));
+ logerror("CPU %s (PC=%06X) : read MCU status\n", space.device().tag(), cpu_get_previouspc(&space.device()));
return 0; // most games test bit 0 for failure
}
diff --git a/src/mame/machine/konamigx.c b/src/mame/machine/konamigx.c
index a6cc54d9c2f..0a6907cab2e 100644
--- a/src/mame/machine/konamigx.c
+++ b/src/mame/machine/konamigx.c
@@ -17,14 +17,14 @@
// K055550/K053990 protection chips, perform simple memset() and other game logic operations
static UINT16 prot_data[0x20];
-static WRITE32_HANDLER(fantjour_dma_w);
-READ16_HANDLER( K055550_word_r )
+
+READ16_MEMBER(konamigx_state::K055550_word_r)
{
return(prot_data[offset]);
}
-WRITE16_HANDLER( K055550_word_w )
+WRITE16_MEMBER(konamigx_state::K055550_word_w)
{
UINT32 adr, bsize, count, i, lim;
int src, tgt, srcend, tgtend, skip, cx1, sx1, wx1, cy1, sy1, wy1, cz1, sz1, wz1, c2, s2, w2;
@@ -45,7 +45,7 @@ WRITE16_HANDLER( K055550_word_w )
lim = adr+bsize*count;
for(i=adr; i<lim; i+=2)
- space->write_word(i, prot_data[0x1a/2]);
+ space.write_word(i, prot_data[0x1a/2]);
break;
// WARNING: The following cases are speculation based with questionable accuracy!(AAT)
@@ -76,41 +76,41 @@ WRITE16_HANDLER( K055550_word_w )
// let's hope GCC will inline the mem24bew calls
for (src=adr; src<srcend; src+=bsize)
{
- cx1 = (short)space->read_word(src);
- sx1 = (short)space->read_word(src + 2);
- wx1 = (short)space->read_word(src + 4);
+ cx1 = (short)space.read_word(src);
+ sx1 = (short)space.read_word(src + 2);
+ wx1 = (short)space.read_word(src + 4);
- cy1 = (short)space->read_word(src + 6);
- sy1 = (short)space->read_word(src + 8);
- wy1 = (short)space->read_word(src +10);
+ cy1 = (short)space.read_word(src + 6);
+ sy1 = (short)space.read_word(src + 8);
+ wy1 = (short)space.read_word(src +10);
- cz1 = (short)space->read_word(src +12);
- sz1 = (short)space->read_word(src +14);
- wz1 = (short)space->read_word(src +16);
+ cz1 = (short)space.read_word(src +12);
+ sz1 = (short)space.read_word(src +14);
+ wz1 = (short)space.read_word(src +16);
count = i = src + skip;
tgt = src + bsize;
- for (; count<tgt; count++) space->write_byte(count, 0);
+ for (; count<tgt; count++) space.write_byte(count, 0);
for (; tgt<tgtend; i++, tgt+=bsize)
{
- c2 = (short)space->read_word(tgt);
- s2 = (short)space->read_word(tgt + 2);
- w2 = (short)space->read_word(tgt + 4);
+ c2 = (short)space.read_word(tgt);
+ s2 = (short)space.read_word(tgt + 2);
+ w2 = (short)space.read_word(tgt + 4);
if (abs((cx1+sx1)-(c2+s2))>=wx1+w2) continue; // X rejection
- c2 = (short)space->read_word(tgt + 6);
- s2 = (short)space->read_word(tgt + 8);
- w2 = (short)space->read_word(tgt +10);
+ c2 = (short)space.read_word(tgt + 6);
+ s2 = (short)space.read_word(tgt + 8);
+ w2 = (short)space.read_word(tgt +10);
if (abs((cy1+sy1)-(c2+s2))>=wy1+w2) continue; // Y rejection
- c2 = (short)space->read_word(tgt +12);
- s2 = (short)space->read_word(tgt +14);
- w2 = (short)space->read_word(tgt +16);
+ c2 = (short)space.read_word(tgt +12);
+ s2 = (short)space.read_word(tgt +14);
+ w2 = (short)space.read_word(tgt +16);
if (abs((cz1+sz1)-(c2+s2))>=wz1+w2) continue; // Z rejection
- space->write_byte(i, 0x80); // collision confirmed
+ space.write_byte(i, 0x80); // collision confirmed
}
}
break;
@@ -137,19 +137,19 @@ WRITE16_HANDLER( K055550_word_w )
else
if (dy < 0) i = 0x80;
else
- i = space->machine().rand() & 0xff; // vector direction indeterminate
+ i = machine().rand() & 0xff; // vector direction indeterminate
prot_data[0x10] = i;
break;
default:
-// logerror("%06x: unknown K055550 command %02x\n", cpu_get_pc(&space->device()), data);
+// logerror("%06x: unknown K055550 command %02x\n", cpu_get_pc(&space.device()), data);
break;
}
}
}
-WRITE16_HANDLER( K053990_martchmp_word_w )
+WRITE16_MEMBER(konamigx_state::K053990_martchmp_word_w)
{
int src_addr, src_count, src_skip;
int dst_addr, /*dst_count,*/ dst_skip;
@@ -184,13 +184,13 @@ WRITE16_HANDLER( K053990_martchmp_word_w )
if (element_size == 1)
for (i=src_count; i; i--)
{
- space->write_byte(dst_addr, space->read_byte(src_addr));
+ space.write_byte(dst_addr, space.read_byte(src_addr));
src_addr += src_skip;
dst_addr += dst_skip;
}
else for (i=src_count; i; i--)
{
- space->write_word(dst_addr, space->read_word(src_addr));
+ space.write_word(dst_addr, space.read_word(src_addr));
src_addr += src_skip;
dst_addr += dst_skip;
}
@@ -215,15 +215,15 @@ WRITE16_HANDLER( K053990_martchmp_word_w )
for (i=mod_count; i; i--)
{
- mod_val = space->read_word(mod_addr);
+ mod_val = space.read_word(mod_addr);
mod_addr += mod_skip;
- mod_data = space->read_word(src_addr);
+ mod_data = space.read_word(src_addr);
src_addr += src_skip;
mod_data += mod_val;
- space->write_word(dst_addr, mod_data);
+ space.write_word(dst_addr, mod_data);
dst_addr += dst_skip;
}
break;
@@ -441,12 +441,13 @@ static UINT32 fantjour_dma[8];
void fantjour_dma_install(running_machine &machine)
{
+ konamigx_state *state = machine.driver_data<konamigx_state>();
state_save_register_global_array(machine, fantjour_dma);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xdb0000, 0xdb001f, FUNC(fantjour_dma_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xdb0000, 0xdb001f, write32_delegate(FUNC(konamigx_state::fantjour_dma_w),state));
memset(fantjour_dma, 0, sizeof(fantjour_dma));
}
-static WRITE32_HANDLER(fantjour_dma_w)
+WRITE32_MEMBER(konamigx_state::fantjour_dma_w)
{
COMBINE_DATA(fantjour_dma + offset);
if(!offset && ACCESSING_BITS_24_31) {
@@ -468,14 +469,14 @@ static WRITE32_HANDLER(fantjour_dma_w)
if(mode == 0x93)
for(i1=0; i1 <= sz2; i1++)
for(i2=0; i2 < db; i2+=4) {
- space->write_dword(da, space->read_dword(sa) ^ x);
+ space.write_dword(da, space.read_dword(sa) ^ x);
da += 4;
sa += 4;
}
else if(mode == 0x8f)
for(i1=0; i1 <= sz2; i1++)
for(i2=0; i2 < db; i2+=4) {
- space->write_dword(da, x);
+ space.write_dword(da, x);
da += 4;
}
}
diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c
index e69b72ad1c5..7797031e308 100644
--- a/src/mame/machine/leland.c
+++ b/src/mame/machine/leland.c
@@ -81,18 +81,18 @@ static int dial_compute_value(running_machine &machine, int new_val, int indx)
*
*************************************/
-READ8_HANDLER( cerberus_dial_1_r )
+READ8_MEMBER(leland_state::cerberus_dial_1_r)
{
- int original = input_port_read(space->machine(), "IN0");
- int modified = dial_compute_value(space->machine(), input_port_read(space->machine(), "AN0"), 0);
+ int original = input_port_read(machine(), "IN0");
+ int modified = dial_compute_value(machine(), input_port_read(machine(), "AN0"), 0);
return (original & 0xc0) | ((modified & 0x80) >> 2) | (modified & 0x1f);
}
-READ8_HANDLER( cerberus_dial_2_r )
+READ8_MEMBER(leland_state::cerberus_dial_2_r)
{
- int original = input_port_read(space->machine(), "IN0");
- int modified = dial_compute_value(space->machine(), input_port_read(space->machine(), "AN1"), 1);
+ int original = input_port_read(machine(), "IN0");
+ int modified = dial_compute_value(machine(), input_port_read(machine(), "AN1"), 1);
return (original & 0xc0) | ((modified & 0x80) >> 2) | (modified & 0x1f);
}
@@ -105,24 +105,23 @@ READ8_HANDLER( cerberus_dial_2_r )
*************************************/
-WRITE8_HANDLER( alleymas_joystick_kludge )
+WRITE8_MEMBER(leland_state::alleymas_joystick_kludge)
{
- leland_state *state = space->machine().driver_data<leland_state>();
/* catch the case where they clear this memory location at PC $1827 and change */
/* the value written to be a 1 */
- if (cpu_get_previouspc(&space->device()) == 0x1827)
- *state->m_alleymas_kludge_mem = 1;
+ if (cpu_get_previouspc(&space.device()) == 0x1827)
+ *m_alleymas_kludge_mem = 1;
else
- *state->m_alleymas_kludge_mem = data;
+ *m_alleymas_kludge_mem = data;
/* while we're here, make sure the first 3 characters in battery RAM are a */
/* valid name; otherwise, it will crash if you start a game and don't enter */
/* your name */
- if (state->m_battery_ram[0] == 0)
+ if (m_battery_ram[0] == 0)
{
- state->m_battery_ram[0] = 'C';
- state->m_battery_ram[1] = 'I';
- state->m_battery_ram[2] = 'N';
+ m_battery_ram[0] = 'C';
+ m_battery_ram[1] = 'I';
+ m_battery_ram[2] = 'N';
}
}
@@ -159,27 +158,24 @@ static void update_dangerz_xy(running_machine &machine)
}
-READ8_HANDLER( dangerz_input_y_r )
+READ8_MEMBER(leland_state::dangerz_input_y_r)
{
- leland_state *state = space->machine().driver_data<leland_state>();
- update_dangerz_xy(space->machine());
- return state->m_dangerz_y & 0xff;
+ update_dangerz_xy(machine());
+ return m_dangerz_y & 0xff;
}
-READ8_HANDLER( dangerz_input_x_r )
+READ8_MEMBER(leland_state::dangerz_input_x_r)
{
- leland_state *state = space->machine().driver_data<leland_state>();
- update_dangerz_xy(space->machine());
- return state->m_dangerz_x & 0xff;
+ update_dangerz_xy(machine());
+ return m_dangerz_x & 0xff;
}
-READ8_HANDLER( dangerz_input_upper_r )
+READ8_MEMBER(leland_state::dangerz_input_upper_r)
{
- leland_state *state = space->machine().driver_data<leland_state>();
- update_dangerz_xy(space->machine());
- return ((state->m_dangerz_y >> 2) & 0xc0) | ((state->m_dangerz_x >> 8) & 0x03);
+ update_dangerz_xy(machine());
+ return ((m_dangerz_y >> 2) & 0xc0) | ((m_dangerz_x >> 8) & 0x03);
}
@@ -192,29 +188,29 @@ READ8_HANDLER( dangerz_input_upper_r )
static const UINT8 redline_pedal_value[8] = { 0xf0, 0xe0, 0xc0, 0xd0, 0x90, 0xb0, 0x30, 0x70 };
-READ8_HANDLER( redline_pedal_1_r )
+READ8_MEMBER(leland_state::redline_pedal_1_r)
{
- int pedal = input_port_read(space->machine(), "IN0");
+ int pedal = input_port_read(machine(), "IN0");
return redline_pedal_value[pedal >> 5] | 0x0f;
}
-READ8_HANDLER( redline_pedal_2_r )
+READ8_MEMBER(leland_state::redline_pedal_2_r)
{
- int pedal = input_port_read(space->machine(), "IN2");
+ int pedal = input_port_read(machine(), "IN2");
return redline_pedal_value[pedal >> 5] | 0x0f;
}
-READ8_HANDLER( redline_wheel_1_r )
+READ8_MEMBER(leland_state::redline_wheel_1_r)
{
- return dial_compute_value(space->machine(), input_port_read(space->machine(), "AN0"), 0);
+ return dial_compute_value(machine(), input_port_read(machine(), "AN0"), 0);
}
-READ8_HANDLER( redline_wheel_2_r )
+READ8_MEMBER(leland_state::redline_wheel_2_r)
{
- return dial_compute_value(space->machine(), input_port_read(space->machine(), "AN1"), 1);
+ return dial_compute_value(machine(), input_port_read(machine(), "AN1"), 1);
}
@@ -225,21 +221,21 @@ READ8_HANDLER( redline_wheel_2_r )
*
*************************************/
-READ8_HANDLER( offroad_wheel_1_r )
+READ8_MEMBER(leland_state::offroad_wheel_1_r)
{
- return dial_compute_value(space->machine(), input_port_read(space->machine(), "AN3"), 0);
+ return dial_compute_value(machine(), input_port_read(machine(), "AN3"), 0);
}
-READ8_HANDLER( offroad_wheel_2_r )
+READ8_MEMBER(leland_state::offroad_wheel_2_r)
{
- return dial_compute_value(space->machine(), input_port_read(space->machine(), "AN4"), 1);
+ return dial_compute_value(machine(), input_port_read(machine(), "AN4"), 1);
}
-READ8_HANDLER( offroad_wheel_3_r )
+READ8_MEMBER(leland_state::offroad_wheel_3_r)
{
- return dial_compute_value(space->machine(), input_port_read(space->machine(), "AN5"), 2);
+ return dial_compute_value(machine(), input_port_read(machine(), "AN5"), 2);
}
@@ -250,11 +246,11 @@ READ8_HANDLER( offroad_wheel_3_r )
*
*************************************/
-READ8_HANDLER( ataxx_trackball_r )
+READ8_MEMBER(leland_state::ataxx_trackball_r)
{
static const char *const tracknames[] = { "AN0", "AN1", "AN2", "AN3" };
- return dial_compute_value(space->machine(), input_port_read(space->machine(), tracknames[offset]), offset);
+ return dial_compute_value(machine(), input_port_read(machine(), tracknames[offset]), offset);
}
@@ -265,24 +261,23 @@ READ8_HANDLER( ataxx_trackball_r )
*
*************************************/
-READ8_HANDLER( indyheat_wheel_r )
+READ8_MEMBER(leland_state::indyheat_wheel_r)
{
static const char *const tracknames[] = { "AN0", "AN1", "AN2" };
- return dial_compute_value(space->machine(), input_port_read(space->machine(), tracknames[offset]), offset);
+ return dial_compute_value(machine(), input_port_read(machine(), tracknames[offset]), offset);
}
-READ8_HANDLER( indyheat_analog_r )
+READ8_MEMBER(leland_state::indyheat_analog_r)
{
- leland_state *state = space->machine().driver_data<leland_state>();
switch (offset)
{
case 0:
return 0;
case 1:
- return state->m_analog_result;
+ return m_analog_result;
case 2:
return 0;
@@ -295,15 +290,14 @@ READ8_HANDLER( indyheat_analog_r )
}
-WRITE8_HANDLER( indyheat_analog_w )
+WRITE8_MEMBER(leland_state::indyheat_analog_w)
{
- leland_state *state = space->machine().driver_data<leland_state>();
static const char *const tracknames[] = { "AN3", "AN4", "AN5" };
switch (offset)
{
case 3:
- state->m_analog_result = input_port_read(space->machine(), tracknames[data]);
+ m_analog_result = input_port_read(machine(), tracknames[data]);
break;
case 0:
@@ -470,18 +464,17 @@ INTERRUPT_GEN( leland_master_interrupt )
*
*************************************/
-WRITE8_HANDLER( leland_master_alt_bankswitch_w )
+WRITE8_MEMBER(leland_state::leland_master_alt_bankswitch_w)
{
- leland_state *state = space->machine().driver_data<leland_state>();
/* update any bankswitching */
if (LOG_BANKSWITCHING_M)
- if ((state->m_alternate_bank ^ data) & 0x0f)
- logerror("%04X:alternate_bank = %02X\n", cpu_get_pc(&space->device()), data & 0x0f);
- state->m_alternate_bank = data & 15;
- (*state->m_update_master_bank)(space->machine());
+ if ((m_alternate_bank ^ data) & 0x0f)
+ logerror("%04X:alternate_bank = %02X\n", cpu_get_pc(&space.device()), data & 0x0f);
+ m_alternate_bank = data & 15;
+ (*m_update_master_bank)(machine());
/* sound control is in the rest */
- leland_80186_control_w(space->machine().device("custom"), offset, data);
+ leland_80186_control_w(machine().device("custom"), offset, data);
}
@@ -855,31 +848,29 @@ WRITE8_DEVICE_HANDLER( ataxx_eeprom_w )
*
*************************************/
-WRITE8_HANDLER( leland_battery_ram_w )
+WRITE8_MEMBER(leland_state::leland_battery_ram_w)
{
- leland_state *state = space->machine().driver_data<leland_state>();
- if (state->m_battery_ram_enable)
+ if (m_battery_ram_enable)
{
- if (LOG_BATTERY_RAM) logerror("%04X:BatteryW@%04X=%02X\n", cpu_get_pc(&space->device()), offset, data);
- state->m_battery_ram[offset] = data;
+ if (LOG_BATTERY_RAM) logerror("%04X:BatteryW@%04X=%02X\n", cpu_get_pc(&space.device()), offset, data);
+ m_battery_ram[offset] = data;
}
else
- logerror("%04X:BatteryW@%04X (invalid!)\n", cpu_get_pc(&space->device()), offset);
+ logerror("%04X:BatteryW@%04X (invalid!)\n", cpu_get_pc(&space.device()), offset);
}
-WRITE8_HANDLER( ataxx_battery_ram_w )
+WRITE8_MEMBER(leland_state::ataxx_battery_ram_w)
{
- leland_state *state = space->machine().driver_data<leland_state>();
- if (state->m_battery_ram_enable)
+ if (m_battery_ram_enable)
{
- if (LOG_BATTERY_RAM) logerror("%04X:BatteryW@%04X=%02X\n", cpu_get_pc(&space->device()), offset, data);
- state->m_battery_ram[offset] = data;
+ if (LOG_BATTERY_RAM) logerror("%04X:BatteryW@%04X=%02X\n", cpu_get_pc(&space.device()), offset, data);
+ m_battery_ram[offset] = data;
}
- else if ((state->m_master_bank & 0x30) == 0x20)
- state->m_ataxx_qram[((state->m_master_bank & 0xc0) << 8) + offset] = data;
+ else if ((m_master_bank & 0x30) == 0x20)
+ m_ataxx_qram[((m_master_bank & 0xc0) << 8) + offset] = data;
else
- logerror("%04X:BatteryW@%04X (invalid!)\n", cpu_get_pc(&space->device()), offset);
+ logerror("%04X:BatteryW@%04X (invalid!)\n", cpu_get_pc(&space.device()), offset);
}
@@ -1032,15 +1023,14 @@ static void keycard_w(running_machine &machine, int data)
*
*************************************/
-READ8_HANDLER( leland_master_analog_key_r )
+READ8_MEMBER(leland_state::leland_master_analog_key_r)
{
- leland_state *state = space->machine().driver_data<leland_state>();
int result = 0;
switch (offset)
{
case 0x00: /* FD = analog data read */
- result = state->m_analog_result;
+ result = m_analog_result;
break;
case 0x01: /* FE = analog status read */
@@ -1049,7 +1039,7 @@ READ8_HANDLER( leland_master_analog_key_r )
break;
case 0x02: /* FF = keycard serial data read */
- result = keycard_r(space->machine());
+ result = keycard_r(machine());
/* bit 7 indicates the analog input is busy for some games */
result &= ~0x80;
@@ -1060,9 +1050,8 @@ READ8_HANDLER( leland_master_analog_key_r )
-WRITE8_HANDLER( leland_master_analog_key_w )
+WRITE8_MEMBER(leland_state::leland_master_analog_key_w)
{
- leland_state *state = space->machine().driver_data<leland_state>();
static const char *const portnames[] = { "AN0", "AN1", "AN2", "AN3", "AN4", "AN5" };
switch (offset)
@@ -1071,18 +1060,18 @@ WRITE8_HANDLER( leland_master_analog_key_w )
break;
case 0x01: /* FE = analog port select/bankswitch */
- state->m_analog_result = input_port_read(space->machine(), portnames[data & 15]);
+ m_analog_result = input_port_read(machine(), portnames[data & 15]);
/* update top board banking for some games */
if (LOG_BANKSWITCHING_M)
- if ((state->m_top_board_bank ^ data) & 0xc0)
- logerror("%04X:top_board_bank = %02X\n", cpu_get_pc(&space->device()), data & 0xc0);
- state->m_top_board_bank = data & 0xc0;
- (*state->m_update_master_bank)(space->machine());
+ if ((m_top_board_bank ^ data) & 0xc0)
+ logerror("%04X:top_board_bank = %02X\n", cpu_get_pc(&space.device()), data & 0xc0);
+ m_top_board_bank = data & 0xc0;
+ (*m_update_master_bank)(machine());
break;
case 0x02: /* FF = keycard data write */
- keycard_w(space->machine(), data);
+ keycard_w(machine(), data);
break;
}
}
@@ -1095,39 +1084,39 @@ WRITE8_HANDLER( leland_master_analog_key_w )
*
*************************************/
-READ8_HANDLER( leland_master_input_r )
+READ8_MEMBER(leland_state::leland_master_input_r)
{
int result = 0xff;
switch (offset)
{
case 0x00: /* /GIN0 */
- result = input_port_read(space->machine(), "IN0");
+ result = input_port_read(machine(), "IN0");
break;
case 0x01: /* /GIN1 */
- result = input_port_read(space->machine(), "IN1");
- if (cpu_get_reg(space->machine().device("slave"), Z80_HALT))
+ result = input_port_read(machine(), "IN1");
+ if (cpu_get_reg(machine().device("slave"), Z80_HALT))
result ^= 0x01;
break;
case 0x02: /* /GIN2 */
case 0x12:
- cputag_set_input_line(space->machine(), "master", INPUT_LINE_NMI, CLEAR_LINE);
+ cputag_set_input_line(machine(), "master", INPUT_LINE_NMI, CLEAR_LINE);
break;
case 0x03: /* /IGID */
case 0x13:
- result = ay8910_r(space->machine().device("ay8910.1"), offset);
+ result = ay8910_r(machine().device("ay8910.1"), offset);
break;
case 0x10: /* /GIN0 */
- result = input_port_read(space->machine(), "IN2");
+ result = input_port_read(machine(), "IN2");
break;
case 0x11: /* /GIN1 */
- result = input_port_read(space->machine(), "IN3");
- if (LOG_EEPROM) logerror("%04X:EE read\n", cpu_get_pc(&space->device()));
+ result = input_port_read(machine(), "IN3");
+ if (LOG_EEPROM) logerror("%04X:EE read\n", cpu_get_pc(&space.device()));
break;
default:
@@ -1138,21 +1127,20 @@ READ8_HANDLER( leland_master_input_r )
}
-WRITE8_HANDLER( leland_master_output_w )
+WRITE8_MEMBER(leland_state::leland_master_output_w)
{
- leland_state *state = space->machine().driver_data<leland_state>();
eeprom_device *eeprom;
switch (offset)
{
case 0x09: /* /MCONT */
- cputag_set_input_line(space->machine(), "slave", INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
- state->m_wcol_enable = (data & 0x02);
- cputag_set_input_line(space->machine(), "slave", INPUT_LINE_NMI, (data & 0x04) ? CLEAR_LINE : ASSERT_LINE);
- cputag_set_input_line(space->machine(), "slave", 0, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE);
+ cputag_set_input_line(machine(), "slave", INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
+ m_wcol_enable = (data & 0x02);
+ cputag_set_input_line(machine(), "slave", INPUT_LINE_NMI, (data & 0x04) ? CLEAR_LINE : ASSERT_LINE);
+ cputag_set_input_line(machine(), "slave", 0, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE);
- eeprom = space->machine().device<eeprom_device>("eeprom");
- if (LOG_EEPROM) logerror("%04X:EE write %d%d%d\n", cpu_get_pc(&space->device()),
+ eeprom = machine().device<eeprom_device>("eeprom");
+ if (LOG_EEPROM) logerror("%04X:EE write %d%d%d\n", cpu_get_pc(&space.device()),
(data >> 6) & 1, (data >> 5) & 1, (data >> 4) & 1);
eeprom->write_bit ((data & 0x10) >> 4);
eeprom->set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
@@ -1161,7 +1149,7 @@ WRITE8_HANDLER( leland_master_output_w )
case 0x0a: /* /OGIA */
case 0x0b: /* /OGID */
- ay8910_address_data_w(space->machine().device("ay8910.1"), offset, data);
+ ay8910_address_data_w(machine().device("ay8910.1"), offset, data);
break;
case 0x0c: /* /BKXL */
@@ -1178,19 +1166,19 @@ WRITE8_HANDLER( leland_master_output_w )
}
-READ8_HANDLER( ataxx_master_input_r )
+READ8_MEMBER(leland_state::ataxx_master_input_r)
{
int result = 0xff;
switch (offset)
{
case 0x06: /* /GIN0 */
- result = input_port_read(space->machine(), "IN0");
+ result = input_port_read(machine(), "IN0");
break;
case 0x07: /* /SLVBLK */
- result = input_port_read(space->machine(), "IN1");
- if (cpu_get_reg(space->machine().device("slave"), Z80_HALT))
+ result = input_port_read(machine(), "IN1");
+ if (cpu_get_reg(machine().device("slave"), Z80_HALT))
result ^= 0x01;
break;
@@ -1202,9 +1190,8 @@ READ8_HANDLER( ataxx_master_input_r )
}
-WRITE8_HANDLER( ataxx_master_output_w )
+WRITE8_MEMBER(leland_state::ataxx_master_output_w)
{
- leland_state *state = space->machine().driver_data<leland_state>();
switch (offset)
{
case 0x00: /* /BKXL */
@@ -1216,20 +1203,20 @@ WRITE8_HANDLER( ataxx_master_output_w )
case 0x04: /* /MBNK */
if (LOG_BANKSWITCHING_M)
- if ((state->m_master_bank ^ data) & 0xff)
- logerror("%04X:master_bank = %02X\n", cpu_get_pc(&space->device()), data & 0xff);
- state->m_master_bank = data;
- ataxx_bankswitch(space->machine());
+ if ((m_master_bank ^ data) & 0xff)
+ logerror("%04X:master_bank = %02X\n", cpu_get_pc(&space.device()), data & 0xff);
+ m_master_bank = data;
+ ataxx_bankswitch(machine());
break;
case 0x05: /* /SLV0 */
- cputag_set_input_line(space->machine(), "slave", 0, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
- cputag_set_input_line(space->machine(), "slave", INPUT_LINE_NMI, (data & 0x04) ? CLEAR_LINE : ASSERT_LINE);
- cputag_set_input_line(space->machine(), "slave", INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
+ cputag_set_input_line(machine(), "slave", 0, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
+ cputag_set_input_line(machine(), "slave", INPUT_LINE_NMI, (data & 0x04) ? CLEAR_LINE : ASSERT_LINE);
+ cputag_set_input_line(machine(), "slave", INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
break;
case 0x08: /* */
- state->m_master_int_timer->adjust(space->machine().primary_screen->time_until_pos(data + 1), data + 1);
+ m_master_int_timer->adjust(machine().primary_screen->time_until_pos(data + 1), data + 1);
break;
default:
@@ -1246,74 +1233,70 @@ WRITE8_HANDLER( ataxx_master_output_w )
*
*************************************/
-WRITE8_HANDLER( leland_gated_paletteram_w )
+WRITE8_MEMBER(leland_state::leland_gated_paletteram_w)
{
- leland_state *state = space->machine().driver_data<leland_state>();
- if (state->m_wcol_enable)
- state->paletteram_BBGGGRRR_w(*space, offset, data);
+ if (m_wcol_enable)
+ paletteram_BBGGGRRR_w(space, offset, data);
}
-READ8_HANDLER( leland_gated_paletteram_r )
+READ8_MEMBER(leland_state::leland_gated_paletteram_r)
{
- leland_state *state = space->machine().driver_data<leland_state>();
- if (state->m_wcol_enable)
- return state->m_generic_paletteram_8[offset];
+ if (m_wcol_enable)
+ return m_generic_paletteram_8[offset];
return 0xff;
}
-WRITE8_HANDLER( ataxx_paletteram_and_misc_w )
+WRITE8_MEMBER(leland_state::ataxx_paletteram_and_misc_w)
{
- leland_state *state = space->machine().driver_data<leland_state>();
- if (state->m_wcol_enable)
- state->paletteram_xxxxRRRRGGGGBBBB_le_w(*space, offset, data);
+ if (m_wcol_enable)
+ paletteram_xxxxRRRRGGGGBBBB_le_w(space, offset, data);
else if (offset == 0x7f8 || offset == 0x7f9)
leland_master_video_addr_w(space, offset - 0x7f8, data);
else if (offset == 0x7fc)
{
- state->m_xrom1_addr = (state->m_xrom1_addr & 0xff00) | (data & 0x00ff);
- if (LOG_XROM) logerror("%04X:XROM1 address low write = %02X (addr=%04X)\n", cpu_get_pc(&space->device()), data, state->m_xrom1_addr);
+ m_xrom1_addr = (m_xrom1_addr & 0xff00) | (data & 0x00ff);
+ if (LOG_XROM) logerror("%04X:XROM1 address low write = %02X (addr=%04X)\n", cpu_get_pc(&space.device()), data, m_xrom1_addr);
}
else if (offset == 0x7fd)
{
- state->m_xrom1_addr = (state->m_xrom1_addr & 0x00ff) | ((data << 8) & 0xff00);
- if (LOG_XROM) logerror("%04X:XROM1 address high write = %02X (addr=%04X)\n", cpu_get_pc(&space->device()), data, state->m_xrom1_addr);
+ m_xrom1_addr = (m_xrom1_addr & 0x00ff) | ((data << 8) & 0xff00);
+ if (LOG_XROM) logerror("%04X:XROM1 address high write = %02X (addr=%04X)\n", cpu_get_pc(&space.device()), data, m_xrom1_addr);
}
else if (offset == 0x7fe)
{
- state->m_xrom2_addr = (state->m_xrom2_addr & 0xff00) | (data & 0x00ff);
- if (LOG_XROM) logerror("%04X:XROM2 address low write = %02X (addr=%04X)\n", cpu_get_pc(&space->device()), data, state->m_xrom2_addr);
+ m_xrom2_addr = (m_xrom2_addr & 0xff00) | (data & 0x00ff);
+ if (LOG_XROM) logerror("%04X:XROM2 address low write = %02X (addr=%04X)\n", cpu_get_pc(&space.device()), data, m_xrom2_addr);
}
else if (offset == 0x7ff)
{
- state->m_xrom2_addr = (state->m_xrom2_addr & 0x00ff) | ((data << 8) & 0xff00);
- if (LOG_XROM) logerror("%04X:XROM2 address high write = %02X (addr=%04X)\n", cpu_get_pc(&space->device()), data, state->m_xrom2_addr);
+ m_xrom2_addr = (m_xrom2_addr & 0x00ff) | ((data << 8) & 0xff00);
+ if (LOG_XROM) logerror("%04X:XROM2 address high write = %02X (addr=%04X)\n", cpu_get_pc(&space.device()), data, m_xrom2_addr);
}
else
- state->m_extra_tram[offset] = data;
+ m_extra_tram[offset] = data;
}
-READ8_HANDLER( ataxx_paletteram_and_misc_r )
+READ8_MEMBER(leland_state::ataxx_paletteram_and_misc_r)
{
- leland_state *state = space->machine().driver_data<leland_state>();
- if (state->m_wcol_enable)
- return state->m_generic_paletteram_8[offset];
+ if (m_wcol_enable)
+ return m_generic_paletteram_8[offset];
else if (offset == 0x7fc || offset == 0x7fd)
{
- int result = state->m_xrom_base[0x00000 | state->m_xrom1_addr | ((offset & 1) << 16)];
- if (LOG_XROM) logerror("%04X:XROM1 read(%d) = %02X (addr=%04X)\n", cpu_get_pc(&space->device()), offset - 0x7fc, result, state->m_xrom1_addr);
+ int result = m_xrom_base[0x00000 | m_xrom1_addr | ((offset & 1) << 16)];
+ if (LOG_XROM) logerror("%04X:XROM1 read(%d) = %02X (addr=%04X)\n", cpu_get_pc(&space.device()), offset - 0x7fc, result, m_xrom1_addr);
return result;
}
else if (offset == 0x7fe || offset == 0x7ff)
{
- int result = state->m_xrom_base[0x20000 | state->m_xrom2_addr | ((offset & 1) << 16)];
- if (LOG_XROM) logerror("%04X:XROM2 read(%d) = %02X (addr=%04X)\n", cpu_get_pc(&space->device()), offset - 0x7fc, result, state->m_xrom2_addr);
+ int result = m_xrom_base[0x20000 | m_xrom2_addr | ((offset & 1) << 16)];
+ if (LOG_XROM) logerror("%04X:XROM2 read(%d) = %02X (addr=%04X)\n", cpu_get_pc(&space.device()), offset - 0x7fc, result, m_xrom2_addr);
return result;
}
else
- return state->m_extra_tram[offset];
+ return m_extra_tram[offset];
}
@@ -1357,41 +1340,38 @@ WRITE8_DEVICE_HANDLER( leland_sound_port_w )
*
*************************************/
-WRITE8_HANDLER( leland_slave_small_banksw_w )
+WRITE8_MEMBER(leland_state::leland_slave_small_banksw_w)
{
- leland_state *state = space->machine().driver_data<leland_state>();
int bankaddress = 0x10000 + 0xc000 * (data & 1);
- if (bankaddress >= state->m_slave_length)
+ if (bankaddress >= m_slave_length)
{
- logerror("%04X:Slave bank %02X out of range!", cpu_get_pc(&space->device()), data & 1);
+ logerror("%04X:Slave bank %02X out of range!", cpu_get_pc(&space.device()), data & 1);
bankaddress = 0x10000;
}
- memory_set_bankptr(space->machine(), "bank3", &state->m_slave_base[bankaddress]);
+ memory_set_bankptr(machine(), "bank3", &m_slave_base[bankaddress]);
- if (LOG_BANKSWITCHING_S) logerror("%04X:Slave bank = %02X (%05X)\n", cpu_get_pc(&space->device()), data & 1, bankaddress);
+ if (LOG_BANKSWITCHING_S) logerror("%04X:Slave bank = %02X (%05X)\n", cpu_get_pc(&space.device()), data & 1, bankaddress);
}
-WRITE8_HANDLER( leland_slave_large_banksw_w )
+WRITE8_MEMBER(leland_state::leland_slave_large_banksw_w)
{
- leland_state *state = space->machine().driver_data<leland_state>();
int bankaddress = 0x10000 + 0x8000 * (data & 15);
- if (bankaddress >= state->m_slave_length)
+ if (bankaddress >= m_slave_length)
{
- logerror("%04X:Slave bank %02X out of range!", cpu_get_pc(&space->device()), data & 15);
+ logerror("%04X:Slave bank %02X out of range!", cpu_get_pc(&space.device()), data & 15);
bankaddress = 0x10000;
}
- memory_set_bankptr(space->machine(), "bank3", &state->m_slave_base[bankaddress]);
+ memory_set_bankptr(machine(), "bank3", &m_slave_base[bankaddress]);
- if (LOG_BANKSWITCHING_S) logerror("%04X:Slave bank = %02X (%05X)\n", cpu_get_pc(&space->device()), data & 15, bankaddress);
+ if (LOG_BANKSWITCHING_S) logerror("%04X:Slave bank = %02X (%05X)\n", cpu_get_pc(&space.device()), data & 15, bankaddress);
}
-WRITE8_HANDLER( ataxx_slave_banksw_w )
+WRITE8_MEMBER(leland_state::ataxx_slave_banksw_w)
{
- leland_state *state = space->machine().driver_data<leland_state>();
int bankaddress, bank = data & 15;
if (bank == 0)
@@ -1399,18 +1379,18 @@ WRITE8_HANDLER( ataxx_slave_banksw_w )
else
{
bankaddress = 0x10000 * bank + 0x8000 * ((data >> 4) & 1);
- if (state->m_slave_length > 0x100000)
+ if (m_slave_length > 0x100000)
bankaddress += 0x100000 * ((data >> 5) & 1);
}
- if (bankaddress >= state->m_slave_length)
+ if (bankaddress >= m_slave_length)
{
- logerror("%04X:Slave bank %02X out of range!", cpu_get_pc(&space->device()), data & 0x3f);
+ logerror("%04X:Slave bank %02X out of range!", cpu_get_pc(&space.device()), data & 0x3f);
bankaddress = 0x2000;
}
- memory_set_bankptr(space->machine(), "bank3", &state->m_slave_base[bankaddress]);
+ memory_set_bankptr(machine(), "bank3", &m_slave_base[bankaddress]);
- if (LOG_BANKSWITCHING_S) logerror("%04X:Slave bank = %02X (%05X)\n", cpu_get_pc(&space->device()), data, bankaddress);
+ if (LOG_BANKSWITCHING_S) logerror("%04X:Slave bank = %02X (%05X)\n", cpu_get_pc(&space.device()), data, bankaddress);
}
@@ -1421,9 +1401,9 @@ WRITE8_HANDLER( ataxx_slave_banksw_w )
*
*************************************/
-READ8_HANDLER( leland_raster_r )
+READ8_MEMBER(leland_state::leland_raster_r)
{
- return space->machine().primary_screen->vpos();
+ return machine().primary_screen->vpos();
}
diff --git a/src/mame/machine/lkage.c b/src/mame/machine/lkage.c
index 0278eedac6b..cab18cbb51b 100644
--- a/src/mame/machine/lkage.c
+++ b/src/mame/machine/lkage.c
@@ -20,26 +20,23 @@
***************************************************************************/
-READ8_HANDLER( lkage_68705_port_a_r )
+READ8_MEMBER(lkage_state::lkage_68705_port_a_r)
{
- lkage_state *state = space->machine().driver_data<lkage_state>();
- //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(&space->device()), state->m_port_a_in);
- return (state->m_port_a_out & state->m_ddr_a) | (state->m_port_a_in & ~state->m_ddr_a);
+ //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(&space.device()), m_port_a_in);
+ return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a);
}
-WRITE8_HANDLER( lkage_68705_port_a_w )
+WRITE8_MEMBER(lkage_state::lkage_68705_port_a_w)
{
- lkage_state *state = space->machine().driver_data<lkage_state>();
- //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(&space->device()), data);
- state->m_port_a_out = data;
+ //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(&space.device()), data);
+ m_port_a_out = data;
}
-WRITE8_HANDLER( lkage_68705_ddr_a_w )
+WRITE8_MEMBER(lkage_state::lkage_68705_ddr_a_w)
{
- lkage_state *state = space->machine().driver_data<lkage_state>();
- state->m_ddr_a = data;
+ m_ddr_a = data;
}
@@ -53,105 +50,96 @@ WRITE8_HANDLER( lkage_68705_ddr_a_w )
* 2 W when 0->1, copies port A to the latch for the main CPU
*/
-READ8_HANDLER( lkage_68705_port_b_r )
+READ8_MEMBER(lkage_state::lkage_68705_port_b_r)
{
- lkage_state *state = space->machine().driver_data<lkage_state>();
- return (state->m_port_b_out & state->m_ddr_b) | (state->m_port_b_in & ~state->m_ddr_b);
+ return (m_port_b_out & m_ddr_b) | (m_port_b_in & ~m_ddr_b);
}
-WRITE8_HANDLER( lkage_68705_port_b_w )
+WRITE8_MEMBER(lkage_state::lkage_68705_port_b_w)
{
- lkage_state *state = space->machine().driver_data<lkage_state>();
- //logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(&space->device()), data);
+ //logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(&space.device()), data);
- if ((state->m_ddr_b & 0x02) && (~data & 0x02) && (state->m_port_b_out & 0x02))
+ if ((m_ddr_b & 0x02) && (~data & 0x02) && (m_port_b_out & 0x02))
{
- state->m_port_a_in = state->m_from_main;
- if (state->m_main_sent)
- device_set_input_line(state->m_mcu, 0, CLEAR_LINE);
+ m_port_a_in = m_from_main;
+ if (m_main_sent)
+ device_set_input_line(m_mcu, 0, CLEAR_LINE);
- state->m_main_sent = 0;
- logerror("read command %02x from main cpu\n", state->m_port_a_in);
+ m_main_sent = 0;
+ logerror("read command %02x from main cpu\n", m_port_a_in);
}
- if ((state->m_ddr_b & 0x04) && (data & 0x04) && (~state->m_port_b_out & 0x04))
+ if ((m_ddr_b & 0x04) && (data & 0x04) && (~m_port_b_out & 0x04))
{
- logerror("send command %02x to main cpu\n", state->m_port_a_out);
- state->m_from_mcu = state->m_port_a_out;
- state->m_mcu_sent = 1;
+ logerror("send command %02x to main cpu\n", m_port_a_out);
+ m_from_mcu = m_port_a_out;
+ m_mcu_sent = 1;
}
- state->m_port_b_out = data;
+ m_port_b_out = data;
}
-WRITE8_HANDLER( lkage_68705_ddr_b_w )
+WRITE8_MEMBER(lkage_state::lkage_68705_ddr_b_w)
{
- lkage_state *state = space->machine().driver_data<lkage_state>();
- state->m_ddr_b = data;
+ m_ddr_b = data;
}
-READ8_HANDLER( lkage_68705_port_c_r )
+READ8_MEMBER(lkage_state::lkage_68705_port_c_r)
{
- lkage_state *state = space->machine().driver_data<lkage_state>();
- state->m_port_c_in = 0;
- if (state->m_main_sent)
- state->m_port_c_in |= 0x01;
- if (!state->m_mcu_sent)
- state->m_port_c_in |= 0x02;
+ m_port_c_in = 0;
+ if (m_main_sent)
+ m_port_c_in |= 0x01;
+ if (!m_mcu_sent)
+ m_port_c_in |= 0x02;
- //logerror("%04x: 68705 port C read %02x\n", cpu_get_pc(&space->device()), state->m_port_c_in);
- return (state->m_port_c_out & state->m_ddr_c) | (state->m_port_c_in & ~state->m_ddr_c);
+ //logerror("%04x: 68705 port C read %02x\n", cpu_get_pc(&space.device()), m_port_c_in);
+ return (m_port_c_out & m_ddr_c) | (m_port_c_in & ~m_ddr_c);
}
-WRITE8_HANDLER( lkage_68705_port_c_w )
+WRITE8_MEMBER(lkage_state::lkage_68705_port_c_w)
{
- lkage_state *state = space->machine().driver_data<lkage_state>();
- logerror("%04x: 68705 port C write %02x\n", cpu_get_pc(&space->device()), data);
- state->m_port_c_out = data;
+ logerror("%04x: 68705 port C write %02x\n", cpu_get_pc(&space.device()), data);
+ m_port_c_out = data;
}
-WRITE8_HANDLER( lkage_68705_ddr_c_w )
+WRITE8_MEMBER(lkage_state::lkage_68705_ddr_c_w)
{
- lkage_state *state = space->machine().driver_data<lkage_state>();
- state->m_ddr_c = data;
+ m_ddr_c = data;
}
-WRITE8_HANDLER( lkage_mcu_w )
+WRITE8_MEMBER(lkage_state::lkage_mcu_w)
{
- lkage_state *state = space->machine().driver_data<lkage_state>();
- logerror("%04x: mcu_w %02x\n", cpu_get_pc(&space->device()), data);
- state->m_from_main = data;
- state->m_main_sent = 1;
- device_set_input_line(state->m_mcu, 0, ASSERT_LINE);
+ logerror("%04x: mcu_w %02x\n", cpu_get_pc(&space.device()), data);
+ m_from_main = data;
+ m_main_sent = 1;
+ device_set_input_line(m_mcu, 0, ASSERT_LINE);
}
-READ8_HANDLER( lkage_mcu_r )
+READ8_MEMBER(lkage_state::lkage_mcu_r)
{
- lkage_state *state = space->machine().driver_data<lkage_state>();
- logerror("%04x: mcu_r %02x\n", cpu_get_pc(&space->device()), state->m_from_mcu);
- state->m_mcu_sent = 0;
- return state->m_from_mcu;
+ logerror("%04x: mcu_r %02x\n", cpu_get_pc(&space.device()), m_from_mcu);
+ m_mcu_sent = 0;
+ return m_from_mcu;
}
-READ8_HANDLER( lkage_mcu_status_r )
+READ8_MEMBER(lkage_state::lkage_mcu_status_r)
{
- lkage_state *state = space->machine().driver_data<lkage_state>();
int res = 0;
/* bit 0 = when 1, mcu is ready to receive data from main cpu */
/* bit 1 = when 1, mcu has sent data to the main cpu */
- //logerror("%04x: mcu_status_r\n", cpu_get_pc(&space->device()));
- if (!state->m_main_sent)
+ //logerror("%04x: mcu_status_r\n", cpu_get_pc(&space.device()));
+ if (!m_main_sent)
res |= 0x01;
- if (state->m_mcu_sent)
+ if (m_mcu_sent)
res |= 0x02;
return res;
diff --git a/src/mame/machine/lsasquad.c b/src/mame/machine/lsasquad.c
index a6820db5272..8170e83878c 100644
--- a/src/mame/machine/lsasquad.c
+++ b/src/mame/machine/lsasquad.c
@@ -18,84 +18,75 @@ static TIMER_CALLBACK( nmi_callback )
state->m_pending_nmi = 1;
}
-WRITE8_HANDLER( lsasquad_sh_nmi_disable_w )
+WRITE8_MEMBER(lsasquad_state::lsasquad_sh_nmi_disable_w)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- state->m_sound_nmi_enable = 0;
+ m_sound_nmi_enable = 0;
}
-WRITE8_HANDLER( lsasquad_sh_nmi_enable_w )
+WRITE8_MEMBER(lsasquad_state::lsasquad_sh_nmi_enable_w)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- state->m_sound_nmi_enable = 1;
- if (state->m_pending_nmi)
+ m_sound_nmi_enable = 1;
+ if (m_pending_nmi)
{
- device_set_input_line(state->m_audiocpu, INPUT_LINE_NMI, PULSE_LINE);
- state->m_pending_nmi = 0;
+ device_set_input_line(m_audiocpu, INPUT_LINE_NMI, PULSE_LINE);
+ m_pending_nmi = 0;
}
}
-WRITE8_HANDLER( lsasquad_sound_command_w )
+WRITE8_MEMBER(lsasquad_state::lsasquad_sound_command_w)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- state->m_sound_pending |= 0x01;
- state->m_sound_cmd = data;
+ m_sound_pending |= 0x01;
+ m_sound_cmd = data;
- //logerror("%04x: sound cmd %02x\n", cpu_get_pc(&space->device()), data);
- space->machine().scheduler().synchronize(FUNC(nmi_callback), data);
+ //logerror("%04x: sound cmd %02x\n", cpu_get_pc(&space.device()), data);
+ machine().scheduler().synchronize(FUNC(nmi_callback), data);
}
-READ8_HANDLER( lsasquad_sh_sound_command_r )
+READ8_MEMBER(lsasquad_state::lsasquad_sh_sound_command_r)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- state->m_sound_pending &= ~0x01;
- //logerror("%04x: read sound cmd %02x\n", cpu_get_pc(&space->device()), state->m_sound_cmd);
- return state->m_sound_cmd;
+ m_sound_pending &= ~0x01;
+ //logerror("%04x: read sound cmd %02x\n", cpu_get_pc(&space.device()), m_sound_cmd);
+ return m_sound_cmd;
}
-WRITE8_HANDLER( lsasquad_sh_result_w )
+WRITE8_MEMBER(lsasquad_state::lsasquad_sh_result_w)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- state->m_sound_pending |= 0x02;
- //logerror("%04x: sound res %02x\n", cpu_get_pc(&space->device()), data);
- state->m_sound_result = data;
+ m_sound_pending |= 0x02;
+ //logerror("%04x: sound res %02x\n", cpu_get_pc(&space.device()), data);
+ m_sound_result = data;
}
-READ8_HANDLER( lsasquad_sound_result_r )
+READ8_MEMBER(lsasquad_state::lsasquad_sound_result_r)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- state->m_sound_pending &= ~0x02;
- //logerror("%04x: read sound res %02x\n", cpu_get_pc(&space->device()), state->m_sound_result);
- return state->m_sound_result;
+ m_sound_pending &= ~0x02;
+ //logerror("%04x: read sound res %02x\n", cpu_get_pc(&space.device()), m_sound_result);
+ return m_sound_result;
}
-READ8_HANDLER( lsasquad_sound_status_r )
+READ8_MEMBER(lsasquad_state::lsasquad_sound_status_r)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
/* bit 0: message pending for sound cpu */
/* bit 1: message pending for main cpu */
- return state->m_sound_pending;
+ return m_sound_pending;
}
-READ8_HANDLER( daikaiju_sh_sound_command_r )
+READ8_MEMBER(lsasquad_state::daikaiju_sh_sound_command_r)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- state->m_sound_pending &= ~0x01;
- state->m_sound_pending |= 0x02;
- //logerror("%04x: read sound cmd %02x\n", cpu_get_pc(&space->device()), state->m_sound_cmd);
- return state->m_sound_cmd;
+ m_sound_pending &= ~0x01;
+ m_sound_pending |= 0x02;
+ //logerror("%04x: read sound cmd %02x\n", cpu_get_pc(&space.device()), m_sound_cmd);
+ return m_sound_cmd;
}
-READ8_HANDLER( daikaiju_sound_status_r )
+READ8_MEMBER(lsasquad_state::daikaiju_sound_status_r)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
/* bit 0: message pending for sound cpu */
/* bit 1: message pending for main cpu */
- return state->m_sound_pending ^ 3;
+ return m_sound_pending ^ 3;
}
@@ -107,26 +98,23 @@ READ8_HANDLER( daikaiju_sound_status_r )
***************************************************************************/
-READ8_HANDLER( lsasquad_68705_port_a_r )
+READ8_MEMBER(lsasquad_state::lsasquad_68705_port_a_r)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(&space->device()), state->m_port_a_in);
- return (state->m_port_a_out & state->m_ddr_a) | (state->m_port_a_in & ~state->m_ddr_a);
+ //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(&space.device()), m_port_a_in);
+ return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a);
}
-WRITE8_HANDLER( lsasquad_68705_port_a_w )
+WRITE8_MEMBER(lsasquad_state::lsasquad_68705_port_a_w)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(&space->device()), data);
- state->m_port_a_out = data;
+ //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(&space.device()), data);
+ m_port_a_out = data;
}
-WRITE8_HANDLER( lsasquad_68705_ddr_a_w )
+WRITE8_MEMBER(lsasquad_state::lsasquad_68705_ddr_a_w)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- state->m_ddr_a = data;
+ m_ddr_a = data;
}
@@ -140,92 +128,85 @@ WRITE8_HANDLER( lsasquad_68705_ddr_a_w )
* 2 W when 0->1, copies port A to the latch for the main CPU
*/
-READ8_HANDLER( lsasquad_68705_port_b_r )
+READ8_MEMBER(lsasquad_state::lsasquad_68705_port_b_r)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- return (state->m_port_b_out & state->m_ddr_b) | (state->m_port_b_in & ~state->m_ddr_b);
+ return (m_port_b_out & m_ddr_b) | (m_port_b_in & ~m_ddr_b);
}
-WRITE8_HANDLER( lsasquad_68705_port_b_w )
+WRITE8_MEMBER(lsasquad_state::lsasquad_68705_port_b_w)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- //logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(&space->device()), data);
+ //logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(&space.device()), data);
- if ((state->m_ddr_b & 0x02) && (~data & 0x02) && (state->m_port_b_out & 0x02))
+ if ((m_ddr_b & 0x02) && (~data & 0x02) && (m_port_b_out & 0x02))
{
- state->m_port_a_in = state->m_from_main;
- if (state->m_main_sent)
- device_set_input_line(state->m_mcu, 0, CLEAR_LINE);
- state->m_main_sent = 0;
- //logerror("read command %02x from main cpu\n", state->m_port_a_in);
+ m_port_a_in = m_from_main;
+ if (m_main_sent)
+ device_set_input_line(m_mcu, 0, CLEAR_LINE);
+ m_main_sent = 0;
+ //logerror("read command %02x from main cpu\n", m_port_a_in);
}
- if ((state->m_ddr_b & 0x04) && (data & 0x04) && (~state->m_port_b_out & 0x04))
+ if ((m_ddr_b & 0x04) && (data & 0x04) && (~m_port_b_out & 0x04))
{
- //logerror("send command %02x to main cpu\n", state->m_port_a_out);
- state->m_from_mcu = state->m_port_a_out;
- state->m_mcu_sent = 1;
+ //logerror("send command %02x to main cpu\n", m_port_a_out);
+ m_from_mcu = m_port_a_out;
+ m_mcu_sent = 1;
}
- state->m_port_b_out = data;
+ m_port_b_out = data;
}
-WRITE8_HANDLER( lsasquad_68705_ddr_b_w )
+WRITE8_MEMBER(lsasquad_state::lsasquad_68705_ddr_b_w)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- state->m_ddr_b = data;
+ m_ddr_b = data;
}
-WRITE8_HANDLER( lsasquad_mcu_w )
+WRITE8_MEMBER(lsasquad_state::lsasquad_mcu_w)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- //logerror("%04x: mcu_w %02x\n", cpu_get_pc(&space->device()), data);
- state->m_from_main = data;
- state->m_main_sent = 1;
- device_set_input_line(state->m_mcu, 0, ASSERT_LINE);
+ //logerror("%04x: mcu_w %02x\n", cpu_get_pc(&space.device()), data);
+ m_from_main = data;
+ m_main_sent = 1;
+ device_set_input_line(m_mcu, 0, ASSERT_LINE);
}
-READ8_HANDLER( lsasquad_mcu_r )
+READ8_MEMBER(lsasquad_state::lsasquad_mcu_r)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- //logerror("%04x: mcu_r %02x\n", cpu_get_pc(&space->device()), state->m_from_mcu);
- state->m_mcu_sent = 0;
- return state->m_from_mcu;
+ //logerror("%04x: mcu_r %02x\n", cpu_get_pc(&space.device()), m_from_mcu);
+ m_mcu_sent = 0;
+ return m_from_mcu;
}
-READ8_HANDLER( lsasquad_mcu_status_r )
+READ8_MEMBER(lsasquad_state::lsasquad_mcu_status_r)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- int res = input_port_read(space->machine(), "MCU");
+ int res = input_port_read(machine(), "MCU");
/* bit 0 = when 1, mcu is ready to receive data from main cpu */
/* bit 1 = when 0, mcu has sent data to the main cpu */
- //logerror("%04x: mcu_status_r\n",cpu_get_pc(&space->device()));
- if (!state->m_main_sent)
+ //logerror("%04x: mcu_status_r\n",cpu_get_pc(&space.device()));
+ if (!m_main_sent)
res |= 0x01;
- if (!state->m_mcu_sent)
+ if (!m_mcu_sent)
res |= 0x02;
return res;
}
-READ8_HANDLER( daikaiju_mcu_status_r )
+READ8_MEMBER(lsasquad_state::daikaiju_mcu_status_r)
{
- lsasquad_state *state = space->machine().driver_data<lsasquad_state>();
- int res = input_port_read(space->machine(), "MCU");
+ int res = input_port_read(machine(), "MCU");
/* bit 0 = when 1, mcu is ready to receive data from main cpu */
/* bit 1 = when 0, mcu has sent data to the main cpu */
- //logerror("%04x: mcu_status_r\n",cpu_get_pc(&space->device()));
- if (!state->m_main_sent)
+ //logerror("%04x: mcu_status_r\n",cpu_get_pc(&space.device()));
+ if (!m_main_sent)
res |= 0x01;
- if (!state->m_mcu_sent)
+ if (!m_mcu_sent)
res |= 0x02;
- res |= ((state->m_sound_pending & 0x02) ^ 2) << 3; //inverted flag
- state->m_sound_pending &= ~0x02;
+ res |= ((m_sound_pending & 0x02) ^ 2) << 3; //inverted flag
+ m_sound_pending &= ~0x02;
return res;
}
diff --git a/src/mame/machine/mcr.c b/src/mame/machine/mcr.c
index e9aedf8ea0d..ac623df231a 100644
--- a/src/mame/machine/mcr.c
+++ b/src/mame/machine/mcr.c
@@ -232,7 +232,7 @@ TIMER_DEVICE_CALLBACK( mcr_ipu_interrupt )
*
*************************************/
-WRITE8_HANDLER( mcr_control_port_w )
+WRITE8_MEMBER(mcr_state::mcr_control_port_w)
{
/*
Bit layout is as follows:
@@ -246,9 +246,9 @@ WRITE8_HANDLER( mcr_control_port_w )
D0 = coin meter 1
*/
- coin_counter_w(space->machine(), 0, (data >> 0) & 1);
- coin_counter_w(space->machine(), 1, (data >> 1) & 1);
- coin_counter_w(space->machine(), 2, (data >> 2) & 1);
+ coin_counter_w(machine(), 0, (data >> 0) & 1);
+ coin_counter_w(machine(), 1, (data >> 1) & 1);
+ coin_counter_w(machine(), 2, (data >> 2) & 1);
mcr_cocktail_flip = (data >> 6) & 1;
}
@@ -271,14 +271,14 @@ static WRITE8_DEVICE_HANDLER( ipu_break_changed )
}
-WRITE8_HANDLER( mcr_ipu_laserdisk_w )
+WRITE8_MEMBER(mcr_state::mcr_ipu_laserdisk_w)
{
/* bit 3 enables (1) LD video regardless of PIX SW */
/* bit 2 enables (1) LD right channel audio */
/* bit 1 enables (1) LD left channel audio */
/* bit 0 enables (1) LD video if PIX SW == 1 */
if (data != 0)
- logerror("%04X:mcr_ipu_laserdisk_w(%d) = %02X\n", cpu_get_pc(&space->device()), offset, data);
+ logerror("%04X:mcr_ipu_laserdisk_w(%d) = %02X\n", cpu_get_pc(&space.device()), offset, data);
}
@@ -293,7 +293,7 @@ static TIMER_CALLBACK( ipu_watchdog_reset )
}
-READ8_HANDLER( mcr_ipu_watchdog_r )
+READ8_MEMBER(mcr_state::mcr_ipu_watchdog_r)
{
/* watchdog counter is clocked by 7.3728MHz crystal / 16 */
/* watchdog is tripped when 14-bit counter overflows => / 32768 = 14.0625Hz*/
@@ -302,7 +302,7 @@ READ8_HANDLER( mcr_ipu_watchdog_r )
}
-WRITE8_HANDLER( mcr_ipu_watchdog_w )
+WRITE8_MEMBER(mcr_state::mcr_ipu_watchdog_w)
{
mcr_ipu_watchdog_r(space,0);
}
diff --git a/src/mame/machine/mcr68.c b/src/mame/machine/mcr68.c
index ef93aa5ebae..e09bed5833d 100644
--- a/src/mame/machine/mcr68.c
+++ b/src/mame/machine/mcr68.c
@@ -423,9 +423,9 @@ static TIMER_CALLBACK( counter_fired_callback )
}
-static void reload_count(mcr68_state *state, int counter)
+void mcr68_state::reload_count(int counter)
{
- struct counter_state *m6840 = &state->m_m6840_state[counter];
+ struct counter_state *m6840 = &m_m6840_state[counter];
attotime period;
attotime total_period;
int count;
@@ -443,9 +443,9 @@ static void reload_count(mcr68_state *state, int counter)
/* determine the clock period for this timer */
if (m6840->control & 0x02)
- period = state->m_m6840_internal_counter_period;
+ period = m_m6840_internal_counter_period;
else
- period = state->m_m6840_counter_periods[counter];
+ period = m_m6840_counter_periods[counter];
/* determine the number of clock periods before we expire */
count = m6840->count;
@@ -462,9 +462,9 @@ LOG(("reload_count(%d): period = %f count = %d\n", counter, period.as_double(),
}
-static UINT16 compute_counter(mcr68_state *state, int counter)
+UINT16 mcr68_state::compute_counter(int counter)
{
- struct counter_state *m6840 = &state->m_m6840_state[counter];
+ struct counter_state *m6840 = &m_m6840_state[counter];
attotime period;
int remaining;
@@ -474,9 +474,9 @@ static UINT16 compute_counter(mcr68_state *state, int counter)
/* determine the clock period for this timer */
if (m6840->control & 0x02)
- period = state->m_m6840_internal_counter_period;
+ period = m_m6840_internal_counter_period;
else
- period = state->m_m6840_counter_periods[counter];
+ period = m_m6840_counter_periods[counter];
/* see how many are left */
remaining = m6840->timer->remaining().as_attoseconds() / period.as_attoseconds();
@@ -500,16 +500,15 @@ static UINT16 compute_counter(mcr68_state *state, int counter)
*
*************************************/
-static WRITE8_HANDLER( mcr68_6840_w_common )
+WRITE8_MEMBER(mcr68_state::mcr68_6840_w_common)
{
- mcr68_state *state = space->machine().driver_data<mcr68_state>();
int i;
/* offsets 0 and 1 are control registers */
if (offset < 2)
{
- int counter = (offset == 1) ? 1 : (state->m_m6840_state[1].control & 0x01) ? 0 : 2;
- struct counter_state *m6840 = &state->m_m6840_state[counter];
+ int counter = (offset == 1) ? 1 : (m_m6840_state[1].control & 0x01) ? 0 : 2;
+ struct counter_state *m6840 = &m_m6840_state[counter];
UINT8 diffs = data ^ m6840->control;
m6840->control = data;
@@ -522,8 +521,8 @@ static WRITE8_HANDLER( mcr68_6840_w_common )
{
for (i = 0; i < 3; i++)
{
- state->m_m6840_state[i].timer->adjust(attotime::never);
- state->m_m6840_state[i].timer_active = 0;
+ m_m6840_state[i].timer->adjust(attotime::never);
+ m_m6840_state[i].timer_active = 0;
}
}
@@ -531,50 +530,49 @@ static WRITE8_HANDLER( mcr68_6840_w_common )
else
{
for (i = 0; i < 3; i++)
- reload_count(state, i);
+ reload_count(i);
}
- state->m_m6840_status = 0;
- update_interrupts(space->machine());
+ m_m6840_status = 0;
+ update_interrupts(machine());
}
/* changing the clock source? (needed for Zwackery) */
if (diffs & 0x02)
- reload_count(state, counter);
+ reload_count(counter);
- LOG(("%06X:Counter %d control = %02X\n", cpu_get_previouspc(&space->device()), counter, data));
+ LOG(("%06X:Counter %d control = %02X\n", cpu_get_previouspc(&space.device()), counter, data));
}
/* offsets 2, 4, and 6 are MSB buffer registers */
else if ((offset & 1) == 0)
{
- LOG(("%06X:MSB = %02X\n", cpu_get_previouspc(&space->device()), data));
- state->m_m6840_msb_buffer = data;
+ LOG(("%06X:MSB = %02X\n", cpu_get_previouspc(&space.device()), data));
+ m_m6840_msb_buffer = data;
}
/* offsets 3, 5, and 7 are Write Timer Latch commands */
else
{
int counter = (offset - 2) / 2;
- struct counter_state *m6840 = &state->m_m6840_state[counter];
- m6840->latch = (state->m_m6840_msb_buffer << 8) | (data & 0xff);
+ struct counter_state *m6840 = &m_m6840_state[counter];
+ m6840->latch = (m_m6840_msb_buffer << 8) | (data & 0xff);
/* clear the interrupt */
- state->m_m6840_status &= ~(1 << counter);
- update_interrupts(space->machine());
+ m_m6840_status &= ~(1 << counter);
+ update_interrupts(machine());
/* reload the count if in an appropriate mode */
if (!(m6840->control & 0x10))
- reload_count(state, counter);
+ reload_count(counter);
- LOG(("%06X:Counter %d latch = %04X\n", cpu_get_previouspc(&space->device()), counter, m6840->latch));
+ LOG(("%06X:Counter %d latch = %04X\n", cpu_get_previouspc(&space.device()), counter, m6840->latch));
}
}
-static READ16_HANDLER( mcr68_6840_r_common )
+READ16_MEMBER(mcr68_state::mcr68_6840_r_common)
{
- mcr68_state *state = space->machine().driver_data<mcr68_state>();
/* offset 0 is a no-op */
if (offset == 0)
return 0;
@@ -582,55 +580,55 @@ static READ16_HANDLER( mcr68_6840_r_common )
/* offset 1 is the status register */
else if (offset == 1)
{
- LOG(("%06X:Status read = %04X\n", cpu_get_previouspc(&space->device()), state->m_m6840_status));
- state->m_m6840_status_read_since_int |= state->m_m6840_status & 0x07;
- return state->m_m6840_status;
+ LOG(("%06X:Status read = %04X\n", cpu_get_previouspc(&space.device()), m_m6840_status));
+ m_m6840_status_read_since_int |= m_m6840_status & 0x07;
+ return m_m6840_status;
}
/* offsets 2, 4, and 6 are Read Timer Counter commands */
else if ((offset & 1) == 0)
{
int counter = (offset - 2) / 2;
- int result = compute_counter(state, counter);
+ int result = compute_counter(counter);
/* clear the interrupt if the status has been read */
- if (state->m_m6840_status_read_since_int & (1 << counter))
- state->m_m6840_status &= ~(1 << counter);
- update_interrupts(space->machine());
+ if (m_m6840_status_read_since_int & (1 << counter))
+ m_m6840_status &= ~(1 << counter);
+ update_interrupts(machine());
- state->m_m6840_lsb_buffer = result & 0xff;
+ m_m6840_lsb_buffer = result & 0xff;
- LOG(("%06X:Counter %d read = %04X\n", cpu_get_previouspc(&space->device()), counter, result));
+ LOG(("%06X:Counter %d read = %04X\n", cpu_get_previouspc(&space.device()), counter, result));
return result >> 8;
}
/* offsets 3, 5, and 7 are LSB buffer registers */
else
- return state->m_m6840_lsb_buffer;
+ return m_m6840_lsb_buffer;
}
-WRITE16_HANDLER( mcr68_6840_upper_w )
+WRITE16_MEMBER(mcr68_state::mcr68_6840_upper_w)
{
if (ACCESSING_BITS_8_15)
mcr68_6840_w_common(space, offset, (data >> 8) & 0xff);
}
-WRITE16_HANDLER( mcr68_6840_lower_w )
+WRITE16_MEMBER(mcr68_state::mcr68_6840_lower_w)
{
if (ACCESSING_BITS_0_7)
mcr68_6840_w_common(space, offset, data & 0xff);
}
-READ16_HANDLER( mcr68_6840_upper_r )
+READ16_MEMBER(mcr68_state::mcr68_6840_upper_r)
{
return (mcr68_6840_r_common(space,offset,0) << 8) | 0x00ff;
}
-READ16_HANDLER( mcr68_6840_lower_r )
+READ16_MEMBER(mcr68_state::mcr68_6840_lower_r)
{
return mcr68_6840_r_common(space,offset,0) | 0xff00;
}
diff --git a/src/mame/machine/mexico86.c b/src/mame/machine/mexico86.c
index 8de9a79c53a..207137fa37b 100644
--- a/src/mame/machine/mexico86.c
+++ b/src/mame/machine/mexico86.c
@@ -12,24 +12,23 @@ bit 2 = sound cpu reset line
bit 1 = microcontroller reset line
bit 0 = ? (unused?)
*/
-WRITE8_HANDLER( mexico86_f008_w )
+WRITE8_MEMBER(mexico86_state::mexico86_f008_w)
{
- mexico86_state *state = space->machine().driver_data<mexico86_state>();
- device_set_input_line(state->m_audiocpu, INPUT_LINE_RESET, (data & 4) ? CLEAR_LINE : ASSERT_LINE);
+ device_set_input_line(m_audiocpu, INPUT_LINE_RESET, (data & 4) ? CLEAR_LINE : ASSERT_LINE);
- if (state->m_mcu != NULL)
+ if (m_mcu != NULL)
{
// mexico 86, knight boy
- device_set_input_line(state->m_mcu, INPUT_LINE_RESET, (data & 2) ? CLEAR_LINE : ASSERT_LINE);
+ device_set_input_line(m_mcu, INPUT_LINE_RESET, (data & 2) ? CLEAR_LINE : ASSERT_LINE);
}
else
{
// simulation for KiKi KaiKai
- state->m_mcu_running = data & 2;
+ m_mcu_running = data & 2;
- if (!state->m_mcu_running)
- state->m_mcu_initialised = 0;
+ if (!m_mcu_running)
+ m_mcu_initialised = 0;
}
}
@@ -225,26 +224,23 @@ INTERRUPT_GEN( mexico86_m68705_interrupt )
}
-READ8_HANDLER( mexico86_68705_port_a_r )
+READ8_MEMBER(mexico86_state::mexico86_68705_port_a_r)
{
- mexico86_state *state = space->machine().driver_data<mexico86_state>();
- //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(&space->device()), state->m_port_a_in);
- return (state->m_port_a_out & state->m_ddr_a) | (state->m_port_a_in & ~state->m_ddr_a);
+ //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(&space.device()), m_port_a_in);
+ return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a);
}
-WRITE8_HANDLER( mexico86_68705_port_a_w )
+WRITE8_MEMBER(mexico86_state::mexico86_68705_port_a_w)
{
- mexico86_state *state = space->machine().driver_data<mexico86_state>();
- //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(&space->device()), data);
- state->m_port_a_out = data;
+ //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(&space.device()), data);
+ m_port_a_out = data;
}
-WRITE8_HANDLER( mexico86_68705_ddr_a_w )
+WRITE8_MEMBER(mexico86_state::mexico86_68705_ddr_a_w)
{
- mexico86_state *state = space->machine().driver_data<mexico86_state>();
- state->m_ddr_a = data;
+ m_ddr_a = data;
}
@@ -265,72 +261,69 @@ WRITE8_HANDLER( mexico86_68705_ddr_a_w )
* 7 W not used?
*/
-READ8_HANDLER( mexico86_68705_port_b_r )
+READ8_MEMBER(mexico86_state::mexico86_68705_port_b_r)
{
- mexico86_state *state = space->machine().driver_data<mexico86_state>();
- return (state->m_port_b_out & state->m_ddr_b) | (state->m_port_b_in & ~state->m_ddr_b);
+ return (m_port_b_out & m_ddr_b) | (m_port_b_in & ~m_ddr_b);
}
-WRITE8_HANDLER( mexico86_68705_port_b_w )
+WRITE8_MEMBER(mexico86_state::mexico86_68705_port_b_w)
{
- mexico86_state *state = space->machine().driver_data<mexico86_state>();
- //logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(&space->device()), data);
+ //logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(&space.device()), data);
- if (BIT(state->m_ddr_b, 0) && BIT(~data, 0) && BIT(state->m_port_b_out, 0))
+ if (BIT(m_ddr_b, 0) && BIT(~data, 0) && BIT(m_port_b_out, 0))
{
- state->m_port_a_in = state->m_latch;
+ m_port_a_in = m_latch;
}
- if (BIT(state->m_ddr_b, 1) && BIT(data, 1) && BIT(~state->m_port_b_out, 1)) /* positive edge trigger */
+ if (BIT(m_ddr_b, 1) && BIT(data, 1) && BIT(~m_port_b_out, 1)) /* positive edge trigger */
{
- state->m_address = state->m_port_a_out;
- //if (state->m_address >= 0x80) logerror("%04x: 68705 address %02x\n", cpu_get_pc(&space->device()), state->m_port_a_out);
+ m_address = m_port_a_out;
+ //if (m_address >= 0x80) logerror("%04x: 68705 address %02x\n", cpu_get_pc(&space.device()), m_port_a_out);
}
- if (BIT(state->m_ddr_b, 3) && BIT(~data, 3) && BIT(state->m_port_b_out, 3))
+ if (BIT(m_ddr_b, 3) && BIT(~data, 3) && BIT(m_port_b_out, 3))
{
if (data & 0x10) /* read */
{
if (data & 0x04)
{
- //logerror("%04x: 68705 read %02x from address %04x\n", cpu_get_pc(&space->device()), state->m_protection_ram[state->m_address], state->m_address);
- state->m_latch = state->m_protection_ram[state->m_address];
+ //logerror("%04x: 68705 read %02x from address %04x\n", cpu_get_pc(&space.device()), m_protection_ram[m_address], m_address);
+ m_latch = m_protection_ram[m_address];
}
else
{
- //logerror("%04x: 68705 read input port %04x\n", cpu_get_pc(&space->device()), state->m_address);
- state->m_latch = input_port_read(space->machine(), (state->m_address & 1) ? "IN2" : "IN1");
+ //logerror("%04x: 68705 read input port %04x\n", cpu_get_pc(&space.device()), m_address);
+ m_latch = input_port_read(machine(), (m_address & 1) ? "IN2" : "IN1");
}
}
else /* write */
{
- //logerror("%04x: 68705 write %02x to address %04x\n",cpu_get_pc(&space->device()), port_a_out, state->m_address);
- state->m_protection_ram[state->m_address] = state->m_port_a_out;
+ //logerror("%04x: 68705 write %02x to address %04x\n",cpu_get_pc(&space.device()), port_a_out, m_address);
+ m_protection_ram[m_address] = m_port_a_out;
}
}
- if (BIT(state->m_ddr_b, 5) && BIT(data, 5) && BIT(~state->m_port_b_out, 5))
+ if (BIT(m_ddr_b, 5) && BIT(data, 5) && BIT(~m_port_b_out, 5))
{
- device_set_input_line_vector(state->m_maincpu, 0, state->m_protection_ram[0]);
- device_set_input_line(state->m_maincpu, 0, HOLD_LINE); // HOLD_LINE works better in Z80 interrupt mode 1.
- device_set_input_line(state->m_mcu, 0, CLEAR_LINE);
+ device_set_input_line_vector(m_maincpu, 0, m_protection_ram[0]);
+ device_set_input_line(m_maincpu, 0, HOLD_LINE); // HOLD_LINE works better in Z80 interrupt mode 1.
+ device_set_input_line(m_mcu, 0, CLEAR_LINE);
}
- if (BIT(state->m_ddr_b, 6) && BIT(~data, 6) && BIT(state->m_port_b_out, 6))
+ if (BIT(m_ddr_b, 6) && BIT(~data, 6) && BIT(m_port_b_out, 6))
{
- logerror("%04x: 68705 unknown port B bit %02x\n", cpu_get_pc(&space->device()), data);
+ logerror("%04x: 68705 unknown port B bit %02x\n", cpu_get_pc(&space.device()), data);
}
- if (BIT(state->m_ddr_b, 7) && BIT(~data, 7) && BIT(state->m_port_b_out, 7))
+ if (BIT(m_ddr_b, 7) && BIT(~data, 7) && BIT(m_port_b_out, 7))
{
- logerror("%04x: 68705 unknown port B bit %02x\n", cpu_get_pc(&space->device()), data);
+ logerror("%04x: 68705 unknown port B bit %02x\n", cpu_get_pc(&space.device()), data);
}
- state->m_port_b_out = data;
+ m_port_b_out = data;
}
-WRITE8_HANDLER( mexico86_68705_ddr_b_w )
+WRITE8_MEMBER(mexico86_state::mexico86_68705_ddr_b_w)
{
- mexico86_state *state = space->machine().driver_data<mexico86_state>();
- state->m_ddr_b = data;
+ m_ddr_b = data;
}
diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c
index 4891f62670e..5523dc80278 100644
--- a/src/mame/machine/mhavoc.c
+++ b/src/mame/machine/mhavoc.c
@@ -39,22 +39,20 @@ TIMER_DEVICE_CALLBACK( mhavoc_cpu_irq_clock )
}
-WRITE8_HANDLER( mhavoc_alpha_irq_ack_w )
+WRITE8_MEMBER(mhavoc_state::mhavoc_alpha_irq_ack_w)
{
- mhavoc_state *state = space->machine().driver_data<mhavoc_state>();
/* clear the line and reset the clock */
- cputag_set_input_line(space->machine(), "alpha", 0, CLEAR_LINE);
- state->m_alpha_irq_clock = 0;
- state->m_alpha_irq_clock_enable = 1;
+ cputag_set_input_line(machine(), "alpha", 0, CLEAR_LINE);
+ m_alpha_irq_clock = 0;
+ m_alpha_irq_clock_enable = 1;
}
-WRITE8_HANDLER( mhavoc_gamma_irq_ack_w )
+WRITE8_MEMBER(mhavoc_state::mhavoc_gamma_irq_ack_w)
{
- mhavoc_state *state = space->machine().driver_data<mhavoc_state>();
/* clear the line and reset the clock */
- cputag_set_input_line(space->machine(), "gamma", 0, CLEAR_LINE);
- state->m_gamma_irq_clock = 0;
+ cputag_set_input_line(machine(), "gamma", 0, CLEAR_LINE);
+ m_gamma_irq_clock = 0;
}
@@ -94,8 +92,8 @@ MACHINE_RESET( mhavoc )
memory_configure_bank(machine, "bank2", 0, 4, machine.region("alpha")->base() + 0x10000, 0x2000);
/* reset RAM/ROM banks to 0 */
- mhavoc_ram_banksel_w(space, 0, 0);
- mhavoc_rom_banksel_w(space, 0, 0);
+ state->mhavoc_ram_banksel_w(*space, 0, 0);
+ state->mhavoc_rom_banksel_w(*space, 0, 0);
/* reset alpha comm status */
state->m_alpha_data = 0;
@@ -140,21 +138,19 @@ static TIMER_CALLBACK( delayed_gamma_w )
}
-WRITE8_HANDLER( mhavoc_gamma_w )
+WRITE8_MEMBER(mhavoc_state::mhavoc_gamma_w)
{
- mhavoc_state *state = space->machine().driver_data<mhavoc_state>();
- logerror(" writing to gamma processor: %02x (%d %d)\n", data, state->m_gamma_rcvd, state->m_alpha_xmtd);
- space->machine().scheduler().synchronize(FUNC(delayed_gamma_w), data);
+ logerror(" writing to gamma processor: %02x (%d %d)\n", data, m_gamma_rcvd, m_alpha_xmtd);
+ machine().scheduler().synchronize(FUNC(delayed_gamma_w), data);
}
-READ8_HANDLER( mhavoc_alpha_r )
+READ8_MEMBER(mhavoc_state::mhavoc_alpha_r)
{
- mhavoc_state *state = space->machine().driver_data<mhavoc_state>();
- logerror("\t\t\t\t\treading from alpha processor: %02x (%d %d)\n", state->m_alpha_data, state->m_gamma_rcvd, state->m_alpha_xmtd);
- state->m_gamma_rcvd = 1;
- state->m_alpha_xmtd = 0;
- return state->m_alpha_data;
+ logerror("\t\t\t\t\treading from alpha processor: %02x (%d %d)\n", m_alpha_data, m_gamma_rcvd, m_alpha_xmtd);
+ m_gamma_rcvd = 1;
+ m_alpha_xmtd = 0;
+ return m_alpha_data;
}
@@ -165,23 +161,21 @@ READ8_HANDLER( mhavoc_alpha_r )
*
*************************************/
-WRITE8_HANDLER( mhavoc_alpha_w )
+WRITE8_MEMBER(mhavoc_state::mhavoc_alpha_w)
{
- mhavoc_state *state = space->machine().driver_data<mhavoc_state>();
- logerror("\t\t\t\t\twriting to alpha processor: %02x %d %d\n", data, state->m_alpha_rcvd, state->m_gamma_xmtd);
- state->m_alpha_rcvd = 0;
- state->m_gamma_xmtd = 1;
- state->m_gamma_data = data;
+ logerror("\t\t\t\t\twriting to alpha processor: %02x %d %d\n", data, m_alpha_rcvd, m_gamma_xmtd);
+ m_alpha_rcvd = 0;
+ m_gamma_xmtd = 1;
+ m_gamma_data = data;
}
-READ8_HANDLER( mhavoc_gamma_r )
+READ8_MEMBER(mhavoc_state::mhavoc_gamma_r)
{
- mhavoc_state *state = space->machine().driver_data<mhavoc_state>();
- logerror(" reading from gamma processor: %02x (%d %d)\n", state->m_gamma_data, state->m_alpha_rcvd, state->m_gamma_xmtd);
- state->m_alpha_rcvd = 1;
- state->m_gamma_xmtd = 0;
- return state->m_gamma_data;
+ logerror(" reading from gamma processor: %02x (%d %d)\n", m_gamma_data, m_alpha_rcvd, m_gamma_xmtd);
+ m_alpha_rcvd = 1;
+ m_gamma_xmtd = 0;
+ return m_gamma_data;
}
@@ -192,15 +186,15 @@ READ8_HANDLER( mhavoc_gamma_r )
*
*************************************/
-WRITE8_HANDLER( mhavoc_ram_banksel_w )
+WRITE8_MEMBER(mhavoc_state::mhavoc_ram_banksel_w)
{
- memory_set_bank(space->machine(), "bank1", data & 1);
+ memory_set_bank(machine(), "bank1", data & 1);
}
-WRITE8_HANDLER( mhavoc_rom_banksel_w )
+WRITE8_MEMBER(mhavoc_state::mhavoc_rom_banksel_w)
{
- memory_set_bank(space->machine(), "bank2", data & 3);
+ memory_set_bank(machine(), "bank2", data & 3);
}
@@ -258,56 +252,55 @@ CUSTOM_INPUT( alpha_xmtd_r )
*
*************************************/
-WRITE8_HANDLER( mhavoc_out_0_w )
+WRITE8_MEMBER(mhavoc_state::mhavoc_out_0_w)
{
- mhavoc_state *state = space->machine().driver_data<mhavoc_state>();
/* Bit 7 = Invert Y -- unemulated */
/* Bit 6 = Invert X -- unemulated */
/* Bit 5 = Player 1 */
- state->m_player_1 = (data >> 5) & 1;
+ m_player_1 = (data >> 5) & 1;
/* Bit 3 = Gamma reset */
- cputag_set_input_line(space->machine(), "gamma", INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE);
+ cputag_set_input_line(machine(), "gamma", INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE);
if (!(data & 0x08))
{
logerror("\t\t\t\t*** resetting gamma processor. ***\n");
- state->m_alpha_rcvd = 0;
- state->m_alpha_xmtd = 0;
- state->m_gamma_rcvd = 0;
- state->m_gamma_xmtd = 0;
+ m_alpha_rcvd = 0;
+ m_alpha_xmtd = 0;
+ m_gamma_rcvd = 0;
+ m_gamma_xmtd = 0;
}
/* Bit 0 = Roller light (Blinks on fatal errors) */
- set_led_status(space->machine(), 0, data & 0x01);
+ set_led_status(machine(), 0, data & 0x01);
}
-WRITE8_HANDLER( alphaone_out_0_w )
+WRITE8_MEMBER(mhavoc_state::alphaone_out_0_w)
{
/* Bit 5 = P2 lamp */
- set_led_status(space->machine(), 0, ~data & 0x20);
+ set_led_status(machine(), 0, ~data & 0x20);
/* Bit 4 = P1 lamp */
- set_led_status(space->machine(), 1, ~data & 0x10);
+ set_led_status(machine(), 1, ~data & 0x10);
/* Bit 1 = right coin counter */
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 1, data & 0x02);
/* Bit 0 = left coin counter */
- coin_counter_w(space->machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 0, data & 0x01);
logerror("alphaone_out_0_w(%02X)\n", data);
}
-WRITE8_HANDLER( mhavoc_out_1_w )
+WRITE8_MEMBER(mhavoc_state::mhavoc_out_1_w)
{
/* Bit 1 = left coin counter */
- coin_counter_w(space->machine(), 0, data & 0x02);
+ coin_counter_w(machine(), 0, data & 0x02);
/* Bit 0 = right coin counter */
- coin_counter_w(space->machine(), 1, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x01);
}
/*************************************
@@ -316,18 +309,16 @@ WRITE8_HANDLER( mhavoc_out_1_w )
*
*************************************/
-static WRITE8_HANDLER( mhavocrv_speech_data_w )
+WRITE8_MEMBER(mhavoc_state::mhavocrv_speech_data_w)
{
- mhavoc_state *state = space->machine().driver_data<mhavoc_state>();
- state->m_speech_write_buffer = data;
+ m_speech_write_buffer = data;
}
-static WRITE8_HANDLER( mhavocrv_speech_strobe_w )
+WRITE8_MEMBER(mhavoc_state::mhavocrv_speech_strobe_w)
{
- mhavoc_state *state = space->machine().driver_data<mhavoc_state>();
- device_t *tms = space->machine().device("tms");
- tms5220_data_w(tms, 0, state->m_speech_write_buffer);
+ device_t *tms = machine().device("tms");
+ tms5220_data_w(tms, 0, m_speech_write_buffer);
}
/*************************************
@@ -340,6 +331,7 @@ DRIVER_INIT( mhavocrv )
{
/* install the speech support that was only optionally stuffed for use */
/* in the Return to Vax hack */
- machine.device("gamma")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x5800, 0x5800, FUNC(mhavocrv_speech_data_w));
- machine.device("gamma")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x5900, 0x5900, FUNC(mhavocrv_speech_strobe_w));
+ mhavoc_state *state = machine.driver_data<mhavoc_state>();
+ machine.device("gamma")->memory().space(AS_PROGRAM)->install_write_handler(0x5800, 0x5800, write8_delegate(FUNC(mhavoc_state::mhavocrv_speech_data_w),state));
+ machine.device("gamma")->memory().space(AS_PROGRAM)->install_write_handler(0x5900, 0x5900, write8_delegate(FUNC(mhavoc_state::mhavocrv_speech_strobe_w),state));
}
diff --git a/src/mame/machine/micro3d.c b/src/mame/machine/micro3d.c
index 25e41cfaa50..dcb4f0ef479 100644
--- a/src/mame/machine/micro3d.c
+++ b/src/mame/machine/micro3d.c
@@ -100,96 +100,94 @@ enum
};
-WRITE16_HANDLER( micro3d_ti_uart_w )
+WRITE16_MEMBER(micro3d_state::micro3d_ti_uart_w)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
switch (offset)
{
case 0x0:
{
- state->m_ti_uart[TX] = data;
+ m_ti_uart[TX] = data;
#if VGB_MONITOR_DISPLAY
mame_debug_printf("%c",data);
#endif
- state->m_ti_uart[STATUS] |= 1;
+ m_ti_uart[STATUS] |= 1;
break;
}
case 0x1:
{
- if (state->m_ti_uart_mode_cycle == 0)
+ if (m_ti_uart_mode_cycle == 0)
{
- state->m_ti_uart[MODE1] = data;
- state->m_ti_uart_mode_cycle = 1;
+ m_ti_uart[MODE1] = data;
+ m_ti_uart_mode_cycle = 1;
}
else
{
- state->m_ti_uart[MODE2] = data;
- state->m_ti_uart_mode_cycle = 0;
+ m_ti_uart[MODE2] = data;
+ m_ti_uart_mode_cycle = 0;
}
break;
}
case 0x2:
{
- if (state->m_ti_uart_sync_cycle == 0)
+ if (m_ti_uart_sync_cycle == 0)
{
- state->m_ti_uart[SYN1] = data;
- state->m_ti_uart_mode_cycle = 1;
+ m_ti_uart[SYN1] = data;
+ m_ti_uart_mode_cycle = 1;
}
- else if (state->m_ti_uart_sync_cycle == 1)
+ else if (m_ti_uart_sync_cycle == 1)
{
- state->m_ti_uart[SYN2] = data;
- state->m_ti_uart_mode_cycle = 2;
+ m_ti_uart[SYN2] = data;
+ m_ti_uart_mode_cycle = 2;
}
else
{
- state->m_ti_uart[DLE] = data;
- state->m_ti_uart_mode_cycle = 0;
+ m_ti_uart[DLE] = data;
+ m_ti_uart_mode_cycle = 0;
}
break;
}
case 0x3:
{
- state->m_ti_uart[COMMAND] = data;
- state->m_ti_uart_mode_cycle = 0;
- state->m_ti_uart_sync_cycle = 0;
+ m_ti_uart[COMMAND] = data;
+ m_ti_uart_mode_cycle = 0;
+ m_ti_uart_sync_cycle = 0;
break;
}
}
}
-READ16_HANDLER( micro3d_ti_uart_r )
+READ16_MEMBER(micro3d_state::micro3d_ti_uart_r)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
switch (offset)
{
case 0x0:
{
- state->m_ti_uart[STATUS] ^= 2;
- return state->m_ti_uart[RX];
+ m_ti_uart[STATUS] ^= 2;
+ return m_ti_uart[RX];
}
case 0x1:
{
- if (state->m_ti_uart_mode_cycle == 0)
+ if (m_ti_uart_mode_cycle == 0)
{
- state->m_ti_uart_mode_cycle = 1;
- return state->m_ti_uart[MODE1];
+ m_ti_uart_mode_cycle = 1;
+ return m_ti_uart[MODE1];
}
else
{
- state->m_ti_uart_mode_cycle = 0;
- return state->m_ti_uart[MODE2];
+ m_ti_uart_mode_cycle = 0;
+ return m_ti_uart[MODE2];
}
}
case 0x2:
{
- return state->m_ti_uart[STATUS];
+ return m_ti_uart[STATUS];
}
case 0x3:
{
- state->m_ti_uart_mode_cycle = state->m_ti_uart_sync_cycle = 0;
- return state->m_ti_uart[COMMAND];
+ m_ti_uart_mode_cycle = m_ti_uart_sync_cycle = 0;
+ return m_ti_uart[COMMAND];
}
default:
{
@@ -206,7 +204,7 @@ READ16_HANDLER( micro3d_ti_uart_r )
*
*************************************/
-WRITE32_HANDLER( micro3d_scc_w )
+WRITE32_MEMBER(micro3d_state::micro3d_scc_w)
{
#if DRMATH_MONITOR_DISPLAY
if (offset == 1)
@@ -214,7 +212,7 @@ WRITE32_HANDLER( micro3d_scc_w )
#endif
}
-READ32_HANDLER( micro3d_scc_r )
+READ32_MEMBER(micro3d_state::micro3d_scc_r)
{
if (offset == 1)
return 0xd;
@@ -229,14 +227,14 @@ READ32_HANDLER( micro3d_scc_r )
*
*************************************/
-READ16_HANDLER( micro3d_tms_host_r )
+READ16_MEMBER(micro3d_state::micro3d_tms_host_r)
{
- return tms34010_host_r(space->machine().device("vgb"), offset);
+ return tms34010_host_r(machine().device("vgb"), offset);
}
-WRITE16_HANDLER( micro3d_tms_host_w )
+WRITE16_MEMBER(micro3d_state::micro3d_tms_host_w)
{
- tms34010_host_w(space->machine().device("vgb"), offset, data);
+ tms34010_host_w(machine().device("vgb"), offset, data);
}
@@ -271,24 +269,21 @@ static TIMER_CALLBACK( mac_done_callback )
}
-WRITE32_HANDLER( micro3d_mac1_w )
+WRITE32_MEMBER(micro3d_state::micro3d_mac1_w)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
- state->m_vtx_addr = (data & 0x3ffff);
- state->m_sram_w_addr = (data >> 18) & 0xfff;
+ m_vtx_addr = (data & 0x3ffff);
+ m_sram_w_addr = (data >> 18) & 0xfff;
}
-READ32_HANDLER( micro3d_mac2_r )
+READ32_MEMBER(micro3d_state::micro3d_mac2_r)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
- return (state->m_mac_inst << 1) | state->m_mac_stat;
+ return (m_mac_inst << 1) | m_mac_stat;
}
-WRITE32_HANDLER( micro3d_mac2_w )
+WRITE32_MEMBER(micro3d_state::micro3d_mac2_w)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
UINT32 cnt = data & 0xff;
UINT32 inst = (data >> 8) & 0x1f;
@@ -300,19 +295,19 @@ WRITE32_HANDLER( micro3d_mac2_w )
UINT32 sram_w_addr;
UINT32 *mac_sram;
- state->m_mac_stat = BIT(data, 13);
- state->m_mac_inst = inst & 0x7;
- state->m_mrab11 = (data >> 18) & (1 << 11);
- state->m_sram_r_addr = (data >> 18) & 0xfff;
+ m_mac_stat = BIT(data, 13);
+ m_mac_inst = inst & 0x7;
+ m_mrab11 = (data >> 18) & (1 << 11);
+ m_sram_r_addr = (data >> 18) & 0xfff;
- mrab11 = state->m_mrab11;
- vtx_addr = state->m_vtx_addr;
- sram_r_addr = state->m_sram_r_addr;
- sram_w_addr = state->m_sram_w_addr;
- mac_sram = state->m_mac_sram;
+ mrab11 = m_mrab11;
+ vtx_addr = m_vtx_addr;
+ sram_r_addr = m_sram_r_addr;
+ sram_w_addr = m_sram_w_addr;
+ mac_sram = m_mac_sram;
if (data & (1 << 14))
- cputag_set_input_line(space->machine(), "drmath", AM29000_INTR0, CLEAR_LINE);
+ cputag_set_input_line(machine(), "drmath", AM29000_INTR0, CLEAR_LINE);
switch (inst)
{
@@ -325,7 +320,7 @@ WRITE32_HANDLER( micro3d_mac2_w )
case 0x08:
{
int i;
- const UINT16 *rom = (UINT16*)space->machine().region("vertex")->base();
+ const UINT16 *rom = (UINT16*)machine().region("vertex")->base();
for (i = 0; i <= cnt; ++i)
{
@@ -364,7 +359,7 @@ WRITE32_HANDLER( micro3d_mac2_w )
case 0x0c:
{
int i;
- const UINT16 *rom = (UINT16*)space->machine().region("vertex")->base();
+ const UINT16 *rom = (UINT16*)machine().region("vertex")->base();
for (i = 0; i <= cnt; ++i)
{
@@ -397,7 +392,7 @@ WRITE32_HANDLER( micro3d_mac2_w )
case 0x0f:
{
int i;
- const UINT16 *rom = (UINT16*)space->machine().region("vertex")->base();
+ const UINT16 *rom = (UINT16*)machine().region("vertex")->base();
for (i = 0; i <= cnt; ++i, vtx_addr += 4)
{
@@ -475,13 +470,13 @@ WRITE32_HANDLER( micro3d_mac2_w )
}
/* TODO: Calculate a better estimate for timing */
- if (state->m_mac_stat)
- space->machine().scheduler().timer_set(attotime::from_hz(MAC_CLK) * mac_cycles, FUNC(mac_done_callback));
+ if (m_mac_stat)
+ machine().scheduler().timer_set(attotime::from_hz(MAC_CLK) * mac_cycles, FUNC(mac_done_callback));
- state->m_mrab11 = mrab11;
- state->m_vtx_addr = vtx_addr;
- state->m_sram_r_addr = sram_r_addr;
- state->m_sram_w_addr = sram_w_addr;
+ m_mrab11 = mrab11;
+ m_vtx_addr = vtx_addr;
+ m_sram_r_addr = sram_r_addr;
+ m_sram_w_addr = sram_w_addr;
}
@@ -491,18 +486,18 @@ WRITE32_HANDLER( micro3d_mac2_w )
*
*************************************/
-READ16_HANDLER( micro3d_encoder_h_r )
+READ16_MEMBER(micro3d_state::micro3d_encoder_h_r)
{
- UINT16 x_encoder = input_port_read_safe(space->machine(), "JOYSTICK_X", 0);
- UINT16 y_encoder = input_port_read_safe(space->machine(), "JOYSTICK_Y", 0);
+ UINT16 x_encoder = input_port_read_safe(machine(), "JOYSTICK_X", 0);
+ UINT16 y_encoder = input_port_read_safe(machine(), "JOYSTICK_Y", 0);
return (y_encoder & 0xf00) | ((x_encoder & 0xf00) >> 8);
}
-READ16_HANDLER( micro3d_encoder_l_r )
+READ16_MEMBER(micro3d_state::micro3d_encoder_l_r)
{
- UINT16 x_encoder = input_port_read_safe(space->machine(), "JOYSTICK_X", 0);
- UINT16 y_encoder = input_port_read_safe(space->machine(), "JOYSTICK_Y", 0);
+ UINT16 x_encoder = input_port_read_safe(machine(), "JOYSTICK_X", 0);
+ UINT16 y_encoder = input_port_read_safe(machine(), "JOYSTICK_Y", 0);
return ((y_encoder & 0xff) << 8) | (x_encoder & 0xff);
}
@@ -524,14 +519,13 @@ static TIMER_CALLBACK( adc_done_callback )
// mc68901_int_gen(machine, GPIP3);
}
-READ16_HANDLER( micro3d_adc_r )
+READ16_MEMBER(micro3d_state::micro3d_adc_r)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
- return state->m_adc_val;
+ return m_adc_val;
}
-WRITE16_HANDLER( micro3d_adc_w )
+WRITE16_MEMBER(micro3d_state::micro3d_adc_w)
{
/* Only handle single-ended mode */
if (data < 4 || data > 7)
@@ -540,7 +534,7 @@ WRITE16_HANDLER( micro3d_adc_w )
return;
}
- space->machine().scheduler().timer_set(attotime::from_usec(40), FUNC(adc_done_callback), data & ~4);
+ machine().scheduler().timer_set(attotime::from_usec(40), FUNC(adc_done_callback), data & ~4);
}
CUSTOM_INPUT( botssa_hwchk_r )
@@ -550,19 +544,17 @@ CUSTOM_INPUT( botssa_hwchk_r )
return state->m_botssa_latch;
}
-READ16_HANDLER( botssa_140000_r )
+READ16_MEMBER(micro3d_state::botssa_140000_r)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
- state->m_botssa_latch = 0;
+ m_botssa_latch = 0;
return 0xffff;
}
-READ16_HANDLER( botssa_180000_r )
+READ16_MEMBER(micro3d_state::botssa_180000_r)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
- state->m_botssa_latch = 1;
+ m_botssa_latch = 1;
return 0xffff;
}
@@ -572,18 +564,18 @@ READ16_HANDLER( botssa_180000_r )
*
*************************************/
-WRITE16_HANDLER( micro3d_reset_w )
+WRITE16_MEMBER(micro3d_state::micro3d_reset_w)
{
data >>= 8;
- cputag_set_input_line(space->machine(), "drmath", INPUT_LINE_RESET, data & 1 ? CLEAR_LINE : ASSERT_LINE);
- cputag_set_input_line(space->machine(), "vgb", INPUT_LINE_RESET, data & 2 ? CLEAR_LINE : ASSERT_LINE);
+ cputag_set_input_line(machine(), "drmath", INPUT_LINE_RESET, data & 1 ? CLEAR_LINE : ASSERT_LINE);
+ cputag_set_input_line(machine(), "vgb", INPUT_LINE_RESET, data & 2 ? CLEAR_LINE : ASSERT_LINE);
/* TODO: Joystick reset? */
}
-WRITE16_HANDLER( host_drmath_int_w )
+WRITE16_MEMBER(micro3d_state::host_drmath_int_w)
{
- cputag_set_input_line(space->machine(), "drmath", AM29000_INTR2, ASSERT_LINE);
- space->machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(10));
+ cputag_set_input_line(machine(), "drmath", AM29000_INTR2, ASSERT_LINE);
+ machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(10));
}
@@ -593,29 +585,27 @@ WRITE16_HANDLER( host_drmath_int_w )
*
*************************************/
-WRITE32_HANDLER( micro3d_shared_w )
+WRITE32_MEMBER(micro3d_state::micro3d_shared_w)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
- state->m_shared_ram[offset * 2 + 1] = data & 0xffff;
- state->m_shared_ram[offset * 2 + 0] = data >> 16;
+ m_shared_ram[offset * 2 + 1] = data & 0xffff;
+ m_shared_ram[offset * 2 + 0] = data >> 16;
}
-READ32_HANDLER( micro3d_shared_r )
+READ32_MEMBER(micro3d_state::micro3d_shared_r)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
- return (state->m_shared_ram[offset * 2] << 16) | state->m_shared_ram[offset * 2 + 1];
+ return (m_shared_ram[offset * 2] << 16) | m_shared_ram[offset * 2 + 1];
}
-WRITE32_HANDLER( drmath_int_w )
+WRITE32_MEMBER(micro3d_state::drmath_int_w)
{
- cputag_set_input_line(space->machine(), "maincpu", 5, HOLD_LINE);
+ cputag_set_input_line(machine(), "maincpu", 5, HOLD_LINE);
}
-WRITE32_HANDLER( drmath_intr2_ack )
+WRITE32_MEMBER(micro3d_state::drmath_intr2_ack)
{
- cputag_set_input_line(space->machine(), "drmath", AM29000_INTR2, CLEAR_LINE);
+ cputag_set_input_line(machine(), "drmath", AM29000_INTR2, CLEAR_LINE);
}
@@ -647,11 +637,12 @@ DRIVER_INIT( micro3d )
DRIVER_INIT( botssa )
{
+ micro3d_state *state = machine.driver_data<micro3d_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* Required to pass the hardware version check */
- space->install_legacy_read_handler(0x140000, 0x140001, FUNC(botssa_140000_r) );
- space->install_legacy_read_handler(0x180000, 0x180001, FUNC(botssa_180000_r) );
+ space->install_read_handler(0x140000, 0x140001, read16_delegate(FUNC(micro3d_state::botssa_140000_r),state));
+ space->install_read_handler(0x180000, 0x180001, read16_delegate(FUNC(micro3d_state::botssa_180000_r),state));
DRIVER_INIT_CALL(micro3d);
}
diff --git a/src/mame/machine/midtunit.c b/src/mame/machine/midtunit.c
index 692f768fbb3..87c1918a8be 100644
--- a/src/mame/machine/midtunit.c
+++ b/src/mame/machine/midtunit.c
@@ -69,32 +69,30 @@ static void register_state_saving(running_machine &machine)
*
*************************************/
-WRITE16_HANDLER( midtunit_cmos_enable_w )
+WRITE16_MEMBER(midtunit_state::midtunit_cmos_enable_w)
{
cmos_write_enable = 1;
}
-WRITE16_HANDLER( midtunit_cmos_w )
+WRITE16_MEMBER(midtunit_state::midtunit_cmos_w)
{
if (1)/*cmos_write_enable)*/
{
- midtunit_state *state = space->machine().driver_data<midtunit_state>();
- COMBINE_DATA(state->m_nvram+offset);
+ COMBINE_DATA(m_nvram+offset);
cmos_write_enable = 0;
}
else
{
- logerror("%08X:Unexpected CMOS W @ %05X\n", cpu_get_pc(&space->device()), offset);
+ logerror("%08X:Unexpected CMOS W @ %05X\n", cpu_get_pc(&space.device()), offset);
popmessage("Bad CMOS write");
}
}
-READ16_HANDLER( midtunit_cmos_r )
+READ16_MEMBER(midtunit_state::midtunit_cmos_r)
{
- midtunit_state *state = space->machine().driver_data<midtunit_state>();
- return state->m_nvram[offset];
+ return m_nvram[offset];
}
@@ -105,11 +103,11 @@ READ16_HANDLER( midtunit_cmos_r )
*
*************************************/
-READ16_HANDLER( midtunit_input_r )
+READ16_MEMBER(midtunit_state::midtunit_input_r)
{
static const char *const portnames[] = { "IN0", "IN1", "IN2", "DSW" };
- return input_port_read(space->machine(), portnames[offset]);
+ return input_port_read(machine(), portnames[offset]);
}
@@ -132,21 +130,21 @@ static const UINT8 mk_prot_values[] =
0xff
};
-static READ16_HANDLER( mk_prot_r )
+READ16_MEMBER(midtunit_state::mk_prot_r)
{
- logerror("%08X:Protection R @ %05X = %04X\n", cpu_get_pc(&space->device()), offset, mk_prot_values[mk_prot_index] << 9);
+ logerror("%08X:Protection R @ %05X = %04X\n", cpu_get_pc(&space.device()), offset, mk_prot_values[mk_prot_index] << 9);
/* just in case */
if (mk_prot_index >= sizeof(mk_prot_values))
{
- logerror("%08X:Unexpected protection R @ %05X\n", cpu_get_pc(&space->device()), offset);
+ logerror("%08X:Unexpected protection R @ %05X\n", cpu_get_pc(&space.device()), offset);
mk_prot_index = 0;
}
return mk_prot_values[mk_prot_index++] << 9;
}
-static WRITE16_HANDLER( mk_prot_w )
+WRITE16_MEMBER(midtunit_state::mk_prot_w)
{
if (ACCESSING_BITS_8_15)
{
@@ -164,11 +162,11 @@ static WRITE16_HANDLER( mk_prot_w )
/* just in case */
if (i == sizeof(mk_prot_values))
{
- logerror("%08X:Unhandled protection W @ %05X = %04X\n", cpu_get_pc(&space->device()), offset, data);
+ logerror("%08X:Unhandled protection W @ %05X = %04X\n", cpu_get_pc(&space.device()), offset, data);
mk_prot_index = 0;
}
- logerror("%08X:Protection W @ %05X = %04X\n", cpu_get_pc(&space->device()), offset, data);
+ logerror("%08X:Protection W @ %05X = %04X\n", cpu_get_pc(&space.device()), offset, data);
}
}
@@ -180,11 +178,11 @@ static WRITE16_HANDLER( mk_prot_w )
*
*************************************/
-static READ16_HANDLER( mkturbo_prot_r )
+READ16_MEMBER(midtunit_state::mkturbo_prot_r)
{
- /* the security GAL overlays a counter of some sort at 0xfffff400 in ROM space.
+ /* the security GAL overlays a counter of some sort at 0xfffff400 in ROM &space.
* A startup protection check expects to read back two different values in succession */
- return space->machine().rand();
+ return machine().rand();
}
@@ -195,22 +193,22 @@ static READ16_HANDLER( mkturbo_prot_r )
*
*************************************/
-static READ16_HANDLER( mk2_prot_const_r )
+READ16_MEMBER(midtunit_state::mk2_prot_const_r)
{
return 2;
}
-static READ16_HANDLER( mk2_prot_r )
+READ16_MEMBER(midtunit_state::mk2_prot_r)
{
return mk2_prot_data;
}
-static READ16_HANDLER( mk2_prot_shift_r )
+READ16_MEMBER(midtunit_state::mk2_prot_shift_r)
{
return mk2_prot_data >> 1;
}
-static WRITE16_HANDLER( mk2_prot_w )
+WRITE16_MEMBER(midtunit_state::mk2_prot_w)
{
COMBINE_DATA(&mk2_prot_data);
}
@@ -263,7 +261,7 @@ static const UINT32 nbajamte_prot_values[128] =
0x381c2e17, 0x393c3e3f, 0x3a3d1e0f, 0x3b1d0e27, 0x3c3e1f2f, 0x3d1e0f07, 0x3e1f2f37, 0x3f3f3f1f
};
-static READ16_HANDLER( nbajam_prot_r )
+READ16_MEMBER(midtunit_state::nbajam_prot_r)
{
int result = nbajam_prot_queue[nbajam_prot_index];
if (nbajam_prot_index < 4)
@@ -271,7 +269,7 @@ static READ16_HANDLER( nbajam_prot_r )
return result;
}
-static WRITE16_HANDLER( nbajam_prot_w )
+WRITE16_MEMBER(midtunit_state::nbajam_prot_w)
{
int table_index = (offset >> 6) & 0x7f;
UINT32 protval = nbajam_prot_table[table_index];
@@ -334,9 +332,9 @@ static const UINT8 jdredd_prot_values_80020[] =
0x39,0x33,0x00,0x00,0x00,0x00,0x00,0x00
};
-static WRITE16_HANDLER( jdredd_prot_w )
+WRITE16_MEMBER(midtunit_state::jdredd_prot_w)
{
- logerror("%08X:jdredd_prot_w(%04X,%04X)\n", cpu_get_previouspc(&space->device()), offset*16, data);
+ logerror("%08X:jdredd_prot_w(%04X,%04X)\n", cpu_get_previouspc(&space.device()), offset*16, data);
switch (offset)
{
@@ -377,23 +375,23 @@ static WRITE16_HANDLER( jdredd_prot_w )
}
}
-static READ16_HANDLER( jdredd_prot_r )
+READ16_MEMBER(midtunit_state::jdredd_prot_r)
{
UINT16 result = 0xffff;
if (jdredd_prot_table && jdredd_prot_index < jdredd_prot_max)
result = jdredd_prot_table[jdredd_prot_index++] << 9;
- logerror("%08X:jdredd_prot_r(%04X) = %04X\n", cpu_get_previouspc(&space->device()), offset*16, result);
+ logerror("%08X:jdredd_prot_r(%04X) = %04X\n", cpu_get_previouspc(&space.device()), offset*16, result);
return result;
}
#if ENABLE_ALL_JDREDD_LEVELS
static UINT16 *jdredd_hack;
-static READ16_HANDLER( jdredd_hack_r )
+READ16_MEMBER(midtunit_state::jdredd_hack_r)
{
- if (cpu_get_pc(&space->device()) == 0xFFBA7EB0)
+ if (cpu_get_pc(&space.device()) == 0xFFBA7EB0)
{
fprintf(stderr, "jdredd_hack_r\n");
return 0;
@@ -464,7 +462,8 @@ DRIVER_INIT( mktunit )
init_tunit_generic(machine, SOUND_ADPCM);
/* protection */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x1b00000, 0x1b6ffff, FUNC(mk_prot_r), FUNC(mk_prot_w));
+ midtunit_state *state = machine.driver_data<midtunit_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x1b00000, 0x1b6ffff, read16_delegate(FUNC(midtunit_state::mk_prot_r),state), write16_delegate(FUNC(midtunit_state::mk_prot_w),state));
/* sound chip protection (hidden RAM) */
machine.device("adpcm")->memory().space(AS_PROGRAM)->install_ram(0xfb9c, 0xfbc6);
@@ -473,7 +472,8 @@ DRIVER_INIT( mktunit )
DRIVER_INIT( mkturbo )
{
/* protection */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xfffff400, 0xfffff40f, FUNC(mkturbo_prot_r));
+ midtunit_state *state = machine.driver_data<midtunit_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xfffff400, 0xfffff40f, read16_delegate(FUNC(midtunit_state::mkturbo_prot_r),state));
DRIVER_INIT_CALL(mktunit);
}
@@ -483,18 +483,18 @@ static void init_nbajam_common(running_machine &machine, int te_protection)
{
/* common init */
init_tunit_generic(machine, SOUND_ADPCM_LARGE);
-
+ midtunit_state *state = machine.driver_data<midtunit_state>();
/* protection */
if (!te_protection)
{
nbajam_prot_table = nbajam_prot_values;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x1b14020, 0x1b2503f, FUNC(nbajam_prot_r), FUNC(nbajam_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x1b14020, 0x1b2503f, read16_delegate(FUNC(midtunit_state::nbajam_prot_r),state), write16_delegate(FUNC(midtunit_state::nbajam_prot_w),state));
}
else
{
nbajam_prot_table = nbajamte_prot_values;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x1b15f40, 0x1b37f5f, FUNC(nbajam_prot_r), FUNC(nbajam_prot_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x1b95f40, 0x1bb7f5f, FUNC(nbajam_prot_r), FUNC(nbajam_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x1b15f40, 0x1b37f5f, read16_delegate(FUNC(midtunit_state::nbajam_prot_r),state), write16_delegate(FUNC(midtunit_state::nbajam_prot_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x1b95f40, 0x1bb7f5f, read16_delegate(FUNC(midtunit_state::nbajam_prot_r),state), write16_delegate(FUNC(midtunit_state::nbajam_prot_w),state));
}
/* sound chip protection (hidden RAM) */
@@ -523,7 +523,8 @@ DRIVER_INIT( jdreddp )
machine.device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x01d81060, 0x01d8107f);
/* protection */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x1b00000, 0x1bfffff, FUNC(jdredd_prot_r), FUNC(jdredd_prot_w));
+ midtunit_state *state = machine.driver_data<midtunit_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x1b00000, 0x1bfffff, read16_delegate(FUNC(midtunit_state::jdredd_prot_r),state), write16_delegate(FUNC(midtunit_state::jdredd_prot_w),state));
/* sound chip protection (hidden RAM) */
machine.device("adpcm")->memory().space(AS_PROGRAM)->install_read_bank(0xfbcf, 0xfbf9, "bank7");
@@ -553,13 +554,14 @@ DRIVER_INIT( mk2 )
midtunit_gfx_rom_large = 1;
/* protection */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x00f20c60, 0x00f20c7f, FUNC(mk2_prot_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x00f42820, 0x00f4283f, FUNC(mk2_prot_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x01a190e0, 0x01a190ff, FUNC(mk2_prot_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x01a191c0, 0x01a191df, FUNC(mk2_prot_shift_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x01a3d0c0, 0x01a3d0ff, FUNC(mk2_prot_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x01d9d1e0, 0x01d9d1ff, FUNC(mk2_prot_const_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x01def920, 0x01def93f, FUNC(mk2_prot_const_r));
+ midtunit_state *state = machine.driver_data<midtunit_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x00f20c60, 0x00f20c7f, write16_delegate(FUNC(midtunit_state::mk2_prot_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x00f42820, 0x00f4283f, write16_delegate(FUNC(midtunit_state::mk2_prot_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x01a190e0, 0x01a190ff, read16_delegate(FUNC(midtunit_state::mk2_prot_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x01a191c0, 0x01a191df, read16_delegate(FUNC(midtunit_state::mk2_prot_shift_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x01a3d0c0, 0x01a3d0ff, read16_delegate(FUNC(midtunit_state::mk2_prot_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x01d9d1e0, 0x01d9d1ff, read16_delegate(FUNC(midtunit_state::mk2_prot_const_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x01def920, 0x01def93f, read16_delegate(FUNC(midtunit_state::mk2_prot_const_r),state));
}
@@ -596,12 +598,12 @@ MACHINE_RESET( midtunit )
*
*************************************/
-READ16_HANDLER( midtunit_sound_state_r )
+READ16_MEMBER(midtunit_state::midtunit_sound_state_r)
{
-/* logerror("%08X:Sound status read\n", cpu_get_pc(&space->device()));*/
+/* logerror("%08X:Sound status read\n", cpu_get_pc(&space.device()));*/
if (chip_type == SOUND_DCS)
- return dcs_control_r(space->machine()) >> 4;
+ return dcs_control_r(machine()) >> 4;
if (fake_sound_state)
{
@@ -611,22 +613,22 @@ READ16_HANDLER( midtunit_sound_state_r )
return ~0;
}
-READ16_HANDLER( midtunit_sound_r )
+READ16_MEMBER(midtunit_state::midtunit_sound_r)
{
- logerror("%08X:Sound data read\n", cpu_get_pc(&space->device()));
+ logerror("%08X:Sound data read\n", cpu_get_pc(&space.device()));
if (chip_type == SOUND_DCS)
- return dcs_data_r(space->machine()) & 0xff;
+ return dcs_data_r(machine()) & 0xff;
return ~0;
}
-WRITE16_HANDLER( midtunit_sound_w )
+WRITE16_MEMBER(midtunit_state::midtunit_sound_w)
{
/* check for out-of-bounds accesses */
if (!offset)
{
- logerror("%08X:Unexpected write to sound (lo) = %04X\n", cpu_get_pc(&space->device()), data);
+ logerror("%08X:Unexpected write to sound (lo) = %04X\n", cpu_get_pc(&space.device()), data);
return;
}
@@ -636,17 +638,17 @@ WRITE16_HANDLER( midtunit_sound_w )
{
case SOUND_ADPCM:
case SOUND_ADPCM_LARGE:
- williams_adpcm_reset_w(space->machine(), ~data & 0x100);
- williams_adpcm_data_w(space->machine(), data & 0xff);
+ williams_adpcm_reset_w(machine(), ~data & 0x100);
+ williams_adpcm_data_w(machine(), data & 0xff);
/* the games seem to check for $82 loops, so this should be just barely enough */
fake_sound_state = 128;
break;
case SOUND_DCS:
- logerror("%08X:Sound write = %04X\n", cpu_get_pc(&space->device()), data);
- dcs_reset_w(space->machine(), ~data & 0x100);
- dcs_data_w(space->machine(), data & 0xff);
+ logerror("%08X:Sound write = %04X\n", cpu_get_pc(&space.device()), data);
+ dcs_reset_w(machine(), ~data & 0x100);
+ dcs_data_w(machine(), data & 0xff);
/* the games seem to check for $82 loops, so this should be just barely enough */
fake_sound_state = 128;
break;
diff --git a/src/mame/machine/midwunit.c b/src/mame/machine/midwunit.c
index eb2109d7b2b..6fee9727134 100644
--- a/src/mame/machine/midwunit.c
+++ b/src/mame/machine/midwunit.c
@@ -12,12 +12,6 @@
#include "includes/midwunit.h"
#include "midwayic.h"
-
-/* prototype */
-static READ16_HANDLER( midwunit_sound_state_r );
-
-
-
/*************************************
*
* State saving
@@ -42,35 +36,31 @@ static void register_state_saving(running_machine &machine)
*
*************************************/
-WRITE16_HANDLER( midwunit_cmos_enable_w )
+WRITE16_MEMBER(midwunit_state::midwunit_cmos_enable_w)
{
- midwunit_state *state = space->machine().driver_data<midwunit_state>();
- state->m_cmos_write_enable = 1;
+ m_cmos_write_enable = 1;
}
-WRITE16_HANDLER( midwunit_cmos_w )
+WRITE16_MEMBER(midwunit_state::midwunit_cmos_w)
{
- midwunit_state *state = space->machine().driver_data<midwunit_state>();
- if (state->m_cmos_write_enable)
+ if (m_cmos_write_enable)
{
- midwunit_state *state = space->machine().driver_data<midwunit_state>();
- COMBINE_DATA(state->m_nvram+offset);
- state->m_cmos_write_enable = 0;
+ COMBINE_DATA(m_nvram+offset);
+ m_cmos_write_enable = 0;
}
else
{
- logerror("%08X:Unexpected CMOS W @ %05X\n", cpu_get_pc(&space->device()), offset);
+ logerror("%08X:Unexpected CMOS W @ %05X\n", cpu_get_pc(&space.device()), offset);
popmessage("Bad CMOS write");
}
}
-READ16_HANDLER( midwunit_cmos_r )
+READ16_MEMBER(midwunit_state::midwunit_cmos_r)
{
- midwunit_state *state = space->machine().driver_data<midwunit_state>();
- return state->m_nvram[offset];
+ return m_nvram[offset];
}
@@ -81,23 +71,22 @@ READ16_HANDLER( midwunit_cmos_r )
*
*************************************/
-WRITE16_HANDLER( midwunit_io_w )
+WRITE16_MEMBER(midwunit_state::midwunit_io_w)
{
- midwunit_state *state = space->machine().driver_data<midwunit_state>();
int oldword, newword;
offset %= 8;
- oldword = state->m_iodata[offset];
+ oldword = m_iodata[offset];
newword = oldword;
COMBINE_DATA(&newword);
switch (offset)
{
case 1:
- logerror("%08X:Control W @ %05X = %04X\n", cpu_get_pc(&space->device()), offset, data);
+ logerror("%08X:Control W @ %05X = %04X\n", cpu_get_pc(&space.device()), offset, data);
/* bit 4 reset sound CPU */
- dcs_reset_w(space->machine(), newword & 0x10);
+ dcs_reset_w(machine(), newword & 0x10);
/* bit 5 (active low) reset security chip */
midway_serial_pic_reset_w(newword & 0x20);
@@ -110,10 +99,10 @@ WRITE16_HANDLER( midwunit_io_w )
break;
default:
- logerror("%08X:Unknown I/O write to %d = %04X\n", cpu_get_pc(&space->device()), offset, data);
+ logerror("%08X:Unknown I/O write to %d = %04X\n", cpu_get_pc(&space.device()), offset, data);
break;
}
- state->m_iodata[offset] = newword;
+ m_iodata[offset] = newword;
}
@@ -124,13 +113,12 @@ WRITE16_HANDLER( midwunit_io_w )
*
*************************************/
-READ16_HANDLER( midwunit_io_r )
+READ16_MEMBER(midwunit_state::midwunit_io_r)
{
- midwunit_state *state = space->machine().driver_data<midwunit_state>();
static const char *const portnames[] = { "IN0", "IN1", "DSW", "IN2" };
/* apply I/O shuffling */
- offset = state->m_ioshuffle[offset % 16];
+ offset = m_ioshuffle[offset % 16];
switch (offset)
{
@@ -138,13 +126,13 @@ READ16_HANDLER( midwunit_io_r )
case 1:
case 2:
case 3:
- return input_port_read(space->machine(), portnames[offset]);
+ return input_port_read(machine(), portnames[offset]);
case 4:
return (midway_serial_pic_status_r() << 12) | midwunit_sound_state_r(space,0,0xffff);
default:
- logerror("%08X:Unknown I/O read from %d\n", cpu_get_pc(&space->device()), offset);
+ logerror("%08X:Unknown I/O read from %d\n", cpu_get_pc(&space.device()), offset);
break;
}
return ~0;
@@ -200,9 +188,8 @@ static void init_wunit_generic(running_machine &machine)
/********************** Mortal Kombat 3 **********************/
-static WRITE16_HANDLER( umk3_palette_hack_w )
+WRITE16_MEMBER(midwunit_state::umk3_palette_hack_w)
{
- midwunit_state *state = space->machine().driver_data<midwunit_state>();
/*
UMK3 uses a circular buffer to hold pending palette changes; the buffer holds 17 entries
total, and the buffer is processed/cleared during the video interrupt. Most of the time,
@@ -221,9 +208,9 @@ static WRITE16_HANDLER( umk3_palette_hack_w )
Although not realistic, this is sufficient to reduce the frequency of incorrect colors
without significantly impacting the rest of the system.
*/
- COMBINE_DATA(&state->m_umk3_palette[offset]);
- device_adjust_icount(&space->device(), -100);
-/* printf("in=%04X%04X out=%04X%04X\n", state->m_umk3_palette[3], state->m_umk3_palette[2], state->m_umk3_palette[1], state->m_umk3_palette[0]); */
+ COMBINE_DATA(&m_umk3_palette[offset]);
+ device_adjust_icount(&space.device(), -100);
+/* printf("in=%04X%04X out=%04X%04X\n", m_umk3_palette[3], m_umk3_palette[2], m_umk3_palette[1], m_umk3_palette[0]); */
}
static void init_mk3_common(running_machine &machine)
@@ -254,14 +241,14 @@ DRIVER_INIT( umk3 )
{
midwunit_state *state = machine.driver_data<midwunit_state>();
init_mk3_common(machine);
- state->m_umk3_palette = machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x0106a060, 0x0106a09f, FUNC(umk3_palette_hack_w));
+ state->m_umk3_palette = machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0106a060, 0x0106a09f, write16_delegate(FUNC(midwunit_state::umk3_palette_hack_w),state));
}
DRIVER_INIT( umk3r11 )
{
midwunit_state *state = machine.driver_data<midwunit_state>();
init_mk3_common(machine);
- state->m_umk3_palette = machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x0106a060, 0x0106a09f, FUNC(umk3_palette_hack_w));
+ state->m_umk3_palette = machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0106a060, 0x0106a09f,write16_delegate(FUNC(midwunit_state::umk3_palette_hack_w),state));
}
@@ -291,14 +278,13 @@ DRIVER_INIT( nbahangt )
/********************** WWF Wrestlemania **********************/
-static WRITE16_HANDLER( wwfmania_io_0_w )
+WRITE16_MEMBER(midwunit_state::wwfmania_io_0_w)
{
- midwunit_state *state = space->machine().driver_data<midwunit_state>();
int i;
/* start with the originals */
for (i = 0; i < 16; i++)
- state->m_ioshuffle[i] = i % 8;
+ m_ioshuffle[i] = i % 8;
/* based on the data written, shuffle */
switch (data)
@@ -307,35 +293,35 @@ static WRITE16_HANDLER( wwfmania_io_0_w )
break;
case 1:
- state->m_ioshuffle[4] = 0;
- state->m_ioshuffle[8] = 1;
- state->m_ioshuffle[1] = 2;
- state->m_ioshuffle[9] = 3;
- state->m_ioshuffle[2] = 4;
+ m_ioshuffle[4] = 0;
+ m_ioshuffle[8] = 1;
+ m_ioshuffle[1] = 2;
+ m_ioshuffle[9] = 3;
+ m_ioshuffle[2] = 4;
break;
case 2:
- state->m_ioshuffle[8] = 0;
- state->m_ioshuffle[2] = 1;
- state->m_ioshuffle[4] = 2;
- state->m_ioshuffle[6] = 3;
- state->m_ioshuffle[1] = 4;
+ m_ioshuffle[8] = 0;
+ m_ioshuffle[2] = 1;
+ m_ioshuffle[4] = 2;
+ m_ioshuffle[6] = 3;
+ m_ioshuffle[1] = 4;
break;
case 3:
- state->m_ioshuffle[1] = 0;
- state->m_ioshuffle[8] = 1;
- state->m_ioshuffle[2] = 2;
- state->m_ioshuffle[10] = 3;
- state->m_ioshuffle[5] = 4;
+ m_ioshuffle[1] = 0;
+ m_ioshuffle[8] = 1;
+ m_ioshuffle[2] = 2;
+ m_ioshuffle[10] = 3;
+ m_ioshuffle[5] = 4;
break;
case 4:
- state->m_ioshuffle[2] = 0;
- state->m_ioshuffle[4] = 1;
- state->m_ioshuffle[1] = 2;
- state->m_ioshuffle[7] = 3;
- state->m_ioshuffle[8] = 4;
+ m_ioshuffle[2] = 0;
+ m_ioshuffle[4] = 1;
+ m_ioshuffle[1] = 2;
+ m_ioshuffle[7] = 3;
+ m_ioshuffle[8] = 4;
break;
}
logerror("Changed I/O swiching to %d\n", data);
@@ -347,7 +333,8 @@ DRIVER_INIT( wwfmania )
init_wunit_generic(machine);
/* enable I/O shuffling */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x01800000, 0x0180000f, FUNC(wwfmania_io_0_w));
+ midwunit_state *state = machine.driver_data<midwunit_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x01800000, 0x0180000f, write16_delegate(FUNC(midwunit_state::wwfmania_io_0_w),state));
/* serial prefixes 430, 528 */
midway_serial_pic_init(machine, 528);
@@ -394,16 +381,16 @@ MACHINE_RESET( midwunit )
*
*************************************/
-READ16_HANDLER( midwunit_security_r )
+READ16_MEMBER(midwunit_state::midwunit_security_r)
{
- return midway_serial_pic_r(space);
+ return midway_serial_pic_r(&space);
}
-WRITE16_HANDLER( midwunit_security_w )
+WRITE16_MEMBER(midwunit_state::midwunit_security_w)
{
if (offset == 0 && ACCESSING_BITS_0_7)
- midway_serial_pic_w(space, data);
+ midway_serial_pic_w(&space, data);
}
@@ -414,33 +401,33 @@ WRITE16_HANDLER( midwunit_security_w )
*
*************************************/
-READ16_HANDLER( midwunit_sound_r )
+READ16_MEMBER(midwunit_state::midwunit_sound_r)
{
- logerror("%08X:Sound read\n", cpu_get_pc(&space->device()));
+ logerror("%08X:Sound read\n", cpu_get_pc(&space.device()));
- return dcs_data_r(space->machine()) & 0xff;
+ return dcs_data_r(machine()) & 0xff;
}
-READ16_HANDLER( midwunit_sound_state_r )
+READ16_MEMBER(midwunit_state::midwunit_sound_state_r)
{
- return dcs_control_r(space->machine());
+ return dcs_control_r(machine());
}
-WRITE16_HANDLER( midwunit_sound_w )
+WRITE16_MEMBER(midwunit_state::midwunit_sound_w)
{
/* check for out-of-bounds accesses */
if (offset)
{
- logerror("%08X:Unexpected write to sound (hi) = %04X\n", cpu_get_pc(&space->device()), data);
+ logerror("%08X:Unexpected write to sound (hi) = %04X\n", cpu_get_pc(&space.device()), data);
return;
}
/* call through based on the sound type */
if (ACCESSING_BITS_0_7)
{
- logerror("%08X:Sound write = %04X\n", cpu_get_pc(&space->device()), data);
- dcs_data_w(space->machine(), data & 0xff);
+ logerror("%08X:Sound write = %04X\n", cpu_get_pc(&space.device()), data);
+ dcs_data_w(machine(), data & 0xff);
}
}
diff --git a/src/mame/machine/midxunit.c b/src/mame/machine/midxunit.c
index cae1181691a..1483255172f 100644
--- a/src/mame/machine/midxunit.c
+++ b/src/mame/machine/midxunit.c
@@ -14,7 +14,6 @@
/* prototype */
-static READ16_HANDLER( midxunit_sound_state_r );
static void midxunit_dcs_output_full(running_machine &machine, int state);
@@ -44,16 +43,14 @@ static void register_state_saving(running_machine &machine)
*
*************************************/
-READ16_HANDLER( midxunit_cmos_r )
+READ16_MEMBER(midxunit_state::midxunit_cmos_r)
{
- midxunit_state *state = space->machine().driver_data<midxunit_state>();
- return state->m_nvram[offset];
+ return m_nvram[offset];
}
-WRITE16_HANDLER( midxunit_cmos_w )
+WRITE16_MEMBER(midxunit_state::midxunit_cmos_w)
{
- midxunit_state *state = space->machine().driver_data<midxunit_state>();
- COMBINE_DATA(state->m_nvram+offset);
+ COMBINE_DATA(m_nvram+offset);
}
@@ -63,13 +60,12 @@ WRITE16_HANDLER( midxunit_cmos_w )
*
*************************************/
-WRITE16_HANDLER( midxunit_io_w )
+WRITE16_MEMBER(midxunit_state::midxunit_io_w)
{
- midxunit_state *state = space->machine().driver_data<midxunit_state>();
int oldword, newword;
offset = (offset / 2) % 8;
- oldword = state->m_iodata[offset];
+ oldword = m_iodata[offset];
newword = oldword;
COMBINE_DATA(&newword);
@@ -91,23 +87,23 @@ WRITE16_HANDLER( midxunit_io_w )
output_set_value("Player2_Gun_LED", (~data & 0x20) >> 5 );
output_set_value("Player3_Gun_LED", (~data & 0x40) >> 6 );
- logerror("%08X:I/O write to %d = %04X\n", cpu_get_pc(&space->device()), offset, data);
-// logerror("%08X:Unknown I/O write to %d = %04X\n", cpu_get_pc(&space->device()), offset, data);
+ logerror("%08X:I/O write to %d = %04X\n", cpu_get_pc(&space.device()), offset, data);
+// logerror("%08X:Unknown I/O write to %d = %04X\n", cpu_get_pc(&space.device()), offset, data);
break;
}
- state->m_iodata[offset] = newword;
+ m_iodata[offset] = newword;
}
-WRITE16_HANDLER( midxunit_unknown_w )
+WRITE16_MEMBER(midxunit_state::midxunit_unknown_w)
{
int offs = offset / 0x40000;
if (offs == 1 && ACCESSING_BITS_0_7)
- dcs_reset_w(space->machine(), data & 2);
+ dcs_reset_w(machine(), data & 2);
if (ACCESSING_BITS_0_7 && offset % 0x40000 == 0)
- logerror("%08X:midxunit_unknown_w @ %d = %02X\n", cpu_get_pc(&space->device()), offs, data & 0xff);
+ logerror("%08X:midxunit_unknown_w @ %d = %02X\n", cpu_get_pc(&space.device()), offs, data & 0xff);
}
@@ -118,7 +114,7 @@ WRITE16_HANDLER( midxunit_unknown_w )
*
*************************************/
-READ16_HANDLER( midxunit_io_r )
+READ16_MEMBER(midxunit_state::midxunit_io_r)
{
static const char *const portnames[] = { "IN0", "IN1", "IN2", "DSW" };
@@ -130,34 +126,32 @@ READ16_HANDLER( midxunit_io_r )
case 1:
case 2:
case 3:
- return input_port_read(space->machine(), portnames[offset]);
+ return input_port_read(machine(), portnames[offset]);
default:
- logerror("%08X:Unknown I/O read from %d\n", cpu_get_pc(&space->device()), offset);
+ logerror("%08X:Unknown I/O read from %d\n", cpu_get_pc(&space.device()), offset);
break;
}
return ~0;
}
-READ16_HANDLER( midxunit_analog_r )
+READ16_MEMBER(midxunit_state::midxunit_analog_r)
{
- midxunit_state *state = space->machine().driver_data<midxunit_state>();
static const char *const portnames[] = { "AN0", "AN1", "AN2", "AN3", "AN4", "AN5" };
- return input_port_read(space->machine(), portnames[state->m_analog_port]);
+ return input_port_read(machine(), portnames[m_analog_port]);
}
-WRITE16_HANDLER( midxunit_analog_select_w )
+WRITE16_MEMBER(midxunit_state::midxunit_analog_select_w)
{
- midxunit_state *state = space->machine().driver_data<midxunit_state>();
if (offset == 0 && ACCESSING_BITS_0_7)
- state->m_analog_port = data - 8;
+ m_analog_port = data - 8;
}
-READ16_HANDLER( midxunit_status_r )
+READ16_MEMBER(midxunit_state::midxunit_status_r)
{
/* low bit indicates whether the ADC is done reading the current input */
return (midway_serial_pic_status_r() << 1) | 1;
@@ -180,9 +174,8 @@ static void midxunit_dcs_output_full(running_machine &machine, int state)
}
-READ16_HANDLER( midxunit_uart_r )
+READ16_MEMBER(midxunit_state::midxunit_uart_r)
{
- midxunit_state *state = space->machine().driver_data<midxunit_state>();
int result = 0;
/* convert to a byte offset */
@@ -200,7 +193,7 @@ READ16_HANDLER( midxunit_uart_r )
case 1: /* register 1 contains the status */
/* loopback case: data always ready, and always ok to send */
- if (state->m_uart[1] == 0x66)
+ if (m_uart[1] == 0x66)
result |= 5;
/* non-loopback case: bit 0 means data ready, bit 2 means ok to send */
@@ -209,15 +202,15 @@ READ16_HANDLER( midxunit_uart_r )
int temp = midxunit_sound_state_r(space, 0, 0xffff);
result |= (temp & 0x800) >> 9;
result |= (~temp & 0x400) >> 10;
- space->machine().scheduler().synchronize();
+ machine().scheduler().synchronize();
}
break;
case 3: /* register 3 contains the data read */
/* loopback case: feed back last data wrtten */
- if (state->m_uart[1] == 0x66)
- result = state->m_uart[3];
+ if (m_uart[1] == 0x66)
+ result = m_uart[3];
/* non-loopback case: read from the DCS system */
else
@@ -227,7 +220,7 @@ READ16_HANDLER( midxunit_uart_r )
case 5: /* register 5 seems to be like 3, but with in/out swapped */
/* loopback case: data always ready, and always ok to send */
- if (state->m_uart[1] == 0x66)
+ if (m_uart[1] == 0x66)
result |= 5;
/* non-loopback case: bit 0 means data ready, bit 2 means ok to send */
@@ -236,23 +229,22 @@ READ16_HANDLER( midxunit_uart_r )
int temp = midxunit_sound_state_r(space, 0, 0xffff);
result |= (temp & 0x800) >> 11;
result |= (~temp & 0x400) >> 8;
- space->machine().scheduler().synchronize();
+ machine().scheduler().synchronize();
}
break;
default: /* everyone else reads themselves */
- result = state->m_uart[offset];
+ result = m_uart[offset];
break;
}
-/* logerror("%08X:UART R @ %X = %02X\n", cpu_get_pc(&space->device()), offset, result);*/
+/* logerror("%08X:UART R @ %X = %02X\n", cpu_get_pc(&space.device()), offset, result);*/
return result;
}
-WRITE16_HANDLER( midxunit_uart_w )
+WRITE16_MEMBER(midxunit_state::midxunit_uart_w)
{
- midxunit_state *state = space->machine().driver_data<midxunit_state>();
/* convert to a byte offset, ignoring MSB writes */
if ((offset & 1) || !ACCESSING_BITS_0_7)
return;
@@ -265,8 +257,8 @@ WRITE16_HANDLER( midxunit_uart_w )
case 3: /* register 3 contains the data to be sent */
/* loopback case: don't feed through */
- if (state->m_uart[1] == 0x66)
- state->m_uart[3] = data;
+ if (m_uart[1] == 0x66)
+ m_uart[3] = data;
/* non-loopback case: send to the DCS system */
else
@@ -274,15 +266,15 @@ WRITE16_HANDLER( midxunit_uart_w )
break;
case 5: /* register 5 write seems to reset things */
- dcs_data_r(space->machine());
+ dcs_data_r(machine());
break;
default: /* everyone else just stores themselves */
- state->m_uart[offset] = data;
+ m_uart[offset] = data;
break;
}
-/* logerror("%08X:UART W @ %X = %02X\n", cpu_get_pc(&space->device()), offset, data);*/
+/* logerror("%08X:UART W @ %X = %02X\n", cpu_get_pc(&space.device()), offset, data);*/
}
@@ -360,24 +352,22 @@ MACHINE_RESET( midxunit )
*
*************************************/
-READ16_HANDLER( midxunit_security_r )
+READ16_MEMBER(midxunit_state::midxunit_security_r)
{
- return midway_serial_pic_r(space);
+ return midway_serial_pic_r(&space);
}
-WRITE16_HANDLER( midxunit_security_w )
+WRITE16_MEMBER(midxunit_state::midxunit_security_w)
{
- midxunit_state *state = space->machine().driver_data<midxunit_state>();
if (ACCESSING_BITS_0_7)
- state->m_security_bits = data & 0x0f;
+ m_security_bits = data & 0x0f;
}
-WRITE16_HANDLER( midxunit_security_clock_w )
+WRITE16_MEMBER(midxunit_state::midxunit_security_clock_w)
{
- midxunit_state *state = space->machine().driver_data<midxunit_state>();
if (offset == 0 && ACCESSING_BITS_0_7)
- midway_serial_pic_w(space, ((~data & 2) << 3) | state->m_security_bits);
+ midway_serial_pic_w(&space, ((~data & 2) << 3) | m_security_bits);
}
@@ -388,33 +378,33 @@ WRITE16_HANDLER( midxunit_security_clock_w )
*
*************************************/
-READ16_HANDLER( midxunit_sound_r )
+READ16_MEMBER(midxunit_state::midxunit_sound_r)
{
- logerror("%08X:Sound read\n", cpu_get_pc(&space->device()));
+ logerror("%08X:Sound read\n", cpu_get_pc(&space.device()));
- return dcs_data_r(space->machine()) & 0xff;
+ return dcs_data_r(machine()) & 0xff;
}
-READ16_HANDLER( midxunit_sound_state_r )
+READ16_MEMBER(midxunit_state::midxunit_sound_state_r)
{
- return dcs_control_r(space->machine());
+ return dcs_control_r(machine());
}
-WRITE16_HANDLER( midxunit_sound_w )
+WRITE16_MEMBER(midxunit_state::midxunit_sound_w)
{
/* check for out-of-bounds accesses */
if (offset)
{
- logerror("%08X:Unexpected write to sound (hi) = %04X\n", cpu_get_pc(&space->device()), data);
+ logerror("%08X:Unexpected write to sound (hi) = %04X\n", cpu_get_pc(&space.device()), data);
return;
}
/* call through based on the sound type */
if (ACCESSING_BITS_0_7)
{
- logerror("%08X:Sound write = %04X\n", cpu_get_pc(&space->device()), data);
- dcs_data_w(space->machine(), data & 0xff);
+ logerror("%08X:Sound write = %04X\n", cpu_get_pc(&space.device()), data);
+ dcs_data_w(machine(), data & 0xff);
}
}
diff --git a/src/mame/machine/midyunit.c b/src/mame/machine/midyunit.c
index 10126549f33..17d441f361a 100644
--- a/src/mame/machine/midyunit.c
+++ b/src/mame/machine/midyunit.c
@@ -26,18 +26,16 @@
*
*************************************/
-WRITE16_HANDLER( midyunit_cmos_w )
+WRITE16_MEMBER(midyunit_state::midyunit_cmos_w)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
- logerror("%08x:CMOS Write @ %05X\n", cpu_get_pc(&space->device()), offset);
- COMBINE_DATA(&state->m_cmos_ram[offset + state->m_cmos_page]);
+ logerror("%08x:CMOS Write @ %05X\n", cpu_get_pc(&space.device()), offset);
+ COMBINE_DATA(&m_cmos_ram[offset + m_cmos_page]);
}
-READ16_HANDLER( midyunit_cmos_r )
+READ16_MEMBER(midyunit_state::midyunit_cmos_r)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
- return state->m_cmos_ram[offset + state->m_cmos_page];
+ return m_cmos_ram[offset + m_cmos_page];
}
@@ -48,31 +46,30 @@ READ16_HANDLER( midyunit_cmos_r )
*
*************************************/
-WRITE16_HANDLER( midyunit_cmos_enable_w )
+WRITE16_MEMBER(midyunit_state::midyunit_cmos_enable_w)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
- state->m_cmos_w_enable = (~data >> 9) & 1;
+ m_cmos_w_enable = (~data >> 9) & 1;
- logerror("%08x:Protection write = %04X\n", cpu_get_pc(&space->device()), data);
+ logerror("%08x:Protection write = %04X\n", cpu_get_pc(&space.device()), data);
/* only go down this path if we have a data structure */
- if (state->m_prot_data)
+ if (m_prot_data)
{
/* mask off the data */
data &= 0x0f00;
/* update the FIFO */
- state->m_prot_sequence[0] = state->m_prot_sequence[1];
- state->m_prot_sequence[1] = state->m_prot_sequence[2];
- state->m_prot_sequence[2] = data;
+ m_prot_sequence[0] = m_prot_sequence[1];
+ m_prot_sequence[1] = m_prot_sequence[2];
+ m_prot_sequence[2] = data;
/* special case: sequence entry 1234 means Strike Force, which is different */
- if (state->m_prot_data->reset_sequence[0] == 0x1234)
+ if (m_prot_data->reset_sequence[0] == 0x1234)
{
if (data == 0x500)
{
- state->m_prot_result = space->read_word(TOBYTE(0x10a4390)) << 4;
- logerror(" desired result = %04X\n", state->m_prot_result);
+ m_prot_result = space.read_word(TOBYTE(0x10a4390)) << 4;
+ logerror(" desired result = %04X\n", m_prot_result);
}
}
@@ -80,31 +77,30 @@ WRITE16_HANDLER( midyunit_cmos_enable_w )
else
{
/* look for a reset */
- if (state->m_prot_sequence[0] == state->m_prot_data->reset_sequence[0] &&
- state->m_prot_sequence[1] == state->m_prot_data->reset_sequence[1] &&
- state->m_prot_sequence[2] == state->m_prot_data->reset_sequence[2])
+ if (m_prot_sequence[0] == m_prot_data->reset_sequence[0] &&
+ m_prot_sequence[1] == m_prot_data->reset_sequence[1] &&
+ m_prot_sequence[2] == m_prot_data->reset_sequence[2])
{
logerror("Protection reset\n");
- state->m_prot_index = 0;
+ m_prot_index = 0;
}
/* look for a clock */
- if ((state->m_prot_sequence[1] & 0x0800) != 0 && (state->m_prot_sequence[2] & 0x0800) == 0)
+ if ((m_prot_sequence[1] & 0x0800) != 0 && (m_prot_sequence[2] & 0x0800) == 0)
{
- state->m_prot_result = state->m_prot_data->data_sequence[state->m_prot_index++];
- logerror("Protection clock (new data = %04X)\n", state->m_prot_result);
+ m_prot_result = m_prot_data->data_sequence[m_prot_index++];
+ logerror("Protection clock (new data = %04X)\n", m_prot_result);
}
}
}
}
-READ16_HANDLER( midyunit_protection_r )
+READ16_MEMBER(midyunit_state::midyunit_protection_r)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
/* return the most recently clocked value */
- logerror("%08X:Protection read = %04X\n", cpu_get_pc(&space->device()), state->m_prot_result);
- return state->m_prot_result;
+ logerror("%08X:Protection read = %04X\n", cpu_get_pc(&space.device()), m_prot_result);
+ return m_prot_result;
}
@@ -115,11 +111,11 @@ READ16_HANDLER( midyunit_protection_r )
*
*************************************/
-READ16_HANDLER( midyunit_input_r )
+READ16_MEMBER(midyunit_state::midyunit_input_r)
{
static const char *const portnames[] = { "IN0", "IN1", "IN2", "DSW", "UNK0", "UNK1" };
- return input_port_read(space->machine(), portnames[offset]);
+ return input_port_read(machine(), portnames[offset]);
}
@@ -130,27 +126,25 @@ READ16_HANDLER( midyunit_input_r )
*
*************************************/
-static READ16_HANDLER( term2_input_r )
+READ16_MEMBER(midyunit_state::term2_input_r)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
static const char *const portnames[] = { "IN0", "IN1", NULL, "DSW", "UNK0", "UNK1" };
if (offset != 2)
- return input_port_read(space->machine(), portnames[offset]);
+ return input_port_read(machine(), portnames[offset]);
- switch (state->m_term2_analog_select)
+ switch (m_term2_analog_select)
{
default:
- case 0: return input_port_read(space->machine(), "STICK0_X");
- case 1: return input_port_read(space->machine(), "STICK0_Y");
- case 2: return input_port_read(space->machine(), "STICK1_X");
- case 3: return input_port_read(space->machine(), "STICK1_Y");
+ case 0: return input_port_read(machine(), "STICK0_X");
+ case 1: return input_port_read(machine(), "STICK0_Y");
+ case 2: return input_port_read(machine(), "STICK1_X");
+ case 3: return input_port_read(machine(), "STICK1_Y");
}
}
-static WRITE16_HANDLER( term2_sound_w )
+WRITE16_MEMBER(midyunit_state::term2_sound_w)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
/* Flash Lamp Output Data */
if ( ((data & 0x800) != 0x800) && ((data & 0x400) == 0x400 ) )
{
@@ -176,10 +170,10 @@ static WRITE16_HANDLER( term2_sound_w )
}
if (offset == 0)
- state->m_term2_analog_select = (data >> 12) & 3;
+ m_term2_analog_select = (data >> 12) & 3;
- williams_adpcm_reset_w(space->machine(), (~data & 0x100) >> 1);
- williams_adpcm_data_w(space->machine(), data);
+ williams_adpcm_reset_w(machine(), (~data & 0x100) >> 1);
+ williams_adpcm_data_w(machine(), data);
}
@@ -190,48 +184,44 @@ static WRITE16_HANDLER( term2_sound_w )
*
*************************************/
-static WRITE16_HANDLER( term2_hack_w )
+WRITE16_MEMBER(midyunit_state::term2_hack_w)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
- if (offset == 1 && cpu_get_pc(&space->device()) == 0xffce6520)
+ if (offset == 1 && cpu_get_pc(&space.device()) == 0xffce6520)
{
- state->m_t2_hack_mem[offset] = 0;
+ m_t2_hack_mem[offset] = 0;
return;
}
- COMBINE_DATA(&state->m_t2_hack_mem[offset]);
+ COMBINE_DATA(&m_t2_hack_mem[offset]);
}
-static WRITE16_HANDLER( term2la3_hack_w )
+WRITE16_MEMBER(midyunit_state::term2la3_hack_w)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
- if (offset == 0 && cpu_get_pc(&space->device()) == 0xffce5230)
+ if (offset == 0 && cpu_get_pc(&space.device()) == 0xffce5230)
{
- state->m_t2_hack_mem[offset] = 0;
+ m_t2_hack_mem[offset] = 0;
return;
}
- COMBINE_DATA(&state->m_t2_hack_mem[offset]);
+ COMBINE_DATA(&m_t2_hack_mem[offset]);
}
-static WRITE16_HANDLER( term2la2_hack_w )
+WRITE16_MEMBER(midyunit_state::term2la2_hack_w)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
- if (offset == 0 && cpu_get_pc(&space->device()) == 0xffce4b80)
+ if (offset == 0 && cpu_get_pc(&space.device()) == 0xffce4b80)
{
- state->m_t2_hack_mem[offset] = 0;
+ m_t2_hack_mem[offset] = 0;
return;
}
- COMBINE_DATA(&state->m_t2_hack_mem[offset]);
+ COMBINE_DATA(&m_t2_hack_mem[offset]);
}
-static WRITE16_HANDLER( term2la1_hack_w )
+WRITE16_MEMBER(midyunit_state::term2la1_hack_w)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
- if (offset == 0 && cpu_get_pc(&space->device()) == 0xffce33f0)
+ if (offset == 0 && cpu_get_pc(&space.device()) == 0xffce33f0)
{
- state->m_t2_hack_mem[offset] = 0;
+ m_t2_hack_mem[offset] = 0;
return;
}
- COMBINE_DATA(&state->m_t2_hack_mem[offset]);
+ COMBINE_DATA(&m_t2_hack_mem[offset]);
}
@@ -242,14 +232,13 @@ static WRITE16_HANDLER( term2la1_hack_w )
*
*************************************/
-static WRITE8_HANDLER( cvsd_protection_w )
+WRITE8_MEMBER(midyunit_state::cvsd_protection_w)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
/* because the entire CVSD ROM is banked, we have to make sure that writes */
/* go to the proper location (i.e., bank 0); currently bank 0 always lives */
- /* in the 0x10000-0x17fff space, so we just need to add 0x8000 to get the */
+ /* in the 0x10000-0x17fff &space, so we just need to add 0x8000 to get the */
/* proper offset */
- state->m_cvsd_protection_base[offset] = data;
+ m_cvsd_protection_base[offset] = data;
}
@@ -310,7 +299,7 @@ static void init_generic(running_machine &machine, int bpp, int sound, int prot_
{
case SOUND_CVSD_SMALL:
williams_cvsd_init(machine);
- machine.device("cvsdcpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(prot_start, prot_end, FUNC(cvsd_protection_w));
+ machine.device("cvsdcpu")->memory().space(AS_PROGRAM)->install_write_handler(prot_start, prot_end, write8_delegate(FUNC(midyunit_state::cvsd_protection_w),state));
state->m_cvsd_protection_base = machine.region("cvsdcpu")->base() + 0x10000 + (prot_start - 0x8000);
break;
@@ -489,24 +478,25 @@ DRIVER_INIT( mkyawdim )
*
*************************************/
-static READ16_HANDLER( mkturbo_prot_r )
+READ16_MEMBER(midyunit_state::mkturbo_prot_r)
{
- /* the security GAL overlays a counter of some sort at 0xfffff400 in ROM space.
+ /* the security GAL overlays a counter of some sort at 0xfffff400 in ROM &space.
* A startup protection check expects to read back two different values in succession */
- return space->machine().rand();
+ return machine().rand();
}
DRIVER_INIT( mkyturbo )
{
/* protection */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xfffff400, 0xfffff40f, FUNC(mkturbo_prot_r));
+ midyunit_state *state = machine.driver_data<midyunit_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xfffff400, 0xfffff40f, read16_delegate(FUNC(midyunit_state::mkturbo_prot_r),state));
DRIVER_INIT_CALL(mkyunit);
}
/********************** Terminator 2 **********************/
-static void term2_init_common(running_machine &machine, write16_space_func hack_w, const char *name)
+static void term2_init_common(running_machine &machine, write16_delegate hack_w)
{
midyunit_state *state = machine.driver_data<midyunit_state>();
/* protection */
@@ -520,19 +510,19 @@ static void term2_init_common(running_machine &machine, write16_space_func hack_
/* common init */
init_generic(machine, 6, SOUND_ADPCM, 0xfa8d, 0xfa9c);
- /* special inputs */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x01c00000, 0x01c0005f, FUNC(term2_input_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x01e00000, 0x01e0001f, FUNC(term2_sound_w));
+ /* special inputs */
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x01c00000, 0x01c0005f, read16_delegate(FUNC(midyunit_state::term2_input_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x01e00000, 0x01e0001f, write16_delegate(FUNC(midyunit_state::term2_sound_w),state));
/* HACK: this prevents the freeze on the movies */
/* until we figure whats causing it, this is better than nothing */
- state->m_t2_hack_mem = machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x010aa0e0, 0x010aa0ff, hack_w, name);
+ state->m_t2_hack_mem = machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x010aa0e0, 0x010aa0ff, hack_w);
}
-DRIVER_INIT( term2 ) { term2_init_common(machine, FUNC(term2_hack_w)); }
-DRIVER_INIT( term2la3 ) { term2_init_common(machine, FUNC(term2la3_hack_w)); }
-DRIVER_INIT( term2la2 ) { term2_init_common(machine, FUNC(term2la2_hack_w)); }
-DRIVER_INIT( term2la1 ) { term2_init_common(machine, FUNC(term2la1_hack_w)); }
+DRIVER_INIT( term2 ) { midyunit_state *state = machine.driver_data<midyunit_state>();term2_init_common(machine, write16_delegate(FUNC(midyunit_state::term2_hack_w),state)); }
+DRIVER_INIT( term2la3 ) { midyunit_state *state = machine.driver_data<midyunit_state>();term2_init_common(machine, write16_delegate(FUNC(midyunit_state::term2la3_hack_w),state)); }
+DRIVER_INIT( term2la2 ) { midyunit_state *state = machine.driver_data<midyunit_state>();term2_init_common(machine, write16_delegate(FUNC(midyunit_state::term2la2_hack_w),state)); }
+DRIVER_INIT( term2la1 ) { midyunit_state *state = machine.driver_data<midyunit_state>();term2_init_common(machine, write16_delegate(FUNC(midyunit_state::term2la1_hack_w),state)); }
@@ -597,38 +587,37 @@ MACHINE_RESET( midyunit )
*
*************************************/
-WRITE16_HANDLER( midyunit_sound_w )
+WRITE16_MEMBER(midyunit_state::midyunit_sound_w)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
/* check for out-of-bounds accesses */
if (offset)
{
- logerror("%08X:Unexpected write to sound (hi) = %04X\n", cpu_get_pc(&space->device()), data);
+ logerror("%08X:Unexpected write to sound (hi) = %04X\n", cpu_get_pc(&space.device()), data);
return;
}
/* call through based on the sound type */
if (ACCESSING_BITS_0_7 && ACCESSING_BITS_8_15)
- switch (state->m_chip_type)
+ switch (m_chip_type)
{
case SOUND_NARC:
- williams_narc_data_w(space->machine(), data);
+ williams_narc_data_w(machine(), data);
break;
case SOUND_CVSD_SMALL:
case SOUND_CVSD:
- williams_cvsd_reset_w(space->machine(), (~data & 0x100) >> 8);
- williams_cvsd_data_w(space->machine(), (data & 0xff) | ((data & 0x200) >> 1));
+ williams_cvsd_reset_w(machine(), (~data & 0x100) >> 8);
+ williams_cvsd_data_w(machine(), (data & 0xff) | ((data & 0x200) >> 1));
break;
case SOUND_ADPCM:
- williams_adpcm_reset_w(space->machine(), (~data & 0x100) >> 8);
- williams_adpcm_data_w(space->machine(), data);
+ williams_adpcm_reset_w(machine(), (~data & 0x100) >> 8);
+ williams_adpcm_data_w(machine(), data);
break;
case SOUND_YAWDIM:
- state->soundlatch_w(*space, 0, data);
- cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(space, 0, data);
+ cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
break;
}
}
diff --git a/src/mame/machine/model1.c b/src/mame/machine/model1.c
index a15e7f2f255..9f43a3731b7 100644
--- a/src/mame/machine/model1.c
+++ b/src/mame/machine/model1.c
@@ -1935,58 +1935,52 @@ static TGP_FUNCTION( function_get_swa )
}
}
-READ16_HANDLER( model1_tgp_copro_r )
+READ16_MEMBER(model1_state::model1_tgp_copro_r)
{
- model1_state *state = space->machine().driver_data<model1_state>();
if(!offset) {
- state->m_copro_r = fifoout_pop(space);
- return state->m_copro_r;
+ m_copro_r = fifoout_pop(&space);
+ return m_copro_r;
} else
- return state->m_copro_r >> 16;
+ return m_copro_r >> 16;
}
-WRITE16_HANDLER( model1_tgp_copro_w )
+WRITE16_MEMBER(model1_state::model1_tgp_copro_w)
{
- model1_state *state = space->machine().driver_data<model1_state>();
if(offset) {
- state->m_copro_w = (state->m_copro_w & 0x0000ffff) | (data << 16);
- state->m_pushpc = cpu_get_pc(&space->device());
- fifoin_push(space, state->m_copro_w);
+ m_copro_w = (m_copro_w & 0x0000ffff) | (data << 16);
+ m_pushpc = cpu_get_pc(&space.device());
+ fifoin_push(&space, m_copro_w);
} else
- state->m_copro_w = (state->m_copro_w & 0xffff0000) | data;
+ m_copro_w = (m_copro_w & 0xffff0000) | data;
}
-READ16_HANDLER( model1_tgp_copro_adr_r )
+READ16_MEMBER(model1_state::model1_tgp_copro_adr_r)
{
- model1_state *state = space->machine().driver_data<model1_state>();
- return state->m_ram_adr;
+ return m_ram_adr;
}
-WRITE16_HANDLER( model1_tgp_copro_adr_w )
+WRITE16_MEMBER(model1_state::model1_tgp_copro_adr_w)
{
- model1_state *state = space->machine().driver_data<model1_state>();
- COMBINE_DATA(&state->m_ram_adr);
+ COMBINE_DATA(&m_ram_adr);
}
-READ16_HANDLER( model1_tgp_copro_ram_r )
+READ16_MEMBER(model1_state::model1_tgp_copro_ram_r)
{
- model1_state *state = space->machine().driver_data<model1_state>();
if(!offset) {
- logerror("TGP f0 ram read %04x, %08x (%f) (%x)\n", state->m_ram_adr, state->m_ram_data[state->m_ram_adr], u2f(state->m_ram_data[state->m_ram_adr]), cpu_get_pc(&space->device()));
- return state->m_ram_data[state->m_ram_adr];
+ logerror("TGP f0 ram read %04x, %08x (%f) (%x)\n", m_ram_adr, m_ram_data[m_ram_adr], u2f(m_ram_data[m_ram_adr]), cpu_get_pc(&space.device()));
+ return m_ram_data[m_ram_adr];
} else
- return state->m_ram_data[state->m_ram_adr++] >> 16;
+ return m_ram_data[m_ram_adr++] >> 16;
}
-WRITE16_HANDLER( model1_tgp_copro_ram_w )
+WRITE16_MEMBER(model1_state::model1_tgp_copro_ram_w)
{
- model1_state *state = space->machine().driver_data<model1_state>();
- COMBINE_DATA(state->m_ram_latch+offset);
+ COMBINE_DATA(m_ram_latch+offset);
if(offset) {
- UINT32 v = state->m_ram_latch[0]|(state->m_ram_latch[1]<<16);
- logerror("TGP f0 ram write %04x, %08x (%f) (%x)\n", state->m_ram_adr, v, u2f(v), cpu_get_pc(&space->device()));
- state->m_ram_data[state->m_ram_adr] = v;
- state->m_ram_adr++;
+ UINT32 v = m_ram_latch[0]|(m_ram_latch[1]<<16);
+ logerror("TGP f0 ram write %04x, %08x (%f) (%x)\n", m_ram_adr, v, u2f(v), cpu_get_pc(&space.device()));
+ m_ram_data[m_ram_adr] = v;
+ m_ram_adr++;
}
}
@@ -2143,98 +2137,90 @@ static void copro_fifoout_push(device_t *device, UINT32 data)
state->m_copro_fifoout_num++;
}
-static READ32_HANDLER(copro_ram_r)
+READ32_MEMBER(model1_state::copro_ram_r)
{
- model1_state *state = space->machine().driver_data<model1_state>();
- return state->m_ram_data[offset & 0x7fff];
+ return m_ram_data[offset & 0x7fff];
}
-static WRITE32_HANDLER(copro_ram_w)
+WRITE32_MEMBER(model1_state::copro_ram_w)
{
- model1_state *state = space->machine().driver_data<model1_state>();
- state->m_ram_data[offset&0x7fff] = data;
+ m_ram_data[offset&0x7fff] = data;
}
-READ16_HANDLER( model1_tgp_vr_adr_r )
+READ16_MEMBER(model1_state::model1_tgp_vr_adr_r)
{
- model1_state *state = space->machine().driver_data<model1_state>();
- if ( state->m_ram_adr == 0 && state->m_copro_fifoin_num != 0 )
+ if ( m_ram_adr == 0 && m_copro_fifoin_num != 0 )
{
/* spin the main cpu and let the TGP catch up */
- device_spin_until_time(&space->device(), attotime::from_usec(100));
+ device_spin_until_time(&space.device(), attotime::from_usec(100));
}
- return state->m_ram_adr;
+ return m_ram_adr;
}
-WRITE16_HANDLER( model1_tgp_vr_adr_w )
+WRITE16_MEMBER(model1_state::model1_tgp_vr_adr_w)
{
- model1_state *state = space->machine().driver_data<model1_state>();
- COMBINE_DATA(&state->m_ram_adr);
+ COMBINE_DATA(&m_ram_adr);
}
-READ16_HANDLER( model1_vr_tgp_ram_r )
+READ16_MEMBER(model1_state::model1_vr_tgp_ram_r)
{
- model1_state *state = space->machine().driver_data<model1_state>();
UINT16 r;
if (!offset)
{
- r = state->m_ram_data[state->m_ram_adr&0x7fff];
+ r = m_ram_data[m_ram_adr&0x7fff];
}
else
{
- r = state->m_ram_data[state->m_ram_adr&0x7fff] >> 16;
+ r = m_ram_data[m_ram_adr&0x7fff] >> 16;
- if ( state->m_ram_adr == 0 && r == 0xffff )
+ if ( m_ram_adr == 0 && r == 0xffff )
{
/* if the TGP is busy, spin some more */
- device_spin_until_time(&space->device(), attotime::from_usec(100));
+ device_spin_until_time(&space.device(), attotime::from_usec(100));
}
- if ( state->m_ram_adr & 0x8000 )
- state->m_ram_adr++;
+ if ( m_ram_adr & 0x8000 )
+ m_ram_adr++;
}
return r;
}
-WRITE16_HANDLER( model1_vr_tgp_ram_w )
+WRITE16_MEMBER(model1_state::model1_vr_tgp_ram_w)
{
- model1_state *state = space->machine().driver_data<model1_state>();
- COMBINE_DATA(state->m_ram_latch+offset);
+ COMBINE_DATA(m_ram_latch+offset);
if (offset)
{
- UINT32 v = state->m_ram_latch[0]|(state->m_ram_latch[1]<<16);
- state->m_ram_data[state->m_ram_adr&0x7fff] = v;
- if ( state->m_ram_adr & 0x8000 )
- state->m_ram_adr++;
+ UINT32 v = m_ram_latch[0]|(m_ram_latch[1]<<16);
+ m_ram_data[m_ram_adr&0x7fff] = v;
+ if ( m_ram_adr & 0x8000 )
+ m_ram_adr++;
}
}
-READ16_HANDLER( model1_vr_tgp_r )
+READ16_MEMBER(model1_state::model1_vr_tgp_r)
{
- model1_state *state = space->machine().driver_data<model1_state>();
if (!offset)
{
- state->m_vr_r = copro_fifoout_pop(space);
- return state->m_vr_r;
+ m_vr_r = copro_fifoout_pop(&space);
+ return m_vr_r;
}
else
- return state->m_vr_r >> 16;
+ return m_vr_r >> 16;
}
-WRITE16_HANDLER( model1_vr_tgp_w )
+WRITE16_MEMBER(model1_state::model1_vr_tgp_w)
{
- model1_state *state = space->machine().driver_data<model1_state>();
if (offset)
{
- state->m_vr_w = (state->m_vr_w & 0x0000ffff) | (data << 16);
- copro_fifoin_push(space, state->m_vr_w);
+ m_vr_w = (m_vr_w & 0x0000ffff) | (data << 16);
+ copro_fifoin_push(&space, m_vr_w);
}
else
- state->m_vr_w = (state->m_vr_w & 0xffff0000) | data;
+ m_vr_w = (m_vr_w & 0xffff0000) | data;
}
/* TGP config */
@@ -2246,8 +2232,8 @@ const mb86233_cpu_core model1_vr_tgp_config =
};
/* TGP memory map */
-ADDRESS_MAP_START( model1_vr_tgp_map, AS_PROGRAM, 32, driver_device )
+ADDRESS_MAP_START( model1_vr_tgp_map, AS_PROGRAM, 32, model1_state )
AM_RANGE(0x00000000, 0x000007ff) AM_RAM AM_REGION("tgp", 0)
- AM_RANGE(0x00400000, 0x00407fff) AM_READWRITE_LEGACY(copro_ram_r, copro_ram_w)
+ AM_RANGE(0x00400000, 0x00407fff) AM_READWRITE(copro_ram_r, copro_ram_w)
AM_RANGE(0xff800000, 0xff87ffff) AM_ROM AM_REGION("user2", 0)
ADDRESS_MAP_END
diff --git a/src/mame/machine/model3.c b/src/mame/machine/model3.c
index 03147b4a27b..3c4b74c8f0c 100644
--- a/src/mame/machine/model3.c
+++ b/src/mame/machine/model3.c
@@ -338,16 +338,16 @@ static UINT8 rtc_get_reg(running_machine &machine, int reg)
}
}
-READ32_HANDLER(rtc72421_r)
+READ32_MEMBER(model3_state::rtc72421_r)
{
int reg = offset;
UINT32 data;
- data = rtc_get_reg(space->machine(), reg) << 24;
+ data = rtc_get_reg(machine(), reg) << 24;
data |= 0x30000; /* these bits are set to pass the battery voltage test */
return data;
}
-WRITE32_HANDLER(rtc72421_w)
+WRITE32_MEMBER(model3_state::rtc72421_w)
{
}
diff --git a/src/mame/machine/namcond1.c b/src/mame/machine/namcond1.c
index 5352ff7fefc..f75c75e54e1 100644
--- a/src/mame/machine/namcond1.c
+++ b/src/mame/machine/namcond1.c
@@ -53,14 +53,13 @@ MACHINE_RESET( namcond1 )
// instance of the shared ram pointer
-READ16_HANDLER( namcond1_shared_ram_r )
+READ16_MEMBER(namcond1_state::namcond1_shared_ram_r)
{
- namcond1_state *state = space->machine().driver_data<namcond1_state>();
- return state->m_shared_ram[offset];
+ return m_shared_ram[offset];
}
// $c3ff00-$c3ffff
-READ16_HANDLER( namcond1_cuskey_r )
+READ16_MEMBER(namcond1_state::namcond1_cuskey_r)
{
switch( offset )
{
@@ -73,35 +72,33 @@ READ16_HANDLER( namcond1_cuskey_r )
default :
logerror( "offset $%X accessed from $%X\n",
- offset<<1, cpu_get_pc(&space->device()) );
+ offset<<1, cpu_get_pc(&space.device()) );
return( 0 );
}
}
-WRITE16_HANDLER( namcond1_shared_ram_w )
+WRITE16_MEMBER(namcond1_state::namcond1_shared_ram_w)
{
- namcond1_state *state = space->machine().driver_data<namcond1_state>();
switch( offset )
{
default :
- COMBINE_DATA( state->m_shared_ram + offset );
+ COMBINE_DATA( m_shared_ram + offset );
break;
}
}
-WRITE16_HANDLER( namcond1_cuskey_w )
+WRITE16_MEMBER(namcond1_state::namcond1_cuskey_w)
{
- namcond1_state *state = space->machine().driver_data<namcond1_state>();
switch( offset )
{
case (0x0a>>1):
// this is a kludge until we emulate the h8
- if ((state->m_h8_irq5_enabled == 0) && (data != 0x0000))
+ if ((m_h8_irq5_enabled == 0) && (data != 0x0000))
{
- cputag_set_input_line(space->machine(), "mcu", INPUT_LINE_RESET, CLEAR_LINE);
+ cputag_set_input_line(machine(), "mcu", INPUT_LINE_RESET, CLEAR_LINE);
}
- state->m_h8_irq5_enabled = ( data != 0x0000 );
+ m_h8_irq5_enabled = ( data != 0x0000 );
break;
case (0x0c>>1):
diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c
index 0ad774c6776..4f1dee5a11f 100644
--- a/src/mame/machine/namcos1.c
+++ b/src/mame/machine/namcos1.c
@@ -552,12 +552,12 @@ static WRITE8_HANDLER( key_type3_w )
* *
*******************************************************************************/
-WRITE8_HANDLER( namcos1_sound_bankswitch_w )
+WRITE8_MEMBER(namcos1_state::namcos1_sound_bankswitch_w)
{
- UINT8 *rom = space->machine().region("audiocpu")->base() + 0xc000;
+ UINT8 *rom = machine().region("audiocpu")->base() + 0xc000;
int bank = (data & 0x70) >> 4;
- memory_set_bankptr(space->machine(), "bank17",rom + 0x4000 * bank);
+ memory_set_bankptr(machine(), "bank17",rom + 0x4000 * bank);
}
@@ -569,37 +569,35 @@ WRITE8_HANDLER( namcos1_sound_bankswitch_w )
*******************************************************************************/
-WRITE8_HANDLER( namcos1_cpu_control_w )
+WRITE8_MEMBER(namcos1_state::namcos1_cpu_control_w)
{
- namcos1_state *state = space->machine().driver_data<namcos1_state>();
-// logerror("reset control pc=%04x %02x\n",cpu_get_pc(&space->device()),data);
- if ((data & 1) ^ state->m_reset)
+// logerror("reset control pc=%04x %02x\n",cpu_get_pc(&space.device()),data);
+ if ((data & 1) ^ m_reset)
{
- state->m_mcu_patch_data = 0;
- state->m_reset = data & 1;
+ m_mcu_patch_data = 0;
+ m_reset = data & 1;
}
- cputag_set_input_line(space->machine(), "sub", INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
- cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
- cputag_set_input_line(space->machine(), "mcu", INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
+ cputag_set_input_line(machine(), "sub", INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
+ cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
+ cputag_set_input_line(machine(), "mcu", INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
}
-WRITE8_HANDLER( namcos1_watchdog_w )
+WRITE8_MEMBER(namcos1_state::namcos1_watchdog_w)
{
- namcos1_state *state = space->machine().driver_data<namcos1_state>();
- if (&space->device() == space->machine().device("maincpu"))
- state->m_wdog |= 1;
- else if (&space->device() == space->machine().device("sub"))
- state->m_wdog |= 2;
- else if (&space->device() == space->machine().device("audiocpu"))
- state->m_wdog |= 4;
-
- if (state->m_wdog == 7 || !state->m_reset)
+ if (&space.device() == machine().device("maincpu"))
+ m_wdog |= 1;
+ else if (&space.device() == machine().device("sub"))
+ m_wdog |= 2;
+ else if (&space.device() == machine().device("audiocpu"))
+ m_wdog |= 4;
+
+ if (m_wdog == 7 || !m_reset)
{
- state->m_wdog = 0;
- state->watchdog_reset_w(*space,0,0);
+ m_wdog = 0;
+ watchdog_reset_w(space,0,0);
}
}
@@ -741,21 +739,21 @@ static void namcos1_bankswitch(running_machine &machine, int cpu, offs_t offset,
}
}
-WRITE8_HANDLER( namcos1_bankswitch_w )
+WRITE8_MEMBER(namcos1_state::namcos1_bankswitch_w)
{
-// logerror("cpu %s: namcos1_bankswitch_w offset %04x data %02x\n", space->device().tag(), offset, data);
+// logerror("cpu %s: namcos1_bankswitch_w offset %04x data %02x\n", device().tag(), offset, data);
- namcos1_bankswitch(space->machine(), (&space->device() == space->machine().device("maincpu")) ? 0 : 1, offset, data);
+ namcos1_bankswitch(machine(), (&space.device() == machine().device("maincpu")) ? 0 : 1, offset, data);
}
/* Sub cpu set start bank port */
-WRITE8_HANDLER( namcos1_subcpu_bank_w )
+WRITE8_MEMBER(namcos1_state::namcos1_subcpu_bank_w)
{
// logerror("namcos1_subcpu_bank_w offset %04x data %02x\n",offset,data);
/* Prepare code for CPU 1 */
- namcos1_bankswitch( space->machine(), 1, 0x0e00, 0x03 );
- namcos1_bankswitch( space->machine(), 1, 0x0e01, data );
+ namcos1_bankswitch( machine(), 1, 0x0e00, 0x03 );
+ namcos1_bankswitch( machine(), 1, 0x0e01, data );
}
/*******************************************************************************
@@ -903,7 +901,7 @@ MACHINE_RESET( namcos1 )
*******************************************************************************/
/* mcu banked rom area select */
-WRITE8_HANDLER( namcos1_mcu_bankswitch_w )
+WRITE8_MEMBER(namcos1_state::namcos1_mcu_bankswitch_w)
{
int addr;
@@ -922,7 +920,7 @@ WRITE8_HANDLER( namcos1_mcu_bankswitch_w )
/* bit 0-1 : address line A15-A16 */
addr += (data & 3) * 0x8000;
- memory_set_bankptr(space->machine(), "bank20", space->machine().region("mcu")->base() + addr);
+ memory_set_bankptr(machine(), "bank20", machine().region("mcu")->base() + addr);
}
@@ -939,13 +937,12 @@ WRITE8_HANDLER( namcos1_mcu_bankswitch_w )
/* I found set $A6 only initialize in MCU */
/* This patch kill write this data by MCU case $A6 to xx(clear) */
-WRITE8_HANDLER( namcos1_mcu_patch_w )
+WRITE8_MEMBER(namcos1_state::namcos1_mcu_patch_w)
{
- namcos1_state *state = space->machine().driver_data<namcos1_state>();
- //logerror("mcu C000 write pc=%04x data=%02x\n",cpu_get_pc(&space->device()),data);
- if (state->m_mcu_patch_data == 0xa6) return;
- state->m_mcu_patch_data = data;
- state->m_triram[0] = data;
+ //logerror("mcu C000 write pc=%04x data=%02x\n",cpu_get_pc(&space.device()),data);
+ if (m_mcu_patch_data == 0xa6) return;
+ m_mcu_patch_data = data;
+ m_triram[0] = data;
}
diff --git a/src/mame/machine/nitedrvr.c b/src/mame/machine/nitedrvr.c
index 8d995bc02d2..3ebda789055 100644
--- a/src/mame/machine/nitedrvr.c
+++ b/src/mame/machine/nitedrvr.c
@@ -56,17 +56,15 @@ static int nitedrvr_steering( running_machine &machine )
nitedrvr_steering_reset
***************************************************************************/
-READ8_HANDLER( nitedrvr_steering_reset_r )
+READ8_MEMBER(nitedrvr_state::nitedrvr_steering_reset_r)
{
- nitedrvr_state *state = space->machine().driver_data<nitedrvr_state>();
- state->m_steering_val = 0;
+ m_steering_val = 0;
return 0;
}
-WRITE8_HANDLER( nitedrvr_steering_reset_w )
+WRITE8_MEMBER(nitedrvr_state::nitedrvr_steering_reset_w)
{
- nitedrvr_state *state = space->machine().driver_data<nitedrvr_state>();
- state->m_steering_val = 0;
+ m_steering_val = 0;
}
@@ -98,33 +96,32 @@ Night Driver looks for the following:
Fill in the steering and gear bits in a special way.
***************************************************************************/
-READ8_HANDLER( nitedrvr_in0_r )
+READ8_MEMBER(nitedrvr_state::nitedrvr_in0_r)
{
- nitedrvr_state *state = space->machine().driver_data<nitedrvr_state>();
- int gear = input_port_read(space->machine(), "GEARS");
+ int gear = input_port_read(machine(), "GEARS");
- if (gear & 0x10) state->m_gear = 1;
- else if (gear & 0x20) state->m_gear = 2;
- else if (gear & 0x40) state->m_gear = 3;
- else if (gear & 0x80) state->m_gear = 4;
+ if (gear & 0x10) m_gear = 1;
+ else if (gear & 0x20) m_gear = 2;
+ else if (gear & 0x40) m_gear = 3;
+ else if (gear & 0x80) m_gear = 4;
switch (offset & 0x03)
{
case 0x00: /* No remapping necessary */
- return input_port_read(space->machine(), "DSW0");
+ return input_port_read(machine(), "DSW0");
case 0x01: /* No remapping necessary */
- return input_port_read(space->machine(), "DSW1");
+ return input_port_read(machine(), "DSW1");
case 0x02: /* Remap our gear shift */
- if (state->m_gear == 1)
+ if (m_gear == 1)
return 0xe0;
- else if (state->m_gear == 2)
+ else if (m_gear == 2)
return 0xd0;
- else if (state->m_gear == 3)
+ else if (m_gear == 3)
return 0xb0;
else
return 0x70;
case 0x03: /* Remap our steering */
- return (input_port_read(space->machine(), "DSW2") | nitedrvr_steering(space->machine()));
+ return (input_port_read(machine(), "DSW2") | nitedrvr_steering(machine()));
default:
return 0xff;
}
@@ -162,16 +159,15 @@ Night Driver looks for the following:
Fill in the track difficulty switch and special signal in a special way.
***************************************************************************/
-READ8_HANDLER( nitedrvr_in1_r )
+READ8_MEMBER(nitedrvr_state::nitedrvr_in1_r)
{
- nitedrvr_state *state = space->machine().driver_data<nitedrvr_state>();
- int port = input_port_read(space->machine(), "IN0");
+ int port = input_port_read(machine(), "IN0");
- state->m_ac_line = (state->m_ac_line + 1) % 3;
+ m_ac_line = (m_ac_line + 1) % 3;
- if (port & 0x10) state->m_track = 0;
- else if (port & 0x20) state->m_track = 1;
- else if (port & 0x40) state->m_track = 2;
+ if (port & 0x10) m_track = 0;
+ else if (port & 0x20) m_track = 1;
+ else if (port & 0x40) m_track = 2;
switch (offset & 0x07)
{
@@ -184,12 +180,12 @@ READ8_HANDLER( nitedrvr_in1_r )
case 0x03:
return ((port & 0x08) << 4);
case 0x04:
- if (state->m_track == 1) return 0x80; else return 0x00;
+ if (m_track == 1) return 0x80; else return 0x00;
case 0x05:
- if (state->m_track == 0) return 0x80; else return 0x00;
+ if (m_track == 0) return 0x80; else return 0x00;
case 0x06:
/* TODO: fix alternating signal? */
- if (state->m_ac_line==0) return 0x80; else return 0x00;
+ if (m_ac_line==0) return 0x80; else return 0x00;
case 0x07:
return 0x00;
default:
@@ -210,13 +206,12 @@ D4 = SKID1
D5 = SKID2
***************************************************************************/
-WRITE8_HANDLER( nitedrvr_out0_w )
+WRITE8_MEMBER(nitedrvr_state::nitedrvr_out0_w)
{
- nitedrvr_state *state = space->machine().driver_data<nitedrvr_state>();
- discrete_sound_w(state->m_discrete, NITEDRVR_MOTOR_DATA, data & 0x0f); // Motor freq data
- discrete_sound_w(state->m_discrete, NITEDRVR_SKID1_EN, data & 0x10); // Skid1 enable
- discrete_sound_w(state->m_discrete, NITEDRVR_SKID2_EN, data & 0x20); // Skid2 enable
+ discrete_sound_w(m_discrete, NITEDRVR_MOTOR_DATA, data & 0x0f); // Motor freq data
+ discrete_sound_w(m_discrete, NITEDRVR_SKID1_EN, data & 0x10); // Skid1 enable
+ discrete_sound_w(m_discrete, NITEDRVR_SKID2_EN, data & 0x20); // Skid2 enable
}
/***************************************************************************
@@ -230,27 +225,26 @@ D4 = LED START
D5 = Spare (Not used)
***************************************************************************/
-WRITE8_HANDLER( nitedrvr_out1_w )
+WRITE8_MEMBER(nitedrvr_state::nitedrvr_out1_w)
{
- nitedrvr_state *state = space->machine().driver_data<nitedrvr_state>();
- set_led_status(space->machine(), 0, data & 0x10);
+ set_led_status(machine(), 0, data & 0x10);
- state->m_crash_en = data & 0x01;
+ m_crash_en = data & 0x01;
- discrete_sound_w(state->m_discrete, NITEDRVR_CRASH_EN, state->m_crash_en); // Crash enable
- discrete_sound_w(state->m_discrete, NITEDRVR_ATTRACT_EN, data & 0x02); // Attract enable (sound disable)
+ discrete_sound_w(m_discrete, NITEDRVR_CRASH_EN, m_crash_en); // Crash enable
+ discrete_sound_w(m_discrete, NITEDRVR_ATTRACT_EN, data & 0x02); // Attract enable (sound disable)
- if (!state->m_crash_en)
+ if (!m_crash_en)
{
/* Crash reset, set counter high and enable output */
- state->m_crash_data_en = 1;
- state->m_crash_data = 0x0f;
+ m_crash_data_en = 1;
+ m_crash_data = 0x0f;
/* Invert video */
- palette_set_color(space->machine(), 1, MAKE_RGB(0x00,0x00,0x00)); /* BLACK */
- palette_set_color(space->machine(), 0, MAKE_RGB(0xff,0xff,0xff)); /* WHITE */
+ palette_set_color(machine(), 1, MAKE_RGB(0x00,0x00,0x00)); /* BLACK */
+ palette_set_color(machine(), 0, MAKE_RGB(0xff,0xff,0xff)); /* WHITE */
}
- discrete_sound_w(state->m_discrete, NITEDRVR_BANG_DATA, state->m_crash_data_en ? state->m_crash_data : 0); // Crash Volume
+ discrete_sound_w(m_discrete, NITEDRVR_BANG_DATA, m_crash_data_en ? m_crash_data : 0); // Crash Volume
}
diff --git a/src/mame/machine/nycaptor.c b/src/mame/machine/nycaptor.c
index 06c368cdc96..1b8508b7c55 100644
--- a/src/mame/machine/nycaptor.c
+++ b/src/mame/machine/nycaptor.c
@@ -10,22 +10,19 @@
#include "emu.h"
#include "includes/nycaptor.h"
-READ8_HANDLER( nycaptor_68705_port_a_r )
+READ8_MEMBER(nycaptor_state::nycaptor_68705_port_a_r)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- return (state->m_port_a_out & state->m_ddr_a) | (state->m_port_a_in & ~state->m_ddr_a);
+ return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a);
}
-WRITE8_HANDLER( nycaptor_68705_port_a_w )
+WRITE8_MEMBER(nycaptor_state::nycaptor_68705_port_a_w)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- state->m_port_a_out = data;
+ m_port_a_out = data;
}
-WRITE8_HANDLER( nycaptor_68705_ddr_a_w )
+WRITE8_MEMBER(nycaptor_state::nycaptor_68705_ddr_a_w)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- state->m_ddr_a = data;
+ m_ddr_a = data;
}
/*
@@ -37,96 +34,86 @@ WRITE8_HANDLER( nycaptor_68705_ddr_a_w )
* 2 W when 0->1, copies port A to the latch for the main CPU
*/
-READ8_HANDLER( nycaptor_68705_port_b_r )
+READ8_MEMBER(nycaptor_state::nycaptor_68705_port_b_r)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- return (state->m_port_b_out & state->m_ddr_b) | (state->m_port_b_in & ~state->m_ddr_b);
+ return (m_port_b_out & m_ddr_b) | (m_port_b_in & ~m_ddr_b);
}
-WRITE8_HANDLER( nycaptor_68705_port_b_w )
+WRITE8_MEMBER(nycaptor_state::nycaptor_68705_port_b_w)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- if (BIT(state->m_ddr_b, 1) && BIT(~data, 1) && BIT(state->m_port_b_out, 1))
+ if (BIT(m_ddr_b, 1) && BIT(~data, 1) && BIT(m_port_b_out, 1))
{
- state->m_port_a_in = state->m_from_main;
+ m_port_a_in = m_from_main;
- if (state->m_main_sent)
- device_set_input_line(state->m_mcu, 0, CLEAR_LINE);
- state->m_main_sent = 0;
+ if (m_main_sent)
+ device_set_input_line(m_mcu, 0, CLEAR_LINE);
+ m_main_sent = 0;
}
- if (BIT(state->m_ddr_b, 2) && BIT(data, 2) && BIT(~state->m_port_b_out, 2))
+ if (BIT(m_ddr_b, 2) && BIT(data, 2) && BIT(~m_port_b_out, 2))
{
- state->m_from_mcu = state->m_port_a_out;
- state->m_mcu_sent = 1;
+ m_from_mcu = m_port_a_out;
+ m_mcu_sent = 1;
}
- state->m_port_b_out = data;
+ m_port_b_out = data;
}
-WRITE8_HANDLER( nycaptor_68705_ddr_b_w )
+WRITE8_MEMBER(nycaptor_state::nycaptor_68705_ddr_b_w)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- state->m_ddr_b = data;
+ m_ddr_b = data;
}
-READ8_HANDLER( nycaptor_68705_port_c_r )
+READ8_MEMBER(nycaptor_state::nycaptor_68705_port_c_r)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- state->m_port_c_in = 0;
+ m_port_c_in = 0;
- if (state->m_main_sent)
- state->m_port_c_in |= 0x01;
- if (!state->m_mcu_sent)
- state->m_port_c_in |= 0x02;
+ if (m_main_sent)
+ m_port_c_in |= 0x01;
+ if (!m_mcu_sent)
+ m_port_c_in |= 0x02;
- return (state->m_port_c_out & state->m_ddr_c) | (state->m_port_c_in & ~state->m_ddr_c);
+ return (m_port_c_out & m_ddr_c) | (m_port_c_in & ~m_ddr_c);
}
-WRITE8_HANDLER( nycaptor_68705_port_c_w )
+WRITE8_MEMBER(nycaptor_state::nycaptor_68705_port_c_w)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- state->m_port_c_out = data;
+ m_port_c_out = data;
}
-WRITE8_HANDLER( nycaptor_68705_ddr_c_w )
+WRITE8_MEMBER(nycaptor_state::nycaptor_68705_ddr_c_w)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- state->m_ddr_c = data;
+ m_ddr_c = data;
}
-WRITE8_HANDLER( nycaptor_mcu_w )
+WRITE8_MEMBER(nycaptor_state::nycaptor_mcu_w)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- state->m_from_main = data;
- state->m_main_sent = 1;
- device_set_input_line(state->m_mcu, 0, ASSERT_LINE);
+ m_from_main = data;
+ m_main_sent = 1;
+ device_set_input_line(m_mcu, 0, ASSERT_LINE);
}
-READ8_HANDLER( nycaptor_mcu_r )
+READ8_MEMBER(nycaptor_state::nycaptor_mcu_r)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- state->m_mcu_sent = 0;
- return state->m_from_mcu;
+ m_mcu_sent = 0;
+ return m_from_mcu;
}
-READ8_HANDLER( nycaptor_mcu_status_r1 )
+READ8_MEMBER(nycaptor_state::nycaptor_mcu_status_r1)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
/* bit 1 = when 1, mcu has sent data to the main cpu */
- return state->m_mcu_sent ? 2 : 0;
+ return m_mcu_sent ? 2 : 0;
}
-READ8_HANDLER( nycaptor_mcu_status_r2 )
+READ8_MEMBER(nycaptor_state::nycaptor_mcu_status_r2)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
/* bit 0 = when 1, mcu is ready to receive data from main cpu */
- return state->m_main_sent ? 0 : 1;
+ return m_main_sent ? 0 : 1;
}
diff --git a/src/mame/machine/opwolf.c b/src/mame/machine/opwolf.c
index 907a437b2ef..3da9a6a7fdd 100644
--- a/src/mame/machine/opwolf.c
+++ b/src/mame/machine/opwolf.c
@@ -388,52 +388,49 @@ static void updateDifficulty( running_machine &machine, int mode )
*
*************************************/
-WRITE16_HANDLER( opwolf_cchip_status_w )
+WRITE16_MEMBER(opwolf_state::opwolf_cchip_status_w)
{
// This is written once after the C-Chip init is complete (and passes)
// We use it to setup some initial state (it's not clear if the real
// c-chip sets this here, or if it's as a side-effect of the other
// init sequence data).
- opwolf_state *state = space->machine().driver_data<opwolf_state>();
- state->m_cchip_ram[0x3d] = 1;
- state->m_cchip_ram[0x7a] = 1;
- updateDifficulty(space->machine(), 0);
+ m_cchip_ram[0x3d] = 1;
+ m_cchip_ram[0x7a] = 1;
+ updateDifficulty(machine(), 0);
}
-WRITE16_HANDLER( opwolf_cchip_bank_w )
+WRITE16_MEMBER(opwolf_state::opwolf_cchip_bank_w)
{
- opwolf_state *state = space->machine().driver_data<opwolf_state>();
- state->m_current_bank = data & 7;
+ m_current_bank = data & 7;
}
-WRITE16_HANDLER( opwolf_cchip_data_w )
+WRITE16_MEMBER(opwolf_state::opwolf_cchip_data_w)
{
- opwolf_state *state = space->machine().driver_data<opwolf_state>();
- state->m_cchip_ram[(state->m_current_bank * 0x400) + offset] = data & 0xff;
+ m_cchip_ram[(m_current_bank * 0x400) + offset] = data & 0xff;
// if (offset != 0x64 && offset != 0x65 && offset != 0x66 && offset != 0x67 && offset != 0x68 && offset != 0x69)
-// logerror("%08x: opwolf c write %04x %04x\n", cpu_get_pc(&space->device()), offset, data);
+// logerror("%08x: opwolf c write %04x %04x\n", cpu_get_pc(&space.device()), offset, data);
- if (state->m_current_bank == 0)
+ if (m_current_bank == 0)
{
// Dip switch A is written here by the 68k - precalculate the coinage values
// Shouldn't we directly read the values from the ROM area ?
if (offset == 0x14)
{
#if OPWOLF_READ_COINAGE_FROM_ROM
- UINT16* rom = (UINT16*)space->machine().region("maincpu")->base();
+ UINT16* rom = (UINT16*)machine().region("maincpu")->base();
UINT32 coin_table[2] = {0, 0};
UINT8 coin_offset[2];
int slot;
- if ((state->m_opwolf_region == OPWOLF_REGION_JAPAN) || (state->m_opwolf_region == OPWOLF_REGION_US))
+ if ((m_opwolf_region == OPWOLF_REGION_JAPAN) || (m_opwolf_region == OPWOLF_REGION_US))
{
coin_table[0] = 0x03ffce;
coin_table[1] = 0x03ffce;
}
- if ((state->m_opwolf_region == OPWOLF_REGION_WORLD) || (state->m_opwolf_region == OPWOLF_REGION_OTHER))
+ if ((m_opwolf_region == OPWOLF_REGION_WORLD) || (m_opwolf_region == OPWOLF_REGION_OTHER))
{
coin_table[0] = 0x03ffde;
coin_table[1] = 0x03ffee;
@@ -445,26 +442,26 @@ WRITE16_HANDLER( opwolf_cchip_data_w )
{
if (coin_table[slot])
{
- state->m_cchip_coins_for_credit[slot] = rom[(coin_table[slot] + coin_offset[slot] + 0) / 2] & 0xff;
- state->m_cchip_credits_for_coin[slot] = rom[(coin_table[slot] + coin_offset[slot] + 2) / 2] & 0xff;
+ m_cchip_coins_for_credit[slot] = rom[(coin_table[slot] + coin_offset[slot] + 0) / 2] & 0xff;
+ m_cchip_credits_for_coin[slot] = rom[(coin_table[slot] + coin_offset[slot] + 2) / 2] & 0xff;
}
}
#else
- if ((state->m_opwolf_region == OPWOLF_REGION_JAPAN) || (state->m_opwolf_region == OPWOLF_REGION_US))
+ if ((m_opwolf_region == OPWOLF_REGION_JAPAN) || (m_opwolf_region == OPWOLF_REGION_US))
{
switch (data&0x30) /* table at 0x03ffce.w - 4 * 2 words (coins for credits first) - inverted order */
{
- case 0x00: state->m_cchip_coins_for_credit[0] = 2; cchip_credits_for_coin[0] = 3; break;
- case 0x10: state->m_cchip_coins_for_credit[0] = 2; cchip_credits_for_coin[0] = 1; break;
- case 0x20: state->m_cchip_coins_for_credit[0] = 1; cchip_credits_for_coin[0] = 2; break;
- case 0x30: state->m_cchip_coins_for_credit[0] = 1; cchip_credits_for_coin[0] = 1; break;
+ case 0x00: m_cchip_coins_for_credit[0] = 2; cchip_credits_for_coin[0] = 3; break;
+ case 0x10: m_cchip_coins_for_credit[0] = 2; cchip_credits_for_coin[0] = 1; break;
+ case 0x20: m_cchip_coins_for_credit[0] = 1; cchip_credits_for_coin[0] = 2; break;
+ case 0x30: m_cchip_coins_for_credit[0] = 1; cchip_credits_for_coin[0] = 1; break;
}
switch (data&0xc0) /* table at 0x03ffce.w - 4 * 2 words (coins for credits first) - inverted order */
{
- case 0x00: state->m_cchip_coins_for_credit[1] = 2; cchip_credits_for_coin[1] = 3; break;
- case 0x40: state->m_cchip_coins_for_credit[1] = 2; cchip_credits_for_coin[1] = 1; break;
- case 0x80: state->m_cchip_coins_for_credit[1] = 1; cchip_credits_for_coin[1] = 2; break;
- case 0xc0: state->m_cchip_coins_for_credit[1] = 1; cchip_credits_for_coin[1] = 1; break;
+ case 0x00: m_cchip_coins_for_credit[1] = 2; cchip_credits_for_coin[1] = 3; break;
+ case 0x40: m_cchip_coins_for_credit[1] = 2; cchip_credits_for_coin[1] = 1; break;
+ case 0x80: m_cchip_coins_for_credit[1] = 1; cchip_credits_for_coin[1] = 2; break;
+ case 0xc0: m_cchip_coins_for_credit[1] = 1; cchip_credits_for_coin[1] = 1; break;
}
}
@@ -472,17 +469,17 @@ WRITE16_HANDLER( opwolf_cchip_data_w )
{
switch (data&0x30) /* table at 0x03ffde.w - 4 * 2 words (coins for credits first) - inverted order */
{
- case 0x00: state->m_cchip_coins_for_credit[0] = 4; cchip_credits_for_coin[0] = 1; break;
- case 0x10: state->m_cchip_coins_for_credit[0] = 3; cchip_credits_for_coin[0] = 1; break;
- case 0x20: state->m_cchip_coins_for_credit[0] = 2; cchip_credits_for_coin[0] = 1; break;
- case 0x30: state->m_cchip_coins_for_credit[0] = 1; cchip_credits_for_coin[0] = 1; break;
+ case 0x00: m_cchip_coins_for_credit[0] = 4; cchip_credits_for_coin[0] = 1; break;
+ case 0x10: m_cchip_coins_for_credit[0] = 3; cchip_credits_for_coin[0] = 1; break;
+ case 0x20: m_cchip_coins_for_credit[0] = 2; cchip_credits_for_coin[0] = 1; break;
+ case 0x30: m_cchip_coins_for_credit[0] = 1; cchip_credits_for_coin[0] = 1; break;
}
switch (data & 0xc0) /* table at 0x03ffee.w - 4 * 2 words (coins for credits first) - inverted order */
{
- case 0x00: state->m_cchip_coins_for_credit[1] = 1; cchip_credits_for_coin[1] = 6; break;
- case 0x40: state->m_cchip_coins_for_credit[1] = 1; cchip_credits_for_coin[1] = 4; break;
- case 0x80: state->m_cchip_coins_for_credit[1] = 1; cchip_credits_for_coin[1] = 3; break;
- case 0xc0: state->m_cchip_coins_for_credit[1] = 1; cchip_credits_for_coin[1] = 2; break;
+ case 0x00: m_cchip_coins_for_credit[1] = 1; cchip_credits_for_coin[1] = 6; break;
+ case 0x40: m_cchip_coins_for_credit[1] = 1; cchip_credits_for_coin[1] = 4; break;
+ case 0x80: m_cchip_coins_for_credit[1] = 1; cchip_credits_for_coin[1] = 3; break;
+ case 0xc0: m_cchip_coins_for_credit[1] = 1; cchip_credits_for_coin[1] = 2; break;
}
}
#endif
@@ -491,7 +488,7 @@ WRITE16_HANDLER( opwolf_cchip_data_w )
// Dip switch B
if (offset == 0x15)
{
- updateDifficulty(space->machine(), 0);
+ updateDifficulty(machine(), 0);
}
}
}
@@ -503,7 +500,7 @@ WRITE16_HANDLER( opwolf_cchip_data_w )
*
*************************************/
-READ16_HANDLER( opwolf_cchip_status_r )
+READ16_MEMBER(opwolf_state::opwolf_cchip_status_r)
{
/*
Bit 0x4 = Error signal
@@ -512,14 +509,13 @@ READ16_HANDLER( opwolf_cchip_status_r )
return 0x1; /* Return 0x5 for C-Chip error */
}
-READ16_HANDLER( opwolf_cchip_data_r )
+READ16_MEMBER(opwolf_state::opwolf_cchip_data_r)
{
- opwolf_state *state = space->machine().driver_data<opwolf_state>();
-// if (offset!=0x7f && offset!=0x1c && offset!=0x1d && offset!=0x1e && offset!=0x1f && offset!=0x20 && cpu_get_pc(&space->device())!=0xc18 && cpu_get_pc(&space->device())!=0xc2e && cpu_get_pc(&space->device())!=0xc9e && offset!=0x50 && offset!=0x51 && offset!=0x52 && offset!=0x53 && offset!=0x5 && offset!=0x13 && offset!=0x79 && offset!=0x12 && offset!=0x34)
-// logerror("%08x: opwolf c read %04x (bank %04x)\n", cpu_get_pc(&space->device()), offset, state->m_current_bank);
+// if (offset!=0x7f && offset!=0x1c && offset!=0x1d && offset!=0x1e && offset!=0x1f && offset!=0x20 && cpu_get_pc(&space.device())!=0xc18 && cpu_get_pc(&space.device())!=0xc2e && cpu_get_pc(&space.device())!=0xc9e && offset!=0x50 && offset!=0x51 && offset!=0x52 && offset!=0x53 && offset!=0x5 && offset!=0x13 && offset!=0x79 && offset!=0x12 && offset!=0x34)
+// logerror("%08x: opwolf c read %04x (bank %04x)\n", cpu_get_pc(&space.device()), offset, m_current_bank);
- return state->m_cchip_ram[(state->m_current_bank * 0x400) + offset];
+ return m_cchip_ram[(m_current_bank * 0x400) + offset];
}
/*************************************
diff --git a/src/mame/machine/pitnrun.c b/src/mame/machine/pitnrun.c
index 0b75c7c73fa..8247be95fda 100644
--- a/src/mame/machine/pitnrun.c
+++ b/src/mame/machine/pitnrun.c
@@ -26,11 +26,10 @@ static TIMER_CALLBACK( pitnrun_mcu_real_data_r )
state->m_zaccept = 1;
}
-READ8_HANDLER( pitnrun_mcu_data_r )
+READ8_MEMBER(pitnrun_state::pitnrun_mcu_data_r)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
- space->machine().scheduler().synchronize(FUNC(pitnrun_mcu_real_data_r));
- return state->m_toz80;
+ machine().scheduler().synchronize(FUNC(pitnrun_mcu_real_data_r));
+ return m_toz80;
}
static TIMER_CALLBACK( pitnrun_mcu_real_data_w )
@@ -41,32 +40,29 @@ static TIMER_CALLBACK( pitnrun_mcu_real_data_w )
state->m_fromz80 = param;
}
-WRITE8_HANDLER( pitnrun_mcu_data_w )
+WRITE8_MEMBER(pitnrun_state::pitnrun_mcu_data_w)
{
- space->machine().scheduler().synchronize(FUNC(pitnrun_mcu_real_data_w), data);
- space->machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(5));
+ machine().scheduler().synchronize(FUNC(pitnrun_mcu_real_data_w), data);
+ machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(5));
}
-READ8_HANDLER( pitnrun_mcu_status_r )
+READ8_MEMBER(pitnrun_state::pitnrun_mcu_status_r)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
/* mcu synchronization */
/* bit 0 = the 68705 has read data from the Z80 */
/* bit 1 = the 68705 has written data for the Z80 */
- return ~((state->m_zready << 1) | (state->m_zaccept << 0));
+ return ~((m_zready << 1) | (m_zaccept << 0));
}
-READ8_HANDLER( pitnrun_68705_portA_r )
+READ8_MEMBER(pitnrun_state::pitnrun_68705_portA_r)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
- return state->m_portA_in;
+ return m_portA_in;
}
-WRITE8_HANDLER( pitnrun_68705_portA_w )
+WRITE8_MEMBER(pitnrun_state::pitnrun_68705_portA_w)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
- state->m_portA_out = data;
+ m_portA_out = data;
}
@@ -89,7 +85,7 @@ WRITE8_HANDLER( pitnrun_68705_portA_w )
* the main Z80 memory location to access)
*/
-READ8_HANDLER( pitnrun_68705_portB_r )
+READ8_MEMBER(pitnrun_state::pitnrun_68705_portB_r)
{
return 0xff;
}
@@ -108,37 +104,36 @@ static TIMER_CALLBACK( pitnrun_mcu_status_real_w )
state->m_zaccept = 0;
}
-WRITE8_HANDLER( pitnrun_68705_portB_w )
+WRITE8_MEMBER(pitnrun_state::pitnrun_68705_portB_w)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
- address_space *cpu0space = space->machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space *cpu0space = machine().device("maincpu")->memory().space(AS_PROGRAM);
if (~data & 0x02)
{
/* 68705 is going to read data from the Z80 */
- space->machine().scheduler().synchronize(FUNC(pitnrun_mcu_data_real_r));
- cputag_set_input_line(space->machine(), "mcu",0,CLEAR_LINE);
- state->m_portA_in = state->m_fromz80;
+ machine().scheduler().synchronize(FUNC(pitnrun_mcu_data_real_r));
+ cputag_set_input_line(machine(), "mcu",0,CLEAR_LINE);
+ m_portA_in = m_fromz80;
}
if (~data & 0x04)
{
/* 68705 is writing data for the Z80 */
- space->machine().scheduler().synchronize(FUNC(pitnrun_mcu_status_real_w), state->m_portA_out);
+ machine().scheduler().synchronize(FUNC(pitnrun_mcu_status_real_w), m_portA_out);
}
if (~data & 0x10)
{
- cpu0space->write_byte(state->m_address, state->m_portA_out);
+ cpu0space->write_byte(m_address, m_portA_out);
}
if (~data & 0x20)
{
- state->m_portA_in = cpu0space->read_byte(state->m_address);
+ m_portA_in = cpu0space->read_byte(m_address);
}
if (~data & 0x40)
{
- state->m_address = (state->m_address & 0xff00) | state->m_portA_out;
+ m_address = (m_address & 0xff00) | m_portA_out;
}
if (~data & 0x80)
{
- state->m_address = (state->m_address & 0x00ff) | (state->m_portA_out << 8);
+ m_address = (m_address & 0x00ff) | (m_portA_out << 8);
}
}
@@ -152,8 +147,7 @@ WRITE8_HANDLER( pitnrun_68705_portB_w )
* passes through)
*/
-READ8_HANDLER( pitnrun_68705_portC_r )
+READ8_MEMBER(pitnrun_state::pitnrun_68705_portC_r)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
- return (state->m_zready << 0) | (state->m_zaccept << 1);
+ return (m_zready << 0) | (m_zaccept << 1);
}
diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c
index 4f8d9df42b6..e96fca012d4 100644
--- a/src/mame/machine/playch10.c
+++ b/src/mame/machine/playch10.c
@@ -5,11 +5,6 @@
#include "includes/playch10.h"
/* prototypes */
-static void pc10_set_mirroring( playch10_state *state, int mirroring );
-static WRITE8_HANDLER( pc10_nt_w );
-static READ8_HANDLER( pc10_nt_r );
-static WRITE8_HANDLER( pc10_chr_w );
-static READ8_HANDLER( pc10_chr_r );
static void pc10_set_videorom_bank( running_machine &machine, int first, int count, int bank, int size );
static void set_videoram_bank( running_machine &machine, int first, int count, int bank, int size );
@@ -45,7 +40,7 @@ MACHINE_RESET( pc10 )
rp5h01_reset_w(rp5h01, 0, 1);
rp5h01_enable_w(rp5h01, 0, 1);
- pc10_set_mirroring(state, state->m_mirroring);
+ state->pc10_set_mirroring(state->m_mirroring);
}
MACHINE_START( pc10 )
@@ -57,8 +52,8 @@ MACHINE_START( pc10 )
/* move to individual boards as documentation of actual boards allows */
state->m_nt_ram = auto_alloc_array(machine, UINT8, 0x1000);
- machine.device("ppu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0, 0x1fff, FUNC(pc10_chr_r), FUNC(pc10_chr_w));
- machine.device("ppu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x2000, 0x3eff, FUNC(pc10_nt_r), FUNC(pc10_nt_w));
+ machine.device("ppu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0, 0x1fff, read8_delegate(FUNC(playch10_state::pc10_chr_r),state), write8_delegate(FUNC(playch10_state::pc10_chr_w),state));
+ machine.device("ppu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(playch10_state::pc10_nt_r),state),write8_delegate(FUNC(playch10_state::pc10_nt_w),state));
if (NULL != state->m_vram)
set_videoram_bank(machine, 0, 8, 0, 8);
@@ -81,8 +76,8 @@ MACHINE_START( playch10_hboard )
state->m_vram = auto_alloc_array(machine, UINT8, 0x2000);
- machine.device("ppu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0, 0x1fff, FUNC(pc10_chr_r), FUNC(pc10_chr_w));
- machine.device("ppu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x2000, 0x3eff, FUNC(pc10_nt_r), FUNC(pc10_nt_w));
+ machine.device("ppu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0, 0x1fff, read8_delegate(FUNC(playch10_state::pc10_chr_r),state), write8_delegate(FUNC(playch10_state::pc10_chr_w),state));
+ machine.device("ppu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(playch10_state::pc10_nt_r),state), write8_delegate(FUNC(playch10_state::pc10_nt_w),state));
}
/*************************************
@@ -97,76 +92,69 @@ CUSTOM_INPUT( pc10_int_detect_r )
return ~state->m_pc10_int_detect & 1;
}
-WRITE8_HANDLER( pc10_SDCS_w )
+WRITE8_MEMBER(playch10_state::pc10_SDCS_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
/*
Hooked to CLR on LS194A - Sheet 2, bottom left.
Drives character and color code to 0.
It's used to keep the screen black during redraws.
Also hooked to the video sram. Prevent writes.
*/
- state->m_pc10_sdcs = ~data & 1;
+ m_pc10_sdcs = ~data & 1;
}
-WRITE8_HANDLER( pc10_CNTRLMASK_w )
+WRITE8_MEMBER(playch10_state::pc10_CNTRLMASK_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
- state->m_cntrl_mask = ~data & 1;
+ m_cntrl_mask = ~data & 1;
}
-WRITE8_HANDLER( pc10_DISPMASK_w )
+WRITE8_MEMBER(playch10_state::pc10_DISPMASK_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
- state->m_pc10_dispmask = ~data & 1;
+ m_pc10_dispmask = ~data & 1;
}
-WRITE8_HANDLER( pc10_SOUNDMASK_w )
+WRITE8_MEMBER(playch10_state::pc10_SOUNDMASK_w)
{
/* should mute the APU - unimplemented yet */
}
-WRITE8_HANDLER( pc10_NMIENABLE_w )
+WRITE8_MEMBER(playch10_state::pc10_NMIENABLE_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
- state->m_pc10_nmi_enable = data & 1;
+ m_pc10_nmi_enable = data & 1;
}
-WRITE8_HANDLER( pc10_DOGDI_w )
+WRITE8_MEMBER(playch10_state::pc10_DOGDI_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
- state->m_pc10_dog_di = data & 1;
+ m_pc10_dog_di = data & 1;
}
-WRITE8_HANDLER( pc10_GAMERES_w )
+WRITE8_MEMBER(playch10_state::pc10_GAMERES_w)
{
- cputag_set_input_line(space->machine(), "cart", INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE );
+ cputag_set_input_line(machine(), "cart", INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE );
}
-WRITE8_HANDLER( pc10_GAMESTOP_w )
+WRITE8_MEMBER(playch10_state::pc10_GAMESTOP_w)
{
- cputag_set_input_line(space->machine(), "cart", INPUT_LINE_HALT, (data & 1) ? CLEAR_LINE : ASSERT_LINE );
+ cputag_set_input_line(machine(), "cart", INPUT_LINE_HALT, (data & 1) ? CLEAR_LINE : ASSERT_LINE );
}
-WRITE8_HANDLER( pc10_PPURES_w )
+WRITE8_MEMBER(playch10_state::pc10_PPURES_w)
{
if (data & 1)
- devtag_reset(space->machine(), "ppu");
+ devtag_reset(machine(), "ppu");
}
-READ8_HANDLER( pc10_detectclr_r )
+READ8_MEMBER(playch10_state::pc10_detectclr_r)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
- state->m_pc10_int_detect = 0;
+ m_pc10_int_detect = 0;
return 0;
}
-WRITE8_HANDLER( pc10_CARTSEL_w )
+WRITE8_MEMBER(playch10_state::pc10_CARTSEL_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
- state->m_cart_sel &= ~(1 << offset);
- state->m_cart_sel |= (data & 1) << offset;
+ m_cart_sel &= ~(1 << offset);
+ m_cart_sel |= (data & 1) << offset;
}
@@ -176,14 +164,13 @@ WRITE8_HANDLER( pc10_CARTSEL_w )
*
*************************************/
-READ8_HANDLER( pc10_prot_r )
+READ8_MEMBER(playch10_state::pc10_prot_r)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
- device_t *rp5h01 = space->machine().device("rp5h01");
+ device_t *rp5h01 = machine().device("rp5h01");
int data = 0xe7;
/* we only support a single cart connected at slot 0 */
- if (state->m_cart_sel == 0)
+ if (m_cart_sel == 0)
{
rp5h01_enable_w(rp5h01, 0, 0);
data |= ((~rp5h01_counter_r(rp5h01, 0)) << 4) & 0x10; /* D4 */
@@ -193,12 +180,11 @@ READ8_HANDLER( pc10_prot_r )
return data;
}
-WRITE8_HANDLER( pc10_prot_w )
+WRITE8_MEMBER(playch10_state::pc10_prot_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
- device_t *rp5h01 = space->machine().device("rp5h01");
+ device_t *rp5h01 = machine().device("rp5h01");
/* we only support a single cart connected at slot 0 */
- if (state->m_cart_sel == 0)
+ if (m_cart_sel == 0)
{
rp5h01_enable_w(rp5h01, 0, 0);
rp5h01_test_w(rp5h01, 0, data & 0x10); /* D4 */
@@ -211,7 +197,7 @@ WRITE8_HANDLER( pc10_prot_w )
/* is the actual protection memory area */
/* setting the whole 0x2000 region every time is a waste */
/* so we just set $ffff with the current value */
- space->machine().region("maincpu")->base()[0xffff] = pc10_prot_r(space, 0);
+ machine().region("maincpu")->base()[0xffff] = pc10_prot_r(space, 0);
}
}
@@ -222,32 +208,30 @@ WRITE8_HANDLER( pc10_prot_w )
*
*************************************/
-WRITE8_HANDLER( pc10_in0_w )
+WRITE8_MEMBER(playch10_state::pc10_in0_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
/* Toggling bit 0 high then low resets both controllers */
if (data & 1)
return;
/* load up the latches */
- state->m_input_latch[0] = input_port_read(space->machine(), "P1");
- state->m_input_latch[1] = input_port_read(space->machine(), "P2");
+ m_input_latch[0] = input_port_read(machine(), "P1");
+ m_input_latch[1] = input_port_read(machine(), "P2");
/* apply any masking from the BIOS */
- if (state->m_cntrl_mask)
+ if (m_cntrl_mask)
{
/* mask out select and start */
- state->m_input_latch[0] &= ~0x0c;
+ m_input_latch[0] &= ~0x0c;
}
}
-READ8_HANDLER( pc10_in0_r )
+READ8_MEMBER(playch10_state::pc10_in0_r)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
- int ret = (state->m_input_latch[0]) & 1;
+ int ret = (m_input_latch[0]) & 1;
/* shift */
- state->m_input_latch[0] >>= 1;
+ m_input_latch[0] >>= 1;
/* some games expect bit 6 to be set because the last entry on the data bus shows up */
/* in the unused upper 3 bits, so typically a read from $4016 leaves 0x40 there. */
@@ -256,21 +240,20 @@ READ8_HANDLER( pc10_in0_r )
return ret;
}
-READ8_HANDLER( pc10_in1_r )
+READ8_MEMBER(playch10_state::pc10_in1_r)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
- int ret = (state->m_input_latch[1]) & 1;
+ int ret = (m_input_latch[1]) & 1;
/* shift */
- state->m_input_latch[1] >>= 1;
+ m_input_latch[1] >>= 1;
/* do the gun thing */
- if (state->m_pc10_gun_controller)
+ if (m_pc10_gun_controller)
{
- ppu2c0x_device *ppu = space->machine().device<ppu2c0x_device>("ppu");
- int trigger = input_port_read(space->machine(), "P1");
- int x = input_port_read(space->machine(), "GUNX");
- int y = input_port_read(space->machine(), "GUNY");
+ ppu2c0x_device *ppu = machine().device<ppu2c0x_device>("ppu");
+ int trigger = input_port_read(machine(), "P1");
+ int x = input_port_read(machine(), "GUNX");
+ int y = input_port_read(machine(), "GUNY");
UINT32 pix, color_base;
/* no sprite hit (yet) */
@@ -290,7 +273,7 @@ READ8_HANDLER( pc10_in1_r )
}
/* now, add the trigger if not masked */
- if (!state->m_cntrl_mask)
+ if (!m_cntrl_mask)
{
ret |= (trigger & 2) << 3;
}
@@ -308,65 +291,61 @@ READ8_HANDLER( pc10_in1_r )
*
*************************************/
-static WRITE8_HANDLER( pc10_nt_w )
+WRITE8_MEMBER(playch10_state::pc10_nt_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
int page = ((offset & 0xc00) >> 10);
- state->m_nametable[page][offset & 0x3ff] = data;
+ m_nametable[page][offset & 0x3ff] = data;
}
-static READ8_HANDLER( pc10_nt_r )
+READ8_MEMBER(playch10_state::pc10_nt_r)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
int page = ((offset & 0xc00) >> 10);
- return state->m_nametable[page][offset & 0x3ff];
+ return m_nametable[page][offset & 0x3ff];
}
-static WRITE8_HANDLER( pc10_chr_w )
+WRITE8_MEMBER(playch10_state::pc10_chr_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
int bank = offset >> 10;
- if (state->m_chr_page[bank].writable)
+ if (m_chr_page[bank].writable)
{
- state->m_chr_page[bank].chr[offset & 0x3ff] = data;
+ m_chr_page[bank].chr[offset & 0x3ff] = data;
}
}
-static READ8_HANDLER( pc10_chr_r )
+READ8_MEMBER(playch10_state::pc10_chr_r)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
int bank = offset >> 10;
- return state->m_chr_page[bank].chr[offset & 0x3ff];
+ return m_chr_page[bank].chr[offset & 0x3ff];
}
-static void pc10_set_mirroring( playch10_state *state, int mirroring )
+void playch10_state::pc10_set_mirroring(int mirroring )
{
switch (mirroring)
{
case PPU_MIRROR_LOW:
- state->m_nametable[0] = state->m_nametable[1] = state->m_nametable[2] = state->m_nametable[3] = state->m_nt_ram;
+ m_nametable[0] = m_nametable[1] = m_nametable[2] = m_nametable[3] = m_nt_ram;
break;
case PPU_MIRROR_HIGH:
- state->m_nametable[0] = state->m_nametable[1] = state->m_nametable[2] = state->m_nametable[3] = state->m_nt_ram + 0x400;
+ m_nametable[0] = m_nametable[1] = m_nametable[2] = m_nametable[3] = m_nt_ram + 0x400;
break;
case PPU_MIRROR_HORZ:
- state->m_nametable[0] = state->m_nt_ram;
- state->m_nametable[1] = state->m_nt_ram;
- state->m_nametable[2] = state->m_nt_ram + 0x400;
- state->m_nametable[3] = state->m_nt_ram + 0x400;
+ m_nametable[0] = m_nt_ram;
+ m_nametable[1] = m_nt_ram;
+ m_nametable[2] = m_nt_ram + 0x400;
+ m_nametable[3] = m_nt_ram + 0x400;
break;
case PPU_MIRROR_VERT:
- state->m_nametable[0] = state->m_nt_ram;
- state->m_nametable[1] = state->m_nt_ram + 0x400;
- state->m_nametable[2] = state->m_nt_ram;
- state->m_nametable[3] = state->m_nt_ram + 0x400;
+ m_nametable[0] = m_nt_ram;
+ m_nametable[1] = m_nt_ram + 0x400;
+ m_nametable[2] = m_nt_ram;
+ m_nametable[3] = m_nt_ram + 0x400;
break;
case PPU_MIRROR_NONE:
default:
- state->m_nametable[0] = state->m_nt_ram;
- state->m_nametable[1] = state->m_nt_ram + 0x400;
- state->m_nametable[2] = state->m_nt_ram + 0x800;
- state->m_nametable[3] = state->m_nt_ram + 0xc00;
+ m_nametable[0] = m_nt_ram;
+ m_nametable[1] = m_nt_ram + 0x400;
+ m_nametable[2] = m_nt_ram + 0x800;
+ m_nametable[3] = m_nt_ram + 0xc00;
break;
}
}
@@ -481,9 +460,8 @@ DRIVER_INIT( pc_hrz )
/* MMC1 mapper, used by D and F boards */
-static WRITE8_HANDLER( mmc1_rom_switch_w )
+WRITE8_MEMBER(playch10_state::mmc1_rom_switch_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
/* basically, a MMC1 mapper from the nes */
static int size16k, switchlow, vrom4k;
@@ -492,7 +470,7 @@ static WRITE8_HANDLER( mmc1_rom_switch_w )
/* reset mapper */
if (data & 0x80)
{
- state->m_mmc1_shiftreg = state->m_mmc1_shiftcount = 0;
+ m_mmc1_shiftreg = m_mmc1_shiftcount = 0;
size16k = 1;
switchlow = 1;
@@ -502,18 +480,18 @@ static WRITE8_HANDLER( mmc1_rom_switch_w )
}
/* see if we need to clock in data */
- if (state->m_mmc1_shiftcount < 5)
+ if (m_mmc1_shiftcount < 5)
{
- state->m_mmc1_shiftreg >>= 1;
- state->m_mmc1_shiftreg |= (data & 1) << 4;
- state->m_mmc1_shiftcount++;
+ m_mmc1_shiftreg >>= 1;
+ m_mmc1_shiftreg |= (data & 1) << 4;
+ m_mmc1_shiftcount++;
}
/* are we done shifting? */
- if (state->m_mmc1_shiftcount == 5)
+ if (m_mmc1_shiftcount == 5)
{
/* reset count */
- state->m_mmc1_shiftcount = 0;
+ m_mmc1_shiftcount = 0;
/* apply data to registers */
switch (reg)
@@ -522,11 +500,11 @@ static WRITE8_HANDLER( mmc1_rom_switch_w )
{
int _mirroring;
- vrom4k = state->m_mmc1_shiftreg & 0x10;
- size16k = state->m_mmc1_shiftreg & 0x08;
- switchlow = state->m_mmc1_shiftreg & 0x04;
+ vrom4k = m_mmc1_shiftreg & 0x10;
+ size16k = m_mmc1_shiftreg & 0x08;
+ switchlow = m_mmc1_shiftreg & 0x04;
- switch (state->m_mmc1_shiftreg & 3)
+ switch (m_mmc1_shiftreg & 3)
{
case 0:
_mirroring = PPU_MIRROR_LOW;
@@ -547,31 +525,31 @@ static WRITE8_HANDLER( mmc1_rom_switch_w )
}
/* apply mirroring */
- pc10_set_mirroring(state, _mirroring);
+ pc10_set_mirroring(_mirroring);
}
break;
case 1: /* video rom banking - bank 0 - 4k or 8k */
- if (state->m_vram)
- set_videoram_bank(space->machine(), 0, (vrom4k) ? 4 : 8, (state->m_mmc1_shiftreg & 0x1f), 4);
+ if (m_vram)
+ set_videoram_bank(machine(), 0, (vrom4k) ? 4 : 8, (m_mmc1_shiftreg & 0x1f), 4);
else
- pc10_set_videorom_bank(space->machine(), 0, (vrom4k) ? 4 : 8, (state->m_mmc1_shiftreg & 0x1f), 4);
+ pc10_set_videorom_bank(machine(), 0, (vrom4k) ? 4 : 8, (m_mmc1_shiftreg & 0x1f), 4);
break;
case 2: /* video rom banking - bank 1 - 4k only */
if (vrom4k)
{
- if (state->m_vram)
- set_videoram_bank(space->machine(), 0, (vrom4k) ? 4 : 8, (state->m_mmc1_shiftreg & 0x1f), 4);
+ if (m_vram)
+ set_videoram_bank(machine(), 0, (vrom4k) ? 4 : 8, (m_mmc1_shiftreg & 0x1f), 4);
else
- pc10_set_videorom_bank(space->machine(), 4, 4, (state->m_mmc1_shiftreg & 0x1f), 4);
+ pc10_set_videorom_bank(machine(), 4, 4, (m_mmc1_shiftreg & 0x1f), 4);
}
break;
case 3: /* program banking */
{
- int bank = (state->m_mmc1_shiftreg & state->m_mmc1_rom_mask) * 0x4000;
- UINT8 *prg = space->machine().region("cart")->base();
+ int bank = (m_mmc1_shiftreg & m_mmc1_rom_mask) * 0x4000;
+ UINT8 *prg = machine().region("cart")->base();
if (!size16k)
{
@@ -601,16 +579,16 @@ static WRITE8_HANDLER( mmc1_rom_switch_w )
/**********************************************************************************/
/* A Board games (Track & Field, Gradius) */
-static WRITE8_HANDLER( aboard_vrom_switch_w )
+WRITE8_MEMBER(playch10_state::aboard_vrom_switch_w)
{
- pc10_set_videorom_bank(space->machine(), 0, 8, (data & 3), 8);
+ pc10_set_videorom_bank(machine(), 0, 8, (data & 3), 8);
}
DRIVER_INIT( pcaboard )
{
playch10_state *state = machine.driver_data<playch10_state>();
/* switches vrom with writes to the $803e-$8041 area */
- machine.device("cart")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0x8fff, FUNC(aboard_vrom_switch_w) );
+ machine.device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0x8fff, write8_delegate(FUNC(playch10_state::aboard_vrom_switch_w),state));
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -625,10 +603,10 @@ DRIVER_INIT( pcaboard )
/**********************************************************************************/
/* B Board games (Contra, Rush N' Attach, Pro Wrestling) */
-static WRITE8_HANDLER( bboard_rom_switch_w )
+WRITE8_MEMBER(playch10_state::bboard_rom_switch_w)
{
int bankoffset = 0x10000 + ((data & 7) * 0x4000);
- UINT8 *prg = space->machine().region("cart")->base();
+ UINT8 *prg = machine().region("cart")->base();
memcpy(&prg[0x08000], &prg[bankoffset], 0x4000);
}
@@ -643,7 +621,7 @@ DRIVER_INIT( pcbboard )
memcpy(&prg[0x08000], &prg[0x28000], 0x8000);
/* Roms are banked at $8000 to $bfff */
- machine.device("cart")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0xffff, FUNC(bboard_rom_switch_w) );
+ machine.device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::bboard_rom_switch_w),state));
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -660,16 +638,16 @@ DRIVER_INIT( pcbboard )
/**********************************************************************************/
/* C Board games (The Goonies) */
-static WRITE8_HANDLER( cboard_vrom_switch_w )
+WRITE8_MEMBER(playch10_state::cboard_vrom_switch_w)
{
- pc10_set_videorom_bank(space->machine(), 0, 8, ((data >> 1) & 1), 8);
+ pc10_set_videorom_bank(machine(), 0, 8, ((data >> 1) & 1), 8);
}
DRIVER_INIT( pccboard )
{
playch10_state *state = machine.driver_data<playch10_state>();
/* switches vrom with writes to $6000 */
- machine.device("cart")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x6000, 0x6000, FUNC(cboard_vrom_switch_w) );
+ machine.device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x6000, 0x6000, write8_delegate(FUNC(playch10_state::cboard_vrom_switch_w),state));
/* we have no vram, make sure switching games doesn't point to an old allocation */
state->m_vram = NULL;
@@ -693,7 +671,7 @@ DRIVER_INIT( pcdboard )
state->m_mmc1_rom_mask = 0x07;
/* MMC mapper at writes to $8000-$ffff */
- machine.device("cart")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0xffff, FUNC(mmc1_rom_switch_w) );
+ machine.device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::mmc1_rom_switch_w),state));
/* common init */
@@ -751,46 +729,45 @@ static void mapper9_latch( device_t *ppu, offs_t offset )
}
}
-static WRITE8_HANDLER( eboard_rom_switch_w )
+WRITE8_MEMBER(playch10_state::eboard_rom_switch_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
/* a variation of mapper 9 on a nes */
switch (offset & 0x7000)
{
case 0x2000: /* code bank switching */
{
int bankoffset = 0x10000 + (data & 0x0f) * 0x2000;
- UINT8 *prg = space->machine().region("cart")->base();
+ UINT8 *prg = machine().region("cart")->base();
memcpy(&prg[0x08000], &prg[bankoffset], 0x2000);
}
break;
case 0x3000: /* gfx bank 0 - 4k */
- state->m_MMC2_bank[0] = data;
- if (state->m_MMC2_bank_latch[0] == 0xfd)
- pc10_set_videorom_bank(space->machine(), 0, 4, data, 4);
+ m_MMC2_bank[0] = data;
+ if (m_MMC2_bank_latch[0] == 0xfd)
+ pc10_set_videorom_bank(machine(), 0, 4, data, 4);
break;
case 0x4000: /* gfx bank 0 - 4k */
- state->m_MMC2_bank[1] = data;
- if (state->m_MMC2_bank_latch[0] == 0xfe)
- pc10_set_videorom_bank(space->machine(), 0, 4, data, 4);
+ m_MMC2_bank[1] = data;
+ if (m_MMC2_bank_latch[0] == 0xfe)
+ pc10_set_videorom_bank(machine(), 0, 4, data, 4);
break;
case 0x5000: /* gfx bank 1 - 4k */
- state->m_MMC2_bank[2] = data;
- if (state->m_MMC2_bank_latch[1] == 0xfd)
- pc10_set_videorom_bank(space->machine(), 4, 4, data, 4);
+ m_MMC2_bank[2] = data;
+ if (m_MMC2_bank_latch[1] == 0xfd)
+ pc10_set_videorom_bank(machine(), 4, 4, data, 4);
break;
case 0x6000: /* gfx bank 1 - 4k */
- state->m_MMC2_bank[3] = data;
- if (state->m_MMC2_bank_latch[1] == 0xfe)
- pc10_set_videorom_bank(space->machine(), 4, 4, data, 4);
+ m_MMC2_bank[3] = data;
+ if (m_MMC2_bank_latch[1] == 0xfe)
+ pc10_set_videorom_bank(machine(), 4, 4, data, 4);
break;
case 0x7000: /* mirroring */
- pc10_set_mirroring(state, data ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT);
+ pc10_set_mirroring(data ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT);
break;
}
@@ -810,7 +787,7 @@ DRIVER_INIT( pceboard )
memcpy(&prg[0x08000], &prg[0x28000], 0x8000);
/* basically a mapper 9 on a nes */
- machine.device("cart")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0xffff, FUNC(eboard_rom_switch_w) );
+ machine.device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::eboard_rom_switch_w),state));
/* ppu_latch callback */
ppu->set_latch(mapper9_latch);
@@ -840,7 +817,7 @@ DRIVER_INIT( pcfboard )
state->m_mmc1_rom_mask = 0x07;
/* MMC mapper at writes to $8000-$ffff */
- machine.device("cart")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0xffff, FUNC(mmc1_rom_switch_w) );
+ machine.device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::mmc1_rom_switch_w),state));
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -877,28 +854,27 @@ static void gboard_scanline_cb( device_t *device, int scanline, int vblank, int
}
}
-static WRITE8_HANDLER( gboard_rom_switch_w )
+WRITE8_MEMBER(playch10_state::gboard_rom_switch_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
- ppu2c0x_device *ppu = space->machine().device<ppu2c0x_device>("ppu");
+ ppu2c0x_device *ppu = machine().device<ppu2c0x_device>("ppu");
/* basically, a MMC3 mapper from the nes */
switch (offset & 0x7001)
{
case 0x0000:
- state->m_gboard_command = data;
+ m_gboard_command = data;
- if (state->m_gboard_last_bank != (data & 0xc0))
+ if (m_gboard_last_bank != (data & 0xc0))
{
int bank;
- UINT8 *prg = space->machine().region("cart")->base();
+ UINT8 *prg = machine().region("cart")->base();
/* reset the banks */
- if (state->m_gboard_command & 0x40)
+ if (m_gboard_command & 0x40)
{
/* high bank */
- bank = state->m_gboard_banks[0] * 0x2000 + 0x10000;
+ bank = m_gboard_banks[0] * 0x2000 + 0x10000;
memcpy(&prg[0x0c000], &prg[bank], 0x2000);
memcpy(&prg[0x08000], &prg[0x4c000], 0x2000);
@@ -906,24 +882,24 @@ static WRITE8_HANDLER( gboard_rom_switch_w )
else
{
/* low bank */
- bank = state->m_gboard_banks[0] * 0x2000 + 0x10000;
+ bank = m_gboard_banks[0] * 0x2000 + 0x10000;
memcpy(&prg[0x08000], &prg[bank], 0x2000);
memcpy(&prg[0x0c000], &prg[0x4c000], 0x2000);
}
/* mid bank */
- bank = state->m_gboard_banks[1] * 0x2000 + 0x10000;
+ bank = m_gboard_banks[1] * 0x2000 + 0x10000;
memcpy(&prg[0x0a000], &prg[bank], 0x2000);
- state->m_gboard_last_bank = data & 0xc0;
+ m_gboard_last_bank = data & 0xc0;
}
break;
case 0x0001:
{
- UINT8 cmd = state->m_gboard_command & 0x07;
- int page = (state->m_gboard_command & 0x80) >> 5;
+ UINT8 cmd = m_gboard_command & 0x07;
+ int page = (m_gboard_command & 0x80) >> 5;
int bank;
switch (cmd)
@@ -932,7 +908,7 @@ static WRITE8_HANDLER( gboard_rom_switch_w )
case 1: /* char banking */
data &= 0xfe;
page ^= (cmd << 1);
- pc10_set_videorom_bank(space->machine(), page, 2, data, 1);
+ pc10_set_videorom_bank(machine(), page, 2, data, 1);
break;
case 2: /* char banking */
@@ -940,17 +916,17 @@ static WRITE8_HANDLER( gboard_rom_switch_w )
case 4: /* char banking */
case 5: /* char banking */
page ^= cmd + 2;
- pc10_set_videorom_bank(space->machine(), page, 1, data, 1);
+ pc10_set_videorom_bank(machine(), page, 1, data, 1);
break;
case 6: /* program banking */
{
- UINT8 *prg = space->machine().region("cart")->base();
- if (state->m_gboard_command & 0x40)
+ UINT8 *prg = machine().region("cart")->base();
+ if (m_gboard_command & 0x40)
{
/* high bank */
- state->m_gboard_banks[0] = data & 0x1f;
- bank = (state->m_gboard_banks[0]) * 0x2000 + 0x10000;
+ m_gboard_banks[0] = data & 0x1f;
+ bank = (m_gboard_banks[0]) * 0x2000 + 0x10000;
memcpy(&prg[0x0c000], &prg[bank], 0x2000);
memcpy(&prg[0x08000], &prg[0x4c000], 0x2000);
@@ -958,8 +934,8 @@ static WRITE8_HANDLER( gboard_rom_switch_w )
else
{
/* low bank */
- state->m_gboard_banks[0] = data & 0x1f;
- bank = (state->m_gboard_banks[0]) * 0x2000 + 0x10000;
+ m_gboard_banks[0] = data & 0x1f;
+ bank = (m_gboard_banks[0]) * 0x2000 + 0x10000;
memcpy(&prg[0x08000], &prg[bank], 0x2000);
memcpy(&prg[0x0c000], &prg[0x4c000], 0x2000);
@@ -970,9 +946,9 @@ static WRITE8_HANDLER( gboard_rom_switch_w )
case 7: /* program banking */
{
/* mid bank */
- UINT8 *prg = space->machine().region("cart")->base();
- state->m_gboard_banks[1] = data & 0x1f;
- bank = state->m_gboard_banks[1] * 0x2000 + 0x10000;
+ UINT8 *prg = machine().region("cart")->base();
+ m_gboard_banks[1] = data & 0x1f;
+ bank = m_gboard_banks[1] * 0x2000 + 0x10000;
memcpy(&prg[0x0a000], &prg[bank], 0x2000);
}
@@ -982,12 +958,12 @@ static WRITE8_HANDLER( gboard_rom_switch_w )
break;
case 0x2000: /* mirroring */
- if (!state->m_gboard_4screen)
+ if (!m_gboard_4screen)
{
if (data & 0x40)
- pc10_set_mirroring(state, PPU_MIRROR_HIGH);
+ pc10_set_mirroring(PPU_MIRROR_HIGH);
else
- pc10_set_mirroring(state, (data & 1) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT);
+ pc10_set_mirroring((data & 1) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT);
}
break;
@@ -996,11 +972,11 @@ static WRITE8_HANDLER( gboard_rom_switch_w )
break;
case 0x4000: /* scanline counter */
- state->m_gboard_scanline_counter = data;
+ m_gboard_scanline_counter = data;
break;
case 0x4001: /* scanline latch */
- state->m_gboard_scanline_latch = data;
+ m_gboard_scanline_latch = data;
break;
case 0x6000: /* disable irqs */
@@ -1025,7 +1001,7 @@ DRIVER_INIT( pcgboard )
memcpy(&prg[0x0c000], &prg[0x4c000], 0x4000);
/* MMC3 mapper at writes to $8000-$ffff */
- machine.device("cart")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0xffff, FUNC(gboard_rom_switch_w) );
+ machine.device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::gboard_rom_switch_w),state));
/* extra ram at $6000-$7fff */
machine.device("cart")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff);
@@ -1054,16 +1030,15 @@ DRIVER_INIT( pcgboard_type2 )
/**********************************************************************************/
/* i Board games (Captain Sky Hawk, Solar Jetman) */
-static WRITE8_HANDLER( iboard_rom_switch_w )
+WRITE8_MEMBER(playch10_state::iboard_rom_switch_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
int bank = data & 7;
- UINT8 *prg = space->machine().region("cart")->base();
+ UINT8 *prg = machine().region("cart")->base();
if (data & 0x10)
- pc10_set_mirroring(state, PPU_MIRROR_HIGH);
+ pc10_set_mirroring(PPU_MIRROR_HIGH);
else
- pc10_set_mirroring(state, PPU_MIRROR_LOW);
+ pc10_set_mirroring(PPU_MIRROR_LOW);
memcpy(&prg[0x08000], &prg[bank * 0x8000 + 0x10000], 0x8000);
}
@@ -1078,7 +1053,7 @@ DRIVER_INIT( pciboard )
memcpy(&prg[0x08000], &prg[0x10000], 0x8000);
/* Roms are banked at $8000 to $bfff */
- machine.device("cart")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0xffff, FUNC(iboard_rom_switch_w) );
+ machine.device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::iboard_rom_switch_w),state));
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -1092,15 +1067,14 @@ DRIVER_INIT( pciboard )
/**********************************************************************************/
/* H Board games (PinBot) */
-static WRITE8_HANDLER( hboard_rom_switch_w )
+WRITE8_MEMBER(playch10_state::hboard_rom_switch_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
switch (offset & 0x7001)
{
case 0x0001:
{
- UINT8 cmd = state->m_gboard_command & 0x07;
- int page = (state->m_gboard_command & 0x80) >> 5;
+ UINT8 cmd = m_gboard_command & 0x07;
+ int page = (m_gboard_command & 0x80) >> 5;
switch (cmd)
{
@@ -1110,11 +1084,11 @@ static WRITE8_HANDLER( hboard_rom_switch_w )
page ^= (cmd << 1);
if (data & 0x40)
{
- set_videoram_bank(space->machine(), page, 2, data, 1);
+ set_videoram_bank(machine(), page, 2, data, 1);
}
else
{
- pc10_set_videorom_bank(space->machine(), page, 2, data, 1);
+ pc10_set_videorom_bank(machine(), page, 2, data, 1);
}
return;
@@ -1125,11 +1099,11 @@ static WRITE8_HANDLER( hboard_rom_switch_w )
page ^= cmd + 2;
if (data & 0x40)
{
- set_videoram_bank(space->machine(), page, 1, data, 1);
+ set_videoram_bank(machine(), page, 1, data, 1);
}
else
{
- pc10_set_videorom_bank(space->machine(), page, 1, data, 1);
+ pc10_set_videorom_bank(machine(), page, 1, data, 1);
}
return;
}
@@ -1147,7 +1121,7 @@ DRIVER_INIT( pchboard )
memcpy(&prg[0x0c000], &prg[0x4c000], 0x4000);
/* Roms are banked at $8000 to $bfff */
- machine.device("cart")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0xffff, FUNC(hboard_rom_switch_w) );
+ machine.device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::hboard_rom_switch_w),state));
/* extra ram at $6000-$7fff */
machine.device("cart")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff);
@@ -1181,7 +1155,7 @@ DRIVER_INIT( pckboard )
machine.device("cart")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff);
/* Roms are banked at $8000 to $bfff */
- machine.device("cart")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0xffff, FUNC(mmc1_rom_switch_w) );
+ machine.device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::mmc1_rom_switch_w),state));
/* common init */
DRIVER_INIT_CALL(playch10);
diff --git a/src/mame/machine/qix.c b/src/mame/machine/qix.c
index 7eca216e4d4..7b6083d6b33 100644
--- a/src/mame/machine/qix.c
+++ b/src/mame/machine/qix.c
@@ -264,9 +264,9 @@ WRITE_LINE_DEVICE_HANDLER( qix_vsync_changed )
*
*************************************/
-WRITE8_HANDLER( zookeep_bankswitch_w )
+WRITE8_MEMBER(qix_state::zookeep_bankswitch_w)
{
- memory_set_bank(space->machine(), "bank1", (data >> 2) & 1);
+ memory_set_bank(machine(), "bank1", (data >> 2) & 1);
/* not necessary, but technically correct */
qix_palettebank_w(space, offset, data);
}
@@ -279,28 +279,28 @@ WRITE8_HANDLER( zookeep_bankswitch_w )
*
*************************************/
-WRITE8_HANDLER( qix_data_firq_w )
+WRITE8_MEMBER(qix_state::qix_data_firq_w)
{
- cputag_set_input_line(space->machine(), "maincpu", M6809_FIRQ_LINE, ASSERT_LINE);
+ cputag_set_input_line(machine(), "maincpu", M6809_FIRQ_LINE, ASSERT_LINE);
}
-WRITE8_HANDLER( qix_data_firq_ack_w )
+WRITE8_MEMBER(qix_state::qix_data_firq_ack_w)
{
- cputag_set_input_line(space->machine(), "maincpu", M6809_FIRQ_LINE, CLEAR_LINE);
+ cputag_set_input_line(machine(), "maincpu", M6809_FIRQ_LINE, CLEAR_LINE);
}
-READ8_HANDLER( qix_data_firq_r )
+READ8_MEMBER(qix_state::qix_data_firq_r)
{
- cputag_set_input_line(space->machine(), "maincpu", M6809_FIRQ_LINE, ASSERT_LINE);
+ cputag_set_input_line(machine(), "maincpu", M6809_FIRQ_LINE, ASSERT_LINE);
return 0xff;
}
-READ8_HANDLER( qix_data_firq_ack_r )
+READ8_MEMBER(qix_state::qix_data_firq_ack_r)
{
- cputag_set_input_line(space->machine(), "maincpu", M6809_FIRQ_LINE, CLEAR_LINE);
+ cputag_set_input_line(machine(), "maincpu", M6809_FIRQ_LINE, CLEAR_LINE);
return 0xff;
}
@@ -312,28 +312,28 @@ READ8_HANDLER( qix_data_firq_ack_r )
*
*************************************/
-WRITE8_HANDLER( qix_video_firq_w )
+WRITE8_MEMBER(qix_state::qix_video_firq_w)
{
- cputag_set_input_line(space->machine(), "videocpu", M6809_FIRQ_LINE, ASSERT_LINE);
+ cputag_set_input_line(machine(), "videocpu", M6809_FIRQ_LINE, ASSERT_LINE);
}
-WRITE8_HANDLER( qix_video_firq_ack_w )
+WRITE8_MEMBER(qix_state::qix_video_firq_ack_w)
{
- cputag_set_input_line(space->machine(), "videocpu", M6809_FIRQ_LINE, CLEAR_LINE);
+ cputag_set_input_line(machine(), "videocpu", M6809_FIRQ_LINE, CLEAR_LINE);
}
-READ8_HANDLER( qix_video_firq_r )
+READ8_MEMBER(qix_state::qix_video_firq_r)
{
- cputag_set_input_line(space->machine(), "videocpu", M6809_FIRQ_LINE, ASSERT_LINE);
+ cputag_set_input_line(machine(), "videocpu", M6809_FIRQ_LINE, ASSERT_LINE);
return 0xff;
}
-READ8_HANDLER( qix_video_firq_ack_r )
+READ8_MEMBER(qix_state::qix_video_firq_ack_r)
{
- cputag_set_input_line(space->machine(), "videocpu", M6809_FIRQ_LINE, CLEAR_LINE);
+ cputag_set_input_line(machine(), "videocpu", M6809_FIRQ_LINE, CLEAR_LINE);
return 0xff;
}
@@ -394,36 +394,33 @@ static WRITE8_DEVICE_HANDLER( qixmcu_coinctrl_w )
*
*************************************/
-READ8_HANDLER( qix_68705_portA_r )
+READ8_MEMBER(qix_state::qix_68705_portA_r)
{
- qix_state *state = space->machine().driver_data<qix_state>();
- UINT8 ddr = state->m_68705_ddr[0];
- UINT8 out = state->m_68705_port_out[0];
- UINT8 in = state->m_68705_port_in[0];
+ UINT8 ddr = m_68705_ddr[0];
+ UINT8 out = m_68705_port_out[0];
+ UINT8 in = m_68705_port_in[0];
logerror("68705:portA_r = %02X (%02X)\n", (out & ddr) | (in & ~ddr), in);
return (out & ddr) | (in & ~ddr);
}
-READ8_HANDLER( qix_68705_portB_r )
+READ8_MEMBER(qix_state::qix_68705_portB_r)
{
- qix_state *state = space->machine().driver_data<qix_state>();
- UINT8 ddr = state->m_68705_ddr[1];
- UINT8 out = state->m_68705_port_out[1];
- UINT8 in = (input_port_read(space->machine(), "COIN") & 0x0f) | ((input_port_read(space->machine(), "COIN") & 0x80) >> 3);
+ UINT8 ddr = m_68705_ddr[1];
+ UINT8 out = m_68705_port_out[1];
+ UINT8 in = (input_port_read(machine(), "COIN") & 0x0f) | ((input_port_read(machine(), "COIN") & 0x80) >> 3);
return (out & ddr) | (in & ~ddr);
}
-READ8_HANDLER( qix_68705_portC_r )
+READ8_MEMBER(qix_state::qix_68705_portC_r)
{
- qix_state *state = space->machine().driver_data<qix_state>();
- UINT8 ddr = state->m_68705_ddr[2];
- UINT8 out = state->m_68705_port_out[2];
- UINT8 in = (state->m_coinctrl & 0x08) | ((input_port_read(space->machine(), "COIN") & 0x70) >> 4);
+ UINT8 ddr = m_68705_ddr[2];
+ UINT8 out = m_68705_port_out[2];
+ UINT8 in = (m_coinctrl & 0x08) | ((input_port_read(machine(), "COIN") & 0x70) >> 4);
return (out & ddr) | (in & ~ddr);
}
@@ -435,30 +432,27 @@ READ8_HANDLER( qix_68705_portC_r )
*
*************************************/
-WRITE8_HANDLER( qix_68705_portA_w )
+WRITE8_MEMBER(qix_state::qix_68705_portA_w)
{
- qix_state *state = space->machine().driver_data<qix_state>();
logerror("68705:portA_w = %02X\n", data);
- state->m_68705_port_out[0] = data;
+ m_68705_port_out[0] = data;
}
-WRITE8_HANDLER( qix_68705_portB_w )
+WRITE8_MEMBER(qix_state::qix_68705_portB_w)
{
- qix_state *state = space->machine().driver_data<qix_state>();
- state->m_68705_port_out[1] = data;
- coin_lockout_w(space->machine(), 0, (~data >> 6) & 1);
- coin_counter_w(space->machine(), 0, (data >> 7) & 1);
+ m_68705_port_out[1] = data;
+ coin_lockout_w(machine(), 0, (~data >> 6) & 1);
+ coin_counter_w(machine(), 0, (data >> 7) & 1);
}
-WRITE8_HANDLER( qix_68705_portC_w )
+WRITE8_MEMBER(qix_state::qix_68705_portC_w)
{
- qix_state *state = space->machine().driver_data<qix_state>();
- state->m_68705_port_out[2] = data;
+ m_68705_port_out[2] = data;
}
diff --git a/src/mame/machine/rainbow.c b/src/mame/machine/rainbow.c
index 89540a38c4c..edb460ae7fd 100644
--- a/src/mame/machine/rainbow.c
+++ b/src/mame/machine/rainbow.c
@@ -773,21 +773,19 @@ static TIMER_CALLBACK( cchip_timer )
*
*************************************/
-WRITE16_HANDLER( rbisland_cchip_ctrl_w )
+WRITE16_MEMBER(rbisland_state::rbisland_cchip_ctrl_w)
{
/* value 2 is written here */
}
-WRITE16_HANDLER( rbisland_cchip_bank_w )
+WRITE16_MEMBER(rbisland_state::rbisland_cchip_bank_w)
{
- rbisland_state *state = space->machine().driver_data<rbisland_state>();
- state->m_current_bank = data & 7;
+ m_current_bank = data & 7;
}
-WRITE16_HANDLER( rbisland_cchip_ram_w )
+WRITE16_MEMBER(rbisland_state::rbisland_cchip_ram_w)
{
- rbisland_state *state = space->machine().driver_data<rbisland_state>();
- state->m_CRAM[state->m_current_bank][offset] = data;
+ m_CRAM[m_current_bank][offset] = data;
}
/*************************************
@@ -796,7 +794,7 @@ WRITE16_HANDLER( rbisland_cchip_ram_w )
*
*************************************/
-READ16_HANDLER( rbisland_cchip_ctrl_r )
+READ16_MEMBER(rbisland_state::rbisland_cchip_ctrl_r)
{
/*
Bit 2 = Error signal
@@ -805,10 +803,9 @@ READ16_HANDLER( rbisland_cchip_ctrl_r )
return 0x01; /* Return 0x05 for C-Chip error */
}
-READ16_HANDLER( rbisland_cchip_ram_r )
+READ16_MEMBER(rbisland_state::rbisland_cchip_ram_r)
{
- rbisland_state *state = space->machine().driver_data<rbisland_state>();
- return state->m_CRAM[state->m_current_bank][offset];
+ return m_CRAM[m_current_bank][offset];
}
/*************************************
diff --git a/src/mame/machine/retofinv.c b/src/mame/machine/retofinv.c
index ae5ebd0de2f..c87eb986645 100644
--- a/src/mame/machine/retofinv.c
+++ b/src/mame/machine/retofinv.c
@@ -10,24 +10,21 @@
***************************************************************************/
-READ8_HANDLER( retofinv_68705_portA_r )
+READ8_MEMBER(retofinv_state::retofinv_68705_portA_r)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
-//logerror("%04x: 68705 port A read %02x\n",cpu_get_pc(&space->device()),state->m_portA_in);
- return (state->m_portA_out & state->m_ddrA) | (state->m_portA_in & ~state->m_ddrA);
+//logerror("%04x: 68705 port A read %02x\n",cpu_get_pc(&space.device()),m_portA_in);
+ return (m_portA_out & m_ddrA) | (m_portA_in & ~m_ddrA);
}
-WRITE8_HANDLER( retofinv_68705_portA_w )
+WRITE8_MEMBER(retofinv_state::retofinv_68705_portA_w)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
-//logerror("%04x: 68705 port A write %02x\n",cpu_get_pc(&space->device()),data);
- state->m_portA_out = data;
+//logerror("%04x: 68705 port A write %02x\n",cpu_get_pc(&space.device()),data);
+ m_portA_out = data;
}
-WRITE8_HANDLER( retofinv_68705_ddrA_w )
+WRITE8_MEMBER(retofinv_state::retofinv_68705_ddrA_w)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
- state->m_ddrA = data;
+ m_ddrA = data;
}
@@ -42,38 +39,35 @@ WRITE8_HANDLER( retofinv_68705_ddrA_w )
*/
-READ8_HANDLER( retofinv_68705_portB_r )
+READ8_MEMBER(retofinv_state::retofinv_68705_portB_r)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
- return (state->m_portB_out & state->m_ddrB) | (state->m_portB_in & ~state->m_ddrB);
+ return (m_portB_out & m_ddrB) | (m_portB_in & ~m_ddrB);
}
-WRITE8_HANDLER( retofinv_68705_portB_w )
+WRITE8_MEMBER(retofinv_state::retofinv_68705_portB_w)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
-//logerror("%04x: 68705 port B write %02x\n",cpu_get_pc(&space->device()),data);
+//logerror("%04x: 68705 port B write %02x\n",cpu_get_pc(&space.device()),data);
- if ((state->m_ddrB & 0x02) && (~data & 0x02) && (state->m_portB_out & 0x02))
+ if ((m_ddrB & 0x02) && (~data & 0x02) && (m_portB_out & 0x02))
{
- state->m_portA_in = state->m_from_main;
- if (state->m_main_sent) cputag_set_input_line(space->machine(), "68705", 0, CLEAR_LINE);
- state->m_main_sent = 0;
-//logerror("read command %02x from main cpu\n",state->m_portA_in);
+ m_portA_in = m_from_main;
+ if (m_main_sent) cputag_set_input_line(machine(), "68705", 0, CLEAR_LINE);
+ m_main_sent = 0;
+//logerror("read command %02x from main cpu\n",m_portA_in);
}
- if ((state->m_ddrB & 0x04) && (data & 0x04) && (~state->m_portB_out & 0x04))
+ if ((m_ddrB & 0x04) && (data & 0x04) && (~m_portB_out & 0x04))
{
-//logerror("send command %02x to main cpu\n",state->m_portA_out);
- state->m_from_mcu = state->m_portA_out;
- state->m_mcu_sent = 1;
+//logerror("send command %02x to main cpu\n",m_portA_out);
+ m_from_mcu = m_portA_out;
+ m_mcu_sent = 1;
}
- state->m_portB_out = data;
+ m_portB_out = data;
}
-WRITE8_HANDLER( retofinv_68705_ddrB_w )
+WRITE8_MEMBER(retofinv_state::retofinv_68705_ddrB_w)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
- state->m_ddrB = data;
+ m_ddrB = data;
}
@@ -87,57 +81,51 @@ WRITE8_HANDLER( retofinv_68705_ddrB_w )
*/
-READ8_HANDLER( retofinv_68705_portC_r )
+READ8_MEMBER(retofinv_state::retofinv_68705_portC_r)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
- state->m_portC_in = 0;
- if (state->m_main_sent) state->m_portC_in |= 0x01;
- if (!state->m_mcu_sent) state->m_portC_in |= 0x02;
-//logerror("%04x: 68705 port C read %02x\n",cpu_get_pc(&space->device()),state->m_portC_in);
- return (state->m_portC_out & state->m_ddrC) | (state->m_portC_in & ~state->m_ddrC);
+ m_portC_in = 0;
+ if (m_main_sent) m_portC_in |= 0x01;
+ if (!m_mcu_sent) m_portC_in |= 0x02;
+//logerror("%04x: 68705 port C read %02x\n",cpu_get_pc(&space.device()),m_portC_in);
+ return (m_portC_out & m_ddrC) | (m_portC_in & ~m_ddrC);
}
-WRITE8_HANDLER( retofinv_68705_portC_w )
+WRITE8_MEMBER(retofinv_state::retofinv_68705_portC_w)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
-logerror("%04x: 68705 port C write %02x\n",cpu_get_pc(&space->device()),data);
- state->m_portC_out = data;
+logerror("%04x: 68705 port C write %02x\n",cpu_get_pc(&space.device()),data);
+ m_portC_out = data;
}
-WRITE8_HANDLER( retofinv_68705_ddrC_w )
+WRITE8_MEMBER(retofinv_state::retofinv_68705_ddrC_w)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
- state->m_ddrC = data;
+ m_ddrC = data;
}
-WRITE8_HANDLER( retofinv_mcu_w )
+WRITE8_MEMBER(retofinv_state::retofinv_mcu_w)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
-logerror("%04x: mcu_w %02x\n",cpu_get_pc(&space->device()),data);
- state->m_from_main = data;
- state->m_main_sent = 1;
- cputag_set_input_line(space->machine(), "68705", 0, ASSERT_LINE);
+logerror("%04x: mcu_w %02x\n",cpu_get_pc(&space.device()),data);
+ m_from_main = data;
+ m_main_sent = 1;
+ cputag_set_input_line(machine(), "68705", 0, ASSERT_LINE);
}
-READ8_HANDLER( retofinv_mcu_r )
+READ8_MEMBER(retofinv_state::retofinv_mcu_r)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
-logerror("%04x: mcu_r %02x\n",cpu_get_pc(&space->device()),state->m_from_mcu);
- state->m_mcu_sent = 0;
- return state->m_from_mcu;
+logerror("%04x: mcu_r %02x\n",cpu_get_pc(&space.device()),m_from_mcu);
+ m_mcu_sent = 0;
+ return m_from_mcu;
}
-READ8_HANDLER( retofinv_mcu_status_r )
+READ8_MEMBER(retofinv_state::retofinv_mcu_status_r)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
int res = 0;
/* bit 4 = when 1, mcu is ready to receive data from main cpu */
/* bit 5 = when 1, mcu has sent data to the main cpu */
-//logerror("%04x: mcu_status_r\n",cpu_get_pc(&space->device()));
- if (!state->m_main_sent) res |= 0x10;
- if (state->m_mcu_sent) res |= 0x20;
+//logerror("%04x: mcu_status_r\n",cpu_get_pc(&space.device()));
+ if (!m_main_sent) res |= 0x10;
+ if (m_mcu_sent) res |= 0x20;
return res;
}
diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c
index 275b9469793..9b037cde185 100644
--- a/src/mame/machine/scramble.c
+++ b/src/mame/machine/scramble.c
@@ -207,7 +207,8 @@ DRIVER_INIT( scramble_ppi )
static DRIVER_INIT( scobra )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa803, 0xa803, FUNC(scrambold_background_enable_w));
+ scramble_state *state = machine.driver_data<scramble_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xa803, 0xa803, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),state));
}
#ifdef UNUSED_FUNCTION
@@ -224,14 +225,16 @@ DRIVER_INIT( scramble )
DRIVER_INIT( stratgyx )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xb000, 0xb000, FUNC(scrambold_background_green_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xb002, 0xb002, FUNC(scrambold_background_blue_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xb00a, 0xb00a, FUNC(scrambold_background_red_w));
+ scramble_state *state = machine.driver_data<scramble_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xb000, 0xb000, write8_delegate(FUNC(scramble_state::scrambold_background_green_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xb002, 0xb002, write8_delegate(FUNC(scramble_state::scrambold_background_blue_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xb00a, 0xb00a, write8_delegate(FUNC(scramble_state::scrambold_background_red_w),state));
}
DRIVER_INIT( tazmani2 )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xb002, 0xb002, FUNC(scrambold_background_enable_w));
+ scramble_state *state = machine.driver_data<scramble_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xb002, 0xb002, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),state));
}
DRIVER_INIT( ckongs )
@@ -345,7 +348,8 @@ DRIVER_INIT( cavelon )
DRIVER_INIT( darkplnt )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xb00a, 0xb00a, FUNC(darkplnt_bullet_color_w));
+ scramble_state *state = machine.driver_data<scramble_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xb00a, 0xb00a, write8_delegate(FUNC(scramble_state::darkplnt_bullet_color_w),state));
}
DRIVER_INIT( mimonkey )
@@ -380,18 +384,20 @@ DRIVER_INIT( mimonkey )
ROM[A] = ROM[A] ^ xortable[line][col];
ctr++;
}
-
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa804, 0xa804, FUNC(scrambold_background_enable_w));
+ scramble_state *state = machine.driver_data<scramble_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xa804, 0xa804, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),state));
}
DRIVER_INIT( mimonsco )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa804, 0xa804, FUNC(scrambold_background_enable_w));
+ scramble_state *state = machine.driver_data<scramble_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xa804, 0xa804, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),state));
}
DRIVER_INIT( mimonscr )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x6804, 0x6804, FUNC(scrambold_background_enable_w));
+ scramble_state *state = machine.driver_data<scramble_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x6804, 0x6804, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),state));
}
diff --git a/src/mame/machine/segas32.c b/src/mame/machine/segas32.c
index 6fabeaa0851..ddb08de88d5 100644
--- a/src/mame/machine/segas32.c
+++ b/src/mame/machine/segas32.c
@@ -49,20 +49,19 @@ void decrypt_ga2_protrom(running_machine &machine)
auto_free(machine, temp);
}
-WRITE16_HANDLER( ga2_dpram_w )
+WRITE16_MEMBER(segas32_state::ga2_dpram_w)
{
/* does it ever actually write.. */
}
-READ16_HANDLER( ga2_dpram_r )
+READ16_MEMBER(segas32_state::ga2_dpram_r)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
- return (state->m_ga2_dpram[offset])|(state->m_ga2_dpram[offset+1]<<8);
+ return (m_ga2_dpram[offset])|(m_ga2_dpram[offset+1]<<8);
}
#if 0 // simulation
-READ16_HANDLER(ga2_sprite_protection_r)
+READ16_MEMBER(segas32_state::ga2_sprite_protection_r)
{
static const UINT16 prot[16] =
{
@@ -79,7 +78,7 @@ READ16_HANDLER(ga2_sprite_protection_r)
return prot[offset];
}
-READ16_HANDLER(ga2_wakeup_protection_r)
+READ16_MEMBER(segas32_state::ga2_wakeup_protection_r)
{
static const char prot[] =
"wake up! GOLDEN AXE The Revenge of Death-Adder! ";
@@ -101,29 +100,28 @@ READ16_HANDLER(ga2_wakeup_protection_r)
#define CURRENT_LEVEL_STATUS 0xF0BC
#define LEVEL_ORDER_ARRAY 0x263A
-WRITE16_HANDLER(sonic_level_load_protection)
+WRITE16_MEMBER(segas32_state::sonic_level_load_protection)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
UINT16 level;
//Perform write
- state->m_system32_workram[CLEARED_LEVELS / 2] = (data & mem_mask) | (state->m_system32_workram[CLEARED_LEVELS / 2] & ~mem_mask);
+ m_system32_workram[CLEARED_LEVELS / 2] = (data & mem_mask) | (m_system32_workram[CLEARED_LEVELS / 2] & ~mem_mask);
//Refresh current level
- if (state->m_system32_workram[CLEARED_LEVELS / 2] == 0)
+ if (m_system32_workram[CLEARED_LEVELS / 2] == 0)
{
level = 0x0007;
}
else
{
- const UINT8 *ROM = space->machine().region("maincpu")->base();
- level = *((ROM + LEVEL_ORDER_ARRAY) + (state->m_system32_workram[CLEARED_LEVELS / 2] * 2) - 1);
- level |= *((ROM + LEVEL_ORDER_ARRAY) + (state->m_system32_workram[CLEARED_LEVELS / 2] * 2) - 2) << 8;
+ const UINT8 *ROM = machine().region("maincpu")->base();
+ level = *((ROM + LEVEL_ORDER_ARRAY) + (m_system32_workram[CLEARED_LEVELS / 2] * 2) - 1);
+ level |= *((ROM + LEVEL_ORDER_ARRAY) + (m_system32_workram[CLEARED_LEVELS / 2] * 2) - 2) << 8;
}
- state->m_system32_workram[CURRENT_LEVEL / 2] = level;
+ m_system32_workram[CURRENT_LEVEL / 2] = level;
//Reset level status
- state->m_system32_workram[CURRENT_LEVEL_STATUS / 2] = 0x0000;
- state->m_system32_workram[(CURRENT_LEVEL_STATUS + 2) / 2] = 0x0000;
+ m_system32_workram[CURRENT_LEVEL_STATUS / 2] = 0x0000;
+ m_system32_workram[(CURRENT_LEVEL_STATUS + 2) / 2] = 0x0000;
}
@@ -136,9 +134,8 @@ WRITE16_HANDLER(sonic_level_load_protection)
// the protection board on many system32 games has full dma/bus access
// and can write things into work RAM. we simulate that here for burning rival.
-READ16_HANDLER(brival_protection_r)
+READ16_MEMBER(segas32_state::brival_protection_r)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
if (mem_mask == 0xffff) // only trap on word-wide reads
{
switch (offset)
@@ -150,12 +147,11 @@ READ16_HANDLER(brival_protection_r)
}
}
- return state->m_system32_workram[0xba00/2 + offset];
+ return m_system32_workram[0xba00/2 + offset];
}
-WRITE16_HANDLER(brival_protection_w)
+WRITE16_MEMBER(segas32_state::brival_protection_w)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
static const int protAddress[6][2] =
{
{ 0x109517, 0x00/2 },
@@ -167,7 +163,7 @@ WRITE16_HANDLER(brival_protection_w)
};
char ret[32];
int curProtType;
- UINT8 *ROM = space->machine().region("maincpu")->base();
+ UINT8 *ROM = machine().region("maincpu")->base();
switch (offset)
{
@@ -199,7 +195,7 @@ WRITE16_HANDLER(brival_protection_w)
memcpy(ret, &ROM[protAddress[curProtType][0]], 16);
ret[16] = '\0';
- memcpy(&state->m_system32_protram[protAddress[curProtType][1]], ret, 16);
+ memcpy(&m_system32_protram[protAddress[curProtType][1]], ret, 16);
}
@@ -226,17 +222,17 @@ void darkedge_fd1149_vblank(device_t *device)
}
-WRITE16_HANDLER( darkedge_protection_w )
+WRITE16_MEMBER(segas32_state::darkedge_protection_w)
{
logerror("%06x:darkedge_prot_w(%06X) = %04X & %04X\n",
- cpu_get_pc(&space->device()), 0xa00000 + 2*offset, data, mem_mask);
+ cpu_get_pc(&space.device()), 0xa00000 + 2*offset, data, mem_mask);
}
-READ16_HANDLER( darkedge_protection_r )
+READ16_MEMBER(segas32_state::darkedge_protection_r)
{
logerror("%06x:darkedge_prot_r(%06X) & %04X\n",
- cpu_get_pc(&space->device()), 0xa00000 + 2*offset, mem_mask);
+ cpu_get_pc(&space.device()), 0xa00000 + 2*offset, mem_mask);
return 0xffff;
}
@@ -248,13 +244,13 @@ READ16_HANDLER( darkedge_protection_r )
******************************************************************************
******************************************************************************/
-WRITE16_HANDLER( dbzvrvs_protection_w )
+WRITE16_MEMBER(segas32_state::dbzvrvs_protection_w)
{
- space->write_word( 0x2080c8, space->read_word( 0x200044 ) );
+ space.write_word( 0x2080c8, space.read_word( 0x200044 ) );
}
-READ16_HANDLER( dbzvrvs_protection_r )
+READ16_MEMBER(segas32_state::dbzvrvs_protection_r)
{
return 0xffff;
}
@@ -269,14 +265,14 @@ READ16_HANDLER( dbzvrvs_protection_r )
// protection ram is 8-bits wide and only occupies every other address
-READ16_HANDLER(arabfgt_protection_r)
+READ16_MEMBER(segas32_state::arabfgt_protection_r)
{
- int PC = cpu_get_pc(&space->device());
+ int PC = cpu_get_pc(&space.device());
int cmpVal;
if (PC == 0xfe0325 || PC == 0xfe01e5 || PC == 0xfe035e || PC == 0xfe03cc)
{
- cmpVal = cpu_get_reg(&space->device(), 1);
+ cmpVal = cpu_get_reg(&space.device(), 1);
// R0 always contains the value the protection is supposed to return (!)
return cmpVal;
@@ -289,11 +285,11 @@ READ16_HANDLER(arabfgt_protection_r)
return 0;
}
-WRITE16_HANDLER(arabfgt_protection_w)
+WRITE16_MEMBER(segas32_state::arabfgt_protection_w)
{
}
-READ16_HANDLER(arf_wakeup_protection_r)
+READ16_MEMBER(segas32_state::arf_wakeup_protection_r)
{
static const char prot[] =
"wake up! ARF! ";
@@ -305,22 +301,21 @@ READ16_HANDLER(arf_wakeup_protection_r)
The J.League 1994 (Japan)
******************************************************************************
******************************************************************************/
-WRITE16_HANDLER( jleague_protection_w )
+WRITE16_MEMBER(segas32_state::jleague_protection_w)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
- COMBINE_DATA( &state->m_system32_workram[0xf700/2 + offset ] );
+ COMBINE_DATA( &m_system32_workram[0xf700/2 + offset ] );
switch( offset )
{
// Map team browser selection to opponent browser selection
// using same lookup table that V60 uses for sound sample mapping.
case 0:
- space->write_byte( 0x20f708, space->read_word( 0x7bbc0 + data*2 ) );
+ space.write_byte( 0x20f708, space.read_word( 0x7bbc0 + data*2 ) );
break;
// move on to team browser
case 4/2:
- space->write_byte( 0x200016, data & 0xff );
+ space.write_byte( 0x200016, data & 0xff );
break;
default:
@@ -349,12 +344,11 @@ WRITE16_HANDLER( jleague_protection_w )
maybe the standalone board was for dev only? nop the 3 bytes at 0x06023A for standalone. (centred intro text)
*/
-READ16_HANDLER( arescue_dsp_r )
+READ16_MEMBER(segas32_state::arescue_dsp_r)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
if( offset == 4/2 )
{
- switch( state->m_arescue_dsp_io[0] )
+ switch( m_arescue_dsp_io[0] )
{
case 0:
case 1:
@@ -362,26 +356,25 @@ READ16_HANDLER( arescue_dsp_r )
break;
case 3:
- state->m_arescue_dsp_io[0] = 0x8000;
- state->m_arescue_dsp_io[2/2] = 0x0001;
+ m_arescue_dsp_io[0] = 0x8000;
+ m_arescue_dsp_io[2/2] = 0x0001;
break;
case 6:
- state->m_arescue_dsp_io[0] = 4 * state->m_arescue_dsp_io[2/2];
+ m_arescue_dsp_io[0] = 4 * m_arescue_dsp_io[2/2];
break;
default:
- logerror("Unhandled DSP cmd %04x (%04x).\n", state->m_arescue_dsp_io[0], state->m_arescue_dsp_io[1] );
+ logerror("Unhandled DSP cmd %04x (%04x).\n", m_arescue_dsp_io[0], m_arescue_dsp_io[1] );
break;
}
}
- return state->m_arescue_dsp_io[offset];
+ return m_arescue_dsp_io[offset];
}
-WRITE16_HANDLER( arescue_dsp_w )
+WRITE16_MEMBER(segas32_state::arescue_dsp_w)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
- COMBINE_DATA(&state->m_arescue_dsp_io[offset]);
+ COMBINE_DATA(&m_arescue_dsp_io[offset]);
}
diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c
index 1163231ee38..f16ab1de77b 100644
--- a/src/mame/machine/simpsons.c
+++ b/src/mame/machine/simpsons.c
@@ -11,19 +11,18 @@
***************************************************************************/
-WRITE8_HANDLER( simpsons_eeprom_w )
+WRITE8_MEMBER(simpsons_state::simpsons_eeprom_w)
{
- simpsons_state *state = space->machine().driver_data<simpsons_state>();
if (data == 0xff)
return;
- input_port_write(space->machine(), "EEPROMOUT", data, 0xff);
+ input_port_write(machine(), "EEPROMOUT", data, 0xff);
- state->m_video_bank = data & 0x03;
- simpsons_video_banking(space->machine(), state->m_video_bank);
+ m_video_bank = data & 0x03;
+ simpsons_video_banking(machine(), m_video_bank);
- state->m_firq_enabled = data & 0x04;
+ m_firq_enabled = data & 0x04;
}
/***************************************************************************
@@ -32,25 +31,23 @@ WRITE8_HANDLER( simpsons_eeprom_w )
***************************************************************************/
-WRITE8_HANDLER( simpsons_coin_counter_w )
+WRITE8_MEMBER(simpsons_state::simpsons_coin_counter_w)
{
- simpsons_state *state = space->machine().driver_data<simpsons_state>();
/* bit 0,1 coin counters */
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02);
/* bit 2 selects mono or stereo sound */
/* bit 3 = enable char ROM reading through the video RAM */
- k052109_set_rmrd_line(state->m_k052109, (data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
+ k052109_set_rmrd_line(m_k052109, (data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
/* bit 4 = INIT (unknown) */
/* bit 5 = enable sprite ROM reading */
- k053246_set_objcha_line(state->m_k053246, (~data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
+ k053246_set_objcha_line(m_k053246, (~data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
}
-READ8_HANDLER( simpsons_sound_interrupt_r )
+READ8_MEMBER(simpsons_state::simpsons_sound_interrupt_r)
{
- simpsons_state *state = space->machine().driver_data<simpsons_state>();
- device_set_input_line_and_vector(state->m_audiocpu, 0, HOLD_LINE, 0xff );
+ device_set_input_line_and_vector(m_audiocpu, 0, HOLD_LINE, 0xff );
return 0x00;
}
diff --git a/src/mame/machine/slapfght.c b/src/mame/machine/slapfght.c
index 26c6385e415..80ea1724bf8 100644
--- a/src/mame/machine/slapfght.c
+++ b/src/mame/machine/slapfght.c
@@ -37,171 +37,155 @@ MACHINE_RESET( slapfight )
*/
/* Reset and hold sound CPU */
-WRITE8_HANDLER( slapfight_port_00_w )
+WRITE8_MEMBER(slapfght_state::slapfight_port_00_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_RESET, ASSERT_LINE);
- state->m_getstar_sh_intenabled = 0;
+ cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_RESET, ASSERT_LINE);
+ m_getstar_sh_intenabled = 0;
}
/* Release reset on sound CPU */
-WRITE8_HANDLER( slapfight_port_01_w )
+WRITE8_MEMBER(slapfght_state::slapfight_port_01_w)
{
- cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_RESET, CLEAR_LINE);
+ cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_RESET, CLEAR_LINE);
}
/* Disable and clear hardware interrupt */
-WRITE8_HANDLER( slapfight_port_06_w )
+WRITE8_MEMBER(slapfght_state::slapfight_port_06_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_irq_mask = 0;
+ m_irq_mask = 0;
}
/* Enable hardware interrupt */
-WRITE8_HANDLER( slapfight_port_07_w )
+WRITE8_MEMBER(slapfght_state::slapfight_port_07_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_irq_mask = 1;
+ m_irq_mask = 1;
}
-WRITE8_HANDLER( slapfight_port_08_w )
+WRITE8_MEMBER(slapfght_state::slapfight_port_08_w)
{
- UINT8 *RAM = space->machine().region("maincpu")->base();
+ UINT8 *RAM = machine().region("maincpu")->base();
- memory_set_bankptr(space->machine(), "bank1",&RAM[0x10000]);
+ memory_set_bankptr(machine(), "bank1",&RAM[0x10000]);
}
-WRITE8_HANDLER( slapfight_port_09_w )
+WRITE8_MEMBER(slapfght_state::slapfight_port_09_w)
{
- UINT8 *RAM = space->machine().region("maincpu")->base();
+ UINT8 *RAM = machine().region("maincpu")->base();
- memory_set_bankptr(space->machine(), "bank1",&RAM[0x14000]);
+ memory_set_bankptr(machine(), "bank1",&RAM[0x14000]);
}
/* Status register */
-READ8_HANDLER( slapfight_port_00_r )
+READ8_MEMBER(slapfght_state::slapfight_port_00_r)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
static const int states[3]={ 0xc7, 0x55, 0x00 };
- state->m_slapfight_status = states[state->m_slapfight_status_state];
+ m_slapfight_status = states[m_slapfight_status_state];
- state->m_slapfight_status_state++;
- if (state->m_slapfight_status_state > 2) state->m_slapfight_status_state = 0;
+ m_slapfight_status_state++;
+ if (m_slapfight_status_state > 2) m_slapfight_status_state = 0;
- return state->m_slapfight_status;
+ return m_slapfight_status;
}
-READ8_HANDLER( slapfight_68705_portA_r )
+READ8_MEMBER(slapfght_state::slapfight_68705_portA_r)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- return (state->m_portA_out & state->m_ddrA) | (state->m_portA_in & ~state->m_ddrA);
+ return (m_portA_out & m_ddrA) | (m_portA_in & ~m_ddrA);
}
-WRITE8_HANDLER( slapfight_68705_portA_w )
+WRITE8_MEMBER(slapfght_state::slapfight_68705_portA_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_portA_out = data;
+ m_portA_out = data;
}
-WRITE8_HANDLER( slapfight_68705_ddrA_w )
+WRITE8_MEMBER(slapfght_state::slapfight_68705_ddrA_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_ddrA = data;
+ m_ddrA = data;
}
-READ8_HANDLER( slapfight_68705_portB_r )
+READ8_MEMBER(slapfght_state::slapfight_68705_portB_r)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- return (state->m_portB_out & state->m_ddrB) | (state->m_portB_in & ~state->m_ddrB);
+ return (m_portB_out & m_ddrB) | (m_portB_in & ~m_ddrB);
}
-WRITE8_HANDLER( slapfight_68705_portB_w )
+WRITE8_MEMBER(slapfght_state::slapfight_68705_portB_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- if ((state->m_ddrB & 0x02) && (~data & 0x02) && (state->m_portB_out & 0x02))
+ if ((m_ddrB & 0x02) && (~data & 0x02) && (m_portB_out & 0x02))
{
- state->m_portA_in = state->m_from_main;
+ m_portA_in = m_from_main;
- if (state->m_main_sent)
- cputag_set_input_line(space->machine(), "mcu", 0, CLEAR_LINE);
+ if (m_main_sent)
+ cputag_set_input_line(machine(), "mcu", 0, CLEAR_LINE);
- state->m_main_sent = 0;
+ m_main_sent = 0;
}
- if ((state->m_ddrB & 0x04) && (data & 0x04) && (~state->m_portB_out & 0x04))
+ if ((m_ddrB & 0x04) && (data & 0x04) && (~m_portB_out & 0x04))
{
- state->m_from_mcu = state->m_portA_out;
- state->m_mcu_sent = 1;
+ m_from_mcu = m_portA_out;
+ m_mcu_sent = 1;
}
- if ((state->m_ddrB & 0x08) && (~data & 0x08) && (state->m_portB_out & 0x08))
+ if ((m_ddrB & 0x08) && (~data & 0x08) && (m_portB_out & 0x08))
{
- *state->m_slapfight_scrollx_lo = state->m_portA_out;
+ *m_slapfight_scrollx_lo = m_portA_out;
}
- if ((state->m_ddrB & 0x10) && (~data & 0x10) && (state->m_portB_out & 0x10))
+ if ((m_ddrB & 0x10) && (~data & 0x10) && (m_portB_out & 0x10))
{
- *state->m_slapfight_scrollx_hi = state->m_portA_out;
+ *m_slapfight_scrollx_hi = m_portA_out;
}
- state->m_portB_out = data;
+ m_portB_out = data;
}
-WRITE8_HANDLER( slapfight_68705_ddrB_w )
+WRITE8_MEMBER(slapfght_state::slapfight_68705_ddrB_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_ddrB = data;
+ m_ddrB = data;
}
-READ8_HANDLER( slapfight_68705_portC_r )
+READ8_MEMBER(slapfght_state::slapfight_68705_portC_r)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_portC_in = 0;
+ m_portC_in = 0;
- if (state->m_main_sent)
- state->m_portC_in |= 0x01;
- if (!state->m_mcu_sent)
- state->m_portC_in |= 0x02;
+ if (m_main_sent)
+ m_portC_in |= 0x01;
+ if (!m_mcu_sent)
+ m_portC_in |= 0x02;
- return (state->m_portC_out & state->m_ddrC) | (state->m_portC_in & ~state->m_ddrC);
+ return (m_portC_out & m_ddrC) | (m_portC_in & ~m_ddrC);
}
-WRITE8_HANDLER( slapfight_68705_portC_w )
+WRITE8_MEMBER(slapfght_state::slapfight_68705_portC_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_portC_out = data;
+ m_portC_out = data;
}
-WRITE8_HANDLER( slapfight_68705_ddrC_w )
+WRITE8_MEMBER(slapfght_state::slapfight_68705_ddrC_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_ddrC = data;
+ m_ddrC = data;
}
-WRITE8_HANDLER( slapfight_mcu_w )
+WRITE8_MEMBER(slapfght_state::slapfight_mcu_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_from_main = data;
- state->m_main_sent = 1;
- cputag_set_input_line(space->machine(), "mcu", 0, ASSERT_LINE);
+ m_from_main = data;
+ m_main_sent = 1;
+ cputag_set_input_line(machine(), "mcu", 0, ASSERT_LINE);
}
-READ8_HANDLER( slapfight_mcu_r )
+READ8_MEMBER(slapfght_state::slapfight_mcu_r)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_mcu_sent = 0;
- return state->m_from_mcu;
+ m_mcu_sent = 0;
+ return m_from_mcu;
}
-READ8_HANDLER( slapfight_mcu_status_r )
+READ8_MEMBER(slapfght_state::slapfight_mcu_status_r)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
int res = 0;
- if (!state->m_main_sent)
+ if (!m_main_sent)
res |= 0x02;
- if (!state->m_mcu_sent)
+ if (!m_mcu_sent)
res |= 0x04;
return res;
@@ -213,83 +197,82 @@ READ8_HANDLER( slapfight_mcu_status_r )
***************************************************************************/
-READ8_HANDLER( getstar_e803_r )
+READ8_MEMBER(slapfght_state::getstar_e803_r)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
UINT16 tmp = 0; /* needed for values computed on 16 bits */
UINT8 getstar_val = 0;
UINT8 phase_lookup_table[] = {0x00, 0x01, 0x03, 0xff, 0xff, 0x02, 0x05, 0xff, 0xff, 0x05}; /* table at 0x0e05 in 'gtstarb1' */
UINT8 lives_lookup_table[] = {0x03, 0x05, 0x01, 0x02}; /* table at 0x0e62 in 'gtstarb1' */
UINT8 lgsb2_lookup_table[] = {0x00, 0x03, 0x04, 0x05}; /* fake tanle for "test mode" in 'gtstarb2' */
- switch (state->m_getstar_id)
+ switch (m_getstar_id)
{
case GETSTAR:
case GETSTARJ:
- switch (state->m_getstar_cmd)
+ switch (m_getstar_cmd)
{
case 0x20: /* continue play */
- getstar_val = ((state->m_gs_a & 0x30) == 0x30) ? 0x20 : 0x80;
+ getstar_val = ((m_gs_a & 0x30) == 0x30) ? 0x20 : 0x80;
break;
case 0x21: /* lose life */
- getstar_val = (state->m_gs_a << 1) | (state->m_gs_a >> 7);
+ getstar_val = (m_gs_a << 1) | (m_gs_a >> 7);
break;
case 0x22: /* starting difficulty */
- getstar_val = ((state->m_gs_a & 0x0c) >> 2) + 1;
+ getstar_val = ((m_gs_a & 0x0c) >> 2) + 1;
break;
case 0x23: /* starting lives */
- getstar_val = lives_lookup_table[state->m_gs_a];
+ getstar_val = lives_lookup_table[m_gs_a];
break;
case 0x24: /* game phase */
- getstar_val = phase_lookup_table[((state->m_gs_a & 0x18) >> 1) | (state->m_gs_a & 0x03)];
+ getstar_val = phase_lookup_table[((m_gs_a & 0x18) >> 1) | (m_gs_a & 0x03)];
break;
case 0x25: /* players inputs */
- getstar_val = BITSWAP8(state->m_gs_a, 3, 2, 1, 0, 7, 5, 6, 4);
+ getstar_val = BITSWAP8(m_gs_a, 3, 2, 1, 0, 7, 5, 6, 4);
break;
case 0x26: /* background (1st read) */
- tmp = 0x8800 + (0x001f * state->m_gs_a);
+ tmp = 0x8800 + (0x001f * m_gs_a);
getstar_val = (tmp & 0x00ff) >> 0;
- state->m_getstar_cmd |= 0x80; /* to allow a second consecutive read */
+ m_getstar_cmd |= 0x80; /* to allow a second consecutive read */
break;
case 0xa6: /* background (2nd read) */
- tmp = 0x8800 + (0x001f * state->m_gs_a);
+ tmp = 0x8800 + (0x001f * m_gs_a);
getstar_val = (tmp & 0xff00) >> 8;
break;
case 0x29: /* unknown effect */
getstar_val = 0x00;
break;
case 0x2a: /* change player (if 2 players game) */
- getstar_val = (state->m_gs_a ^ 0x40);
+ getstar_val = (m_gs_a ^ 0x40);
break;
case 0x37: /* foreground (1st read) */
- tmp = ((0xd0 + ((state->m_gs_e >> 2) & 0x0f)) << 8) | (0x40 * (state->m_gs_e & 03) + state->m_gs_d);
+ tmp = ((0xd0 + ((m_gs_e >> 2) & 0x0f)) << 8) | (0x40 * (m_gs_e & 03) + m_gs_d);
getstar_val = (tmp & 0x00ff) >> 0;
- state->m_getstar_cmd |= 0x80; /* to allow a second consecutive read */
+ m_getstar_cmd |= 0x80; /* to allow a second consecutive read */
break;
case 0xb7: /* foreground (2nd read) */
- tmp = ((0xd0 + ((state->m_gs_e >> 2) & 0x0f)) << 8) | (0x40 * (state->m_gs_e & 03) + state->m_gs_d);
+ tmp = ((0xd0 + ((m_gs_e >> 2) & 0x0f)) << 8) | (0x40 * (m_gs_e & 03) + m_gs_d);
getstar_val = (tmp & 0xff00) >> 8;
break;
case 0x38: /* laser position (1st read) */
- tmp = 0xf740 - (((state->m_gs_e >> 4) << 8) | ((state->m_gs_e & 0x08) ? 0x80 : 0x00)) + (0x02 + (state->m_gs_d >> 2));
+ tmp = 0xf740 - (((m_gs_e >> 4) << 8) | ((m_gs_e & 0x08) ? 0x80 : 0x00)) + (0x02 + (m_gs_d >> 2));
getstar_val = (tmp & 0x00ff) >> 0;
- state->m_getstar_cmd |= 0x80; /* to allow a second consecutive read */
+ m_getstar_cmd |= 0x80; /* to allow a second consecutive read */
break;
case 0xb8: /* laser position (2nd read) */
- tmp = 0xf740 - (((state->m_gs_e >> 4) << 8) | ((state->m_gs_e & 0x08) ? 0x80 : 0x00)) + (0x02 + (state->m_gs_d >> 2));
+ tmp = 0xf740 - (((m_gs_e >> 4) << 8) | ((m_gs_e & 0x08) ? 0x80 : 0x00)) + (0x02 + (m_gs_d >> 2));
getstar_val = (tmp & 0xff00) >> 8;
break;
case 0x73: /* avoid "BAD HW" message */
getstar_val = 0x76;
break;
default:
- logerror("%04x: getstar_e803_r - cmd = %02x\n",cpu_get_pc(&space->device()),state->m_getstar_cmd);
+ logerror("%04x: getstar_e803_r - cmd = %02x\n",cpu_get_pc(&space.device()),m_getstar_cmd);
break;
}
break;
case GTSTARB1:
/* value isn't computed by the bootleg but we want to please the "test mode" */
- if (cpu_get_pc(&space->device()) == 0x6b04) return (lives_lookup_table[state->m_gs_a]);
+ if (cpu_get_pc(&space.device()) == 0x6b04) return (lives_lookup_table[m_gs_a]);
break;
case GTSTARB2:
/*
@@ -302,389 +285,388 @@ READ8_HANDLER( getstar_e803_r )
0576: BE cp (hl)
0577: C2 6E 05 jp nz,$056E
*/
- if (cpu_get_pc(&space->device()) == 0x056e) return (getstar_val);
- if (cpu_get_pc(&space->device()) == 0x0570) return (getstar_val+1);
- if (cpu_get_pc(&space->device()) == 0x0577) return ((getstar_val+0x05) ^ 0x56);
+ if (cpu_get_pc(&space.device()) == 0x056e) return (getstar_val);
+ if (cpu_get_pc(&space.device()) == 0x0570) return (getstar_val+1);
+ if (cpu_get_pc(&space.device()) == 0x0577) return ((getstar_val+0x05) ^ 0x56);
/* value isn't computed by the bootleg but we want to please the "test mode" */
- if (cpu_get_pc(&space->device()) == 0x6b04) return (lgsb2_lookup_table[state->m_gs_a]);
+ if (cpu_get_pc(&space.device()) == 0x6b04) return (lgsb2_lookup_table[m_gs_a]);
break;
default:
- logerror("%04x: getstar_e803_r - cmd = %02x - unknown set !\n",cpu_get_pc(&space->device()),state->m_getstar_cmd);
+ logerror("%04x: getstar_e803_r - cmd = %02x - unknown set !\n",cpu_get_pc(&space.device()),m_getstar_cmd);
break;
}
return getstar_val;
}
-WRITE8_HANDLER( getstar_e803_w )
+WRITE8_MEMBER(slapfght_state::getstar_e803_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- switch (state->m_getstar_id)
+ switch (m_getstar_id)
{
case GETSTAR:
/* unknown effect - not read back */
- if (cpu_get_pc(&space->device()) == 0x00bf)
+ if (cpu_get_pc(&space.device()) == 0x00bf)
{
- state->m_getstar_cmd = 0x00;
+ m_getstar_cmd = 0x00;
GS_RESET_REGS
}
/* players inputs */
- if (cpu_get_pc(&space->device()) == 0x0560)
+ if (cpu_get_pc(&space.device()) == 0x0560)
{
- state->m_getstar_cmd = 0x25;
+ m_getstar_cmd = 0x25;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x056d)
+ if (cpu_get_pc(&space.device()) == 0x056d)
{
- state->m_getstar_cmd = 0x25;
+ m_getstar_cmd = 0x25;
GS_SAVE_REGS
}
/* lose life */
- if (cpu_get_pc(&space->device()) == 0x0a0a)
+ if (cpu_get_pc(&space.device()) == 0x0a0a)
{
- state->m_getstar_cmd = 0x21;
+ m_getstar_cmd = 0x21;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0a17)
+ if (cpu_get_pc(&space.device()) == 0x0a17)
{
- state->m_getstar_cmd = 0x21;
+ m_getstar_cmd = 0x21;
GS_SAVE_REGS
}
/* unknown effect */
- if (cpu_get_pc(&space->device()) == 0x0a51)
+ if (cpu_get_pc(&space.device()) == 0x0a51)
{
- state->m_getstar_cmd = 0x29;
+ m_getstar_cmd = 0x29;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0a6e)
+ if (cpu_get_pc(&space.device()) == 0x0a6e)
{
- state->m_getstar_cmd = 0x29;
+ m_getstar_cmd = 0x29;
GS_SAVE_REGS
}
/* continue play */
- if (cpu_get_pc(&space->device()) == 0x0ae3)
+ if (cpu_get_pc(&space.device()) == 0x0ae3)
{
- state->m_getstar_cmd = 0x20;
+ m_getstar_cmd = 0x20;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0af0)
+ if (cpu_get_pc(&space.device()) == 0x0af0)
{
- state->m_getstar_cmd = 0x20;
+ m_getstar_cmd = 0x20;
GS_SAVE_REGS
}
/* unknown effect - not read back */
- if (cpu_get_pc(&space->device()) == 0x0b62)
+ if (cpu_get_pc(&space.device()) == 0x0b62)
{
- state->m_getstar_cmd = 0x00; /* 0x1f */
+ m_getstar_cmd = 0x00; /* 0x1f */
GS_RESET_REGS
}
/* change player (if 2 players game) */
- if (cpu_get_pc(&space->device()) == 0x0bab)
+ if (cpu_get_pc(&space.device()) == 0x0bab)
{
- state->m_getstar_cmd = 0x2a;
+ m_getstar_cmd = 0x2a;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0bb8)
+ if (cpu_get_pc(&space.device()) == 0x0bb8)
{
- state->m_getstar_cmd = 0x2a;
+ m_getstar_cmd = 0x2a;
GS_SAVE_REGS
}
/* game phase */
- if (cpu_get_pc(&space->device()) == 0x0d37)
+ if (cpu_get_pc(&space.device()) == 0x0d37)
{
- state->m_getstar_cmd = 0x24;
+ m_getstar_cmd = 0x24;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0d44)
+ if (cpu_get_pc(&space.device()) == 0x0d44)
{
- state->m_getstar_cmd = 0x24;
+ m_getstar_cmd = 0x24;
GS_SAVE_REGS
}
/* starting lives */
- if (cpu_get_pc(&space->device()) == 0x0d79)
+ if (cpu_get_pc(&space.device()) == 0x0d79)
{
- state->m_getstar_cmd = 0x23;
+ m_getstar_cmd = 0x23;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0d8a)
+ if (cpu_get_pc(&space.device()) == 0x0d8a)
{
- state->m_getstar_cmd = 0x23;
+ m_getstar_cmd = 0x23;
GS_SAVE_REGS
}
/* starting difficulty */
- if (cpu_get_pc(&space->device()) == 0x0dc1)
+ if (cpu_get_pc(&space.device()) == 0x0dc1)
{
- state->m_getstar_cmd = 0x22;
+ m_getstar_cmd = 0x22;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0dd0)
+ if (cpu_get_pc(&space.device()) == 0x0dd0)
{
- state->m_getstar_cmd = 0x22;
+ m_getstar_cmd = 0x22;
GS_SAVE_REGS
}
/* starting lives (again) */
- if (cpu_get_pc(&space->device()) == 0x1011)
+ if (cpu_get_pc(&space.device()) == 0x1011)
{
- state->m_getstar_cmd = 0x23;
+ m_getstar_cmd = 0x23;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x101e)
+ if (cpu_get_pc(&space.device()) == 0x101e)
{
- state->m_getstar_cmd = 0x23;
+ m_getstar_cmd = 0x23;
GS_SAVE_REGS
}
/* hardware test */
- if (cpu_get_pc(&space->device()) == 0x107a)
+ if (cpu_get_pc(&space.device()) == 0x107a)
{
- state->m_getstar_cmd = 0x73;
+ m_getstar_cmd = 0x73;
GS_RESET_REGS
}
/* game phase (again) */
- if (cpu_get_pc(&space->device()) == 0x10c6)
+ if (cpu_get_pc(&space.device()) == 0x10c6)
{
- state->m_getstar_cmd = 0x24;
+ m_getstar_cmd = 0x24;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x10d3)
+ if (cpu_get_pc(&space.device()) == 0x10d3)
{
- state->m_getstar_cmd = 0x24;
+ m_getstar_cmd = 0x24;
GS_SAVE_REGS
}
/* background */
- if (cpu_get_pc(&space->device()) == 0x1910)
+ if (cpu_get_pc(&space.device()) == 0x1910)
{
- state->m_getstar_cmd = 0x26;
+ m_getstar_cmd = 0x26;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x191d)
+ if (cpu_get_pc(&space.device()) == 0x191d)
{
- state->m_getstar_cmd = 0x26;
+ m_getstar_cmd = 0x26;
GS_SAVE_REGS
}
/* foreground */
- if (cpu_get_pc(&space->device()) == 0x19d5)
+ if (cpu_get_pc(&space.device()) == 0x19d5)
{
- state->m_getstar_cmd = 0x37;
+ m_getstar_cmd = 0x37;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x19e4)
+ if (cpu_get_pc(&space.device()) == 0x19e4)
{
- state->m_getstar_cmd = 0x37;
+ m_getstar_cmd = 0x37;
GS_SAVE_REGS
}
- if (cpu_get_pc(&space->device()) == 0x19f1)
+ if (cpu_get_pc(&space.device()) == 0x19f1)
{
- state->m_getstar_cmd = 0x37;
+ m_getstar_cmd = 0x37;
/* do NOT update the registers because there are 2 writes before 2 reads ! */
}
/* laser position */
- if (cpu_get_pc(&space->device()) == 0x26af)
+ if (cpu_get_pc(&space.device()) == 0x26af)
{
- state->m_getstar_cmd = 0x38;
+ m_getstar_cmd = 0x38;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x26be)
+ if (cpu_get_pc(&space.device()) == 0x26be)
{
- state->m_getstar_cmd = 0x38;
+ m_getstar_cmd = 0x38;
GS_SAVE_REGS
}
- if (cpu_get_pc(&space->device()) == 0x26cb)
+ if (cpu_get_pc(&space.device()) == 0x26cb)
{
- state->m_getstar_cmd = 0x38;
+ m_getstar_cmd = 0x38;
/* do NOT update the registers because there are 2 writes before 2 reads ! */
}
/* starting lives (for "test mode") */
- if (cpu_get_pc(&space->device()) == 0x6a27)
+ if (cpu_get_pc(&space.device()) == 0x6a27)
{
- state->m_getstar_cmd = 0x23;
+ m_getstar_cmd = 0x23;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x6a38)
+ if (cpu_get_pc(&space.device()) == 0x6a38)
{
- state->m_getstar_cmd = 0x23;
+ m_getstar_cmd = 0x23;
GS_SAVE_REGS
}
break;
case GETSTARJ:
/* unknown effect - not read back */
- if (cpu_get_pc(&space->device()) == 0x00bf)
+ if (cpu_get_pc(&space.device()) == 0x00bf)
{
- state->m_getstar_cmd = 0x00;
+ m_getstar_cmd = 0x00;
GS_RESET_REGS
}
/* players inputs */
- if (cpu_get_pc(&space->device()) == 0x0560)
+ if (cpu_get_pc(&space.device()) == 0x0560)
{
- state->m_getstar_cmd = 0x25;
+ m_getstar_cmd = 0x25;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x056d)
+ if (cpu_get_pc(&space.device()) == 0x056d)
{
- state->m_getstar_cmd = 0x25;
+ m_getstar_cmd = 0x25;
GS_SAVE_REGS
}
/* lose life */
- if (cpu_get_pc(&space->device()) == 0x0ad5)
+ if (cpu_get_pc(&space.device()) == 0x0ad5)
{
- state->m_getstar_cmd = 0x21;
+ m_getstar_cmd = 0x21;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0ae2)
+ if (cpu_get_pc(&space.device()) == 0x0ae2)
{
- state->m_getstar_cmd = 0x21;
+ m_getstar_cmd = 0x21;
GS_SAVE_REGS
}
/* unknown effect */
- if (cpu_get_pc(&space->device()) == 0x0b1c)
+ if (cpu_get_pc(&space.device()) == 0x0b1c)
{
- state->m_getstar_cmd = 0x29;
+ m_getstar_cmd = 0x29;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0b29)
+ if (cpu_get_pc(&space.device()) == 0x0b29)
{
- state->m_getstar_cmd = 0x29;
+ m_getstar_cmd = 0x29;
GS_SAVE_REGS
}
/* continue play */
- if (cpu_get_pc(&space->device()) == 0x0bae)
+ if (cpu_get_pc(&space.device()) == 0x0bae)
{
- state->m_getstar_cmd = 0x20;
+ m_getstar_cmd = 0x20;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0bbb)
+ if (cpu_get_pc(&space.device()) == 0x0bbb)
{
- state->m_getstar_cmd = 0x20;
+ m_getstar_cmd = 0x20;
GS_SAVE_REGS
}
/* unknown effect - not read back */
- if (cpu_get_pc(&space->device()) == 0x0c2d)
+ if (cpu_get_pc(&space.device()) == 0x0c2d)
{
- state->m_getstar_cmd = 0x00; /* 0x1f */
+ m_getstar_cmd = 0x00; /* 0x1f */
GS_RESET_REGS
}
/* change player (if 2 players game) */
- if (cpu_get_pc(&space->device()) == 0x0c76)
+ if (cpu_get_pc(&space.device()) == 0x0c76)
{
- state->m_getstar_cmd = 0x2a;
+ m_getstar_cmd = 0x2a;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0c83)
+ if (cpu_get_pc(&space.device()) == 0x0c83)
{
- state->m_getstar_cmd = 0x2a;
+ m_getstar_cmd = 0x2a;
GS_SAVE_REGS
}
/* game phase */
- if (cpu_get_pc(&space->device()) == 0x0e02)
+ if (cpu_get_pc(&space.device()) == 0x0e02)
{
- state->m_getstar_cmd = 0x24;
+ m_getstar_cmd = 0x24;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0e0f)
+ if (cpu_get_pc(&space.device()) == 0x0e0f)
{
- state->m_getstar_cmd = 0x24;
+ m_getstar_cmd = 0x24;
GS_SAVE_REGS
}
/* starting lives */
- if (cpu_get_pc(&space->device()) == 0x0e44)
+ if (cpu_get_pc(&space.device()) == 0x0e44)
{
- state->m_getstar_cmd = 0x23;
+ m_getstar_cmd = 0x23;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0e55)
+ if (cpu_get_pc(&space.device()) == 0x0e55)
{
- state->m_getstar_cmd = 0x23;
+ m_getstar_cmd = 0x23;
GS_SAVE_REGS
}
/* starting difficulty */
- if (cpu_get_pc(&space->device()) == 0x0e8c)
+ if (cpu_get_pc(&space.device()) == 0x0e8c)
{
- state->m_getstar_cmd = 0x22;
+ m_getstar_cmd = 0x22;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x0e9b)
+ if (cpu_get_pc(&space.device()) == 0x0e9b)
{
- state->m_getstar_cmd = 0x22;
+ m_getstar_cmd = 0x22;
GS_SAVE_REGS
}
/* starting lives (again) */
- if (cpu_get_pc(&space->device()) == 0x10d6)
+ if (cpu_get_pc(&space.device()) == 0x10d6)
{
- state->m_getstar_cmd = 0x23;
+ m_getstar_cmd = 0x23;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x10e3)
+ if (cpu_get_pc(&space.device()) == 0x10e3)
{
- state->m_getstar_cmd = 0x23;
+ m_getstar_cmd = 0x23;
GS_SAVE_REGS
}
/* hardware test */
- if (cpu_get_pc(&space->device()) == 0x113f)
+ if (cpu_get_pc(&space.device()) == 0x113f)
{
- state->m_getstar_cmd = 0x73;
+ m_getstar_cmd = 0x73;
GS_RESET_REGS
}
/* game phase (again) */
- if (cpu_get_pc(&space->device()) == 0x118b)
+ if (cpu_get_pc(&space.device()) == 0x118b)
{
- state->m_getstar_cmd = 0x24;
+ m_getstar_cmd = 0x24;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x1198)
+ if (cpu_get_pc(&space.device()) == 0x1198)
{
- state->m_getstar_cmd = 0x24;
+ m_getstar_cmd = 0x24;
GS_SAVE_REGS
}
/* background */
- if (cpu_get_pc(&space->device()) == 0x19f8)
+ if (cpu_get_pc(&space.device()) == 0x19f8)
{
- state->m_getstar_cmd = 0x26;
+ m_getstar_cmd = 0x26;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x1a05)
+ if (cpu_get_pc(&space.device()) == 0x1a05)
{
- state->m_getstar_cmd = 0x26;
+ m_getstar_cmd = 0x26;
GS_SAVE_REGS
}
/* foreground */
- if (cpu_get_pc(&space->device()) == 0x1abd)
+ if (cpu_get_pc(&space.device()) == 0x1abd)
{
- state->m_getstar_cmd = 0x37;
+ m_getstar_cmd = 0x37;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x1acc)
+ if (cpu_get_pc(&space.device()) == 0x1acc)
{
- state->m_getstar_cmd = 0x37;
+ m_getstar_cmd = 0x37;
GS_SAVE_REGS
}
- if (cpu_get_pc(&space->device()) == 0x1ad9)
+ if (cpu_get_pc(&space.device()) == 0x1ad9)
{
- state->m_getstar_cmd = 0x37;
+ m_getstar_cmd = 0x37;
/* do NOT update the registers because there are 2 writes before 2 reads ! */
}
/* laser position */
- if (cpu_get_pc(&space->device()) == 0x2792)
+ if (cpu_get_pc(&space.device()) == 0x2792)
{
- state->m_getstar_cmd = 0x38;
+ m_getstar_cmd = 0x38;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x27a1)
+ if (cpu_get_pc(&space.device()) == 0x27a1)
{
- state->m_getstar_cmd = 0x38;
+ m_getstar_cmd = 0x38;
GS_SAVE_REGS
}
- if (cpu_get_pc(&space->device()) == 0x27ae)
+ if (cpu_get_pc(&space.device()) == 0x27ae)
{
- state->m_getstar_cmd = 0x38;
+ m_getstar_cmd = 0x38;
/* do NOT update the registers because there are 2 writes before 2 reads ! */
}
/* starting lives (for "test mode") */
- if (cpu_get_pc(&space->device()) == 0x6ae2)
+ if (cpu_get_pc(&space.device()) == 0x6ae2)
{
- state->m_getstar_cmd = 0x23;
+ m_getstar_cmd = 0x23;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x6af3)
+ if (cpu_get_pc(&space.device()) == 0x6af3)
{
- state->m_getstar_cmd = 0x23;
+ m_getstar_cmd = 0x23;
GS_SAVE_REGS
}
break;
@@ -714,14 +696,14 @@ WRITE8_HANDLER( getstar_e803_w )
6B01: 3A 03 E8 ld a,($E803)
We save the regs though to hack it in 'getstar_e803_r' read handler.
*/
- if (cpu_get_pc(&space->device()) == 0x6ae2)
+ if (cpu_get_pc(&space.device()) == 0x6ae2)
{
- state->m_getstar_cmd = 0x00;
+ m_getstar_cmd = 0x00;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x6af3)
+ if (cpu_get_pc(&space.device()) == 0x6af3)
{
- state->m_getstar_cmd = 0x00;
+ m_getstar_cmd = 0x00;
GS_SAVE_REGS
}
break;
@@ -753,29 +735,28 @@ WRITE8_HANDLER( getstar_e803_w )
6B01: 3A 03 E8 ld a,($E803)
We save the regs though to hack it in 'getstar_e803_r' read handler.
*/
- if (cpu_get_pc(&space->device()) == 0x6ae2)
+ if (cpu_get_pc(&space.device()) == 0x6ae2)
{
- state->m_getstar_cmd = 0x00;
+ m_getstar_cmd = 0x00;
GS_RESET_REGS
}
- if (cpu_get_pc(&space->device()) == 0x6af3)
+ if (cpu_get_pc(&space.device()) == 0x6af3)
{
- state->m_getstar_cmd = 0x00;
+ m_getstar_cmd = 0x00;
GS_SAVE_REGS
}
break;
default:
- logerror("%04x: getstar_e803_w - data = %02x - unknown set !\n",cpu_get_pc(&space->device()),data);
+ logerror("%04x: getstar_e803_w - data = %02x - unknown set !\n",cpu_get_pc(&space.device()),data);
break;
}
}
/* Enable hardware interrupt of sound cpu */
-WRITE8_HANDLER( getstar_sh_intenable_w )
+WRITE8_MEMBER(slapfght_state::getstar_sh_intenable_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_getstar_sh_intenabled = 1;
- logerror("cpu #1 PC=%d: %d written to a0e0\n",cpu_get_pc(&space->device()),data);
+ m_getstar_sh_intenabled = 1;
+ logerror("cpu #1 PC=%d: %d written to a0e0\n",cpu_get_pc(&space.device()),data);
}
@@ -789,7 +770,7 @@ INTERRUPT_GEN( getstar_interrupt )
}
#ifdef UNUSED_FUNCTION
-WRITE8_HANDLER( getstar_port_04_w )
+WRITE8_MEMBER(slapfght_state::getstar_port_04_w)
{
// cpu_halt(0,0);
}
@@ -802,133 +783,119 @@ WRITE8_HANDLER( getstar_port_04_w )
***************************************************************************/
-READ8_HANDLER( tigerh_68705_portA_r )
+READ8_MEMBER(slapfght_state::tigerh_68705_portA_r)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- return (state->m_portA_out & state->m_ddrA) | (state->m_portA_in & ~state->m_ddrA);
+ return (m_portA_out & m_ddrA) | (m_portA_in & ~m_ddrA);
}
-WRITE8_HANDLER( tigerh_68705_portA_w )
+WRITE8_MEMBER(slapfght_state::tigerh_68705_portA_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_portA_out = data;//?
- state->m_from_mcu = state->m_portA_out;
- state->m_mcu_sent = 1;
+ m_portA_out = data;//?
+ m_from_mcu = m_portA_out;
+ m_mcu_sent = 1;
}
-WRITE8_HANDLER( tigerh_68705_ddrA_w )
+WRITE8_MEMBER(slapfght_state::tigerh_68705_ddrA_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_ddrA = data;
+ m_ddrA = data;
}
-READ8_HANDLER( tigerh_68705_portB_r )
+READ8_MEMBER(slapfght_state::tigerh_68705_portB_r)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- return (state->m_portB_out & state->m_ddrB) | (state->m_portB_in & ~state->m_ddrB);
+ return (m_portB_out & m_ddrB) | (m_portB_in & ~m_ddrB);
}
-WRITE8_HANDLER( tigerh_68705_portB_w )
+WRITE8_MEMBER(slapfght_state::tigerh_68705_portB_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- if ((state->m_ddrB & 0x02) && (~data & 0x02) && (state->m_portB_out & 0x02))
+ if ((m_ddrB & 0x02) && (~data & 0x02) && (m_portB_out & 0x02))
{
- state->m_portA_in = state->m_from_main;
- if (state->m_main_sent) cputag_set_input_line(space->machine(), "mcu", 0, CLEAR_LINE);
- state->m_main_sent = 0;
+ m_portA_in = m_from_main;
+ if (m_main_sent) cputag_set_input_line(machine(), "mcu", 0, CLEAR_LINE);
+ m_main_sent = 0;
}
- if ((state->m_ddrB & 0x04) && (data & 0x04) && (~state->m_portB_out & 0x04))
+ if ((m_ddrB & 0x04) && (data & 0x04) && (~m_portB_out & 0x04))
{
- state->m_from_mcu = state->m_portA_out;
- state->m_mcu_sent = 1;
+ m_from_mcu = m_portA_out;
+ m_mcu_sent = 1;
}
- state->m_portB_out = data;
+ m_portB_out = data;
}
-WRITE8_HANDLER( tigerh_68705_ddrB_w )
+WRITE8_MEMBER(slapfght_state::tigerh_68705_ddrB_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_ddrB = data;
+ m_ddrB = data;
}
-READ8_HANDLER( tigerh_68705_portC_r )
+READ8_MEMBER(slapfght_state::tigerh_68705_portC_r)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_portC_in = 0;
- if (!state->m_main_sent) state->m_portC_in |= 0x01;
- if (state->m_mcu_sent) state->m_portC_in |= 0x02;
- return (state->m_portC_out & state->m_ddrC) | (state->m_portC_in & ~state->m_ddrC);
+ m_portC_in = 0;
+ if (!m_main_sent) m_portC_in |= 0x01;
+ if (m_mcu_sent) m_portC_in |= 0x02;
+ return (m_portC_out & m_ddrC) | (m_portC_in & ~m_ddrC);
}
-WRITE8_HANDLER( tigerh_68705_portC_w )
+WRITE8_MEMBER(slapfght_state::tigerh_68705_portC_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_portC_out = data;
+ m_portC_out = data;
}
-WRITE8_HANDLER( tigerh_68705_ddrC_w )
+WRITE8_MEMBER(slapfght_state::tigerh_68705_ddrC_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_ddrC = data;
+ m_ddrC = data;
}
-WRITE8_HANDLER( tigerh_mcu_w )
+WRITE8_MEMBER(slapfght_state::tigerh_mcu_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_from_main = data;
- state->m_main_sent = 1;
- state->m_mcu_sent = 0;
- cputag_set_input_line(space->machine(), "mcu", 0, ASSERT_LINE);
+ m_from_main = data;
+ m_main_sent = 1;
+ m_mcu_sent = 0;
+ cputag_set_input_line(machine(), "mcu", 0, ASSERT_LINE);
}
-READ8_HANDLER( tigerh_mcu_r )
+READ8_MEMBER(slapfght_state::tigerh_mcu_r)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_mcu_sent = 0;
- return state->m_from_mcu;
+ m_mcu_sent = 0;
+ return m_from_mcu;
}
-READ8_HANDLER( tigerh_mcu_status_r )
+READ8_MEMBER(slapfght_state::tigerh_mcu_status_r)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
int res = 0;
- if (!state->m_main_sent) res |= 0x02;
- if (!state->m_mcu_sent) res |= 0x04;
+ if (!m_main_sent) res |= 0x02;
+ if (!m_mcu_sent) res |= 0x04;
return res;
}
-READ8_HANDLER( tigerhb_e803_r )
+READ8_MEMBER(slapfght_state::tigerhb_e803_r)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
UINT8 tigerhb_val = 0;
- switch (state->m_tigerhb_cmd)
+ switch (m_tigerhb_cmd)
{
case 0x73: /* avoid "BAD HW" message */
tigerhb_val = 0x83;
break;
default:
- logerror("%04x: tigerhb_e803_r - cmd = %02x\n",cpu_get_pc(&space->device()),state->m_getstar_cmd);
+ logerror("%04x: tigerhb_e803_r - cmd = %02x\n",cpu_get_pc(&space.device()),m_getstar_cmd);
break;
}
return tigerhb_val;
}
-WRITE8_HANDLER( tigerhb_e803_w )
+WRITE8_MEMBER(slapfght_state::tigerhb_e803_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
switch (data)
{
/* hardware test */
case 0x73:
- state->m_tigerhb_cmd = 0x73;
+ m_tigerhb_cmd = 0x73;
break;
default:
- logerror("%04x: tigerhb_e803_w - data = %02x\n",cpu_get_pc(&space->device()),data);
- state->m_tigerhb_cmd = 0x00;
+ logerror("%04x: tigerhb_e803_w - data = %02x\n",cpu_get_pc(&space.device()),data);
+ m_tigerhb_cmd = 0x00;
break;
}
}
@@ -940,8 +907,8 @@ WRITE8_HANDLER( tigerhb_e803_w )
***************************************************************************/
-READ8_HANDLER( perfrman_port_00_r )
+READ8_MEMBER(slapfght_state::perfrman_port_00_r)
{
/* TODO */
- return space->machine().rand() & 1;
+ return machine().rand() & 1;
}
diff --git a/src/mame/machine/starwars.c b/src/mame/machine/starwars.c
index 5e639089532..b16930426bb 100644
--- a/src/mame/machine/starwars.c
+++ b/src/mame/machine/starwars.c
@@ -48,11 +48,11 @@ static TIMER_CALLBACK( math_run_clear )
*
*************************************/
-WRITE8_HANDLER( starwars_nstore_w )
+WRITE8_MEMBER(starwars_state::starwars_nstore_w)
{
- space->machine().device<x2212_device>("x2212")->store(0);
- space->machine().device<x2212_device>("x2212")->store(1);
- space->machine().device<x2212_device>("x2212")->store(0);
+ machine().device<x2212_device>("x2212")->store(0);
+ machine().device<x2212_device>("x2212")->store(1);
+ machine().device<x2212_device>("x2212")->store(0);
}
/*************************************
@@ -61,41 +61,40 @@ WRITE8_HANDLER( starwars_nstore_w )
*
*************************************/
-WRITE8_HANDLER( starwars_out_w )
+WRITE8_MEMBER(starwars_state::starwars_out_w)
{
- starwars_state *state = space->machine().driver_data<starwars_state>();
switch (offset & 7)
{
case 0: /* Coin counter 1 */
- coin_counter_w(space->machine(), 0, data);
+ coin_counter_w(machine(), 0, data);
break;
case 1: /* Coin counter 2 */
- coin_counter_w(space->machine(), 1, data);
+ coin_counter_w(machine(), 1, data);
break;
case 2: /* LED 3 */
- set_led_status(space->machine(), 2, ~data & 0x80);
+ set_led_status(machine(), 2, ~data & 0x80);
break;
case 3: /* LED 2 */
- set_led_status(space->machine(), 1, ~data & 0x80);
+ set_led_status(machine(), 1, ~data & 0x80);
break;
case 4: /* bank switch */
- memory_set_bank(space->machine(), "bank1", (data >> 7) & 1);
- if (state->m_is_esb)
- memory_set_bank(space->machine(), "bank2", (data >> 7) & 1);
+ memory_set_bank(machine(), "bank1", (data >> 7) & 1);
+ if (m_is_esb)
+ memory_set_bank(machine(), "bank2", (data >> 7) & 1);
break;
case 5: /* reset PRNG */
break;
case 6: /* LED 1 */
- set_led_status(space->machine(), 0, ~data & 0x80);
+ set_led_status(machine(), 0, ~data & 0x80);
break;
case 7: /* NVRAM array recall */
- space->machine().device<x2212_device>("x2212")->recall(~data & 0x80);
+ machine().device<x2212_device>("x2212")->recall(~data & 0x80);
break;
}
}
@@ -123,16 +122,15 @@ CUSTOM_INPUT( matrix_flag_r )
*
*************************************/
-READ8_HANDLER( starwars_adc_r )
+READ8_MEMBER(starwars_state::starwars_adc_r)
{
- starwars_state *state = space->machine().driver_data<starwars_state>();
/* pitch */
- if (state->m_control_num == kPitch)
- return input_port_read(space->machine(), "STICKY");
+ if (m_control_num == kPitch)
+ return input_port_read(machine(), "STICKY");
/* yaw */
- else if (state->m_control_num == kYaw)
- return input_port_read(space->machine(), "STICKX");
+ else if (m_control_num == kYaw)
+ return input_port_read(machine(), "STICKX");
/* default to unused thrust */
else
@@ -140,10 +138,9 @@ READ8_HANDLER( starwars_adc_r )
}
-WRITE8_HANDLER( starwars_adc_select_w )
+WRITE8_MEMBER(starwars_state::starwars_adc_select_w)
{
- starwars_state *state = space->machine().driver_data<starwars_state>();
- state->m_control_num = offset;
+ m_control_num = offset;
}
@@ -371,7 +368,7 @@ static void run_mproc(running_machine &machine)
*
*************************************/
-READ8_HANDLER( starwars_prng_r )
+READ8_MEMBER(starwars_state::starwars_prng_r)
{
/*
* The PRNG is a modified 23 bit LFSR. Taps are at 4 and 22 so the
@@ -386,7 +383,7 @@ READ8_HANDLER( starwars_prng_r )
*/
/* Use MAME's PRNG for now */
- return space->machine().rand();
+ return machine().rand();
}
@@ -397,45 +394,42 @@ READ8_HANDLER( starwars_prng_r )
*
*************************************/
-READ8_HANDLER( starwars_div_reh_r )
+READ8_MEMBER(starwars_state::starwars_div_reh_r)
{
- starwars_state *state = space->machine().driver_data<starwars_state>();
- return (state->m_quotient_shift & 0xff00) >> 8;
+ return (m_quotient_shift & 0xff00) >> 8;
}
-READ8_HANDLER( starwars_div_rel_r )
+READ8_MEMBER(starwars_state::starwars_div_rel_r)
{
- starwars_state *state = space->machine().driver_data<starwars_state>();
- return state->m_quotient_shift & 0x00ff;
+ return m_quotient_shift & 0x00ff;
}
-WRITE8_HANDLER( starwars_math_w )
+WRITE8_MEMBER(starwars_state::starwars_math_w)
{
- starwars_state *state = space->machine().driver_data<starwars_state>();
int i;
data &= 0xff; /* ASG 971002 -- make sure we only get bytes here */
switch (offset)
{
case 0: /* mw0 */
- state->m_MPA = data << 2; /* Set starting PROM address */
- run_mproc(space->machine()); /* and run the Matrix Processor */
+ m_MPA = data << 2; /* Set starting PROM address */
+ run_mproc(machine()); /* and run the Matrix Processor */
break;
case 1: /* mw1 */
- state->m_BIC = (state->m_BIC & 0x00ff) | ((data & 0x01) << 8);
+ m_BIC = (m_BIC & 0x00ff) | ((data & 0x01) << 8);
break;
case 2: /* mw2 */
- state->m_BIC = (state->m_BIC & 0x0100) | data;
+ m_BIC = (m_BIC & 0x0100) | data;
break;
case 4: /* dvsrh */
- state->m_divisor = (state->m_divisor & 0x00ff) | (data << 8);
- state->m_dvd_shift = state->m_dividend;
- state->m_quotient_shift = 0;
+ m_divisor = (m_divisor & 0x00ff) | (data << 8);
+ m_dvd_shift = m_dividend;
+ m_quotient_shift = 0;
break;
case 5: /* dvsrl */
@@ -445,35 +439,35 @@ WRITE8_HANDLER( starwars_math_w )
/* If the Tie fighters look corrupt, he byte order of */
/* the 16 bit writes in the 6809 are backwards */
- state->m_divisor = (state->m_divisor & 0xff00) | data;
+ m_divisor = (m_divisor & 0xff00) | data;
/*
* Simple restoring division as shown in the
* schematics. The algorithm produces the same "wrong"
- * results as the hardware if state->m_divisor < 2*state->m_dividend or
- * state->m_divisor > 0x8000.
+ * results as the hardware if m_divisor < 2*m_dividend or
+ * m_divisor > 0x8000.
*/
for (i = 1; i < 16; i++)
{
- state->m_quotient_shift <<= 1;
- if (((INT32)state->m_dvd_shift + (state->m_divisor ^ 0xffff) + 1) & 0x10000)
+ m_quotient_shift <<= 1;
+ if (((INT32)m_dvd_shift + (m_divisor ^ 0xffff) + 1) & 0x10000)
{
- state->m_quotient_shift |= 1;
- state->m_dvd_shift = (state->m_dvd_shift + (state->m_divisor ^ 0xffff) + 1) << 1;
+ m_quotient_shift |= 1;
+ m_dvd_shift = (m_dvd_shift + (m_divisor ^ 0xffff) + 1) << 1;
}
else
{
- state->m_dvd_shift <<= 1;
+ m_dvd_shift <<= 1;
}
}
break;
case 6: /* dvddh */
- state->m_dividend = (state->m_dividend & 0x00ff) | (data << 8);
+ m_dividend = (m_dividend & 0x00ff) | (data << 8);
break;
case 7: /* dvddl */
- state->m_dividend = (state->m_dividend & 0xff00) | (data);
+ m_dividend = (m_dividend & 0xff00) | (data);
break;
default:
diff --git a/src/mame/machine/stfight.c b/src/mame/machine/stfight.c
index 140082dd7ac..bc827c80fa1 100644
--- a/src/mame/machine/stfight.c
+++ b/src/mame/machine/stfight.c
@@ -13,7 +13,7 @@
#include "includes/stfight.h"
// this prototype will move to the driver
-static WRITE8_HANDLER( stfight_bank_w );
+
/*
@@ -96,16 +96,16 @@ MACHINE_RESET( stfight )
state->m_coin_mech_query = 0;
// initialise rom bank
- stfight_bank_w( space, 0, 0 );
+ state->stfight_bank_w(*space, 0, 0 );
}
// It's entirely possible that this bank is never switched out
// - in fact I don't even know how/where it's switched in!
-static WRITE8_HANDLER( stfight_bank_w )
+WRITE8_MEMBER(stfight_state::stfight_bank_w)
{
- UINT8 *ROM2 = space->machine().region("maincpu")->base() + 0x10000;
+ UINT8 *ROM2 = machine().region("maincpu")->base() + 0x10000;
- memory_set_bankptr(space->machine(), "bank1", &ROM2[data<<14] );
+ memory_set_bankptr(machine(), "bank1", &ROM2[data<<14] );
}
/*
@@ -130,22 +130,21 @@ INTERRUPT_GEN( stfight_vb_interrupt )
*/
// Perhaps define dipswitches as active low?
-READ8_HANDLER( stfight_dsw_r )
+READ8_MEMBER(stfight_state::stfight_dsw_r)
{
- return( ~input_port_read(space->machine(), offset ? "DSW1" : "DSW0") );
+ return( ~input_port_read(machine(), offset ? "DSW1" : "DSW0") );
}
-READ8_HANDLER( stfight_coin_r )
+READ8_MEMBER(stfight_state::stfight_coin_r)
{
- stfight_state *state = space->machine().driver_data<stfight_state>();
int coin_mech_data;
int i;
// Was the coin mech queried by software?
- if( state->m_coin_mech_query_active )
+ if( m_coin_mech_query_active )
{
- state->m_coin_mech_query_active = 0;
- return( (~state->m_coin_mech_query) & 0x03 );
+ m_coin_mech_query_active = 0;
+ return( (~m_coin_mech_query) & 0x03 );
}
/*
@@ -155,13 +154,13 @@ READ8_HANDLER( stfight_coin_r )
* since it's read by the 30Hz interrupt ISR
*/
- coin_mech_data = input_port_read(space->machine(), "COIN");
+ coin_mech_data = input_port_read(machine(), "COIN");
for( i=0; i<2; i++ )
{
/* Only valid on signal edge */
- if( ( coin_mech_data & (1<<i) ) != state->m_coin_mech_latch[i] )
- state->m_coin_mech_latch[i] = coin_mech_data & (1<<i);
+ if( ( coin_mech_data & (1<<i) ) != m_coin_mech_latch[i] )
+ m_coin_mech_latch[i] = coin_mech_data & (1<<i);
else
coin_mech_data |= coin_mech_data & (1<<i);
}
@@ -169,12 +168,11 @@ READ8_HANDLER( stfight_coin_r )
return( coin_mech_data );
}
-WRITE8_HANDLER( stfight_coin_w )
+WRITE8_MEMBER(stfight_state::stfight_coin_w)
{
- stfight_state *state = space->machine().driver_data<stfight_state>();
// interrogate coin mech
- state->m_coin_mech_query_active = 1;
- state->m_coin_mech_query = data;
+ m_coin_mech_query_active = 1;
+ m_coin_mech_query = data;
}
/*
@@ -227,7 +225,7 @@ WRITE8_DEVICE_HANDLER( stfight_adpcm_control_w )
msm5205_reset_w( device, data & 0x08 ? 1 : 0 );
}
-WRITE8_HANDLER( stfight_e800_w )
+WRITE8_MEMBER(stfight_state::stfight_e800_w)
{
}
@@ -235,20 +233,18 @@ WRITE8_HANDLER( stfight_e800_w )
* Machine hardware for YM2303 fm sound control
*/
-WRITE8_HANDLER( stfight_fm_w )
+WRITE8_MEMBER(stfight_state::stfight_fm_w)
{
- stfight_state *state = space->machine().driver_data<stfight_state>();
// the sound cpu ignores any fm data without bit 7 set
- state->m_fm_data = 0x80 | data;
+ m_fm_data = 0x80 | data;
}
-READ8_HANDLER( stfight_fm_r )
+READ8_MEMBER(stfight_state::stfight_fm_r)
{
- stfight_state *state = space->machine().driver_data<stfight_state>();
- int data = state->m_fm_data;
+ int data = m_fm_data;
// clear the latch?!?
- state->m_fm_data &= 0x7f;
+ m_fm_data &= 0x7f;
return( data );
}
diff --git a/src/mame/machine/subs.c b/src/mame/machine/subs.c
index f2abbc2fa25..3d9b00110ed 100644
--- a/src/mame/machine/subs.c
+++ b/src/mame/machine/subs.c
@@ -98,19 +98,18 @@ static int subs_steering_2(running_machine &machine)
/***************************************************************************
subs_steer_reset
***************************************************************************/
-WRITE8_HANDLER( subs_steer_reset_w )
+WRITE8_MEMBER(subs_state::subs_steer_reset_w)
{
- subs_state *state = space->machine().driver_data<subs_state>();
- state->m_steering_val1 = 0x00;
- state->m_steering_val2 = 0x00;
+ m_steering_val1 = 0x00;
+ m_steering_val2 = 0x00;
}
/***************************************************************************
subs_control_r
***************************************************************************/
-READ8_HANDLER( subs_control_r )
+READ8_MEMBER(subs_state::subs_control_r)
{
- int inport = input_port_read(space->machine(), "IN0");
+ int inport = input_port_read(machine(), "IN0");
switch (offset & 0x07)
{
@@ -118,10 +117,10 @@ READ8_HANDLER( subs_control_r )
case 0x01: return ((inport & 0x02) << 6); /* diag hold */
case 0x02: return ((inport & 0x04) << 5); /* slam */
case 0x03: return ((inport & 0x08) << 4); /* spare */
- case 0x04: return ((subs_steering_1(space->machine()) & 0x40) << 1); /* steer dir 1 */
- case 0x05: return ((subs_steering_1(space->machine()) & 0x80) << 0); /* steer flag 1 */
- case 0x06: return ((subs_steering_2(space->machine()) & 0x40) << 1); /* steer dir 2 */
- case 0x07: return ((subs_steering_2(space->machine()) & 0x80) << 0); /* steer flag 2 */
+ case 0x04: return ((subs_steering_1(machine()) & 0x40) << 1); /* steer dir 1 */
+ case 0x05: return ((subs_steering_1(machine()) & 0x80) << 0); /* steer flag 1 */
+ case 0x06: return ((subs_steering_2(machine()) & 0x40) << 1); /* steer dir 2 */
+ case 0x07: return ((subs_steering_2(machine()) & 0x80) << 0); /* steer flag 2 */
}
return 0;
@@ -130,9 +129,9 @@ READ8_HANDLER( subs_control_r )
/***************************************************************************
subs_coin_r
***************************************************************************/
-READ8_HANDLER( subs_coin_r )
+READ8_MEMBER(subs_state::subs_coin_r)
{
- int inport = input_port_read(space->machine(), "IN1");
+ int inport = input_port_read(machine(), "IN1");
switch (offset & 0x07)
{
@@ -152,9 +151,9 @@ READ8_HANDLER( subs_coin_r )
/***************************************************************************
subs_options_r
***************************************************************************/
-READ8_HANDLER( subs_options_r )
+READ8_MEMBER(subs_state::subs_options_r)
{
- int opts = input_port_read(space->machine(), "DSW");
+ int opts = input_port_read(machine(), "DSW");
switch (offset & 0x03)
{
@@ -170,15 +169,15 @@ READ8_HANDLER( subs_options_r )
/***************************************************************************
subs_lamp1_w
***************************************************************************/
-WRITE8_HANDLER( subs_lamp1_w )
+WRITE8_MEMBER(subs_state::subs_lamp1_w)
{
- set_led_status(space->machine(), 0,~offset & 1);
+ set_led_status(machine(), 0,~offset & 1);
}
/***************************************************************************
subs_lamp2_w
***************************************************************************/
-WRITE8_HANDLER( subs_lamp2_w )
+WRITE8_MEMBER(subs_state::subs_lamp2_w)
{
- set_led_status(space->machine(), 1,~offset & 1);
+ set_led_status(machine(), 1,~offset & 1);
}
diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c
index 72b29bb2ae4..68ae7973295 100644
--- a/src/mame/machine/taitosj.c
+++ b/src/mame/machine/taitosj.c
@@ -41,7 +41,7 @@ MACHINE_RESET( taitosj )
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* set the default ROM bank (many games only have one bank and */
/* never write to the bank selector register) */
- taitosj_bankswitch_w(space, 0, 0);
+ state->taitosj_bankswitch_w(*space, 0, 0);
state->m_zaccept = 1;
@@ -54,12 +54,12 @@ MACHINE_RESET( taitosj )
}
-WRITE8_HANDLER( taitosj_bankswitch_w )
+WRITE8_MEMBER(taitosj_state::taitosj_bankswitch_w)
{
- coin_lockout_global_w(space->machine(), ~data & 1);
+ coin_lockout_global_w(machine(), ~data & 1);
- if(data & 0x80) memory_set_bank(space->machine(), "bank1", 1);
- else memory_set_bank(space->machine(), "bank1", 0);
+ if(data & 0x80) memory_set_bank(machine(), "bank1", 1);
+ else memory_set_bank(machine(), "bank1", 0);
}
@@ -77,31 +77,30 @@ WRITE8_HANDLER( taitosj_bankswitch_w )
direct access to the Z80 memory space. It can also trigger IRQs on the Z80.
***************************************************************************/
-READ8_HANDLER( taitosj_fake_data_r )
+READ8_MEMBER(taitosj_state::taitosj_fake_data_r)
{
- LOG(("%04x: protection read\n",cpu_get_pc(&space->device())));
+ LOG(("%04x: protection read\n",cpu_get_pc(&space.device())));
return 0;
}
-WRITE8_HANDLER( taitosj_fake_data_w )
+WRITE8_MEMBER(taitosj_state::taitosj_fake_data_w)
{
- LOG(("%04x: protection write %02x\n",cpu_get_pc(&space->device()),data));
+ LOG(("%04x: protection write %02x\n",cpu_get_pc(&space.device()),data));
}
-READ8_HANDLER( taitosj_fake_status_r )
+READ8_MEMBER(taitosj_state::taitosj_fake_status_r)
{
- LOG(("%04x: protection status read\n",cpu_get_pc(&space->device())));
+ LOG(("%04x: protection status read\n",cpu_get_pc(&space.device())));
return 0xff;
}
/* timer callback : */
-READ8_HANDLER( taitosj_mcu_data_r )
+READ8_MEMBER(taitosj_state::taitosj_mcu_data_r)
{
- taitosj_state *state = space->machine().driver_data<taitosj_state>();
- LOG(("%04x: protection read %02x\n",cpu_get_pc(&space->device()),state->m_toz80));
- state->m_zaccept = 1;
- return state->m_toz80;
+ LOG(("%04x: protection read %02x\n",cpu_get_pc(&space.device()),m_toz80));
+ m_zaccept = 1;
+ return m_toz80;
}
/* timer callback : */
@@ -113,37 +112,34 @@ static TIMER_CALLBACK( taitosj_mcu_real_data_w )
state->m_fromz80 = param;
}
-WRITE8_HANDLER( taitosj_mcu_data_w )
+WRITE8_MEMBER(taitosj_state::taitosj_mcu_data_w)
{
- LOG(("%04x: protection write %02x\n",cpu_get_pc(&space->device()),data));
- space->machine().scheduler().synchronize(FUNC(taitosj_mcu_real_data_w), data);
+ LOG(("%04x: protection write %02x\n",cpu_get_pc(&space.device()),data));
+ machine().scheduler().synchronize(FUNC(taitosj_mcu_real_data_w), data);
/* temporarily boost the interleave to sync things up */
- space->machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(10));
+ machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(10));
}
-READ8_HANDLER( taitosj_mcu_status_r )
+READ8_MEMBER(taitosj_state::taitosj_mcu_status_r)
{
- taitosj_state *state = space->machine().driver_data<taitosj_state>();
/* temporarily boost the interleave to sync things up */
- space->machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(10));
+ machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(10));
/* bit 0 = the 68705 has read data from the Z80 */
/* bit 1 = the 68705 has written data for the Z80 */
- return ~((state->m_zready << 0) | (state->m_zaccept << 1));
+ return ~((m_zready << 0) | (m_zaccept << 1));
}
-READ8_HANDLER( taitosj_68705_portA_r )
+READ8_MEMBER(taitosj_state::taitosj_68705_portA_r)
{
- taitosj_state *state = space->machine().driver_data<taitosj_state>();
- LOG(("%04x: 68705 port A read %02x\n",cpu_get_pc(&space->device()),state->m_portA_in));
- return state->m_portA_in;
+ LOG(("%04x: 68705 port A read %02x\n",cpu_get_pc(&space.device()),m_portA_in));
+ return m_portA_in;
}
-WRITE8_HANDLER( taitosj_68705_portA_w )
+WRITE8_MEMBER(taitosj_state::taitosj_68705_portA_w)
{
- taitosj_state *state = space->machine().driver_data<taitosj_state>();
- LOG(("%04x: 68705 port A write %02x\n",cpu_get_pc(&space->device()),data));
- state->m_portA_out = data;
+ LOG(("%04x: 68705 port A write %02x\n",cpu_get_pc(&space.device()),data));
+ m_portA_out = data;
}
@@ -168,7 +164,7 @@ WRITE8_HANDLER( taitosj_68705_portA_w )
* the main Z80 memory location to access)
*/
-READ8_HANDLER( taitosj_68705_portB_r )
+READ8_MEMBER(taitosj_state::taitosj_68705_portB_r)
{
return 0xff;
}
@@ -188,59 +184,58 @@ static TIMER_CALLBACK( taitosj_mcu_status_real_w )
state->m_zaccept = 0;
}
-WRITE8_HANDLER( taitosj_68705_portB_w )
+WRITE8_MEMBER(taitosj_state::taitosj_68705_portB_w)
{
- taitosj_state *state = space->machine().driver_data<taitosj_state>();
- LOG(("%04x: 68705 port B write %02x\n", cpu_get_pc(&space->device()), data));
+ LOG(("%04x: 68705 port B write %02x\n", cpu_get_pc(&space.device()), data));
if (~data & 0x01)
{
- LOG(("%04x: 68705 68INTRQ **NOT SUPPORTED**!\n", cpu_get_pc(&space->device())));
+ LOG(("%04x: 68705 68INTRQ **NOT SUPPORTED**!\n", cpu_get_pc(&space.device())));
}
if (~data & 0x02)
{
/* 68705 is going to read data from the Z80 */
- space->machine().scheduler().synchronize(FUNC(taitosj_mcu_data_real_r));
- cputag_set_input_line(space->machine(), "mcu", 0, CLEAR_LINE);
- state->m_portA_in = state->m_fromz80;
- LOG(("%04x: 68705 <- Z80 %02x\n", cpu_get_pc(&space->device()), state->m_portA_in));
+ machine().scheduler().synchronize(FUNC(taitosj_mcu_data_real_r));
+ cputag_set_input_line(machine(), "mcu", 0, CLEAR_LINE);
+ m_portA_in = m_fromz80;
+ LOG(("%04x: 68705 <- Z80 %02x\n", cpu_get_pc(&space.device()), m_portA_in));
}
if (~data & 0x08)
- state->m_busreq = 1;
+ m_busreq = 1;
else
- state->m_busreq = 0;
+ m_busreq = 0;
if (~data & 0x04)
{
- LOG(("%04x: 68705 -> Z80 %02x\n", cpu_get_pc(&space->device()), state->m_portA_out));
+ LOG(("%04x: 68705 -> Z80 %02x\n", cpu_get_pc(&space.device()), m_portA_out));
/* 68705 is writing data for the Z80 */
- space->machine().scheduler().synchronize(FUNC(taitosj_mcu_status_real_w), state->m_portA_out);
+ machine().scheduler().synchronize(FUNC(taitosj_mcu_status_real_w), m_portA_out);
}
if (~data & 0x10)
{
- address_space *cpu0space = space->machine().device("maincpu")->memory().space(AS_PROGRAM);
- LOG(("%04x: 68705 write %02x to address %04x\n",cpu_get_pc(&space->device()), state->m_portA_out, state->m_address));
+ address_space *cpu0space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ LOG(("%04x: 68705 write %02x to address %04x\n",cpu_get_pc(&space.device()), m_portA_out, m_address));
- cpu0space->write_byte(state->m_address, state->m_portA_out);
+ cpu0space->write_byte(m_address, m_portA_out);
/* increase low 8 bits of latched address for burst writes */
- state->m_address = (state->m_address & 0xff00) | ((state->m_address + 1) & 0xff);
+ m_address = (m_address & 0xff00) | ((m_address + 1) & 0xff);
}
if (~data & 0x20)
{
- address_space *cpu0space = space->machine().device("maincpu")->memory().space(AS_PROGRAM);
- state->m_portA_in = cpu0space->read_byte(state->m_address);
- LOG(("%04x: 68705 read %02x from address %04x\n", cpu_get_pc(&space->device()), state->m_portA_in, state->m_address));
+ address_space *cpu0space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ m_portA_in = cpu0space->read_byte(m_address);
+ LOG(("%04x: 68705 read %02x from address %04x\n", cpu_get_pc(&space.device()), m_portA_in, m_address));
}
if (~data & 0x40)
{
- LOG(("%04x: 68705 address low %02x\n", cpu_get_pc(&space->device()), state->m_portA_out));
- state->m_address = (state->m_address & 0xff00) | state->m_portA_out;
+ LOG(("%04x: 68705 address low %02x\n", cpu_get_pc(&space.device()), m_portA_out));
+ m_address = (m_address & 0xff00) | m_portA_out;
}
if (~data & 0x80)
{
- LOG(("%04x: 68705 address high %02x\n", cpu_get_pc(&space->device()), state->m_portA_out));
- state->m_address = (state->m_address & 0x00ff) | (state->m_portA_out << 8);
+ LOG(("%04x: 68705 address high %02x\n", cpu_get_pc(&space.device()), m_portA_out));
+ m_address = (m_address & 0x00ff) | (m_portA_out << 8);
}
}
@@ -254,69 +249,64 @@ WRITE8_HANDLER( taitosj_68705_portB_w )
* passes through)
*/
-READ8_HANDLER( taitosj_68705_portC_r )
+READ8_MEMBER(taitosj_state::taitosj_68705_portC_r)
{
- taitosj_state *state = space->machine().driver_data<taitosj_state>();
int res;
- res = (state->m_zready << 0) | (state->m_zaccept << 1) | ((state->m_busreq^1) << 2);
- LOG(("%04x: 68705 port C read %02x\n",cpu_get_pc(&space->device()),res));
+ res = (m_zready << 0) | (m_zaccept << 1) | ((m_busreq^1) << 2);
+ LOG(("%04x: 68705 port C read %02x\n",cpu_get_pc(&space.device()),res));
return res;
}
/* Space Cruiser protection (otherwise the game resets on the asteroids level) */
-READ8_HANDLER( spacecr_prot_r )
+READ8_MEMBER(taitosj_state::spacecr_prot_r)
{
- taitosj_state *state = space->machine().driver_data<taitosj_state>();
- int pc = cpu_get_pc(&space->device());
+ int pc = cpu_get_pc(&space.device());
if( pc != 0x368A && pc != 0x36A6 )
logerror("Read protection from an unknown location: %04X\n",pc);
- state->m_spacecr_prot_value ^= 0xff;
+ m_spacecr_prot_value ^= 0xff;
- return state->m_spacecr_prot_value;
+ return m_spacecr_prot_value;
}
/* Alpine Ski protection crack routines */
-WRITE8_HANDLER( alpine_protection_w )
+WRITE8_MEMBER(taitosj_state::alpine_protection_w)
{
- taitosj_state *state = space->machine().driver_data<taitosj_state>();
switch (data)
{
case 0x05:
- state->m_protection_value = 0x18;
+ m_protection_value = 0x18;
break;
case 0x07:
case 0x0c:
case 0x0f:
- state->m_protection_value = 0x00; /* not used as far as I can tell */
+ m_protection_value = 0x00; /* not used as far as I can tell */
break;
case 0x16:
- state->m_protection_value = 0x08;
+ m_protection_value = 0x08;
break;
case 0x1d:
- state->m_protection_value = 0x18;
+ m_protection_value = 0x18;
break;
default:
- state->m_protection_value = data; /* not used as far as I can tell */
+ m_protection_value = data; /* not used as far as I can tell */
break;
}
}
-WRITE8_HANDLER( alpinea_bankswitch_w )
+WRITE8_MEMBER(taitosj_state::alpinea_bankswitch_w)
{
- taitosj_state *state = space->machine().driver_data<taitosj_state>();
taitosj_bankswitch_w(space, offset, data);
- state->m_protection_value = data >> 2;
+ m_protection_value = data >> 2;
}
-READ8_HANDLER( alpine_port_2_r )
+READ8_MEMBER(taitosj_state::alpine_port_2_r)
{
- taitosj_state *state = space->machine().driver_data<taitosj_state>();
- return input_port_read(space->machine(), "IN2") | state->m_protection_value;
+ return input_port_read(machine(), "IN2") | m_protection_value;
}
diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c
index 8f4c3e606a3..6d96fab2cec 100644
--- a/src/mame/machine/tatsumi.c
+++ b/src/mame/machine/tatsumi.c
@@ -21,15 +21,13 @@ void tatsumi_reset(running_machine &machine)
/******************************************************************************/
-READ16_HANDLER( apache3_bank_r )
+READ16_MEMBER(tatsumi_state::apache3_bank_r)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- return state->m_control_word;
+ return m_control_word;
}
-WRITE16_HANDLER( apache3_bank_w )
+WRITE16_MEMBER(tatsumi_state::apache3_bank_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
/*
0x8000 - Set when accessing palette ram (not implemented, perhaps blank screen?)
0x0080 - Set when accessing IO cpu RAM/ROM (implemented as halt cpu)
@@ -38,58 +36,56 @@ WRITE16_HANDLER( apache3_bank_w )
0x000f - OBJ bank to access from main cpu (0x8 = RAM, 0x0 to 0x7 = ROM)
*/
- COMBINE_DATA(&state->m_control_word);
+ COMBINE_DATA(&m_control_word);
- if (state->m_control_word & 0x7f00)
+ if (m_control_word & 0x7f00)
{
- logerror("Unknown control Word: %04x\n",state->m_control_word);
- cputag_set_input_line(space->machine(), "sub2", INPUT_LINE_HALT, CLEAR_LINE); // ?
+ logerror("Unknown control Word: %04x\n",m_control_word);
+ cputag_set_input_line(machine(), "sub2", INPUT_LINE_HALT, CLEAR_LINE); // ?
}
- if (state->m_control_word & 0x10)
- cputag_set_input_line(space->machine(), "sub", INPUT_LINE_HALT, ASSERT_LINE);
+ if (m_control_word & 0x10)
+ cputag_set_input_line(machine(), "sub", INPUT_LINE_HALT, ASSERT_LINE);
else
- cputag_set_input_line(space->machine(), "sub", INPUT_LINE_HALT, CLEAR_LINE);
+ cputag_set_input_line(machine(), "sub", INPUT_LINE_HALT, CLEAR_LINE);
- if (state->m_control_word & 0x80)
- cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_HALT, ASSERT_LINE);
+ if (m_control_word & 0x80)
+ cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_HALT, ASSERT_LINE);
else
- cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_HALT, CLEAR_LINE);
+ cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_HALT, CLEAR_LINE);
- state->m_last_control=state->m_control_word;
+ m_last_control=m_control_word;
}
// D1 = /ZBREQ - Z80 bus request
// D0 = /GRDACC - Allow 68000 access to road pattern RAM
-WRITE16_HANDLER( apache3_z80_ctrl_w )
+WRITE16_MEMBER(tatsumi_state::apache3_z80_ctrl_w)
{
- cputag_set_input_line(space->machine(), "sub2", INPUT_LINE_HALT, data & 2 ? ASSERT_LINE : CLEAR_LINE);
+ cputag_set_input_line(machine(), "sub2", INPUT_LINE_HALT, data & 2 ? ASSERT_LINE : CLEAR_LINE);
}
-READ16_HANDLER( apache3_v30_v20_r )
+READ16_MEMBER(tatsumi_state::apache3_v30_v20_r)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- address_space *targetspace = space->machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space *targetspace = machine().device("audiocpu")->memory().space(AS_PROGRAM);
/* Each V20 byte maps to a V30 word */
- if ((state->m_control_word & 0xe0) == 0xe0)
+ if ((m_control_word & 0xe0) == 0xe0)
offset += 0xf8000; /* Upper half */
- else if ((state->m_control_word & 0xe0) == 0xc0)
+ else if ((m_control_word & 0xe0) == 0xc0)
offset += 0xf0000;
- else if ((state->m_control_word & 0xe0) == 0x80)
+ else if ((m_control_word & 0xe0) == 0x80)
offset += 0x00000; // main ram
else
- logerror("%08x: unmapped read z80 rom %08x\n", cpu_get_pc(&space->device()), offset);
+ logerror("%08x: unmapped read z80 rom %08x\n", cpu_get_pc(&space.device()), offset);
return 0xff00 | targetspace->read_byte(offset);
}
-WRITE16_HANDLER( apache3_v30_v20_w )
+WRITE16_MEMBER(tatsumi_state::apache3_v30_v20_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- address_space *targetspace = space->machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space *targetspace = machine().device("audiocpu")->memory().space(AS_PROGRAM);
- if ((state->m_control_word & 0xe0) != 0x80)
- logerror("%08x: write unmapped v30 rom %08x\n", cpu_get_pc(&space->device()), offset);
+ if ((m_control_word & 0xe0) != 0x80)
+ logerror("%08x: write unmapped v30 rom %08x\n", cpu_get_pc(&space.device()), offset);
/* Only 8 bits of the V30 data bus are connected - ignore writes to the other half */
if (ACCESSING_BITS_0_7)
@@ -98,29 +94,26 @@ WRITE16_HANDLER( apache3_v30_v20_w )
}
}
-READ16_HANDLER( apache3_z80_r )
+READ16_MEMBER(tatsumi_state::apache3_z80_r)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- return state->m_apache3_z80_ram[offset];
+ return m_apache3_z80_ram[offset];
}
-WRITE16_HANDLER( apache3_z80_w )
+WRITE16_MEMBER(tatsumi_state::apache3_z80_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- state->m_apache3_z80_ram[offset] = data & 0xff;
+ m_apache3_z80_ram[offset] = data & 0xff;
}
-READ8_HANDLER( apache3_adc_r )
+READ8_MEMBER(tatsumi_state::apache3_adc_r)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- switch (state->m_apache3_adc)
+ switch (m_apache3_adc)
{
- case 0: return input_port_read(space->machine(), "STICK_X");
- case 1: return input_port_read(space->machine(), "STICK_Y");
+ case 0: return input_port_read(machine(), "STICK_X");
+ case 1: return input_port_read(machine(), "STICK_Y");
case 2: return 0; // VSP1
case 3: return 0;
- case 4: return (UINT8)((255./100) * (100 - input_port_read(space->machine(), "VR1")));
- case 5: return input_port_read(space->machine(), "THROTTLE");
+ case 4: return (UINT8)((255./100) * (100 - input_port_read(machine(), "VR1")));
+ case 5: return input_port_read(machine(), "THROTTLE");
case 6: return 0; // RPSNC
case 7: return 0; // LPSNC
}
@@ -128,10 +121,9 @@ READ8_HANDLER( apache3_adc_r )
return 0;
}
-WRITE8_HANDLER( apache3_adc_w )
+WRITE8_MEMBER(tatsumi_state::apache3_adc_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- state->m_apache3_adc = offset;
+ m_apache3_adc = offset;
}
/* Ground/sky rotation control
@@ -140,60 +132,56 @@ WRITE8_HANDLER( apache3_adc_w )
* presumably loaded into the 8 TZ2213 custom
* accumulators and counters.
*/
-WRITE16_HANDLER( apache3_rotate_w )
+WRITE16_MEMBER(tatsumi_state::apache3_rotate_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- state->m_apache3_rotate_ctrl[state->m_apache3_rot_idx] = data;
- state->m_apache3_rot_idx = (state->m_apache3_rot_idx + 1) % 12;
+ m_apache3_rotate_ctrl[m_apache3_rot_idx] = data;
+ m_apache3_rot_idx = (m_apache3_rot_idx + 1) % 12;
}
/******************************************************************************/
-READ16_HANDLER( roundup_v30_z80_r )
+READ16_MEMBER(tatsumi_state::roundup_v30_z80_r)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- address_space *targetspace = space->machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space *targetspace = machine().device("audiocpu")->memory().space(AS_PROGRAM);
/* Each Z80 byte maps to a V30 word */
- if (state->m_control_word & 0x20)
+ if (m_control_word & 0x20)
offset += 0x8000; /* Upper half */
return 0xff00 | targetspace->read_byte(offset);
}
-WRITE16_HANDLER( roundup_v30_z80_w )
+WRITE16_MEMBER(tatsumi_state::roundup_v30_z80_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- address_space *targetspace = space->machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space *targetspace = machine().device("audiocpu")->memory().space(AS_PROGRAM);
/* Only 8 bits of the V30 data bus are connected - ignore writes to the other half */
if (ACCESSING_BITS_0_7)
{
- if (state->m_control_word & 0x20)
- offset += 0x8000; /* Upper half of Z80 address space */
+ if (m_control_word & 0x20)
+ offset += 0x8000; /* Upper half of Z80 address &space */
targetspace->write_byte(offset, data & 0xff);
}
}
-WRITE16_HANDLER( roundup5_control_w )
+WRITE16_MEMBER(tatsumi_state::roundup5_control_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- COMBINE_DATA(&state->m_control_word);
+ COMBINE_DATA(&m_control_word);
- if (state->m_control_word & 0x10)
- cputag_set_input_line(space->machine(), "sub", INPUT_LINE_HALT, ASSERT_LINE);
+ if (m_control_word & 0x10)
+ cputag_set_input_line(machine(), "sub", INPUT_LINE_HALT, ASSERT_LINE);
else
- cputag_set_input_line(space->machine(), "sub", INPUT_LINE_HALT, CLEAR_LINE);
+ cputag_set_input_line(machine(), "sub", INPUT_LINE_HALT, CLEAR_LINE);
- if (state->m_control_word & 0x4)
- cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_HALT, ASSERT_LINE);
+ if (m_control_word & 0x4)
+ cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_HALT, ASSERT_LINE);
else
- cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_HALT, CLEAR_LINE);
+ cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_HALT, CLEAR_LINE);
// if (offset == 1 && (tatsumi_control_w & 0xfeff) != (last_bank & 0xfeff))
-// logerror("%08x: Changed bank to %04x (%d)\n", cpu_get_pc(&space->device()), tatsumi_control_w,offset);
+// logerror("%08x: Changed bank to %04x (%d)\n", cpu_get_pc(&space.device()), tatsumi_control_w,offset);
//todo - watchdog
@@ -215,8 +203,8 @@ WRITE16_HANDLER( roundup5_control_w )
Changed bank to 0060 (0)
*/
- if ((state->m_control_word & 0x8) == 0 && !(state->m_last_control & 0x8))
- cputag_set_input_line(space->machine(), "sub", INPUT_LINE_IRQ4, ASSERT_LINE);
+ if ((m_control_word & 0x8) == 0 && !(m_last_control & 0x8))
+ cputag_set_input_line(machine(), "sub", INPUT_LINE_IRQ4, ASSERT_LINE);
// if (tatsumi_control_w&0x200)
// cpu_set_reset_line(1, CLEAR_LINE);
// else
@@ -227,51 +215,47 @@ WRITE16_HANDLER( roundup5_control_w )
// if ((tatsumi_control_w&0x200)==0 && (last_bank&0x200)==0x200)
// logerror("68k reset\n");
- if (state->m_control_word == 0x3a00)
+ if (m_control_word == 0x3a00)
{
// cpu_set_reset_line(1, CLEAR_LINE);
// logerror("68k on\n");
}
- state->m_last_control = state->m_control_word;
+ m_last_control = m_control_word;
}
-WRITE16_HANDLER( roundup5_d0000_w )
+WRITE16_MEMBER(tatsumi_state::roundup5_d0000_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- COMBINE_DATA(&state->m_roundup5_d0000_ram[offset]);
-// logerror("d_68k_d0000_w %06x %04x\n", cpu_get_pc(&space->device()), data);
+ COMBINE_DATA(&m_roundup5_d0000_ram[offset]);
+// logerror("d_68k_d0000_w %06x %04x\n", cpu_get_pc(&space.device()), data);
}
-WRITE16_HANDLER( roundup5_e0000_w )
+WRITE16_MEMBER(tatsumi_state::roundup5_e0000_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
/* Bit 0x10 is road bank select,
Bit 0x100 is used, but unknown
*/
- COMBINE_DATA(&state->m_roundup5_e0000_ram[offset]);
- cputag_set_input_line(space->machine(), "sub", INPUT_LINE_IRQ4, CLEAR_LINE); // guess, probably wrong
+ COMBINE_DATA(&m_roundup5_e0000_ram[offset]);
+ cputag_set_input_line(machine(), "sub", INPUT_LINE_IRQ4, CLEAR_LINE); // guess, probably wrong
-// logerror("d_68k_e0000_w %06x %04x\n", cpu_get_pc(&space->device()), data);
+// logerror("d_68k_e0000_w %06x %04x\n", cpu_get_pc(&space.device()), data);
}
/******************************************************************************/
-READ16_HANDLER(cyclwarr_control_r)
+READ16_MEMBER(tatsumi_state::cyclwarr_control_r)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
-// logerror("%08x: control_r\n", cpu_get_pc(&space->device()));
- return state->m_control_word;
+// logerror("%08x: control_r\n", cpu_get_pc(&space.device()));
+ return m_control_word;
}
-WRITE16_HANDLER(cyclwarr_control_w)
+WRITE16_MEMBER(tatsumi_state::cyclwarr_control_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- COMBINE_DATA(&state->m_control_word);
+ COMBINE_DATA(&m_control_word);
-// if ((state->m_control_word&0xfe) != (state->m_last_control&0xfe))
-// logerror("%08x: control_w %04x\n", cpu_get_pc(&space->device()), data);
+// if ((m_control_word&0xfe) != (m_last_control&0xfe))
+// logerror("%08x: control_w %04x\n", cpu_get_pc(&space.device()), data);
/*
@@ -282,44 +266,43 @@ WRITE16_HANDLER(cyclwarr_control_w)
*/
- if ((state->m_control_word & 4) == 4 && (state->m_last_control & 4) == 0)
+ if ((m_control_word & 4) == 4 && (m_last_control & 4) == 0)
{
// logerror("68k 2 halt\n");
- cputag_set_input_line(space->machine(), "sub", INPUT_LINE_HALT, ASSERT_LINE);
+ cputag_set_input_line(machine(), "sub", INPUT_LINE_HALT, ASSERT_LINE);
}
- if ((state->m_control_word & 4) == 0 && (state->m_last_control & 4) == 4)
+ if ((m_control_word & 4) == 0 && (m_last_control & 4) == 4)
{
// logerror("68k 2 irq go\n");
- cputag_set_input_line(space->machine(), "sub", INPUT_LINE_HALT, CLEAR_LINE);
+ cputag_set_input_line(machine(), "sub", INPUT_LINE_HALT, CLEAR_LINE);
}
// hack
- if (cpu_get_pc(&space->device()) == 0x2c3c34)
+ if (cpu_get_pc(&space.device()) == 0x2c3c34)
{
// cpu_set_reset_line(1, CLEAR_LINE);
// logerror("hack 68k2 on\n");
}
- state->m_last_control = state->m_control_word;
+ m_last_control = m_control_word;
}
/******************************************************************************/
-READ16_HANDLER( tatsumi_v30_68000_r )
+READ16_MEMBER(tatsumi_state::tatsumi_v30_68000_r)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- const UINT16* rom=(UINT16*)space->machine().region("sub")->base();
+ const UINT16* rom=(UINT16*)machine().region("sub")->base();
-logerror("%05X:68000_r(%04X),cw=%04X\n", cpu_get_pc(&space->device()), offset*2, state->m_control_word);
+logerror("%05X:68000_r(%04X),cw=%04X\n", cpu_get_pc(&space.device()), offset*2, m_control_word);
/* Read from 68k RAM */
- if ((state->m_control_word&0x1f)==0x18)
+ if ((m_control_word&0x1f)==0x18)
{
// hack to make roundup 5 boot
- if (cpu_get_pc(&space->device())==0xec575)
+ if (cpu_get_pc(&space.device())==0xec575)
{
- UINT8 *dst = space->machine().region("maincpu")->base();
+ UINT8 *dst = machine().region("maincpu")->base();
dst[BYTE_XOR_LE(0xec57a)]=0x46;
dst[BYTE_XOR_LE(0xec57b)]=0x46;
@@ -331,22 +314,21 @@ logerror("%05X:68000_r(%04X),cw=%04X\n", cpu_get_pc(&space->device()), offset*2,
dst[BYTE_XOR_LE(0xfc525)]=0x46;
}
- return state->m_68k_ram[offset & 0x1fff];
+ return m_68k_ram[offset & 0x1fff];
}
/* Read from 68k ROM */
- offset+=(state->m_control_word&0x7)*0x8000;
+ offset+=(m_control_word&0x7)*0x8000;
return rom[offset];
}
-WRITE16_HANDLER( tatsumi_v30_68000_w )
+WRITE16_MEMBER(tatsumi_state::tatsumi_v30_68000_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- if ((state->m_control_word&0x1f)!=0x18)
- logerror("68k write in bank %05x\n",state->m_control_word);
+ if ((m_control_word&0x1f)!=0x18)
+ logerror("68k write in bank %05x\n",m_control_word);
- COMBINE_DATA(&state->m_68k_ram[offset]);
+ COMBINE_DATA(&m_68k_ram[offset]);
}
/***********************************************************************************/
diff --git a/src/mame/machine/tecmosys.c b/src/mame/machine/tecmosys.c
index 592761cc8a0..7e1dce3f311 100644
--- a/src/mame/machine/tecmosys.c
+++ b/src/mame/machine/tecmosys.c
@@ -124,7 +124,7 @@ void tecmosys_prot_init(running_machine &machine, int which)
machine.add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(FUNC(tecmosys_prot_reset), &machine));
}
-READ16_HANDLER(tecmosys_prot_status_r)
+READ16_MEMBER(tecmosys_state::tecmosys_prot_status_r)
{
if (ACCESSING_BITS_8_15)
{
@@ -136,87 +136,85 @@ READ16_HANDLER(tecmosys_prot_status_r)
return 0xc0; // simulation is always ready
}
-WRITE16_HANDLER(tecmosys_prot_status_w)
+WRITE16_MEMBER(tecmosys_state::tecmosys_prot_status_w)
{
// deroon clears the status in one place.
}
-READ16_HANDLER(tecmosys_prot_data_r)
+READ16_MEMBER(tecmosys_state::tecmosys_prot_data_r)
{
- tecmosys_state *state = space->machine().driver_data<tecmosys_state>();
// prot appears to be read-ready for two consecutive reads
// but returns 0xff for subsequent reads.
- UINT8 ret = state->m_device_value;
- state->m_device_value = 0xff;
+ UINT8 ret = m_device_value;
+ m_device_value = 0xff;
//logerror("- prot_r = 0x%02x\n", ret );
return ret << 8;
}
-WRITE16_HANDLER(tecmosys_prot_data_w)
+WRITE16_MEMBER(tecmosys_state::tecmosys_prot_data_w)
{
- tecmosys_state *state = space->machine().driver_data<tecmosys_state>();
// Only LSB
data >>= 8;
//logerror("+ prot_w( 0x%02x )\n", data );
- switch( state->m_device_status )
+ switch( m_device_status )
{
case DS_IDLE:
if( data == 0x13 )
{
- state->m_device_status = DS_LOGIN;
- state->m_device_value = state->m_device_data->passwd_len;
- state->m_device_read_ptr = 0;
+ m_device_status = DS_LOGIN;
+ m_device_value = m_device_data->passwd_len;
+ m_device_read_ptr = 0;
break;
}
break;
case DS_LOGIN:
- if( state->m_device_read_ptr >= state->m_device_data->passwd_len)
+ if( m_device_read_ptr >= m_device_data->passwd_len)
{
- state->m_device_status = DS_SEND_CODE;
- state->m_device_value = state->m_device_data->code[0];
- state->m_device_read_ptr = 1;
+ m_device_status = DS_SEND_CODE;
+ m_device_value = m_device_data->code[0];
+ m_device_read_ptr = 1;
}
else
- state->m_device_value = state->m_device_data->passwd[state->m_device_read_ptr++] == data ? 0 : 0xff;
+ m_device_value = m_device_data->passwd[m_device_read_ptr++] == data ? 0 : 0xff;
break;
case DS_SEND_CODE:
- if( state->m_device_read_ptr >= state->m_device_data->code[0]+2 ) // + code_len + trailer
+ if( m_device_read_ptr >= m_device_data->code[0]+2 ) // + code_len + trailer
{
- state->m_device_status = DS_SEND_ADRS;
- state->m_device_value = state->m_device_data->checksum_ranges[0];
- state->m_device_read_ptr = 1;
+ m_device_status = DS_SEND_ADRS;
+ m_device_value = m_device_data->checksum_ranges[0];
+ m_device_read_ptr = 1;
}
else
- state->m_device_value = data == state->m_device_data->code[state->m_device_read_ptr-1] ? state->m_device_data->code[state->m_device_read_ptr++] : 0xff;
+ m_device_value = data == m_device_data->code[m_device_read_ptr-1] ? m_device_data->code[m_device_read_ptr++] : 0xff;
break;
case DS_SEND_ADRS:
- if( state->m_device_read_ptr >= 16+1 ) //+ trailer
+ if( m_device_read_ptr >= 16+1 ) //+ trailer
{
- state->m_device_status = DS_SEND_CHKSUMS;
- state->m_device_value = 0;
- state->m_device_read_ptr = 0;
+ m_device_status = DS_SEND_CHKSUMS;
+ m_device_value = 0;
+ m_device_read_ptr = 0;
}
else
{
- state->m_device_value = data == state->m_device_data->checksum_ranges[state->m_device_read_ptr-1] ? state->m_device_data->checksum_ranges[state->m_device_read_ptr++] : 0xff;
+ m_device_value = data == m_device_data->checksum_ranges[m_device_read_ptr-1] ? m_device_data->checksum_ranges[m_device_read_ptr++] : 0xff;
}
break;
case DS_SEND_CHKSUMS:
- if( state->m_device_read_ptr >= 5 )
+ if( m_device_read_ptr >= 5 )
{
- state->m_device_status = DS_DONE;
- state->m_device_value = 0;
+ m_device_status = DS_DONE;
+ m_device_value = 0;
}
else
- state->m_device_value = data == state->m_device_data->checksums[state->m_device_read_ptr] ? state->m_device_data->checksums[state->m_device_read_ptr++] : 0xff;
+ m_device_value = data == m_device_data->checksums[m_device_read_ptr] ? m_device_data->checksums[m_device_read_ptr++] : 0xff;
break;
case DS_DONE:
diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c
index adbe2b445b6..c3fd5beeee0 100644
--- a/src/mame/machine/tnzs.c
+++ b/src/mame/machine/tnzs.c
@@ -17,77 +17,73 @@
#include "includes/tnzs.h"
-static READ8_HANDLER( mcu_tnzs_r )
+READ8_MEMBER(tnzs_state::mcu_tnzs_r)
{
- tnzs_state *state = space->machine().driver_data<tnzs_state>();
UINT8 data;
- data = upi41_master_r(state->m_mcu, offset & 1);
- device_yield(&space->device());
+ data = upi41_master_r(m_mcu, offset & 1);
+ device_yield(&space.device());
-// logerror("PC %04x: read %02x from mcu $c00%01x\n", cpu_get_previouspc(&space->device()), data, offset);
+// logerror("PC %04x: read %02x from mcu $c00%01x\n", cpu_get_previouspc(&space.device()), data, offset);
return data;
}
-static WRITE8_HANDLER( mcu_tnzs_w )
+WRITE8_MEMBER(tnzs_state::mcu_tnzs_w)
{
- tnzs_state *state = space->machine().driver_data<tnzs_state>();
-// logerror("PC %04x: write %02x to mcu $c00%01x\n", cpu_get_previouspc(&space->device()), data, offset);
+// logerror("PC %04x: write %02x to mcu $c00%01x\n", cpu_get_previouspc(&space.device()), data, offset);
- upi41_master_w(state->m_mcu, offset & 1, data);
+ upi41_master_w(m_mcu, offset & 1, data);
}
-READ8_HANDLER( tnzs_port1_r )
+READ8_MEMBER(tnzs_state::tnzs_port1_r)
{
- tnzs_state *state = space->machine().driver_data<tnzs_state>();
int data = 0;
- switch (state->m_input_select & 0x0f)
+ switch (m_input_select & 0x0f)
{
- case 0x0a: data = input_port_read(space->machine(), "IN2"); break;
- case 0x0c: data = input_port_read(space->machine(), "IN0"); break;
- case 0x0d: data = input_port_read(space->machine(), "IN1"); break;
+ case 0x0a: data = input_port_read(machine(), "IN2"); break;
+ case 0x0c: data = input_port_read(machine(), "IN0"); break;
+ case 0x0d: data = input_port_read(machine(), "IN1"); break;
default: data = 0xff; break;
}
-// logerror("I8742:%04x Read %02x from port 1\n", cpu_get_previouspc(&space->device()), data);
+// logerror("I8742:%04x Read %02x from port 1\n", cpu_get_previouspc(&space.device()), data);
return data;
}
-READ8_HANDLER( tnzs_port2_r )
+READ8_MEMBER(tnzs_state::tnzs_port2_r)
{
- int data = input_port_read(space->machine(), "IN2");
+ int data = input_port_read(machine(), "IN2");
-// logerror("I8742:%04x Read %02x from port 2\n", cpu_get_previouspc(&space->device()), data);
+// logerror("I8742:%04x Read %02x from port 2\n", cpu_get_previouspc(&space.device()), data);
return data;
}
-WRITE8_HANDLER( tnzs_port2_w )
+WRITE8_MEMBER(tnzs_state::tnzs_port2_w)
{
- tnzs_state *state = space->machine().driver_data<tnzs_state>();
-// logerror("I8742:%04x Write %02x to port 2\n", cpu_get_previouspc(&space->device()), data);
+// logerror("I8742:%04x Write %02x to port 2\n", cpu_get_previouspc(&space.device()), data);
- coin_lockout_w(space->machine(), 0, (data & 0x40));
- coin_lockout_w(space->machine(), 1, (data & 0x80));
- coin_counter_w(space->machine(), 0, (~data & 0x10));
- coin_counter_w(space->machine(), 1, (~data & 0x20));
+ coin_lockout_w(machine(), 0, (data & 0x40));
+ coin_lockout_w(machine(), 1, (data & 0x80));
+ coin_counter_w(machine(), 0, (~data & 0x10));
+ coin_counter_w(machine(), 1, (~data & 0x20));
- state->m_input_select = data;
+ m_input_select = data;
}
-READ8_HANDLER( arknoid2_sh_f000_r )
+READ8_MEMBER(tnzs_state::arknoid2_sh_f000_r)
{
int val;
-// logerror("PC %04x: read input %04x\n", cpu_get_pc(&space->device()), 0xf000 + offset);
+// logerror("PC %04x: read input %04x\n", cpu_get_pc(&space.device()), 0xf000 + offset);
- val = input_port_read_safe(space->machine(), (offset / 2) ? "AN2" : "AN1", 0);
+ val = input_port_read_safe(machine(), (offset / 2) ? "AN2" : "AN1", 0);
if (offset & 1)
return ((val >> 8) & 0xff);
else
@@ -186,40 +182,39 @@ static void mcu_handle_coins( running_machine &machine, int coin )
}
-static READ8_HANDLER( mcu_arknoid2_r )
+READ8_MEMBER(tnzs_state::mcu_arknoid2_r)
{
static const char mcu_startup[] = "\x55\xaa\x5a";
- tnzs_state *state = space->machine().driver_data<tnzs_state>();
-// logerror("PC %04x: read mcu %04x\n", cpu_get_pc(&space->device()), 0xc000 + offset);
+// logerror("PC %04x: read mcu %04x\n", cpu_get_pc(&space.device()), 0xc000 + offset);
if (offset == 0)
{
/* if the mcu has just been reset, return startup code */
- if (state->m_mcu_initializing)
+ if (m_mcu_initializing)
{
- state->m_mcu_initializing--;
- return mcu_startup[2 - state->m_mcu_initializing];
+ m_mcu_initializing--;
+ return mcu_startup[2 - m_mcu_initializing];
}
- switch (state->m_mcu_command)
+ switch (m_mcu_command)
{
case 0x41:
- return state->m_mcu_credits;
+ return m_mcu_credits;
case 0xc1:
/* Read the credit counter or the inputs */
- if (state->m_mcu_readcredits == 0)
+ if (m_mcu_readcredits == 0)
{
- state->m_mcu_readcredits = 1;
- if (state->m_mcu_reportcoin & 0x08)
+ m_mcu_readcredits = 1;
+ if (m_mcu_reportcoin & 0x08)
{
- state->m_mcu_initializing = 3;
+ m_mcu_initializing = 3;
return 0xee; /* tilt */
}
- else return state->m_mcu_credits;
+ else return m_mcu_credits;
}
- else return input_port_read(space->machine(), "IN0"); /* buttons */
+ else return input_port_read(machine(), "IN0"); /* buttons */
default:
logerror("error, unknown mcu command\n");
@@ -240,23 +235,22 @@ static READ8_HANDLER( mcu_arknoid2_r )
1,2,3 = coin switch pressed
e = tilt
*/
- if (state->m_mcu_reportcoin & 0x08) return 0xe1; /* tilt */
- if (state->m_mcu_reportcoin & 0x01) return 0x11; /* coin 1 (will trigger "coin inserted" sound) */
- if (state->m_mcu_reportcoin & 0x02) return 0x21; /* coin 2 (will trigger "coin inserted" sound) */
- if (state->m_mcu_reportcoin & 0x04) return 0x31; /* coin 3 (will trigger "coin inserted" sound) */
+ if (m_mcu_reportcoin & 0x08) return 0xe1; /* tilt */
+ if (m_mcu_reportcoin & 0x01) return 0x11; /* coin 1 (will trigger "coin inserted" sound) */
+ if (m_mcu_reportcoin & 0x02) return 0x21; /* coin 2 (will trigger "coin inserted" sound) */
+ if (m_mcu_reportcoin & 0x04) return 0x31; /* coin 3 (will trigger "coin inserted" sound) */
return 0x01;
}
}
-static WRITE8_HANDLER( mcu_arknoid2_w )
+WRITE8_MEMBER(tnzs_state::mcu_arknoid2_w)
{
- tnzs_state *state = space->machine().driver_data<tnzs_state>();
if (offset == 0)
{
-// logerror("PC %04x: write %02x to mcu %04x\n", cpu_get_pc(&space->device()), data, 0xc000 + offset);
- if (state->m_mcu_command == 0x41)
+// logerror("PC %04x: write %02x to mcu %04x\n", cpu_get_pc(&space.device()), data, 0xc000 + offset);
+ if (m_mcu_command == 0x41)
{
- state->m_mcu_credits = (state->m_mcu_credits + data) & 0xff;
+ m_mcu_credits = (m_mcu_credits + data) & 0xff;
}
}
else
@@ -270,87 +264,86 @@ static WRITE8_HANDLER( mcu_arknoid2_w )
0x80: release coin lockout (issued only in test mode)
during initialization, a sequence of 4 bytes sets coin/credit settings
*/
-// logerror("PC %04x: write %02x to mcu %04x\n", cpu_get_pc(&space->device()), data, 0xc000 + offset);
+// logerror("PC %04x: write %02x to mcu %04x\n", cpu_get_pc(&space.device()), data, 0xc000 + offset);
- if (state->m_mcu_initializing)
+ if (m_mcu_initializing)
{
/* set up coin/credit settings */
- state->m_mcu_coinage[state->m_mcu_coinage_init++] = data;
- if (state->m_mcu_coinage_init == 4)
- state->m_mcu_coinage_init = 0; /* must not happen */
+ m_mcu_coinage[m_mcu_coinage_init++] = data;
+ if (m_mcu_coinage_init == 4)
+ m_mcu_coinage_init = 0; /* must not happen */
}
if (data == 0xc1)
- state->m_mcu_readcredits = 0; /* reset input port number */
+ m_mcu_readcredits = 0; /* reset input port number */
if (data == 0x15)
{
- state->m_mcu_credits = (state->m_mcu_credits - 1) & 0xff;
- if (state->m_mcu_credits == 0xff)
- state->m_mcu_credits = 0;
+ m_mcu_credits = (m_mcu_credits - 1) & 0xff;
+ if (m_mcu_credits == 0xff)
+ m_mcu_credits = 0;
}
- state->m_mcu_command = data;
+ m_mcu_command = data;
}
}
-static READ8_HANDLER( mcu_extrmatn_r )
+READ8_MEMBER(tnzs_state::mcu_extrmatn_r)
{
- tnzs_state *state = space->machine().driver_data<tnzs_state>();
static const char mcu_startup[] = "\x5a\xa5\x55";
-// logerror("PC %04x: read mcu %04x\n", cpu_get_pc(&space->device()), 0xc000 + offset);
+// logerror("PC %04x: read mcu %04x\n", cpu_get_pc(&space.device()), 0xc000 + offset);
if (offset == 0)
{
/* if the mcu has just been reset, return startup code */
- if (state->m_mcu_initializing)
+ if (m_mcu_initializing)
{
- state->m_mcu_initializing--;
- return mcu_startup[2 - state->m_mcu_initializing];
+ m_mcu_initializing--;
+ return mcu_startup[2 - m_mcu_initializing];
}
- switch (state->m_mcu_command)
+ switch (m_mcu_command)
{
case 0x01:
- return input_port_read(space->machine(), "IN0") ^ 0xff; /* player 1 joystick + buttons */
+ return input_port_read(machine(), "IN0") ^ 0xff; /* player 1 joystick + buttons */
case 0x02:
- return input_port_read(space->machine(), "IN1") ^ 0xff; /* player 2 joystick + buttons */
+ return input_port_read(machine(), "IN1") ^ 0xff; /* player 2 joystick + buttons */
case 0x1a:
- return (input_port_read(space->machine(), "COIN1") | (input_port_read(space->machine(), "COIN2") << 1));
+ return (input_port_read(machine(), "COIN1") | (input_port_read(machine(), "COIN2") << 1));
case 0x21:
- return input_port_read(space->machine(), "IN2") & 0x0f;
+ return input_port_read(machine(), "IN2") & 0x0f;
case 0x41:
- return state->m_mcu_credits;
+ return m_mcu_credits;
case 0xa0:
/* Read the credit counter */
- if (state->m_mcu_reportcoin & 0x08)
+ if (m_mcu_reportcoin & 0x08)
{
- state->m_mcu_initializing = 3;
+ m_mcu_initializing = 3;
return 0xee; /* tilt */
}
- else return state->m_mcu_credits;
+ else return m_mcu_credits;
case 0xa1:
/* Read the credit counter or the inputs */
- if (state->m_mcu_readcredits == 0)
+ if (m_mcu_readcredits == 0)
{
- state->m_mcu_readcredits = 1;
- if (state->m_mcu_reportcoin & 0x08)
+ m_mcu_readcredits = 1;
+ if (m_mcu_reportcoin & 0x08)
{
- state->m_mcu_initializing = 3;
+ m_mcu_initializing = 3;
return 0xee; /* tilt */
// return 0x64; /* theres a reset input somewhere */
}
- else return state->m_mcu_credits;
+ else return m_mcu_credits;
}
/* buttons */
- else return ((input_port_read(space->machine(), "IN0") & 0xf0) | (input_port_read(space->machine(), "IN1") >> 4)) ^ 0xff;
+ else return ((input_port_read(machine(), "IN0") & 0xf0) | (input_port_read(machine(), "IN1") >> 4)) ^ 0xff;
default:
logerror("error, unknown mcu command\n");
@@ -371,23 +364,22 @@ static READ8_HANDLER( mcu_extrmatn_r )
1,2,3 = coin switch pressed
e = tilt
*/
- if (state->m_mcu_reportcoin & 0x08) return 0xe1; /* tilt */
- if (state->m_mcu_reportcoin & 0x01) return 0x11; /* coin 1 (will trigger "coin inserted" sound) */
- if (state->m_mcu_reportcoin & 0x02) return 0x21; /* coin 2 (will trigger "coin inserted" sound) */
- if (state->m_mcu_reportcoin & 0x04) return 0x31; /* coin 3 (will trigger "coin inserted" sound) */
+ if (m_mcu_reportcoin & 0x08) return 0xe1; /* tilt */
+ if (m_mcu_reportcoin & 0x01) return 0x11; /* coin 1 (will trigger "coin inserted" sound) */
+ if (m_mcu_reportcoin & 0x02) return 0x21; /* coin 2 (will trigger "coin inserted" sound) */
+ if (m_mcu_reportcoin & 0x04) return 0x31; /* coin 3 (will trigger "coin inserted" sound) */
return 0x01;
}
}
-static WRITE8_HANDLER( mcu_extrmatn_w )
+WRITE8_MEMBER(tnzs_state::mcu_extrmatn_w)
{
- tnzs_state *state = space->machine().driver_data<tnzs_state>();
if (offset == 0)
{
-// logerror("PC %04x: write %02x to mcu %04x\n", cpu_get_pc(&space->device()), data, 0xc000 + offset);
- if (state->m_mcu_command == 0x41)
+// logerror("PC %04x: write %02x to mcu %04x\n", cpu_get_pc(&space.device()), data, 0xc000 + offset);
+ if (m_mcu_command == 0x41)
{
- state->m_mcu_credits = (state->m_mcu_credits + data) & 0xff;
+ m_mcu_credits = (m_mcu_credits + data) & 0xff;
}
}
else
@@ -406,26 +398,26 @@ static WRITE8_HANDLER( mcu_extrmatn_w )
during initialization, a sequence of 4 bytes sets coin/credit settings
*/
-// logerror("PC %04x: write %02x to mcu %04x\n", cpu_get_pc(&space->device()), data, 0xc000 + offset);
+// logerror("PC %04x: write %02x to mcu %04x\n", cpu_get_pc(&space.device()), data, 0xc000 + offset);
- if (state->m_mcu_initializing)
+ if (m_mcu_initializing)
{
/* set up coin/credit settings */
- state->m_mcu_coinage[state->m_mcu_coinage_init++] = data;
- if (state->m_mcu_coinage_init == 4)
- state->m_mcu_coinage_init = 0; /* must not happen */
+ m_mcu_coinage[m_mcu_coinage_init++] = data;
+ if (m_mcu_coinage_init == 4)
+ m_mcu_coinage_init = 0; /* must not happen */
}
if (data == 0xa1)
- state->m_mcu_readcredits = 0; /* reset input port number */
+ m_mcu_readcredits = 0; /* reset input port number */
/* Dr Toppel decrements credits differently. So handle it */
- if ((data == 0x09) && (state->m_mcu_type == MCU_DRTOPPEL || state->m_mcu_type == MCU_PLUMPOP))
- state->m_mcu_credits = (state->m_mcu_credits - 1) & 0xff; /* Player 1 start */
- if ((data == 0x18) && (state->m_mcu_type == MCU_DRTOPPEL || state->m_mcu_type == MCU_PLUMPOP))
- state->m_mcu_credits = (state->m_mcu_credits - 2) & 0xff; /* Player 2 start */
+ if ((data == 0x09) && (m_mcu_type == MCU_DRTOPPEL || m_mcu_type == MCU_PLUMPOP))
+ m_mcu_credits = (m_mcu_credits - 1) & 0xff; /* Player 1 start */
+ if ((data == 0x18) && (m_mcu_type == MCU_DRTOPPEL || m_mcu_type == MCU_PLUMPOP))
+ m_mcu_credits = (m_mcu_credits - 2) & 0xff; /* Player 2 start */
- state->m_mcu_command = data;
+ m_mcu_command = data;
}
}
@@ -482,9 +474,9 @@ static TIMER_CALLBACK( kludge_callback )
tnzs_sharedram[0x0f10] = param;
}
-static WRITE8_HANDLER( tnzs_sync_kludge_w )
+WRITE8_MEMBER(tnzs_state::tnzs_sync_kludge_w)
{
- space->machine().scheduler().synchronize(FUNC(kludge_callback), data);
+ machine().scheduler().synchronize(FUNC(kludge_callback), data);
}
*/
@@ -567,10 +559,9 @@ DRIVER_INIT( kageki )
}
-READ8_HANDLER( tnzs_mcu_r )
+READ8_MEMBER(tnzs_state::tnzs_mcu_r)
{
- tnzs_state *state = space->machine().driver_data<tnzs_state>();
- switch (state->m_mcu_type)
+ switch (m_mcu_type)
{
case MCU_TNZS:
case MCU_CHUKATAI:
@@ -586,10 +577,9 @@ READ8_HANDLER( tnzs_mcu_r )
}
}
-WRITE8_HANDLER( tnzs_mcu_w )
+WRITE8_MEMBER(tnzs_state::tnzs_mcu_w)
{
- tnzs_state *state = space->machine().driver_data<tnzs_state>();
- switch (state->m_mcu_type)
+ switch (m_mcu_type)
{
case MCU_TNZS:
case MCU_CHUKATAI:
@@ -739,62 +729,60 @@ MACHINE_START( jpopnics )
}
-WRITE8_HANDLER( tnzs_bankswitch_w )
+WRITE8_MEMBER(tnzs_state::tnzs_bankswitch_w)
{
- tnzs_state *state = space->machine().driver_data<tnzs_state>();
-// logerror("PC %04x: writing %02x to bankswitch\n", cpu_get_pc(&space->device()),data);
+// logerror("PC %04x: writing %02x to bankswitch\n", cpu_get_pc(&space.device()),data);
/* bit 4 resets the second CPU */
if (data & 0x10)
- device_set_input_line(state->m_subcpu, INPUT_LINE_RESET, CLEAR_LINE);
+ device_set_input_line(m_subcpu, INPUT_LINE_RESET, CLEAR_LINE);
else
- device_set_input_line(state->m_subcpu, INPUT_LINE_RESET, ASSERT_LINE);
+ device_set_input_line(m_subcpu, INPUT_LINE_RESET, ASSERT_LINE);
/* bits 0-2 select RAM/ROM bank */
- state->m_bank1 = data & 0x07;
- memory_set_bank(space->machine(), "bank1", state->m_bank1);
+ m_bank1 = data & 0x07;
+ memory_set_bank(machine(), "bank1", m_bank1);
- if (state->m_bank1 <= 1)
- space->install_write_bank(0x8000, 0xbfff, "bank1");
+ if (m_bank1 <= 1)
+ space.install_write_bank(0x8000, 0xbfff, "bank1");
else
- space->unmap_write(0x8000, 0xbfff);
+ space.unmap_write(0x8000, 0xbfff);
}
-WRITE8_HANDLER( tnzs_bankswitch1_w )
+WRITE8_MEMBER(tnzs_state::tnzs_bankswitch1_w)
{
- tnzs_state *state = space->machine().driver_data<tnzs_state>();
-// logerror("PC %04x: writing %02x to bankswitch 1\n", cpu_get_pc(&space->device()),data);
+// logerror("PC %04x: writing %02x to bankswitch 1\n", cpu_get_pc(&space.device()),data);
- switch (state->m_mcu_type)
+ switch (m_mcu_type)
{
case MCU_TNZS:
case MCU_CHUKATAI:
/* bit 2 resets the mcu */
if (data & 0x04)
{
- if (state->m_mcu != NULL && state->m_mcu->type() == I8742)
- device_set_input_line(state->m_mcu, INPUT_LINE_RESET, PULSE_LINE);
+ if (m_mcu != NULL && m_mcu->type() == I8742)
+ device_set_input_line(m_mcu, INPUT_LINE_RESET, PULSE_LINE);
}
/* Coin count and lockout is handled by the i8742 */
break;
case MCU_NONE_INSECTX:
- coin_lockout_w(space->machine(), 0, (~data & 0x04));
- coin_lockout_w(space->machine(), 1, (~data & 0x08));
- coin_counter_w(space->machine(), 0, (data & 0x10));
- coin_counter_w(space->machine(), 1, (data & 0x20));
+ coin_lockout_w(machine(), 0, (~data & 0x04));
+ coin_lockout_w(machine(), 1, (~data & 0x08));
+ coin_counter_w(machine(), 0, (data & 0x10));
+ coin_counter_w(machine(), 1, (data & 0x20));
break;
case MCU_NONE_TNZSB:
case MCU_NONE_KABUKIZ:
- coin_lockout_w(space->machine(), 0, (~data & 0x10));
- coin_lockout_w(space->machine(), 1, (~data & 0x20));
- coin_counter_w(space->machine(), 0, (data & 0x04));
- coin_counter_w(space->machine(), 1, (data & 0x08));
+ coin_lockout_w(machine(), 0, (~data & 0x10));
+ coin_lockout_w(machine(), 1, (~data & 0x20));
+ coin_counter_w(machine(), 0, (data & 0x04));
+ coin_counter_w(machine(), 1, (data & 0x08));
break;
case MCU_NONE_KAGEKI:
- coin_lockout_global_w(space->machine(), (~data & 0x20));
- coin_counter_w(space->machine(), 0, (data & 0x04));
- coin_counter_w(space->machine(), 1, (data & 0x08));
+ coin_lockout_global_w(machine(), (~data & 0x20));
+ coin_counter_w(machine(), 0, (data & 0x04));
+ coin_counter_w(machine(), 1, (data & 0x08));
break;
case MCU_ARKANOID:
case MCU_EXTRMATN:
@@ -802,13 +790,13 @@ WRITE8_HANDLER( tnzs_bankswitch1_w )
case MCU_PLUMPOP:
/* bit 2 resets the mcu */
if (data & 0x04)
- mcu_reset(space->machine());
+ mcu_reset(machine());
break;
default:
break;
}
/* bits 0-1 select ROM bank */
- state->m_bank2 = data & 0x03;
- memory_set_bank(space->machine(), "bank2", state->m_bank2);
+ m_bank2 = data & 0x03;
+ memory_set_bank(machine(), "bank2", m_bank2);
}
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index ae8b2eb631a..d258d0ed440 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -47,69 +47,65 @@ INTERRUPT_GEN( toaplan1_interrupt )
device_set_input_line(device, 4, HOLD_LINE);
}
-WRITE16_HANDLER( toaplan1_intenable_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_intenable_w)
{
if (ACCESSING_BITS_0_7)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- state->m_intenable = data & 0xff;
+ m_intenable = data & 0xff;
}
}
-WRITE16_HANDLER( demonwld_dsp_addrsel_w )
+WRITE16_MEMBER(toaplan1_state::demonwld_dsp_addrsel_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
/* This sets the main CPU RAM address the DSP should */
/* read/write, via the DSP IO port 0 */
/* Top three bits of data need to be shifted left 9 places */
/* to select which memory bank from main CPU address */
- /* space to use */
+ /* &space to use */
/* Lower thirteen bits of this data is shifted left one position */
/* to move it to an even address word boundary */
- state->m_main_ram_seg = ((data & 0xe000) << 9);
- state->m_dsp_addr_w = ((data & 0x1fff) << 1);
- logerror("DSP PC:%04x IO write %04x (%08x) at port 0\n", cpu_get_previouspc(&space->device()), data, state->m_main_ram_seg + state->m_dsp_addr_w);
+ m_main_ram_seg = ((data & 0xe000) << 9);
+ m_dsp_addr_w = ((data & 0x1fff) << 1);
+ logerror("DSP PC:%04x IO write %04x (%08x) at port 0\n", cpu_get_previouspc(&space.device()), data, m_main_ram_seg + m_dsp_addr_w);
}
-READ16_HANDLER( demonwld_dsp_r )
+READ16_MEMBER(toaplan1_state::demonwld_dsp_r)
{
/* DSP can read data from main CPU RAM via DSP IO port 1 */
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
address_space *mainspace;
UINT16 input_data = 0;
- switch (state->m_main_ram_seg) {
- case 0xc00000: mainspace = space->machine().device("maincpu")->memory().space(AS_PROGRAM);
- input_data = mainspace->read_word(state->m_main_ram_seg + state->m_dsp_addr_w);
+ switch (m_main_ram_seg) {
+ case 0xc00000: mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ input_data = mainspace->read_word(m_main_ram_seg + m_dsp_addr_w);
break;
- default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n", cpu_get_previouspc(&space->device()), state->m_main_ram_seg + state->m_dsp_addr_w);
+ default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n", cpu_get_previouspc(&space.device()), m_main_ram_seg + m_dsp_addr_w);
}
- logerror("DSP PC:%04x IO read %04x at %08x (port 1)\n", cpu_get_previouspc(&space->device()), input_data, state->m_main_ram_seg + state->m_dsp_addr_w);
+ logerror("DSP PC:%04x IO read %04x at %08x (port 1)\n", cpu_get_previouspc(&space.device()), input_data, m_main_ram_seg + m_dsp_addr_w);
return input_data;
}
-WRITE16_HANDLER( demonwld_dsp_w )
+WRITE16_MEMBER(toaplan1_state::demonwld_dsp_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
address_space *mainspace;
/* Data written to main CPU RAM via DSP IO port 1 */
- state->m_dsp_execute = 0;
- switch (state->m_main_ram_seg) {
- case 0xc00000: if ((state->m_dsp_addr_w < 3) && (data == 0)) state->m_dsp_execute = 1;
- mainspace = space->machine().device("maincpu")->memory().space(AS_PROGRAM);
- mainspace->write_word(state->m_main_ram_seg + state->m_dsp_addr_w, data);
+ m_dsp_execute = 0;
+ switch (m_main_ram_seg) {
+ case 0xc00000: if ((m_dsp_addr_w < 3) && (data == 0)) m_dsp_execute = 1;
+ mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ mainspace->write_word(m_main_ram_seg + m_dsp_addr_w, data);
break;
- default: logerror("DSP PC:%04x Warning !!! IO writing to %08x (port 1)\n", cpu_get_previouspc(&space->device()), state->m_main_ram_seg + state->m_dsp_addr_w);
+ default: logerror("DSP PC:%04x Warning !!! IO writing to %08x (port 1)\n", cpu_get_previouspc(&space.device()), m_main_ram_seg + m_dsp_addr_w);
}
- logerror("DSP PC:%04x IO write %04x at %08x (port 1)\n", cpu_get_previouspc(&space->device()), data, state->m_main_ram_seg + state->m_dsp_addr_w);
+ logerror("DSP PC:%04x IO write %04x at %08x (port 1)\n", cpu_get_previouspc(&space.device()), data, m_main_ram_seg + m_dsp_addr_w);
}
-WRITE16_HANDLER( demonwld_dsp_bio_w )
+WRITE16_MEMBER(toaplan1_state::demonwld_dsp_bio_w)
{
/* data 0xffff means inhibit BIO line to DSP and enable */
/* communication to main processor */
@@ -117,27 +113,25 @@ WRITE16_HANDLER( demonwld_dsp_bio_w )
/* data 0x0000 means set DSP BIO line active and disable */
/* communication to main processor*/
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- logerror("DSP PC:%04x IO write %04x at port 3\n", cpu_get_previouspc(&space->device()), data);
+ logerror("DSP PC:%04x IO write %04x at port 3\n", cpu_get_previouspc(&space.device()), data);
if (data & 0x8000) {
- state->m_dsp_BIO = CLEAR_LINE;
+ m_dsp_BIO = CLEAR_LINE;
}
if (data == 0) {
- if (state->m_dsp_execute) {
+ if (m_dsp_execute) {
logerror("Turning 68000 on\n");
- cputag_set_input_line(space->machine(), "maincpu", INPUT_LINE_HALT, CLEAR_LINE);
- state->m_dsp_execute = 0;
+ cputag_set_input_line(machine(), "maincpu", INPUT_LINE_HALT, CLEAR_LINE);
+ m_dsp_execute = 0;
}
- state->m_dsp_BIO = ASSERT_LINE;
+ m_dsp_BIO = ASSERT_LINE;
}
}
-READ16_HANDLER ( demonwld_BIO_r )
+READ16_MEMBER(toaplan1_state::demonwld_BIO_r)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- return state->m_dsp_BIO;
+ return m_dsp_BIO;
}
@@ -167,36 +161,36 @@ static void demonwld_restore_dsp(running_machine &machine)
demonwld_dsp(machine, state->m_dsp_on);
}
-WRITE16_HANDLER( demonwld_dsp_ctrl_w )
+WRITE16_MEMBER(toaplan1_state::demonwld_dsp_ctrl_w)
{
#if 0
- logerror("68000:%08x Writing %08x to %08x.\n",cpu_get_pc(&space->device()) ,data ,0xe0000a + offset);
+ logerror("68000:%08x Writing %08x to %08x.\n",cpu_get_pc(&space.device()) ,data ,0xe0000a + offset);
#endif
if (ACCESSING_BITS_0_7)
{
switch (data)
{
- case 0x00: demonwld_dsp(space->machine(), 1); break; /* Enable the INT line to the DSP */
- case 0x01: demonwld_dsp(space->machine(), 0); break; /* Inhibit the INT line to the DSP */
- default: logerror("68000:%04x Writing unknown command %08x to %08x\n",cpu_get_previouspc(&space->device()) ,data ,0xe0000a + offset); break;
+ case 0x00: demonwld_dsp(machine(), 1); break; /* Enable the INT line to the DSP */
+ case 0x01: demonwld_dsp(machine(), 0); break; /* Inhibit the INT line to the DSP */
+ default: logerror("68000:%04x Writing unknown command %08x to %08x\n",cpu_get_previouspc(&space.device()) ,data ,0xe0000a + offset); break;
}
}
else
{
- logerror("68000:%04x Writing unknown command %08x to %08x\n",cpu_get_previouspc(&space->device()) ,data ,0xe0000a + offset);
+ logerror("68000:%04x Writing unknown command %08x to %08x\n",cpu_get_previouspc(&space.device()) ,data ,0xe0000a + offset);
}
}
-READ16_HANDLER( samesame_port_6_word_r )
+READ16_MEMBER(toaplan1_state::samesame_port_6_word_r)
{
/* Bit 0x80 is secondary CPU (HD647180) ready signal */
- logerror("PC:%04x Warning !!! IO reading from $14000a\n",cpu_get_previouspc(&space->device()));
- return (0x80 | input_port_read(space->machine(), "TJUMP")) & 0xff;
+ logerror("PC:%04x Warning !!! IO reading from $14000a\n",cpu_get_previouspc(&space.device()));
+ return (0x80 | input_port_read(machine(), "TJUMP")) & 0xff;
}
-READ16_HANDLER ( vimana_system_port_r )
+READ16_MEMBER(toaplan1_state::vimana_system_port_r)
{
static const UINT8 vimana_region[16] =
{
@@ -206,33 +200,32 @@ READ16_HANDLER ( vimana_system_port_r )
TOAPLAN1_REGION_OTHER, TOAPLAN1_REGION_OTHER, TOAPLAN1_REGION_OTHER, TOAPLAN1_REGION_JAPAN
};
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
int data, p, r, d, slot, reg, dsw;
slot = -1;
- d = input_port_read(space->machine(), "DSWA");
- r = input_port_read(space->machine(), "TJUMP");
- p = input_port_read(space->machine(), "SYSTEM");
- state->m_vimana_latch ^= p;
- data = (state->m_vimana_latch & p);
+ d = input_port_read(machine(), "DSWA");
+ r = input_port_read(machine(), "TJUMP");
+ p = input_port_read(machine(), "SYSTEM");
+ m_vimana_latch ^= p;
+ data = (m_vimana_latch & p);
/* simulate the mcu keeping track of credits based on region and coinage settings */
/* latch so it doesn't add more than one coin per keypress */
if (d & 0x04) /* "test mode" ON */
{
- state->m_vimana_coins[0] = state->m_vimana_coins[1] = 0;
- state->m_vimana_credits = 0;
+ m_vimana_coins[0] = m_vimana_coins[1] = 0;
+ m_vimana_credits = 0;
}
else /* "test mode" OFF */
{
if (data & 0x02) /* TILT */
{
- state->m_vimana_coins[0] = state->m_vimana_coins[1] = 0;
- state->m_vimana_credits = 0;
+ m_vimana_coins[0] = m_vimana_coins[1] = 0;
+ m_vimana_credits = 0;
}
if (data & 0x01) /* SERVICE1 */
{
- state->m_vimana_credits++ ;
+ m_vimana_credits++ ;
}
if (data & 0x08) /* COIN1 */
{
@@ -247,28 +240,28 @@ READ16_HANDLER ( vimana_system_port_r )
{
reg = vimana_region[r];
dsw = (d & 0xf0) >> (4 + 2 * slot);
- state->m_vimana_coins[slot]++;
- if (state->m_vimana_coins[slot] >= toaplan1_coins_for_credit[reg][slot][dsw])
+ m_vimana_coins[slot]++;
+ if (m_vimana_coins[slot] >= toaplan1_coins_for_credit[reg][slot][dsw])
{
- state->m_vimana_credits += toaplan1_credits_for_coin[reg][slot][dsw];
- state->m_vimana_coins[slot] -= toaplan1_coins_for_credit[reg][slot][dsw];
+ m_vimana_credits += toaplan1_credits_for_coin[reg][slot][dsw];
+ m_vimana_coins[slot] -= toaplan1_coins_for_credit[reg][slot][dsw];
}
- coin_counter_w(space->machine(), slot, 1);
- coin_counter_w(space->machine(), slot, 0);
+ coin_counter_w(machine(), slot, 1);
+ coin_counter_w(machine(), slot, 0);
}
- if (state->m_vimana_credits >= 9)
- state->m_vimana_credits = 9;
+ if (m_vimana_credits >= 9)
+ m_vimana_credits = 9;
}
- coin_lockout_global_w(space->machine(), (state->m_vimana_credits >= 9));
+ coin_lockout_global_w(machine(), (m_vimana_credits >= 9));
- state->m_vimana_latch = p;
+ m_vimana_latch = p;
return p & 0xffff;
}
-READ16_HANDLER( vimana_mcu_r )
+READ16_MEMBER(toaplan1_state::vimana_mcu_r)
{
int data = 0 ;
switch (offset)
@@ -277,15 +270,14 @@ READ16_HANDLER( vimana_mcu_r )
case 1: data = 0x00; break;
case 2:
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- data = state->m_vimana_credits;
+ data = m_vimana_credits;
break;
}
}
return data & 0xff;
}
-WRITE16_HANDLER( vimana_mcu_w )
+WRITE16_MEMBER(toaplan1_state::vimana_mcu_w)
{
switch (offset)
{
@@ -294,93 +286,89 @@ WRITE16_HANDLER( vimana_mcu_w )
case 2:
if (ACCESSING_BITS_0_7)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- state->m_vimana_credits = data & 0xff;
- coin_lockout_global_w(space->machine(), (state->m_vimana_credits >= 9));
+ m_vimana_credits = data & 0xff;
+ coin_lockout_global_w(machine(), (m_vimana_credits >= 9));
}
break;
}
}
-READ16_HANDLER( toaplan1_shared_r )
+READ16_MEMBER(toaplan1_state::toaplan1_shared_r)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- return state->m_sharedram[offset] & 0xff;
+ return m_sharedram[offset] & 0xff;
}
-WRITE16_HANDLER( toaplan1_shared_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_shared_w)
{
if (ACCESSING_BITS_0_7)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- state->m_sharedram[offset] = data & 0xff;
+ m_sharedram[offset] = data & 0xff;
}
}
-WRITE16_HANDLER( toaplan1_reset_sound )
+WRITE16_MEMBER(toaplan1_state::toaplan1_reset_sound)
{
/* Reset the secondary CPU and sound chip during soft resets */
if (ACCESSING_BITS_0_7 && (data == 0))
{
- logerror("PC:%04x Resetting Sound CPU and Sound chip (%08x)\n", cpu_get_previouspc(&space->device()), data);
- devtag_reset(space->machine(), "ymsnd");
- device_t *audiocpu = space->machine().device("audiocpu");
+ logerror("PC:%04x Resetting Sound CPU and Sound chip (%08x)\n", cpu_get_previouspc(&space.device()), data);
+ devtag_reset(machine(), "ymsnd");
+ device_t *audiocpu = machine().device("audiocpu");
if (audiocpu != NULL && audiocpu->type() == Z80)
device_set_input_line(audiocpu, INPUT_LINE_RESET, PULSE_LINE);
}
}
-WRITE8_HANDLER( rallybik_coin_w )
+WRITE8_MEMBER(toaplan1_state::rallybik_coin_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
switch (data) {
- case 0x08: if (state->m_coin_count) { coin_counter_w(space->machine(), 0, 1); coin_counter_w(space->machine(), 0, 0); } break;
- case 0x09: if (state->m_coin_count) { coin_counter_w(space->machine(), 2, 1); coin_counter_w(space->machine(), 2, 0); } break;
- case 0x0a: if (state->m_coin_count) { coin_counter_w(space->machine(), 1, 1); coin_counter_w(space->machine(), 1, 0); } break;
- case 0x0b: if (state->m_coin_count) { coin_counter_w(space->machine(), 3, 1); coin_counter_w(space->machine(), 3, 0); } break;
- case 0x0c: coin_lockout_w(space->machine(), 0, 1); coin_lockout_w(space->machine(), 2, 1); break;
- case 0x0d: coin_lockout_w(space->machine(), 0, 0); coin_lockout_w(space->machine(), 2, 0); break;
- case 0x0e: coin_lockout_w(space->machine(), 1, 1); coin_lockout_w(space->machine(), 3, 1); break;
- case 0x0f: coin_lockout_w(space->machine(), 1, 0); coin_lockout_w(space->machine(), 3, 0); state->m_coin_count=1; break;
- default: logerror("PC:%04x Writing unknown data (%04x) to coin count/lockout port\n",cpu_get_previouspc(&space->device()),data); break;
+ case 0x08: if (m_coin_count) { coin_counter_w(machine(), 0, 1); coin_counter_w(machine(), 0, 0); } break;
+ case 0x09: if (m_coin_count) { coin_counter_w(machine(), 2, 1); coin_counter_w(machine(), 2, 0); } break;
+ case 0x0a: if (m_coin_count) { coin_counter_w(machine(), 1, 1); coin_counter_w(machine(), 1, 0); } break;
+ case 0x0b: if (m_coin_count) { coin_counter_w(machine(), 3, 1); coin_counter_w(machine(), 3, 0); } break;
+ case 0x0c: coin_lockout_w(machine(), 0, 1); coin_lockout_w(machine(), 2, 1); break;
+ case 0x0d: coin_lockout_w(machine(), 0, 0); coin_lockout_w(machine(), 2, 0); break;
+ case 0x0e: coin_lockout_w(machine(), 1, 1); coin_lockout_w(machine(), 3, 1); break;
+ case 0x0f: coin_lockout_w(machine(), 1, 0); coin_lockout_w(machine(), 3, 0); m_coin_count=1; break;
+ default: logerror("PC:%04x Writing unknown data (%04x) to coin count/lockout port\n",cpu_get_previouspc(&space.device()),data); break;
}
}
-WRITE8_HANDLER( toaplan1_coin_w )
+WRITE8_MEMBER(toaplan1_state::toaplan1_coin_w)
{
logerror("Z80 writing %02x to coin control\n",data);
/* This still isnt too clear yet. */
/* Coin C has no coin lock ? */
- /* Are some outputs for lights ? (no space on JAMMA for it though) */
+ /* Are some outputs for lights ? (no &space on JAMMA for it though) */
switch (data) {
- case 0xee: coin_counter_w(space->machine(), 1,1); coin_counter_w(space->machine(), 1,0); break; /* Count slot B */
- case 0xed: coin_counter_w(space->machine(), 0,1); coin_counter_w(space->machine(), 0,0); break; /* Count slot A */
+ case 0xee: coin_counter_w(machine(), 1,1); coin_counter_w(machine(), 1,0); break; /* Count slot B */
+ case 0xed: coin_counter_w(machine(), 0,1); coin_counter_w(machine(), 0,0); break; /* Count slot A */
/* The following are coin counts after coin-lock active (faulty coin-lock ?) */
- case 0xe2: coin_counter_w(space->machine(), 1,1); coin_counter_w(space->machine(), 1,0); coin_lockout_w(space->machine(), 1,1); break;
- case 0xe1: coin_counter_w(space->machine(), 0,1); coin_counter_w(space->machine(), 0,0); coin_lockout_w(space->machine(), 0,1); break;
+ case 0xe2: coin_counter_w(machine(), 1,1); coin_counter_w(machine(), 1,0); coin_lockout_w(machine(), 1,1); break;
+ case 0xe1: coin_counter_w(machine(), 0,1); coin_counter_w(machine(), 0,0); coin_lockout_w(machine(), 0,1); break;
- case 0xec: coin_lockout_global_w(space->machine(), 0); break; /* ??? count games played */
+ case 0xec: coin_lockout_global_w(machine(), 0); break; /* ??? count games played */
case 0xe8: break; /* ??? Maximum credits reached with coin/credit ratio */
case 0xe4: break; /* ??? Reset coin system */
- case 0x0c: coin_lockout_global_w(space->machine(), 0); break; /* Unlock all coin slots */
- case 0x08: coin_lockout_w(space->machine(), 2,0); break; /* Unlock coin slot C */
- case 0x09: coin_lockout_w(space->machine(), 0,0); break; /* Unlock coin slot A */
- case 0x0a: coin_lockout_w(space->machine(), 1,0); break; /* Unlock coin slot B */
+ case 0x0c: coin_lockout_global_w(machine(), 0); break; /* Unlock all coin slots */
+ case 0x08: coin_lockout_w(machine(), 2,0); break; /* Unlock coin slot C */
+ case 0x09: coin_lockout_w(machine(), 0,0); break; /* Unlock coin slot A */
+ case 0x0a: coin_lockout_w(machine(), 1,0); break; /* Unlock coin slot B */
- case 0x02: coin_lockout_w(space->machine(), 1,1); break; /* Lock coin slot B */
- case 0x01: coin_lockout_w(space->machine(), 0,1); break; /* Lock coin slot A */
- case 0x00: coin_lockout_global_w(space->machine(), 1); break; /* Lock all coin slots */
- default: logerror("PC:%04x Writing unknown data (%04x) to coin count/lockout port\n",cpu_get_previouspc(&space->device()),data); break;
+ case 0x02: coin_lockout_w(machine(), 1,1); break; /* Lock coin slot B */
+ case 0x01: coin_lockout_w(machine(), 0,1); break; /* Lock coin slot A */
+ case 0x00: coin_lockout_global_w(machine(), 1); break; /* Lock all coin slots */
+ default: logerror("PC:%04x Writing unknown data (%04x) to coin count/lockout port\n",cpu_get_previouspc(&space.device()),data); break;
}
}
-WRITE16_HANDLER( samesame_coin_w )
+WRITE16_MEMBER(toaplan1_state::samesame_coin_w)
{
if (ACCESSING_BITS_0_7)
{
@@ -388,7 +376,7 @@ WRITE16_HANDLER( samesame_coin_w )
}
if (ACCESSING_BITS_8_15 && (data&0xff00))
{
- logerror("PC:%04x Writing unknown MSB data (%04x) to coin count/lockout port\n",cpu_get_previouspc(&space->device()),data);
+ logerror("PC:%04x Writing unknown MSB data (%04x) to coin count/lockout port\n",cpu_get_previouspc(&space.device()),data);
}
}
diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c
index 6a4ed8255cf..eef13e6e8be 100644
--- a/src/mame/machine/twincobr.c
+++ b/src/mame/machine/twincobr.c
@@ -37,162 +37,152 @@ INTERRUPT_GEN( wardner_interrupt )
}
-WRITE16_HANDLER( twincobr_dsp_addrsel_w )
+WRITE16_MEMBER(twincobr_state::twincobr_dsp_addrsel_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
/* This sets the main CPU RAM address the DSP should */
/* read/write, via the DSP IO port 0 */
/* Top three bits of data need to be shifted left 3 places */
/* to select which memory bank from main CPU address */
- /* space to use */
+ /* &space to use */
/* Lower thirteen bits of this data is shifted left one position */
/* to move it to an even address word boundary */
- state->m_main_ram_seg = ((data & 0xe000) << 3);
- state->m_dsp_addr_w = ((data & 0x1fff) << 1);
+ m_main_ram_seg = ((data & 0xe000) << 3);
+ m_dsp_addr_w = ((data & 0x1fff) << 1);
- LOG(("DSP PC:%04x IO write %04x (%08x) at port 0\n",cpu_get_previouspc(&space->device()),data,state->m_main_ram_seg + state->m_dsp_addr_w));
+ LOG(("DSP PC:%04x IO write %04x (%08x) at port 0\n",cpu_get_previouspc(&space.device()),data,m_main_ram_seg + m_dsp_addr_w));
}
-READ16_HANDLER( twincobr_dsp_r )
+READ16_MEMBER(twincobr_state::twincobr_dsp_r)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
/* DSP can read data from main CPU RAM via DSP IO port 1 */
address_space *mainspace;
UINT16 input_data = 0;
- switch (state->m_main_ram_seg) {
+ switch (m_main_ram_seg) {
case 0x30000:
case 0x40000:
- case 0x50000: mainspace = space->machine().device("maincpu")->memory().space(AS_PROGRAM);
- input_data = mainspace->read_word(state->m_main_ram_seg + state->m_dsp_addr_w);
+ case 0x50000: mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ input_data = mainspace->read_word(m_main_ram_seg + m_dsp_addr_w);
break;
- default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n",cpu_get_previouspc(&space->device()),state->m_main_ram_seg + state->m_dsp_addr_w); break;
+ default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n",cpu_get_previouspc(&space.device()),m_main_ram_seg + m_dsp_addr_w); break;
}
- LOG(("DSP PC:%04x IO read %04x at %08x (port 1)\n",cpu_get_previouspc(&space->device()),input_data,state->m_main_ram_seg + state->m_dsp_addr_w));
+ LOG(("DSP PC:%04x IO read %04x at %08x (port 1)\n",cpu_get_previouspc(&space.device()),input_data,m_main_ram_seg + m_dsp_addr_w));
return input_data;
}
-WRITE16_HANDLER( twincobr_dsp_w )
+WRITE16_MEMBER(twincobr_state::twincobr_dsp_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
address_space *mainspace;
/* Data written to main CPU RAM via DSP IO port 1 */
- state->m_dsp_execute = 0;
- switch (state->m_main_ram_seg) {
- case 0x30000: if ((state->m_dsp_addr_w < 3) && (data == 0)) state->m_dsp_execute = 1;
+ m_dsp_execute = 0;
+ switch (m_main_ram_seg) {
+ case 0x30000: if ((m_dsp_addr_w < 3) && (data == 0)) m_dsp_execute = 1;
case 0x40000:
- case 0x50000: mainspace = space->machine().device("maincpu")->memory().space(AS_PROGRAM);
- mainspace->write_word(state->m_main_ram_seg + state->m_dsp_addr_w, data);
+ case 0x50000: mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ mainspace->write_word(m_main_ram_seg + m_dsp_addr_w, data);
break;
- default: logerror("DSP PC:%04x Warning !!! IO writing to %08x (port 1)\n",cpu_get_previouspc(&space->device()),state->m_main_ram_seg + state->m_dsp_addr_w); break;
+ default: logerror("DSP PC:%04x Warning !!! IO writing to %08x (port 1)\n",cpu_get_previouspc(&space.device()),m_main_ram_seg + m_dsp_addr_w); break;
}
- LOG(("DSP PC:%04x IO write %04x at %08x (port 1)\n",cpu_get_previouspc(&space->device()),data,state->m_main_ram_seg + state->m_dsp_addr_w));
+ LOG(("DSP PC:%04x IO write %04x at %08x (port 1)\n",cpu_get_previouspc(&space.device()),data,m_main_ram_seg + m_dsp_addr_w));
}
-WRITE16_HANDLER( wardner_dsp_addrsel_w )
+WRITE16_MEMBER(twincobr_state::wardner_dsp_addrsel_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
/* This sets the main CPU RAM address the DSP should */
/* read/write, via the DSP IO port 0 */
/* Lower twelve bits of this data is shifted left one position */
/* to move it to an even address boundary */
- state->m_main_ram_seg = (data & 0xe000);
- state->m_dsp_addr_w = ((data & 0x07ff) << 1);
+ m_main_ram_seg = (data & 0xe000);
+ m_dsp_addr_w = ((data & 0x07ff) << 1);
- if (state->m_main_ram_seg == 0x6000) state->m_main_ram_seg = 0x7000;
+ if (m_main_ram_seg == 0x6000) m_main_ram_seg = 0x7000;
- LOG(("DSP PC:%04x IO write %04x (%08x) at port 0\n",cpu_get_previouspc(&space->device()),data,state->m_main_ram_seg + state->m_dsp_addr_w));
+ LOG(("DSP PC:%04x IO write %04x (%08x) at port 0\n",cpu_get_previouspc(&space.device()),data,m_main_ram_seg + m_dsp_addr_w));
}
-READ16_HANDLER( wardner_dsp_r )
+READ16_MEMBER(twincobr_state::wardner_dsp_r)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
/* DSP can read data from main CPU RAM via DSP IO port 1 */
address_space *mainspace;
UINT16 input_data = 0;
- switch (state->m_main_ram_seg) {
+ switch (m_main_ram_seg) {
case 0x7000:
case 0x8000:
- case 0xa000: mainspace = space->machine().device("maincpu")->memory().space(AS_PROGRAM);
- input_data = mainspace->read_byte(state->m_main_ram_seg + (state->m_dsp_addr_w + 0))
- | (mainspace->read_byte(state->m_main_ram_seg + (state->m_dsp_addr_w + 1)) << 8);
+ case 0xa000: mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ input_data = mainspace->read_byte(m_main_ram_seg + (m_dsp_addr_w + 0))
+ | (mainspace->read_byte(m_main_ram_seg + (m_dsp_addr_w + 1)) << 8);
break;
- default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n",cpu_get_previouspc(&space->device()),state->m_main_ram_seg + state->m_dsp_addr_w); break;
+ default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n",cpu_get_previouspc(&space.device()),m_main_ram_seg + m_dsp_addr_w); break;
}
- LOG(("DSP PC:%04x IO read %04x at %08x (port 1)\n",cpu_get_previouspc(&space->device()),input_data,state->m_main_ram_seg + state->m_dsp_addr_w));
+ LOG(("DSP PC:%04x IO read %04x at %08x (port 1)\n",cpu_get_previouspc(&space.device()),input_data,m_main_ram_seg + m_dsp_addr_w));
return input_data;
}
-WRITE16_HANDLER( wardner_dsp_w )
+WRITE16_MEMBER(twincobr_state::wardner_dsp_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
address_space *mainspace;
/* Data written to main CPU RAM via DSP IO port 1 */
- state->m_dsp_execute = 0;
- switch (state->m_main_ram_seg) {
- case 0x7000: if ((state->m_dsp_addr_w < 3) && (data == 0)) state->m_dsp_execute = 1;
+ m_dsp_execute = 0;
+ switch (m_main_ram_seg) {
+ case 0x7000: if ((m_dsp_addr_w < 3) && (data == 0)) m_dsp_execute = 1;
case 0x8000:
- case 0xa000: mainspace = space->machine().device("maincpu")->memory().space(AS_PROGRAM);
- mainspace->write_byte(state->m_main_ram_seg + (state->m_dsp_addr_w + 0), (data & 0xff));
- mainspace->write_byte(state->m_main_ram_seg + (state->m_dsp_addr_w + 1), ((data >> 8) & 0xff));
+ case 0xa000: mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ mainspace->write_byte(m_main_ram_seg + (m_dsp_addr_w + 0), (data & 0xff));
+ mainspace->write_byte(m_main_ram_seg + (m_dsp_addr_w + 1), ((data >> 8) & 0xff));
break;
- default: logerror("DSP PC:%04x Warning !!! IO writing to %08x (port 1)\n",cpu_get_previouspc(&space->device()),state->m_main_ram_seg + state->m_dsp_addr_w); break;
+ default: logerror("DSP PC:%04x Warning !!! IO writing to %08x (port 1)\n",cpu_get_previouspc(&space.device()),m_main_ram_seg + m_dsp_addr_w); break;
}
- LOG(("DSP PC:%04x IO write %04x at %08x (port 1)\n",cpu_get_previouspc(&space->device()),data,state->m_main_ram_seg + state->m_dsp_addr_w));
+ LOG(("DSP PC:%04x IO write %04x at %08x (port 1)\n",cpu_get_previouspc(&space.device()),data,m_main_ram_seg + m_dsp_addr_w));
}
-WRITE16_HANDLER( twincobr_dsp_bio_w )
+WRITE16_MEMBER(twincobr_state::twincobr_dsp_bio_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
/* data 0xffff means inhibit BIO line to DSP and enable */
/* communication to main processor */
/* Actually only DSP data bit 15 controls this */
/* data 0x0000 means set DSP BIO line active and disable */
/* communication to main processor*/
- LOG(("DSP PC:%04x IO write %04x at port 3\n",cpu_get_previouspc(&space->device()),data));
+ LOG(("DSP PC:%04x IO write %04x at port 3\n",cpu_get_previouspc(&space.device()),data));
if (data & 0x8000) {
- state->m_dsp_BIO = CLEAR_LINE;
+ m_dsp_BIO = CLEAR_LINE;
}
if (data == 0) {
- if (state->m_dsp_execute) {
+ if (m_dsp_execute) {
LOG(("Turning the main CPU on\n"));
- cputag_set_input_line(space->machine(), "maincpu", INPUT_LINE_HALT, CLEAR_LINE);
- state->m_dsp_execute = 0;
+ cputag_set_input_line(machine(), "maincpu", INPUT_LINE_HALT, CLEAR_LINE);
+ m_dsp_execute = 0;
}
- state->m_dsp_BIO = ASSERT_LINE;
+ m_dsp_BIO = ASSERT_LINE;
}
}
-READ16_HANDLER( fsharkbt_dsp_r )
+READ16_MEMBER(twincobr_state::fsharkbt_dsp_r)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
/* IO Port 2 used by Flying Shark bootleg */
/* DSP reads data from an extra MCU (8741) at IO port 2 */
/* Port is read three times during startup. First and last data */
/* read must equal, but second data read must be different */
- state->m_fsharkbt_8741 += 1;
- LOG(("DSP PC:%04x IO read %04x from 8741 MCU (port 2)\n",cpu_get_previouspc(&space->device()),(state->m_fsharkbt_8741 & 0x08)));
- return (state->m_fsharkbt_8741 & 1);
+ m_fsharkbt_8741 += 1;
+ LOG(("DSP PC:%04x IO read %04x from 8741 MCU (port 2)\n",cpu_get_previouspc(&space.device()),(m_fsharkbt_8741 & 0x08)));
+ return (m_fsharkbt_8741 & 1);
}
-WRITE16_HANDLER( fsharkbt_dsp_w )
+WRITE16_MEMBER(twincobr_state::fsharkbt_dsp_w)
{
/* Flying Shark bootleg DSP writes data to an extra MCU (8741) at IO port 2 */
#if 0
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
- logerror("DSP PC:%04x IO write from DSP RAM:%04x to 8741 MCU (port 2)\n",cpu_get_previouspc(&space->device()),state->m_fsharkbt_8741);
+ logerror("DSP PC:%04x IO write from DSP RAM:%04x to 8741 MCU (port 2)\n",cpu_get_previouspc(&space.device()),m_fsharkbt_8741);
#endif
}
-READ16_HANDLER ( twincobr_BIO_r )
+READ16_MEMBER(twincobr_state::twincobr_BIO_r)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
- return state->m_dsp_BIO;
+ return m_dsp_BIO;
}
@@ -246,32 +236,30 @@ static void toaplan0_control_w(running_machine &machine, int offset, int data)
}
}
-WRITE16_HANDLER( twincobr_control_w )
+WRITE16_MEMBER(twincobr_state::twincobr_control_w)
{
if (ACCESSING_BITS_0_7)
{
- toaplan0_control_w(space->machine(), offset, data & 0xff);
+ toaplan0_control_w(machine(), offset, data & 0xff);
}
}
-WRITE8_HANDLER( wardner_control_w )
+WRITE8_MEMBER(twincobr_state::wardner_control_w)
{
- toaplan0_control_w(space->machine(), offset, data);
+ toaplan0_control_w(machine(), offset, data);
}
-READ16_HANDLER( twincobr_sharedram_r )
+READ16_MEMBER(twincobr_state::twincobr_sharedram_r)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
- return state->m_sharedram[offset];
+ return m_sharedram[offset];
}
-WRITE16_HANDLER( twincobr_sharedram_w )
+WRITE16_MEMBER(twincobr_state::twincobr_sharedram_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_sharedram[offset] = data & 0xff;
+ m_sharedram[offset] = data & 0xff;
}
}
@@ -306,22 +294,22 @@ static void toaplan0_coin_dsp_w(address_space *space, int offset, int data)
}
-WRITE16_HANDLER( fshark_coin_dsp_w )
+WRITE16_MEMBER(twincobr_state::fshark_coin_dsp_w)
{
if (ACCESSING_BITS_0_7)
{
- toaplan0_coin_dsp_w(space, offset, data & 0xff);
+ toaplan0_coin_dsp_w(&space, offset, data & 0xff);
}
}
-WRITE8_HANDLER( twincobr_coin_w )
+WRITE8_MEMBER(twincobr_state::twincobr_coin_w)
{
- toaplan0_coin_dsp_w(space, offset, data);
+ toaplan0_coin_dsp_w(&space, offset, data);
}
-WRITE8_HANDLER( wardner_coin_dsp_w )
+WRITE8_MEMBER(twincobr_state::wardner_coin_dsp_w)
{
- toaplan0_coin_dsp_w(space, offset, data);
+ toaplan0_coin_dsp_w(&space, offset, data);
}
diff --git a/src/mame/machine/tx1.c b/src/mame/machine/tx1.c
index 61ad5b34ae4..b78a050b9bd 100644
--- a/src/mame/machine/tx1.c
+++ b/src/mame/machine/tx1.c
@@ -597,10 +597,9 @@ static void tx1_update_state(running_machine &machine)
}
}
-READ16_HANDLER( tx1_math_r )
+READ16_MEMBER(tx1_state::tx1_math_r)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- math_t &math = state->m_math;
+ math_t &math = m_math;
offset = offset << 1;
/* /MLPCS */
@@ -619,7 +618,7 @@ READ16_HANDLER( tx1_math_r )
}
/* TODO What do we return? */
- kick_sn74s516(space->machine(), &math.retval, ins);
+ kick_sn74s516(machine(), &math.retval, ins);
}
/* /PPSEN */
else if (offset < 0x800)
@@ -657,7 +656,7 @@ READ16_HANDLER( tx1_math_r )
TODO make this constant somewhere
e.g. math.retval = math.romptr[ get_tx1_datarom_addr() ];
*/
- UINT16 *romdata = (UINT16*)space->machine().region("au_data")->base();
+ UINT16 *romdata = (UINT16*)machine().region("au_data")->base();
UINT16 addr = get_tx1_datarom_addr(math);
math.retval = romdata[addr];
}
@@ -684,7 +683,7 @@ READ16_HANDLER( tx1_math_r )
if (math.mux != TX1_SEL_ILDEN)
{
INC_PROM_ADDR;
- tx1_update_state(space->machine());
+ tx1_update_state(machine());
// MUST RETURN HERE?
return math.retval;
@@ -703,21 +702,20 @@ READ16_HANDLER( tx1_math_r )
if (offset & TX1_INSLD)
{
math.promaddr = (offset << 2) & 0x1ff;
- tx1_update_state(space->machine());
+ tx1_update_state(machine());
}
else if (offset & TX1_CNTST)
{
INC_PROM_ADDR;
- tx1_update_state(space->machine());
+ tx1_update_state(machine());
}
return math.retval;
}
-WRITE16_HANDLER( tx1_math_w )
+WRITE16_MEMBER(tx1_state::tx1_math_w)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- math_t &math = state->m_math;
+ math_t &math = m_math;
math.cpulatch = data;
offset <<= 1;
@@ -738,7 +736,7 @@ WRITE16_HANDLER( tx1_math_w )
ins = (offset >> 1) & 7;
}
- kick_sn74s516(space->machine(), &math.cpulatch, ins);
+ kick_sn74s516(machine(), &math.cpulatch, ins);
}
/* /PPSEN */
else if ((offset & 0xc00) == 0x400)
@@ -794,20 +792,19 @@ WRITE16_HANDLER( tx1_math_w )
if (offset & TX1_INSLD)
{
math.promaddr = (offset << 2) & 0x1ff;
- tx1_update_state(space->machine());
+ tx1_update_state(machine());
}
else if (offset & TX1_CNTST)
{
INC_PROM_ADDR;
- tx1_update_state(space->machine());
+ tx1_update_state(machine());
}
}
-READ16_HANDLER( tx1_spcs_rom_r )
+READ16_MEMBER(tx1_state::tx1_spcs_rom_r)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- math_t &math = state->m_math;
- math.cpulatch = *(UINT16*)((UINT8*)space->machine().region("math_cpu")->base() + 0xfc000 + 0x1000 + offset*2);
+ math_t &math = m_math;
+ math.cpulatch = *(UINT16*)((UINT8*)machine().region("math_cpu")->base() + 0xfc000 + 0x1000 + offset*2);
if (math.mux == TX1_SEL_ILDEN)
{
@@ -818,7 +815,7 @@ READ16_HANDLER( tx1_spcs_rom_r )
int ins = math.inslatch & 7;
TX1_SET_INS0_BIT;
- kick_sn74s516(space->machine(), &math.cpulatch, ins);
+ kick_sn74s516(machine(), &math.cpulatch, ins);
}
else if (math.mux == TX1_SEL_PPSEN)
{
@@ -860,18 +857,17 @@ READ16_HANDLER( tx1_spcs_rom_r )
if (math.mux != TX1_SEL_ILDEN)
{
INC_PROM_ADDR;
- tx1_update_state(space->machine());
+ tx1_update_state(machine());
}
return math.cpulatch;
}
-READ16_HANDLER( tx1_spcs_ram_r )
+READ16_MEMBER(tx1_state::tx1_spcs_ram_r)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- math_t &math = state->m_math;
- math.cpulatch = state->m_math_ram[offset];
+ math_t &math = m_math;
+ math.cpulatch = m_math_ram[offset];
offset <<= 1;
@@ -884,7 +880,7 @@ READ16_HANDLER( tx1_spcs_ram_r )
int ins = math.inslatch & 7;
TX1_SET_INS0_BIT;
- kick_sn74s516(space->machine(), &math.cpulatch, ins);
+ kick_sn74s516(machine(), &math.cpulatch, ins);
}
else if (math.mux == TX1_SEL_PPSEN)
{
@@ -924,18 +920,17 @@ READ16_HANDLER( tx1_spcs_ram_r )
if (math.mux != TX1_SEL_ILDEN)
{
INC_PROM_ADDR;
- tx1_update_state(space->machine());
+ tx1_update_state(machine());
}
return math.cpulatch;
}
/* Should never occur */
-WRITE16_HANDLER( tx1_spcs_ram_w )
+WRITE16_MEMBER(tx1_state::tx1_spcs_ram_w)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
mame_printf_debug("Write to /SPCS RAM?");
- COMBINE_DATA(&state->m_math_ram[offset]);
+ COMBINE_DATA(&m_math_ram[offset]);
}
@@ -1103,10 +1098,9 @@ static void buggyboy_update_state(running_machine &machine)
}
}
-READ16_HANDLER( buggyboy_math_r )
+READ16_MEMBER(tx1_state::buggyboy_math_r)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- math_t &math = state->m_math;
+ math_t &math = m_math;
offset = offset << 1;
/* /MLPCS */
@@ -1125,7 +1119,7 @@ READ16_HANDLER( buggyboy_math_r )
}
/* TODO What do we return? */
- kick_sn74s516(space->machine(), &math.retval, ins);
+ kick_sn74s516(machine(), &math.retval, ins);
/* TODO */
//if (math.mux == BB_MUX_PPSEN)
@@ -1139,7 +1133,7 @@ READ16_HANDLER( buggyboy_math_r )
/* /DPROE */
else if ((offset & 0xc00) == 0xc00)
{
- UINT16 *romdata = (UINT16*)space->machine().region("au_data")->base();
+ UINT16 *romdata = (UINT16*)machine().region("au_data")->base();
UINT16 addr = get_bb_datarom_addr(math);
math.retval = romdata[addr];
@@ -1154,7 +1148,7 @@ READ16_HANDLER( buggyboy_math_r )
if (math.mux != BB_MUX_ILDEN)
{
INC_PROM_ADDR;
- buggyboy_update_state(space->machine());
+ buggyboy_update_state(machine());
}
}
}
@@ -1170,21 +1164,20 @@ READ16_HANDLER( buggyboy_math_r )
if (offset & BB_INSLD)
{
math.promaddr = (offset << 2) & 0x1ff;
- buggyboy_update_state(space->machine());
+ buggyboy_update_state(machine());
}
else if (offset & BB_CNTST)
{
INC_PROM_ADDR;
- buggyboy_update_state(space->machine());
+ buggyboy_update_state(machine());
}
return math.retval;
}
-WRITE16_HANDLER( buggyboy_math_w )
+WRITE16_MEMBER(tx1_state::buggyboy_math_w)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- math_t &math = state->m_math;
+ math_t &math = m_math;
math.cpulatch = data;
offset <<= 1;
@@ -1204,7 +1197,7 @@ WRITE16_HANDLER( buggyboy_math_w )
ins = (offset >> 1) & 7;
}
- kick_sn74s516(space->machine(), &math.cpulatch, ins);
+ kick_sn74s516(machine(), &math.cpulatch, ins);
}
/* /PPSEN */
else if ((offset & 0xc00) == 0x400)
@@ -1246,35 +1239,34 @@ WRITE16_HANDLER( buggyboy_math_w )
else
{
mame_printf_debug("BB_DSEL was not 3 for P->S load!\n");
- debugger_break(space->machine());
+ debugger_break(machine());
}
}
else
{
mame_printf_debug("Buggy Boy unknown math state!\n");
- debugger_break(space->machine());
+ debugger_break(machine());
}
if (offset & BB_INSLD)
{
math.promaddr = (offset << 2) & 0x1ff;
- buggyboy_update_state(space->machine());
+ buggyboy_update_state(machine());
}
else if (offset & BB_CNTST)
{
INC_PROM_ADDR;
- buggyboy_update_state(space->machine());
+ buggyboy_update_state(machine());
}
}
/*
This is for ROM range 0x5000-0x7fff
*/
-READ16_HANDLER( buggyboy_spcs_rom_r )
+READ16_MEMBER(tx1_state::buggyboy_spcs_rom_r)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- math_t &math = state->m_math;
- math.cpulatch = *(UINT16*)((UINT8*)space->machine().region("math_cpu")->base() + 0xfc000 + 0x1000 + offset*2);
+ math_t &math = m_math;
+ math.cpulatch = *(UINT16*)((UINT8*)machine().region("math_cpu")->base() + 0xfc000 + 0x1000 + offset*2);
if (math.mux == BB_MUX_ILDEN)
{
@@ -1285,7 +1277,7 @@ READ16_HANDLER( buggyboy_spcs_rom_r )
int ins = math.inslatch & 7;
BB_SET_INS0_BIT;
- kick_sn74s516(space->machine(), &math.cpulatch, ins);
+ kick_sn74s516(machine(), &math.cpulatch, ins);
}
else if (math.mux == BB_MUX_PPSEN)
{
@@ -1327,23 +1319,21 @@ READ16_HANDLER( buggyboy_spcs_rom_r )
if (math.mux != BB_MUX_ILDEN)
{
INC_PROM_ADDR;
- buggyboy_update_state(space->machine());
+ buggyboy_update_state(machine());
}
return math.cpulatch;
}
-WRITE16_HANDLER( buggyboy_spcs_ram_w )
+WRITE16_MEMBER(tx1_state::buggyboy_spcs_ram_w)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- COMBINE_DATA(&state->m_math_ram[offset]);
+ COMBINE_DATA(&m_math_ram[offset]);
}
-READ16_HANDLER( buggyboy_spcs_ram_r )
+READ16_MEMBER(tx1_state::buggyboy_spcs_ram_r)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- math_t &math = state->m_math;
- math.cpulatch = state->m_math_ram[offset];
+ math_t &math = m_math;
+ math.cpulatch = m_math_ram[offset];
offset <<= 1;
@@ -1356,7 +1346,7 @@ READ16_HANDLER( buggyboy_spcs_ram_r )
int ins = math.inslatch & 7;
BB_SET_INS0_BIT;
- kick_sn74s516(space->machine(), &math.cpulatch, ins);
+ kick_sn74s516(machine(), &math.cpulatch, ins);
}
else if (math.mux == BB_MUX_PPSEN)
{
@@ -1398,7 +1388,7 @@ READ16_HANDLER( buggyboy_spcs_ram_r )
if (math.mux != BB_MUX_ILDEN)
{
INC_PROM_ADDR;
- buggyboy_update_state(space->machine());
+ buggyboy_update_state(machine());
}
return math.cpulatch;
diff --git a/src/mame/machine/vectrex.c b/src/mame/machine/vectrex.c
index 6b97df6cab2..f1ba3305675 100644
--- a/src/mame/machine/vectrex.c
+++ b/src/mame/machine/vectrex.c
@@ -306,20 +306,19 @@ TIMER_CALLBACK(vectrex_imager_eye)
}
-WRITE8_HANDLER(vectrex_psg_port_w)
+WRITE8_MEMBER(vectrex_state::vectrex_psg_port_w)
{
- vectrex_state *state = space->machine().driver_data<vectrex_state>();
double wavel, ang_acc, tmp;
int mcontrol;
mcontrol = data & 0x40; /* IO6 controls the imager motor */
- if (!mcontrol && mcontrol ^ state->m_old_mcontrol)
+ if (!mcontrol && mcontrol ^ m_old_mcontrol)
{
- state->m_old_mcontrol = mcontrol;
- tmp = space->machine().time().as_double();
- wavel = tmp - state->m_sl;
- state->m_sl = tmp;
+ m_old_mcontrol = mcontrol;
+ tmp = machine().time().as_double();
+ wavel = tmp - m_sl;
+ m_sl = tmp;
if (wavel < 1)
{
@@ -329,22 +328,22 @@ WRITE8_HANDLER(vectrex_psg_port_w)
of the whole thing and some constants of the motor's torque/speed curve.
pwl is the negative pulse width and wavel is the whole wavelength. */
- ang_acc = (50.0 - 1.55 * state->m_imager_freq) / MMI;
- state->m_imager_freq += ang_acc * state->m_pwl + DAMPC * state->m_imager_freq / MMI * wavel;
+ ang_acc = (50.0 - 1.55 * m_imager_freq) / MMI;
+ m_imager_freq += ang_acc * m_pwl + DAMPC * m_imager_freq / MMI * wavel;
- if (state->m_imager_freq > 1)
+ if (m_imager_freq > 1)
{
- state->m_imager_timer->adjust(
- attotime::from_double(MIN(1.0 / state->m_imager_freq, state->m_imager_timer->remaining().as_double())),
+ m_imager_timer->adjust(
+ attotime::from_double(MIN(1.0 / m_imager_freq, m_imager_timer->remaining().as_double())),
2,
- attotime::from_double(1.0 / state->m_imager_freq));
+ attotime::from_double(1.0 / m_imager_freq));
}
}
}
- if (mcontrol && mcontrol ^ state->m_old_mcontrol)
+ if (mcontrol && mcontrol ^ m_old_mcontrol)
{
- state->m_old_mcontrol = mcontrol;
- state->m_pwl = space->machine().time().as_double() - state->m_sl;
+ m_old_mcontrol = mcontrol;
+ m_pwl = machine().time().as_double() - m_sl;
}
}
diff --git a/src/mame/machine/vertigo.c b/src/mame/machine/vertigo.c
index 227676b45f2..1cae9fad997 100644
--- a/src/mame/machine/vertigo.c
+++ b/src/mame/machine/vertigo.c
@@ -112,33 +112,31 @@ static WRITE_LINE_DEVICE_HANDLER( v_irq3_w )
*
*************************************/
-READ16_HANDLER( vertigo_io_convert )
+READ16_MEMBER(vertigo_state::vertigo_io_convert)
{
- vertigo_state *state = space->machine().driver_data<vertigo_state>();
static const char *const adcnames[] = { "P1X", "P1Y", "PADDLE" };
if (offset > 2)
- state->m_adc_result = 0;
+ m_adc_result = 0;
else
- state->m_adc_result = input_port_read(space->machine(), adcnames[offset]);
+ m_adc_result = input_port_read(machine(), adcnames[offset]);
- update_irq_encoder(space->machine(), INPUT_LINE_IRQ2, ASSERT_LINE);
+ update_irq_encoder(machine(), INPUT_LINE_IRQ2, ASSERT_LINE);
return 0;
}
-READ16_HANDLER( vertigo_io_adc )
+READ16_MEMBER(vertigo_state::vertigo_io_adc)
{
- vertigo_state *state = space->machine().driver_data<vertigo_state>();
- update_irq_encoder(space->machine(), INPUT_LINE_IRQ2, CLEAR_LINE);
- return state->m_adc_result;
+ update_irq_encoder(machine(), INPUT_LINE_IRQ2, CLEAR_LINE);
+ return m_adc_result;
}
-READ16_HANDLER( vertigo_coin_r )
+READ16_MEMBER(vertigo_state::vertigo_coin_r)
{
- update_irq_encoder(space->machine(), INPUT_LINE_IRQ6, CLEAR_LINE);
- return (input_port_read(space->machine(), "COIN"));
+ update_irq_encoder(machine(), INPUT_LINE_IRQ6, CLEAR_LINE);
+ return (input_port_read(machine(), "COIN"));
}
@@ -157,13 +155,13 @@ INTERRUPT_GEN( vertigo_interrupt )
*
*************************************/
-WRITE16_HANDLER( vertigo_wsot_w )
+WRITE16_MEMBER(vertigo_state::vertigo_wsot_w)
{
/* Reset sound cpu */
if ((data & 2) == 0)
- cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_RESET, ASSERT_LINE);
+ cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_RESET, ASSERT_LINE);
else
- cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_RESET, CLEAR_LINE);
+ cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_RESET, CLEAR_LINE);
}
@@ -180,17 +178,16 @@ static TIMER_CALLBACK( sound_command_w )
}
-WRITE16_HANDLER( vertigo_audio_w )
+WRITE16_MEMBER(vertigo_state::vertigo_audio_w)
{
if (ACCESSING_BITS_0_7)
- space->machine().scheduler().synchronize(FUNC(sound_command_w), data & 0xff);
+ machine().scheduler().synchronize(FUNC(sound_command_w), data & 0xff);
}
-READ16_HANDLER( vertigo_sio_r )
+READ16_MEMBER(vertigo_state::vertigo_sio_r)
{
- vertigo_state *state = space->machine().driver_data<vertigo_state>();
- return exidy440_sound_command_ack(state->m_custom) ? 0xfc : 0xfd;
+ return exidy440_sound_command_ack(m_custom) ? 0xfc : 0xfd;
}
@@ -240,7 +237,7 @@ MACHINE_RESET( vertigo )
*
*************************************/
-WRITE16_HANDLER( vertigo_motor_w )
+WRITE16_MEMBER(vertigo_state::vertigo_motor_w)
{
/* Motor controller interface. Not emulated. */
}
diff --git a/src/mame/machine/volfied.c b/src/mame/machine/volfied.c
index b41d38c7e9a..867de218f13 100644
--- a/src/mame/machine/volfied.c
+++ b/src/mame/machine/volfied.c
@@ -328,36 +328,34 @@ static TIMER_CALLBACK( volfied_timer_callback )
*
*************************************/
-WRITE16_HANDLER( volfied_cchip_ctrl_w )
+WRITE16_MEMBER(volfied_state::volfied_cchip_ctrl_w)
{
/* value 2 is written here */
}
-WRITE16_HANDLER( volfied_cchip_bank_w )
+WRITE16_MEMBER(volfied_state::volfied_cchip_bank_w)
{
- volfied_state *state = space->machine().driver_data<volfied_state>();
- state->m_current_bank = data & 7;
+ m_current_bank = data & 7;
}
-WRITE16_HANDLER( volfied_cchip_ram_w )
+WRITE16_MEMBER(volfied_state::volfied_cchip_ram_w)
{
- volfied_state *state = space->machine().driver_data<volfied_state>();
- state->m_cchip_ram[(state->m_current_bank * 0x400) + offset] = data;
+ m_cchip_ram[(m_current_bank * 0x400) + offset] = data;
// if (offset != 0x8)
-// logerror("%08x: volfied c write %04x %04x\n", cpu_get_pc(&space->device()), offset, data);
+// logerror("%08x: volfied c write %04x %04x\n", cpu_get_pc(&space.device()), offset, data);
- if (state->m_current_bank == 0)
+ if (m_current_bank == 0)
{
if (offset == 0x008)
{
- state->m_cc_port = data;
+ m_cc_port = data;
- coin_lockout_w(space->machine(), 1, data & 0x80);
- coin_lockout_w(space->machine(), 0, data & 0x40);
- coin_counter_w(space->machine(), 1, data & 0x20);
- coin_counter_w(space->machine(), 0, data & 0x10);
+ coin_lockout_w(machine(), 1, data & 0x80);
+ coin_lockout_w(machine(), 0, data & 0x40);
+ coin_counter_w(machine(), 1, data & 0x20);
+ coin_counter_w(machine(), 0, data & 0x10);
}
if (offset == 0x3fe)
@@ -387,29 +385,29 @@ WRITE16_HANDLER( volfied_cchip_ram_w )
********************/
- state->m_current_cmd = data;
+ m_current_cmd = data;
// Palette request cmd - verified to take around 122242 68000 cycles to complete
- if (state->m_current_cmd >= 0x1 && state->m_current_cmd < 0x12)
+ if (m_current_cmd >= 0x1 && m_current_cmd < 0x12)
{
- space->machine().scheduler().timer_set(downcast<cpu_device *>(&space->device())->cycles_to_attotime(122242), FUNC(volfied_timer_callback));
+ machine().scheduler().timer_set(downcast<cpu_device *>(&space.device())->cycles_to_attotime(122242), FUNC(volfied_timer_callback));
}
// Unknown cmd - verified to take around 105500 68000 cycles to complete
- else if (state->m_current_cmd >= 0x81 && state->m_current_cmd < 0x92)
+ else if (m_current_cmd >= 0x81 && m_current_cmd < 0x92)
{
- space->machine().scheduler().timer_set(downcast<cpu_device *>(&space->device())->cycles_to_attotime(105500), FUNC(volfied_timer_callback));
+ machine().scheduler().timer_set(downcast<cpu_device *>(&space.device())->cycles_to_attotime(105500), FUNC(volfied_timer_callback));
}
else
{
logerror("unknown cchip cmd %02x\n", data);
- state->m_current_cmd = 0;
+ m_current_cmd = 0;
}
}
// Some kind of timer command
if (offset == 0x3ff)
{
- state->m_current_flag = data;
+ m_current_flag = data;
}
}
}
@@ -421,7 +419,7 @@ WRITE16_HANDLER( volfied_cchip_ram_w )
*
*************************************/
-READ16_HANDLER( volfied_cchip_ctrl_r )
+READ16_MEMBER(volfied_state::volfied_cchip_ctrl_r)
{
/*
Bit 2 = Error signal
@@ -430,28 +428,27 @@ READ16_HANDLER( volfied_cchip_ctrl_r )
return 0x01; /* Return 0x05 for C-Chip error */
}
-READ16_HANDLER( volfied_cchip_ram_r )
+READ16_MEMBER(volfied_state::volfied_cchip_ram_r)
{
- volfied_state *state = space->machine().driver_data<volfied_state>();
/* Check for input ports */
- if (state->m_current_bank == 0)
+ if (m_current_bank == 0)
{
switch (offset)
{
- case 0x03: return input_port_read(space->machine(), "F00007"); /* STARTn + SERVICE1 */
- case 0x04: return input_port_read(space->machine(), "F00009"); /* COINn */
- case 0x05: return input_port_read(space->machine(), "F0000B"); /* Player controls + TILT */
- case 0x06: return input_port_read(space->machine(), "F0000D"); /* Player controls (cocktail) */
- case 0x08: return state->m_cc_port;
+ case 0x03: return input_port_read(machine(), "F00007"); /* STARTn + SERVICE1 */
+ case 0x04: return input_port_read(machine(), "F00009"); /* COINn */
+ case 0x05: return input_port_read(machine(), "F0000B"); /* Player controls + TILT */
+ case 0x06: return input_port_read(machine(), "F0000D"); /* Player controls (cocktail) */
+ case 0x08: return m_cc_port;
}
}
-// if (cpu_get_pc(&space->device())!=0x15ca8 && cpu_get_pc(&space->device())!=0x15cd8 && cpu_get_pc(&space->device())!=0x15cde)
-// logerror("%08x: volfied c read %04x (bank %04x)\n", cpu_get_pc(&space->device()), offset, current_bank);
+// if (cpu_get_pc(&space.device())!=0x15ca8 && cpu_get_pc(&space.device())!=0x15cd8 && cpu_get_pc(&space.device())!=0x15cde)
+// logerror("%08x: volfied c read %04x (bank %04x)\n", cpu_get_pc(&space.device()), offset, current_bank);
/* Unknown */
- if (state->m_current_bank == 2 && offset == 0x005)
+ if (m_current_bank == 2 && offset == 0x005)
{
/* Not fully understood - Game writes:
0001a0c2: volfied c write 0005 00aa
@@ -464,18 +461,18 @@ READ16_HANDLER( volfied_cchip_ram_r )
}
/* Unknown - some kind of timer */
- if (state->m_current_bank == 0 && offset == 0x3ff)
+ if (m_current_bank == 0 && offset == 0x3ff)
{
- return 2 * state->m_current_flag; /* fixes freeze after shield runs out */
+ return 2 * m_current_flag; /* fixes freeze after shield runs out */
}
/* Current command status */
- if (state->m_current_bank == 0 && offset == 0x3fe)
+ if (m_current_bank == 0 && offset == 0x3fe)
{
- return state->m_current_cmd;
+ return m_current_cmd;
}
- return state->m_cchip_ram[(state->m_current_bank * 0x400) + offset];
+ return m_cchip_ram[(m_current_bank * 0x400) + offset];
}
diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c
index 9a8a36e53a8..f875cffbab0 100644
--- a/src/mame/machine/vsnes.c
+++ b/src/mame/machine/vsnes.c
@@ -19,10 +19,10 @@ Nintendo VS UniSystem and DualSystem - (c) 1984 Nintendo of America
/* This leads to the memory system being an optimal place to perform banking */
/* Prototypes for mapping board components to PPU bus */
-static WRITE8_HANDLER( vsnes_nt0_w );
-static WRITE8_HANDLER( vsnes_nt1_w );
-static READ8_HANDLER( vsnes_nt0_r );
-static READ8_HANDLER( vsnes_nt1_r );
+
+
+
+
static const char * const chr_banknames[] = { "bank2", "bank3", "bank4", "bank5", "bank6", "bank7", "bank8", "bank9" };
@@ -32,106 +32,99 @@ static const char * const chr_banknames[] = { "bank2", "bank3", "bank4", "bank5"
*
*************************************/
-WRITE8_HANDLER( vsnes_in0_w )
+WRITE8_MEMBER(vsnes_state::vsnes_in0_w)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
/* Toggling bit 0 high then low resets both controllers */
if (data & 1)
{
/* load up the latches */
- state->m_input_latch[0] = input_port_read(space->machine(), "IN0");
- state->m_input_latch[1] = input_port_read(space->machine(), "IN1");
+ m_input_latch[0] = input_port_read(machine(), "IN0");
+ m_input_latch[1] = input_port_read(machine(), "IN1");
}
}
-static READ8_HANDLER( gun_in0_r )
+READ8_MEMBER(vsnes_state::gun_in0_r)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
- int ret = (state->m_input_latch[0]) & 1;
+ int ret = (m_input_latch[0]) & 1;
/* shift */
- state->m_input_latch[0] >>= 1;
+ m_input_latch[0] >>= 1;
- ret |= input_port_read(space->machine(), "COINS"); /* merge coins, etc */
- ret |= (input_port_read(space->machine(), "DSW0") & 3) << 3; /* merge 2 dipswitches */
+ ret |= input_port_read(machine(), "COINS"); /* merge coins, etc */
+ ret |= (input_port_read(machine(), "DSW0") & 3) << 3; /* merge 2 dipswitches */
/* The gun games expect a 1 returned on every 5th read after sound_fix is reset*/
/* Info Supplied by Ben Parnell <xodnizel@home.com> of FCE Ultra fame */
- if (state->m_sound_fix == 4)
+ if (m_sound_fix == 4)
{
ret = 1;
}
- state->m_sound_fix++;
+ m_sound_fix++;
return ret;
}
-READ8_HANDLER( vsnes_in0_r )
+READ8_MEMBER(vsnes_state::vsnes_in0_r)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
- int ret = (state->m_input_latch[0]) & 1;
+ int ret = (m_input_latch[0]) & 1;
/* shift */
- state->m_input_latch[0] >>= 1;
+ m_input_latch[0] >>= 1;
- ret |= input_port_read(space->machine(), "COINS"); /* merge coins, etc */
- ret |= (input_port_read(space->machine(), "DSW0") & 3) << 3; /* merge 2 dipswitches */
+ ret |= input_port_read(machine(), "COINS"); /* merge coins, etc */
+ ret |= (input_port_read(machine(), "DSW0") & 3) << 3; /* merge 2 dipswitches */
return ret;
}
-READ8_HANDLER( vsnes_in1_r )
+READ8_MEMBER(vsnes_state::vsnes_in1_r)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
- int ret = (state->m_input_latch[1]) & 1;
+ int ret = (m_input_latch[1]) & 1;
- ret |= input_port_read(space->machine(), "DSW0") & ~3; /* merge the rest of the dipswitches */
+ ret |= input_port_read(machine(), "DSW0") & ~3; /* merge the rest of the dipswitches */
/* shift */
- state->m_input_latch[1] >>= 1;
+ m_input_latch[1] >>= 1;
return ret;
}
-WRITE8_HANDLER( vsnes_in0_1_w )
+WRITE8_MEMBER(vsnes_state::vsnes_in0_1_w)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
/* Toggling bit 0 high then low resets both controllers */
if (data & 1)
{
/* load up the latches */
- state->m_input_latch[2] = input_port_read(space->machine(), "IN2");
- state->m_input_latch[3] = input_port_read(space->machine(), "IN3");
+ m_input_latch[2] = input_port_read(machine(), "IN2");
+ m_input_latch[3] = input_port_read(machine(), "IN3");
}
}
-READ8_HANDLER( vsnes_in0_1_r )
+READ8_MEMBER(vsnes_state::vsnes_in0_1_r)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
- int ret = (state->m_input_latch[2]) & 1;
+ int ret = (m_input_latch[2]) & 1;
/* shift */
- state->m_input_latch[2] >>= 1;
+ m_input_latch[2] >>= 1;
- ret |= input_port_read(space->machine(), "COINS2"); /* merge coins, etc */
- ret |= (input_port_read(space->machine(), "DSW1") & 3) << 3; /* merge 2 dipswitches */
+ ret |= input_port_read(machine(), "COINS2"); /* merge coins, etc */
+ ret |= (input_port_read(machine(), "DSW1") & 3) << 3; /* merge 2 dipswitches */
return ret;
}
-READ8_HANDLER( vsnes_in1_1_r )
+READ8_MEMBER(vsnes_state::vsnes_in1_1_r)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
- int ret = (state->m_input_latch[3]) & 1;
+ int ret = (m_input_latch[3]) & 1;
- ret |= input_port_read(space->machine(), "DSW1") & ~3; /* merge the rest of the dipswitches */
+ ret |= input_port_read(machine(), "DSW1") & ~3; /* merge the rest of the dipswitches */
/* shift */
- state->m_input_latch[3] >>= 1;
+ m_input_latch[3] >>= 1;
return ret;
@@ -207,7 +200,7 @@ MACHINE_START( vsnes )
state->m_nt_page[0][2] = state->m_nt_ram[0] + 0x800;
state->m_nt_page[0][3] = state->m_nt_ram[0] + 0xc00;
- ppu1_space->install_legacy_readwrite_handler(0x2000, 0x3eff, FUNC(vsnes_nt0_r), FUNC(vsnes_nt0_w));
+ ppu1_space->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(vsnes_state::vsnes_nt0_r),state), write8_delegate(FUNC(vsnes_state::vsnes_nt0_w),state));
state->m_vrom[0] = machine.region("gfx1")->base();
state->m_vrom_size[0] = machine.region("gfx1")->bytes();
@@ -252,8 +245,8 @@ MACHINE_START( vsdual )
state->m_nt_page[1][2] = state->m_nt_ram[1] + 0x800;
state->m_nt_page[1][3] = state->m_nt_ram[1] + 0xc00;
- machine.device("ppu1")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x2000, 0x3eff, FUNC(vsnes_nt0_r), FUNC(vsnes_nt0_w));
- machine.device("ppu2")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x2000, 0x3eff, FUNC(vsnes_nt1_r), FUNC(vsnes_nt1_w));
+ machine.device("ppu1")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(vsnes_state::vsnes_nt0_r),state), write8_delegate(FUNC(vsnes_state::vsnes_nt0_w),state));
+ machine.device("ppu2")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(vsnes_state::vsnes_nt1_r),state), write8_delegate(FUNC(vsnes_state::vsnes_nt1_w),state));
// read only!
machine.device("ppu1")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x1fff, "bank2");
// read only!
@@ -270,62 +263,58 @@ MACHINE_START( vsdual )
*
*************************************/
-static WRITE8_HANDLER( vsnes_nt0_w )
+WRITE8_MEMBER(vsnes_state::vsnes_nt0_w)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
int page = ((offset & 0xc00) >> 10);
- state->m_nt_page[0][page][offset & 0x3ff] = data;
+ m_nt_page[0][page][offset & 0x3ff] = data;
}
-static WRITE8_HANDLER( vsnes_nt1_w )
+WRITE8_MEMBER(vsnes_state::vsnes_nt1_w)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
int page = ((offset & 0xc00) >> 10);
- state->m_nt_page[1][page][offset & 0x3ff] = data;
+ m_nt_page[1][page][offset & 0x3ff] = data;
}
-static READ8_HANDLER( vsnes_nt0_r )
+READ8_MEMBER(vsnes_state::vsnes_nt0_r)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
int page = ((offset&0xc00) >> 10);
- return state->m_nt_page[0][page][offset & 0x3ff];
+ return m_nt_page[0][page][offset & 0x3ff];
}
-static READ8_HANDLER( vsnes_nt1_r )
+READ8_MEMBER(vsnes_state::vsnes_nt1_r)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
int page = ((offset & 0xc00) >> 10);
- return state->m_nt_page[1][page][offset & 0x3ff];
+ return m_nt_page[1][page][offset & 0x3ff];
}
-static void v_set_mirroring( vsnes_state *state, int ppu, int mirroring )
+void vsnes_state::v_set_mirroring(int ppu, int mirroring)
{
switch (mirroring)
{
case PPU_MIRROR_LOW:
- state->m_nt_page[ppu][0] = state->m_nt_page[ppu][1] = state->m_nt_page[ppu][2] = state->m_nt_page[ppu][3] = state->m_nt_ram[ppu];
+ m_nt_page[ppu][0] = m_nt_page[ppu][1] = m_nt_page[ppu][2] = m_nt_page[ppu][3] = m_nt_ram[ppu];
break;
case PPU_MIRROR_HIGH:
- state->m_nt_page[ppu][0] = state->m_nt_page[ppu][1] = state->m_nt_page[ppu][2] = state->m_nt_page[ppu][3] = state->m_nt_ram[ppu] + 0x400;
+ m_nt_page[ppu][0] = m_nt_page[ppu][1] = m_nt_page[ppu][2] = m_nt_page[ppu][3] = m_nt_ram[ppu] + 0x400;
break;
case PPU_MIRROR_HORZ:
- state->m_nt_page[ppu][0] = state->m_nt_ram[ppu];
- state->m_nt_page[ppu][1] = state->m_nt_ram[ppu];
- state->m_nt_page[ppu][2] = state->m_nt_ram[ppu] + 0x400;
- state->m_nt_page[ppu][3] = state->m_nt_ram[ppu] + 0x400;
+ m_nt_page[ppu][0] = m_nt_ram[ppu];
+ m_nt_page[ppu][1] = m_nt_ram[ppu];
+ m_nt_page[ppu][2] = m_nt_ram[ppu] + 0x400;
+ m_nt_page[ppu][3] = m_nt_ram[ppu] + 0x400;
break;
case PPU_MIRROR_VERT:
- state->m_nt_page[ppu][0] = state->m_nt_ram[ppu];
- state->m_nt_page[ppu][1] = state->m_nt_ram[ppu] + 0x400;
- state->m_nt_page[ppu][2] = state->m_nt_ram[ppu];
- state->m_nt_page[ppu][3] = state->m_nt_ram[ppu] + 0x400;
+ m_nt_page[ppu][0] = m_nt_ram[ppu];
+ m_nt_page[ppu][1] = m_nt_ram[ppu] + 0x400;
+ m_nt_page[ppu][2] = m_nt_ram[ppu];
+ m_nt_page[ppu][3] = m_nt_ram[ppu] + 0x400;
break;
case PPU_MIRROR_NONE:
default:
- state->m_nt_page[ppu][0] = state->m_nt_ram[ppu];
- state->m_nt_page[ppu][1] = state->m_nt_ram[ppu] + 0x400;
- state->m_nt_page[ppu][2] = state->m_nt_ram[ppu] + 0x800;
- state->m_nt_page[ppu][3] = state->m_nt_ram[ppu] + 0xc00;
+ m_nt_page[ppu][0] = m_nt_ram[ppu];
+ m_nt_page[ppu][1] = m_nt_ram[ppu] + 0x400;
+ m_nt_page[ppu][2] = m_nt_ram[ppu] + 0x800;
+ m_nt_page[ppu][3] = m_nt_ram[ppu] + 0xc00;
break;
}
@@ -340,10 +329,10 @@ static void v_set_mirroring( vsnes_state *state, int ppu, int mirroring )
/**********************************************************************************/
/* Most games: VROM Banking in controller 0 write */
-static WRITE8_HANDLER( vsnormal_vrom_banking )
+WRITE8_MEMBER(vsnes_state::vsnormal_vrom_banking)
{
/* switch vrom */
- v_set_videorom_bank(space->machine(), 0, 8, (data & 4) ? 8 : 0);
+ v_set_videorom_bank(machine(), 0, 8, (data & 4) ? 8 : 0);
/* bit 1 ( data & 2 ) enables writes to extra ram, we ignore it */
@@ -354,21 +343,21 @@ static WRITE8_HANDLER( vsnormal_vrom_banking )
DRIVER_INIT( vsnormal )
{
/* vrom switching is enabled with bit 2 of $4016 */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x4016, 0x4016, FUNC(vsnormal_vrom_banking));
+ vsnes_state *state = machine.driver_data<vsnes_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x4016, 0x4016, write8_delegate(FUNC(vsnes_state::vsnormal_vrom_banking),state));
}
/**********************************************************************************/
/* Gun games: VROM Banking in controller 0 write */
-static WRITE8_HANDLER( gun_in0_w )
+WRITE8_MEMBER(vsnes_state::gun_in0_w)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
- ppu2c0x_device *ppu1 = space->machine().device<ppu2c0x_device>("ppu1");
+ ppu2c0x_device *ppu1 = machine().device<ppu2c0x_device>("ppu1");
- if (state->m_do_vrom_bank)
+ if (m_do_vrom_bank)
{
/* switch vrom */
- v_set_videorom_bank(space->machine(), 0, 8, (data & 4) ? 8 : 0);
+ v_set_videorom_bank(machine(), 0, 8, (data & 4) ? 8 : 0);
}
/* here we do things a little different */
@@ -376,11 +365,11 @@ static WRITE8_HANDLER( gun_in0_w )
{
/* load up the latches */
- state->m_input_latch[0] = input_port_read(space->machine(), "IN0");
+ m_input_latch[0] = input_port_read(machine(), "IN0");
/* do the gun thing */
- int x = input_port_read(space->machine(), "GUNX");
- int y = input_port_read(space->machine(), "GUNY");
+ int x = input_port_read(machine(), "GUNX");
+ int y = input_port_read(machine(), "GUNY");
UINT32 pix, color_base;
/* get the pixel at the gun position */
@@ -393,33 +382,33 @@ static WRITE8_HANDLER( gun_in0_w )
if ((pix == color_base + 0x20 ) || (pix == color_base + 0x30) ||
(pix == color_base + 0x33 ) || (pix == color_base + 0x34))
{
- state->m_input_latch[0] |= 0x40;
+ m_input_latch[0] |= 0x40;
}
- state->m_input_latch[1] = input_port_read(space->machine(), "IN1");
+ m_input_latch[1] = input_port_read(machine(), "IN1");
}
- if ((state->m_zapstore & 1) && (!(data & 1)))
+ if ((m_zapstore & 1) && (!(data & 1)))
/* reset sound_fix to keep sound from hanging */
{
- state->m_sound_fix = 0;
+ m_sound_fix = 0;
}
- state->m_zapstore = data;
+ m_zapstore = data;
}
DRIVER_INIT( vsgun )
{
vsnes_state *state = machine.driver_data<vsnes_state>();
/* VROM switching is enabled with bit 2 of $4016 */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x4016, 0x4016, FUNC(gun_in0_r), FUNC(gun_in0_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x4016, 0x4016, read8_delegate(FUNC(vsnes_state::gun_in0_r),state), write8_delegate(FUNC(vsnes_state::gun_in0_w),state));
state->m_do_vrom_bank = 1;
}
/**********************************************************************************/
/* Konami games: ROMs bankings at $8000-$ffff */
-static WRITE8_HANDLER( vskonami_rom_banking )
+WRITE8_MEMBER(vsnes_state::vskonami_rom_banking)
{
int reg = (offset >> 12) & 0x07;
int bankoffset = (data & 7) * 0x2000 + 0x10000;
@@ -430,17 +419,17 @@ static WRITE8_HANDLER( vskonami_rom_banking )
case 2: /* code bank 1 */
case 4: /* code bank 2 */
{
- UINT8 *prg = space->machine().region("maincpu")->base();
+ UINT8 *prg = machine().region("maincpu")->base();
memcpy(&prg[0x08000 + reg * 0x1000], &prg[bankoffset], 0x2000);
}
break;
case 6: /* vrom bank 0 */
- v_set_videorom_bank(space->machine(), 0, 4, data * 4);
+ v_set_videorom_bank(machine(), 0, 4, data * 4);
break;
case 7: /* vrom bank 1 */
- v_set_videorom_bank(space->machine(), 4, 4, data * 4);
+ v_set_videorom_bank(machine(), 4, 4, data * 4);
break;
}
}
@@ -453,21 +442,21 @@ DRIVER_INIT( vskonami )
memcpy(&prg[0x08000], &prg[0x18000], 0x8000);
/* banking is done with writes to the $8000-$ffff area */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0xffff, FUNC(vskonami_rom_banking));
+ vsnes_state *state = machine.driver_data<vsnes_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::vskonami_rom_banking),state));
}
/***********************************************************************/
/* Vs. Gumshoe */
-static WRITE8_HANDLER( vsgshoe_gun_in0_w )
+WRITE8_MEMBER(vsnes_state::vsgshoe_gun_in0_w)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
int addr;
- if((data & 0x04) != state->m_old_bank)
+ if((data & 0x04) != m_old_bank)
{
- UINT8 *prg = space->machine().region("maincpu")->base();
- state->m_old_bank = data & 0x04;
- addr = state->m_old_bank ? 0x12000: 0x10000;
+ UINT8 *prg = machine().region("maincpu")->base();
+ m_old_bank = data & 0x04;
+ addr = m_old_bank ? 0x12000: 0x10000;
memcpy(&prg[0x08000], &prg[addr], 0x2000);
}
@@ -482,7 +471,7 @@ DRIVER_INIT( vsgshoe )
memcpy (&prg[0x08000], &prg[0x12000], 0x2000);
/* vrom switching is enabled with bit 2 of $4016 */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x4016, 0x4016, FUNC(gun_in0_r), FUNC(vsgshoe_gun_in0_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x4016, 0x4016, read8_delegate(FUNC(vsnes_state::gun_in0_r),state), write8_delegate(FUNC(vsnes_state::vsgshoe_gun_in0_w),state));
state->m_do_vrom_bank = 1;
}
@@ -491,9 +480,8 @@ DRIVER_INIT( vsgshoe )
/* Dr Mario: ROMs bankings at $8000-$ffff */
-static WRITE8_HANDLER( drmario_rom_banking )
+WRITE8_MEMBER(vsnes_state::drmario_rom_banking)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
/* basically, a MMC1 mapper from the nes */
int reg = (offset >> 13);
@@ -501,29 +489,29 @@ static WRITE8_HANDLER( drmario_rom_banking )
/* reset mapper */
if (data & 0x80)
{
- state->m_drmario_shiftreg = state->m_drmario_shiftcount = 0;
+ m_drmario_shiftreg = m_drmario_shiftcount = 0;
- state->m_size16k = 1;
+ m_size16k = 1;
- state->m_switchlow = 1;
- state->m_vrom4k = 0;
+ m_switchlow = 1;
+ m_vrom4k = 0;
return;
}
/* see if we need to clock in data */
- if (state->m_drmario_shiftcount < 5)
+ if (m_drmario_shiftcount < 5)
{
- state->m_drmario_shiftreg >>= 1;
- state->m_drmario_shiftreg |= (data & 1) << 4;
- state->m_drmario_shiftcount++;
+ m_drmario_shiftreg >>= 1;
+ m_drmario_shiftreg |= (data & 1) << 4;
+ m_drmario_shiftcount++;
}
/* are we done shifting? */
- if (state->m_drmario_shiftcount == 5)
+ if (m_drmario_shiftcount == 5)
{
/* reset count */
- state->m_drmario_shiftcount = 0;
+ m_drmario_shiftcount = 0;
/* apply data to registers */
switch (reg)
@@ -532,11 +520,11 @@ static WRITE8_HANDLER( drmario_rom_banking )
{
int mirroring;
- state->m_vrom4k = state->m_drmario_shiftreg & 0x10;
- state->m_size16k = state->m_drmario_shiftreg & 0x08;
- state->m_switchlow = state->m_drmario_shiftreg & 0x04;
+ m_vrom4k = m_drmario_shiftreg & 0x10;
+ m_size16k = m_drmario_shiftreg & 0x08;
+ m_switchlow = m_drmario_shiftreg & 0x04;
- switch (state->m_drmario_shiftreg & 3)
+ switch (m_drmario_shiftreg & 3)
{
case 0:
mirroring = PPU_MIRROR_LOW;
@@ -557,26 +545,26 @@ static WRITE8_HANDLER( drmario_rom_banking )
}
/* apply mirroring */
- v_set_mirroring(state, 1, mirroring);
+ v_set_mirroring(1, mirroring);
}
break;
case 1: /* video rom banking - bank 0 - 4k or 8k */
- if (!state->m_vram)
- v_set_videorom_bank(space->machine(), 0, (state->m_vrom4k) ? 4 : 8, state->m_drmario_shiftreg * 4);
+ if (!m_vram)
+ v_set_videorom_bank(machine(), 0, (m_vrom4k) ? 4 : 8, m_drmario_shiftreg * 4);
break;
case 2: /* video rom banking - bank 1 - 4k only */
- if (state->m_vrom4k && !state->m_vram)
- v_set_videorom_bank(space->machine(), 4, 4, state->m_drmario_shiftreg * 4);
+ if (m_vrom4k && !m_vram)
+ v_set_videorom_bank(machine(), 4, 4, m_drmario_shiftreg * 4);
break;
case 3: /* program banking */
{
- int bank = (state->m_drmario_shiftreg & 0x03) * 0x4000;
- UINT8 *prg = space->machine().region("maincpu")->base();
+ int bank = (m_drmario_shiftreg & 0x03) * 0x4000;
+ UINT8 *prg = machine().region("maincpu")->base();
- if (!state->m_size16k)
+ if (!m_size16k)
{
/* switch 32k */
memcpy(&prg[0x08000], &prg[0x010000 + bank], 0x8000);
@@ -584,7 +572,7 @@ static WRITE8_HANDLER( drmario_rom_banking )
else
{
/* switch 16k */
- if (state->m_switchlow)
+ if (m_switchlow)
{
/* low */
memcpy(&prg[0x08000], &prg[0x010000 + bank], 0x4000);
@@ -599,7 +587,7 @@ static WRITE8_HANDLER( drmario_rom_banking )
break;
}
- state->m_drmario_shiftreg = 0;
+ m_drmario_shiftreg = 0;
}
}
@@ -613,7 +601,7 @@ DRIVER_INIT( drmario )
memcpy(&prg[0x0c000], &prg[0x1c000], 0x4000);
/* MMC1 mapper at writes to $8000-$ffff */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0xffff, FUNC(drmario_rom_banking));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::drmario_rom_banking),state));
state->m_drmario_shiftreg = 0;
state->m_drmario_shiftcount = 0;
@@ -622,10 +610,10 @@ DRIVER_INIT( drmario )
/**********************************************************************************/
/* Games with VRAM instead of graphics ROMs: ROMs bankings at $8000-$ffff */
-static WRITE8_HANDLER( vsvram_rom_banking )
+WRITE8_MEMBER(vsnes_state::vsvram_rom_banking)
{
int rombank = 0x10000 + (data & 7) * 0x4000;
- UINT8 *prg = space->machine().region("maincpu")->base();
+ UINT8 *prg = machine().region("maincpu")->base();
memcpy(&prg[0x08000], &prg[rombank], 0x4000);
}
@@ -638,7 +626,7 @@ DRIVER_INIT( vsvram )
memcpy(&prg[0x08000], &prg[0x28000], 0x8000);
/* banking is done with writes to the $8000-$ffff area */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0xffff, FUNC(vsvram_rom_banking));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::vsvram_rom_banking),state));
/* allocate state->m_vram */
state->m_vram = auto_alloc_array(machine, UINT8, 0x2000);
@@ -697,53 +685,52 @@ static void mapper4_irq( device_t *device, int scanline, int vblank, int blanked
}
}
-static WRITE8_HANDLER( mapper4_w )
+WRITE8_MEMBER(vsnes_state::mapper4_w)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
- ppu2c0x_device *ppu1 = space->machine().device<ppu2c0x_device>("ppu1");
+ ppu2c0x_device *ppu1 = machine().device<ppu2c0x_device>("ppu1");
UINT8 MMC3_helper, cmd;
switch (offset & 0x6001)
{
case 0x0000: /* $8000 */
- MMC3_helper = state->m_MMC3_cmd ^ data;
- state->m_MMC3_cmd = data;
+ MMC3_helper = m_MMC3_cmd ^ data;
+ m_MMC3_cmd = data;
/* Has PRG Mode changed? */
if (MMC3_helper & 0x40)
- mapper4_set_prg(space->machine());
+ mapper4_set_prg(machine());
/* Has CHR Mode changed? */
if (MMC3_helper & 0x80)
- mapper4_set_chr(space->machine());
+ mapper4_set_chr(machine());
break;
case 0x0001: /* $8001 */
- cmd = state->m_MMC3_cmd & 0x07;
+ cmd = m_MMC3_cmd & 0x07;
switch (cmd)
{
case 0: case 1: // these do not need to be separated: we take care of them in set_chr!
case 2: case 3: case 4: case 5:
- state->m_MMC3_chr_bank[cmd] = data;
- mapper4_set_chr(space->machine());
+ m_MMC3_chr_bank[cmd] = data;
+ mapper4_set_chr(machine());
break;
case 6:
case 7:
- state->m_MMC3_prg_bank[cmd - 6] = data;
- mapper4_set_prg(space->machine());
+ m_MMC3_prg_bank[cmd - 6] = data;
+ mapper4_set_prg(machine());
break;
}
break;
case 0x2000: /* $a000 */
if (data & 0x40)
- v_set_mirroring(state, 1, PPU_MIRROR_HIGH);
+ v_set_mirroring(1, PPU_MIRROR_HIGH);
else
{
if (data & 0x01)
- v_set_mirroring(state, 1, PPU_MIRROR_HORZ);
+ v_set_mirroring(1, PPU_MIRROR_HORZ);
else
- v_set_mirroring(state, 1, PPU_MIRROR_VERT);
+ v_set_mirroring(1, PPU_MIRROR_VERT);
}
break;
@@ -752,25 +739,25 @@ static WRITE8_HANDLER( mapper4_w )
break;
case 0x4000: /* $c000 - IRQ scanline counter */
- state->m_IRQ_count = data;
+ m_IRQ_count = data;
break;
case 0x4001: /* $c001 - IRQ scanline latch */
- state->m_IRQ_count_latch = data;
+ m_IRQ_count_latch = data;
break;
case 0x6000: /* $e000 - Disable IRQs */
- state->m_IRQ_enable = 0;
- state->m_IRQ_count = state->m_IRQ_count_latch;
+ m_IRQ_enable = 0;
+ m_IRQ_count = m_IRQ_count_latch;
ppu1->set_scanline_callback(0);
break;
case 0x6001: /* $e001 - Enable IRQs */
- state->m_IRQ_enable = 1;
+ m_IRQ_enable = 1;
ppu1->set_scanline_callback(mapper4_irq);
break;
@@ -802,7 +789,7 @@ DRIVER_INIT( MMC3 )
memcpy(&prg[0xe000], &prg[(MMC3_prg_chunks - 1) * 0x4000 + 0x12000], 0x2000);
/* MMC3 mapper at writes to $8000-$ffff */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0xffff, FUNC(mapper4_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::mapper4_w),state));
/* extra ram at $6000-$7fff */
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff);
@@ -810,21 +797,20 @@ DRIVER_INIT( MMC3 )
/* Vs. RBI Baseball */
-static READ8_HANDLER( rbi_hack_r )
+READ8_MEMBER(vsnes_state::rbi_hack_r)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
/* Supplied by Ben Parnell <xodnizel@home.com> of FCE Ultra fame */
if (offset == 0)
{
- state->m_VSindex=0;
+ m_VSindex=0;
return 0xFF;
}
else
{
- switch(state->m_VSindex++)
+ switch(m_VSindex++)
{
case 9:
return 0x6F;
@@ -843,46 +829,44 @@ DRIVER_INIT( rbibb )
DRIVER_INIT_CALL(MMC3);
/* RBI Base ball hack */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x5e00, 0x5e01, FUNC(rbi_hack_r)) ;
+ vsnes_state *state = machine.driver_data<vsnes_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x5e00, 0x5e01, read8_delegate(FUNC(vsnes_state::rbi_hack_r),state)) ;
}
/* Vs. Super Xevious */
-static READ8_HANDLER( supxevs_read_prot_1_r )
+READ8_MEMBER(vsnes_state::supxevs_read_prot_1_r)
{
return 0x05;
}
-static READ8_HANDLER( supxevs_read_prot_2_r )
+READ8_MEMBER(vsnes_state::supxevs_read_prot_2_r)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
- if (state->m_supxevs_prot_index)
+ if (m_supxevs_prot_index)
return 0;
else
return 0x01;
}
-static READ8_HANDLER( supxevs_read_prot_3_r )
+READ8_MEMBER(vsnes_state::supxevs_read_prot_3_r)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
- if (state->m_supxevs_prot_index)
+ if (m_supxevs_prot_index)
return 0xd1;
else
return 0x89;
}
-static READ8_HANDLER( supxevs_read_prot_4_r )
+READ8_MEMBER(vsnes_state::supxevs_read_prot_4_r)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
- if (state->m_supxevs_prot_index)
+ if (m_supxevs_prot_index)
{
- state->m_supxevs_prot_index = 0;
+ m_supxevs_prot_index = 0;
return 0x3e;
}
else
{
- state->m_supxevs_prot_index = 1;
+ m_supxevs_prot_index = 1;
return 0x37;
}
}
@@ -893,17 +877,17 @@ DRIVER_INIT( supxevs )
DRIVER_INIT_CALL(MMC3);
/* Vs. Super Xevious Protection */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x54ff, 0x54ff, FUNC(supxevs_read_prot_1_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x5678, 0x5678, FUNC(supxevs_read_prot_2_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x578f, 0x578f, FUNC(supxevs_read_prot_3_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x5567, 0x5567, FUNC(supxevs_read_prot_4_r));
+ vsnes_state *state = machine.driver_data<vsnes_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x54ff, 0x54ff, read8_delegate(FUNC(vsnes_state::supxevs_read_prot_1_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x5678, 0x5678, read8_delegate(FUNC(vsnes_state::supxevs_read_prot_2_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x578f, 0x578f, read8_delegate(FUNC(vsnes_state::supxevs_read_prot_3_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x5567, 0x5567, read8_delegate(FUNC(vsnes_state::supxevs_read_prot_4_r),state));
}
/* Vs. TKO Boxing */
-static READ8_HANDLER( tko_security_r )
+READ8_MEMBER(vsnes_state::tko_security_r)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
static const UINT8 security_data[] = {
0xff, 0xbf, 0xb7, 0x97, 0x97, 0x17, 0x57, 0x4f,
0x6f, 0x6b, 0xeb, 0xa9, 0xb1, 0x90, 0x94, 0x14,
@@ -913,11 +897,11 @@ static READ8_HANDLER( tko_security_r )
if (offset == 0)
{
- state->m_security_counter = 0;
+ m_security_counter = 0;
return 0;
}
- return security_data[(state->m_security_counter++)];
+ return security_data[(m_security_counter++)];
}
@@ -926,7 +910,8 @@ DRIVER_INIT( tkoboxng )
DRIVER_INIT_CALL(MMC3);
/* security device at $5e00-$5e01 */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x5e00, 0x5e01, FUNC(tko_security_r));
+ vsnes_state *state = machine.driver_data<vsnes_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x5e00, 0x5e01, read8_delegate(FUNC(vsnes_state::tko_security_r),state));
}
/* Vs. Freedom Force */
@@ -936,7 +921,7 @@ DRIVER_INIT( vsfdf )
vsnes_state *state = machine.driver_data<vsnes_state>();
DRIVER_INIT_CALL(MMC3);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x4016, 0x4016, FUNC(gun_in0_r), FUNC(gun_in0_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x4016, 0x4016, read8_delegate(FUNC(vsnes_state::gun_in0_r),state), write8_delegate(FUNC(vsnes_state::gun_in0_w),state));
state->m_do_vrom_bank = 0;
}
@@ -944,30 +929,30 @@ DRIVER_INIT( vsfdf )
/**********************************************************************************/
/* Platoon rom banking */
-static WRITE8_HANDLER( mapper68_rom_banking )
+WRITE8_MEMBER(vsnes_state::mapper68_rom_banking)
{
switch (offset & 0x7000)
{
case 0x0000:
- v_set_videorom_bank(space->machine(), 0, 2, data * 2);
+ v_set_videorom_bank(machine(), 0, 2, data * 2);
break;
case 0x1000:
- v_set_videorom_bank(space->machine(), 2, 2, data * 2);
+ v_set_videorom_bank(machine(), 2, 2, data * 2);
break;
case 0x2000:
- v_set_videorom_bank(space->machine(), 4, 2, data * 2);
+ v_set_videorom_bank(machine(), 4, 2, data * 2);
break;
case 0x3000: /* ok? */
- v_set_videorom_bank(space->machine(), 6, 2, data * 2);
+ v_set_videorom_bank(machine(), 6, 2, data * 2);
break;
case 0x7000:
{
- UINT8 *prg = space->machine().region("maincpu")->base();
+ UINT8 *prg = machine().region("maincpu")->base();
memcpy(&prg[0x08000], &prg[0x10000 + data * 0x4000], 0x4000);
}
break;
@@ -986,31 +971,30 @@ DRIVER_INIT( platoon )
memcpy(&prg[0x08000], &prg[0x10000], 0x4000);
memcpy(&prg[0x0c000], &prg[0x2c000], 0x4000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0xffff, FUNC(mapper68_rom_banking));
+ vsnes_state *state = machine.driver_data<vsnes_state>();
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::mapper68_rom_banking),state));
}
/**********************************************************************************/
/* Vs. Raid on Bungeling Bay (Japan) */
-static WRITE8_HANDLER( set_bnglngby_irq_w )
+WRITE8_MEMBER(vsnes_state::set_bnglngby_irq_w)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
- state->m_ret = data;
- cputag_set_input_line(space->machine(), "maincpu", 0, (data & 2) ? ASSERT_LINE : CLEAR_LINE);
+ m_ret = data;
+ cputag_set_input_line(machine(), "maincpu", 0, (data & 2) ? ASSERT_LINE : CLEAR_LINE);
/* other values ??? */
/* 0, 4, 84 */
}
-static READ8_HANDLER( set_bnglngby_irq_r )
+READ8_MEMBER(vsnes_state::set_bnglngby_irq_r)
{
- vsnes_state *state = space->machine().driver_data<vsnes_state>();
- return state->m_ret;
+ return m_ret;
}
DRIVER_INIT( bnglngby )
{
vsnes_state *state = machine.driver_data<vsnes_state>();
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x0231, 0x0231, FUNC(set_bnglngby_irq_r), FUNC(set_bnglngby_irq_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x0231, 0x0231, read8_delegate(FUNC(vsnes_state::set_bnglngby_irq_r),state), write8_delegate(FUNC(vsnes_state::set_bnglngby_irq_w),state));
/* extra ram */
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff);
@@ -1024,18 +1008,17 @@ DRIVER_INIT( bnglngby )
/**********************************************************************************/
/* VS Dualsystem */
-static WRITE8_HANDLER( vsdual_vrom_banking )
+WRITE8_MEMBER(vsnes_state::vsdual_vrom_banking)
{
- device_t *other_cpu = (&space->device() == space->machine().device("maincpu")) ? space->machine().device("sub") : space->machine().device("maincpu");
-
+ device_t *other_cpu = (&space.device() == machine().device("maincpu")) ? machine().device("sub") : machine().device("maincpu");
/* switch vrom */
- (&space->device() == space->machine().device("maincpu")) ? memory_set_bank(space->machine(), "bank2", BIT(data, 2)) : memory_set_bank(space->machine(), "bank3", BIT(data, 2));
+ (&space.device() == machine().device("maincpu")) ? memory_set_bank(machine(), "bank2", BIT(data, 2)) : memory_set_bank(machine(), "bank3", BIT(data, 2));
/* bit 1 ( data & 2 ) triggers irq on the other cpu */
device_set_input_line(other_cpu, 0, (data & 2) ? CLEAR_LINE : ASSERT_LINE);
/* move along */
- if (&space->device() == space->machine().device("maincpu"))
+ if (&space.device() == machine().device("maincpu"))
vsnes_in0_w(space, offset, data);
else
vsnes_in0_1_w(space, offset, data);
@@ -1045,9 +1028,10 @@ DRIVER_INIT( vsdual )
{
UINT8 *prg = machine.region("maincpu")->base();
+ vsnes_state *state = machine.driver_data<vsnes_state>();
/* vrom switching is enabled with bit 2 of $4016 */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x4016, 0x4016, FUNC(vsdual_vrom_banking));
- machine.device("sub")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x4016, 0x4016, FUNC(vsdual_vrom_banking));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x4016, 0x4016, write8_delegate(FUNC(vsnes_state::vsdual_vrom_banking),state));
+ machine.device("sub")->memory().space(AS_PROGRAM)->install_write_handler(0x4016, 0x4016, write8_delegate(FUNC(vsnes_state::vsdual_vrom_banking),state));
/* shared ram at $6000 */
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff, &prg[0x6000]);
diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c
index 17b8f2ee62f..72f64474fd5 100644
--- a/src/mame/machine/williams.c
+++ b/src/mame/machine/williams.c
@@ -459,7 +459,7 @@ static void williams2_postload(running_machine &machine)
{
williams_state *state = machine.driver_data<williams_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- williams2_bank_select_w(space, 0, state->m_vram_bank);
+ state->williams2_bank_select_w(*space, 0, state->m_vram_bank);
}
@@ -478,10 +478,11 @@ MACHINE_START( williams2 )
MACHINE_RESET( williams2 )
{
+ williams_state *state = machine.driver_data<williams_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* make sure our banking is reset */
- williams2_bank_select_w(space, 0, 0);
+ state->williams2_bank_select_w(*space, 0, 0);
/* set a timer to go off every 16 scanlines, to toggle the VA11 line and update the screen */
timer_device *scan_timer = machine.device<timer_device>("scan_timer");
@@ -500,49 +501,47 @@ MACHINE_RESET( williams2 )
*
*************************************/
-WRITE8_HANDLER( williams_vram_select_w )
+WRITE8_MEMBER(williams_state::williams_vram_select_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
/* VRAM/ROM banking from bit 0 */
- state->m_vram_bank = data & 0x01;
- memory_set_bank(space->machine(), "bank1", state->m_vram_bank);
+ m_vram_bank = data & 0x01;
+ memory_set_bank(machine(), "bank1", m_vram_bank);
/* cocktail flip from bit 1 */
- state->m_cocktail = data & 0x02;
+ m_cocktail = data & 0x02;
}
-WRITE8_HANDLER( williams2_bank_select_w )
+WRITE8_MEMBER(williams_state::williams2_bank_select_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_vram_bank = data & 0x07;
+ m_vram_bank = data & 0x07;
/* the low two bits control the paging */
- switch (state->m_vram_bank & 0x03)
+ switch (m_vram_bank & 0x03)
{
/* page 0 is video ram */
case 0:
- space->install_read_bank(0x0000, 0x8fff, "bank1");
- space->install_write_bank(0x8000, 0x87ff, "bank4");
- memory_set_bank(space->machine(), "bank1", 0);
- memory_set_bankptr(space->machine(), "bank4", &state->m_videoram[0x8000]);
+ space.install_read_bank(0x0000, 0x8fff, "bank1");
+ space.install_write_bank(0x8000, 0x87ff, "bank4");
+ memory_set_bank(machine(), "bank1", 0);
+ memory_set_bankptr(machine(), "bank4", &m_videoram[0x8000]);
break;
/* pages 1 and 2 are ROM */
case 1:
case 2:
- space->install_read_bank(0x0000, 0x8fff, "bank1");
- space->install_write_bank(0x8000, 0x87ff, "bank4");
- memory_set_bank(space->machine(), "bank1", 1 + ((state->m_vram_bank & 6) >> 1));
- memory_set_bankptr(space->machine(), "bank4", &state->m_videoram[0x8000]);
+ space.install_read_bank(0x0000, 0x8fff, "bank1");
+ space.install_write_bank(0x8000, 0x87ff, "bank4");
+ memory_set_bank(machine(), "bank1", 1 + ((m_vram_bank & 6) >> 1));
+ memory_set_bankptr(machine(), "bank4", &m_videoram[0x8000]);
break;
/* page 3 accesses palette RAM; the remaining areas are as if page 1 ROM was selected */
case 3:
- space->install_read_bank(0x8000, 0x87ff, "bank4");
- space->install_legacy_write_handler(0x8000, 0x87ff, FUNC(williams2_paletteram_w));
- memory_set_bank(space->machine(), "bank1", 1 + ((state->m_vram_bank & 4) >> 1));
- memory_set_bankptr(space->machine(), "bank4", state->m_generic_paletteram_8);
+ space.install_read_bank(0x8000, 0x87ff, "bank4");
+ space.install_write_handler(0x8000, 0x87ff, write8_delegate(FUNC(williams_state::williams2_paletteram_w),this));
+ memory_set_bank(machine(), "bank1", 1 + ((m_vram_bank & 4) >> 1));
+ memory_set_bankptr(machine(), "bank4", m_generic_paletteram_8);
break;
}
}
@@ -677,19 +676,17 @@ READ8_DEVICE_HANDLER( williams_input_port_49way_0_5_r )
*
*************************************/
-WRITE8_HANDLER( williams_cmos_w )
+WRITE8_MEMBER(williams_state::williams_cmos_w)
{
/* only 4 bits are valid */
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_nvram[offset] = data | 0xf0;
+ m_nvram[offset] = data | 0xf0;
}
-WRITE8_HANDLER( bubbles_cmos_w )
+WRITE8_MEMBER(williams_state::bubbles_cmos_w)
{
/* bubbles has additional CMOS for a full 8 bits */
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_nvram[offset] = data;
+ m_nvram[offset] = data;
}
@@ -700,21 +697,19 @@ WRITE8_HANDLER( bubbles_cmos_w )
*
*************************************/
-WRITE8_HANDLER( williams_watchdog_reset_w )
+WRITE8_MEMBER(williams_state::williams_watchdog_reset_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
/* yes, the data bits are checked for this specific value */
if (data == 0x39)
- state->watchdog_reset_w(*space,0,0);
+ watchdog_reset_w(space,0,0);
}
-WRITE8_HANDLER( williams2_watchdog_reset_w )
+WRITE8_MEMBER(williams_state::williams2_watchdog_reset_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
/* yes, the data bits are checked for this specific value */
if ((data & 0x3f) == 0x14)
- state->watchdog_reset_w(*space,0,0);
+ watchdog_reset_w(space,0,0);
}
@@ -725,7 +720,7 @@ WRITE8_HANDLER( williams2_watchdog_reset_w )
*
*************************************/
-WRITE8_HANDLER( williams2_7segment_w )
+WRITE8_MEMBER(williams_state::williams2_7segment_w)
{
int n;
char dot;
@@ -770,7 +765,7 @@ static void defender_postload(running_machine &machine)
{
williams_state *state = machine.driver_data<williams_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- defender_bank_select_w(space, 0, state->m_vram_bank);
+ state->defender_bank_select_w(*space, 0, state->m_vram_bank);
}
@@ -787,32 +782,31 @@ MACHINE_START( defender )
MACHINE_RESET( defender )
{
+ williams_state *state = machine.driver_data<williams_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
MACHINE_RESET_CALL(williams_common);
- defender_bank_select_w(space, 0, 0);
+ state->defender_bank_select_w(*space, 0, 0);
}
-WRITE8_HANDLER( defender_video_control_w )
+WRITE8_MEMBER(williams_state::defender_video_control_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_cocktail = data & 0x01;
+ m_cocktail = data & 0x01;
}
-WRITE8_HANDLER( defender_bank_select_w )
+WRITE8_MEMBER(williams_state::defender_bank_select_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_vram_bank = data & 0x0f;
+ m_vram_bank = data & 0x0f;
/* set bank address */
switch (data)
{
- /* page 0 is I/O space */
+ /* page 0 is I/O &space */
case 0:
- defender_install_io_space(space);
+ defender_install_io_space(&space);
break;
/* pages 1-9 map to ROM banks */
@@ -825,14 +819,14 @@ WRITE8_HANDLER( defender_bank_select_w )
case 7:
case 8:
case 9:
- space->install_read_bank(0xc000, 0xcfff, "bank1");
- space->unmap_write(0xc000, 0xcfff);
- memory_set_bank(space->machine(), "bank1", state->m_vram_bank - 1);
+ space.install_read_bank(0xc000, 0xcfff, "bank1");
+ space.unmap_write(0xc000, 0xcfff);
+ memory_set_bank(machine(), "bank1", m_vram_bank - 1);
break;
/* pages A-F are not connected */
default:
- space->nop_readwrite(0xc000, 0xcfff);
+ space.nop_readwrite(0xc000, 0xcfff);
break;
}
}
@@ -845,15 +839,14 @@ WRITE8_HANDLER( defender_bank_select_w )
*
*************************************/
-READ8_HANDLER( mayday_protection_r )
+READ8_MEMBER(williams_state::mayday_protection_r)
{
- williams_state *state = space->machine().driver_data<williams_state>();
/* Mayday does some kind of protection check that is not currently understood */
/* However, the results of that protection check are stored at $a190 and $a191 */
/* These are compared against $a193 and $a194, respectively. Thus, to prevent */
- /* the protection from resetting the space->machine(), we just return $a193 for $a190, */
+ /* the protection from resetting the machine(), we just return $a193 for $a190, */
/* and $a194 for $a191. */
- return state->m_mayday_protection[offset + 3];
+ return m_mayday_protection[offset + 3];
}
@@ -864,14 +857,13 @@ READ8_HANDLER( mayday_protection_r )
*
*************************************/
-WRITE8_HANDLER( sinistar_vram_select_w )
+WRITE8_MEMBER(williams_state::sinistar_vram_select_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
/* low two bits are standard */
williams_vram_select_w(space, offset, data);
/* window enable from bit 2 (clips to 0x7400) */
- state->m_blitter_window_enable = data & 0x04;
+ m_blitter_window_enable = data & 0x04;
}
@@ -912,26 +904,24 @@ INLINE void update_blaster_banking(running_machine &machine)
}
-WRITE8_HANDLER( blaster_vram_select_w )
+WRITE8_MEMBER(williams_state::blaster_vram_select_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
/* VRAM/ROM banking from bit 0 */
- state->m_vram_bank = data & 0x01;
- update_blaster_banking(space->machine());
+ m_vram_bank = data & 0x01;
+ update_blaster_banking(machine());
/* cocktail flip from bit 1 */
- state->m_cocktail = data & 0x02;
+ m_cocktail = data & 0x02;
/* window enable from bit 2 (clips to 0x9700) */
- state->m_blitter_window_enable = data & 0x04;
+ m_blitter_window_enable = data & 0x04;
}
-WRITE8_HANDLER( blaster_bank_select_w )
+WRITE8_MEMBER(williams_state::blaster_bank_select_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_blaster_bank = data & 15;
- update_blaster_banking(space->machine());
+ m_blaster_bank = data & 15;
+ update_blaster_banking(machine());
}
diff --git a/src/mame/machine/wrally.c b/src/mame/machine/wrally.c
index 75307df5a62..eb7c99cda73 100644
--- a/src/mame/machine/wrally.c
+++ b/src/mame/machine/wrally.c
@@ -18,36 +18,35 @@
***************************************************************************/
-WRITE16_HANDLER( wrally_vram_w )
+WRITE16_MEMBER(wrally_state::wrally_vram_w)
{
- wrally_state *state = space->machine().driver_data<wrally_state>();
- data = gaelco_decrypt(space, offset, data, 0x1f, 0x522a);
- COMBINE_DATA(&state->m_videoram[offset]);
+ data = gaelco_decrypt(&space, offset, data, 0x1f, 0x522a);
+ COMBINE_DATA(&m_videoram[offset]);
- state->m_pant[(offset & 0x1fff) >> 12]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2);
+ m_pant[(offset & 0x1fff) >> 12]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2);
}
-WRITE16_HANDLER( wrally_flipscreen_w )
+WRITE16_MEMBER(wrally_state::wrally_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 0x01);
+ flip_screen_set(machine(), data & 0x01);
}
-WRITE16_HANDLER( OKIM6295_bankswitch_w )
+WRITE16_MEMBER(wrally_state::OKIM6295_bankswitch_w)
{
- UINT8 *RAM = space->machine().region("oki")->base();
+ UINT8 *RAM = machine().region("oki")->base();
if (ACCESSING_BITS_0_7){
memcpy(&RAM[0x30000], &RAM[0x40000 + (data & 0x0f)*0x10000], 0x10000);
}
}
-WRITE16_HANDLER( wrally_coin_counter_w )
+WRITE16_MEMBER(wrally_state::wrally_coin_counter_w)
{
- coin_counter_w( space->machine(), (offset >> 3) & 0x01, data & 0x01);
+ coin_counter_w( machine(), (offset >> 3) & 0x01, data & 0x01);
}
-WRITE16_HANDLER( wrally_coin_lockout_w )
+WRITE16_MEMBER(wrally_state::wrally_coin_lockout_w)
{
- coin_lockout_w( space->machine(), (offset >> 3) & 0x01, ~data & 0x01);
+ coin_lockout_w( machine(), (offset >> 3) & 0x01, ~data & 0x01);
}
diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c
index b1d99abf054..b7326e4f1ec 100644
--- a/src/mame/video/1942.c
+++ b/src/mame/video/1942.c
@@ -140,55 +140,50 @@ VIDEO_START( 1942 )
***************************************************************************/
-WRITE8_HANDLER( c1942_fgvideoram_w )
+WRITE8_MEMBER(_1942_state::c1942_fgvideoram_w)
{
- _1942_state *state = space->machine().driver_data<_1942_state>();
- state->m_fg_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fg_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( c1942_bgvideoram_w )
+WRITE8_MEMBER(_1942_state::c1942_bgvideoram_w)
{
- _1942_state *state = space->machine().driver_data<_1942_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty((offset & 0x0f) | ((offset >> 1) & 0x01f0));
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty((offset & 0x0f) | ((offset >> 1) & 0x01f0));
}
-WRITE8_HANDLER( c1942_palette_bank_w )
+WRITE8_MEMBER(_1942_state::c1942_palette_bank_w)
{
- _1942_state *state = space->machine().driver_data<_1942_state>();
- if (state->m_palette_bank != data)
+ if (m_palette_bank != data)
{
- state->m_palette_bank = data;
- state->m_bg_tilemap->mark_all_dirty();
+ m_palette_bank = data;
+ m_bg_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( c1942_scroll_w )
+WRITE8_MEMBER(_1942_state::c1942_scroll_w)
{
- _1942_state *state = space->machine().driver_data<_1942_state>();
- state->m_scroll[offset] = data;
- state->m_bg_tilemap->set_scrollx(0, state->m_scroll[0] | (state->m_scroll[1] << 8));
+ m_scroll[offset] = data;
+ m_bg_tilemap->set_scrollx(0, m_scroll[0] | (m_scroll[1] << 8));
}
-WRITE8_HANDLER( c1942_c804_w )
+WRITE8_MEMBER(_1942_state::c1942_c804_w)
{
- _1942_state *state = space->machine().driver_data<_1942_state>();
/* bit 7: flip screen
bit 4: cpu B reset
bit 0: coin counter */
- coin_counter_w(space->machine(), 0,data & 0x01);
+ coin_counter_w(machine(), 0,data & 0x01);
- device_set_input_line(state->m_audiocpu, INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
+ device_set_input_line(m_audiocpu, INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
}
diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c
index 6b6b7c9c908..660f084e587 100644
--- a/src/mame/video/1943.c
+++ b/src/mame/video/1943.c
@@ -118,54 +118,50 @@ PALETTE_INIT( 1943 )
}
}
-WRITE8_HANDLER( c1943_videoram_w )
+WRITE8_MEMBER(_1943_state::c1943_videoram_w)
{
- _1943_state *state = space->machine().driver_data<_1943_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( c1943_colorram_w )
+WRITE8_MEMBER(_1943_state::c1943_colorram_w)
{
- _1943_state *state = space->machine().driver_data<_1943_state>();
- state->m_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( c1943_c804_w )
+WRITE8_MEMBER(_1943_state::c1943_c804_w)
{
- _1943_state *state = space->machine().driver_data<_1943_state>();
/* bits 0 and 1 are coin counters */
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02);
/* bits 2, 3 and 4 select the ROM bank */
- memory_set_bank(space->machine(), "bank1", (data & 0x1c) >> 2);
+ memory_set_bank(machine(), "bank1", (data & 0x1c) >> 2);
/* bit 5 resets the sound CPU - we ignore it */
/* bit 6 flips screen */
- flip_screen_set(space->machine(), data & 0x40);
+ flip_screen_set(machine(), data & 0x40);
/* bit 7 enables characters */
- state->m_char_on = data & 0x80;
+ m_char_on = data & 0x80;
}
-WRITE8_HANDLER( c1943_d806_w )
+WRITE8_MEMBER(_1943_state::c1943_d806_w)
{
- _1943_state *state = space->machine().driver_data<_1943_state>();
/* bit 4 enables bg 1 */
- state->m_bg1_on = data & 0x10;
+ m_bg1_on = data & 0x10;
/* bit 5 enables bg 2 */
- state->m_bg2_on = data & 0x20;
+ m_bg2_on = data & 0x20;
/* bit 6 enables sprites */
- state->m_obj_on = data & 0x40;
+ m_obj_on = data & 0x40;
}
static TILE_GET_INFO( c1943_get_bg2_tile_info )
diff --git a/src/mame/video/40love.c b/src/mame/video/40love.c
index 50c2f88d9e9..6711321cb24 100644
--- a/src/mame/video/40love.c
+++ b/src/mame/video/40love.c
@@ -150,32 +150,30 @@ static void fortyl_set_scroll_x( running_machine &machine, int offset )
state->m_bg_tilemap->set_scrollx(offset / 2, x);
}
-WRITE8_HANDLER( fortyl_pixram_sel_w )
+WRITE8_MEMBER(fortyl_state::fortyl_pixram_sel_w)
{
- fortyl_state *state = space->machine().driver_data<fortyl_state>();
int offs;
int f = data & 0x01;
- state->m_pixram_sel = (data & 0x04) >> 2;
+ m_pixram_sel = (data & 0x04) >> 2;
- if (state->m_flipscreen != f)
+ if (m_flipscreen != f)
{
- state->m_flipscreen = f;
- flip_screen_set(space->machine(), state->m_flipscreen);
- state->m_pix_redraw = 1;
+ m_flipscreen = f;
+ flip_screen_set(machine(), m_flipscreen);
+ m_pix_redraw = 1;
for (offs = 0; offs < 32; offs++)
- fortyl_set_scroll_x(space->machine(), offs * 2);
+ fortyl_set_scroll_x(machine(), offs * 2);
}
}
-READ8_HANDLER( fortyl_pixram_r )
+READ8_MEMBER(fortyl_state::fortyl_pixram_r)
{
- fortyl_state *state = space->machine().driver_data<fortyl_state>();
- if (state->m_pixram_sel)
- return state->m_pixram2[offset];
+ if (m_pixram_sel)
+ return m_pixram2[offset];
else
- return state->m_pixram1[offset];
+ return m_pixram1[offset];
}
static void fortyl_plot_pix( running_machine &machine, int offset )
@@ -207,50 +205,45 @@ static void fortyl_plot_pix( running_machine &machine, int offset )
}
}
-WRITE8_HANDLER( fortyl_pixram_w )
+WRITE8_MEMBER(fortyl_state::fortyl_pixram_w)
{
- fortyl_state *state = space->machine().driver_data<fortyl_state>();
- if (state->m_pixram_sel)
- state->m_pixram2[offset] = data;
+ if (m_pixram_sel)
+ m_pixram2[offset] = data;
else
- state->m_pixram1[offset] = data;
+ m_pixram1[offset] = data;
- fortyl_plot_pix(space->machine(), offset & 0x1fff);
+ fortyl_plot_pix(machine(), offset & 0x1fff);
}
-WRITE8_HANDLER( fortyl_bg_videoram_w )
+WRITE8_MEMBER(fortyl_state::fortyl_bg_videoram_w)
{
- fortyl_state *state = space->machine().driver_data<fortyl_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-READ8_HANDLER( fortyl_bg_videoram_r )
+READ8_MEMBER(fortyl_state::fortyl_bg_videoram_r)
{
- fortyl_state *state = space->machine().driver_data<fortyl_state>();
- return state->m_videoram[offset];
+ return m_videoram[offset];
}
-WRITE8_HANDLER( fortyl_bg_colorram_w )
+WRITE8_MEMBER(fortyl_state::fortyl_bg_colorram_w)
{
- fortyl_state *state = space->machine().driver_data<fortyl_state>();
- if (state->m_colorram[offset] != data)
+ if (m_colorram[offset] != data)
{
int i;
- state->m_colorram[offset] = data;
+ m_colorram[offset] = data;
for (i = (offset / 2) * 64; i < (offset / 2) * 64 + 64; i++)
- state->m_bg_tilemap->mark_tile_dirty(i);
+ m_bg_tilemap->mark_tile_dirty(i);
- fortyl_set_scroll_x(space->machine(), offset);
+ fortyl_set_scroll_x(machine(), offset);
}
}
-READ8_HANDLER( fortyl_bg_colorram_r )
+READ8_MEMBER(fortyl_state::fortyl_bg_colorram_r)
{
- fortyl_state *state = space->machine().driver_data<fortyl_state>();
- return state->m_colorram[offset];
+ return m_colorram[offset];
}
/***************************************************************************
diff --git a/src/mame/video/4enraya.c b/src/mame/video/4enraya.c
index a6e19a30321..d5a19266b2d 100644
--- a/src/mame/video/4enraya.c
+++ b/src/mame/video/4enraya.c
@@ -9,13 +9,12 @@
#include "emu.h"
#include "includes/4enraya.h"
-WRITE8_HANDLER( fenraya_videoram_w )
+WRITE8_MEMBER(_4enraya_state::fenraya_videoram_w)
{
- _4enraya_state *state = space->machine().driver_data<_4enraya_state>();
- state->m_videoram[(offset & 0x3ff) * 2] = data;
- state->m_videoram[(offset & 0x3ff) * 2 + 1] = (offset & 0xc00) >> 10;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_videoram[(offset & 0x3ff) * 2] = data;
+ m_videoram[(offset & 0x3ff) * 2 + 1] = (offset & 0xc00) >> 10;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
static TILE_GET_INFO( get_tile_info )
diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c
index 47359ccd6c8..717f5bc6d04 100644
--- a/src/mame/video/aeroboto.c
+++ b/src/mame/video/aeroboto.c
@@ -79,45 +79,42 @@ VIDEO_START( aeroboto )
***************************************************************************/
-READ8_HANDLER( aeroboto_in0_r )
+READ8_MEMBER(aeroboto_state::aeroboto_in0_r)
{
- return input_port_read(space->machine(), flip_screen_get(space->machine()) ? "P2" : "P1");
+ return input_port_read(machine(), flip_screen_get(machine()) ? "P2" : "P1");
}
-WRITE8_HANDLER( aeroboto_3000_w )
+WRITE8_MEMBER(aeroboto_state::aeroboto_3000_w)
{
- aeroboto_state *state = space->machine().driver_data<aeroboto_state>();
/* bit 0 selects both flip screen and player1/player2 controls */
- flip_screen_set(space->machine(), data & 0x01);
+ flip_screen_set(machine(), data & 0x01);
/* bit 1 = char bank select */
- if (state->m_charbank != ((data & 0x02) >> 1))
+ if (m_charbank != ((data & 0x02) >> 1))
{
- state->m_bg_tilemap->mark_all_dirty();
- state->m_charbank = (data & 0x02) >> 1;
+ m_bg_tilemap->mark_all_dirty();
+ m_charbank = (data & 0x02) >> 1;
}
/* bit 2 = disable star field? */
- state->m_starsoff = data & 0x4;
+ m_starsoff = data & 0x4;
}
-WRITE8_HANDLER( aeroboto_videoram_w )
+WRITE8_MEMBER(aeroboto_state::aeroboto_videoram_w)
{
- aeroboto_state *state = space->machine().driver_data<aeroboto_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( aeroboto_tilecolor_w )
+WRITE8_MEMBER(aeroboto_state::aeroboto_tilecolor_w)
{
- aeroboto_state *state = space->machine().driver_data<aeroboto_state>();
- if (state->m_tilecolor[offset] != data)
+ if (m_tilecolor[offset] != data)
{
- state->m_tilecolor[offset] = data;
- state->m_bg_tilemap->mark_all_dirty();
+ m_tilecolor[offset] = data;
+ m_bg_tilemap->mark_all_dirty();
}
}
diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c
index aa0097bed37..cb20f933d1f 100644
--- a/src/mame/video/aerofgt.c
+++ b/src/mame/video/aerofgt.c
@@ -189,18 +189,16 @@ VIDEO_START( wbbc97 )
***************************************************************************/
-WRITE16_HANDLER( aerofgt_bg1videoram_w )
+WRITE16_MEMBER(aerofgt_state::aerofgt_bg1videoram_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
- COMBINE_DATA(&state->m_bg1videoram[offset]);
- state->m_bg1_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bg1videoram[offset]);
+ m_bg1_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( aerofgt_bg2videoram_w )
+WRITE16_MEMBER(aerofgt_state::aerofgt_bg2videoram_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
- COMBINE_DATA(&state->m_bg2videoram[offset]);
- state->m_bg2_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bg2videoram[offset]);
+ m_bg2_tilemap->mark_tile_dirty(offset);
}
@@ -214,117 +212,104 @@ static void setbank( running_machine &machine, tilemap_t *tmap, int num, int ban
}
}
-WRITE16_HANDLER( pspikes_gfxbank_w )
+WRITE16_MEMBER(aerofgt_state::pspikes_gfxbank_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
if (ACCESSING_BITS_0_7)
{
- setbank(space->machine(), state->m_bg1_tilemap, 0, (data & 0xf0) >> 4);
- setbank(space->machine(), state->m_bg1_tilemap, 1, data & 0x0f);
+ setbank(machine(), m_bg1_tilemap, 0, (data & 0xf0) >> 4);
+ setbank(machine(), m_bg1_tilemap, 1, data & 0x0f);
}
}
-WRITE16_HANDLER( pspikesb_gfxbank_w )
+WRITE16_MEMBER(aerofgt_state::pspikesb_gfxbank_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
- COMBINE_DATA(&state->m_rasterram[0x200 / 2]);
+ COMBINE_DATA(&m_rasterram[0x200 / 2]);
- setbank(space->machine(), state->m_bg1_tilemap, 0, (data & 0xf000) >> 12);
- setbank(space->machine(), state->m_bg1_tilemap, 1, (data & 0x0f00) >> 8);
+ setbank(machine(), m_bg1_tilemap, 0, (data & 0xf000) >> 12);
+ setbank(machine(), m_bg1_tilemap, 1, (data & 0x0f00) >> 8);
}
-WRITE16_HANDLER( spikes91_lookup_w )
+WRITE16_MEMBER(aerofgt_state::spikes91_lookup_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
- state->m_spikes91_lookup = data & 1;
+ m_spikes91_lookup = data & 1;
}
-WRITE16_HANDLER( karatblz_gfxbank_w )
+WRITE16_MEMBER(aerofgt_state::karatblz_gfxbank_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
if (ACCESSING_BITS_8_15)
{
- setbank(space->machine(), state->m_bg1_tilemap, 0, (data & 0x0100) >> 8);
- setbank(space->machine(), state->m_bg2_tilemap, 1, (data & 0x0800) >> 11);
+ setbank(machine(), m_bg1_tilemap, 0, (data & 0x0100) >> 8);
+ setbank(machine(), m_bg2_tilemap, 1, (data & 0x0800) >> 11);
}
}
-WRITE16_HANDLER( spinlbrk_gfxbank_w )
+WRITE16_MEMBER(aerofgt_state::spinlbrk_gfxbank_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
if (ACCESSING_BITS_0_7)
{
- setbank(space->machine(), state->m_bg1_tilemap, 0, (data & 0x07));
- setbank(space->machine(), state->m_bg2_tilemap, 1, (data & 0x38) >> 3);
+ setbank(machine(), m_bg1_tilemap, 0, (data & 0x07));
+ setbank(machine(), m_bg2_tilemap, 1, (data & 0x38) >> 3);
}
}
-WRITE16_HANDLER( turbofrc_gfxbank_w )
+WRITE16_MEMBER(aerofgt_state::turbofrc_gfxbank_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
- tilemap_t *tmap = (offset == 0) ? state->m_bg1_tilemap : state->m_bg2_tilemap;
+ tilemap_t *tmap = (offset == 0) ? m_bg1_tilemap : m_bg2_tilemap;
- data = COMBINE_DATA(&state->m_bank[offset]);
+ data = COMBINE_DATA(&m_bank[offset]);
- setbank(space->machine(), tmap, 4 * offset + 0, (data >> 0) & 0x0f);
- setbank(space->machine(), tmap, 4 * offset + 1, (data >> 4) & 0x0f);
- setbank(space->machine(), tmap, 4 * offset + 2, (data >> 8) & 0x0f);
- setbank(space->machine(), tmap, 4 * offset + 3, (data >> 12) & 0x0f);
+ setbank(machine(), tmap, 4 * offset + 0, (data >> 0) & 0x0f);
+ setbank(machine(), tmap, 4 * offset + 1, (data >> 4) & 0x0f);
+ setbank(machine(), tmap, 4 * offset + 2, (data >> 8) & 0x0f);
+ setbank(machine(), tmap, 4 * offset + 3, (data >> 12) & 0x0f);
}
-WRITE16_HANDLER( aerofgt_gfxbank_w )
+WRITE16_MEMBER(aerofgt_state::aerofgt_gfxbank_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
- tilemap_t *tmap = (offset < 2) ? state->m_bg1_tilemap : state->m_bg2_tilemap;
+ tilemap_t *tmap = (offset < 2) ? m_bg1_tilemap : m_bg2_tilemap;
- data = COMBINE_DATA(&state->m_bank[offset]);
+ data = COMBINE_DATA(&m_bank[offset]);
- setbank(space->machine(), tmap, 2 * offset + 0, (data >> 8) & 0xff);
- setbank(space->machine(), tmap, 2 * offset + 1, (data >> 0) & 0xff);
+ setbank(machine(), tmap, 2 * offset + 0, (data >> 8) & 0xff);
+ setbank(machine(), tmap, 2 * offset + 1, (data >> 0) & 0xff);
}
-WRITE16_HANDLER( aerofgt_bg1scrollx_w )
+WRITE16_MEMBER(aerofgt_state::aerofgt_bg1scrollx_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
- COMBINE_DATA(&state->m_bg1scrollx);
+ COMBINE_DATA(&m_bg1scrollx);
}
-WRITE16_HANDLER( aerofgt_bg1scrolly_w )
+WRITE16_MEMBER(aerofgt_state::aerofgt_bg1scrolly_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
- COMBINE_DATA(&state->m_bg1scrolly);
+ COMBINE_DATA(&m_bg1scrolly);
}
-WRITE16_HANDLER( aerofgt_bg2scrollx_w )
+WRITE16_MEMBER(aerofgt_state::aerofgt_bg2scrollx_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
- COMBINE_DATA(&state->m_bg2scrollx);
+ COMBINE_DATA(&m_bg2scrollx);
}
-WRITE16_HANDLER( aerofgt_bg2scrolly_w )
+WRITE16_MEMBER(aerofgt_state::aerofgt_bg2scrolly_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
- COMBINE_DATA(&state->m_bg2scrolly);
+ COMBINE_DATA(&m_bg2scrolly);
}
-WRITE16_HANDLER( pspikes_palette_bank_w )
+WRITE16_MEMBER(aerofgt_state::pspikes_palette_bank_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_spritepalettebank = data & 0x03;
- if (state->m_charpalettebank != (data & 0x1c) >> 2)
+ m_spritepalettebank = data & 0x03;
+ if (m_charpalettebank != (data & 0x1c) >> 2)
{
- state->m_charpalettebank = (data & 0x1c) >> 2;
- state->m_bg1_tilemap->mark_all_dirty();
+ m_charpalettebank = (data & 0x1c) >> 2;
+ m_bg1_tilemap->mark_all_dirty();
}
}
}
-WRITE16_HANDLER( wbbc97_bitmap_enable_w )
+WRITE16_MEMBER(aerofgt_state::wbbc97_bitmap_enable_w)
{
- aerofgt_state *state = space->machine().driver_data<aerofgt_state>();
- COMBINE_DATA(&state->m_wbbc97_bitmap_enable);
+ COMBINE_DATA(&m_wbbc97_bitmap_enable);
}
/***************************************************************************
diff --git a/src/mame/video/airbustr.c b/src/mame/video/airbustr.c
index 4185e1bb763..7ce1c9a72e4 100644
--- a/src/mame/video/airbustr.c
+++ b/src/mame/video/airbustr.c
@@ -34,32 +34,28 @@
#include "video/kan_pand.h"
#include "includes/airbustr.h"
-WRITE8_HANDLER( airbustr_videoram_w )
+WRITE8_MEMBER(airbustr_state::airbustr_videoram_w)
{
- airbustr_state *state = space->machine().driver_data<airbustr_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( airbustr_colorram_w )
+WRITE8_MEMBER(airbustr_state::airbustr_colorram_w)
{
- airbustr_state *state = space->machine().driver_data<airbustr_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( airbustr_videoram2_w )
+WRITE8_MEMBER(airbustr_state::airbustr_videoram2_w)
{
- airbustr_state *state = space->machine().driver_data<airbustr_state>();
- state->m_videoram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( airbustr_colorram2_w )
+WRITE8_MEMBER(airbustr_state::airbustr_colorram2_w)
{
- airbustr_state *state = space->machine().driver_data<airbustr_state>();
- state->m_colorram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
/* Scroll Registers
@@ -74,24 +70,23 @@ WRITE8_HANDLER( airbustr_colorram2_w )
Bg Y Bg X Fg Y Fg X <-Scroll High Bits (complemented!)
*/
-WRITE8_HANDLER( airbustr_scrollregs_w )
+WRITE8_MEMBER(airbustr_state::airbustr_scrollregs_w)
{
- airbustr_state *state = space->machine().driver_data<airbustr_state>();
switch (offset) // offset 0 <-> port 4
{
- case 0x00: state->m_fg_scrolly = data; break; // low 8 bits
- case 0x02: state->m_fg_scrollx = data; break;
- case 0x04: state->m_bg_scrolly = data; break;
- case 0x06: state->m_bg_scrollx = data; break;
- case 0x08: state->m_highbits = ~data; break; // complemented high bits
+ case 0x00: m_fg_scrolly = data; break; // low 8 bits
+ case 0x02: m_fg_scrollx = data; break;
+ case 0x04: m_bg_scrolly = data; break;
+ case 0x06: m_bg_scrollx = data; break;
+ case 0x08: m_highbits = ~data; break; // complemented high bits
- default: logerror("CPU #2 - port %02X written with %02X - PC = %04X\n", offset, data, cpu_get_pc(&space->device()));
+ default: logerror("CPU #2 - port %02X written with %02X - PC = %04X\n", offset, data, cpu_get_pc(&space.device()));
}
- state->m_bg_tilemap->set_scrolly(0, ((state->m_highbits << 5) & 0x100) + state->m_bg_scrolly);
- state->m_bg_tilemap->set_scrollx(0, ((state->m_highbits << 6) & 0x100) + state->m_bg_scrollx);
- state->m_fg_tilemap->set_scrolly(0, ((state->m_highbits << 7) & 0x100) + state->m_fg_scrolly);
- state->m_fg_tilemap->set_scrollx(0, ((state->m_highbits << 8) & 0x100) + state->m_fg_scrollx);
+ m_bg_tilemap->set_scrolly(0, ((m_highbits << 5) & 0x100) + m_bg_scrolly);
+ m_bg_tilemap->set_scrollx(0, ((m_highbits << 6) & 0x100) + m_bg_scrollx);
+ m_fg_tilemap->set_scrolly(0, ((m_highbits << 7) & 0x100) + m_fg_scrolly);
+ m_fg_tilemap->set_scrollx(0, ((m_highbits << 8) & 0x100) + m_fg_scrollx);
}
static TILE_GET_INFO( get_fg_tile_info )
diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c
index 42ada0e9711..62e4ba92596 100644
--- a/src/mame/video/alpha68k.c
+++ b/src/mame/video/alpha68k.c
@@ -20,20 +20,19 @@ void alpha68k_V_video_bank_w( running_machine &machine, int bank )
state->m_bank_base = bank & 0xf;
}
-WRITE16_HANDLER( alpha68k_paletteram_w )
+WRITE16_MEMBER(alpha68k_state::alpha68k_paletteram_w)
{
- alpha68k_state *state = space->machine().driver_data<alpha68k_state>();
int newword;
int r, g, b;
- COMBINE_DATA(state->m_paletteram + offset);
- newword = state->m_paletteram[offset];
+ COMBINE_DATA(m_paletteram + offset);
+ newword = m_paletteram[offset];
r = ((newword >> 7) & 0x1e) | ((newword >> 14) & 0x01);
g = ((newword >> 3) & 0x1e) | ((newword >> 13) & 0x01);
b = ((newword << 1) & 0x1e) | ((newword >> 12) & 0x01);
- palette_set_color_rgb(space->machine(), offset, pal5bit(r), pal5bit(g), pal5bit(b));
+ palette_set_color_rgb(machine(), offset, pal5bit(r), pal5bit(g), pal5bit(b));
}
/******************************************************************************/
@@ -49,19 +48,18 @@ static TILE_GET_INFO( get_tile_info )
SET_TILE_INFO(0, tile, color, 0);
}
-WRITE16_HANDLER( alpha68k_videoram_w )
+WRITE16_MEMBER(alpha68k_state::alpha68k_videoram_w)
{
- alpha68k_state *state = space->machine().driver_data<alpha68k_state>();
/* Doh. */
if(ACCESSING_BITS_0_7)
if(ACCESSING_BITS_8_15)
- state->m_videoram[offset] = data;
+ m_videoram[offset] = data;
else
- state->m_videoram[offset] = data & 0xff;
+ m_videoram[offset] = data & 0xff;
else
- state->m_videoram[offset] = (data >> 8) & 0xff;
+ m_videoram[offset] = (data >> 8) & 0xff;
- state->m_fix_tilemap->mark_tile_dirty(offset / 2);
+ m_fix_tilemap->mark_tile_dirty(offset / 2);
}
VIDEO_START( alpha68k )
@@ -169,33 +167,32 @@ SCREEN_UPDATE_IND16( alpha68k_II )
*/
-WRITE16_HANDLER( alpha68k_II_video_bank_w )
+WRITE16_MEMBER(alpha68k_state::alpha68k_II_video_bank_w)
{
- alpha68k_state *state = space->machine().driver_data<alpha68k_state>();
switch (offset)
{
case 0x10: /* Reset */
- state->m_bank_base = state->m_buffer_28 = state->m_buffer_60 = state->m_buffer_68 = 0;
+ m_bank_base = m_buffer_28 = m_buffer_60 = m_buffer_68 = 0;
return;
case 0x14:
- if (state->m_buffer_60) state->m_bank_base=1; else state->m_bank_base=0;
- state->m_buffer_28 = 1;
+ if (m_buffer_60) m_bank_base=1; else m_bank_base=0;
+ m_buffer_28 = 1;
return;
case 0x18:
- if (state->m_buffer_68) {if (state->m_buffer_60) state->m_bank_base = 3; else state->m_bank_base = 2; }
- if (state->m_buffer_28) {if (state->m_buffer_60) state->m_bank_base = 1; else state->m_bank_base = 0; }
+ if (m_buffer_68) {if (m_buffer_60) m_bank_base = 3; else m_bank_base = 2; }
+ if (m_buffer_28) {if (m_buffer_60) m_bank_base = 1; else m_bank_base = 0; }
return;
case 0x30:
- state->m_buffer_28 = state->m_buffer_68 = 0; state->m_bank_base = 1;
- state->m_buffer_60 = 1;
+ m_buffer_28 = m_buffer_68 = 0; m_bank_base = 1;
+ m_buffer_60 = 1;
return;
case 0x34:
- if (state->m_buffer_60) state->m_bank_base = 3; else state->m_bank_base = 2;
- state->m_buffer_68 = 1;
+ if (m_buffer_60) m_bank_base = 3; else m_bank_base = 2;
+ m_buffer_68 = 1;
return;
case 0x38:
- if (state->m_buffer_68) {if (state->m_buffer_60) state->m_bank_base = 7; else state->m_bank_base = 6; }
- if (state->m_buffer_28) {if (state->m_buffer_60) state->m_bank_base = 5; else state->m_bank_base = 4; }
+ if (m_buffer_68) {if (m_buffer_60) m_bank_base = 7; else m_bank_base = 6; }
+ if (m_buffer_28) {if (m_buffer_60) m_bank_base = 5; else m_bank_base = 4; }
return;
case 0x08: /* Graphics flags? Not related to fix chars anyway */
case 0x0c:
@@ -209,7 +206,7 @@ WRITE16_HANDLER( alpha68k_II_video_bank_w )
/******************************************************************************/
-WRITE16_HANDLER( alpha68k_V_video_control_w )
+WRITE16_MEMBER(alpha68k_state::alpha68k_V_video_control_w)
{
switch (offset)
{
diff --git a/src/mame/video/ampoker2.c b/src/mame/video/ampoker2.c
index 6a960863479..2bc7717242a 100644
--- a/src/mame/video/ampoker2.c
+++ b/src/mame/video/ampoker2.c
@@ -111,12 +111,11 @@ PALETTE_INIT( ampoker2 )
}
}
-WRITE8_HANDLER( ampoker2_videoram_w )
+WRITE8_MEMBER(ampoker2_state::ampoker2_videoram_w)
{
- ampoker2_state *state = space->machine().driver_data<ampoker2_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c
index fb1bbca3f01..59ffb09016e 100644
--- a/src/mame/video/amspdwy.c
+++ b/src/mame/video/amspdwy.c
@@ -16,19 +16,17 @@
#include "includes/amspdwy.h"
-WRITE8_HANDLER( amspdwy_paletteram_w )
+WRITE8_MEMBER(amspdwy_state::amspdwy_paletteram_w)
{
- amspdwy_state *state = space->machine().driver_data<amspdwy_state>();
data ^= 0xff;
- state->paletteram_BBGGGRRR_w(*space, offset, data);
+ paletteram_BBGGGRRR_w(space, offset, data);
// paletteram_RRRGGGBB_w(offset, data);
}
-WRITE8_HANDLER( amspdwy_flipscreen_w )
+WRITE8_MEMBER(amspdwy_state::amspdwy_flipscreen_w)
{
- amspdwy_state *state = space->machine().driver_data<amspdwy_state>();
- state->m_flipscreen ^= 1;
- flip_screen_set(space->machine(), state->m_flipscreen);
+ m_flipscreen ^= 1;
+ flip_screen_set(machine(), m_flipscreen);
}
/***************************************************************************
@@ -56,18 +54,16 @@ static TILE_GET_INFO( get_tile_info )
0);
}
-WRITE8_HANDLER( amspdwy_videoram_w )
+WRITE8_MEMBER(amspdwy_state::amspdwy_videoram_w)
{
- amspdwy_state *state = space->machine().driver_data<amspdwy_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( amspdwy_colorram_w )
+WRITE8_MEMBER(amspdwy_state::amspdwy_colorram_w)
{
- amspdwy_state *state = space->machine().driver_data<amspdwy_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c
index 616d30f1f62..2387a7ce021 100644
--- a/src/mame/video/angelkds.c
+++ b/src/mame/video/angelkds.c
@@ -23,22 +23,20 @@ static TILE_GET_INFO( get_tx_tile_info )
SET_TILE_INFO(0, tileno, 0, 0);
}
-WRITE8_HANDLER( angelkds_txvideoram_w )
+WRITE8_MEMBER(angelkds_state::angelkds_txvideoram_w)
{
- angelkds_state *state = space->machine().driver_data<angelkds_state>();
- state->m_txvideoram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ m_txvideoram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( angelkds_txbank_write )
+WRITE8_MEMBER(angelkds_state::angelkds_txbank_write)
{
- angelkds_state *state = space->machine().driver_data<angelkds_state>();
- if (state->m_txbank != data)
+ if (m_txbank != data)
{
- state->m_txbank = data;
- state->m_tx_tilemap->mark_all_dirty();
+ m_txbank = data;
+ m_tx_tilemap->mark_all_dirty();
}
}
@@ -57,30 +55,27 @@ static TILE_GET_INFO( get_bgtop_tile_info )
SET_TILE_INFO(1, tileno, 0, 0);
}
-WRITE8_HANDLER( angelkds_bgtopvideoram_w )
+WRITE8_MEMBER(angelkds_state::angelkds_bgtopvideoram_w)
{
- angelkds_state *state = space->machine().driver_data<angelkds_state>();
- state->m_bgtopvideoram[offset] = data;
- state->m_bgtop_tilemap->mark_tile_dirty(offset);
+ m_bgtopvideoram[offset] = data;
+ m_bgtop_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( angelkds_bgtopbank_write )
+WRITE8_MEMBER(angelkds_state::angelkds_bgtopbank_write)
{
- angelkds_state *state = space->machine().driver_data<angelkds_state>();
- if (state->m_bgtopbank != data)
+ if (m_bgtopbank != data)
{
- state->m_bgtopbank = data;
- state->m_bgtop_tilemap->mark_all_dirty();
+ m_bgtopbank = data;
+ m_bgtop_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( angelkds_bgtopscroll_write )
+WRITE8_MEMBER(angelkds_state::angelkds_bgtopscroll_write)
{
- angelkds_state *state = space->machine().driver_data<angelkds_state>();
- state->m_bgtop_tilemap->set_scrollx(0, data);
+ m_bgtop_tilemap->set_scrollx(0, data);
}
/*** Bottom Half Background Tilemap
@@ -98,39 +93,35 @@ static TILE_GET_INFO( get_bgbot_tile_info )
SET_TILE_INFO(2, tileno, 1, 0);
}
-WRITE8_HANDLER( angelkds_bgbotvideoram_w )
+WRITE8_MEMBER(angelkds_state::angelkds_bgbotvideoram_w)
{
- angelkds_state *state = space->machine().driver_data<angelkds_state>();
- state->m_bgbotvideoram[offset] = data;
- state->m_bgbot_tilemap->mark_tile_dirty(offset);
+ m_bgbotvideoram[offset] = data;
+ m_bgbot_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( angelkds_bgbotbank_write )
+WRITE8_MEMBER(angelkds_state::angelkds_bgbotbank_write)
{
- angelkds_state *state = space->machine().driver_data<angelkds_state>();
- if (state->m_bgbotbank != data)
+ if (m_bgbotbank != data)
{
- state->m_bgbotbank = data;
- state->m_bgbot_tilemap->mark_all_dirty();
+ m_bgbotbank = data;
+ m_bgbot_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( angelkds_bgbotscroll_write )
+WRITE8_MEMBER(angelkds_state::angelkds_bgbotscroll_write)
{
- angelkds_state *state = space->machine().driver_data<angelkds_state>();
- state->m_bgbot_tilemap->set_scrollx(0, data);
+ m_bgbot_tilemap->set_scrollx(0, data);
}
-WRITE8_HANDLER( angelkds_layer_ctrl_write )
+WRITE8_MEMBER(angelkds_state::angelkds_layer_ctrl_write)
{
- angelkds_state *state = space->machine().driver_data<angelkds_state>();
- state->m_layer_ctrl = data;
+ m_layer_ctrl = data;
}
/*** Sprites
@@ -241,15 +232,14 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
*/
-WRITE8_HANDLER( angelkds_paletteram_w )
+WRITE8_MEMBER(angelkds_state::angelkds_paletteram_w)
{
- angelkds_state *state = space->machine().driver_data<angelkds_state>();
int no;
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
no = offset & 0xff;
- palette_set_color_rgb(space->machine(), no, pal4bit(state->m_paletteram[no]), pal4bit(state->m_paletteram[no]>>4), pal4bit(state->m_paletteram[no + 0x100]));
+ palette_set_color_rgb(machine(), no, pal4bit(m_paletteram[no]), pal4bit(m_paletteram[no]>>4), pal4bit(m_paletteram[no + 0x100]));
}
/*** Video Start & Update
diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c
index fc4364d029b..2e2638888b3 100644
--- a/src/mame/video/appoooh.c
+++ b/src/mame/video/appoooh.c
@@ -145,49 +145,43 @@ VIDEO_START( appoooh )
state->save_item(NAME(state->m_priority));
}
-WRITE8_HANDLER( appoooh_scroll_w )
+WRITE8_MEMBER(appoooh_state::appoooh_scroll_w)
{
- appoooh_state *state = space->machine().driver_data<appoooh_state>();
- state->m_scroll_x = data;
+ m_scroll_x = data;
}
-WRITE8_HANDLER( appoooh_fg_videoram_w )
+WRITE8_MEMBER(appoooh_state::appoooh_fg_videoram_w)
{
- appoooh_state *state = space->machine().driver_data<appoooh_state>();
- state->m_fg_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( appoooh_fg_colorram_w )
+WRITE8_MEMBER(appoooh_state::appoooh_fg_colorram_w)
{
- appoooh_state *state = space->machine().driver_data<appoooh_state>();
- state->m_fg_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( appoooh_bg_videoram_w )
+WRITE8_MEMBER(appoooh_state::appoooh_bg_videoram_w)
{
- appoooh_state *state = space->machine().driver_data<appoooh_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( appoooh_bg_colorram_w )
+WRITE8_MEMBER(appoooh_state::appoooh_bg_colorram_w)
{
- appoooh_state *state = space->machine().driver_data<appoooh_state>();
- state->m_bg_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( appoooh_out_w )
+WRITE8_MEMBER(appoooh_state::appoooh_out_w)
{
- appoooh_state *state = space->machine().driver_data<appoooh_state>();
/* bit 0 controls NMI */
- state->m_nmi_mask = data & 1;
+ m_nmi_mask = data & 1;
/* bit 1 flip screen */
- flip_screen_set(space->machine(), data & 0x02);
+ flip_screen_set(machine(), data & 0x02);
/* bits 2-3 unknown */
@@ -195,13 +189,13 @@ WRITE8_HANDLER( appoooh_out_w )
/* TODO: understand how this works, currently the only thing I do is draw */
/* the front layer behind sprites when priority == 0, and invert the sprite */
/* order when priority == 1 */
- state->m_priority = (data & 0x30) >> 4;
+ m_priority = (data & 0x30) >> 4;
/* bit 6 ROM bank select */
{
- UINT8 *RAM = space->machine().region("maincpu")->base();
+ UINT8 *RAM = machine().region("maincpu")->base();
- memory_set_bankptr(space->machine(), "bank1",&RAM[data&0x40 ? 0x10000 : 0x0a000]);
+ memory_set_bankptr(machine(), "bank1",&RAM[data&0x40 ? 0x10000 : 0x0a000]);
}
/* bit 7 unknown (used) */
diff --git a/src/mame/video/aquarium.c b/src/mame/video/aquarium.c
index ae5b0dbfa2d..4a53d43b716 100644
--- a/src/mame/video/aquarium.c
+++ b/src/mame/video/aquarium.c
@@ -96,11 +96,10 @@ static TILE_GET_INFO( get_aquarium_txt_tile_info )
SET_TILE_INFO(2, tileno, colour, 0);
}
-WRITE16_HANDLER( aquarium_txt_videoram_w )
+WRITE16_MEMBER(aquarium_state::aquarium_txt_videoram_w)
{
- aquarium_state *state = space->machine().driver_data<aquarium_state>();
- state->m_txt_videoram[offset] = data;
- state->m_txt_tilemap->mark_tile_dirty(offset);
+ m_txt_videoram[offset] = data;
+ m_txt_tilemap->mark_tile_dirty(offset);
}
/* MID Layer */
@@ -118,11 +117,10 @@ static TILE_GET_INFO( get_aquarium_mid_tile_info )
tileinfo.category = (state->m_mid_videoram[tile_index * 2 + 1] & 0x20) >> 5;
}
-WRITE16_HANDLER( aquarium_mid_videoram_w )
+WRITE16_MEMBER(aquarium_state::aquarium_mid_videoram_w)
{
- aquarium_state *state = space->machine().driver_data<aquarium_state>();
- state->m_mid_videoram[offset] = data;
- state->m_mid_tilemap->mark_tile_dirty(offset / 2);
+ m_mid_videoram[offset] = data;
+ m_mid_tilemap->mark_tile_dirty(offset / 2);
}
/* BAK Layer */
@@ -140,11 +138,10 @@ static TILE_GET_INFO( get_aquarium_bak_tile_info )
tileinfo.category = (state->m_bak_videoram[tile_index * 2 + 1] & 0x20) >> 5;
}
-WRITE16_HANDLER( aquarium_bak_videoram_w )
+WRITE16_MEMBER(aquarium_state::aquarium_bak_videoram_w)
{
- aquarium_state *state = space->machine().driver_data<aquarium_state>();
- state->m_bak_videoram[offset] = data;
- state->m_bak_tilemap->mark_tile_dirty(offset / 2);
+ m_bak_videoram[offset] = data;
+ m_bak_tilemap->mark_tile_dirty(offset / 2);
}
VIDEO_START(aquarium)
diff --git a/src/mame/video/arabian.c b/src/mame/video/arabian.c
index 8b739b81860..8e8589b0d20 100644
--- a/src/mame/video/arabian.c
+++ b/src/mame/video/arabian.c
@@ -267,26 +267,25 @@ static void blit_area( running_machine &machine, UINT8 plane, UINT16 src, UINT8
*
*************************************/
-WRITE8_HANDLER( arabian_blitter_w )
+WRITE8_MEMBER(arabian_state::arabian_blitter_w)
{
- arabian_state *state = space->machine().driver_data<arabian_state>();
/* write the data */
- state->m_blitter[offset] = data;
+ m_blitter[offset] = data;
/* watch for a write to offset 6 -- that triggers the blit */
if (offset == 6)
{
/* extract the data */
- int plane = state->m_blitter[0];
- int src = state->m_blitter[1] | (state->m_blitter[2] << 8);
- int x = state->m_blitter[4] << 2;
- int y = state->m_blitter[3];
- int sx = state->m_blitter[6];
- int sy = state->m_blitter[5];
+ int plane = m_blitter[0];
+ int src = m_blitter[1] | (m_blitter[2] << 8);
+ int x = m_blitter[4] << 2;
+ int y = m_blitter[3];
+ int sx = m_blitter[6];
+ int sy = m_blitter[5];
/* blit it */
- blit_area(space->machine(), plane, src, x, y, sx, sy);
+ blit_area(machine(), plane, src, x, y, sx, sy);
}
}
@@ -298,9 +297,8 @@ WRITE8_HANDLER( arabian_blitter_w )
*
*************************************/
-WRITE8_HANDLER( arabian_videoram_w )
+WRITE8_MEMBER(arabian_state::arabian_videoram_w)
{
- arabian_state *state = space->machine().driver_data<arabian_state>();
UINT8 *base;
UINT8 x, y;
@@ -309,7 +307,7 @@ WRITE8_HANDLER( arabian_videoram_w )
y = offset & 0xff;
/* get a pointer to the pixels */
- base = &state->m_main_bitmap[y * BITMAP_WIDTH + x];
+ base = &m_main_bitmap[y * BITMAP_WIDTH + x];
/* the data is written as 4 2-bit values, as follows:
@@ -324,7 +322,7 @@ WRITE8_HANDLER( arabian_videoram_w )
*/
/* enable writes to AZ/AR */
- if (state->m_blitter[0] & 0x08)
+ if (m_blitter[0] & 0x08)
{
base[0] = (base[0] & ~0x03) | ((data & 0x10) >> 3) | ((data & 0x01) >> 0);
base[1] = (base[1] & ~0x03) | ((data & 0x20) >> 4) | ((data & 0x02) >> 1);
@@ -333,7 +331,7 @@ WRITE8_HANDLER( arabian_videoram_w )
}
/* enable writes to AG/AB */
- if (state->m_blitter[0] & 0x04)
+ if (m_blitter[0] & 0x04)
{
base[0] = (base[0] & ~0x0c) | ((data & 0x10) >> 1) | ((data & 0x01) << 2);
base[1] = (base[1] & ~0x0c) | ((data & 0x20) >> 2) | ((data & 0x02) << 1);
@@ -342,7 +340,7 @@ WRITE8_HANDLER( arabian_videoram_w )
}
/* enable writes to BZ/BR */
- if (state->m_blitter[0] & 0x02)
+ if (m_blitter[0] & 0x02)
{
base[0] = (base[0] & ~0x30) | ((data & 0x10) << 1) | ((data & 0x01) << 4);
base[1] = (base[1] & ~0x30) | ((data & 0x20) << 0) | ((data & 0x02) << 3);
@@ -351,7 +349,7 @@ WRITE8_HANDLER( arabian_videoram_w )
}
/* enable writes to BG/BB */
- if (state->m_blitter[0] & 0x01)
+ if (m_blitter[0] & 0x01)
{
base[0] = (base[0] & ~0xc0) | ((data & 0x10) << 3) | ((data & 0x01) << 6);
base[1] = (base[1] & ~0xc0) | ((data & 0x20) << 2) | ((data & 0x02) << 5);
diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c
index 8daa5187615..020a9783331 100644
--- a/src/mame/video/argus.c
+++ b/src/mame/video/argus.c
@@ -439,127 +439,115 @@ static void argus_change_bg_palette(running_machine &machine, int color, int lo_
Memory handler
***************************************************************************/
-WRITE8_HANDLER( valtric_mosaic_w )
+WRITE8_MEMBER(argus_state::valtric_mosaic_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- state->m_valtric_mosaic = data;
+ m_valtric_mosaic = data;
}
-READ8_HANDLER( argus_txram_r )
+READ8_MEMBER(argus_state::argus_txram_r)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- return state->m_txram[offset];
+ return m_txram[offset];
}
-WRITE8_HANDLER( argus_txram_w )
+WRITE8_MEMBER(argus_state::argus_txram_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- state->m_txram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset >> 1);
+ m_txram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset >> 1);
}
-READ8_HANDLER( argus_bg1ram_r )
+READ8_MEMBER(argus_state::argus_bg1ram_r)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- return state->m_bg1ram[offset];
+ return m_bg1ram[offset];
}
-WRITE8_HANDLER( argus_bg1ram_w )
+WRITE8_MEMBER(argus_state::argus_bg1ram_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- state->m_bg1ram[offset] = data;
- state->m_bg1_tilemap->mark_tile_dirty(offset >> 1);
+ m_bg1ram[offset] = data;
+ m_bg1_tilemap->mark_tile_dirty(offset >> 1);
}
-WRITE8_HANDLER( argus_bg_status_w )
+WRITE8_MEMBER(argus_state::argus_bg_status_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- if (state->m_bg_status != data)
+ if (m_bg_status != data)
{
- state->m_bg_status = data;
+ m_bg_status = data;
/* Gray / purple scale */
- if (state->m_bg_status & 2)
+ if (m_bg_status & 2)
{
int offs;
for (offs = 0x400; offs < 0x500; offs++)
{
- argus_change_bg_palette(space->machine(), (offs - 0x400) + 0x080, offs, offs + 0x400);
+ argus_change_bg_palette(machine(), (offs - 0x400) + 0x080, offs, offs + 0x400);
}
}
}
}
-WRITE8_HANDLER( valtric_bg_status_w )
+WRITE8_MEMBER(argus_state::valtric_bg_status_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- if (state->m_bg_status != data)
+ if (m_bg_status != data)
{
- state->m_bg_status = data;
+ m_bg_status = data;
/* Gray / purple scale */
- if (state->m_bg_status & 2)
+ if (m_bg_status & 2)
{
int offs;
for (offs = 0x400; offs < 0x600; offs += 2)
{
- argus_change_bg_palette(space->machine(), ((offs - 0x400) >> 1) + 0x100, offs & ~1, offs | 1);
+ argus_change_bg_palette(machine(), ((offs - 0x400) >> 1) + 0x100, offs & ~1, offs | 1);
}
}
}
}
-WRITE8_HANDLER( butasan_bg0_status_w )
+WRITE8_MEMBER(argus_state::butasan_bg0_status_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- state->m_bg_status = data;
+ m_bg_status = data;
}
-WRITE8_HANDLER( butasan_bg1_status_w )
+WRITE8_MEMBER(argus_state::butasan_bg1_status_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- if (state->m_butasan_bg1_status != data)
+ if (m_butasan_bg1_status != data)
{
- state->m_butasan_bg1_status = data;
+ m_butasan_bg1_status = data;
/* Bank changed */
- state->m_bg1_tilemap->mark_all_dirty();
+ m_bg1_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( argus_flipscreen_w )
+WRITE8_MEMBER(argus_state::argus_flipscreen_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- state->m_flipscreen = data & 0x80;
+ m_flipscreen = data & 0x80;
}
-READ8_HANDLER( argus_paletteram_r )
+READ8_MEMBER(argus_state::argus_paletteram_r)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- return state->m_paletteram[offset];
+ return m_paletteram[offset];
}
-WRITE8_HANDLER( argus_paletteram_w )
+WRITE8_MEMBER(argus_state::argus_paletteram_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
int offs;
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
if (offset <= 0x0ff) /* sprite color */
{
offset &= 0x07f;
- argus_change_palette(space->machine(), offset, offset, offset + 0x080);
+ argus_change_palette(machine(), offset, offset, offset + 0x080);
if (offset == 0x07f || offset == 0x0ff)
{
- state->m_palette_intensity = state->m_paletteram[0x0ff] | (state->m_paletteram[0x07f] << 8);
+ m_palette_intensity = m_paletteram[0x0ff] | (m_paletteram[0x07f] << 8);
for (offs = 0x400; offs < 0x500; offs++)
- argus_change_bg_palette(space->machine(), (offs & 0xff) + 0x080, offs, offs + 0x400);
+ argus_change_bg_palette(machine(), (offs & 0xff) + 0x080, offs, offs + 0x400);
}
}
else if ((offset >= 0x400 && offset <= 0x4ff) ||
@@ -568,7 +556,7 @@ WRITE8_HANDLER( argus_paletteram_w )
offs = offset & 0xff;
offset = offs | 0x400;
- argus_change_bg_palette(space->machine(), offs + 0x080, offset, offset + 0x400);
+ argus_change_bg_palette(machine(), offs + 0x080, offset, offset + 0x400);
}
else if ((offset >= 0x500 && offset <= 0x5ff) ||
(offset >= 0x900 && offset <= 0x9ff)) /* BG1 color */
@@ -576,7 +564,7 @@ WRITE8_HANDLER( argus_paletteram_w )
offs = offset & 0xff;
offset = offs | 0x500;
- argus_change_palette(space->machine(), offs + 0x180, offset, offset + 0x400);
+ argus_change_palette(machine(), offs + 0x180, offset, offset + 0x400);
}
else if ((offset >= 0x700 && offset <= 0x7ff) ||
(offset >= 0xb00 && offset <= 0xbff)) /* text color */
@@ -584,139 +572,130 @@ WRITE8_HANDLER( argus_paletteram_w )
offs = offset & 0xff;
offset = offs | 0x700;
- argus_change_palette(space->machine(), offs + 0x280, offset, offset + 0x400);
+ argus_change_palette(machine(), offs + 0x280, offset, offset + 0x400);
}
}
-WRITE8_HANDLER( valtric_paletteram_w )
+WRITE8_MEMBER(argus_state::valtric_paletteram_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
if (offset <= 0x1ff) /* Sprite color */
{
- argus_change_palette(space->machine(), offset >> 1, offset & ~1, offset | 1);
+ argus_change_palette(machine(), offset >> 1, offset & ~1, offset | 1);
if (offset == 0x1fe || offset == 0x1ff)
{
int offs;
- state->m_palette_intensity = state->m_paletteram[0x1ff] | (state->m_paletteram[0x1fe] << 8);
+ m_palette_intensity = m_paletteram[0x1ff] | (m_paletteram[0x1fe] << 8);
for (offs = 0x400; offs < 0x600; offs += 2)
- argus_change_bg_palette(space->machine(), ((offs & 0x1ff) >> 1) + 0x100, offs & ~1, offs | 1);
+ argus_change_bg_palette(machine(), ((offs & 0x1ff) >> 1) + 0x100, offs & ~1, offs | 1);
}
}
else if (offset >= 0x400 && offset <= 0x5ff) /* BG color */
{
- argus_change_bg_palette(space->machine(), ((offset & 0x1ff) >> 1) + 0x100, offset & ~1, offset | 1);
+ argus_change_bg_palette(machine(), ((offset & 0x1ff) >> 1) + 0x100, offset & ~1, offset | 1);
}
else if (offset >= 0x600 && offset <= 0x7ff) /* Text color */
{
- argus_change_palette(space->machine(), ((offset & 0x1ff) >> 1) + 0x200, offset & ~1, offset | 1);
+ argus_change_palette(machine(), ((offset & 0x1ff) >> 1) + 0x200, offset & ~1, offset | 1);
}
}
-WRITE8_HANDLER( butasan_paletteram_w )
+WRITE8_MEMBER(argus_state::butasan_paletteram_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
if (offset <= 0x1ff) /* BG0 color */
{
- argus_change_palette(space->machine(), (offset >> 1) + 0x100, offset & ~1, offset | 1);
+ argus_change_palette(machine(), (offset >> 1) + 0x100, offset & ~1, offset | 1);
}
else if (offset <= 0x23f) /* BG1 color */
{
- argus_change_palette(space->machine(), ((offset & 0x3f) >> 1) + 0x0c0, offset & ~1, offset | 1);
+ argus_change_palette(machine(), ((offset & 0x3f) >> 1) + 0x0c0, offset & ~1, offset | 1);
}
else if (offset >= 0x400 && offset <= 0x47f) /* Sprite color */
{ /* 16 colors */
- argus_change_palette(space->machine(), (offset & 0x7f) >> 1, offset & ~1, offset | 1);
+ argus_change_palette(machine(), (offset & 0x7f) >> 1, offset & ~1, offset | 1);
}
else if (offset >= 0x480 && offset <= 0x4ff) /* Sprite color */
{ /* 8 colors */
int offs = (offset & 0x070) | ((offset & 0x00f) >> 1);
- argus_change_palette(space->machine(), offs + 0x040, offset & ~1, offset | 1);
- argus_change_palette(space->machine(), offs + 0x048, offset & ~1, offset | 1);
+ argus_change_palette(machine(), offs + 0x040, offset & ~1, offset | 1);
+ argus_change_palette(machine(), offs + 0x048, offset & ~1, offset | 1);
}
else if (offset >= 0x600 && offset <= 0x7ff) /* Text color */
{
- argus_change_palette(space->machine(), ((offset & 0x1ff) >> 1) + 0x200, offset & ~1, offset | 1);
+ argus_change_palette(machine(), ((offset & 0x1ff) >> 1) + 0x200, offset & ~1, offset | 1);
}
else if (offset >= 0x240 && offset <= 0x25f) // dummy
- argus_change_palette(space->machine(), ((offset & 0x1f) >> 1) + 0xe0, offset & ~1, offset | 1);
+ argus_change_palette(machine(), ((offset & 0x1f) >> 1) + 0xe0, offset & ~1, offset | 1);
else if (offset >= 0x500 && offset <= 0x51f) // dummy
- argus_change_palette(space->machine(), ((offset & 0x1f) >> 1) + 0xf0, offset & ~1, offset | 1);
+ argus_change_palette(machine(), ((offset & 0x1f) >> 1) + 0xf0, offset & ~1, offset | 1);
}
-READ8_HANDLER( butasan_bg1ram_r )
+READ8_MEMBER(argus_state::butasan_bg1ram_r)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- return state->m_butasan_bg1ram[offset];
+ return m_butasan_bg1ram[offset];
}
-WRITE8_HANDLER( butasan_bg1ram_w )
+WRITE8_MEMBER(argus_state::butasan_bg1ram_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
int idx;
- state->m_butasan_bg1ram[offset] = data;
+ m_butasan_bg1ram[offset] = data;
idx = (offset & 0x00f) | ((offset & 0x200) >> 5) | ((offset & 0x1f0) << 1);
idx ^= 0x0f0;
- state->m_bg1_tilemap->mark_tile_dirty(idx);
+ m_bg1_tilemap->mark_tile_dirty(idx);
}
-WRITE8_HANDLER( butasan_pageselect_w )
+WRITE8_MEMBER(argus_state::butasan_pageselect_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- state->m_butasan_page_latch = data & 1;
+ m_butasan_page_latch = data & 1;
}
-READ8_HANDLER( butasan_pagedram_r )
+READ8_MEMBER(argus_state::butasan_pagedram_r)
{
- argus_state *state = space->machine().driver_data<argus_state>();
if (offset <= 0x07ff)
- return state->m_butasan_pagedram[state->m_butasan_page_latch][offset];
+ return m_butasan_pagedram[m_butasan_page_latch][offset];
else
- return state->m_butasan_pagedram[0][offset];
+ return m_butasan_pagedram[0][offset];
}
-WRITE8_HANDLER( butasan_pagedram_w )
+WRITE8_MEMBER(argus_state::butasan_pagedram_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- state->m_butasan_pagedram[state->m_butasan_page_latch][offset] = data;
+ m_butasan_pagedram[m_butasan_page_latch][offset] = data;
- if (!state->m_butasan_page_latch)
+ if (!m_butasan_page_latch)
{
if (offset <= 0x07ff)
{
int idx;
idx = ((offset & 0x01e) >> 1) | ((offset & 0x400) >> 6) | (offset & 0x3e0);
idx ^= 0x1e0;
- state->m_bg0_tilemap->mark_tile_dirty(idx);
+ m_bg0_tilemap->mark_tile_dirty(idx);
}
}
else
{
if (offset <= 0x07ff)
- state->m_tx_tilemap->mark_tile_dirty((offset ^ 0x7c0) >> 1);
+ m_tx_tilemap->mark_tile_dirty((offset ^ 0x7c0) >> 1);
}
}
-WRITE8_HANDLER( valtric_unknown_w )
+WRITE8_MEMBER(argus_state::valtric_unknown_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- state->m_valtric_unknown = data;
+ m_valtric_unknown = data;
}
-WRITE8_HANDLER( butasan_unknown_w )
+WRITE8_MEMBER(argus_state::butasan_unknown_w)
{
- argus_state *state = space->machine().driver_data<argus_state>();
- state->m_butasan_unknown = data;
+ m_butasan_unknown = data;
}
diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c
index cdc536ca563..09ab2e9d05a 100644
--- a/src/mame/video/arkanoid.c
+++ b/src/mame/video/arkanoid.c
@@ -10,37 +10,35 @@
#include "includes/arkanoid.h"
-WRITE8_HANDLER( arkanoid_videoram_w )
+WRITE8_MEMBER(arkanoid_state::arkanoid_videoram_w)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( arkanoid_d008_w )
+WRITE8_MEMBER(arkanoid_state::arkanoid_d008_w)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
int bank;
/* bits 0 and 1 flip X and Y, I don't know which is which */
- if (flip_screen_x_get(space->machine()) != (data & 0x01))
+ if (flip_screen_x_get(machine()) != (data & 0x01))
{
- flip_screen_x_set(space->machine(), data & 0x01);
- state->m_bg_tilemap->mark_all_dirty();
+ flip_screen_x_set(machine(), data & 0x01);
+ m_bg_tilemap->mark_all_dirty();
}
- if (flip_screen_y_get(space->machine()) != (data & 0x02))
+ if (flip_screen_y_get(machine()) != (data & 0x02))
{
- flip_screen_y_set(space->machine(), data & 0x02);
- state->m_bg_tilemap->mark_all_dirty();
+ flip_screen_y_set(machine(), data & 0x02);
+ m_bg_tilemap->mark_all_dirty();
}
/* bit 2 selects the input paddle */
- state->m_paddle_select = data & 0x04;
+ m_paddle_select = data & 0x04;
/* bit 3 is coin lockout (but not the service coin) */
- coin_lockout_w(space->machine(), 0, !(data & 0x08));
- coin_lockout_w(space->machine(), 1, !(data & 0x08));
+ coin_lockout_w(machine(), 0, !(data & 0x08));
+ coin_lockout_w(machine(), 1, !(data & 0x08));
/* bit 4 is unknown */
@@ -48,18 +46,18 @@ WRITE8_HANDLER( arkanoid_d008_w )
/* so I don't know which is which. */
bank = (data & 0x20) >> 5;
- if (state->m_gfxbank != bank)
+ if (m_gfxbank != bank)
{
- state->m_gfxbank = bank;
- state->m_bg_tilemap->mark_all_dirty();
+ m_gfxbank = bank;
+ m_bg_tilemap->mark_all_dirty();
}
bank = (data & 0x40) >> 6;
- if (state->m_palettebank != bank)
+ if (m_palettebank != bank)
{
- state->m_palettebank = bank;
- state->m_bg_tilemap->mark_all_dirty();
+ m_palettebank = bank;
+ m_bg_tilemap->mark_all_dirty();
}
/* BM: bit 7 is suspected to be MCU reset, the evidence for this is that
@@ -68,31 +66,30 @@ WRITE8_HANDLER( arkanoid_d008_w )
leaving the tilt screen (as the MCU is now out of sync with main CPU
which resets itself). This bit is the likely candidate as it is flipped
early in bootup just prior to accessing the MCU for the first time. */
- if (state->m_mcu != NULL) // Bootlegs don't have the MCU but still set this bit
- device_set_input_line(state->m_mcu, INPUT_LINE_RESET, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE);
+ if (m_mcu != NULL) // Bootlegs don't have the MCU but still set this bit
+ device_set_input_line(m_mcu, INPUT_LINE_RESET, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE);
}
/* different hook-up, everything except for bits 0-1 and 7 aren't tested afaik. */
-WRITE8_HANDLER( tetrsark_d008_w )
+WRITE8_MEMBER(arkanoid_state::tetrsark_d008_w)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
int bank;
/* bits 0 and 1 flip X and Y, I don't know which is which */
- if (flip_screen_x_get(space->machine()) != (data & 0x01))
+ if (flip_screen_x_get(machine()) != (data & 0x01))
{
- flip_screen_x_set(space->machine(), data & 0x01);
- state->m_bg_tilemap->mark_all_dirty();
+ flip_screen_x_set(machine(), data & 0x01);
+ m_bg_tilemap->mark_all_dirty();
}
- if (flip_screen_y_get(space->machine()) != (data & 0x02))
+ if (flip_screen_y_get(machine()) != (data & 0x02))
{
- flip_screen_y_set(space->machine(), data & 0x02);
- state->m_bg_tilemap->mark_all_dirty();
+ flip_screen_y_set(machine(), data & 0x02);
+ m_bg_tilemap->mark_all_dirty();
}
/* bit 2 selects the input paddle? */
- state->m_paddle_select = data & 0x04;
+ m_paddle_select = data & 0x04;
/* bit 3-4 is unknown? */
@@ -100,54 +97,53 @@ WRITE8_HANDLER( tetrsark_d008_w )
/* so I don't know which is which.? */
bank = (data & 0x20) >> 5;
- if (state->m_gfxbank != bank)
+ if (m_gfxbank != bank)
{
- state->m_gfxbank = bank;
- state->m_bg_tilemap->mark_all_dirty();
+ m_gfxbank = bank;
+ m_bg_tilemap->mark_all_dirty();
}
bank = (data & 0x40) >> 6;
- if (state->m_palettebank != bank)
+ if (m_palettebank != bank)
{
- state->m_palettebank = bank;
- state->m_bg_tilemap->mark_all_dirty();
+ m_palettebank = bank;
+ m_bg_tilemap->mark_all_dirty();
}
/* bit 7 is coin lockout (but not the service coin) */
- coin_lockout_w(space->machine(), 0, !(data & 0x80));
- coin_lockout_w(space->machine(), 1, !(data & 0x80));
+ coin_lockout_w(machine(), 0, !(data & 0x80));
+ coin_lockout_w(machine(), 1, !(data & 0x80));
}
-WRITE8_HANDLER( hexa_d008_w )
+WRITE8_MEMBER(arkanoid_state::hexa_d008_w)
{
- arkanoid_state *state = space->machine().driver_data<arkanoid_state>();
/* bit 0 = flipx (or y?) */
- if (flip_screen_x_get(space->machine()) != (data & 0x01))
+ if (flip_screen_x_get(machine()) != (data & 0x01))
{
- flip_screen_x_set(space->machine(), data & 0x01);
- state->m_bg_tilemap->mark_all_dirty();
+ flip_screen_x_set(machine(), data & 0x01);
+ m_bg_tilemap->mark_all_dirty();
}
/* bit 1 = flipy (or x?) */
- if (flip_screen_y_get(space->machine()) != (data & 0x02))
+ if (flip_screen_y_get(machine()) != (data & 0x02))
{
- flip_screen_y_set(space->machine(), data & 0x02);
- state->m_bg_tilemap->mark_all_dirty();
+ flip_screen_y_set(machine(), data & 0x02);
+ m_bg_tilemap->mark_all_dirty();
}
/* bit 2 - 3 unknown */
/* bit 4 could be the ROM bank selector for 8000-bfff (not sure) */
- memory_set_bank(space->machine(), "bank1", ((data & 0x10) >> 4));
+ memory_set_bank(machine(), "bank1", ((data & 0x10) >> 4));
/* bit 5 = gfx bank */
- if (state->m_gfxbank != ((data & 0x20) >> 5))
+ if (m_gfxbank != ((data & 0x20) >> 5))
{
- state->m_gfxbank = (data & 0x20) >> 5;
- state->m_bg_tilemap->mark_all_dirty();
+ m_gfxbank = (data & 0x20) >> 5;
+ m_bg_tilemap->mark_all_dirty();
}
/* bit 6 - 7 unknown */
diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c
index c6ba2a3b9ad..c6d4db5ba42 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -167,107 +167,94 @@ VIDEO_START( armedf )
***************************************************************************/
-READ8_HANDLER( nb1414m4_text_videoram_r )
+READ8_MEMBER(armedf_state::nb1414m4_text_videoram_r)
{
- armedf_state *state = space->machine().driver_data<armedf_state>();
- return state->m_text_videoram[offset];
+ return m_text_videoram[offset];
}
-WRITE8_HANDLER( nb1414m4_text_videoram_w )
+WRITE8_MEMBER(armedf_state::nb1414m4_text_videoram_w)
{
- armedf_state *state = space->machine().driver_data<armedf_state>();
- state->m_text_videoram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_text_videoram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-READ8_HANDLER( armedf_text_videoram_r )
+READ8_MEMBER(armedf_state::armedf_text_videoram_r)
{
- armedf_state *state = space->machine().driver_data<armedf_state>();
- return state->m_text_videoram[offset];
+ return m_text_videoram[offset];
}
-WRITE8_HANDLER( armedf_text_videoram_w )
+WRITE8_MEMBER(armedf_state::armedf_text_videoram_w)
{
- armedf_state *state = space->machine().driver_data<armedf_state>();
- state->m_text_videoram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_text_videoram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-WRITE16_HANDLER( armedf_fg_videoram_w )
+WRITE16_MEMBER(armedf_state::armedf_fg_videoram_w)
{
- armedf_state *state = space->machine().driver_data<armedf_state>();
- COMBINE_DATA(&state->m_fg_videoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_fg_videoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( armedf_bg_videoram_w )
+WRITE16_MEMBER(armedf_state::armedf_bg_videoram_w)
{
- armedf_state *state = space->machine().driver_data<armedf_state>();
- COMBINE_DATA(&state->m_bg_videoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bg_videoram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( terraf_fg_scrolly_w )
+WRITE16_MEMBER(armedf_state::terraf_fg_scrolly_w)
{
- armedf_state *state = space->machine().driver_data<armedf_state>();
if (ACCESSING_BITS_8_15)
{
- state->m_fg_scrolly = ((data >> 8) & 0xff) | (state->m_fg_scrolly & 0x300);
- state->m_waiting_msb = 1;
+ m_fg_scrolly = ((data >> 8) & 0xff) | (m_fg_scrolly & 0x300);
+ m_waiting_msb = 1;
}
}
-WRITE16_HANDLER( terraf_fg_scrollx_w )
+WRITE16_MEMBER(armedf_state::terraf_fg_scrollx_w)
{
- armedf_state *state = space->machine().driver_data<armedf_state>();
if (ACCESSING_BITS_8_15)
{
- if (state->m_waiting_msb)
+ if (m_waiting_msb)
{
- state->m_scroll_msb = data >> 8;
- state->m_fg_scrollx = (state->m_fg_scrollx & 0xff) | (((state->m_scroll_msb >> 4) & 3) << 8);
- state->m_fg_scrolly = (state->m_fg_scrolly & 0xff) | (((state->m_scroll_msb >> 0) & 3) << 8);
- //popmessage("%04X %04X %04X",data,state->m_fg_scrollx,state->m_fg_scrolly);
+ m_scroll_msb = data >> 8;
+ m_fg_scrollx = (m_fg_scrollx & 0xff) | (((m_scroll_msb >> 4) & 3) << 8);
+ m_fg_scrolly = (m_fg_scrolly & 0xff) | (((m_scroll_msb >> 0) & 3) << 8);
+ //popmessage("%04X %04X %04X",data,m_fg_scrollx,m_fg_scrolly);
}
else
- state->m_fg_scrollx = ((data >> 8) & 0xff) | (state->m_fg_scrollx & 0x300);
+ m_fg_scrollx = ((data >> 8) & 0xff) | (m_fg_scrollx & 0x300);
}
}
-WRITE16_HANDLER( terraf_fg_scroll_msb_arm_w )
+WRITE16_MEMBER(armedf_state::terraf_fg_scroll_msb_arm_w)
{
- armedf_state *state = space->machine().driver_data<armedf_state>();
if (ACCESSING_BITS_8_15)
- state->m_waiting_msb = 0;
+ m_waiting_msb = 0;
}
-WRITE16_HANDLER( armedf_fg_scrollx_w )
+WRITE16_MEMBER(armedf_state::armedf_fg_scrollx_w)
{
- armedf_state *state = space->machine().driver_data<armedf_state>();
- COMBINE_DATA(&state->m_fg_scrollx);
+ COMBINE_DATA(&m_fg_scrollx);
}
-WRITE16_HANDLER( armedf_fg_scrolly_w )
+WRITE16_MEMBER(armedf_state::armedf_fg_scrolly_w)
{
- armedf_state *state = space->machine().driver_data<armedf_state>();
- COMBINE_DATA(&state->m_fg_scrolly);
+ COMBINE_DATA(&m_fg_scrolly);
}
-WRITE16_HANDLER( armedf_bg_scrollx_w )
+WRITE16_MEMBER(armedf_state::armedf_bg_scrollx_w)
{
- armedf_state *state = space->machine().driver_data<armedf_state>();
- COMBINE_DATA(&state->m_bg_scrollx);
- state->m_bg_tilemap->set_scrollx(0, state->m_bg_scrollx);
+ COMBINE_DATA(&m_bg_scrollx);
+ m_bg_tilemap->set_scrollx(0, m_bg_scrollx);
}
-WRITE16_HANDLER( armedf_bg_scrolly_w )
+WRITE16_MEMBER(armedf_state::armedf_bg_scrolly_w)
{
- armedf_state *state = space->machine().driver_data<armedf_state>();
- COMBINE_DATA(&state->m_bg_scrolly);
- state->m_bg_tilemap->set_scrolly(0, state->m_bg_scrolly);
+ COMBINE_DATA(&m_bg_scrolly);
+ m_bg_tilemap->set_scrolly(0, m_bg_scrolly);
}
diff --git a/src/mame/video/artmagic.c b/src/mame/video/artmagic.c
index 87e790337a9..d02a19806aa 100644
--- a/src/mame/video/artmagic.c
+++ b/src/mame/video/artmagic.c
@@ -299,35 +299,33 @@ static void execute_blit(running_machine &machine)
}
-READ16_HANDLER( artmagic_blitter_r )
+READ16_MEMBER(artmagic_state::artmagic_blitter_r)
{
- artmagic_state *state = space->machine().driver_data<artmagic_state>();
/*
bit 1 is a busy flag; loops tightly if clear
bit 2 is tested in a similar fashion
bit 4 reflects the page
*/
- UINT16 result = 0xffef | (state->m_blitter_page << 4);
+ UINT16 result = 0xffef | (m_blitter_page << 4);
#if (!INSTANT_BLIT)
- if (attotime_compare(space->machine().time(), state->m_blitter_busy_until) < 0)
+ if (attotime_compare(machine().time(), m_blitter_busy_until) < 0)
result ^= 6;
#endif
return result;
}
-WRITE16_HANDLER( artmagic_blitter_w )
+WRITE16_MEMBER(artmagic_state::artmagic_blitter_w)
{
- artmagic_state *state = space->machine().driver_data<artmagic_state>();
- COMBINE_DATA(&state->m_blitter_data[offset]);
+ COMBINE_DATA(&m_blitter_data[offset]);
/* offset 3 triggers the blit */
if (offset == 3)
- execute_blit(space->machine());
+ execute_blit(machine());
/* offset 4 contains the target page */
else if (offset == 4)
- state->m_blitter_page = (data >> 1) & 1;
+ m_blitter_page = (data >> 1) & 1;
}
diff --git a/src/mame/video/ashnojoe.c b/src/mame/video/ashnojoe.c
index 80bf86f205f..d58d1f8e38f 100644
--- a/src/mame/video/ashnojoe.c
+++ b/src/mame/video/ashnojoe.c
@@ -98,109 +98,100 @@ static TILE_GET_INFO( get_joe_tile_info_7 )
0);
}
-WRITE16_HANDLER( ashnojoe_tileram_w )
+WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram_w)
{
- ashnojoe_state *state = space->machine().driver_data<ashnojoe_state>();
- state->m_tileram[offset] = data;
- state->m_joetilemap->mark_tile_dirty(offset);
+ m_tileram[offset] = data;
+ m_joetilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( ashnojoe_tileram2_w )
+WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram2_w)
{
- ashnojoe_state *state = space->machine().driver_data<ashnojoe_state>();
- state->m_tileram_2[offset] = data;
- state->m_joetilemap2->mark_tile_dirty(offset / 2);
+ m_tileram_2[offset] = data;
+ m_joetilemap2->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( ashnojoe_tileram3_w )
+WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram3_w)
{
- ashnojoe_state *state = space->machine().driver_data<ashnojoe_state>();
- state->m_tileram_3[offset] = data;
- state->m_joetilemap3->mark_tile_dirty(offset);
+ m_tileram_3[offset] = data;
+ m_joetilemap3->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( ashnojoe_tileram4_w )
+WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram4_w)
{
- ashnojoe_state *state = space->machine().driver_data<ashnojoe_state>();
- state->m_tileram_4[offset] = data;
- state->m_joetilemap4->mark_tile_dirty(offset);
+ m_tileram_4[offset] = data;
+ m_joetilemap4->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( ashnojoe_tileram5_w )
+WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram5_w)
{
- ashnojoe_state *state = space->machine().driver_data<ashnojoe_state>();
- state->m_tileram_5[offset] = data;
- state->m_joetilemap5->mark_tile_dirty(offset / 2);
+ m_tileram_5[offset] = data;
+ m_joetilemap5->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( ashnojoe_tileram6_w )
+WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram6_w)
{
- ashnojoe_state *state = space->machine().driver_data<ashnojoe_state>();
- state->m_tileram_6[offset] = data;
- state->m_joetilemap6->mark_tile_dirty(offset / 2);
+ m_tileram_6[offset] = data;
+ m_joetilemap6->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( ashnojoe_tileram7_w )
+WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram7_w)
{
- ashnojoe_state *state = space->machine().driver_data<ashnojoe_state>();
- state->m_tileram_7[offset] = data;
- state->m_joetilemap7->mark_tile_dirty(offset / 2);
+ m_tileram_7[offset] = data;
+ m_joetilemap7->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( joe_tilemaps_xscroll_w )
+WRITE16_MEMBER(ashnojoe_state::joe_tilemaps_xscroll_w)
{
- ashnojoe_state *state = space->machine().driver_data<ashnojoe_state>();
switch( offset )
{
case 0:
- state->m_joetilemap3->set_scrollx(0, data);
+ m_joetilemap3->set_scrollx(0, data);
break;
case 1:
- state->m_joetilemap5->set_scrollx(0, data);
+ m_joetilemap5->set_scrollx(0, data);
break;
case 2:
- state->m_joetilemap2->set_scrollx(0, data);
+ m_joetilemap2->set_scrollx(0, data);
break;
case 3:
- state->m_joetilemap4->set_scrollx(0, data);
+ m_joetilemap4->set_scrollx(0, data);
break;
case 4:
- state->m_joetilemap6->set_scrollx(0, data);
- state->m_joetilemap7->set_scrollx(0, data);
+ m_joetilemap6->set_scrollx(0, data);
+ m_joetilemap7->set_scrollx(0, data);
break;
}
}
-WRITE16_HANDLER( joe_tilemaps_yscroll_w )
+WRITE16_MEMBER(ashnojoe_state::joe_tilemaps_yscroll_w)
{
- ashnojoe_state *state = space->machine().driver_data<ashnojoe_state>();
switch( offset )
{
case 0:
- state->m_joetilemap3->set_scrolly(0, data);
+ m_joetilemap3->set_scrolly(0, data);
break;
case 1:
- state->m_joetilemap5->set_scrolly(0, data);
+ m_joetilemap5->set_scrolly(0, data);
break;
case 2:
- state->m_joetilemap2->set_scrolly(0, data);
+ m_joetilemap2->set_scrolly(0, data);
break;
case 3:
- state->m_joetilemap4->set_scrolly(0, data);
+ m_joetilemap4->set_scrolly(0, data);
break;
case 4:
- state->m_joetilemap6->set_scrolly(0, data);
- state->m_joetilemap7->set_scrolly(0, data);
+ m_joetilemap6->set_scrolly(0, data);
+ m_joetilemap7->set_scrolly(0, data);
break;
}
}
diff --git a/src/mame/video/asterix.c b/src/mame/video/asterix.c
index 27f99e9846c..f6bc763346b 100644
--- a/src/mame/video/asterix.c
+++ b/src/mame/video/asterix.c
@@ -13,11 +13,10 @@ static void reset_spritebank( running_machine &machine )
state->m_spritebanks[3] = (state->m_spritebank << 3) & 0x7000;
}
-WRITE16_HANDLER( asterix_spritebank_w )
+WRITE16_MEMBER(asterix_state::asterix_spritebank_w)
{
- asterix_state *state = space->machine().driver_data<asterix_state>();
- COMBINE_DATA(&state->m_spritebank);
- reset_spritebank(space->machine());
+ COMBINE_DATA(&m_spritebank);
+ reset_spritebank(machine());
}
void asterix_sprite_callback( running_machine &machine, int *code, int *color, int *priority_mask )
diff --git a/src/mame/video/astrocde.c b/src/mame/video/astrocde.c
index a29cd36b8dd..d27e9c1f149 100644
--- a/src/mame/video/astrocde.c
+++ b/src/mame/video/astrocde.c
@@ -460,73 +460,72 @@ static TIMER_CALLBACK( scanline_callback )
*
*************************************/
-READ8_HANDLER( astrocade_data_chip_register_r )
+READ8_MEMBER(astrocde_state::astrocade_data_chip_register_r)
{
- astrocde_state *state = space->machine().driver_data<astrocde_state>();
UINT8 result = 0xff;
/* these are the core registers */
switch (offset & 0xff)
{
case 0x08: /* intercept feedback */
- result = state->m_funcgen_intercept;
- state->m_funcgen_intercept = 0;
+ result = m_funcgen_intercept;
+ m_funcgen_intercept = 0;
break;
case 0x0e: /* vertical feedback (from lightpen interrupt) */
- result = state->m_vertical_feedback;
+ result = m_vertical_feedback;
break;
case 0x0f: /* horizontal feedback (from lightpen interrupt) */
- result = state->m_horizontal_feedback;
+ result = m_horizontal_feedback;
break;
case 0x10: /* player 1 handle */
- result = input_port_read_safe(space->machine(), "P1HANDLE", 0xff);
+ result = input_port_read_safe(machine(), "P1HANDLE", 0xff);
break;
case 0x11: /* player 2 handle */
- result = input_port_read_safe(space->machine(), "P2HANDLE", 0xff);
+ result = input_port_read_safe(machine(), "P2HANDLE", 0xff);
break;
case 0x12: /* player 3 handle */
- result = input_port_read_safe(space->machine(), "P3HANDLE", 0xff);
+ result = input_port_read_safe(machine(), "P3HANDLE", 0xff);
break;
case 0x13: /* player 4 handle */
- result = input_port_read_safe(space->machine(), "P4HANDLE", 0xff);
+ result = input_port_read_safe(machine(), "P4HANDLE", 0xff);
break;
case 0x14: /* keypad column 0 */
- result = input_port_read_safe(space->machine(), "KEYPAD0", 0xff);
+ result = input_port_read_safe(machine(), "KEYPAD0", 0xff);
break;
case 0x15: /* keypad column 1 */
- result = input_port_read_safe(space->machine(), "KEYPAD1", 0xff);
+ result = input_port_read_safe(machine(), "KEYPAD1", 0xff);
break;
case 0x16: /* keypad column 2 */
- result = input_port_read_safe(space->machine(), "KEYPAD2", 0xff);
+ result = input_port_read_safe(machine(), "KEYPAD2", 0xff);
break;
case 0x17: /* keypad column 3 */
- result = input_port_read_safe(space->machine(), "KEYPAD3", 0xff);
+ result = input_port_read_safe(machine(), "KEYPAD3", 0xff);
break;
case 0x1c: /* player 1 knob */
- result = input_port_read_safe(space->machine(), "P1_KNOB", 0xff);
+ result = input_port_read_safe(machine(), "P1_KNOB", 0xff);
break;
case 0x1d: /* player 2 knob */
- result = input_port_read_safe(space->machine(), "P2_KNOB", 0xff);
+ result = input_port_read_safe(machine(), "P2_KNOB", 0xff);
break;
case 0x1e: /* player 3 knob */
- result = input_port_read_safe(space->machine(), "P3_KNOB", 0xff);
+ result = input_port_read_safe(machine(), "P3_KNOB", 0xff);
break;
case 0x1f: /* player 4 knob */
- result = input_port_read_safe(space->machine(), "P4_KNOB", 0xff);
+ result = input_port_read_safe(machine(), "P4_KNOB", 0xff);
break;
}
@@ -534,9 +533,8 @@ READ8_HANDLER( astrocade_data_chip_register_r )
}
-WRITE8_HANDLER( astrocade_data_chip_register_w )
+WRITE8_MEMBER(astrocde_state::astrocade_data_chip_register_w)
{
- astrocde_state *state = space->machine().driver_data<astrocde_state>();
/* these are the core registers */
switch (offset & 0xff)
{
@@ -548,43 +546,43 @@ WRITE8_HANDLER( astrocade_data_chip_register_w )
case 0x05:
case 0x06:
case 0x07:
- state->m_colors[offset & 7] = data;
+ m_colors[offset & 7] = data;
break;
case 0x08: /* mode register */
- state->m_video_mode = data & 1;
+ m_video_mode = data & 1;
break;
case 0x09: /* color split pixel */
- state->m_colorsplit = 2 * (data & 0x3f);
- state->m_bgdata = ((data & 0xc0) >> 6) * 0x55;
+ m_colorsplit = 2 * (data & 0x3f);
+ m_bgdata = ((data & 0xc0) >> 6) * 0x55;
break;
case 0x0a: /* vertical blank register */
- state->m_vblank = data;
+ m_vblank = data;
break;
case 0x0b: /* color block transfer */
- state->m_colors[(offset >> 8) & 7] = data;
+ m_colors[(offset >> 8) & 7] = data;
break;
case 0x0c: /* function generator */
- state->m_funcgen_control = data;
- state->m_funcgen_expand_count = 0; /* reset flip-flop for expand mode on write to this register */
- state->m_funcgen_rotate_count = 0; /* reset counter for rotate mode on write to this register */
- state->m_funcgen_shift_prev_data = 0; /* reset shift buffer on write to this register */
+ m_funcgen_control = data;
+ m_funcgen_expand_count = 0; /* reset flip-flop for expand mode on write to this register */
+ m_funcgen_rotate_count = 0; /* reset counter for rotate mode on write to this register */
+ m_funcgen_shift_prev_data = 0; /* reset shift buffer on write to this register */
break;
case 0x0d: /* interrupt feedback */
- state->m_interrupt_vector = data;
+ m_interrupt_vector = data;
break;
case 0x0e: /* interrupt enable and mode */
- state->m_interrupt_enabl = data;
+ m_interrupt_enabl = data;
break;
case 0x0f: /* interrupt line */
- state->m_interrupt_scanline = data;
+ m_interrupt_scanline = data;
break;
case 0x10: /* master oscillator register */
@@ -596,13 +594,13 @@ WRITE8_HANDLER( astrocade_data_chip_register_w )
case 0x16: /* tone A volume and tone B volume register */
case 0x17: /* noise volume register */
case 0x18: /* sound block transfer */
- if (state->m_video_config & AC_SOUND_PRESENT)
- astrocade_sound_w(space->machine().device("astrocade1"), offset, data);
+ if (m_video_config & AC_SOUND_PRESENT)
+ astrocade_sound_w(machine().device("astrocade1"), offset, data);
break;
case 0x19: /* expand register */
- state->m_funcgen_expand_color[0] = data & 0x03;
- state->m_funcgen_expand_color[1] = (data >> 2) & 0x03;
+ m_funcgen_expand_color[0] = data & 0x03;
+ m_funcgen_expand_color[1] = (data >> 2) & 0x03;
break;
}
}
@@ -615,9 +613,8 @@ WRITE8_HANDLER( astrocade_data_chip_register_w )
*
*************************************/
-WRITE8_HANDLER( astrocade_funcgen_w )
+WRITE8_MEMBER(astrocde_state::astrocade_funcgen_w)
{
- astrocde_state *state = space->machine().driver_data<astrocde_state>();
UINT8 prev_data;
/* control register:
@@ -631,76 +628,76 @@ WRITE8_HANDLER( astrocade_funcgen_w )
*/
/* expansion */
- if (state->m_funcgen_control & 0x08)
+ if (m_funcgen_control & 0x08)
{
- state->m_funcgen_expand_count ^= 1;
- data >>= 4 * state->m_funcgen_expand_count;
- data = (state->m_funcgen_expand_color[(data >> 3) & 1] << 6) |
- (state->m_funcgen_expand_color[(data >> 2) & 1] << 4) |
- (state->m_funcgen_expand_color[(data >> 1) & 1] << 2) |
- (state->m_funcgen_expand_color[(data >> 0) & 1] << 0);
+ m_funcgen_expand_count ^= 1;
+ data >>= 4 * m_funcgen_expand_count;
+ data = (m_funcgen_expand_color[(data >> 3) & 1] << 6) |
+ (m_funcgen_expand_color[(data >> 2) & 1] << 4) |
+ (m_funcgen_expand_color[(data >> 1) & 1] << 2) |
+ (m_funcgen_expand_color[(data >> 0) & 1] << 0);
}
- prev_data = state->m_funcgen_shift_prev_data;
- state->m_funcgen_shift_prev_data = data;
+ prev_data = m_funcgen_shift_prev_data;
+ m_funcgen_shift_prev_data = data;
/* rotate or shift */
- if (state->m_funcgen_control & 0x04)
+ if (m_funcgen_control & 0x04)
{
/* rotate */
/* first 4 writes accumulate data for the rotate */
- if ((state->m_funcgen_rotate_count & 4) == 0)
+ if ((m_funcgen_rotate_count & 4) == 0)
{
- state->m_funcgen_rotate_data[state->m_funcgen_rotate_count++ & 3] = data;
+ m_funcgen_rotate_data[m_funcgen_rotate_count++ & 3] = data;
return;
}
/* second 4 writes actually write it */
else
{
- UINT8 shift = 2 * (~state->m_funcgen_rotate_count++ & 3);
- data = (((state->m_funcgen_rotate_data[3] >> shift) & 3) << 6) |
- (((state->m_funcgen_rotate_data[2] >> shift) & 3) << 4) |
- (((state->m_funcgen_rotate_data[1] >> shift) & 3) << 2) |
- (((state->m_funcgen_rotate_data[0] >> shift) & 3) << 0);
+ UINT8 shift = 2 * (~m_funcgen_rotate_count++ & 3);
+ data = (((m_funcgen_rotate_data[3] >> shift) & 3) << 6) |
+ (((m_funcgen_rotate_data[2] >> shift) & 3) << 4) |
+ (((m_funcgen_rotate_data[1] >> shift) & 3) << 2) |
+ (((m_funcgen_rotate_data[0] >> shift) & 3) << 0);
}
}
else
{
/* shift */
- UINT8 shift = 2 * (state->m_funcgen_control & 0x03);
+ UINT8 shift = 2 * (m_funcgen_control & 0x03);
data = (data >> shift) | (prev_data << (8 - shift));
}
/* flopping */
- if (state->m_funcgen_control & 0x40)
+ if (m_funcgen_control & 0x40)
data = (data >> 6) | ((data >> 2) & 0x0c) | ((data << 2) & 0x30) | (data << 6);
/* OR/XOR */
- if (state->m_funcgen_control & 0x30)
+ if (m_funcgen_control & 0x30)
{
- UINT8 olddata = space->read_byte(0x4000 + offset);
+ UINT8 olddata = space.read_byte(0x4000 + offset);
/* compute any intercepts */
- state->m_funcgen_intercept &= 0x0f;
+ m_funcgen_intercept &= 0x0f;
if ((olddata & 0xc0) && (data & 0xc0))
- state->m_funcgen_intercept |= 0x11;
+ m_funcgen_intercept |= 0x11;
if ((olddata & 0x30) && (data & 0x30))
- state->m_funcgen_intercept |= 0x22;
+ m_funcgen_intercept |= 0x22;
if ((olddata & 0x0c) && (data & 0x0c))
- state->m_funcgen_intercept |= 0x44;
+ m_funcgen_intercept |= 0x44;
if ((olddata & 0x03) && (data & 0x03))
- state->m_funcgen_intercept |= 0x88;
+ m_funcgen_intercept |= 0x88;
/* apply the operation */
- if (state->m_funcgen_control & 0x10)
+ if (m_funcgen_control & 0x10)
data |= olddata;
- else if (state->m_funcgen_control & 0x20)
+ else if (m_funcgen_control & 0x20)
data ^= olddata;
}
/* write the result */
- space->write_byte(0x4000 + offset, data);
+ space.write_byte(0x4000 + offset, data);
}
@@ -837,39 +834,38 @@ static void execute_blit(address_space *space)
}
-WRITE8_HANDLER( astrocade_pattern_board_w )
+WRITE8_MEMBER(astrocde_state::astrocade_pattern_board_w)
{
- astrocde_state *state = space->machine().driver_data<astrocde_state>();
switch (offset)
{
case 0: /* source offset low 8 bits */
- state->m_pattern_source = (state->m_pattern_source & 0xff00) | (data << 0);
+ m_pattern_source = (m_pattern_source & 0xff00) | (data << 0);
break;
case 1: /* source offset upper 8 bits */
- state->m_pattern_source = (state->m_pattern_source & 0x00ff) | (data << 8);
+ m_pattern_source = (m_pattern_source & 0x00ff) | (data << 8);
break;
case 2: /* mode control; also clears low byte of dest */
- state->m_pattern_mode = data & 0x3f;
- state->m_pattern_dest &= 0xff00;
+ m_pattern_mode = data & 0x3f;
+ m_pattern_dest &= 0xff00;
break;
case 3: /* skip value */
- state->m_pattern_skip = data;
+ m_pattern_skip = data;
break;
case 4: /* dest offset upper 8 bits; also adds skip to low 8 bits */
- state->m_pattern_dest = ((state->m_pattern_dest + state->m_pattern_skip) & 0xff) | (data << 8);
+ m_pattern_dest = ((m_pattern_dest + m_pattern_skip) & 0xff) | (data << 8);
break;
case 5: /* width of blit */
- state->m_pattern_width = data;
+ m_pattern_width = data;
break;
case 6: /* height of blit and initiator */
- state->m_pattern_height = data;
- execute_blit(space->device().memory().space(AS_PROGRAM));
+ m_pattern_height = data;
+ execute_blit(space.device().memory().space(AS_PROGRAM));
break;
}
}
@@ -954,52 +950,49 @@ static void init_sparklestar(running_machine &machine)
*
*************************************/
-WRITE8_HANDLER( profpac_page_select_w )
+WRITE8_MEMBER(astrocde_state::profpac_page_select_w)
{
- astrocde_state *state = space->machine().driver_data<astrocde_state>();
- state->m_profpac_readpage = data & 3;
- state->m_profpac_writepage = (data >> 2) & 3;
- state->m_profpac_vispage = (data >> 4) & 3;
+ m_profpac_readpage = data & 3;
+ m_profpac_writepage = (data >> 2) & 3;
+ m_profpac_vispage = (data >> 4) & 3;
}
-READ8_HANDLER( profpac_intercept_r )
+READ8_MEMBER(astrocde_state::profpac_intercept_r)
{
- astrocde_state *state = space->machine().driver_data<astrocde_state>();
- return state->m_profpac_intercept;
+ return m_profpac_intercept;
}
-WRITE8_HANDLER( profpac_screenram_ctrl_w )
+WRITE8_MEMBER(astrocde_state::profpac_screenram_ctrl_w)
{
- astrocde_state *state = space->machine().driver_data<astrocde_state>();
switch (offset)
{
case 0: /* port 0xC0 - red component */
- state->m_profpac_palette[data >> 4] = (state->m_profpac_palette[data >> 4] & ~0xf00) | ((data & 0x0f) << 8);
+ m_profpac_palette[data >> 4] = (m_profpac_palette[data >> 4] & ~0xf00) | ((data & 0x0f) << 8);
break;
case 1: /* port 0xC1 - green component */
- state->m_profpac_palette[data >> 4] = (state->m_profpac_palette[data >> 4] & ~0x0f0) | ((data & 0x0f) << 4);
+ m_profpac_palette[data >> 4] = (m_profpac_palette[data >> 4] & ~0x0f0) | ((data & 0x0f) << 4);
break;
case 2: /* port 0xC2 - blue component */
- state->m_profpac_palette[data >> 4] = (state->m_profpac_palette[data >> 4] & ~0x00f) | ((data & 0x0f) << 0);
+ m_profpac_palette[data >> 4] = (m_profpac_palette[data >> 4] & ~0x00f) | ((data & 0x0f) << 0);
break;
case 3: /* port 0xC3 - set 2bpp to 4bpp mapping and clear intercepts */
- state->m_profpac_colormap[(data >> 4) & 3] = data & 0x0f;
- state->m_profpac_intercept = 0x00;
+ m_profpac_colormap[(data >> 4) & 3] = data & 0x0f;
+ m_profpac_intercept = 0x00;
break;
case 4: /* port 0xC4 - which half to read on a memory access */
- state->m_profpac_vw = data & 0x0f; /* refresh write enable lines TBD */
- state->m_profpac_readshift = 2 * ((data >> 4) & 1);
+ m_profpac_vw = data & 0x0f; /* refresh write enable lines TBD */
+ m_profpac_readshift = 2 * ((data >> 4) & 1);
break;
case 5: /* port 0xC5 - write enable and write mode */
- state->m_profpac_writemask = ((data & 0x0f) << 12) | ((data & 0x0f) << 8) | ((data & 0x0f) << 4) | ((data & 0x0f) << 0);
- state->m_profpac_writemode = (data >> 4) & 0x03;
+ m_profpac_writemask = ((data & 0x0f) << 12) | ((data & 0x0f) << 8) | ((data & 0x0f) << 4) | ((data & 0x0f) << 0);
+ m_profpac_writemode = (data >> 4) & 0x03;
break;
}
}
@@ -1012,29 +1005,27 @@ WRITE8_HANDLER( profpac_screenram_ctrl_w )
*
*************************************/
-READ8_HANDLER( profpac_videoram_r )
+READ8_MEMBER(astrocde_state::profpac_videoram_r)
{
- astrocde_state *state = space->machine().driver_data<astrocde_state>();
- UINT16 temp = state->m_profpac_videoram[state->m_profpac_readpage * 0x4000 + offset] >> state->m_profpac_readshift;
+ UINT16 temp = m_profpac_videoram[m_profpac_readpage * 0x4000 + offset] >> m_profpac_readshift;
return ((temp >> 6) & 0xc0) | ((temp >> 4) & 0x30) | ((temp >> 2) & 0x0c) | ((temp >> 0) & 0x03);
}
/* All this information comes from decoding the PLA at U39 on the screen ram board */
-WRITE8_HANDLER( profpac_videoram_w )
+WRITE8_MEMBER(astrocde_state::profpac_videoram_w)
{
- astrocde_state *state = space->machine().driver_data<astrocde_state>();
- UINT16 oldbits = state->m_profpac_videoram[state->m_profpac_writepage * 0x4000 + offset];
+ UINT16 oldbits = m_profpac_videoram[m_profpac_writepage * 0x4000 + offset];
UINT16 newbits, result = 0;
/* apply the 2->4 bit expansion first */
- newbits = (state->m_profpac_colormap[(data >> 6) & 3] << 12) |
- (state->m_profpac_colormap[(data >> 4) & 3] << 8) |
- (state->m_profpac_colormap[(data >> 2) & 3] << 4) |
- (state->m_profpac_colormap[(data >> 0) & 3] << 0);
+ newbits = (m_profpac_colormap[(data >> 6) & 3] << 12) |
+ (m_profpac_colormap[(data >> 4) & 3] << 8) |
+ (m_profpac_colormap[(data >> 2) & 3] << 4) |
+ (m_profpac_colormap[(data >> 0) & 3] << 0);
/* there are 4 write modes: overwrite, xor, overlay, or underlay */
- switch (state->m_profpac_writemode)
+ switch (m_profpac_writemode)
{
case 0: /* normal write */
result = newbits;
@@ -1060,8 +1051,8 @@ WRITE8_HANDLER( profpac_videoram_w )
}
/* apply the write mask and store */
- result = (result & state->m_profpac_writemask) | (oldbits & ~state->m_profpac_writemask);
- state->m_profpac_videoram[state->m_profpac_writepage * 0x4000 + offset] = result;
+ result = (result & m_profpac_writemask) | (oldbits & ~m_profpac_writemask);
+ m_profpac_videoram[m_profpac_writepage * 0x4000 + offset] = result;
/* Intercept (collision) stuff */
@@ -1074,17 +1065,17 @@ WRITE8_HANDLER( profpac_videoram_w )
((oldbits & 0x00f0) == 0x0030 && (newbits & 0x00c0) == 0x0040) ||
((oldbits & 0x000f) == 0x0002 && (newbits & 0x0008) == 0x0008) ||
((oldbits & 0x000f) == 0x0003 && (newbits & 0x000c) == 0x0004))
- state->m_profpac_intercept |= 0x01;
+ m_profpac_intercept |= 0x01;
if (((newbits & 0xf000) != 0x0000 && (oldbits & 0xc000) == 0x4000) ||
((newbits & 0x0f00) != 0x0000 && (oldbits & 0x0c00) == 0x0400) ||
((newbits & 0x00f0) != 0x0000 && (oldbits & 0x00c0) == 0x0040) ||
((newbits & 0x000f) != 0x0000 && (oldbits & 0x000c) == 0x0004))
- state->m_profpac_intercept |= 0x02;
+ m_profpac_intercept |= 0x02;
if (((newbits & 0xf000) != 0x0000 && (oldbits & 0x8000) == 0x8000) ||
((newbits & 0x0f00) != 0x0000 && (oldbits & 0x0800) == 0x0800) ||
((newbits & 0x00f0) != 0x0000 && (oldbits & 0x0080) == 0x0080) ||
((newbits & 0x000f) != 0x0000 && (oldbits & 0x0008) == 0x0008))
- state->m_profpac_intercept |= 0x04;
+ m_profpac_intercept |= 0x04;
}
diff --git a/src/mame/video/asuka.c b/src/mame/video/asuka.c
index ec20e4c8509..81be402b3f5 100644
--- a/src/mame/video/asuka.c
+++ b/src/mame/video/asuka.c
@@ -6,12 +6,11 @@
SPRITE READ AND WRITE HANDLERS
**************************************************************/
-WRITE16_HANDLER( asuka_spritectrl_w )
+WRITE16_MEMBER(asuka_state::asuka_spritectrl_w)
{
- asuka_state *state = space->machine().driver_data<asuka_state>();
/* Bits 2-5 are color bank; in asuka games bit 0 is global priority */
- pc090oj_set_sprite_ctrl(state->m_pc090oj, ((data & 0x3c) >> 2) | ((data & 0x1) << 15));
+ pc090oj_set_sprite_ctrl(m_pc090oj, ((data & 0x3c) >> 2) | ((data & 0x1) << 15));
}
diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c
index 942348e9236..d50ff352270 100644
--- a/src/mame/video/atarifb.c
+++ b/src/mame/video/atarifb.c
@@ -59,30 +59,27 @@ static TILE_GET_INFO( field_get_tile_info )
*
*************************************/
-WRITE8_HANDLER( atarifb_alpha1_videoram_w )
+WRITE8_MEMBER(atarifb_state::atarifb_alpha1_videoram_w)
{
- atarifb_state *state = space->machine().driver_data<atarifb_state>();
- state->m_alphap1_videoram[offset] = data;
- state->m_alpha1_tilemap->mark_tile_dirty(offset);
+ m_alphap1_videoram[offset] = data;
+ m_alpha1_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( atarifb_alpha2_videoram_w )
+WRITE8_MEMBER(atarifb_state::atarifb_alpha2_videoram_w)
{
- atarifb_state *state = space->machine().driver_data<atarifb_state>();
- state->m_alphap2_videoram[offset] = data;
- state->m_alpha2_tilemap->mark_tile_dirty(offset);
+ m_alphap2_videoram[offset] = data;
+ m_alpha2_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( atarifb_field_videoram_w )
+WRITE8_MEMBER(atarifb_state::atarifb_field_videoram_w)
{
- atarifb_state *state = space->machine().driver_data<atarifb_state>();
- state->m_field_videoram[offset] = data;
- state->m_field_tilemap->mark_tile_dirty(offset);
+ m_field_videoram[offset] = data;
+ m_field_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/atetris.c b/src/mame/video/atetris.c
index 5ede8bcff38..b26837d8550 100644
--- a/src/mame/video/atetris.c
+++ b/src/mame/video/atetris.c
@@ -32,13 +32,12 @@ static TILE_GET_INFO( get_tile_info )
*
*************************************/
-WRITE8_HANDLER( atetris_videoram_w )
+WRITE8_MEMBER(atetris_state::atetris_videoram_w)
{
- atetris_state *state = space->machine().driver_data<atetris_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
diff --git a/src/mame/video/aztarac.c b/src/mame/video/aztarac.c
index 44a8bfe5040..1168d488c4c 100644
--- a/src/mame/video/aztarac.c
+++ b/src/mame/video/aztarac.c
@@ -9,7 +9,7 @@
#include "includes/aztarac.h"
#define AVECTOR(m, x, y, color, intensity) \
-vector_add_point (m, state->m_xcenter + ((x) << 16), state->m_ycenter - ((y) << 16), color, intensity)
+vector_add_point (m, m_xcenter + ((x) << 16), m_ycenter - ((y) << 16), color, intensity)
@@ -22,10 +22,9 @@ INLINE void read_vectorram(UINT16 *vectorram, int addr, int *x, int *y, int *c)
if (*y & 0x200) *y |= 0xfffffc00;
}
-WRITE16_HANDLER( aztarac_ubr_w )
+WRITE16_MEMBER(aztarac_state::aztarac_ubr_w)
{
- aztarac_state *state = space->machine().driver_data<aztarac_state>();
- UINT16 *vectorram = state->m_vectorram;
+ UINT16 *vectorram = m_vectorram;
int x, y, c, intensity, xoffset, yoffset, color;
int defaddr, objaddr=0, ndefs;
@@ -44,7 +43,7 @@ WRITE16_HANDLER( aztarac_ubr_w )
if ((c & 0x2000) == 0)
{
defaddr = (c >> 1) & 0x7ff;
- AVECTOR (space->machine(), xoffset, yoffset, 0, 0);
+ AVECTOR (machine(), xoffset, yoffset, 0, 0);
read_vectorram(vectorram, defaddr, &x, &ndefs, &c);
ndefs++;
@@ -59,9 +58,9 @@ WRITE16_HANDLER( aztarac_ubr_w )
defaddr++;
read_vectorram(vectorram, defaddr, &x, &y, &c);
if ((c & 0xff00) == 0)
- AVECTOR (space->machine(), x + xoffset, y + yoffset, 0, 0);
+ AVECTOR (machine(), x + xoffset, y + yoffset, 0, 0);
else
- AVECTOR (space->machine(), x + xoffset, y + yoffset, color, intensity);
+ AVECTOR (machine(), x + xoffset, y + yoffset, color, intensity);
}
}
else
@@ -72,7 +71,7 @@ WRITE16_HANDLER( aztarac_ubr_w )
defaddr++;
read_vectorram(vectorram, defaddr, &x, &y, &c);
color = VECTOR_COLOR222(c & 0x3f);
- AVECTOR (space->machine(), x + xoffset, y + yoffset, color, c >> 8);
+ AVECTOR (machine(), x + xoffset, y + yoffset, color, c >> 8);
}
}
}
diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c
index a30cb77f559..2f8b550474d 100644
--- a/src/mame/video/bagman.c
+++ b/src/mame/video/bagman.c
@@ -11,18 +11,16 @@
#include "includes/bagman.h"
-WRITE8_HANDLER( bagman_videoram_w )
+WRITE8_MEMBER(bagman_state::bagman_videoram_w)
{
- bagman_state *state = space->machine().driver_data<bagman_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( bagman_colorram_w )
+WRITE8_MEMBER(bagman_state::bagman_colorram_w)
{
- bagman_state *state = space->machine().driver_data<bagman_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
/***************************************************************************
@@ -81,13 +79,12 @@ PALETTE_INIT( bagman )
}
}
-WRITE8_HANDLER( bagman_flipscreen_w )
+WRITE8_MEMBER(bagman_state::bagman_flipscreen_w)
{
- bagman_state *state = space->machine().driver_data<bagman_state>();
- if ((flip_screen_get(space->machine()) ^ data) & 1)
+ if ((flip_screen_get(machine()) ^ data) & 1)
{
- flip_screen_set(space->machine(), data & 0x01);
- state->m_bg_tilemap->mark_all_dirty();
+ flip_screen_set(machine(), data & 0x01);
+ m_bg_tilemap->mark_all_dirty();
}
}
diff --git a/src/mame/video/balsente.c b/src/mame/video/balsente.c
index 5236277b2b7..66ec2c1a05c 100644
--- a/src/mame/video/balsente.c
+++ b/src/mame/video/balsente.c
@@ -42,15 +42,14 @@ VIDEO_START( balsente )
*
*************************************/
-WRITE8_HANDLER( balsente_videoram_w )
+WRITE8_MEMBER(balsente_state::balsente_videoram_w)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
/* expand the two pixel values into two bytes */
- state->m_videoram[offset] = data;
+ m_videoram[offset] = data;
- state->m_expanded_videoram[offset * 2 + 0] = data >> 4;
- state->m_expanded_videoram[offset * 2 + 1] = data & 15;
+ m_expanded_videoram[offset * 2 + 0] = data >> 4;
+ m_expanded_videoram[offset * 2 + 1] = data & 15;
}
@@ -61,19 +60,18 @@ WRITE8_HANDLER( balsente_videoram_w )
*
*************************************/
-WRITE8_HANDLER( balsente_palette_select_w )
+WRITE8_MEMBER(balsente_state::balsente_palette_select_w)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
/* only update if changed */
- if (state->m_palettebank_vis != (data & 3))
+ if (m_palettebank_vis != (data & 3))
{
/* update the scanline palette */
- space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos() - 1 + BALSENTE_VBEND);
- state->m_palettebank_vis = data & 3;
+ machine().primary_screen->update_partial(machine().primary_screen->vpos() - 1 + BALSENTE_VBEND);
+ m_palettebank_vis = data & 3;
}
- logerror("balsente_palette_select_w(%d) scanline=%d\n", data & 3, space->machine().primary_screen->vpos());
+ logerror("balsente_palette_select_w(%d) scanline=%d\n", data & 3, machine().primary_screen->vpos());
}
@@ -84,18 +82,17 @@ WRITE8_HANDLER( balsente_palette_select_w )
*
*************************************/
-WRITE8_HANDLER( balsente_paletteram_w )
+WRITE8_MEMBER(balsente_state::balsente_paletteram_w)
{
int r, g, b;
- balsente_state *state = space->machine().driver_data<balsente_state>();
- state->m_generic_paletteram_8[offset] = data & 0x0f;
+ m_generic_paletteram_8[offset] = data & 0x0f;
- r = state->m_generic_paletteram_8[(offset & ~3) + 0];
- g = state->m_generic_paletteram_8[(offset & ~3) + 1];
- b = state->m_generic_paletteram_8[(offset & ~3) + 2];
+ r = m_generic_paletteram_8[(offset & ~3) + 0];
+ g = m_generic_paletteram_8[(offset & ~3) + 1];
+ b = m_generic_paletteram_8[(offset & ~3) + 2];
- palette_set_color_rgb(space->machine(), offset / 4, pal4bit(r), pal4bit(g), pal4bit(b));
+ palette_set_color_rgb(machine(), offset / 4, pal4bit(r), pal4bit(g), pal4bit(b));
}
@@ -106,14 +103,13 @@ WRITE8_HANDLER( balsente_paletteram_w )
*
*************************************/
-WRITE8_HANDLER( shrike_sprite_select_w )
+WRITE8_MEMBER(balsente_state::shrike_sprite_select_w)
{
- balsente_state *state = space->machine().driver_data<balsente_state>();
- if( state->m_sprite_data != state->m_sprite_bank[(data & 0x80 >> 7) ^ 1 ])
+ if( m_sprite_data != m_sprite_bank[(data & 0x80 >> 7) ^ 1 ])
{
logerror( "shrike_sprite_select_w( 0x%02x )\n", data );
- space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos() - 1 + BALSENTE_VBEND);
- state->m_sprite_data = state->m_sprite_bank[(data & 0x80 >> 7) ^ 1];
+ machine().primary_screen->update_partial(machine().primary_screen->vpos() - 1 + BALSENTE_VBEND);
+ m_sprite_data = m_sprite_bank[(data & 0x80 >> 7) ^ 1];
}
shrike_shared_6809_w( space, 1, data );
diff --git a/src/mame/video/bankp.c b/src/mame/video/bankp.c
index 358afc06067..4dd0a42ad42 100644
--- a/src/mame/video/bankp.c
+++ b/src/mame/video/bankp.c
@@ -80,59 +80,53 @@ PALETTE_INIT( bankp )
/* the bottom half of the PROM seems to be not used */
}
-WRITE8_HANDLER( bankp_scroll_w )
+WRITE8_MEMBER(bankp_state::bankp_scroll_w)
{
- bankp_state *state = space->machine().driver_data<bankp_state>();
- state->m_scroll_x = data;
+ m_scroll_x = data;
}
-WRITE8_HANDLER( bankp_videoram_w )
+WRITE8_MEMBER(bankp_state::bankp_videoram_w)
{
- bankp_state *state = space->machine().driver_data<bankp_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( bankp_colorram_w )
+WRITE8_MEMBER(bankp_state::bankp_colorram_w)
{
- bankp_state *state = space->machine().driver_data<bankp_state>();
- state->m_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( bankp_videoram2_w )
+WRITE8_MEMBER(bankp_state::bankp_videoram2_w)
{
- bankp_state *state = space->machine().driver_data<bankp_state>();
- state->m_videoram2[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( bankp_colorram2_w )
+WRITE8_MEMBER(bankp_state::bankp_colorram2_w)
{
- bankp_state *state = space->machine().driver_data<bankp_state>();
- state->m_colorram2[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram2[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( bankp_out_w )
+WRITE8_MEMBER(bankp_state::bankp_out_w)
{
- bankp_state *state = space->machine().driver_data<bankp_state>();
/* bits 0-1 are playfield priority */
/* TODO: understand how this works */
- state->m_priority = data & 0x03;
+ m_priority = data & 0x03;
/* bits 2-3 unknown (2 is used) */
/* bit 4 controls NMI */
- state->m_nmi_mask = (data & 0x10) >> 4;
+ m_nmi_mask = (data & 0x10) >> 4;
/* bit 5 controls screen flip */
- flip_screen_set(space->machine(), data & 0x20);
+ flip_screen_set(machine(), data & 0x20);
/* bits 6-7 unknown */
}
diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c
index 5ae8aaeab46..03976e26ec7 100644
--- a/src/mame/video/baraduke.c
+++ b/src/mame/video/baraduke.c
@@ -138,30 +138,26 @@ VIDEO_START( baraduke )
***************************************************************************/
-READ8_HANDLER( baraduke_videoram_r )
+READ8_MEMBER(baraduke_state::baraduke_videoram_r)
{
- baraduke_state *state = space->machine().driver_data<baraduke_state>();
- return state->m_videoram[offset];
+ return m_videoram[offset];
}
-WRITE8_HANDLER( baraduke_videoram_w )
+WRITE8_MEMBER(baraduke_state::baraduke_videoram_w)
{
- baraduke_state *state = space->machine().driver_data<baraduke_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap[offset/0x1000]->mark_tile_dirty((offset&0xfff)/2);
+ m_videoram[offset] = data;
+ m_bg_tilemap[offset/0x1000]->mark_tile_dirty((offset&0xfff)/2);
}
-READ8_HANDLER( baraduke_textram_r )
+READ8_MEMBER(baraduke_state::baraduke_textram_r)
{
- baraduke_state *state = space->machine().driver_data<baraduke_state>();
- return state->m_textram[offset];
+ return m_textram[offset];
}
-WRITE8_HANDLER( baraduke_textram_w )
+WRITE8_MEMBER(baraduke_state::baraduke_textram_w)
{
- baraduke_state *state = space->machine().driver_data<baraduke_state>();
- state->m_textram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_textram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
}
@@ -182,31 +178,29 @@ static void scroll_w(address_space *space, int layer, int offset, int data)
}
}
-WRITE8_HANDLER( baraduke_scroll0_w )
+WRITE8_MEMBER(baraduke_state::baraduke_scroll0_w)
{
- scroll_w(space, 0, offset, data);
+ scroll_w(&space, 0, offset, data);
}
-WRITE8_HANDLER( baraduke_scroll1_w )
+WRITE8_MEMBER(baraduke_state::baraduke_scroll1_w)
{
- scroll_w(space, 1, offset, data);
+ scroll_w(&space, 1, offset, data);
}
-READ8_HANDLER( baraduke_spriteram_r )
+READ8_MEMBER(baraduke_state::baraduke_spriteram_r)
{
- baraduke_state *state = space->machine().driver_data<baraduke_state>();
- return state->m_spriteram[offset];
+ return m_spriteram[offset];
}
-WRITE8_HANDLER( baraduke_spriteram_w )
+WRITE8_MEMBER(baraduke_state::baraduke_spriteram_w)
{
- baraduke_state *state = space->machine().driver_data<baraduke_state>();
- state->m_spriteram[offset] = data;
+ m_spriteram[offset] = data;
/* a write to this offset tells the sprite chip to buffer the sprite list */
if (offset == 0x1ff2)
- state->m_copy_sprites = 1;
+ m_copy_sprites = 1;
}
diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c
index eb9f92fa263..751641f6e16 100644
--- a/src/mame/video/battlane.c
+++ b/src/mame/video/battlane.c
@@ -15,9 +15,8 @@
0x01 = Scroll MSB
*/
-WRITE8_HANDLER( battlane_palette_w )
+WRITE8_MEMBER(battlane_state::battlane_palette_w)
{
- battlane_state *state = space->machine().driver_data<battlane_state>();
int r, g, b;
int bit0, bit1, bit2;
@@ -37,45 +36,40 @@ WRITE8_HANDLER( battlane_palette_w )
/* blue component */
- bit0 = (~state->m_video_ctrl >> 7) & 0x01;
+ bit0 = (~m_video_ctrl >> 7) & 0x01;
bit1 = (~data >> 6) & 0x01;
bit2 = (~data >> 7) & 0x01;
b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2;
- palette_set_color(space->machine(), offset, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), offset, MAKE_RGB(r, g, b));
}
-WRITE8_HANDLER( battlane_scrollx_w )
+WRITE8_MEMBER(battlane_state::battlane_scrollx_w)
{
- battlane_state *state = space->machine().driver_data<battlane_state>();
- state->m_bg_tilemap->set_scrollx(0, ((state->m_video_ctrl & 0x01) << 8) + data);
+ m_bg_tilemap->set_scrollx(0, ((m_video_ctrl & 0x01) << 8) + data);
}
-WRITE8_HANDLER( battlane_scrolly_w )
+WRITE8_MEMBER(battlane_state::battlane_scrolly_w)
{
- battlane_state *state = space->machine().driver_data<battlane_state>();
- state->m_bg_tilemap->set_scrolly(0, ((state->m_cpu_control & 0x01) << 8) + data);
+ m_bg_tilemap->set_scrolly(0, ((m_cpu_control & 0x01) << 8) + data);
}
-WRITE8_HANDLER( battlane_tileram_w )
+WRITE8_MEMBER(battlane_state::battlane_tileram_w)
{
- battlane_state *state = space->machine().driver_data<battlane_state>();
- state->m_tileram[offset] = data;
- //state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_tileram[offset] = data;
+ //m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( battlane_spriteram_w )
+WRITE8_MEMBER(battlane_state::battlane_spriteram_w)
{
- battlane_state *state = space->machine().driver_data<battlane_state>();
- state->m_spriteram[offset] = data;
+ m_spriteram[offset] = data;
}
-WRITE8_HANDLER( battlane_bitmap_w )
+WRITE8_MEMBER(battlane_state::battlane_bitmap_w)
{
- battlane_state *state = space->machine().driver_data<battlane_state>();
int i, orval;
- orval = (~state->m_video_ctrl >> 1) & 0x07;
+ orval = (~m_video_ctrl >> 1) & 0x07;
if (!orval)
orval = 7;
@@ -84,19 +78,18 @@ WRITE8_HANDLER( battlane_bitmap_w )
{
if (data & 1 << i)
{
- state->m_screen_bitmap.pix8(offset % 0x100, (offset / 0x100) * 8 + i) |= orval;
+ m_screen_bitmap.pix8(offset % 0x100, (offset / 0x100) * 8 + i) |= orval;
}
else
{
- state->m_screen_bitmap.pix8(offset % 0x100, (offset / 0x100) * 8 + i) &= ~orval;
+ m_screen_bitmap.pix8(offset % 0x100, (offset / 0x100) * 8 + i) &= ~orval;
}
}
}
-WRITE8_HANDLER( battlane_video_ctrl_w )
+WRITE8_MEMBER(battlane_state::battlane_video_ctrl_w)
{
- battlane_state *state = space->machine().driver_data<battlane_state>();
- state->m_video_ctrl = data;
+ m_video_ctrl = data;
}
static TILE_GET_INFO( get_tile_info_bg )
diff --git a/src/mame/video/battlera.c b/src/mame/video/battlera.c
index b231e952885..93e980f6e36 100644
--- a/src/mame/video/battlera.c
+++ b/src/mame/video/battlera.c
@@ -38,54 +38,49 @@ VIDEO_START( battlera )
/******************************************************************************/
-WRITE8_HANDLER( battlera_palette_w )
+WRITE8_MEMBER(battlera_state::battlera_palette_w)
{
int pal_word;
- battlera_state *state = space->machine().driver_data<battlera_state>();
- state->m_generic_paletteram_8[offset]=data;
+ m_generic_paletteram_8[offset]=data;
if (offset%2) offset-=1;
- pal_word=state->m_generic_paletteram_8[offset] | (state->m_generic_paletteram_8[offset+1]<<8);
- palette_set_color_rgb(space->machine(), offset/2, pal3bit(pal_word >> 3), pal3bit(pal_word >> 6), pal3bit(pal_word >> 0));
+ pal_word=m_generic_paletteram_8[offset] | (m_generic_paletteram_8[offset+1]<<8);
+ palette_set_color_rgb(machine(), offset/2, pal3bit(pal_word >> 3), pal3bit(pal_word >> 6), pal3bit(pal_word >> 0));
}
/******************************************************************************/
-READ8_HANDLER( HuC6270_debug_r )
+READ8_MEMBER(battlera_state::HuC6270_debug_r)
{
- battlera_state *state = space->machine().driver_data<battlera_state>();
- return state->m_HuC6270_vram[offset];
+ return m_HuC6270_vram[offset];
}
-WRITE8_HANDLER( HuC6270_debug_w )
+WRITE8_MEMBER(battlera_state::HuC6270_debug_w)
{
- battlera_state *state = space->machine().driver_data<battlera_state>();
- state->m_HuC6270_vram[offset]=data;
+ m_HuC6270_vram[offset]=data;
}
-READ8_HANDLER( HuC6270_register_r )
+READ8_MEMBER(battlera_state::HuC6270_register_r)
{
- battlera_state *state = space->machine().driver_data<battlera_state>();
int rr;
- if ((state->m_current_scanline+56)==state->m_HuC6270_registers[6]) rr=1; else rr=0;
+ if ((m_current_scanline+56)==m_HuC6270_registers[6]) rr=1; else rr=0;
return 0 /* CR flag */
| (0 << 1) /* OR flag */
| (rr << 2) /* RR flag */
| (0 << 3) /* DS flag */
| (0 << 4) /* DV flag */
- | (state->m_bldwolf_vblank << 5) /* VD flag (1 when vblank else 0) */
+ | (m_bldwolf_vblank << 5) /* VD flag (1 when vblank else 0) */
| (0 << 6) /* BSY flag (1 when dma active, else 0) */
| (0 << 7); /* Always zero */
}
-WRITE8_HANDLER( HuC6270_register_w )
+WRITE8_MEMBER(battlera_state::HuC6270_register_w)
{
- battlera_state *state = space->machine().driver_data<battlera_state>();
switch (offset) {
case 0: /* Select data region */
- state->m_VDC_register=data;
+ m_VDC_register=data;
break;
case 1: /* Unused */
break;
@@ -95,18 +90,17 @@ WRITE8_HANDLER( HuC6270_register_w )
/******************************************************************************/
#ifdef UNUSED_FUNCTION
-READ8_HANDLER( HuC6270_data_r )
+READ8_MEMBER(battlera_state::HuC6270_data_r)
{
- battlera_state *state = space->machine().driver_data<battlera_state>();
int result;
switch (offset) {
case 0: /* LSB */
- return state->m_HuC6270_vram[(state->m_HuC6270_registers[1]<<1)|1];
+ return m_HuC6270_vram[(m_HuC6270_registers[1]<<1)|1];
case 1:/* MSB */
- result=state->m_HuC6270_vram[(state->m_HuC6270_registers[1]<<1)|0];
- state->m_HuC6270_registers[1]=(state->m_HuC6270_registers[1]+state->m_inc_value)&0xffff;
+ result=m_HuC6270_vram[(m_HuC6270_registers[1]<<1)|0];
+ m_HuC6270_registers[1]=(m_HuC6270_registers[1]+m_inc_value)&0xffff;
return result;
}
@@ -114,28 +108,27 @@ READ8_HANDLER( HuC6270_data_r )
}
#endif
-WRITE8_HANDLER( HuC6270_data_w )
+WRITE8_MEMBER(battlera_state::HuC6270_data_w)
{
- battlera_state *state = space->machine().driver_data<battlera_state>();
switch (offset) {
case 0: /* LSB */
- switch (state->m_VDC_register) {
+ switch (m_VDC_register) {
case 0: /* MAWR */
- state->m_HuC6270_registers[0]=(state->m_HuC6270_registers[0]&0xff00) | (data);
+ m_HuC6270_registers[0]=(m_HuC6270_registers[0]&0xff00) | (data);
return;
case 1: /* MARR */
- state->m_HuC6270_registers[0]=(state->m_HuC6270_registers[1]&0xff00) | (data);
+ m_HuC6270_registers[0]=(m_HuC6270_registers[1]&0xff00) | (data);
return;
case 2: /* VRAM */
- if (state->m_HuC6270_vram[(state->m_HuC6270_registers[0]<<1)|1]!=data) {
- state->m_HuC6270_vram[(state->m_HuC6270_registers[0]<<1)|1]=data;
- gfx_element_mark_dirty(space->machine().gfx[0], state->m_HuC6270_registers[0]>>4);
- gfx_element_mark_dirty(space->machine().gfx[1], state->m_HuC6270_registers[0]>>6);
+ if (m_HuC6270_vram[(m_HuC6270_registers[0]<<1)|1]!=data) {
+ m_HuC6270_vram[(m_HuC6270_registers[0]<<1)|1]=data;
+ gfx_element_mark_dirty(machine().gfx[0], m_HuC6270_registers[0]>>4);
+ gfx_element_mark_dirty(machine().gfx[1], m_HuC6270_registers[0]>>6);
}
- if (state->m_HuC6270_registers[0]<0x1000) state->m_vram_dirty[state->m_HuC6270_registers[0]]=1;
+ if (m_HuC6270_registers[0]<0x1000) m_vram_dirty[m_HuC6270_registers[0]]=1;
return;
case 3: break; /* Unused */
@@ -143,34 +136,34 @@ WRITE8_HANDLER( HuC6270_data_w )
case 5: /* CR - Control register */
/* Bits 0,1 unknown */
- state->m_rcr_enable=data&0x4; /* Raster interrupt enable */
- state->m_irq_enable=data&0x8; /* VBL interrupt enable */
+ m_rcr_enable=data&0x4; /* Raster interrupt enable */
+ m_irq_enable=data&0x8; /* VBL interrupt enable */
/* Bits 4,5 unknown (EX) */
- state->m_sb_enable=data&0x40; /* Sprites enable */
- state->m_bb_enable=data&0x80; /* Background enable */
+ m_sb_enable=data&0x40; /* Sprites enable */
+ m_bb_enable=data&0x80; /* Background enable */
return;
case 6: /* RCR - Raster counter register */
- state->m_HuC6270_registers[6]=(state->m_HuC6270_registers[6]&0xff00) | (data);
+ m_HuC6270_registers[6]=(m_HuC6270_registers[6]&0xff00) | (data);
return;
case 7: /* BXR - X scroll */
- state->m_HuC6270_registers[7]=(state->m_HuC6270_registers[7]&0xff00) | (data);
+ m_HuC6270_registers[7]=(m_HuC6270_registers[7]&0xff00) | (data);
return;
case 8: /* BYR - Y scroll */
- state->m_HuC6270_registers[8]=(state->m_HuC6270_registers[8]&0xff00) | (data);
+ m_HuC6270_registers[8]=(m_HuC6270_registers[8]&0xff00) | (data);
return;
case 15: /* DMA */
case 16:
case 17:
case 18:
- logerror("%04x: dma 2 %02x\n",cpu_get_pc(&space->device()),data);
+ logerror("%04x: dma 2 %02x\n",cpu_get_pc(&space.device()),data);
break;
case 19: /* SATB */
- state->m_HuC6270_registers[19]=(state->m_HuC6270_registers[19]&0xff00) | (data);
+ m_HuC6270_registers[19]=(m_HuC6270_registers[19]&0xff00) | (data);
return;
}
@@ -179,65 +172,65 @@ WRITE8_HANDLER( HuC6270_data_w )
/*********************************************/
case 1: /* MSB (Autoincrement on this write) */
- switch (state->m_VDC_register) {
+ switch (m_VDC_register) {
case 0: /* MAWR - Memory Address Write Register */
- state->m_HuC6270_registers[0]=(state->m_HuC6270_registers[0]&0xff) | (data<<8);
+ m_HuC6270_registers[0]=(m_HuC6270_registers[0]&0xff) | (data<<8);
return;
case 1: /* MARR */
- state->m_HuC6270_registers[1]=(state->m_HuC6270_registers[1]&0xff) | (data<<8);
+ m_HuC6270_registers[1]=(m_HuC6270_registers[1]&0xff) | (data<<8);
return;
case 2: /* VWR - VRAM */
- if (state->m_HuC6270_vram[(state->m_HuC6270_registers[0]<<1)|0]!=data) {
- state->m_HuC6270_vram[(state->m_HuC6270_registers[0]<<1)|0]=data;
- gfx_element_mark_dirty(space->machine().gfx[0], state->m_HuC6270_registers[0]>>4);
- gfx_element_mark_dirty(space->machine().gfx[1], state->m_HuC6270_registers[0]>>6);
- if (state->m_HuC6270_registers[0]<0x1000) state->m_vram_dirty[state->m_HuC6270_registers[0]]=1;
+ if (m_HuC6270_vram[(m_HuC6270_registers[0]<<1)|0]!=data) {
+ m_HuC6270_vram[(m_HuC6270_registers[0]<<1)|0]=data;
+ gfx_element_mark_dirty(machine().gfx[0], m_HuC6270_registers[0]>>4);
+ gfx_element_mark_dirty(machine().gfx[1], m_HuC6270_registers[0]>>6);
+ if (m_HuC6270_registers[0]<0x1000) m_vram_dirty[m_HuC6270_registers[0]]=1;
}
- state->m_HuC6270_registers[0]+=state->m_inc_value;
- state->m_HuC6270_registers[0]=state->m_HuC6270_registers[0]&0xffff;
+ m_HuC6270_registers[0]+=m_inc_value;
+ m_HuC6270_registers[0]=m_HuC6270_registers[0]&0xffff;
return;
case 5: /* CR */
/* IW - Auto-increment values */
switch ((data>>3)&3) {
- case 0: state->m_inc_value=1; break;
- case 1: state->m_inc_value=32;break;
- case 2: state->m_inc_value=64; break;
- case 3: state->m_inc_value=128; break;
+ case 0: m_inc_value=1; break;
+ case 1: m_inc_value=32;break;
+ case 2: m_inc_value=64; break;
+ case 3: m_inc_value=128; break;
}
/* DR, TE unknown */
return;
case 6: /* RCR - Raster counter register */
- state->m_HuC6270_registers[6]=(state->m_HuC6270_registers[6]&0xff) | (data<<8);
+ m_HuC6270_registers[6]=(m_HuC6270_registers[6]&0xff) | (data<<8);
return;
case 7: /* BXR - X scroll */
- state->m_HuC6270_registers[7]=(state->m_HuC6270_registers[7]&0xff) | (data<<8);
+ m_HuC6270_registers[7]=(m_HuC6270_registers[7]&0xff) | (data<<8);
return;
case 8: /* BYR - Y scroll */
- state->m_HuC6270_registers[8]=(state->m_HuC6270_registers[8]&0xff) | (data<<8);
+ m_HuC6270_registers[8]=(m_HuC6270_registers[8]&0xff) | (data<<8);
return;
case 15: /* DMA */
case 16:
case 17:
case 18:
- logerror("%04x: dma 2 %02x\n",cpu_get_pc(&space->device()),data);
+ logerror("%04x: dma 2 %02x\n",cpu_get_pc(&space.device()),data);
break;
case 19: /* SATB - Sprites */
- state->m_HuC6270_registers[19]=(state->m_HuC6270_registers[19]&0xff) | (data<<8);
+ m_HuC6270_registers[19]=(m_HuC6270_registers[19]&0xff) | (data<<8);
return;
}
break;
}
- logerror("%04x: unknown write to VDC_register %02x (%02x) at %02x\n",cpu_get_pc(&space->device()),state->m_VDC_register,data,offset);
+ logerror("%04x: unknown write to VDC_register %02x (%02x) at %02x\n",cpu_get_pc(&space.device()),m_VDC_register,data,offset);
}
/******************************************************************************/
diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c
index 549a6bd9427..319e4c8be77 100644
--- a/src/mame/video/battlex.c
+++ b/src/mame/video/battlex.c
@@ -8,43 +8,39 @@
#include "includes/battlex.h"
-WRITE8_HANDLER( battlex_palette_w )
+WRITE8_MEMBER(battlex_state::battlex_palette_w)
{
- palette_set_color_rgb(space->machine(), offset, pal1bit(data >> 0), pal1bit(data >> 2), pal1bit(data >> 1));
+ palette_set_color_rgb(machine(), offset, pal1bit(data >> 0), pal1bit(data >> 2), pal1bit(data >> 1));
}
-WRITE8_HANDLER( battlex_scroll_x_lsb_w )
+WRITE8_MEMBER(battlex_state::battlex_scroll_x_lsb_w)
{
- battlex_state *state = space->machine().driver_data<battlex_state>();
- state->m_scroll_lsb = data;
+ m_scroll_lsb = data;
}
-WRITE8_HANDLER( battlex_scroll_x_msb_w )
+WRITE8_MEMBER(battlex_state::battlex_scroll_x_msb_w)
{
- battlex_state *state = space->machine().driver_data<battlex_state>();
- state->m_scroll_msb = data;
+ m_scroll_msb = data;
}
-WRITE8_HANDLER( battlex_scroll_starfield_w )
+WRITE8_MEMBER(battlex_state::battlex_scroll_starfield_w)
{
}
-WRITE8_HANDLER( battlex_videoram_w )
+WRITE8_MEMBER(battlex_state::battlex_videoram_w)
{
- battlex_state *state = space->machine().driver_data<battlex_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( battlex_flipscreen_w )
+WRITE8_MEMBER(battlex_state::battlex_flipscreen_w)
{
- battlex_state *state = space->machine().driver_data<battlex_state>();
- state->m_starfield_enabled = data & 0x10;
+ m_starfield_enabled = data & 0x10;
- if (flip_screen_get(space->machine()) != (data >> 7))
+ if (flip_screen_get(machine()) != (data >> 7))
{
- flip_screen_set(space->machine(), data & 0x80);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x80);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/battlnts.c b/src/mame/video/battlnts.c
index b4ce2cd0504..090c5fd9ec4 100644
--- a/src/mame/video/battlnts.c
+++ b/src/mame/video/battlnts.c
@@ -31,10 +31,9 @@ void battlnts_sprite_callback(running_machine &machine, int *code,int *color)
*color = 0;
}
-WRITE8_HANDLER( battlnts_spritebank_w )
+WRITE8_MEMBER(battlnts_state::battlnts_spritebank_w)
{
- battlnts_state *state = space->machine().driver_data<battlnts_state>();
- state->m_spritebank = 1024 * (data & 1);
+ m_spritebank = 1024 * (data & 1);
}
/***************************************************************************
diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c
index 14a4ab2c288..01bbceaed60 100644
--- a/src/mame/video/bbusters.c
+++ b/src/mame/video/bbusters.c
@@ -51,28 +51,25 @@ static TILE_GET_INFO( get_pf2_tile_info )
SET_TILE_INFO(4,tile&0xfff,tile>>12,0);
}
-WRITE16_HANDLER( bbusters_video_w )
+WRITE16_MEMBER(bbusters_state::bbusters_video_w)
{
- bbusters_state *state = space->machine().driver_data<bbusters_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_fix_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_fix_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( bbusters_pf1_w )
+WRITE16_MEMBER(bbusters_state::bbusters_pf1_w)
{
- bbusters_state *state = space->machine().driver_data<bbusters_state>();
- COMBINE_DATA(&state->m_pf1_data[offset]);
- state->m_pf1_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_pf1_data[offset]);
+ m_pf1_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( bbusters_pf2_w )
+WRITE16_MEMBER(bbusters_state::bbusters_pf2_w)
{
- bbusters_state *state = space->machine().driver_data<bbusters_state>();
- COMBINE_DATA(&state->m_pf2_data[offset]);
- state->m_pf2_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_pf2_data[offset]);
+ m_pf2_tilemap->mark_tile_dirty(offset);
}
/******************************************************************************/
diff --git a/src/mame/video/beezer.c b/src/mame/video/beezer.c
index 7767ddabe8a..0c20d03125d 100644
--- a/src/mame/video/beezer.c
+++ b/src/mame/video/beezer.c
@@ -35,7 +35,7 @@ SCREEN_UPDATE_IND16( beezer )
return 0;
}
-WRITE8_HANDLER( beezer_map_w )
+WRITE8_MEMBER(beezer_state::beezer_map_w)
{
/*
bit 7 -- 330 ohm resistor -- BLUE
@@ -65,12 +65,12 @@ WRITE8_HANDLER( beezer_map_w )
bit1 = (data >> 7) & 0x01;
b = 0x5f * bit0 + 0xa0 * bit1;
- palette_set_color(space->machine(), offset, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), offset, MAKE_RGB(r, g, b));
}
-READ8_HANDLER( beezer_line_r )
+READ8_MEMBER(beezer_state::beezer_line_r)
{
- return space->machine().primary_screen->vpos();
-// Note: was (state->m_scanline & 0xfe) << 1; with scanline % 128
+ return machine().primary_screen->vpos();
+// Note: was (m_scanline & 0xfe) << 1; with scanline % 128
}
diff --git a/src/mame/video/bigevglf.c b/src/mame/video/bigevglf.c
index 2e48ddc45e2..bda915eb6c4 100644
--- a/src/mame/video/bigevglf.c
+++ b/src/mame/video/bigevglf.c
@@ -9,49 +9,44 @@
#include "includes/bigevglf.h"
-WRITE8_HANDLER(bigevglf_palette_w)
+WRITE8_MEMBER(bigevglf_state::bigevglf_palette_w)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
int color;
- state->m_paletteram[offset] = data;
- color = state->m_paletteram[offset & 0x3ff] | (state->m_paletteram[0x400 + (offset & 0x3ff)] << 8);
- palette_set_color_rgb(space->machine(), offset & 0x3ff, pal4bit(color >> 4), pal4bit(color >> 0), pal4bit(color >> 8));
+ m_paletteram[offset] = data;
+ color = m_paletteram[offset & 0x3ff] | (m_paletteram[0x400 + (offset & 0x3ff)] << 8);
+ palette_set_color_rgb(machine(), offset & 0x3ff, pal4bit(color >> 4), pal4bit(color >> 0), pal4bit(color >> 8));
}
-WRITE8_HANDLER( bigevglf_gfxcontrol_w )
+WRITE8_MEMBER(bigevglf_state::bigevglf_gfxcontrol_w)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
/* bits used: 0,1,2,3
0 and 2 select plane,
1 and 3 select visible plane,
*/
- state->m_plane_selected = ((data & 4) >> 1) | (data & 1);
- state->m_plane_visible = ((data & 8) >> 2) | ((data & 2) >> 1);
+ m_plane_selected = ((data & 4) >> 1) | (data & 1);
+ m_plane_visible = ((data & 8) >> 2) | ((data & 2) >> 1);
}
-WRITE8_HANDLER( bigevglf_vidram_addr_w )
+WRITE8_MEMBER(bigevglf_state::bigevglf_vidram_addr_w)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
- state->m_vidram_bank = (data & 0xff) * 0x100;
+ m_vidram_bank = (data & 0xff) * 0x100;
}
-WRITE8_HANDLER( bigevglf_vidram_w )
+WRITE8_MEMBER(bigevglf_state::bigevglf_vidram_w)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
UINT32 x, y, o;
- o = state->m_vidram_bank + offset;
- state->m_vidram[o + 0x10000 * state->m_plane_selected] = data;
+ o = m_vidram_bank + offset;
+ m_vidram[o + 0x10000 * m_plane_selected] = data;
y = o >>8;
x = (o & 255);
- state->m_tmp_bitmap[state->m_plane_selected].pix16(y, x) = data;
+ m_tmp_bitmap[m_plane_selected].pix16(y, x) = data;
}
-READ8_HANDLER( bigevglf_vidram_r )
+READ8_MEMBER(bigevglf_state::bigevglf_vidram_r)
{
- bigevglf_state *state = space->machine().driver_data<bigevglf_state>();
- return state->m_vidram[0x10000 * state->m_plane_selected + state->m_vidram_bank + offset];
+ return m_vidram[0x10000 * m_plane_selected + m_vidram_bank + offset];
}
VIDEO_START( bigevglf )
diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c
index 9d1a1de98f0..f32c4e01f5b 100644
--- a/src/mame/video/bigstrkb.c
+++ b/src/mame/video/bigstrkb.c
@@ -70,11 +70,10 @@ static TILE_GET_INFO( get_bsb_tile_info )
SET_TILE_INFO(0,tileno,col>>12,0);
}
-WRITE16_HANDLER( bsb_videoram_w )
+WRITE16_MEMBER(bigstrkb_state::bsb_videoram_w)
{
- bigstrkb_state *state = space->machine().driver_data<bigstrkb_state>();
- state->m_videoram[offset] = data;
- state->m_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_bsb_tile2_info )
@@ -88,11 +87,10 @@ static TILE_GET_INFO( get_bsb_tile2_info )
SET_TILE_INFO(1,tileno,col>>12,0);
}
-WRITE16_HANDLER( bsb_videoram2_w )
+WRITE16_MEMBER(bigstrkb_state::bsb_videoram2_w)
{
- bigstrkb_state *state = space->machine().driver_data<bigstrkb_state>();
- state->m_videoram2[offset] = data;
- state->m_tilemap2->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_tilemap2->mark_tile_dirty(offset);
}
@@ -107,11 +105,10 @@ static TILE_GET_INFO( get_bsb_tile3_info )
SET_TILE_INFO(1,tileno+0x2000,(col>>12)+(0x100/16),0);
}
-WRITE16_HANDLER( bsb_videoram3_w )
+WRITE16_MEMBER(bigstrkb_state::bsb_videoram3_w)
{
- bigstrkb_state *state = space->machine().driver_data<bigstrkb_state>();
- state->m_videoram3[offset] = data;
- state->m_tilemap3->mark_tile_dirty(offset);
+ m_videoram3[offset] = data;
+ m_tilemap3->mark_tile_dirty(offset);
}
/* Video Start / Update */
diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c
index 94682d2097b..ed107e3c3af 100644
--- a/src/mame/video/bionicc.c
+++ b/src/mame/video/bionicc.c
@@ -114,35 +114,31 @@ VIDEO_START( bionicc )
***************************************************************************/
-WRITE16_HANDLER( bionicc_bgvideoram_w )
+WRITE16_MEMBER(bionicc_state::bionicc_bgvideoram_w)
{
- bionicc_state *state = space->machine().driver_data<bionicc_state>();
- COMBINE_DATA(&state->m_bgvideoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_bgvideoram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( bionicc_fgvideoram_w )
+WRITE16_MEMBER(bionicc_state::bionicc_fgvideoram_w)
{
- bionicc_state *state = space->machine().driver_data<bionicc_state>();
- COMBINE_DATA(&state->m_fgvideoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_fgvideoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( bionicc_txvideoram_w )
+WRITE16_MEMBER(bionicc_state::bionicc_txvideoram_w)
{
- bionicc_state *state = space->machine().driver_data<bionicc_state>();
- COMBINE_DATA(&state->m_txvideoram[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
+ COMBINE_DATA(&m_txvideoram[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE16_HANDLER( bionicc_paletteram_w )
+WRITE16_MEMBER(bionicc_state::bionicc_paletteram_w)
{
- bionicc_state *state = space->machine().driver_data<bionicc_state>();
int r, g, b, bright;
- data = COMBINE_DATA(&state->m_paletteram[offset]);
+ data = COMBINE_DATA(&m_paletteram[offset]);
bright = (data & 0x0f);
@@ -157,45 +153,43 @@ WRITE16_HANDLER( bionicc_paletteram_w )
b = b * (0x07 + bright) / 0x0e;
}
- palette_set_color (space->machine(), offset, MAKE_RGB(r, g, b));
+ palette_set_color (machine(), offset, MAKE_RGB(r, g, b));
}
-WRITE16_HANDLER( bionicc_scroll_w )
+WRITE16_MEMBER(bionicc_state::bionicc_scroll_w)
{
- bionicc_state *state = space->machine().driver_data<bionicc_state>();
- data = COMBINE_DATA(&state->m_scroll[offset]);
+ data = COMBINE_DATA(&m_scroll[offset]);
switch (offset)
{
case 0:
- state->m_fg_tilemap->set_scrollx(0, data);
+ m_fg_tilemap->set_scrollx(0, data);
break;
case 1:
- state->m_fg_tilemap->set_scrolly(0, data);
+ m_fg_tilemap->set_scrolly(0, data);
break;
case 2:
- state->m_bg_tilemap->set_scrollx(0, data);
+ m_bg_tilemap->set_scrollx(0, data);
break;
case 3:
- state->m_bg_tilemap->set_scrolly(0, data);
+ m_bg_tilemap->set_scrolly(0, data);
break;
}
}
-WRITE16_HANDLER( bionicc_gfxctrl_w )
+WRITE16_MEMBER(bionicc_state::bionicc_gfxctrl_w)
{
- bionicc_state *state = space->machine().driver_data<bionicc_state>();
if (ACCESSING_BITS_8_15)
{
- flip_screen_set(space->machine(), data & 0x0100);
+ flip_screen_set(machine(), data & 0x0100);
- state->m_bg_tilemap->enable(data & 0x2000); /* guess */
- state->m_fg_tilemap->enable(data & 0x1000); /* guess */
+ m_bg_tilemap->enable(data & 0x2000); /* guess */
+ m_fg_tilemap->enable(data & 0x1000); /* guess */
- coin_counter_w(space->machine(), 0, data & 0x8000);
- coin_counter_w(space->machine(), 1, data & 0x4000);
+ coin_counter_w(machine(), 0, data & 0x8000);
+ coin_counter_w(machine(), 1, data & 0x4000);
}
}
diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c
index 211ce799320..482d06ba803 100644
--- a/src/mame/video/bking.c
+++ b/src/mame/video/bking.c
@@ -82,46 +82,39 @@ PALETTE_INIT( bking )
}
-WRITE8_HANDLER( bking_xld1_w )
+WRITE8_MEMBER(bking_state::bking_xld1_w)
{
- bking_state *state = space->machine().driver_data<bking_state>();
- state->m_xld1 = -data;
+ m_xld1 = -data;
}
-WRITE8_HANDLER( bking_yld1_w )
+WRITE8_MEMBER(bking_state::bking_yld1_w)
{
- bking_state *state = space->machine().driver_data<bking_state>();
- state->m_yld1 = -data;
+ m_yld1 = -data;
}
-WRITE8_HANDLER( bking_xld2_w )
+WRITE8_MEMBER(bking_state::bking_xld2_w)
{
- bking_state *state = space->machine().driver_data<bking_state>();
- state->m_xld2 = -data;
+ m_xld2 = -data;
}
-WRITE8_HANDLER( bking_yld2_w )
+WRITE8_MEMBER(bking_state::bking_yld2_w)
{
- bking_state *state = space->machine().driver_data<bking_state>();
- state->m_yld2 = -data;
+ m_yld2 = -data;
}
-WRITE8_HANDLER( bking_xld3_w )
+WRITE8_MEMBER(bking_state::bking_xld3_w)
{
- bking_state *state = space->machine().driver_data<bking_state>();
- state->m_xld3 = -data;
+ m_xld3 = -data;
}
-WRITE8_HANDLER( bking_yld3_w )
+WRITE8_MEMBER(bking_state::bking_yld3_w)
{
- bking_state *state = space->machine().driver_data<bking_state>();
- state->m_yld3 = -data;
+ m_yld3 = -data;
}
-WRITE8_HANDLER( bking_cont1_w )
+WRITE8_MEMBER(bking_state::bking_cont1_w)
{
- bking_state *state = space->machine().driver_data<bking_state>();
/* D0 = COIN LOCK */
/* D1 = BALL 5 (Controller selection) */
@@ -129,96 +122,88 @@ WRITE8_HANDLER( bking_cont1_w )
/* D3 = Not Connected */
/* D4-D7 = CROW0-CROW3 (selects crow picture) */
- coin_lockout_global_w(space->machine(), ~data & 0x01);
+ coin_lockout_global_w(machine(), ~data & 0x01);
- flip_screen_set_no_update(space->machine(), data & 0x04);
+ flip_screen_set_no_update(machine(), data & 0x04);
- space->machine().tilemap().set_flip_all(flip_screen_get(space->machine()) ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
+ machine().tilemap().set_flip_all(flip_screen_get(machine()) ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
- state->m_controller = data & 0x02;
+ m_controller = data & 0x02;
- state->m_crow_pic = (data >> 4) & 0x0f;
+ m_crow_pic = (data >> 4) & 0x0f;
}
-WRITE8_HANDLER( bking_cont2_w )
+WRITE8_MEMBER(bking_state::bking_cont2_w)
{
- bking_state *state = space->machine().driver_data<bking_state>();
/* D0-D2 = BALL10 - BALL12 (Selects player 1 ball picture) */
/* D3-D5 = BALL20 - BALL22 (Selects player 2 ball picture) */
/* D6 = HIT1 */
/* D7 = HIT2 */
- state->m_ball1_pic = (data >> 0) & 0x07;
- state->m_ball2_pic = (data >> 3) & 0x07;
+ m_ball1_pic = (data >> 0) & 0x07;
+ m_ball2_pic = (data >> 3) & 0x07;
- state->m_hit = data >> 6;
+ m_hit = data >> 6;
}
-WRITE8_HANDLER( bking_cont3_w )
+WRITE8_MEMBER(bking_state::bking_cont3_w)
{
- bking_state *state = space->machine().driver_data<bking_state>();
/* D0 = CROW INV (inverts Crow picture and coordinates) */
/* D1-D2 = COLOR 0 - COLOR 1 (switches 4 color palettes, global across all graphics) */
/* D3 = SOUND STOP */
- state->m_crow_flip = ~data & 0x01;
+ m_crow_flip = ~data & 0x01;
- if (state->m_palette_bank != ((data >> 1) & 0x03))
+ if (m_palette_bank != ((data >> 1) & 0x03))
{
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_tilemap->mark_all_dirty();
}
- state->m_palette_bank = (data >> 1) & 0x03;
+ m_palette_bank = (data >> 1) & 0x03;
- space->machine().sound().system_mute(data & 0x08);
+ machine().sound().system_mute(data & 0x08);
}
-WRITE8_HANDLER( bking_msk_w )
+WRITE8_MEMBER(bking_state::bking_msk_w)
{
- bking_state *state = space->machine().driver_data<bking_state>();
- state->m_pc3259_mask++;
+ m_pc3259_mask++;
}
-WRITE8_HANDLER( bking_hitclr_w )
+WRITE8_MEMBER(bking_state::bking_hitclr_w)
{
- bking_state *state = space->machine().driver_data<bking_state>();
- state->m_pc3259_mask = 0;
+ m_pc3259_mask = 0;
- state->m_pc3259_output[0] = 0;
- state->m_pc3259_output[1] = 0;
- state->m_pc3259_output[2] = 0;
- state->m_pc3259_output[3] = 0;
+ m_pc3259_output[0] = 0;
+ m_pc3259_output[1] = 0;
+ m_pc3259_output[2] = 0;
+ m_pc3259_output[3] = 0;
}
-WRITE8_HANDLER( bking_playfield_w )
+WRITE8_MEMBER(bking_state::bking_playfield_w)
{
- bking_state *state = space->machine().driver_data<bking_state>();
- state->m_playfield_ram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_playfield_ram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-READ8_HANDLER( bking_input_port_5_r )
+READ8_MEMBER(bking_state::bking_input_port_5_r)
{
- bking_state *state = space->machine().driver_data<bking_state>();
- return input_port_read(space->machine(), state->m_controller ? "TRACK1_X" : "TRACK0_X");
+ return input_port_read(machine(), m_controller ? "TRACK1_X" : "TRACK0_X");
}
-READ8_HANDLER( bking_input_port_6_r )
+READ8_MEMBER(bking_state::bking_input_port_6_r)
{
- bking_state *state = space->machine().driver_data<bking_state>();
- return input_port_read(space->machine(), state->m_controller ? "TRACK1_Y" : "TRACK0_Y");
+ return input_port_read(machine(), m_controller ? "TRACK1_Y" : "TRACK0_Y");
}
-READ8_HANDLER( bking_pos_r )
+READ8_MEMBER(bking_state::bking_pos_r)
{
- bking_state *state = space->machine().driver_data<bking_state>();
- return state->m_pc3259_output[offset / 8] << 4;
+ return m_pc3259_output[offset / 8] << 4;
}
diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c
index 73f7b46a737..f307a833edb 100644
--- a/src/mame/video/blktiger.c
+++ b/src/mame/video/blktiger.c
@@ -101,94 +101,85 @@ VIDEO_START( blktiger )
***************************************************************************/
-WRITE8_HANDLER( blktiger_txvideoram_w )
+WRITE8_MEMBER(blktiger_state::blktiger_txvideoram_w)
{
- blktiger_state *state = space->machine().driver_data<blktiger_state>();
- state->m_txvideoram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_txvideoram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-READ8_HANDLER( blktiger_bgvideoram_r )
+READ8_MEMBER(blktiger_state::blktiger_bgvideoram_r)
{
- blktiger_state *state = space->machine().driver_data<blktiger_state>();
- return state->m_scroll_ram[offset + state->m_scroll_bank];
+ return m_scroll_ram[offset + m_scroll_bank];
}
-WRITE8_HANDLER( blktiger_bgvideoram_w )
+WRITE8_MEMBER(blktiger_state::blktiger_bgvideoram_w)
{
- blktiger_state *state = space->machine().driver_data<blktiger_state>();
- offset += state->m_scroll_bank;
+ offset += m_scroll_bank;
- state->m_scroll_ram[offset] = data;
- state->m_bg_tilemap8x4->mark_tile_dirty(offset / 2);
- state->m_bg_tilemap4x8->mark_tile_dirty(offset / 2);
+ m_scroll_ram[offset] = data;
+ m_bg_tilemap8x4->mark_tile_dirty(offset / 2);
+ m_bg_tilemap4x8->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( blktiger_bgvideoram_bank_w )
+WRITE8_MEMBER(blktiger_state::blktiger_bgvideoram_bank_w)
{
- blktiger_state *state = space->machine().driver_data<blktiger_state>();
- state->m_scroll_bank = (data % BGRAM_BANKS) * BGRAM_BANK_SIZE;
+ m_scroll_bank = (data % BGRAM_BANKS) * BGRAM_BANK_SIZE;
}
-WRITE8_HANDLER( blktiger_scrolly_w )
+WRITE8_MEMBER(blktiger_state::blktiger_scrolly_w)
{
- blktiger_state *state = space->machine().driver_data<blktiger_state>();
int scrolly;
- state->m_scroll_y[offset] = data;
- scrolly = state->m_scroll_y[0] | (state->m_scroll_y[1] << 8);
- state->m_bg_tilemap8x4->set_scrolly(0, scrolly);
- state->m_bg_tilemap4x8->set_scrolly(0, scrolly);
+ m_scroll_y[offset] = data;
+ scrolly = m_scroll_y[0] | (m_scroll_y[1] << 8);
+ m_bg_tilemap8x4->set_scrolly(0, scrolly);
+ m_bg_tilemap4x8->set_scrolly(0, scrolly);
}
-WRITE8_HANDLER( blktiger_scrollx_w )
+WRITE8_MEMBER(blktiger_state::blktiger_scrollx_w)
{
- blktiger_state *state = space->machine().driver_data<blktiger_state>();
int scrollx;
- state->m_scroll_x[offset] = data;
- scrollx = state->m_scroll_x[0] | (state->m_scroll_x[1] << 8);
- state->m_bg_tilemap8x4->set_scrollx(0, scrollx);
- state->m_bg_tilemap4x8->set_scrollx(0, scrollx);
+ m_scroll_x[offset] = data;
+ scrollx = m_scroll_x[0] | (m_scroll_x[1] << 8);
+ m_bg_tilemap8x4->set_scrollx(0, scrollx);
+ m_bg_tilemap4x8->set_scrollx(0, scrollx);
}
-WRITE8_HANDLER( blktiger_video_control_w )
+WRITE8_MEMBER(blktiger_state::blktiger_video_control_w)
{
- blktiger_state *state = space->machine().driver_data<blktiger_state>();
/* bits 0 and 1 are coin counters */
- coin_counter_w(space->machine(), 0,data & 1);
- coin_counter_w(space->machine(), 1,data & 2);
+ coin_counter_w(machine(), 0,data & 1);
+ coin_counter_w(machine(), 1,data & 2);
/* bit 5 resets the sound CPU */
- device_set_input_line(state->m_audiocpu, INPUT_LINE_RESET, (data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
+ device_set_input_line(m_audiocpu, INPUT_LINE_RESET, (data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
/* bit 6 flips screen */
- flip_screen_set(space->machine(), data & 0x40);
+ flip_screen_set(machine(), data & 0x40);
/* bit 7 enables characters? Just a guess */
- state->m_chon = ~data & 0x80;
+ m_chon = ~data & 0x80;
}
-WRITE8_HANDLER( blktiger_video_enable_w )
+WRITE8_MEMBER(blktiger_state::blktiger_video_enable_w)
{
- blktiger_state *state = space->machine().driver_data<blktiger_state>();
/* not sure which is which, but I think that bit 1 and 2 enable background and sprites */
/* bit 1 enables bg ? */
- state->m_bgon = ~data & 0x02;
+ m_bgon = ~data & 0x02;
/* bit 2 enables sprites ? */
- state->m_objon = ~data & 0x04;
+ m_objon = ~data & 0x04;
}
-WRITE8_HANDLER( blktiger_screen_layout_w )
+WRITE8_MEMBER(blktiger_state::blktiger_screen_layout_w)
{
- blktiger_state *state = space->machine().driver_data<blktiger_state>();
- state->m_screen_layout = data;
- state->m_bg_tilemap8x4->enable(state->m_screen_layout);
- state->m_bg_tilemap4x8->enable(!state->m_screen_layout);
+ m_screen_layout = data;
+ m_bg_tilemap8x4->enable(m_screen_layout);
+ m_bg_tilemap4x8->enable(!m_screen_layout);
}
diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c
index a4b4032b01a..821903c5806 100644
--- a/src/mame/video/blmbycar.c
+++ b/src/mame/video/blmbycar.c
@@ -42,12 +42,11 @@ Note: if MAME_DEBUG is defined, pressing Z with:
/* xxxxBBBBGGGGRRRR */
-WRITE16_HANDLER( blmbycar_palette_w )
+WRITE16_MEMBER(blmbycar_state::blmbycar_palette_w)
{
- blmbycar_state *state = space->machine().driver_data<blmbycar_state>();
- data = COMBINE_DATA(&state->m_paletteram[offset]);
- palette_set_color_rgb( space->machine(), offset, pal4bit(data >> 4), pal4bit(data >> 0), pal4bit(data >> 8));
+ data = COMBINE_DATA(&m_paletteram[offset]);
+ palette_set_color_rgb( machine(), offset, pal4bit(data >> 4), pal4bit(data >> 0), pal4bit(data >> 8));
}
@@ -100,18 +99,16 @@ static TILE_GET_INFO( get_tile_info_1 )
}
-WRITE16_HANDLER( blmbycar_vram_0_w )
+WRITE16_MEMBER(blmbycar_state::blmbycar_vram_0_w)
{
- blmbycar_state *state = space->machine().driver_data<blmbycar_state>();
- COMBINE_DATA(&state->m_vram_0[offset]);
- state->m_tilemap_0->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_vram_0[offset]);
+ m_tilemap_0->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( blmbycar_vram_1_w )
+WRITE16_MEMBER(blmbycar_state::blmbycar_vram_1_w)
{
- blmbycar_state *state = space->machine().driver_data<blmbycar_state>();
- COMBINE_DATA(&state->m_vram_1[offset]);
- state->m_tilemap_1->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_vram_1[offset]);
+ m_tilemap_1->mark_tile_dirty(offset / 2);
}
diff --git a/src/mame/video/blockade.c b/src/mame/video/blockade.c
index 0c7b972bea0..277bda03a6c 100644
--- a/src/mame/video/blockade.c
+++ b/src/mame/video/blockade.c
@@ -1,16 +1,15 @@
#include "emu.h"
#include "includes/blockade.h"
-WRITE8_HANDLER( blockade_videoram_w )
+WRITE8_MEMBER(blockade_state::blockade_videoram_w)
{
- blockade_state *state = space->machine().driver_data<blockade_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
- if (input_port_read(space->machine(), "IN3") & 0x80)
+ if (input_port_read(machine(), "IN3") & 0x80)
{
- logerror("blockade_videoram_w: scanline %d\n", space->machine().primary_screen->vpos());
- device_spin_until_interrupt(&space->device());
+ logerror("blockade_videoram_w: scanline %d\n", machine().primary_screen->vpos());
+ device_spin_until_interrupt(&space.device());
}
}
diff --git a/src/mame/video/blockout.c b/src/mame/video/blockout.c
index 1420c62663a..f96835c5eb3 100644
--- a/src/mame/video/blockout.c
+++ b/src/mame/video/blockout.c
@@ -38,20 +38,18 @@ static void setcolor( running_machine &machine, int color, int rgb )
palette_set_color(machine, color, MAKE_RGB(r,g,b));
}
-WRITE16_HANDLER( blockout_paletteram_w )
+WRITE16_MEMBER(blockout_state::blockout_paletteram_w)
{
- blockout_state *state = space->machine().driver_data<blockout_state>();
- COMBINE_DATA(&state->m_paletteram[offset]);
- setcolor(space->machine(), offset, state->m_paletteram[offset]);
+ COMBINE_DATA(&m_paletteram[offset]);
+ setcolor(machine(), offset, m_paletteram[offset]);
}
-WRITE16_HANDLER( blockout_frontcolor_w )
+WRITE16_MEMBER(blockout_state::blockout_frontcolor_w)
{
- blockout_state *state = space->machine().driver_data<blockout_state>();
- COMBINE_DATA(&state->m_color);
- setcolor(space->machine(), 512, state->m_color);
+ COMBINE_DATA(&m_color);
+ setcolor(machine(), 512, m_color);
}
@@ -100,12 +98,11 @@ static void update_pixels( running_machine &machine, int x, int y )
-WRITE16_HANDLER( blockout_videoram_w )
+WRITE16_MEMBER(blockout_state::blockout_videoram_w)
{
- blockout_state *state = space->machine().driver_data<blockout_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- update_pixels(space->machine(), (offset % 256) * 2, (offset / 256) % 256);
+ COMBINE_DATA(&m_videoram[offset]);
+ update_pixels(machine(), (offset % 256) * 2, (offset / 256) % 256);
}
diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c
index cb87c3121bd..0fca9dfaf04 100644
--- a/src/mame/video/bloodbro.c
+++ b/src/mame/video/bloodbro.c
@@ -74,25 +74,22 @@ VIDEO_START( bloodbro )
***************************************************************************/
-WRITE16_HANDLER( bloodbro_bgvideoram_w )
+WRITE16_MEMBER(bloodbro_state::bloodbro_bgvideoram_w)
{
- bloodbro_state *state = space->machine().driver_data<bloodbro_state>();
- COMBINE_DATA(&state->m_bgvideoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bgvideoram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( bloodbro_fgvideoram_w )
+WRITE16_MEMBER(bloodbro_state::bloodbro_fgvideoram_w)
{
- bloodbro_state *state = space->machine().driver_data<bloodbro_state>();
- COMBINE_DATA(&state->m_fgvideoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_fgvideoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( bloodbro_txvideoram_w )
+WRITE16_MEMBER(bloodbro_state::bloodbro_txvideoram_w)
{
- bloodbro_state *state = space->machine().driver_data<bloodbro_state>();
- COMBINE_DATA(&state->m_txvideoram[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_txvideoram[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c
index fa038203e4c..97f1bdbc9d1 100644
--- a/src/mame/video/blueprnt.c
+++ b/src/mame/video/blueprnt.c
@@ -46,32 +46,29 @@ PALETTE_INIT( blueprnt )
}
}
-WRITE8_HANDLER( blueprnt_videoram_w )
+WRITE8_MEMBER(blueprnt_state::blueprnt_videoram_w)
{
- blueprnt_state *state = space->machine().driver_data<blueprnt_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( blueprnt_colorram_w )
+WRITE8_MEMBER(blueprnt_state::blueprnt_colorram_w)
{
- blueprnt_state *state = space->machine().driver_data<blueprnt_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( blueprnt_flipscreen_w )
+WRITE8_MEMBER(blueprnt_state::blueprnt_flipscreen_w)
{
- blueprnt_state *state = space->machine().driver_data<blueprnt_state>();
- flip_screen_set(space->machine(), ~data & 0x02);
+ flip_screen_set(machine(), ~data & 0x02);
- if (state->m_gfx_bank != ((data & 0x04) >> 2))
+ if (m_gfx_bank != ((data & 0x04) >> 2))
{
- state->m_gfx_bank = ((data & 0x04) >> 2);
- space->machine().tilemap().mark_all_dirty();
+ m_gfx_bank = ((data & 0x04) >> 2);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c
index 9307e5be81c..366779025e0 100644
--- a/src/mame/video/bogeyman.c
+++ b/src/mame/video/bogeyman.c
@@ -35,43 +35,38 @@ PALETTE_INIT( bogeyman )
}
}
-WRITE8_HANDLER( bogeyman_videoram_w )
+WRITE8_MEMBER(bogeyman_state::bogeyman_videoram_w)
{
- bogeyman_state *state = space->machine().driver_data<bogeyman_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( bogeyman_colorram_w )
+WRITE8_MEMBER(bogeyman_state::bogeyman_colorram_w)
{
- bogeyman_state *state = space->machine().driver_data<bogeyman_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( bogeyman_videoram2_w )
+WRITE8_MEMBER(bogeyman_state::bogeyman_videoram2_w)
{
- bogeyman_state *state = space->machine().driver_data<bogeyman_state>();
- state->m_videoram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( bogeyman_colorram2_w )
+WRITE8_MEMBER(bogeyman_state::bogeyman_colorram2_w)
{
- bogeyman_state *state = space->machine().driver_data<bogeyman_state>();
- state->m_colorram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( bogeyman_paletteram_w )
+WRITE8_MEMBER(bogeyman_state::bogeyman_paletteram_w)
{
/* RGB output is inverted */
- bogeyman_state *state = space->machine().driver_data<bogeyman_state>();
- state->paletteram_BBGGGRRR_w(*space, offset, ~data);
+ paletteram_BBGGGRRR_w(space, offset, ~data);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c
index b661c3b0acf..f29bab27273 100644
--- a/src/mame/video/bombjack.c
+++ b/src/mame/video/bombjack.c
@@ -9,37 +9,34 @@
#include "emu.h"
#include "includes/bombjack.h"
-WRITE8_HANDLER( bombjack_videoram_w )
+WRITE8_MEMBER(bombjack_state::bombjack_videoram_w)
{
- bombjack_state *state = space->machine().driver_data<bombjack_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( bombjack_colorram_w )
+WRITE8_MEMBER(bombjack_state::bombjack_colorram_w)
{
- bombjack_state *state = space->machine().driver_data<bombjack_state>();
- state->m_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( bombjack_background_w )
+WRITE8_MEMBER(bombjack_state::bombjack_background_w)
{
- bombjack_state *state = space->machine().driver_data<bombjack_state>();
- if (state->m_background_image != data)
+ if (m_background_image != data)
{
- state->m_background_image = data;
- state->m_bg_tilemap->mark_all_dirty();
+ m_background_image = data;
+ m_bg_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( bombjack_flipscreen_w )
+WRITE8_MEMBER(bombjack_state::bombjack_flipscreen_w)
{
- if (flip_screen_get(space->machine()) != (data & 0x01))
+ if (flip_screen_get(machine()) != (data & 0x01))
{
- flip_screen_set(space->machine(), data & 0x01);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x01);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c
index ca047782e62..0a276a3cec2 100644
--- a/src/mame/video/brkthru.c
+++ b/src/mame/video/brkthru.c
@@ -86,12 +86,11 @@ static TILE_GET_INFO( get_bg_tile_info )
SET_TILE_INFO(region, code & 0x7f, colour,0);
}
-WRITE8_HANDLER( brkthru_bgram_w )
+WRITE8_MEMBER(brkthru_state::brkthru_bgram_w)
{
- brkthru_state *state = space->machine().driver_data<brkthru_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
@@ -102,12 +101,11 @@ static TILE_GET_INFO( get_fg_tile_info )
SET_TILE_INFO(0, code, 0, 0);
}
-WRITE8_HANDLER( brkthru_fgram_w )
+WRITE8_MEMBER(brkthru_state::brkthru_fgram_w)
{
- brkthru_state *state = space->machine().driver_data<brkthru_state>();
- state->m_fg_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
VIDEO_START( brkthru )
@@ -122,35 +120,34 @@ VIDEO_START( brkthru )
}
-WRITE8_HANDLER( brkthru_1800_w )
+WRITE8_MEMBER(brkthru_state::brkthru_1800_w)
{
- brkthru_state *state = space->machine().driver_data<brkthru_state>();
if (offset == 0) /* low 8 bits of scroll */
- state->m_bgscroll = (state->m_bgscroll & 0x100) | data;
+ m_bgscroll = (m_bgscroll & 0x100) | data;
else if (offset == 1)
{
/* bit 0-2 = ROM bank select */
- memory_set_bank(space->machine(), "bank1", data & 0x07);
+ memory_set_bank(machine(), "bank1", data & 0x07);
/* bit 3-5 = background tiles color code */
- if (((data & 0x38) >> 2) != state->m_bgbasecolor)
+ if (((data & 0x38) >> 2) != m_bgbasecolor)
{
- state->m_bgbasecolor = (data & 0x38) >> 2;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bgbasecolor = (data & 0x38) >> 2;
+ m_bg_tilemap->mark_all_dirty();
}
/* bit 6 = screen flip */
- if (state->m_flipscreen != (data & 0x40))
+ if (m_flipscreen != (data & 0x40))
{
- state->m_flipscreen = data & 0x40;
- state->m_bg_tilemap->set_flip(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- state->m_fg_tilemap->set_flip(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen = data & 0x40;
+ m_bg_tilemap->set_flip(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_fg_tilemap->set_flip(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
/* bit 7 = high bit of scroll */
- state->m_bgscroll = (state->m_bgscroll & 0xff) | ((data & 0x80) << 1);
+ m_bgscroll = (m_bgscroll & 0xff) | ((data & 0x80) << 1);
}
}
diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c
index dec01839228..53ecbee5dd6 100644
--- a/src/mame/video/bsktball.c
+++ b/src/mame/video/bsktball.c
@@ -8,12 +8,11 @@
#include "includes/bsktball.h"
-WRITE8_HANDLER( bsktball_videoram_w )
+WRITE8_MEMBER(bsktball_state::bsktball_videoram_w)
{
- bsktball_state *state = space->machine().driver_data<bsktball_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c
index 5aebbd97ed3..1517e9d814c 100644
--- a/src/mame/video/btime.c
+++ b/src/mame/video/btime.c
@@ -137,23 +137,20 @@ VIDEO_START( bnj )
}
-WRITE8_HANDLER( btime_paletteram_w )
+WRITE8_MEMBER(btime_state::btime_paletteram_w)
{
/* RGB output is inverted */
- btime_state *state = space->machine().driver_data<btime_state>();
- state->paletteram_BBGGGRRR_w(*space, offset, ~data);
+ paletteram_BBGGGRRR_w(space, offset, ~data);
}
-WRITE8_HANDLER( lnc_videoram_w )
+WRITE8_MEMBER(btime_state::lnc_videoram_w)
{
- btime_state *state = space->machine().driver_data<btime_state>();
- state->m_videoram[offset] = data;
- state->m_colorram[offset] = *state->m_lnc_charbank;
+ m_videoram[offset] = data;
+ m_colorram[offset] = *m_lnc_charbank;
}
-READ8_HANDLER( btime_mirrorvideoram_r )
+READ8_MEMBER(btime_state::btime_mirrorvideoram_r)
{
- btime_state *state = space->machine().driver_data<btime_state>();
int x, y;
/* swap x and y coordinates */
@@ -161,12 +158,11 @@ READ8_HANDLER( btime_mirrorvideoram_r )
y = offset % 32;
offset = 32 * y + x;
- return state->m_videoram[offset];
+ return m_videoram[offset];
}
-READ8_HANDLER( btime_mirrorcolorram_r )
+READ8_MEMBER(btime_state::btime_mirrorcolorram_r)
{
- btime_state *state = space->machine().driver_data<btime_state>();
int x, y;
/* swap x and y coordinates */
@@ -174,12 +170,11 @@ READ8_HANDLER( btime_mirrorcolorram_r )
y = offset % 32;
offset = 32 * y + x;
- return state->m_colorram[offset];
+ return m_colorram[offset];
}
-WRITE8_HANDLER( btime_mirrorvideoram_w )
+WRITE8_MEMBER(btime_state::btime_mirrorvideoram_w)
{
- btime_state *state = space->machine().driver_data<btime_state>();
int x, y;
/* swap x and y coordinates */
@@ -187,10 +182,10 @@ WRITE8_HANDLER( btime_mirrorvideoram_w )
y = offset % 32;
offset = 32 * y + x;
- state->m_videoram[offset] = data;
+ m_videoram[offset] = data;
}
-WRITE8_HANDLER( lnc_mirrorvideoram_w )
+WRITE8_MEMBER(btime_state::lnc_mirrorvideoram_w)
{
int x, y;
@@ -202,9 +197,8 @@ WRITE8_HANDLER( lnc_mirrorvideoram_w )
lnc_videoram_w(space, offset, data);
}
-WRITE8_HANDLER( btime_mirrorcolorram_w )
+WRITE8_MEMBER(btime_state::btime_mirrorcolorram_w)
{
- btime_state *state = space->machine().driver_data<btime_state>();
int x, y;
/* swap x and y coordinates */
@@ -212,55 +206,51 @@ WRITE8_HANDLER( btime_mirrorcolorram_w )
y = offset % 32;
offset = 32 * y + x;
- state->m_colorram[offset] = data;
+ m_colorram[offset] = data;
}
-WRITE8_HANDLER( deco_charram_w )
+WRITE8_MEMBER(btime_state::deco_charram_w)
{
- btime_state *state = space->machine().driver_data<btime_state>();
- if (state->m_deco_charram[offset] == data)
+ if (m_deco_charram[offset] == data)
return;
- state->m_deco_charram[offset] = data;
+ m_deco_charram[offset] = data;
offset &= 0x1fff;
/* dirty sprite */
- gfx_element_mark_dirty(space->machine().gfx[1], offset >> 5);
+ gfx_element_mark_dirty(machine().gfx[1], offset >> 5);
/* diry char */
- gfx_element_mark_dirty(space->machine().gfx[0], offset >> 3);
+ gfx_element_mark_dirty(machine().gfx[0], offset >> 3);
}
-WRITE8_HANDLER( bnj_background_w )
+WRITE8_MEMBER(btime_state::bnj_background_w)
{
- btime_state *state = space->machine().driver_data<btime_state>();
- state->m_bnj_backgroundram[offset] = data;
+ m_bnj_backgroundram[offset] = data;
}
-WRITE8_HANDLER( bnj_scroll1_w )
+WRITE8_MEMBER(btime_state::bnj_scroll1_w)
{
- btime_state *state = space->machine().driver_data<btime_state>();
- state->m_bnj_scroll1 = data;
+ m_bnj_scroll1 = data;
}
-WRITE8_HANDLER( bnj_scroll2_w )
+WRITE8_MEMBER(btime_state::bnj_scroll2_w)
{
- btime_state *state = space->machine().driver_data<btime_state>();
- state->m_bnj_scroll2 = data;
+ m_bnj_scroll2 = data;
}
-WRITE8_HANDLER( btime_video_control_w )
+WRITE8_MEMBER(btime_state::btime_video_control_w)
{
// Btime video control
//
// Bit 0 = Flip screen
// Bit 1-7 = Unknown
- flip_screen_set(space->machine(), data & 0x01);
+ flip_screen_set(machine(), data & 0x01);
}
-WRITE8_HANDLER( bnj_video_control_w )
+WRITE8_MEMBER(btime_state::bnj_video_control_w)
{
/* Bnj/Lnc works a little differently than the btime/eggs (apparently). */
/* According to the information at: */
@@ -272,32 +262,30 @@ WRITE8_HANDLER( bnj_video_control_w )
/* For now we just check 0x40 in DSW1, and ignore the write if we */
/* are in upright controls mode. */
- if (input_port_read(space->machine(), "DSW1") & 0x40) /* cocktail mode */
+ if (input_port_read(machine(), "DSW1") & 0x40) /* cocktail mode */
btime_video_control_w(space, offset, data);
}
-WRITE8_HANDLER( zoar_video_control_w )
+WRITE8_MEMBER(btime_state::zoar_video_control_w)
{
- btime_state *state = space->machine().driver_data<btime_state>();
// Zoar video control
//
// Bit 0-2 = Unknown (always 0). Marked as MCOL on schematics
// Bit 3-4 = Palette
// Bit 7 = Flip Screen
- state->m_btime_palette = (data & 0x30) >> 3;
+ m_btime_palette = (data & 0x30) >> 3;
- if (input_port_read(space->machine(), "DSW1") & 0x40) /* cocktail mode */
- flip_screen_set(space->machine(), data & 0x80);
+ if (input_port_read(machine(), "DSW1") & 0x40) /* cocktail mode */
+ flip_screen_set(machine(), data & 0x80);
}
-WRITE8_HANDLER( disco_video_control_w )
+WRITE8_MEMBER(btime_state::disco_video_control_w)
{
- btime_state *state = space->machine().driver_data<btime_state>();
- state->m_btime_palette = (data >> 2) & 0x03;
+ m_btime_palette = (data >> 2) & 0x03;
- if (!(input_port_read(space->machine(), "DSW1") & 0x40)) /* cocktail mode */
- flip_screen_set(space->machine(), data & 0x01);
+ if (!(input_port_read(machine(), "DSW1") & 0x40)) /* cocktail mode */
+ flip_screen_set(machine(), data & 0x01);
}
diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c
index dbd3c3d091b..8c1cdec59bc 100644
--- a/src/mame/video/buggychl.c
+++ b/src/mame/video/buggychl.c
@@ -25,31 +25,27 @@ VIDEO_START( buggychl )
-WRITE8_HANDLER( buggychl_chargen_w )
+WRITE8_MEMBER(buggychl_state::buggychl_chargen_w)
{
- buggychl_state *state = space->machine().driver_data<buggychl_state>();
- if (state->m_charram[offset] != data)
+ if (m_charram[offset] != data)
{
- state->m_charram[offset] = data;
- gfx_element_mark_dirty(space->machine().gfx[0], (offset / 8) & 0xff);
+ m_charram[offset] = data;
+ gfx_element_mark_dirty(machine().gfx[0], (offset / 8) & 0xff);
}
}
-WRITE8_HANDLER( buggychl_sprite_lookup_bank_w )
+WRITE8_MEMBER(buggychl_state::buggychl_sprite_lookup_bank_w)
{
- buggychl_state *state = space->machine().driver_data<buggychl_state>();
- state->m_sl_bank = (data & 0x10) << 8;
+ m_sl_bank = (data & 0x10) << 8;
}
-WRITE8_HANDLER( buggychl_sprite_lookup_w )
+WRITE8_MEMBER(buggychl_state::buggychl_sprite_lookup_w)
{
- buggychl_state *state = space->machine().driver_data<buggychl_state>();
- state->m_sprite_lookup[offset + state->m_sl_bank] = data;
+ m_sprite_lookup[offset + m_sl_bank] = data;
}
-WRITE8_HANDLER( buggychl_ctrl_w )
+WRITE8_MEMBER(buggychl_state::buggychl_ctrl_w)
{
- buggychl_state *state = space->machine().driver_data<buggychl_state>();
/*
bit7 = lamp
bit6 = lockout
@@ -60,22 +56,21 @@ WRITE8_HANDLER( buggychl_ctrl_w )
bit0 = VINV
*/
- flip_screen_y_set(space->machine(), data & 0x01);
- flip_screen_x_set(space->machine(), data & 0x02);
+ flip_screen_y_set(machine(), data & 0x01);
+ flip_screen_x_set(machine(), data & 0x02);
- state->m_bg_on = data & 0x04;
- state->m_sky_on = data & 0x08;
+ m_bg_on = data & 0x04;
+ m_sky_on = data & 0x08;
- state->m_sprite_color_base = (data & 0x10) ? 1 * 16 : 3 * 16;
+ m_sprite_color_base = (data & 0x10) ? 1 * 16 : 3 * 16;
- coin_lockout_global_w(space->machine(), (~data & 0x40) >> 6);
- set_led_status(space->machine(), 0, ~data & 0x80);
+ coin_lockout_global_w(machine(), (~data & 0x40) >> 6);
+ set_led_status(machine(), 0, ~data & 0x80);
}
-WRITE8_HANDLER( buggychl_bg_scrollx_w )
+WRITE8_MEMBER(buggychl_state::buggychl_bg_scrollx_w)
{
- buggychl_state *state = space->machine().driver_data<buggychl_state>();
- state->m_bg_scrollx = -(data - 0x12);
+ m_bg_scrollx = -(data - 0x12);
}
diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c
index 98caa72f588..7af5477b269 100644
--- a/src/mame/video/bwing.c
+++ b/src/mame/video/bwing.c
@@ -55,89 +55,83 @@ const gfx_layout bwing_tilelayout =
};
-WRITE8_HANDLER( bwing_spriteram_w )
+WRITE8_MEMBER(bwing_state::bwing_spriteram_w)
{
- bwing_state *state = space->machine().driver_data<bwing_state>();
- state->m_spriteram[offset] = data;
+ m_spriteram[offset] = data;
}
-WRITE8_HANDLER( bwing_videoram_w )
+WRITE8_MEMBER(bwing_state::bwing_videoram_w)
{
- bwing_state *state = space->machine().driver_data<bwing_state>();
- state->m_videoram[offset] = data;
- state->m_charmap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_charmap->mark_tile_dirty(offset);
}
-READ8_HANDLER ( bwing_scrollram_r )
+READ8_MEMBER(bwing_state::bwing_scrollram_r)
{
- bwing_state *state = space->machine().driver_data<bwing_state>();
int offs;
- if (!state->m_srbank)
- offs = state->m_srxlat[offset];
+ if (!m_srbank)
+ offs = m_srxlat[offset];
else
offs = offset;
- return ((state->m_srbase[state->m_srbank])[offs]);
+ return ((m_srbase[m_srbank])[offs]);
}
-WRITE8_HANDLER( bwing_scrollram_w )
+WRITE8_MEMBER(bwing_state::bwing_scrollram_w)
{
- bwing_state *state = space->machine().driver_data<bwing_state>();
int offs;
- if (!state->m_srbank)
+ if (!m_srbank)
{
- offs = state->m_srxlat[offset];
+ offs = m_srxlat[offset];
if (offs >> 12)
- state->m_bgmap->mark_tile_dirty(offs & 0xfff);
+ m_bgmap->mark_tile_dirty(offs & 0xfff);
else
- state->m_fgmap->mark_tile_dirty(offs & 0xfff);
+ m_fgmap->mark_tile_dirty(offs & 0xfff);
}
else
{
offs = offset;
if (offset < 0x1000)
- gfx_element_mark_dirty(space->machine().gfx[2], offset / 32);
+ gfx_element_mark_dirty(machine().gfx[2], offset / 32);
else
- gfx_element_mark_dirty(space->machine().gfx[3], offset / 32);
+ gfx_element_mark_dirty(machine().gfx[3], offset / 32);
}
- (state->m_srbase[state->m_srbank])[offs] = data;
+ (m_srbase[m_srbank])[offs] = data;
}
-WRITE8_HANDLER( bwing_scrollreg_w )
+WRITE8_MEMBER(bwing_state::bwing_scrollreg_w)
{
- bwing_state *state = space->machine().driver_data<bwing_state>();
- state->m_sreg[offset] = data;
+ m_sreg[offset] = data;
switch (offset)
{
- case 6: state->m_palatch = data; break; // one of the palette components is latched through I/O(yike)
+ case 6: m_palatch = data; break; // one of the palette components is latched through I/O(yike)
case 7:
// tile graphics are decoded in RAM on the fly and tile codes are banked + interleaved(ouch)
- state->m_mapmask = data;
- state->m_srbank = data >> 6;
+ m_mapmask = data;
+ m_srbank = data >> 6;
#if BW_DEBUG
- logerror("(%s)%04x: w=%02x a=%04x f=%d\n", space->device().tag, cpu_get_pc(&space->device()), data, 0x1b00 + offset, space->machine().primary_screen->frame_number());
+ logerror("(%s)%04x: w=%02x a=%04x f=%d\n", device().tag, cpu_get_pc(&space.device()), data, 0x1b00 + offset, machine().primary_screen->frame_number());
#endif
break;
}
#if BW_DEBUG
- (space->machine().region(REGION_CPU1)->base())[0x1b10 + offset] = data;
+ (machine().region(REGION_CPU1)->base())[0x1b10 + offset] = data;
#endif
}
-WRITE8_HANDLER( bwing_paletteram_w )
+WRITE8_MEMBER(bwing_state::bwing_paletteram_w)
{
- bwing_state *state = space->machine().driver_data<bwing_state>();
static const float rgb[4][3] = {
{0.85f, 0.95f, 1.00f},
{0.90f, 1.00f, 1.00f},
@@ -146,17 +140,17 @@ WRITE8_HANDLER( bwing_paletteram_w )
};
int r, g, b, i;
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
r = ~data & 7;
g = ~(data >> 4) & 7;
- b = ~state->m_palatch & 7;
+ b = ~m_palatch & 7;
r = ((r << 5) + (r << 2) + (r >> 1));
g = ((g << 5) + (g << 2) + (g >> 1));
b = ((b << 5) + (b << 2) + (b >> 1));
- if ((i = input_port_read(space->machine(), "EXTRA")) < 4)
+ if ((i = input_port_read(machine(), "EXTRA")) < 4)
{
r = (float)r * rgb[i][0];
g = (float)g * rgb[i][1];
@@ -166,10 +160,10 @@ WRITE8_HANDLER( bwing_paletteram_w )
if (b > 0xff) b = 0xff;
}
- palette_set_color(space->machine(), offset, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), offset, MAKE_RGB(r, g, b));
#if BW_DEBUG
- state->m_paletteram[offset + 0x40] = state->m_palatch;
+ m_paletteram[offset + 0x40] = m_palatch;
#endif
}
diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c
index c7c608b8c28..e7e11a09e7b 100644
--- a/src/mame/video/cabal.c
+++ b/src/mame/video/cabal.c
@@ -56,31 +56,28 @@ VIDEO_START( cabal )
/**************************************************************************/
-WRITE16_HANDLER( cabal_flipscreen_w )
+WRITE16_MEMBER(cabal_state::cabal_flipscreen_w)
{
if (ACCESSING_BITS_0_7)
{
- cabal_state *state = space->machine().driver_data<cabal_state>();
int flip = (data & 0x20) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0;
- state->m_background_layer->set_flip(flip);
- state->m_text_layer->set_flip(flip);
+ m_background_layer->set_flip(flip);
+ m_text_layer->set_flip(flip);
- flip_screen_set(space->machine(), data & 0x20);
+ flip_screen_set(machine(), data & 0x20);
}
}
-WRITE16_HANDLER( cabal_background_videoram16_w )
+WRITE16_MEMBER(cabal_state::cabal_background_videoram16_w)
{
- cabal_state *state = space->machine().driver_data<cabal_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_background_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_background_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( cabal_text_videoram16_w )
+WRITE16_MEMBER(cabal_state::cabal_text_videoram16_w)
{
- cabal_state *state = space->machine().driver_data<cabal_state>();
- COMBINE_DATA(&state->m_colorram[offset]);
- state->m_text_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_colorram[offset]);
+ m_text_layer->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/calomega.c b/src/mame/video/calomega.c
index 66f866b2915..747953c625f 100644
--- a/src/mame/video/calomega.c
+++ b/src/mame/video/calomega.c
@@ -17,18 +17,16 @@
#include "includes/calomega.h"
-WRITE8_HANDLER( calomega_videoram_w )
+WRITE8_MEMBER(calomega_state::calomega_videoram_w)
{
- calomega_state *state = space->machine().driver_data<calomega_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( calomega_colorram_w )
+WRITE8_MEMBER(calomega_state::calomega_colorram_w)
{
- calomega_state *state = space->machine().driver_data<calomega_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c
index 52302a03054..df5634baaa6 100644
--- a/src/mame/video/canyon.c
+++ b/src/mame/video/canyon.c
@@ -8,11 +8,10 @@ Atari Canyon Bomber video emulation
#include "includes/canyon.h"
-WRITE8_HANDLER( canyon_videoram_w )
+WRITE8_MEMBER(canyon_state::canyon_videoram_w)
{
- canyon_state *state = space->machine().driver_data<canyon_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/capbowl.c b/src/mame/video/capbowl.c
index 1e733c05fe5..1c5066a6761 100644
--- a/src/mame/video/capbowl.c
+++ b/src/mame/video/capbowl.c
@@ -52,9 +52,8 @@ VIDEO_START( capbowl )
*
*************************************/
-WRITE8_HANDLER( capbowl_tms34061_w )
+WRITE8_MEMBER(capbowl_state::capbowl_tms34061_w)
{
- capbowl_state *state = space->machine().driver_data<capbowl_state>();
int func = (offset >> 8) & 3;
int col = offset & 0xff;
@@ -64,13 +63,12 @@ WRITE8_HANDLER( capbowl_tms34061_w )
col ^= 2;
/* Row address (RA0-RA8) is not dependent on the offset */
- tms34061_w(space, col, *state->m_rowaddress, func, data);
+ tms34061_w(&space, col, *m_rowaddress, func, data);
}
-READ8_HANDLER( capbowl_tms34061_r )
+READ8_MEMBER(capbowl_state::capbowl_tms34061_r)
{
- capbowl_state *state = space->machine().driver_data<capbowl_state>();
int func = (offset >> 8) & 3;
int col = offset & 0xff;
@@ -80,7 +78,7 @@ READ8_HANDLER( capbowl_tms34061_r )
col ^= 2;
/* Row address (RA0-RA8) is not dependent on the offset */
- return tms34061_r(space, col, *state->m_rowaddress, func);
+ return tms34061_r(&space, col, *m_rowaddress, func);
}
@@ -91,35 +89,33 @@ READ8_HANDLER( capbowl_tms34061_r )
*
*************************************/
-WRITE8_HANDLER( bowlrama_blitter_w )
+WRITE8_MEMBER(capbowl_state::bowlrama_blitter_w)
{
- capbowl_state *state = space->machine().driver_data<capbowl_state>();
switch (offset)
{
case 0x08: /* Write address high byte (only 2 bits used) */
- state->m_blitter_addr = (state->m_blitter_addr & ~0xff0000) | (data << 16);
+ m_blitter_addr = (m_blitter_addr & ~0xff0000) | (data << 16);
break;
case 0x17: /* Write address mid byte (8 bits) */
- state->m_blitter_addr = (state->m_blitter_addr & ~0x00ff00) | (data << 8);
+ m_blitter_addr = (m_blitter_addr & ~0x00ff00) | (data << 8);
break;
case 0x18: /* Write Address low byte (8 bits) */
- state->m_blitter_addr = (state->m_blitter_addr & ~0x0000ff) | (data << 0);
+ m_blitter_addr = (m_blitter_addr & ~0x0000ff) | (data << 0);
break;
default:
- logerror("PC=%04X Write to unsupported blitter address %02X Data=%02X\n", cpu_get_pc(&space->device()), offset, data);
+ logerror("PC=%04X Write to unsupported blitter address %02X Data=%02X\n", cpu_get_pc(&space.device()), offset, data);
break;
}
}
-READ8_HANDLER( bowlrama_blitter_r )
+READ8_MEMBER(capbowl_state::bowlrama_blitter_r)
{
- capbowl_state *state = space->machine().driver_data<capbowl_state>();
- UINT8 data = space->machine().region("gfx1")->base()[state->m_blitter_addr];
+ UINT8 data = machine().region("gfx1")->base()[m_blitter_addr];
UINT8 result = 0;
switch (offset)
@@ -138,11 +134,11 @@ READ8_HANDLER( bowlrama_blitter_r )
/* Read data and increment address */
case 4:
result = data;
- state->m_blitter_addr = (state->m_blitter_addr + 1) & 0x3ffff;
+ m_blitter_addr = (m_blitter_addr + 1) & 0x3ffff;
break;
default:
- logerror("PC=%04X Read from unsupported blitter address %02X\n", cpu_get_pc(&space->device()), offset);
+ logerror("PC=%04X Read from unsupported blitter address %02X\n", cpu_get_pc(&space.device()), offset);
break;
}
diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c
index 8f5895e3df8..767fcabca52 100644
--- a/src/mame/video/carjmbre.c
+++ b/src/mame/video/carjmbre.c
@@ -42,45 +42,42 @@ PALETTE_INIT( carjmbre )
-WRITE8_HANDLER( carjmbre_flipscreen_w )
+WRITE8_MEMBER(carjmbre_state::carjmbre_flipscreen_w)
{
- carjmbre_state *state = space->machine().driver_data<carjmbre_state>();
- state->m_flipscreen = (data & 1) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0;
- space->machine().tilemap().set_flip_all(state->m_flipscreen);
+ m_flipscreen = (data & 1) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0;
+ machine().tilemap().set_flip_all(m_flipscreen);
}
-WRITE8_HANDLER( carjmbre_bgcolor_w )
+WRITE8_MEMBER(carjmbre_state::carjmbre_bgcolor_w)
{
- carjmbre_state *state = space->machine().driver_data<carjmbre_state>();
data = ~data & 0x3f;
- if (data != state->m_bgcolor)
+ if (data != m_bgcolor)
{
int i;
- state->m_bgcolor = data;
+ m_bgcolor = data;
if (data & 3)
for (i = 0; i < 64; i += 4)
- palette_set_color(space->machine(), i, palette_get_color(space->machine(), data));
+ palette_set_color(machine(), i, palette_get_color(machine(), data));
else
// restore to initial state (black)
for (i = 0; i < 64; i += 4)
- palette_set_color(space->machine(), i, RGB_BLACK);
+ palette_set_color(machine(), i, RGB_BLACK);
}
}
-WRITE8_HANDLER( carjmbre_8806_w )
+WRITE8_MEMBER(carjmbre_state::carjmbre_8806_w)
{
// unknown, gets updated at same time as carjmbre_bgcolor_w
}
-WRITE8_HANDLER( carjmbre_videoram_w )
+WRITE8_MEMBER(carjmbre_state::carjmbre_videoram_w)
{
- carjmbre_state *state = space->machine().driver_data<carjmbre_state>();
- state->m_videoram[offset] = data;
- state->m_cj_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_videoram[offset] = data;
+ m_cj_tilemap->mark_tile_dirty(offset & 0x3ff);
}
diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c
index 9e631704b1a..4a5b28316a2 100644
--- a/src/mame/video/cave.c
+++ b/src/mame/video/cave.c
@@ -352,15 +352,15 @@ static TILE_GET_INFO( get_tile_info_1 ) { get_tile_info(machine, tileinfo, tile_
static TILE_GET_INFO( get_tile_info_2 ) { get_tile_info(machine, tileinfo, tile_index, 2); }
static TILE_GET_INFO( get_tile_info_3 ) { get_tile_info(machine, tileinfo, tile_index, 3); }
-WRITE16_HANDLER( cave_vram_0_w ) { vram_w(space, offset, data, mem_mask, 0); }
-WRITE16_HANDLER( cave_vram_1_w ) { vram_w(space, offset, data, mem_mask, 1); }
-WRITE16_HANDLER( cave_vram_2_w ) { vram_w(space, offset, data, mem_mask, 2); }
-WRITE16_HANDLER( cave_vram_3_w ) { vram_w(space, offset, data, mem_mask, 3); }
-
-WRITE16_HANDLER( cave_vram_0_8x8_w ) { vram_8x8_w(space, offset, data, mem_mask, 0); }
-WRITE16_HANDLER( cave_vram_1_8x8_w ) { vram_8x8_w(space, offset, data, mem_mask, 1); }
-WRITE16_HANDLER( cave_vram_2_8x8_w ) { vram_8x8_w(space, offset, data, mem_mask, 2); }
-WRITE16_HANDLER( cave_vram_3_8x8_w ) { vram_8x8_w(space, offset, data, mem_mask, 3); }
+WRITE16_MEMBER(cave_state::cave_vram_0_w){ vram_w(&space, offset, data, mem_mask, 0); }
+WRITE16_MEMBER(cave_state::cave_vram_1_w){ vram_w(&space, offset, data, mem_mask, 1); }
+WRITE16_MEMBER(cave_state::cave_vram_2_w){ vram_w(&space, offset, data, mem_mask, 2); }
+WRITE16_MEMBER(cave_state::cave_vram_3_w){ vram_w(&space, offset, data, mem_mask, 3); }
+
+WRITE16_MEMBER(cave_state::cave_vram_0_8x8_w){ vram_8x8_w(&space, offset, data, mem_mask, 0); }
+WRITE16_MEMBER(cave_state::cave_vram_1_8x8_w){ vram_8x8_w(&space, offset, data, mem_mask, 1); }
+WRITE16_MEMBER(cave_state::cave_vram_2_8x8_w){ vram_8x8_w(&space, offset, data, mem_mask, 2); }
+WRITE16_MEMBER(cave_state::cave_vram_3_8x8_w){ vram_8x8_w(&space, offset, data, mem_mask, 3); }
/***************************************************************************
diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c
index 39cdbc5e7e6..42e9748b32b 100644
--- a/src/mame/video/cbasebal.c
+++ b/src/mame/video/cbasebal.c
@@ -62,78 +62,71 @@ VIDEO_START( cbasebal )
***************************************************************************/
-WRITE8_HANDLER( cbasebal_textram_w )
+WRITE8_MEMBER(cbasebal_state::cbasebal_textram_w)
{
- cbasebal_state *state = space->machine().driver_data<cbasebal_state>();
- state->m_textram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_textram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-READ8_HANDLER( cbasebal_textram_r )
+READ8_MEMBER(cbasebal_state::cbasebal_textram_r)
{
- cbasebal_state *state = space->machine().driver_data<cbasebal_state>();
- return state->m_textram[offset];
+ return m_textram[offset];
}
-WRITE8_HANDLER( cbasebal_scrollram_w )
+WRITE8_MEMBER(cbasebal_state::cbasebal_scrollram_w)
{
- cbasebal_state *state = space->machine().driver_data<cbasebal_state>();
- state->m_scrollram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_scrollram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-READ8_HANDLER( cbasebal_scrollram_r )
+READ8_MEMBER(cbasebal_state::cbasebal_scrollram_r)
{
- cbasebal_state *state = space->machine().driver_data<cbasebal_state>();
- return state->m_scrollram[offset];
+ return m_scrollram[offset];
}
-WRITE8_HANDLER( cbasebal_gfxctrl_w )
+WRITE8_MEMBER(cbasebal_state::cbasebal_gfxctrl_w)
{
- cbasebal_state *state = space->machine().driver_data<cbasebal_state>();
/* bit 0 is unknown - toggles continuously */
/* bit 1 is flip screen */
- state->m_flipscreen = data & 0x02;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen = data & 0x02;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
/* bit 2 is unknown - unused? */
/* bit 3 is tile bank */
- if (state->m_tilebank != ((data & 0x08) >> 3))
+ if (m_tilebank != ((data & 0x08) >> 3))
{
- state->m_tilebank = (data & 0x08) >> 3;
- state->m_bg_tilemap->mark_all_dirty();
+ m_tilebank = (data & 0x08) >> 3;
+ m_bg_tilemap->mark_all_dirty();
}
/* bit 4 is sprite bank */
- state->m_spritebank = (data & 0x10) >> 4;
+ m_spritebank = (data & 0x10) >> 4;
/* bits 5 is text enable */
- state->m_text_on = ~data & 0x20;
+ m_text_on = ~data & 0x20;
/* bits 6-7 are bg/sprite enable (don't know which is which) */
- state->m_bg_on = ~data & 0x40;
- state->m_obj_on = ~data & 0x80;
+ m_bg_on = ~data & 0x40;
+ m_obj_on = ~data & 0x80;
/* other bits unknown, but used */
}
-WRITE8_HANDLER( cbasebal_scrollx_w )
+WRITE8_MEMBER(cbasebal_state::cbasebal_scrollx_w)
{
- cbasebal_state *state = space->machine().driver_data<cbasebal_state>();
- state->m_scroll_x[offset] = data;
- state->m_bg_tilemap->set_scrollx(0, state->m_scroll_x[0] + 256 * state->m_scroll_x[1]);
+ m_scroll_x[offset] = data;
+ m_bg_tilemap->set_scrollx(0, m_scroll_x[0] + 256 * m_scroll_x[1]);
}
-WRITE8_HANDLER( cbasebal_scrolly_w )
+WRITE8_MEMBER(cbasebal_state::cbasebal_scrolly_w)
{
- cbasebal_state *state = space->machine().driver_data<cbasebal_state>();
- state->m_scroll_y[offset] = data;
- state->m_bg_tilemap->set_scrolly(0, state->m_scroll_y[0] + 256 * state->m_scroll_y[1]);
+ m_scroll_y[offset] = data;
+ m_bg_tilemap->set_scrolly(0, m_scroll_y[0] + 256 * m_scroll_y[1]);
}
diff --git a/src/mame/video/cbuster.c b/src/mame/video/cbuster.c
index c8a14877ddc..f7641087370 100644
--- a/src/mame/video/cbuster.c
+++ b/src/mame/video/cbuster.c
@@ -25,18 +25,16 @@ static void update_24bitcol( running_machine &machine, int offset )
palette_set_color(machine, offset, MAKE_RGB(r, g, b));
}
-WRITE16_HANDLER( twocrude_palette_24bit_rg_w )
+WRITE16_MEMBER(cbuster_state::twocrude_palette_24bit_rg_w)
{
- cbuster_state *state = space->machine().driver_data<cbuster_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- update_24bitcol(space->machine(), offset);
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ update_24bitcol(machine(), offset);
}
-WRITE16_HANDLER( twocrude_palette_24bit_b_w )
+WRITE16_MEMBER(cbuster_state::twocrude_palette_24bit_b_w)
{
- cbuster_state *state = space->machine().driver_data<cbuster_state>();
- COMBINE_DATA(&state->m_generic_paletteram2_16[offset]);
- update_24bitcol(space->machine(), offset);
+ COMBINE_DATA(&m_generic_paletteram2_16[offset]);
+ update_24bitcol(machine(), offset);
}
diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c
index 22cecc6f6e1..a095ddc3b68 100644
--- a/src/mame/video/ccastles.c
+++ b/src/mame/video/ccastles.c
@@ -49,26 +49,23 @@ VIDEO_START( ccastles )
*
*************************************/
-WRITE8_HANDLER( ccastles_hscroll_w )
+WRITE8_MEMBER(ccastles_state::ccastles_hscroll_w)
{
- ccastles_state *state = space->machine().driver_data<ccastles_state>();
- space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos());
- state->m_hscroll = data;
+ machine().primary_screen->update_partial(machine().primary_screen->vpos());
+ m_hscroll = data;
}
-WRITE8_HANDLER( ccastles_vscroll_w )
+WRITE8_MEMBER(ccastles_state::ccastles_vscroll_w)
{
- ccastles_state *state = space->machine().driver_data<ccastles_state>();
- state->m_vscroll = data;
+ m_vscroll = data;
}
-WRITE8_HANDLER( ccastles_video_control_w )
+WRITE8_MEMBER(ccastles_state::ccastles_video_control_w)
{
- ccastles_state *state = space->machine().driver_data<ccastles_state>();
/* only D3 matters */
- state->m_video_control[offset] = (data >> 3) & 1;
+ m_video_control[offset] = (data >> 3) & 1;
}
@@ -79,9 +76,8 @@ WRITE8_HANDLER( ccastles_video_control_w )
*
*************************************/
-WRITE8_HANDLER( ccastles_paletteram_w )
+WRITE8_MEMBER(ccastles_state::ccastles_paletteram_w)
{
- ccastles_state *state = space->machine().driver_data<ccastles_state>();
int bit0, bit1, bit2;
int r, g, b;
@@ -94,21 +90,21 @@ WRITE8_HANDLER( ccastles_paletteram_w )
bit0 = (~r >> 0) & 0x01;
bit1 = (~r >> 1) & 0x01;
bit2 = (~r >> 2) & 0x01;
- r = combine_3_weights(state->m_rweights, bit0, bit1, bit2);
+ r = combine_3_weights(m_rweights, bit0, bit1, bit2);
/* green component (inverted) */
bit0 = (~g >> 0) & 0x01;
bit1 = (~g >> 1) & 0x01;
bit2 = (~g >> 2) & 0x01;
- g = combine_3_weights(state->m_gweights, bit0, bit1, bit2);
+ g = combine_3_weights(m_gweights, bit0, bit1, bit2);
/* blue component (inverted) */
bit0 = (~b >> 0) & 0x01;
bit1 = (~b >> 1) & 0x01;
bit2 = (~b >> 2) & 0x01;
- b = combine_3_weights(state->m_bweights, bit0, bit1, bit2);
+ b = combine_3_weights(m_bweights, bit0, bit1, bit2);
- palette_set_color(space->machine(), offset & 0x1f, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), offset & 0x1f, MAKE_RGB(r, g, b));
}
@@ -198,10 +194,10 @@ INLINE void bitmode_autoinc( running_machine &machine )
*
*************************************/
-WRITE8_HANDLER( ccastles_videoram_w )
+WRITE8_MEMBER(ccastles_state::ccastles_videoram_w)
{
/* direct writes to VRAM go through the write protect PROM as well */
- ccastles_write_vram(space->machine(), offset, data, 0, 0);
+ ccastles_write_vram(machine(), offset, data, 0, 0);
}
@@ -212,49 +208,46 @@ WRITE8_HANDLER( ccastles_videoram_w )
*
*************************************/
-READ8_HANDLER( ccastles_bitmode_r )
+READ8_MEMBER(ccastles_state::ccastles_bitmode_r)
{
- ccastles_state *state = space->machine().driver_data<ccastles_state>();
/* in bitmode, the address comes from the autoincrement latches */
- UINT16 addr = (state->m_bitmode_addr[1] << 7) | (state->m_bitmode_addr[0] >> 1);
+ UINT16 addr = (m_bitmode_addr[1] << 7) | (m_bitmode_addr[0] >> 1);
/* the appropriate pixel is selected into the upper 4 bits */
- UINT8 result = state->m_videoram[addr] << ((~state->m_bitmode_addr[0] & 1) * 4);
+ UINT8 result = m_videoram[addr] << ((~m_bitmode_addr[0] & 1) * 4);
/* autoincrement because /BITMD was selected */
- bitmode_autoinc(space->machine());
+ bitmode_autoinc(machine());
/* the low 4 bits of the data lines are not driven so make them all 1's */
return result | 0x0f;
}
-WRITE8_HANDLER( ccastles_bitmode_w )
+WRITE8_MEMBER(ccastles_state::ccastles_bitmode_w)
{
- ccastles_state *state = space->machine().driver_data<ccastles_state>();
/* in bitmode, the address comes from the autoincrement latches */
- UINT16 addr = (state->m_bitmode_addr[1] << 7) | (state->m_bitmode_addr[0] >> 1);
+ UINT16 addr = (m_bitmode_addr[1] << 7) | (m_bitmode_addr[0] >> 1);
/* the upper 4 bits of data are replicated to the lower 4 bits */
data = (data & 0xf0) | (data >> 4);
/* write through the generic VRAM routine, passing the low 2 X bits as PIXB/PIXA */
- ccastles_write_vram(space->machine(), addr, data, 1, state->m_bitmode_addr[0] & 3);
+ ccastles_write_vram(machine(), addr, data, 1, m_bitmode_addr[0] & 3);
/* autoincrement because /BITMD was selected */
- bitmode_autoinc(space->machine());
+ bitmode_autoinc(machine());
}
-WRITE8_HANDLER( ccastles_bitmode_addr_w )
+WRITE8_MEMBER(ccastles_state::ccastles_bitmode_addr_w)
{
- ccastles_state *state = space->machine().driver_data<ccastles_state>();
/* write through to video RAM and also to the addressing latches */
- ccastles_write_vram(space->machine(), offset, data, 0, 0);
- state->m_bitmode_addr[offset] = data;
+ ccastles_write_vram(machine(), offset, data, 0, 0);
+ m_bitmode_addr[offset] = data;
}
diff --git a/src/mame/video/cchasm.c b/src/mame/video/cchasm.c
index 2fd656f48b0..ac6ea3317d6 100644
--- a/src/mame/video/cchasm.c
+++ b/src/mame/video/cchasm.c
@@ -103,17 +103,17 @@ static void cchasm_refresh (running_machine &machine)
}
-WRITE16_HANDLER( cchasm_refresh_control_w )
+WRITE16_MEMBER(cchasm_state::cchasm_refresh_control_w)
{
if (ACCESSING_BITS_8_15)
{
switch (data >> 8)
{
case 0x37:
- cchasm_refresh(space->machine());
+ cchasm_refresh(machine());
break;
case 0xf7:
- cputag_set_input_line (space->machine(), "maincpu", 2, CLEAR_LINE);
+ cputag_set_input_line (machine(), "maincpu", 2, CLEAR_LINE);
break;
}
}
diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c
index 58cb7f43a38..f630445f68e 100644
--- a/src/mame/video/cclimber.c
+++ b/src/mame/video/cclimber.c
@@ -325,20 +325,18 @@ static void swimmer_set_background_pen(running_machine &machine)
-WRITE8_HANDLER( cclimber_colorram_w )
+WRITE8_MEMBER(cclimber_state::cclimber_colorram_w)
{
- cclimber_state *state = space->machine().driver_data<cclimber_state>();
/* A5 is not connected, there is only 0x200 bytes of RAM */
- state->m_colorram[offset & ~0x20] = data;
- state->m_colorram[offset | 0x20] = data;
+ m_colorram[offset & ~0x20] = data;
+ m_colorram[offset | 0x20] = data;
}
-WRITE8_HANDLER( cannonb_flip_screen_w )
+WRITE8_MEMBER(cclimber_state::cannonb_flip_screen_w)
{
- cclimber_state *state = space->machine().driver_data<cclimber_state>();
- state->m_flip_screen[0] = data;
- state->m_flip_screen[1] = data;
+ m_flip_screen[0] = data;
+ m_flip_screen[1] = data;
}
diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c
index 9228e85e880..913fcf22b3e 100644
--- a/src/mame/video/centiped.c
+++ b/src/mame/video/centiped.c
@@ -147,13 +147,12 @@ VIDEO_START( bullsdrt )
*
*************************************/
-WRITE8_HANDLER( centiped_videoram_w )
+WRITE8_MEMBER(centiped_state::centiped_videoram_w)
{
- centiped_state *state = space->machine().driver_data<centiped_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
@@ -164,11 +163,10 @@ WRITE8_HANDLER( centiped_videoram_w )
*
*************************************/
-WRITE8_HANDLER( centiped_flip_screen_w )
+WRITE8_MEMBER(centiped_state::centiped_flip_screen_w)
{
- centiped_state *state = space->machine().driver_data<centiped_state>();
- state->m_flipscreen = data >> 7;
+ m_flipscreen = data >> 7;
}
@@ -179,12 +177,11 @@ WRITE8_HANDLER( centiped_flip_screen_w )
*
*************************************/
-WRITE8_HANDLER( bullsdrt_tilesbank_w )
+WRITE8_MEMBER(centiped_state::bullsdrt_tilesbank_w)
{
- centiped_state *state = space->machine().driver_data<centiped_state>();
- state->m_bullsdrt_tiles_bankram[offset] = data;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bullsdrt_tiles_bankram[offset] = data;
+ m_bg_tilemap->mark_all_dirty();
}
@@ -195,11 +192,10 @@ WRITE8_HANDLER( bullsdrt_tilesbank_w )
*
*************************************/
-WRITE8_HANDLER( bullsdrt_sprites_bank_w )
+WRITE8_MEMBER(centiped_state::bullsdrt_sprites_bank_w)
{
- centiped_state *state = space->machine().driver_data<centiped_state>();
- state->m_bullsdrt_sprites_bank = data;
+ m_bullsdrt_sprites_bank = data;
}
@@ -227,10 +223,9 @@ WRITE8_HANDLER( bullsdrt_sprites_bank_w )
***************************************************************************/
-WRITE8_HANDLER( centiped_paletteram_w )
+WRITE8_MEMBER(centiped_state::centiped_paletteram_w)
{
- centiped_state *state = space->machine().driver_data<centiped_state>();
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
/* bit 2 of the output palette RAM is always pulled high, so we ignore */
/* any palette changes unless the write is to a palette RAM address */
@@ -255,7 +250,7 @@ WRITE8_HANDLER( centiped_paletteram_w )
/* character colors, set directly */
if ((offset & 0x08) == 0)
- palette_set_color(space->machine(), offset & 0x03, color);
+ palette_set_color(machine(), offset & 0x03, color);
/* sprite colors - set all the applicable ones */
else
@@ -267,13 +262,13 @@ WRITE8_HANDLER( centiped_paletteram_w )
for (i = 0; i < 0x100; i += 4)
{
if (offset == ((i >> 2) & 0x03))
- palette_set_color(space->machine(), i + 4 + 1, color);
+ palette_set_color(machine(), i + 4 + 1, color);
if (offset == ((i >> 4) & 0x03))
- palette_set_color(space->machine(), i + 4 + 2, color);
+ palette_set_color(machine(), i + 4 + 2, color);
if (offset == ((i >> 6) & 0x03))
- palette_set_color(space->machine(), i + 4 + 3, color);
+ palette_set_color(machine(), i + 4 + 3, color);
}
}
}
@@ -406,22 +401,20 @@ static void melliped_mazeinv_set_color(running_machine &machine, offs_t offset,
}
-WRITE8_HANDLER( milliped_paletteram_w )
+WRITE8_MEMBER(centiped_state::milliped_paletteram_w)
{
- centiped_state *state = space->machine().driver_data<centiped_state>();
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
- melliped_mazeinv_set_color(space->machine(), offset, data);
+ melliped_mazeinv_set_color(machine(), offset, data);
}
-WRITE8_HANDLER( mazeinv_paletteram_w )
+WRITE8_MEMBER(centiped_state::mazeinv_paletteram_w)
{
- centiped_state *state = space->machine().driver_data<centiped_state>();
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
/* the value passed in is a look-up index into the color PROM */
- melliped_mazeinv_set_color(space->machine(), offset, ~space->machine().region("proms")->base()[~data & 0x0f]);
+ melliped_mazeinv_set_color(machine(), offset, ~machine().region("proms")->base()[~data & 0x0f]);
}
diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c
index c209e3a7d9c..d077476b6e4 100644
--- a/src/mame/video/chaknpop.c
+++ b/src/mame/video/chaknpop.c
@@ -67,58 +67,54 @@ static void tx_tilemap_mark_all_dirty( running_machine &machine )
state->m_tx_tilemap->set_flip(state->m_flip_x | state->m_flip_y);
}
-READ8_HANDLER( chaknpop_gfxmode_r )
+READ8_MEMBER(chaknpop_state::chaknpop_gfxmode_r)
{
- chaknpop_state *state = space->machine().driver_data<chaknpop_state>();
- return state->m_gfxmode;
+ return m_gfxmode;
}
-WRITE8_HANDLER( chaknpop_gfxmode_w )
+WRITE8_MEMBER(chaknpop_state::chaknpop_gfxmode_w)
{
- chaknpop_state *state = space->machine().driver_data<chaknpop_state>();
- if (state->m_gfxmode != data)
+ if (m_gfxmode != data)
{
int all_dirty = 0;
- state->m_gfxmode = data;
- memory_set_bank(space->machine(), "bank1", (state->m_gfxmode & GFX_VRAM_BANK) ? 1 : 0); /* Select 2 banks of 16k */
+ m_gfxmode = data;
+ memory_set_bank(machine(), "bank1", (m_gfxmode & GFX_VRAM_BANK) ? 1 : 0); /* Select 2 banks of 16k */
- if (state->m_flip_x != (state->m_gfxmode & GFX_FLIP_X))
+ if (m_flip_x != (m_gfxmode & GFX_FLIP_X))
{
- state->m_flip_x = state->m_gfxmode & GFX_FLIP_X;
+ m_flip_x = m_gfxmode & GFX_FLIP_X;
all_dirty = 1;
}
- if (state->m_flip_y != (state->m_gfxmode & GFX_FLIP_Y))
+ if (m_flip_y != (m_gfxmode & GFX_FLIP_Y))
{
- state->m_flip_y = state->m_gfxmode & GFX_FLIP_Y;
+ m_flip_y = m_gfxmode & GFX_FLIP_Y;
all_dirty = 1;
}
if (all_dirty)
- tx_tilemap_mark_all_dirty(space->machine());
+ tx_tilemap_mark_all_dirty(machine());
}
}
-WRITE8_HANDLER( chaknpop_txram_w )
+WRITE8_MEMBER(chaknpop_state::chaknpop_txram_w)
{
- chaknpop_state *state = space->machine().driver_data<chaknpop_state>();
- state->m_tx_ram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ m_tx_ram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( chaknpop_attrram_w )
+WRITE8_MEMBER(chaknpop_state::chaknpop_attrram_w)
{
- chaknpop_state *state = space->machine().driver_data<chaknpop_state>();
- if (state->m_attr_ram[offset] != data)
+ if (m_attr_ram[offset] != data)
{
- state->m_attr_ram[offset] = data;
+ m_attr_ram[offset] = data;
if (offset == TX_COLOR1 || offset == TX_COLOR2)
- tx_tilemap_mark_all_dirty(space->machine());
+ tx_tilemap_mark_all_dirty(machine());
}
}
diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c
index 469ce7705c7..b5187117212 100644
--- a/src/mame/video/champbas.c
+++ b/src/mame/video/champbas.c
@@ -161,34 +161,31 @@ VIDEO_START( exctsccr )
-WRITE8_HANDLER( champbas_bg_videoram_w )
+WRITE8_MEMBER(champbas_state::champbas_bg_videoram_w)
{
- champbas_state *state = space->machine().driver_data<champbas_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( champbas_gfxbank_w )
+WRITE8_MEMBER(champbas_state::champbas_gfxbank_w)
{
- champbas_state *state = space->machine().driver_data<champbas_state>();
data &= 1;
- if (state->m_gfx_bank != data)
+ if (m_gfx_bank != data)
{
- state->m_gfx_bank = data;
- state->m_bg_tilemap->mark_all_dirty();
+ m_gfx_bank = data;
+ m_bg_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( champbas_palette_bank_w )
+WRITE8_MEMBER(champbas_state::champbas_palette_bank_w)
{
- champbas_state *state = space->machine().driver_data<champbas_state>();
- state->m_palette_bank = data & 1;
- state->m_bg_tilemap->set_palette_offset(state->m_palette_bank << 8);
+ m_palette_bank = data & 1;
+ m_bg_tilemap->set_palette_offset(m_palette_bank << 8);
}
-WRITE8_HANDLER( champbas_flipscreen_w )
+WRITE8_MEMBER(champbas_state::champbas_flipscreen_w)
{
- flip_screen_set(space->machine(), ~data & 1);
+ flip_screen_set(machine(), ~data & 1);
}
diff --git a/src/mame/video/changela.c b/src/mame/video/changela.c
index 959ba5f1dd9..7ef399b2511 100644
--- a/src/mame/video/changela.c
+++ b/src/mame/video/changela.c
@@ -734,7 +734,7 @@ SCREEN_UPDATE_IND16( changela )
return 0;
}
-WRITE8_HANDLER( changela_colors_w )
+WRITE8_MEMBER(changela_state::changela_colors_w)
{
/* Each color is combined from 3 bits from open-colelctor outputs of ram.
Each of the bits is connected to a 220, 470, or 1000 Ohm resistor.
@@ -767,57 +767,52 @@ WRITE8_HANDLER( changela_colors_w )
g = color_table[(c >> 3) & 0x07];
b = color_table[(c >> 6) & 0x07];
- palette_set_color_rgb(space->machine(),color_index,r,g,b);
+ palette_set_color_rgb(machine(),color_index,r,g,b);
}
-WRITE8_HANDLER( changela_mem_device_select_w )
+WRITE8_MEMBER(changela_state::changela_mem_device_select_w)
{
- changela_state *state = space->machine().driver_data<changela_state>();
- state->m_mem_dev_selected = (data & 0x07) * 0x800;
- state->m_tree_en = (data & 0x30) >> 4;
+ m_mem_dev_selected = (data & 0x07) * 0x800;
+ m_tree_en = (data & 0x30) >> 4;
/*
(data & 0x07) possible settings:
0 - not connected (no device)
- 1 - ADR1 is 2114 RAM at U59 (state space->machine()) (accessible range: 0x0000-0x003f)
+ 1 - ADR1 is 2114 RAM at U59 (state machine()) (accessible range: 0x0000-0x003f)
2 - ADR2 is 2128 RAM at U109 (River RAM) (accessible range: 0x0000-0x07ff)
3 - ADR3 is 2128 RAM at U114 (Tree RAM) (accessible range: 0x0000-0x07ff)
4 - ADR4 is 2732 ROM at U7 (Tree ROM) (accessible range: 0x0000-0x07ff)
- 5 - SLOPE is ROM at U44 (state space->machine()) (accessible range: 0x0000-0x07ff)
+ 5 - SLOPE is ROM at U44 (state machine()) (accessible range: 0x0000-0x07ff)
*/
}
-WRITE8_HANDLER( changela_mem_device_w )
+WRITE8_MEMBER(changela_state::changela_mem_device_w)
{
- changela_state *state = space->machine().driver_data<changela_state>();
- state->m_memory_devices[state->m_mem_dev_selected + offset] = data;
+ m_memory_devices[m_mem_dev_selected + offset] = data;
- if (state->m_mem_dev_selected == 0x800)
+ if (m_mem_dev_selected == 0x800)
{
- state->m_memory_devices[state->m_mem_dev_selected + 0x40 + offset] = data;
- state->m_memory_devices[state->m_mem_dev_selected + 0x80 + offset] = data;
+ m_memory_devices[m_mem_dev_selected + 0x40 + offset] = data;
+ m_memory_devices[m_mem_dev_selected + 0x80 + offset] = data;
}
}
-READ8_HANDLER( changela_mem_device_r )
+READ8_MEMBER(changela_state::changela_mem_device_r)
{
- changela_state *state = space->machine().driver_data<changela_state>();
- return state->m_memory_devices[state->m_mem_dev_selected + offset];
+ return m_memory_devices[m_mem_dev_selected + offset];
}
-WRITE8_HANDLER( changela_slope_rom_addr_hi_w )
+WRITE8_MEMBER(changela_state::changela_slope_rom_addr_hi_w)
{
- changela_state *state = space->machine().driver_data<changela_state>();
- state->m_slopeROM_bank = (data & 0x03) << 9;
+ m_slopeROM_bank = (data & 0x03) << 9;
}
-WRITE8_HANDLER( changela_slope_rom_addr_lo_w )
+WRITE8_MEMBER(changela_state::changela_slope_rom_addr_lo_w)
{
- changela_state *state = space->machine().driver_data<changela_state>();
- state->m_horizon = data;
+ m_horizon = data;
}
diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c
index e826fb2ae5d..e09ba4d4f9b 100644
--- a/src/mame/video/cheekyms.c
+++ b/src/mame/video/cheekyms.c
@@ -39,27 +39,25 @@ PALETTE_INIT( cheekyms )
}
-WRITE8_HANDLER( cheekyms_port_40_w )
+WRITE8_MEMBER(cheekyms_state::cheekyms_port_40_w)
{
- cheekyms_state *state = space->machine().driver_data<cheekyms_state>();
/* the lower bits probably trigger sound samples */
- dac_data_w(state->m_dac, data ? 0x80 : 0);
+ dac_data_w(m_dac, data ? 0x80 : 0);
}
-WRITE8_HANDLER( cheekyms_port_80_w )
+WRITE8_MEMBER(cheekyms_state::cheekyms_port_80_w)
{
- cheekyms_state *state = space->machine().driver_data<cheekyms_state>();
/* d0-d1 - sound enables, not sure which bit is which */
/* d3-d5 - man scroll amount */
/* d6 - palette select (selects either 0 = PROM M9, 1 = PROM M8) */
/* d7 - screen flip */
- *state->m_port_80 = data;
+ *m_port_80 = data;
/* d2 - interrupt enable */
- state->m_irq_mask = data & 4;
+ m_irq_mask = data & 4;
}
diff --git a/src/mame/video/cinemat.c b/src/mame/video/cinemat.c
index b4020bcc70c..066836b9f2c 100644
--- a/src/mame/video/cinemat.c
+++ b/src/mame/video/cinemat.c
@@ -69,46 +69,45 @@ void cinemat_vector_callback(device_t *device, INT16 sx, INT16 sy, INT16 ex, INT
*
*************************************/
-WRITE8_HANDLER(cinemat_vector_control_w)
+WRITE8_MEMBER(cinemat_state::cinemat_vector_control_w)
{
- cinemat_state *state = space->machine().driver_data<cinemat_state>();
int r, g, b, i;
- cpu_device *cpu = space->machine().device<cpu_device>("maincpu");
+ cpu_device *cpu = machine().device<cpu_device>("maincpu");
- switch (state->m_color_mode)
+ switch (m_color_mode)
{
case COLOR_BILEVEL:
/* color is either bright or dim, selected by the value sent to the port */
- state->m_vector_color = (data & 1) ? MAKE_RGB(0x80,0x80,0x80) : MAKE_RGB(0xff,0xff,0xff);
+ m_vector_color = (data & 1) ? MAKE_RGB(0x80,0x80,0x80) : MAKE_RGB(0xff,0xff,0xff);
break;
case COLOR_16LEVEL:
/* on the rising edge of the data value, latch bits 0-3 of the */
/* X register as the intensity */
- if (data != state->m_last_control && data)
+ if (data != m_last_control && data)
{
int xval = cpu->state(CCPU_X) & 0x0f;
i = (xval + 1) * 255 / 16;
- state->m_vector_color = MAKE_RGB(i,i,i);
+ m_vector_color = MAKE_RGB(i,i,i);
}
break;
case COLOR_64LEVEL:
/* on the rising edge of the data value, latch bits 2-7 of the */
/* X register as the intensity */
- if (data != state->m_last_control && data)
+ if (data != m_last_control && data)
{
int xval = cpu->state(CCPU_X);
xval = (~xval >> 2) & 0x3f;
i = (xval + 1) * 255 / 64;
- state->m_vector_color = MAKE_RGB(i,i,i);
+ m_vector_color = MAKE_RGB(i,i,i);
}
break;
case COLOR_RGB:
/* on the rising edge of the data value, latch the X register */
/* as 4-4-4 BGR values */
- if (data != state->m_last_control && data)
+ if (data != m_last_control && data)
{
int xval = cpu->state(CCPU_X);
r = (~xval >> 0) & 0x0f;
@@ -117,7 +116,7 @@ WRITE8_HANDLER(cinemat_vector_control_w)
g = g * 255 / 15;
b = (~xval >> 8) & 0x0f;
b = b * 255 / 15;
- state->m_vector_color = MAKE_RGB(r,g,b);
+ m_vector_color = MAKE_RGB(r,g,b);
}
break;
@@ -127,15 +126,15 @@ WRITE8_HANDLER(cinemat_vector_control_w)
/* they will be restored on the rising edge; this is to simulate the fact */
/* that the Rockola color hardware did not overwrite the beam X,Y position */
/* on an IV instruction if data == 0 here */
- if (data != state->m_last_control && !data)
+ if (data != m_last_control && !data)
{
- state->m_qb3_lastx = cpu->state(CCPU_X);
- state->m_qb3_lasty = cpu->state(CCPU_Y);
+ m_qb3_lastx = cpu->state(CCPU_X);
+ m_qb3_lasty = cpu->state(CCPU_Y);
}
/* on the rising edge of the data value, latch the Y register */
/* as 2-3-3 BGR values */
- if (data != state->m_last_control && data)
+ if (data != m_last_control && data)
{
int yval = cpu->state(CCPU_Y);
r = (~yval >> 0) & 0x07;
@@ -144,18 +143,18 @@ WRITE8_HANDLER(cinemat_vector_control_w)
g = g * 255 / 7;
b = (~yval >> 6) & 0x03;
b = b * 255 / 3;
- state->m_vector_color = MAKE_RGB(r,g,b);
+ m_vector_color = MAKE_RGB(r,g,b);
/* restore the original X,Y values */
- cpu->set_state(CCPU_X, state->m_qb3_lastx);
- cpu->set_state(CCPU_Y, state->m_qb3_lasty);
+ cpu->set_state(CCPU_X, m_qb3_lastx);
+ cpu->set_state(CCPU_Y, m_qb3_lasty);
}
}
break;
}
/* remember the last value */
- state->m_last_control = data;
+ m_last_control = data;
}
diff --git a/src/mame/video/circus.c b/src/mame/video/circus.c
index dceeb8437f9..54668af45ba 100644
--- a/src/mame/video/circus.c
+++ b/src/mame/video/circus.c
@@ -11,23 +11,20 @@
#include "includes/circus.h"
-WRITE8_HANDLER( circus_videoram_w )
+WRITE8_MEMBER(circus_state::circus_videoram_w)
{
- circus_state *state = space->machine().driver_data<circus_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( circus_clown_x_w )
+WRITE8_MEMBER(circus_state::circus_clown_x_w)
{
- circus_state *state = space->machine().driver_data<circus_state>();
- state->m_clown_x = 240 - data;
+ m_clown_x = 240 - data;
}
-WRITE8_HANDLER( circus_clown_y_w )
+WRITE8_MEMBER(circus_state::circus_clown_y_w)
{
- circus_state *state = space->machine().driver_data<circus_state>();
- state->m_clown_y = 240 - data;
+ m_clown_y = 240 - data;
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c
index 2f064e6403a..76fcf9fd84a 100644
--- a/src/mame/video/circusc.c
+++ b/src/mame/video/circusc.c
@@ -134,23 +134,21 @@ VIDEO_START( circusc )
***************************************************************************/
-WRITE8_HANDLER( circusc_videoram_w )
+WRITE8_MEMBER(circusc_state::circusc_videoram_w)
{
- circusc_state *state = space->machine().driver_data<circusc_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( circusc_colorram_w )
+WRITE8_MEMBER(circusc_state::circusc_colorram_w)
{
- circusc_state *state = space->machine().driver_data<circusc_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( circusc_flipscreen_w )
+WRITE8_MEMBER(circusc_state::circusc_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 1);
+ flip_screen_set(machine(), data & 1);
}
diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c
index 23d53fb04ad..1a4d56580d0 100644
--- a/src/mame/video/cischeat.c
+++ b/src/mame/video/cischeat.c
@@ -60,13 +60,13 @@ Note: if MAME_DEBUG is defined, pressing Z or X with:
#define SHOW_READ_ERROR(_format_,_offset_)\
{\
popmessage(_format_,_offset_);\
- logerror("CPU #0 PC %06X : Warning, ",cpu_get_pc(&space->device())); \
+ logerror("CPU #0 PC %06X : Warning, ",cpu_get_pc(&space.device())); \
logerror(_format_ "\n",_offset_);\
}
#define SHOW_WRITE_ERROR(_format_,_offset_,_data_)\
{\
popmessage(_format_,_offset_,_data_);\
- logerror("CPU #0 PC %06X : Warning, ",cpu_get_pc(&space->device())); \
+ logerror("CPU #0 PC %06X : Warning, ",cpu_get_pc(&space.device())); \
logerror(_format_ "\n",_offset_,_data_); \
}
@@ -74,18 +74,18 @@ Note: if MAME_DEBUG is defined, pressing Z or X with:
#define SHOW_READ_ERROR(_format_,_offset_)\
{\
- logerror("CPU #0 PC %06X : Warning, ",cpu_get_pc(&space->device())); \
+ logerror("CPU #0 PC %06X : Warning, ",cpu_get_pc(&space.device())); \
logerror(_format_ "\n",_offset_);\
}
#define SHOW_WRITE_ERROR(_format_,_offset_,_data_)\
{\
- logerror("CPU #0 PC %06X : Warning, ",cpu_get_pc(&space->device())); \
+ logerror("CPU #0 PC %06X : Warning, ",cpu_get_pc(&space.device())); \
logerror(_format_ "\n",_offset_,_data_); \
}
#endif
-#define CISCHEAT_VREG_SCROLL(_n_, _dir_) state->m_scroll##_dir_[_n_] = new_data
+#define CISCHEAT_VREG_SCROLL(_n_, _dir_) m_scroll##_dir_[_n_] = new_data
#define cischeat_tmap_SET_SCROLL(_n_) \
@@ -149,9 +149,9 @@ INLINE void scrollram_w(address_space *space, offs_t offset, UINT16 data, UINT16
}
}
-WRITE16_HANDLER( cischeat_scrollram_0_w ) { scrollram_w(space, offset, data, mem_mask, 0); }
-WRITE16_HANDLER( cischeat_scrollram_1_w ) { scrollram_w(space, offset, data, mem_mask, 1); }
-WRITE16_HANDLER( cischeat_scrollram_2_w ) { scrollram_w(space, offset, data, mem_mask, 2); }
+WRITE16_MEMBER(cischeat_state::cischeat_scrollram_0_w){ scrollram_w(&space, offset, data, mem_mask, 0); }
+WRITE16_MEMBER(cischeat_state::cischeat_scrollram_1_w){ scrollram_w(&space, offset, data, mem_mask, 1); }
+WRITE16_MEMBER(cischeat_state::cischeat_scrollram_2_w){ scrollram_w(&space, offset, data, mem_mask, 2); }
static TILEMAP_MAPPER( cischeat_scan_8x8 )
{
@@ -219,13 +219,13 @@ static void create_tilemaps(running_machine &machine)
}
}
-static void cischeat_set_vreg_flag(cischeat_state *state, int which, int data)
+void cischeat_state::cischeat_set_vreg_flag(int which, int data)
{
- if (state->m_scroll_flag[which] != data)
+ if (m_scroll_flag[which] != data)
{
- state->m_scroll_flag[which] = data;
- state->m_tmap[which] = state->m_tilemap[which][(data >> 4) & 1][data & 3];
- state->m_tmap[which]->mark_all_dirty();
+ m_scroll_flag[which] = data;
+ m_tmap[which] = m_tilemap[which][(data >> 4) & 1][data & 3];
+ m_tmap[which]->mark_all_dirty();
}
}
@@ -295,51 +295,49 @@ VIDEO_START( bigrun )
Big Run
**************************************************************************/
-READ16_HANDLER( bigrun_vregs_r )
+READ16_MEMBER(cischeat_state::bigrun_vregs_r)
{
- cischeat_state *state = space->machine().driver_data<cischeat_state>();
switch (offset)
{
- case 0x0000/2 : return input_port_read(space->machine(), "IN1"); // Coins
- case 0x0002/2 : return input_port_read(space->machine(), "IN2"); // Buttons
- case 0x0004/2 : return input_port_read(space->machine(), "IN3"); // Motor Limit Switches
- case 0x0006/2 : return input_port_read(space->machine(), "IN4"); // DSW 1 & 2
+ case 0x0000/2 : return input_port_read(machine(), "IN1"); // Coins
+ case 0x0002/2 : return input_port_read(machine(), "IN2"); // Buttons
+ case 0x0004/2 : return input_port_read(machine(), "IN3"); // Motor Limit Switches
+ case 0x0006/2 : return input_port_read(machine(), "IN4"); // DSW 1 & 2
- case 0x0008/2 : return state->soundlatch2_word_r(*space,0,0xffff); // From sound cpu
+ case 0x0008/2 : return soundlatch2_word_r(space,0,0xffff); // From sound cpu
case 0x0010/2 :
- switch (state->m_ip_select & 0x3)
+ switch (m_ip_select & 0x3)
{
- case 0 : return input_port_read(space->machine(), "IN6"); // Driving Wheel
+ case 0 : return input_port_read(machine(), "IN6"); // Driving Wheel
case 1 : return 0xffff; // Cockpit: Up / Down Position
case 2 : return 0xffff; // Cockpit: Left / Right Position?
- case 3 : return input_port_read(space->machine(), "PEDAL"); // Accelerator (Pedal)
+ case 3 : return input_port_read(machine(), "PEDAL"); // Accelerator (Pedal)
default: return 0xffff;
}
- case 0x2200/2 : return input_port_read(space->machine(), "IN5"); // DSW 3 (4 bits)
+ case 0x2200/2 : return input_port_read(machine(), "IN5"); // DSW 3 (4 bits)
default: SHOW_READ_ERROR("vreg %04X read!",offset*2);
- return state->m_vregs[offset];
+ return m_vregs[offset];
}
}
-WRITE16_HANDLER( bigrun_vregs_w )
+WRITE16_MEMBER(cischeat_state::bigrun_vregs_w)
{
- cischeat_state *state = space->machine().driver_data<cischeat_state>();
- UINT16 old_data = state->m_vregs[offset];
- UINT16 new_data = COMBINE_DATA(&state->m_vregs[offset]);
+ UINT16 old_data = m_vregs[offset];
+ UINT16 new_data = COMBINE_DATA(&m_vregs[offset]);
switch (offset)
{
case 0x0000/2 : // leds
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(space->machine(), 0,new_data & 0x01);
- coin_counter_w(space->machine(), 1,new_data & 0x02);
- set_led_status(space->machine(), 0,new_data & 0x10); // start button
- set_led_status(space->machine(), 1,new_data & 0x20); // ?
+ coin_counter_w(machine(), 0,new_data & 0x01);
+ coin_counter_w(machine(), 1,new_data & 0x02);
+ set_led_status(machine(), 0,new_data & 0x10); // start button
+ set_led_status(machine(), 1,new_data & 0x20); // ?
}
break;
@@ -348,40 +346,40 @@ WRITE16_HANDLER( bigrun_vregs_w )
case 0x0004/2 : // motor (seat?)
if (ACCESSING_BITS_0_7)
- set_led_status(space->machine(), 2, (new_data != old_data) ? 1 : 0);
+ set_led_status(machine(), 2, (new_data != old_data) ? 1 : 0);
break;
case 0x0006/2 : // motor (wheel?)
break;
case 0x000a/2 : // to sound cpu
- state->soundlatch_word_w(*space,0,new_data,0xffff);
+ soundlatch_word_w(space,0,new_data,0xffff);
break;
case 0x000c/2 : break; // ??
- case 0x0010/2 : state->m_ip_select = new_data; break;
- case 0x0012/2 : state->m_ip_select = new_data+1; break; // value above + 1
+ case 0x0010/2 : m_ip_select = new_data; break;
+ case 0x0012/2 : m_ip_select = new_data+1; break; // value above + 1
case 0x2000/2+0 : CISCHEAT_VREG_SCROLL(0,x); break;
case 0x2000/2+1 : CISCHEAT_VREG_SCROLL(0,y); break;
- case 0x2000/2+2 : cischeat_set_vreg_flag(state,0,new_data);break;
+ case 0x2000/2+2 : cischeat_set_vreg_flag(0,new_data);break;
case 0x2008/2+0 : CISCHEAT_VREG_SCROLL(1,x); break;
case 0x2008/2+1 : CISCHEAT_VREG_SCROLL(1,y); break;
- case 0x2008/2+2 : cischeat_set_vreg_flag(state,1,new_data);break;
+ case 0x2008/2+2 : cischeat_set_vreg_flag(1,new_data);break;
case 0x2100/2+0 : CISCHEAT_VREG_SCROLL(2,x); break;
case 0x2100/2+1 : CISCHEAT_VREG_SCROLL(2,y); break;
- case 0x2100/2+2 : cischeat_set_vreg_flag(state,2,new_data);break;
+ case 0x2100/2+2 : cischeat_set_vreg_flag(2,new_data);break;
case 0x2108/2 : break; // ? written with 0 only
case 0x2208/2 : break; // watchdog reset
/* Not sure about this one.. */
- case 0x2308/2 : cputag_set_input_line(space->machine(), "cpu2", INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
- cputag_set_input_line(space->machine(), "cpu3", INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
- cputag_set_input_line(space->machine(), "soundcpu", INPUT_LINE_RESET, (new_data & 1) ? ASSERT_LINE : CLEAR_LINE );
+ case 0x2308/2 : cputag_set_input_line(machine(), "cpu2", INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
+ cputag_set_input_line(machine(), "cpu3", INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
+ cputag_set_input_line(machine(), "soundcpu", INPUT_LINE_RESET, (new_data & 1) ? ASSERT_LINE : CLEAR_LINE );
break;
default: SHOW_WRITE_ERROR("vreg %04X <- %04X",offset*2,data);
@@ -393,48 +391,46 @@ WRITE16_HANDLER( bigrun_vregs_w )
Cisco Heat
**************************************************************************/
-READ16_HANDLER( cischeat_vregs_r )
+READ16_MEMBER(cischeat_state::cischeat_vregs_r)
{
- cischeat_state *state = space->machine().driver_data<cischeat_state>();
switch (offset)
{
- case 0x0000/2 : return input_port_read(space->machine(), "IN1"); // Coins
- case 0x0002/2 : return input_port_read(space->machine(), "IN2"); // Buttons
- case 0x0004/2 : return input_port_read(space->machine(), "IN3"); // Motor Limit Switches
- case 0x0006/2 : return input_port_read(space->machine(), "IN4"); // DSW 1 & 2
+ case 0x0000/2 : return input_port_read(machine(), "IN1"); // Coins
+ case 0x0002/2 : return input_port_read(machine(), "IN2"); // Buttons
+ case 0x0004/2 : return input_port_read(machine(), "IN3"); // Motor Limit Switches
+ case 0x0006/2 : return input_port_read(machine(), "IN4"); // DSW 1 & 2
case 0x0010/2 :
- switch (state->m_ip_select & 0x3)
+ switch (m_ip_select & 0x3)
{
- case 0 : return input_port_read(space->machine(), "IN6"); // Driving Wheel
+ case 0 : return input_port_read(machine(), "IN6"); // Driving Wheel
case 1 : return ~0; // Cockpit: Up / Down Position?
case 2 : return ~0; // Cockpit: Left / Right Position?
default: return ~0;
}
- case 0x2200/2 : return input_port_read(space->machine(), "IN5"); // DSW 3 (4 bits)
- case 0x2300/2 : return state->soundlatch2_r(*space,0); // From sound cpu
+ case 0x2200/2 : return input_port_read(machine(), "IN5"); // DSW 3 (4 bits)
+ case 0x2300/2 : return soundlatch2_r(space,0); // From sound cpu
default: SHOW_READ_ERROR("vreg %04X read!",offset*2);
- return state->m_vregs[offset];
+ return m_vregs[offset];
}
}
-WRITE16_HANDLER( cischeat_vregs_w )
+WRITE16_MEMBER(cischeat_state::cischeat_vregs_w)
{
- cischeat_state *state = space->machine().driver_data<cischeat_state>();
- UINT16 old_data = state->m_vregs[offset];
- UINT16 new_data = COMBINE_DATA(&state->m_vregs[offset]);
+ UINT16 old_data = m_vregs[offset];
+ UINT16 new_data = COMBINE_DATA(&m_vregs[offset]);
switch (offset)
{
case 0x0000/2 : // leds
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(space->machine(), 0,new_data & 0x01);
- coin_counter_w(space->machine(), 1,new_data & 0x02);
- set_led_status(space->machine(), 0,new_data & 0x10); // start button
- set_led_status(space->machine(), 1,new_data & 0x20); // ?
+ coin_counter_w(machine(), 0,new_data & 0x01);
+ coin_counter_w(machine(), 1,new_data & 0x02);
+ set_led_status(machine(), 0,new_data & 0x10); // start button
+ set_led_status(machine(), 1,new_data & 0x20); // ?
}
break;
@@ -443,39 +439,39 @@ WRITE16_HANDLER( cischeat_vregs_w )
case 0x0004/2 : // motor (seat?)
if (ACCESSING_BITS_0_7)
- set_led_status(space->machine(), 2, (new_data != old_data) ? 1 : 0);
+ set_led_status(machine(), 2, (new_data != old_data) ? 1 : 0);
break;
case 0x0006/2 : // motor (wheel?)
break;
- case 0x0010/2 : state->m_ip_select = new_data; break;
+ case 0x0010/2 : m_ip_select = new_data; break;
case 0x0012/2 : break; // value above + 1
case 0x2000/2+0 : CISCHEAT_VREG_SCROLL(0,x); break;
case 0x2000/2+1 : CISCHEAT_VREG_SCROLL(0,y); break;
- case 0x2000/2+2 : cischeat_set_vreg_flag(state,0,new_data);break;
+ case 0x2000/2+2 : cischeat_set_vreg_flag(0,new_data);break;
case 0x2008/2+0 : CISCHEAT_VREG_SCROLL(1,x); break;
case 0x2008/2+1 : CISCHEAT_VREG_SCROLL(1,y); break;
- case 0x2008/2+2 : cischeat_set_vreg_flag(state,1,new_data);break;
+ case 0x2008/2+2 : cischeat_set_vreg_flag(1,new_data);break;
case 0x2100/2+0 : CISCHEAT_VREG_SCROLL(2,x); break;
case 0x2100/2+1 : CISCHEAT_VREG_SCROLL(2,y); break;
- case 0x2100/2+2 : cischeat_set_vreg_flag(state,2,new_data);break;
+ case 0x2100/2+2 : cischeat_set_vreg_flag(2,new_data);break;
case 0x2108/2 : break; // ? written with 0 only
case 0x2208/2 : break; // watchdog reset
case 0x2300/2 : /* Sound CPU: reads latch during int 4, and stores command */
- state->soundlatch_word_w(*space, 0, new_data, 0xffff);
- cputag_set_input_line(space->machine(), "soundcpu", 4, HOLD_LINE);
+ soundlatch_word_w(space, 0, new_data, 0xffff);
+ cputag_set_input_line(machine(), "soundcpu", 4, HOLD_LINE);
break;
/* Not sure about this one.. */
- case 0x2308/2 : cputag_set_input_line(space->machine(), "cpu2", INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
- cputag_set_input_line(space->machine(), "cpu3", INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
- cputag_set_input_line(space->machine(), "soundcpu", INPUT_LINE_RESET, (new_data & 1) ? ASSERT_LINE : CLEAR_LINE );
+ case 0x2308/2 : cputag_set_input_line(machine(), "cpu2", INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
+ cputag_set_input_line(machine(), "cpu3", INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
+ cputag_set_input_line(machine(), "soundcpu", INPUT_LINE_RESET, (new_data & 1) ? ASSERT_LINE : CLEAR_LINE );
break;
default: SHOW_WRITE_ERROR("vreg %04X <- %04X",offset*2,data);
@@ -488,41 +484,39 @@ WRITE16_HANDLER( cischeat_vregs_w )
F1 GrandPrix Star
**************************************************************************/
-READ16_HANDLER( f1gpstar_vregs_r )
+READ16_MEMBER(cischeat_state::f1gpstar_vregs_r)
{
- cischeat_state *state = space->machine().driver_data<cischeat_state>();
switch (offset)
{
- case 0x0000/2 : return input_port_read(space->machine(), "IN1"); // DSW 1 & 2
+ case 0x0000/2 : return input_port_read(machine(), "IN1"); // DSW 1 & 2
// case 0x0002/2 : return 0xFFFF;
- case 0x0004/2 : return input_port_read(space->machine(), "IN2"); // Buttons
+ case 0x0004/2 : return input_port_read(machine(), "IN2"); // Buttons
- case 0x0006/2 : return input_port_read(space->machine(), "IN3"); // ? Read at boot only
+ case 0x0006/2 : return input_port_read(machine(), "IN3"); // ? Read at boot only
- case 0x0008/2 : return state->soundlatch2_r(*space,0); // From sound cpu
+ case 0x0008/2 : return soundlatch2_r(space,0); // From sound cpu
- case 0x000c/2 : return input_port_read(space->machine(), "IN4"); // DSW 3
+ case 0x000c/2 : return input_port_read(machine(), "IN4"); // DSW 3
case 0x0010/2 : // Accel + Driving Wheel
- return (input_port_read(space->machine(), "PEDAL") & 0xff) + ((input_port_read(space->machine(), "IN5") & 0xff)<<8);
+ return (input_port_read(machine(), "PEDAL") & 0xff) + ((input_port_read(machine(), "IN5") & 0xff)<<8);
default: SHOW_READ_ERROR("vreg %04X read!",offset*2);
- return state->m_vregs[offset];
+ return m_vregs[offset];
}
}
-READ16_HANDLER( f1gpstr2_vregs_r )
+READ16_MEMBER(cischeat_state::f1gpstr2_vregs_r)
{
- cischeat_state *state = space->machine().driver_data<cischeat_state>();
if ((offset >= 0x1000/2) && (offset < 0x2000/2))
- return state->m_vregs[offset];
+ return m_vregs[offset];
switch (offset)
{
case 0x0018/2 :
- return (state->m_f1gpstr2_ioready[0]&1) ? 0xff : 0xf0;
+ return (m_f1gpstr2_ioready[0]&1) ? 0xff : 0xf0;
default:
return f1gpstar_vregs_r(space,offset,mem_mask);
@@ -533,37 +527,35 @@ READ16_HANDLER( f1gpstr2_vregs_r )
Wild Pilot
**************************************************************************/
-READ16_HANDLER( wildplt_vregs_r )
+READ16_MEMBER(cischeat_state::wildplt_vregs_r)
{
- cischeat_state *state = space->machine().driver_data<cischeat_state>();
if ((offset >= 0x1000/2) && (offset < 0x2000/2))
- return state->m_vregs[offset];
+ return m_vregs[offset];
switch (offset)
{
- case 0x0000/2 : return input_port_read(space->machine(), "IN0"); // DSW 1 & 2
+ case 0x0000/2 : return input_port_read(machine(), "IN0"); // DSW 1 & 2
- case 0x0004/2 : return input_port_read(space->machine(), "IN1"); // Buttons
+ case 0x0004/2 : return input_port_read(machine(), "IN1"); // Buttons
- case 0x0008/2 : return state->soundlatch2_r(*space,0); // From sound cpu
+ case 0x0008/2 : return soundlatch2_r(space,0); // From sound cpu
case 0x0010/2 : // X, Y
- return input_port_read(space->machine(), "IN2") | (input_port_read(space->machine(), "IN3")<<8);
+ return input_port_read(machine(), "IN2") | (input_port_read(machine(), "IN3")<<8);
case 0x0018/2 :
- return (state->m_f1gpstr2_ioready[0]&1) ? 0xff : 0xf0;
+ return (m_f1gpstr2_ioready[0]&1) ? 0xff : 0xf0;
default: SHOW_READ_ERROR("vreg %04X read!",offset*2);
- return state->m_vregs[offset];
+ return m_vregs[offset];
}
}
-WRITE16_HANDLER( f1gpstar_vregs_w )
+WRITE16_MEMBER(cischeat_state::f1gpstar_vregs_w)
{
- cischeat_state *state = space->machine().driver_data<cischeat_state>();
-// UINT16 old_data = state->m_vregs[offset];
- UINT16 new_data = COMBINE_DATA(&state->m_vregs[offset]);
+// UINT16 old_data = m_vregs[offset];
+ UINT16 new_data = COMBINE_DATA(&m_vregs[offset]);
switch (offset)
{
@@ -576,52 +568,51 @@ CPU #0 PC 00235C : Warning, vreg 0006 <- 0000
case 0x0004/2 :
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(space->machine(), 0,new_data & 0x01);
- coin_counter_w(space->machine(), 1,new_data & 0x02);
- set_led_status(space->machine(), 0,new_data & 0x04); // start button
- set_led_status(space->machine(), 1,new_data & 0x20); // ?
+ coin_counter_w(machine(), 0,new_data & 0x01);
+ coin_counter_w(machine(), 1,new_data & 0x02);
+ set_led_status(machine(), 0,new_data & 0x04); // start button
+ set_led_status(machine(), 1,new_data & 0x20); // ?
// wheel | seat motor
- set_led_status(space->machine(), 2, ((new_data >> 3) | (new_data >> 4)) & 1 );
+ set_led_status(machine(), 2, ((new_data >> 3) | (new_data >> 4)) & 1 );
}
break;
case 0x0014/2 : break;
/* Usually written in sequence, but not always */
- case 0x0008/2 : state->soundlatch_word_w(*space, 0, new_data, 0xffff); break;
- case 0x0018/2 : cputag_set_input_line(space->machine(), "soundcpu", 4, HOLD_LINE); break;
+ case 0x0008/2 : soundlatch_word_w(space, 0, new_data, 0xffff); break;
+ case 0x0018/2 : cputag_set_input_line(machine(), "soundcpu", 4, HOLD_LINE); break;
case 0x0010/2 : break;
case 0x2000/2+0 : CISCHEAT_VREG_SCROLL(0,x); break;
case 0x2000/2+1 : CISCHEAT_VREG_SCROLL(0,y); break;
- case 0x2000/2+2 : cischeat_set_vreg_flag(state,0,new_data);break;
+ case 0x2000/2+2 : cischeat_set_vreg_flag(0,new_data);break;
case 0x2008/2+0 : CISCHEAT_VREG_SCROLL(1,x); break;
case 0x2008/2+1 : CISCHEAT_VREG_SCROLL(1,y); break;
- case 0x2008/2+2 : cischeat_set_vreg_flag(state,1,new_data);break;
+ case 0x2008/2+2 : cischeat_set_vreg_flag(1,new_data);break;
case 0x2100/2+0 : CISCHEAT_VREG_SCROLL(2,x); break;
case 0x2100/2+1 : CISCHEAT_VREG_SCROLL(2,y); break;
- case 0x2100/2+2 : cischeat_set_vreg_flag(state,2,new_data);break;
+ case 0x2100/2+2 : cischeat_set_vreg_flag(2,new_data);break;
case 0x2108/2 : break; // ? written with 0 only
case 0x2208/2 : break; // watchdog reset
/* Not sure about this one. Values: $10 then 0, $7 then 0 */
- case 0x2308/2 : cputag_set_input_line(space->machine(), "cpu2", INPUT_LINE_RESET, (new_data & 1) ? ASSERT_LINE : CLEAR_LINE );
- cputag_set_input_line(space->machine(), "cpu3", INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
- cputag_set_input_line(space->machine(), "soundcpu", INPUT_LINE_RESET, (new_data & 4) ? ASSERT_LINE : CLEAR_LINE );
+ case 0x2308/2 : cputag_set_input_line(machine(), "cpu2", INPUT_LINE_RESET, (new_data & 1) ? ASSERT_LINE : CLEAR_LINE );
+ cputag_set_input_line(machine(), "cpu3", INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
+ cputag_set_input_line(machine(), "soundcpu", INPUT_LINE_RESET, (new_data & 4) ? ASSERT_LINE : CLEAR_LINE );
break;
default: SHOW_WRITE_ERROR("vreg %04X <- %04X",offset*2,data);
}
}
-WRITE16_HANDLER( f1gpstr2_vregs_w )
+WRITE16_MEMBER(cischeat_state::f1gpstr2_vregs_w)
{
- cischeat_state *state = space->machine().driver_data<cischeat_state>();
- UINT16 old_data = state->m_vregs[offset];
- UINT16 new_data = COMBINE_DATA(&state->m_vregs[offset]);
+ UINT16 old_data = m_vregs[offset];
+ UINT16 new_data = COMBINE_DATA(&m_vregs[offset]);
if ((offset >= 0x1000/2) && (offset < 0x2000/2))
return;
@@ -632,9 +623,9 @@ WRITE16_HANDLER( f1gpstr2_vregs_w )
if (ACCESSING_BITS_0_7)
{
if((old_data & 4) && ((new_data & 4) == 0))
- cputag_set_input_line(space->machine(), "cpu5", 4, HOLD_LINE);
+ cputag_set_input_line(machine(), "cpu5", 4, HOLD_LINE);
if((old_data & 2) && ((new_data & 2) == 0))
- cputag_set_input_line(space->machine(), "cpu5", 2, HOLD_LINE);
+ cputag_set_input_line(machine(), "cpu5", 2, HOLD_LINE);
}
break;
@@ -648,17 +639,16 @@ WRITE16_HANDLER( f1gpstr2_vregs_w )
Scud Hammer
**************************************************************************/
-WRITE16_HANDLER( scudhamm_vregs_w )
+WRITE16_MEMBER(cischeat_state::scudhamm_vregs_w)
{
- cischeat_state *state = space->machine().driver_data<cischeat_state>();
-// int old_data = state->m_vregs[offset];
- int new_data = COMBINE_DATA(&state->m_vregs[offset]);
+// int old_data = m_vregs[offset];
+ int new_data = COMBINE_DATA(&m_vregs[offset]);
switch (offset)
{
case 0x000/2+0 : CISCHEAT_VREG_SCROLL(0,x); break;
case 0x000/2+1 : CISCHEAT_VREG_SCROLL(0,y); break;
- case 0x000/2+2 : cischeat_set_vreg_flag(state,0,new_data);break;
+ case 0x000/2+2 : cischeat_set_vreg_flag(0,new_data);break;
// UNUSED LAYER
case 0x008/2+0 :
@@ -668,9 +658,9 @@ WRITE16_HANDLER( scudhamm_vregs_w )
case 0x100/2+0 : CISCHEAT_VREG_SCROLL(2,x); break;
case 0x100/2+1 : CISCHEAT_VREG_SCROLL(2,y); break;
- case 0x100/2+2 : cischeat_set_vreg_flag(state,2,new_data);break;
+ case 0x100/2+2 : cischeat_set_vreg_flag(2,new_data);break;
- case 0x208/2 : state->watchdog_reset_w(*space,0,0); break;
+ case 0x208/2 : watchdog_reset_w(space,0,0); break;
default: SHOW_WRITE_ERROR("vreg %04X <- %04X",offset*2,data);
}
diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c
index c7c189d6f4f..b8d5728fcd6 100644
--- a/src/mame/video/citycon.c
+++ b/src/mame/video/citycon.c
@@ -70,35 +70,32 @@ VIDEO_START( citycon )
***************************************************************************/
-WRITE8_HANDLER( citycon_videoram_w )
+WRITE8_MEMBER(citycon_state::citycon_videoram_w)
{
- citycon_state *state = space->machine().driver_data<citycon_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( citycon_linecolor_w )
+WRITE8_MEMBER(citycon_state::citycon_linecolor_w)
{
- citycon_state *state = space->machine().driver_data<citycon_state>();
- state->m_linecolor[offset] = data;
+ m_linecolor[offset] = data;
}
-WRITE8_HANDLER( citycon_background_w )
+WRITE8_MEMBER(citycon_state::citycon_background_w)
{
- citycon_state *state = space->machine().driver_data<citycon_state>();
/* bits 4-7 control the background image */
- if (state->m_bg_image != (data >> 4))
+ if (m_bg_image != (data >> 4))
{
- state->m_bg_image = (data >> 4);
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_image = (data >> 4);
+ m_bg_tilemap->mark_all_dirty();
}
/* bit 0 flips screen */
/* it is also used to multiplex player 1 and player 2 controls */
- flip_screen_set(space->machine(), data & 0x01);
+ flip_screen_set(machine(), data & 0x01);
/* bits 1-3 are unknown */
// if ((data & 0x0e) != 0) logerror("background register = %02x\n", data);
diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c
index a67b7d412e9..479fbe8a583 100644
--- a/src/mame/video/cloak.c
+++ b/src/mame/video/cloak.c
@@ -38,10 +38,9 @@
***************************************************************************/
-WRITE8_HANDLER( cloak_paletteram_w )
+WRITE8_MEMBER(cloak_state::cloak_paletteram_w)
{
- cloak_state *state = space->machine().driver_data<cloak_state>();
- state->m_palette_ram[offset & 0x3f] = ((offset & 0x40) << 2) | data;
+ m_palette_ram[offset & 0x3f] = ((offset & 0x40) << 2) | data;
}
@@ -87,75 +86,71 @@ static void set_pens(running_machine &machine)
}
-static void set_current_bitmap_videoram_pointer(cloak_state *state)
+void cloak_state::set_current_bitmap_videoram_pointer()
{
- state->m_current_bitmap_videoram_accessed = state->m_bitmap_videoram_selected ? state->m_bitmap_videoram1 : state->m_bitmap_videoram2;
- state->m_current_bitmap_videoram_displayed = state->m_bitmap_videoram_selected ? state->m_bitmap_videoram2 : state->m_bitmap_videoram1;
+ m_current_bitmap_videoram_accessed = m_bitmap_videoram_selected ? m_bitmap_videoram1 : m_bitmap_videoram2;
+ m_current_bitmap_videoram_displayed = m_bitmap_videoram_selected ? m_bitmap_videoram2 : m_bitmap_videoram1;
}
-WRITE8_HANDLER( cloak_clearbmp_w )
+WRITE8_MEMBER(cloak_state::cloak_clearbmp_w)
{
- cloak_state *state = space->machine().driver_data<cloak_state>();
- space->machine().primary_screen->update_now();
- state->m_bitmap_videoram_selected = data & 0x01;
- set_current_bitmap_videoram_pointer(state);
+ machine().primary_screen->update_now();
+ m_bitmap_videoram_selected = data & 0x01;
+ set_current_bitmap_videoram_pointer();
if (data & 0x02) /* clear */
- memset(state->m_current_bitmap_videoram_accessed, 0, 256*256);
+ memset(m_current_bitmap_videoram_accessed, 0, 256*256);
}
-static void adjust_xy(cloak_state *state, int offset)
+void cloak_state::adjust_xy(int offset)
{
switch (offset)
{
- case 0x00: state->m_bitmap_videoram_address_x--; state->m_bitmap_videoram_address_y++; break;
- case 0x01: state->m_bitmap_videoram_address_y--; break;
- case 0x02: state->m_bitmap_videoram_address_x--; break;
- case 0x04: state->m_bitmap_videoram_address_x++; state->m_bitmap_videoram_address_y++; break;
- case 0x05: state->m_bitmap_videoram_address_y++; break;
- case 0x06: state->m_bitmap_videoram_address_x++; break;
+ case 0x00: m_bitmap_videoram_address_x--; m_bitmap_videoram_address_y++; break;
+ case 0x01: m_bitmap_videoram_address_y--; break;
+ case 0x02: m_bitmap_videoram_address_x--; break;
+ case 0x04: m_bitmap_videoram_address_x++; m_bitmap_videoram_address_y++; break;
+ case 0x05: m_bitmap_videoram_address_y++; break;
+ case 0x06: m_bitmap_videoram_address_x++; break;
}
}
-READ8_HANDLER( graph_processor_r )
+READ8_MEMBER(cloak_state::graph_processor_r)
{
- cloak_state *state = space->machine().driver_data<cloak_state>();
- UINT8 ret = state->m_current_bitmap_videoram_displayed[(state->m_bitmap_videoram_address_y << 8) | state->m_bitmap_videoram_address_x];
+ UINT8 ret = m_current_bitmap_videoram_displayed[(m_bitmap_videoram_address_y << 8) | m_bitmap_videoram_address_x];
- adjust_xy(state, offset);
+ adjust_xy(offset);
return ret;
}
-WRITE8_HANDLER( graph_processor_w )
+WRITE8_MEMBER(cloak_state::graph_processor_w)
{
- cloak_state *state = space->machine().driver_data<cloak_state>();
switch (offset)
{
- case 0x03: state->m_bitmap_videoram_address_x = data; break;
- case 0x07: state->m_bitmap_videoram_address_y = data; break;
+ case 0x03: m_bitmap_videoram_address_x = data; break;
+ case 0x07: m_bitmap_videoram_address_y = data; break;
default:
- state->m_current_bitmap_videoram_accessed[(state->m_bitmap_videoram_address_y << 8) | state->m_bitmap_videoram_address_x] = data & 0x0f;
+ m_current_bitmap_videoram_accessed[(m_bitmap_videoram_address_y << 8) | m_bitmap_videoram_address_x] = data & 0x0f;
- adjust_xy(state, offset);
+ adjust_xy(offset);
break;
}
}
-WRITE8_HANDLER( cloak_videoram_w )
+WRITE8_MEMBER(cloak_state::cloak_videoram_w)
{
- cloak_state *state = space->machine().driver_data<cloak_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( cloak_flipscreen_w )
+WRITE8_MEMBER(cloak_state::cloak_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -177,7 +172,7 @@ VIDEO_START( cloak )
state->m_bitmap_videoram2 = auto_alloc_array(machine, UINT8, 256*256);
state->m_palette_ram = auto_alloc_array(machine, UINT16, NUM_PENS);
- set_current_bitmap_videoram_pointer(state);
+ state->set_current_bitmap_videoram_pointer();
state->save_item(NAME(state->m_bitmap_videoram_address_x));
state->save_item(NAME(state->m_bitmap_videoram_address_y));
@@ -185,7 +180,7 @@ VIDEO_START( cloak )
state->save_pointer(NAME(state->m_bitmap_videoram1), 256*256);
state->save_pointer(NAME(state->m_bitmap_videoram2), 256*256);
state->save_pointer(NAME(state->m_palette_ram), NUM_PENS);
- machine.save().register_postload(save_prepost_delegate(FUNC(set_current_bitmap_videoram_pointer), state));
+ machine.save().register_postload(save_prepost_delegate(FUNC(cloak_state::set_current_bitmap_videoram_pointer), state));
}
static void draw_bitmap(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c
index ea470669c5d..491fff15d7d 100644
--- a/src/mame/video/cloud9.c
+++ b/src/mame/video/cloud9.c
@@ -52,12 +52,11 @@ VIDEO_START( cloud9 )
*
*************************************/
-WRITE8_HANDLER( cloud9_video_control_w )
+WRITE8_MEMBER(cloud9_state::cloud9_video_control_w)
{
- cloud9_state *state = space->machine().driver_data<cloud9_state>();
/* only D7 matters */
- state->m_video_control[offset] = (data >> 7) & 1;
+ m_video_control[offset] = (data >> 7) & 1;
}
@@ -68,9 +67,8 @@ WRITE8_HANDLER( cloud9_video_control_w )
*
*************************************/
-WRITE8_HANDLER( cloud9_paletteram_w )
+WRITE8_MEMBER(cloud9_state::cloud9_paletteram_w)
{
- cloud9_state *state = space->machine().driver_data<cloud9_state>();
int bit0, bit1, bit2;
int r, g, b;
@@ -83,21 +81,21 @@ WRITE8_HANDLER( cloud9_paletteram_w )
bit0 = (~r >> 0) & 0x01;
bit1 = (~r >> 1) & 0x01;
bit2 = (~r >> 2) & 0x01;
- r = combine_3_weights(state->m_rweights, bit0, bit1, bit2);
+ r = combine_3_weights(m_rweights, bit0, bit1, bit2);
/* green component (inverted) */
bit0 = (~g >> 0) & 0x01;
bit1 = (~g >> 1) & 0x01;
bit2 = (~g >> 2) & 0x01;
- g = combine_3_weights(state->m_gweights, bit0, bit1, bit2);
+ g = combine_3_weights(m_gweights, bit0, bit1, bit2);
/* blue component (inverted) */
bit0 = (~b >> 0) & 0x01;
bit1 = (~b >> 1) & 0x01;
bit2 = (~b >> 2) & 0x01;
- b = combine_3_weights(state->m_bweights, bit0, bit1, bit2);
+ b = combine_3_weights(m_bweights, bit0, bit1, bit2);
- palette_set_color(space->machine(), offset & 0x3f, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), offset & 0x3f, MAKE_RGB(r, g, b));
}
@@ -180,10 +178,10 @@ INLINE void bitmode_autoinc( running_machine &machine )
*
*************************************/
-WRITE8_HANDLER( cloud9_videoram_w )
+WRITE8_MEMBER(cloud9_state::cloud9_videoram_w)
{
/* direct writes to VRAM go through the write protect PROM as well */
- cloud9_write_vram(space->machine(), offset, data, 0, 0);
+ cloud9_write_vram(machine(), offset, data, 0, 0);
}
@@ -194,49 +192,46 @@ WRITE8_HANDLER( cloud9_videoram_w )
*
*************************************/
-READ8_HANDLER( cloud9_bitmode_r )
+READ8_MEMBER(cloud9_state::cloud9_bitmode_r)
{
- cloud9_state *state = space->machine().driver_data<cloud9_state>();
/* in bitmode, the address comes from the autoincrement latches */
- UINT16 addr = (state->m_bitmode_addr[1] << 6) | (state->m_bitmode_addr[0] >> 2);
+ UINT16 addr = (m_bitmode_addr[1] << 6) | (m_bitmode_addr[0] >> 2);
/* the appropriate pixel is selected into the upper 4 bits */
- UINT8 result = state->m_videoram[((~state->m_bitmode_addr[0] & 2) << 13) | addr] << ((state->m_bitmode_addr[0] & 1) * 4);
+ UINT8 result = m_videoram[((~m_bitmode_addr[0] & 2) << 13) | addr] << ((m_bitmode_addr[0] & 1) * 4);
/* autoincrement because /BITMD was selected */
- bitmode_autoinc(space->machine());
+ bitmode_autoinc(machine());
/* the upper 4 bits of the data lines are not driven so make them all 1's */
return (result >> 4) | 0xf0;
}
-WRITE8_HANDLER( cloud9_bitmode_w )
+WRITE8_MEMBER(cloud9_state::cloud9_bitmode_w)
{
- cloud9_state *state = space->machine().driver_data<cloud9_state>();
/* in bitmode, the address comes from the autoincrement latches */
- UINT16 addr = (state->m_bitmode_addr[1] << 6) | (state->m_bitmode_addr[0] >> 2);
+ UINT16 addr = (m_bitmode_addr[1] << 6) | (m_bitmode_addr[0] >> 2);
/* the lower 4 bits of data are replicated to the upper 4 bits */
data = (data & 0x0f) | (data << 4);
/* write through the generic VRAM routine, passing the low 2 X bits as PIXB/PIXA */
- cloud9_write_vram(space->machine(), addr, data, 1, state->m_bitmode_addr[0] & 3);
+ cloud9_write_vram(machine(), addr, data, 1, m_bitmode_addr[0] & 3);
/* autoincrement because /BITMD was selected */
- bitmode_autoinc(space->machine());
+ bitmode_autoinc(machine());
}
-WRITE8_HANDLER( cloud9_bitmode_addr_w )
+WRITE8_MEMBER(cloud9_state::cloud9_bitmode_addr_w)
{
- cloud9_state *state = space->machine().driver_data<cloud9_state>();
/* write through to video RAM and also to the addressing latches */
- cloud9_write_vram(space->machine(), offset, data, 0, 0);
- state->m_bitmode_addr[offset] = data;
+ cloud9_write_vram(machine(), offset, data, 0, 0);
+ m_bitmode_addr[offset] = data;
}
diff --git a/src/mame/video/clshroad.c b/src/mame/video/clshroad.c
index d20270c66f6..88a2e8bc4b5 100644
--- a/src/mame/video/clshroad.c
+++ b/src/mame/video/clshroad.c
@@ -34,9 +34,9 @@
#include "includes/clshroad.h"
-WRITE8_HANDLER( clshroad_flipscreen_w )
+WRITE8_MEMBER(clshroad_state::clshroad_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 1 );
+ flip_screen_set(machine(), data & 1 );
}
@@ -130,14 +130,13 @@ static TILE_GET_INFO( get_tile_info_0b )
0);
}
-WRITE8_HANDLER( clshroad_vram_0_w )
+WRITE8_MEMBER(clshroad_state::clshroad_vram_0_w)
{
- clshroad_state *state = space->machine().driver_data<clshroad_state>();
int tile_index = offset / 2;
int tile = (tile_index & 0x1f) + (tile_index & ~0x3f)/2;
- state->m_vram_0[offset] = data;
- if (tile_index & 0x20) state->m_tilemap_0a->mark_tile_dirty(tile);
- else state->m_tilemap_0b->mark_tile_dirty(tile);
+ m_vram_0[offset] = data;
+ if (tile_index & 0x20) m_tilemap_0a->mark_tile_dirty(tile);
+ else m_tilemap_0b->mark_tile_dirty(tile);
}
/***************************************************************************
@@ -200,11 +199,10 @@ static TILE_GET_INFO( get_tile_info_1 )
0);
}
-WRITE8_HANDLER( clshroad_vram_1_w )
+WRITE8_MEMBER(clshroad_state::clshroad_vram_1_w)
{
- clshroad_state *state = space->machine().driver_data<clshroad_state>();
- state->m_vram_1[offset] = data;
- state->m_tilemap_1->mark_tile_dirty(offset % 0x400);
+ m_vram_1[offset] = data;
+ m_tilemap_1->mark_tile_dirty(offset % 0x400);
}
diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c
index ba76d978b15..c36c0e0b3a1 100644
--- a/src/mame/video/combatsc.c
+++ b/src/mame/video/combatsc.c
@@ -331,58 +331,53 @@ VIDEO_START( combatscb )
***************************************************************************/
-READ8_HANDLER( combatsc_video_r )
+READ8_MEMBER(combatsc_state::combatsc_video_r)
{
- combatsc_state *state = space->machine().driver_data<combatsc_state>();
- return state->m_videoram[offset];
+ return m_videoram[offset];
}
-WRITE8_HANDLER( combatsc_video_w )
+WRITE8_MEMBER(combatsc_state::combatsc_video_w)
{
- combatsc_state *state = space->machine().driver_data<combatsc_state>();
- state->m_videoram[offset] = data;
+ m_videoram[offset] = data;
if (offset < 0x800)
{
- if (state->m_video_circuit)
- state->m_bg_tilemap[1]->mark_tile_dirty(offset & 0x3ff);
+ if (m_video_circuit)
+ m_bg_tilemap[1]->mark_tile_dirty(offset & 0x3ff);
else
- state->m_bg_tilemap[0]->mark_tile_dirty(offset & 0x3ff);
+ m_bg_tilemap[0]->mark_tile_dirty(offset & 0x3ff);
}
- else if (offset < 0x1000 && state->m_video_circuit == 0)
+ else if (offset < 0x1000 && m_video_circuit == 0)
{
- state->m_textlayer->mark_tile_dirty(offset & 0x3ff);
+ m_textlayer->mark_tile_dirty(offset & 0x3ff);
}
}
-WRITE8_HANDLER( combatsc_pf_control_w )
+WRITE8_MEMBER(combatsc_state::combatsc_pf_control_w)
{
- combatsc_state *state = space->machine().driver_data<combatsc_state>();
- device_t *k007121 = state->m_video_circuit ? state->m_k007121_2 : state->m_k007121_1;
+ device_t *k007121 = m_video_circuit ? m_k007121_2 : m_k007121_1;
k007121_ctrl_w(k007121, offset, data);
if (offset == 7)
- state->m_bg_tilemap[state->m_video_circuit]->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_bg_tilemap[m_video_circuit]->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
if (offset == 3)
{
if (data & 0x08)
- memcpy(state->m_spriteram[state->m_video_circuit], state->m_page[state->m_video_circuit] + 0x1000, 0x800);
+ memcpy(m_spriteram[m_video_circuit], m_page[m_video_circuit] + 0x1000, 0x800);
else
- memcpy(state->m_spriteram[state->m_video_circuit], state->m_page[state->m_video_circuit] + 0x1800, 0x800);
+ memcpy(m_spriteram[m_video_circuit], m_page[m_video_circuit] + 0x1800, 0x800);
}
}
-READ8_HANDLER( combatsc_scrollram_r )
+READ8_MEMBER(combatsc_state::combatsc_scrollram_r)
{
- combatsc_state *state = space->machine().driver_data<combatsc_state>();
- return state->m_scrollram[offset];
+ return m_scrollram[offset];
}
-WRITE8_HANDLER( combatsc_scrollram_w )
+WRITE8_MEMBER(combatsc_state::combatsc_scrollram_w)
{
- combatsc_state *state = space->machine().driver_data<combatsc_state>();
- state->m_scrollram[offset] = data;
+ m_scrollram[offset] = data;
}
diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c
index 3acb70d5005..cd7d5380e37 100644
--- a/src/mame/video/commando.c
+++ b/src/mame/video/commando.c
@@ -10,67 +10,60 @@
#include "includes/commando.h"
-WRITE8_HANDLER( commando_videoram_w )
+WRITE8_MEMBER(commando_state::commando_videoram_w)
{
- commando_state *state = space->machine().driver_data<commando_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( commando_colorram_w )
+WRITE8_MEMBER(commando_state::commando_colorram_w)
{
- commando_state *state = space->machine().driver_data<commando_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( commando_videoram2_w )
+WRITE8_MEMBER(commando_state::commando_videoram2_w)
{
- commando_state *state = space->machine().driver_data<commando_state>();
- state->m_videoram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( commando_colorram2_w )
+WRITE8_MEMBER(commando_state::commando_colorram2_w)
{
- commando_state *state = space->machine().driver_data<commando_state>();
- state->m_colorram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( commando_scrollx_w )
+WRITE8_MEMBER(commando_state::commando_scrollx_w)
{
- commando_state *state = space->machine().driver_data<commando_state>();
- state->m_scroll_x[offset] = data;
- state->m_bg_tilemap->set_scrollx(0, state->m_scroll_x[0] | (state->m_scroll_x[1] << 8));
+ m_scroll_x[offset] = data;
+ m_bg_tilemap->set_scrollx(0, m_scroll_x[0] | (m_scroll_x[1] << 8));
}
-WRITE8_HANDLER( commando_scrolly_w )
+WRITE8_MEMBER(commando_state::commando_scrolly_w)
{
- commando_state *state = space->machine().driver_data<commando_state>();
- state->m_scroll_y[offset] = data;
- state->m_bg_tilemap->set_scrolly(0, state->m_scroll_y[0] | (state->m_scroll_y[1] << 8));
+ m_scroll_y[offset] = data;
+ m_bg_tilemap->set_scrolly(0, m_scroll_y[0] | (m_scroll_y[1] << 8));
}
-WRITE8_HANDLER( commando_c804_w )
+WRITE8_MEMBER(commando_state::commando_c804_w)
{
- commando_state *state = space->machine().driver_data<commando_state>();
// bits 0 and 1 are coin counters
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02);
// bit 4 resets the sound CPU
- device_set_input_line(state->m_audiocpu, INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
+ device_set_input_line(m_audiocpu, INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
// bit 7 flips screen
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/compgolf.c b/src/mame/video/compgolf.c
index 4c92e790125..65bf2e89275 100644
--- a/src/mame/video/compgolf.c
+++ b/src/mame/video/compgolf.c
@@ -33,18 +33,16 @@ PALETTE_INIT( compgolf )
}
}
-WRITE8_HANDLER( compgolf_video_w )
+WRITE8_MEMBER(compgolf_state::compgolf_video_w)
{
- compgolf_state *state = space->machine().driver_data<compgolf_state>();
- state->m_videoram[offset] = data;
- state->m_text_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_text_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( compgolf_back_w )
+WRITE8_MEMBER(compgolf_state::compgolf_back_w)
{
- compgolf_state *state = space->machine().driver_data<compgolf_state>();
- state->m_bg_ram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_ram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
static TILE_GET_INFO( get_text_info )
diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c
index 07360700399..1de9606a545 100644
--- a/src/mame/video/contra.c
+++ b/src/mame/video/contra.c
@@ -197,100 +197,92 @@ VIDEO_START( contra )
***************************************************************************/
-WRITE8_HANDLER( contra_fg_vram_w )
+WRITE8_MEMBER(contra_state::contra_fg_vram_w)
{
- contra_state *state = space->machine().driver_data<contra_state>();
- state->m_fg_vram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_vram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( contra_fg_cram_w )
+WRITE8_MEMBER(contra_state::contra_fg_cram_w)
{
- contra_state *state = space->machine().driver_data<contra_state>();
- state->m_fg_cram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_cram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( contra_bg_vram_w )
+WRITE8_MEMBER(contra_state::contra_bg_vram_w)
{
- contra_state *state = space->machine().driver_data<contra_state>();
- state->m_bg_vram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_vram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( contra_bg_cram_w )
+WRITE8_MEMBER(contra_state::contra_bg_cram_w)
{
- contra_state *state = space->machine().driver_data<contra_state>();
- state->m_bg_cram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_cram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( contra_text_vram_w )
+WRITE8_MEMBER(contra_state::contra_text_vram_w)
{
- contra_state *state = space->machine().driver_data<contra_state>();
- state->m_tx_vram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ m_tx_vram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( contra_text_cram_w )
+WRITE8_MEMBER(contra_state::contra_text_cram_w)
{
- contra_state *state = space->machine().driver_data<contra_state>();
- state->m_tx_cram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ m_tx_cram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( contra_K007121_ctrl_0_w )
+WRITE8_MEMBER(contra_state::contra_K007121_ctrl_0_w)
{
- contra_state *state = space->machine().driver_data<contra_state>();
- UINT8 ctrl_6 = k007121_ctrlram_r(state->m_k007121_1, 6);
+ UINT8 ctrl_6 = k007121_ctrlram_r(m_k007121_1, 6);
if (offset == 3)
{
if ((data & 0x8) == 0)
- memcpy(state->m_buffered_spriteram, state->m_spriteram + 0x800, 0x800);
+ memcpy(m_buffered_spriteram, m_spriteram + 0x800, 0x800);
else
- memcpy(state->m_buffered_spriteram, state->m_spriteram, 0x800);
+ memcpy(m_buffered_spriteram, m_spriteram, 0x800);
}
if (offset == 6)
{
if (ctrl_6 != data)
- state->m_fg_tilemap->mark_all_dirty();
+ m_fg_tilemap->mark_all_dirty();
}
if (offset == 7)
- state->m_fg_tilemap->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_fg_tilemap->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- k007121_ctrl_w(state->m_k007121_1, offset, data);
+ k007121_ctrl_w(m_k007121_1, offset, data);
}
-WRITE8_HANDLER( contra_K007121_ctrl_1_w )
+WRITE8_MEMBER(contra_state::contra_K007121_ctrl_1_w)
{
- contra_state *state = space->machine().driver_data<contra_state>();
- UINT8 ctrl_6 = k007121_ctrlram_r(state->m_k007121_2, 6);
+ UINT8 ctrl_6 = k007121_ctrlram_r(m_k007121_2, 6);
if (offset == 3)
{
if ((data & 0x8) == 0)
- memcpy(state->m_buffered_spriteram_2, state->m_spriteram + 0x2800, 0x800);
+ memcpy(m_buffered_spriteram_2, m_spriteram + 0x2800, 0x800);
else
- memcpy(state->m_buffered_spriteram_2, state->m_spriteram + 0x2000, 0x800);
+ memcpy(m_buffered_spriteram_2, m_spriteram + 0x2000, 0x800);
}
if (offset == 6)
{
if (ctrl_6 != data )
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_tilemap->mark_all_dirty();
}
if (offset == 7)
- state->m_bg_tilemap->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_bg_tilemap->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- k007121_ctrl_w(state->m_k007121_2, offset, data);
+ k007121_ctrl_w(m_k007121_2, offset, data);
}
diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c
index 5b0ed49dd0b..96db56a7e49 100644
--- a/src/mame/video/cop01.c
+++ b/src/mame/video/cop01.c
@@ -120,21 +120,19 @@ VIDEO_START( cop01 )
***************************************************************************/
-WRITE8_HANDLER( cop01_background_w )
+WRITE8_MEMBER(cop01_state::cop01_background_w)
{
- cop01_state *state = space->machine().driver_data<cop01_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-WRITE8_HANDLER( cop01_foreground_w )
+WRITE8_MEMBER(cop01_state::cop01_foreground_w)
{
- cop01_state *state = space->machine().driver_data<cop01_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( cop01_vreg_w )
+WRITE8_MEMBER(cop01_state::cop01_vreg_w)
{
/* 0x40: --xx---- sprite bank, coin counters, flip screen
* -----x-- flip screen
@@ -147,14 +145,13 @@ WRITE8_HANDLER( cop01_vreg_w )
* -------x msb xscroll
* 0x43: xxxxxxxx yscroll
*/
- cop01_state *state = space->machine().driver_data<cop01_state>();
- state->m_vreg[offset] = data;
+ m_vreg[offset] = data;
if (offset == 0)
{
- coin_counter_w(space->machine(), 0, data & 1);
- coin_counter_w(space->machine(), 1, data & 2);
- flip_screen_set(space->machine(), data & 4);
+ coin_counter_w(machine(), 0, data & 1);
+ coin_counter_w(machine(), 1, data & 2);
+ flip_screen_set(machine(), data & 4);
}
}
diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c
index ae94d7bc03d..c08664bcf77 100644
--- a/src/mame/video/cosmic.c
+++ b/src/mame/video/cosmic.c
@@ -10,10 +10,9 @@
#include "includes/cosmic.h"
-WRITE8_HANDLER( cosmic_color_register_w )
+WRITE8_MEMBER(cosmic_state::cosmic_color_register_w)
{
- cosmic_state *state = space->machine().driver_data<cosmic_state>();
- state->m_color_registers[offset] = data ? 1 : 0;
+ m_color_registers[offset] = data ? 1 : 0;
}
@@ -244,10 +243,9 @@ PALETTE_INIT( nomnlnd )
}
-WRITE8_HANDLER( cosmic_background_enable_w )
+WRITE8_MEMBER(cosmic_state::cosmic_background_enable_w)
{
- cosmic_state *state = space->machine().driver_data<cosmic_state>();
- state->m_background_enable = data;
+ m_background_enable = data;
}
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index e88ce983288..3849f70c5a4 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -1572,10 +1572,9 @@ INLINE UINT16 *cps1_base( running_machine &machine, int offset, int boundary )
-WRITE16_HANDLER( cps1_cps_a_w )
+WRITE16_MEMBER(cps_state::cps1_cps_a_w)
{
- cps_state *state = space->machine().driver_data<cps_state>();
- data = COMBINE_DATA(&state->m_cps_a_regs[offset]);
+ data = COMBINE_DATA(&m_cps_a_regs[offset]);
/*
The main CPU writes the palette to gfxram, and the CPS-B custom copies it
@@ -1586,10 +1585,10 @@ WRITE16_HANDLER( cps1_cps_a_w )
fixes glitches in the ghouls intro, but it might happen at next vblank.
*/
if (offset == CPS1_PALETTE_BASE)
- cps1_build_palette(space->machine(), cps1_base(space->machine(), CPS1_PALETTE_BASE, state->m_palette_align));
+ cps1_build_palette(machine(), cps1_base(machine(), CPS1_PALETTE_BASE, m_palette_align));
// pzloop2 write to register 24 on startup. This is probably just a bug.
- if (offset == 0x24 / 2 && state->m_cps_version == 2)
+ if (offset == 0x24 / 2 && m_cps_version == 2)
return;
#ifdef MAME_DEBUG
@@ -1599,42 +1598,41 @@ WRITE16_HANDLER( cps1_cps_a_w )
}
-READ16_HANDLER( cps1_cps_b_r )
+READ16_MEMBER(cps_state::cps1_cps_b_r)
{
- cps_state *state = space->machine().driver_data<cps_state>();
/* Some games interrogate a couple of registers on bootup. */
/* These are CPS1 board B self test checks. They wander from game to */
/* game. */
- if (offset == state->m_game_config->cpsb_addr / 2)
- return state->m_game_config->cpsb_value;
+ if (offset == m_game_config->cpsb_addr / 2)
+ return m_game_config->cpsb_value;
/* some games use as a protection check the ability to do 16-bit multiplications */
/* with a 32-bit result, by writing the factors to two ports and reading the */
/* result from two other ports. */
- if (offset == state->m_game_config->mult_result_lo / 2)
- return (state->m_cps_b_regs[state->m_game_config->mult_factor1 / 2] *
- state->m_cps_b_regs[state->m_game_config->mult_factor2 / 2]) & 0xffff;
+ if (offset == m_game_config->mult_result_lo / 2)
+ return (m_cps_b_regs[m_game_config->mult_factor1 / 2] *
+ m_cps_b_regs[m_game_config->mult_factor2 / 2]) & 0xffff;
- if (offset == state->m_game_config->mult_result_hi / 2)
- return (state->m_cps_b_regs[state->m_game_config->mult_factor1 / 2] *
- state->m_cps_b_regs[state->m_game_config->mult_factor2 / 2]) >> 16;
+ if (offset == m_game_config->mult_result_hi / 2)
+ return (m_cps_b_regs[m_game_config->mult_factor1 / 2] *
+ m_cps_b_regs[m_game_config->mult_factor2 / 2]) >> 16;
- if (offset == state->m_game_config->in2_addr / 2) /* Extra input ports (on C-board) */
- return input_port_read(space->machine(), "IN2");
+ if (offset == m_game_config->in2_addr / 2) /* Extra input ports (on C-board) */
+ return input_port_read(machine(), "IN2");
- if (offset == state->m_game_config->in3_addr / 2) /* Player 4 controls (on C-board) ("Captain Commando") */
- return input_port_read(space->machine(), "IN3");
+ if (offset == m_game_config->in3_addr / 2) /* Player 4 controls (on C-board) ("Captain Commando") */
+ return input_port_read(machine(), "IN3");
- if (state->m_cps_version == 2)
+ if (m_cps_version == 2)
{
if (offset == 0x10/2)
{
// UNKNOWN--only mmatrix appears to read this, and I'm not sure if the result is actuallyused
- return state->m_cps_b_regs[0x10 / 2];
+ return m_cps_b_regs[0x10 / 2];
}
if (offset == 0x12/2)
- return state->m_cps_b_regs[0x12 / 2];
+ return m_cps_b_regs[0x12 / 2];
}
#ifdef MAME_DEBUG
popmessage("CPS-B read port %02x contact MAMEDEV", offset * 2);
@@ -1643,12 +1641,11 @@ READ16_HANDLER( cps1_cps_b_r )
}
-WRITE16_HANDLER( cps1_cps_b_w )
+WRITE16_MEMBER(cps_state::cps1_cps_b_w)
{
- cps_state *state = space->machine().driver_data<cps_state>();
- data = COMBINE_DATA(&state->m_cps_b_regs[offset]);
+ data = COMBINE_DATA(&m_cps_b_regs[offset]);
- if (state->m_cps_version == 2)
+ if (m_cps_version == 2)
{
/* To mark scanlines for raster effects */
if (offset == 0x0e/2)
@@ -1658,52 +1655,52 @@ WRITE16_HANDLER( cps1_cps_b_w )
}
if (offset == 0x10/2)
{
- state->m_scanline1 = (data & 0x1ff);
+ m_scanline1 = (data & 0x1ff);
return;
}
if (offset == 0x12/2)
{
- state->m_scanline2 = (data & 0x1ff);
+ m_scanline2 = (data & 0x1ff);
return;
}
}
// additional outputs on C-board
- if (offset == state->m_game_config->out2_addr / 2)
+ if (offset == m_game_config->out2_addr / 2)
{
if (ACCESSING_BITS_0_7)
{
- if (state->m_game_config->cpsb_value == 0x0402) // Mercs (CN2 connector)
+ if (m_game_config->cpsb_value == 0x0402) // Mercs (CN2 connector)
{
- coin_lockout_w(space->machine(), 2, ~data & 0x01);
- set_led_status(space->machine(), 0, data & 0x02);
- set_led_status(space->machine(), 1, data & 0x04);
- set_led_status(space->machine(), 2, data & 0x08);
+ coin_lockout_w(machine(), 2, ~data & 0x01);
+ set_led_status(machine(), 0, data & 0x02);
+ set_led_status(machine(), 1, data & 0x04);
+ set_led_status(machine(), 2, data & 0x08);
}
else // kod, captcomm, knights
{
- coin_lockout_w(space->machine(), 2, ~data & 0x02);
- coin_lockout_w(space->machine(), 3, ~data & 0x08);
+ coin_lockout_w(machine(), 2, ~data & 0x02);
+ coin_lockout_w(machine(), 3, ~data & 0x08);
}
}
}
#ifdef MAME_DEBUG
- if (offset != state->m_game_config->cpsb_addr / 2 && // only varth writes here
- offset != state->m_game_config->mult_factor1 / 2 &&
- offset != state->m_game_config->mult_factor2 / 2 &&
- offset != state->m_game_config->layer_control / 2 &&
- offset != state->m_game_config->unknown1 / 2 &&
- offset != state->m_game_config->unknown2 / 2 &&
- offset != state->m_game_config->unknown3 / 2 &&
- offset != state->m_game_config->priority[0] / 2 &&
- offset != state->m_game_config->priority[1] / 2 &&
- offset != state->m_game_config->priority[2] / 2 &&
- offset != state->m_game_config->priority[3] / 2 &&
- offset != state->m_game_config->palette_control / 2 &&
- offset != state->m_game_config->out2_addr / 2 &&
- !state->m_game_config->bootleg_kludge)
+ if (offset != m_game_config->cpsb_addr / 2 && // only varth writes here
+ offset != m_game_config->mult_factor1 / 2 &&
+ offset != m_game_config->mult_factor2 / 2 &&
+ offset != m_game_config->layer_control / 2 &&
+ offset != m_game_config->unknown1 / 2 &&
+ offset != m_game_config->unknown2 / 2 &&
+ offset != m_game_config->unknown3 / 2 &&
+ offset != m_game_config->priority[0] / 2 &&
+ offset != m_game_config->priority[1] / 2 &&
+ offset != m_game_config->priority[2] / 2 &&
+ offset != m_game_config->priority[3] / 2 &&
+ offset != m_game_config->palette_control / 2 &&
+ offset != m_game_config->out2_addr / 2 &&
+ !m_game_config->bootleg_kludge)
popmessage("CPS-B write %04x to port %02x contact MAMEDEV", data, offset * 2);
#endif
}
@@ -1910,20 +1907,19 @@ void cps1_get_video_base( running_machine &machine )
}
-WRITE16_HANDLER( cps1_gfxram_w )
+WRITE16_MEMBER(cps_state::cps1_gfxram_w)
{
- cps_state *state = space->machine().driver_data<cps_state>();
int page = (offset >> 7) & 0x3c0;
- COMBINE_DATA(&state->m_gfxram[offset]);
+ COMBINE_DATA(&m_gfxram[offset]);
- if (page == (state->m_cps_a_regs[CPS1_SCROLL1_BASE] & 0x3c0))
- state->m_bg_tilemap[0]->mark_tile_dirty(offset / 2 & 0x0fff);
+ if (page == (m_cps_a_regs[CPS1_SCROLL1_BASE] & 0x3c0))
+ m_bg_tilemap[0]->mark_tile_dirty(offset / 2 & 0x0fff);
- if (page == (state->m_cps_a_regs[CPS1_SCROLL2_BASE] & 0x3c0))
- state->m_bg_tilemap[1]->mark_tile_dirty(offset / 2 & 0x0fff);
+ if (page == (m_cps_a_regs[CPS1_SCROLL2_BASE] & 0x3c0))
+ m_bg_tilemap[1]->mark_tile_dirty(offset / 2 & 0x0fff);
- if (page == (state->m_cps_a_regs[CPS1_SCROLL3_BASE] & 0x3c0))
- state->m_bg_tilemap[2]->mark_tile_dirty(offset / 2 & 0x0fff);
+ if (page == (m_cps_a_regs[CPS1_SCROLL3_BASE] & 0x3c0))
+ m_bg_tilemap[2]->mark_tile_dirty(offset / 2 & 0x0fff);
}
@@ -2469,48 +2465,43 @@ static void cps1_render_sprites( running_machine &machine, bitmap_ind16 &bitmap,
-WRITE16_HANDLER( cps2_objram_bank_w )
+WRITE16_MEMBER(cps_state::cps2_objram_bank_w)
{
- cps_state *state = space->machine().driver_data<cps_state>();
if (ACCESSING_BITS_0_7)
- state->m_objram_bank = data & 1;
+ m_objram_bank = data & 1;
}
-READ16_HANDLER( cps2_objram1_r )
+READ16_MEMBER(cps_state::cps2_objram1_r)
{
- cps_state *state = space->machine().driver_data<cps_state>();
- if (state->m_objram_bank & 1)
- return state->m_objram2[offset];
+ if (m_objram_bank & 1)
+ return m_objram2[offset];
else
- return state->m_objram1[offset];
+ return m_objram1[offset];
}
-READ16_HANDLER( cps2_objram2_r )
+READ16_MEMBER(cps_state::cps2_objram2_r)
{
- cps_state *state = space->machine().driver_data<cps_state>();
- if (state->m_objram_bank & 1)
- return state->m_objram1[offset];
+ if (m_objram_bank & 1)
+ return m_objram1[offset];
else
- return state->m_objram2[offset];
+ return m_objram2[offset];
}
-WRITE16_HANDLER( cps2_objram1_w )
+WRITE16_MEMBER(cps_state::cps2_objram1_w)
{
- cps_state *state = space->machine().driver_data<cps_state>();
- if (state->m_objram_bank & 1)
- COMBINE_DATA(&state->m_objram2[offset]);
+ if (m_objram_bank & 1)
+ COMBINE_DATA(&m_objram2[offset]);
else
- COMBINE_DATA(&state->m_objram1[offset]);
+ COMBINE_DATA(&m_objram1[offset]);
}
-WRITE16_HANDLER( cps2_objram2_w )
+WRITE16_MEMBER(cps_state::cps2_objram2_w)
{
- cps_state *state = space->machine().driver_data<cps_state>();
- if (state->m_objram_bank & 1)
- COMBINE_DATA(&state->m_objram1[offset]);
+ if (m_objram_bank & 1)
+ COMBINE_DATA(&m_objram1[offset]);
else
- COMBINE_DATA(&state->m_objram2[offset]);
+ COMBINE_DATA(&m_objram2[offset]);
}
static UINT16 *cps2_objbase( running_machine &machine )
diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c
index 7154903c995..4b7963eee4e 100644
--- a/src/mame/video/crbaloon.c
+++ b/src/mame/video/crbaloon.c
@@ -47,18 +47,16 @@ PALETTE_INIT( crbaloon )
}
-WRITE8_HANDLER( crbaloon_videoram_w )
+WRITE8_MEMBER(crbaloon_state::crbaloon_videoram_w)
{
- crbaloon_state *state = space->machine().driver_data<crbaloon_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( crbaloon_colorram_w )
+WRITE8_MEMBER(crbaloon_state::crbaloon_colorram_w)
{
- crbaloon_state *state = space->machine().driver_data<crbaloon_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/crgolf.c b/src/mame/video/crgolf.c
index 89a0eccae05..82f06e32661 100644
--- a/src/mame/video/crgolf.c
+++ b/src/mame/video/crgolf.c
@@ -18,26 +18,24 @@
*
*************************************/
-WRITE8_HANDLER( crgolf_videoram_w )
+WRITE8_MEMBER(crgolf_state::crgolf_videoram_w)
{
- crgolf_state *state = space->machine().driver_data<crgolf_state>();
- if (*state->m_screen_select & 1)
- state->m_videoram_b[offset] = data;
+ if (*m_screen_select & 1)
+ m_videoram_b[offset] = data;
else
- state->m_videoram_a[offset] = data;
+ m_videoram_a[offset] = data;
}
-READ8_HANDLER( crgolf_videoram_r )
+READ8_MEMBER(crgolf_state::crgolf_videoram_r)
{
- crgolf_state *state = space->machine().driver_data<crgolf_state>();
UINT8 ret;
- if (*state->m_screen_select & 1)
- ret = state->m_videoram_b[offset];
+ if (*m_screen_select & 1)
+ ret = m_videoram_b[offset];
else
- ret = state->m_videoram_a[offset];
+ ret = m_videoram_a[offset];
return ret;
}
diff --git a/src/mame/video/crospang.c b/src/mame/video/crospang.c
index dd788e122f8..098df3e0d37 100644
--- a/src/mame/video/crospang.c
+++ b/src/mame/video/crospang.c
@@ -13,90 +13,79 @@
#include "includes/crospang.h"
#include "video/decospr.h"
-WRITE16_HANDLER( bestri_tilebank_w)
+WRITE16_MEMBER(crospang_state::bestri_tilebank_w)
{
- crospang_state *state = space->machine().driver_data<crospang_state>();
- state->m_bestri_tilebank = (data>>10) & 0xf;
+ m_bestri_tilebank = (data>>10) & 0xf;
//printf("bestri %04x\n", data);
- state->m_fg_layer->mark_all_dirty();
- state->m_bg_layer->mark_all_dirty();
+ m_fg_layer->mark_all_dirty();
+ m_bg_layer->mark_all_dirty();
}
-WRITE16_HANDLER ( bestri_bg_scrolly_w )
+WRITE16_MEMBER(crospang_state::bestri_bg_scrolly_w)
{
- crospang_state *state = space->machine().driver_data<crospang_state>();
/* Very Strange */
int scroll = (data & 0x3ff) ^ 0x0155;
- state->m_bg_layer->set_scrolly(0, -scroll + 7);
+ m_bg_layer->set_scrolly(0, -scroll + 7);
}
-WRITE16_HANDLER ( bestri_fg_scrolly_w )
+WRITE16_MEMBER(crospang_state::bestri_fg_scrolly_w)
{
- crospang_state *state = space->machine().driver_data<crospang_state>();
/* Very Strange */
int scroll = (data & 0x3ff) ^ 0x00ab;
- state->m_fg_layer->set_scrolly(0, -scroll + 7);
+ m_fg_layer->set_scrolly(0, -scroll + 7);
}
-WRITE16_HANDLER ( bestri_fg_scrollx_w )
+WRITE16_MEMBER(crospang_state::bestri_fg_scrollx_w)
{
- crospang_state *state = space->machine().driver_data<crospang_state>();
// printf("fg_layer x %04x\n",data);
- state->m_fg_layer->set_scrollx(0, data + 32);
+ m_fg_layer->set_scrollx(0, data + 32);
}
-WRITE16_HANDLER ( bestri_bg_scrollx_w )
+WRITE16_MEMBER(crospang_state::bestri_bg_scrollx_w)
{
- crospang_state *state = space->machine().driver_data<crospang_state>();
// printf("bg_layer x %04x\n",data);
- state->m_bg_layer->set_scrollx(0, data - 60);
+ m_bg_layer->set_scrollx(0, data - 60);
}
-WRITE16_HANDLER ( crospang_fg_scrolly_w )
+WRITE16_MEMBER(crospang_state::crospang_fg_scrolly_w)
{
- crospang_state *state = space->machine().driver_data<crospang_state>();
- state->m_fg_layer->set_scrolly(0, data + 8);
+ m_fg_layer->set_scrolly(0, data + 8);
}
-WRITE16_HANDLER ( crospang_bg_scrolly_w )
+WRITE16_MEMBER(crospang_state::crospang_bg_scrolly_w)
{
- crospang_state *state = space->machine().driver_data<crospang_state>();
- state->m_bg_layer->set_scrolly(0, data + 8);
+ m_bg_layer->set_scrolly(0, data + 8);
}
-WRITE16_HANDLER ( crospang_fg_scrollx_w )
+WRITE16_MEMBER(crospang_state::crospang_fg_scrollx_w)
{
- crospang_state *state = space->machine().driver_data<crospang_state>();
- state->m_fg_layer->set_scrollx(0, data);
+ m_fg_layer->set_scrollx(0, data);
}
-WRITE16_HANDLER ( crospang_bg_scrollx_w )
+WRITE16_MEMBER(crospang_state::crospang_bg_scrollx_w)
{
- crospang_state *state = space->machine().driver_data<crospang_state>();
- state->m_bg_layer->set_scrollx(0, data + 4);
+ m_bg_layer->set_scrollx(0, data + 4);
}
-WRITE16_HANDLER ( crospang_fg_videoram_w )
+WRITE16_MEMBER(crospang_state::crospang_fg_videoram_w)
{
- crospang_state *state = space->machine().driver_data<crospang_state>();
- COMBINE_DATA(&state->m_fg_videoram[offset]);
- state->m_fg_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_fg_videoram[offset]);
+ m_fg_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER ( crospang_bg_videoram_w )
+WRITE16_MEMBER(crospang_state::crospang_bg_videoram_w)
{
- crospang_state *state = space->machine().driver_data<crospang_state>();
- COMBINE_DATA(&state->m_bg_videoram[offset]);
- state->m_bg_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bg_videoram[offset]);
+ m_bg_layer->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c
index 6ccf4b12185..bf70ac251ad 100644
--- a/src/mame/video/crshrace.c
+++ b/src/mame/video/crshrace.c
@@ -50,45 +50,41 @@ VIDEO_START( crshrace )
***************************************************************************/
-WRITE16_HANDLER( crshrace_videoram1_w )
+WRITE16_MEMBER(crshrace_state::crshrace_videoram1_w)
{
- crshrace_state *state = space->machine().driver_data<crshrace_state>();
- COMBINE_DATA(&state->m_videoram1[offset]);
- state->m_tilemap1->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_videoram1[offset]);
+ m_tilemap1->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( crshrace_videoram2_w )
+WRITE16_MEMBER(crshrace_state::crshrace_videoram2_w)
{
- crshrace_state *state = space->machine().driver_data<crshrace_state>();
- COMBINE_DATA(&state->m_videoram2[offset]);
- state->m_tilemap2->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_videoram2[offset]);
+ m_tilemap2->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( crshrace_roz_bank_w )
+WRITE16_MEMBER(crshrace_state::crshrace_roz_bank_w)
{
- crshrace_state *state = space->machine().driver_data<crshrace_state>();
if (ACCESSING_BITS_0_7)
{
- if (state->m_roz_bank != (data & 0xff))
+ if (m_roz_bank != (data & 0xff))
{
- state->m_roz_bank = data & 0xff;
- state->m_tilemap1->mark_all_dirty();
+ m_roz_bank = data & 0xff;
+ m_tilemap1->mark_all_dirty();
}
}
}
-WRITE16_HANDLER( crshrace_gfxctrl_w )
+WRITE16_MEMBER(crshrace_state::crshrace_gfxctrl_w)
{
- crshrace_state *state = space->machine().driver_data<crshrace_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_gfxctrl = data & 0xdf;
- state->m_flipscreen = data & 0x20;
+ m_gfxctrl = data & 0xdf;
+ m_flipscreen = data & 0x20;
}
}
diff --git a/src/mame/video/cvs.c b/src/mame/video/cvs.c
index 37ea7b2e5aa..8e22cff2a59 100644
--- a/src/mame/video/cvs.c
+++ b/src/mame/video/cvs.c
@@ -81,21 +81,20 @@ static void set_pens( running_machine &machine )
-WRITE8_HANDLER( cvs_video_fx_w )
+WRITE8_MEMBER(cvs_state::cvs_video_fx_w)
{
- cvs_state *state = space->machine().driver_data<cvs_state>();
if (data & 0xce)
- logerror("%4x : CVS: Unimplemented CVS video fx = %2x\n",cpu_get_pc(&space->device()), data & 0xce);
+ logerror("%4x : CVS: Unimplemented CVS video fx = %2x\n",cpu_get_pc(&space.device()), data & 0xce);
- state->m_stars_on = data & 0x01;
+ m_stars_on = data & 0x01;
if (data & 0x02) logerror(" SHADE BRIGHTER TO RIGHT\n");
if (data & 0x04) logerror(" SCREEN ROTATE\n");
if (data & 0x08) logerror(" SHADE BRIGHTER TO LEFT\n");
- set_led_status(space->machine(), 1, data & 0x10); /* lamp 1 */
- set_led_status(space->machine(), 2, data & 0x20); /* lamp 2 */
+ set_led_status(machine(), 1, data & 0x10); /* lamp 1 */
+ set_led_status(machine(), 2, data & 0x20); /* lamp 2 */
if (data & 0x40) logerror(" SHADE BRIGHTER TO BOTTOM\n");
if (data & 0x80) logerror(" SHADE BRIGHTER TO TOP\n");
@@ -103,24 +102,21 @@ WRITE8_HANDLER( cvs_video_fx_w )
-READ8_HANDLER( cvs_collision_r )
+READ8_MEMBER(cvs_state::cvs_collision_r)
{
- cvs_state *state = space->machine().driver_data<cvs_state>();
- return state->m_collision_register;
+ return m_collision_register;
}
-READ8_HANDLER( cvs_collision_clear )
+READ8_MEMBER(cvs_state::cvs_collision_clear)
{
- cvs_state *state = space->machine().driver_data<cvs_state>();
- state->m_collision_register = 0;
+ m_collision_register = 0;
return 0;
}
-WRITE8_HANDLER( cvs_scroll_w )
+WRITE8_MEMBER(cvs_state::cvs_scroll_w)
{
- cvs_state *state = space->machine().driver_data<cvs_state>();
- state->m_scroll_reg = 255 - data;
+ m_scroll_reg = 255 - data;
}
diff --git a/src/mame/video/darius.c b/src/mame/video/darius.c
index bcaf4bdf60f..a105fef32e1 100644
--- a/src/mame/video/darius.c
+++ b/src/mame/video/darius.c
@@ -35,13 +35,12 @@ VIDEO_START( darius )
/***************************************************************************/
-WRITE16_HANDLER( darius_fg_layer_w )
+WRITE16_MEMBER(darius_state::darius_fg_layer_w)
{
- darius_state *state = space->machine().driver_data<darius_state>();
- COMBINE_DATA(&state->m_fg_ram[offset]);
+ COMBINE_DATA(&m_fg_ram[offset]);
if (offset < 0x4000)
- state->m_fg_tilemap->mark_tile_dirty((offset & 0x1fff));
+ m_fg_tilemap->mark_tile_dirty((offset & 0x1fff));
}
/***************************************************************************/
diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c
index d5c885fa754..4ca19217b7d 100644
--- a/src/mame/video/darkseal.c
+++ b/src/mame/video/darkseal.c
@@ -39,18 +39,16 @@ static void update_24bitcol(running_machine &machine, int offset)
palette_set_color(machine,offset,MAKE_RGB(r,g,b));
}
-WRITE16_HANDLER( darkseal_palette_24bit_rg_w )
+WRITE16_MEMBER(darkseal_state::darkseal_palette_24bit_rg_w)
{
- darkseal_state *state = space->machine().driver_data<darkseal_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- update_24bitcol(space->machine(), offset);
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ update_24bitcol(machine(), offset);
}
-WRITE16_HANDLER( darkseal_palette_24bit_b_w )
+WRITE16_MEMBER(darkseal_state::darkseal_palette_24bit_b_w)
{
- darkseal_state *state = space->machine().driver_data<darkseal_state>();
- COMBINE_DATA(&state->m_generic_paletteram2_16[offset]);
- update_24bitcol(space->machine(), offset);
+ COMBINE_DATA(&m_generic_paletteram2_16[offset]);
+ update_24bitcol(machine(), offset);
}
/******************************************************************************/
diff --git a/src/mame/video/dbz.c b/src/mame/video/dbz.c
index a54e7d68b68..2a3a77658be 100644
--- a/src/mame/video/dbz.c
+++ b/src/mame/video/dbz.c
@@ -38,11 +38,10 @@ void dbz_sprite_callback( running_machine &machine, int *code, int *color, int *
/* Background Tilemaps */
-WRITE16_HANDLER( dbz_bg2_videoram_w )
+WRITE16_MEMBER(dbz_state::dbz_bg2_videoram_w)
{
- dbz_state *state = space->machine().driver_data<dbz_state>();
- COMBINE_DATA(&state->m_bg2_videoram[offset]);
- state->m_bg2_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_bg2_videoram[offset]);
+ m_bg2_tilemap->mark_tile_dirty(offset / 2);
}
static TILE_GET_INFO( get_dbz_bg2_tile_info )
@@ -57,11 +56,10 @@ static TILE_GET_INFO( get_dbz_bg2_tile_info )
SET_TILE_INFO(0, tileno, colour + (state->m_layer_colorbase[5] << 1), flag);
}
-WRITE16_HANDLER( dbz_bg1_videoram_w )
+WRITE16_MEMBER(dbz_state::dbz_bg1_videoram_w)
{
- dbz_state *state = space->machine().driver_data<dbz_state>();
- COMBINE_DATA(&state->m_bg1_videoram[offset]);
- state->m_bg1_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_bg1_videoram[offset]);
+ m_bg1_tilemap->mark_tile_dirty(offset / 2);
}
static TILE_GET_INFO( get_dbz_bg1_tile_info )
diff --git a/src/mame/video/dcheese.c b/src/mame/video/dcheese.c
index 7561a2c0876..b481357338c 100644
--- a/src/mame/video/dcheese.c
+++ b/src/mame/video/dcheese.c
@@ -234,31 +234,27 @@ static void do_blit( running_machine &machine )
*
*************************************/
-WRITE16_HANDLER( madmax_blitter_color_w )
+WRITE16_MEMBER(dcheese_state::madmax_blitter_color_w)
{
- dcheese_state *state = space->machine().driver_data<dcheese_state>();
- COMBINE_DATA(&state->m_blitter_color[offset]);
+ COMBINE_DATA(&m_blitter_color[offset]);
}
-WRITE16_HANDLER( madmax_blitter_xparam_w )
+WRITE16_MEMBER(dcheese_state::madmax_blitter_xparam_w)
{
- dcheese_state *state = space->machine().driver_data<dcheese_state>();
- COMBINE_DATA(&state->m_blitter_xparam[offset]);
+ COMBINE_DATA(&m_blitter_xparam[offset]);
}
-WRITE16_HANDLER( madmax_blitter_yparam_w )
+WRITE16_MEMBER(dcheese_state::madmax_blitter_yparam_w)
{
- dcheese_state *state = space->machine().driver_data<dcheese_state>();
- COMBINE_DATA(&state->m_blitter_yparam[offset]);
+ COMBINE_DATA(&m_blitter_yparam[offset]);
}
-WRITE16_HANDLER( madmax_blitter_vidparam_w )
+WRITE16_MEMBER(dcheese_state::madmax_blitter_vidparam_w)
{
- dcheese_state *state = space->machine().driver_data<dcheese_state>();
- COMBINE_DATA(&state->m_blitter_vidparam[offset]);
+ COMBINE_DATA(&m_blitter_vidparam[offset]);
switch (offset)
{
@@ -274,7 +270,7 @@ WRITE16_HANDLER( madmax_blitter_vidparam_w )
break;
case 0x22/2: /* scanline interrupt */
- update_scanline_irq(space->machine());
+ update_scanline_irq(machine());
break;
case 0x24/2: /* writes here after writing to 0x28 */
@@ -286,40 +282,40 @@ WRITE16_HANDLER( madmax_blitter_vidparam_w )
break;
case 0x38/2: /* blit */
- do_blit(space->machine());
+ do_blit(machine());
break;
case 0x3e/2: /* clear */
- do_clear(space->machine());
+ do_clear(machine());
break;
default:
- logerror("%06X:write to %06X = %04X & %04x\n", cpu_get_pc(&space->device()), 0x2a0000 + 2 * offset, data, mem_mask);
+ logerror("%06X:write to %06X = %04X & %04x\n", cpu_get_pc(&space.device()), 0x2a0000 + 2 * offset, data, mem_mask);
break;
}
}
-WRITE16_HANDLER( madmax_blitter_unknown_w )
+WRITE16_MEMBER(dcheese_state::madmax_blitter_unknown_w)
{
/* written to just before the blitter command register is written */
- logerror("%06X:write to %06X = %04X & %04X\n", cpu_get_pc(&space->device()), 0x300000 + 2 * offset, data, mem_mask);
+ logerror("%06X:write to %06X = %04X & %04X\n", cpu_get_pc(&space.device()), 0x300000 + 2 * offset, data, mem_mask);
}
-READ16_HANDLER( madmax_blitter_vidparam_r )
+READ16_MEMBER(dcheese_state::madmax_blitter_vidparam_r)
{
/* analog inputs seem to be hooked up here -- might not actually map to blitter */
if (offset == 0x02/2)
- return input_port_read(space->machine(), "2a0002");
+ return input_port_read(machine(), "2a0002");
if (offset == 0x0e/2)
- return input_port_read(space->machine(), "2a000e");
+ return input_port_read(machine(), "2a000e");
/* early code polls on this bit, wants it to be 0 */
if (offset == 0x36/2)
return 0xffff ^ (1 << 5);
/* log everything else */
- logerror("%06X:read from %06X\n", cpu_get_pc(&space->device()), 0x2a0000 + 2 * offset);
+ logerror("%06X:read from %06X\n", cpu_get_pc(&space.device()), 0x2a0000 + 2 * offset);
return 0xffff;
}
diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c
index ba97a7a908c..da8712c03ce 100644
--- a/src/mame/video/dcon.c
+++ b/src/mame/video/dcon.c
@@ -10,70 +10,63 @@
/******************************************************************************/
-READ16_HANDLER( dcon_control_r )
+READ16_MEMBER(dcon_state::dcon_control_r)
{
- dcon_state *state = space->machine().driver_data<dcon_state>();
- return state->m_enable;
+ return m_enable;
}
-WRITE16_HANDLER( dcon_control_w )
+WRITE16_MEMBER(dcon_state::dcon_control_w)
{
- dcon_state *state = space->machine().driver_data<dcon_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_enable=data;
- if ((state->m_enable&4)==4)
- state->m_foreground_layer->enable(0);
+ m_enable=data;
+ if ((m_enable&4)==4)
+ m_foreground_layer->enable(0);
else
- state->m_foreground_layer->enable(1);
+ m_foreground_layer->enable(1);
- if ((state->m_enable&2)==2)
- state->m_midground_layer->enable(0);
+ if ((m_enable&2)==2)
+ m_midground_layer->enable(0);
else
- state->m_midground_layer->enable(1);
+ m_midground_layer->enable(1);
- if ((state->m_enable&1)==1)
- state->m_background_layer->enable(0);
+ if ((m_enable&1)==1)
+ m_background_layer->enable(0);
else
- state->m_background_layer->enable(1);
+ m_background_layer->enable(1);
}
}
-WRITE16_HANDLER( dcon_gfxbank_w )
+WRITE16_MEMBER(dcon_state::dcon_gfxbank_w)
{
- dcon_state *state = space->machine().driver_data<dcon_state>();
if (data&1)
- state->m_gfx_bank_select=0x1000;
+ m_gfx_bank_select=0x1000;
else
- state->m_gfx_bank_select=0;
+ m_gfx_bank_select=0;
}
-WRITE16_HANDLER( dcon_background_w )
+WRITE16_MEMBER(dcon_state::dcon_background_w)
{
- dcon_state *state = space->machine().driver_data<dcon_state>();
- COMBINE_DATA(&state->m_back_data[offset]);
- state->m_background_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_back_data[offset]);
+ m_background_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( dcon_foreground_w )
+WRITE16_MEMBER(dcon_state::dcon_foreground_w)
{
- dcon_state *state = space->machine().driver_data<dcon_state>();
- COMBINE_DATA(&state->m_fore_data[offset]);
- state->m_foreground_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_fore_data[offset]);
+ m_foreground_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( dcon_midground_w )
+WRITE16_MEMBER(dcon_state::dcon_midground_w)
{
- dcon_state *state = space->machine().driver_data<dcon_state>();
- COMBINE_DATA(&state->m_mid_data[offset]);
- state->m_midground_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_mid_data[offset]);
+ m_midground_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( dcon_text_w )
+WRITE16_MEMBER(dcon_state::dcon_text_w)
{
- dcon_state *state = space->machine().driver_data<dcon_state>();
- COMBINE_DATA(&state->m_textram[offset]);
- state->m_text_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_textram[offset]);
+ m_text_layer->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_back_tile_info )
diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c
index 1b2ec8d6109..3edfabb021a 100644
--- a/src/mame/video/dday.c
+++ b/src/mame/video/dday.c
@@ -18,10 +18,9 @@
Thanks Zwaxy for the timer info. */
-READ8_HANDLER( dday_countdown_timer_r )
+READ8_MEMBER(dday_state::dday_countdown_timer_r)
{
- dday_state *state = space->machine().driver_data<dday_state>();
- return ((state->m_timer_value / 10) << 4) | (state->m_timer_value % 10);
+ return ((m_timer_value / 10) << 4) | (m_timer_value % 10);
}
static TIMER_CALLBACK( countdown_timer_callback )
@@ -228,85 +227,78 @@ VIDEO_START( dday )
start_countdown_timer(machine);
}
-WRITE8_HANDLER( dday_bgvideoram_w )
+WRITE8_MEMBER(dday_state::dday_bgvideoram_w)
{
- dday_state *state = space->machine().driver_data<dday_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( dday_fgvideoram_w )
+WRITE8_MEMBER(dday_state::dday_fgvideoram_w)
{
- dday_state *state = space->machine().driver_data<dday_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
- state->m_fg_tilemap->mark_tile_dirty(offset ^ 0x1f); /* for flipx case */
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_tilemap->mark_tile_dirty(offset ^ 0x1f); /* for flipx case */
}
-WRITE8_HANDLER( dday_textvideoram_w )
+WRITE8_MEMBER(dday_state::dday_textvideoram_w)
{
- dday_state *state = space->machine().driver_data<dday_state>();
- state->m_textvideoram[offset] = data;
- state->m_text_tilemap->mark_tile_dirty(offset);
+ m_textvideoram[offset] = data;
+ m_text_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( dday_colorram_w )
+WRITE8_MEMBER(dday_state::dday_colorram_w)
{
- dday_state *state = space->machine().driver_data<dday_state>();
int i;
offset &= 0x03e0;
- state->m_colorram[offset & 0x3e0] = data;
+ m_colorram[offset & 0x3e0] = data;
for (i = 0; i < 0x20; i++)
- state->m_fg_tilemap->mark_tile_dirty(offset + i);
+ m_fg_tilemap->mark_tile_dirty(offset + i);
}
-READ8_HANDLER( dday_colorram_r )
+READ8_MEMBER(dday_state::dday_colorram_r)
{
- dday_state *state = space->machine().driver_data<dday_state>();
- return state->m_colorram[offset & 0x03e0];
+ return m_colorram[offset & 0x03e0];
}
-WRITE8_HANDLER( dday_sl_control_w )
+WRITE8_MEMBER(dday_state::dday_sl_control_w)
{
- dday_state *state = space->machine().driver_data<dday_state>();
- if (state->m_sl_image != data)
+ if (m_sl_image != data)
{
- state->m_sl_image = data;
- state->m_sl_tilemap->mark_all_dirty();
+ m_sl_image = data;
+ m_sl_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( dday_control_w )
+WRITE8_MEMBER(dday_state::dday_control_w)
{
- dday_state *state = space->machine().driver_data<dday_state>();
//if (data & 0xac) logerror("Control = %02X\n", data & 0xac);
/* bit 0 is coin counter 1 */
- coin_counter_w(space->machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 0, data & 0x01);
/* bit 1 is coin counter 2 */
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 1, data & 0x02);
/* bit 4 is sound enable */
- if (!(data & 0x10) && (state->m_control & 0x10))
- state->m_ay1->reset();
+ if (!(data & 0x10) && (m_control & 0x10))
+ m_ay1->reset();
- space->machine().sound().system_enable(data & 0x10);
+ machine().sound().system_enable(data & 0x10);
/* bit 6 is search light enable */
- state->m_sl_enable = data & 0x40;
+ m_sl_enable = data & 0x40;
- state->m_control = data;
+ m_control = data;
}
/***************************************************************************
diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c
index 5a36e50a0fa..6c2054d1245 100644
--- a/src/mame/video/ddragon.c
+++ b/src/mame/video/ddragon.c
@@ -129,18 +129,16 @@ VIDEO_START( chinagat )
***************************************************************************/
-WRITE8_HANDLER( ddragon_bgvideoram_w )
+WRITE8_MEMBER(ddragon_state::ddragon_bgvideoram_w)
{
- ddragon_state *state = space->machine().driver_data<ddragon_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( ddragon_fgvideoram_w )
+WRITE8_MEMBER(ddragon_state::ddragon_fgvideoram_w)
{
- ddragon_state *state = space->machine().driver_data<ddragon_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset / 2);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset / 2);
}
diff --git a/src/mame/video/ddragon3.c b/src/mame/video/ddragon3.c
index 96826981a87..f384969822c 100644
--- a/src/mame/video/ddragon3.c
+++ b/src/mame/video/ddragon3.c
@@ -7,55 +7,51 @@
#include "emu.h"
#include "includes/ddragon3.h"
-WRITE16_HANDLER( ddragon3_scroll_w )
+WRITE16_MEMBER(ddragon3_state::ddragon3_scroll_w)
{
- ddragon3_state *state = space->machine().driver_data<ddragon3_state>();
switch (offset)
{
- case 0: COMBINE_DATA(&state->m_fg_scrollx); break; // Scroll X, BG1
- case 1: COMBINE_DATA(&state->m_fg_scrolly); break; // Scroll Y, BG1
- case 2: COMBINE_DATA(&state->m_bg_scrollx); break; // Scroll X, BG0
- case 3: COMBINE_DATA(&state->m_bg_scrolly); break; // Scroll Y, BG0
+ case 0: COMBINE_DATA(&m_fg_scrollx); break; // Scroll X, BG1
+ case 1: COMBINE_DATA(&m_fg_scrolly); break; // Scroll Y, BG1
+ case 2: COMBINE_DATA(&m_bg_scrollx); break; // Scroll X, BG0
+ case 3: COMBINE_DATA(&m_bg_scrolly); break; // Scroll Y, BG0
case 4: break; // Unknown write
- case 5: flip_screen_set(space->machine(), data & 0x01); break; // Flip Screen
+ case 5: flip_screen_set(machine(), data & 0x01); break; // Flip Screen
case 6:
- COMBINE_DATA(&state->m_bg_tilebase); // BG Tile Base
- state->m_bg_tilebase &= 0x1ff;
- state->m_bg_tilemap->mark_all_dirty();
+ COMBINE_DATA(&m_bg_tilebase); // BG Tile Base
+ m_bg_tilebase &= 0x1ff;
+ m_bg_tilemap->mark_all_dirty();
break;
}
}
-READ16_HANDLER( ddragon3_scroll_r )
+READ16_MEMBER(ddragon3_state::ddragon3_scroll_r)
{
- ddragon3_state *state = space->machine().driver_data<ddragon3_state>();
switch (offset)
{
- case 0: return state->m_fg_scrollx;
- case 1: return state->m_fg_scrolly;
- case 2: return state->m_bg_scrollx;
- case 3: return state->m_bg_scrolly;
- case 5: return flip_screen_get(space->machine());
- case 6: return state->m_bg_tilebase;
+ case 0: return m_fg_scrollx;
+ case 1: return m_fg_scrolly;
+ case 2: return m_bg_scrollx;
+ case 3: return m_bg_scrolly;
+ case 5: return flip_screen_get(machine());
+ case 6: return m_bg_tilebase;
}
return 0;
}
-WRITE16_HANDLER( ddragon3_bg_videoram_w )
+WRITE16_MEMBER(ddragon3_state::ddragon3_bg_videoram_w)
{
- ddragon3_state *state = space->machine().driver_data<ddragon3_state>();
- COMBINE_DATA(&state->m_bg_videoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bg_videoram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( ddragon3_fg_videoram_w )
+WRITE16_MEMBER(ddragon3_state::ddragon3_fg_videoram_w)
{
- ddragon3_state *state = space->machine().driver_data<ddragon3_state>();
- COMBINE_DATA(&state->m_fg_videoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_fg_videoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset / 2);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/ddribble.c b/src/mame/video/ddribble.c
index 7906c150247..7d5db2cf019 100644
--- a/src/mame/video/ddribble.c
+++ b/src/mame/video/ddribble.c
@@ -44,42 +44,40 @@ static void set_pens( running_machine &machine )
}
-WRITE8_HANDLER( K005885_0_w )
+WRITE8_MEMBER(ddribble_state::K005885_0_w)
{
- ddribble_state *state = space->machine().driver_data<ddribble_state>();
switch (offset)
{
case 0x03: /* char bank selection for set 1 */
- if ((data & 0x03) != state->m_charbank[0])
+ if ((data & 0x03) != m_charbank[0])
{
- state->m_charbank[0] = data & 0x03;
- state->m_fg_tilemap->mark_all_dirty();
+ m_charbank[0] = data & 0x03;
+ m_fg_tilemap->mark_all_dirty();
}
break;
case 0x04: /* IRQ control, flipscreen */
- state->m_int_enable_0 = data & 0x02;
+ m_int_enable_0 = data & 0x02;
break;
}
- state->m_vregs[0][offset] = data;
+ m_vregs[0][offset] = data;
}
-WRITE8_HANDLER( K005885_1_w )
+WRITE8_MEMBER(ddribble_state::K005885_1_w)
{
- ddribble_state *state = space->machine().driver_data<ddribble_state>();
switch (offset)
{
case 0x03: /* char bank selection for set 2 */
- if ((data & 0x03) != state->m_charbank[1])
+ if ((data & 0x03) != m_charbank[1])
{
- state->m_charbank[1] = data & 0x03;
- state->m_bg_tilemap->mark_all_dirty();
+ m_charbank[1] = data & 0x03;
+ m_bg_tilemap->mark_all_dirty();
}
break;
case 0x04: /* IRQ control, flipscreen */
- state->m_int_enable_1 = data & 0x02;
+ m_int_enable_1 = data & 0x02;
break;
}
- state->m_vregs[1][offset] = data;
+ m_vregs[1][offset] = data;
}
/***************************************************************************
@@ -140,18 +138,16 @@ VIDEO_START( ddribble )
***************************************************************************/
-WRITE8_HANDLER( ddribble_fg_videoram_w )
+WRITE8_MEMBER(ddribble_state::ddribble_fg_videoram_w)
{
- ddribble_state *state = space->machine().driver_data<ddribble_state>();
- state->m_fg_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0xbff);
+ m_fg_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0xbff);
}
-WRITE8_HANDLER( ddribble_bg_videoram_w )
+WRITE8_MEMBER(ddribble_state::ddribble_bg_videoram_w)
{
- ddribble_state *state = space->machine().driver_data<ddribble_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0xbff);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0xbff);
}
/***************************************************************************
diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c
index 77922a2145c..a4c842e244e 100644
--- a/src/mame/video/deadang.c
+++ b/src/mame/video/deadang.c
@@ -4,31 +4,28 @@
/******************************************************************************/
-WRITE16_HANDLER( deadang_foreground_w )
+WRITE16_MEMBER(deadang_state::deadang_foreground_w)
{
- deadang_state *state = space->machine().driver_data<deadang_state>();
- COMBINE_DATA(&state->m_video_data[offset]);
- state->m_pf1_layer->mark_tile_dirty(offset );
+ COMBINE_DATA(&m_video_data[offset]);
+ m_pf1_layer->mark_tile_dirty(offset );
}
-WRITE16_HANDLER( deadang_text_w )
+WRITE16_MEMBER(deadang_state::deadang_text_w)
{
- deadang_state *state = space->machine().driver_data<deadang_state>();
- UINT16 *videoram = state->m_videoram;
+ UINT16 *videoram = m_videoram;
COMBINE_DATA(&videoram[offset]);
- state->m_text_layer->mark_tile_dirty(offset );
+ m_text_layer->mark_tile_dirty(offset );
}
-WRITE16_HANDLER( deadang_bank_w )
+WRITE16_MEMBER(deadang_state::deadang_bank_w)
{
- deadang_state *state = space->machine().driver_data<deadang_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_deadangle_tilebank = data&1;
- if (state->m_deadangle_tilebank!=state->m_deadangle_oldtilebank)
+ m_deadangle_tilebank = data&1;
+ if (m_deadangle_tilebank!=m_deadangle_oldtilebank)
{
- state->m_deadangle_oldtilebank = state->m_deadangle_tilebank;
- state->m_pf1_layer->mark_all_dirty();
+ m_deadangle_oldtilebank = m_deadangle_tilebank;
+ m_pf1_layer->mark_all_dirty();
}
}
}
diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c
index d3b443a285e..5d97f3c35c4 100644
--- a/src/mame/video/dec0.c
+++ b/src/mame/video/dec0.c
@@ -11,10 +11,9 @@
/******************************************************************************/
-WRITE16_HANDLER( dec0_update_sprites_w )
+WRITE16_MEMBER(dec0_state::dec0_update_sprites_w)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
- memcpy(state->m_buffered_spriteram,state->m_spriteram,0x800);
+ memcpy(m_buffered_spriteram,m_spriteram,0x800);
}
/******************************************************************************/
@@ -31,18 +30,16 @@ static void update_24bitcol(running_machine &machine, int offset)
palette_set_color(machine,offset,MAKE_RGB(r,g,b));
}
-WRITE16_HANDLER( dec0_paletteram_rg_w )
+WRITE16_MEMBER(dec0_state::dec0_paletteram_rg_w)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- update_24bitcol(space->machine(), offset);
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ update_24bitcol(machine(), offset);
}
-WRITE16_HANDLER( dec0_paletteram_b_w )
+WRITE16_MEMBER(dec0_state::dec0_paletteram_b_w)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
- COMBINE_DATA(&state->m_generic_paletteram2_16[offset]);
- update_24bitcol(space->machine(), offset);
+ COMBINE_DATA(&m_generic_paletteram2_16[offset]);
+ update_24bitcol(machine(), offset);
}
/******************************************************************************/
@@ -252,10 +249,9 @@ SCREEN_UPDATE_IND16( midres )
}
-WRITE16_HANDLER( dec0_priority_w )
+WRITE16_MEMBER(dec0_state::dec0_priority_w)
{
- dec0_state *state = space->machine().driver_data<dec0_state>();
- COMBINE_DATA(&state->m_pri);
+ COMBINE_DATA(&m_pri);
}
VIDEO_START( dec0_nodma )
diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c
index 23a07995cf7..06c8364c961 100644
--- a/src/mame/video/dec8.c
+++ b/src/mame/video/dec8.c
@@ -103,61 +103,54 @@ PALETTE_INIT( ghostb )
}
}
-WRITE8_HANDLER( dec8_bg_data_w )
+WRITE8_MEMBER(dec8_state::dec8_bg_data_w)
{
- dec8_state *state = space->machine().driver_data<dec8_state>();
- state->m_bg_data[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_data[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-READ8_HANDLER( dec8_bg_data_r )
+READ8_MEMBER(dec8_state::dec8_bg_data_r)
{
- dec8_state *state = space->machine().driver_data<dec8_state>();
- return state->m_bg_data[offset];
+ return m_bg_data[offset];
}
-WRITE8_HANDLER( dec8_videoram_w )
+WRITE8_MEMBER(dec8_state::dec8_videoram_w)
{
- dec8_state *state = space->machine().driver_data<dec8_state>();
- state->m_videoram[offset] = data;
- state->m_fix_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_fix_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( srdarwin_videoram_w )
+WRITE8_MEMBER(dec8_state::srdarwin_videoram_w)
{
- dec8_state *state = space->machine().driver_data<dec8_state>();
- state->m_videoram[offset] = data;
- state->m_fix_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fix_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( dec8_scroll2_w )
+WRITE8_MEMBER(dec8_state::dec8_scroll2_w)
{
- dec8_state *state = space->machine().driver_data<dec8_state>();
- state->m_scroll2[offset] = data;
+ m_scroll2[offset] = data;
}
-WRITE8_HANDLER( srdarwin_control_w )
+WRITE8_MEMBER(dec8_state::srdarwin_control_w)
{
- dec8_state *state = space->machine().driver_data<dec8_state>();
switch (offset)
{
case 0: /* Top 3 bits - bank switch, bottom 4 - scroll MSB */
- memory_set_bank(space->machine(), "bank1", (data >> 5));
- state->m_scroll2[0] = data & 0xf;
+ memory_set_bank(machine(), "bank1", (data >> 5));
+ m_scroll2[0] = data & 0xf;
return;
case 1:
- state->m_scroll2[1] = data;
+ m_scroll2[1] = data;
return;
}
}
-WRITE8_HANDLER( lastmisn_control_w )
+WRITE8_MEMBER(dec8_state::lastmisn_control_w)
{
- dec8_state *state = space->machine().driver_data<dec8_state>();
/*
Bit 0x0f - ROM bank switch.
@@ -166,54 +159,50 @@ WRITE8_HANDLER( lastmisn_control_w )
Bit 0x40 - Y scroll MSB
Bit 0x80 - Hold subcpu reset line high if clear, else low
*/
- memory_set_bank(space->machine(), "bank1", data & 0x0f);
+ memory_set_bank(machine(), "bank1", data & 0x0f);
- state->m_scroll2[0] = (data >> 5) & 1;
- state->m_scroll2[2] = (data >> 6) & 1;
+ m_scroll2[0] = (data >> 5) & 1;
+ m_scroll2[2] = (data >> 6) & 1;
if (data & 0x80)
- device_set_input_line(state->m_subcpu, INPUT_LINE_RESET, CLEAR_LINE);
+ device_set_input_line(m_subcpu, INPUT_LINE_RESET, CLEAR_LINE);
else
- device_set_input_line(state->m_subcpu, INPUT_LINE_RESET, ASSERT_LINE);
+ device_set_input_line(m_subcpu, INPUT_LINE_RESET, ASSERT_LINE);
}
-WRITE8_HANDLER( shackled_control_w )
+WRITE8_MEMBER(dec8_state::shackled_control_w)
{
- dec8_state *state = space->machine().driver_data<dec8_state>();
/* Bottom 4 bits - bank switch, Bits 4 & 5 - Scroll MSBs */
- memory_set_bank(space->machine(), "bank1", data & 0x0f);
+ memory_set_bank(machine(), "bank1", data & 0x0f);
- state->m_scroll2[0] = (data >> 5) & 1;
- state->m_scroll2[2] = (data >> 6) & 1;
+ m_scroll2[0] = (data >> 5) & 1;
+ m_scroll2[2] = (data >> 6) & 1;
}
-WRITE8_HANDLER( lastmisn_scrollx_w )
+WRITE8_MEMBER(dec8_state::lastmisn_scrollx_w)
{
- dec8_state *state = space->machine().driver_data<dec8_state>();
- state->m_scroll2[1] = data;
+ m_scroll2[1] = data;
}
-WRITE8_HANDLER( lastmisn_scrolly_w )
+WRITE8_MEMBER(dec8_state::lastmisn_scrolly_w)
{
- dec8_state *state = space->machine().driver_data<dec8_state>();
- state->m_scroll2[3] = data;
+ m_scroll2[3] = data;
}
-WRITE8_HANDLER( gondo_scroll_w )
+WRITE8_MEMBER(dec8_state::gondo_scroll_w)
{
- dec8_state *state = space->machine().driver_data<dec8_state>();
switch (offset)
{
case 0x0:
- state->m_scroll2[1] = data; /* X LSB */
+ m_scroll2[1] = data; /* X LSB */
break;
case 0x8:
- state->m_scroll2[3] = data; /* Y LSB */
+ m_scroll2[3] = data; /* Y LSB */
break;
case 0x10:
- state->m_scroll2[0] = (data >> 0) & 1; /* Bit 0: X MSB */
- state->m_scroll2[2] = (data >> 1) & 1; /* Bit 1: Y MSB */
+ m_scroll2[0] = (data >> 0) & 1; /* Bit 0: X MSB */
+ m_scroll2[2] = (data >> 1) & 1; /* Bit 1: Y MSB */
/* Bit 2 is also used in Gondo & Garyoret */
break;
}
diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c
index ce85c3e7b12..d1df4ce0d3f 100644
--- a/src/mame/video/deco32.c
+++ b/src/mame/video/deco32.c
@@ -5,29 +5,25 @@
/******************************************************************************/
-WRITE32_HANDLER( deco32_pri_w )
+WRITE32_MEMBER(deco32_state::deco32_pri_w)
{
- deco32_state *state = space->machine().driver_data<deco32_state>();
- state->m_pri=data;
+ m_pri=data;
}
-WRITE32_HANDLER( dragngun_sprite_control_w )
+WRITE32_MEMBER(dragngun_state::dragngun_sprite_control_w)
{
- dragngun_state *state = space->machine().driver_data<dragngun_state>();
- state->m_dragngun_sprite_ctrl=data;
+ m_dragngun_sprite_ctrl=data;
}
-WRITE32_HANDLER( dragngun_spriteram_dma_w )
+WRITE32_MEMBER(dragngun_state::dragngun_spriteram_dma_w)
{
/* DMA spriteram to private sprite chip area, and clear cpu ram */
- deco32_state *state = space->machine().driver_data<deco32_state>();
- state->m_spriteram->copy();
- memset(state->m_spriteram->live(),0,0x2000);
+ m_spriteram->copy();
+ memset(m_spriteram->live(),0,0x2000);
}
-WRITE32_HANDLER( deco32_ace_ram_w )
+WRITE32_MEMBER(deco32_state::deco32_ace_ram_w)
{
- deco32_state *state = space->machine().driver_data<deco32_state>();
/* Some notes pieced together from Tattoo Assassins info:
Bytes 0 to 0x58 - object alpha control?
@@ -59,10 +55,10 @@ WRITE32_HANDLER( deco32_ace_ram_w )
'fadetype' - 1100 for multiplicative fade, 1000 for additive
*/
- if (offset>=(0x80/4) && (data!=state->m_ace_ram[offset]))
- state->m_ace_ram_dirty=1;
+ if (offset>=(0x80/4) && (data!=m_ace_ram[offset]))
+ m_ace_ram_dirty=1;
- COMBINE_DATA(&state->m_ace_ram[offset]);
+ COMBINE_DATA(&m_ace_ram[offset]);
}
static void updateAceRam(running_machine& machine)
@@ -103,48 +99,45 @@ static void updateAceRam(running_machine& machine)
/* Later games have double buffered paletteram - the real palette ram is
only updated on a DMA call */
-WRITE32_HANDLER( deco32_nonbuffered_palette_w )
+WRITE32_MEMBER(deco32_state::deco32_nonbuffered_palette_w)
{
int r,g,b;
- deco32_state *state = space->machine().driver_data<deco32_state>();
- COMBINE_DATA(&state->m_generic_paletteram_32[offset]);
+ COMBINE_DATA(&m_generic_paletteram_32[offset]);
- b = (state->m_generic_paletteram_32[offset] >>16) & 0xff;
- g = (state->m_generic_paletteram_32[offset] >> 8) & 0xff;
- r = (state->m_generic_paletteram_32[offset] >> 0) & 0xff;
+ b = (m_generic_paletteram_32[offset] >>16) & 0xff;
+ g = (m_generic_paletteram_32[offset] >> 8) & 0xff;
+ r = (m_generic_paletteram_32[offset] >> 0) & 0xff;
- palette_set_color(space->machine(),offset,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),offset,MAKE_RGB(r,g,b));
}
-WRITE32_HANDLER( deco32_buffered_palette_w )
+WRITE32_MEMBER(deco32_state::deco32_buffered_palette_w)
{
- deco32_state *state = space->machine().driver_data<deco32_state>();
- COMBINE_DATA(&state->m_generic_paletteram_32[offset]);
- state->m_dirty_palette[offset]=1;
+ COMBINE_DATA(&m_generic_paletteram_32[offset]);
+ m_dirty_palette[offset]=1;
}
-WRITE32_HANDLER( deco32_palette_dma_w )
+WRITE32_MEMBER(deco32_state::deco32_palette_dma_w)
{
- deco32_state *state = space->machine().driver_data<deco32_state>();
- const int m=space->machine().total_colors();
+ const int m=machine().total_colors();
int r,g,b,i;
for (i=0; i<m; i++) {
- if (state->m_dirty_palette[i]) {
- state->m_dirty_palette[i]=0;
+ if (m_dirty_palette[i]) {
+ m_dirty_palette[i]=0;
- if (state->m_has_ace_ram)
+ if (m_has_ace_ram)
{
- state->m_ace_ram_dirty=1;
+ m_ace_ram_dirty=1;
}
else
{
- b = (state->m_generic_paletteram_32[i] >>16) & 0xff;
- g = (state->m_generic_paletteram_32[i] >> 8) & 0xff;
- r = (state->m_generic_paletteram_32[i] >> 0) & 0xff;
+ b = (m_generic_paletteram_32[i] >>16) & 0xff;
+ g = (m_generic_paletteram_32[i] >> 8) & 0xff;
+ r = (m_generic_paletteram_32[i] >> 0) & 0xff;
- palette_set_color(space->machine(),i,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),i,MAKE_RGB(r,g,b));
}
}
}
diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c
index d3ad227c790..79be67614ae 100644
--- a/src/mame/video/deniam.c
+++ b/src/mame/video/deniam.c
@@ -124,60 +124,55 @@ VIDEO_START( deniam )
***************************************************************************/
-WRITE16_HANDLER( deniam_videoram_w )
+WRITE16_MEMBER(deniam_state::deniam_videoram_w)
{
- deniam_state *state = space->machine().driver_data<deniam_state>();
int page, i;
- COMBINE_DATA(&state->m_videoram[offset]);
+ COMBINE_DATA(&m_videoram[offset]);
page = offset >> 11;
for (i = 0; i < 4; i++)
{
- if (state->m_bg_page[i] == page)
- state->m_bg_tilemap->mark_tile_dirty(i * 0x800 + (offset & 0x7ff));
- if (state->m_fg_page[i] == page)
- state->m_fg_tilemap->mark_tile_dirty(i * 0x800 + (offset & 0x7ff));
+ if (m_bg_page[i] == page)
+ m_bg_tilemap->mark_tile_dirty(i * 0x800 + (offset & 0x7ff));
+ if (m_fg_page[i] == page)
+ m_fg_tilemap->mark_tile_dirty(i * 0x800 + (offset & 0x7ff));
}
}
-WRITE16_HANDLER( deniam_textram_w )
+WRITE16_MEMBER(deniam_state::deniam_textram_w)
{
- deniam_state *state = space->machine().driver_data<deniam_state>();
- COMBINE_DATA(&state->m_textram[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_textram[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( deniam_palette_w )
+WRITE16_MEMBER(deniam_state::deniam_palette_w)
{
- deniam_state *state = space->machine().driver_data<deniam_state>();
int r, g, b;
- data = COMBINE_DATA(&state->m_paletteram[offset]);
+ data = COMBINE_DATA(&m_paletteram[offset]);
r = ((data << 1) & 0x1e) | ((data >> 12) & 0x01);
g = ((data >> 3) & 0x1e) | ((data >> 13) & 0x01);
b = ((data >> 7) & 0x1e) | ((data >> 14) & 0x01);
- palette_set_color_rgb(space->machine(), offset, pal5bit(r), pal5bit(g), pal5bit(b));
+ palette_set_color_rgb(machine(), offset, pal5bit(r), pal5bit(g), pal5bit(b));
}
-READ16_HANDLER( deniam_coinctrl_r )
+READ16_MEMBER(deniam_state::deniam_coinctrl_r)
{
- deniam_state *state = space->machine().driver_data<deniam_state>();
- return state->m_coinctrl;
+ return m_coinctrl;
}
-WRITE16_HANDLER( deniam_coinctrl_w )
+WRITE16_MEMBER(deniam_state::deniam_coinctrl_w)
{
- deniam_state *state = space->machine().driver_data<deniam_state>();
- COMBINE_DATA(&state->m_coinctrl);
+ COMBINE_DATA(&m_coinctrl);
/* bit 0 is coin counter */
- coin_counter_w(space->machine(), 0, state->m_coinctrl & 0x01);
+ coin_counter_w(machine(), 0, m_coinctrl & 0x01);
/* bit 6 is display enable (0 freezes screen) */
- state->m_display_enable = state->m_coinctrl & 0x20;
+ m_display_enable = m_coinctrl & 0x20;
/* other bits unknown (unused?) */
}
diff --git a/src/mame/video/djboy.c b/src/mame/video/djboy.c
index 985fe1f9848..219d0a9fe34 100644
--- a/src/mame/video/djboy.c
+++ b/src/mame/video/djboy.c
@@ -7,16 +7,14 @@
#include "video/kan_pand.h"
#include "includes/djboy.h"
-WRITE8_HANDLER( djboy_scrollx_w )
+WRITE8_MEMBER(djboy_state::djboy_scrollx_w)
{
- djboy_state *state = space->machine().driver_data<djboy_state>();
- state->m_scrollx = data;
+ m_scrollx = data;
}
-WRITE8_HANDLER( djboy_scrolly_w )
+WRITE8_MEMBER(djboy_state::djboy_scrolly_w)
{
- djboy_state *state = space->machine().driver_data<djboy_state>();
- state->m_scrolly = data;
+ m_scrolly = data;
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -32,12 +30,11 @@ static TILE_GET_INFO( get_bg_tile_info )
SET_TILE_INFO(1, code, color, 0); /* no flip */
}
-WRITE8_HANDLER( djboy_videoram_w )
+WRITE8_MEMBER(djboy_state::djboy_videoram_w)
{
- djboy_state *state = space->machine().driver_data<djboy_state>();
- state->m_videoram[offset] = data;
- state->m_background->mark_tile_dirty(offset & 0x7ff);
+ m_videoram[offset] = data;
+ m_background->mark_tile_dirty(offset & 0x7ff);
}
VIDEO_START( djboy )
@@ -46,16 +43,15 @@ VIDEO_START( djboy )
state->m_background = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 32);
}
-WRITE8_HANDLER( djboy_paletteram_w )
+WRITE8_MEMBER(djboy_state::djboy_paletteram_w)
{
- djboy_state *state = space->machine().driver_data<djboy_state>();
int val;
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
offset &= ~1;
- val = (state->m_paletteram[offset] << 8) | state->m_paletteram[offset + 1];
+ val = (m_paletteram[offset] << 8) | m_paletteram[offset + 1];
- palette_set_color_rgb(space->machine(), offset / 2, pal4bit(val >> 8), pal4bit(val >> 4), pal4bit(val >> 0));
+ palette_set_color_rgb(machine(), offset / 2, pal4bit(val >> 8), pal4bit(val >> 4), pal4bit(val >> 0));
}
SCREEN_UPDATE_IND16( djboy )
diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c
index b3754f61eeb..64ccc68af3a 100644
--- a/src/mame/video/dkong.c
+++ b/src/mame/video/dkong.c
@@ -472,85 +472,77 @@ static TILE_GET_INFO( radarscp1_bg_tile_info )
***************************************************************************/
-WRITE8_HANDLER( dkong_videoram_w )
+WRITE8_MEMBER(dkong_state::dkong_videoram_w)
{
- dkong_state *state = space->machine().driver_data<dkong_state>();
- if (state->m_video_ram[offset] != data)
+ if (m_video_ram[offset] != data)
{
- state->m_video_ram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_video_ram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
}
-WRITE8_HANDLER( dkongjr_gfxbank_w )
+WRITE8_MEMBER(dkong_state::dkongjr_gfxbank_w)
{
- dkong_state *state = space->machine().driver_data<dkong_state>();
- if (state->m_gfx_bank != (data & 0x01))
+ if (m_gfx_bank != (data & 0x01))
{
- state->m_gfx_bank = data & 0x01;
- state->m_bg_tilemap->mark_all_dirty();
+ m_gfx_bank = data & 0x01;
+ m_bg_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( dkong3_gfxbank_w )
+WRITE8_MEMBER(dkong_state::dkong3_gfxbank_w)
{
- dkong_state *state = space->machine().driver_data<dkong_state>();
- if (state->m_gfx_bank != (~data & 0x01))
+ if (m_gfx_bank != (~data & 0x01))
{
- state->m_gfx_bank = ~data & 0x01;
- state->m_bg_tilemap->mark_all_dirty();
+ m_gfx_bank = ~data & 0x01;
+ m_bg_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( dkong_palettebank_w )
+WRITE8_MEMBER(dkong_state::dkong_palettebank_w)
{
- dkong_state *state = space->machine().driver_data<dkong_state>();
int newbank;
- newbank = state->m_palette_bank;
+ newbank = m_palette_bank;
if (data & 1)
newbank |= 1 << offset;
else
newbank &= ~(1 << offset);
- if (state->m_palette_bank != newbank)
+ if (m_palette_bank != newbank)
{
- state->m_palette_bank = newbank;
- state->m_bg_tilemap->mark_all_dirty();
+ m_palette_bank = newbank;
+ m_bg_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( radarscp_grid_enable_w )
+WRITE8_MEMBER(dkong_state::radarscp_grid_enable_w)
{
- dkong_state *state = space->machine().driver_data<dkong_state>();
- state->m_grid_on = data & 0x01;
+ m_grid_on = data & 0x01;
}
-WRITE8_HANDLER( radarscp_grid_color_w )
+WRITE8_MEMBER(dkong_state::radarscp_grid_color_w)
{
- dkong_state *state = space->machine().driver_data<dkong_state>();
- state->m_grid_col = (data & 0x07) ^ 0x07;
- /* popmessage("Gridcol: %d", state->m_grid_col); */
+ m_grid_col = (data & 0x07) ^ 0x07;
+ /* popmessage("Gridcol: %d", m_grid_col); */
}
-WRITE8_HANDLER( dkong_flipscreen_w )
+WRITE8_MEMBER(dkong_state::dkong_flipscreen_w)
{
- dkong_state *state = space->machine().driver_data<dkong_state>();
- state->m_flip = ~data & 0x01;
+ m_flip = ~data & 0x01;
}
-WRITE8_HANDLER( dkong_spritebank_w )
+WRITE8_MEMBER(dkong_state::dkong_spritebank_w)
{
- dkong_state *state = space->machine().driver_data<dkong_state>();
- state->m_sprite_bank = data & 0x01;
+ m_sprite_bank = data & 0x01;
}
/***************************************************************************
diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c
index 1a4b81ef0de..cc3e292c481 100644
--- a/src/mame/video/docastle.c
+++ b/src/mame/video/docastle.c
@@ -62,48 +62,42 @@ PALETTE_INIT( docastle )
}
}
-WRITE8_HANDLER( docastle_videoram_w )
+WRITE8_MEMBER(docastle_state::docastle_videoram_w)
{
- docastle_state *state = space->machine().driver_data<docastle_state>();
- state->m_videoram[offset] = data;
- state->m_do_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_do_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( docastle_colorram_w )
+WRITE8_MEMBER(docastle_state::docastle_colorram_w)
{
- docastle_state *state = space->machine().driver_data<docastle_state>();
- state->m_colorram[offset] = data;
- state->m_do_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_do_tilemap->mark_tile_dirty(offset);
}
-READ8_HANDLER( docastle_flipscreen_off_r )
+READ8_MEMBER(docastle_state::docastle_flipscreen_off_r)
{
- docastle_state *state = space->machine().driver_data<docastle_state>();
- flip_screen_set(space->machine(), 0);
- state->m_do_tilemap->mark_all_dirty();
+ flip_screen_set(machine(), 0);
+ m_do_tilemap->mark_all_dirty();
return 0;
}
-READ8_HANDLER( docastle_flipscreen_on_r )
+READ8_MEMBER(docastle_state::docastle_flipscreen_on_r)
{
- docastle_state *state = space->machine().driver_data<docastle_state>();
- flip_screen_set(space->machine(), 1);
- state->m_do_tilemap->mark_all_dirty();
+ flip_screen_set(machine(), 1);
+ m_do_tilemap->mark_all_dirty();
return 1;
}
-WRITE8_HANDLER( docastle_flipscreen_off_w )
+WRITE8_MEMBER(docastle_state::docastle_flipscreen_off_w)
{
- docastle_state *state = space->machine().driver_data<docastle_state>();
- flip_screen_set(space->machine(), 0);
- state->m_do_tilemap->mark_all_dirty();
+ flip_screen_set(machine(), 0);
+ m_do_tilemap->mark_all_dirty();
}
-WRITE8_HANDLER( docastle_flipscreen_on_w )
+WRITE8_MEMBER(docastle_state::docastle_flipscreen_on_w)
{
- docastle_state *state = space->machine().driver_data<docastle_state>();
- flip_screen_set(space->machine(), 1);
- state->m_do_tilemap->mark_all_dirty();
+ flip_screen_set(machine(), 1);
+ m_do_tilemap->mark_all_dirty();
}
static TILE_GET_INFO( get_tile_info )
diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c
index abaff8a2330..0d156c11273 100644
--- a/src/mame/video/dogfgt.c
+++ b/src/mame/video/dogfgt.c
@@ -84,32 +84,29 @@ VIDEO_START( dogfgt )
***************************************************************************/
-WRITE8_HANDLER( dogfgt_plane_select_w )
+WRITE8_MEMBER(dogfgt_state::dogfgt_plane_select_w)
{
- dogfgt_state *state = space->machine().driver_data<dogfgt_state>();
- state->m_bm_plane = data;
+ m_bm_plane = data;
}
-READ8_HANDLER( dogfgt_bitmapram_r )
+READ8_MEMBER(dogfgt_state::dogfgt_bitmapram_r)
{
- dogfgt_state *state = space->machine().driver_data<dogfgt_state>();
- if (state->m_bm_plane > 2)
+ if (m_bm_plane > 2)
{
- popmessage("bitmapram_r offs %04x plane %d\n", offset, state->m_bm_plane);
+ popmessage("bitmapram_r offs %04x plane %d\n", offset, m_bm_plane);
return 0;
}
- return state->m_bitmapram[offset + BITMAPRAM_SIZE / 3 * state->m_bm_plane];
+ return m_bitmapram[offset + BITMAPRAM_SIZE / 3 * m_bm_plane];
}
-static WRITE8_HANDLER( internal_bitmapram_w )
+WRITE8_MEMBER(dogfgt_state::internal_bitmapram_w)
{
- dogfgt_state *state = space->machine().driver_data<dogfgt_state>();
int x, y, subx;
- state->m_bitmapram[offset] = data;
+ m_bitmapram[offset] = data;
offset &= (BITMAPRAM_SIZE / 3 - 1);
x = 8 * (offset / 256);
@@ -120,61 +117,57 @@ static WRITE8_HANDLER( internal_bitmapram_w )
int i, color = 0;
for (i = 0; i < 3; i++)
- color |= ((state->m_bitmapram[offset + BITMAPRAM_SIZE / 3 * i] >> subx) & 1) << i;
+ color |= ((m_bitmapram[offset + BITMAPRAM_SIZE / 3 * i] >> subx) & 1) << i;
- if (flip_screen_get(space->machine()))
- state->m_pixbitmap.pix16(y ^ 0xff, (x + subx) ^ 0xff) = PIXMAP_COLOR_BASE + 8 * state->m_pixcolor + color;
+ if (flip_screen_get(machine()))
+ m_pixbitmap.pix16(y ^ 0xff, (x + subx) ^ 0xff) = PIXMAP_COLOR_BASE + 8 * m_pixcolor + color;
else
- state->m_pixbitmap.pix16(y, x + subx) = PIXMAP_COLOR_BASE + 8 * state->m_pixcolor + color;
+ m_pixbitmap.pix16(y, x + subx) = PIXMAP_COLOR_BASE + 8 * m_pixcolor + color;
}
}
-WRITE8_HANDLER( dogfgt_bitmapram_w )
+WRITE8_MEMBER(dogfgt_state::dogfgt_bitmapram_w)
{
- dogfgt_state *state = space->machine().driver_data<dogfgt_state>();
- if (state->m_bm_plane > 2)
+ if (m_bm_plane > 2)
{
- popmessage("bitmapram_w offs %04x plane %d\n", offset, state->m_bm_plane);
+ popmessage("bitmapram_w offs %04x plane %d\n", offset, m_bm_plane);
return;
}
- internal_bitmapram_w(space, offset + BITMAPRAM_SIZE / 3 * state->m_bm_plane, data);
+ internal_bitmapram_w(space, offset + BITMAPRAM_SIZE / 3 * m_bm_plane, data);
}
-WRITE8_HANDLER( dogfgt_bgvideoram_w )
+WRITE8_MEMBER(dogfgt_state::dogfgt_bgvideoram_w)
{
- dogfgt_state *state = space->machine().driver_data<dogfgt_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( dogfgt_scroll_w )
+WRITE8_MEMBER(dogfgt_state::dogfgt_scroll_w)
{
- dogfgt_state *state = space->machine().driver_data<dogfgt_state>();
- state->m_scroll[offset] = data;
- state->m_bg_tilemap->set_scrollx(0, state->m_scroll[0] + 256 * state->m_scroll[1] + 256);
- state->m_bg_tilemap->set_scrolly(0, state->m_scroll[2] + 256 * state->m_scroll[3]);
+ m_scroll[offset] = data;
+ m_bg_tilemap->set_scrollx(0, m_scroll[0] + 256 * m_scroll[1] + 256);
+ m_bg_tilemap->set_scrolly(0, m_scroll[2] + 256 * m_scroll[3]);
}
-WRITE8_HANDLER( dogfgt_1800_w )
+WRITE8_MEMBER(dogfgt_state::dogfgt_1800_w)
{
- dogfgt_state *state = space->machine().driver_data<dogfgt_state>();
/* bits 0 and 1 are probably text color (not verified because PROM is missing) */
- state->m_pixcolor = ((data & 0x01) << 1) | ((data & 0x02) >> 1);
+ m_pixcolor = ((data & 0x01) << 1) | ((data & 0x02) >> 1);
/* bits 4 and 5 are coin counters */
- coin_counter_w(space->machine(), 0, data & 0x10);
- coin_counter_w(space->machine(), 1, data & 0x20);
+ coin_counter_w(machine(), 0, data & 0x10);
+ coin_counter_w(machine(), 1, data & 0x20);
/* bit 7 is screen flip */
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
/* other bits unused? */
- logerror("PC %04x: 1800 = %02x\n", cpu_get_pc(&space->device()), data);
+ logerror("PC %04x: 1800 = %02x\n", cpu_get_pc(&space.device()), data);
}
@@ -230,7 +223,7 @@ SCREEN_UPDATE_IND16( dogfgt )
state->m_lastpixcolor = state->m_pixcolor;
for (offs = 0; offs < BITMAPRAM_SIZE; offs++)
- internal_bitmapram_w(space, offs, state->m_bitmapram[offs]);
+ state->internal_bitmapram_w(*space, offs, state->m_bitmapram[offs]);
}
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index c048c29ce25..7bf116fecb5 100644
--- a/src/mame/video/dooyong.c
+++ b/src/mame/video/dooyong.c
@@ -46,95 +46,89 @@ INLINE void dooyong_scroll8_w(offs_t offset, UINT8 data, UINT8 *scroll, tilemap_
/* These handle writes to the tilemap scroll registers in 8-bit machines.
There is one per tilemap, wrapping the above function that does the work. */
-WRITE8_HANDLER( dooyong_bgscroll8_w )
+WRITE8_MEMBER(dooyong_state::dooyong_bgscroll8_w)
{
- dooyong_state *state = space->machine().driver_data<dooyong_state>();
- dooyong_scroll8_w(offset, data, state->m_bgscroll8, state->m_bg_tilemap);
+ dooyong_scroll8_w(offset, data, m_bgscroll8, m_bg_tilemap);
}
-static WRITE8_HANDLER( dooyong_bg2scroll8_w )
+WRITE8_MEMBER(dooyong_state::dooyong_bg2scroll8_w)
{
- dooyong_state *state = space->machine().driver_data<dooyong_state>();
- dooyong_scroll8_w(offset, data, state->m_bg2scroll8, state->m_bg2_tilemap);
+ dooyong_scroll8_w(offset, data, m_bg2scroll8, m_bg2_tilemap);
}
-WRITE8_HANDLER( dooyong_fgscroll8_w )
+WRITE8_MEMBER(dooyong_state::dooyong_fgscroll8_w)
{
- dooyong_state *state = space->machine().driver_data<dooyong_state>();
- dooyong_scroll8_w(offset, data, state->m_fgscroll8, state->m_fg_tilemap);
+ dooyong_scroll8_w(offset, data, m_fgscroll8, m_fg_tilemap);
}
-WRITE8_HANDLER( dooyong_fg2scroll8_w )
+WRITE8_MEMBER(dooyong_state::dooyong_fg2scroll8_w)
{
- dooyong_state *state = space->machine().driver_data<dooyong_state>();
- dooyong_scroll8_w(offset, data, state->m_fg2scroll8, state->m_fg2_tilemap);
+ dooyong_scroll8_w(offset, data, m_fg2scroll8, m_fg2_tilemap);
}
/* These handle writes to the tilemap scroll registers in 16-bit machines.
This is just an 8-bit peripheral in a 16-bit machine. */
-WRITE16_HANDLER( dooyong_bgscroll16_w )
+WRITE16_MEMBER(dooyong_state::dooyong_bgscroll16_w)
{
if (ACCESSING_BITS_0_7) dooyong_bgscroll8_w(space, offset, data & 0x00ff);
}
-WRITE16_HANDLER( dooyong_bg2scroll16_w )
+WRITE16_MEMBER(dooyong_state::dooyong_bg2scroll16_w)
{
if (ACCESSING_BITS_0_7) dooyong_bg2scroll8_w(space, offset, data & 0x00ff);
}
-WRITE16_HANDLER( dooyong_fgscroll16_w )
+WRITE16_MEMBER(dooyong_state::dooyong_fgscroll16_w)
{
if (ACCESSING_BITS_0_7) dooyong_fgscroll8_w(space, offset, data & 0x00ff);
}
-WRITE16_HANDLER( dooyong_fg2scroll16_w )
+WRITE16_MEMBER(dooyong_state::dooyong_fg2scroll16_w)
{
if (ACCESSING_BITS_0_7) dooyong_fg2scroll8_w(space, offset, data & 0x00ff);
}
-WRITE8_HANDLER( dooyong_txvideoram8_w )
+WRITE8_MEMBER(dooyong_state::dooyong_txvideoram8_w)
{
- dooyong_state *state = space->machine().driver_data<dooyong_state>();
- if (state->m_txvideoram[offset] != data)
+ if (m_txvideoram[offset] != data)
{
- state->m_txvideoram[offset] = data;
- if (state->m_tx_tilemap_mode == 0)
- state->m_tx_tilemap->mark_tile_dirty(offset & 0x07ff);
+ m_txvideoram[offset] = data;
+ if (m_tx_tilemap_mode == 0)
+ m_tx_tilemap->mark_tile_dirty(offset & 0x07ff);
else
- state->m_tx_tilemap->mark_tile_dirty(offset >> 1);
+ m_tx_tilemap->mark_tile_dirty(offset >> 1);
}
}
/* Control registers seem to be different on every game */
-WRITE8_HANDLER( lastday_ctrl_w )
+WRITE8_MEMBER(dooyong_state::lastday_ctrl_w)
{
- dooyong_state *state = space->machine().driver_data<dooyong_state>();
/* bits 0 and 1 are coin counters */
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02);
/* bit 3 is used but unknown */
/* bit 4 disables sprites */
- state->m_sprites_disabled = data & 0x10;
+ m_sprites_disabled = data & 0x10;
/* bit 6 is flip screen */
- flip_screen_set(space->machine(), data & 0x40);
+ flip_screen_set(machine(), data & 0x40);
}
-WRITE8_HANDLER( pollux_ctrl_w )
+WRITE8_MEMBER(dooyong_state::pollux_ctrl_w)
{
/* bit 0 is flip screen */
- flip_screen_set(space->machine(), data & 0x01);
+ flip_screen_set(machine(), data & 0x01);
/* bits 6 and 7 are coin counters */
- coin_counter_w(space->machine(), 0, data & 0x80);
- coin_counter_w(space->machine(), 1, data & 0x40);
+ coin_counter_w(machine(), 0, data & 0x80);
+ coin_counter_w(machine(), 1, data & 0x40);
/* bit 1 is used but unknown */
@@ -142,61 +136,57 @@ WRITE8_HANDLER( pollux_ctrl_w )
/* bit 4 is used but unknown */
}
-WRITE8_HANDLER( primella_ctrl_w )
+WRITE8_MEMBER(dooyong_state::primella_ctrl_w)
{
- dooyong_state *state = space->machine().driver_data<dooyong_state>();
/* bits 0-2 select ROM bank */
- memory_set_bank(space->machine(), "bank1", data & 0x07);
+ memory_set_bank(machine(), "bank1", data & 0x07);
/* bit 3 disables tx layer */
- state->m_tx_pri = data & 0x08;
+ m_tx_pri = data & 0x08;
/* bit 4 flips screen */
- flip_screen_set(space->machine(), data & 0x10);
+ flip_screen_set(machine(), data & 0x10);
/* bit 5 used but unknown */
-// logerror("%04x: bankswitch = %02x\n",cpu_get_pc(&space->device()),data&0xe0);
+// logerror("%04x: bankswitch = %02x\n",cpu_get_pc(&space.device()),data&0xe0);
}
-WRITE8_HANDLER( paletteram_flytiger_w )
+WRITE8_MEMBER(dooyong_state::paletteram_flytiger_w)
{
- dooyong_state *state = space->machine().driver_data<dooyong_state>();
- if (state->m_flytiger_palette_bank)
+ if (m_flytiger_palette_bank)
{
UINT16 value;
- state->m_paletteram_flytiger[offset] = data;
- value = state->m_paletteram_flytiger[offset & ~1] | (state->m_paletteram_flytiger[offset | 1] << 8);
- palette_set_color_rgb(space->machine(), offset/2, pal5bit(value >> 10), pal5bit(value >> 5), pal5bit(value >> 0));
+ m_paletteram_flytiger[offset] = data;
+ value = m_paletteram_flytiger[offset & ~1] | (m_paletteram_flytiger[offset | 1] << 8);
+ palette_set_color_rgb(machine(), offset/2, pal5bit(value >> 10), pal5bit(value >> 5), pal5bit(value >> 0));
}
}
-WRITE8_HANDLER( flytiger_ctrl_w )
+WRITE8_MEMBER(dooyong_state::flytiger_ctrl_w)
{
- dooyong_state *state = space->machine().driver_data<dooyong_state>();
/* bit 0 is flip screen */
- flip_screen_set(space->machine(), data & 0x01);
+ flip_screen_set(machine(), data & 0x01);
/* bits 1, 2 used but unknown */
/* bit 3 fg palette banking: trash protection? */
- state->m_flytiger_palette_bank = data & 0x08;
+ m_flytiger_palette_bank = data & 0x08;
/* bit 4 changes tilemaps priority */
- state->m_flytiger_pri = data & 0x10;
+ m_flytiger_pri = data & 0x10;
}
-WRITE16_HANDLER( rshark_ctrl_w )
+WRITE16_MEMBER(dooyong_state::rshark_ctrl_w)
{
- dooyong_state *state = space->machine().driver_data<dooyong_state>();
if (ACCESSING_BITS_0_7)
{
/* bit 0 flips screen */
- flip_screen_set(space->machine(), data & 0x0001);
+ flip_screen_set(machine(), data & 0x0001);
/* bit 4 changes tilemaps priority */
- state->m_rshark_pri = data & 0x0010;
+ m_rshark_pri = data & 0x0010;
/* bit 5 used but unknown */
}
diff --git a/src/mame/video/drgnmst.c b/src/mame/video/drgnmst.c
index 3e227dfb082..55db9fb1328 100644
--- a/src/mame/video/drgnmst.c
+++ b/src/mame/video/drgnmst.c
@@ -17,11 +17,10 @@ static TILE_GET_INFO( get_drgnmst_fg_tile_info )
SET_TILE_INFO(1, tileno, colour, TILE_FLIPYX(flipyx));
}
-WRITE16_HANDLER( drgnmst_fg_videoram_w )
+WRITE16_MEMBER(drgnmst_state::drgnmst_fg_videoram_w)
{
- drgnmst_state *state = space->machine().driver_data<drgnmst_state>();
- COMBINE_DATA(&state->m_fg_videoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_fg_videoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset / 2);
}
static TILE_GET_INFO( get_drgnmst_bg_tile_info )
@@ -35,11 +34,10 @@ static TILE_GET_INFO( get_drgnmst_bg_tile_info )
SET_TILE_INFO(3, tileno, colour, TILE_FLIPYX(flipyx));
}
-WRITE16_HANDLER( drgnmst_bg_videoram_w )
+WRITE16_MEMBER(drgnmst_state::drgnmst_bg_videoram_w)
{
- drgnmst_state *state = space->machine().driver_data<drgnmst_state>();
- COMBINE_DATA(&state->m_bg_videoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_bg_videoram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
static TILE_GET_INFO( get_drgnmst_md_tile_info )
@@ -53,11 +51,10 @@ static TILE_GET_INFO( get_drgnmst_md_tile_info )
SET_TILE_INFO(2, tileno, colour, TILE_FLIPYX(flipyx));
}
-WRITE16_HANDLER( drgnmst_md_videoram_w )
+WRITE16_MEMBER(drgnmst_state::drgnmst_md_videoram_w)
{
- drgnmst_state *state = space->machine().driver_data<drgnmst_state>();
- COMBINE_DATA(&state->m_md_videoram[offset]);
- state->m_md_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_md_videoram[offset]);
+ m_md_tilemap->mark_tile_dirty(offset / 2);
}
static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect )
diff --git a/src/mame/video/dribling.c b/src/mame/video/dribling.c
index bf681d98502..71c35af6bfb 100644
--- a/src/mame/video/dribling.c
+++ b/src/mame/video/dribling.c
@@ -42,12 +42,11 @@ PALETTE_INIT( dribling )
*
*************************************/
-WRITE8_HANDLER( dribling_colorram_w )
+WRITE8_MEMBER(dribling_state::dribling_colorram_w)
{
- dribling_state *state = space->machine().driver_data<dribling_state>();
/* it is very important that we mask off the two bits here */
- state->m_colorram[offset & 0x1f9f] = data;
+ m_colorram[offset & 0x1f9f] = data;
}
diff --git a/src/mame/video/drmicro.c b/src/mame/video/drmicro.c
index 3f8b393bebc..694a1cd5f44 100644
--- a/src/mame/video/drmicro.c
+++ b/src/mame/video/drmicro.c
@@ -13,15 +13,14 @@ Video hardware
/****************************************************************************/
-WRITE8_HANDLER( drmicro_videoram_w )
+WRITE8_MEMBER(drmicro_state::drmicro_videoram_w)
{
- drmicro_state *state = space->machine().driver_data<drmicro_state>();
- state->m_videoram[offset] = data;
+ m_videoram[offset] = data;
if (offset < 0x800)
- state->m_bg2->mark_tile_dirty((offset & 0x3ff));
+ m_bg2->mark_tile_dirty((offset & 0x3ff));
else
- state->m_bg1->mark_tile_dirty((offset & 0x3ff));
+ m_bg1->mark_tile_dirty((offset & 0x3ff));
}
diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c
index 6a2c8168585..ce3edbfd4a7 100644
--- a/src/mame/video/dynax.c
+++ b/src/mame/video/dynax.c
@@ -55,230 +55,206 @@ PALETTE_INIT( sprtmtch )
#define LAYOUT_MJDIALQ2 3 // 2 layers
#define LAYOUT_JANTOUKI 4 // 2 x (4 couples of layers, interleaved)
-WRITE8_HANDLER( dynax_extra_scrollx_w )
+WRITE8_MEMBER(dynax_state::dynax_extra_scrollx_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_extra_scroll_x = data;
+ m_extra_scroll_x = data;
}
-WRITE8_HANDLER( dynax_extra_scrolly_w )
+WRITE8_MEMBER(dynax_state::dynax_extra_scrolly_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_extra_scroll_y = data;
+ m_extra_scroll_y = data;
}
/* Destination Pen */
-WRITE8_HANDLER( dynax_blit_pen_w )
+WRITE8_MEMBER(dynax_state::dynax_blit_pen_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_blit_pen = data;
+ m_blit_pen = data;
LOG(("P=%02X ", data));
}
-WRITE8_HANDLER( dynax_blit2_pen_w )
+WRITE8_MEMBER(dynax_state::dynax_blit2_pen_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_blit2_pen = data;
+ m_blit2_pen = data;
LOG(("P'=%02X ", data));
}
/* Destination Layers */
-WRITE8_HANDLER( dynax_blit_dest_w )
+WRITE8_MEMBER(dynax_state::dynax_blit_dest_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_blit_dest = data;
- if (state->m_layer_layout == LAYOUT_HNORIDUR)
- state->m_blit_dest = BITSWAP8(state->m_blit_dest ^ 0x0f, 7, 6, 5, 4, 0, 1, 2, 3);
+ m_blit_dest = data;
+ if (m_layer_layout == LAYOUT_HNORIDUR)
+ m_blit_dest = BITSWAP8(m_blit_dest ^ 0x0f, 7, 6, 5, 4, 0, 1, 2, 3);
LOG(("D=%02X ", data));
}
-WRITE8_HANDLER( dynax_blit2_dest_w )
+WRITE8_MEMBER(dynax_state::dynax_blit2_dest_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_blit2_dest = data;
+ m_blit2_dest = data;
LOG(("D'=%02X ", data));
}
-WRITE8_HANDLER( tenkai_blit_dest_w )
+WRITE8_MEMBER(dynax_state::tenkai_blit_dest_w)
{
dynax_blit_dest_w(space, 0, BITSWAP8(data, 7, 6, 5, 4, 0, 1, 2, 3));
}
/* Background Color */
-WRITE8_HANDLER( dynax_blit_backpen_w )
+WRITE8_MEMBER(dynax_state::dynax_blit_backpen_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_blit_backpen = data;
+ m_blit_backpen = data;
LOG(("B=%02X ", data));
}
/* Layers 0&1 Palettes (Low Bits) */
-WRITE8_HANDLER( dynax_blit_palette01_w )
+WRITE8_MEMBER(dynax_state::dynax_blit_palette01_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- if (state->m_layer_layout == LAYOUT_HNORIDUR)
- state->m_blit_palettes = (state->m_blit_palettes & 0x00ff) | ((data & 0x0f) << 12) | ((data & 0xf0) << 4);
+ if (m_layer_layout == LAYOUT_HNORIDUR)
+ m_blit_palettes = (m_blit_palettes & 0x00ff) | ((data & 0x0f) << 12) | ((data & 0xf0) << 4);
else
- state->m_blit_palettes = (state->m_blit_palettes & 0xff00) | data;
+ m_blit_palettes = (m_blit_palettes & 0xff00) | data;
LOG(("P01=%02X ", data));
}
-WRITE8_HANDLER( tenkai_blit_palette01_w )
+WRITE8_MEMBER(dynax_state::tenkai_blit_palette01_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_blit_palettes = (state->m_blit_palettes & 0xff00) | data;
+ m_blit_palettes = (m_blit_palettes & 0xff00) | data;
LOG(("P01=%02X ", data));
}
/* Layers 4&5 Palettes (Low Bits) */
-WRITE8_HANDLER( dynax_blit_palette45_w )
+WRITE8_MEMBER(dynax_state::dynax_blit_palette45_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- if (state->m_layer_layout == LAYOUT_HNORIDUR)
- state->m_blit2_palettes = (state->m_blit2_palettes & 0x00ff) | ((data & 0x0f) << 12) | ((data & 0xf0) << 4);
+ if (m_layer_layout == LAYOUT_HNORIDUR)
+ m_blit2_palettes = (m_blit2_palettes & 0x00ff) | ((data & 0x0f) << 12) | ((data & 0xf0) << 4);
else
- state->m_blit2_palettes = (state->m_blit2_palettes & 0xff00) | data;
+ m_blit2_palettes = (m_blit2_palettes & 0xff00) | data;
LOG(("P45=%02X ", data));
}
/* Layer 2&3 Palettes (Low Bits) */
-WRITE8_HANDLER( dynax_blit_palette23_w )
+WRITE8_MEMBER(dynax_state::dynax_blit_palette23_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- if (state->m_layer_layout == LAYOUT_HNORIDUR)
- state->m_blit_palettes = (state->m_blit_palettes & 0xff00) | ((data & 0x0f) << 4) | ((data & 0xf0) >> 4);
+ if (m_layer_layout == LAYOUT_HNORIDUR)
+ m_blit_palettes = (m_blit_palettes & 0xff00) | ((data & 0x0f) << 4) | ((data & 0xf0) >> 4);
else
- state->m_blit_palettes = (state->m_blit_palettes & 0x00ff) | (data << 8);
+ m_blit_palettes = (m_blit_palettes & 0x00ff) | (data << 8);
LOG(("P23=%02X ", data));
}
-WRITE8_HANDLER( tenkai_blit_palette23_w )
+WRITE8_MEMBER(dynax_state::tenkai_blit_palette23_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_blit_palettes = (state->m_blit_palettes & 0x00ff) | ((data & 0x0f) << 12) | ((data & 0xf0) << 4);
+ m_blit_palettes = (m_blit_palettes & 0x00ff) | ((data & 0x0f) << 12) | ((data & 0xf0) << 4);
LOG(("P23=%02X ", data));
}
/* Layer 6&7 Palettes (Low Bits) */
-WRITE8_HANDLER( dynax_blit_palette67_w )
+WRITE8_MEMBER(dynax_state::dynax_blit_palette67_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- if (state->m_layer_layout == LAYOUT_HNORIDUR)
- state->m_blit2_palettes = (state->m_blit2_palettes & 0xff00) | ((data & 0x0f) << 4) | ((data & 0xf0) >> 4);
+ if (m_layer_layout == LAYOUT_HNORIDUR)
+ m_blit2_palettes = (m_blit2_palettes & 0xff00) | ((data & 0x0f) << 4) | ((data & 0xf0) >> 4);
else
- state->m_blit2_palettes = (state->m_blit2_palettes & 0x00ff) | (data << 8);
+ m_blit2_palettes = (m_blit2_palettes & 0x00ff) | (data << 8);
LOG(("P67=%02X ", data));
}
/* Layers Palettes (High Bits) */
-WRITE8_HANDLER( dynax_blit_palbank_w )
+WRITE8_MEMBER(dynax_state::dynax_blit_palbank_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_blit_palbank = data;
+ m_blit_palbank = data;
LOG(("PB=%02X ", data));
}
-WRITE8_HANDLER( dynax_blit2_palbank_w )
+WRITE8_MEMBER(dynax_state::dynax_blit2_palbank_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_blit2_palbank = data;
+ m_blit2_palbank = data;
LOG(("PB'=%02X ", data));
}
/* Which half of the layers to write two (interleaved games only) */
-WRITE8_HANDLER( hanamai_layer_half_w )
+WRITE8_MEMBER(dynax_state::hanamai_layer_half_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_hanamai_layer_half = (~data) & 1;
+ m_hanamai_layer_half = (~data) & 1;
LOG(("H=%02X ", data));
}
/* Write to both halves of the layers (interleaved games only) */
-WRITE8_HANDLER( hnoridur_layer_half2_w )
+WRITE8_MEMBER(dynax_state::hnoridur_layer_half2_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_hnoridur_layer_half2 = (~data) & 1;
+ m_hnoridur_layer_half2 = (~data) & 1;
LOG(("H2=%02X ", data));
}
-WRITE8_HANDLER( mjdialq2_blit_dest_w )
+WRITE8_MEMBER(dynax_state::mjdialq2_blit_dest_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
int mask = (2 >> offset); /* 1 or 2 */
- state->m_blit_dest &= ~mask;
+ m_blit_dest &= ~mask;
if (~data & 1)
- state->m_blit_dest |= mask;
+ m_blit_dest |= mask;
}
/* Layers Enable */
-WRITE8_HANDLER( dynax_layer_enable_w )
+WRITE8_MEMBER(dynax_state::dynax_layer_enable_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_layer_enable = data;
+ m_layer_enable = data;
LOG(("E=%02X ", data));
}
-WRITE8_HANDLER( jantouki_layer_enable_w )
+WRITE8_MEMBER(dynax_state::jantouki_layer_enable_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
int mask = 1 << (7 - offset);
- state->m_layer_enable = (state->m_layer_enable & ~mask) | ((data & 1) ? mask : 0);
- state->m_layer_enable |= 1;
+ m_layer_enable = (m_layer_enable & ~mask) | ((data & 1) ? mask : 0);
+ m_layer_enable |= 1;
}
-WRITE8_HANDLER( mjdialq2_layer_enable_w )
+WRITE8_MEMBER(dynax_state::mjdialq2_layer_enable_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
int mask = (2 >> offset); /* 1 or 2 */
- state->m_layer_enable &= ~mask;
+ m_layer_enable &= ~mask;
if (~data & 1)
- state->m_layer_enable |= mask;
+ m_layer_enable |= mask;
}
-WRITE8_HANDLER( dynax_flipscreen_w )
+WRITE8_MEMBER(dynax_state::dynax_flipscreen_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_flipscreen = data & 1;
+ m_flipscreen = data & 1;
if (data & ~1)
- logerror("CPU#0 PC %06X: Warning, flip screen <- %02X\n", cpu_get_pc(&space->device()), data);
+ logerror("CPU#0 PC %06X: Warning, flip screen <- %02X\n", cpu_get_pc(&space.device()), data);
LOG(("F=%02X ", data));
}
static const char *const gfxregions[] = { "gfx1", "gfx2", "gfx3", "gfx4", "gfx5", "gfx6", "gfx7", "gfx8" };
-WRITE8_HANDLER( dynax_blit_romregion_w )
+WRITE8_MEMBER(dynax_state::dynax_blit_romregion_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
if (data < ARRAY_LENGTH(gfxregions))
- state->m_blit_romregion = data;
+ m_blit_romregion = data;
LOG(("GFX%X ", data + 1));
}
-WRITE8_HANDLER( dynax_blit2_romregion_w )
+WRITE8_MEMBER(dynax_state::dynax_blit2_romregion_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
if (data + 1 < ARRAY_LENGTH(gfxregions))
- state->m_blit2_romregion = data + 1;
+ m_blit2_romregion = data + 1;
LOG(("GFX%X' ", data + 2));
}
@@ -618,126 +594,119 @@ static void jantouki_blitter2_start( running_machine &machine, int flags )
-static WRITE8_HANDLER( dynax_blit_scroll_w )
+WRITE8_MEMBER(dynax_state::dynax_blit_scroll_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- switch (state->m_blit_src & 0xc00000)
+ switch (m_blit_src & 0xc00000)
{
- case 0x000000: state->m_blit_scroll_x = data;
+ case 0x000000: m_blit_scroll_x = data;
LOG(("SX=%02X ", data));
break;
- case 0x400000: state->m_blit_scroll_y = data;
+ case 0x400000: m_blit_scroll_y = data;
LOG(("SY=%02X ", data));
break;
case 0x800000:
- case 0xc00000: state->m_blit_wrap_enable = data;
+ case 0xc00000: m_blit_wrap_enable = data;
LOG(("WE=%02X ", data));
break;
}
}
// inverted scroll values
-static WRITE8_HANDLER( tenkai_blit_scroll_w )
+WRITE8_MEMBER(dynax_state::tenkai_blit_scroll_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- switch (state->m_blit_src & 0xc00000)
+ switch (m_blit_src & 0xc00000)
{
- case 0x000000: state->m_blit_scroll_x = ((data ^ 0xff) + 1) & 0xff;
+ case 0x000000: m_blit_scroll_x = ((data ^ 0xff) + 1) & 0xff;
LOG(("SX=%02X ", data));
break;
- case 0x400000: state->m_blit_scroll_y = data ^ 0xff;
+ case 0x400000: m_blit_scroll_y = data ^ 0xff;
LOG(("SY=%02X ", data));
break;
case 0x800000:
- case 0xc00000: state->m_blit_wrap_enable = data;
+ case 0xc00000: m_blit_wrap_enable = data;
LOG(("WE=%02X ", data));
break;
}
}
-static WRITE8_HANDLER( dynax_blit2_scroll_w )
+WRITE8_MEMBER(dynax_state::dynax_blit2_scroll_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- switch (state->m_blit2_src & 0xc00000)
+ switch (m_blit2_src & 0xc00000)
{
- case 0x000000: state->m_blit2_scroll_x = data;
+ case 0x000000: m_blit2_scroll_x = data;
LOG(("SX'=%02X ", data));
break;
- case 0x400000: state->m_blit2_scroll_y = data;
+ case 0x400000: m_blit2_scroll_y = data;
LOG(("SY'=%02X ", data));
break;
case 0x800000:
- case 0xc00000: state->m_blit2_wrap_enable = data;
+ case 0xc00000: m_blit2_wrap_enable = data;
LOG(("WE'=%02X ", data));
break;
}
}
-WRITE8_HANDLER( dynax_blitter_rev2_w )
+WRITE8_MEMBER(dynax_state::dynax_blitter_rev2_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
switch (offset)
{
- case 0: dynax_blitter_start(space->machine(), data); break;
- case 1: state->m_blit_x = data; break;
- case 2: state->m_blit_y = data; break;
- case 3: state->m_blit_src = (state->m_blit_src & 0xffff00) | (data << 0); break;
- case 4: state->m_blit_src = (state->m_blit_src & 0xff00ff) | (data << 8); break;
- case 5: state->m_blit_src = (state->m_blit_src & 0x00ffff) | (data << 16); break;
+ case 0: dynax_blitter_start(machine(), data); break;
+ case 1: m_blit_x = data; break;
+ case 2: m_blit_y = data; break;
+ case 3: m_blit_src = (m_blit_src & 0xffff00) | (data << 0); break;
+ case 4: m_blit_src = (m_blit_src & 0xff00ff) | (data << 8); break;
+ case 5: m_blit_src = (m_blit_src & 0x00ffff) | (data << 16); break;
case 6: dynax_blit_scroll_w(space, 0, data); break;
}
}
// different scroll_w
-WRITE8_HANDLER( tenkai_blitter_rev2_w )
+WRITE8_MEMBER(dynax_state::tenkai_blitter_rev2_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
switch (offset)
{
- case 0: dynax_blitter_start(space->machine(), data); break;
- case 1: state->m_blit_x = data; break;
- case 2: state->m_blit_y = data; break;
- case 3: state->m_blit_src = (state->m_blit_src & 0xffff00) | (data << 0); break;
- case 4: state->m_blit_src = (state->m_blit_src & 0xff00ff) | (data << 8); break;
- case 5: state->m_blit_src = (state->m_blit_src & 0x00ffff) | (data << 16); break;
+ case 0: dynax_blitter_start(machine(), data); break;
+ case 1: m_blit_x = data; break;
+ case 2: m_blit_y = data; break;
+ case 3: m_blit_src = (m_blit_src & 0xffff00) | (data << 0); break;
+ case 4: m_blit_src = (m_blit_src & 0xff00ff) | (data << 8); break;
+ case 5: m_blit_src = (m_blit_src & 0x00ffff) | (data << 16); break;
case 6: tenkai_blit_scroll_w(space, 0, data); break;
}
}
-WRITE8_HANDLER( jantouki_blitter_rev2_w )
+WRITE8_MEMBER(dynax_state::jantouki_blitter_rev2_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
switch (offset)
{
- case 0: jantouki_blitter_start(space->machine(), data); break;
- case 1: state->m_blit_x = data; break;
- case 2: state->m_blit_y = data; break;
- case 3: state->m_blit_src = (state->m_blit_src & 0xffff00) | (data << 0); break;
- case 4: state->m_blit_src = (state->m_blit_src & 0xff00ff) | (data << 8); break;
- case 5: state->m_blit_src = (state->m_blit_src & 0x00ffff) | (data << 16); break;
+ case 0: jantouki_blitter_start(machine(), data); break;
+ case 1: m_blit_x = data; break;
+ case 2: m_blit_y = data; break;
+ case 3: m_blit_src = (m_blit_src & 0xffff00) | (data << 0); break;
+ case 4: m_blit_src = (m_blit_src & 0xff00ff) | (data << 8); break;
+ case 5: m_blit_src = (m_blit_src & 0x00ffff) | (data << 16); break;
case 6: dynax_blit_scroll_w(space, 0, data); break;
}
}
-WRITE8_HANDLER( jantouki_blitter2_rev2_w )
+WRITE8_MEMBER(dynax_state::jantouki_blitter2_rev2_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
switch (offset)
{
- case 0: jantouki_blitter2_start(space->machine(),data); break;
- case 1: state->m_blit2_x = data; break;
- case 2: state->m_blit2_y = data; break;
- case 3: state->m_blit2_src = (state->m_blit2_src & 0xffff00) | (data << 0); break;
- case 4: state->m_blit2_src = (state->m_blit2_src & 0xff00ff) | (data << 8); break;
- case 5: state->m_blit2_src = (state->m_blit2_src & 0x00ffff) | (data << 16); break;
+ case 0: jantouki_blitter2_start(machine(),data); break;
+ case 1: m_blit2_x = data; break;
+ case 2: m_blit2_y = data; break;
+ case 3: m_blit2_src = (m_blit2_src & 0xffff00) | (data << 0); break;
+ case 4: m_blit2_src = (m_blit2_src & 0xff00ff) | (data << 8); break;
+ case 5: m_blit2_src = (m_blit2_src & 0x00ffff) | (data << 16); break;
case 6: dynax_blit2_scroll_w(space, 0, data); break;
}
}
@@ -1189,16 +1158,14 @@ static void mjdialq2_copylayer( running_machine &machine, bitmap_ind16 &bitmap,
}
}
-WRITE8_HANDLER( hanamai_priority_w )
+WRITE8_MEMBER(dynax_state::hanamai_priority_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_hanamai_priority = data;
+ m_hanamai_priority = data;
}
-WRITE8_HANDLER( tenkai_priority_w )
+WRITE8_MEMBER(dynax_state::tenkai_priority_w)
{
- dynax_state *state = space->machine().driver_data<dynax_state>();
- state->m_hanamai_priority = BITSWAP8(data, 3, 2, 1, 0, 4, 7, 5, 6);
+ m_hanamai_priority = BITSWAP8(data, 3, 2, 1, 0, 4, 7, 5, 6);
}
static int debug_mask( running_machine &machine )
diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c
index 4432e2bbbb7..df2b1e90982 100644
--- a/src/mame/video/dynduke.c
+++ b/src/mame/video/dynduke.c
@@ -5,36 +5,32 @@
/******************************************************************************/
-WRITE16_HANDLER( dynduke_paletteram_w )
+WRITE16_MEMBER(dynduke_state::dynduke_paletteram_w)
{
- dynduke_state *state = space->machine().driver_data<dynduke_state>();
int color;
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- color=state->m_generic_paletteram_16[offset];
- palette_set_color_rgb(space->machine(),offset,pal4bit(color >> 0),pal4bit(color >> 4),pal4bit(color >> 8));
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ color=m_generic_paletteram_16[offset];
+ palette_set_color_rgb(machine(),offset,pal4bit(color >> 0),pal4bit(color >> 4),pal4bit(color >> 8));
}
-WRITE16_HANDLER( dynduke_background_w )
+WRITE16_MEMBER(dynduke_state::dynduke_background_w)
{
- dynduke_state *state = space->machine().driver_data<dynduke_state>();
- COMBINE_DATA(&state->m_back_data[offset]);
- state->m_bg_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_back_data[offset]);
+ m_bg_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( dynduke_foreground_w )
+WRITE16_MEMBER(dynduke_state::dynduke_foreground_w)
{
- dynduke_state *state = space->machine().driver_data<dynduke_state>();
- COMBINE_DATA(&state->m_fore_data[offset]);
- state->m_fg_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_fore_data[offset]);
+ m_fg_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( dynduke_text_w )
+WRITE16_MEMBER(dynduke_state::dynduke_text_w)
{
- dynduke_state *state = space->machine().driver_data<dynduke_state>();
- UINT16 *videoram = state->m_videoram;
+ UINT16 *videoram = m_videoram;
COMBINE_DATA(&videoram[offset]);
- state->m_tx_layer->mark_tile_dirty(offset);
+ m_tx_layer->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -94,29 +90,27 @@ VIDEO_START( dynduke )
state->m_tx_layer->set_transparent_pen(15);
}
-WRITE16_HANDLER( dynduke_gfxbank_w )
+WRITE16_MEMBER(dynduke_state::dynduke_gfxbank_w)
{
- dynduke_state *state = space->machine().driver_data<dynduke_state>();
if (ACCESSING_BITS_0_7)
{
- if (data&0x01) state->m_back_bankbase=0x1000; else state->m_back_bankbase=0;
- if (data&0x10) state->m_fore_bankbase=0x1000; else state->m_fore_bankbase=0;
+ if (data&0x01) m_back_bankbase=0x1000; else m_back_bankbase=0;
+ if (data&0x10) m_fore_bankbase=0x1000; else m_fore_bankbase=0;
- if (state->m_back_bankbase!=state->m_old_back)
- state->m_bg_layer->mark_all_dirty();
- if (state->m_fore_bankbase!=state->m_old_fore)
- state->m_fg_layer->mark_all_dirty();
+ if (m_back_bankbase!=m_old_back)
+ m_bg_layer->mark_all_dirty();
+ if (m_fore_bankbase!=m_old_fore)
+ m_fg_layer->mark_all_dirty();
- state->m_old_back=state->m_back_bankbase;
- state->m_old_fore=state->m_fore_bankbase;
+ m_old_back=m_back_bankbase;
+ m_old_fore=m_fore_bankbase;
}
}
-WRITE16_HANDLER( dynduke_control_w )
+WRITE16_MEMBER(dynduke_state::dynduke_control_w)
{
- dynduke_state *state = space->machine().driver_data<dynduke_state>();
if (ACCESSING_BITS_0_7)
{
@@ -129,12 +123,12 @@ WRITE16_HANDLER( dynduke_control_w )
// bit 0x02 is used on the map screen (fore disable?)
// bit 0x01 set when inserting coin.. bg disable?
- if (data&0x1) state->m_back_enable = 0; else state->m_back_enable = 1;
- if (data&0x2) state->m_fore_enable=0; else state->m_fore_enable=1;
- if (data&0x4) state->m_txt_enable = 0; else state->m_txt_enable = 1;
- if (data&0x8) state->m_sprite_enable=0; else state->m_sprite_enable=1;
+ if (data&0x1) m_back_enable = 0; else m_back_enable = 1;
+ if (data&0x2) m_fore_enable=0; else m_fore_enable=1;
+ if (data&0x4) m_txt_enable = 0; else m_txt_enable = 1;
+ if (data&0x8) m_sprite_enable=0; else m_sprite_enable=1;
- flip_screen_set(space->machine(), data & 0x40);
+ flip_screen_set(machine(), data & 0x40);
}
}
diff --git a/src/mame/video/eolith.c b/src/mame/video/eolith.c
index d5c446c5c32..66bfc0cae5e 100644
--- a/src/mame/video/eolith.c
+++ b/src/mame/video/eolith.c
@@ -2,10 +2,9 @@
#include "includes/eolith.h"
-WRITE32_HANDLER( eolith_vram_w )
+WRITE32_MEMBER(eolith_state::eolith_vram_w)
{
- eolith_state *state = space->machine().driver_data<eolith_state>();
- UINT32 *dest = &state->m_vram[offset+(0x40000/4)*state->m_buffer];
+ UINT32 *dest = &m_vram[offset+(0x40000/4)*m_buffer];
if (mem_mask == 0xffffffff)
{
@@ -26,10 +25,9 @@ WRITE32_HANDLER( eolith_vram_w )
}
-READ32_HANDLER( eolith_vram_r )
+READ32_MEMBER(eolith_state::eolith_vram_r)
{
- eolith_state *state = space->machine().driver_data<eolith_state>();
- return state->m_vram[offset+(0x40000/4)*state->m_buffer];
+ return m_vram[offset+(0x40000/4)*m_buffer];
}
VIDEO_START( eolith )
diff --git a/src/mame/video/epos.c b/src/mame/video/epos.c
index 370add43ada..0e28880f69c 100644
--- a/src/mame/video/epos.c
+++ b/src/mame/video/epos.c
@@ -53,9 +53,8 @@ static void get_pens( running_machine &machine, pen_t *pens )
}
-WRITE8_HANDLER( epos_port_1_w )
+WRITE8_MEMBER(epos_state::epos_port_1_w)
{
- epos_state *state = space->machine().driver_data<epos_state>();
/* D0 - start light #1
D1 - start light #2
D2 - coin counter
@@ -63,12 +62,12 @@ WRITE8_HANDLER( epos_port_1_w )
D4-D7 - unused
*/
- set_led_status(space->machine(), 0, (data >> 0) & 0x01);
- set_led_status(space->machine(), 1, (data >> 1) & 0x01);
+ set_led_status(machine(), 0, (data >> 0) & 0x01);
+ set_led_status(machine(), 1, (data >> 1) & 0x01);
- coin_counter_w(space->machine(), 0, (data >> 2) & 0x01);
+ coin_counter_w(machine(), 0, (data >> 2) & 0x01);
- state->m_palette = (data >> 3) & 0x01;
+ m_palette = (data >> 3) & 0x01;
}
diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c
index b7b85d77586..2a0ab8cb99f 100644
--- a/src/mame/video/equites.c
+++ b/src/mame/video/equites.c
@@ -151,104 +151,94 @@ VIDEO_START( splndrbt )
*
*************************************/
-READ16_HANDLER(equites_fg_videoram_r)
+READ16_MEMBER(equites_state::equites_fg_videoram_r)
{
- equites_state *state = space->machine().driver_data<equites_state>();
- return 0xff00 | state->m_fg_videoram[offset];
+ return 0xff00 | m_fg_videoram[offset];
}
-WRITE16_HANDLER(equites_fg_videoram_w)
+WRITE16_MEMBER(equites_state::equites_fg_videoram_w)
{
- equites_state *state = space->machine().driver_data<equites_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_fg_videoram[offset] = data & 0xff;
+ m_fg_videoram[offset] = data & 0xff;
- state->m_fg_tilemap->mark_tile_dirty(offset >> 1);
+ m_fg_tilemap->mark_tile_dirty(offset >> 1);
}
}
-WRITE16_HANDLER(equites_bg_videoram_w)
+WRITE16_MEMBER(equites_state::equites_bg_videoram_w)
{
- equites_state *state = space->machine().driver_data<equites_state>();
- COMBINE_DATA(state->m_bg_videoram + offset);
+ COMBINE_DATA(m_bg_videoram + offset);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER(equites_bgcolor_w)
+WRITE16_MEMBER(equites_state::equites_bgcolor_w)
{
- equites_state *state = space->machine().driver_data<equites_state>();
if (ACCESSING_BITS_8_15)
- state->m_bgcolor = data >> 8;
+ m_bgcolor = data >> 8;
}
-WRITE16_HANDLER(equites_scrollreg_w)
+WRITE16_MEMBER(equites_state::equites_scrollreg_w)
{
- equites_state *state = space->machine().driver_data<equites_state>();
if (ACCESSING_BITS_0_7)
- state->m_bg_tilemap->set_scrolly(0, data & 0xff);
+ m_bg_tilemap->set_scrolly(0, data & 0xff);
if (ACCESSING_BITS_8_15)
- state->m_bg_tilemap->set_scrollx(0, data >> 8);
+ m_bg_tilemap->set_scrollx(0, data >> 8);
}
-WRITE16_HANDLER(splndrbt_selchar0_w)
+WRITE16_MEMBER(equites_state::splndrbt_selchar0_w)
{
- equites_state *state = space->machine().driver_data<equites_state>();
- if (state->m_fg_char_bank != 0)
+ if (m_fg_char_bank != 0)
{
- state->m_fg_char_bank = 0;
- state->m_fg_tilemap->mark_all_dirty();
+ m_fg_char_bank = 0;
+ m_fg_tilemap->mark_all_dirty();
}
}
-WRITE16_HANDLER(splndrbt_selchar1_w)
+WRITE16_MEMBER(equites_state::splndrbt_selchar1_w)
{
- equites_state *state = space->machine().driver_data<equites_state>();
- if (state->m_fg_char_bank != 1)
+ if (m_fg_char_bank != 1)
{
- state->m_fg_char_bank = 1;
- state->m_fg_tilemap->mark_all_dirty();
+ m_fg_char_bank = 1;
+ m_fg_tilemap->mark_all_dirty();
}
}
-WRITE16_HANDLER(equites_flip0_w)
+WRITE16_MEMBER(equites_state::equites_flip0_w)
{
- flip_screen_set(space->machine(), 0);
+ flip_screen_set(machine(), 0);
}
-WRITE16_HANDLER(equites_flip1_w)
+WRITE16_MEMBER(equites_state::equites_flip1_w)
{
- flip_screen_set(space->machine(), 1);
+ flip_screen_set(machine(), 1);
}
-WRITE16_HANDLER(splndrbt_flip0_w)
+WRITE16_MEMBER(equites_state::splndrbt_flip0_w)
{
- equites_state *state = space->machine().driver_data<equites_state>();
if (ACCESSING_BITS_0_7)
- flip_screen_set(space->machine(), 0);
+ flip_screen_set(machine(), 0);
if (ACCESSING_BITS_8_15)
- state->m_bgcolor = data >> 8;
+ m_bgcolor = data >> 8;
}
-WRITE16_HANDLER(splndrbt_flip1_w)
+WRITE16_MEMBER(equites_state::splndrbt_flip1_w)
{
if (ACCESSING_BITS_0_7)
- flip_screen_set(space->machine(), 1);
+ flip_screen_set(machine(), 1);
}
-WRITE16_HANDLER(splndrbt_bg_scrollx_w)
+WRITE16_MEMBER(equites_state::splndrbt_bg_scrollx_w)
{
- equites_state *state = space->machine().driver_data<equites_state>();
- COMBINE_DATA(&state->m_splndrbt_bg_scrollx);
+ COMBINE_DATA(&m_splndrbt_bg_scrollx);
}
-WRITE16_HANDLER(splndrbt_bg_scrolly_w)
+WRITE16_MEMBER(equites_state::splndrbt_bg_scrolly_w)
{
- equites_state *state = space->machine().driver_data<equites_state>();
- COMBINE_DATA(&state->m_splndrbt_bg_scrolly);
+ COMBINE_DATA(&m_splndrbt_bg_scrolly);
}
diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c
index b2ab059a94e..17831f96d21 100644
--- a/src/mame/video/esd16.c
+++ b/src/mame/video/esd16.c
@@ -95,29 +95,26 @@ static TILE_GET_INFO( get_tile_info_1_16x16 )
0);
}
-WRITE16_HANDLER( esd16_vram_0_w )
+WRITE16_MEMBER(esd16_state::esd16_vram_0_w)
{
- esd16_state *state = space->machine().driver_data<esd16_state>();
- COMBINE_DATA(&state->m_vram_0[offset]);
- state->m_tilemap_0->mark_tile_dirty(offset);
- state->m_tilemap_0_16x16->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_vram_0[offset]);
+ m_tilemap_0->mark_tile_dirty(offset);
+ m_tilemap_0_16x16->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( esd16_vram_1_w )
+WRITE16_MEMBER(esd16_state::esd16_vram_1_w)
{
- esd16_state *state = space->machine().driver_data<esd16_state>();
- COMBINE_DATA(&state->m_vram_1[offset]);
- state->m_tilemap_1->mark_tile_dirty(offset);
- state->m_tilemap_1_16x16->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_vram_1[offset]);
+ m_tilemap_1->mark_tile_dirty(offset);
+ m_tilemap_1_16x16->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( esd16_tilemap0_color_w )
+WRITE16_MEMBER(esd16_state::esd16_tilemap0_color_w)
{
- esd16_state *state = space->machine().driver_data<esd16_state>();
- state->m_tilemap0_color = data & 3;
- state->m_tilemap_0->mark_all_dirty();
+ m_tilemap0_color = data & 3;
+ m_tilemap_0->mark_all_dirty();
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
}
diff --git a/src/mame/video/espial.c b/src/mame/video/espial.c
index 31aa4d8bd2d..52171eed483 100644
--- a/src/mame/video/espial.c
+++ b/src/mame/video/espial.c
@@ -115,48 +115,43 @@ VIDEO_START( netwars )
*
*************************************/
-WRITE8_HANDLER( espial_videoram_w )
+WRITE8_MEMBER(espial_state::espial_videoram_w)
{
- espial_state *state = space->machine().driver_data<espial_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( espial_colorram_w )
+WRITE8_MEMBER(espial_state::espial_colorram_w)
{
- espial_state *state = space->machine().driver_data<espial_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( espial_attributeram_w )
+WRITE8_MEMBER(espial_state::espial_attributeram_w)
{
- espial_state *state = space->machine().driver_data<espial_state>();
- state->m_attributeram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_attributeram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( espial_scrollram_w )
+WRITE8_MEMBER(espial_state::espial_scrollram_w)
{
- espial_state *state = space->machine().driver_data<espial_state>();
- state->m_scrollram[offset] = data;
- state->m_bg_tilemap->set_scrolly(offset, data);
+ m_scrollram[offset] = data;
+ m_bg_tilemap->set_scrolly(offset, data);
}
-WRITE8_HANDLER( espial_flipscreen_w )
+WRITE8_MEMBER(espial_state::espial_flipscreen_w)
{
- espial_state *state = space->machine().driver_data<espial_state>();
- state->m_flipscreen = data;
- state->m_bg_tilemap->set_flip(state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
+ m_flipscreen = data;
+ m_bg_tilemap->set_flip(m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
}
diff --git a/src/mame/video/esripsys.c b/src/mame/video/esripsys.c
index afc36ae0e41..96742fa584d 100644
--- a/src/mame/video/esripsys.c
+++ b/src/mame/video/esripsys.c
@@ -185,10 +185,9 @@ SCREEN_UPDATE_RGB32( esripsys )
return 0;
}
-WRITE8_HANDLER( esripsys_bg_intensity_w )
+WRITE8_MEMBER(esripsys_state::esripsys_bg_intensity_w)
{
- esripsys_state *state = space->machine().driver_data<esripsys_state>();
- state->m_bg_intensity = data & 0xf;
+ m_bg_intensity = data & 0xf;
}
/* Draw graphics to a line buffer */
diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c
index be5a4bff887..8e11d3c8322 100644
--- a/src/mame/video/exedexes.c
+++ b/src/mame/video/exedexes.c
@@ -80,51 +80,47 @@ PALETTE_INIT( exedexes )
}
}
-WRITE8_HANDLER( exedexes_videoram_w )
+WRITE8_MEMBER(exedexes_state::exedexes_videoram_w)
{
- exedexes_state *state = space->machine().driver_data<exedexes_state>();
- state->m_videoram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( exedexes_colorram_w )
+WRITE8_MEMBER(exedexes_state::exedexes_colorram_w)
{
- exedexes_state *state = space->machine().driver_data<exedexes_state>();
- state->m_colorram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( exedexes_c804_w )
+WRITE8_MEMBER(exedexes_state::exedexes_c804_w)
{
- exedexes_state *state = space->machine().driver_data<exedexes_state>();
/* bits 0 and 1 are coin counters */
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02);
- coin_lockout_w(space->machine(), 0, data & 0x04);
- coin_lockout_w(space->machine(), 1, data & 0x08);
+ coin_lockout_w(machine(), 0, data & 0x04);
+ coin_lockout_w(machine(), 1, data & 0x08);
/* bit 7 is text enable */
- state->m_chon = data & 0x80;
+ m_chon = data & 0x80;
/* other bits seem to be unused */
}
-WRITE8_HANDLER( exedexes_gfxctrl_w )
+WRITE8_MEMBER(exedexes_state::exedexes_gfxctrl_w)
{
- exedexes_state *state = space->machine().driver_data<exedexes_state>();
/* bit 4 is bg enable */
- state->m_sc2on = data & 0x10;
+ m_sc2on = data & 0x10;
/* bit 5 is fg enable */
- state->m_sc1on = data & 0x20;
+ m_sc1on = data & 0x20;
/* bit 6 is sprite enable */
- state->m_objon = data & 0x40;
+ m_objon = data & 0x40;
/* other bits seem to be unused */
}
diff --git a/src/mame/video/exerion.c b/src/mame/video/exerion.c
index c92c19de200..7b6b8d7363e 100644
--- a/src/mame/video/exerion.c
+++ b/src/mame/video/exerion.c
@@ -183,48 +183,46 @@ VIDEO_START( exerion )
*
*************************************/
-WRITE8_HANDLER( exerion_videoreg_w )
+WRITE8_MEMBER(exerion_state::exerion_videoreg_w)
{
- exerion_state *state = space->machine().driver_data<exerion_state>();
/* bit 0 = flip screen and joystick input multiplexer */
- state->m_cocktail_flip = data & 1;
+ m_cocktail_flip = data & 1;
/* bits 1-2 char lookup table bank */
- state->m_char_palette = (data & 0x06) >> 1;
+ m_char_palette = (data & 0x06) >> 1;
/* bits 3 char bank */
- state->m_char_bank = (data & 0x08) >> 3;
+ m_char_bank = (data & 0x08) >> 3;
/* bits 4-5 unused */
/* bits 6-7 sprite lookup table bank */
- state->m_sprite_palette = (data & 0xc0) >> 6;
+ m_sprite_palette = (data & 0xc0) >> 6;
}
-WRITE8_HANDLER( exerion_video_latch_w )
+WRITE8_MEMBER(exerion_state::exerion_video_latch_w)
{
- exerion_state *state = space->machine().driver_data<exerion_state>();
- int scanline = space->machine().primary_screen->vpos();
+ int scanline = machine().primary_screen->vpos();
if (scanline > 0)
- space->machine().primary_screen->update_partial(scanline - 1);
- state->m_background_latches[offset] = data;
+ machine().primary_screen->update_partial(scanline - 1);
+ m_background_latches[offset] = data;
}
-READ8_HANDLER( exerion_video_timing_r )
+READ8_MEMBER(exerion_state::exerion_video_timing_r)
{
/* bit 0 is the SNMI signal, which is the negated value of H6, if H7=1 & H8=1 & VBLANK=0, otherwise 1 */
/* bit 1 is VBLANK */
- UINT16 hcounter = space->machine().primary_screen->hpos() + EXERION_HCOUNT_START;
+ UINT16 hcounter = machine().primary_screen->hpos() + EXERION_HCOUNT_START;
UINT8 snmi = 1;
- if (((hcounter & 0x180) == 0x180) && !space->machine().primary_screen->vblank())
+ if (((hcounter & 0x180) == 0x180) && !machine().primary_screen->vblank())
snmi = !((hcounter >> 6) & 0x01);
- return (space->machine().primary_screen->vblank() << 1) | snmi;
+ return (machine().primary_screen->vblank() << 1) | snmi;
}
diff --git a/src/mame/video/exidy.c b/src/mame/video/exidy.c
index 1bd742d632a..4caa7d0c83a 100644
--- a/src/mame/video/exidy.c
+++ b/src/mame/video/exidy.c
@@ -79,14 +79,13 @@ INTERRUPT_GEN( exidy_vblank_interrupt )
-READ8_HANDLER( exidy_interrupt_r )
+READ8_MEMBER(exidy_state::exidy_interrupt_r)
{
- exidy_state *state = space->machine().driver_data<exidy_state>();
/* clear any interrupts */
- cputag_set_input_line(space->machine(), "maincpu", 0, CLEAR_LINE);
+ cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
/* return the latched condition */
- return state->m_int_condition;
+ return m_int_condition;
}
diff --git a/src/mame/video/exidy440.c b/src/mame/video/exidy440.c
index a9f26fc1e7a..5e4b5509f9b 100644
--- a/src/mame/video/exidy440.c
+++ b/src/mame/video/exidy440.c
@@ -74,20 +74,18 @@ static VIDEO_START( topsecex )
*
*************************************/
-READ8_HANDLER( exidy440_videoram_r )
+READ8_MEMBER(exidy440_state::exidy440_videoram_r)
{
- exidy440_state *state = space->machine().driver_data<exidy440_state>();
- UINT8 *base = &state->m_local_videoram[(*state->m_scanline * 256 + offset) * 2];
+ UINT8 *base = &m_local_videoram[(*m_scanline * 256 + offset) * 2];
/* combine the two pixel values into one byte */
return (base[0] << 4) | base[1];
}
-WRITE8_HANDLER( exidy440_videoram_w )
+WRITE8_MEMBER(exidy440_state::exidy440_videoram_w)
{
- exidy440_state *state = space->machine().driver_data<exidy440_state>();
- UINT8 *base = &state->m_local_videoram[(*state->m_scanline * 256 + offset) * 2];
+ UINT8 *base = &m_local_videoram[(*m_scanline * 256 + offset) * 2];
/* expand the two pixel values into two bytes */
base[0] = (data >> 4) & 15;
@@ -102,30 +100,28 @@ WRITE8_HANDLER( exidy440_videoram_w )
*
*************************************/
-READ8_HANDLER( exidy440_paletteram_r )
+READ8_MEMBER(exidy440_state::exidy440_paletteram_r)
{
- exidy440_state *state = space->machine().driver_data<exidy440_state>();
- return state->m_local_paletteram[state->m_palettebank_io * 512 + offset];
+ return m_local_paletteram[m_palettebank_io * 512 + offset];
}
-WRITE8_HANDLER( exidy440_paletteram_w )
+WRITE8_MEMBER(exidy440_state::exidy440_paletteram_w)
{
- exidy440_state *state = space->machine().driver_data<exidy440_state>();
/* update palette ram in the I/O bank */
- state->m_local_paletteram[state->m_palettebank_io * 512 + offset] = data;
+ m_local_paletteram[m_palettebank_io * 512 + offset] = data;
/* if we're modifying the active palette, change the color immediately */
- if (state->m_palettebank_io == state->m_palettebank_vis)
+ if (m_palettebank_io == m_palettebank_vis)
{
int word;
/* combine two bytes into a word */
- offset = state->m_palettebank_vis * 512 + (offset & 0x1fe);
- word = (state->m_local_paletteram[offset] << 8) + state->m_local_paletteram[offset + 1];
+ offset = m_palettebank_vis * 512 + (offset & 0x1fe);
+ word = (m_local_paletteram[offset] << 8) + m_local_paletteram[offset + 1];
/* extract the 5-5-5 RGB colors */
- palette_set_color_rgb(space->machine(), offset / 2, pal5bit(word >> 10), pal5bit(word >> 5), pal5bit(word >> 0));
+ palette_set_color_rgb(machine(), offset / 2, pal5bit(word >> 10), pal5bit(word >> 5), pal5bit(word >> 0));
}
}
@@ -137,20 +133,19 @@ WRITE8_HANDLER( exidy440_paletteram_w )
*
*************************************/
-READ8_HANDLER( exidy440_horizontal_pos_r )
+READ8_MEMBER(exidy440_state::exidy440_horizontal_pos_r)
{
- exidy440_state *state = space->machine().driver_data<exidy440_state>();
/* clear the FIRQ on a read here */
- state->m_firq_beam = 0;
- exidy440_update_firq(space->machine());
+ m_firq_beam = 0;
+ exidy440_update_firq(machine());
/* according to the schems, this value is only latched on an FIRQ
* caused by collision or beam */
- return state->m_latched_x;
+ return m_latched_x;
}
-READ8_HANDLER( exidy440_vertical_pos_r )
+READ8_MEMBER(exidy440_state::exidy440_vertical_pos_r)
{
int result;
@@ -158,7 +153,7 @@ READ8_HANDLER( exidy440_vertical_pos_r )
* caused by collision or beam, ORed together with CHRCLK,
* which probably goes off once per scanline; for now, we just
* always return the current scanline */
- result = space->machine().primary_screen->vpos();
+ result = machine().primary_screen->vpos();
return (result < 255) ? result : 255;
}
@@ -170,11 +165,10 @@ READ8_HANDLER( exidy440_vertical_pos_r )
*
*************************************/
-WRITE8_HANDLER( exidy440_spriteram_w )
+WRITE8_MEMBER(exidy440_state::exidy440_spriteram_w)
{
- exidy440_state *state = space->machine().driver_data<exidy440_state>();
- space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos());
- state->m_spriteram[offset] = data;
+ machine().primary_screen->update_partial(machine().primary_screen->vpos());
+ m_spriteram[offset] = data;
}
@@ -185,44 +179,42 @@ WRITE8_HANDLER( exidy440_spriteram_w )
*
*************************************/
-WRITE8_HANDLER( exidy440_control_w )
+WRITE8_MEMBER(exidy440_state::exidy440_control_w)
{
- exidy440_state *state = space->machine().driver_data<exidy440_state>();
- int oldvis = state->m_palettebank_vis;
+ int oldvis = m_palettebank_vis;
/* extract the various bits */
- exidy440_bank_select(space->machine(), data >> 4);
- state->m_firq_enable = (data >> 3) & 1;
- state->m_firq_select = (data >> 2) & 1;
- state->m_palettebank_io = (data >> 1) & 1;
- state->m_palettebank_vis = data & 1;
+ exidy440_bank_select(machine(), data >> 4);
+ m_firq_enable = (data >> 3) & 1;
+ m_firq_select = (data >> 2) & 1;
+ m_palettebank_io = (data >> 1) & 1;
+ m_palettebank_vis = data & 1;
/* update the FIRQ in case we enabled something */
- exidy440_update_firq(space->machine());
+ exidy440_update_firq(machine());
/* if we're swapping palettes, change all the colors */
- if (oldvis != state->m_palettebank_vis)
+ if (oldvis != m_palettebank_vis)
{
int i;
/* pick colors from the visible bank */
- offset = state->m_palettebank_vis * 512;
+ offset = m_palettebank_vis * 512;
for (i = 0; i < 256; i++, offset += 2)
{
/* extract a word and the 5-5-5 RGB components */
- int word = (state->m_local_paletteram[offset] << 8) + state->m_local_paletteram[offset + 1];
- palette_set_color_rgb(space->machine(), i, pal5bit(word >> 10), pal5bit(word >> 5), pal5bit(word >> 0));
+ int word = (m_local_paletteram[offset] << 8) + m_local_paletteram[offset + 1];
+ palette_set_color_rgb(machine(), i, pal5bit(word >> 10), pal5bit(word >> 5), pal5bit(word >> 0));
}
}
}
-WRITE8_HANDLER( exidy440_interrupt_clear_w )
+WRITE8_MEMBER(exidy440_state::exidy440_interrupt_clear_w)
{
- exidy440_state *state = space->machine().driver_data<exidy440_state>();
/* clear the VBLANK FIRQ on a write here */
- state->m_firq_vblank = 0;
- exidy440_update_firq(space->machine());
+ m_firq_vblank = 0;
+ exidy440_update_firq(machine());
}
diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c
index 7c6618c4de9..e29c4983f05 100644
--- a/src/mame/video/exprraid.c
+++ b/src/mame/video/exprraid.c
@@ -2,49 +2,44 @@
#include "includes/exprraid.h"
-WRITE8_HANDLER( exprraid_videoram_w )
+WRITE8_MEMBER(exprraid_state::exprraid_videoram_w)
{
- exprraid_state *state = space->machine().driver_data<exprraid_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( exprraid_colorram_w )
+WRITE8_MEMBER(exprraid_state::exprraid_colorram_w)
{
- exprraid_state *state = space->machine().driver_data<exprraid_state>();
- state->m_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( exprraid_flipscreen_w )
+WRITE8_MEMBER(exprraid_state::exprraid_flipscreen_w)
{
- if (flip_screen_get(space->machine()) != (data & 0x01))
+ if (flip_screen_get(machine()) != (data & 0x01))
{
- flip_screen_set(space->machine(), data & 0x01);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x01);
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( exprraid_bgselect_w )
+WRITE8_MEMBER(exprraid_state::exprraid_bgselect_w)
{
- exprraid_state *state = space->machine().driver_data<exprraid_state>();
- if (state->m_bg_index[offset] != data)
+ if (m_bg_index[offset] != data)
{
- state->m_bg_index[offset] = data;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_index[offset] = data;
+ m_bg_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( exprraid_scrollx_w )
+WRITE8_MEMBER(exprraid_state::exprraid_scrollx_w)
{
- exprraid_state *state = space->machine().driver_data<exprraid_state>();
- state->m_bg_tilemap->set_scrollx(offset, data);
+ m_bg_tilemap->set_scrollx(offset, data);
}
-WRITE8_HANDLER( exprraid_scrolly_w )
+WRITE8_MEMBER(exprraid_state::exprraid_scrolly_w)
{
- exprraid_state *state = space->machine().driver_data<exprraid_state>();
- state->m_bg_tilemap->set_scrolly(0, data);
+ m_bg_tilemap->set_scrolly(0, data);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/exzisus.c b/src/mame/video/exzisus.c
index bae608461cb..eff80ef810d 100644
--- a/src/mame/video/exzisus.c
+++ b/src/mame/video/exzisus.c
@@ -16,59 +16,51 @@ Functions to emulate the video hardware of the machine.
Memory handlers
***************************************************************************/
-READ8_HANDLER ( exzisus_videoram_0_r )
+READ8_MEMBER(exzisus_state::exzisus_videoram_0_r)
{
- exzisus_state *state = space->machine().driver_data<exzisus_state>();
- return state->m_videoram0[offset];
+ return m_videoram0[offset];
}
-READ8_HANDLER ( exzisus_videoram_1_r )
+READ8_MEMBER(exzisus_state::exzisus_videoram_1_r)
{
- exzisus_state *state = space->machine().driver_data<exzisus_state>();
- return state->m_videoram1[offset];
+ return m_videoram1[offset];
}
-READ8_HANDLER ( exzisus_objectram_0_r )
+READ8_MEMBER(exzisus_state::exzisus_objectram_0_r)
{
- exzisus_state *state = space->machine().driver_data<exzisus_state>();
- return state->m_objectram0[offset];
+ return m_objectram0[offset];
}
-READ8_HANDLER ( exzisus_objectram_1_r )
+READ8_MEMBER(exzisus_state::exzisus_objectram_1_r)
{
- exzisus_state *state = space->machine().driver_data<exzisus_state>();
- return state->m_objectram1[offset];
+ return m_objectram1[offset];
}
-WRITE8_HANDLER( exzisus_videoram_0_w )
+WRITE8_MEMBER(exzisus_state::exzisus_videoram_0_w)
{
- exzisus_state *state = space->machine().driver_data<exzisus_state>();
- state->m_videoram0[offset] = data;
+ m_videoram0[offset] = data;
}
-WRITE8_HANDLER( exzisus_videoram_1_w )
+WRITE8_MEMBER(exzisus_state::exzisus_videoram_1_w)
{
- exzisus_state *state = space->machine().driver_data<exzisus_state>();
- state->m_videoram1[offset] = data;
+ m_videoram1[offset] = data;
}
-WRITE8_HANDLER( exzisus_objectram_0_w )
+WRITE8_MEMBER(exzisus_state::exzisus_objectram_0_w)
{
- exzisus_state *state = space->machine().driver_data<exzisus_state>();
- state->m_objectram0[offset] = data;
+ m_objectram0[offset] = data;
}
-WRITE8_HANDLER( exzisus_objectram_1_w )
+WRITE8_MEMBER(exzisus_state::exzisus_objectram_1_w)
{
- exzisus_state *state = space->machine().driver_data<exzisus_state>();
- state->m_objectram1[offset] = data;
+ m_objectram1[offset] = data;
}
diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c
index d2840a74b3d..d23ba758ee0 100644
--- a/src/mame/video/f1gp.c
+++ b/src/mame/video/f1gp.c
@@ -95,77 +95,69 @@ VIDEO_START( f1gp2 )
***************************************************************************/
-READ16_HANDLER( f1gp_zoomdata_r )
+READ16_MEMBER(f1gp_state::f1gp_zoomdata_r)
{
- f1gp_state *state = space->machine().driver_data<f1gp_state>();
- return state->m_zoomdata[offset];
+ return m_zoomdata[offset];
}
-WRITE16_HANDLER( f1gp_zoomdata_w )
+WRITE16_MEMBER(f1gp_state::f1gp_zoomdata_w)
{
- f1gp_state *state = space->machine().driver_data<f1gp_state>();
- COMBINE_DATA(&state->m_zoomdata[offset]);
- gfx_element_mark_dirty(space->machine().gfx[3], offset / 64);
+ COMBINE_DATA(&m_zoomdata[offset]);
+ gfx_element_mark_dirty(machine().gfx[3], offset / 64);
}
-READ16_HANDLER( f1gp_rozvideoram_r )
+READ16_MEMBER(f1gp_state::f1gp_rozvideoram_r)
{
- f1gp_state *state = space->machine().driver_data<f1gp_state>();
- return state->m_rozvideoram[offset];
+ return m_rozvideoram[offset];
}
-WRITE16_HANDLER( f1gp_rozvideoram_w )
+WRITE16_MEMBER(f1gp_state::f1gp_rozvideoram_w)
{
- f1gp_state *state = space->machine().driver_data<f1gp_state>();
- COMBINE_DATA(&state->m_rozvideoram[offset]);
- state->m_roz_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_rozvideoram[offset]);
+ m_roz_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( f1gp_fgvideoram_w )
+WRITE16_MEMBER(f1gp_state::f1gp_fgvideoram_w)
{
- f1gp_state *state = space->machine().driver_data<f1gp_state>();
- COMBINE_DATA(&state->m_fgvideoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_fgvideoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( f1gp_fgscroll_w )
+WRITE16_MEMBER(f1gp_state::f1gp_fgscroll_w)
{
- f1gp_state *state = space->machine().driver_data<f1gp_state>();
- COMBINE_DATA(&state->m_scroll[offset]);
+ COMBINE_DATA(&m_scroll[offset]);
- state->m_fg_tilemap->set_scrollx(0, state->m_scroll[0]);
- state->m_fg_tilemap->set_scrolly(0, state->m_scroll[1]);
+ m_fg_tilemap->set_scrollx(0, m_scroll[0]);
+ m_fg_tilemap->set_scrolly(0, m_scroll[1]);
}
-WRITE16_HANDLER( f1gp_gfxctrl_w )
+WRITE16_MEMBER(f1gp_state::f1gp_gfxctrl_w)
{
- f1gp_state *state = space->machine().driver_data<f1gp_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_flipscreen = data & 0x20;
- state->m_gfxctrl = data & 0xdf;
+ m_flipscreen = data & 0x20;
+ m_gfxctrl = data & 0xdf;
}
}
-WRITE16_HANDLER( f1gp2_gfxctrl_w )
+WRITE16_MEMBER(f1gp_state::f1gp2_gfxctrl_w)
{
- f1gp_state *state = space->machine().driver_data<f1gp_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_flipscreen = data & 0x20;
+ m_flipscreen = data & 0x20;
/* bit 0/1 = fg/sprite/roz priority */
/* bit 2 = blank screen */
- state->m_gfxctrl = data & 0xdf;
+ m_gfxctrl = data & 0xdf;
}
if (ACCESSING_BITS_8_15)
{
- if (state->m_roz_bank != (data >> 8))
+ if (m_roz_bank != (data >> 8))
{
- state->m_roz_bank = (data >> 8);
- state->m_roz_tilemap->mark_all_dirty();
+ m_roz_bank = (data >> 8);
+ m_roz_tilemap->mark_all_dirty();
}
}
}
diff --git a/src/mame/video/fastlane.c b/src/mame/video/fastlane.c
index abf696d209e..b6eeb85cb89 100644
--- a/src/mame/video/fastlane.c
+++ b/src/mame/video/fastlane.c
@@ -133,18 +133,16 @@ VIDEO_START( fastlane )
***************************************************************************/
-WRITE8_HANDLER( fastlane_vram1_w )
+WRITE8_MEMBER(fastlane_state::fastlane_vram1_w)
{
- fastlane_state *state = space->machine().driver_data<fastlane_state>();
- state->m_videoram1[offset] = data;
- state->m_layer0->mark_tile_dirty(offset & 0x3ff);
+ m_videoram1[offset] = data;
+ m_layer0->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( fastlane_vram2_w )
+WRITE8_MEMBER(fastlane_state::fastlane_vram2_w)
{
- fastlane_state *state = space->machine().driver_data<fastlane_state>();
- state->m_videoram2[offset] = data;
- state->m_layer1->mark_tile_dirty(offset & 0x3ff);
+ m_videoram2[offset] = data;
+ m_layer1->mark_tile_dirty(offset & 0x3ff);
}
diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c
index 8923c055be9..e1e200eaead 100644
--- a/src/mame/video/fcombat.c
+++ b/src/mame/video/fcombat.c
@@ -112,23 +112,22 @@ VIDEO_START( fcombat )
*
*************************************/
-WRITE8_HANDLER( fcombat_videoreg_w )
+WRITE8_MEMBER(fcombat_state::fcombat_videoreg_w)
{
- fcombat_state *state = space->machine().driver_data<fcombat_state>();
/* bit 0 = flip screen and joystick input multiplexor */
- state->m_cocktail_flip = data & 1;
+ m_cocktail_flip = data & 1;
/* bits 1-2 char lookup table bank */
- state->m_char_palette = (data & 0x06) >> 1;
+ m_char_palette = (data & 0x06) >> 1;
/* bits 3 char bank */
- state->m_char_bank = (data & 0x08) >> 3;
+ m_char_bank = (data & 0x08) >> 3;
/* bits 4-5 unused */
/* bits 6-7 sprite lookup table bank */
- state->m_sprite_palette = 0;//(data & 0xc0) >> 6;
+ m_sprite_palette = 0;//(data & 0xc0) >> 6;
//popmessage("%08x",data);
}
diff --git a/src/mame/video/fgoal.c b/src/mame/video/fgoal.c
index 067dd42e18a..723830b07db 100644
--- a/src/mame/video/fgoal.c
+++ b/src/mame/video/fgoal.c
@@ -8,24 +8,21 @@
#include "includes/fgoal.h"
-WRITE8_HANDLER( fgoal_color_w )
+WRITE8_MEMBER(fgoal_state::fgoal_color_w)
{
- fgoal_state *state = space->machine().driver_data<fgoal_state>();
- state->m_current_color = data & 3;
+ m_current_color = data & 3;
}
-WRITE8_HANDLER( fgoal_ypos_w )
+WRITE8_MEMBER(fgoal_state::fgoal_ypos_w)
{
- fgoal_state *state = space->machine().driver_data<fgoal_state>();
- state->m_ypos = data;
+ m_ypos = data;
}
-WRITE8_HANDLER( fgoal_xpos_w )
+WRITE8_MEMBER(fgoal_state::fgoal_xpos_w)
{
- fgoal_state *state = space->machine().driver_data<fgoal_state>();
- state->m_xpos = data;
+ m_xpos = data;
}
diff --git a/src/mame/video/finalizr.c b/src/mame/video/finalizr.c
index 218d9dff903..dc094fb27c2 100644
--- a/src/mame/video/finalizr.c
+++ b/src/mame/video/finalizr.c
@@ -75,11 +75,10 @@ VIDEO_START( finalizr )
-WRITE8_HANDLER( finalizr_videoctrl_w )
+WRITE8_MEMBER(finalizr_state::finalizr_videoctrl_w)
{
- finalizr_state *state = space->machine().driver_data<finalizr_state>();
- state->m_charbank = data & 3;
- state->m_spriterambank = data & 8;
+ m_charbank = data & 3;
+ m_spriterambank = data & 8;
/* other bits unknown */
}
diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c
index e1f0b3499c1..31b664d7231 100644
--- a/src/mame/video/firetrap.c
+++ b/src/mame/video/firetrap.c
@@ -143,54 +143,47 @@ VIDEO_START( firetrap )
***************************************************************************/
-WRITE8_HANDLER( firetrap_fgvideoram_w )
+WRITE8_MEMBER(firetrap_state::firetrap_fgvideoram_w)
{
- firetrap_state *state = space->machine().driver_data<firetrap_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( firetrap_bg1videoram_w )
+WRITE8_MEMBER(firetrap_state::firetrap_bg1videoram_w)
{
- firetrap_state *state = space->machine().driver_data<firetrap_state>();
- state->m_bg1videoram[offset] = data;
- state->m_bg1_tilemap->mark_tile_dirty(offset & 0x6ff);
+ m_bg1videoram[offset] = data;
+ m_bg1_tilemap->mark_tile_dirty(offset & 0x6ff);
}
-WRITE8_HANDLER( firetrap_bg2videoram_w )
+WRITE8_MEMBER(firetrap_state::firetrap_bg2videoram_w)
{
- firetrap_state *state = space->machine().driver_data<firetrap_state>();
- state->m_bg2videoram[offset] = data;
- state->m_bg2_tilemap->mark_tile_dirty(offset & 0x6ff);
+ m_bg2videoram[offset] = data;
+ m_bg2_tilemap->mark_tile_dirty(offset & 0x6ff);
}
-WRITE8_HANDLER( firetrap_bg1_scrollx_w )
+WRITE8_MEMBER(firetrap_state::firetrap_bg1_scrollx_w)
{
- firetrap_state *state = space->machine().driver_data<firetrap_state>();
- state->m_scroll1_x[offset] = data;
- state->m_bg1_tilemap->set_scrollx(0, state->m_scroll1_x[0] | (state->m_scroll1_x[1] << 8));
+ m_scroll1_x[offset] = data;
+ m_bg1_tilemap->set_scrollx(0, m_scroll1_x[0] | (m_scroll1_x[1] << 8));
}
-WRITE8_HANDLER( firetrap_bg1_scrolly_w )
+WRITE8_MEMBER(firetrap_state::firetrap_bg1_scrolly_w)
{
- firetrap_state *state = space->machine().driver_data<firetrap_state>();
- state->m_scroll1_y[offset] = data;
- state->m_bg1_tilemap->set_scrolly(0, -(state->m_scroll1_y[0] | (state->m_scroll1_y[1] << 8)));
+ m_scroll1_y[offset] = data;
+ m_bg1_tilemap->set_scrolly(0, -(m_scroll1_y[0] | (m_scroll1_y[1] << 8)));
}
-WRITE8_HANDLER( firetrap_bg2_scrollx_w )
+WRITE8_MEMBER(firetrap_state::firetrap_bg2_scrollx_w)
{
- firetrap_state *state = space->machine().driver_data<firetrap_state>();
- state->m_scroll2_x[offset] = data;
- state->m_bg2_tilemap->set_scrollx(0, state->m_scroll2_x[0] | (state->m_scroll2_x[1] << 8));
+ m_scroll2_x[offset] = data;
+ m_bg2_tilemap->set_scrollx(0, m_scroll2_x[0] | (m_scroll2_x[1] << 8));
}
-WRITE8_HANDLER( firetrap_bg2_scrolly_w )
+WRITE8_MEMBER(firetrap_state::firetrap_bg2_scrolly_w)
{
- firetrap_state *state = space->machine().driver_data<firetrap_state>();
- state->m_scroll2_y[offset] = data;
- state->m_bg2_tilemap->set_scrolly(0, -(state->m_scroll2_y[0] | (state->m_scroll2_y[1] << 8)));
+ m_scroll2_y[offset] = data;
+ m_bg2_tilemap->set_scrolly(0, -(m_scroll2_y[0] | (m_scroll2_y[1] << 8)));
}
diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c
index a0b75f288a4..3d1cb39aeeb 100644
--- a/src/mame/video/fitfight.c
+++ b/src/mame/video/fitfight.c
@@ -52,12 +52,11 @@ static TILE_GET_INFO( get_fof_bak_tile_info )
SET_TILE_INFO(2, code, colr, TILE_FLIPYX(xflip));
}
-WRITE16_HANDLER( fof_bak_tileram_w )
+WRITE16_MEMBER(fitfight_state::fof_bak_tileram_w)
{
- fitfight_state *state = space->machine().driver_data<fitfight_state>();
- COMBINE_DATA(&state->m_fof_bak_tileram[offset]);
- state->m_fof_bak_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_fof_bak_tileram[offset]);
+ m_fof_bak_tilemap->mark_tile_dirty(offset / 2);
}
@@ -72,12 +71,11 @@ static TILE_GET_INFO( get_fof_mid_tile_info )
SET_TILE_INFO(1, code, colr, TILE_FLIPYX(xflip));
}
-WRITE16_HANDLER( fof_mid_tileram_w )
+WRITE16_MEMBER(fitfight_state::fof_mid_tileram_w)
{
- fitfight_state *state = space->machine().driver_data<fitfight_state>();
- COMBINE_DATA(&state->m_fof_mid_tileram[offset]);
- state->m_fof_mid_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_fof_mid_tileram[offset]);
+ m_fof_mid_tilemap->mark_tile_dirty(offset / 2);
}
static TILE_GET_INFO( get_fof_txt_tile_info )
@@ -91,12 +89,11 @@ static TILE_GET_INFO( get_fof_txt_tile_info )
SET_TILE_INFO(0, code, colr, TILE_FLIPYX(xflip));
}
-WRITE16_HANDLER( fof_txt_tileram_w )
+WRITE16_MEMBER(fitfight_state::fof_txt_tileram_w)
{
- fitfight_state *state = space->machine().driver_data<fitfight_state>();
- COMBINE_DATA(&state->m_fof_txt_tileram[offset]);
- state->m_fof_txt_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_fof_txt_tileram[offset]);
+ m_fof_txt_tilemap->mark_tile_dirty(offset / 2);
}
/* video start / update */
diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c
index 5892f6ec4a7..91f1ac1adff 100644
--- a/src/mame/video/flkatck.c
+++ b/src/mame/video/flkatck.c
@@ -83,39 +83,37 @@ VIDEO_START( flkatck )
***************************************************************************/
-WRITE8_HANDLER( flkatck_k007121_w )
+WRITE8_MEMBER(flkatck_state::flkatck_k007121_w)
{
- flkatck_state *state = space->machine().driver_data<flkatck_state>();
- state->m_k007121_ram[offset] = data;
+ m_k007121_ram[offset] = data;
if (offset < 0x1000) /* tiles */
{
if (offset & 0x800) /* score */
- state->m_k007121_tilemap[1]->mark_tile_dirty(offset & 0x3ff);
+ m_k007121_tilemap[1]->mark_tile_dirty(offset & 0x3ff);
else
- state->m_k007121_tilemap[0]->mark_tile_dirty(offset & 0x3ff);
+ m_k007121_tilemap[0]->mark_tile_dirty(offset & 0x3ff);
}
}
-WRITE8_HANDLER( flkatck_k007121_regs_w )
+WRITE8_MEMBER(flkatck_state::flkatck_k007121_regs_w)
{
- flkatck_state *state = space->machine().driver_data<flkatck_state>();
switch (offset)
{
case 0x04: /* ROM bank select */
- if (data != k007121_ctrlram_r(state->m_k007121, 4))
- space->machine().tilemap().mark_all_dirty();
+ if (data != k007121_ctrlram_r(m_k007121, 4))
+ machine().tilemap().mark_all_dirty();
break;
case 0x07: /* flip screen + IRQ control */
- state->m_flipscreen = data & 0x08;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- state->m_irq_enabled = data & 0x02;
+ m_flipscreen = data & 0x08;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_irq_enabled = data & 0x02;
break;
}
- k007121_ctrl_w(state->m_k007121, offset, data);
+ k007121_ctrl_w(m_k007121, offset, data);
}
diff --git a/src/mame/video/flower.c b/src/mame/video/flower.c
index 610fef3f1bc..8ec1c86ba7d 100644
--- a/src/mame/video/flower.c
+++ b/src/mame/video/flower.c
@@ -192,29 +192,26 @@ SCREEN_UPDATE_IND16( flower )
return 0;
}
-WRITE8_HANDLER( flower_textram_w )
+WRITE8_MEMBER(flower_state::flower_textram_w)
{
- flower_state *state = space->machine().driver_data<flower_state>();
- state->m_textram[offset] = data;
- state->m_text_tilemap->mark_tile_dirty(offset);
- state->m_text_right_tilemap->mark_all_dirty();
+ m_textram[offset] = data;
+ m_text_tilemap->mark_tile_dirty(offset);
+ m_text_right_tilemap->mark_all_dirty();
}
-WRITE8_HANDLER( flower_bg0ram_w )
+WRITE8_MEMBER(flower_state::flower_bg0ram_w)
{
- flower_state *state = space->machine().driver_data<flower_state>();
- state->m_bg0ram[offset] = data;
- state->m_bg0_tilemap->mark_tile_dirty(offset & 0x1ff);
+ m_bg0ram[offset] = data;
+ m_bg0_tilemap->mark_tile_dirty(offset & 0x1ff);
}
-WRITE8_HANDLER( flower_bg1ram_w )
+WRITE8_MEMBER(flower_state::flower_bg1ram_w)
{
- flower_state *state = space->machine().driver_data<flower_state>();
- state->m_bg1ram[offset] = data;
- state->m_bg1_tilemap->mark_tile_dirty(offset & 0x1ff);
+ m_bg1ram[offset] = data;
+ m_bg1_tilemap->mark_tile_dirty(offset & 0x1ff);
}
-WRITE8_HANDLER( flower_flipscreen_w )
+WRITE8_MEMBER(flower_state::flower_flipscreen_w)
{
- flip_screen_set(space->machine(), data);
+ flip_screen_set(machine(), data);
}
diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c
index 3b1f89272a5..138b6f4bcb5 100644
--- a/src/mame/video/flstory.c
+++ b/src/mame/video/flstory.c
@@ -93,82 +93,75 @@ VIDEO_START( victnine )
state->m_generic_paletteram2_8.allocate(0x200);
}
-WRITE8_HANDLER( flstory_videoram_w )
+WRITE8_MEMBER(flstory_state::flstory_videoram_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( flstory_palette_w )
+WRITE8_MEMBER(flstory_state::flstory_palette_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
if (offset & 0x100)
- state->paletteram_xxxxBBBBGGGGRRRR_split2_w(*space, (offset & 0xff) + (state->m_palette_bank << 8),data);
+ paletteram_xxxxBBBBGGGGRRRR_split2_w(space, (offset & 0xff) + (m_palette_bank << 8),data);
else
- state->paletteram_xxxxBBBBGGGGRRRR_split1_w(*space, (offset & 0xff) + (state->m_palette_bank << 8),data);
+ paletteram_xxxxBBBBGGGGRRRR_split1_w(space, (offset & 0xff) + (m_palette_bank << 8),data);
}
-READ8_HANDLER( flstory_palette_r )
+READ8_MEMBER(flstory_state::flstory_palette_r)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
if (offset & 0x100)
- return state->m_generic_paletteram2_8[ (offset & 0xff) + (state->m_palette_bank << 8) ];
+ return m_generic_paletteram2_8[ (offset & 0xff) + (m_palette_bank << 8) ];
else
- return state->m_generic_paletteram_8 [ (offset & 0xff) + (state->m_palette_bank << 8) ];
+ return m_generic_paletteram_8 [ (offset & 0xff) + (m_palette_bank << 8) ];
}
-WRITE8_HANDLER( flstory_gfxctrl_w )
+WRITE8_MEMBER(flstory_state::flstory_gfxctrl_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- if (state->m_gfxctrl == data)
+ if (m_gfxctrl == data)
return;
- state->m_gfxctrl = data;
+ m_gfxctrl = data;
- state->m_flipscreen = (~data & 0x01);
- if (state->m_char_bank != ((data & 0x10) >> 4))
+ m_flipscreen = (~data & 0x01);
+ if (m_char_bank != ((data & 0x10) >> 4))
{
- state->m_char_bank = (data & 0x10) >> 4;
- state->m_bg_tilemap->mark_all_dirty();
+ m_char_bank = (data & 0x10) >> 4;
+ m_bg_tilemap->mark_all_dirty();
}
- state->m_palette_bank = (data & 0x20) >> 5;
+ m_palette_bank = (data & 0x20) >> 5;
- flip_screen_set(space->machine(), state->m_flipscreen);
+ flip_screen_set(machine(), m_flipscreen);
-//popmessage("%04x: gfxctrl = %02x\n", cpu_get_pc(&space->device()), data);
+//popmessage("%04x: gfxctrl = %02x\n", cpu_get_pc(&space.device()), data);
}
-READ8_HANDLER( victnine_gfxctrl_r )
+READ8_MEMBER(flstory_state::victnine_gfxctrl_r)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- return state->m_gfxctrl;
+ return m_gfxctrl;
}
-WRITE8_HANDLER( victnine_gfxctrl_w )
+WRITE8_MEMBER(flstory_state::victnine_gfxctrl_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- if (state->m_gfxctrl == data)
+ if (m_gfxctrl == data)
return;
- state->m_gfxctrl = data;
+ m_gfxctrl = data;
- state->m_palette_bank = (data & 0x20) >> 5;
+ m_palette_bank = (data & 0x20) >> 5;
if (data & 0x04)
{
- state->m_flipscreen = (data & 0x01);
- flip_screen_set(space->machine(), state->m_flipscreen);
+ m_flipscreen = (data & 0x01);
+ flip_screen_set(machine(), m_flipscreen);
}
-//popmessage("%04x: gfxctrl = %02x\n", cpu_get_pc(&space->device()), data);
+//popmessage("%04x: gfxctrl = %02x\n", cpu_get_pc(&space.device()), data);
}
-WRITE8_HANDLER( flstory_scrlram_w )
+WRITE8_MEMBER(flstory_state::flstory_scrlram_w)
{
- flstory_state *state = space->machine().driver_data<flstory_state>();
- state->m_scrlram[offset] = data;
- state->m_bg_tilemap->set_scrolly(offset, data);
+ m_scrlram[offset] = data;
+ m_bg_tilemap->set_scrolly(offset, data);
}
diff --git a/src/mame/video/freekick.c b/src/mame/video/freekick.c
index 565184fa3dd..bee6303e2c5 100644
--- a/src/mame/video/freekick.c
+++ b/src/mame/video/freekick.c
@@ -22,11 +22,10 @@ VIDEO_START( freekick )
}
-WRITE8_HANDLER( freek_videoram_w )
+WRITE8_MEMBER(freekick_state::freek_videoram_w)
{
- freekick_state *state = space->machine().driver_data<freekick_state>();
- state->m_videoram[offset] = data;
- state->m_freek_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_videoram[offset] = data;
+ m_freek_tilemap->mark_tile_dirty(offset & 0x3ff);
}
static void gigas_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect )
diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c
index 367f2479cbc..407e4296397 100644
--- a/src/mame/video/fromanc2.c
+++ b/src/mame/video/fromanc2.c
@@ -61,114 +61,102 @@ static TILE_GET_INFO( fromancr_get_v1_l2_tile_info ) { fromancr_get_tile_info(ma
******************************************************************************/
-READ16_HANDLER( fromanc2_paletteram_0_r )
+READ16_MEMBER(fromanc2_state::fromanc2_paletteram_0_r)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
- return state->m_paletteram[0][offset];
+ return m_paletteram[0][offset];
}
-READ16_HANDLER( fromanc2_paletteram_1_r )
+READ16_MEMBER(fromanc2_state::fromanc2_paletteram_1_r)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
- return state->m_paletteram[1][offset];
+ return m_paletteram[1][offset];
}
-WRITE16_HANDLER( fromanc2_paletteram_0_w )
+WRITE16_MEMBER(fromanc2_state::fromanc2_paletteram_0_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
UINT16 color;
- COMBINE_DATA(&state->m_paletteram[0][offset]);
+ COMBINE_DATA(&m_paletteram[0][offset]);
// GGGG_GRRR_RRBB_BBBx
color = ((offset & 0x0700) << 1) + (offset & 0x00ff);
- palette_set_color_rgb(space->machine(), 0x000 + color, pal5bit(data >> 6), pal5bit(data >> 11), pal5bit(data >> 1));
+ palette_set_color_rgb(machine(), 0x000 + color, pal5bit(data >> 6), pal5bit(data >> 11), pal5bit(data >> 1));
}
-WRITE16_HANDLER( fromanc2_paletteram_1_w )
+WRITE16_MEMBER(fromanc2_state::fromanc2_paletteram_1_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
UINT16 color;
- COMBINE_DATA(&state->m_paletteram[1][offset]);
+ COMBINE_DATA(&m_paletteram[1][offset]);
// GGGG_GRRR_RRBB_BBBx
color = ((offset & 0x0700) << 1) + (offset & 0x00ff);
- palette_set_color_rgb(space->machine(), 0x100 + color, pal5bit(data >> 6), pal5bit(data >> 11), pal5bit(data >> 1));
+ palette_set_color_rgb(machine(), 0x100 + color, pal5bit(data >> 6), pal5bit(data >> 11), pal5bit(data >> 1));
}
-READ16_HANDLER( fromancr_paletteram_0_r )
+READ16_MEMBER(fromanc2_state::fromancr_paletteram_0_r)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
- return state->m_paletteram[0][offset];
+ return m_paletteram[0][offset];
}
-READ16_HANDLER( fromancr_paletteram_1_r )
+READ16_MEMBER(fromanc2_state::fromancr_paletteram_1_r)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
- return state->m_paletteram[1][offset];
+ return m_paletteram[1][offset];
}
-WRITE16_HANDLER( fromancr_paletteram_0_w )
+WRITE16_MEMBER(fromanc2_state::fromancr_paletteram_0_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
UINT16 color;
- COMBINE_DATA(&state->m_paletteram[0][offset]);
+ COMBINE_DATA(&m_paletteram[0][offset]);
// xGGG_GGRR_RRRB_BBBB
color = ((offset & 0x0700) << 1) + (offset & 0x00ff);
- palette_set_color_rgb(space->machine(), 0x000 + color, pal5bit(data >> 5), pal5bit(data >> 10), pal5bit(data >> 0));
+ palette_set_color_rgb(machine(), 0x000 + color, pal5bit(data >> 5), pal5bit(data >> 10), pal5bit(data >> 0));
}
-WRITE16_HANDLER( fromancr_paletteram_1_w )
+WRITE16_MEMBER(fromanc2_state::fromancr_paletteram_1_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
UINT16 color;
- COMBINE_DATA(&state->m_paletteram[1][offset]);
+ COMBINE_DATA(&m_paletteram[1][offset]);
// xGGG_GGRR_RRRB_BBBB
color = ((offset & 0x0700) << 1) + (offset & 0x00ff);
- palette_set_color_rgb(space->machine(), 0x100 + color, pal5bit(data >> 5), pal5bit(data >> 10), pal5bit(data >> 0));
+ palette_set_color_rgb(machine(), 0x100 + color, pal5bit(data >> 5), pal5bit(data >> 10), pal5bit(data >> 0));
}
-READ16_HANDLER( fromanc4_paletteram_0_r )
+READ16_MEMBER(fromanc2_state::fromanc4_paletteram_0_r)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
- return state->m_paletteram[0][offset];
+ return m_paletteram[0][offset];
}
-READ16_HANDLER( fromanc4_paletteram_1_r )
+READ16_MEMBER(fromanc2_state::fromanc4_paletteram_1_r)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
- return state->m_paletteram[1][offset];
+ return m_paletteram[1][offset];
}
-WRITE16_HANDLER( fromanc4_paletteram_0_w )
+WRITE16_MEMBER(fromanc2_state::fromanc4_paletteram_0_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
UINT16 color;
- COMBINE_DATA(&state->m_paletteram[0][offset]);
+ COMBINE_DATA(&m_paletteram[0][offset]);
// xRRR_RRGG_GGGB_BBBB
color = ((offset & 0x0700) << 1) + (offset & 0x00ff);
- palette_set_color_rgb(space->machine(), 0x000 + color, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0));
+ palette_set_color_rgb(machine(), 0x000 + color, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0));
}
-WRITE16_HANDLER( fromanc4_paletteram_1_w )
+WRITE16_MEMBER(fromanc2_state::fromanc4_paletteram_1_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
UINT16 color;
- COMBINE_DATA(&state->m_paletteram[1][offset]);
+ COMBINE_DATA(&m_paletteram[1][offset]);
// xRRR_RRGG_GGGB_BBBB
color = ((offset & 0x0700) << 1) + (offset & 0x00ff);
- palette_set_color_rgb(space->machine(), 0x100 + color, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0));
+ palette_set_color_rgb(machine(), 0x100 + color, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0));
}
@@ -181,91 +169,85 @@ INLINE void fromanc2_dispvram_w( running_machine &machine, offs_t offset, UINT16
state->m_tilemap[vram][layer]->mark_tile_dirty(offset & 0x0fff);
}
-WRITE16_HANDLER( fromanc2_videoram_0_w ) { fromanc2_dispvram_w(space->machine(), offset, data, mem_mask, 0, 0); }
-WRITE16_HANDLER( fromanc2_videoram_1_w ) { fromanc2_dispvram_w(space->machine(), offset, data, mem_mask, 0, 2); }
-WRITE16_HANDLER( fromanc2_videoram_2_w ) { fromanc2_dispvram_w(space->machine(), offset, data, mem_mask, 1, 0); }
-WRITE16_HANDLER( fromanc2_videoram_3_w ) { fromanc2_dispvram_w(space->machine(), offset, data, mem_mask, 1, 2); }
+WRITE16_MEMBER(fromanc2_state::fromanc2_videoram_0_w){ fromanc2_dispvram_w(machine(), offset, data, mem_mask, 0, 0); }
+WRITE16_MEMBER(fromanc2_state::fromanc2_videoram_1_w){ fromanc2_dispvram_w(machine(), offset, data, mem_mask, 0, 2); }
+WRITE16_MEMBER(fromanc2_state::fromanc2_videoram_2_w){ fromanc2_dispvram_w(machine(), offset, data, mem_mask, 1, 0); }
+WRITE16_MEMBER(fromanc2_state::fromanc2_videoram_3_w){ fromanc2_dispvram_w(machine(), offset, data, mem_mask, 1, 2); }
-WRITE16_HANDLER( fromanc2_gfxreg_0_w )
+WRITE16_MEMBER(fromanc2_state::fromanc2_gfxreg_0_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
switch (offset)
{
- case 0x00: state->m_scrollx[0][0] = -(data - 0x000); break;
- case 0x01: state->m_scrolly[0][0] = -(data - 0x000); break;
- case 0x02: state->m_scrollx[0][1] = -(data - 0x004); break;
- case 0x03: state->m_scrolly[0][1] = -(data - 0x000); break;
+ case 0x00: m_scrollx[0][0] = -(data - 0x000); break;
+ case 0x01: m_scrolly[0][0] = -(data - 0x000); break;
+ case 0x02: m_scrollx[0][1] = -(data - 0x004); break;
+ case 0x03: m_scrolly[0][1] = -(data - 0x000); break;
// offset 0x04 - 0x11 unknown
default: break;
}
}
-WRITE16_HANDLER( fromanc2_gfxreg_1_w )
+WRITE16_MEMBER(fromanc2_state::fromanc2_gfxreg_1_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
switch (offset)
{
- case 0x00: state->m_scrollx[1][0] = -(data - 0x1be); break;
- case 0x01: state->m_scrolly[1][0] = -(data - 0x1ef); break;
- case 0x02: state->m_scrollx[1][1] = -(data - 0x1c2); break;
- case 0x03: state->m_scrolly[1][1] = -(data - 0x1ef); break;
+ case 0x00: m_scrollx[1][0] = -(data - 0x1be); break;
+ case 0x01: m_scrolly[1][0] = -(data - 0x1ef); break;
+ case 0x02: m_scrollx[1][1] = -(data - 0x1c2); break;
+ case 0x03: m_scrolly[1][1] = -(data - 0x1ef); break;
// offset 0x04 - 0x11 unknown
default: break;
}
}
-WRITE16_HANDLER( fromanc2_gfxreg_2_w )
+WRITE16_MEMBER(fromanc2_state::fromanc2_gfxreg_2_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
switch (offset)
{
- case 0x00: state->m_scrollx[0][2] = -(data - 0x1c0); break;
- case 0x01: state->m_scrolly[0][2] = -(data - 0x1ef); break;
- case 0x02: state->m_scrollx[0][3] = -(data - 0x1c3); break;
- case 0x03: state->m_scrolly[0][3] = -(data - 0x1ef); break;
+ case 0x00: m_scrollx[0][2] = -(data - 0x1c0); break;
+ case 0x01: m_scrolly[0][2] = -(data - 0x1ef); break;
+ case 0x02: m_scrollx[0][3] = -(data - 0x1c3); break;
+ case 0x03: m_scrolly[0][3] = -(data - 0x1ef); break;
// offset 0x04 - 0x11 unknown
default: break;
}
}
-WRITE16_HANDLER( fromanc2_gfxreg_3_w )
+WRITE16_MEMBER(fromanc2_state::fromanc2_gfxreg_3_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
switch (offset)
{
- case 0x00: state->m_scrollx[1][2] = -(data - 0x1bf); break;
- case 0x01: state->m_scrolly[1][2] = -(data - 0x1ef); break;
- case 0x02: state->m_scrollx[1][3] = -(data - 0x1c3); break;
- case 0x03: state->m_scrolly[1][3] = -(data - 0x1ef); break;
+ case 0x00: m_scrollx[1][2] = -(data - 0x1bf); break;
+ case 0x01: m_scrolly[1][2] = -(data - 0x1ef); break;
+ case 0x02: m_scrollx[1][3] = -(data - 0x1c3); break;
+ case 0x03: m_scrolly[1][3] = -(data - 0x1ef); break;
// offset 0x04 - 0x11 unknown
default: break;
}
}
-WRITE16_HANDLER( fromanc2_gfxbank_0_w )
+WRITE16_MEMBER(fromanc2_state::fromanc2_gfxbank_0_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
- state->m_gfxbank[0][0] = (data & 0x000f) >> 0;
- state->m_gfxbank[0][1] = (data & 0x00f0) >> 4;
- state->m_gfxbank[0][2] = (data & 0x0f00) >> 8;
- state->m_gfxbank[0][3] = (data & 0xf000) >> 12;
- state->m_tilemap[0][0]->mark_all_dirty();
- state->m_tilemap[0][1]->mark_all_dirty();
- state->m_tilemap[0][2]->mark_all_dirty();
- state->m_tilemap[0][3]->mark_all_dirty();
+ m_gfxbank[0][0] = (data & 0x000f) >> 0;
+ m_gfxbank[0][1] = (data & 0x00f0) >> 4;
+ m_gfxbank[0][2] = (data & 0x0f00) >> 8;
+ m_gfxbank[0][3] = (data & 0xf000) >> 12;
+ m_tilemap[0][0]->mark_all_dirty();
+ m_tilemap[0][1]->mark_all_dirty();
+ m_tilemap[0][2]->mark_all_dirty();
+ m_tilemap[0][3]->mark_all_dirty();
}
-WRITE16_HANDLER( fromanc2_gfxbank_1_w )
+WRITE16_MEMBER(fromanc2_state::fromanc2_gfxbank_1_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
- state->m_gfxbank[1][0] = (data & 0x000f) >> 0;
- state->m_gfxbank[1][1] = (data & 0x00f0) >> 4;
- state->m_gfxbank[1][2] = (data & 0x0f00) >> 8;
- state->m_gfxbank[1][3] = (data & 0xf000) >> 12;
- state->m_tilemap[1][0]->mark_all_dirty();
- state->m_tilemap[1][1]->mark_all_dirty();
- state->m_tilemap[1][2]->mark_all_dirty();
- state->m_tilemap[1][3]->mark_all_dirty();
+ m_gfxbank[1][0] = (data & 0x000f) >> 0;
+ m_gfxbank[1][1] = (data & 0x00f0) >> 4;
+ m_gfxbank[1][2] = (data & 0x0f00) >> 8;
+ m_gfxbank[1][3] = (data & 0xf000) >> 12;
+ m_tilemap[1][0]->mark_all_dirty();
+ m_tilemap[1][1]->mark_all_dirty();
+ m_tilemap[1][2]->mark_all_dirty();
+ m_tilemap[1][3]->mark_all_dirty();
}
@@ -278,33 +260,31 @@ INLINE void fromancr_vram_w(running_machine &machine, offs_t offset, UINT16 data
state->m_tilemap[vram][layer]->mark_tile_dirty(offset & 0x0fff);
}
-WRITE16_HANDLER( fromancr_videoram_0_w ) { fromancr_vram_w(space->machine(), offset, data, mem_mask, 1); }
-WRITE16_HANDLER( fromancr_videoram_1_w ) { fromancr_vram_w(space->machine(), offset, data, mem_mask, 0); }
-WRITE16_HANDLER( fromancr_videoram_2_w ) { fromancr_vram_w(space->machine(), offset, data, mem_mask, 2); }
+WRITE16_MEMBER(fromanc2_state::fromancr_videoram_0_w){ fromancr_vram_w(machine(), offset, data, mem_mask, 1); }
+WRITE16_MEMBER(fromanc2_state::fromancr_videoram_1_w){ fromancr_vram_w(machine(), offset, data, mem_mask, 0); }
+WRITE16_MEMBER(fromanc2_state::fromancr_videoram_2_w){ fromancr_vram_w(machine(), offset, data, mem_mask, 2); }
-WRITE16_HANDLER( fromancr_gfxreg_0_w )
+WRITE16_MEMBER(fromanc2_state::fromancr_gfxreg_0_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
switch (offset)
{
- case 0x00: state->m_scrollx[0][0] = -(data - 0x1bf); break;
- case 0x01: state->m_scrolly[0][0] = -(data - 0x1ef); break;
- case 0x02: state->m_scrollx[1][0] = -(data - 0x1c3); break;
- case 0x03: state->m_scrolly[1][0] = -(data - 0x1ef); break;
+ case 0x00: m_scrollx[0][0] = -(data - 0x1bf); break;
+ case 0x01: m_scrolly[0][0] = -(data - 0x1ef); break;
+ case 0x02: m_scrollx[1][0] = -(data - 0x1c3); break;
+ case 0x03: m_scrolly[1][0] = -(data - 0x1ef); break;
// offset 0x04 - 0x11 unknown
default: break;
}
}
-WRITE16_HANDLER( fromancr_gfxreg_1_w )
+WRITE16_MEMBER(fromanc2_state::fromancr_gfxreg_1_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
switch (offset)
{
- case 0x00: state->m_scrollx[0][1] = -(data - 0x000); break;
- case 0x01: state->m_scrolly[0][1] = -(data - 0x000); break;
- case 0x02: state->m_scrollx[1][1] = -(data - 0x004); break;
- case 0x03: state->m_scrolly[1][1] = -(data - 0x000); break;
+ case 0x00: m_scrollx[0][1] = -(data - 0x000); break;
+ case 0x01: m_scrolly[0][1] = -(data - 0x000); break;
+ case 0x02: m_scrollx[1][1] = -(data - 0x004); break;
+ case 0x03: m_scrolly[1][1] = -(data - 0x000); break;
// offset 0x04 - 0x11 unknown
default: break;
}
@@ -334,61 +314,58 @@ INLINE void fromanc4_vram_w( running_machine &machine, offs_t offset, UINT16 dat
state->m_tilemap[vram][layer]->mark_tile_dirty(offset & 0x3fff);
}
-WRITE16_HANDLER( fromanc4_videoram_0_w ) { fromanc4_vram_w(space->machine(), offset, data, mem_mask, 2); }
-WRITE16_HANDLER( fromanc4_videoram_1_w ) { fromanc4_vram_w(space->machine(), offset, data, mem_mask, 1); }
-WRITE16_HANDLER( fromanc4_videoram_2_w ) { fromanc4_vram_w(space->machine(), offset, data, mem_mask, 0); }
+WRITE16_MEMBER(fromanc2_state::fromanc4_videoram_0_w){ fromanc4_vram_w(machine(), offset, data, mem_mask, 2); }
+WRITE16_MEMBER(fromanc2_state::fromanc4_videoram_1_w){ fromanc4_vram_w(machine(), offset, data, mem_mask, 1); }
+WRITE16_MEMBER(fromanc2_state::fromanc4_videoram_2_w){ fromanc4_vram_w(machine(), offset, data, mem_mask, 0); }
-WRITE16_HANDLER( fromanc4_gfxreg_0_w )
+WRITE16_MEMBER(fromanc2_state::fromanc4_gfxreg_0_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
switch (offset)
{
- case 0x00: state->m_scrollx[0][2] = -(data - 0xfbb); break;
- case 0x01: state->m_scrolly[0][2] = -(data - 0x1e4); break;
- case 0x02: state->m_scrollx[1][2] = -(data - 0xfbb); break;
- case 0x03: state->m_scrolly[1][2] = -(data - 0x1e4); break;
- case 0x05: state->m_gfxbank[0][2] = (data & 0x000f) >> 0;
- state->m_gfxbank[1][2] = (data & 0x0f00) >> 8;
- state->m_tilemap[0][2]->mark_all_dirty();
- state->m_tilemap[1][2]->mark_all_dirty();
+ case 0x00: m_scrollx[0][2] = -(data - 0xfbb); break;
+ case 0x01: m_scrolly[0][2] = -(data - 0x1e4); break;
+ case 0x02: m_scrollx[1][2] = -(data - 0xfbb); break;
+ case 0x03: m_scrolly[1][2] = -(data - 0x1e4); break;
+ case 0x05: m_gfxbank[0][2] = (data & 0x000f) >> 0;
+ m_gfxbank[1][2] = (data & 0x0f00) >> 8;
+ m_tilemap[0][2]->mark_all_dirty();
+ m_tilemap[1][2]->mark_all_dirty();
break;
// offset 0x04, 0x06 - 0x11 unknown
default: break;
}
}
-WRITE16_HANDLER( fromanc4_gfxreg_1_w )
+WRITE16_MEMBER(fromanc2_state::fromanc4_gfxreg_1_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
switch (offset)
{
- case 0x00: state->m_scrollx[0][1] = -(data - 0xfba); break;
- case 0x01: state->m_scrolly[0][1] = -(data - 0x1e4); break;
- case 0x02: state->m_scrollx[1][1] = -(data - 0xfba); break;
- case 0x03: state->m_scrolly[1][1] = -(data - 0x1e4); break;
- case 0x05: state->m_gfxbank[0][1] = (data & 0x000f) >> 0;
- state->m_gfxbank[1][1] = (data & 0x0f00) >> 8;
- state->m_tilemap[0][1]->mark_all_dirty();
- state->m_tilemap[1][1]->mark_all_dirty();
+ case 0x00: m_scrollx[0][1] = -(data - 0xfba); break;
+ case 0x01: m_scrolly[0][1] = -(data - 0x1e4); break;
+ case 0x02: m_scrollx[1][1] = -(data - 0xfba); break;
+ case 0x03: m_scrolly[1][1] = -(data - 0x1e4); break;
+ case 0x05: m_gfxbank[0][1] = (data & 0x000f) >> 0;
+ m_gfxbank[1][1] = (data & 0x0f00) >> 8;
+ m_tilemap[0][1]->mark_all_dirty();
+ m_tilemap[1][1]->mark_all_dirty();
break;
// offset 0x04, 0x06 - 0x11 unknown
default: break;
}
}
-WRITE16_HANDLER( fromanc4_gfxreg_2_w )
+WRITE16_MEMBER(fromanc2_state::fromanc4_gfxreg_2_w)
{
- fromanc2_state *state = space->machine().driver_data<fromanc2_state>();
switch (offset)
{
- case 0x00: state->m_scrollx[0][0] = -(data - 0xfbb); break;
- case 0x01: state->m_scrolly[0][0] = -(data - 0x1e4); break;
- case 0x02: state->m_scrollx[1][0] = -(data - 0xfbb); break;
- case 0x03: state->m_scrolly[1][0] = -(data - 0x1e4); break;
- case 0x05: state->m_gfxbank[0][0] = (data & 0x000f) >> 0;
- state->m_gfxbank[1][0] = (data & 0x0f00) >> 8;
- state->m_tilemap[0][0]->mark_all_dirty();
- state->m_tilemap[1][0]->mark_all_dirty();
+ case 0x00: m_scrollx[0][0] = -(data - 0xfbb); break;
+ case 0x01: m_scrolly[0][0] = -(data - 0x1e4); break;
+ case 0x02: m_scrollx[1][0] = -(data - 0xfbb); break;
+ case 0x03: m_scrolly[1][0] = -(data - 0x1e4); break;
+ case 0x05: m_gfxbank[0][0] = (data & 0x000f) >> 0;
+ m_gfxbank[1][0] = (data & 0x0f00) >> 8;
+ m_tilemap[0][0]->mark_all_dirty();
+ m_tilemap[1][0]->mark_all_dirty();
break;
// offset 0x04, 0x06 - 0x11 unknown
default: break;
diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c
index 51620b3ccbe..0a6f2078b37 100644
--- a/src/mame/video/fromance.c
+++ b/src/mame/video/fromance.c
@@ -134,19 +134,18 @@ VIDEO_START( hatris )
*
*************************************/
-WRITE8_HANDLER( fromance_gfxreg_w )
+WRITE8_MEMBER(fromance_state::fromance_gfxreg_w)
{
- fromance_state *state = space->machine().driver_data<fromance_state>();
- state->m_gfxreg = data;
- state->m_flipscreen = (data & 0x01);
- state->m_selected_videoram = (~data >> 1) & 1;
- state->m_selected_paletteram = (data >> 6) & 1;
+ m_gfxreg = data;
+ m_flipscreen = (data & 0x01);
+ m_selected_videoram = (~data >> 1) & 1;
+ m_selected_paletteram = (data >> 6) & 1;
- if (state->m_flipscreen != state->m_flipscreen_old)
+ if (m_flipscreen != m_flipscreen_old)
{
- state->m_flipscreen_old = state->m_flipscreen;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ m_flipscreen_old = m_flipscreen;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
}
}
@@ -158,28 +157,26 @@ WRITE8_HANDLER( fromance_gfxreg_w )
*
*************************************/
-READ8_HANDLER( fromance_paletteram_r )
+READ8_MEMBER(fromance_state::fromance_paletteram_r)
{
- fromance_state *state = space->machine().driver_data<fromance_state>();
/* adjust for banking and read */
- offset |= state->m_selected_paletteram << 11;
- return state->m_local_paletteram[offset];
+ offset |= m_selected_paletteram << 11;
+ return m_local_paletteram[offset];
}
-WRITE8_HANDLER( fromance_paletteram_w )
+WRITE8_MEMBER(fromance_state::fromance_paletteram_w)
{
- fromance_state *state = space->machine().driver_data<fromance_state>();
int palword;
/* adjust for banking and modify */
- offset |= state->m_selected_paletteram << 11;
- state->m_local_paletteram[offset] = data;
+ offset |= m_selected_paletteram << 11;
+ m_local_paletteram[offset] = data;
/* compute R,G,B */
- palword = (state->m_local_paletteram[offset | 1] << 8) | state->m_local_paletteram[offset & ~1];
- palette_set_color_rgb(space->machine(), offset / 2, pal5bit(palword >> 10), pal5bit(palword >> 5), pal5bit(palword >> 0));
+ palword = (m_local_paletteram[offset | 1] << 8) | m_local_paletteram[offset & ~1];
+ palette_set_color_rgb(machine(), offset / 2, pal5bit(palword >> 10), pal5bit(palword >> 5), pal5bit(palword >> 0));
}
@@ -190,18 +187,16 @@ WRITE8_HANDLER( fromance_paletteram_w )
*
*************************************/
-READ8_HANDLER( fromance_videoram_r )
+READ8_MEMBER(fromance_state::fromance_videoram_r)
{
- fromance_state *state = space->machine().driver_data<fromance_state>();
- return state->m_local_videoram[state->m_selected_videoram][offset];
+ return m_local_videoram[m_selected_videoram][offset];
}
-WRITE8_HANDLER( fromance_videoram_w )
+WRITE8_MEMBER(fromance_state::fromance_videoram_w)
{
- fromance_state *state = space->machine().driver_data<fromance_state>();
- state->m_local_videoram[state->m_selected_videoram][offset] = data;
- (state->m_selected_videoram ? state->m_fg_tilemap : state->m_bg_tilemap)->mark_tile_dirty(offset & 0x0fff);
+ m_local_videoram[m_selected_videoram][offset] = data;
+ (m_selected_videoram ? m_fg_tilemap : m_bg_tilemap)->mark_tile_dirty(offset & 0x0fff);
}
@@ -212,24 +207,23 @@ WRITE8_HANDLER( fromance_videoram_w )
*
*************************************/
-WRITE8_HANDLER( fromance_scroll_w )
+WRITE8_MEMBER(fromance_state::fromance_scroll_w)
{
- fromance_state *state = space->machine().driver_data<fromance_state>();
- if (state->m_flipscreen)
+ if (m_flipscreen)
{
switch (offset)
{
case 0:
- state->m_scrollx[1] = (data + (((state->m_gfxreg & 0x08) >> 3) * 0x100) - state->m_scrollx_ofs);
+ m_scrollx[1] = (data + (((m_gfxreg & 0x08) >> 3) * 0x100) - m_scrollx_ofs);
break;
case 1:
- state->m_scrolly[1] = (data + (((state->m_gfxreg & 0x04) >> 2) * 0x100) - state->m_scrolly_ofs); // - 0x10
+ m_scrolly[1] = (data + (((m_gfxreg & 0x04) >> 2) * 0x100) - m_scrolly_ofs); // - 0x10
break;
case 2:
- state->m_scrollx[0] = (data + (((state->m_gfxreg & 0x20) >> 5) * 0x100) - state->m_scrollx_ofs);
+ m_scrollx[0] = (data + (((m_gfxreg & 0x20) >> 5) * 0x100) - m_scrollx_ofs);
break;
case 3:
- state->m_scrolly[0] = (data + (((state->m_gfxreg & 0x10) >> 4) * 0x100) - state->m_scrolly_ofs);
+ m_scrolly[0] = (data + (((m_gfxreg & 0x10) >> 4) * 0x100) - m_scrolly_ofs);
break;
}
}
@@ -238,16 +232,16 @@ WRITE8_HANDLER( fromance_scroll_w )
switch (offset)
{
case 0:
- state->m_scrollx[1] = (data + (((state->m_gfxreg & 0x08) >> 3) * 0x100) - 0x1f7);
+ m_scrollx[1] = (data + (((m_gfxreg & 0x08) >> 3) * 0x100) - 0x1f7);
break;
case 1:
- state->m_scrolly[1] = (data + (((state->m_gfxreg & 0x04) >> 2) * 0x100) - 0xf9);
+ m_scrolly[1] = (data + (((m_gfxreg & 0x04) >> 2) * 0x100) - 0xf9);
break;
case 2:
- state->m_scrollx[0] = (data + (((state->m_gfxreg & 0x20) >> 5) * 0x100) - 0x1f7);
+ m_scrollx[0] = (data + (((m_gfxreg & 0x20) >> 5) * 0x100) - 0x1f7);
break;
case 3:
- state->m_scrolly[0] = (data + (((state->m_gfxreg & 0x10) >> 4) * 0x100) - 0xf9);
+ m_scrolly[0] = (data + (((m_gfxreg & 0x10) >> 4) * 0x100) - 0xf9);
break;
}
}
@@ -270,29 +264,27 @@ static TIMER_CALLBACK( crtc_interrupt_gen )
}
-WRITE8_HANDLER( fromance_crtc_data_w )
+WRITE8_MEMBER(fromance_state::fromance_crtc_data_w)
{
- fromance_state *state = space->machine().driver_data<fromance_state>();
- state->m_crtc_data[state->m_crtc_register] = data;
+ m_crtc_data[m_crtc_register] = data;
- switch (state->m_crtc_register)
+ switch (m_crtc_register)
{
/* only register we know about.... */
case 0x0b:
- state->m_crtc_timer->adjust(space->machine().primary_screen->time_until_vblank_start(), (data > 0x80) ? 2 : 1);
+ m_crtc_timer->adjust(machine().primary_screen->time_until_vblank_start(), (data > 0x80) ? 2 : 1);
break;
default:
- logerror("CRTC register %02X = %02X\n", state->m_crtc_register, data & 0xff);
+ logerror("CRTC register %02X = %02X\n", m_crtc_register, data & 0xff);
break;
}
}
-WRITE8_HANDLER( fromance_crtc_register_w )
+WRITE8_MEMBER(fromance_state::fromance_crtc_register_w)
{
- fromance_state *state = space->machine().driver_data<fromance_state>();
- state->m_crtc_register = data;
+ m_crtc_register = data;
}
diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c
index 530998a28dd..521c3a075c5 100644
--- a/src/mame/video/funkybee.c
+++ b/src/mame/video/funkybee.c
@@ -39,39 +39,35 @@ PALETTE_INIT( funkybee )
}
}
-WRITE8_HANDLER( funkybee_videoram_w )
+WRITE8_MEMBER(funkybee_state::funkybee_videoram_w)
{
- funkybee_state *state = space->machine().driver_data<funkybee_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( funkybee_colorram_w )
+WRITE8_MEMBER(funkybee_state::funkybee_colorram_w)
{
- funkybee_state *state = space->machine().driver_data<funkybee_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( funkybee_gfx_bank_w )
+WRITE8_MEMBER(funkybee_state::funkybee_gfx_bank_w)
{
- funkybee_state *state = space->machine().driver_data<funkybee_state>();
- if (state->m_gfx_bank != (data & 0x01))
+ if (m_gfx_bank != (data & 0x01))
{
- state->m_gfx_bank = data & 0x01;
- space->machine().tilemap().mark_all_dirty();
+ m_gfx_bank = data & 0x01;
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( funkybee_scroll_w )
+WRITE8_MEMBER(funkybee_state::funkybee_scroll_w)
{
- funkybee_state *state = space->machine().driver_data<funkybee_state>();
- state->m_bg_tilemap->set_scrollx(0, flip_screen_get(space->machine()) ? -data : data);
+ m_bg_tilemap->set_scrollx(0, flip_screen_get(machine()) ? -data : data);
}
-WRITE8_HANDLER( funkybee_flipscreen_w )
+WRITE8_MEMBER(funkybee_state::funkybee_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 0x01);
+ flip_screen_set(machine(), data & 0x01);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/funworld.c b/src/mame/video/funworld.c
index 15f5a70bd5b..eb1ec000959 100644
--- a/src/mame/video/funworld.c
+++ b/src/mame/video/funworld.c
@@ -142,18 +142,16 @@ PALETTE_INIT(funworld)
}
-WRITE8_HANDLER( funworld_videoram_w )
+WRITE8_MEMBER(funworld_state::funworld_videoram_w)
{
- funworld_state *state = space->machine().driver_data<funworld_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( funworld_colorram_w )
+WRITE8_MEMBER(funworld_state::funworld_colorram_w)
{
- funworld_state *state = space->machine().driver_data<funworld_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/funybubl.c b/src/mame/video/funybubl.c
index 64b00006277..4c548561f7b 100644
--- a/src/mame/video/funybubl.c
+++ b/src/mame/video/funybubl.c
@@ -9,18 +9,17 @@ todo - convert to tilemap
#include "includes/funybubl.h"
-WRITE8_HANDLER ( funybubl_paldatawrite )
+WRITE8_MEMBER(funybubl_state::funybubl_paldatawrite)
{
- funybubl_state *state = space->machine().driver_data<funybubl_state>();
int colchanged ;
UINT32 coldat;
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
colchanged = offset >> 2;
- coldat = state->m_paletteram[colchanged * 4] | (state->m_paletteram[colchanged * 4 + 1] << 8) |
- (state->m_paletteram[colchanged * 4 + 2] << 16) | (state->m_paletteram[colchanged * 4 + 3] << 24);
+ coldat = m_paletteram[colchanged * 4] | (m_paletteram[colchanged * 4 + 1] << 8) |
+ (m_paletteram[colchanged * 4 + 2] << 16) | (m_paletteram[colchanged * 4 + 3] << 24);
- palette_set_color_rgb(space->machine(), colchanged, pal6bit(coldat >> 12), pal6bit(coldat >> 0), pal6bit(coldat >> 6));
+ palette_set_color_rgb(machine(), colchanged, pal6bit(coldat >> 12), pal6bit(coldat >> 0), pal6bit(coldat >> 6));
}
diff --git a/src/mame/video/fuukifg2.c b/src/mame/video/fuukifg2.c
index cfd3f334554..36162d76911 100644
--- a/src/mame/video/fuukifg2.c
+++ b/src/mame/video/fuukifg2.c
@@ -64,10 +64,10 @@ INLINE void fuuki16_vram_w(address_space *space, offs_t offset, UINT16 data, UIN
state->m_tilemap[_N_]->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( fuuki16_vram_0_w ) { fuuki16_vram_w(space, offset, data, mem_mask, 0); }
-WRITE16_HANDLER( fuuki16_vram_1_w ) { fuuki16_vram_w(space, offset, data, mem_mask, 1); }
-WRITE16_HANDLER( fuuki16_vram_2_w ) { fuuki16_vram_w(space, offset, data, mem_mask, 2); }
-WRITE16_HANDLER( fuuki16_vram_3_w ) { fuuki16_vram_w(space, offset, data, mem_mask, 3); }
+WRITE16_MEMBER(fuuki16_state::fuuki16_vram_0_w){ fuuki16_vram_w(&space, offset, data, mem_mask, 0); }
+WRITE16_MEMBER(fuuki16_state::fuuki16_vram_1_w){ fuuki16_vram_w(&space, offset, data, mem_mask, 1); }
+WRITE16_MEMBER(fuuki16_state::fuuki16_vram_2_w){ fuuki16_vram_w(&space, offset, data, mem_mask, 2); }
+WRITE16_MEMBER(fuuki16_state::fuuki16_vram_3_w){ fuuki16_vram_w(&space, offset, data, mem_mask, 3); }
/***************************************************************************
diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c
index 187d5eb0ca7..f1cbfb6b5b3 100644
--- a/src/mame/video/fuukifg3.c
+++ b/src/mame/video/fuukifg3.c
@@ -77,10 +77,10 @@ INLINE void fuuki32_vram_w(address_space *space, offs_t offset, UINT32 data, UIN
state->m_tilemap[_N_]->mark_tile_dirty(offset);
}
-WRITE32_HANDLER( fuuki32_vram_0_w ) { fuuki32_vram_w(space, offset, data, mem_mask, 0); }
-WRITE32_HANDLER( fuuki32_vram_1_w ) { fuuki32_vram_w(space, offset, data, mem_mask, 1); }
-WRITE32_HANDLER( fuuki32_vram_2_w ) { fuuki32_vram_w(space, offset, data, mem_mask, 2); }
-WRITE32_HANDLER( fuuki32_vram_3_w ) { fuuki32_vram_w(space, offset, data, mem_mask, 3); }
+WRITE32_MEMBER(fuuki32_state::fuuki32_vram_0_w){ fuuki32_vram_w(&space, offset, data, mem_mask, 0); }
+WRITE32_MEMBER(fuuki32_state::fuuki32_vram_1_w){ fuuki32_vram_w(&space, offset, data, mem_mask, 1); }
+WRITE32_MEMBER(fuuki32_state::fuuki32_vram_2_w){ fuuki32_vram_w(&space, offset, data, mem_mask, 2); }
+WRITE32_MEMBER(fuuki32_state::fuuki32_vram_3_w){ fuuki32_vram_w(&space, offset, data, mem_mask, 3); }
/***************************************************************************
diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c
index 72ef6cff708..e80b5d97076 100644
--- a/src/mame/video/gaelco.c
+++ b/src/mame/video/gaelco.c
@@ -62,11 +62,10 @@ static TILE_GET_INFO( get_tile_info_gaelco_screen1 )
***************************************************************************/
-WRITE16_HANDLER( gaelco_vram_w )
+WRITE16_MEMBER(gaelco_state::gaelco_vram_w)
{
- gaelco_state *state = space->machine().driver_data<gaelco_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_tilemap[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 2);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_tilemap[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 2);
}
/***************************************************************************
diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c
index e0d7f58b6db..e797cdbbe4d 100644
--- a/src/mame/video/gaelco2.c
+++ b/src/mame/video/gaelco2.c
@@ -171,24 +171,23 @@ static TILE_GET_INFO( get_tile_info_gaelco2_screen1_dual )
***************************************************************************/
-WRITE16_HANDLER( gaelco2_vram_w )
+WRITE16_MEMBER(gaelco2_state::gaelco2_vram_w)
{
- gaelco2_state *state = space->machine().driver_data<gaelco2_state>();
- int pant0_start = ((state->m_vregs[0] >> 9) & 0x07)*0x1000;
+ int pant0_start = ((m_vregs[0] >> 9) & 0x07)*0x1000;
int pant0_end = pant0_start + 0x1000;
- int pant1_start = ((state->m_vregs[1] >> 9) & 0x07)*0x1000;
+ int pant1_start = ((m_vregs[1] >> 9) & 0x07)*0x1000;
int pant1_end = pant1_start + 0x1000;
- COMBINE_DATA(&state->m_videoram[offset]);
+ COMBINE_DATA(&m_videoram[offset]);
/* tilemap 0 writes */
if ((offset >= pant0_start) && (offset < pant0_end)){
- state->m_pant[0]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2);
+ m_pant[0]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2);
}
/* tilemap 1 writes */
if ((offset >= pant1_start) && (offset < pant1_end)){
- state->m_pant[1]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2);
+ m_pant[1]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2);
}
}
@@ -222,13 +221,12 @@ static const int pen_color_adjust[16] = {
};
-WRITE16_HANDLER( gaelco2_palette_w )
+WRITE16_MEMBER(gaelco2_state::gaelco2_palette_w)
{
- gaelco2_state *state = space->machine().driver_data<gaelco2_state>();
int i, color, r, g, b, auxr, auxg, auxb;
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- color = state->m_generic_paletteram_16[offset];
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ color = m_generic_paletteram_16[offset];
/* extract RGB components */
r = (color >> 10) & 0x1f;
@@ -240,7 +238,7 @@ WRITE16_HANDLER( gaelco2_palette_w )
b = pal5bit(b);
/* update game palette */
- palette_set_color(space->machine(), 4096*0 + offset, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), 4096*0 + offset, MAKE_RGB(r, g, b));
/* update shadow/highligh palettes */
for (i = 1; i < 16; i++){
@@ -252,7 +250,7 @@ WRITE16_HANDLER( gaelco2_palette_w )
auxg = ADJUST_COLOR(g + pen_color_adjust[i]);
auxb = ADJUST_COLOR(b + pen_color_adjust[i]);
- palette_set_color(space->machine(), 4096*i + offset, MAKE_RGB(auxr, auxg, auxb));
+ palette_set_color(machine(), 4096*i + offset, MAKE_RGB(auxr, auxg, auxb));
}
}
diff --git a/src/mame/video/gaelco3d.c b/src/mame/video/gaelco3d.c
index 24f5b2cea59..4aa0ab56654 100644
--- a/src/mame/video/gaelco3d.c
+++ b/src/mame/video/gaelco3d.c
@@ -373,27 +373,26 @@ void gaelco3d_render(screen_device &screen)
*
*************************************/
-WRITE32_HANDLER( gaelco3d_render_w )
+WRITE32_MEMBER(gaelco3d_state::gaelco3d_render_w)
{
- gaelco3d_state *state = space->machine().driver_data<gaelco3d_state>();
/* append the data to our buffer */
- state->m_polydata_buffer[state->m_polydata_count++] = data;
- if (state->m_polydata_count >= MAX_POLYDATA)
- fatalerror("Out of polygon buffer space!");
+ m_polydata_buffer[m_polydata_count++] = data;
+ if (m_polydata_count >= MAX_POLYDATA)
+ fatalerror("Out of polygon buffer &space!");
/* if we've accumulated a completed poly set of data, queue it */
- if (!space->machine().video().skip_this_frame())
+ if (!machine().video().skip_this_frame())
{
- if (state->m_polydata_count >= 18 && (state->m_polydata_count % 2) == 1 && IS_POLYEND(state->m_polydata_buffer[state->m_polydata_count - 2]))
+ if (m_polydata_count >= 18 && (m_polydata_count % 2) == 1 && IS_POLYEND(m_polydata_buffer[m_polydata_count - 2]))
{
- state->m_poly->render_poly(*space->machine().primary_screen, &state->m_polydata_buffer[0]);
- state->m_polydata_count = 0;
+ m_poly->render_poly(*machine().primary_screen, &m_polydata_buffer[0]);
+ m_polydata_count = 0;
}
- state->m_video_changed = TRUE;
+ m_video_changed = TRUE;
}
#if DISPLAY_STATS
- state->m_lastscan = space->machine().primary_screen->vpos();
+ m_lastscan = machine().primary_screen->vpos();
#endif
}
@@ -405,22 +404,20 @@ WRITE32_HANDLER( gaelco3d_render_w )
*
*************************************/
-WRITE16_HANDLER( gaelco3d_paletteram_w )
+WRITE16_MEMBER(gaelco3d_state::gaelco3d_paletteram_w)
{
- gaelco3d_state *state = space->machine().driver_data<gaelco3d_state>();
- state->m_poly->wait("Palette change");
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- state->m_palette[offset] = ((state->m_generic_paletteram_16[offset] & 0x7fe0) << 6) | (state->m_generic_paletteram_16[offset] & 0x1f);
+ m_poly->wait("Palette change");
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ m_palette[offset] = ((m_generic_paletteram_16[offset] & 0x7fe0) << 6) | (m_generic_paletteram_16[offset] & 0x1f);
}
-WRITE32_HANDLER( gaelco3d_paletteram_020_w )
+WRITE32_MEMBER(gaelco3d_state::gaelco3d_paletteram_020_w)
{
- gaelco3d_state *state = space->machine().driver_data<gaelco3d_state>();
- state->m_poly->wait("Palette change");
- COMBINE_DATA(&state->m_generic_paletteram_32[offset]);
- state->m_palette[offset*2+0] = ((state->m_generic_paletteram_32[offset] & 0x7fe00000) >> 10) | ((state->m_generic_paletteram_32[offset] & 0x1f0000) >> 16);
- state->m_palette[offset*2+1] = ((state->m_generic_paletteram_32[offset] & 0x7fe0) << 6) | (state->m_generic_paletteram_32[offset] & 0x1f);
+ m_poly->wait("Palette change");
+ COMBINE_DATA(&m_generic_paletteram_32[offset]);
+ m_palette[offset*2+0] = ((m_generic_paletteram_32[offset] & 0x7fe00000) >> 10) | ((m_generic_paletteram_32[offset] & 0x1f0000) >> 16);
+ m_palette[offset*2+1] = ((m_generic_paletteram_32[offset] & 0x7fe0) << 6) | (m_generic_paletteram_32[offset] & 0x1f);
}
diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c
index a1712693c18..a7a972c163f 100644
--- a/src/mame/video/gaiden.c
+++ b/src/mame/video/gaiden.c
@@ -167,126 +167,111 @@ VIDEO_START( drgnbowl )
***************************************************************************/
-WRITE16_HANDLER( gaiden_flip_w )
+WRITE16_MEMBER(gaiden_state::gaiden_flip_w)
{
if (ACCESSING_BITS_0_7)
- flip_screen_set(space->machine(), data & 1);
+ flip_screen_set(machine(), data & 1);
}
-WRITE16_HANDLER( gaiden_txscrollx_w )
+WRITE16_MEMBER(gaiden_state::gaiden_txscrollx_w)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
- COMBINE_DATA(&state->m_tx_scroll_x);
- state->m_text_layer->set_scrollx(0, state->m_tx_scroll_x);
+ COMBINE_DATA(&m_tx_scroll_x);
+ m_text_layer->set_scrollx(0, m_tx_scroll_x);
}
-WRITE16_HANDLER( gaiden_txscrolly_w )
+WRITE16_MEMBER(gaiden_state::gaiden_txscrolly_w)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
- COMBINE_DATA(&state->m_tx_scroll_y);
- state->m_text_layer->set_scrolly(0, (state->m_tx_scroll_y - state->m_tx_offset_y) & 0xffff);
+ COMBINE_DATA(&m_tx_scroll_y);
+ m_text_layer->set_scrolly(0, (m_tx_scroll_y - m_tx_offset_y) & 0xffff);
}
-WRITE16_HANDLER( gaiden_fgscrollx_w )
+WRITE16_MEMBER(gaiden_state::gaiden_fgscrollx_w)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
- COMBINE_DATA(&state->m_fg_scroll_x);
- state->m_foreground->set_scrollx(0, state->m_fg_scroll_x);
+ COMBINE_DATA(&m_fg_scroll_x);
+ m_foreground->set_scrollx(0, m_fg_scroll_x);
}
-WRITE16_HANDLER( gaiden_fgscrolly_w )
+WRITE16_MEMBER(gaiden_state::gaiden_fgscrolly_w)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
- COMBINE_DATA(&state->m_fg_scroll_y);
- state->m_foreground->set_scrolly(0, (state->m_fg_scroll_y - state->m_fg_offset_y) & 0xffff);
+ COMBINE_DATA(&m_fg_scroll_y);
+ m_foreground->set_scrolly(0, (m_fg_scroll_y - m_fg_offset_y) & 0xffff);
}
-WRITE16_HANDLER( gaiden_bgscrollx_w )
+WRITE16_MEMBER(gaiden_state::gaiden_bgscrollx_w)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
- COMBINE_DATA(&state->m_bg_scroll_x);
- state->m_background->set_scrollx(0, state->m_bg_scroll_x);
+ COMBINE_DATA(&m_bg_scroll_x);
+ m_background->set_scrollx(0, m_bg_scroll_x);
}
-WRITE16_HANDLER( gaiden_bgscrolly_w )
+WRITE16_MEMBER(gaiden_state::gaiden_bgscrolly_w)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
- COMBINE_DATA(&state->m_bg_scroll_y);
- state->m_background->set_scrolly(0, (state->m_bg_scroll_y - state->m_bg_offset_y) & 0xffff);
+ COMBINE_DATA(&m_bg_scroll_y);
+ m_background->set_scrolly(0, (m_bg_scroll_y - m_bg_offset_y) & 0xffff);
}
-WRITE16_HANDLER( gaiden_txoffsety_w )
+WRITE16_MEMBER(gaiden_state::gaiden_txoffsety_w)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
if (ACCESSING_BITS_0_7) {
- state->m_tx_offset_y = data;
- state->m_text_layer->set_scrolly(0, (state->m_tx_scroll_y - state->m_tx_offset_y) & 0xffff);
+ m_tx_offset_y = data;
+ m_text_layer->set_scrolly(0, (m_tx_scroll_y - m_tx_offset_y) & 0xffff);
}
}
-WRITE16_HANDLER( gaiden_fgoffsety_w )
+WRITE16_MEMBER(gaiden_state::gaiden_fgoffsety_w)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
if (ACCESSING_BITS_0_7) {
- state->m_fg_offset_y = data;
- state->m_foreground->set_scrolly(0, (state->m_fg_scroll_y - state->m_fg_offset_y) & 0xffff);
+ m_fg_offset_y = data;
+ m_foreground->set_scrolly(0, (m_fg_scroll_y - m_fg_offset_y) & 0xffff);
}
}
-WRITE16_HANDLER( gaiden_bgoffsety_w )
+WRITE16_MEMBER(gaiden_state::gaiden_bgoffsety_w)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
if (ACCESSING_BITS_0_7) {
- state->m_bg_offset_y = data;
- state->m_background->set_scrolly(0, (state->m_bg_scroll_y - state->m_bg_offset_y) & 0xffff);
+ m_bg_offset_y = data;
+ m_background->set_scrolly(0, (m_bg_scroll_y - m_bg_offset_y) & 0xffff);
}
}
-WRITE16_HANDLER( gaiden_sproffsety_w )
+WRITE16_MEMBER(gaiden_state::gaiden_sproffsety_w)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
if (ACCESSING_BITS_0_7) {
- state->m_spr_offset_y = data;
+ m_spr_offset_y = data;
// handled in draw_sprites
}
}
-WRITE16_HANDLER( gaiden_videoram3_w )
+WRITE16_MEMBER(gaiden_state::gaiden_videoram3_w)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
- COMBINE_DATA(&state->m_videoram3[offset]);
- state->m_background->mark_tile_dirty(offset & 0x07ff);
+ COMBINE_DATA(&m_videoram3[offset]);
+ m_background->mark_tile_dirty(offset & 0x07ff);
}
-READ16_HANDLER( gaiden_videoram3_r )
+READ16_MEMBER(gaiden_state::gaiden_videoram3_r)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
- return state->m_videoram3[offset];
+ return m_videoram3[offset];
}
-WRITE16_HANDLER( gaiden_videoram2_w )
+WRITE16_MEMBER(gaiden_state::gaiden_videoram2_w)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
- COMBINE_DATA(&state->m_videoram2[offset]);
- state->m_foreground->mark_tile_dirty(offset & 0x07ff);
+ COMBINE_DATA(&m_videoram2[offset]);
+ m_foreground->mark_tile_dirty(offset & 0x07ff);
}
-READ16_HANDLER( gaiden_videoram2_r )
+READ16_MEMBER(gaiden_state::gaiden_videoram2_r)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
- return state->m_videoram2[offset];
+ return m_videoram2[offset];
}
-WRITE16_HANDLER( gaiden_videoram_w )
+WRITE16_MEMBER(gaiden_state::gaiden_videoram_w)
{
- gaiden_state *state = space->machine().driver_data<gaiden_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_text_layer->mark_tile_dirty(offset & 0x03ff);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_text_layer->mark_tile_dirty(offset & 0x03ff);
}
diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c
index 9eca8629099..5829ad87186 100644
--- a/src/mame/video/galaga.c
+++ b/src/mame/video/galaga.c
@@ -452,20 +452,18 @@ VIDEO_START( galaga )
***************************************************************************/
-WRITE8_HANDLER( galaga_videoram_w )
+WRITE8_MEMBER(galaga_state::galaga_videoram_w)
{
- galaga_state *state = space->machine().driver_data<galaga_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER ( gatsbee_bank_w )
+WRITE8_MEMBER(galaga_state::gatsbee_bank_w)
{
- galaga_state *state = space->machine().driver_data<galaga_state>();
- state->m_galaga_gfxbank = data & 0x1;
- state->m_fg_tilemap->mark_all_dirty();
+ m_galaga_gfxbank = data & 0x1;
+ m_fg_tilemap->mark_all_dirty();
}
diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c
index 88ec22e5ffb..2fa2ab11ae3 100644
--- a/src/mame/video/galaxian.c
+++ b/src/mame/video/galaxian.c
@@ -497,27 +497,25 @@ static TILE_GET_INFO( bg_get_tile_info )
}
-WRITE8_HANDLER( galaxian_videoram_w )
+WRITE8_MEMBER(galaxian_state::galaxian_videoram_w)
{
- galaxian_state *state = space->machine().driver_data<galaxian_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
/* update any video up to the current scanline */
- space->machine().primary_screen->update_now();
+ machine().primary_screen->update_now();
/* store the data and mark the corresponding tile dirty */
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( galaxian_objram_w )
+WRITE8_MEMBER(galaxian_state::galaxian_objram_w)
{
- galaxian_state *state = space->machine().driver_data<galaxian_state>();
/* update any video up to the current scanline */
- space->machine().primary_screen->update_now();
+ machine().primary_screen->update_now();
/* store the data */
- state->m_spriteram[offset] = data;
+ m_spriteram[offset] = data;
/* the first $40 bytes affect the tilemap */
if (offset < 0x40)
@@ -526,19 +524,19 @@ WRITE8_HANDLER( galaxian_objram_w )
if ((offset & 0x01) == 0)
{
/* Frogger: top and bottom 4 bits swapped entering the adder */
- if (state->m_frogger_adjust)
+ if (m_frogger_adjust)
data = (data >> 4) | (data << 4);
- if (!state->m_sfx_tilemap)
- state->m_bg_tilemap->set_scrolly(offset >> 1, data);
+ if (!m_sfx_tilemap)
+ m_bg_tilemap->set_scrolly(offset >> 1, data);
else
- state->m_bg_tilemap->set_scrollx(offset >> 1, GALAXIAN_XSCALE*data);
+ m_bg_tilemap->set_scrollx(offset >> 1, GALAXIAN_XSCALE*data);
}
/* odd entries control the color base for the row */
else
{
for (offset >>= 1; offset < 0x0400; offset += 32)
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
}
}
@@ -659,35 +657,33 @@ static void bullets_draw(running_machine &machine, bitmap_rgb32 &bitmap, const r
*
*************************************/
-WRITE8_HANDLER( galaxian_flip_screen_x_w )
+WRITE8_MEMBER(galaxian_state::galaxian_flip_screen_x_w)
{
- galaxian_state *state = space->machine().driver_data<galaxian_state>();
- if (state->m_flipscreen_x != (data & 0x01))
+ if (m_flipscreen_x != (data & 0x01))
{
- space->machine().primary_screen->update_now();
+ machine().primary_screen->update_now();
/* when the direction changes, we count a different number of clocks */
/* per frame, so we need to reset the origin of the stars to the current */
/* frame before we flip */
- stars_update_origin(space->machine());
+ stars_update_origin(machine());
- state->m_flipscreen_x = data & 0x01;
- state->m_bg_tilemap->set_flip((state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0));
+ m_flipscreen_x = data & 0x01;
+ m_bg_tilemap->set_flip((m_flipscreen_x ? TILEMAP_FLIPX : 0) | (m_flipscreen_y ? TILEMAP_FLIPY : 0));
}
}
-WRITE8_HANDLER( galaxian_flip_screen_y_w )
+WRITE8_MEMBER(galaxian_state::galaxian_flip_screen_y_w)
{
- galaxian_state *state = space->machine().driver_data<galaxian_state>();
- if (state->m_flipscreen_y != (data & 0x01))
+ if (m_flipscreen_y != (data & 0x01))
{
- space->machine().primary_screen->update_now();
- state->m_flipscreen_y = data & 0x01;
- state->m_bg_tilemap->set_flip((state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0));
+ machine().primary_screen->update_now();
+ m_flipscreen_y = data & 0x01;
+ m_bg_tilemap->set_flip((m_flipscreen_x ? TILEMAP_FLIPX : 0) | (m_flipscreen_y ? TILEMAP_FLIPY : 0));
}
}
-WRITE8_HANDLER( galaxian_flip_screen_xy_w )
+WRITE8_MEMBER(galaxian_state::galaxian_flip_screen_xy_w)
{
galaxian_flip_screen_x_w(space, offset, data);
galaxian_flip_screen_y_w(space, offset, data);
@@ -701,61 +697,56 @@ WRITE8_HANDLER( galaxian_flip_screen_xy_w )
*
*************************************/
-WRITE8_HANDLER( galaxian_stars_enable_w )
+WRITE8_MEMBER(galaxian_state::galaxian_stars_enable_w)
{
- galaxian_state *state = space->machine().driver_data<galaxian_state>();
- if ((state->m_stars_enabled ^ data) & 0x01)
- space->machine().primary_screen->update_now();
+ if ((m_stars_enabled ^ data) & 0x01)
+ machine().primary_screen->update_now();
- if (!state->m_stars_enabled && (data & 0x01))
+ if (!m_stars_enabled && (data & 0x01))
{
/* on the rising edge of this, the CLR on the shift registers is released */
/* this resets the "origin" of this frame to 0 minus the number of clocks */
/* we have counted so far */
- state->m_star_rng_origin = STAR_RNG_PERIOD - (space->machine().primary_screen->vpos() * 512 + space->machine().primary_screen->hpos());
- state->m_star_rng_origin_frame = space->machine().primary_screen->frame_number();
+ m_star_rng_origin = STAR_RNG_PERIOD - (machine().primary_screen->vpos() * 512 + machine().primary_screen->hpos());
+ m_star_rng_origin_frame = machine().primary_screen->frame_number();
}
- state->m_stars_enabled = data & 0x01;
+ m_stars_enabled = data & 0x01;
}
-WRITE8_HANDLER( scramble_background_enable_w )
+WRITE8_MEMBER(galaxian_state::scramble_background_enable_w)
{
- galaxian_state *state = space->machine().driver_data<galaxian_state>();
- if ((state->m_background_enable ^ data) & 0x01)
- space->machine().primary_screen->update_now();
+ if ((m_background_enable ^ data) & 0x01)
+ machine().primary_screen->update_now();
- state->m_background_enable = data & 0x01;
+ m_background_enable = data & 0x01;
}
-WRITE8_HANDLER( scramble_background_red_w )
+WRITE8_MEMBER(galaxian_state::scramble_background_red_w)
{
- galaxian_state *state = space->machine().driver_data<galaxian_state>();
- if ((state->m_background_red ^ data) & 0x01)
- space->machine().primary_screen->update_now();
+ if ((m_background_red ^ data) & 0x01)
+ machine().primary_screen->update_now();
- state->m_background_red = data & 0x01;
+ m_background_red = data & 0x01;
}
-WRITE8_HANDLER( scramble_background_green_w )
+WRITE8_MEMBER(galaxian_state::scramble_background_green_w)
{
- galaxian_state *state = space->machine().driver_data<galaxian_state>();
- if ((state->m_background_green ^ data) & 0x01)
- space->machine().primary_screen->update_now();
+ if ((m_background_green ^ data) & 0x01)
+ machine().primary_screen->update_now();
- state->m_background_green = data & 0x01;
+ m_background_green = data & 0x01;
}
-WRITE8_HANDLER( scramble_background_blue_w )
+WRITE8_MEMBER(galaxian_state::scramble_background_blue_w)
{
- galaxian_state *state = space->machine().driver_data<galaxian_state>();
- if ((state->m_background_blue ^ data) & 0x01)
- space->machine().primary_screen->update_now();
+ if ((m_background_blue ^ data) & 0x01)
+ machine().primary_screen->update_now();
- state->m_background_blue = data & 0x01;
+ m_background_blue = data & 0x01;
}
@@ -766,14 +757,13 @@ WRITE8_HANDLER( scramble_background_blue_w )
*
*************************************/
-WRITE8_HANDLER( galaxian_gfxbank_w )
+WRITE8_MEMBER(galaxian_state::galaxian_gfxbank_w)
{
- galaxian_state *state = space->machine().driver_data<galaxian_state>();
- if (state->m_gfxbank[offset] != data)
+ if (m_gfxbank[offset] != data)
{
- space->machine().primary_screen->update_now();
- state->m_gfxbank[offset] = data;
- state->m_bg_tilemap->mark_all_dirty();
+ machine().primary_screen->update_now();
+ m_gfxbank[offset] = data;
+ m_bg_tilemap->mark_all_dirty();
}
}
diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c
index 094717f193f..c27205a008e 100644
--- a/src/mame/video/galaxold.c
+++ b/src/mame/video/galaxold.c
@@ -749,11 +749,10 @@ VIDEO_START( ad2083 )
}
-WRITE8_HANDLER( racknrol_tiles_bank_w )
+WRITE8_MEMBER(galaxold_state::racknrol_tiles_bank_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- state->m_racknrol_tiles_bank[offset] = data;
- state->m_bg_tilemap->mark_all_dirty();
+ m_racknrol_tiles_bank[offset] = data;
+ m_bg_tilemap->mark_all_dirty();
}
static TILE_GET_INFO( racknrol_get_tile_info )
@@ -839,24 +838,21 @@ VIDEO_START( dambustr )
}
-WRITE8_HANDLER( galaxold_videoram_w )
+WRITE8_MEMBER(galaxold_state::galaxold_videoram_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-READ8_HANDLER( galaxold_videoram_r )
+READ8_MEMBER(galaxold_state::galaxold_videoram_r)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- return state->m_videoram[offset];
+ return m_videoram[offset];
}
-WRITE8_HANDLER( galaxold_attributesram_w )
+WRITE8_MEMBER(galaxold_state::galaxold_attributesram_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- if (state->m_attributesram[offset] != data)
+ if (m_attributesram[offset] != data)
{
if (offset & 0x01)
{
@@ -864,165 +860,151 @@ WRITE8_HANDLER( galaxold_attributesram_w )
int i;
for (i = offset >> 1; i < 0x0400; i += 32)
- state->m_bg_tilemap->mark_tile_dirty(i);
+ m_bg_tilemap->mark_tile_dirty(i);
}
else
{
- if (state->m_modify_ypos)
+ if (m_modify_ypos)
{
- (*state->m_modify_ypos)(&data);
+ (*m_modify_ypos)(&data);
}
- state->m_bg_tilemap->set_scrolly(offset >> 1, data);
+ m_bg_tilemap->set_scrolly(offset >> 1, data);
}
- state->m_attributesram[offset] = data;
+ m_attributesram[offset] = data;
}
}
-WRITE8_HANDLER( galaxold_flip_screen_x_w )
+WRITE8_MEMBER(galaxold_state::galaxold_flip_screen_x_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- if (state->m_flipscreen_x != (data & 0x01))
+ if (m_flipscreen_x != (data & 0x01))
{
- state->m_flipscreen_x = data & 0x01;
+ m_flipscreen_x = data & 0x01;
- state->m_bg_tilemap->set_flip((state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0));
+ m_bg_tilemap->set_flip((m_flipscreen_x ? TILEMAP_FLIPX : 0) | (m_flipscreen_y ? TILEMAP_FLIPY : 0));
}
}
-WRITE8_HANDLER( galaxold_flip_screen_y_w )
+WRITE8_MEMBER(galaxold_state::galaxold_flip_screen_y_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- if (state->m_flipscreen_y != (data & 0x01))
+ if (m_flipscreen_y != (data & 0x01))
{
- state->m_flipscreen_y = data & 0x01;
+ m_flipscreen_y = data & 0x01;
- state->m_bg_tilemap->set_flip((state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0));
+ m_bg_tilemap->set_flip((m_flipscreen_x ? TILEMAP_FLIPX : 0) | (m_flipscreen_y ? TILEMAP_FLIPY : 0));
}
}
#ifdef UNUSED_FUNCTION
-WRITE8_HANDLER( gteikob2_flip_screen_x_w )
+WRITE8_MEMBER(galaxold_state::gteikob2_flip_screen_x_w)
{
galaxold_flip_screen_x_w(space, offset, ~data);
}
-WRITE8_HANDLER( gteikob2_flip_screen_y_w )
+WRITE8_MEMBER(galaxold_state::gteikob2_flip_screen_y_w)
{
galaxold_flip_screen_y_w(space, offset, ~data);
}
#endif
-WRITE8_HANDLER( hotshock_flip_screen_w )
+WRITE8_MEMBER(galaxold_state::hotshock_flip_screen_w)
{
galaxold_flip_screen_x_w(space, offset, data);
galaxold_flip_screen_y_w(space, offset, data);
}
-WRITE8_HANDLER( scrambold_background_enable_w )
+WRITE8_MEMBER(galaxold_state::scrambold_background_enable_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- state->m_background_enable = data & 0x01;
+ m_background_enable = data & 0x01;
}
-WRITE8_HANDLER( scrambold_background_red_w )
+WRITE8_MEMBER(galaxold_state::scrambold_background_red_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- state->m_background_red = data & 0x01;
+ m_background_red = data & 0x01;
}
-WRITE8_HANDLER( scrambold_background_green_w )
+WRITE8_MEMBER(galaxold_state::scrambold_background_green_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- state->m_background_green = data & 0x01;
+ m_background_green = data & 0x01;
}
-WRITE8_HANDLER( scrambold_background_blue_w )
+WRITE8_MEMBER(galaxold_state::scrambold_background_blue_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- state->m_background_blue = data & 0x01;
+ m_background_blue = data & 0x01;
}
-WRITE8_HANDLER( galaxold_stars_enable_w )
+WRITE8_MEMBER(galaxold_state::galaxold_stars_enable_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- state->m_stars_on = data & 0x01;
+ m_stars_on = data & 0x01;
- if (!state->m_stars_on)
+ if (!m_stars_on)
{
- state->m_stars_scrollpos = 0;
+ m_stars_scrollpos = 0;
}
}
-WRITE8_HANDLER( darkplnt_bullet_color_w )
+WRITE8_MEMBER(galaxold_state::darkplnt_bullet_color_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- state->m_darkplnt_bullet_color = data & 0x01;
+ m_darkplnt_bullet_color = data & 0x01;
}
-WRITE8_HANDLER( galaxold_gfxbank_w )
+WRITE8_MEMBER(galaxold_state::galaxold_gfxbank_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- if (state->m_gfxbank[offset] != data)
+ if (m_gfxbank[offset] != data)
{
- state->m_gfxbank[offset] = data;
+ m_gfxbank[offset] = data;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( rockclim_videoram_w )
+WRITE8_MEMBER(galaxold_state::rockclim_videoram_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- state->m_rockclim_videoram[offset] = data;
- state->m_rockclim_tilemap->mark_tile_dirty(offset);
+ m_rockclim_videoram[offset] = data;
+ m_rockclim_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( rockclim_scroll_w )
+WRITE8_MEMBER(galaxold_state::rockclim_scroll_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
switch(offset&3)
{
- case 0: state->m_rockclim_h=(state->m_rockclim_h&0xff00)|data;state->m_rockclim_tilemap ->set_scrollx(0, state->m_rockclim_h );break;
- case 1: state->m_rockclim_h=(state->m_rockclim_h&0xff)|(data<<8);state->m_rockclim_tilemap ->set_scrollx(0, state->m_rockclim_h );break;
- case 2: state->m_rockclim_v=(state->m_rockclim_v&0xff00)|data;state->m_rockclim_tilemap ->set_scrolly(0, state->m_rockclim_v );break;
- case 3: state->m_rockclim_v=(state->m_rockclim_v&0xff)|(data<<8);state->m_rockclim_tilemap ->set_scrolly(0, state->m_rockclim_v );break;
+ case 0: m_rockclim_h=(m_rockclim_h&0xff00)|data;m_rockclim_tilemap ->set_scrollx(0, m_rockclim_h );break;
+ case 1: m_rockclim_h=(m_rockclim_h&0xff)|(data<<8);m_rockclim_tilemap ->set_scrollx(0, m_rockclim_h );break;
+ case 2: m_rockclim_v=(m_rockclim_v&0xff00)|data;m_rockclim_tilemap ->set_scrolly(0, m_rockclim_v );break;
+ case 3: m_rockclim_v=(m_rockclim_v&0xff)|(data<<8);m_rockclim_tilemap ->set_scrolly(0, m_rockclim_v );break;
}
}
-READ8_HANDLER( rockclim_videoram_r )
+READ8_MEMBER(galaxold_state::rockclim_videoram_r)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- return state->m_rockclim_videoram[offset];
+ return m_rockclim_videoram[offset];
}
-WRITE8_HANDLER( dambustr_bg_split_line_w )
+WRITE8_MEMBER(galaxold_state::dambustr_bg_split_line_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- state->m_dambustr_bg_split_line = data;
+ m_dambustr_bg_split_line = data;
}
-WRITE8_HANDLER( dambustr_bg_color_w )
+WRITE8_MEMBER(galaxold_state::dambustr_bg_color_w)
{
- galaxold_state *state = space->machine().driver_data<galaxold_state>();
- state->m_dambustr_bg_color_1 = (BIT(data,2)<<2) | (BIT(data,1)<<1) | BIT(data,0);
- state->m_dambustr_bg_color_2 = (BIT(data,6)<<2) | (BIT(data,5)<<1) | BIT(data,4);
- state->m_dambustr_bg_priority = BIT(data,3);
- state->m_dambustr_char_bank = BIT(data,7);
- state->m_bg_tilemap->mark_all_dirty();
+ m_dambustr_bg_color_1 = (BIT(data,2)<<2) | (BIT(data,1)<<1) | BIT(data,0);
+ m_dambustr_bg_color_2 = (BIT(data,6)<<2) | (BIT(data,5)<<1) | BIT(data,4);
+ m_dambustr_bg_priority = BIT(data,3);
+ m_dambustr_char_bank = BIT(data,7);
+ m_bg_tilemap->mark_all_dirty();
}
diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c
index 20baf72077d..947465fce69 100644
--- a/src/mame/video/galivan.c
+++ b/src/mame/video/galivan.c
@@ -208,55 +208,52 @@ VIDEO_START( ninjemak )
***************************************************************************/
-WRITE8_HANDLER( galivan_videoram_w )
+WRITE8_MEMBER(galivan_state::galivan_videoram_w)
{
- galivan_state *state = space->machine().driver_data<galivan_state>();
- state->m_videoram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_videoram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
}
/* Written through port 40 */
-WRITE8_HANDLER( galivan_gfxbank_w )
+WRITE8_MEMBER(galivan_state::galivan_gfxbank_w)
{
- galivan_state *state = space->machine().driver_data<galivan_state>();
/* bits 0 and 1 coin counters */
- coin_counter_w(space->machine(), 0,data & 1);
- coin_counter_w(space->machine(), 1,data & 2);
+ coin_counter_w(machine(), 0,data & 1);
+ coin_counter_w(machine(), 1,data & 2);
/* bit 2 flip screen */
- state->m_flipscreen = data & 0x04;
- state->m_bg_tilemap->set_flip(state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
- state->m_tx_tilemap->set_flip(state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
+ m_flipscreen = data & 0x04;
+ m_bg_tilemap->set_flip(m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
+ m_tx_tilemap->set_flip(m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
/* bit 7 selects one of two ROM banks for c000-dfff */
- memory_set_bank(space->machine(), "bank1", (data & 0x80) >> 7);
+ memory_set_bank(machine(), "bank1", (data & 0x80) >> 7);
- /* logerror("Address: %04X - port 40 = %02x\n", cpu_get_pc(&space->device()), data); */
+ /* logerror("Address: %04X - port 40 = %02x\n", cpu_get_pc(&space.device()), data); */
}
-WRITE8_HANDLER( ninjemak_gfxbank_w )
+WRITE8_MEMBER(galivan_state::ninjemak_gfxbank_w)
{
- galivan_state *state = space->machine().driver_data<galivan_state>();
/* bits 0 and 1 coin counters */
- coin_counter_w(space->machine(), 0,data & 1);
- coin_counter_w(space->machine(), 1,data & 2);
+ coin_counter_w(machine(), 0,data & 1);
+ coin_counter_w(machine(), 1,data & 2);
/* bit 2 flip screen */
- state->m_flipscreen = data & 0x04;
- state->m_bg_tilemap->set_flip(state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
- state->m_tx_tilemap->set_flip(state->m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
+ m_flipscreen = data & 0x04;
+ m_bg_tilemap->set_flip(m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
+ m_tx_tilemap->set_flip(m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
/* bit 3 unknown */
/* bit 4 background disable flag */
- state->m_ninjemak_dispdisable = data & 0x10;
+ m_ninjemak_dispdisable = data & 0x10;
/* bit 5 sprite flag ??? */
/* bit 6, 7 ROM bank select */
- memory_set_bank(space->machine(), "bank1", (data & 0xc0) >> 6);
+ memory_set_bank(machine(), "bank1", (data & 0xc0) >> 6);
#if 0
{
@@ -275,27 +272,25 @@ WRITE8_HANDLER( ninjemak_gfxbank_w )
/* Written through port 41-42 */
-WRITE8_HANDLER( galivan_scrollx_w )
+WRITE8_MEMBER(galivan_state::galivan_scrollx_w)
{
- galivan_state *state = space->machine().driver_data<galivan_state>();
if (offset == 1)
{
if (data & 0x80)
- state->m_write_layers = 1;
- else if (state->m_write_layers)
+ m_write_layers = 1;
+ else if (m_write_layers)
{
- state->m_layers = data & 0x60;
- state->m_write_layers = 0;
+ m_layers = data & 0x60;
+ m_write_layers = 0;
}
}
- state->m_galivan_scrollx[offset] = data;
+ m_galivan_scrollx[offset] = data;
}
/* Written through port 43-44 */
-WRITE8_HANDLER( galivan_scrolly_w )
+WRITE8_MEMBER(galivan_state::galivan_scrolly_w)
{
- galivan_state *state = space->machine().driver_data<galivan_state>();
- state->m_galivan_scrolly[offset] = data;
+ m_galivan_scrolly[offset] = data;
}
diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c
index 4742bdd3abc..234ee6640f0 100644
--- a/src/mame/video/gaplus.c
+++ b/src/mame/video/gaplus.c
@@ -197,24 +197,21 @@ VIDEO_START( gaplus )
***************************************************************************/
-READ8_HANDLER( gaplus_videoram_r )
+READ8_MEMBER(gaplus_state::gaplus_videoram_r)
{
- gaplus_state *state = space->machine().driver_data<gaplus_state>();
- return state->m_videoram[offset];
+ return m_videoram[offset];
}
-WRITE8_HANDLER( gaplus_videoram_w )
+WRITE8_MEMBER(gaplus_state::gaplus_videoram_w)
{
- gaplus_state *state = space->machine().driver_data<gaplus_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( gaplus_starfield_control_w )
+WRITE8_MEMBER(gaplus_state::gaplus_starfield_control_w)
{
- gaplus_state *state = space->machine().driver_data<gaplus_state>();
offset &= 3;
- state->m_starfield_control[offset] = data;
+ m_starfield_control[offset] = data;
}
diff --git a/src/mame/video/gatron.c b/src/mame/video/gatron.c
index 3d65ff9c91c..e07bb9b2da9 100644
--- a/src/mame/video/gatron.c
+++ b/src/mame/video/gatron.c
@@ -21,12 +21,11 @@
#include "includes/gatron.h"
-WRITE8_HANDLER( gat_videoram_w )
+WRITE8_MEMBER(gatron_state::gat_videoram_w)
{
- gatron_state *state = space->machine().driver_data<gatron_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c
index da7c2853140..21779d3d9e5 100644
--- a/src/mame/video/gberet.c
+++ b/src/mame/video/gberet.c
@@ -77,35 +77,31 @@ PALETTE_INIT( gberet )
}
}
-WRITE8_HANDLER( gberet_videoram_w )
+WRITE8_MEMBER(gberet_state::gberet_videoram_w)
{
- gberet_state *state = space->machine().driver_data<gberet_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( gberet_colorram_w )
+WRITE8_MEMBER(gberet_state::gberet_colorram_w)
{
- gberet_state *state = space->machine().driver_data<gberet_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( gberet_scroll_w )
+WRITE8_MEMBER(gberet_state::gberet_scroll_w)
{
- gberet_state *state = space->machine().driver_data<gberet_state>();
int scroll;
- state->m_scrollram[offset] = data;
+ m_scrollram[offset] = data;
- scroll = state->m_scrollram[offset & 0x1f] | (state->m_scrollram[offset | 0x20] << 8);
- state->m_bg_tilemap->set_scrollx(offset & 0x1f, scroll);
+ scroll = m_scrollram[offset & 0x1f] | (m_scrollram[offset | 0x20] << 8);
+ m_bg_tilemap->set_scrollx(offset & 0x1f, scroll);
}
-WRITE8_HANDLER( gberet_sprite_bank_w )
+WRITE8_MEMBER(gberet_state::gberet_sprite_bank_w)
{
- gberet_state *state = space->machine().driver_data<gberet_state>();
- state->m_spritebank = data;
+ m_spritebank = data;
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -180,16 +176,15 @@ SCREEN_UPDATE_IND16( gberet )
/* Green Beret (bootleg) */
-WRITE8_HANDLER( gberetb_scroll_w )
+WRITE8_MEMBER(gberet_state::gberetb_scroll_w)
{
- gberet_state *state = space->machine().driver_data<gberet_state>();
int scroll = data;
if (offset)
scroll |= 0x100;
for (offset = 6; offset < 29; offset++)
- state->m_bg_tilemap->set_scrollx(offset, scroll + 64 - 8);
+ m_bg_tilemap->set_scrollx(offset, scroll + 64 - 8);
}
static void gberetb_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect )
diff --git a/src/mame/video/gcpinbal.c b/src/mame/video/gcpinbal.c
index 58c8dc3bf16..68dac1841f2 100644
--- a/src/mame/video/gcpinbal.c
+++ b/src/mame/video/gcpinbal.c
@@ -76,29 +76,27 @@ VIDEO_START( gcpinbal )
TILEMAP READ AND WRITE HANDLERS
*******************************************************************/
-READ16_HANDLER( gcpinbal_tilemaps_word_r )
+READ16_MEMBER(gcpinbal_state::gcpinbal_tilemaps_word_r)
{
- gcpinbal_state *state = space->machine().driver_data<gcpinbal_state>();
- return state->m_tilemapram[offset];
+ return m_tilemapram[offset];
}
-WRITE16_HANDLER( gcpinbal_tilemaps_word_w )
+WRITE16_MEMBER(gcpinbal_state::gcpinbal_tilemaps_word_w)
{
- gcpinbal_state *state = space->machine().driver_data<gcpinbal_state>();
- COMBINE_DATA(&state->m_tilemapram[offset]);
+ COMBINE_DATA(&m_tilemapram[offset]);
if (offset < 0x800) /* BG0 */
- state->m_tilemap[0]->mark_tile_dirty(offset / 2);
+ m_tilemap[0]->mark_tile_dirty(offset / 2);
else if ((offset < 0x1000)) /* BG1 */
- state->m_tilemap[1]->mark_tile_dirty((offset % 0x800) / 2);
+ m_tilemap[1]->mark_tile_dirty((offset % 0x800) / 2);
else if ((offset < 0x1800)) /* FG */
- state->m_tilemap[2]->mark_tile_dirty((offset % 0x800));
+ m_tilemap[2]->mark_tile_dirty((offset % 0x800));
}
#ifdef UNUSED_FUNCTION
-READ16_HANDLER( gcpinbal_ctrl_word_r )
+READ16_MEMBER(gcpinbal_state::gcpinbal_ctrl_word_r)
{
// ***** NOT HOOKED UP *****
@@ -106,7 +104,7 @@ READ16_HANDLER( gcpinbal_ctrl_word_r )
}
-WRITE16_HANDLER( gcpinbal_ctrl_word_w )
+WRITE16_MEMBER(gcpinbal_state::gcpinbal_ctrl_word_w)
{
// ***** NOT HOOKED UP *****
diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c
index 4fc19e1ea80..258bdcc82af 100644
--- a/src/mame/video/ginganin.c
+++ b/src/mame/video/ginganin.c
@@ -103,11 +103,10 @@ static TILE_GET_INFO( get_fg_tile_info )
0);
}
-WRITE16_HANDLER( ginganin_fgram16_w )
+WRITE16_MEMBER(ginganin_state::ginganin_fgram16_w)
{
- ginganin_state *state = space->machine().driver_data<ginganin_state>();
- COMBINE_DATA(&state->m_fgram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_fgram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
@@ -128,11 +127,10 @@ static TILE_GET_INFO( get_txt_tile_info )
0);
}
-WRITE16_HANDLER( ginganin_txtram16_w )
+WRITE16_MEMBER(ginganin_state::ginganin_txtram16_w)
{
- ginganin_state *state = space->machine().driver_data<ginganin_state>();
- COMBINE_DATA(&state->m_txtram[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_txtram[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset);
}
@@ -148,42 +146,41 @@ VIDEO_START( ginganin )
}
-WRITE16_HANDLER( ginganin_vregs16_w )
+WRITE16_MEMBER(ginganin_state::ginganin_vregs16_w)
{
- ginganin_state *state = space->machine().driver_data<ginganin_state>();
- COMBINE_DATA(&state->m_vregs[offset]);
- data = state->m_vregs[offset];
+ COMBINE_DATA(&m_vregs[offset]);
+ data = m_vregs[offset];
switch (offset)
{
case 0:
- state->m_fg_tilemap->set_scrolly(0, data);
+ m_fg_tilemap->set_scrolly(0, data);
break;
case 1:
- state->m_fg_tilemap->set_scrollx(0, data);
+ m_fg_tilemap->set_scrollx(0, data);
break;
case 2:
- state->m_bg_tilemap->set_scrolly(0, data);
+ m_bg_tilemap->set_scrolly(0, data);
break;
case 3:
- state->m_bg_tilemap->set_scrollx(0, data);
+ m_bg_tilemap->set_scrollx(0, data);
break;
case 4:
- state->m_layers_ctrl = data;
+ m_layers_ctrl = data;
break;
/* case 5:
* break;
*/
case 6:
- state->m_flipscreen = !(data & 1);
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen = !(data & 1);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
break;
case 7:
- state->soundlatch_w(*space, 0, data);
- device_set_input_line(state->m_audiocpu, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(space, 0, data);
+ device_set_input_line(m_audiocpu, INPUT_LINE_NMI, PULSE_LINE);
break;
default:
- logerror("CPU #0 PC %06X : Warning, videoreg %04X <- %04X\n", cpu_get_pc(&space->device()), offset, data);
+ logerror("CPU #0 PC %06X : Warning, videoreg %04X <- %04X\n", cpu_get_pc(&space.device()), offset, data);
}
}
diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c
index 68de96f86f8..093ae9e3b7f 100644
--- a/src/mame/video/gladiatr.c
+++ b/src/mame/video/gladiatr.c
@@ -79,116 +79,108 @@ VIDEO_START( gladiatr )
***************************************************************************/
-WRITE8_HANDLER( gladiatr_videoram_w )
+WRITE8_MEMBER(gladiatr_state::gladiatr_videoram_w)
{
- gladiatr_state *state = space->machine().driver_data<gladiatr_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( gladiatr_colorram_w )
+WRITE8_MEMBER(gladiatr_state::gladiatr_colorram_w)
{
- gladiatr_state *state = space->machine().driver_data<gladiatr_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( gladiatr_textram_w )
+WRITE8_MEMBER(gladiatr_state::gladiatr_textram_w)
{
- gladiatr_state *state = space->machine().driver_data<gladiatr_state>();
- state->m_textram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_textram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( gladiatr_paletteram_w )
+WRITE8_MEMBER(gladiatr_state::gladiatr_paletteram_w)
{
int r,g,b;
- gladiatr_state *state = space->machine().driver_data<gladiatr_state>();
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
offset &= 0x3ff;
- r = (state->m_generic_paletteram_8[offset] >> 0) & 0x0f;
- g = (state->m_generic_paletteram_8[offset] >> 4) & 0x0f;
- b = (state->m_generic_paletteram_8[offset + 0x400] >> 0) & 0x0f;
+ r = (m_generic_paletteram_8[offset] >> 0) & 0x0f;
+ g = (m_generic_paletteram_8[offset] >> 4) & 0x0f;
+ b = (m_generic_paletteram_8[offset + 0x400] >> 0) & 0x0f;
- r = (r << 1) + ((state->m_generic_paletteram_8[offset + 0x400] >> 4) & 0x01);
- g = (g << 1) + ((state->m_generic_paletteram_8[offset + 0x400] >> 5) & 0x01);
- b = (b << 1) + ((state->m_generic_paletteram_8[offset + 0x400] >> 6) & 0x01);
+ r = (r << 1) + ((m_generic_paletteram_8[offset + 0x400] >> 4) & 0x01);
+ g = (g << 1) + ((m_generic_paletteram_8[offset + 0x400] >> 5) & 0x01);
+ b = (b << 1) + ((m_generic_paletteram_8[offset + 0x400] >> 6) & 0x01);
- palette_set_color_rgb(space->machine(),offset,pal5bit(r),pal5bit(g),pal5bit(b));
+ palette_set_color_rgb(machine(),offset,pal5bit(r),pal5bit(g),pal5bit(b));
}
-WRITE8_HANDLER( gladiatr_spritebuffer_w )
+WRITE8_MEMBER(gladiatr_state::gladiatr_spritebuffer_w)
{
- gladiatr_state *state = space->machine().driver_data<gladiatr_state>();
- state->m_sprite_buffer = data & 1;
+ m_sprite_buffer = data & 1;
}
-WRITE8_HANDLER( gladiatr_spritebank_w )
+WRITE8_MEMBER(gladiatr_state::gladiatr_spritebank_w)
{
- gladiatr_state *state = space->machine().driver_data<gladiatr_state>();
- state->m_sprite_bank = (data & 1) ? 4 : 2;
+ m_sprite_bank = (data & 1) ? 4 : 2;
}
-WRITE8_HANDLER( ppking_video_registers_w )
+WRITE8_MEMBER(gladiatr_state::ppking_video_registers_w)
{
- gladiatr_state *state = space->machine().driver_data<gladiatr_state>();
switch (offset & 0x300)
{
case 0x000:
- state->m_bg_tilemap->set_scrolly(offset & 0x0f, 0x100-data);
+ m_bg_tilemap->set_scrolly(offset & 0x0f, 0x100-data);
break;
case 0x200:
if (data & 0x80)
- state->m_fg_scrolly = data + 0x100;
+ m_fg_scrolly = data + 0x100;
else
- state->m_fg_scrolly = data;
+ m_fg_scrolly = data;
break;
case 0x300:
- if (state->m_fg_tile_bank != (data & 0x03))
+ if (m_fg_tile_bank != (data & 0x03))
{
- state->m_fg_tile_bank = data & 0x03;
- state->m_fg_tilemap->mark_all_dirty();
+ m_fg_tile_bank = data & 0x03;
+ m_fg_tilemap->mark_all_dirty();
}
- state->m_video_attributes = data;
+ m_video_attributes = data;
break;
}
-//popmessage("%02x %02x",state->m_fg_scrolly, state->m_video_attributes);
+//popmessage("%02x %02x",m_fg_scrolly, m_video_attributes);
}
-WRITE8_HANDLER( gladiatr_video_registers_w )
+WRITE8_MEMBER(gladiatr_state::gladiatr_video_registers_w)
{
- gladiatr_state *state = space->machine().driver_data<gladiatr_state>();
switch (offset)
{
case 0x000:
- state->m_fg_scrolly = data;
+ m_fg_scrolly = data;
break;
case 0x080:
- if (state->m_fg_tile_bank != (data & 0x03))
+ if (m_fg_tile_bank != (data & 0x03))
{
- state->m_fg_tile_bank = data & 0x03;
- state->m_fg_tilemap->mark_all_dirty();
+ m_fg_tile_bank = data & 0x03;
+ m_fg_tilemap->mark_all_dirty();
}
- if (state->m_bg_tile_bank != ((data & 0x10) >> 4))
+ if (m_bg_tile_bank != ((data & 0x10) >> 4))
{
- state->m_bg_tile_bank = (data & 0x10) >> 4;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_tile_bank = (data & 0x10) >> 4;
+ m_bg_tilemap->mark_all_dirty();
}
- state->m_video_attributes = data;
+ m_video_attributes = data;
break;
case 0x100:
- state->m_fg_scrollx = data;
+ m_fg_scrollx = data;
break;
case 0x200:
- state->m_bg_scrolly = data;
+ m_bg_scrolly = data;
break;
case 0x300:
- state->m_bg_scrollx = data;
+ m_bg_scrollx = data;
break;
}
}
diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c
index 7de62cf0dc1..0b84a71b4fd 100644
--- a/src/mame/video/glass.c
+++ b/src/mame/video/glass.c
@@ -67,29 +67,28 @@ static TILE_GET_INFO( get_tile_info_glass_screen1 )
B2B1B0 selects the picture (there are 8 pictures in each half of the ROM)
*/
-WRITE16_HANDLER( glass_blitter_w )
+WRITE16_MEMBER(glass_state::glass_blitter_w)
{
- glass_state *state = space->machine().driver_data<glass_state>();
- state->m_blitter_serial_buffer[state->m_current_bit] = data & 0x01;
- state->m_current_bit++;
+ m_blitter_serial_buffer[m_current_bit] = data & 0x01;
+ m_current_bit++;
- if (state->m_current_bit == 5)
+ if (m_current_bit == 5)
{
- state->m_current_command = (state->m_blitter_serial_buffer[0] << 4) |
- (state->m_blitter_serial_buffer[1] << 3) |
- (state->m_blitter_serial_buffer[2] << 2) |
- (state->m_blitter_serial_buffer[3] << 1) |
- (state->m_blitter_serial_buffer[4] << 0);
- state->m_current_bit = 0;
+ m_current_command = (m_blitter_serial_buffer[0] << 4) |
+ (m_blitter_serial_buffer[1] << 3) |
+ (m_blitter_serial_buffer[2] << 2) |
+ (m_blitter_serial_buffer[3] << 1) |
+ (m_blitter_serial_buffer[4] << 0);
+ m_current_bit = 0;
/* fill the screen bitmap with the current picture */
{
int i, j;
- UINT8 *gfx = (UINT8 *)space->machine().region("gfx3")->base();
+ UINT8 *gfx = (UINT8 *)machine().region("gfx3")->base();
- gfx = gfx + (state->m_current_command & 0x07) * 0x10000 + (state->m_current_command & 0x08) * 0x10000 + 0x140;
+ gfx = gfx + (m_current_command & 0x07) * 0x10000 + (m_current_command & 0x08) * 0x10000 + 0x140;
- if ((state->m_current_command & 0x18) != 0)
+ if ((m_current_command & 0x18) != 0)
{
for (j = 0; j < 200; j++)
{
@@ -97,12 +96,12 @@ WRITE16_HANDLER( glass_blitter_w )
{
int color = *gfx;
gfx++;
- state->m_screen_bitmap->pix16(j, i) = color & 0xff;
+ m_screen_bitmap->pix16(j, i) = color & 0xff;
}
}
}
else
- state->m_screen_bitmap->fill(0);
+ m_screen_bitmap->fill(0);
}
}
}
@@ -113,11 +112,10 @@ WRITE16_HANDLER( glass_blitter_w )
***************************************************************************/
-WRITE16_HANDLER( glass_vram_w )
+WRITE16_MEMBER(glass_state::glass_vram_w)
{
- glass_state *state = space->machine().driver_data<glass_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_pant[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 2);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_pant[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 2);
}
diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c
index d22162b1311..5105689fb97 100644
--- a/src/mame/video/gng.c
+++ b/src/mame/video/gng.c
@@ -65,39 +65,35 @@ VIDEO_START( gng )
***************************************************************************/
-WRITE8_HANDLER( gng_fgvideoram_w )
+WRITE8_MEMBER(gng_state::gng_fgvideoram_w)
{
- gng_state *state = space->machine().driver_data<gng_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( gng_bgvideoram_w )
+WRITE8_MEMBER(gng_state::gng_bgvideoram_w)
{
- gng_state *state = space->machine().driver_data<gng_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( gng_bgscrollx_w )
+WRITE8_MEMBER(gng_state::gng_bgscrollx_w)
{
- gng_state *state = space->machine().driver_data<gng_state>();
- state->m_scrollx[offset] = data;
- state->m_bg_tilemap->set_scrollx(0, state->m_scrollx[0] + 256 * state->m_scrollx[1]);
+ m_scrollx[offset] = data;
+ m_bg_tilemap->set_scrollx(0, m_scrollx[0] + 256 * m_scrollx[1]);
}
-WRITE8_HANDLER( gng_bgscrolly_w )
+WRITE8_MEMBER(gng_state::gng_bgscrolly_w)
{
- gng_state *state = space->machine().driver_data<gng_state>();
- state->m_scrolly[offset] = data;
- state->m_bg_tilemap->set_scrolly(0, state->m_scrolly[0] + 256 * state->m_scrolly[1]);
+ m_scrolly[offset] = data;
+ m_bg_tilemap->set_scrolly(0, m_scrolly[0] + 256 * m_scrolly[1]);
}
-WRITE8_HANDLER( gng_flipscreen_w )
+WRITE8_MEMBER(gng_state::gng_flipscreen_w)
{
- flip_screen_set(space->machine(), ~data & 1);
+ flip_screen_set(machine(), ~data & 1);
}
diff --git a/src/mame/video/goal92.c b/src/mame/video/goal92.c
index f01c811e142..4427733a2ea 100644
--- a/src/mame/video/goal92.c
+++ b/src/mame/video/goal92.c
@@ -7,42 +7,37 @@
#include "emu.h"
#include "includes/goal92.h"
-READ16_HANDLER( goal92_fg_bank_r )
+READ16_MEMBER(goal92_state::goal92_fg_bank_r)
{
- goal92_state *state = space->machine().driver_data<goal92_state>();
- return state->m_fg_bank;
+ return m_fg_bank;
}
-WRITE16_HANDLER( goal92_fg_bank_w )
+WRITE16_MEMBER(goal92_state::goal92_fg_bank_w)
{
- goal92_state *state = space->machine().driver_data<goal92_state>();
- COMBINE_DATA(&state->m_fg_bank);
+ COMBINE_DATA(&m_fg_bank);
if (ACCESSING_BITS_0_7)
{
- state->m_fg_layer->mark_all_dirty();
+ m_fg_layer->mark_all_dirty();
}
}
-WRITE16_HANDLER( goal92_text_w )
+WRITE16_MEMBER(goal92_state::goal92_text_w)
{
- goal92_state *state = space->machine().driver_data<goal92_state>();
- COMBINE_DATA(&state->m_tx_data[offset]);
- state->m_tx_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_tx_data[offset]);
+ m_tx_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( goal92_background_w )
+WRITE16_MEMBER(goal92_state::goal92_background_w)
{
- goal92_state *state = space->machine().driver_data<goal92_state>();
- COMBINE_DATA(&state->m_bg_data[offset]);
- state->m_bg_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bg_data[offset]);
+ m_bg_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( goal92_foreground_w )
+WRITE16_MEMBER(goal92_state::goal92_foreground_w)
{
- goal92_state *state = space->machine().driver_data<goal92_state>();
- COMBINE_DATA(&state->m_fg_data[offset]);
- state->m_fg_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_fg_data[offset]);
+ m_fg_layer->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_text_tile_info )
diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c
index 922d1df7c15..306fb97dd20 100644
--- a/src/mame/video/goindol.c
+++ b/src/mame/video/goindol.c
@@ -63,18 +63,16 @@ VIDEO_START( goindol )
***************************************************************************/
-WRITE8_HANDLER( goindol_fg_videoram_w )
+WRITE8_MEMBER(goindol_state::goindol_fg_videoram_w)
{
- goindol_state *state = space->machine().driver_data<goindol_state>();
- state->m_fg_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset / 2);
+ m_fg_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( goindol_bg_videoram_w )
+WRITE8_MEMBER(goindol_state::goindol_bg_videoram_w)
{
- goindol_state *state = space->machine().driver_data<goindol_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c
index 663cb3b8424..73f55b344ba 100644
--- a/src/mame/video/goldstar.c
+++ b/src/mame/video/goldstar.c
@@ -19,11 +19,10 @@
***************************************************************************/
-WRITE8_HANDLER( cm_girl_scroll_w )
+WRITE8_MEMBER(goldstar_state::cm_girl_scroll_w)
{
- goldstar_state *state = space->machine().driver_data<goldstar_state>();
- state->m_cm_girl_scroll = data;
+ m_cm_girl_scroll = data;
/*
xxxx ---- yscroll
---- xxxx xscroll
@@ -33,11 +32,10 @@ WRITE8_HANDLER( cm_girl_scroll_w )
*/
}
-WRITE8_HANDLER( cm_outport0_w )
+WRITE8_MEMBER(goldstar_state::cm_outport0_w)
{
- goldstar_state *state = space->machine().driver_data<goldstar_state>();
- state->m_cm_enable_reg = data;
+ m_cm_enable_reg = data;
/*
---- ---x (global enable or irq enable?)
---- --x- (fg enable)
@@ -50,20 +48,18 @@ WRITE8_HANDLER( cm_outport0_w )
//popmessage("%02x",data);
}
-WRITE8_HANDLER( goldstar_fg_vidram_w )
+WRITE8_MEMBER(goldstar_state::goldstar_fg_vidram_w)
{
- goldstar_state *state = space->machine().driver_data<goldstar_state>();
- state->m_fg_vidram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_vidram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( goldstar_fg_atrram_w )
+WRITE8_MEMBER(goldstar_state::goldstar_fg_atrram_w)
{
- goldstar_state *state = space->machine().driver_data<goldstar_state>();
- state->m_fg_atrram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_atrram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_goldstar_fg_tile_info )
@@ -109,12 +105,11 @@ static TILE_GET_INFO( get_cherrym_fg_tile_info )
-WRITE8_HANDLER( goldstar_reel1_ram_w )
+WRITE8_MEMBER(goldstar_state::goldstar_reel1_ram_w)
{
- goldstar_state *state = space->machine().driver_data<goldstar_state>();
- state->m_reel1_ram[offset] = data;
- state->m_reel1_tilemap->mark_tile_dirty(offset);
+ m_reel1_ram[offset] = data;
+ m_reel1_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_goldstar_reel1_tile_info )
@@ -130,11 +125,10 @@ static TILE_GET_INFO( get_goldstar_reel1_tile_info )
}
-WRITE8_HANDLER( goldstar_reel2_ram_w )
+WRITE8_MEMBER(goldstar_state::goldstar_reel2_ram_w)
{
- goldstar_state *state = space->machine().driver_data<goldstar_state>();
- state->m_reel2_ram[offset] = data;
- state->m_reel2_tilemap->mark_tile_dirty(offset);
+ m_reel2_ram[offset] = data;
+ m_reel2_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_goldstar_reel2_tile_info )
@@ -149,12 +143,11 @@ static TILE_GET_INFO( get_goldstar_reel2_tile_info )
0);
}
-WRITE8_HANDLER( goldstar_reel3_ram_w )
+WRITE8_MEMBER(goldstar_state::goldstar_reel3_ram_w)
{
- goldstar_state *state = space->machine().driver_data<goldstar_state>();
- state->m_reel3_ram[offset] = data;
- state->m_reel3_tilemap->mark_tile_dirty(offset);
+ m_reel3_ram[offset] = data;
+ m_reel3_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_goldstar_reel3_tile_info )
@@ -169,29 +162,26 @@ static TILE_GET_INFO( get_goldstar_reel3_tile_info )
0);
}
-WRITE8_HANDLER( unkch_reel1_attrram_w )
+WRITE8_MEMBER(goldstar_state::unkch_reel1_attrram_w)
{
- goldstar_state *state = space->machine().driver_data<goldstar_state>();
- state->m_reel1_attrram[offset] = data;
- state->m_reel1_tilemap->mark_tile_dirty(offset);
+ m_reel1_attrram[offset] = data;
+ m_reel1_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( unkch_reel2_attrram_w )
+WRITE8_MEMBER(goldstar_state::unkch_reel2_attrram_w)
{
- goldstar_state *state = space->machine().driver_data<goldstar_state>();
- state->m_reel2_attrram[offset] = data;
- state->m_reel2_tilemap->mark_tile_dirty(offset);
+ m_reel2_attrram[offset] = data;
+ m_reel2_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( unkch_reel3_attrram_w )
+WRITE8_MEMBER(goldstar_state::unkch_reel3_attrram_w)
{
- goldstar_state *state = space->machine().driver_data<goldstar_state>();
- state->m_reel3_attrram[offset] = data;
- state->m_reel3_tilemap->mark_tile_dirty(offset);
+ m_reel3_attrram[offset] = data;
+ m_reel3_tilemap->mark_tile_dirty(offset);
}
@@ -335,22 +325,20 @@ VIDEO_START( cherrym )
-WRITE8_HANDLER( goldstar_fa00_w )
+WRITE8_MEMBER(goldstar_state::goldstar_fa00_w)
{
- goldstar_state *state = space->machine().driver_data<goldstar_state>();
/* bit 1 toggles continuously - might be irq enable or watchdog reset */
/* bit 2 selects background gfx color (I think) */
- state->m_bgcolor = (data & 0x04) >> 2;
- state->m_reel1_tilemap->mark_all_dirty();
- state->m_reel2_tilemap->mark_all_dirty();
- state->m_reel3_tilemap->mark_all_dirty();
+ m_bgcolor = (data & 0x04) >> 2;
+ m_reel1_tilemap->mark_all_dirty();
+ m_reel2_tilemap->mark_all_dirty();
+ m_reel3_tilemap->mark_all_dirty();
}
-WRITE8_HANDLER( cm_background_col_w )
+WRITE8_MEMBER(goldstar_state::cm_background_col_w)
{
- goldstar_state *state = space->machine().driver_data<goldstar_state>();
//printf("cm_background_col_w %02x\n",data);
@@ -366,24 +354,24 @@ WRITE8_HANDLER( cm_background_col_w )
*/
- state->m_cmaster_girl_num = (data >> 4)&0x7;
- state->m_cmaster_girl_pal = (data >> 2)&0x3;
+ m_cmaster_girl_num = (data >> 4)&0x7;
+ m_cmaster_girl_pal = (data >> 2)&0x3;
//bgcolor = (data & 0x03) >> 0;
// apparently some boards have this colour scheme?
// i'm not convinced it isn't just a different prom on them
#if 0
- state->m_bgcolor = 0;
- state->m_bgcolor |= (data & 0x01) << 1;
- state->m_bgcolor |= (data & 0x02) >> 1;
+ m_bgcolor = 0;
+ m_bgcolor |= (data & 0x01) << 1;
+ m_bgcolor |= (data & 0x02) >> 1;
#else
- state->m_bgcolor = (data & 0x03) >> 0;
+ m_bgcolor = (data & 0x03) >> 0;
#endif
- state->m_reel1_tilemap->mark_all_dirty();
- state->m_reel2_tilemap->mark_all_dirty();
- state->m_reel3_tilemap->mark_all_dirty();
+ m_reel1_tilemap->mark_all_dirty();
+ m_reel2_tilemap->mark_all_dirty();
+ m_reel3_tilemap->mark_all_dirty();
}
diff --git a/src/mame/video/gomoku.c b/src/mame/video/gomoku.c
index a4bcfc3de78..612c4cec5b5 100644
--- a/src/mame/video/gomoku.c
+++ b/src/mame/video/gomoku.c
@@ -68,36 +68,31 @@ static TILE_GET_INFO( get_fg_tile_info )
TILE_FLIPYX(flipyx));
}
-WRITE8_HANDLER( gomoku_videoram_w )
+WRITE8_MEMBER(gomoku_state::gomoku_videoram_w)
{
- gomoku_state *state = space->machine().driver_data<gomoku_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( gomoku_colorram_w )
+WRITE8_MEMBER(gomoku_state::gomoku_colorram_w)
{
- gomoku_state *state = space->machine().driver_data<gomoku_state>();
- state->m_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( gomoku_bgram_w )
+WRITE8_MEMBER(gomoku_state::gomoku_bgram_w)
{
- gomoku_state *state = space->machine().driver_data<gomoku_state>();
- state->m_bgram[offset] = data;
+ m_bgram[offset] = data;
}
-WRITE8_HANDLER( gomoku_flipscreen_w )
+WRITE8_MEMBER(gomoku_state::gomoku_flipscreen_w)
{
- gomoku_state *state = space->machine().driver_data<gomoku_state>();
- state->m_flipscreen = (data & 0x02) ? 0 : 1;
+ m_flipscreen = (data & 0x02) ? 0 : 1;
}
-WRITE8_HANDLER( gomoku_bg_dispsw_w )
+WRITE8_MEMBER(gomoku_state::gomoku_bg_dispsw_w)
{
- gomoku_state *state = space->machine().driver_data<gomoku_state>();
- state->m_bg_dispsw = (data & 0x02) ? 0 : 1;
+ m_bg_dispsw = (data & 0x02) ? 0 : 1;
}
diff --git a/src/mame/video/gotcha.c b/src/mame/video/gotcha.c
index 033cf23e8ca..ab31d2984c7 100644
--- a/src/mame/video/gotcha.c
+++ b/src/mame/video/gotcha.c
@@ -54,51 +54,46 @@ VIDEO_START( gotcha )
}
-WRITE16_HANDLER( gotcha_fgvideoram_w )
+WRITE16_MEMBER(gotcha_state::gotcha_fgvideoram_w)
{
- gotcha_state *state = space->machine().driver_data<gotcha_state>();
- COMBINE_DATA(&state->m_fgvideoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_fgvideoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( gotcha_bgvideoram_w )
+WRITE16_MEMBER(gotcha_state::gotcha_bgvideoram_w)
{
- gotcha_state *state = space->machine().driver_data<gotcha_state>();
- COMBINE_DATA(&state->m_bgvideoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bgvideoram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( gotcha_gfxbank_select_w )
+WRITE16_MEMBER(gotcha_state::gotcha_gfxbank_select_w)
{
- gotcha_state *state = space->machine().driver_data<gotcha_state>();
if (ACCESSING_BITS_8_15)
- state->m_banksel = (data & 0x0300) >> 8;
+ m_banksel = (data & 0x0300) >> 8;
}
-WRITE16_HANDLER( gotcha_gfxbank_w )
+WRITE16_MEMBER(gotcha_state::gotcha_gfxbank_w)
{
- gotcha_state *state = space->machine().driver_data<gotcha_state>();
if (ACCESSING_BITS_8_15)
{
- if (state->m_gfxbank[state->m_banksel] != ((data & 0x0f00) >> 8))
+ if (m_gfxbank[m_banksel] != ((data & 0x0f00) >> 8))
{
- state->m_gfxbank[state->m_banksel] = (data & 0x0f00) >> 8;
- space->machine().tilemap().mark_all_dirty();
+ m_gfxbank[m_banksel] = (data & 0x0f00) >> 8;
+ machine().tilemap().mark_all_dirty();
}
}
}
-WRITE16_HANDLER( gotcha_scroll_w )
+WRITE16_MEMBER(gotcha_state::gotcha_scroll_w)
{
- gotcha_state *state = space->machine().driver_data<gotcha_state>();
- COMBINE_DATA(&state->m_scroll[offset]);
+ COMBINE_DATA(&m_scroll[offset]);
switch (offset)
{
- case 0: state->m_fg_tilemap->set_scrollx(0, state->m_scroll[0]); break;
- case 1: state->m_fg_tilemap->set_scrolly(0, state->m_scroll[1]); break;
- case 2: state->m_bg_tilemap->set_scrollx(0, state->m_scroll[2]); break;
- case 3: state->m_bg_tilemap->set_scrolly(0, state->m_scroll[3]); break;
+ case 0: m_fg_tilemap->set_scrollx(0, m_scroll[0]); break;
+ case 1: m_fg_tilemap->set_scrolly(0, m_scroll[1]); break;
+ case 2: m_bg_tilemap->set_scrollx(0, m_scroll[2]); break;
+ case 3: m_bg_tilemap->set_scrolly(0, m_scroll[3]); break;
}
}
diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c
index 3a2f5ad9a39..8765101d87e 100644
--- a/src/mame/video/gottlieb.c
+++ b/src/mame/video/gottlieb.c
@@ -15,25 +15,24 @@
*
*************************************/
-WRITE8_HANDLER( gottlieb_paletteram_w )
+WRITE8_MEMBER(gottlieb_state::gottlieb_paletteram_w)
{
- gottlieb_state *state = space->machine().driver_data<gottlieb_state>();
int r, g, b, a, val;
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
/* blue & green are encoded in the even bytes */
- val = state->m_generic_paletteram_8[offset & ~1];
- g = combine_4_weights(state->m_weights, (val >> 4) & 1, (val >> 5) & 1, (val >> 6) & 1, (val >> 7) & 1);
- b = combine_4_weights(state->m_weights, (val >> 0) & 1, (val >> 1) & 1, (val >> 2) & 1, (val >> 3) & 1);
+ val = m_generic_paletteram_8[offset & ~1];
+ g = combine_4_weights(m_weights, (val >> 4) & 1, (val >> 5) & 1, (val >> 6) & 1, (val >> 7) & 1);
+ b = combine_4_weights(m_weights, (val >> 0) & 1, (val >> 1) & 1, (val >> 2) & 1, (val >> 3) & 1);
/* red is encoded in the odd bytes */
- val = state->m_generic_paletteram_8[offset | 1];
- r = combine_4_weights(state->m_weights, (val >> 0) & 1, (val >> 1) & 1, (val >> 2) & 1, (val >> 3) & 1);
+ val = m_generic_paletteram_8[offset | 1];
+ r = combine_4_weights(m_weights, (val >> 0) & 1, (val >> 1) & 1, (val >> 2) & 1, (val >> 3) & 1);
/* alpha is set to 0 if laserdisc video is enabled */
- a = (state->m_transparent0 && offset / 2 == 0) ? 0 : 255;
- palette_set_color(space->machine(), offset / 2, MAKE_ARGB(a, r, g, b));
+ a = (m_transparent0 && offset / 2 == 0) ? 0 : 255;
+ palette_set_color(machine(), offset / 2, MAKE_ARGB(a, r, g, b));
}
@@ -44,51 +43,49 @@ WRITE8_HANDLER( gottlieb_paletteram_w )
*
*************************************/
-WRITE8_HANDLER( gottlieb_video_control_w )
+WRITE8_MEMBER(gottlieb_state::gottlieb_video_control_w)
{
- gottlieb_state *state = space->machine().driver_data<gottlieb_state>();
/* bit 0 controls foreground/background priority */
- if (state->m_background_priority != (data & 0x01))
- space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos());
- state->m_background_priority = data & 0x01;
+ if (m_background_priority != (data & 0x01))
+ machine().primary_screen->update_partial(machine().primary_screen->vpos());
+ m_background_priority = data & 0x01;
/* bit 1 controls horizonal flip screen */
- if (flip_screen_x_get(space->machine()) != (data & 0x02))
+ if (flip_screen_x_get(machine()) != (data & 0x02))
{
- flip_screen_x_set(space->machine(), data & 0x02);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_x_set(machine(), data & 0x02);
+ machine().tilemap().mark_all_dirty();
}
/* bit 2 controls horizonal flip screen */
- if (flip_screen_y_get(space->machine()) != (data & 0x04))
+ if (flip_screen_y_get(machine()) != (data & 0x04))
{
- flip_screen_y_set(space->machine(), data & 0x04);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_y_set(machine(), data & 0x04);
+ machine().tilemap().mark_all_dirty();
}
/* in Q*Bert Qubes only, bit 4 controls the sprite bank */
- state->m_spritebank = (data & 0x10) >> 4;
+ m_spritebank = (data & 0x10) >> 4;
}
-WRITE8_HANDLER( gottlieb_laserdisc_video_control_w )
+WRITE8_MEMBER(gottlieb_state::gottlieb_laserdisc_video_control_w)
{
- gottlieb_state *state = space->machine().driver_data<gottlieb_state>();
/* bit 0 works like the other games */
gottlieb_video_control_w(space, offset, data & 0x01);
/* bit 1 controls the sprite bank. */
- state->m_spritebank = (data & 0x02) >> 1;
+ m_spritebank = (data & 0x02) >> 1;
/* bit 2 video enable (0 = black screen) */
/* bit 3 genlock control (1 = show laserdisc image) */
- state->m_laserdisc->overlay_enable((data & 0x04) ? TRUE : FALSE);
- state->m_laserdisc->video_enable(((data & 0x0c) == 0x0c) ? TRUE : FALSE);
+ m_laserdisc->overlay_enable((data & 0x04) ? TRUE : FALSE);
+ m_laserdisc->video_enable(((data & 0x0c) == 0x0c) ? TRUE : FALSE);
/* configure the palette if the laserdisc is enabled */
- state->m_transparent0 = (data >> 3) & 1;
- gottlieb_paletteram_w(space, 0, state->m_generic_paletteram_8[0]);
+ m_transparent0 = (data >> 3) & 1;
+ gottlieb_paletteram_w(space, 0, m_generic_paletteram_8[0]);
}
@@ -99,22 +96,20 @@ WRITE8_HANDLER( gottlieb_laserdisc_video_control_w )
*
*************************************/
-WRITE8_HANDLER( gottlieb_videoram_w )
+WRITE8_MEMBER(gottlieb_state::gottlieb_videoram_w)
{
- gottlieb_state *state = space->machine().driver_data<gottlieb_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( gottlieb_charram_w )
+WRITE8_MEMBER(gottlieb_state::gottlieb_charram_w)
{
- gottlieb_state *state = space->machine().driver_data<gottlieb_state>();
- if (state->m_charram[offset] != data)
+ if (m_charram[offset] != data)
{
- state->m_charram[offset] = data;
- gfx_element_mark_dirty(space->machine().gfx[0], offset / 32);
+ m_charram[offset] = data;
+ gfx_element_mark_dirty(machine().gfx[0], offset / 32);
}
}
diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c
index 1ece4fb492c..3556e058a07 100644
--- a/src/mame/video/gotya.c
+++ b/src/mame/video/gotya.c
@@ -61,34 +61,31 @@ PALETTE_INIT( gotya )
}
}
-WRITE8_HANDLER( gotya_videoram_w )
+WRITE8_MEMBER(gotya_state::gotya_videoram_w)
{
- gotya_state *state = space->machine().driver_data<gotya_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( gotya_colorram_w )
+WRITE8_MEMBER(gotya_state::gotya_colorram_w)
{
- gotya_state *state = space->machine().driver_data<gotya_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( gotya_video_control_w )
+WRITE8_MEMBER(gotya_state::gotya_video_control_w)
{
- gotya_state *state = space->machine().driver_data<gotya_state>();
/* bit 0 - scroll bit 8
bit 1 - flip screen
bit 2 - sound disable ??? */
- state->m_scroll_bit_8 = data & 0x01;
+ m_scroll_bit_8 = data & 0x01;
- if (flip_screen_get(space->machine()) != (data & 0x02))
+ if (flip_screen_get(machine()) != (data & 0x02))
{
- flip_screen_set(space->machine(), data & 0x02);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x02);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/gradius3.c b/src/mame/video/gradius3.c
index f74d3bdfa8e..01532d85ef4 100644
--- a/src/mame/video/gradius3.c
+++ b/src/mame/video/gradius3.c
@@ -99,22 +99,21 @@ VIDEO_START( gradius3 )
***************************************************************************/
-READ16_HANDLER( gradius3_gfxrom_r )
+READ16_MEMBER(gradius3_state::gradius3_gfxrom_r)
{
- UINT8 *gfxdata = space->machine().region("gfx2")->base();
+ UINT8 *gfxdata = machine().region("gfx2")->base();
return (gfxdata[2 * offset + 1] << 8) | gfxdata[2 * offset];
}
-WRITE16_HANDLER( gradius3_gfxram_w )
+WRITE16_MEMBER(gradius3_state::gradius3_gfxram_w)
{
- gradius3_state *state = space->machine().driver_data<gradius3_state>();
- int oldword = state->m_gfxram[offset];
+ int oldword = m_gfxram[offset];
- COMBINE_DATA(&state->m_gfxram[offset]);
+ COMBINE_DATA(&m_gfxram[offset]);
- if (oldword != state->m_gfxram[offset])
- gfx_element_mark_dirty(space->machine().gfx[0], offset / 16);
+ if (oldword != m_gfxram[offset])
+ gfx_element_mark_dirty(machine().gfx[0], offset / 16);
}
/***************************************************************************
diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c
index 20de9bf8862..256a01f4bd5 100644
--- a/src/mame/video/grchamp.c
+++ b/src/mame/video/grchamp.c
@@ -52,25 +52,22 @@ PALETTE_INIT( grchamp )
}
-WRITE8_HANDLER( grchamp_left_w )
+WRITE8_MEMBER(grchamp_state::grchamp_left_w)
{
- grchamp_state *state = space->machine().driver_data<grchamp_state>();
- state->m_leftram[offset] = data;
- state->m_left_tilemap->mark_tile_dirty(offset);
+ m_leftram[offset] = data;
+ m_left_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( grchamp_center_w )
+WRITE8_MEMBER(grchamp_state::grchamp_center_w)
{
- grchamp_state *state = space->machine().driver_data<grchamp_state>();
- state->m_centerram[offset] = data;
- state->m_center_tilemap->mark_tile_dirty(offset);
+ m_centerram[offset] = data;
+ m_center_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( grchamp_right_w )
+WRITE8_MEMBER(grchamp_state::grchamp_right_w)
{
- grchamp_state *state = space->machine().driver_data<grchamp_state>();
- state->m_rightram[offset] = data;
- state->m_right_tilemap->mark_tile_dirty(offset);
+ m_rightram[offset] = data;
+ m_right_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_text_tile_info )
diff --git a/src/mame/video/gridlee.c b/src/mame/video/gridlee.c
index 8af0fa4cbd5..f6ac3026e2c 100644
--- a/src/mame/video/gridlee.c
+++ b/src/mame/video/gridlee.c
@@ -80,10 +80,9 @@ VIDEO_START( gridlee )
*
*************************************/
-WRITE8_HANDLER( gridlee_cocktail_flip_w )
+WRITE8_MEMBER(gridlee_state::gridlee_cocktail_flip_w)
{
- gridlee_state *state = space->machine().driver_data<gridlee_state>();
- state->m_cocktail_flip = data & 1;
+ m_cocktail_flip = data & 1;
}
@@ -94,15 +93,14 @@ WRITE8_HANDLER( gridlee_cocktail_flip_w )
*
*************************************/
-WRITE8_HANDLER( gridlee_videoram_w )
+WRITE8_MEMBER(gridlee_state::gridlee_videoram_w)
{
- gridlee_state *state = space->machine().driver_data<gridlee_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
/* expand the two pixel values into two bytes */
- state->m_local_videoram[offset * 2 + 0] = data >> 4;
- state->m_local_videoram[offset * 2 + 1] = data & 15;
+ m_local_videoram[offset * 2 + 0] = data >> 4;
+ m_local_videoram[offset * 2 + 1] = data & 15;
}
@@ -113,12 +111,11 @@ WRITE8_HANDLER( gridlee_videoram_w )
*
*************************************/
-WRITE8_HANDLER( gridlee_palette_select_w )
+WRITE8_MEMBER(gridlee_state::gridlee_palette_select_w)
{
- gridlee_state *state = space->machine().driver_data<gridlee_state>();
/* update the scanline palette */
- space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos() - 1 + GRIDLEE_VBEND);
- state->m_palettebank_vis = data & 0x3f;
+ machine().primary_screen->update_partial(machine().primary_screen->vpos() - 1 + GRIDLEE_VBEND);
+ m_palettebank_vis = data & 0x3f;
}
diff --git a/src/mame/video/gstriker.c b/src/mame/video/gstriker.c
index 87bdbe1a4a3..dffa1324856 100644
--- a/src/mame/video/gstriker.c
+++ b/src/mame/video/gstriker.c
@@ -39,18 +39,16 @@ static TILE_GET_INFO( VS920A_get_tile_info )
SET_TILE_INFO(state->m_VS920A_cur_chip->gfx_region, tileno, state->m_VS920A_cur_chip->pal_base + pal, 0);
}
-WRITE16_HANDLER( VS920A_0_vram_w )
+WRITE16_MEMBER(gstriker_state::VS920A_0_vram_w)
{
- gstriker_state *state = space->machine().driver_data<gstriker_state>();
- COMBINE_DATA(&state->m_VS920A[0].vram[offset]);
- state->m_VS920A[0].tmap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_VS920A[0].vram[offset]);
+ m_VS920A[0].tmap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( VS920A_1_vram_w )
+WRITE16_MEMBER(gstriker_state::VS920A_1_vram_w)
{
- gstriker_state *state = space->machine().driver_data<gstriker_state>();
- COMBINE_DATA(&state->m_VS920A[1].vram[offset]);
- state->m_VS920A[1].tmap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_VS920A[1].vram[offset]);
+ m_VS920A[1].tmap->mark_tile_dirty(offset);
}
static void VS920A_init(running_machine &machine, int numchips)
@@ -156,9 +154,9 @@ static TILE_GET_INFO( MB60553_get_tile_info )
SET_TILE_INFO(state->m_MB60553->gfx_region, tileno + state->m_MB60553_cur_chip->bank[bankno] * 0x200, pal + state->m_MB60553->pal_base, 0);
}
-static void MB60553_reg_written(gstriker_state *state, int numchip, int num_reg)
+void gstriker_state::MB60553_reg_written(int numchip, int num_reg)
{
- tMB60553* cur = &state->m_MB60553[numchip];
+ tMB60553* cur = &m_MB60553[numchip];
switch (num_reg)
{
@@ -286,42 +284,38 @@ static tilemap_t* MB60553_get_tilemap(gstriker_state *state, int numchip)
}
-WRITE16_HANDLER(MB60553_0_regs_w)
+WRITE16_MEMBER(gstriker_state::MB60553_0_regs_w)
{
- gstriker_state *state = space->machine().driver_data<gstriker_state>();
- UINT16 oldreg = state->m_MB60553[0].regs[offset];
+ UINT16 oldreg = m_MB60553[0].regs[offset];
- COMBINE_DATA(&state->m_MB60553[0].regs[offset]);
+ COMBINE_DATA(&m_MB60553[0].regs[offset]);
- if (state->m_MB60553[0].regs[offset] != oldreg)
- MB60553_reg_written(state, 0, offset);
+ if (m_MB60553[0].regs[offset] != oldreg)
+ MB60553_reg_written(0, offset);
}
-WRITE16_HANDLER(MB60553_1_regs_w)
+WRITE16_MEMBER(gstriker_state::MB60553_1_regs_w)
{
- gstriker_state *state = space->machine().driver_data<gstriker_state>();
- UINT16 oldreg = state->m_MB60553[1].regs[offset];
+ UINT16 oldreg = m_MB60553[1].regs[offset];
- COMBINE_DATA(&state->m_MB60553[1].regs[offset]);
+ COMBINE_DATA(&m_MB60553[1].regs[offset]);
- if (state->m_MB60553[1].regs[offset] != oldreg)
- MB60553_reg_written(state, 1, offset);
+ if (m_MB60553[1].regs[offset] != oldreg)
+ MB60553_reg_written(1, offset);
}
-WRITE16_HANDLER(MB60553_0_vram_w)
+WRITE16_MEMBER(gstriker_state::MB60553_0_vram_w)
{
- gstriker_state *state = space->machine().driver_data<gstriker_state>();
- COMBINE_DATA(&state->m_MB60553[0].vram[offset]);
+ COMBINE_DATA(&m_MB60553[0].vram[offset]);
- state->m_MB60553[0].tmap->mark_tile_dirty(offset);
+ m_MB60553[0].tmap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER(MB60553_1_vram_w)
+WRITE16_MEMBER(gstriker_state::MB60553_1_vram_w)
{
- gstriker_state *state = space->machine().driver_data<gstriker_state>();
- COMBINE_DATA(&state->m_MB60553[1].vram[offset]);
+ COMBINE_DATA(&m_MB60553[1].vram[offset]);
- state->m_MB60553[1].tmap->mark_tile_dirty(offset);
+ m_MB60553[1].tmap->mark_tile_dirty(offset);
}
@@ -525,7 +519,7 @@ static void CG10103_set_transpen(gstriker_state *state, int numchip, int transpe
#ifdef UNUSED_FUNCTION
-WRITE16_HANDLER( gsx_videoram3_w )
+WRITE16_MEMBER(gstriker_state::gsx_videoram3_w)
{
// This memory appears to be empty in gstriker
gs_videoram3[offset] = data;
diff --git a/src/mame/video/gsword.c b/src/mame/video/gsword.c
index 9291732b387..f6920413726 100644
--- a/src/mame/video/gsword.c
+++ b/src/mame/video/gsword.c
@@ -90,27 +90,24 @@ PALETTE_INIT( gsword )
PALETTE_INIT_CALL(common);
}
-WRITE8_HANDLER( gsword_videoram_w )
+WRITE8_MEMBER(gsword_state::gsword_videoram_w)
{
- gsword_state *state = space->machine().driver_data<gsword_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( gsword_charbank_w )
+WRITE8_MEMBER(gsword_state::gsword_charbank_w)
{
- gsword_state *state = space->machine().driver_data<gsword_state>();
- if (state->m_charbank != data)
+ if (m_charbank != data)
{
- state->m_charbank = data;
- space->machine().tilemap().mark_all_dirty();
+ m_charbank = data;
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( gsword_videoctrl_w )
+WRITE8_MEMBER(gsword_state::gsword_videoctrl_w)
{
- gsword_state *state = space->machine().driver_data<gsword_state>();
if (data & 0x8f)
{
popmessage("videoctrl %02x",data);
@@ -118,18 +115,18 @@ WRITE8_HANDLER( gsword_videoctrl_w )
/* bits 5-6 are char palette bank */
- if (state->m_charpalbank != ((data & 0x60) >> 5))
+ if (m_charpalbank != ((data & 0x60) >> 5))
{
- state->m_charpalbank = (data & 0x60) >> 5;
- space->machine().tilemap().mark_all_dirty();
+ m_charpalbank = (data & 0x60) >> 5;
+ machine().tilemap().mark_all_dirty();
}
/* bit 4 is flip screen */
- if (state->m_flipscreen != (data & 0x10))
+ if (m_flipscreen != (data & 0x10))
{
- state->m_flipscreen = data & 0x10;
- space->machine().tilemap().mark_all_dirty();
+ m_flipscreen = data & 0x10;
+ machine().tilemap().mark_all_dirty();
}
/* bit 0 could be used but unknown */
@@ -137,10 +134,9 @@ WRITE8_HANDLER( gsword_videoctrl_w )
/* other bits unused */
}
-WRITE8_HANDLER( gsword_scroll_w )
+WRITE8_MEMBER(gsword_state::gsword_scroll_w)
{
- gsword_state *state = space->machine().driver_data<gsword_state>();
- state->m_bg_tilemap->set_scrolly(0, data);
+ m_bg_tilemap->set_scrolly(0, data);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/gumbo.c b/src/mame/video/gumbo.c
index ca6a529305d..836f5a315eb 100644
--- a/src/mame/video/gumbo.c
+++ b/src/mame/video/gumbo.c
@@ -4,11 +4,10 @@
#include "includes/gumbo.h"
-WRITE16_HANDLER( gumbo_bg_videoram_w )
+WRITE16_MEMBER(gumbo_state::gumbo_bg_videoram_w)
{
- gumbo_state *state = space->machine().driver_data<gumbo_state>();
- COMBINE_DATA(&state->m_bg_videoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bg_videoram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_gumbo_bg_tile_info )
@@ -19,11 +18,10 @@ static TILE_GET_INFO( get_gumbo_bg_tile_info )
}
-WRITE16_HANDLER( gumbo_fg_videoram_w )
+WRITE16_MEMBER(gumbo_state::gumbo_fg_videoram_w)
{
- gumbo_state *state = space->machine().driver_data<gumbo_state>();
- COMBINE_DATA(&state->m_fg_videoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_fg_videoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_gumbo_fg_tile_info )
diff --git a/src/mame/video/gundealr.c b/src/mame/video/gundealr.c
index 33577fdd402..1cf5043bddd 100644
--- a/src/mame/video/gundealr.c
+++ b/src/mame/video/gundealr.c
@@ -69,59 +69,53 @@ VIDEO_START( gundealr )
***************************************************************************/
-WRITE8_HANDLER( gundealr_bg_videoram_w )
+WRITE8_MEMBER(gundealr_state::gundealr_bg_videoram_w)
{
- gundealr_state *state = space->machine().driver_data<gundealr_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( gundealr_fg_videoram_w )
+WRITE8_MEMBER(gundealr_state::gundealr_fg_videoram_w)
{
- gundealr_state *state = space->machine().driver_data<gundealr_state>();
- state->m_fg_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset / 2);
+ m_fg_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( gundealr_paletteram_w )
+WRITE8_MEMBER(gundealr_state::gundealr_paletteram_w)
{
- gundealr_state *state = space->machine().driver_data<gundealr_state>();
int r,g,b,val;
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
- val = state->m_paletteram[offset & ~1];
+ val = m_paletteram[offset & ~1];
r = (val >> 4) & 0x0f;
g = (val >> 0) & 0x0f;
- val = state->m_paletteram[offset | 1];
+ val = m_paletteram[offset | 1];
b = (val >> 4) & 0x0f;
/* TODO: the bottom 4 bits are used as well, but I'm not sure about the meaning */
- palette_set_color_rgb(space->machine(), offset / 2, pal4bit(r), pal4bit(g), pal4bit(b));
+ palette_set_color_rgb(machine(), offset / 2, pal4bit(r), pal4bit(g), pal4bit(b));
}
-WRITE8_HANDLER( gundealr_fg_scroll_w )
+WRITE8_MEMBER(gundealr_state::gundealr_fg_scroll_w)
{
- gundealr_state *state = space->machine().driver_data<gundealr_state>();
- state->m_scroll[offset] = data;
- state->m_fg_tilemap->set_scrollx(0, state->m_scroll[1] | ((state->m_scroll[0] & 0x03) << 8));
- state->m_fg_tilemap->set_scrolly(0, state->m_scroll[3] | ((state->m_scroll[2] & 0x03) << 8));
+ m_scroll[offset] = data;
+ m_fg_tilemap->set_scrollx(0, m_scroll[1] | ((m_scroll[0] & 0x03) << 8));
+ m_fg_tilemap->set_scrolly(0, m_scroll[3] | ((m_scroll[2] & 0x03) << 8));
}
-WRITE8_HANDLER( yamyam_fg_scroll_w )
+WRITE8_MEMBER(gundealr_state::yamyam_fg_scroll_w)
{
- gundealr_state *state = space->machine().driver_data<gundealr_state>();
- state->m_scroll[offset] = data;
- state->m_fg_tilemap->set_scrollx(0, state->m_scroll[0] | ((state->m_scroll[1] & 0x03) << 8));
- state->m_fg_tilemap->set_scrolly(0, state->m_scroll[2] | ((state->m_scroll[3] & 0x03) << 8));
+ m_scroll[offset] = data;
+ m_fg_tilemap->set_scrollx(0, m_scroll[0] | ((m_scroll[1] & 0x03) << 8));
+ m_fg_tilemap->set_scrolly(0, m_scroll[2] | ((m_scroll[3] & 0x03) << 8));
}
-WRITE8_HANDLER( gundealr_flipscreen_w )
+WRITE8_MEMBER(gundealr_state::gundealr_flipscreen_w)
{
- gundealr_state *state = space->machine().driver_data<gundealr_state>();
- state->m_flipscreen = data;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen = data;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c
index f118348ab2a..4daf89c2e59 100644
--- a/src/mame/video/gunsmoke.c
+++ b/src/mame/video/gunsmoke.c
@@ -58,52 +58,48 @@ PALETTE_INIT( gunsmoke )
}
}
-WRITE8_HANDLER( gunsmoke_videoram_w )
+WRITE8_MEMBER(gunsmoke_state::gunsmoke_videoram_w)
{
- gunsmoke_state *state = space->machine().driver_data<gunsmoke_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( gunsmoke_colorram_w )
+WRITE8_MEMBER(gunsmoke_state::gunsmoke_colorram_w)
{
- gunsmoke_state *state = space->machine().driver_data<gunsmoke_state>();
- state->m_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( gunsmoke_c804_w )
+WRITE8_MEMBER(gunsmoke_state::gunsmoke_c804_w)
{
- gunsmoke_state *state = space->machine().driver_data<gunsmoke_state>();
/* bits 0 and 1 are for coin counters */
- coin_counter_w(space->machine(), 1, data & 0x01);
- coin_counter_w(space->machine(), 0, data & 0x02);
+ coin_counter_w(machine(), 1, data & 0x01);
+ coin_counter_w(machine(), 0, data & 0x02);
/* bits 2 and 3 select the ROM bank */
- memory_set_bank(space->machine(), "bank1", (data & 0x0c) >> 2);
+ memory_set_bank(machine(), "bank1", (data & 0x0c) >> 2);
/* bit 5 resets the sound CPU? - we ignore it */
/* bit 6 flips screen */
- flip_screen_set(space->machine(), data & 0x40);
+ flip_screen_set(machine(), data & 0x40);
/* bit 7 enables characters? */
- state->m_chon = data & 0x80;
+ m_chon = data & 0x80;
}
-WRITE8_HANDLER( gunsmoke_d806_w )
+WRITE8_MEMBER(gunsmoke_state::gunsmoke_d806_w)
{
- gunsmoke_state *state = space->machine().driver_data<gunsmoke_state>();
/* bits 0-2 select the sprite 3 bank */
- state->m_sprite3bank = data & 0x07;
+ m_sprite3bank = data & 0x07;
/* bit 4 enables bg 1? */
- state->m_bgon = data & 0x10;
+ m_bgon = data & 0x10;
/* bit 5 enables sprites? */
- state->m_objon = data & 0x20;
+ m_objon = data & 0x20;
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c
index 02ba0634a2a..3d81bbea25c 100644
--- a/src/mame/video/gyruss.c
+++ b/src/mame/video/gyruss.c
@@ -91,11 +91,10 @@ PALETTE_INIT( gyruss )
-WRITE8_HANDLER( gyruss_spriteram_w )
+WRITE8_MEMBER(gyruss_state::gyruss_spriteram_w)
{
- gyruss_state *state = space->machine().driver_data<gyruss_state>();
- space->machine().primary_screen->update_now();
- state->m_spriteram[offset] = data;
+ machine().primary_screen->update_now();
+ m_spriteram[offset] = data;
}
@@ -122,10 +121,10 @@ VIDEO_START( gyruss )
-READ8_HANDLER( gyruss_scanline_r )
+READ8_MEMBER(gyruss_state::gyruss_scanline_r)
{
/* reads 1V - 128V */
- return space->machine().primary_screen->vpos();
+ return machine().primary_screen->vpos();
}
diff --git a/src/mame/video/hanaawas.c b/src/mame/video/hanaawas.c
index 783a0beb610..513b564e0a5 100644
--- a/src/mame/video/hanaawas.c
+++ b/src/mame/video/hanaawas.c
@@ -62,21 +62,19 @@ PALETTE_INIT( hanaawas )
}
}
-WRITE8_HANDLER( hanaawas_videoram_w )
+WRITE8_MEMBER(hanaawas_state::hanaawas_videoram_w)
{
- hanaawas_state *state = space->machine().driver_data<hanaawas_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( hanaawas_colorram_w )
+WRITE8_MEMBER(hanaawas_state::hanaawas_colorram_w)
{
- hanaawas_state *state = space->machine().driver_data<hanaawas_state>();
- state->m_colorram[offset] = data;
+ m_colorram[offset] = data;
/* dirty both current and next offsets */
- state->m_bg_tilemap->mark_tile_dirty(offset);
- state->m_bg_tilemap->mark_tile_dirty((offset + (flip_screen_get(space->machine()) ? -1 : 1)) & 0x03ff);
+ m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty((offset + (flip_screen_get(machine()) ? -1 : 1)) & 0x03ff);
}
WRITE8_DEVICE_HANDLER( hanaawas_portB_w )
diff --git a/src/mame/video/hcastle.c b/src/mame/video/hcastle.c
index ce103096bbb..b5c4c74d2b3 100644
--- a/src/mame/video/hcastle.c
+++ b/src/mame/video/hcastle.c
@@ -146,66 +146,60 @@ VIDEO_START( hcastle )
***************************************************************************/
-WRITE8_HANDLER( hcastle_pf1_video_w )
+WRITE8_MEMBER(hcastle_state::hcastle_pf1_video_w)
{
- hcastle_state *state = space->machine().driver_data<hcastle_state>();
- state->m_pf1_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0xbff);
+ m_pf1_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0xbff);
}
-WRITE8_HANDLER( hcastle_pf2_video_w )
+WRITE8_MEMBER(hcastle_state::hcastle_pf2_video_w)
{
- hcastle_state *state = space->machine().driver_data<hcastle_state>();
- state->m_pf2_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0xbff);
+ m_pf2_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0xbff);
}
-WRITE8_HANDLER( hcastle_gfxbank_w )
+WRITE8_MEMBER(hcastle_state::hcastle_gfxbank_w)
{
- hcastle_state *state = space->machine().driver_data<hcastle_state>();
- state->m_gfx_bank = data;
+ m_gfx_bank = data;
}
-READ8_HANDLER( hcastle_gfxbank_r )
+READ8_MEMBER(hcastle_state::hcastle_gfxbank_r)
{
- hcastle_state *state = space->machine().driver_data<hcastle_state>();
- return state->m_gfx_bank;
+ return m_gfx_bank;
}
-WRITE8_HANDLER( hcastle_pf1_control_w )
+WRITE8_MEMBER(hcastle_state::hcastle_pf1_control_w)
{
- hcastle_state *state = space->machine().driver_data<hcastle_state>();
if (offset == 3)
{
if ((data & 0x8) == 0)
- state->m_spriteram->copy(0x800, 0x800);
+ m_spriteram->copy(0x800, 0x800);
else
- state->m_spriteram->copy(0x000, 0x800);
+ m_spriteram->copy(0x000, 0x800);
}
else if (offset == 7)
{
- state->m_fg_tilemap->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_fg_tilemap->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
- k007121_ctrl_w(state->m_k007121_1, offset, data);
+ k007121_ctrl_w(m_k007121_1, offset, data);
}
-WRITE8_HANDLER( hcastle_pf2_control_w )
+WRITE8_MEMBER(hcastle_state::hcastle_pf2_control_w)
{
- hcastle_state *state = space->machine().driver_data<hcastle_state>();
if (offset == 3)
{
if ((data & 0x8) == 0)
- state->m_spriteram2->copy(0x800, 0x800);
+ m_spriteram2->copy(0x800, 0x800);
else
- state->m_spriteram2->copy(0x000, 0x800);
+ m_spriteram2->copy(0x000, 0x800);
}
else if (offset == 7)
{
- state->m_bg_tilemap->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_bg_tilemap->set_flip((data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
- k007121_ctrl_w(state->m_k007121_2, offset, data);
+ k007121_ctrl_w(m_k007121_2, offset, data);
}
/*****************************************************************************/
diff --git a/src/mame/video/hexion.c b/src/mame/video/hexion.c
index a950a934a1f..beebc5f1c78 100644
--- a/src/mame/video/hexion.c
+++ b/src/mame/video/hexion.c
@@ -63,98 +63,93 @@ VIDEO_START( hexion )
***************************************************************************/
-WRITE8_HANDLER( hexion_bankswitch_w )
+WRITE8_MEMBER(hexion_state::hexion_bankswitch_w)
{
- hexion_state *state = space->machine().driver_data<hexion_state>();
- UINT8 *rom = space->machine().region("maincpu")->base() + 0x10000;
+ UINT8 *rom = machine().region("maincpu")->base() + 0x10000;
/* bits 0-3 select ROM bank */
- memory_set_bankptr(space->machine(), "bank1",rom + 0x2000 * (data & 0x0f));
+ memory_set_bankptr(machine(), "bank1",rom + 0x2000 * (data & 0x0f));
/* does bit 6 trigger the 052591? */
if (data & 0x40)
{
- int bank = state->m_unkram[0]&1;
- memset(state->m_vram[bank],state->m_unkram[1],0x2000);
- state->m_bg_tilemap[bank]->mark_all_dirty();
+ int bank = m_unkram[0]&1;
+ memset(m_vram[bank],m_unkram[1],0x2000);
+ m_bg_tilemap[bank]->mark_all_dirty();
}
/* bit 7 = PMC-BK */
- state->m_pmcbank = (data & 0x80) >> 7;
+ m_pmcbank = (data & 0x80) >> 7;
/* other bits unknown */
if (data & 0x30)
popmessage("bankswitch %02x",data&0xf0);
-//logerror("%04x: bankswitch_w %02x\n",cpu_get_pc(&space->device()),data);
+//logerror("%04x: bankswitch_w %02x\n",cpu_get_pc(&space.device()),data);
}
-READ8_HANDLER( hexion_bankedram_r )
+READ8_MEMBER(hexion_state::hexion_bankedram_r)
{
- hexion_state *state = space->machine().driver_data<hexion_state>();
- if (state->m_gfxrom_select && offset < 0x1000)
+ if (m_gfxrom_select && offset < 0x1000)
{
- return space->machine().region("gfx1")->base()[((state->m_gfxrom_select & 0x7f) << 12) + offset];
+ return machine().region("gfx1")->base()[((m_gfxrom_select & 0x7f) << 12) + offset];
}
- else if (state->m_bankctrl == 0)
+ else if (m_bankctrl == 0)
{
- return state->m_vram[state->m_rambank][offset];
+ return m_vram[m_rambank][offset];
}
- else if (state->m_bankctrl == 2 && offset < 0x800)
+ else if (m_bankctrl == 2 && offset < 0x800)
{
- return state->m_unkram[offset];
+ return m_unkram[offset];
}
else
{
-//logerror("%04x: bankedram_r offset %04x, bankctrl = %02x\n",cpu_get_pc(&space->device()),offset,state->m_bankctrl);
+//logerror("%04x: bankedram_r offset %04x, bankctrl = %02x\n",cpu_get_pc(&space.device()),offset,m_bankctrl);
return 0;
}
}
-WRITE8_HANDLER( hexion_bankedram_w )
+WRITE8_MEMBER(hexion_state::hexion_bankedram_w)
{
- hexion_state *state = space->machine().driver_data<hexion_state>();
- if (state->m_bankctrl == 3 && offset == 0 && (data & 0xfe) == 0)
+ if (m_bankctrl == 3 && offset == 0 && (data & 0xfe) == 0)
{
-//logerror("%04x: bankedram_w offset %04x, data %02x, bankctrl = %02x\n",cpu_get_pc(&space->device()),offset,data,state->m_bankctrl);
- state->m_rambank = data & 1;
+//logerror("%04x: bankedram_w offset %04x, data %02x, bankctrl = %02x\n",cpu_get_pc(&space.device()),offset,data,m_bankctrl);
+ m_rambank = data & 1;
}
- else if (state->m_bankctrl == 0)
+ else if (m_bankctrl == 0)
{
- if (state->m_pmcbank)
+ if (m_pmcbank)
{
-//logerror("%04x: bankedram_w offset %04x, data %02x, bankctrl = %02x\n",cpu_get_pc(&space->device()),offset,data,state->m_bankctrl);
- state->m_vram[state->m_rambank][offset] = data;
- state->m_bg_tilemap[state->m_rambank]->mark_tile_dirty(offset/4);
+//logerror("%04x: bankedram_w offset %04x, data %02x, bankctrl = %02x\n",cpu_get_pc(&space.device()),offset,data,m_bankctrl);
+ m_vram[m_rambank][offset] = data;
+ m_bg_tilemap[m_rambank]->mark_tile_dirty(offset/4);
}
else
- logerror("%04x pmc internal ram %04x = %02x\n",cpu_get_pc(&space->device()),offset,data);
+ logerror("%04x pmc internal ram %04x = %02x\n",cpu_get_pc(&space.device()),offset,data);
}
- else if (state->m_bankctrl == 2 && offset < 0x800)
+ else if (m_bankctrl == 2 && offset < 0x800)
{
- if (state->m_pmcbank)
+ if (m_pmcbank)
{
-//logerror("%04x: unkram_w offset %04x, data %02x, bankctrl = %02x\n",cpu_get_pc(&space->device()),offset,data,state->m_bankctrl);
- state->m_unkram[offset] = data;
+//logerror("%04x: unkram_w offset %04x, data %02x, bankctrl = %02x\n",cpu_get_pc(&space.device()),offset,data,m_bankctrl);
+ m_unkram[offset] = data;
}
else
- logerror("%04x pmc internal ram %04x = %02x\n",cpu_get_pc(&space->device()),offset,data);
+ logerror("%04x pmc internal ram %04x = %02x\n",cpu_get_pc(&space.device()),offset,data);
}
else
-logerror("%04x: bankedram_w offset %04x, data %02x, bankctrl = %02x\n",cpu_get_pc(&space->device()),offset,data,state->m_bankctrl);
+logerror("%04x: bankedram_w offset %04x, data %02x, bankctrl = %02x\n",cpu_get_pc(&space.device()),offset,data,m_bankctrl);
}
-WRITE8_HANDLER( hexion_bankctrl_w )
+WRITE8_MEMBER(hexion_state::hexion_bankctrl_w)
{
- hexion_state *state = space->machine().driver_data<hexion_state>();
-//logerror("%04x: bankctrl_w %02x\n",cpu_get_pc(&space->device()),data);
- state->m_bankctrl = data;
+//logerror("%04x: bankctrl_w %02x\n",cpu_get_pc(&space.device()),data);
+ m_bankctrl = data;
}
-WRITE8_HANDLER( hexion_gfxrom_select_w )
+WRITE8_MEMBER(hexion_state::hexion_gfxrom_select_w)
{
- hexion_state *state = space->machine().driver_data<hexion_state>();
-//logerror("%04x: gfxrom_select_w %02x\n",cpu_get_pc(&space->device()),data);
- state->m_gfxrom_select = data;
+//logerror("%04x: gfxrom_select_w %02x\n",cpu_get_pc(&space.device()),data);
+ m_gfxrom_select = data;
}
diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c
index 47efa4d6e6c..f8182fdfdc0 100644
--- a/src/mame/video/higemaru.c
+++ b/src/mame/video/higemaru.c
@@ -1,18 +1,16 @@
#include "emu.h"
#include "includes/higemaru.h"
-WRITE8_HANDLER( higemaru_videoram_w )
+WRITE8_MEMBER(higemaru_state::higemaru_videoram_w)
{
- higemaru_state *state = space->machine().driver_data<higemaru_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( higemaru_colorram_w )
+WRITE8_MEMBER(higemaru_state::higemaru_colorram_w)
{
- higemaru_state *state = space->machine().driver_data<higemaru_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
/***************************************************************************
@@ -73,21 +71,20 @@ PALETTE_INIT( higemaru )
}
}
-WRITE8_HANDLER( higemaru_c800_w )
+WRITE8_MEMBER(higemaru_state::higemaru_c800_w)
{
- higemaru_state *state = space->machine().driver_data<higemaru_state>();
if (data & 0x7c)
logerror("c800 = %02x\n",data);
/* bits 0 and 1 are coin counters */
- coin_counter_w(space->machine(), 0,data & 2);
- coin_counter_w(space->machine(), 1,data & 1);
+ coin_counter_w(machine(), 0,data & 2);
+ coin_counter_w(machine(), 1,data & 1);
/* bit 7 flips screen */
- if (flip_screen_get(space->machine()) != (data & 0x80))
+ if (flip_screen_get(machine()) != (data & 0x80))
{
- flip_screen_set(space->machine(), data & 0x80);
- state->m_bg_tilemap->mark_all_dirty();
+ flip_screen_set(machine(), data & 0x80);
+ m_bg_tilemap->mark_all_dirty();
}
}
diff --git a/src/mame/video/himesiki.c b/src/mame/video/himesiki.c
index 4ee045601b6..f374e685714 100644
--- a/src/mame/video/himesiki.c
+++ b/src/mame/video/himesiki.c
@@ -27,24 +27,21 @@ VIDEO_START( himesiki )
state->m_bg_tilemap = tilemap_create( machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32);
}
-WRITE8_HANDLER( himesiki_bg_ram_w )
+WRITE8_MEMBER(himesiki_state::himesiki_bg_ram_w)
{
- himesiki_state *state = space->machine().driver_data<himesiki_state>();
- state->m_bg_ram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_ram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( himesiki_scrollx_w )
+WRITE8_MEMBER(himesiki_state::himesiki_scrollx_w)
{
- himesiki_state *state = space->machine().driver_data<himesiki_state>();
- state->m_scrollx[offset] = data;
+ m_scrollx[offset] = data;
}
-WRITE8_HANDLER( himesiki_flip_w )
+WRITE8_MEMBER(himesiki_state::himesiki_flip_w)
{
- himesiki_state *state = space->machine().driver_data<himesiki_state>();
- state->m_flipscreen = data & 0xc0;
- flip_screen_set(space->machine(), state->m_flipscreen);
+ m_flipscreen = data & 0xc0;
+ flip_screen_set(machine(), m_flipscreen);
if (data & 0x3f)
logerror("p08_w %02x\n",data);
diff --git a/src/mame/video/hnayayoi.c b/src/mame/video/hnayayoi.c
index 4ba19658456..3a4b6351584 100644
--- a/src/mame/video/hnayayoi.c
+++ b/src/mame/video/hnayayoi.c
@@ -100,17 +100,16 @@ up blit_src for the second call.
***************************************************************************/
-WRITE8_HANDLER( dynax_blitter_rev1_param_w )
+WRITE8_MEMBER(hnayayoi_state::dynax_blitter_rev1_param_w)
{
- hnayayoi_state *state = space->machine().driver_data<hnayayoi_state>();
switch (offset)
{
- case 0: state->m_blit_dest = (state->m_blit_dest & 0xff00) | (data << 0); break;
- case 1: state->m_blit_dest = (state->m_blit_dest & 0x00ff) | (data << 8); break;
- case 2: state->m_blit_layer = data; break;
- case 3: state->m_blit_src = (state->m_blit_src & 0xffff00) | (data << 0); break;
- case 4: state->m_blit_src = (state->m_blit_src & 0xff00ff) | (data << 8); break;
- case 5: state->m_blit_src = (state->m_blit_src & 0x00ffff) | (data <<16); break;
+ case 0: m_blit_dest = (m_blit_dest & 0xff00) | (data << 0); break;
+ case 1: m_blit_dest = (m_blit_dest & 0x00ff) | (data << 8); break;
+ case 2: m_blit_layer = data; break;
+ case 3: m_blit_src = (m_blit_src & 0xffff00) | (data << 0); break;
+ case 4: m_blit_src = (m_blit_src & 0xff00ff) | (data << 8); break;
+ case 5: m_blit_src = (m_blit_src & 0x00ffff) | (data <<16); break;
}
}
@@ -129,23 +128,22 @@ static void copy_pixel( running_machine &machine, int x, int y, int pen )
}
}
-WRITE8_HANDLER( dynax_blitter_rev1_start_w )
+WRITE8_MEMBER(hnayayoi_state::dynax_blitter_rev1_start_w)
{
- hnayayoi_state *state = space->machine().driver_data<hnayayoi_state>();
- UINT8 *rom = space->machine().region("gfx1")->base();
- int romlen = space->machine().region("gfx1")->bytes();
- int sx = state->m_blit_dest & 0xff;
- int sy = state->m_blit_dest >> 8;
+ UINT8 *rom = machine().region("gfx1")->base();
+ int romlen = machine().region("gfx1")->bytes();
+ int sx = m_blit_dest & 0xff;
+ int sy = m_blit_dest >> 8;
int x, y;
x = sx;
y = sy;
- while (state->m_blit_src < romlen)
+ while (m_blit_src < romlen)
{
- int cmd = rom[state->m_blit_src] & 0x0f;
- int pen = rom[state->m_blit_src] >> 4;
+ int cmd = rom[m_blit_src] & 0x0f;
+ int pen = rom[m_blit_src] >> 4;
- state->m_blit_src++;
+ m_blit_src++;
switch (cmd)
{
@@ -155,31 +153,31 @@ WRITE8_HANDLER( dynax_blitter_rev1_start_w )
break;
case 0xe:
- if (state->m_blit_src >= romlen)
+ if (m_blit_src >= romlen)
{
- popmessage("GFXROM OVER %06x", state->m_blit_src);
+ popmessage("GFXROM OVER %06x", m_blit_src);
return;
}
x = sx;
- state->m_blit_layer = rom[state->m_blit_src++];
+ m_blit_layer = rom[m_blit_src++];
break;
case 0xd:
- if (state->m_blit_src >= romlen)
+ if (m_blit_src >= romlen)
{
- popmessage("GFXROM OVER %06x", state->m_blit_src);
+ popmessage("GFXROM OVER %06x", m_blit_src);
return;
}
- x = sx + rom[state->m_blit_src++];
+ x = sx + rom[m_blit_src++];
/* fall through into next case */
case 0xc:
- if (state->m_blit_src >= romlen)
+ if (m_blit_src >= romlen)
{
- popmessage("GFXROM OVER %06x", state->m_blit_src);
+ popmessage("GFXROM OVER %06x", m_blit_src);
return;
}
- cmd = rom[state->m_blit_src++];
+ cmd = rom[m_blit_src++];
/* fall through into next case */
case 0xb:
@@ -194,7 +192,7 @@ WRITE8_HANDLER( dynax_blitter_rev1_start_w )
case 0x2:
case 0x1:
while (cmd--)
- copy_pixel(space->machine(), x++, y, pen);
+ copy_pixel(machine(), x++, y, pen);
break;
case 0x0:
@@ -202,28 +200,26 @@ WRITE8_HANDLER( dynax_blitter_rev1_start_w )
}
}
- popmessage("GFXROM OVER %06x", state->m_blit_src);
+ popmessage("GFXROM OVER %06x", m_blit_src);
}
-WRITE8_HANDLER( dynax_blitter_rev1_clear_w )
+WRITE8_MEMBER(hnayayoi_state::dynax_blitter_rev1_clear_w)
{
- hnayayoi_state *state = space->machine().driver_data<hnayayoi_state>();
int pen = data >> 4;
int i;
for (i = 0; i < 8; i++)
{
- if ((~state->m_blit_layer & (1 << i)) && (state->m_pixmap[i]))
- memset(state->m_pixmap[i] + state->m_blit_dest, pen, 0x10000 - state->m_blit_dest);
+ if ((~m_blit_layer & (1 << i)) && (m_pixmap[i]))
+ memset(m_pixmap[i] + m_blit_dest, pen, 0x10000 - m_blit_dest);
}
}
-WRITE8_HANDLER( hnayayoi_palbank_w )
+WRITE8_MEMBER(hnayayoi_state::hnayayoi_palbank_w)
{
- hnayayoi_state *state = space->machine().driver_data<hnayayoi_state>();
offset *= 8;
- state->m_palbank = (state->m_palbank & (0xff00 >> offset)) | (data << offset);
+ m_palbank = (m_palbank & (0xff00 >> offset)) | (data << offset);
}
diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c
index 327e4c2f1ef..5479a726828 100644
--- a/src/mame/video/hng64.c
+++ b/src/mame/video/hng64.c
@@ -651,12 +651,11 @@ static TILE_GET_INFO( get_hng64_tile3_16x16_info )
}
-WRITE32_HANDLER( hng64_videoram_w )
+WRITE32_MEMBER(hng64_state::hng64_videoram_w)
{
- hng64_state *state = space->machine().driver_data<hng64_state>();
int realoff;
-
- COMBINE_DATA(&state->m_videoram[offset]);
+ hng64_state *state = machine().driver_data<hng64_state>();
+ COMBINE_DATA(&m_videoram[offset]);
realoff = offset*4;
diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c
index bcf71241028..ff7efd85834 100644
--- a/src/mame/video/holeland.c
+++ b/src/mame/video/holeland.c
@@ -69,43 +69,39 @@ VIDEO_START( crzrally )
state->m_bg_tilemap = tilemap_create(machine, crzrally_get_tile_info, tilemap_scan_cols, 8, 8, 32, 32);
}
-WRITE8_HANDLER( holeland_videoram_w )
+WRITE8_MEMBER(holeland_state::holeland_videoram_w)
{
- holeland_state *state = space->machine().driver_data<holeland_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( holeland_colorram_w )
+WRITE8_MEMBER(holeland_state::holeland_colorram_w)
{
- holeland_state *state = space->machine().driver_data<holeland_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( holeland_pal_offs_w )
+WRITE8_MEMBER(holeland_state::holeland_pal_offs_w)
{
- holeland_state *state = space->machine().driver_data<holeland_state>();
- if ((data & 1) != state->m_po[offset])
+ if ((data & 1) != m_po[offset])
{
- state->m_po[offset] = data & 1;
- state->m_palette_offset = (state->m_po[0] + (state->m_po[1] << 1)) << 4;
- space->machine().tilemap().mark_all_dirty();
+ m_po[offset] = data & 1;
+ m_palette_offset = (m_po[0] + (m_po[1] << 1)) << 4;
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( holeland_scroll_w )
+WRITE8_MEMBER(holeland_state::holeland_scroll_w)
{
- holeland_state *state = space->machine().driver_data<holeland_state>();
- state->m_bg_tilemap->set_scrollx(0, data);
+ m_bg_tilemap->set_scrollx(0, data);
}
-WRITE8_HANDLER( holeland_flipscreen_w )
+WRITE8_MEMBER(holeland_state::holeland_flipscreen_w)
{
if (offset)
- flip_screen_y_set(space->machine(), data);
+ flip_screen_y_set(machine(), data);
else
- flip_screen_x_set(space->machine(), data);
+ flip_screen_x_set(machine(), data);
}
diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c
index 10d68197863..38fb451ece0 100644
--- a/src/mame/video/homedata.c
+++ b/src/mame/video/homedata.c
@@ -99,7 +99,7 @@ static void mrokumei_handleblit( address_space *space, int rom_base )
} /* i!=0 */
if (data) /* 00 is a nop */
- mrokumei_videoram_w(space, base_addr + dest_addr, data);
+ state->mrokumei_videoram_w(*space, base_addr + dest_addr, data);
if (state->m_vreg[1] & 0x80) /* flip screen */
{
@@ -202,7 +202,7 @@ static void reikaids_handleblit( address_space *space, int rom_base )
addr ^= 0x007c;
}
- reikaids_videoram_w(space, addr, dat);
+ state->reikaids_videoram_w(*space, addr, dat);
}
}
@@ -289,7 +289,7 @@ static void pteacher_handleblit( address_space *space, int rom_base )
if ((addr & 0x2080) == 0)
{
addr = ((addr & 0xc000) >> 2) | ((addr & 0x1f00) >> 1) | (addr & 0x7f);
- mrokumei_videoram_w(space, addr, data);
+ state->mrokumei_videoram_w(*space, addr, data);
}
}
@@ -719,114 +719,103 @@ VIDEO_START( mirderby )
***************************************************************************/
-WRITE8_HANDLER( mrokumei_videoram_w )
+WRITE8_MEMBER(homedata_state::mrokumei_videoram_w)
{
- homedata_state *state = space->machine().driver_data<homedata_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap[(offset & 0x2000) >> 13][(offset & 0x1000) >> 12]->mark_tile_dirty((offset & 0xffe) >> 1);
+ m_videoram[offset] = data;
+ m_bg_tilemap[(offset & 0x2000) >> 13][(offset & 0x1000) >> 12]->mark_tile_dirty((offset & 0xffe) >> 1);
}
-WRITE8_HANDLER( reikaids_videoram_w )
+WRITE8_MEMBER(homedata_state::reikaids_videoram_w)
{
- homedata_state *state = space->machine().driver_data<homedata_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap[(offset & 0x2000) >> 13][offset & 3]->mark_tile_dirty((offset & 0xffc) >> 2);
+ m_videoram[offset] = data;
+ m_bg_tilemap[(offset & 0x2000) >> 13][offset & 3]->mark_tile_dirty((offset & 0xffc) >> 2);
}
-WRITE8_HANDLER( reikaids_gfx_bank_w )
+WRITE8_MEMBER(homedata_state::reikaids_gfx_bank_w)
{
- homedata_state *state = space->machine().driver_data<homedata_state>();
-//logerror( "%04x: [setbank %02x]\n",cpu_get_pc(&space->device()),data);
+//logerror( "%04x: [setbank %02x]\n",cpu_get_pc(&space.device()),data);
- if (state->m_gfx_bank[state->m_reikaids_which] != data)
+ if (m_gfx_bank[m_reikaids_which] != data)
{
- state->m_gfx_bank[state->m_reikaids_which] = data;
- space->machine().tilemap().mark_all_dirty();
+ m_gfx_bank[m_reikaids_which] = data;
+ machine().tilemap().mark_all_dirty();
}
- state->m_reikaids_which ^= 1;
+ m_reikaids_which ^= 1;
}
-WRITE8_HANDLER( pteacher_gfx_bank_w )
+WRITE8_MEMBER(homedata_state::pteacher_gfx_bank_w)
{
- homedata_state *state = space->machine().driver_data<homedata_state>();
-// logerror("%04x: gfxbank:=%02x\n", cpu_get_pc(&space->device()), data);
- if (state->m_gfx_bank[0] != data)
+// logerror("%04x: gfxbank:=%02x\n", cpu_get_pc(&space.device()), data);
+ if (m_gfx_bank[0] != data)
{
- state->m_gfx_bank[0] = data;
- space->machine().tilemap().mark_all_dirty();
+ m_gfx_bank[0] = data;
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( homedata_blitter_param_w )
+WRITE8_MEMBER(homedata_state::homedata_blitter_param_w)
{
- homedata_state *state = space->machine().driver_data<homedata_state>();
-//logerror("%04x: blitter_param_w %02x\n", cpu_get_pc(&space->device()), data);
- state->m_blitter_param[state->m_blitter_param_count] = data;
- state->m_blitter_param_count++;
- state->m_blitter_param_count &= 3;
+//logerror("%04x: blitter_param_w %02x\n", cpu_get_pc(&space.device()), data);
+ m_blitter_param[m_blitter_param_count] = data;
+ m_blitter_param_count++;
+ m_blitter_param_count &= 3;
}
-WRITE8_HANDLER( mrokumei_blitter_bank_w )
+WRITE8_MEMBER(homedata_state::mrokumei_blitter_bank_w)
{
- homedata_state *state = space->machine().driver_data<homedata_state>();
/* --xxx--- layer 1 gfx bank
-----x-- blitter ROM bank
------xx layer 0 gfx bank
*/
- if ((state->m_blitter_bank ^ data) & 0x3b)
- space->machine().tilemap().mark_all_dirty();
+ if ((m_blitter_bank ^ data) & 0x3b)
+ machine().tilemap().mark_all_dirty();
- state->m_blitter_bank = data;
+ m_blitter_bank = data;
}
-WRITE8_HANDLER( reikaids_blitter_bank_w )
+WRITE8_MEMBER(homedata_state::reikaids_blitter_bank_w)
{
- homedata_state *state = space->machine().driver_data<homedata_state>();
/* xxx----- priority control
----x--- target page? what's this for?
------xx blitter ROM bank
*/
- state->m_blitter_bank = data;
+ m_blitter_bank = data;
}
-WRITE8_HANDLER( pteacher_blitter_bank_w )
+WRITE8_MEMBER(homedata_state::pteacher_blitter_bank_w)
{
- homedata_state *state = space->machine().driver_data<homedata_state>();
/* xxx----- blitter ROM bank
-----x-- pixel clock (normal/slow)
------x- layer #1 gfx charset (lemnangl only)
-------x layer #0 gfx charset (lemnangl only)
*/
- if ((state->m_blitter_bank ^ data) & 0x03)
- space->machine().tilemap().mark_all_dirty();
+ if ((m_blitter_bank ^ data) & 0x03)
+ machine().tilemap().mark_all_dirty();
- state->m_blitter_bank = data;
+ m_blitter_bank = data;
}
-WRITE8_HANDLER( mrokumei_blitter_start_w )
+WRITE8_MEMBER(homedata_state::mrokumei_blitter_start_w)
{
- homedata_state *state = space->machine().driver_data<homedata_state>();
if (data & 0x80)
- mrokumei_handleblit(space, ((state->m_blitter_bank & 0x04) >> 2) * 0x10000);
+ mrokumei_handleblit(&space, ((m_blitter_bank & 0x04) >> 2) * 0x10000);
/* bit 0 = bank switch; used by hourouki to access the
optional service mode ROM (not available in current dump) */
}
-WRITE8_HANDLER( reikaids_blitter_start_w )
+WRITE8_MEMBER(homedata_state::reikaids_blitter_start_w)
{
- homedata_state *state = space->machine().driver_data<homedata_state>();
- reikaids_handleblit(space, (state->m_blitter_bank & 3) * 0x10000);
+ reikaids_handleblit(&space, (m_blitter_bank & 3) * 0x10000);
}
-WRITE8_HANDLER( pteacher_blitter_start_w )
+WRITE8_MEMBER(homedata_state::pteacher_blitter_start_w)
{
- homedata_state *state = space->machine().driver_data<homedata_state>();
- pteacher_handleblit(space, (state->m_blitter_bank >> 5) * 0x10000 & (space->machine().region("user1")->bytes() - 1));
+ pteacher_handleblit(&space, (m_blitter_bank >> 5) * 0x10000 & (machine().region("user1")->bytes() - 1));
}
diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c
index 9b193c5b0a2..19226ff214b 100644
--- a/src/mame/video/homerun.c
+++ b/src/mame/video/homerun.c
@@ -18,14 +18,13 @@ WRITE8_DEVICE_HANDLER(homerun_banking_w)
memory_set_bank(device->machine(), "bank1", data & 0x07);
}
-WRITE8_HANDLER( homerun_videoram_w )
+WRITE8_MEMBER(homerun_state::homerun_videoram_w)
{
- homerun_state *state = space->machine().driver_data<homerun_state>();
- state->m_videoram[offset] = data;
- state->m_tilemap->mark_tile_dirty(offset & 0xfff);
+ m_videoram[offset] = data;
+ m_tilemap->mark_tile_dirty(offset & 0xfff);
}
-WRITE8_HANDLER(homerun_color_w)
+WRITE8_MEMBER(homerun_state::homerun_color_w)
{
int r, g, b;
int bit0, bit1, bit2;
@@ -41,7 +40,7 @@ WRITE8_HANDLER(homerun_color_w)
bit1 = (data >> 6) & 0x01;
bit2 = (data >> 7) & 0x01;
b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2;
- palette_set_color(space->machine(), offset, MAKE_RGB(r,g,b));
+ palette_set_color(machine(), offset, MAKE_RGB(r,g,b));
}
static TILE_GET_INFO( get_homerun_tile_info )
diff --git a/src/mame/video/hyhoo.c b/src/mame/video/hyhoo.c
index 232f39c571a..ba22591099d 100644
--- a/src/mame/video/hyhoo.c
+++ b/src/mame/video/hyhoo.c
@@ -14,46 +14,44 @@
static void hyhoo_gfxdraw(running_machine &machine);
-WRITE8_HANDLER( hyhoo_blitter_w )
+WRITE8_MEMBER(hyhoo_state::hyhoo_blitter_w)
{
- hyhoo_state *state = space->machine().driver_data<hyhoo_state>();
switch (offset)
{
- case 0x00: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0xff00) | data;
- nb1413m3_gfxradr_l_w(space, 0, data); break;
- case 0x01: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0x00ff) | (data << 8);
- nb1413m3_gfxradr_h_w(space, 0, data); break;
- case 0x02: state->m_blitter_destx = data; break;
- case 0x03: state->m_blitter_desty = data; break;
- case 0x04: state->m_blitter_sizex = data; break;
- case 0x05: state->m_blitter_sizey = data;
+ case 0x00: m_blitter_src_addr = (m_blitter_src_addr & 0xff00) | data;
+ nb1413m3_gfxradr_l_w(&space, 0, data); break;
+ case 0x01: m_blitter_src_addr = (m_blitter_src_addr & 0x00ff) | (data << 8);
+ nb1413m3_gfxradr_h_w(&space, 0, data); break;
+ case 0x02: m_blitter_destx = data; break;
+ case 0x03: m_blitter_desty = data; break;
+ case 0x04: m_blitter_sizex = data; break;
+ case 0x05: m_blitter_sizey = data;
/* writing here also starts the blit */
- hyhoo_gfxdraw(space->machine());
+ hyhoo_gfxdraw(machine());
break;
- case 0x06: state->m_blitter_direction_x = (data >> 0) & 0x01;
- state->m_blitter_direction_y = (data >> 1) & 0x01;
- state->m_flipscreen = (~data >> 2) & 0x01;
- state->m_dispflag = (~data >> 3) & 0x01;
+ case 0x06: m_blitter_direction_x = (data >> 0) & 0x01;
+ m_blitter_direction_y = (data >> 1) & 0x01;
+ m_flipscreen = (~data >> 2) & 0x01;
+ m_dispflag = (~data >> 3) & 0x01;
break;
case 0x07: break;
}
}
-WRITE8_HANDLER( hyhoo_romsel_w )
+WRITE8_MEMBER(hyhoo_state::hyhoo_romsel_w)
{
- hyhoo_state *state = space->machine().driver_data<hyhoo_state>();
- int gfxlen = space->machine().region("gfx1")->bytes();
- state->m_gfxrom = (((data & 0xc0) >> 4) + (data & 0x03));
- state->m_highcolorflag = data;
- nb1413m3_gfxrombank_w(space, 0, data);
+ int gfxlen = machine().region("gfx1")->bytes();
+ m_gfxrom = (((data & 0xc0) >> 4) + (data & 0x03));
+ m_highcolorflag = data;
+ nb1413m3_gfxrombank_w(&space, 0, data);
- if ((0x20000 * state->m_gfxrom) > (gfxlen - 1))
+ if ((0x20000 * m_gfxrom) > (gfxlen - 1))
{
#ifdef MAME_DEBUG
popmessage("GFXROM BANK OVER!!");
#endif
- state->m_gfxrom &= (gfxlen / 0x20000 - 1);
+ m_gfxrom &= (gfxlen / 0x20000 - 1);
}
}
diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c
index 37bfadae5eb..e7724c03aee 100644
--- a/src/mame/video/hyperspt.c
+++ b/src/mame/video/hyperspt.c
@@ -89,26 +89,24 @@ PALETTE_INIT( hyperspt )
}
}
-WRITE8_HANDLER( hyperspt_videoram_w )
+WRITE8_MEMBER(hyperspt_state::hyperspt_videoram_w)
{
- hyperspt_state *state = space->machine().driver_data<hyperspt_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( hyperspt_colorram_w )
+WRITE8_MEMBER(hyperspt_state::hyperspt_colorram_w)
{
- hyperspt_state *state = space->machine().driver_data<hyperspt_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( hyperspt_flipscreen_w )
+WRITE8_MEMBER(hyperspt_state::hyperspt_flipscreen_w)
{
- if (flip_screen_get(space->machine()) != (data & 0x01))
+ if (flip_screen_get(machine()) != (data & 0x01))
{
- flip_screen_set(space->machine(), data & 0x01);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x01);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c
index 9798bfea41b..bc62cea599c 100644
--- a/src/mame/video/hyprduel.c
+++ b/src/mame/video/hyprduel.c
@@ -61,11 +61,10 @@ Note: if MAME_DEBUG is defined, pressing Z with:
Palette GGGGGRRRRRBBBBBx
***************************************************************************/
-WRITE16_HANDLER( hyprduel_paletteram_w )
+WRITE16_MEMBER(hyprduel_state::hyprduel_paletteram_w)
{
- hyprduel_state *state = space->machine().driver_data<hyprduel_state>();
- data = COMBINE_DATA(&state->m_paletteram[offset]);
- palette_set_color_rgb(space->machine(), offset, pal5bit(data >> 6), pal5bit(data >> 11), pal5bit(data >> 1));
+ data = COMBINE_DATA(&m_paletteram[offset]);
+ palette_set_color_rgb(machine(), offset, pal5bit(data >> 6), pal5bit(data >> 11), pal5bit(data >> 1));
}
@@ -275,35 +274,31 @@ static TILE_GET_INFO( get_tile_info_2_8bit )
get_tile_info_8bit(machine, tileinfo, tile_index, 2, state->m_vram_2);
}
-WRITE16_HANDLER( hyprduel_vram_0_w )
+WRITE16_MEMBER(hyprduel_state::hyprduel_vram_0_w)
{
- hyprduel_state *state = space->machine().driver_data<hyprduel_state>();
- hyprduel_vram_w(space->machine(), offset, data, mem_mask, 0, state->m_vram_0);
+ hyprduel_vram_w(machine(), offset, data, mem_mask, 0, m_vram_0);
}
-WRITE16_HANDLER( hyprduel_vram_1_w )
+WRITE16_MEMBER(hyprduel_state::hyprduel_vram_1_w)
{
- hyprduel_state *state = space->machine().driver_data<hyprduel_state>();
- hyprduel_vram_w(space->machine(), offset, data, mem_mask, 1, state->m_vram_1);
+ hyprduel_vram_w(machine(), offset, data, mem_mask, 1, m_vram_1);
}
-WRITE16_HANDLER( hyprduel_vram_2_w )
+WRITE16_MEMBER(hyprduel_state::hyprduel_vram_2_w)
{
- hyprduel_state *state = space->machine().driver_data<hyprduel_state>();
- hyprduel_vram_w(space->machine(), offset, data, mem_mask, 2, state->m_vram_2);
+ hyprduel_vram_w(machine(), offset, data, mem_mask, 2, m_vram_2);
}
/* Dirty the relevant tilemap when its window changes */
-WRITE16_HANDLER( hyprduel_window_w )
+WRITE16_MEMBER(hyprduel_state::hyprduel_window_w)
{
- hyprduel_state *state = space->machine().driver_data<hyprduel_state>();
- UINT16 olddata = state->m_window[offset];
- UINT16 newdata = COMBINE_DATA(&state->m_window[offset]);
+ UINT16 olddata = m_window[offset];
+ UINT16 newdata = COMBINE_DATA(&m_window[offset]);
if (newdata != olddata)
{
offset /= 2;
- state->m_bg_tilemap[offset]->mark_all_dirty();
+ m_bg_tilemap[offset]->mark_all_dirty();
}
}
@@ -616,34 +611,32 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
Screen Drawing
***************************************************************************/
-WRITE16_HANDLER( hyprduel_scrollreg_w )
+WRITE16_MEMBER(hyprduel_state::hyprduel_scrollreg_w)
{
- hyprduel_state *state = space->machine().driver_data<hyprduel_state>();
- UINT16 window = state->m_window[offset];
+ UINT16 window = m_window[offset];
- COMBINE_DATA(&state->m_scroll[offset]);
+ COMBINE_DATA(&m_scroll[offset]);
if (offset & 0x01)
- state->m_bg_tilemap[offset / 2]->set_scrollx(0, state->m_scroll[offset] - window - (window & 7));
+ m_bg_tilemap[offset / 2]->set_scrollx(0, m_scroll[offset] - window - (window & 7));
else
- state->m_bg_tilemap[offset / 2]->set_scrolly(0, state->m_scroll[offset] - window - (window & 7));
+ m_bg_tilemap[offset / 2]->set_scrolly(0, m_scroll[offset] - window - (window & 7));
}
-WRITE16_HANDLER( hyprduel_scrollreg_init_w )
+WRITE16_MEMBER(hyprduel_state::hyprduel_scrollreg_init_w)
{
- hyprduel_state *state = space->machine().driver_data<hyprduel_state>();
int i;
for (i = 0; i < 3; i++)
{
- UINT16 wx = state->m_window[i * 2 + 1];
- UINT16 wy = state->m_window[i * 2 + 0];
+ UINT16 wx = m_window[i * 2 + 1];
+ UINT16 wy = m_window[i * 2 + 0];
- state->m_scroll[i * 2 + 1] = data;
- state->m_scroll[i * 2 + 0] = data;
+ m_scroll[i * 2 + 1] = data;
+ m_scroll[i * 2 + 0] = data;
- state->m_bg_tilemap[i]->set_scrollx(0, data - wx - (wx & 7));
- state->m_bg_tilemap[i]->set_scrolly(0, data - wy - (wy & 7));
+ m_bg_tilemap[i]->set_scrollx(0, data - wx - (wx & 7));
+ m_bg_tilemap[i]->set_scrolly(0, data - wy - (wy & 7));
}
}
diff --git a/src/mame/video/ikki.c b/src/mame/video/ikki.c
index 0708864a719..13e33667cbe 100644
--- a/src/mame/video/ikki.c
+++ b/src/mame/video/ikki.c
@@ -55,10 +55,9 @@ PALETTE_INIT( ikki )
}
}
-WRITE8_HANDLER( ikki_scrn_ctrl_w )
+WRITE8_MEMBER(ikki_state::ikki_scrn_ctrl_w)
{
- ikki_state *state = space->machine().driver_data<ikki_state>();
- state->m_flipscreen = (data >> 2) & 1;
+ m_flipscreen = (data >> 2) & 1;
}
diff --git a/src/mame/video/inufuku.c b/src/mame/video/inufuku.c
index 27c90c9776a..2ecce7b13d5 100644
--- a/src/mame/video/inufuku.c
+++ b/src/mame/video/inufuku.c
@@ -21,30 +21,28 @@
******************************************************************************/
-WRITE16_HANDLER( inufuku_palettereg_w )
+WRITE16_MEMBER(inufuku_state::inufuku_palettereg_w)
{
- inufuku_state *state = space->machine().driver_data<inufuku_state>();
switch (offset)
{
- case 0x02: state->m_bg_palettebank = (data & 0xf000) >> 12;
- state->m_bg_tilemap->mark_all_dirty();
+ case 0x02: m_bg_palettebank = (data & 0xf000) >> 12;
+ m_bg_tilemap->mark_all_dirty();
break;
- case 0x03: state->m_tx_palettebank = (data & 0xf000) >> 12;
- state->m_tx_tilemap->mark_all_dirty();
+ case 0x03: m_tx_palettebank = (data & 0xf000) >> 12;
+ m_tx_tilemap->mark_all_dirty();
break;
}
}
-WRITE16_HANDLER( inufuku_scrollreg_w )
+WRITE16_MEMBER(inufuku_state::inufuku_scrollreg_w)
{
- inufuku_state *state = space->machine().driver_data<inufuku_state>();
switch (offset)
{
- case 0x00: state->m_bg_scrollx = data + 1; break;
- case 0x01: state->m_bg_scrolly = data + 0; break;
- case 0x02: state->m_tx_scrollx = data - 3; break;
- case 0x03: state->m_tx_scrolly = data + 1; break;
- case 0x04: state->m_bg_raster = (data & 0x0200) ? 0 : 1; break;
+ case 0x00: m_bg_scrollx = data + 1; break;
+ case 0x01: m_bg_scrolly = data + 0; break;
+ case 0x02: m_tx_scrollx = data - 3; break;
+ case 0x03: m_tx_scrolly = data + 1; break;
+ case 0x04: m_bg_raster = (data & 0x0200) ? 0 : 1; break;
}
}
@@ -183,30 +181,26 @@ static TILE_GET_INFO( get_inufuku_tx_tile_info )
0);
}
-READ16_HANDLER( inufuku_bg_videoram_r )
+READ16_MEMBER(inufuku_state::inufuku_bg_videoram_r)
{
- inufuku_state *state = space->machine().driver_data<inufuku_state>();
- return state->m_bg_videoram[offset];
+ return m_bg_videoram[offset];
}
-WRITE16_HANDLER( inufuku_bg_videoram_w )
+WRITE16_MEMBER(inufuku_state::inufuku_bg_videoram_w)
{
- inufuku_state *state = space->machine().driver_data<inufuku_state>();
- COMBINE_DATA(&state->m_bg_videoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bg_videoram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-READ16_HANDLER( inufuku_tx_videoram_r )
+READ16_MEMBER(inufuku_state::inufuku_tx_videoram_r)
{
- inufuku_state *state = space->machine().driver_data<inufuku_state>();
- return state->m_tx_videoram[offset];
+ return m_tx_videoram[offset];
}
-WRITE16_HANDLER( inufuku_tx_videoram_w )
+WRITE16_MEMBER(inufuku_state::inufuku_tx_videoram_w)
{
- inufuku_state *state = space->machine().driver_data<inufuku_state>();
- COMBINE_DATA(&state->m_tx_videoram[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_tx_videoram[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/iqblock.c b/src/mame/video/iqblock.c
index 02e12110a59..4f7adb1a10b 100644
--- a/src/mame/video/iqblock.c
+++ b/src/mame/video/iqblock.c
@@ -56,30 +56,26 @@ VIDEO_START( iqblock )
***************************************************************************/
-WRITE8_HANDLER( iqblock_fgvideoram_w )
+WRITE8_MEMBER(iqblock_state::iqblock_fgvideoram_w)
{
- iqblock_state *state = space->machine().driver_data<iqblock_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( iqblock_bgvideoram_w )
+WRITE8_MEMBER(iqblock_state::iqblock_bgvideoram_w)
{
- iqblock_state *state = space->machine().driver_data<iqblock_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-READ8_HANDLER( iqblock_bgvideoram_r )
+READ8_MEMBER(iqblock_state::iqblock_bgvideoram_r)
{
- iqblock_state *state = space->machine().driver_data<iqblock_state>();
- return state->m_bgvideoram[offset];
+ return m_bgvideoram[offset];
}
-WRITE8_HANDLER( iqblock_fgscroll_w )
+WRITE8_MEMBER(iqblock_state::iqblock_fgscroll_w)
{
- iqblock_state *state = space->machine().driver_data<iqblock_state>();
- state->m_fg_tilemap->set_scrolly(offset,data);
+ m_fg_tilemap->set_scrolly(offset,data);
}
diff --git a/src/mame/video/irobot.c b/src/mame/video/irobot.c
index 69184db4ba5..bf85c0af5af 100644
--- a/src/mame/video/irobot.c
+++ b/src/mame/video/irobot.c
@@ -57,7 +57,7 @@ PALETTE_INIT( irobot )
}
-WRITE8_HANDLER( irobot_paletteram_w )
+WRITE8_MEMBER(irobot_state::irobot_paletteram_w)
{
int r,g,b;
int bits,intensity;
@@ -71,7 +71,7 @@ WRITE8_HANDLER( irobot_paletteram_w )
g = 12 * bits * intensity;
bits = (color >> 7) & 0x03;
r = 12 * bits * intensity;
- palette_set_color(space->machine(),(offset >> 1) & 0x3F,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),(offset >> 1) & 0x3F,MAKE_RGB(r,g,b));
}
diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c
index b5705ef614a..81993020241 100644
--- a/src/mame/video/ironhors.c
+++ b/src/mame/video/ironhors.c
@@ -78,45 +78,41 @@ PALETTE_INIT( ironhors )
}
}
-WRITE8_HANDLER( ironhors_videoram_w )
+WRITE8_MEMBER(ironhors_state::ironhors_videoram_w)
{
- ironhors_state *state = space->machine().driver_data<ironhors_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( ironhors_colorram_w )
+WRITE8_MEMBER(ironhors_state::ironhors_colorram_w)
{
- ironhors_state *state = space->machine().driver_data<ironhors_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( ironhors_charbank_w )
+WRITE8_MEMBER(ironhors_state::ironhors_charbank_w)
{
- ironhors_state *state = space->machine().driver_data<ironhors_state>();
- if (state->m_charbank != (data & 0x03))
+ if (m_charbank != (data & 0x03))
{
- state->m_charbank = data & 0x03;
- space->machine().tilemap().mark_all_dirty();
+ m_charbank = data & 0x03;
+ machine().tilemap().mark_all_dirty();
}
- state->m_spriterambank = data & 0x08;
+ m_spriterambank = data & 0x08;
/* other bits unknown */
}
-WRITE8_HANDLER( ironhors_palettebank_w )
+WRITE8_MEMBER(ironhors_state::ironhors_palettebank_w)
{
- ironhors_state *state = space->machine().driver_data<ironhors_state>();
- if (state->m_palettebank != (data & 0x07))
+ if (m_palettebank != (data & 0x07))
{
- state->m_palettebank = data & 0x07;
- space->machine().tilemap().mark_all_dirty();
+ m_palettebank = data & 0x07;
+ machine().tilemap().mark_all_dirty();
}
- coin_counter_w(space->machine(), 0, data & 0x10);
- coin_counter_w(space->machine(), 1, data & 0x20);
+ coin_counter_w(machine(), 0, data & 0x10);
+ coin_counter_w(machine(), 1, data & 0x20);
/* bit 6 unknown - set after game over */
@@ -124,12 +120,12 @@ WRITE8_HANDLER( ironhors_palettebank_w )
popmessage("ironhors_palettebank_w %02x",data);
}
-WRITE8_HANDLER( ironhors_flipscreen_w )
+WRITE8_MEMBER(ironhors_state::ironhors_flipscreen_w)
{
- if (flip_screen_get(space->machine()) != (~data & 0x08))
+ if (flip_screen_get(machine()) != (~data & 0x08))
{
- flip_screen_set(space->machine(), ~data & 0x08);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), ~data & 0x08);
+ machine().tilemap().mark_all_dirty();
}
/* other bits are used too, but unknown */
diff --git a/src/mame/video/itech32.c b/src/mame/video/itech32.c
index 5a24d5a923a..82b518e68a4 100644
--- a/src/mame/video/itech32.c
+++ b/src/mame/video/itech32.c
@@ -26,79 +26,79 @@
*
*************************************/
-#define VIDEO_UNKNOWN00 state->m_video[0x00/2] /* $0087 at startup */
-#define VIDEO_STATUS state->m_video[0x00/2]
-#define VIDEO_INTSTATE state->m_video[0x02/2]
-#define VIDEO_INTACK state->m_video[0x02/2]
-#define VIDEO_TRANSFER state->m_video[0x04/2]
-#define VIDEO_TRANSFER_FLAGS state->m_video[0x06/2] /* $5080 at startup (kept at $1512) */
-#define VIDEO_COMMAND state->m_video[0x08/2] /* $0005 at startup */
-#define VIDEO_INTENABLE state->m_video[0x0a/2] /* $0144 at startup (kept at $1514) */
-#define VIDEO_TRANSFER_HEIGHT state->m_video[0x0c/2]
-#define VIDEO_TRANSFER_WIDTH state->m_video[0x0e/2]
-#define VIDEO_TRANSFER_ADDRLO state->m_video[0x10/2]
-#define VIDEO_TRANSFER_X state->m_video[0x12/2]
-#define VIDEO_TRANSFER_Y state->m_video[0x14/2]
-#define VIDEO_SRC_YSTEP state->m_video[0x16/2] /* $0011 at startup */
-#define VIDEO_SRC_XSTEP state->m_video[0x18/2]
-#define VIDEO_DST_XSTEP state->m_video[0x1a/2]
-#define VIDEO_DST_YSTEP state->m_video[0x1c/2]
-#define VIDEO_YSTEP_PER_X state->m_video[0x1e/2]
-#define VIDEO_XSTEP_PER_Y state->m_video[0x20/2]
-#define VIDEO_UNKNOWN22 state->m_video[0x22/2] /* $0033 at startup */
-#define VIDEO_LEFTCLIP state->m_video[0x24/2]
-#define VIDEO_RIGHTCLIP state->m_video[0x26/2]
-#define VIDEO_TOPCLIP state->m_video[0x28/2]
-#define VIDEO_BOTTOMCLIP state->m_video[0x2a/2]
-#define VIDEO_INTSCANLINE state->m_video[0x2c/2] /* $00ef at startup */
-#define VIDEO_TRANSFER_ADDRHI state->m_video[0x2e/2] /* $0000 at startup */
-
-#define VIDEO_UNKNOWN30 state->m_video[0x30/2] /* $0040 at startup */
-#define VIDEO_VTOTAL state->m_video[0x32/2] /* $0106 at startup */
-#define VIDEO_VSYNC state->m_video[0x34/2] /* $0101 at startup */
-#define VIDEO_VBLANK_START state->m_video[0x36/2] /* $00f3 at startup */
-#define VIDEO_VBLANK_END state->m_video[0x38/2] /* $0003 at startup */
-#define VIDEO_HTOTAL state->m_video[0x3a/2] /* $01fc at startup */
-#define VIDEO_HSYNC state->m_video[0x3c/2] /* $01e4 at startup */
-#define VIDEO_HBLANK_START state->m_video[0x3e/2] /* $01b2 at startup */
-#define VIDEO_HBLANK_END state->m_video[0x40/2] /* $0032 at startup */
-#define VIDEO_UNKNOWN42 state->m_video[0x42/2] /* $0015 at startup */
-#define VIDEO_DISPLAY_YORIGIN1 state->m_video[0x44/2] /* $0000 at startup */
-#define VIDEO_DISPLAY_YORIGIN2 state->m_video[0x46/2] /* $0000 at startup */
-#define VIDEO_DISPLAY_YSCROLL2 state->m_video[0x48/2] /* $0000 at startup */
-#define VIDEO_UNKNOWN4a state->m_video[0x4a/2] /* $0000 at startup */
-#define VIDEO_DISPLAY_XORIGIN1 state->m_video[0x4c/2] /* $0000 at startup */
-#define VIDEO_DISPLAY_XORIGIN2 state->m_video[0x4e/2] /* $0000 at startup */
-#define VIDEO_DISPLAY_XSCROLL2 state->m_video[0x50/2] /* $0000 at startup */
-#define VIDEO_UNKNOWN52 state->m_video[0x52/2] /* $0000 at startup */
-#define VIDEO_UNKNOWN54 state->m_video[0x54/2] /* $0080 at startup */
-#define VIDEO_UNKNOWN56 state->m_video[0x56/2] /* $00c0 at startup */
-#define VIDEO_UNKNOWN58 state->m_video[0x58/2] /* $01c0 at startup */
-#define VIDEO_UNKNOWN5a state->m_video[0x5a/2] /* $01c0 at startup */
-#define VIDEO_UNKNOWN5c state->m_video[0x5c/2] /* $01cf at startup */
-#define VIDEO_UNKNOWN5e state->m_video[0x5e/2] /* $01cf at startup */
-#define VIDEO_UNKNOWN60 state->m_video[0x60/2] /* $01e3 at startup */
-#define VIDEO_UNKNOWN62 state->m_video[0x62/2] /* $01cf at startup */
-#define VIDEO_UNKNOWN64 state->m_video[0x64/2] /* $01ff at startup */
-#define VIDEO_UNKNOWN66 state->m_video[0x66/2] /* $0183 at startup */
-#define VIDEO_UNKNOWN68 state->m_video[0x68/2] /* $01ff at startup */
-#define VIDEO_UNKNOWN6a state->m_video[0x6a/2] /* $000f at startup */
-#define VIDEO_UNKNOWN6c state->m_video[0x6c/2] /* $018f at startup */
-#define VIDEO_UNKNOWN6e state->m_video[0x6e/2] /* $01ff at startup */
-#define VIDEO_UNKNOWN70 state->m_video[0x70/2] /* $000f at startup */
-#define VIDEO_UNKNOWN72 state->m_video[0x72/2] /* $000f at startup */
-#define VIDEO_UNKNOWN74 state->m_video[0x74/2] /* $01ff at startup */
-#define VIDEO_UNKNOWN76 state->m_video[0x76/2] /* $01ff at startup */
-#define VIDEO_UNKNOWN78 state->m_video[0x78/2] /* $01ff at startup */
-#define VIDEO_UNKNOWN7a state->m_video[0x7a/2] /* $01ff at startup */
-#define VIDEO_UNKNOWN7c state->m_video[0x7c/2] /* $0820 at startup */
-#define VIDEO_UNKNOWN7e state->m_video[0x7e/2] /* $0100 at startup */
-
-#define VIDEO_STARTSTEP state->m_video[0x80/2] /* drivedge only? */
-#define VIDEO_LEFTSTEPLO state->m_video[0x82/2] /* drivedge only? */
-#define VIDEO_LEFTSTEPHI state->m_video[0x84/2] /* drivedge only? */
-#define VIDEO_RIGHTSTEPLO state->m_video[0x86/2] /* drivedge only? */
-#define VIDEO_RIGHTSTEPHI state->m_video[0x88/2] /* drivedge only? */
+#define VIDEO_UNKNOWN00 m_video[0x00/2] /* $0087 at startup */
+#define VIDEO_STATUS m_video[0x00/2]
+#define VIDEO_INTSTATE m_video[0x02/2]
+#define VIDEO_INTACK m_video[0x02/2]
+#define VIDEO_TRANSFER m_video[0x04/2]
+#define VIDEO_TRANSFER_FLAGS m_video[0x06/2] /* $5080 at startup (kept at $1512) */
+#define VIDEO_COMMAND m_video[0x08/2] /* $0005 at startup */
+#define VIDEO_INTENABLE m_video[0x0a/2] /* $0144 at startup (kept at $1514) */
+#define VIDEO_TRANSFER_HEIGHT m_video[0x0c/2]
+#define VIDEO_TRANSFER_WIDTH m_video[0x0e/2]
+#define VIDEO_TRANSFER_ADDRLO m_video[0x10/2]
+#define VIDEO_TRANSFER_X m_video[0x12/2]
+#define VIDEO_TRANSFER_Y m_video[0x14/2]
+#define VIDEO_SRC_YSTEP m_video[0x16/2] /* $0011 at startup */
+#define VIDEO_SRC_XSTEP m_video[0x18/2]
+#define VIDEO_DST_XSTEP m_video[0x1a/2]
+#define VIDEO_DST_YSTEP m_video[0x1c/2]
+#define VIDEO_YSTEP_PER_X m_video[0x1e/2]
+#define VIDEO_XSTEP_PER_Y m_video[0x20/2]
+#define VIDEO_UNKNOWN22 m_video[0x22/2] /* $0033 at startup */
+#define VIDEO_LEFTCLIP m_video[0x24/2]
+#define VIDEO_RIGHTCLIP m_video[0x26/2]
+#define VIDEO_TOPCLIP m_video[0x28/2]
+#define VIDEO_BOTTOMCLIP m_video[0x2a/2]
+#define VIDEO_INTSCANLINE m_video[0x2c/2] /* $00ef at startup */
+#define VIDEO_TRANSFER_ADDRHI m_video[0x2e/2] /* $0000 at startup */
+
+#define VIDEO_UNKNOWN30 m_video[0x30/2] /* $0040 at startup */
+#define VIDEO_VTOTAL m_video[0x32/2] /* $0106 at startup */
+#define VIDEO_VSYNC m_video[0x34/2] /* $0101 at startup */
+#define VIDEO_VBLANK_START m_video[0x36/2] /* $00f3 at startup */
+#define VIDEO_VBLANK_END m_video[0x38/2] /* $0003 at startup */
+#define VIDEO_HTOTAL m_video[0x3a/2] /* $01fc at startup */
+#define VIDEO_HSYNC m_video[0x3c/2] /* $01e4 at startup */
+#define VIDEO_HBLANK_START m_video[0x3e/2] /* $01b2 at startup */
+#define VIDEO_HBLANK_END m_video[0x40/2] /* $0032 at startup */
+#define VIDEO_UNKNOWN42 m_video[0x42/2] /* $0015 at startup */
+#define VIDEO_DISPLAY_YORIGIN1 m_video[0x44/2] /* $0000 at startup */
+#define VIDEO_DISPLAY_YORIGIN2 m_video[0x46/2] /* $0000 at startup */
+#define VIDEO_DISPLAY_YSCROLL2 m_video[0x48/2] /* $0000 at startup */
+#define VIDEO_UNKNOWN4a m_video[0x4a/2] /* $0000 at startup */
+#define VIDEO_DISPLAY_XORIGIN1 m_video[0x4c/2] /* $0000 at startup */
+#define VIDEO_DISPLAY_XORIGIN2 m_video[0x4e/2] /* $0000 at startup */
+#define VIDEO_DISPLAY_XSCROLL2 m_video[0x50/2] /* $0000 at startup */
+#define VIDEO_UNKNOWN52 m_video[0x52/2] /* $0000 at startup */
+#define VIDEO_UNKNOWN54 m_video[0x54/2] /* $0080 at startup */
+#define VIDEO_UNKNOWN56 m_video[0x56/2] /* $00c0 at startup */
+#define VIDEO_UNKNOWN58 m_video[0x58/2] /* $01c0 at startup */
+#define VIDEO_UNKNOWN5a m_video[0x5a/2] /* $01c0 at startup */
+#define VIDEO_UNKNOWN5c m_video[0x5c/2] /* $01cf at startup */
+#define VIDEO_UNKNOWN5e m_video[0x5e/2] /* $01cf at startup */
+#define VIDEO_UNKNOWN60 m_video[0x60/2] /* $01e3 at startup */
+#define VIDEO_UNKNOWN62 m_video[0x62/2] /* $01cf at startup */
+#define VIDEO_UNKNOWN64 m_video[0x64/2] /* $01ff at startup */
+#define VIDEO_UNKNOWN66 m_video[0x66/2] /* $0183 at startup */
+#define VIDEO_UNKNOWN68 m_video[0x68/2] /* $01ff at startup */
+#define VIDEO_UNKNOWN6a m_video[0x6a/2] /* $000f at startup */
+#define VIDEO_UNKNOWN6c m_video[0x6c/2] /* $018f at startup */
+#define VIDEO_UNKNOWN6e m_video[0x6e/2] /* $01ff at startup */
+#define VIDEO_UNKNOWN70 m_video[0x70/2] /* $000f at startup */
+#define VIDEO_UNKNOWN72 m_video[0x72/2] /* $000f at startup */
+#define VIDEO_UNKNOWN74 m_video[0x74/2] /* $01ff at startup */
+#define VIDEO_UNKNOWN76 m_video[0x76/2] /* $01ff at startup */
+#define VIDEO_UNKNOWN78 m_video[0x78/2] /* $01ff at startup */
+#define VIDEO_UNKNOWN7a m_video[0x7a/2] /* $01ff at startup */
+#define VIDEO_UNKNOWN7c m_video[0x7c/2] /* $0820 at startup */
+#define VIDEO_UNKNOWN7e m_video[0x7e/2] /* $0100 at startup */
+
+#define VIDEO_STARTSTEP m_video[0x80/2] /* drivedge only? */
+#define VIDEO_LEFTSTEPLO m_video[0x82/2] /* drivedge only? */
+#define VIDEO_LEFTSTEPHI m_video[0x84/2] /* drivedge only? */
+#define VIDEO_RIGHTSTEPLO m_video[0x86/2] /* drivedge only? */
+#define VIDEO_RIGHTSTEPHI m_video[0x88/2] /* drivedge only? */
#define VIDEOINT_SCANLINE 0x0004
#define VIDEOINT_BLITTER 0x0040
@@ -207,97 +207,88 @@ VIDEO_START( itech32 )
*
*************************************/
-WRITE16_HANDLER( timekill_colora_w )
+WRITE16_MEMBER(itech32_state::timekill_colora_w)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_enable_latch[0] = (~data >> 5) & 1;
- state->m_enable_latch[1] = (~data >> 7) & 1;
- state->m_color_latch[0] = (data & 0x0f) << 8;
+ m_enable_latch[0] = (~data >> 5) & 1;
+ m_enable_latch[1] = (~data >> 7) & 1;
+ m_color_latch[0] = (data & 0x0f) << 8;
}
}
-WRITE16_HANDLER( timekill_colorbc_w )
+WRITE16_MEMBER(itech32_state::timekill_colorbc_w)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
if (ACCESSING_BITS_0_7)
- state->m_color_latch[1] = ((data & 0xf0) << 4) | 0x1000;
+ m_color_latch[1] = ((data & 0xf0) << 4) | 0x1000;
}
-WRITE16_HANDLER( timekill_intensity_w )
+WRITE16_MEMBER(itech32_state::timekill_intensity_w)
{
if (ACCESSING_BITS_0_7)
{
double intensity = (double)(data & 0xff) / (double)0x60;
int i;
for (i = 0; i < 8192; i++)
- palette_set_pen_contrast(space->machine(), i, intensity);
+ palette_set_pen_contrast(machine(), i, intensity);
}
}
-WRITE16_HANDLER( bloodstm_color1_w )
+WRITE16_MEMBER(itech32_state::bloodstm_color1_w)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
if (ACCESSING_BITS_0_7)
- state->m_color_latch[0] = (data & 0x7f) << 8;
+ m_color_latch[0] = (data & 0x7f) << 8;
}
-WRITE16_HANDLER( bloodstm_color2_w )
+WRITE16_MEMBER(itech32_state::bloodstm_color2_w)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
if (ACCESSING_BITS_0_7)
- state->m_color_latch[1] = (data & 0x7f) << 8;
+ m_color_latch[1] = (data & 0x7f) << 8;
}
-WRITE16_HANDLER( bloodstm_plane_w )
+WRITE16_MEMBER(itech32_state::bloodstm_plane_w)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_enable_latch[0] = (~data >> 1) & 1;
- state->m_enable_latch[1] = (~data >> 2) & 1;
+ m_enable_latch[0] = (~data >> 1) & 1;
+ m_enable_latch[1] = (~data >> 2) & 1;
}
}
-WRITE32_HANDLER( drivedge_color0_w )
+WRITE32_MEMBER(itech32_state::drivedge_color0_w)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
if (ACCESSING_BITS_16_23)
- state->m_color_latch[0] = ((data >> 16) & 0x7f) << 8;
+ m_color_latch[0] = ((data >> 16) & 0x7f) << 8;
}
-WRITE32_HANDLER( itech020_color1_w )
+WRITE32_MEMBER(itech32_state::itech020_color1_w)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
if (ACCESSING_BITS_0_7)
- state->m_color_latch[1] = (data & 0x7f) << 8;
+ m_color_latch[1] = (data & 0x7f) << 8;
}
-WRITE32_HANDLER( itech020_color2_w )
+WRITE32_MEMBER(itech32_state::itech020_color2_w)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
if (ACCESSING_BITS_0_7)
- state->m_color_latch[0] = (data & 0x7f) << 8;
+ m_color_latch[0] = (data & 0x7f) << 8;
}
-WRITE32_HANDLER( itech020_plane_w )
+WRITE32_MEMBER(itech32_state::itech020_plane_w)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
if (ACCESSING_BITS_8_15)
{
- state->m_enable_latch[0] = (~data >> 9) & 1;
- state->m_enable_latch[1] = (~data >> 10) & 1;
- state->m_grom_bank = ((data >> 14) & state->m_grom_bank_mask) << 24;
+ m_enable_latch[0] = (~data >> 9) & 1;
+ m_enable_latch[1] = (~data >> 10) & 1;
+ m_grom_bank = ((data >> 14) & m_grom_bank_mask) << 24;
}
}
@@ -309,66 +300,62 @@ WRITE32_HANDLER( itech020_plane_w )
*
*************************************/
-WRITE16_HANDLER( timekill_paletteram_w )
+WRITE16_MEMBER(itech32_state::timekill_paletteram_w)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
int r, g, b;
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
- r = state->m_generic_paletteram_16[offset & ~1] & 0xff;
- g = state->m_generic_paletteram_16[offset & ~1] >> 8;
- b = state->m_generic_paletteram_16[offset | 1] >> 8;
+ r = m_generic_paletteram_16[offset & ~1] & 0xff;
+ g = m_generic_paletteram_16[offset & ~1] >> 8;
+ b = m_generic_paletteram_16[offset | 1] >> 8;
- palette_set_color(space->machine(), offset / 2, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), offset / 2, MAKE_RGB(r, g, b));
}
-WRITE16_HANDLER( bloodstm_paletteram_w )
+WRITE16_MEMBER(itech32_state::bloodstm_paletteram_w)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
int r, g, b;
/* in test mode, the LSB is used; in game mode, the MSB is used */
if (!ACCESSING_BITS_0_7 && (offset & 1))
data >>= 8, mem_mask >>= 8;
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
- r = state->m_generic_paletteram_16[offset & ~1] & 0xff;
- g = state->m_generic_paletteram_16[offset & ~1] >> 8;
- b = state->m_generic_paletteram_16[offset | 1] & 0xff;
+ r = m_generic_paletteram_16[offset & ~1] & 0xff;
+ g = m_generic_paletteram_16[offset & ~1] >> 8;
+ b = m_generic_paletteram_16[offset | 1] & 0xff;
- palette_set_color(space->machine(), offset / 2, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), offset / 2, MAKE_RGB(r, g, b));
}
-WRITE32_HANDLER( drivedge_paletteram_w )
+WRITE32_MEMBER(itech32_state::drivedge_paletteram_w)
{
int r, g, b;
- itech32_state *state = space->machine().driver_data<itech32_state>();
- COMBINE_DATA(&state->m_generic_paletteram_32[offset]);
+ COMBINE_DATA(&m_generic_paletteram_32[offset]);
- r = state->m_generic_paletteram_32[offset] & 0xff;
- g = (state->m_generic_paletteram_32[offset] >> 8) & 0xff;
- b = (state->m_generic_paletteram_32[offset] >> 16) & 0xff;
+ r = m_generic_paletteram_32[offset] & 0xff;
+ g = (m_generic_paletteram_32[offset] >> 8) & 0xff;
+ b = (m_generic_paletteram_32[offset] >> 16) & 0xff;
- palette_set_color(space->machine(), offset, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), offset, MAKE_RGB(r, g, b));
}
-WRITE32_HANDLER( itech020_paletteram_w )
+WRITE32_MEMBER(itech32_state::itech020_paletteram_w)
{
int r, g, b;
- itech32_state *state = space->machine().driver_data<itech32_state>();
- COMBINE_DATA(&state->m_generic_paletteram_32[offset]);
+ COMBINE_DATA(&m_generic_paletteram_32[offset]);
- r = (state->m_generic_paletteram_32[offset] >> 16) & 0xff;
- g = (state->m_generic_paletteram_32[offset] >> 8) & 0xff;
- b = state->m_generic_paletteram_32[offset] & 0xff;
+ r = (m_generic_paletteram_32[offset] >> 16) & 0xff;
+ g = (m_generic_paletteram_32[offset] >> 8) & 0xff;
+ b = m_generic_paletteram_32[offset] & 0xff;
- palette_set_color(space->machine(), offset, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), offset, MAKE_RGB(r, g, b));
}
@@ -384,19 +371,19 @@ static void logblit(running_machine &machine, const char *tag)
itech32_state *state = machine.driver_data<itech32_state>();
if (!machine.input().code_pressed(KEYCODE_L))
return;
- if (state->m_is_drivedge && VIDEO_TRANSFER_FLAGS == 0x5490)
+ if (state->m_is_drivedge && state->VIDEO_TRANSFER_FLAGS == 0x5490)
{
/* polygon drawing */
logerror("%s: e=%d%d f=%04x s=(%03x-%03x,%03x) w=%03x h=%03x b=%02x%04x c=%02x%02x ss=%04x,%04x ds=%04x,%04x ls=%04x%04x rs=%04x%04x u80=%04x", tag,
state->m_enable_latch[0], state->m_enable_latch[1],
- VIDEO_TRANSFER_FLAGS,
- VIDEO_TRANSFER_X, VIDEO_RIGHTCLIP, VIDEO_TRANSFER_Y, VIDEO_TRANSFER_WIDTH, VIDEO_TRANSFER_HEIGHT,
- VIDEO_TRANSFER_ADDRHI, VIDEO_TRANSFER_ADDRLO,
+ state->VIDEO_TRANSFER_FLAGS,
+ state->VIDEO_TRANSFER_X, state->VIDEO_RIGHTCLIP, state->VIDEO_TRANSFER_Y, state->VIDEO_TRANSFER_WIDTH, state->VIDEO_TRANSFER_HEIGHT,
+ state->VIDEO_TRANSFER_ADDRHI, state->VIDEO_TRANSFER_ADDRLO,
state->m_color_latch[0] >> 8, state->m_color_latch[1] >> 8,
- VIDEO_SRC_XSTEP, VIDEO_SRC_YSTEP,
- VIDEO_DST_XSTEP, VIDEO_DST_YSTEP,
- VIDEO_LEFTSTEPHI, VIDEO_LEFTSTEPLO, VIDEO_RIGHTSTEPHI, VIDEO_RIGHTSTEPLO,
- VIDEO_STARTSTEP);
+ state->VIDEO_SRC_XSTEP, state->VIDEO_SRC_YSTEP,
+ state->VIDEO_DST_XSTEP, state->VIDEO_DST_YSTEP,
+ state->VIDEO_LEFTSTEPHI, state->VIDEO_LEFTSTEPLO, state->VIDEO_RIGHTSTEPHI, state->VIDEO_RIGHTSTEPLO,
+ state->VIDEO_STARTSTEP);
}
else if (state->m_video[0x16/2] == 0x100 && state->m_video[0x18/2] == 0x100 &&
@@ -405,23 +392,23 @@ static void logblit(running_machine &machine, const char *tag)
{
logerror("%s: e=%d%d f=%04x c=%02x%02x %02x%04x -> (%03x,%03x) %3dx%3dc=(%03x,%03x)-(%03x,%03x)", tag,
state->m_enable_latch[0], state->m_enable_latch[1],
- VIDEO_TRANSFER_FLAGS,
+ state->VIDEO_TRANSFER_FLAGS,
state->m_color_latch[0] >> 8, state->m_color_latch[1] >> 8,
- VIDEO_TRANSFER_ADDRHI, VIDEO_TRANSFER_ADDRLO,
- VIDEO_TRANSFER_X, VIDEO_TRANSFER_Y,
- VIDEO_TRANSFER_WIDTH, ADJUSTED_HEIGHT(VIDEO_TRANSFER_HEIGHT),
- VIDEO_LEFTCLIP, VIDEO_TOPCLIP, VIDEO_RIGHTCLIP, VIDEO_BOTTOMCLIP);
+ state->VIDEO_TRANSFER_ADDRHI, state->VIDEO_TRANSFER_ADDRLO,
+ state->VIDEO_TRANSFER_X, state->VIDEO_TRANSFER_Y,
+ state->VIDEO_TRANSFER_WIDTH, ADJUSTED_HEIGHT(state->VIDEO_TRANSFER_HEIGHT),
+ state->VIDEO_LEFTCLIP, state->VIDEO_TOPCLIP, state->VIDEO_RIGHTCLIP, state->VIDEO_BOTTOMCLIP);
}
else
{
logerror("%s: e=%d%d f=%04x c=%02x%02x %02x%04x -> (%03x,%03x) %3dx%3d c=(%03x,%03x)-(%03x,%03x) s=%04x %04x %04x %04x %04x %04x", tag,
state->m_enable_latch[0], state->m_enable_latch[1],
- VIDEO_TRANSFER_FLAGS,
+ state->VIDEO_TRANSFER_FLAGS,
state->m_color_latch[0] >> 8, state->m_color_latch[1] >> 8,
- VIDEO_TRANSFER_ADDRHI, VIDEO_TRANSFER_ADDRLO,
- VIDEO_TRANSFER_X, VIDEO_TRANSFER_Y,
- VIDEO_TRANSFER_WIDTH, ADJUSTED_HEIGHT(VIDEO_TRANSFER_HEIGHT),
- VIDEO_LEFTCLIP, VIDEO_TOPCLIP, VIDEO_RIGHTCLIP, VIDEO_BOTTOMCLIP,
+ state->VIDEO_TRANSFER_ADDRHI, state->VIDEO_TRANSFER_ADDRLO,
+ state->VIDEO_TRANSFER_X, state->VIDEO_TRANSFER_Y,
+ state->VIDEO_TRANSFER_WIDTH, ADJUSTED_HEIGHT(state->VIDEO_TRANSFER_HEIGHT),
+ state->VIDEO_LEFTCLIP, state->VIDEO_TOPCLIP, state->VIDEO_RIGHTCLIP, state->VIDEO_BOTTOMCLIP,
state->m_video[0x16/2], state->m_video[0x18/2], state->m_video[0x1a/2],
state->m_video[0x1c/2], state->m_video[0x1e/2], state->m_video[0x20/2]);
}
@@ -442,9 +429,9 @@ static void update_interrupts(running_machine &machine, int fast)
itech32_state *state = machine.driver_data<itech32_state>();
int scanline_state = 0, blitter_state = 0;
- if (VIDEO_INTSTATE & VIDEO_INTENABLE & VIDEOINT_SCANLINE)
+ if (state->VIDEO_INTSTATE & state->VIDEO_INTENABLE & VIDEOINT_SCANLINE)
scanline_state = 1;
- if (VIDEO_INTSTATE & VIDEO_INTENABLE & VIDEOINT_BLITTER)
+ if (state->VIDEO_INTSTATE & state->VIDEO_INTENABLE & VIDEOINT_BLITTER)
blitter_state = 1;
itech32_update_interrupts(machine, -1, blitter_state, scanline_state);
@@ -455,11 +442,11 @@ static TIMER_CALLBACK( scanline_interrupt )
{
itech32_state *state = machine.driver_data<itech32_state>();
/* set timer for next frame */
- state->m_scanline_timer->adjust(machine.primary_screen->time_until_pos(VIDEO_INTSCANLINE));
+ state->m_scanline_timer->adjust(machine.primary_screen->time_until_pos(state->VIDEO_INTSCANLINE));
/* set the interrupt bit in the status reg */
logerror("-------------- (DISPLAY INT @ %d) ----------------\n", machine.primary_screen->vpos());
- VIDEO_INTSTATE |= VIDEOINT_SCANLINE;
+ state->VIDEO_INTSTATE |= VIDEOINT_SCANLINE;
/* update the interrupt state */
update_interrupts(machine, 0);
@@ -475,30 +462,30 @@ static TIMER_CALLBACK( scanline_interrupt )
static void draw_raw(itech32_state *state, UINT16 *base, UINT16 color)
{
- UINT8 *src = &state->m_grom_base[(state->m_grom_bank | ((VIDEO_TRANSFER_ADDRHI & 0xff) << 16) | VIDEO_TRANSFER_ADDRLO) % state->m_grom_size];
- int transparent_pen = (VIDEO_TRANSFER_FLAGS & XFERFLAG_TRANSPARENT) ? 0xff : -1;
- int width = VIDEO_TRANSFER_WIDTH << 8;
- int height = ADJUSTED_HEIGHT(VIDEO_TRANSFER_HEIGHT) << 8;
- int xsrcstep = VIDEO_SRC_XSTEP;
- int ysrcstep = VIDEO_SRC_YSTEP;
- int sx, sy = (VIDEO_TRANSFER_Y & 0xfff) << 8;
- int startx = (VIDEO_TRANSFER_X & 0xfff) << 8;
+ UINT8 *src = &state->m_grom_base[(state->m_grom_bank | ((state->VIDEO_TRANSFER_ADDRHI & 0xff) << 16) | state->VIDEO_TRANSFER_ADDRLO) % state->m_grom_size];
+ int transparent_pen = (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_TRANSPARENT) ? 0xff : -1;
+ int width = state->VIDEO_TRANSFER_WIDTH << 8;
+ int height = ADJUSTED_HEIGHT(state->VIDEO_TRANSFER_HEIGHT) << 8;
+ int xsrcstep = state->VIDEO_SRC_XSTEP;
+ int ysrcstep = state->VIDEO_SRC_YSTEP;
+ int sx, sy = (state->VIDEO_TRANSFER_Y & 0xfff) << 8;
+ int startx = (state->VIDEO_TRANSFER_X & 0xfff) << 8;
int xdststep = 0x100;
- int ydststep = VIDEO_DST_YSTEP;
+ int ydststep = state->VIDEO_DST_YSTEP;
int x, y;
/* adjust for (lack of) clipping */
- if (!(VIDEO_TRANSFER_FLAGS & XFERFLAG_CLIP))
+ if (!(state->VIDEO_TRANSFER_FLAGS & XFERFLAG_CLIP))
disable_clipping(state);
/* adjust for scaling */
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_DSTXSCALE)
- xdststep = VIDEO_DST_XSTEP;
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_DSTXSCALE)
+ xdststep = state->VIDEO_DST_XSTEP;
/* adjust for flipping */
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_XFLIP)
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_XFLIP)
xdststep = -xdststep;
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_YFLIP)
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_YFLIP)
ydststep = -ydststep;
/* loop over Y in src pixels */
@@ -507,7 +494,7 @@ static void draw_raw(itech32_state *state, UINT16 *base, UINT16 color)
UINT8 *rowsrc = &src[(y >> 8) * (width >> 8)];
/* simpler case: VIDEO_YSTEP_PER_X is zero */
- if (VIDEO_YSTEP_PER_X == 0)
+ if (state->VIDEO_YSTEP_PER_X == 0)
{
/* clip in the Y direction */
if (sy >= state->m_scaled_clip_rect.min_y && sy < state->m_scaled_clip_rect.max_y)
@@ -554,7 +541,7 @@ static void draw_raw(itech32_state *state, UINT16 *base, UINT16 color)
/* slow case: VIDEO_YSTEP_PER_X is non-zero */
else
{
- int ystep = (VIDEO_TRANSFER_FLAGS & XFERFLAG_DYDXSIGN) ? -VIDEO_YSTEP_PER_X : VIDEO_YSTEP_PER_X;
+ int ystep = (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_DYDXSIGN) ? -state->VIDEO_YSTEP_PER_X : state->VIDEO_YSTEP_PER_X;
int ty = sy;
/* render all pixels */
@@ -569,47 +556,47 @@ static void draw_raw(itech32_state *state, UINT16 *base, UINT16 color)
}
/* apply skew */
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_DXDYSIGN)
- startx += VIDEO_XSTEP_PER_Y;
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_DXDYSIGN)
+ startx += state->VIDEO_XSTEP_PER_Y;
else
- startx -= VIDEO_XSTEP_PER_Y;
+ startx -= state->VIDEO_XSTEP_PER_Y;
}
/* restore cliprects */
- if (!(VIDEO_TRANSFER_FLAGS & XFERFLAG_CLIP))
+ if (!(state->VIDEO_TRANSFER_FLAGS & XFERFLAG_CLIP))
enable_clipping(state);
}
static void draw_raw_drivedge(itech32_state *state, UINT16 *base, UINT16 *zbase, UINT16 color)
{
- UINT8 *src = &state->m_grom_base[(state->m_grom_bank | ((VIDEO_TRANSFER_ADDRHI & 0xff) << 16) | VIDEO_TRANSFER_ADDRLO) % state->m_grom_size];
- int transparent_pen = (VIDEO_TRANSFER_FLAGS & XFERFLAG_TRANSPARENT) ? 0xff : -1;
- int width = VIDEO_TRANSFER_WIDTH << 8;
- int height = ADJUSTED_HEIGHT(VIDEO_TRANSFER_HEIGHT) << 8;
- int xsrcstep = VIDEO_SRC_XSTEP;
- int ysrcstep = VIDEO_SRC_YSTEP;
- int sx, sy = ((VIDEO_TRANSFER_Y & 0xfff) << 8) + 0x80;
- int startx = ((VIDEO_TRANSFER_X & 0xfff) << 8) + 0x80;
+ UINT8 *src = &state->m_grom_base[(state->m_grom_bank | ((state->VIDEO_TRANSFER_ADDRHI & 0xff) << 16) | state->VIDEO_TRANSFER_ADDRLO) % state->m_grom_size];
+ int transparent_pen = (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_TRANSPARENT) ? 0xff : -1;
+ int width = state->VIDEO_TRANSFER_WIDTH << 8;
+ int height = ADJUSTED_HEIGHT(state->VIDEO_TRANSFER_HEIGHT) << 8;
+ int xsrcstep = state->VIDEO_SRC_XSTEP;
+ int ysrcstep = state->VIDEO_SRC_YSTEP;
+ int sx, sy = ((state->VIDEO_TRANSFER_Y & 0xfff) << 8) + 0x80;
+ int startx = ((state->VIDEO_TRANSFER_X & 0xfff) << 8) + 0x80;
int xdststep = 0x100;
- int ydststep = VIDEO_DST_YSTEP;
+ int ydststep = state->VIDEO_DST_YSTEP;
INT32 z0 = state->m_drivedge_zbuf_control[2] & 0x7ff00;
INT32 zmatch = (state->m_drivedge_zbuf_control[2] & 0x1f) << 11;
INT32 srcdelta = 0;
int x, y;
/* adjust for (lack of) clipping */
- if (!(VIDEO_TRANSFER_FLAGS & XFERFLAG_CLIP))
+ if (!(state->VIDEO_TRANSFER_FLAGS & XFERFLAG_CLIP))
disable_clipping(state);
/* adjust for scaling */
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_DSTXSCALE)
- xdststep = VIDEO_DST_XSTEP;
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_DSTXSCALE)
+ xdststep = state->VIDEO_DST_XSTEP;
/* adjust for flipping */
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_XFLIP)
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_XFLIP)
xdststep = -xdststep;
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_YFLIP)
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_YFLIP)
ydststep = -ydststep;
/* loop over Y in src pixels */
@@ -618,13 +605,13 @@ static void draw_raw_drivedge(itech32_state *state, UINT16 *base, UINT16 *zbase,
UINT8 *rowsrc = src + (srcdelta >> 8);
/* in the polygon case, we don't factor in the Y */
- if (VIDEO_TRANSFER_FLAGS != 0x5490)
+ if (state->VIDEO_TRANSFER_FLAGS != 0x5490)
rowsrc += (y >> 8) * (width >> 8);
else
width = 1000 << 8;
/* simpler case: VIDEO_YSTEP_PER_X is zero */
- if (VIDEO_YSTEP_PER_X == 0)
+ if (state->VIDEO_YSTEP_PER_X == 0)
{
/* clip in the Y direction */
if (sy >= state->m_scaled_clip_rect.min_y && sy < state->m_scaled_clip_rect.max_y)
@@ -736,7 +723,7 @@ static void draw_raw_drivedge(itech32_state *state, UINT16 *base, UINT16 *zbase,
/* slow case: VIDEO_YSTEP_PER_X is non-zero */
else
{
- int ystep = (VIDEO_TRANSFER_FLAGS & XFERFLAG_DYDXSIGN) ? -VIDEO_YSTEP_PER_X : VIDEO_YSTEP_PER_X;
+ int ystep = (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_DYDXSIGN) ? -state->VIDEO_YSTEP_PER_X : state->VIDEO_YSTEP_PER_X;
int ty = sy;
INT32 z = z0;
@@ -789,30 +776,30 @@ static void draw_raw_drivedge(itech32_state *state, UINT16 *base, UINT16 *zbase,
}
/* apply skew */
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_DXDYSIGN)
- startx += VIDEO_XSTEP_PER_Y;
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_DXDYSIGN)
+ startx += state->VIDEO_XSTEP_PER_Y;
else
- startx -= VIDEO_XSTEP_PER_Y;
+ startx -= state->VIDEO_XSTEP_PER_Y;
/* update the per-scanline parameters */
- if (VIDEO_TRANSFER_FLAGS == 0x5490)
+ if (state->VIDEO_TRANSFER_FLAGS == 0x5490)
{
- startx += (INT32)((VIDEO_LEFTSTEPHI << 16) | VIDEO_LEFTSTEPLO);
- state->m_scaled_clip_rect.max_x += (INT32)((VIDEO_RIGHTSTEPHI << 16) | VIDEO_RIGHTSTEPLO);
- srcdelta += (INT16)VIDEO_STARTSTEP;
+ startx += (INT32)((state->VIDEO_LEFTSTEPHI << 16) | state->VIDEO_LEFTSTEPLO);
+ state->m_scaled_clip_rect.max_x += (INT32)((state->VIDEO_RIGHTSTEPHI << 16) | state->VIDEO_RIGHTSTEPLO);
+ srcdelta += (INT16)state->VIDEO_STARTSTEP;
}
z0 += (INT32)state->m_drivedge_zbuf_control[1];
}
/* restore cliprects */
- if (!(VIDEO_TRANSFER_FLAGS & XFERFLAG_CLIP))
+ if (!(state->VIDEO_TRANSFER_FLAGS & XFERFLAG_CLIP))
enable_clipping(state);
/* reflect the final values into registers */
- VIDEO_TRANSFER_X = (VIDEO_TRANSFER_X & ~0xfff) | (startx >> 8);
- VIDEO_RIGHTCLIP = (VIDEO_RIGHTCLIP & ~0xfff) | (state->m_scaled_clip_rect.max_x >> 8);
- VIDEO_TRANSFER_Y = (VIDEO_TRANSFER_Y & ~0xfff) | ((VIDEO_TRANSFER_Y + (y >> 8)) & 0xfff);
- VIDEO_TRANSFER_ADDRLO += srcdelta >> 8;
+ state->VIDEO_TRANSFER_X = (state->VIDEO_TRANSFER_X & ~0xfff) | (startx >> 8);
+ state->VIDEO_RIGHTCLIP = (state->VIDEO_RIGHTCLIP & ~0xfff) | (state->m_scaled_clip_rect.max_x >> 8);
+ state->VIDEO_TRANSFER_Y = (state->VIDEO_TRANSFER_Y & ~0xfff) | ((state->VIDEO_TRANSFER_Y + (y >> 8)) & 0xfff);
+ state->VIDEO_TRANSFER_ADDRLO += srcdelta >> 8;
state->m_drivedge_zbuf_control[2] = (state->m_drivedge_zbuf_control[2] & ~0x7ff00) | (z0 & 0x7ff00);
}
@@ -865,14 +852,14 @@ do { \
INLINE void draw_rle_fast(itech32_state *state, UINT16 *base, UINT16 color)
{
- UINT8 *src = &state->m_grom_base[(state->m_grom_bank | ((VIDEO_TRANSFER_ADDRHI & 0xff) << 16) | VIDEO_TRANSFER_ADDRLO) % state->m_grom_size];
- int transparent_pen = (VIDEO_TRANSFER_FLAGS & XFERFLAG_TRANSPARENT) ? 0xff : -1;
- int width = VIDEO_TRANSFER_WIDTH;
- int height = ADJUSTED_HEIGHT(VIDEO_TRANSFER_HEIGHT);
- int sx = VIDEO_TRANSFER_X & 0xfff;
- int sy = (VIDEO_TRANSFER_Y & 0xfff) << 8;
+ UINT8 *src = &state->m_grom_base[(state->m_grom_bank | ((state->VIDEO_TRANSFER_ADDRHI & 0xff) << 16) | state->VIDEO_TRANSFER_ADDRLO) % state->m_grom_size];
+ int transparent_pen = (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_TRANSPARENT) ? 0xff : -1;
+ int width = state->VIDEO_TRANSFER_WIDTH;
+ int height = ADJUSTED_HEIGHT(state->VIDEO_TRANSFER_HEIGHT);
+ int sx = state->VIDEO_TRANSFER_X & 0xfff;
+ int sy = (state->VIDEO_TRANSFER_Y & 0xfff) << 8;
int xleft, y, count = 0, val = 0, innercount;
- int ydststep = VIDEO_DST_YSTEP;
+ int ydststep = state->VIDEO_DST_YSTEP;
int lclip, rclip;
/* determine clipping */
@@ -884,7 +871,7 @@ INLINE void draw_rle_fast(itech32_state *state, UINT16 *base, UINT16 color)
sx += lclip;
/* adjust for flipping */
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_YFLIP)
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_YFLIP)
ydststep = -ydststep;
/* loop over Y in src pixels */
@@ -942,14 +929,14 @@ INLINE void draw_rle_fast(itech32_state *state, UINT16 *base, UINT16 color)
INLINE void draw_rle_fast_xflip(itech32_state *state, UINT16 *base, UINT16 color)
{
- UINT8 *src = &state->m_grom_base[(state->m_grom_bank | ((VIDEO_TRANSFER_ADDRHI & 0xff) << 16) | VIDEO_TRANSFER_ADDRLO) % state->m_grom_size];
- int transparent_pen = (VIDEO_TRANSFER_FLAGS & XFERFLAG_TRANSPARENT) ? 0xff : -1;
- int width = VIDEO_TRANSFER_WIDTH;
- int height = ADJUSTED_HEIGHT(VIDEO_TRANSFER_HEIGHT);
- int sx = VIDEO_TRANSFER_X & 0xfff;
- int sy = (VIDEO_TRANSFER_Y & 0xfff) << 8;
+ UINT8 *src = &state->m_grom_base[(state->m_grom_bank | ((state->VIDEO_TRANSFER_ADDRHI & 0xff) << 16) | state->VIDEO_TRANSFER_ADDRLO) % state->m_grom_size];
+ int transparent_pen = (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_TRANSPARENT) ? 0xff : -1;
+ int width = state->VIDEO_TRANSFER_WIDTH;
+ int height = ADJUSTED_HEIGHT(state->VIDEO_TRANSFER_HEIGHT);
+ int sx = state->VIDEO_TRANSFER_X & 0xfff;
+ int sy = (state->VIDEO_TRANSFER_Y & 0xfff) << 8;
int xleft, y, count = 0, val = 0, innercount;
- int ydststep = VIDEO_DST_YSTEP;
+ int ydststep = state->VIDEO_DST_YSTEP;
int lclip, rclip;
/* determine clipping */
@@ -961,7 +948,7 @@ INLINE void draw_rle_fast_xflip(itech32_state *state, UINT16 *base, UINT16 color
sx -= lclip;
/* adjust for flipping */
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_YFLIP)
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_YFLIP)
ydststep = -ydststep;
/* loop over Y in src pixels */
@@ -1026,24 +1013,24 @@ INLINE void draw_rle_fast_xflip(itech32_state *state, UINT16 *base, UINT16 color
INLINE void draw_rle_slow(itech32_state *state, UINT16 *base, UINT16 color)
{
- UINT8 *src = &state->m_grom_base[(state->m_grom_bank | ((VIDEO_TRANSFER_ADDRHI & 0xff) << 16) | VIDEO_TRANSFER_ADDRLO) % state->m_grom_size];
- int transparent_pen = (VIDEO_TRANSFER_FLAGS & XFERFLAG_TRANSPARENT) ? 0xff : -1;
- int width = VIDEO_TRANSFER_WIDTH;
- int height = ADJUSTED_HEIGHT(VIDEO_TRANSFER_HEIGHT);
- int sx, sy = (VIDEO_TRANSFER_Y & 0xfff) << 8;
+ UINT8 *src = &state->m_grom_base[(state->m_grom_bank | ((state->VIDEO_TRANSFER_ADDRHI & 0xff) << 16) | state->VIDEO_TRANSFER_ADDRLO) % state->m_grom_size];
+ int transparent_pen = (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_TRANSPARENT) ? 0xff : -1;
+ int width = state->VIDEO_TRANSFER_WIDTH;
+ int height = ADJUSTED_HEIGHT(state->VIDEO_TRANSFER_HEIGHT);
+ int sx, sy = (state->VIDEO_TRANSFER_Y & 0xfff) << 8;
int xleft, y, count = 0, val = 0, innercount;
int xdststep = 0x100;
- int ydststep = VIDEO_DST_YSTEP;
- int startx = (VIDEO_TRANSFER_X & 0xfff) << 8;
+ int ydststep = state->VIDEO_DST_YSTEP;
+ int startx = (state->VIDEO_TRANSFER_X & 0xfff) << 8;
/* adjust for scaling */
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_DSTXSCALE)
- xdststep = VIDEO_DST_XSTEP;
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_DSTXSCALE)
+ xdststep = state->VIDEO_DST_XSTEP;
/* adjust for flipping */
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_XFLIP)
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_XFLIP)
xdststep = -xdststep;
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_YFLIP)
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_YFLIP)
ydststep = -ydststep;
/* loop over Y in src pixels */
@@ -1093,10 +1080,10 @@ INLINE void draw_rle_slow(itech32_state *state, UINT16 *base, UINT16 color)
}
/* apply skew */
- if (VIDEO_TRANSFER_FLAGS & XFERFLAG_DXDYSIGN)
- startx += VIDEO_XSTEP_PER_Y;
+ if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_DXDYSIGN)
+ startx += state->VIDEO_XSTEP_PER_Y;
else
- startx -= VIDEO_XSTEP_PER_Y;
+ startx -= state->VIDEO_XSTEP_PER_Y;
}
}
@@ -1105,21 +1092,21 @@ INLINE void draw_rle_slow(itech32_state *state, UINT16 *base, UINT16 color)
static void draw_rle(itech32_state *state, UINT16 *base, UINT16 color)
{
/* adjust for (lack of) clipping */
- if (!(VIDEO_TRANSFER_FLAGS & XFERFLAG_CLIP))
+ if (!(state->VIDEO_TRANSFER_FLAGS & XFERFLAG_CLIP))
disable_clipping(state);
/* if we have an X scale, draw it slow */
- if (((VIDEO_TRANSFER_FLAGS & XFERFLAG_DSTXSCALE) && VIDEO_DST_XSTEP != 0x100) || VIDEO_XSTEP_PER_Y)
+ if (((state->VIDEO_TRANSFER_FLAGS & XFERFLAG_DSTXSCALE) && state->VIDEO_DST_XSTEP != 0x100) || state->VIDEO_XSTEP_PER_Y)
draw_rle_slow(state, base, color);
/* else draw it fast */
- else if (VIDEO_TRANSFER_FLAGS & XFERFLAG_XFLIP)
+ else if (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_XFLIP)
draw_rle_fast_xflip(state, base, color);
else
draw_rle_fast(state, base, color);
/* restore cliprects */
- if (!(VIDEO_TRANSFER_FLAGS & XFERFLAG_CLIP))
+ if (!(state->VIDEO_TRANSFER_FLAGS & XFERFLAG_CLIP))
enable_clipping(state);
}
@@ -1133,10 +1120,10 @@ static void draw_rle(itech32_state *state, UINT16 *base, UINT16 color)
static void shiftreg_clear(itech32_state *state, UINT16 *base, UINT16 *zbase)
{
- int ydir = (VIDEO_TRANSFER_FLAGS & XFERFLAG_YFLIP) ? -1 : 1;
- int height = ADJUSTED_HEIGHT(VIDEO_TRANSFER_HEIGHT);
- int sx = VIDEO_TRANSFER_X & 0xfff;
- int sy = VIDEO_TRANSFER_Y & 0xfff;
+ int ydir = (state->VIDEO_TRANSFER_FLAGS & XFERFLAG_YFLIP) ? -1 : 1;
+ int height = ADJUSTED_HEIGHT(state->VIDEO_TRANSFER_HEIGHT);
+ int sx = state->VIDEO_TRANSFER_X & 0xfff;
+ int sy = state->VIDEO_TRANSFER_Y & 0xfff;
UINT16 *src;
int y;
@@ -1172,7 +1159,7 @@ static void handle_video_command(running_machine &machine)
{
itech32_state *state = machine.driver_data<itech32_state>();
/* only 6 known commands */
- switch (VIDEO_COMMAND)
+ switch (state->VIDEO_COMMAND)
{
/* command 1: blit raw data */
case 1:
@@ -1206,10 +1193,10 @@ static void handle_video_command(running_machine &machine)
/* command 3: set up raw data transfer */
case 3:
if (BLIT_LOGGING) logblit(machine, "Raw Xfer");
- state->m_xfer_xcount = VIDEO_TRANSFER_WIDTH;
- state->m_xfer_ycount = ADJUSTED_HEIGHT(VIDEO_TRANSFER_HEIGHT);
- state->m_xfer_xcur = VIDEO_TRANSFER_X & 0xfff;
- state->m_xfer_ycur = VIDEO_TRANSFER_Y & 0xfff;
+ state->m_xfer_xcount = state->VIDEO_TRANSFER_WIDTH;
+ state->m_xfer_ycount = ADJUSTED_HEIGHT(state->VIDEO_TRANSFER_HEIGHT);
+ state->m_xfer_xcur = state->VIDEO_TRANSFER_X & 0xfff;
+ state->m_xfer_ycur = state->VIDEO_TRANSFER_Y & 0xfff;
break;
/* command 4: flush? */
@@ -1239,12 +1226,12 @@ static void handle_video_command(running_machine &machine)
break;
default:
- if (BLIT_LOGGING) logerror("Unknown blit command %d\n", VIDEO_COMMAND);
+ if (BLIT_LOGGING) logerror("Unknown blit command %d\n", state->VIDEO_COMMAND);
break;
}
/* tell the processor we're done */
- VIDEO_INTSTATE |= VIDEOINT_BLITTER;
+ state->VIDEO_INTSTATE |= VIDEOINT_BLITTER;
update_interrupts(machine, 1);
}
@@ -1256,72 +1243,72 @@ static void handle_video_command(running_machine &machine)
*
*************************************/
-WRITE16_HANDLER( itech32_video_w )
+WRITE16_MEMBER(itech32_state::itech32_video_w)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
rectangle visarea;
- int old = state->m_video[offset];
- COMBINE_DATA(&state->m_video[offset]);
+ int old = m_video[offset];
+ COMBINE_DATA(&m_video[offset]);
switch (offset)
{
case 0x02/2: /* VIDEO_INTACK */
VIDEO_INTSTATE = old & ~data;
- update_interrupts(space->machine(), 1);
+ update_interrupts(machine(), 1);
break;
case 0x04/2: /* VIDEO_TRANSFER */
- if (VIDEO_COMMAND == 3 && state->m_xfer_ycount)
+ if (VIDEO_COMMAND == 3 && m_xfer_ycount)
{
- offs_t addr = compute_safe_address(state, state->m_xfer_xcur, state->m_xfer_ycur);
- if (state->m_enable_latch[0])
+ itech32_state *state = machine().driver_data<itech32_state>();
+ offs_t addr = compute_safe_address(state, m_xfer_xcur, m_xfer_ycur);
+ if (m_enable_latch[0])
{
- VIDEO_TRANSFER = state->m_videoplane[0][addr];
- state->m_videoplane[0][addr] = (data & 0xff) | state->m_color_latch[0];
+ VIDEO_TRANSFER = m_videoplane[0][addr];
+ m_videoplane[0][addr] = (data & 0xff) | m_color_latch[0];
}
- if (state->m_enable_latch[1])
+ if (m_enable_latch[1])
{
- VIDEO_TRANSFER = state->m_videoplane[1][addr];
- state->m_videoplane[1][addr] = (data & 0xff) | state->m_color_latch[1];
+ VIDEO_TRANSFER = m_videoplane[1][addr];
+ m_videoplane[1][addr] = (data & 0xff) | m_color_latch[1];
}
- if (--state->m_xfer_xcount)
- state->m_xfer_xcur++;
- else if (--state->m_xfer_ycount)
- state->m_xfer_xcur = VIDEO_TRANSFER_X, state->m_xfer_xcount = VIDEO_TRANSFER_WIDTH, state->m_xfer_ycur++;
+ if (--m_xfer_xcount)
+ m_xfer_xcur++;
+ else if (--m_xfer_ycount)
+ m_xfer_xcur = VIDEO_TRANSFER_X, m_xfer_xcount = VIDEO_TRANSFER_WIDTH, m_xfer_ycur++;
}
break;
case 0x08/2: /* VIDEO_COMMAND */
- handle_video_command(space->machine());
+ handle_video_command(machine());
break;
case 0x0a/2: /* VIDEO_INTENABLE */
- update_interrupts(space->machine(), 1);
+ update_interrupts(machine(), 1);
break;
case 0x24/2: /* VIDEO_LEFTCLIP */
- state->m_clip_rect.min_x = VIDEO_LEFTCLIP;
- state->m_scaled_clip_rect.min_x = VIDEO_LEFTCLIP << 8;
+ m_clip_rect.min_x = VIDEO_LEFTCLIP;
+ m_scaled_clip_rect.min_x = VIDEO_LEFTCLIP << 8;
break;
case 0x26/2: /* VIDEO_RIGHTCLIP */
- state->m_clip_rect.max_x = VIDEO_RIGHTCLIP;
- state->m_scaled_clip_rect.max_x = VIDEO_RIGHTCLIP << 8;
+ m_clip_rect.max_x = VIDEO_RIGHTCLIP;
+ m_scaled_clip_rect.max_x = VIDEO_RIGHTCLIP << 8;
break;
case 0x28/2: /* VIDEO_TOPCLIP */
- state->m_clip_rect.min_y = VIDEO_TOPCLIP;
- state->m_scaled_clip_rect.min_y = VIDEO_TOPCLIP << 8;
+ m_clip_rect.min_y = VIDEO_TOPCLIP;
+ m_scaled_clip_rect.min_y = VIDEO_TOPCLIP << 8;
break;
case 0x2a/2: /* VIDEO_BOTTOMCLIP */
- state->m_clip_rect.max_y = VIDEO_BOTTOMCLIP;
- state->m_scaled_clip_rect.max_y = VIDEO_BOTTOMCLIP << 8;
+ m_clip_rect.max_y = VIDEO_BOTTOMCLIP;
+ m_scaled_clip_rect.max_y = VIDEO_BOTTOMCLIP << 8;
break;
case 0x2c/2: /* VIDEO_INTSCANLINE */
- state->m_scanline_timer->adjust(space->machine().primary_screen->time_until_pos(VIDEO_INTSCANLINE));
+ m_scanline_timer->adjust(machine().primary_screen->time_until_pos(VIDEO_INTSCANLINE));
break;
case 0x32/2: /* VIDEO_VTOTAL */
@@ -1353,26 +1340,25 @@ WRITE16_HANDLER( itech32_video_w )
logerror("Configure Screen: HTOTAL: %x HBSTART: %x HBEND: %x VTOTAL: %x VBSTART: %x VBEND: %x\n",
VIDEO_HTOTAL, VIDEO_HBLANK_START, VIDEO_HBLANK_END, VIDEO_VTOTAL, VIDEO_VBLANK_START, VIDEO_VBLANK_END);
- space->machine().primary_screen->configure(VIDEO_HTOTAL, VIDEO_VTOTAL, visarea, HZ_TO_ATTOSECONDS(VIDEO_CLOCK) * VIDEO_HTOTAL * VIDEO_VTOTAL);
+ machine().primary_screen->configure(VIDEO_HTOTAL, VIDEO_VTOTAL, visarea, HZ_TO_ATTOSECONDS(VIDEO_CLOCK) * VIDEO_HTOTAL * VIDEO_VTOTAL);
}
break;
}
}
-READ16_HANDLER( itech32_video_r )
+READ16_MEMBER(itech32_state::itech32_video_r)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
if (offset == 0)
{
- return (state->m_video[offset] & ~0x08) | 0x04 | 0x01;
+ return (m_video[offset] & ~0x08) | 0x04 | 0x01;
}
else if (offset == 3)
{
- return 0xef;/*space->machine().primary_screen->vpos() - 1;*/
+ return 0xef;/*machine().primary_screen->vpos() - 1;*/
}
- return state->m_video[offset];
+ return m_video[offset];
}
@@ -1383,19 +1369,19 @@ READ16_HANDLER( itech32_video_r )
*
*************************************/
-WRITE16_HANDLER( bloodstm_video_w )
+WRITE16_MEMBER(itech32_state::bloodstm_video_w)
{
itech32_video_w(space, offset / 2, data, mem_mask);
}
-READ16_HANDLER( bloodstm_video_r )
+READ16_MEMBER(itech32_state::bloodstm_video_r)
{
return itech32_video_r(space, offset / 2, mem_mask);
}
-WRITE32_HANDLER( itech020_video_w )
+WRITE32_MEMBER(itech32_state::itech020_video_w)
{
if (ACCESSING_BITS_16_31)
itech32_video_w(space, offset, data >> 16, mem_mask >> 16);
@@ -1404,14 +1390,13 @@ WRITE32_HANDLER( itech020_video_w )
}
-WRITE32_HANDLER( drivedge_zbuf_control_w )
+WRITE32_MEMBER(itech32_state::drivedge_zbuf_control_w)
{
- itech32_state *state = space->machine().driver_data<itech32_state>();
- COMBINE_DATA(&state->m_drivedge_zbuf_control[offset]);
+ COMBINE_DATA(&m_drivedge_zbuf_control[offset]);
}
-READ32_HANDLER( itech020_video_r )
+READ32_MEMBER(itech32_state::itech020_video_r)
{
int result = itech32_video_r(space, offset, mem_mask);
return (result << 16) | result;
@@ -1433,12 +1418,12 @@ SCREEN_UPDATE_IND16( itech32 )
/* loop over height */
for (y = cliprect.min_y; y <= cliprect.max_y; y++)
{
- UINT16 *src1 = &state->m_videoplane[0][compute_safe_address(state, VIDEO_DISPLAY_XORIGIN1, VIDEO_DISPLAY_YORIGIN1 + y)];
+ UINT16 *src1 = &state->m_videoplane[0][compute_safe_address(state, state->VIDEO_DISPLAY_XORIGIN1, state->VIDEO_DISPLAY_YORIGIN1 + y)];
/* handle multi-plane case */
if (state->m_planes > 1)
{
- UINT16 *src2 = &state->m_videoplane[1][compute_safe_address(state, VIDEO_DISPLAY_XORIGIN2 + VIDEO_DISPLAY_XSCROLL2, VIDEO_DISPLAY_YORIGIN2 + VIDEO_DISPLAY_YSCROLL2 + y)];
+ UINT16 *src2 = &state->m_videoplane[1][compute_safe_address(state, state->VIDEO_DISPLAY_XORIGIN2 + state->VIDEO_DISPLAY_XSCROLL2, state->VIDEO_DISPLAY_YORIGIN2 + state->VIDEO_DISPLAY_YSCROLL2 + y)];
UINT16 scanline[384];
int x;
diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c
index 9f872a01e67..57e94586d60 100644
--- a/src/mame/video/itech8.c
+++ b/src/mame/video/itech8.c
@@ -187,9 +187,9 @@ VIDEO_START( itech8 )
*
*************************************/
-WRITE8_HANDLER( itech8_palette_w )
+WRITE8_MEMBER(itech8_state::itech8_palette_w)
{
- tlc34076_w(space->machine().device("tlc34076"), offset/2, data);
+ tlc34076_w(machine().device("tlc34076"), offset/2, data);
}
@@ -200,12 +200,11 @@ WRITE8_HANDLER( itech8_palette_w )
*
*************************************/
-WRITE8_HANDLER( itech8_page_w )
+WRITE8_MEMBER(itech8_state::itech8_page_w)
{
- itech8_state *state = space->machine().driver_data<itech8_state>();
- space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos());
- logerror("%04x:display_page = %02X (%d)\n", cpu_get_pc(&space->device()), data, space->machine().primary_screen->vpos());
- state->m_page_select = data;
+ machine().primary_screen->update_partial(machine().primary_screen->vpos());
+ logerror("%04x:display_page = %02X (%d)\n", cpu_get_pc(&space.device()), data, machine().primary_screen->vpos());
+ m_page_select = data;
}
@@ -439,14 +438,13 @@ static TIMER_CALLBACK( blitter_done )
*
*************************************/
-READ8_HANDLER( itech8_blitter_r )
+READ8_MEMBER(itech8_state::itech8_blitter_r)
{
- itech8_state *state = space->machine().driver_data<itech8_state>();
- int result = state->m_blitter_data[offset / 2];
+ int result = m_blitter_data[offset / 2];
static const char *const portnames[] = { "AN_C", "AN_D", "AN_E", "AN_F" };
/* debugging */
- if (FULL_LOGGING) logerror("%04x:blitter_r(%02x)\n", cpu_get_previouspc(&space->device()), offset / 2);
+ if (FULL_LOGGING) logerror("%04x:blitter_r(%02x)\n", cpu_get_previouspc(&space.device()), offset / 2);
/* low bit seems to be ignored */
offset /= 2;
@@ -454,8 +452,8 @@ READ8_HANDLER( itech8_blitter_r )
/* a read from offset 3 clears the interrupt and returns the status */
if (offset == 3)
{
- itech8_update_interrupts(space->machine(), -1, -1, 0);
- if (state->m_blit_in_progress)
+ itech8_update_interrupts(machine(), -1, -1, 0);
+ if (m_blit_in_progress)
result |= 0x80;
else
result &= 0x7f;
@@ -463,17 +461,16 @@ READ8_HANDLER( itech8_blitter_r )
/* a read from offsets 12-15 return input port values */
if (offset >= 12 && offset <= 15)
- result = input_port_read_safe(space->machine(), portnames[offset - 12], 0x00);
+ result = input_port_read_safe(machine(), portnames[offset - 12], 0x00);
return result;
}
-WRITE8_HANDLER( itech8_blitter_w )
+WRITE8_MEMBER(itech8_state::itech8_blitter_w)
{
- itech8_state *state = space->machine().driver_data<itech8_state>();
- UINT8 *blitter_data = state->m_blitter_data;
- struct tms34061_display &tms_state = state->m_tms_state;
+ UINT8 *blitter_data = m_blitter_data;
+ struct tms34061_display &tms_state = m_tms_state;
/* low bit seems to be ignored */
offset /= 2;
@@ -487,7 +484,7 @@ WRITE8_HANDLER( itech8_blitter_w )
{
logerror("Blit: XY=%1X%04X SRC=%02X%02X%02X SIZE=%3dx%3d FLAGS=%02x",
(tms_state.regs[TMS34061_XYOFFSET] >> 8) & 0x0f, tms_state.regs[TMS34061_XYADDRESS],
- *state->m_grom_bank, blitter_data[0], blitter_data[1],
+ *m_grom_bank, blitter_data[0], blitter_data[1],
blitter_data[4], blitter_data[5],
blitter_data[2]);
logerror(" %02X %02X %02X [%02X] %02X %02X %02X [%02X]-%02X %02X %02X %02X [%02X %02X %02X %02X]\n",
@@ -502,15 +499,15 @@ WRITE8_HANDLER( itech8_blitter_w )
}
/* perform the blit */
- perform_blit(space);
- state->m_blit_in_progress = 1;
+ perform_blit(&space);
+ m_blit_in_progress = 1;
/* set a timer to go off when we're done */
- space->machine().scheduler().timer_set(attotime::from_hz(12000000/4) * (BLITTER_WIDTH * BLITTER_HEIGHT + 12), FUNC(blitter_done));
+ machine().scheduler().timer_set(attotime::from_hz(12000000/4) * (BLITTER_WIDTH * BLITTER_HEIGHT + 12), FUNC(blitter_done));
}
/* debugging */
- if (FULL_LOGGING) logerror("%04x:blitter_w(%02x)=%02x\n", cpu_get_previouspc(&space->device()), offset, data);
+ if (FULL_LOGGING) logerror("%04x:blitter_w(%02x)=%02x\n", cpu_get_previouspc(&space.device()), offset, data);
}
@@ -521,7 +518,7 @@ WRITE8_HANDLER( itech8_blitter_w )
*
*************************************/
-WRITE8_HANDLER( itech8_tms34061_w )
+WRITE8_MEMBER(itech8_state::itech8_tms34061_w)
{
int func = (offset >> 9) & 7;
int col = offset & 0xff;
@@ -532,11 +529,11 @@ WRITE8_HANDLER( itech8_tms34061_w )
col ^= 2;
/* Row address (RA0-RA8) is not dependent on the offset */
- tms34061_w(space, col, 0xff, func, data);
+ tms34061_w(&space, col, 0xff, func, data);
}
-READ8_HANDLER( itech8_tms34061_r )
+READ8_MEMBER(itech8_state::itech8_tms34061_r)
{
int func = (offset >> 9) & 7;
int col = offset & 0xff;
@@ -547,7 +544,7 @@ READ8_HANDLER( itech8_tms34061_r )
col ^= 2;
/* Row address (RA0-RA8) is not dependent on the offset */
- return tms34061_r(space, col, 0xff, func);
+ return tms34061_r(&space, col, 0xff, func);
}
@@ -558,20 +555,18 @@ READ8_HANDLER( itech8_tms34061_r )
*
*************************************/
-WRITE8_HANDLER( grmatch_palette_w )
+WRITE8_MEMBER(itech8_state::grmatch_palette_w)
{
- itech8_state *state = space->machine().driver_data<itech8_state>();
/* set the palette control; examined in the scanline callback */
- state->m_grmatch_palcontrol = data;
+ m_grmatch_palcontrol = data;
}
-WRITE8_HANDLER( grmatch_xscroll_w )
+WRITE8_MEMBER(itech8_state::grmatch_xscroll_w)
{
- itech8_state *state = space->machine().driver_data<itech8_state>();
/* update the X scroll value */
- space->machine().primary_screen->update_now();
- state->m_grmatch_xscroll = data;
+ machine().primary_screen->update_now();
+ m_grmatch_xscroll = data;
}
diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c
index 9b4c66d435f..65d0d229def 100644
--- a/src/mame/video/jack.c
+++ b/src/mame/video/jack.c
@@ -10,36 +10,33 @@
#include "includes/jack.h"
-WRITE8_HANDLER( jack_videoram_w )
+WRITE8_MEMBER(jack_state::jack_videoram_w)
{
- jack_state *state = space->machine().driver_data<jack_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( jack_colorram_w )
+WRITE8_MEMBER(jack_state::jack_colorram_w)
{
- jack_state *state = space->machine().driver_data<jack_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( jack_paletteram_w )
+WRITE8_MEMBER(jack_state::jack_paletteram_w)
{
/* RGB output is inverted */
- jack_state *state = space->machine().driver_data<jack_state>();
- state->paletteram_BBGGGRRR_w(*space, offset, ~data);
+ paletteram_BBGGGRRR_w(space, offset, ~data);
}
-READ8_HANDLER( jack_flipscreen_r )
+READ8_MEMBER(jack_state::jack_flipscreen_r)
{
- flip_screen_set(space->machine(), offset);
+ flip_screen_set(machine(), offset);
return 0;
}
-WRITE8_HANDLER( jack_flipscreen_w )
+WRITE8_MEMBER(jack_state::jack_flipscreen_w)
{
- flip_screen_set(space->machine(), offset);
+ flip_screen_set(machine(), offset);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c
index 7b660e867f0..bc9f53090e6 100644
--- a/src/mame/video/jailbrek.c
+++ b/src/mame/video/jailbrek.c
@@ -34,18 +34,16 @@ PALETTE_INIT( jailbrek )
}
}
-WRITE8_HANDLER( jailbrek_videoram_w )
+WRITE8_MEMBER(jailbrek_state::jailbrek_videoram_w)
{
- jailbrek_state *state = space->machine().driver_data<jailbrek_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( jailbrek_colorram_w )
+WRITE8_MEMBER(jailbrek_state::jailbrek_colorram_w)
{
- jailbrek_state *state = space->machine().driver_data<jailbrek_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/jedi.c b/src/mame/video/jedi.c
index fd95929c451..5045dd91173 100644
--- a/src/mame/video/jedi.c
+++ b/src/mame/video/jedi.c
@@ -108,19 +108,17 @@ static void do_pen_lookup(jedi_state *state, bitmap_rgb32 &bitmap, const rectang
*
*************************************/
-WRITE8_HANDLER( jedi_vscroll_w )
+WRITE8_MEMBER(jedi_state::jedi_vscroll_w)
{
- jedi_state *state = space->machine().driver_data<jedi_state>();
- state->m_vscroll = data | (offset << 8);
+ m_vscroll = data | (offset << 8);
}
-WRITE8_HANDLER( jedi_hscroll_w )
+WRITE8_MEMBER(jedi_state::jedi_hscroll_w)
{
- jedi_state *state = space->machine().driver_data<jedi_state>();
- state->m_hscroll = data | (offset << 8);
+ m_hscroll = data | (offset << 8);
}
diff --git a/src/mame/video/jpmimpct.c b/src/mame/video/jpmimpct.c
index 74711885062..7e49eca4e80 100644
--- a/src/mame/video/jpmimpct.c
+++ b/src/mame/video/jpmimpct.c
@@ -27,44 +27,43 @@
* 1 1 0 Command register
*/
-WRITE16_HANDLER( jpmimpct_bt477_w )
+WRITE16_MEMBER(jpmimpct_state::jpmimpct_bt477_w)
{
- jpmimpct_state *state = space->machine().driver_data<jpmimpct_state>();
UINT8 val = data & 0xff;
switch (offset)
{
case 0x0:
{
- state->m_bt477.address = val;
- state->m_bt477.addr_cnt = 0;
+ m_bt477.address = val;
+ m_bt477.addr_cnt = 0;
break;
}
case 0x1:
{
- UINT8 *addr_cnt = &state->m_bt477.addr_cnt;
- rgb_t *color = &state->m_bt477.color;
+ UINT8 *addr_cnt = &m_bt477.addr_cnt;
+ rgb_t *color = &m_bt477.color;
color[*addr_cnt] = val;
if (++*addr_cnt == 3)
{
- palette_set_color(space->machine(), state->m_bt477.address, MAKE_RGB(color[0], color[1], color[2]));
+ palette_set_color(machine(), m_bt477.address, MAKE_RGB(color[0], color[1], color[2]));
*addr_cnt = 0;
/* Address register increments */
- state->m_bt477.address++;
+ m_bt477.address++;
}
break;
}
case 0x2:
{
- state->m_bt477.pixmask = val;
+ m_bt477.pixmask = val;
break;
}
case 0x6:
{
- state->m_bt477.command = val;
+ m_bt477.command = val;
break;
}
default:
@@ -74,7 +73,7 @@ WRITE16_HANDLER( jpmimpct_bt477_w )
}
}
-READ16_HANDLER( jpmimpct_bt477_r )
+READ16_MEMBER(jpmimpct_state::jpmimpct_bt477_r)
{
popmessage("Bt477: Unhandled read access (offset:%x)", offset);
return 0;
diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c
index 193839f90fe..d6eb6488b63 100644
--- a/src/mame/video/kaneko16.c
+++ b/src/mame/video/kaneko16.c
@@ -46,10 +46,9 @@ struct tempsprite
};
-WRITE16_HANDLER( kaneko16_display_enable )
+WRITE16_MEMBER(kaneko16_state::kaneko16_display_enable)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- COMBINE_DATA(&state->m_disp_enable);
+ COMBINE_DATA(&m_disp_enable);
}
/***************************************************************************
@@ -92,10 +91,10 @@ INLINE void kaneko16_vram_w(address_space *space, offs_t offset, UINT16 data, UI
state->m_tmap[_N_]->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( kaneko16_vram_0_w ) { kaneko16_vram_w(space, offset, data, mem_mask, 0); }
-WRITE16_HANDLER( kaneko16_vram_1_w ) { kaneko16_vram_w(space, offset, data, mem_mask, 1); }
-WRITE16_HANDLER( kaneko16_vram_2_w ) { kaneko16_vram_w(space, offset, data, mem_mask, 2); }
-WRITE16_HANDLER( kaneko16_vram_3_w ) { kaneko16_vram_w(space, offset, data, mem_mask, 3); }
+WRITE16_MEMBER(kaneko16_state::kaneko16_vram_0_w){ kaneko16_vram_w(&space, offset, data, mem_mask, 0); }
+WRITE16_MEMBER(kaneko16_state::kaneko16_vram_1_w){ kaneko16_vram_w(&space, offset, data, mem_mask, 1); }
+WRITE16_MEMBER(kaneko16_state::kaneko16_vram_2_w){ kaneko16_vram_w(&space, offset, data, mem_mask, 2); }
+WRITE16_MEMBER(kaneko16_state::kaneko16_vram_3_w){ kaneko16_vram_w(&space, offset, data, mem_mask, 3); }
VIDEO_START( kaneko16_sprites )
{
@@ -717,36 +716,34 @@ FLIP ON:
900010: 0000 0400 A000 A400-1E00 2200 0000 0400 ; +1f<<6 on y
*/
-READ16_HANDLER( kaneko16_sprites_regs_r )
+READ16_MEMBER(kaneko16_state::kaneko16_sprites_regs_r)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- return state->m_sprites_regs[offset];
+ return m_sprites_regs[offset];
}
-WRITE16_HANDLER( kaneko16_sprites_regs_w )
+WRITE16_MEMBER(kaneko16_state::kaneko16_sprites_regs_w)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
UINT16 new_data;
- COMBINE_DATA(&state->m_sprites_regs[offset]);
- new_data = state->m_sprites_regs[offset];
+ COMBINE_DATA(&m_sprites_regs[offset]);
+ new_data = m_sprites_regs[offset];
switch (offset)
{
case 0:
if (ACCESSING_BITS_0_7)
{
- state->m_sprite_flipx = new_data & 2;
- state->m_sprite_flipy = new_data & 1;
+ m_sprite_flipx = new_data & 2;
+ m_sprite_flipy = new_data & 1;
- if(state->m_sprite_type == 0 || state->m_sprite_type == 2)
- state->m_keep_sprites = ~new_data & 4;
+ if(m_sprite_type == 0 || m_sprite_type == 2)
+ m_keep_sprites = ~new_data & 4;
}
break;
}
-// logerror("CPU #0 PC %06X : Warning, sprites reg %04X <- %04X\n",cpu_get_pc(&space->device()),offset*2,data);
+// logerror("CPU #0 PC %06X : Warning, sprites reg %04X <- %04X\n",cpu_get_pc(&space.device()),offset*2,data);
}
@@ -802,43 +799,37 @@ There are more!
*/
-WRITE16_HANDLER( kaneko16_layers_0_regs_w )
+WRITE16_MEMBER(kaneko16_state::kaneko16_layers_0_regs_w)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- COMBINE_DATA(&state->m_layers_0_regs[offset]);
+ COMBINE_DATA(&m_layers_0_regs[offset]);
}
-WRITE16_HANDLER( kaneko16_layers_1_regs_w )
+WRITE16_MEMBER(kaneko16_state::kaneko16_layers_1_regs_w)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- COMBINE_DATA(&state->m_layers_1_regs[offset]);
+ COMBINE_DATA(&m_layers_1_regs[offset]);
}
/* Select the high color background image (out of 32 in the ROMs) */
-READ16_HANDLER( kaneko16_bg15_select_r )
+READ16_MEMBER(kaneko16_state::kaneko16_bg15_select_r)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- return state->m_bg15_select[0];
+ return m_bg15_select[0];
}
-WRITE16_HANDLER( kaneko16_bg15_select_w )
+WRITE16_MEMBER(kaneko16_state::kaneko16_bg15_select_w)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- COMBINE_DATA(&state->m_bg15_select[0]);
+ COMBINE_DATA(&m_bg15_select[0]);
}
/* ? */
-READ16_HANDLER( kaneko16_bg15_reg_r )
+READ16_MEMBER(kaneko16_state::kaneko16_bg15_reg_r)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- return state->m_bg15_reg[0];
+ return m_bg15_reg[0];
}
-WRITE16_HANDLER( kaneko16_bg15_reg_w )
+WRITE16_MEMBER(kaneko16_state::kaneko16_bg15_reg_w)
{
- kaneko16_state *state = space->machine().driver_data<kaneko16_state>();
- COMBINE_DATA(&state->m_bg15_reg[0]);
+ COMBINE_DATA(&m_bg15_reg[0]);
}
diff --git a/src/mame/video/kangaroo.c b/src/mame/video/kangaroo.c
index 57dcf5e0ada..e546548290d 100644
--- a/src/mame/video/kangaroo.c
+++ b/src/mame/video/kangaroo.c
@@ -61,10 +61,9 @@ static void videoram_write( running_machine &machine, UINT16 offset, UINT8 data,
}
-WRITE8_HANDLER( kangaroo_videoram_w )
+WRITE8_MEMBER(kangaroo_state::kangaroo_videoram_w)
{
- kangaroo_state *state = space->machine().driver_data<kangaroo_state>();
- videoram_write(space->machine(), offset, data, state->m_video_control[8]);
+ videoram_write(machine(), offset, data, m_video_control[8]);
}
@@ -75,19 +74,18 @@ WRITE8_HANDLER( kangaroo_videoram_w )
*
*************************************/
-WRITE8_HANDLER( kangaroo_video_control_w )
+WRITE8_MEMBER(kangaroo_state::kangaroo_video_control_w)
{
- kangaroo_state *state = space->machine().driver_data<kangaroo_state>();
- state->m_video_control[offset] = data;
+ m_video_control[offset] = data;
switch (offset)
{
case 5: /* blitter start */
- blitter_execute(space->machine());
+ blitter_execute(machine());
break;
case 8: /* bank select */
- memory_set_bank(space->machine(), "bank1", (data & 0x05) ? 0 : 1);
+ memory_set_bank(machine(), "bank1", (data & 0x05) ? 0 : 1);
break;
}
}
diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c
index 674836b1f8d..35b4d34fefb 100644
--- a/src/mame/video/karnov.c
+++ b/src/mame/video/karnov.c
@@ -145,18 +145,16 @@ static TILE_GET_INFO( get_fix_tile_info )
0);
}
-WRITE16_HANDLER( karnov_videoram_w )
+WRITE16_MEMBER(karnov_state::karnov_videoram_w)
{
- karnov_state *state = space->machine().driver_data<karnov_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_fix_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_fix_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( karnov_playfield_swap_w )
+WRITE16_MEMBER(karnov_state::karnov_playfield_swap_w)
{
- karnov_state *state = space->machine().driver_data<karnov_state>();
offset = ((offset & 0x1f) << 5) | ((offset & 0x3e0) >> 5);
- COMBINE_DATA(&state->m_pf_data[offset]);
+ COMBINE_DATA(&m_pf_data[offset]);
}
/******************************************************************************/
diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c
index 86acb2c0a52..b6dbf96efe3 100644
--- a/src/mame/video/kchamp.c
+++ b/src/mame/video/kchamp.c
@@ -24,23 +24,21 @@ PALETTE_INIT( kchamp )
}
}
-WRITE8_HANDLER( kchamp_videoram_w )
+WRITE8_MEMBER(kchamp_state::kchamp_videoram_w)
{
- kchamp_state *state = space->machine().driver_data<kchamp_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( kchamp_colorram_w )
+WRITE8_MEMBER(kchamp_state::kchamp_colorram_w)
{
- kchamp_state *state = space->machine().driver_data<kchamp_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( kchamp_flipscreen_w )
+WRITE8_MEMBER(kchamp_state::kchamp_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 0x01);
+ flip_screen_set(machine(), data & 0x01);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/kickgoal.c b/src/mame/video/kickgoal.c
index 6d9624de334..2f3d097831e 100644
--- a/src/mame/video/kickgoal.c
+++ b/src/mame/video/kickgoal.c
@@ -4,25 +4,22 @@
#include "includes/kickgoal.h"
-WRITE16_HANDLER( kickgoal_fgram_w )
+WRITE16_MEMBER(kickgoal_state::kickgoal_fgram_w)
{
- kickgoal_state *state = space->machine().driver_data<kickgoal_state>();
- state->m_fgram[offset] = data;
- state->m_fgtm->mark_tile_dirty(offset / 2);
+ m_fgram[offset] = data;
+ m_fgtm->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( kickgoal_bgram_w )
+WRITE16_MEMBER(kickgoal_state::kickgoal_bgram_w)
{
- kickgoal_state *state = space->machine().driver_data<kickgoal_state>();
- state->m_bgram[offset] = data;
- state->m_bgtm->mark_tile_dirty(offset / 2);
+ m_bgram[offset] = data;
+ m_bgtm->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( kickgoal_bg2ram_w )
+WRITE16_MEMBER(kickgoal_state::kickgoal_bg2ram_w)
{
- kickgoal_state *state = space->machine().driver_data<kickgoal_state>();
- state->m_bg2ram[offset] = data;
- state->m_bg2tm->mark_tile_dirty(offset / 2);
+ m_bg2ram[offset] = data;
+ m_bg2tm->mark_tile_dirty(offset / 2);
}
diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c
index f570226a887..58fd6cf913d 100644
--- a/src/mame/video/kingobox.c
+++ b/src/mame/video/kingobox.c
@@ -131,49 +131,44 @@ PALETTE_INIT( ringking )
palette_init_common(machine, color_prom, ringking_get_rgb_data);
}
-WRITE8_HANDLER( kingofb_videoram_w )
+WRITE8_MEMBER(kingofb_state::kingofb_videoram_w)
{
- kingofb_state *state = space->machine().driver_data<kingofb_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( kingofb_colorram_w )
+WRITE8_MEMBER(kingofb_state::kingofb_colorram_w)
{
- kingofb_state *state = space->machine().driver_data<kingofb_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( kingofb_videoram2_w )
+WRITE8_MEMBER(kingofb_state::kingofb_videoram2_w)
{
- kingofb_state *state = space->machine().driver_data<kingofb_state>();
- state->m_videoram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( kingofb_colorram2_w )
+WRITE8_MEMBER(kingofb_state::kingofb_colorram2_w)
{
- kingofb_state *state = space->machine().driver_data<kingofb_state>();
- state->m_colorram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( kingofb_f800_w )
+WRITE8_MEMBER(kingofb_state::kingofb_f800_w)
{
- kingofb_state *state = space->machine().driver_data<kingofb_state>();
- state->m_nmi_enable = data & 0x20;
+ m_nmi_enable = data & 0x20;
- if (state->m_palette_bank != ((data & 0x18) >> 3))
+ if (m_palette_bank != ((data & 0x18) >> 3))
{
- state->m_palette_bank = (data & 0x18) >> 3;
- state->m_bg_tilemap->mark_all_dirty();
+ m_palette_bank = (data & 0x18) >> 3;
+ m_bg_tilemap->mark_all_dirty();
}
- if (flip_screen_get(space->machine()) != (data & 0x80))
+ if (flip_screen_get(machine()) != (data & 0x80))
{
- flip_screen_set(space->machine(), data & 0x80);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x80);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c
index 0d9fcbe441b..af035aaea12 100644
--- a/src/mame/video/kncljoe.c
+++ b/src/mame/video/kncljoe.c
@@ -117,16 +117,14 @@ VIDEO_START( kncljoe )
***************************************************************************/
-WRITE8_HANDLER( kncljoe_videoram_w )
+WRITE8_MEMBER(kncljoe_state::kncljoe_videoram_w)
{
- kncljoe_state *state = space->machine().driver_data<kncljoe_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( kncljoe_control_w )
+WRITE8_MEMBER(kncljoe_state::kncljoe_control_w)
{
- kncljoe_state *state = space->machine().driver_data<kncljoe_state>();
int i;
/*
0x01 screen flip
@@ -138,38 +136,37 @@ WRITE8_HANDLER( kncljoe_control_w )
reset when IN0 - Coin 1 goes low (active)
set after IN0 - Coin 1 goes high AND the credit has been added
*/
- state->m_flipscreen = data & 0x01;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? TILEMAP_FLIPX : TILEMAP_FLIPY);
+ m_flipscreen = data & 0x01;
+ machine().tilemap().set_flip_all(m_flipscreen ? TILEMAP_FLIPX : TILEMAP_FLIPY);
- coin_counter_w(space->machine(), 0, data & 0x02);
- coin_counter_w(space->machine(), 1, data & 0x20);
+ coin_counter_w(machine(), 0, data & 0x02);
+ coin_counter_w(machine(), 1, data & 0x20);
i = (data & 0x10) >> 4;
- if (state->m_tile_bank != i)
+ if (m_tile_bank != i)
{
- state->m_tile_bank = i;
- state->m_bg_tilemap->mark_all_dirty();
+ m_tile_bank = i;
+ m_bg_tilemap->mark_all_dirty();
}
i = (data & 0x04) >> 2;
- if (state->m_sprite_bank != i)
+ if (m_sprite_bank != i)
{
- state->m_sprite_bank = i;
- memset(space->machine().region("maincpu")->base() + 0xf100, 0, 0x180);
+ m_sprite_bank = i;
+ memset(machine().region("maincpu")->base() + 0xf100, 0, 0x180);
}
}
-WRITE8_HANDLER( kncljoe_scroll_w )
+WRITE8_MEMBER(kncljoe_state::kncljoe_scroll_w)
{
- kncljoe_state *state = space->machine().driver_data<kncljoe_state>();
int scrollx;
- state->m_scrollregs[offset] = data;
- scrollx = state->m_scrollregs[0] | state->m_scrollregs[1] << 8;
- state->m_bg_tilemap->set_scrollx(0, scrollx);
- state->m_bg_tilemap->set_scrollx(1, scrollx);
- state->m_bg_tilemap->set_scrollx(2, scrollx);
- state->m_bg_tilemap->set_scrollx(3, 0);
+ m_scrollregs[offset] = data;
+ scrollx = m_scrollregs[0] | m_scrollregs[1] << 8;
+ m_bg_tilemap->set_scrollx(0, scrollx);
+ m_bg_tilemap->set_scrollx(1, scrollx);
+ m_bg_tilemap->set_scrollx(2, scrollx);
+ m_bg_tilemap->set_scrollx(3, 0);
}
diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c
index d184e3f715f..ef5a5cdd98a 100644
--- a/src/mame/video/konamigx.c
+++ b/src/mame/video/konamigx.c
@@ -1841,7 +1841,7 @@ UINT32* konamigx_type3_psac2_bank;
static int konamigx_type3_psac2_actual_bank;
//int konamigx_type3_psac2_actual_last_bank = 0;
-WRITE32_HANDLER( konamigx_type3_psac2_bank_w )
+WRITE32_MEMBER(konamigx_state::konamigx_type3_psac2_bank_w)
{
// other bits are used for something...
@@ -2582,22 +2582,21 @@ SCREEN_UPDATE_RGB32(konamigx_right)
}
-WRITE32_HANDLER( konamigx_palette_w )
+WRITE32_MEMBER(konamigx_state::konamigx_palette_w)
{
int r,g,b;
- konamigx_state *state = space->machine().driver_data<konamigx_state>();
- COMBINE_DATA(&state->m_generic_paletteram_32[offset]);
+ COMBINE_DATA(&m_generic_paletteram_32[offset]);
- r = (state->m_generic_paletteram_32[offset] >>16) & 0xff;
- g = (state->m_generic_paletteram_32[offset] >> 8) & 0xff;
- b = (state->m_generic_paletteram_32[offset] >> 0) & 0xff;
+ r = (m_generic_paletteram_32[offset] >>16) & 0xff;
+ g = (m_generic_paletteram_32[offset] >> 8) & 0xff;
+ b = (m_generic_paletteram_32[offset] >> 0) & 0xff;
- palette_set_color(space->machine(),offset,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),offset,MAKE_RGB(r,g,b));
}
#ifdef UNUSED_FUNCTION
-WRITE32_HANDLER( konamigx_palette2_w )
+WRITE32_MEMBER(konamigx_state::konamigx_palette2_w)
{
int r,g,b;
@@ -2609,7 +2608,7 @@ WRITE32_HANDLER( konamigx_palette2_w )
offset += (0x8000/4);
- palette_set_color(space->machine(),offset,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),offset,MAKE_RGB(r,g,b));
}
#endif
@@ -2620,20 +2619,19 @@ INLINE void set_color_555(running_machine &machine, pen_t color, int rshift, int
#ifdef UNUSED_FUNCTION
// main monitor for type 3
-WRITE32_HANDLER( konamigx_555_palette_w )
+WRITE32_MEMBER(konamigx_state::konamigx_555_palette_w)
{
UINT32 coldat;
- konamigx_state *state = space->machine().driver_data<konamigx_state>();
- COMBINE_DATA(&state->m_generic_paletteram_32[offset]);
+ COMBINE_DATA(&m_generic_paletteram_32[offset]);
- coldat = state->m_generic_paletteram_32[offset];
+ coldat = m_generic_paletteram_32[offset];
- set_color_555(space->machine(), offset*2, 0, 5, 10,coldat >> 16);
- set_color_555(space->machine(), offset*2+1, 0, 5, 10,coldat & 0xffff);
+ set_color_555(machine(), offset*2, 0, 5, 10,coldat >> 16);
+ set_color_555(machine(), offset*2+1, 0, 5, 10,coldat & 0xffff);
}
// sub monitor for type 3
-WRITE32_HANDLER( konamigx_555_palette2_w )
+WRITE32_MEMBER(konamigx_state::konamigx_555_palette2_w)
{
UINT32 coldat;
COMBINE_DATA(&gx_subpaletteram32[offset]);
@@ -2641,13 +2639,13 @@ WRITE32_HANDLER( konamigx_555_palette2_w )
offset += (0x4000/4);
- set_color_555(space->machine(), offset*2, 0, 5, 10,coldat >> 16);
- set_color_555(space->machine(), offset*2+1, 0, 5, 10,coldat & 0xffff);
+ set_color_555(machine(), offset*2, 0, 5, 10,coldat >> 16);
+ set_color_555(machine(), offset*2+1, 0, 5, 10,coldat & 0xffff);
}
#endif
-WRITE32_HANDLER( konamigx_tilebank_w )
+WRITE32_MEMBER(konamigx_state::konamigx_tilebank_w)
{
if (ACCESSING_BITS_24_31)
gx_tilebanks[offset*4] = (data>>24)&0xff;
@@ -2660,7 +2658,7 @@ WRITE32_HANDLER( konamigx_tilebank_w )
}
// type 1 RAM-based PSAC tilemap
-WRITE32_HANDLER(konamigx_t1_psacmap_w)
+WRITE32_MEMBER(konamigx_state::konamigx_t1_psacmap_w)
{
COMBINE_DATA(&gx_psacram[offset]);
gx_psac_tilemap->mark_tile_dirty(offset/2);
@@ -2668,7 +2666,7 @@ WRITE32_HANDLER(konamigx_t1_psacmap_w)
}
// type 4 RAM-based PSAC tilemap
-WRITE32_HANDLER( konamigx_t4_psacmap_w )
+WRITE32_MEMBER(konamigx_state::konamigx_t4_psacmap_w)
{
COMBINE_DATA(&gx_psacram[offset]);
diff --git a/src/mame/video/kopunch.c b/src/mame/video/kopunch.c
index 62ae50e62bc..50094a3e907 100644
--- a/src/mame/video/kopunch.c
+++ b/src/mame/video/kopunch.c
@@ -32,42 +32,37 @@ PALETTE_INIT( kopunch )
}
}
-WRITE8_HANDLER( kopunch_videoram_w )
+WRITE8_MEMBER(kopunch_state::kopunch_videoram_w)
{
- kopunch_state *state = space->machine().driver_data<kopunch_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( kopunch_videoram2_w )
+WRITE8_MEMBER(kopunch_state::kopunch_videoram2_w)
{
- kopunch_state *state = space->machine().driver_data<kopunch_state>();
- state->m_videoram2[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( kopunch_scroll_x_w )
+WRITE8_MEMBER(kopunch_state::kopunch_scroll_x_w)
{
- kopunch_state *state = space->machine().driver_data<kopunch_state>();
- state->m_bg_tilemap->set_scrollx(0, data);
+ m_bg_tilemap->set_scrollx(0, data);
}
-WRITE8_HANDLER( kopunch_scroll_y_w )
+WRITE8_MEMBER(kopunch_state::kopunch_scroll_y_w)
{
- kopunch_state *state = space->machine().driver_data<kopunch_state>();
- state->m_bg_tilemap->set_scrolly(0, data);
+ m_bg_tilemap->set_scrolly(0, data);
}
-WRITE8_HANDLER( kopunch_gfxbank_w )
+WRITE8_MEMBER(kopunch_state::kopunch_gfxbank_w)
{
- kopunch_state *state = space->machine().driver_data<kopunch_state>();
- if (state->m_gfxbank != (data & 0x07))
+ if (m_gfxbank != (data & 0x07))
{
- state->m_gfxbank = data & 0x07;
- state->m_bg_tilemap->mark_all_dirty();
+ m_gfxbank = data & 0x07;
+ m_bg_tilemap->mark_all_dirty();
}
- state->m_bg_tilemap->set_flip((data & 0x08) ? TILEMAP_FLIPY : 0);
+ m_bg_tilemap->set_flip((data & 0x08) ? TILEMAP_FLIPY : 0);
}
static TILE_GET_INFO( get_fg_tile_info )
diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c
index 70c8b597f5d..70770d36afe 100644
--- a/src/mame/video/ksayakyu.c
+++ b/src/mame/video/ksayakyu.c
@@ -2,14 +2,13 @@
#include "includes/ksayakyu.h"
-WRITE8_HANDLER(ksayakyu_videoram_w)
+WRITE8_MEMBER(ksayakyu_state::ksayakyu_videoram_w)
{
- ksayakyu_state *state = space->machine().driver_data<ksayakyu_state>();
- state->m_videoram[offset]=data;
- state->m_textmap->mark_tile_dirty(offset >> 1);
+ m_videoram[offset]=data;
+ m_textmap->mark_tile_dirty(offset >> 1);
}
-WRITE8_HANDLER(ksayakyu_videoctrl_w)
+WRITE8_MEMBER(ksayakyu_state::ksayakyu_videoctrl_w)
{
/*
bits:
@@ -20,16 +19,15 @@ WRITE8_HANDLER(ksayakyu_videoctrl_w)
xxx - scroll offset
*/
- ksayakyu_state *state = space->machine().driver_data<ksayakyu_state>();
- state->m_video_ctrl = data;
-
- state->m_flipscreen = data & 4;
- flip_screen_set(space->machine(), state->m_flipscreen);
- state->m_tilemap->set_scrolly(0, (data & 0xe0) << 3);
- if(state->m_flipscreen)
- state->m_tilemap->set_flip((data & 2) ? TILEMAP_FLIPY : TILEMAP_FLIPX | TILEMAP_FLIPY);
+ m_video_ctrl = data;
+
+ m_flipscreen = data & 4;
+ flip_screen_set(machine(), m_flipscreen);
+ m_tilemap->set_scrolly(0, (data & 0xe0) << 3);
+ if(m_flipscreen)
+ m_tilemap->set_flip((data & 2) ? TILEMAP_FLIPY : TILEMAP_FLIPX | TILEMAP_FLIPY);
else
- state->m_tilemap->set_flip((data & 2) ? TILEMAP_FLIPX : 0);
+ m_tilemap->set_flip((data & 2) ? TILEMAP_FLIPX : 0);
}
PALETTE_INIT( ksayakyu )
diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c
index de3a07b28a7..17d58b1cd13 100644
--- a/src/mame/video/kyugo.c
+++ b/src/mame/video/kyugo.c
@@ -65,69 +65,63 @@ VIDEO_START( kyugo )
*
*************************************/
-WRITE8_HANDLER( kyugo_fgvideoram_w )
+WRITE8_MEMBER(kyugo_state::kyugo_fgvideoram_w)
{
- kyugo_state *state = space->machine().driver_data<kyugo_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( kyugo_bgvideoram_w )
+WRITE8_MEMBER(kyugo_state::kyugo_bgvideoram_w)
{
- kyugo_state *state = space->machine().driver_data<kyugo_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( kyugo_bgattribram_w )
+WRITE8_MEMBER(kyugo_state::kyugo_bgattribram_w)
{
- kyugo_state *state = space->machine().driver_data<kyugo_state>();
- state->m_bgattribram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bgattribram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-READ8_HANDLER( kyugo_spriteram_2_r )
+READ8_MEMBER(kyugo_state::kyugo_spriteram_2_r)
{
- kyugo_state *state = space->machine().driver_data<kyugo_state>();
// only the lower nibble is connected
- return state->m_spriteram_2[offset] | 0xf0;
+ return m_spriteram_2[offset] | 0xf0;
}
-WRITE8_HANDLER( kyugo_scroll_x_lo_w )
+WRITE8_MEMBER(kyugo_state::kyugo_scroll_x_lo_w)
{
- kyugo_state *state = space->machine().driver_data<kyugo_state>();
- state->m_scroll_x_lo = data;
+ m_scroll_x_lo = data;
}
-WRITE8_HANDLER( kyugo_gfxctrl_w )
+WRITE8_MEMBER(kyugo_state::kyugo_gfxctrl_w)
{
- kyugo_state *state = space->machine().driver_data<kyugo_state>();
/* bit 0 is scroll MSB */
- state->m_scroll_x_hi = data & 0x01;
+ m_scroll_x_hi = data & 0x01;
/* bit 5 is front layer color (Son of Phoenix only) */
- if (state->m_fgcolor != ((data & 0x20) >> 5))
+ if (m_fgcolor != ((data & 0x20) >> 5))
{
- state->m_fgcolor = (data & 0x20) >> 5;
+ m_fgcolor = (data & 0x20) >> 5;
- state->m_fg_tilemap->mark_all_dirty();
+ m_fg_tilemap->mark_all_dirty();
}
/* bit 6 is background palette bank */
- if (state->m_bgpalbank != ((data & 0x40) >> 6))
+ if (m_bgpalbank != ((data & 0x40) >> 6))
{
- state->m_bgpalbank = (data & 0x40) >> 6;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bgpalbank = (data & 0x40) >> 6;
+ m_bg_tilemap->mark_all_dirty();
}
if (data & 0x9e)
@@ -135,21 +129,19 @@ WRITE8_HANDLER( kyugo_gfxctrl_w )
}
-WRITE8_HANDLER( kyugo_scroll_y_w )
+WRITE8_MEMBER(kyugo_state::kyugo_scroll_y_w)
{
- kyugo_state *state = space->machine().driver_data<kyugo_state>();
- state->m_scroll_y = data;
+ m_scroll_y = data;
}
-WRITE8_HANDLER( kyugo_flipscreen_w )
+WRITE8_MEMBER(kyugo_state::kyugo_flipscreen_w)
{
- kyugo_state *state = space->machine().driver_data<kyugo_state>();
- if (state->m_flipscreen != (data & 0x01))
+ if (m_flipscreen != (data & 0x01))
{
- state->m_flipscreen = (data & 0x01);
- space->machine().tilemap().set_flip_all((state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY): 0));
+ m_flipscreen = (data & 0x01);
+ machine().tilemap().set_flip_all((m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY): 0));
}
}
diff --git a/src/mame/video/labyrunr.c b/src/mame/video/labyrunr.c
index 9205e76fef7..e4ffb9293e5 100644
--- a/src/mame/video/labyrunr.c
+++ b/src/mame/video/labyrunr.c
@@ -158,18 +158,16 @@ VIDEO_START( labyrunr )
***************************************************************************/
-WRITE8_HANDLER( labyrunr_vram1_w )
+WRITE8_MEMBER(labyrunr_state::labyrunr_vram1_w)
{
- labyrunr_state *state = space->machine().driver_data<labyrunr_state>();
- state->m_videoram1[offset] = data;
- state->m_layer0->mark_tile_dirty(offset & 0x3ff);
+ m_videoram1[offset] = data;
+ m_layer0->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( labyrunr_vram2_w )
+WRITE8_MEMBER(labyrunr_state::labyrunr_vram2_w)
{
- labyrunr_state *state = space->machine().driver_data<labyrunr_state>();
- state->m_videoram2[offset] = data;
- state->m_layer1->mark_tile_dirty(offset & 0x3ff);
+ m_videoram2[offset] = data;
+ m_layer1->mark_tile_dirty(offset & 0x3ff);
}
diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c
index cf04e6d6a55..976549c5b4b 100644
--- a/src/mame/video/ladybug.c
+++ b/src/mame/video/ladybug.c
@@ -135,32 +135,29 @@ PALETTE_INIT( sraider )
colortable_entry_set_value(machine.colortable, 0x81, 0x40);
}
-WRITE8_HANDLER( ladybug_videoram_w )
+WRITE8_MEMBER(ladybug_state::ladybug_videoram_w)
{
- ladybug_state *state = space->machine().driver_data<ladybug_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( ladybug_colorram_w )
+WRITE8_MEMBER(ladybug_state::ladybug_colorram_w)
{
- ladybug_state *state = space->machine().driver_data<ladybug_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( ladybug_flipscreen_w )
+WRITE8_MEMBER(ladybug_state::ladybug_flipscreen_w)
{
- if (flip_screen_get(space->machine()) != (data & 0x01))
+ if (flip_screen_get(machine()) != (data & 0x01))
{
- flip_screen_set(space->machine(), data & 0x01);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x01);
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( sraider_io_w )
+WRITE8_MEMBER(ladybug_state::sraider_io_w)
{
- ladybug_state *state = space->machine().driver_data<ladybug_state>();
// bit7 = flip
// bit6 = grid red
@@ -169,15 +166,15 @@ WRITE8_HANDLER( sraider_io_w )
// bit3 = enable stars
// bit210 = stars speed/dir
- if (flip_screen_get(space->machine()) != (data & 0x80))
+ if (flip_screen_get(machine()) != (data & 0x80))
{
- flip_screen_set(space->machine(), data & 0x80);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x80);
+ machine().tilemap().mark_all_dirty();
}
- state->m_grid_color = data & 0x70;
+ m_grid_color = data & 0x70;
- redclash_set_stars_enable(space->machine(), (data & 0x08) >> 3);
+ redclash_set_stars_enable(machine(), (data & 0x08) >> 3);
/*
* There must be a subtle clocking difference between
@@ -185,7 +182,7 @@ WRITE8_HANDLER( sraider_io_w )
* hence the -1 here
*/
- redclash_set_stars_speed(space->machine(), (data & 0x07) - 1);
+ redclash_set_stars_speed(machine(), (data & 0x07) - 1);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c
index 7519446239d..cbb153c5914 100644
--- a/src/mame/video/ladyfrog.c
+++ b/src/mame/video/ladyfrog.c
@@ -9,16 +9,14 @@
#include "includes/ladyfrog.h"
-WRITE8_HANDLER(ladyfrog_spriteram_w)
+WRITE8_MEMBER(ladyfrog_state::ladyfrog_spriteram_w)
{
- ladyfrog_state *state = space->machine().driver_data<ladyfrog_state>();
- state->m_spriteram[offset] = data;
+ m_spriteram[offset] = data;
}
-READ8_HANDLER(ladyfrog_spriteram_r)
+READ8_MEMBER(ladyfrog_state::ladyfrog_spriteram_r)
{
- ladyfrog_state *state = space->machine().driver_data<ladyfrog_state>();
- return state->m_spriteram[offset];
+ return m_spriteram[offset];
}
static TILE_GET_INFO( get_tile_info )
@@ -33,74 +31,66 @@ static TILE_GET_INFO( get_tile_info )
);
}
-WRITE8_HANDLER( ladyfrog_videoram_w )
+WRITE8_MEMBER(ladyfrog_state::ladyfrog_videoram_w)
{
- ladyfrog_state *state = space->machine().driver_data<ladyfrog_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset >> 1);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset >> 1);
}
-READ8_HANDLER( ladyfrog_videoram_r )
+READ8_MEMBER(ladyfrog_state::ladyfrog_videoram_r)
{
- ladyfrog_state *state = space->machine().driver_data<ladyfrog_state>();
- return state->m_videoram[offset];
+ return m_videoram[offset];
}
-WRITE8_HANDLER( ladyfrog_palette_w )
+WRITE8_MEMBER(ladyfrog_state::ladyfrog_palette_w)
{
- ladyfrog_state *state = space->machine().driver_data<ladyfrog_state>();
if (offset & 0x100)
- state->paletteram_xxxxBBBBGGGGRRRR_split2_w(*space, (offset & 0xff) + (state->m_palette_bank << 8), data);
+ paletteram_xxxxBBBBGGGGRRRR_split2_w(space, (offset & 0xff) + (m_palette_bank << 8), data);
else
- state->paletteram_xxxxBBBBGGGGRRRR_split1_w(*space, (offset & 0xff) + (state->m_palette_bank << 8), data);
+ paletteram_xxxxBBBBGGGGRRRR_split1_w(space, (offset & 0xff) + (m_palette_bank << 8), data);
}
-READ8_HANDLER( ladyfrog_palette_r )
+READ8_MEMBER(ladyfrog_state::ladyfrog_palette_r)
{
- ladyfrog_state *state = space->machine().driver_data<ladyfrog_state>();
if (offset & 0x100)
- return state->m_generic_paletteram2_8[(offset & 0xff) + (state->m_palette_bank << 8)];
+ return m_generic_paletteram2_8[(offset & 0xff) + (m_palette_bank << 8)];
else
- return state->m_generic_paletteram_8[(offset & 0xff) + (state->m_palette_bank << 8)];
+ return m_generic_paletteram_8[(offset & 0xff) + (m_palette_bank << 8)];
}
-WRITE8_HANDLER( ladyfrog_gfxctrl_w )
+WRITE8_MEMBER(ladyfrog_state::ladyfrog_gfxctrl_w)
{
- ladyfrog_state *state = space->machine().driver_data<ladyfrog_state>();
- state->m_palette_bank = (data & 0x20) >> 5;
+ m_palette_bank = (data & 0x20) >> 5;
}
-WRITE8_HANDLER( ladyfrog_gfxctrl2_w )
+WRITE8_MEMBER(ladyfrog_state::ladyfrog_gfxctrl2_w)
{
- ladyfrog_state *state = space->machine().driver_data<ladyfrog_state>();
- state->m_tilebank = ((data & 0x18) >> 3) ^ 3;
- state->m_bg_tilemap->mark_all_dirty();
+ m_tilebank = ((data & 0x18) >> 3) ^ 3;
+ m_bg_tilemap->mark_all_dirty();
}
#ifdef UNUSED_FUNCTION
int gfxctrl;
-READ8_HANDLER( ladyfrog_gfxctrl_r )
+READ8_MEMBER(ladyfrog_state::ladyfrog_gfxctrl_r)
{
return gfxctrl;
}
#endif
-READ8_HANDLER( ladyfrog_scrlram_r )
+READ8_MEMBER(ladyfrog_state::ladyfrog_scrlram_r)
{
- ladyfrog_state *state = space->machine().driver_data<ladyfrog_state>();
- return state->m_scrlram[offset];
+ return m_scrlram[offset];
}
-WRITE8_HANDLER( ladyfrog_scrlram_w )
+WRITE8_MEMBER(ladyfrog_state::ladyfrog_scrlram_w)
{
- ladyfrog_state *state = space->machine().driver_data<ladyfrog_state>();
- state->m_scrlram[offset] = data;
- state->m_bg_tilemap->set_scrolly(offset, data);
+ m_scrlram[offset] = data;
+ m_bg_tilemap->set_scrolly(offset, data);
}
static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect )
diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c
index f8ef9c60996..4adea46636c 100644
--- a/src/mame/video/lasso.c
+++ b/src/mame/video/lasso.c
@@ -201,66 +201,61 @@ VIDEO_START( pinbo )
*
*************************************/
-WRITE8_HANDLER( lasso_videoram_w )
+WRITE8_MEMBER(lasso_state::lasso_videoram_w)
{
- lasso_state *state = space->machine().driver_data<lasso_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( lasso_colorram_w )
+WRITE8_MEMBER(lasso_state::lasso_colorram_w)
{
- lasso_state *state = space->machine().driver_data<lasso_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-static WRITE8_HANDLER( lasso_flip_screen_w )
+WRITE8_MEMBER(lasso_state::lasso_flip_screen_w)
{
/* don't know which is which, but they are always set together */
- flip_screen_x_set(space->machine(), data & 0x01);
- flip_screen_y_set(space->machine(), data & 0x02);
+ flip_screen_x_set(machine(), data & 0x01);
+ flip_screen_y_set(machine(), data & 0x02);
- space->machine().tilemap().set_flip_all((flip_screen_x_get(space->machine()) ? TILEMAP_FLIPX : 0) | (flip_screen_y_get(space->machine()) ? TILEMAP_FLIPY : 0));
+ machine().tilemap().set_flip_all((flip_screen_x_get(machine()) ? TILEMAP_FLIPX : 0) | (flip_screen_y_get(machine()) ? TILEMAP_FLIPY : 0));
}
-WRITE8_HANDLER( lasso_video_control_w )
+WRITE8_MEMBER(lasso_state::lasso_video_control_w)
{
- lasso_state *state = space->machine().driver_data<lasso_state>();
int bank = (data & 0x04) >> 2;
- if (state->m_gfxbank != bank)
+ if (m_gfxbank != bank)
{
- state->m_gfxbank = bank;
- space->machine().tilemap().mark_all_dirty();
+ m_gfxbank = bank;
+ machine().tilemap().mark_all_dirty();
}
lasso_flip_screen_w(space, offset, data);
}
-WRITE8_HANDLER( wwjgtin_video_control_w )
+WRITE8_MEMBER(lasso_state::wwjgtin_video_control_w)
{
- lasso_state *state = space->machine().driver_data<lasso_state>();
int bank = ((data & 0x04) ? 0 : 1) + ((data & 0x10) ? 2 : 0);
- state->m_track_enable = data & 0x08;
+ m_track_enable = data & 0x08;
- if (state->m_gfxbank != bank)
+ if (m_gfxbank != bank)
{
- state->m_gfxbank = bank;
- space->machine().tilemap().mark_all_dirty();
+ m_gfxbank = bank;
+ machine().tilemap().mark_all_dirty();
}
lasso_flip_screen_w(space, offset, data);
}
-WRITE8_HANDLER( pinbo_video_control_w )
+WRITE8_MEMBER(lasso_state::pinbo_video_control_w)
{
- lasso_state *state = space->machine().driver_data<lasso_state>();
/* no need to dirty the tilemap -- only the sprites use the global bank */
- state->m_gfxbank = (data & 0x0c) >> 2;
+ m_gfxbank = (data & 0x0c) >> 2;
lasso_flip_screen_w(space, offset, data);
}
diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c
index 805d1082ea5..fa818cfbd6e 100644
--- a/src/mame/video/lastduel.c
+++ b/src/mame/video/lastduel.c
@@ -124,83 +124,76 @@ VIDEO_START( madgear )
***************************************************************************/
-WRITE16_HANDLER( lastduel_flip_w )
+WRITE16_MEMBER(lastduel_state::lastduel_flip_w)
{
if (ACCESSING_BITS_0_7)
{
- flip_screen_set(space->machine(), data & 0x01);
+ flip_screen_set(machine(), data & 0x01);
- coin_lockout_w(space->machine(), 0, ~data & 0x10);
- coin_lockout_w(space->machine(), 1, ~data & 0x20);
- coin_counter_w(space->machine(), 0, data & 0x40);
- coin_counter_w(space->machine(), 1, data & 0x80);
+ coin_lockout_w(machine(), 0, ~data & 0x10);
+ coin_lockout_w(machine(), 1, ~data & 0x20);
+ coin_counter_w(machine(), 0, data & 0x40);
+ coin_counter_w(machine(), 1, data & 0x80);
}
}
-WRITE16_HANDLER( lastduel_scroll_w )
+WRITE16_MEMBER(lastduel_state::lastduel_scroll_w)
{
- lastduel_state *state = space->machine().driver_data<lastduel_state>();
- data = COMBINE_DATA(&state->m_scroll[offset]);
+ data = COMBINE_DATA(&m_scroll[offset]);
switch (offset)
{
- case 0: state->m_fg_tilemap->set_scrolly(0, data); break;
- case 1: state->m_fg_tilemap->set_scrollx(0, data); break;
- case 2: state->m_bg_tilemap->set_scrolly(0, data); break;
- case 3: state->m_bg_tilemap->set_scrollx(0, data); break;
- case 7: state->m_tilemap_priority = data; break;
+ case 0: m_fg_tilemap->set_scrolly(0, data); break;
+ case 1: m_fg_tilemap->set_scrollx(0, data); break;
+ case 2: m_bg_tilemap->set_scrolly(0, data); break;
+ case 3: m_bg_tilemap->set_scrollx(0, data); break;
+ case 7: m_tilemap_priority = data; break;
default:
logerror("Unmapped video write %d %04x\n", offset, data);
break;
}
}
-WRITE16_HANDLER( lastduel_scroll1_w )
+WRITE16_MEMBER(lastduel_state::lastduel_scroll1_w)
{
- lastduel_state *state = space->machine().driver_data<lastduel_state>();
- COMBINE_DATA(&state->m_scroll1[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_scroll1[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( lastduel_scroll2_w )
+WRITE16_MEMBER(lastduel_state::lastduel_scroll2_w)
{
- lastduel_state *state = space->machine().driver_data<lastduel_state>();
- COMBINE_DATA(&state->m_scroll2[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_scroll2[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( lastduel_vram_w )
+WRITE16_MEMBER(lastduel_state::lastduel_vram_w)
{
- lastduel_state *state = space->machine().driver_data<lastduel_state>();
- COMBINE_DATA(&state->m_vram[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_vram[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( madgear_scroll1_w )
+WRITE16_MEMBER(lastduel_state::madgear_scroll1_w)
{
- lastduel_state *state = space->machine().driver_data<lastduel_state>();
- COMBINE_DATA(&state->m_scroll1[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ COMBINE_DATA(&m_scroll1[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-WRITE16_HANDLER( madgear_scroll2_w )
+WRITE16_MEMBER(lastduel_state::madgear_scroll2_w)
{
- lastduel_state *state = space->machine().driver_data<lastduel_state>();
- COMBINE_DATA(&state->m_scroll2[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ COMBINE_DATA(&m_scroll2[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-WRITE16_HANDLER( lastduel_palette_word_w )
+WRITE16_MEMBER(lastduel_state::lastduel_palette_word_w)
{
- lastduel_state *state = space->machine().driver_data<lastduel_state>();
int red, green, blue, bright;
- data = COMBINE_DATA(&state->m_paletteram[offset]);
+ data = COMBINE_DATA(&m_paletteram[offset]);
// Brightness parameter interpreted same way as CPS1
bright = 0x10 + (data & 0x0f);
@@ -209,7 +202,7 @@ WRITE16_HANDLER( lastduel_palette_word_w )
green = ((data >> 8) & 0x0f) * bright * 0x11 / 0x1f;
blue = ((data >> 4) & 0x0f) * bright * 0x11 / 0x1f;
- palette_set_color (space->machine(), offset, MAKE_RGB(red, green, blue));
+ palette_set_color (machine(), offset, MAKE_RGB(red, green, blue));
}
/***************************************************************************
diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c
index 1b6ed9ede08..ac132584a0c 100644
--- a/src/mame/video/legionna.c
+++ b/src/mame/video/legionna.c
@@ -30,32 +30,28 @@ void denjinmk_setgfxbank(running_machine &machine, UINT16 data)
state->m_text_layer->mark_all_dirty();
}
-WRITE16_HANDLER( legionna_background_w )
+WRITE16_MEMBER(legionna_state::legionna_background_w)
{
- legionna_state *state = space->machine().driver_data<legionna_state>();
- COMBINE_DATA(&state->m_back_data[offset]);
- state->m_background_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_back_data[offset]);
+ m_background_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( legionna_midground_w )
+WRITE16_MEMBER(legionna_state::legionna_midground_w)
{
- legionna_state *state = space->machine().driver_data<legionna_state>();
- COMBINE_DATA(&state->m_mid_data[offset]);
- state->m_midground_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_mid_data[offset]);
+ m_midground_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( legionna_foreground_w )
+WRITE16_MEMBER(legionna_state::legionna_foreground_w)
{
- legionna_state *state = space->machine().driver_data<legionna_state>();
- COMBINE_DATA(&state->m_fore_data[offset]);
- state->m_foreground_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_fore_data[offset]);
+ m_foreground_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( legionna_text_w )
+WRITE16_MEMBER(legionna_state::legionna_text_w)
{
- legionna_state *state = space->machine().driver_data<legionna_state>();
- COMBINE_DATA(&state->m_textram[offset]);
- state->m_text_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_textram[offset]);
+ m_text_layer->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_back_tile_info )
diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c
index 3f389180710..2cb79c34e54 100644
--- a/src/mame/video/leland.c
+++ b/src/mame/video/leland.c
@@ -86,30 +86,29 @@ static VIDEO_START( ataxx )
*
*************************************/
-WRITE8_HANDLER( leland_scroll_w )
+WRITE8_MEMBER(leland_state::leland_scroll_w)
{
- leland_state *state = space->machine().driver_data<leland_state>();
- int scanline = space->machine().primary_screen->vpos();
+ int scanline = machine().primary_screen->vpos();
if (scanline > 0)
- space->machine().primary_screen->update_partial(scanline - 1);
+ machine().primary_screen->update_partial(scanline - 1);
/* adjust the proper scroll value */
switch (offset)
{
case 0:
- state->m_xscroll = (state->m_xscroll & 0xff00) | (data & 0x00ff);
+ m_xscroll = (m_xscroll & 0xff00) | (data & 0x00ff);
break;
case 1:
- state->m_xscroll = (state->m_xscroll & 0x00ff) | ((data << 8) & 0xff00);
+ m_xscroll = (m_xscroll & 0x00ff) | ((data << 8) & 0xff00);
break;
case 2:
- state->m_yscroll = (state->m_yscroll & 0xff00) | (data & 0x00ff);
+ m_yscroll = (m_yscroll & 0xff00) | (data & 0x00ff);
break;
case 3:
- state->m_yscroll = (state->m_yscroll & 0x00ff) | ((data << 8) & 0xff00);
+ m_yscroll = (m_yscroll & 0x00ff) | ((data << 8) & 0xff00);
break;
default:
@@ -285,9 +284,9 @@ static void leland_vram_port_w(address_space *space, int offset, int data, int n
*
*************************************/
-WRITE8_HANDLER( leland_master_video_addr_w )
+WRITE8_MEMBER(leland_state::leland_master_video_addr_w)
{
- leland_video_addr_w(space, offset, data, 0);
+ leland_video_addr_w(&space, offset, data, 0);
}
@@ -302,15 +301,15 @@ static TIMER_CALLBACK( leland_delayed_mvram_w )
}
-WRITE8_HANDLER( leland_mvram_port_w )
+WRITE8_MEMBER(leland_state::leland_mvram_port_w)
{
- space->machine().scheduler().synchronize(FUNC(leland_delayed_mvram_w), 0x00000 | (offset << 8) | data);
+ machine().scheduler().synchronize(FUNC(leland_delayed_mvram_w), 0x00000 | (offset << 8) | data);
}
-READ8_HANDLER( leland_mvram_port_r )
+READ8_MEMBER(leland_state::leland_mvram_port_r)
{
- return leland_vram_port_r(space, offset, 0);
+ return leland_vram_port_r(&space, offset, 0);
}
@@ -321,21 +320,21 @@ READ8_HANDLER( leland_mvram_port_r )
*
*************************************/
-WRITE8_HANDLER( leland_slave_video_addr_w )
+WRITE8_MEMBER(leland_state::leland_slave_video_addr_w)
{
- leland_video_addr_w(space, offset, data, 1);
+ leland_video_addr_w(&space, offset, data, 1);
}
-WRITE8_HANDLER( leland_svram_port_w )
+WRITE8_MEMBER(leland_state::leland_svram_port_w)
{
- leland_vram_port_w(space, offset, data, 1);
+ leland_vram_port_w(&space, offset, data, 1);
}
-READ8_HANDLER( leland_svram_port_r )
+READ8_MEMBER(leland_state::leland_svram_port_r)
{
- return leland_vram_port_r(space, offset, 1);
+ return leland_vram_port_r(&space, offset, 1);
}
@@ -346,17 +345,17 @@ READ8_HANDLER( leland_svram_port_r )
*
*************************************/
-WRITE8_HANDLER( ataxx_mvram_port_w )
+WRITE8_MEMBER(leland_state::ataxx_mvram_port_w)
{
offset = ((offset >> 1) & 0x07) | ((offset << 3) & 0x08) | (offset & 0x10);
- space->machine().scheduler().synchronize(FUNC(leland_delayed_mvram_w), 0x00000 | (offset << 8) | data);
+ machine().scheduler().synchronize(FUNC(leland_delayed_mvram_w), 0x00000 | (offset << 8) | data);
}
-WRITE8_HANDLER( ataxx_svram_port_w )
+WRITE8_MEMBER(leland_state::ataxx_svram_port_w)
{
offset = ((offset >> 1) & 0x07) | ((offset << 3) & 0x08) | (offset & 0x10);
- leland_vram_port_w(space, offset, data, 1);
+ leland_vram_port_w(&space, offset, data, 1);
}
@@ -367,17 +366,17 @@ WRITE8_HANDLER( ataxx_svram_port_w )
*
*************************************/
-READ8_HANDLER( ataxx_mvram_port_r )
+READ8_MEMBER(leland_state::ataxx_mvram_port_r)
{
offset = ((offset >> 1) & 0x07) | ((offset << 3) & 0x08) | (offset & 0x10);
- return leland_vram_port_r(space, offset, 0);
+ return leland_vram_port_r(&space, offset, 0);
}
-READ8_HANDLER( ataxx_svram_port_r )
+READ8_MEMBER(leland_state::ataxx_svram_port_r)
{
offset = ((offset >> 1) & 0x07) | ((offset << 3) & 0x08) | (offset & 0x10);
- return leland_vram_port_r(space, offset, 1);
+ return leland_vram_port_r(&space, offset, 1);
}
diff --git a/src/mame/video/lemmings.c b/src/mame/video/lemmings.c
index d4ebd2713e8..acf494cef28 100644
--- a/src/mame/video/lemmings.c
+++ b/src/mame/video/lemmings.c
@@ -63,15 +63,14 @@ SCREEN_VBLANK( lemmings )
/******************************************************************************/
// RAM based
-WRITE16_HANDLER( lemmings_pixel_0_w )
+WRITE16_MEMBER(lemmings_state::lemmings_pixel_0_w)
{
- lemmings_state *state = space->machine().driver_data<lemmings_state>();
int sx, sy, src, old;
- old = state->m_pixel_0_data[offset];
- COMBINE_DATA(&state->m_pixel_0_data[offset]);
- src = state->m_pixel_0_data[offset];
+ old = m_pixel_0_data[offset];
+ COMBINE_DATA(&m_pixel_0_data[offset]);
+ src = m_pixel_0_data[offset];
if (old == src)
return;
@@ -81,36 +80,34 @@ WRITE16_HANDLER( lemmings_pixel_0_w )
if (sx > 2047 || sy > 255)
return;
- state->m_bitmap0.pix16(sy, sx + 0) = ((src >> 8) & 0xf) | 0x100;
- state->m_bitmap0.pix16(sy, sx + 1) = ((src >> 0) & 0xf) | 0x100;
+ m_bitmap0.pix16(sy, sx + 0) = ((src >> 8) & 0xf) | 0x100;
+ m_bitmap0.pix16(sy, sx + 1) = ((src >> 0) & 0xf) | 0x100;
}
// RAM based tiles for the FG tilemap
-WRITE16_HANDLER( lemmings_pixel_1_w )
+WRITE16_MEMBER(lemmings_state::lemmings_pixel_1_w)
{
- lemmings_state *state = space->machine().driver_data<lemmings_state>();
int sx, sy, src, tile;
- COMBINE_DATA(&state->m_pixel_1_data[offset]);
- src = state->m_pixel_1_data[offset];
+ COMBINE_DATA(&m_pixel_1_data[offset]);
+ src = m_pixel_1_data[offset];
sy = ((offset << 1) / 0x200);
sx = ((offset << 1) & 0x1ff);
/* Copy pixel to buffer for easier decoding later */
tile = ((sx / 8) * 32) + (sy / 8);
- gfx_element_mark_dirty(space->machine().gfx[2], tile);
- state->m_vram_buffer[(tile * 64) + ((sx & 7)) + ((sy & 7) * 8)] = (src >> 8) & 0xf;
+ gfx_element_mark_dirty(machine().gfx[2], tile);
+ m_vram_buffer[(tile * 64) + ((sx & 7)) + ((sy & 7) * 8)] = (src >> 8) & 0xf;
sx += 1; /* Update both pixels in the word */
- state->m_vram_buffer[(tile * 64) + ((sx & 7)) + ((sy & 7) * 8)] = (src >> 0) & 0xf;
+ m_vram_buffer[(tile * 64) + ((sx & 7)) + ((sy & 7) * 8)] = (src >> 0) & 0xf;
}
-WRITE16_HANDLER( lemmings_vram_w )
+WRITE16_MEMBER(lemmings_state::lemmings_vram_w)
{
- lemmings_state *state = space->machine().driver_data<lemmings_state>();
- COMBINE_DATA(&state->m_vram_data[offset]);
- state->m_vram_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_vram_data[offset]);
+ m_vram_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/lethal.c b/src/mame/video/lethal.c
index fa1140c2a56..928774c8d2c 100644
--- a/src/mame/video/lethal.c
+++ b/src/mame/video/lethal.c
@@ -76,28 +76,27 @@ VIDEO_START(lethalen)
state->m_layer_colorbase[3] = 0xc0;
}
-WRITE8_HANDLER(lethalen_palette_control)
+WRITE8_MEMBER(lethal_state::lethalen_palette_control)
{
- lethal_state *state = space->machine().driver_data<lethal_state>();
switch (offset)
{
case 0: // 40c8 - PCU1 from schematics
- state->m_layer_colorbase[0] = ((data & 0x7) - 1) * 0x40;
- state->m_layer_colorbase[1] = (((data >> 4) & 0x7) - 1) * 0x40;
- k056832_mark_plane_dirty(state->m_k056832, 0);
- k056832_mark_plane_dirty(state->m_k056832, 1);
+ m_layer_colorbase[0] = ((data & 0x7) - 1) * 0x40;
+ m_layer_colorbase[1] = (((data >> 4) & 0x7) - 1) * 0x40;
+ k056832_mark_plane_dirty(m_k056832, 0);
+ k056832_mark_plane_dirty(m_k056832, 1);
break;
case 4: // 40cc - PCU2 from schematics
- state->m_layer_colorbase[2] = ((data & 0x7) - 1) * 0x40;
- state->m_layer_colorbase[3] = (((data >> 4) & 0x7) - 1) * 0x40;
- k056832_mark_plane_dirty(state->m_k056832, 2);
- k056832_mark_plane_dirty(state->m_k056832, 3);
+ m_layer_colorbase[2] = ((data & 0x7) - 1) * 0x40;
+ m_layer_colorbase[3] = (((data >> 4) & 0x7) - 1) * 0x40;
+ k056832_mark_plane_dirty(m_k056832, 2);
+ k056832_mark_plane_dirty(m_k056832, 3);
break;
case 8: // 40d0 - PCU3 from schematics
- state->m_sprite_colorbase = ((data & 0x7) - 1) * 0x40;
+ m_sprite_colorbase = ((data & 0x7) - 1) * 0x40;
break;
}
}
diff --git a/src/mame/video/lethalj.c b/src/mame/video/lethalj.c
index f7f22481246..cb72f4261b2 100644
--- a/src/mame/video/lethalj.c
+++ b/src/mame/video/lethalj.c
@@ -39,9 +39,8 @@ INLINE void get_crosshair_xy(running_machine &machine, int player, int *x, int *
*
*************************************/
-READ16_HANDLER( lethalj_gun_r )
+READ16_MEMBER(lethalj_state::lethalj_gun_r)
{
- lethalj_state *state = space->machine().driver_data<lethalj_state>();
UINT16 result = 0;
int beamx, beamy;
@@ -50,21 +49,21 @@ READ16_HANDLER( lethalj_gun_r )
case 4:
case 5:
/* latch the crosshair position */
- get_crosshair_xy(space->machine(), offset - 4, &beamx, &beamy);
- state->m_gunx = beamx;
- state->m_guny = beamy;
- state->m_blank_palette = 1;
+ get_crosshair_xy(machine(), offset - 4, &beamx, &beamy);
+ m_gunx = beamx;
+ m_guny = beamy;
+ m_blank_palette = 1;
break;
case 6:
- result = state->m_gunx / 2;
+ result = m_gunx / 2;
break;
case 7:
- result = state->m_guny + 4;
+ result = m_guny + 4;
break;
}
-/* logerror("%08X:lethalj_gun_r(%d) = %04X\n", cpu_get_pc(&space->device()), offset, result); */
+/* logerror("%08X:lethalj_gun_r(%d) = %04X\n", cpu_get_pc(&space.device()), offset, result); */
return result;
}
@@ -102,19 +101,19 @@ static TIMER_CALLBACK( gen_ext1_int )
-static void do_blit(lethalj_state *state)
+void lethalj_state::do_blit()
{
- int dsty = (INT16)state->m_blitter_data[1];
- int srcx = (UINT16)state->m_blitter_data[2];
- int srcy = (UINT16)(state->m_blitter_data[3] + 1);
- int width = (UINT16)state->m_blitter_data[5];
- int dstx = (INT16)state->m_blitter_data[6];
- int height = (UINT16)state->m_blitter_data[7];
+ int dsty = (INT16)m_blitter_data[1];
+ int srcx = (UINT16)m_blitter_data[2];
+ int srcy = (UINT16)(m_blitter_data[3] + 1);
+ int width = (UINT16)m_blitter_data[5];
+ int dstx = (INT16)m_blitter_data[6];
+ int height = (UINT16)m_blitter_data[7];
int y;
/*
logerror("blitter data = %04X %04X %04X %04X %04X %04X %04X %04X\n",
- state->m_blitter_data[0], state->m_blitter_data[1], state->m_blitter_data[2], state->m_blitter_data[3],
- state->m_blitter_data[4], state->m_blitter_data[5], state->m_blitter_data[6], state->m_blitter_data[7]);
+ m_blitter_data[0], m_blitter_data[1], m_blitter_data[2], m_blitter_data[3],
+ m_blitter_data[4], m_blitter_data[5], m_blitter_data[6], m_blitter_data[7]);
*/
/* loop over Y coordinates */
for (y = 0; y <= height; y++, srcy++, dsty++)
@@ -122,8 +121,8 @@ static void do_blit(lethalj_state *state)
/* clip in Y */
if (dsty >= 0 && dsty < BLITTER_DEST_HEIGHT/2)
{
- UINT16 *source = state->m_blitter_base + (srcy % state->m_blitter_rows) * BLITTER_SOURCE_WIDTH;
- UINT16 *dest = state->m_screenram + (dsty + (state->m_vispage ^ 1) * 256) * BLITTER_DEST_WIDTH;
+ UINT16 *source = m_blitter_base + (srcy % m_blitter_rows) * BLITTER_SOURCE_WIDTH;
+ UINT16 *dest = m_screenram + (dsty + (m_vispage ^ 1) * 256) * BLITTER_DEST_WIDTH;
int sx = srcx;
int dx = dstx;
int x;
@@ -141,26 +140,25 @@ static void do_blit(lethalj_state *state)
}
-WRITE16_HANDLER( lethalj_blitter_w )
+WRITE16_MEMBER(lethalj_state::lethalj_blitter_w)
{
- lethalj_state *state = space->machine().driver_data<lethalj_state>();
/* combine the data */
- COMBINE_DATA(&state->m_blitter_data[offset]);
+ COMBINE_DATA(&m_blitter_data[offset]);
/* blit on a write to offset 7, and signal an IRQ */
if (offset == 7)
{
- if (state->m_blitter_data[6] == 2 && state->m_blitter_data[7] == 2)
- state->m_vispage ^= 1;
+ if (m_blitter_data[6] == 2 && m_blitter_data[7] == 2)
+ m_vispage ^= 1;
else
- do_blit(state);
+ do_blit();
- space->machine().scheduler().timer_set(attotime::from_hz(XTAL_32MHz) * ((state->m_blitter_data[5] + 1) * (state->m_blitter_data[7] + 1)), FUNC(gen_ext1_int));
+ machine().scheduler().timer_set(attotime::from_hz(XTAL_32MHz) * ((m_blitter_data[5] + 1) * (m_blitter_data[7] + 1)), FUNC(gen_ext1_int));
}
/* clear the IRQ on offset 0 */
else if (offset == 0)
- cputag_set_input_line(space->machine(), "maincpu", 0, CLEAR_LINE);
+ cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
}
diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c
index 24c03a5f135..ab9ff8a8a53 100644
--- a/src/mame/video/liberate.c
+++ b/src/mame/video/liberate.c
@@ -102,108 +102,102 @@ static TILE_GET_INFO( prosport_get_back_tile_info )
/***************************************************************************/
-WRITE8_HANDLER( deco16_io_w )
+WRITE8_MEMBER(liberate_state::deco16_io_w)
{
- liberate_state *state = space->machine().driver_data<liberate_state>();
- state->m_io_ram[offset] = data;
+ m_io_ram[offset] = data;
if (offset > 1 && offset < 6)
- state->m_back_tilemap->mark_all_dirty();
+ m_back_tilemap->mark_all_dirty();
switch (offset)
{
case 6: /* Background colour */
- if (((data >> 4) & 3) != state->m_background_color)
+ if (((data >> 4) & 3) != m_background_color)
{
- state->m_background_color = (data >> 4) & 3;
- state->m_back_tilemap->mark_all_dirty();
+ m_background_color = (data >> 4) & 3;
+ m_back_tilemap->mark_all_dirty();
}
- state->m_background_disable = data & 0x4;
- flip_screen_set(space->machine(), data & 0x01);
+ m_background_disable = data & 0x4;
+ flip_screen_set(machine(), data & 0x01);
break;
case 7: /* Background palette resistors? */
/* Todo */
break;
case 8: /* Irq ack */
- device_set_input_line(state->m_maincpu, DECO16_IRQ_LINE, CLEAR_LINE);
+ device_set_input_line(m_maincpu, DECO16_IRQ_LINE, CLEAR_LINE);
break;
case 9: /* Sound */
- state->soundlatch_w(*space, 0, data);
- device_set_input_line(state->m_audiocpu, M6502_IRQ_LINE, HOLD_LINE);
+ soundlatch_w(space, 0, data);
+ device_set_input_line(m_audiocpu, M6502_IRQ_LINE, HOLD_LINE);
break;
}
}
-WRITE8_HANDLER( prosoccr_io_w )
+WRITE8_MEMBER(liberate_state::prosoccr_io_w)
{
- liberate_state *state = space->machine().driver_data<liberate_state>();
- state->m_io_ram[offset] = data;
+ m_io_ram[offset] = data;
if (offset > 1 && offset < 6)
- state->m_back_tilemap->mark_all_dirty();
+ m_back_tilemap->mark_all_dirty();
- // popmessage("%02x %02x",state->m_io_ram[6],state->m_io_ram[7]);
+ // popmessage("%02x %02x",m_io_ram[6],m_io_ram[7]);
switch (offset)
{
case 6: /* unused here */
break;
case 7:
- state->m_background_disable = ~data & 0x10;
+ m_background_disable = ~data & 0x10;
//sprite_priority = (data & 0x80)>>7;
/* -x-- --xx used during gameplay */
/* x--- ---- used on the attract mode */
break;
case 8: /* Irq ack */
- device_set_input_line(state->m_maincpu, DECO16_IRQ_LINE, CLEAR_LINE);
+ device_set_input_line(m_maincpu, DECO16_IRQ_LINE, CLEAR_LINE);
break;
case 9: /* Sound */
- state->soundlatch_w(*space, 0, data);
- device_set_input_line(state->m_audiocpu, M6502_IRQ_LINE, HOLD_LINE);
+ soundlatch_w(space, 0, data);
+ device_set_input_line(m_audiocpu, M6502_IRQ_LINE, HOLD_LINE);
break;
}
}
/* completely different i/o...*/
-WRITE8_HANDLER( prosport_io_w )
+WRITE8_MEMBER(liberate_state::prosport_io_w)
{
- liberate_state *state = space->machine().driver_data<liberate_state>();
- state->m_io_ram[offset] = data;
+ m_io_ram[offset] = data;
switch (offset)
{
case 0:
//background_disable = ~data & 0x80;
- flip_screen_set(space->machine(), data & 0x80);
- state->m_back_tilemap->mark_all_dirty();
+ flip_screen_set(machine(), data & 0x80);
+ m_back_tilemap->mark_all_dirty();
break;
case 2: /* Sound */
- state->soundlatch_w(*space, 0, data);
- device_set_input_line(state->m_audiocpu, M6502_IRQ_LINE, HOLD_LINE);
+ soundlatch_w(space, 0, data);
+ device_set_input_line(m_audiocpu, M6502_IRQ_LINE, HOLD_LINE);
break;
case 4: /* Irq ack */
- device_set_input_line(state->m_maincpu, DECO16_IRQ_LINE, CLEAR_LINE);
+ device_set_input_line(m_maincpu, DECO16_IRQ_LINE, CLEAR_LINE);
break;
}
}
-WRITE8_HANDLER( liberate_videoram_w )
+WRITE8_MEMBER(liberate_state::liberate_videoram_w)
{
- liberate_state *state = space->machine().driver_data<liberate_state>();
- state->m_videoram[offset] = data;
- state->m_fix_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fix_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( liberate_colorram_w )
+WRITE8_MEMBER(liberate_state::liberate_colorram_w)
{
- liberate_state *state = space->machine().driver_data<liberate_state>();
- state->m_colorram[offset] = data;
- state->m_fix_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_fix_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( prosport_bg_vram_w )
+WRITE8_MEMBER(liberate_state::prosport_bg_vram_w)
{
- liberate_state *state = space->machine().driver_data<liberate_state>();
- state->m_bg_vram[offset] = data;
- state->m_back_tilemap->mark_tile_dirty(offset);
+ m_bg_vram[offset] = data;
+ m_back_tilemap->mark_tile_dirty(offset);
}
/***************************************************************************/
@@ -249,13 +243,12 @@ VIDEO_START( prosport )
/***************************************************************************/
-WRITE8_HANDLER( prosport_paletteram_w )
+WRITE8_MEMBER(liberate_state::prosport_paletteram_w)
{
- liberate_state *state = space->machine().driver_data<liberate_state>();
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
/* RGB output is inverted */
- palette_set_color_rgb(space->machine(), offset, pal3bit(~data >> 0), pal3bit(~data >> 3), pal2bit(~data >> 6));
+ palette_set_color_rgb(machine(), offset, pal3bit(~data >> 0), pal3bit(~data >> 3), pal2bit(~data >> 6));
}
PALETTE_INIT( liberate )
diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c
index eb282c84dd3..856cb6fc75c 100644
--- a/src/mame/video/lkage.c
+++ b/src/mame/video/lkage.c
@@ -41,24 +41,23 @@
#include "includes/lkage.h"
-WRITE8_HANDLER( lkage_videoram_w )
+WRITE8_MEMBER(lkage_state::lkage_videoram_w)
{
- lkage_state *state = space->machine().driver_data<lkage_state>();
- state->m_videoram[offset] = data;
+ m_videoram[offset] = data;
switch (offset / 0x400)
{
case 0:
- state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
break;
case 1:
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
break;
case 2:
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
break;
default:
diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c
index cfbf6d95782..6ff367e89af 100644
--- a/src/mame/video/lockon.c
+++ b/src/mame/video/lockon.c
@@ -21,12 +21,12 @@
*
*************************************/
-READ16_HANDLER( lockon_crtc_r )
+READ16_MEMBER(lockon_state::lockon_crtc_r)
{
return 0xffff;
}
-WRITE16_HANDLER( lockon_crtc_w )
+WRITE16_MEMBER(lockon_state::lockon_crtc_w)
{
#if 0
data &= 0xff;
@@ -132,11 +132,10 @@ PALETTE_INIT( lockon )
*
*************************************/
-WRITE16_HANDLER( lockon_char_w )
+WRITE16_MEMBER(lockon_state::lockon_char_w)
{
- lockon_state *state = space->machine().driver_data<lockon_state>();
- state->m_char_ram[offset] = data;
- state->m_tilemap->mark_tile_dirty(offset);
+ m_char_ram[offset] = data;
+ m_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_lockon_tile_info )
@@ -156,16 +155,14 @@ static TILE_GET_INFO( get_lockon_tile_info )
*******************************************************************************************/
-WRITE16_HANDLER( lockon_scene_h_scr_w )
+WRITE16_MEMBER(lockon_state::lockon_scene_h_scr_w)
{
- lockon_state *state = space->machine().driver_data<lockon_state>();
- state->m_scroll_h = data & 0x1ff;
+ m_scroll_h = data & 0x1ff;
}
-WRITE16_HANDLER( lockon_scene_v_scr_w )
+WRITE16_MEMBER(lockon_state::lockon_scene_v_scr_w)
{
- lockon_state *state = space->machine().driver_data<lockon_state>();
- state->m_scroll_v = data & 0x81ff;
+ m_scroll_v = data & 0x81ff;
}
static void scene_draw( running_machine &machine )
@@ -279,10 +276,9 @@ static void scene_draw( running_machine &machine )
*******************************************************************************************/
-WRITE16_HANDLER( lockon_ground_ctrl_w )
+WRITE16_MEMBER(lockon_state::lockon_ground_ctrl_w)
{
- lockon_state *state = space->machine().driver_data<lockon_state>();
- state->m_ground_ctrl = data & 0xff;
+ m_ground_ctrl = data & 0xff;
}
static TIMER_CALLBACK( bufend_callback )
@@ -608,30 +604,27 @@ static void objects_draw( running_machine &machine )
}
/* The mechanism used by the object CPU to update the object ASICs palette RAM */
-WRITE16_HANDLER( lockon_tza112_w )
+WRITE16_MEMBER(lockon_state::lockon_tza112_w)
{
- lockon_state *state = space->machine().driver_data<lockon_state>();
- if (state->m_iden)
+ if (m_iden)
{
- state->m_obj_pal_latch = data & 0xff;
- state->m_obj_pal_addr = offset & 0xf;
- objects_draw(space->machine());
+ m_obj_pal_latch = data & 0xff;
+ m_obj_pal_addr = offset & 0xf;
+ objects_draw(machine());
}
}
-READ16_HANDLER( lockon_obj_4000_r )
+READ16_MEMBER(lockon_state::lockon_obj_4000_r)
{
- lockon_state *state = space->machine().driver_data<lockon_state>();
- device_set_input_line(state->m_object, NEC_INPUT_LINE_POLL, CLEAR_LINE);
+ device_set_input_line(m_object, NEC_INPUT_LINE_POLL, CLEAR_LINE);
return 0xffff;
}
-WRITE16_HANDLER( lockon_obj_4000_w )
+WRITE16_MEMBER(lockon_state::lockon_obj_4000_w)
{
- lockon_state *state = space->machine().driver_data<lockon_state>();
- state->m_iden = data & 1;
+ m_iden = data & 1;
}
@@ -657,30 +650,29 @@ WRITE16_HANDLER( lockon_obj_4000_w )
*******************************************************************************************/
-WRITE16_HANDLER( lockon_fb_clut_w )
+WRITE16_MEMBER(lockon_state::lockon_fb_clut_w)
{
rgb_t color;
- color = palette_get_color(space->machine(), 0x300 + (data & 0xff));
- palette_set_color(space->machine(), 0x400 + offset, color);
+ color = palette_get_color(machine(), 0x300 + (data & 0xff));
+ palette_set_color(machine(), 0x400 + offset, color);
}
/* Rotation control register */
-WRITE16_HANDLER( lockon_rotate_w )
+WRITE16_MEMBER(lockon_state::lockon_rotate_w)
{
- lockon_state *state = space->machine().driver_data<lockon_state>();
switch (offset & 7)
{
- case 0: state->m_xsal = data & 0x1ff; break;
- case 1: state->m_x0ll = data & 0xff; break;
- case 2: state->m_dx0ll = data & 0x1ff; break;
- case 3: state->m_dxll = data & 0x1ff; break;
-
- case 4: state->m_ysal = data & 0x1ff; break;
- case 5: state->m_y0ll = data & 0xff; break;
- case 6: state->m_dy0ll = data & 0x1ff; break;
- case 7: state->m_dyll = data & 0x3ff; break;
+ case 0: m_xsal = data & 0x1ff; break;
+ case 1: m_x0ll = data & 0xff; break;
+ case 2: m_dx0ll = data & 0x1ff; break;
+ case 3: m_dxll = data & 0x1ff; break;
+
+ case 4: m_ysal = data & 0x1ff; break;
+ case 5: m_y0ll = data & 0xff; break;
+ case 6: m_dy0ll = data & 0x1ff; break;
+ case 7: m_dyll = data & 0x3ff; break;
}
}
diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c
index fbb8a7cf8db..2e60398e1bc 100644
--- a/src/mame/video/lordgun.c
+++ b/src/mame/video/lordgun.c
@@ -46,12 +46,11 @@ Note: if MAME_DEBUG is defined, pressing Z with:
***************************************************************************/
// xxxxBBBBGGGGRRRR, but repeat ecah color for each priority code (since we stuff it in the high bits of the pen)
-WRITE16_HANDLER( lordgun_paletteram_w )
+WRITE16_MEMBER(lordgun_state::lordgun_paletteram_w)
{
- lordgun_state *state = space->machine().driver_data<lordgun_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
for (int pri = 0; pri < 8; pri++)
- palette_set_color_rgb(space->machine(), offset+0x800*pri, pal4bit(data >> 0), pal4bit(data >> 4), pal4bit(data >> 8));
+ palette_set_color_rgb(machine(), offset+0x800*pri, pal4bit(data >> 0), pal4bit(data >> 4), pal4bit(data >> 8));
}
@@ -83,10 +82,10 @@ INLINE void lordgun_vram_w(address_space *space, offs_t offset, UINT16 data, UIN
state->m_tilemap[_N_]->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( lordgun_vram_0_w ) { lordgun_vram_w(space, offset, data, mem_mask, 0); }
-WRITE16_HANDLER( lordgun_vram_1_w ) { lordgun_vram_w(space, offset, data, mem_mask, 1); }
-WRITE16_HANDLER( lordgun_vram_2_w ) { lordgun_vram_w(space, offset, data, mem_mask, 2); }
-WRITE16_HANDLER( lordgun_vram_3_w ) { lordgun_vram_w(space, offset, data, mem_mask, 3); }
+WRITE16_MEMBER(lordgun_state::lordgun_vram_0_w){ lordgun_vram_w(&space, offset, data, mem_mask, 0); }
+WRITE16_MEMBER(lordgun_state::lordgun_vram_1_w){ lordgun_vram_w(&space, offset, data, mem_mask, 1); }
+WRITE16_MEMBER(lordgun_state::lordgun_vram_2_w){ lordgun_vram_w(&space, offset, data, mem_mask, 2); }
+WRITE16_MEMBER(lordgun_state::lordgun_vram_3_w){ lordgun_vram_w(&space, offset, data, mem_mask, 3); }
/***************************************************************************
diff --git a/src/mame/video/lucky74.c b/src/mame/video/lucky74.c
index a057bb77050..f51ade1a563 100644
--- a/src/mame/video/lucky74.c
+++ b/src/mame/video/lucky74.c
@@ -98,32 +98,28 @@
#include "includes/lucky74.h"
-WRITE8_HANDLER( lucky74_fg_videoram_w )
+WRITE8_MEMBER(lucky74_state::lucky74_fg_videoram_w)
{
- lucky74_state *state = space->machine().driver_data<lucky74_state>();
- state->m_fg_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( lucky74_fg_colorram_w )
+WRITE8_MEMBER(lucky74_state::lucky74_fg_colorram_w)
{
- lucky74_state *state = space->machine().driver_data<lucky74_state>();
- state->m_fg_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( lucky74_bg_videoram_w )
+WRITE8_MEMBER(lucky74_state::lucky74_bg_videoram_w)
{
- lucky74_state *state = space->machine().driver_data<lucky74_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( lucky74_bg_colorram_w )
+WRITE8_MEMBER(lucky74_state::lucky74_bg_colorram_w)
{
- lucky74_state *state = space->machine().driver_data<lucky74_state>();
- state->m_bg_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/lvcards.c b/src/mame/video/lvcards.c
index 9fb104cbfd8..601fc4a1da6 100644
--- a/src/mame/video/lvcards.c
+++ b/src/mame/video/lvcards.c
@@ -80,18 +80,16 @@ PALETTE_INIT( lvcards ) //Ever so slightly different, but different enough.
}
}
-WRITE8_HANDLER( lvcards_videoram_w )
+WRITE8_MEMBER(lvcards_state::lvcards_videoram_w)
{
- lvcards_state *state = space->machine().driver_data<lvcards_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( lvcards_colorram_w )
+WRITE8_MEMBER(lvcards_state::lvcards_colorram_w)
{
- lvcards_state *state = space->machine().driver_data<lvcards_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c
index 1b1e5830e1b..b23ff33f3b7 100644
--- a/src/mame/video/lwings.c
+++ b/src/mame/video/lwings.c
@@ -121,49 +121,43 @@ VIDEO_START( avengers )
***************************************************************************/
-WRITE8_HANDLER( lwings_fgvideoram_w )
+WRITE8_MEMBER(lwings_state::lwings_fgvideoram_w)
{
- lwings_state *state = space->machine().driver_data<lwings_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( lwings_bg1videoram_w )
+WRITE8_MEMBER(lwings_state::lwings_bg1videoram_w)
{
- lwings_state *state = space->machine().driver_data<lwings_state>();
- state->m_bg1videoram[offset] = data;
- state->m_bg1_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bg1videoram[offset] = data;
+ m_bg1_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( lwings_bg1_scrollx_w )
+WRITE8_MEMBER(lwings_state::lwings_bg1_scrollx_w)
{
- lwings_state *state = space->machine().driver_data<lwings_state>();
- state->m_scroll_x[offset] = data;
- state->m_bg1_tilemap->set_scrollx(0, state->m_scroll_x[0] | (state->m_scroll_x[1] << 8));
+ m_scroll_x[offset] = data;
+ m_bg1_tilemap->set_scrollx(0, m_scroll_x[0] | (m_scroll_x[1] << 8));
}
-WRITE8_HANDLER( lwings_bg1_scrolly_w )
+WRITE8_MEMBER(lwings_state::lwings_bg1_scrolly_w)
{
- lwings_state *state = space->machine().driver_data<lwings_state>();
- state->m_scroll_y[offset] = data;
- state->m_bg1_tilemap->set_scrolly(0, state->m_scroll_y[0] | (state->m_scroll_y[1] << 8));
+ m_scroll_y[offset] = data;
+ m_bg1_tilemap->set_scrolly(0, m_scroll_y[0] | (m_scroll_y[1] << 8));
}
-WRITE8_HANDLER( trojan_bg2_scrollx_w )
+WRITE8_MEMBER(lwings_state::trojan_bg2_scrollx_w)
{
- lwings_state *state = space->machine().driver_data<lwings_state>();
- state->m_bg2_tilemap->set_scrollx(0, data);
+ m_bg2_tilemap->set_scrollx(0, data);
}
-WRITE8_HANDLER( trojan_bg2_image_w )
+WRITE8_MEMBER(lwings_state::trojan_bg2_image_w)
{
- lwings_state *state = space->machine().driver_data<lwings_state>();
- if (state->m_bg2_image != data)
+ if (m_bg2_image != data)
{
- state->m_bg2_image = data;
- state->m_bg2_tilemap->mark_all_dirty();
+ m_bg2_image = data;
+ m_bg2_tilemap->mark_all_dirty();
}
}
diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c
index bfc9f45e131..d716f149a8f 100644
--- a/src/mame/video/m10.c
+++ b/src/mame/video/m10.c
@@ -56,38 +56,35 @@ static void get_tile_info( running_machine &machine, tile_data &tileinfo, tilema
}
-WRITE8_HANDLER( m10_colorram_w )
+WRITE8_MEMBER(m10_state::m10_colorram_w)
{
- m10_state *state = space->machine().driver_data<m10_state>();
- if (state->m_colorram[offset] != data)
+ if (m_colorram[offset] != data)
{
- state->m_tx_tilemap->mark_tile_dirty(offset);
- state->m_colorram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
}
}
-WRITE8_HANDLER( m10_chargen_w )
+WRITE8_MEMBER(m10_state::m10_chargen_w)
{
- m10_state *state = space->machine().driver_data<m10_state>();
- if (state->m_chargen[offset] != data)
+ if (m_chargen[offset] != data)
{
- state->m_chargen[offset] = data;
- gfx_element_mark_dirty(state->m_back_gfx, offset >> (3 + 5));
+ m_chargen[offset] = data;
+ gfx_element_mark_dirty(m_back_gfx, offset >> (3 + 5));
}
}
-WRITE8_HANDLER( m15_chargen_w )
+WRITE8_MEMBER(m10_state::m15_chargen_w)
{
- m10_state *state = space->machine().driver_data<m10_state>();
- if (state->m_chargen[offset] != data)
+ if (m_chargen[offset] != data)
{
- state->m_chargen[offset] = data;
- gfx_element_mark_dirty(space->machine().gfx[0], offset >> 3);
+ m_chargen[offset] = data;
+ gfx_element_mark_dirty(machine().gfx[0], offset >> 3);
}
}
diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c
index 6a4cbd626e8..5c9d715fcdc 100644
--- a/src/mame/video/m107.c
+++ b/src/mame/video/m107.c
@@ -64,26 +64,24 @@ static TILE_GET_INFO( get_pf_tile_info )
/*****************************************************************************/
-WRITE16_HANDLER( m107_vram_w )
+WRITE16_MEMBER(m107_state::m107_vram_w)
{
- m107_state *state = space->machine().driver_data<m107_state>();
int laynum;
- COMBINE_DATA(&state->m_vram_data[offset]);
+ COMBINE_DATA(&m_vram_data[offset]);
for (laynum = 0; laynum < 4; laynum++)
- if ((offset & 0x6000) == state->m_pf_layer[laynum].vram_base)
- state->m_pf_layer[laynum].tmap->mark_tile_dirty((offset & 0x1fff) / 2);
+ if ((offset & 0x6000) == m_pf_layer[laynum].vram_base)
+ m_pf_layer[laynum].tmap->mark_tile_dirty((offset & 0x1fff) / 2);
}
/*****************************************************************************/
-WRITE16_HANDLER( m107_control_w )
+WRITE16_MEMBER(m107_state::m107_control_w)
{
- m107_state *state = space->machine().driver_data<m107_state>();
- UINT16 old = state->m_control[offset];
+ UINT16 old = m_control[offset];
pf_layer_info *layer;
- COMBINE_DATA(&state->m_control[offset]);
+ COMBINE_DATA(&m_control[offset]);
switch (offset*2)
{
@@ -91,20 +89,20 @@ WRITE16_HANDLER( m107_control_w )
case 0x12: /* Playfield 2 */
case 0x14: /* Playfield 3 */
case 0x16: /* Playfield 4 (bottom layer) */
- layer = &state->m_pf_layer[offset - 0x08];
+ layer = &m_pf_layer[offset - 0x08];
/* update VRAM base (bits 8-11) */
- layer->vram_base = ((state->m_control[offset] >> 8) & 15) * 0x800;
+ layer->vram_base = ((m_control[offset] >> 8) & 15) * 0x800;
/* update enable (bit 7) */
- layer->tmap->enable((~state->m_control[offset] >> 7) & 1);
+ layer->tmap->enable((~m_control[offset] >> 7) & 1);
/* mark everything dirty of the VRAM base changes */
- if ((old ^ state->m_control[offset]) & 0x0f00)
+ if ((old ^ m_control[offset]) & 0x0f00)
layer->tmap->mark_all_dirty();
- if(state->m_control[offset] & 0xf07c)
- printf("%04x %02x\n",state->m_control[offset],offset*2);
+ if(m_control[offset] & 0xf07c)
+ printf("%04x %02x\n",m_control[offset],offset*2);
break;
@@ -114,7 +112,7 @@ WRITE16_HANDLER( m107_control_w )
break;
case 0x1e:
- state->m_raster_irq_position = state->m_control[offset] - 128;
+ m_raster_irq_position = m_control[offset] - 128;
break;
}
}
@@ -369,17 +367,16 @@ static void m107_screenrefresh(running_machine &machine, bitmap_ind16 &bitmap, c
/*****************************************************************************/
-WRITE16_HANDLER( m107_spritebuffer_w )
+WRITE16_MEMBER(m107_state::m107_spritebuffer_w)
{
- m107_state *state = space->machine().driver_data<m107_state>();
if (ACCESSING_BITS_0_7) {
/*
TODO: this register looks a lot more complex than how the game uses it. All of them seems to test various bit combinations during POST.
*/
-// logerror("%04x: buffered spriteram\n",cpu_get_pc(&space->device()));
- state->m_sprite_display = (!(data & 0x1000));
+// logerror("%04x: buffered spriteram\n",cpu_get_pc(&space.device()));
+ m_sprite_display = (!(data & 0x1000));
- memcpy(state->m_buffered_spriteram, state->m_spriteram, 0x1000);
+ memcpy(m_buffered_spriteram, m_spriteram, 0x1000);
}
}
diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c
index 2ddca534926..35c738133ab 100644
--- a/src/mame/video/m52.c
+++ b/src/mame/video/m52.c
@@ -172,9 +172,8 @@ VIDEO_START( m52 )
*
*************************************/
-WRITE8_HANDLER( m52_scroll_w )
+WRITE8_MEMBER(m52_state::m52_scroll_w)
{
- m52_state *state = space->machine().driver_data<m52_state>();
/*
According to the schematics there is only one video register that holds the X scroll value
with a NAND gate on the V64 and V128 lines to control when it's read, and when
@@ -182,10 +181,10 @@ WRITE8_HANDLER( m52_scroll_w )
So we set the first 3 quarters to 255 and the last to the scroll value
*/
- state->m_bg_tilemap->set_scrollx(0, 255);
- state->m_bg_tilemap->set_scrollx(1, 255);
- state->m_bg_tilemap->set_scrollx(2, 255);
- state->m_bg_tilemap->set_scrollx(3, -data);
+ m_bg_tilemap->set_scrollx(0, 255);
+ m_bg_tilemap->set_scrollx(1, 255);
+ m_bg_tilemap->set_scrollx(2, 255);
+ m_bg_tilemap->set_scrollx(3, -data);
}
@@ -196,21 +195,19 @@ WRITE8_HANDLER( m52_scroll_w )
*
*************************************/
-WRITE8_HANDLER( m52_videoram_w )
+WRITE8_MEMBER(m52_state::m52_videoram_w)
{
- m52_state *state = space->machine().driver_data<m52_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( m52_colorram_w )
+WRITE8_MEMBER(m52_state::m52_colorram_w)
{
- m52_state *state = space->machine().driver_data<m52_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
@@ -224,15 +221,14 @@ WRITE8_HANDLER( m52_colorram_w )
/* This looks like some kind of protection implemented by a custom chip on the
scroll board. It mangles the value written to the port m52_bg1xpos_w, as
follows: result = popcount(value & 0x7f) ^ (value >> 7) */
-READ8_HANDLER( m52_protection_r )
+READ8_MEMBER(m52_state::m52_protection_r)
{
- m52_state *state = space->machine().driver_data<m52_state>();
int popcount = 0;
int temp;
- for (temp = state->m_bg1xpos & 0x7f; temp != 0; temp >>= 1)
+ for (temp = m_bg1xpos & 0x7f; temp != 0; temp >>= 1)
popcount += temp & 1;
- return popcount ^ (state->m_bg1xpos >> 7);
+ return popcount ^ (m_bg1xpos >> 7);
}
@@ -243,34 +239,29 @@ READ8_HANDLER( m52_protection_r )
*
*************************************/
-WRITE8_HANDLER( m52_bg1ypos_w )
+WRITE8_MEMBER(m52_state::m52_bg1ypos_w)
{
- m52_state *state = space->machine().driver_data<m52_state>();
- state->m_bg1ypos = data;
+ m_bg1ypos = data;
}
-WRITE8_HANDLER( m52_bg1xpos_w )
+WRITE8_MEMBER(m52_state::m52_bg1xpos_w)
{
- m52_state *state = space->machine().driver_data<m52_state>();
- state->m_bg1xpos = data;
+ m_bg1xpos = data;
}
-WRITE8_HANDLER( m52_bg2xpos_w )
+WRITE8_MEMBER(m52_state::m52_bg2xpos_w)
{
- m52_state *state = space->machine().driver_data<m52_state>();
- state->m_bg2xpos = data;
+ m_bg2xpos = data;
}
-WRITE8_HANDLER( m52_bg2ypos_w )
+WRITE8_MEMBER(m52_state::m52_bg2ypos_w)
{
- m52_state *state = space->machine().driver_data<m52_state>();
- state->m_bg2ypos = data;
+ m_bg2ypos = data;
}
-WRITE8_HANDLER( m52_bgcontrol_w )
+WRITE8_MEMBER(m52_state::m52_bgcontrol_w)
{
- m52_state *state = space->machine().driver_data<m52_state>();
- state->m_bgcontrol = data;
+ m_bgcontrol = data;
}
@@ -281,18 +272,18 @@ WRITE8_HANDLER( m52_bgcontrol_w )
*
*************************************/
-WRITE8_HANDLER( m52_flipscreen_w )
+WRITE8_MEMBER(m52_state::m52_flipscreen_w)
{
/* screen flip is handled both by software and hardware */
- flip_screen_set(space->machine(), (data & 0x01) ^ (~input_port_read(space->machine(), "DSW2") & 0x01));
+ flip_screen_set(machine(), (data & 0x01) ^ (~input_port_read(machine(), "DSW2") & 0x01));
- coin_counter_w(space->machine(), 0, data & 0x02);
- coin_counter_w(space->machine(), 1, data & 0x20);
+ coin_counter_w(machine(), 0, data & 0x02);
+ coin_counter_w(machine(), 1, data & 0x20);
}
-WRITE8_HANDLER( alpha1v_flipscreen_w )
+WRITE8_MEMBER(m52_state::alpha1v_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 0x01);
+ flip_screen_set(machine(), data & 0x01);
}
diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c
index 5172240ad6c..de6fb4de2e6 100644
--- a/src/mame/video/m57.c
+++ b/src/mame/video/m57.c
@@ -126,12 +126,11 @@ static TILE_GET_INFO( get_tile_info )
*
*************************************/
-WRITE8_HANDLER( m57_videoram_w )
+WRITE8_MEMBER(m57_state::m57_videoram_w)
{
- m57_state *state = space->machine().driver_data<m57_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
@@ -158,16 +157,15 @@ VIDEO_START( m57 )
*
*************************************/
-WRITE8_HANDLER( m57_flipscreen_w )
+WRITE8_MEMBER(m57_state::m57_flipscreen_w)
{
- m57_state *state = space->machine().driver_data<m57_state>();
/* screen flip is handled both by software and hardware */
- state->m_flipscreen = (data & 0x01) ^ (~input_port_read(space->machine(), "DSW2") & 0x01);
- state->m_bg_tilemap->set_flip(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen = (data & 0x01) ^ (~input_port_read(machine(), "DSW2") & 0x01);
+ m_bg_tilemap->set_flip(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- coin_counter_w(space->machine(), 0,data & 0x02);
- coin_counter_w(space->machine(), 1,data & 0x20);
+ coin_counter_w(machine(), 0,data & 0x02);
+ coin_counter_w(machine(), 1,data & 0x20);
}
diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c
index 50de5597dcb..6dd439d7f1f 100644
--- a/src/mame/video/m58.c
+++ b/src/mame/video/m58.c
@@ -103,18 +103,16 @@ PALETTE_INIT( yard )
*
*************************************/
-WRITE8_HANDLER( yard_videoram_w )
+WRITE8_MEMBER(m58_state::yard_videoram_w)
{
- m58_state *state = space->machine().driver_data<m58_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( yard_scroll_panel_w )
+WRITE8_MEMBER(m58_state::yard_scroll_panel_w)
{
- m58_state *state = space->machine().driver_data<m58_state>();
int sx,sy,i;
@@ -133,7 +131,7 @@ WRITE8_HANDLER( yard_scroll_panel_w )
col = (data >> i) & 0x11;
col = ((col >> 3) | col) & 3;
- state->m_scroll_panel_bitmap->pix16(sy, sx + i) = RADAR_PALETTE_BASE + (sy & 0xfc) + col;
+ m_scroll_panel_bitmap->pix16(sy, sx + i) = RADAR_PALETTE_BASE + (sy & 0xfc) + col;
}
}
@@ -199,13 +197,13 @@ VIDEO_START( yard )
*
*************************************/
-WRITE8_HANDLER( yard_flipscreen_w )
+WRITE8_MEMBER(m58_state::yard_flipscreen_w)
{
/* screen flip is handled both by software and hardware */
- flip_screen_set(space->machine(), (data & 0x01) ^ (~input_port_read(space->machine(), "DSW2") & 0x01));
+ flip_screen_set(machine(), (data & 0x01) ^ (~input_port_read(machine(), "DSW2") & 0x01));
- coin_counter_w(space->machine(), 0, data & 0x02);
- coin_counter_w(space->machine(), 1, data & 0x20);
+ coin_counter_w(machine(), 0, data & 0x02);
+ coin_counter_w(machine(), 1, data & 0x20);
}
diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c
index b1cee773671..dc25530d90d 100644
--- a/src/mame/video/m62.c
+++ b/src/mame/video/m62.c
@@ -298,58 +298,51 @@ static void register_savestate( running_machine &machine )
}
-WRITE8_HANDLER( m62_flipscreen_w )
+WRITE8_MEMBER(m62_state::m62_flipscreen_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
/* screen flip is handled both by software and hardware */
- data ^= ~input_port_read(space->machine(), "DSW2") & 1;
+ data ^= ~input_port_read(machine(), "DSW2") & 1;
- state->m_flipscreen = data & 0x01;
- if (state->m_flipscreen)
- space->machine().tilemap().set_flip_all(TILEMAP_FLIPX | TILEMAP_FLIPY);
+ m_flipscreen = data & 0x01;
+ if (m_flipscreen)
+ machine().tilemap().set_flip_all(TILEMAP_FLIPX | TILEMAP_FLIPY);
else
- space->machine().tilemap().set_flip_all(0);
+ machine().tilemap().set_flip_all(0);
- coin_counter_w(space->machine(), 0, data & 2);
- coin_counter_w(space->machine(), 1, data & 4);
+ coin_counter_w(machine(), 0, data & 2);
+ coin_counter_w(machine(), 1, data & 4);
}
-WRITE8_HANDLER( m62_hscroll_low_w )
+WRITE8_MEMBER(m62_state::m62_hscroll_low_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
- state->m_m62_background_hscroll = (state->m_m62_background_hscroll & 0xff00) | data;
+ m_m62_background_hscroll = (m_m62_background_hscroll & 0xff00) | data;
}
-WRITE8_HANDLER( m62_hscroll_high_w )
+WRITE8_MEMBER(m62_state::m62_hscroll_high_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
- state->m_m62_background_hscroll = (state->m_m62_background_hscroll & 0xff) | (data << 8);
+ m_m62_background_hscroll = (m_m62_background_hscroll & 0xff) | (data << 8);
}
-WRITE8_HANDLER( m62_vscroll_low_w )
+WRITE8_MEMBER(m62_state::m62_vscroll_low_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
- state->m_m62_background_vscroll = (state->m_m62_background_vscroll & 0xff00) | data;
+ m_m62_background_vscroll = (m_m62_background_vscroll & 0xff00) | data;
}
-WRITE8_HANDLER( m62_vscroll_high_w )
+WRITE8_MEMBER(m62_state::m62_vscroll_high_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
- state->m_m62_background_vscroll = (state->m_m62_background_vscroll & 0xff) | (data << 8);
+ m_m62_background_vscroll = (m_m62_background_vscroll & 0xff) | (data << 8);
}
-WRITE8_HANDLER( m62_tileram_w )
+WRITE8_MEMBER(m62_state::m62_tileram_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
- state->m_m62_tileram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset >> 1);
+ m_m62_tileram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset >> 1);
}
-WRITE8_HANDLER( m62_textram_w )
+WRITE8_MEMBER(m62_state::m62_textram_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
- state->m_m62_textram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset >> 1);
+ m_m62_textram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset >> 1);
}
@@ -438,11 +431,10 @@ static void m62_textlayer( running_machine &machine, tile_get_info_func tile_get
state->m_fg_tilemap->set_scroll_cols(cols);
}
-WRITE8_HANDLER( kungfum_tileram_w )
+WRITE8_MEMBER(m62_state::kungfum_tileram_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
- state->m_m62_tileram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_m62_tileram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
static TILE_GET_INFO( get_kungfum_bg_tile_info )
@@ -563,10 +555,9 @@ VIDEO_START( ldrun2 )
}
-WRITE8_HANDLER( ldrun3_topbottom_mask_w )
+WRITE8_MEMBER(m62_state::ldrun3_topbottom_mask_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
- state->m_ldrun3_topbottom_mask = data & 1;
+ m_ldrun3_topbottom_mask = data & 1;
}
SCREEN_UPDATE_IND16( ldrun3 )
@@ -724,25 +715,22 @@ SCREEN_UPDATE_IND16( lotlot )
}
-WRITE8_HANDLER( kidniki_text_vscroll_low_w )
+WRITE8_MEMBER(m62_state::kidniki_text_vscroll_low_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
- state->m_kidniki_text_vscroll = (state->m_kidniki_text_vscroll & 0xff00) | data;
+ m_kidniki_text_vscroll = (m_kidniki_text_vscroll & 0xff00) | data;
}
-WRITE8_HANDLER( kidniki_text_vscroll_high_w )
+WRITE8_MEMBER(m62_state::kidniki_text_vscroll_high_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
- state->m_kidniki_text_vscroll = (state->m_kidniki_text_vscroll & 0xff) | (data << 8);
+ m_kidniki_text_vscroll = (m_kidniki_text_vscroll & 0xff) | (data << 8);
}
-WRITE8_HANDLER( kidniki_background_bank_w )
+WRITE8_MEMBER(m62_state::kidniki_background_bank_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
- if (state->m_kidniki_background_bank != (data & 1))
+ if (m_kidniki_background_bank != (data & 1))
{
- state->m_kidniki_background_bank = data & 1;
- state->m_bg_tilemap->mark_all_dirty();
+ m_kidniki_background_bank = data & 1;
+ m_bg_tilemap->mark_all_dirty();
}
}
@@ -796,14 +784,13 @@ SCREEN_UPDATE_IND16( kidniki )
}
-WRITE8_HANDLER( spelunkr_palbank_w )
+WRITE8_MEMBER(m62_state::spelunkr_palbank_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
- if (state->m_spelunkr_palbank != (data & 0x01))
+ if (m_spelunkr_palbank != (data & 0x01))
{
- state->m_spelunkr_palbank = data & 0x01;
- state->m_bg_tilemap->mark_all_dirty();
- state->m_fg_tilemap->mark_all_dirty();
+ m_spelunkr_palbank = data & 0x01;
+ m_bg_tilemap->mark_all_dirty();
+ m_fg_tilemap->mark_all_dirty();
}
}
@@ -850,16 +837,15 @@ SCREEN_UPDATE_IND16( spelunkr )
}
-WRITE8_HANDLER( spelunk2_gfxport_w )
+WRITE8_MEMBER(m62_state::spelunk2_gfxport_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
m62_hscroll_high_w(space, 0, (data & 2) >> 1);
m62_vscroll_high_w(space, 0, (data & 1));
- if (state->m_spelunkr_palbank != ((data & 0x0c) >> 2))
+ if (m_spelunkr_palbank != ((data & 0x0c) >> 2))
{
- state->m_spelunkr_palbank = (data & 0x0c) >> 2;
- state->m_bg_tilemap->mark_all_dirty();
- state->m_fg_tilemap->mark_all_dirty();
+ m_spelunkr_palbank = (data & 0x0c) >> 2;
+ m_bg_tilemap->mark_all_dirty();
+ m_fg_tilemap->mark_all_dirty();
}
}
@@ -944,10 +930,9 @@ SCREEN_UPDATE_IND16( youjyudn )
}
-WRITE8_HANDLER( horizon_scrollram_w )
+WRITE8_MEMBER(m62_state::horizon_scrollram_w)
{
- m62_state *state = space->machine().driver_data<m62_state>();
- state->m_scrollram[offset] = data;
+ m_scrollram[offset] = data;
}
static TILE_GET_INFO( get_horizon_bg_tile_info )
diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c
index 7c7853ecc42..87d87536cfe 100644
--- a/src/mame/video/m72.c
+++ b/src/mame/video/m72.c
@@ -261,22 +261,20 @@ VIDEO_START( hharry )
***************************************************************************/
-READ16_HANDLER( m72_palette1_r )
+READ16_MEMBER(m72_state::m72_palette1_r)
{
/* A9 isn't connected, so 0x200-0x3ff mirrors 0x000-0x1ff etc. */
offset &= ~0x100;
- m72_state *state = space->machine().driver_data<m72_state>();
- return state->m_generic_paletteram_16[offset] | 0xffe0; /* only D0-D4 are connected */
+ return m_generic_paletteram_16[offset] | 0xffe0; /* only D0-D4 are connected */
}
-READ16_HANDLER( m72_palette2_r )
+READ16_MEMBER(m72_state::m72_palette2_r)
{
/* A9 isn't connected, so 0x200-0x3ff mirrors 0x000-0x1ff etc. */
offset &= ~0x100;
- m72_state *state = space->machine().driver_data<m72_state>();
- return state->m_generic_paletteram2_16[offset] | 0xffe0; /* only D0-D4 are connected */
+ return m_generic_paletteram2_16[offset] | 0xffe0; /* only D0-D4 are connected */
}
INLINE void changecolor(running_machine &machine,int color,int r,int g,int b)
@@ -284,131 +282,119 @@ INLINE void changecolor(running_machine &machine,int color,int r,int g,int b)
palette_set_color_rgb(machine,color,pal5bit(r),pal5bit(g),pal5bit(b));
}
-WRITE16_HANDLER( m72_palette1_w )
+WRITE16_MEMBER(m72_state::m72_palette1_w)
{
/* A9 isn't connected, so 0x200-0x3ff mirrors 0x000-0x1ff etc. */
offset &= ~0x100;
- m72_state *state = space->machine().driver_data<m72_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
offset &= 0x0ff;
- changecolor(space->machine(),
+ changecolor(machine(),
offset,
- state->m_generic_paletteram_16[offset + 0x000],
- state->m_generic_paletteram_16[offset + 0x200],
- state->m_generic_paletteram_16[offset + 0x400]);
+ m_generic_paletteram_16[offset + 0x000],
+ m_generic_paletteram_16[offset + 0x200],
+ m_generic_paletteram_16[offset + 0x400]);
}
-WRITE16_HANDLER( m72_palette2_w )
+WRITE16_MEMBER(m72_state::m72_palette2_w)
{
/* A9 isn't connected, so 0x200-0x3ff mirrors 0x000-0x1ff etc. */
offset &= ~0x100;
- m72_state *state = space->machine().driver_data<m72_state>();
- COMBINE_DATA(&state->m_generic_paletteram2_16[offset]);
+ COMBINE_DATA(&m_generic_paletteram2_16[offset]);
offset &= 0x0ff;
- changecolor(space->machine(),
+ changecolor(machine(),
offset + 256,
- state->m_generic_paletteram2_16[offset + 0x000],
- state->m_generic_paletteram2_16[offset + 0x200],
- state->m_generic_paletteram2_16[offset + 0x400]);
+ m_generic_paletteram2_16[offset + 0x000],
+ m_generic_paletteram2_16[offset + 0x200],
+ m_generic_paletteram2_16[offset + 0x400]);
}
-WRITE16_HANDLER( m72_videoram1_w )
+WRITE16_MEMBER(m72_state::m72_videoram1_w)
{
- m72_state *state = space->machine().driver_data<m72_state>();
- COMBINE_DATA(&state->m_videoram1[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_videoram1[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( m72_videoram2_w )
+WRITE16_MEMBER(m72_state::m72_videoram2_w)
{
- m72_state *state = space->machine().driver_data<m72_state>();
- COMBINE_DATA(&state->m_videoram2[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_videoram2[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( m72_irq_line_w )
+WRITE16_MEMBER(m72_state::m72_irq_line_w)
{
- m72_state *state = space->machine().driver_data<m72_state>();
- COMBINE_DATA(&state->m_raster_irq_position);
+ COMBINE_DATA(&m_raster_irq_position);
}
-WRITE16_HANDLER( m72_scrollx1_w )
+WRITE16_MEMBER(m72_state::m72_scrollx1_w)
{
- m72_state *state = space->machine().driver_data<m72_state>();
- COMBINE_DATA(&state->m_scrollx1);
+ COMBINE_DATA(&m_scrollx1);
}
-WRITE16_HANDLER( m72_scrollx2_w )
+WRITE16_MEMBER(m72_state::m72_scrollx2_w)
{
- m72_state *state = space->machine().driver_data<m72_state>();
- COMBINE_DATA(&state->m_scrollx2);
+ COMBINE_DATA(&m_scrollx2);
}
-WRITE16_HANDLER( m72_scrolly1_w )
+WRITE16_MEMBER(m72_state::m72_scrolly1_w)
{
- m72_state *state = space->machine().driver_data<m72_state>();
- COMBINE_DATA(&state->m_scrolly1);
+ COMBINE_DATA(&m_scrolly1);
}
-WRITE16_HANDLER( m72_scrolly2_w )
+WRITE16_MEMBER(m72_state::m72_scrolly2_w)
{
- m72_state *state = space->machine().driver_data<m72_state>();
- COMBINE_DATA(&state->m_scrolly2);
+ COMBINE_DATA(&m_scrolly2);
}
-WRITE16_HANDLER( m72_dmaon_w )
+WRITE16_MEMBER(m72_state::m72_dmaon_w)
{
- m72_state *state = space->machine().driver_data<m72_state>();
if (ACCESSING_BITS_0_7)
- memcpy(state->m_buffered_spriteram, state->m_spriteram, state->m_spriteram_size);
+ memcpy(m_buffered_spriteram, m_spriteram, m_spriteram_size);
}
-WRITE16_HANDLER( m72_port02_w )
+WRITE16_MEMBER(m72_state::m72_port02_w)
{
- m72_state *state = space->machine().driver_data<m72_state>();
if (ACCESSING_BITS_0_7)
{
if (data & 0xe0) logerror("write %02x to port 02\n",data);
/* bits 0/1 are coin counters */
- coin_counter_w(space->machine(), 0,data & 0x01);
- coin_counter_w(space->machine(), 1,data & 0x02);
+ coin_counter_w(machine(), 0,data & 0x01);
+ coin_counter_w(machine(), 1,data & 0x02);
/* bit 2 is flip screen (handled both by software and hardware) */
- flip_screen_set(space->machine(), ((data & 0x04) >> 2) ^ ((~input_port_read(space->machine(), "DSW") >> 8) & 1));
+ flip_screen_set(machine(), ((data & 0x04) >> 2) ^ ((~input_port_read(machine(), "DSW") >> 8) & 1));
/* bit 3 is display disable */
- state->m_video_off = data & 0x08;
+ m_video_off = data & 0x08;
/* bit 4 resets sound CPU (active low) */
if (data & 0x10)
- cputag_set_input_line(space->machine(), "soundcpu", INPUT_LINE_RESET, CLEAR_LINE);
+ cputag_set_input_line(machine(), "soundcpu", INPUT_LINE_RESET, CLEAR_LINE);
else
- cputag_set_input_line(space->machine(), "soundcpu", INPUT_LINE_RESET, ASSERT_LINE);
+ cputag_set_input_line(machine(), "soundcpu", INPUT_LINE_RESET, ASSERT_LINE);
/* bit 5 = "bank"? */
}
}
-WRITE16_HANDLER( rtype2_port02_w )
+WRITE16_MEMBER(m72_state::rtype2_port02_w)
{
- m72_state *state = space->machine().driver_data<m72_state>();
if (ACCESSING_BITS_0_7)
{
if (data & 0xe0) logerror("write %02x to port 02\n",data);
/* bits 0/1 are coin counters */
- coin_counter_w(space->machine(), 0,data & 0x01);
- coin_counter_w(space->machine(), 1,data & 0x02);
+ coin_counter_w(machine(), 0,data & 0x01);
+ coin_counter_w(machine(), 1,data & 0x02);
/* bit 2 is flip screen (handled both by software and hardware) */
- flip_screen_set(space->machine(), ((data & 0x04) >> 2) ^ ((~input_port_read(space->machine(), "DSW") >> 8) & 1));
+ flip_screen_set(machine(), ((data & 0x04) >> 2) ^ ((~input_port_read(machine(), "DSW") >> 8) & 1));
/* bit 3 is display disable */
- state->m_video_off = data & 0x08;
+ m_video_off = data & 0x08;
/* other bits unknown */
}
@@ -417,13 +403,12 @@ WRITE16_HANDLER( rtype2_port02_w )
/* the following is mostly a kludge. This register seems to be used for something else */
-WRITE16_HANDLER( majtitle_gfx_ctrl_w )
+WRITE16_MEMBER(m72_state::majtitle_gfx_ctrl_w)
{
- m72_state *state = space->machine().driver_data<m72_state>();
if (ACCESSING_BITS_8_15)
{
- if (data & 0xff00) state->m_majtitle_rowscroll = 1;
- else state->m_majtitle_rowscroll = 0;
+ if (data & 0xff00) m_majtitle_rowscroll = 1;
+ else m_majtitle_rowscroll = 0;
}
}
diff --git a/src/mame/video/m90.c b/src/mame/video/m90.c
index c87fd3927ff..4fc739bb27d 100644
--- a/src/mame/video/m90.c
+++ b/src/mame/video/m90.c
@@ -272,10 +272,9 @@ static void dynablsb_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap
}
}
-WRITE16_HANDLER( m90_video_control_w )
+WRITE16_MEMBER(m90_state::m90_video_control_w)
{
- m90_state *state = space->machine().driver_data<m90_state>();
- COMBINE_DATA(&state->m_video_control_data[offset]);
+ COMBINE_DATA(&m_video_control_data[offset]);
}
static void markdirty(tilemap_t *tmap,int page,offs_t offset)
@@ -286,15 +285,14 @@ static void markdirty(tilemap_t *tmap,int page,offs_t offset)
tmap->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( m90_video_w )
+WRITE16_MEMBER(m90_state::m90_video_w)
{
- m90_state *state = space->machine().driver_data<m90_state>();
- COMBINE_DATA(&state->m_video_data[offset]);
+ COMBINE_DATA(&m_video_data[offset]);
- markdirty(state->m_pf1_layer, state->m_video_control_data[5] & 0x3,offset);
- markdirty(state->m_pf1_wide_layer,state->m_video_control_data[5] & 0x2,offset);
- markdirty(state->m_pf2_layer, state->m_video_control_data[6] & 0x3,offset);
- markdirty(state->m_pf2_wide_layer,state->m_video_control_data[6] & 0x2,offset);
+ markdirty(m_pf1_layer, m_video_control_data[5] & 0x3,offset);
+ markdirty(m_pf1_wide_layer,m_video_control_data[5] & 0x2,offset);
+ markdirty(m_pf2_layer, m_video_control_data[6] & 0x3,offset);
+ markdirty(m_pf2_wide_layer,m_video_control_data[6] & 0x2,offset);
}
SCREEN_UPDATE_IND16( m90 )
diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c
index e0783038013..f635d9ff4ca 100644
--- a/src/mame/video/m92.c
+++ b/src/mame/video/m92.c
@@ -52,10 +52,9 @@ static TIMER_CALLBACK( spritebuffer_callback )
m92_sprite_interrupt(machine);
}
-WRITE16_HANDLER( m92_spritecontrol_w )
+WRITE16_MEMBER(m92_state::m92_spritecontrol_w)
{
- m92_state *state = space->machine().driver_data<m92_state>();
- COMBINE_DATA(&state->m_spritecontrol[offset]);
+ COMBINE_DATA(&m_spritecontrol[offset]);
// offset0: sprite list size (negative)
// offset1: ? (always 0)
// offset2: sprite control
@@ -67,9 +66,9 @@ WRITE16_HANDLER( m92_spritecontrol_w )
if (offset==2 && ACCESSING_BITS_0_7)
{
if ((data & 0xff) == 8)
- state->m_sprite_list = (((0x100 - state->m_spritecontrol[0]) & 0xff) * 4);
+ m_sprite_list = (((0x100 - m_spritecontrol[0]) & 0xff) * 4);
else
- state->m_sprite_list = 0x400;
+ m_sprite_list = 0x400;
/* Bit 0 is also significant */
}
@@ -78,20 +77,19 @@ WRITE16_HANDLER( m92_spritecontrol_w )
if (offset==4)
{
/* this implementation is not accurate: still some delayed sprites in gunforc2 (might be another issue?) */
- state->m_spriteram->copy();
- state->m_sprite_buffer_busy = 0;
+ m_spriteram->copy();
+ m_sprite_buffer_busy = 0;
/* Pixel clock is 26.6666MHz (some boards 27MHz??), we have 0x800 bytes, or 0x400 words to copy from
spriteram to the buffer. It seems safe to assume 1 word can be copied per clock. */
- space->machine().scheduler().timer_set(attotime::from_hz(XTAL_26_66666MHz) * 0x400, FUNC(spritebuffer_callback));
+ machine().scheduler().timer_set(attotime::from_hz(XTAL_26_66666MHz) * 0x400, FUNC(spritebuffer_callback));
}
-// logerror("%04x: m92_spritecontrol_w %08x %08x\n",cpu_get_pc(&space->device()),offset,data);
+// logerror("%04x: m92_spritecontrol_w %08x %08x\n",cpu_get_pc(&space.device()),offset,data);
}
-WRITE16_HANDLER( m92_videocontrol_w )
+WRITE16_MEMBER(m92_state::m92_videocontrol_w)
{
- m92_state *state = space->machine().driver_data<m92_state>();
- COMBINE_DATA(&state->m_videocontrol);
+ COMBINE_DATA(&m_videocontrol);
/*
Many games write:
0x2000
@@ -121,21 +119,19 @@ WRITE16_HANDLER( m92_videocontrol_w )
*/
/* Access to upper palette bank */
- state->m_palette_bank = (state->m_videocontrol >> 1) & 1;
+ m_palette_bank = (m_videocontrol >> 1) & 1;
-// logerror("%04x: m92_videocontrol_w %d = %02x\n",cpu_get_pc(&space->device()),offset,data);
+// logerror("%04x: m92_videocontrol_w %d = %02x\n",cpu_get_pc(&space.device()),offset,data);
}
-READ16_HANDLER( m92_paletteram_r )
+READ16_MEMBER(m92_state::m92_paletteram_r)
{
- m92_state *state = space->machine().driver_data<m92_state>();
- return state->m_generic_paletteram_16[offset + 0x400 * state->m_palette_bank];
+ return m_generic_paletteram_16[offset + 0x400 * m_palette_bank];
}
-WRITE16_HANDLER( m92_paletteram_w )
+WRITE16_MEMBER(m92_state::m92_paletteram_w)
{
- m92_state *state = space->machine().driver_data<m92_state>();
- state->paletteram16_xBBBBBGGGGGRRRRR_word_w(*space, offset + 0x400 * state->m_palette_bank, data, mem_mask);
+ paletteram16_xBBBBBGGGGGRRRRR_word_w(space, offset + 0x400 * m_palette_bank, data, mem_mask);
}
/*****************************************************************************/
@@ -162,77 +158,72 @@ static TILE_GET_INFO( get_pf_tile_info )
/*****************************************************************************/
-WRITE16_HANDLER( m92_vram_w )
+WRITE16_MEMBER(m92_state::m92_vram_w)
{
- m92_state *state = space->machine().driver_data<m92_state>();
int laynum;
- COMBINE_DATA(&state->m_vram_data[offset]);
+ COMBINE_DATA(&m_vram_data[offset]);
for (laynum = 0; laynum < 3; laynum++)
{
- if ((offset & 0x6000) == state->m_pf_layer[laynum].vram_base)
+ if ((offset & 0x6000) == m_pf_layer[laynum].vram_base)
{
- state->m_pf_layer[laynum].tmap->mark_tile_dirty((offset & 0x1fff) / 2);
- state->m_pf_layer[laynum].wide_tmap->mark_tile_dirty((offset & 0x3fff) / 2);
+ m_pf_layer[laynum].tmap->mark_tile_dirty((offset & 0x1fff) / 2);
+ m_pf_layer[laynum].wide_tmap->mark_tile_dirty((offset & 0x3fff) / 2);
}
- if ((offset & 0x6000) == state->m_pf_layer[laynum].vram_base + 0x2000)
- state->m_pf_layer[laynum].wide_tmap->mark_tile_dirty((offset & 0x3fff) / 2);
+ if ((offset & 0x6000) == m_pf_layer[laynum].vram_base + 0x2000)
+ m_pf_layer[laynum].wide_tmap->mark_tile_dirty((offset & 0x3fff) / 2);
}
}
/*****************************************************************************/
-WRITE16_HANDLER( m92_pf1_control_w )
+WRITE16_MEMBER(m92_state::m92_pf1_control_w)
{
- m92_state *state = space->machine().driver_data<m92_state>();
- COMBINE_DATA(&state->m_pf_layer[0].control[offset]);
+ COMBINE_DATA(&m_pf_layer[0].control[offset]);
}
-WRITE16_HANDLER( m92_pf2_control_w )
+WRITE16_MEMBER(m92_state::m92_pf2_control_w)
{
- m92_state *state = space->machine().driver_data<m92_state>();
- COMBINE_DATA(&state->m_pf_layer[1].control[offset]);
+ COMBINE_DATA(&m_pf_layer[1].control[offset]);
}
-WRITE16_HANDLER( m92_pf3_control_w )
+WRITE16_MEMBER(m92_state::m92_pf3_control_w)
{
- m92_state *state = space->machine().driver_data<m92_state>();
- COMBINE_DATA(&state->m_pf_layer[2].control[offset]);
+ COMBINE_DATA(&m_pf_layer[2].control[offset]);
}
-WRITE16_HANDLER( m92_master_control_w )
+WRITE16_MEMBER(m92_state::m92_master_control_w)
{
- m92_state *state = space->machine().driver_data<m92_state>();
- UINT16 old = state->m_pf_master_control[offset];
+ UINT16 old = m_pf_master_control[offset];
pf_layer_info *layer;
- COMBINE_DATA(&state->m_pf_master_control[offset]);
+ COMBINE_DATA(&m_pf_master_control[offset]);
switch (offset)
{
case 0: /* Playfield 1 (top layer) */
case 1: /* Playfield 2 (middle layer) */
case 2: /* Playfield 3 (bottom layer) */
- layer = &state->m_pf_layer[offset];
+ layer = &m_pf_layer[offset];
/* update VRAM base (bits 0-1) */
- layer->vram_base = (state->m_pf_master_control[offset] & 3) * 0x2000;
+ layer->vram_base = (m_pf_master_control[offset] & 3) * 0x2000;
/* update size (bit 2) */
- if (state->m_pf_master_control[offset] & 0x04)
+ if (m_pf_master_control[offset] & 0x04)
{
layer->tmap->enable(FALSE);
- layer->wide_tmap->enable((~state->m_pf_master_control[offset] >> 4) & 1);
+ layer->wide_tmap->enable((~m_pf_master_control[offset] >> 4) & 1);
}
else
{
- layer->tmap->enable((~state->m_pf_master_control[offset] >> 4) & 1);
+ layer->tmap->enable((~m_pf_master_control[offset] >> 4) & 1);
layer->wide_tmap->enable(FALSE);
}
/* mark everything dirty of the VRAM base or size changes */
- if ((old ^ state->m_pf_master_control[offset]) & 0x07)
+ if ((old ^ m_pf_master_control[offset]) & 0x07)
{
layer->tmap->mark_all_dirty();
layer->wide_tmap->mark_all_dirty();
@@ -240,7 +231,7 @@ WRITE16_HANDLER( m92_master_control_w )
break;
case 3:
- state->m_raster_irq_position = state->m_pf_master_control[3] - 128;
+ m_raster_irq_position = m_pf_master_control[3] - 128;
break;
}
}
diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c
index e1dc1c5ffaa..4f7518dfa66 100644
--- a/src/mame/video/macrossp.c
+++ b/src/mame/video/macrossp.c
@@ -6,13 +6,12 @@
/*** SCR A LAYER ***/
-WRITE32_HANDLER( macrossp_scra_videoram_w )
+WRITE32_MEMBER(macrossp_state::macrossp_scra_videoram_w)
{
- macrossp_state *state = space->machine().driver_data<macrossp_state>();
- COMBINE_DATA(&state->m_scra_videoram[offset]);
+ COMBINE_DATA(&m_scra_videoram[offset]);
- state->m_scra_tilemap->mark_tile_dirty(offset);
+ m_scra_tilemap->mark_tile_dirty(offset);
}
@@ -44,13 +43,12 @@ static TILE_GET_INFO( get_macrossp_scra_tile_info )
/*** SCR B LAYER ***/
-WRITE32_HANDLER( macrossp_scrb_videoram_w )
+WRITE32_MEMBER(macrossp_state::macrossp_scrb_videoram_w)
{
- macrossp_state *state = space->machine().driver_data<macrossp_state>();
- COMBINE_DATA(&state->m_scrb_videoram[offset]);
+ COMBINE_DATA(&m_scrb_videoram[offset]);
- state->m_scrb_tilemap->mark_tile_dirty(offset);
+ m_scrb_tilemap->mark_tile_dirty(offset);
}
@@ -82,13 +80,12 @@ static TILE_GET_INFO( get_macrossp_scrb_tile_info )
/*** SCR C LAYER ***/
-WRITE32_HANDLER( macrossp_scrc_videoram_w )
+WRITE32_MEMBER(macrossp_state::macrossp_scrc_videoram_w)
{
- macrossp_state *state = space->machine().driver_data<macrossp_state>();
- COMBINE_DATA(&state->m_scrc_videoram[offset]);
+ COMBINE_DATA(&m_scrc_videoram[offset]);
- state->m_scrc_tilemap->mark_tile_dirty(offset);
+ m_scrc_tilemap->mark_tile_dirty(offset);
}
@@ -120,13 +117,12 @@ static TILE_GET_INFO( get_macrossp_scrc_tile_info )
/*** TEXT LAYER ***/
-WRITE32_HANDLER( macrossp_text_videoram_w )
+WRITE32_MEMBER(macrossp_state::macrossp_text_videoram_w)
{
- macrossp_state *state = space->machine().driver_data<macrossp_state>();
- COMBINE_DATA(&state->m_text_videoram[offset]);
+ COMBINE_DATA(&m_text_videoram[offset]);
- state->m_text_tilemap->mark_tile_dirty(offset);
+ m_text_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c
index 7cba81e9409..69aeac0fde3 100644
--- a/src/mame/video/madalien.c
+++ b/src/mame/video/madalien.c
@@ -112,11 +112,10 @@ static TILE_GET_INFO( get_tile_info_FG )
SET_TILE_INFO(0, state->m_videoram[tile_index], 0, 0);
}
-WRITE8_HANDLER( madalien_videoram_w )
+WRITE8_MEMBER(madalien_state::madalien_videoram_w)
{
- madalien_state *state = space->machine().driver_data<madalien_state>();
- state->m_videoram[offset] = data;
- state->m_tilemap_fg->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_tilemap_fg->mark_tile_dirty(offset);
}
@@ -243,11 +242,10 @@ static void draw_foreground(running_machine &machine, bitmap_ind16 &bitmap, cons
}
-WRITE8_HANDLER( madalien_charram_w )
+WRITE8_MEMBER(madalien_state::madalien_charram_w)
{
- madalien_state *state = space->machine().driver_data<madalien_state>();
- state->m_charram[offset] = data;
- gfx_element_mark_dirty(space->machine().gfx[0], (offset/8) & 0xff);
+ m_charram[offset] = data;
+ gfx_element_mark_dirty(machine().gfx[0], (offset/8) & 0xff);
}
diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c
index e030236abc9..3ba8449228d 100644
--- a/src/mame/video/mainsnk.c
+++ b/src/mame/video/mainsnk.c
@@ -83,16 +83,15 @@ VIDEO_START(mainsnk)
}
-WRITE8_HANDLER(mainsnk_c600_w)
+WRITE8_MEMBER(mainsnk_state::mainsnk_c600_w)
{
- mainsnk_state *state = space->machine().driver_data<mainsnk_state>();
int bank;
- int total_elements = space->machine().gfx[0]->total_elements;
+ int total_elements = machine().gfx[0]->total_elements;
- flip_screen_set(space->machine(), ~data & 0x80);
+ flip_screen_set(machine(), ~data & 0x80);
- state->m_bg_tilemap->set_palette_offset((data & 0x07) << 4);
- state->m_tx_tilemap->set_palette_offset((data & 0x07) << 4);
+ m_bg_tilemap->set_palette_offset((data & 0x07) << 4);
+ m_tx_tilemap->set_palette_offset((data & 0x07) << 4);
bank = 0;
if (total_elements == 0x400) // mainsnk
@@ -100,27 +99,25 @@ WRITE8_HANDLER(mainsnk_c600_w)
else if (total_elements == 0x800) // canvas
bank = ((data & 0x40) >> 6) | ((data & 0x30) >> 3);
- if (state->m_bg_tile_offset != (bank << 8))
+ if (m_bg_tile_offset != (bank << 8))
{
- state->m_bg_tile_offset = bank << 8;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_tile_offset = bank << 8;
+ m_bg_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( mainsnk_fgram_w )
+WRITE8_MEMBER(mainsnk_state::mainsnk_fgram_w)
{
- mainsnk_state *state = space->machine().driver_data<mainsnk_state>();
- state->m_fgram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ m_fgram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( mainsnk_bgram_w )
+WRITE8_MEMBER(mainsnk_state::mainsnk_bgram_w)
{
- mainsnk_state *state = space->machine().driver_data<mainsnk_state>();
- state->m_bgram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bgram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/malzak.c b/src/mame/video/malzak.c
index 22bc234411f..003f6bf8821 100644
--- a/src/mame/video/malzak.c
+++ b/src/mame/video/malzak.c
@@ -81,13 +81,12 @@ SCREEN_UPDATE_IND16( malzak )
return 0;
}
-WRITE8_HANDLER( malzak_playfield_w )
+WRITE8_MEMBER(malzak_state::malzak_playfield_w)
{
- malzak_state *state = space->machine().driver_data<malzak_state>();
- int tile = ((state->m_malzak_x / 16) * 16) + (offset / 16);
+ int tile = ((m_malzak_x / 16) * 16) + (offset / 16);
-// state->m_playfield_x[tile] = state->m_malzak_x / 16;
-// state->m_playfield_y[tile] = state->m_malzak_y;
- state->m_playfield_code[tile] = (data & 0x1f);
+// m_playfield_x[tile] = m_malzak_x / 16;
+// m_playfield_y[tile] = m_malzak_y;
+ m_playfield_code[tile] = (data & 0x1f);
logerror("GFX: 0x16%02x write 0x%02x\n", offset, data);
}
diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c
index c99b79bc643..e9dee72f2f1 100644
--- a/src/mame/video/mappy.c
+++ b/src/mame/video/mappy.c
@@ -357,38 +357,35 @@ VIDEO_START( mappy )
***************************************************************************/
-WRITE8_HANDLER( superpac_videoram_w )
+WRITE8_MEMBER(mappy_state::superpac_videoram_w)
{
- mappy_state *state = space->machine().driver_data<mappy_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( mappy_videoram_w )
+WRITE8_MEMBER(mappy_state::mappy_videoram_w)
{
- mappy_state *state = space->machine().driver_data<mappy_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-WRITE8_HANDLER( superpac_flipscreen_w )
+WRITE8_MEMBER(mappy_state::superpac_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 1);
+ flip_screen_set(machine(), data & 1);
}
-READ8_HANDLER( superpac_flipscreen_r )
+READ8_MEMBER(mappy_state::superpac_flipscreen_r)
{
- flip_screen_set(space->machine(), 1);
+ flip_screen_set(machine(), 1);
return 0xff;
}
-WRITE8_HANDLER( mappy_scroll_w )
+WRITE8_MEMBER(mappy_state::mappy_scroll_w)
{
- mappy_state *state = space->machine().driver_data<mappy_state>();
- state->m_scroll = offset >> 3;
+ m_scroll = offset >> 3;
}
diff --git a/src/mame/video/marineb.c b/src/mame/video/marineb.c
index 2a244222997..000ed0822ef 100644
--- a/src/mame/video/marineb.c
+++ b/src/mame/video/marineb.c
@@ -86,74 +86,67 @@ VIDEO_START( marineb )
*
*************************************/
-WRITE8_HANDLER( marineb_videoram_w )
+WRITE8_MEMBER(marineb_state::marineb_videoram_w)
{
- marineb_state *state = space->machine().driver_data<marineb_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( marineb_colorram_w )
+WRITE8_MEMBER(marineb_state::marineb_colorram_w)
{
- marineb_state *state = space->machine().driver_data<marineb_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( marineb_column_scroll_w )
+WRITE8_MEMBER(marineb_state::marineb_column_scroll_w)
{
- marineb_state *state = space->machine().driver_data<marineb_state>();
- state->m_column_scroll = data;
+ m_column_scroll = data;
}
-WRITE8_HANDLER( marineb_palette_bank_0_w )
+WRITE8_MEMBER(marineb_state::marineb_palette_bank_0_w)
{
- marineb_state *state = space->machine().driver_data<marineb_state>();
- UINT8 old = state->m_palette_bank;
+ UINT8 old = m_palette_bank;
- state->m_palette_bank = (state->m_palette_bank & 0x02) | (data & 0x01);
+ m_palette_bank = (m_palette_bank & 0x02) | (data & 0x01);
- if (old != state->m_palette_bank)
+ if (old != m_palette_bank)
{
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( marineb_palette_bank_1_w )
+WRITE8_MEMBER(marineb_state::marineb_palette_bank_1_w)
{
- marineb_state *state = space->machine().driver_data<marineb_state>();
- UINT8 old = state->m_palette_bank;
+ UINT8 old = m_palette_bank;
- state->m_palette_bank = (state->m_palette_bank & 0x01) | ((data & 0x01) << 1);
+ m_palette_bank = (m_palette_bank & 0x01) | ((data & 0x01) << 1);
- if (old != state->m_palette_bank)
+ if (old != m_palette_bank)
{
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( marineb_flipscreen_x_w )
+WRITE8_MEMBER(marineb_state::marineb_flipscreen_x_w)
{
- marineb_state *state = space->machine().driver_data<marineb_state>();
- state->m_flipscreen_x = data ^ state->m_marineb_active_low_flipscreen;
- state->m_bg_tilemap->set_flip((state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0));
+ m_flipscreen_x = data ^ m_marineb_active_low_flipscreen;
+ m_bg_tilemap->set_flip((m_flipscreen_x ? TILEMAP_FLIPX : 0) | (m_flipscreen_y ? TILEMAP_FLIPY : 0));
}
-WRITE8_HANDLER( marineb_flipscreen_y_w )
+WRITE8_MEMBER(marineb_state::marineb_flipscreen_y_w)
{
- marineb_state *state = space->machine().driver_data<marineb_state>();
- state->m_flipscreen_y = data ^ state->m_marineb_active_low_flipscreen;
- state->m_bg_tilemap->set_flip((state->m_flipscreen_x ? TILEMAP_FLIPX : 0) | (state->m_flipscreen_y ? TILEMAP_FLIPY : 0));
+ m_flipscreen_y = data ^ m_marineb_active_low_flipscreen;
+ m_bg_tilemap->set_flip((m_flipscreen_x ? TILEMAP_FLIPX : 0) | (m_flipscreen_y ? TILEMAP_FLIPY : 0));
}
diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c
index ea5d08de34c..ac2387405a1 100644
--- a/src/mame/video/mario.c
+++ b/src/mame/video/mario.c
@@ -77,55 +77,50 @@ PALETTE_INIT( mario )
palette_normalize_range(machine.palette, 256, 511, 0, 255);
}
-WRITE8_HANDLER( mario_videoram_w )
+WRITE8_MEMBER(mario_state::mario_videoram_w)
{
- mario_state *state = space->machine().driver_data<mario_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( mario_gfxbank_w )
+WRITE8_MEMBER(mario_state::mario_gfxbank_w)
{
- mario_state *state = space->machine().driver_data<mario_state>();
- if (state->m_gfx_bank != (data & 0x01))
+ if (m_gfx_bank != (data & 0x01))
{
- state->m_gfx_bank = data & 0x01;
- space->machine().tilemap().mark_all_dirty();
+ m_gfx_bank = data & 0x01;
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( mario_palettebank_w )
+WRITE8_MEMBER(mario_state::mario_palettebank_w)
{
- mario_state *state = space->machine().driver_data<mario_state>();
- if (state->m_palette_bank != (data & 0x01))
+ if (m_palette_bank != (data & 0x01))
{
- state->m_palette_bank = data & 0x01;
- space->machine().tilemap().mark_all_dirty();
+ m_palette_bank = data & 0x01;
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( mario_scroll_w )
+WRITE8_MEMBER(mario_state::mario_scroll_w)
{
- mario_state *state = space->machine().driver_data<mario_state>();
- state->m_gfx_scroll = data + 17;
+ m_gfx_scroll = data + 17;
}
-WRITE8_HANDLER( mario_flip_w )
+WRITE8_MEMBER(mario_state::mario_flip_w)
{
- mario_state *state = space->machine().driver_data<mario_state>();
- if (state->m_flip != (data & 0x01))
+ if (m_flip != (data & 0x01))
{
- state->m_flip = data & 0x01;
- if (state->m_flip)
- space->machine().tilemap().set_flip_all(TILEMAP_FLIPX | TILEMAP_FLIPY);
+ m_flip = data & 0x01;
+ if (m_flip)
+ machine().tilemap().set_flip_all(TILEMAP_FLIPX | TILEMAP_FLIPY);
else
- space->machine().tilemap().set_flip_all(0);
- space->machine().tilemap().mark_all_dirty();
+ machine().tilemap().set_flip_all(0);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c
index aea541a709b..b8291fd5d74 100644
--- a/src/mame/video/markham.c
+++ b/src/mame/video/markham.c
@@ -39,19 +39,18 @@ PALETTE_INIT( markham )
}
}
-WRITE8_HANDLER( markham_videoram_w )
+WRITE8_MEMBER(markham_state::markham_videoram_w)
{
- markham_state *state = space->machine().driver_data<markham_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( markham_flipscreen_w )
+WRITE8_MEMBER(markham_state::markham_flipscreen_w)
{
- if (flip_screen_get(space->machine()) != (data & 0x01))
+ if (flip_screen_get(machine()) != (data & 0x01))
{
- flip_screen_set(space->machine(), data & 0x01);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x01);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/matmania.c b/src/mame/video/matmania.c
index 9a84e44bcfb..0e4f5046739 100644
--- a/src/mame/video/matmania.c
+++ b/src/mame/video/matmania.c
@@ -72,38 +72,37 @@ PALETTE_INIT( matmania )
-WRITE8_HANDLER( matmania_paletteram_w )
+WRITE8_MEMBER(matmania_state::matmania_paletteram_w)
{
- matmania_state *state = space->machine().driver_data<matmania_state>();
int bit0, bit1, bit2, bit3, val;
int r, g, b;
int offs2;
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
offs2 = offset & 0x0f;
- val = state->m_paletteram[offs2];
+ val = m_paletteram[offs2];
bit0 = BIT(val, 0);
bit1 = BIT(val, 1);
bit2 = BIT(val, 2);
bit3 = BIT(val, 3);
r = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
- val = state->m_paletteram[offs2 | 0x10];
+ val = m_paletteram[offs2 | 0x10];
bit0 = BIT(val, 0);
bit1 = BIT(val, 1);
bit2 = BIT(val, 2);
bit3 = BIT(val, 3);
g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
- val = state->m_paletteram[offs2 | 0x20];
+ val = m_paletteram[offs2 | 0x20];
bit0 = BIT(val, 0);
bit1 = BIT(val, 1);
bit2 = BIT(val, 2);
bit3 = BIT(val, 3);
b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
- palette_set_color(space->machine(),offs2 + 64,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),offs2 + 64,MAKE_RGB(r,g,b));
}
diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c
index e0b0b2642ca..0a7ca749bf5 100644
--- a/src/mame/video/mcatadv.c
+++ b/src/mame/video/mcatadv.c
@@ -24,12 +24,11 @@ static TILE_GET_INFO( get_mcatadv_tile_info1 )
tileinfo.category = pri;
}
-WRITE16_HANDLER( mcatadv_videoram1_w )
+WRITE16_MEMBER(mcatadv_state::mcatadv_videoram1_w)
{
- mcatadv_state *state = space->machine().driver_data<mcatadv_state>();
- COMBINE_DATA(&state->m_videoram1[offset]);
- state->m_tilemap1->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_videoram1[offset]);
+ m_tilemap1->mark_tile_dirty(offset / 2);
}
static TILE_GET_INFO( get_mcatadv_tile_info2 )
@@ -43,12 +42,11 @@ static TILE_GET_INFO( get_mcatadv_tile_info2 )
tileinfo.category = pri;
}
-WRITE16_HANDLER( mcatadv_videoram2_w )
+WRITE16_MEMBER(mcatadv_state::mcatadv_videoram2_w)
{
- mcatadv_state *state = space->machine().driver_data<mcatadv_state>();
- COMBINE_DATA(&state->m_videoram2[offset]);
- state->m_tilemap2->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_videoram2[offset]);
+ m_tilemap2->mark_tile_dirty(offset / 2);
}
diff --git a/src/mame/video/mcr.c b/src/mame/video/mcr.c
index 3e89e1adf6e..cdb2d38d8c6 100644
--- a/src/mame/video/mcr.c
+++ b/src/mame/video/mcr.c
@@ -168,12 +168,11 @@ static void journey_set_color(running_machine &machine, int index, int data)
}
-WRITE8_HANDLER( mcr_91490_paletteram_w )
+WRITE8_MEMBER(mcr_state::mcr_91490_paletteram_w)
{
- mcr_state *state = space->machine().driver_data<mcr_state>();
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
offset &= 0x7f;
- mcr_set_color(space->machine(), (offset / 2) & 0x3f, data | ((offset & 1) << 8));
+ mcr_set_color(machine(), (offset / 2) & 0x3f, data | ((offset & 1) << 8));
}
@@ -184,19 +183,17 @@ WRITE8_HANDLER( mcr_91490_paletteram_w )
*
*************************************/
-WRITE8_HANDLER( mcr_90009_videoram_w )
+WRITE8_MEMBER(mcr_state::mcr_90009_videoram_w)
{
- mcr_state *state = space->machine().driver_data<mcr_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( mcr_90010_videoram_w )
+WRITE8_MEMBER(mcr_state::mcr_90010_videoram_w)
{
- mcr_state *state = space->machine().driver_data<mcr_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
bg_tilemap->mark_tile_dirty(offset / 2);
@@ -204,26 +201,24 @@ WRITE8_HANDLER( mcr_90010_videoram_w )
if ((offset & 0x780) == 0x780)
{
if (mcr_cpu_board != 91475)
- mcr_set_color(space->machine(), (offset / 2) & 0x3f, data | ((offset & 1) << 8));
+ mcr_set_color(machine(), (offset / 2) & 0x3f, data | ((offset & 1) << 8));
else
- journey_set_color(space->machine(), (offset / 2) & 0x3f, data | ((offset & 1) << 8));
+ journey_set_color(machine(), (offset / 2) & 0x3f, data | ((offset & 1) << 8));
}
}
-READ8_HANDLER( twotiger_videoram_r )
+READ8_MEMBER(mcr_state::twotiger_videoram_r)
{
- mcr_state *state = space->machine().driver_data<mcr_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
/* Two Tigers swizzles the address bits on videoram */
int effoffs = ((offset << 1) & 0x7fe) | ((offset >> 10) & 1);
return videoram[effoffs];
}
-WRITE8_HANDLER( twotiger_videoram_w )
+WRITE8_MEMBER(mcr_state::twotiger_videoram_w)
{
- mcr_state *state = space->machine().driver_data<mcr_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
/* Two Tigers swizzles the address bits on videoram */
int effoffs = ((offset << 1) & 0x7fe) | ((offset >> 10) & 1);
@@ -232,14 +227,13 @@ WRITE8_HANDLER( twotiger_videoram_w )
/* palette RAM is mapped into the upper 0x80 bytes here */
if ((effoffs & 0x780) == 0x780)
- mcr_set_color(space->machine(), ((offset & 0x400) >> 5) | ((offset >> 1) & 0x1f), data | ((offset & 1) << 8));
+ mcr_set_color(machine(), ((offset & 0x400) >> 5) | ((offset >> 1) & 0x1f), data | ((offset & 1) << 8));
}
-WRITE8_HANDLER( mcr_91490_videoram_w )
+WRITE8_MEMBER(mcr_state::mcr_91490_videoram_w)
{
- mcr_state *state = space->machine().driver_data<mcr_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
bg_tilemap->mark_tile_dirty(offset / 2);
}
diff --git a/src/mame/video/mcr3.c b/src/mame/video/mcr3.c
index b37557e3740..895b9b26861 100644
--- a/src/mame/video/mcr3.c
+++ b/src/mame/video/mcr3.c
@@ -131,14 +131,13 @@ VIDEO_START( spyhunt )
*
*************************************/
-WRITE8_HANDLER( mcr3_paletteram_w )
+WRITE8_MEMBER(mcr3_state::mcr3_paletteram_w)
{
- mcr3_state *state = space->machine().driver_data<mcr3_state>();
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
offset &= 0x7f;
/* high bit of red comes from low bit of address */
- palette_set_color_rgb(space->machine(), offset / 2, pal3bit(((offset & 1) << 2) + (data >> 6)), pal3bit(data >> 0), pal3bit(data >> 3));
+ palette_set_color_rgb(machine(), offset / 2, pal3bit(((offset & 1) << 2) + (data >> 6)), pal3bit(data >> 0), pal3bit(data >> 3));
}
@@ -149,51 +148,47 @@ WRITE8_HANDLER( mcr3_paletteram_w )
*
*************************************/
-WRITE8_HANDLER( mcr3_videoram_w )
+WRITE8_MEMBER(mcr3_state::mcr3_videoram_w)
{
- mcr3_state *state = space->machine().driver_data<mcr3_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( spyhunt_videoram_w )
+WRITE8_MEMBER(mcr3_state::spyhunt_videoram_w)
{
- mcr3_state *state = space->machine().driver_data<mcr3_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( spyhunt_alpharam_w )
+WRITE8_MEMBER(mcr3_state::spyhunt_alpharam_w)
{
- mcr3_state *state = space->machine().driver_data<mcr3_state>();
- state->m_spyhunt_alpharam[offset] = data;
- state->m_alpha_tilemap->mark_tile_dirty(offset);
+ m_spyhunt_alpharam[offset] = data;
+ m_alpha_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( spyhunt_scroll_value_w )
+WRITE8_MEMBER(mcr3_state::spyhunt_scroll_value_w)
{
- mcr3_state *state = space->machine().driver_data<mcr3_state>();
switch (offset)
{
case 0:
/* low 8 bits of horizontal scroll */
- state->m_spyhunt_scrollx = (state->m_spyhunt_scrollx & ~0xff) | data;
+ m_spyhunt_scrollx = (m_spyhunt_scrollx & ~0xff) | data;
break;
case 1:
/* upper 3 bits of horizontal scroll and upper 1 bit of vertical scroll */
- state->m_spyhunt_scrollx = (state->m_spyhunt_scrollx & 0xff) | ((data & 0x07) << 8);
- state->m_spyhunt_scrolly = (state->m_spyhunt_scrolly & 0xff) | ((data & 0x80) << 1);
+ m_spyhunt_scrollx = (m_spyhunt_scrollx & 0xff) | ((data & 0x07) << 8);
+ m_spyhunt_scrolly = (m_spyhunt_scrolly & 0xff) | ((data & 0x80) << 1);
break;
case 2:
/* low 8 bits of vertical scroll */
- state->m_spyhunt_scrolly = (state->m_spyhunt_scrolly & ~0xff) | data;
+ m_spyhunt_scrolly = (m_spyhunt_scrolly & ~0xff) | data;
break;
}
}
diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c
index 5cd6a410fe5..f9691209a8f 100644
--- a/src/mame/video/mcr68.c
+++ b/src/mame/video/mcr68.c
@@ -149,25 +149,23 @@ VIDEO_START( zwackery )
*
*************************************/
-WRITE16_HANDLER( mcr68_paletteram_w )
+WRITE16_MEMBER(mcr68_state::mcr68_paletteram_w)
{
int newword;
- mcr68_state *state = space->machine().driver_data<mcr68_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- newword = state->m_generic_paletteram_16[offset];
- palette_set_color_rgb(space->machine(), offset, pal3bit(newword >> 6), pal3bit(newword >> 0), pal3bit(newword >> 3));
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ newword = m_generic_paletteram_16[offset];
+ palette_set_color_rgb(machine(), offset, pal3bit(newword >> 6), pal3bit(newword >> 0), pal3bit(newword >> 3));
}
-WRITE16_HANDLER( zwackery_paletteram_w )
+WRITE16_MEMBER(mcr68_state::zwackery_paletteram_w)
{
int newword;
- mcr68_state *state = space->machine().driver_data<mcr68_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- newword = state->m_generic_paletteram_16[offset];
- palette_set_color_rgb(space->machine(), offset, pal5bit(~newword >> 10), pal5bit(~newword >> 0), pal5bit(~newword >> 5));
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ newword = m_generic_paletteram_16[offset];
+ palette_set_color_rgb(machine(), offset, pal5bit(~newword >> 10), pal5bit(~newword >> 0), pal5bit(~newword >> 5));
}
@@ -178,32 +176,29 @@ WRITE16_HANDLER( zwackery_paletteram_w )
*
*************************************/
-WRITE16_HANDLER( mcr68_videoram_w )
+WRITE16_MEMBER(mcr68_state::mcr68_videoram_w)
{
- mcr68_state *state = space->machine().driver_data<mcr68_state>();
- UINT16 *videoram = state->m_videoram;
+ UINT16 *videoram = m_videoram;
COMBINE_DATA(&videoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( zwackery_videoram_w )
+WRITE16_MEMBER(mcr68_state::zwackery_videoram_w)
{
- mcr68_state *state = space->machine().driver_data<mcr68_state>();
- UINT16 *videoram = state->m_videoram;
+ UINT16 *videoram = m_videoram;
COMBINE_DATA(&videoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( zwackery_spriteram_w )
+WRITE16_MEMBER(mcr68_state::zwackery_spriteram_w)
{
- mcr68_state *state = space->machine().driver_data<mcr68_state>();
/* yech -- Zwackery relies on the upper 8 bits of a spriteram read being $ff! */
/* to make this happen we always write $ff in the upper 8 bits */
- COMBINE_DATA(&state->m_spriteram[offset]);
- state->m_spriteram[offset] |= 0xff00;
+ COMBINE_DATA(&m_spriteram[offset]);
+ m_spriteram[offset] |= 0xff00;
}
diff --git a/src/mame/video/meadows.c b/src/mame/video/meadows.c
index abcfd2e5e08..7c7d497dc9c 100644
--- a/src/mame/video/meadows.c
+++ b/src/mame/video/meadows.c
@@ -47,12 +47,11 @@ VIDEO_START( meadows )
*
*************************************/
-WRITE8_HANDLER( meadows_videoram_w )
+WRITE8_MEMBER(meadows_state::meadows_videoram_w)
{
- meadows_state *state = space->machine().driver_data<meadows_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
@@ -63,11 +62,10 @@ WRITE8_HANDLER( meadows_videoram_w )
*
*************************************/
-WRITE8_HANDLER( meadows_spriteram_w )
+WRITE8_MEMBER(meadows_state::meadows_spriteram_w)
{
- meadows_state *state = space->machine().driver_data<meadows_state>();
- space->machine().primary_screen->update_now();
- state->m_spriteram[offset] = data;
+ machine().primary_screen->update_now();
+ m_spriteram[offset] = data;
}
diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c
index e99f6dfbe25..56544049322 100644
--- a/src/mame/video/megasys1.c
+++ b/src/mame/video/megasys1.c
@@ -202,7 +202,7 @@ static void create_tilemaps(running_machine &machine);
#define SHOW_WRITE_ERROR(_format_,_offset_,_data_)\
{ \
popmessage(_format_,_offset_,_data_);\
- logerror("CPU #0 PC %06X : Warning, ",cpu_get_pc(&space->device())); \
+ logerror("CPU #0 PC %06X : Warning, ",cpu_get_pc(&space.device())); \
logerror(_format_,_offset_,_data_);\
logerror("\n");\
}
@@ -211,7 +211,7 @@ static void create_tilemaps(running_machine &machine);
#define SHOW_WRITE_ERROR(_format_,_offset_,_data_)\
{\
- logerror("CPU #0 PC %06X : Warning, ",cpu_get_pc(&space->device())); \
+ logerror("CPU #0 PC %06X : Warning, ",cpu_get_pc(&space.device())); \
logerror(_format_,_offset_,_data_); \
logerror("\n");\
}
@@ -311,9 +311,9 @@ INLINE void scrollram_w(address_space *space, offs_t offset, UINT16 data, UINT16
}
}
-WRITE16_HANDLER( megasys1_scrollram_0_w ) { scrollram_w(space, offset, data, mem_mask, 0); }
-WRITE16_HANDLER( megasys1_scrollram_1_w ) { scrollram_w(space, offset, data, mem_mask, 1); }
-WRITE16_HANDLER( megasys1_scrollram_2_w ) { scrollram_w(space, offset, data, mem_mask, 2); }
+WRITE16_MEMBER(megasys1_state::megasys1_scrollram_0_w){ scrollram_w(&space, offset, data, mem_mask, 0); }
+WRITE16_MEMBER(megasys1_state::megasys1_scrollram_1_w){ scrollram_w(&space, offset, data, mem_mask, 1); }
+WRITE16_MEMBER(megasys1_state::megasys1_scrollram_2_w){ scrollram_w(&space, offset, data, mem_mask, 2); }
@@ -401,54 +401,53 @@ static void create_tilemaps(running_machine &machine)
}
}
-static void megasys1_set_vreg_flag(megasys1_state *state, int which, int data)
+void megasys1_state::megasys1_set_vreg_flag(int which, int data)
{
- if (state->m_scroll_flag[which] != data)
+ if (m_scroll_flag[which] != data)
{
- state->m_scroll_flag[which] = data;
- state->m_tmap[which] = state->m_tilemap[which][(data >> 4) & 1][data & 3];
- state->m_tmap[which]->mark_all_dirty();
+ m_scroll_flag[which] = data;
+ m_tmap[which] = m_tilemap[which][(data >> 4) & 1][data & 3];
+ m_tmap[which]->mark_all_dirty();
}
}
/* Used by MS1-A/Z, B */
-WRITE16_HANDLER( megasys1_vregs_A_w )
+WRITE16_MEMBER(megasys1_state::megasys1_vregs_A_w)
{
- megasys1_state *state = space->machine().driver_data<megasys1_state>();
- UINT16 new_data = COMBINE_DATA(&state->m_vregs[offset]);
+ UINT16 new_data = COMBINE_DATA(&m_vregs[offset]);
switch (offset)
{
- case 0x000/2 : state->m_active_layers = new_data; break;
+ case 0x000/2 : m_active_layers = new_data; break;
- case 0x008/2+0 : state->m_scrollx[2] = new_data; break;
- case 0x008/2+1 : state->m_scrolly[2] = new_data; break;
- case 0x008/2+2 : megasys1_set_vreg_flag(state, 2, new_data); break;
+ case 0x008/2+0 : m_scrollx[2] = new_data; break;
+ case 0x008/2+1 : m_scrolly[2] = new_data; break;
+ case 0x008/2+2 : megasys1_set_vreg_flag(2, new_data); break;
- case 0x200/2+0 : state->m_scrollx[0] = new_data; break;
- case 0x200/2+1 : state->m_scrolly[0] = new_data; break;
- case 0x200/2+2 : megasys1_set_vreg_flag(state, 0, new_data); break;
+ case 0x200/2+0 : m_scrollx[0] = new_data; break;
+ case 0x200/2+1 : m_scrolly[0] = new_data; break;
+ case 0x200/2+2 : megasys1_set_vreg_flag(0, new_data); break;
- case 0x208/2+0 : state->m_scrollx[1] = new_data; break;
- case 0x208/2+1 : state->m_scrolly[1] = new_data; break;
- case 0x208/2+2 : megasys1_set_vreg_flag(state, 1, new_data); break;
+ case 0x208/2+0 : m_scrollx[1] = new_data; break;
+ case 0x208/2+1 : m_scrolly[1] = new_data; break;
+ case 0x208/2+2 : megasys1_set_vreg_flag(1, new_data); break;
- case 0x100/2 : state->m_sprite_flag = new_data; break;
+ case 0x100/2 : m_sprite_flag = new_data; break;
- case 0x300/2 : state->m_screen_flag = new_data;
- if (space->machine().device("soundcpu"))
+ case 0x300/2 : m_screen_flag = new_data;
+ if (machine().device("soundcpu"))
{
if (new_data & 0x10)
- cputag_set_input_line(space->machine(), "soundcpu", INPUT_LINE_RESET, ASSERT_LINE);
+ cputag_set_input_line(machine(), "soundcpu", INPUT_LINE_RESET, ASSERT_LINE);
else
- cputag_set_input_line(space->machine(), "soundcpu", INPUT_LINE_RESET, CLEAR_LINE);
+ cputag_set_input_line(machine(), "soundcpu", INPUT_LINE_RESET, CLEAR_LINE);
}
break;
- case 0x308/2 : state->soundlatch_word_w(*space,0,new_data,0xffff);
- cputag_set_input_line(space->machine(), "soundcpu", 4, HOLD_LINE);
+ case 0x308/2 : soundlatch_word_w(space,0,new_data,0xffff);
+ cputag_set_input_line(machine(), "soundcpu", 4, HOLD_LINE);
break;
default : SHOW_WRITE_ERROR("vreg %04X <- %04X",offset*2,data);
@@ -460,49 +459,47 @@ WRITE16_HANDLER( megasys1_vregs_A_w )
/* Used by MS1-C only */
-READ16_HANDLER( megasys1_vregs_C_r )
+READ16_MEMBER(megasys1_state::megasys1_vregs_C_r)
{
- megasys1_state *state = space->machine().driver_data<megasys1_state>();
switch (offset)
{
- case 0x8000/2: return state->soundlatch2_word_r(*space,0,0xffff);
- default: return state->m_vregs[offset];
+ case 0x8000/2: return soundlatch2_word_r(space,0,0xffff);
+ default: return m_vregs[offset];
}
}
-WRITE16_HANDLER( megasys1_vregs_C_w )
+WRITE16_MEMBER(megasys1_state::megasys1_vregs_C_w)
{
- megasys1_state *state = space->machine().driver_data<megasys1_state>();
- UINT16 new_data = COMBINE_DATA(&state->m_vregs[offset]);
+ UINT16 new_data = COMBINE_DATA(&m_vregs[offset]);
switch (offset)
{
- case 0x2000/2+0 : state->m_scrollx[0] = new_data; break;
- case 0x2000/2+1 : state->m_scrolly[0] = new_data; break;
- case 0x2000/2+2 : megasys1_set_vreg_flag(state, 0, new_data); break;
+ case 0x2000/2+0 : m_scrollx[0] = new_data; break;
+ case 0x2000/2+1 : m_scrolly[0] = new_data; break;
+ case 0x2000/2+2 : megasys1_set_vreg_flag(0, new_data); break;
- case 0x2008/2+0 : state->m_scrollx[1] = new_data; break;
- case 0x2008/2+1 : state->m_scrolly[1] = new_data; break;
- case 0x2008/2+2 : megasys1_set_vreg_flag(state, 1, new_data); break;
+ case 0x2008/2+0 : m_scrollx[1] = new_data; break;
+ case 0x2008/2+1 : m_scrolly[1] = new_data; break;
+ case 0x2008/2+2 : megasys1_set_vreg_flag(1, new_data); break;
- case 0x2100/2+0 : state->m_scrollx[2] = new_data; break;
- case 0x2100/2+1 : state->m_scrolly[2] = new_data; break;
- case 0x2100/2+2 : megasys1_set_vreg_flag(state, 2, new_data); break;
+ case 0x2100/2+0 : m_scrollx[2] = new_data; break;
+ case 0x2100/2+1 : m_scrolly[2] = new_data; break;
+ case 0x2100/2+2 : megasys1_set_vreg_flag(2, new_data); break;
- case 0x2108/2 : state->m_sprite_bank = new_data; break;
- case 0x2200/2 : state->m_sprite_flag = new_data; break;
- case 0x2208/2 : state->m_active_layers = new_data; break;
+ case 0x2108/2 : m_sprite_bank = new_data; break;
+ case 0x2200/2 : m_sprite_flag = new_data; break;
+ case 0x2208/2 : m_active_layers = new_data; break;
- case 0x2308/2 : state->m_screen_flag = new_data;
+ case 0x2308/2 : m_screen_flag = new_data;
if (new_data & 0x10)
- cputag_set_input_line(space->machine(), "soundcpu", INPUT_LINE_RESET, ASSERT_LINE);
+ cputag_set_input_line(machine(), "soundcpu", INPUT_LINE_RESET, ASSERT_LINE);
else
- cputag_set_input_line(space->machine(), "soundcpu", INPUT_LINE_RESET, CLEAR_LINE);
+ cputag_set_input_line(machine(), "soundcpu", INPUT_LINE_RESET, CLEAR_LINE);
break;
case 0x8000/2 : /* Cybattler reads sound latch on irq 2 */
- state->soundlatch_word_w(*space, 0, new_data, 0xffff);
- cputag_set_input_line(space->machine(), "soundcpu", 2, HOLD_LINE);
+ soundlatch_word_w(space, 0, new_data, 0xffff);
+ cputag_set_input_line(machine(), "soundcpu", 2, HOLD_LINE);
break;
default: SHOW_WRITE_ERROR("vreg %04X <- %04X", offset * 2, data);
@@ -512,29 +509,28 @@ WRITE16_HANDLER( megasys1_vregs_C_w )
/* Used by MS1-D only */
-WRITE16_HANDLER( megasys1_vregs_D_w )
+WRITE16_MEMBER(megasys1_state::megasys1_vregs_D_w)
{
- megasys1_state *state = space->machine().driver_data<megasys1_state>();
- UINT16 new_data = COMBINE_DATA(&state->m_vregs[offset]);
+ UINT16 new_data = COMBINE_DATA(&m_vregs[offset]);
switch (offset)
{
- case 0x2000/2+0 : state->m_scrollx[0] = new_data; break;
- case 0x2000/2+1 : state->m_scrolly[0] = new_data; break;
- case 0x2000/2+2 : megasys1_set_vreg_flag(state, 0, new_data); break;
-
- case 0x2008/2+0 : state->m_scrollx[1] = new_data; break;
- case 0x2008/2+1 : state->m_scrolly[1] = new_data; break;
- case 0x2008/2+2 : megasys1_set_vreg_flag(state, 1, new_data); break;
-
-// case 0x2100/2+0 : state->m_scrollx[2] = new_data; break;
-// case 0x2100/2+1 : state->m_scrolly[2] = new_data; break;
-// case 0x2100/2+2 : megasys1_set_vreg_flag(state, 2, new_data); break;
-
- case 0x2108/2 : state->m_sprite_bank = new_data; break;
- case 0x2200/2 : state->m_sprite_flag = new_data; break;
- case 0x2208/2 : state->m_active_layers = new_data; break;
- case 0x2308/2 : state->m_screen_flag = new_data; break;
+ case 0x2000/2+0 : m_scrollx[0] = new_data; break;
+ case 0x2000/2+1 : m_scrolly[0] = new_data; break;
+ case 0x2000/2+2 : megasys1_set_vreg_flag(0, new_data); break;
+
+ case 0x2008/2+0 : m_scrollx[1] = new_data; break;
+ case 0x2008/2+1 : m_scrolly[1] = new_data; break;
+ case 0x2008/2+2 : megasys1_set_vreg_flag(1, new_data); break;
+
+// case 0x2100/2+0 : m_scrollx[2] = new_data; break;
+// case 0x2100/2+1 : m_scrolly[2] = new_data; break;
+// case 0x2100/2+2 : megasys1_set_vreg_flag(2, new_data); break;
+
+ case 0x2108/2 : m_sprite_bank = new_data; break;
+ case 0x2200/2 : m_sprite_flag = new_data; break;
+ case 0x2208/2 : m_active_layers = new_data; break;
+ case 0x2308/2 : m_screen_flag = new_data; break;
default: SHOW_WRITE_ERROR("vreg %04X <- %04X",offset*2,data);
}
diff --git a/src/mame/video/megazone.c b/src/mame/video/megazone.c
index d07f7495798..3c0cce4dba5 100644
--- a/src/mame/video/megazone.c
+++ b/src/mame/video/megazone.c
@@ -96,10 +96,9 @@ PALETTE_INIT( megazone )
}
}
-WRITE8_HANDLER( megazone_flipscreen_w )
+WRITE8_MEMBER(megazone_state::megazone_flipscreen_w)
{
- megazone_state *state = space->machine().driver_data<megazone_state>();
- state->m_flipscreen = data & 1;
+ m_flipscreen = data & 1;
}
VIDEO_START( megazone )
diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c
index d1f7f4f18ea..8879aed9ce5 100644
--- a/src/mame/video/mermaid.c
+++ b/src/mame/video/mermaid.c
@@ -63,64 +63,57 @@ PALETTE_INIT( rougien )
}
-WRITE8_HANDLER( mermaid_videoram2_w )
+WRITE8_MEMBER(mermaid_state::mermaid_videoram2_w)
{
- mermaid_state *state = space->machine().driver_data<mermaid_state>();
- state->m_videoram2[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( mermaid_videoram_w )
+WRITE8_MEMBER(mermaid_state::mermaid_videoram_w)
{
- mermaid_state *state = space->machine().driver_data<mermaid_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( mermaid_colorram_w )
+WRITE8_MEMBER(mermaid_state::mermaid_colorram_w)
{
- mermaid_state *state = space->machine().driver_data<mermaid_state>();
- state->m_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( mermaid_flip_screen_x_w )
+WRITE8_MEMBER(mermaid_state::mermaid_flip_screen_x_w)
{
- flip_screen_x_set(space->machine(), data & 0x01);
+ flip_screen_x_set(machine(), data & 0x01);
}
-WRITE8_HANDLER( mermaid_flip_screen_y_w )
+WRITE8_MEMBER(mermaid_state::mermaid_flip_screen_y_w)
{
- flip_screen_y_set(space->machine(), data & 0x01);
+ flip_screen_y_set(machine(), data & 0x01);
}
-WRITE8_HANDLER( mermaid_bg_scroll_w )
+WRITE8_MEMBER(mermaid_state::mermaid_bg_scroll_w)
{
- mermaid_state *state = space->machine().driver_data<mermaid_state>();
- state->m_bg_scrollram[offset] = data;
- state->m_bg_tilemap->set_scrolly(offset, data);
+ m_bg_scrollram[offset] = data;
+ m_bg_tilemap->set_scrolly(offset, data);
}
-WRITE8_HANDLER( mermaid_fg_scroll_w )
+WRITE8_MEMBER(mermaid_state::mermaid_fg_scroll_w)
{
- mermaid_state *state = space->machine().driver_data<mermaid_state>();
- state->m_fg_scrollram[offset] = data;
- state->m_fg_tilemap->set_scrolly(offset, data);
+ m_fg_scrollram[offset] = data;
+ m_fg_tilemap->set_scrolly(offset, data);
}
-WRITE8_HANDLER( rougien_gfxbankswitch1_w )
+WRITE8_MEMBER(mermaid_state::rougien_gfxbankswitch1_w)
{
- mermaid_state *state = space->machine().driver_data<mermaid_state>();
- state->m_rougien_gfxbank1 = data & 0x01;
+ m_rougien_gfxbank1 = data & 0x01;
}
-WRITE8_HANDLER( rougien_gfxbankswitch2_w )
+WRITE8_MEMBER(mermaid_state::rougien_gfxbankswitch2_w)
{
- mermaid_state *state = space->machine().driver_data<mermaid_state>();
- state->m_rougien_gfxbank2 = data & 0x01;
+ m_rougien_gfxbank2 = data & 0x01;
}
-READ8_HANDLER( mermaid_collision_r )
+READ8_MEMBER(mermaid_state::mermaid_collision_r)
{
/*
collision register active LOW:
@@ -137,14 +130,13 @@ READ8_HANDLER( mermaid_collision_r )
Bit 7
*/
- mermaid_state *state = space->machine().driver_data<mermaid_state>();
int collision = 0xff;
- if (state->m_coll_bit0) collision ^= 0x01;
- if (state->m_coll_bit1) collision ^= 0x02;
- if (state->m_coll_bit2) collision ^= 0x04;
- if (state->m_coll_bit3) collision ^= 0x08;
- if (state->m_coll_bit6) collision ^= 0x40;
+ if (m_coll_bit0) collision ^= 0x01;
+ if (m_coll_bit1) collision ^= 0x02;
+ if (m_coll_bit2) collision ^= 0x04;
+ if (m_coll_bit3) collision ^= 0x08;
+ if (m_coll_bit6) collision ^= 0x40;
return collision;
}
diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c
index c26d79e7d0d..66d3d50aa69 100644
--- a/src/mame/video/metlclsh.c
+++ b/src/mame/video/metlclsh.c
@@ -22,30 +22,28 @@
#include "includes/metlclsh.h"
-WRITE8_HANDLER( metlclsh_rambank_w )
+WRITE8_MEMBER(metlclsh_state::metlclsh_rambank_w)
{
- metlclsh_state *state = space->machine().driver_data<metlclsh_state>();
if (data & 1)
{
- state->m_write_mask = 0;
- memory_set_bankptr(space->machine(), "bank1", state->m_bgram);
+ m_write_mask = 0;
+ memory_set_bankptr(machine(), "bank1", m_bgram);
}
else
{
- state->m_write_mask = 1 << (data >> 1);
- memory_set_bankptr(space->machine(), "bank1", state->m_otherram);
+ m_write_mask = 1 << (data >> 1);
+ memory_set_bankptr(machine(), "bank1", m_otherram);
}
}
-WRITE8_HANDLER( metlclsh_gfxbank_w )
+WRITE8_MEMBER(metlclsh_state::metlclsh_gfxbank_w)
{
- metlclsh_state *state = space->machine().driver_data<metlclsh_state>();
- if (!(data & 4) && (state->m_gfxbank != data))
+ if (!(data & 4) && (m_gfxbank != data))
{
- state->m_bg_tilemap->mark_all_dirty();
- state->m_gfxbank = data & 3;
+ m_bg_tilemap->mark_all_dirty();
+ m_gfxbank = data & 3;
}
}
@@ -77,13 +75,12 @@ static TILE_GET_INFO( get_bg_tile_info )
SET_TILE_INFO(1, state->m_bgram[tile_index] + (state->m_gfxbank << 7), 0, 0);
}
-WRITE8_HANDLER( metlclsh_bgram_w )
+WRITE8_MEMBER(metlclsh_state::metlclsh_bgram_w)
{
- metlclsh_state *state = space->machine().driver_data<metlclsh_state>();
/* This ram is banked: it's either the tilemap (e401 = 1)
or bit n of another area (e401 = n << 1)? (that I don't understand) */
- if (state->m_write_mask)
+ if (m_write_mask)
{
/* unknown area - the following is almost surely wrong */
// 405b (e401 = e c a 8 6 4 2 0) writes d400++
@@ -91,14 +88,14 @@ WRITE8_HANDLER( metlclsh_bgram_w )
// 4085 (e401 = e a 6 2) writes d000++
// 405b (e401 = e a 6 2) writes d000++
-// state->m_otherram[offset] |= (data & state->m_write_mask);
- state->m_otherram[offset] = (state->m_otherram[offset] & ~state->m_write_mask) | (data & state->m_write_mask);
+// m_otherram[offset] |= (data & m_write_mask);
+ m_otherram[offset] = (m_otherram[offset] & ~m_write_mask) | (data & m_write_mask);
}
else
{
/* tilemap */
- state->m_bgram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x1ff);
+ m_bgram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x1ff);
}
}
@@ -124,11 +121,10 @@ static TILE_GET_INFO( get_fg_tile_info )
tileinfo.category = ((attr & 0x80) ? 1 : 2);
}
-WRITE8_HANDLER( metlclsh_fgram_w )
+WRITE8_MEMBER(metlclsh_state::metlclsh_fgram_w)
{
- metlclsh_state *state = space->machine().driver_data<metlclsh_state>();
- state->m_fgram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fgram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c
index a05240ff2cf..3157c2cb089 100644
--- a/src/mame/video/metro.c
+++ b/src/mame/video/metro.c
@@ -79,11 +79,10 @@ static TILE_GET_INFO( metro_k053936_gstrik2_get_tile_info )
0);
}
-WRITE16_HANDLER( metro_k053936_w )
+WRITE16_MEMBER(metro_state::metro_k053936_w)
{
- metro_state *state = space->machine().driver_data<metro_state>();
- COMBINE_DATA(&state->m_k053936_ram[offset]);
- state->m_k053936_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_k053936_ram[offset]);
+ m_k053936_tilemap->mark_tile_dirty(offset);
}
static TILEMAP_MAPPER( tilemap_scan_gstrik2 )
@@ -239,17 +238,16 @@ INLINE void metro_vram_w( running_machine &machine, offs_t offset, UINT16 data,
COMBINE_DATA(&vram[offset]);
}
-WRITE16_HANDLER( metro_vram_0_w ) { metro_state *state = space->machine().driver_data<metro_state>(); metro_vram_w(space->machine(), offset, data, mem_mask, 0, state->m_vram_0); }
-WRITE16_HANDLER( metro_vram_1_w ) { metro_state *state = space->machine().driver_data<metro_state>(); metro_vram_w(space->machine(), offset, data, mem_mask, 1, state->m_vram_1); }
-WRITE16_HANDLER( metro_vram_2_w ) { metro_state *state = space->machine().driver_data<metro_state>(); metro_vram_w(space->machine(), offset, data, mem_mask, 2, state->m_vram_2); }
+WRITE16_MEMBER(metro_state::metro_vram_0_w){ metro_vram_w(machine(), offset, data, mem_mask, 0, m_vram_0); }
+WRITE16_MEMBER(metro_state::metro_vram_1_w){ metro_vram_w(machine(), offset, data, mem_mask, 1, m_vram_1); }
+WRITE16_MEMBER(metro_state::metro_vram_2_w){ metro_vram_w(machine(), offset, data, mem_mask, 2, m_vram_2); }
/* Dirty the relevant tilemap when its window changes */
-WRITE16_HANDLER( metro_window_w )
+WRITE16_MEMBER(metro_state::metro_window_w)
{
- metro_state *state = space->machine().driver_data<metro_state>();
- COMBINE_DATA(&state->m_window[offset]);
+ COMBINE_DATA(&m_window[offset]);
}
diff --git a/src/mame/video/mexico86.c b/src/mame/video/mexico86.c
index 27a0fe51a38..cb3c4dd50ea 100644
--- a/src/mame/video/mexico86.c
+++ b/src/mame/video/mexico86.c
@@ -2,16 +2,15 @@
#include "includes/mexico86.h"
-WRITE8_HANDLER( mexico86_bankswitch_w )
+WRITE8_MEMBER(mexico86_state::mexico86_bankswitch_w)
{
- mexico86_state *state = space->machine().driver_data<mexico86_state>();
if ((data & 7) > 5)
popmessage("Switching to invalid bank!");
- memory_set_bank(space->machine(), "bank1", data & 0x07);
+ memory_set_bank(machine(), "bank1", data & 0x07);
- state->m_charbank = BIT(data, 5);
+ m_charbank = BIT(data, 5);
}
diff --git a/src/mame/video/micro3d.c b/src/mame/video/micro3d.c
index 2f615182dd4..e470490a7ff 100644
--- a/src/mame/video/micro3d.c
+++ b/src/mame/video/micro3d.c
@@ -107,31 +107,28 @@ void micro3d_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int sc
}
}
-WRITE16_HANDLER( micro3d_clut_w )
+WRITE16_MEMBER(micro3d_state::micro3d_clut_w)
{
UINT16 word;
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- word = state->m_generic_paletteram_16[offset];
- palette_set_color_rgb(space->machine(), offset, pal5bit(word >> 6), pal5bit(word >> 1), pal5bit(word >> 11));
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ word = m_generic_paletteram_16[offset];
+ palette_set_color_rgb(machine(), offset, pal5bit(word >> 6), pal5bit(word >> 1), pal5bit(word >> 11));
}
-WRITE16_HANDLER( micro3d_creg_w )
+WRITE16_MEMBER(micro3d_state::micro3d_creg_w)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
if (~data & 0x80)
- cputag_set_input_line(space->machine(), "vgb", 0, CLEAR_LINE);
+ cputag_set_input_line(machine(), "vgb", 0, CLEAR_LINE);
- state->m_creg = data;
+ m_creg = data;
}
-WRITE16_HANDLER( micro3d_xfer3dk_w )
+WRITE16_MEMBER(micro3d_state::micro3d_xfer3dk_w)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
- state->m_xfer3dk = data;
+ m_xfer3dk = data;
}
void micro3d_tms_interrupt(device_t *device, int state)
@@ -647,49 +644,48 @@ bc000000-1fc DPRAM address for read access
******************************************************************************/
-WRITE32_HANDLER( micro3d_fifo_w )
+WRITE32_MEMBER(micro3d_state::micro3d_fifo_w)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
UINT32 opcode = data >> 24;
- switch (state->m_draw_state)
+ switch (m_draw_state)
{
case STATE_DRAW_CMD:
{
- state->m_draw_cmd = data;
+ m_draw_cmd = data;
switch (opcode)
{
case 0xb4:
{
- state->m_x_mid = data & 0x3ff;
- state->m_y_mid = (data >> 10) & 0x3ff;
+ m_x_mid = data & 0x3ff;
+ m_y_mid = (data >> 10) & 0x3ff;
break;
}
case 0xc8:
{
- state->m_dpram_bank ^= 1;
+ m_dpram_bank ^= 1;
break;
}
case 0xbc:
{
- UINT32 dpram_r_addr = (((data & 0x01ff) << 1) | state->m_dpram_bank);
- state->m_pipe_data = state->m_draw_dpram[dpram_r_addr];
- cputag_set_input_line(space->machine(), "drmath", AM29000_INTR1, ASSERT_LINE);
+ UINT32 dpram_r_addr = (((data & 0x01ff) << 1) | m_dpram_bank);
+ m_pipe_data = m_draw_dpram[dpram_r_addr];
+ cputag_set_input_line(machine(), "drmath", AM29000_INTR1, ASSERT_LINE);
break;
}
case 0x80:
{
int addr;
- state->m_fifo_idx = 0;
- state->m_draw_state = STATE_DRAW_VTX_DATA;
+ m_fifo_idx = 0;
+ m_draw_state = STATE_DRAW_VTX_DATA;
/* Invalidate the draw RAM
* TODO: Not sure this is the right place for it -
* causes monitor mode draw tests to fail
*/
for (addr = 0; addr < 512; ++addr)
- state->m_draw_dpram[addr << 1] = 0x3ff000;
+ m_draw_dpram[addr << 1] = 0x3ff000;
break;
}
@@ -701,66 +697,65 @@ WRITE32_HANDLER( micro3d_fifo_w )
case 0xd8:
{
/* TODO: We shouldn't need this extra buffer - is there some sort of sync missing? */
- memcpy(state->m_frame_buffers[state->m_drawing_buffer], state->m_tmp_buffer, 512*1024*2);
- state->m_drawing_buffer ^= 1;
- cputag_set_input_line(space->machine(), "vgb", 0, ASSERT_LINE);
+ memcpy(m_frame_buffers[m_drawing_buffer], m_tmp_buffer, 512*1024*2);
+ m_drawing_buffer ^= 1;
+ cputag_set_input_line(machine(), "vgb", 0, ASSERT_LINE);
break;
}
default:
- state->m_draw_state = STATE_DRAW_CMD_DATA;
+ m_draw_state = STATE_DRAW_CMD_DATA;
}
break;
}
case STATE_DRAW_CMD_DATA:
{
- switch (state->m_draw_cmd >> 24)
+ switch (m_draw_cmd >> 24)
{
- case 0x90: state->m_z_min = VTX_SEX(data); break;
- case 0x94: state->m_z_max = VTX_SEX(data); break;
- case 0x98: state->m_y_max = VTX_SEX(data); break;
- case 0x9c: state->m_x_min = VTX_SEX(data); break;
- case 0xa0: state->m_x_max = VTX_SEX(data); break;
- case 0xa4: state->m_y_min = VTX_SEX(data); break;
+ case 0x90: m_z_min = VTX_SEX(data); break;
+ case 0x94: m_z_max = VTX_SEX(data); break;
+ case 0x98: m_y_max = VTX_SEX(data); break;
+ case 0x9c: m_x_min = VTX_SEX(data); break;
+ case 0xa0: m_x_max = VTX_SEX(data); break;
+ case 0xa4: m_y_min = VTX_SEX(data); break;
case 0xb8:
{
- state->m_draw_dpram[((state->m_draw_cmd & 0x1ff) << 1) | state->m_dpram_bank] = data & 0x00ffffff;
+ m_draw_dpram[((m_draw_cmd & 0x1ff) << 1) | m_dpram_bank] = data & 0x00ffffff;
break;
}
default:
- popmessage("Unknown 3D command: %x %x\n", state->m_draw_cmd, data);
+ popmessage("Unknown 3D command: %x %x\n", m_draw_cmd, data);
}
- state->m_draw_state = STATE_DRAW_CMD;
+ m_draw_state = STATE_DRAW_CMD;
break;
}
case STATE_DRAW_VTX_DATA:
{
if ((opcode == 0x85) || (opcode == 0x8a))
{
+ micro3d_state *state = machine().driver_data<micro3d_state>();
draw_triangles(state, data);
- state->m_draw_state = STATE_DRAW_CMD;
+ m_draw_state = STATE_DRAW_CMD;
}
else
{
- state->m_vtx_fifo[state->m_fifo_idx++] = VTX_SEX(data);
+ m_vtx_fifo[m_fifo_idx++] = VTX_SEX(data);
}
break;
}
}
}
-WRITE32_HANDLER( micro3d_alt_fifo_w )
+WRITE32_MEMBER(micro3d_state::micro3d_alt_fifo_w)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
- state->m_vtx_fifo[state->m_fifo_idx++] = VTX_SEX(data);
+ m_vtx_fifo[m_fifo_idx++] = VTX_SEX(data);
}
-READ32_HANDLER( micro3d_pipe_r )
+READ32_MEMBER(micro3d_state::micro3d_pipe_r)
{
- micro3d_state *state = space->machine().driver_data<micro3d_state>();
- cputag_set_input_line(space->machine(), "drmath", AM29000_INTR1, CLEAR_LINE);
- return state->m_pipe_data;
+ cputag_set_input_line(machine(), "drmath", AM29000_INTR1, CLEAR_LINE);
+ return m_pipe_data;
}
INTERRUPT_GEN( micro3d_vblank )
diff --git a/src/mame/video/midtunit.c b/src/mame/video/midtunit.c
index 260e15e9f23..e4e845b5ac3 100644
--- a/src/mame/video/midtunit.c
+++ b/src/mame/video/midtunit.c
@@ -128,7 +128,7 @@ VIDEO_START( midxunit )
*
*************************************/
-READ16_HANDLER( midtunit_gfxrom_r )
+READ16_MEMBER(midtunit_state::midtunit_gfxrom_r)
{
UINT8 *base = &midtunit_gfx_rom[gfxbank_offset[(offset >> 21) & 1]];
offset = (offset & 0x01fffff) * 2;
@@ -136,7 +136,7 @@ READ16_HANDLER( midtunit_gfxrom_r )
}
-READ16_HANDLER( midwunit_gfxrom_r )
+READ16_MEMBER(midtunit_state::midwunit_gfxrom_r)
{
UINT8 *base = &midtunit_gfx_rom[gfxbank_offset[0]];
offset *= 2;
@@ -151,7 +151,7 @@ READ16_HANDLER( midwunit_gfxrom_r )
*
*************************************/
-WRITE16_HANDLER( midtunit_vram_w )
+WRITE16_MEMBER(midtunit_state::midtunit_vram_w)
{
offset *= 2;
if (videobank_select)
@@ -171,7 +171,7 @@ WRITE16_HANDLER( midtunit_vram_w )
}
-WRITE16_HANDLER( midtunit_vram_data_w )
+WRITE16_MEMBER(midtunit_state::midtunit_vram_data_w)
{
offset *= 2;
if (ACCESSING_BITS_0_7)
@@ -181,7 +181,7 @@ WRITE16_HANDLER( midtunit_vram_data_w )
}
-WRITE16_HANDLER( midtunit_vram_color_w )
+WRITE16_MEMBER(midtunit_state::midtunit_vram_color_w)
{
offset *= 2;
if (ACCESSING_BITS_0_7)
@@ -191,7 +191,7 @@ WRITE16_HANDLER( midtunit_vram_color_w )
}
-READ16_HANDLER( midtunit_vram_r )
+READ16_MEMBER(midtunit_state::midtunit_vram_r)
{
offset *= 2;
if (videobank_select)
@@ -201,14 +201,14 @@ READ16_HANDLER( midtunit_vram_r )
}
-READ16_HANDLER( midtunit_vram_data_r )
+READ16_MEMBER(midtunit_state::midtunit_vram_data_r)
{
offset *= 2;
return (local_videoram[offset] & 0x00ff) | (local_videoram[offset + 1] << 8);
}
-READ16_HANDLER( midtunit_vram_color_r )
+READ16_MEMBER(midtunit_state::midtunit_vram_color_r)
{
offset *= 2;
return (local_videoram[offset] >> 8) | (local_videoram[offset + 1] & 0xff00);
@@ -241,7 +241,7 @@ void midtunit_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftr
*
*************************************/
-WRITE16_HANDLER( midtunit_control_w )
+WRITE16_MEMBER(midtunit_state::midtunit_control_w)
{
/*
other important bits:
@@ -262,7 +262,7 @@ WRITE16_HANDLER( midtunit_control_w )
}
-WRITE16_HANDLER( midwunit_control_w )
+WRITE16_MEMBER(midtunit_state::midwunit_control_w)
{
/*
other important bits:
@@ -280,7 +280,7 @@ WRITE16_HANDLER( midwunit_control_w )
}
-READ16_HANDLER( midwunit_control_r )
+READ16_MEMBER(midtunit_state::midwunit_control_r)
{
return midtunit_control;
}
@@ -293,28 +293,26 @@ READ16_HANDLER( midwunit_control_r )
*
*************************************/
-WRITE16_HANDLER( midtunit_paletteram_w )
+WRITE16_MEMBER(midtunit_state::midtunit_paletteram_w)
{
//int newword;
- midtunit_state *state = space->machine().driver_data<midtunit_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- //newword = state->m_generic_paletteram_16[offset];
- palette_set_color_rgb(space->machine(), offset, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0));
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ //newword = m_generic_paletteram_16[offset];
+ palette_set_color_rgb(machine(), offset, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0));
}
-WRITE16_HANDLER( midxunit_paletteram_w )
+WRITE16_MEMBER(midtunit_state::midxunit_paletteram_w)
{
if (!(offset & 1))
midtunit_paletteram_w(space, offset / 2, data, mem_mask);
}
-READ16_HANDLER( midxunit_paletteram_r )
+READ16_MEMBER(midtunit_state::midxunit_paletteram_r)
{
- midxunit_state *state = space->machine().driver_data<midxunit_state>();
- return state->m_generic_paletteram_16[offset / 2];
+ return m_generic_paletteram_16[offset / 2];
}
@@ -602,7 +600,7 @@ static TIMER_CALLBACK( dma_callback )
*
*************************************/
-READ16_HANDLER( midtunit_dma_r )
+READ16_MEMBER(midtunit_state::midtunit_dma_r)
{
/* rmpgwt sometimes reads register 0, expecting it to return the */
/* current DMA status; thus we map register 0 to register 1 */
@@ -659,7 +657,7 @@ READ16_HANDLER( midtunit_dma_r )
* | ----------2----- | select top/bottom or left/right for reg 12/13
*/
-WRITE16_HANDLER( midtunit_dma_w )
+WRITE16_MEMBER(midtunit_state::midtunit_dma_w)
{
static const UINT8 register_map[2][16] =
{
@@ -681,7 +679,7 @@ WRITE16_HANDLER( midtunit_dma_w )
/* high bit triggers action */
command = dma_register[DMA_COMMAND];
- cputag_set_input_line(space->machine(), "maincpu", 0, CLEAR_LINE);
+ cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
if (!(command & 0x8000))
return;
@@ -717,7 +715,7 @@ WRITE16_HANDLER( midtunit_dma_w )
if (LOG_DMA)
{
- if (space->machine().input().code_pressed(KEYCODE_L))
+ if (machine().input().code_pressed(KEYCODE_L))
{
logerror("DMA command %04X: (bpp=%d skip=%d xflip=%d yflip=%d preskip=%d postskip=%d)\n",
command, (command >> 12) & 7, (command >> 7) & 1, (command >> 4) & 1, (command >> 5) & 1, (command >> 8) & 3, (command >> 10) & 3);
@@ -791,7 +789,7 @@ if (LOG_DMA)
/* signal we're done */
skipdma:
- space->machine().scheduler().timer_set(attotime::from_nsec(41 * pixels), FUNC(dma_callback));
+ machine().scheduler().timer_set(attotime::from_nsec(41 * pixels), FUNC(dma_callback));
g_profiler.stop();
}
diff --git a/src/mame/video/midvunit.c b/src/mame/video/midvunit.c
index d0973915162..0b4c31d492b 100644
--- a/src/mame/video/midvunit.c
+++ b/src/mame/video/midvunit.c
@@ -346,32 +346,30 @@ void midvunit_renderer::process_dma_queue()
*
*************************************/
-WRITE32_HANDLER( midvunit_dma_queue_w )
+WRITE32_MEMBER(midvunit_state::midvunit_dma_queue_w)
{
- midvunit_state *state = space->machine().driver_data<midvunit_state>();
- if (LOG_DMA && space->machine().input().code_pressed(KEYCODE_L))
- logerror("%06X:queue(%X) = %08X\n", cpu_get_pc(&space->device()), state->m_dma_data_index, data);
- if (state->m_dma_data_index < 16)
- state->m_dma_data[state->m_dma_data_index++] = data;
+ if (LOG_DMA && machine().input().code_pressed(KEYCODE_L))
+ logerror("%06X:queue(%X) = %08X\n", cpu_get_pc(&space.device()), m_dma_data_index, data);
+ if (m_dma_data_index < 16)
+ m_dma_data[m_dma_data_index++] = data;
}
-READ32_HANDLER( midvunit_dma_queue_entries_r )
+READ32_MEMBER(midvunit_state::midvunit_dma_queue_entries_r)
{
/* always return 0 entries */
return 0;
}
-READ32_HANDLER( midvunit_dma_trigger_r )
+READ32_MEMBER(midvunit_state::midvunit_dma_trigger_r)
{
- midvunit_state *state = space->machine().driver_data<midvunit_state>();
if (offset)
{
- if (LOG_DMA && space->machine().input().code_pressed(KEYCODE_L))
- logerror("%06X:trigger\n", cpu_get_pc(&space->device()));
- state->m_poly->process_dma_queue();
- state->m_dma_data_index = 0;
+ if (LOG_DMA && machine().input().code_pressed(KEYCODE_L))
+ logerror("%06X:trigger\n", cpu_get_pc(&space.device()));
+ m_poly->process_dma_queue();
+ m_dma_data_index = 0;
}
return 0;
}
@@ -384,25 +382,23 @@ READ32_HANDLER( midvunit_dma_trigger_r )
*
*************************************/
-WRITE32_HANDLER( midvunit_page_control_w )
+WRITE32_MEMBER(midvunit_state::midvunit_page_control_w)
{
- midvunit_state *state = space->machine().driver_data<midvunit_state>();
/* watch for the display page to change */
- if ((state->m_page_control ^ data) & 1)
+ if ((m_page_control ^ data) & 1)
{
- state->m_video_changed = TRUE;
- if (LOG_DMA && space->machine().input().code_pressed(KEYCODE_L))
+ m_video_changed = TRUE;
+ if (LOG_DMA && machine().input().code_pressed(KEYCODE_L))
logerror("##########################################################\n");
- space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos() - 1);
+ machine().primary_screen->update_partial(machine().primary_screen->vpos() - 1);
}
- state->m_page_control = data;
+ m_page_control = data;
}
-READ32_HANDLER( midvunit_page_control_r )
+READ32_MEMBER(midvunit_state::midvunit_page_control_r)
{
- midvunit_state *state = space->machine().driver_data<midvunit_state>();
- return state->m_page_control;
+ return m_page_control;
}
@@ -413,36 +409,35 @@ READ32_HANDLER( midvunit_page_control_r )
*
*************************************/
-WRITE32_HANDLER( midvunit_video_control_w )
+WRITE32_MEMBER(midvunit_state::midvunit_video_control_w)
{
- midvunit_state *state = space->machine().driver_data<midvunit_state>();
- UINT16 old = state->m_video_regs[offset];
+ UINT16 old = m_video_regs[offset];
/* update the data */
- COMBINE_DATA(&state->m_video_regs[offset]);
+ COMBINE_DATA(&m_video_regs[offset]);
/* update the scanline timer */
if (offset == 0)
- state->m_scanline_timer->adjust(space->machine().primary_screen->time_until_pos((data & 0x1ff) + 1, 0), data & 0x1ff);
+ m_scanline_timer->adjust(machine().primary_screen->time_until_pos((data & 0x1ff) + 1, 0), data & 0x1ff);
/* if something changed, update our parameters */
- if (old != state->m_video_regs[offset] && state->m_video_regs[6] != 0 && state->m_video_regs[11] != 0)
+ if (old != m_video_regs[offset] && m_video_regs[6] != 0 && m_video_regs[11] != 0)
{
rectangle visarea;
/* derive visible area from blanking */
visarea.min_x = 0;
- visarea.max_x = (state->m_video_regs[6] + state->m_video_regs[2] - state->m_video_regs[5]) % state->m_video_regs[6];
+ visarea.max_x = (m_video_regs[6] + m_video_regs[2] - m_video_regs[5]) % m_video_regs[6];
visarea.min_y = 0;
- visarea.max_y = (state->m_video_regs[11] + state->m_video_regs[7] - state->m_video_regs[10]) % state->m_video_regs[11];
- space->machine().primary_screen->configure(state->m_video_regs[6], state->m_video_regs[11], visarea, HZ_TO_ATTOSECONDS(MIDVUNIT_VIDEO_CLOCK / 2) * state->m_video_regs[6] * state->m_video_regs[11]);
+ visarea.max_y = (m_video_regs[11] + m_video_regs[7] - m_video_regs[10]) % m_video_regs[11];
+ machine().primary_screen->configure(m_video_regs[6], m_video_regs[11], visarea, HZ_TO_ATTOSECONDS(MIDVUNIT_VIDEO_CLOCK / 2) * m_video_regs[6] * m_video_regs[11]);
}
}
-READ32_HANDLER( midvunit_scanline_r )
+READ32_MEMBER(midvunit_state::midvunit_scanline_r)
{
- return space->machine().primary_screen->vpos();
+ return machine().primary_screen->vpos();
}
@@ -453,25 +448,23 @@ READ32_HANDLER( midvunit_scanline_r )
*
*************************************/
-WRITE32_HANDLER( midvunit_videoram_w )
+WRITE32_MEMBER(midvunit_state::midvunit_videoram_w)
{
- midvunit_state *state = space->machine().driver_data<midvunit_state>();
- state->m_poly->wait("Video RAM write");
- if (!state->m_video_changed)
+ m_poly->wait("Video RAM write");
+ if (!m_video_changed)
{
- int visbase = (state->m_page_control & 1) ? 0x40000 : 0x00000;
+ int visbase = (m_page_control & 1) ? 0x40000 : 0x00000;
if ((offset & 0x40000) == visbase)
- state->m_video_changed = TRUE;
+ m_video_changed = TRUE;
}
- COMBINE_DATA(&state->m_videoram[offset]);
+ COMBINE_DATA(&m_videoram[offset]);
}
-READ32_HANDLER( midvunit_videoram_r )
+READ32_MEMBER(midvunit_state::midvunit_videoram_r)
{
- midvunit_state *state = space->machine().driver_data<midvunit_state>();
- state->m_poly->wait("Video RAM read");
- return state->m_videoram[offset];
+ m_poly->wait("Video RAM read");
+ return m_videoram[offset];
}
@@ -482,14 +475,13 @@ READ32_HANDLER( midvunit_videoram_r )
*
*************************************/
-WRITE32_HANDLER( midvunit_paletteram_w )
+WRITE32_MEMBER(midvunit_state::midvunit_paletteram_w)
{
int newword;
- midvunit_state *state = space->machine().driver_data<midvunit_state>();
- COMBINE_DATA(&state->m_generic_paletteram_32[offset]);
- newword = state->m_generic_paletteram_32[offset];
- palette_set_color_rgb(space->machine(), offset, pal5bit(newword >> 10), pal5bit(newword >> 5), pal5bit(newword >> 0));
+ COMBINE_DATA(&m_generic_paletteram_32[offset]);
+ newword = m_generic_paletteram_32[offset];
+ palette_set_color_rgb(machine(), offset, pal5bit(newword >> 10), pal5bit(newword >> 5), pal5bit(newword >> 0));
}
@@ -500,20 +492,18 @@ WRITE32_HANDLER( midvunit_paletteram_w )
*
*************************************/
-WRITE32_HANDLER( midvunit_textureram_w )
+WRITE32_MEMBER(midvunit_state::midvunit_textureram_w)
{
- midvunit_state *state = space->machine().driver_data<midvunit_state>();
- UINT8 *base = (UINT8 *)state->m_textureram;
- state->m_poly->wait("Texture RAM write");
+ UINT8 *base = (UINT8 *)m_textureram;
+ m_poly->wait("Texture RAM write");
base[offset * 2] = data;
base[offset * 2 + 1] = data >> 8;
}
-READ32_HANDLER( midvunit_textureram_r )
+READ32_MEMBER(midvunit_state::midvunit_textureram_r)
{
- midvunit_state *state = space->machine().driver_data<midvunit_state>();
- UINT8 *base = (UINT8 *)state->m_textureram;
+ UINT8 *base = (UINT8 *)m_textureram;
return (base[offset * 2 + 1] << 8) | base[offset * 2];
}
diff --git a/src/mame/video/midyunit.c b/src/mame/video/midyunit.c
index b1368510680..d4824bcc7ee 100644
--- a/src/mame/video/midyunit.c
+++ b/src/mame/video/midyunit.c
@@ -121,15 +121,14 @@ VIDEO_START( midzunit )
*
*************************************/
-READ16_HANDLER( midyunit_gfxrom_r )
+READ16_MEMBER(midyunit_state::midyunit_gfxrom_r)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
offset *= 2;
- if (state->m_palette_mask == 0x00ff)
- return state->m_gfx_rom[offset] | (state->m_gfx_rom[offset] << 4) |
- (state->m_gfx_rom[offset + 1] << 8) | (state->m_gfx_rom[offset + 1] << 12);
+ if (m_palette_mask == 0x00ff)
+ return m_gfx_rom[offset] | (m_gfx_rom[offset] << 4) |
+ (m_gfx_rom[offset + 1] << 8) | (m_gfx_rom[offset + 1] << 12);
else
- return state->m_gfx_rom[offset] | (state->m_gfx_rom[offset + 1] << 8);
+ return m_gfx_rom[offset] | (m_gfx_rom[offset + 1] << 8);
}
@@ -140,35 +139,33 @@ READ16_HANDLER( midyunit_gfxrom_r )
*
*************************************/
-WRITE16_HANDLER( midyunit_vram_w )
+WRITE16_MEMBER(midyunit_state::midyunit_vram_w)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
offset *= 2;
- if (state->m_videobank_select)
+ if (m_videobank_select)
{
if (ACCESSING_BITS_0_7)
- state->m_local_videoram[offset] = (data & 0x00ff) | (state->m_dma_register[DMA_PALETTE] << 8);
+ m_local_videoram[offset] = (data & 0x00ff) | (m_dma_register[DMA_PALETTE] << 8);
if (ACCESSING_BITS_8_15)
- state->m_local_videoram[offset + 1] = (data >> 8) | (state->m_dma_register[DMA_PALETTE] & 0xff00);
+ m_local_videoram[offset + 1] = (data >> 8) | (m_dma_register[DMA_PALETTE] & 0xff00);
}
else
{
if (ACCESSING_BITS_0_7)
- state->m_local_videoram[offset] = (state->m_local_videoram[offset] & 0x00ff) | (data << 8);
+ m_local_videoram[offset] = (m_local_videoram[offset] & 0x00ff) | (data << 8);
if (ACCESSING_BITS_8_15)
- state->m_local_videoram[offset + 1] = (state->m_local_videoram[offset + 1] & 0x00ff) | (data & 0xff00);
+ m_local_videoram[offset + 1] = (m_local_videoram[offset + 1] & 0x00ff) | (data & 0xff00);
}
}
-READ16_HANDLER( midyunit_vram_r )
+READ16_MEMBER(midyunit_state::midyunit_vram_r)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
offset *= 2;
- if (state->m_videobank_select)
- return (state->m_local_videoram[offset] & 0x00ff) | (state->m_local_videoram[offset + 1] << 8);
+ if (m_videobank_select)
+ return (m_local_videoram[offset] & 0x00ff) | (m_local_videoram[offset + 1] << 8);
else
- return (state->m_local_videoram[offset] >> 8) | (state->m_local_videoram[offset + 1] & 0xff00);
+ return (m_local_videoram[offset] >> 8) | (m_local_videoram[offset + 1] & 0xff00);
}
@@ -200,9 +197,8 @@ void midyunit_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftr
*
*************************************/
-WRITE16_HANDLER( midyunit_control_w )
+WRITE16_MEMBER(midyunit_state::midyunit_control_w)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
/*
* Narc system register
* ------------------
@@ -220,13 +216,13 @@ WRITE16_HANDLER( midyunit_control_w )
if (ACCESSING_BITS_0_7)
{
/* CMOS page is bits 6-7 */
- state->m_cmos_page = ((data >> 6) & 3) * 0x1000;
+ m_cmos_page = ((data >> 6) & 3) * 0x1000;
/* video bank select is bit 5 */
- state->m_videobank_select = (data >> 5) & 1;
+ m_videobank_select = (data >> 5) & 1;
/* handle autoerase disable (bit 4) */
- state->m_autoerase_enable = ((data & 0x10) == 0);
+ m_autoerase_enable = ((data & 0x10) == 0);
}
}
@@ -238,14 +234,13 @@ WRITE16_HANDLER( midyunit_control_w )
*
*************************************/
-WRITE16_HANDLER( midyunit_paletteram_w )
+WRITE16_MEMBER(midyunit_state::midyunit_paletteram_w)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
int newword;
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- newword = state->m_generic_paletteram_16[offset];
- palette_set_color_rgb(space->machine(), offset & state->m_palette_mask, pal5bit(newword >> 10), pal5bit(newword >> 5), pal5bit(newword >> 0));
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ newword = m_generic_paletteram_16[offset];
+ palette_set_color_rgb(machine(), offset & m_palette_mask, pal5bit(newword >> 10), pal5bit(newword >> 5), pal5bit(newword >> 0));
}
@@ -383,10 +378,9 @@ static TIMER_CALLBACK( dma_callback )
*
*************************************/
-READ16_HANDLER( midyunit_dma_r )
+READ16_MEMBER(midyunit_state::midyunit_dma_r)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
- return state->m_dma_register[offset];
+ return m_dma_register[offset];
}
@@ -422,58 +416,57 @@ READ16_HANDLER( midyunit_dma_r )
* 9 | xxxxxxxxxxxxxxxx | color
*/
-WRITE16_HANDLER( midyunit_dma_w )
+WRITE16_MEMBER(midyunit_state::midyunit_dma_w)
{
- midyunit_state *state = space->machine().driver_data<midyunit_state>();
- struct dma_state_t &dma_state = state->m_dma_state;
+ struct dma_state_t &dma_state = m_dma_state;
UINT32 gfxoffset;
int command;
/* blend with the current register contents */
- COMBINE_DATA(&state->m_dma_register[offset]);
+ COMBINE_DATA(&m_dma_register[offset]);
/* only writes to DMA_COMMAND actually cause actions */
if (offset != DMA_COMMAND)
return;
/* high bit triggers action */
- command = state->m_dma_register[DMA_COMMAND];
- cputag_set_input_line(space->machine(), "maincpu", 0, CLEAR_LINE);
+ command = m_dma_register[DMA_COMMAND];
+ cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
if (!(command & 0x8000))
return;
if (LOG_DMA)
{
- if (space->machine().input().code_pressed(KEYCODE_L))
+ if (machine().input().code_pressed(KEYCODE_L))
{
logerror("----\n");
logerror("DMA command %04X: (xflip=%d yflip=%d)\n",
command, (command >> 4) & 1, (command >> 5) & 1);
logerror(" offset=%08X pos=(%d,%d) w=%d h=%d rb=%d\n",
- state->m_dma_register[DMA_OFFSETLO] | (state->m_dma_register[DMA_OFFSETHI] << 16),
- (INT16)state->m_dma_register[DMA_XSTART], (INT16)state->m_dma_register[DMA_YSTART],
- state->m_dma_register[DMA_WIDTH], state->m_dma_register[DMA_HEIGHT], (INT16)state->m_dma_register[DMA_ROWBYTES]);
+ m_dma_register[DMA_OFFSETLO] | (m_dma_register[DMA_OFFSETHI] << 16),
+ (INT16)m_dma_register[DMA_XSTART], (INT16)m_dma_register[DMA_YSTART],
+ m_dma_register[DMA_WIDTH], m_dma_register[DMA_HEIGHT], (INT16)m_dma_register[DMA_ROWBYTES]);
logerror(" palette=%04X color=%04X\n",
- state->m_dma_register[DMA_PALETTE], state->m_dma_register[DMA_COLOR]);
+ m_dma_register[DMA_PALETTE], m_dma_register[DMA_COLOR]);
}
}
g_profiler.start(PROFILER_USER1);
/* fill in the basic data */
- dma_state.rowbytes = (INT16)state->m_dma_register[DMA_ROWBYTES];
- dma_state.xpos = (INT16)state->m_dma_register[DMA_XSTART];
- dma_state.ypos = (INT16)state->m_dma_register[DMA_YSTART];
- dma_state.width = state->m_dma_register[DMA_WIDTH];
- dma_state.height = state->m_dma_register[DMA_HEIGHT];
- dma_state.palette = state->m_dma_register[DMA_PALETTE] << 8;
- dma_state.color = state->m_dma_register[DMA_COLOR] & 0xff;
+ dma_state.rowbytes = (INT16)m_dma_register[DMA_ROWBYTES];
+ dma_state.xpos = (INT16)m_dma_register[DMA_XSTART];
+ dma_state.ypos = (INT16)m_dma_register[DMA_YSTART];
+ dma_state.width = m_dma_register[DMA_WIDTH];
+ dma_state.height = m_dma_register[DMA_HEIGHT];
+ dma_state.palette = m_dma_register[DMA_PALETTE] << 8;
+ dma_state.color = m_dma_register[DMA_COLOR] & 0xff;
/* determine the offset and adjust the rowbytes */
- gfxoffset = state->m_dma_register[DMA_OFFSETLO] | (state->m_dma_register[DMA_OFFSETHI] << 16);
+ gfxoffset = m_dma_register[DMA_OFFSETLO] | (m_dma_register[DMA_OFFSETHI] << 16);
if (command & 0x10)
{
- if (!state->m_yawdim_dma)
+ if (!m_yawdim_dma)
{
gfxoffset -= (dma_state.width - 1) * 8;
dma_state.rowbytes = (dma_state.rowbytes - dma_state.width + 3) & ~3;
@@ -524,11 +517,11 @@ if (LOG_DMA)
gfxoffset += 0x02000000;
{
dma_state.offset = gfxoffset - 0x02000000;
- dma_draw(space->machine(), command);
+ dma_draw(machine(), command);
}
/* signal we're done */
- space->machine().scheduler().timer_set(attotime::from_nsec(41 * dma_state.width * dma_state.height), FUNC(dma_callback));
+ machine().scheduler().timer_set(attotime::from_nsec(41 * dma_state.width * dma_state.height), FUNC(dma_callback));
g_profiler.stop();
}
diff --git a/src/mame/video/midzeus.c b/src/mame/video/midzeus.c
index 4bad958750f..6be9418b542 100644
--- a/src/mame/video/midzeus.c
+++ b/src/mame/video/midzeus.c
@@ -387,7 +387,7 @@ SCREEN_UPDATE_IND16( midzeus )
*
*************************************/
-READ32_HANDLER( zeus_r )
+READ32_MEMBER(midzeus_state::zeus_r)
{
int logit = (offset < 0xb0 || offset > 0xb7);
UINT32 result = zeusbase[offset & ~1];
@@ -395,18 +395,18 @@ READ32_HANDLER( zeus_r )
switch (offset & ~1)
{
case 0xf0:
- result = space->machine().primary_screen->hpos();
+ result = machine().primary_screen->hpos();
logit = 0;
break;
case 0xf2:
- result = space->machine().primary_screen->vpos();
+ result = machine().primary_screen->vpos();
logit = 0;
break;
case 0xf4:
result = 6;
- if (space->machine().primary_screen->vblank())
+ if (machine().primary_screen->vblank())
result |= 0x800;
logit = 0;
break;
@@ -428,11 +428,11 @@ READ32_HANDLER( zeus_r )
if (logit)
{
if (offset & 1)
- logerror("%06X:zeus32_r(%02X) = %08X -- unexpected in 32-bit mode\n", cpu_get_pc(&space->device()), offset, result);
+ logerror("%06X:zeus32_r(%02X) = %08X -- unexpected in 32-bit mode\n", cpu_get_pc(&space.device()), offset, result);
else if (offset != 0xe0)
- logerror("%06X:zeus32_r(%02X) = %08X\n", cpu_get_pc(&space->device()), offset, result);
+ logerror("%06X:zeus32_r(%02X) = %08X\n", cpu_get_pc(&space.device()), offset, result);
else
- logerror("%06X:zeus32_r(%02X) = %08X\n", cpu_get_pc(&space->device()), offset, result);
+ logerror("%06X:zeus32_r(%02X) = %08X\n", cpu_get_pc(&space.device()), offset, result);
}
}
@@ -444,7 +444,7 @@ READ32_HANDLER( zeus_r )
else
result &= 0xffff;
if (logit)
- logerror("%06X:zeus16_r(%02X) = %04X\n", cpu_get_pc(&space->device()), offset, result);
+ logerror("%06X:zeus16_r(%02X) = %04X\n", cpu_get_pc(&space.device()), offset, result);
}
return result;
}
@@ -457,20 +457,20 @@ READ32_HANDLER( zeus_r )
*
*************************************/
-WRITE32_HANDLER( zeus_w )
+WRITE32_MEMBER(midzeus_state::zeus_w)
{
int logit = zeus_enable_logging || ((offset < 0xb0 || offset > 0xb7) && (offset < 0xe0 || offset > 0xe1));
if (logit)
- logerror("%06X:zeus_w", cpu_get_pc(&space->device()));
+ logerror("%06X:zeus_w", cpu_get_pc(&space.device()));
/* 32-bit mode */
if (zeusbase[0x80] & 0x00020000)
- zeus_register32_w(space->machine(), offset, data, logit);
+ zeus_register32_w(machine(), offset, data, logit);
/* 16-bit mode */
else
- zeus_register16_w(space->machine(), offset, data, logit);
+ zeus_register16_w(machine(), offset, data, logit);
}
diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c
index b27125f943e..87af164a16a 100644
--- a/src/mame/video/mikie.c
+++ b/src/mame/video/mikie.c
@@ -87,39 +87,36 @@ PALETTE_INIT( mikie )
}
}
-WRITE8_HANDLER( mikie_videoram_w )
+WRITE8_MEMBER(mikie_state::mikie_videoram_w)
{
- mikie_state *state = space->machine().driver_data<mikie_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( mikie_colorram_w )
+WRITE8_MEMBER(mikie_state::mikie_colorram_w)
{
- mikie_state *state = space->machine().driver_data<mikie_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( mikie_palettebank_w )
+WRITE8_MEMBER(mikie_state::mikie_palettebank_w)
{
- mikie_state *state = space->machine().driver_data<mikie_state>();
- if (state->m_palettebank != (data & 0x07))
+ if (m_palettebank != (data & 0x07))
{
- state->m_palettebank = data & 0x07;
- space->machine().tilemap().mark_all_dirty();
+ m_palettebank = data & 0x07;
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( mikie_flipscreen_w )
+WRITE8_MEMBER(mikie_state::mikie_flipscreen_w)
{
- if (flip_screen_get(space->machine()) != (data & 0x01))
+ if (flip_screen_get(machine()) != (data & 0x01))
{
- flip_screen_set(space->machine(), data & 0x01);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x01);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c
index 828da329f75..3f95b24319a 100644
--- a/src/mame/video/mitchell.c
+++ b/src/mame/video/mitchell.c
@@ -62,64 +62,56 @@ VIDEO_START( pang )
OBJ / CHAR RAM HANDLERS (BANK 0 = CHAR, BANK 1=OBJ)
***************************************************************************/
-WRITE8_HANDLER( pang_video_bank_w )
+WRITE8_MEMBER(mitchell_state::pang_video_bank_w)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
/* Bank handler (sets base pointers for video write) (doesn't apply to mgakuen) */
- state->m_video_bank = data;
+ m_video_bank = data;
}
-WRITE8_HANDLER( mstworld_video_bank_w )
+WRITE8_MEMBER(mitchell_state::mstworld_video_bank_w)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
/* Monsters World seems to freak out if more bits are used.. */
- state->m_video_bank = data & 1;
+ m_video_bank = data & 1;
}
-WRITE8_HANDLER( mgakuen_videoram_w )
+WRITE8_MEMBER(mitchell_state::mgakuen_videoram_w)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-READ8_HANDLER( mgakuen_videoram_r )
+READ8_MEMBER(mitchell_state::mgakuen_videoram_r)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
- return state->m_videoram[offset];
+ return m_videoram[offset];
}
-WRITE8_HANDLER( mgakuen_objram_w )
+WRITE8_MEMBER(mitchell_state::mgakuen_objram_w)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
- state->m_objram[offset] = data;
+ m_objram[offset] = data;
}
-READ8_HANDLER( mgakuen_objram_r )
+READ8_MEMBER(mitchell_state::mgakuen_objram_r)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
- return state->m_objram[offset];
+ return m_objram[offset];
}
-WRITE8_HANDLER( pang_videoram_w )
+WRITE8_MEMBER(mitchell_state::pang_videoram_w)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
- if (state->m_video_bank)
+ if (m_video_bank)
mgakuen_objram_w(space, offset, data);
else
mgakuen_videoram_w(space, offset, data);
}
-READ8_HANDLER( pang_videoram_r )
+READ8_MEMBER(mitchell_state::pang_videoram_r)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
- if (state->m_video_bank)
+ if (m_video_bank)
return mgakuen_objram_r(space, offset);
else
return mgakuen_videoram_r(space, offset);
@@ -129,29 +121,26 @@ READ8_HANDLER( pang_videoram_r )
COLOUR RAM
****************************************************************************/
-WRITE8_HANDLER( pang_colorram_w )
+WRITE8_MEMBER(mitchell_state::pang_colorram_w)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-READ8_HANDLER( pang_colorram_r )
+READ8_MEMBER(mitchell_state::pang_colorram_r)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
- return state->m_colorram[offset];
+ return m_colorram[offset];
}
/***************************************************************************
PALETTE HANDLERS (COLOURS: BANK 0 = 0x00-0x3f BANK 1=0x40-0xff)
****************************************************************************/
-WRITE8_HANDLER( pang_gfxctrl_w )
+WRITE8_MEMBER(mitchell_state::pang_gfxctrl_w)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
-logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data);
+logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space.device()),data);
{
#if 0
char baf[40];
@@ -163,23 +152,23 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data);
/* bit 0 is unknown (used, maybe back color enable?) */
/* bit 1 is coin counter */
- coin_counter_w(space->machine(), 0, data & 2);
+ coin_counter_w(space.machine(), 0, data & 2);
/* bit 2 is flip screen */
- if (state->m_flipscreen != (data & 0x04))
+ if (m_flipscreen != (data & 0x04))
{
- state->m_flipscreen = data & 0x04;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen = data & 0x04;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
/* bit 3 is unknown (used, e.g. marukin pulses it on the title screen) */
/* bit 4 selects OKI M6295 bank */
- if (state->m_oki != NULL)
- state->m_oki->set_bank_base((data & 0x10) ? 0x40000 : 0x00000);
+ if (m_oki != NULL)
+ m_oki->set_bank_base((data & 0x10) ? 0x40000 : 0x00000);
/* bit 5 is palette RAM bank selector (doesn't apply to mgakuen) */
- state->m_paletteram_bank = data & 0x20;
+ m_paletteram_bank = data & 0x20;
/* bits 6 and 7 are unknown, used in several places. At first I thought */
/* they were bg and sprites enable, but this screws up spang (screen flickers */
@@ -187,11 +176,10 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data);
/* up marukin - you can see partially built up screens during attract mode. */
}
-WRITE8_HANDLER( pangbl_gfxctrl_w )
+WRITE8_MEMBER(mitchell_state::pangbl_gfxctrl_w)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
-logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data);
+logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space.device()),data);
{
#if 0
char baf[40];
@@ -203,13 +191,13 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data);
/* bit 0 is unknown (used, maybe back color enable?) */
/* bit 1 is coin counter */
- coin_counter_w(space->machine(), 0, data & 2);
+ coin_counter_w(machine(), 0, data & 2);
/* bit 2 is flip screen */
- if (state->m_flipscreen != (data & 0x04))
+ if (m_flipscreen != (data & 0x04))
{
- state->m_flipscreen = data & 0x04;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen = data & 0x04;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
/* bit 3 is unknown (used, e.g. marukin pulses it on the title screen) */
@@ -217,7 +205,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data);
/* bit 4 selects OKI M6295 bank, nop'ed here */
/* bit 5 is palette RAM bank selector (doesn't apply to mgakuen) */
- state->m_paletteram_bank = data & 0x20;
+ m_paletteram_bank = data & 0x20;
/* bits 6 and 7 are unknown, used in several places. At first I thought */
/* they were bg and sprites enable, but this screws up spang (screen flickers */
@@ -225,11 +213,10 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data);
/* up marukin - you can see partially built up screens during attract mode. */
}
-WRITE8_HANDLER( mstworld_gfxctrl_w )
+WRITE8_MEMBER(mitchell_state::mstworld_gfxctrl_w)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
-logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data);
+logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space.device()),data);
{
char baf[40];
sprintf(baf,"%02x",data);
@@ -239,13 +226,13 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data);
/* bit 0 is unknown (used, maybe back color enable?) */
/* bit 1 is coin counter */
- coin_counter_w(space->machine(), 0, data & 2);
+ coin_counter_w(machine(), 0, data & 2);
/* bit 2 is flip screen */
- if (state->m_flipscreen != (data & 0x04))
+ if (m_flipscreen != (data & 0x04))
{
- state->m_flipscreen = data & 0x04;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen = data & 0x04;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
/* bit 3 is unknown (used, e.g. marukin pulses it on the title screen) */
@@ -253,7 +240,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data);
/* bit 4 here does not select OKI M6295 bank: mstworld has its own z80 + sound banking */
/* bit 5 is palette RAM bank selector (doesn't apply to mgakuen) */
- state->m_paletteram_bank = data & 0x20;
+ m_paletteram_bank = data & 0x20;
/* bits 6 and 7 are unknown, used in several places. At first I thought */
/* they were bg and sprites enable, but this screws up spang (screen flickers */
@@ -261,36 +248,32 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(&space->device()),data);
/* up marukin - you can see partially built up screens during attract mode. */
}
-WRITE8_HANDLER( pang_paletteram_w )
+WRITE8_MEMBER(mitchell_state::pang_paletteram_w)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
- if (state->m_paletteram_bank)
- state->paletteram_xxxxRRRRGGGGBBBB_le_w(*space, offset + 0x800, data);
+ if (m_paletteram_bank)
+ paletteram_xxxxRRRRGGGGBBBB_le_w(space, offset + 0x800, data);
else
- state->paletteram_xxxxRRRRGGGGBBBB_le_w(*space, offset, data);
+ paletteram_xxxxRRRRGGGGBBBB_le_w(space, offset, data);
}
-READ8_HANDLER( pang_paletteram_r )
+READ8_MEMBER(mitchell_state::pang_paletteram_r)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
- if (state->m_paletteram_bank)
- return state->m_generic_paletteram_8[offset + 0x800];
+ if (m_paletteram_bank)
+ return m_generic_paletteram_8[offset + 0x800];
- return state->m_generic_paletteram_8[offset];
+ return m_generic_paletteram_8[offset];
}
-WRITE8_HANDLER( mgakuen_paletteram_w )
+WRITE8_MEMBER(mitchell_state::mgakuen_paletteram_w)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
- state->paletteram_xxxxRRRRGGGGBBBB_le_w(*space, offset, data);
+ paletteram_xxxxRRRRGGGGBBBB_le_w(space, offset, data);
}
-READ8_HANDLER( mgakuen_paletteram_r )
+READ8_MEMBER(mitchell_state::mgakuen_paletteram_r)
{
- mitchell_state *state = space->machine().driver_data<mitchell_state>();
- return state->m_generic_paletteram_8[offset];
+ return m_generic_paletteram_8[offset];
}
diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c
index ef591927c48..5a432e16713 100644
--- a/src/mame/video/mjkjidai.c
+++ b/src/mame/video/mjkjidai.c
@@ -40,42 +40,40 @@ VIDEO_START( mjkjidai )
***************************************************************************/
-WRITE8_HANDLER( mjkjidai_videoram_w )
+WRITE8_MEMBER(mjkjidai_state::mjkjidai_videoram_w)
{
- mjkjidai_state *state = space->machine().driver_data<mjkjidai_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-WRITE8_HANDLER( mjkjidai_ctrl_w )
+WRITE8_MEMBER(mjkjidai_state::mjkjidai_ctrl_w)
{
- mjkjidai_state *state = space->machine().driver_data<mjkjidai_state>();
- UINT8 *rom = space->machine().region("maincpu")->base();
+ UINT8 *rom = machine().region("maincpu")->base();
-// logerror("%04x: port c0 = %02x\n",cpu_get_pc(&space->device()),data);
+// logerror("%04x: port c0 = %02x\n",cpu_get_pc(&space.device()),data);
/* bit 0 = NMI enable */
- state->m_nmi_mask = data & 1;
+ m_nmi_mask = data & 1;
/* bit 1 = flip screen */
- flip_screen_set(space->machine(), data & 0x02);
+ flip_screen_set(machine(), data & 0x02);
/* bit 2 =display enable */
- state->m_display_enable = data & 0x04;
+ m_display_enable = data & 0x04;
/* bit 5 = coin counter */
- coin_counter_w(space->machine(), 0,data & 0x20);
+ coin_counter_w(machine(), 0,data & 0x20);
/* bits 6-7 select ROM bank */
if (data & 0xc0)
{
- memory_set_bankptr(space->machine(), "bank1",rom + 0x10000-0x4000 + ((data & 0xc0) << 8));
+ memory_set_bankptr(machine(), "bank1",rom + 0x10000-0x4000 + ((data & 0xc0) << 8));
}
else
{
/* there is code flowing from 7fff to this bank so they have to be contiguous in memory */
- memory_set_bankptr(space->machine(), "bank1",rom + 0x08000);
+ memory_set_bankptr(machine(), "bank1",rom + 0x08000);
}
}
diff --git a/src/mame/video/model1.c b/src/mame/video/model1.c
index 767f258d378..c1e09f9af1a 100644
--- a/src/mame/video/model1.c
+++ b/src/mame/video/model1.c
@@ -1168,20 +1168,18 @@ static void end_frame(running_machine &machine)
state->m_listctl[0] ^= 0x40;
}
-READ16_HANDLER( model1_listctl_r )
+READ16_MEMBER(model1_state::model1_listctl_r)
{
- model1_state *state = space->machine().driver_data<model1_state>();
if(!offset)
- return state->m_listctl[0] | 0x30;
+ return m_listctl[0] | 0x30;
else
- return state->m_listctl[1];
+ return m_listctl[1];
}
-WRITE16_HANDLER( model1_listctl_w )
+WRITE16_MEMBER(model1_state::model1_listctl_w)
{
- model1_state *state = space->machine().driver_data<model1_state>();
- COMBINE_DATA(state->m_listctl+offset);
- LOG_TGP(("VIDEO: control=%08x\n", (state->m_listctl[1]<<16)|state->m_listctl[0]));
+ COMBINE_DATA(m_listctl+offset);
+ LOG_TGP(("VIDEO: control=%08x\n", (m_listctl[1]<<16)|m_listctl[0]));
}
static void tgp_render(running_machine &machine, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c
index 0b19f5de9ee..978f297ab04 100644
--- a/src/mame/video/model3.c
+++ b/src/mame/video/model3.c
@@ -412,73 +412,66 @@ SCREEN_UPDATE_IND16( model3 )
-READ64_HANDLER(model3_char_r)
+READ64_MEMBER(model3_state::model3_char_r)
{
- model3_state *state = space->machine().driver_data<model3_state>();
- return state->m_m3_char_ram[offset];
+ return m_m3_char_ram[offset];
}
-WRITE64_HANDLER(model3_char_w)
+WRITE64_MEMBER(model3_state::model3_char_w)
{
- model3_state *state = space->machine().driver_data<model3_state>();
- COMBINE_DATA(&state->m_m3_char_ram[offset]);
+ COMBINE_DATA(&m_m3_char_ram[offset]);
}
-READ64_HANDLER(model3_tile_r)
+READ64_MEMBER(model3_state::model3_tile_r)
{
- model3_state *state = space->machine().driver_data<model3_state>();
- return state->m_m3_tile_ram[offset];
+ return m_m3_tile_ram[offset];
}
-WRITE64_HANDLER(model3_tile_w)
+WRITE64_MEMBER(model3_state::model3_tile_w)
{
- model3_state *state = space->machine().driver_data<model3_state>();
- COMBINE_DATA(&state->m_m3_tile_ram[offset]);
+ COMBINE_DATA(&m_m3_tile_ram[offset]);
}
-READ64_HANDLER(model3_vid_reg_r)
+READ64_MEMBER(model3_state::model3_vid_reg_r)
{
- model3_state *state = space->machine().driver_data<model3_state>();
switch(offset)
{
- case 0x00/8: return state->m_vid_reg0;
+ case 0x00/8: return m_vid_reg0;
case 0x08/8: return U64(0xffffffffffffffff); /* ??? */
- case 0x20/8: return (UINT64)state->m_layer_enable << 52;
- case 0x40/8: return ((UINT64)state->m_layer_modulate1 << 32) | (UINT64)state->m_layer_modulate2;
+ case 0x20/8: return (UINT64)m_layer_enable << 52;
+ case 0x40/8: return ((UINT64)m_layer_modulate1 << 32) | (UINT64)m_layer_modulate2;
default: logerror("read reg %02X\n", offset);break;
}
return 0;
}
-WRITE64_HANDLER(model3_vid_reg_w)
+WRITE64_MEMBER(model3_state::model3_vid_reg_w)
{
- model3_state *state = space->machine().driver_data<model3_state>();
switch(offset)
{
- case 0x00/8: logerror("vid_reg0: %08X%08X\n", (UINT32)(data>>32),(UINT32)(data)); state->m_vid_reg0 = data; break;
+ case 0x00/8: logerror("vid_reg0: %08X%08X\n", (UINT32)(data>>32),(UINT32)(data)); m_vid_reg0 = data; break;
case 0x08/8: break; /* ??? */
- case 0x10/8: model3_set_irq_line(space->machine(), (data >> 56) & 0x0f, CLEAR_LINE); break; /* VBL IRQ Ack */
+ case 0x10/8: model3_set_irq_line(machine(), (data >> 56) & 0x0f, CLEAR_LINE); break; /* VBL IRQ Ack */
- case 0x20/8: state->m_layer_enable = (data >> 52); break;
+ case 0x20/8: m_layer_enable = (data >> 52); break;
- case 0x40/8: state->m_layer_modulate1 = (UINT32)(data >> 32);
- state->m_layer_modulate2 = (UINT32)(data);
+ case 0x40/8: m_layer_modulate1 = (UINT32)(data >> 32);
+ m_layer_modulate2 = (UINT32)(data);
break;
- case 0x60/8: COMBINE_DATA(&state->m_layer_scroll[0]); break;
- case 0x68/8: COMBINE_DATA(&state->m_layer_scroll[1]); break;
+ case 0x60/8: COMBINE_DATA(&m_layer_scroll[0]); break;
+ case 0x68/8: COMBINE_DATA(&m_layer_scroll[1]); break;
default: logerror("model3_vid_reg_w: %02X, %08X%08X\n", offset, (UINT32)(data >> 32), (UINT32)(data)); break;
}
}
-WRITE64_HANDLER( model3_palette_w )
+WRITE64_MEMBER(model3_state::model3_palette_w)
{
- model3_state *state = space->machine().driver_data<model3_state>();
int r1,g1,b1,r2,g2,b2;
UINT32 data1,data2;
- COMBINE_DATA(&state->m_paletteram64[offset]);
- data1 = BYTE_REVERSE32((UINT32)(state->m_paletteram64[offset] >> 32));
- data2 = BYTE_REVERSE32((UINT32)(state->m_paletteram64[offset] >> 0));
+ COMBINE_DATA(&m_paletteram64[offset]);
+ data1 = BYTE_REVERSE32((UINT32)(m_paletteram64[offset] >> 32));
+ data2 = BYTE_REVERSE32((UINT32)(m_paletteram64[offset] >> 0));
r1 = ((data1 >> 0) & 0x1f);
g1 = ((data1 >> 5) & 0x1f);
@@ -487,14 +480,13 @@ WRITE64_HANDLER( model3_palette_w )
g2 = ((data2 >> 5) & 0x1f);
b2 = ((data2 >> 10) & 0x1f);
- state->m_pal_lookup[(offset*2)+0] = (data1 & 0x8000) | (r1 << 10) | (g1 << 5) | b1;
- state->m_pal_lookup[(offset*2)+1] = (data2 & 0x8000) | (r2 << 10) | (g2 << 5) | b2;
+ m_pal_lookup[(offset*2)+0] = (data1 & 0x8000) | (r1 << 10) | (g1 << 5) | b1;
+ m_pal_lookup[(offset*2)+1] = (data2 & 0x8000) | (r2 << 10) | (g2 << 5) | b2;
}
-READ64_HANDLER( model3_palette_r )
+READ64_MEMBER(model3_state::model3_palette_r)
{
- model3_state *state = space->machine().driver_data<model3_state>();
- return state->m_paletteram64[offset];
+ return m_paletteram64[offset];
}
@@ -641,25 +633,23 @@ static cached_texture *get_texture(running_machine &machine, int page, int texx,
/*****************************************************************************/
/* Real3D Graphics stuff */
-WRITE64_HANDLER( real3d_display_list_w )
+WRITE64_MEMBER(model3_state::real3d_display_list_w)
{
- model3_state *state = space->machine().driver_data<model3_state>();
if(ACCESSING_BITS_32_63) {
- state->m_display_list_ram[offset*2] = BYTE_REVERSE32((UINT32)(data >> 32));
+ m_display_list_ram[offset*2] = BYTE_REVERSE32((UINT32)(data >> 32));
}
if(ACCESSING_BITS_0_31) {
- state->m_display_list_ram[(offset*2)+1] = BYTE_REVERSE32((UINT32)(data));
+ m_display_list_ram[(offset*2)+1] = BYTE_REVERSE32((UINT32)(data));
}
}
-WRITE64_HANDLER( real3d_polygon_ram_w )
+WRITE64_MEMBER(model3_state::real3d_polygon_ram_w)
{
- model3_state *state = space->machine().driver_data<model3_state>();
if(ACCESSING_BITS_32_63) {
- state->m_polygon_ram[offset*2] = BYTE_REVERSE32((UINT32)(data >> 32));
+ m_polygon_ram[offset*2] = BYTE_REVERSE32((UINT32)(data >> 32));
}
if(ACCESSING_BITS_0_31) {
- state->m_polygon_ram[(offset*2)+1] = BYTE_REVERSE32((UINT32)(data));
+ m_polygon_ram[(offset*2)+1] = BYTE_REVERSE32((UINT32)(data));
}
}
@@ -870,9 +860,9 @@ void real3d_polygon_ram_dma(address_space *space, UINT32 src, UINT32 dst, int le
}
}
-WRITE64_HANDLER( real3d_cmd_w )
+WRITE64_MEMBER(model3_state::real3d_cmd_w)
{
- real3d_display_list_end(space->machine());
+ real3d_display_list_end(machine());
}
diff --git a/src/mame/video/momoko.c b/src/mame/video/momoko.c
index d602dd22fa0..c7e56115d33 100644
--- a/src/mame/video/momoko.c
+++ b/src/mame/video/momoko.c
@@ -12,66 +12,56 @@
#include "includes/momoko.h"
-WRITE8_HANDLER ( momoko_fg_scrollx_w )
+WRITE8_MEMBER(momoko_state::momoko_fg_scrollx_w)
{
- momoko_state *state = space->machine().driver_data<momoko_state>();
- state->m_fg_scrollx = data;
+ m_fg_scrollx = data;
}
-WRITE8_HANDLER ( momoko_fg_scrolly_w )
+WRITE8_MEMBER(momoko_state::momoko_fg_scrolly_w)
{
- momoko_state *state = space->machine().driver_data<momoko_state>();
- state->m_fg_scrolly = data;
+ m_fg_scrolly = data;
}
-WRITE8_HANDLER ( momoko_fg_select_w )
+WRITE8_MEMBER(momoko_state::momoko_fg_select_w)
{
- momoko_state *state = space->machine().driver_data<momoko_state>();
- state->m_fg_select = data & 0x0f;
- state->m_fg_mask = data & 0x10;
+ m_fg_select = data & 0x0f;
+ m_fg_mask = data & 0x10;
}
-WRITE8_HANDLER ( momoko_text_scrolly_w )
+WRITE8_MEMBER(momoko_state::momoko_text_scrolly_w)
{
- momoko_state *state = space->machine().driver_data<momoko_state>();
- state->m_text_scrolly = data;
+ m_text_scrolly = data;
}
-WRITE8_HANDLER ( momoko_text_mode_w )
+WRITE8_MEMBER(momoko_state::momoko_text_mode_w)
{
- momoko_state *state = space->machine().driver_data<momoko_state>();
- state->m_text_mode = data;
+ m_text_mode = data;
}
-WRITE8_HANDLER ( momoko_bg_scrollx_w )
+WRITE8_MEMBER(momoko_state::momoko_bg_scrollx_w)
{
- momoko_state *state = space->machine().driver_data<momoko_state>();
- state->m_bg_scrollx[offset] = data;
+ m_bg_scrollx[offset] = data;
}
-WRITE8_HANDLER ( momoko_bg_scrolly_w )
+WRITE8_MEMBER(momoko_state::momoko_bg_scrolly_w)
{
- momoko_state *state = space->machine().driver_data<momoko_state>();
- state->m_bg_scrolly[offset] = data;
+ m_bg_scrolly[offset] = data;
}
-WRITE8_HANDLER( momoko_bg_select_w )
+WRITE8_MEMBER(momoko_state::momoko_bg_select_w)
{
- momoko_state *state = space->machine().driver_data<momoko_state>();
- state->m_bg_select = data & 0x0f;
- state->m_bg_mask = data & 0x10;
+ m_bg_select = data & 0x0f;
+ m_bg_mask = data & 0x10;
}
-WRITE8_HANDLER( momoko_bg_priority_w )
+WRITE8_MEMBER(momoko_state::momoko_bg_priority_w)
{
- momoko_state *state = space->machine().driver_data<momoko_state>();
- state->m_bg_priority = data & 0x01;
+ m_bg_priority = data & 0x01;
}
-WRITE8_HANDLER( momoko_flipscreen_w )
+WRITE8_MEMBER(momoko_state::momoko_flipscreen_w)
{
- momoko_state *state = space->machine().driver_data<momoko_state>();
- state->m_flipscreen = data & 0x01;
+ m_flipscreen = data & 0x01;
}
/****************************************************************************/
diff --git a/src/mame/video/mosaic.c b/src/mame/video/mosaic.c
index 892bcc571bf..f02d48295a4 100644
--- a/src/mame/video/mosaic.c
+++ b/src/mame/video/mosaic.c
@@ -62,20 +62,18 @@ VIDEO_START( mosaic )
***************************************************************************/
-WRITE8_HANDLER( mosaic_fgvideoram_w )
+WRITE8_MEMBER(mosaic_state::mosaic_fgvideoram_w)
{
- mosaic_state *state = space->machine().driver_data<mosaic_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset / 2);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( mosaic_bgvideoram_w )
+WRITE8_MEMBER(mosaic_state::mosaic_bgvideoram_w)
{
- mosaic_state *state = space->machine().driver_data<mosaic_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
diff --git a/src/mame/video/mouser.c b/src/mame/video/mouser.c
index fa48bb51330..51b2fdf257b 100644
--- a/src/mame/video/mouser.c
+++ b/src/mame/video/mouser.c
@@ -44,14 +44,14 @@ PALETTE_INIT( mouser )
}
}
-WRITE8_HANDLER( mouser_flip_screen_x_w )
+WRITE8_MEMBER(mouser_state::mouser_flip_screen_x_w)
{
- flip_screen_x_set(space->machine(), ~data & 1);
+ flip_screen_x_set(machine(), ~data & 1);
}
-WRITE8_HANDLER( mouser_flip_screen_y_w )
+WRITE8_MEMBER(mouser_state::mouser_flip_screen_y_w)
{
- flip_screen_y_set(space->machine(), ~data & 1);
+ flip_screen_y_set(machine(), ~data & 1);
}
SCREEN_UPDATE_IND16( mouser )
diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c
index 29757f5dbd6..0b627636903 100644
--- a/src/mame/video/mrdo.c
+++ b/src/mame/video/mrdo.c
@@ -191,48 +191,43 @@ VIDEO_START( mrdo )
***************************************************************************/
-WRITE8_HANDLER( mrdo_bgvideoram_w )
+WRITE8_MEMBER(mrdo_state::mrdo_bgvideoram_w)
{
- mrdo_state *state = space->machine().driver_data<mrdo_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( mrdo_fgvideoram_w )
+WRITE8_MEMBER(mrdo_state::mrdo_fgvideoram_w)
{
- mrdo_state *state = space->machine().driver_data<mrdo_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( mrdo_scrollx_w )
+WRITE8_MEMBER(mrdo_state::mrdo_scrollx_w)
{
- mrdo_state *state = space->machine().driver_data<mrdo_state>();
- state->m_bg_tilemap->set_scrollx(0, data);
+ m_bg_tilemap->set_scrollx(0, data);
}
-WRITE8_HANDLER( mrdo_scrolly_w )
+WRITE8_MEMBER(mrdo_state::mrdo_scrolly_w)
{
- mrdo_state *state = space->machine().driver_data<mrdo_state>();
/* This is NOT affected by flipscreen (so stop it happening) */
- if (state->m_flipscreen)
- state->m_bg_tilemap->set_scrolly(0,((256 - data) & 0xff));
+ if (m_flipscreen)
+ m_bg_tilemap->set_scrolly(0,((256 - data) & 0xff));
else
- state->m_bg_tilemap->set_scrolly(0, data);
+ m_bg_tilemap->set_scrolly(0, data);
}
-WRITE8_HANDLER( mrdo_flipscreen_w )
+WRITE8_MEMBER(mrdo_state::mrdo_flipscreen_w)
{
- mrdo_state *state = space->machine().driver_data<mrdo_state>();
/* bits 1-3 control the playfield priority, but they are not used by */
/* Mr. Do! so we don't emulate them */
- state->m_flipscreen = data & 0x01;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen = data & 0x01;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
diff --git a/src/mame/video/mrflea.c b/src/mame/video/mrflea.c
index 4fe3cfa6956..a7948b42b9f 100644
--- a/src/mame/video/mrflea.c
+++ b/src/mame/video/mrflea.c
@@ -8,39 +8,36 @@ Mr. F. Lea
#include "emu.h"
#include "includes/mrflea.h"
-WRITE8_HANDLER( mrflea_gfx_bank_w )
+WRITE8_MEMBER(mrflea_state::mrflea_gfx_bank_w)
{
- mrflea_state *state = space->machine().driver_data<mrflea_state>();
- state->m_gfx_bank = data;
+ m_gfx_bank = data;
if (data & ~0x14)
logerror("unknown gfx bank: 0x%02x\n", data);
}
-WRITE8_HANDLER( mrflea_videoram_w )
+WRITE8_MEMBER(mrflea_state::mrflea_videoram_w)
{
- mrflea_state *state = space->machine().driver_data<mrflea_state>();
int bank = offset / 0x400;
offset &= 0x3ff;
- state->m_videoram[offset] = data;
- state->m_videoram[offset + 0x400] = bank;
+ m_videoram[offset] = data;
+ m_videoram[offset + 0x400] = bank;
/* the address range that tile data is written to sets one bit of
the bank select. The remaining bits are from a video register. */
}
-WRITE8_HANDLER( mrflea_spriteram_w )
+WRITE8_MEMBER(mrflea_state::mrflea_spriteram_w)
{
- mrflea_state *state = space->machine().driver_data<mrflea_state>();
if (offset & 2)
{
/* tile_number */
- state->m_spriteram[offset | 1] = offset & 1;
+ m_spriteram[offset | 1] = offset & 1;
offset &= ~1;
}
- state->m_spriteram[offset] = data;
+ m_spriteram[offset] = data;
}
static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect )
diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c
index 1f813664189..21db07ef9b8 100644
--- a/src/mame/video/mrjong.c
+++ b/src/mame/video/mrjong.c
@@ -68,26 +68,24 @@ PALETTE_INIT( mrjong )
***************************************************************************/
-WRITE8_HANDLER( mrjong_videoram_w )
+WRITE8_MEMBER(mrjong_state::mrjong_videoram_w)
{
- mrjong_state *state = space->machine().driver_data<mrjong_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( mrjong_colorram_w )
+WRITE8_MEMBER(mrjong_state::mrjong_colorram_w)
{
- mrjong_state *state = space->machine().driver_data<mrjong_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( mrjong_flipscreen_w )
+WRITE8_MEMBER(mrjong_state::mrjong_flipscreen_w)
{
- if (flip_screen_get(space->machine()) != BIT(data, 2))
+ if (flip_screen_get(machine()) != BIT(data, 2))
{
- flip_screen_set(space->machine(), BIT(data, 2));
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), BIT(data, 2));
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c
index 3b4fb1ca319..b1abda95ba3 100644
--- a/src/mame/video/ms32.c
+++ b/src/mame/video/ms32.c
@@ -151,29 +151,28 @@ static void update_color(running_machine &machine, int color)
palette_set_color(machine,color,MAKE_RGB(r,g,b));
}
-WRITE32_HANDLER( ms32_brightness_w )
+WRITE32_MEMBER(ms32_state::ms32_brightness_w)
{
- ms32_state *state = space->machine().driver_data<ms32_state>();
- int oldword = state->m_brt[offset];
- COMBINE_DATA(&state->m_brt[offset]);
+ int oldword = m_brt[offset];
+ COMBINE_DATA(&m_brt[offset]);
- if (state->m_brt[offset] != oldword)
+ if (m_brt[offset] != oldword)
{
int bank = ((offset & 2) >> 1) * 0x4000;
//int i;
if (bank == 0)
{
- state->m_brt_r = 0x100 - ((state->m_brt[0] & 0xff00) >> 8);
- state->m_brt_g = 0x100 - ((state->m_brt[0] & 0x00ff) >> 0);
- state->m_brt_b = 0x100 - ((state->m_brt[1] & 0x00ff) >> 0);
+ m_brt_r = 0x100 - ((m_brt[0] & 0xff00) >> 8);
+ m_brt_g = 0x100 - ((m_brt[0] & 0x00ff) >> 0);
+ m_brt_b = 0x100 - ((m_brt[1] & 0x00ff) >> 0);
// for (i = 0;i < 0x3000;i++) // colors 0x3000-0x3fff are not used
- // update_color(space->machine(), i);
+ // update_color(machine(), i);
}
}
-//popmessage("%04x %04x %04x %04x",state->m_brt[0],state->m_brt[1],state->m_brt[2],state->m_brt[3]);
+//popmessage("%04x %04x %04x %04x",m_brt[0],m_brt[1],m_brt[2],m_brt[3]);
}
@@ -181,16 +180,15 @@ WRITE32_HANDLER( ms32_brightness_w )
-WRITE32_HANDLER( ms32_gfxctrl_w )
+WRITE32_MEMBER(ms32_state::ms32_gfxctrl_w)
{
- ms32_state *state = space->machine().driver_data<ms32_state>();
if (ACCESSING_BITS_0_7)
{
/* bit 1 = flip screen */
- state->m_flipscreen = data & 0x02;
- state->m_tx_tilemap->set_flip(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- state->m_bg_tilemap->set_flip(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- state->m_bg_tilemap_alt->set_flip(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen = data & 0x02;
+ m_tx_tilemap->set_flip(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_bg_tilemap->set_flip(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_bg_tilemap_alt->set_flip(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
/* bit 2 used by f1superb, unknown */
diff --git a/src/mame/video/msisaac.c b/src/mame/video/msisaac.c
index 7be0357c41d..5a6209567dc 100644
--- a/src/mame/video/msisaac.c
+++ b/src/mame/video/msisaac.c
@@ -70,45 +70,39 @@ VIDEO_START( msisaac )
***************************************************************************/
-WRITE8_HANDLER( msisaac_fg_scrolly_w )
+WRITE8_MEMBER(msisaac_state::msisaac_fg_scrolly_w)
{
- msisaac_state *state = space->machine().driver_data<msisaac_state>();
- state->m_fg_tilemap->set_scrolly(0, data);
+ m_fg_tilemap->set_scrolly(0, data);
}
-WRITE8_HANDLER( msisaac_fg_scrollx_w )
+WRITE8_MEMBER(msisaac_state::msisaac_fg_scrollx_w)
{
- msisaac_state *state = space->machine().driver_data<msisaac_state>();
- state->m_fg_tilemap->set_scrollx(0, 9 + data);
+ m_fg_tilemap->set_scrollx(0, 9 + data);
}
-WRITE8_HANDLER( msisaac_bg2_scrolly_w )
+WRITE8_MEMBER(msisaac_state::msisaac_bg2_scrolly_w)
{
- msisaac_state *state = space->machine().driver_data<msisaac_state>();
- state->m_bg2_tilemap->set_scrolly(0, data);
+ m_bg2_tilemap->set_scrolly(0, data);
}
-WRITE8_HANDLER( msisaac_bg2_scrollx_w )
+WRITE8_MEMBER(msisaac_state::msisaac_bg2_scrollx_w)
{
- msisaac_state *state = space->machine().driver_data<msisaac_state>();
- state->m_bg2_tilemap->set_scrollx(0, 9 + 2 + data);
+ m_bg2_tilemap->set_scrollx(0, 9 + 2 + data);
}
-WRITE8_HANDLER( msisaac_bg_scrolly_w )
+WRITE8_MEMBER(msisaac_state::msisaac_bg_scrolly_w)
{
- msisaac_state *state = space->machine().driver_data<msisaac_state>();
- state->m_bg_tilemap->set_scrolly(0, data);
+ m_bg_tilemap->set_scrolly(0, data);
}
-WRITE8_HANDLER( msisaac_bg_scrollx_w )
+WRITE8_MEMBER(msisaac_state::msisaac_bg_scrollx_w)
{
- msisaac_state *state = space->machine().driver_data<msisaac_state>();
- state->m_bg_tilemap->set_scrollx(0, 9 + 4 + data);
+ m_bg_tilemap->set_scrollx(0, 9 + 4 + data);
}
#ifdef UNUSED_FUNCTION
-WRITE8_HANDLER( msisaac_textbank1_w )
+WRITE8_MEMBER(msisaac_state::msisaac_textbank1_w)
{
if (textbank1!=data)
{
@@ -118,13 +112,12 @@ WRITE8_HANDLER( msisaac_textbank1_w )
}
#endif
-WRITE8_HANDLER( msisaac_bg2_textbank_w )
+WRITE8_MEMBER(msisaac_state::msisaac_bg2_textbank_w)
{
- msisaac_state *state = space->machine().driver_data<msisaac_state>();
- if (state->m_bg2_textbank != data )
+ if (m_bg2_textbank != data )
{
- state->m_bg2_textbank = data;
- state->m_bg2_tilemap->mark_all_dirty();
+ m_bg2_textbank = data;
+ m_bg2_tilemap->mark_all_dirty();
//check if we are correct on this one
if ((data != 8) && (data != 0))
@@ -134,25 +127,22 @@ WRITE8_HANDLER( msisaac_bg2_textbank_w )
}
}
-WRITE8_HANDLER( msisaac_bg_videoram_w )
+WRITE8_MEMBER(msisaac_state::msisaac_bg_videoram_w)
{
- msisaac_state *state = space->machine().driver_data<msisaac_state>();
- state->m_videoram2[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( msisaac_bg2_videoram_w )
+WRITE8_MEMBER(msisaac_state::msisaac_bg2_videoram_w)
{
- msisaac_state *state = space->machine().driver_data<msisaac_state>();
- state->m_videoram3[offset] = data;
- state->m_bg2_tilemap->mark_tile_dirty(offset);
+ m_videoram3[offset] = data;
+ m_bg2_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( msisaac_fg_videoram_w )
+WRITE8_MEMBER(msisaac_state::msisaac_fg_videoram_w)
{
- msisaac_state *state = space->machine().driver_data<msisaac_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/mugsmash.c b/src/mame/video/mugsmash.c
index 3973c76c9b9..4e4a256f998 100644
--- a/src/mame/video/mugsmash.c
+++ b/src/mame/video/mugsmash.c
@@ -80,12 +80,11 @@ static TILE_GET_INFO( get_mugsmash_tile_info1 )
SET_TILE_INFO(1, tileno, colour, TILE_FLIPYX(fx));
}
-WRITE16_HANDLER( mugsmash_videoram1_w )
+WRITE16_MEMBER(mugsmash_state::mugsmash_videoram1_w)
{
- mugsmash_state *state = space->machine().driver_data<mugsmash_state>();
- state->m_videoram1[offset] = data;
- state->m_tilemap1->mark_tile_dirty(offset / 2);
+ m_videoram1[offset] = data;
+ m_tilemap1->mark_tile_dirty(offset / 2);
}
static TILE_GET_INFO( get_mugsmash_tile_info2 )
@@ -109,34 +108,32 @@ static TILE_GET_INFO( get_mugsmash_tile_info2 )
SET_TILE_INFO(1, tileno, 16 + colour, TILE_FLIPYX(fx));
}
-WRITE16_HANDLER( mugsmash_videoram2_w )
+WRITE16_MEMBER(mugsmash_state::mugsmash_videoram2_w)
{
- mugsmash_state *state = space->machine().driver_data<mugsmash_state>();
- state->m_videoram2[offset] = data;
- state->m_tilemap2->mark_tile_dirty(offset / 2);
+ m_videoram2[offset] = data;
+ m_tilemap2->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER (mugsmash_reg_w)
+WRITE16_MEMBER(mugsmash_state::mugsmash_reg_w)
{
- mugsmash_state *state = space->machine().driver_data<mugsmash_state>();
- state->m_regs1[offset] = data;
+ m_regs1[offset] = data;
// popmessage ("Regs %04x, %04x, %04x, %04x", mugsmash_regs1[0], mugsmash_regs1[1],mugsmash_regs1[2], mugsmash_regs1[3]);
switch (offset)
{
case 0:
- state->m_tilemap2->set_scrollx(0, state->m_regs1[2] + 7);
+ m_tilemap2->set_scrollx(0, m_regs1[2] + 7);
break;
case 1:
- state->m_tilemap2->set_scrolly(0, state->m_regs1[3] + 4);
+ m_tilemap2->set_scrolly(0, m_regs1[3] + 4);
break;
case 2:
- state->m_tilemap1->set_scrollx(0, state->m_regs1[0] + 3);
+ m_tilemap1->set_scrollx(0, m_regs1[0] + 3);
break;
case 3:
- state->m_tilemap1->set_scrolly(0, state->m_regs1[1] + 4);
+ m_tilemap1->set_scrolly(0, m_regs1[1] + 4);
break;
}
}
diff --git a/src/mame/video/munchmo.c b/src/mame/video/munchmo.c
index 36526015b2f..aeb45437919 100644
--- a/src/mame/video/munchmo.c
+++ b/src/mame/video/munchmo.c
@@ -29,16 +29,14 @@ PALETTE_INIT( mnchmobl )
}
}
-WRITE8_HANDLER( mnchmobl_palette_bank_w )
+WRITE8_MEMBER(munchmo_state::mnchmobl_palette_bank_w)
{
- munchmo_state *state = space->machine().driver_data<munchmo_state>();
- state->m_palette_bank = data & 0x3;
+ m_palette_bank = data & 0x3;
}
-WRITE8_HANDLER( mnchmobl_flipscreen_w )
+WRITE8_MEMBER(munchmo_state::mnchmobl_flipscreen_w)
{
- munchmo_state *state = space->machine().driver_data<munchmo_state>();
- state->m_flipscreen = data;
+ m_flipscreen = data;
}
diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c
index bc48f4a0a18..ba6af16369f 100644
--- a/src/mame/video/mustache.c
+++ b/src/mame/video/mustache.c
@@ -43,39 +43,36 @@ PALETTE_INIT(mustache)
}
}
-WRITE8_HANDLER( mustache_videoram_w )
+WRITE8_MEMBER(mustache_state::mustache_videoram_w)
{
- mustache_state *state = space->machine().driver_data<mustache_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER (mustache_video_control_w)
+WRITE8_MEMBER(mustache_state::mustache_video_control_w)
{
- mustache_state *state = space->machine().driver_data<mustache_state>();
- if (flip_screen_get(space->machine()) != (data & 0x01))
+ if (flip_screen_get(machine()) != (data & 0x01))
{
- flip_screen_set(space->machine(), data & 0x01);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x01);
+ machine().tilemap().mark_all_dirty();
}
/* tile bank */
- if ((state->m_control_byte ^ data) & 0x08)
+ if ((m_control_byte ^ data) & 0x08)
{
- state->m_control_byte = data;
- space->machine().tilemap().mark_all_dirty();
+ m_control_byte = data;
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( mustache_scroll_w )
+WRITE8_MEMBER(mustache_state::mustache_scroll_w)
{
- mustache_state *state = space->machine().driver_data<mustache_state>();
- state->m_bg_tilemap->set_scrollx(0, 0x100 - data);
- state->m_bg_tilemap->set_scrollx(1, 0x100 - data);
- state->m_bg_tilemap->set_scrollx(2, 0x100 - data);
- state->m_bg_tilemap->set_scrollx(3, 0x100);
+ m_bg_tilemap->set_scrollx(0, 0x100 - data);
+ m_bg_tilemap->set_scrollx(1, 0x100 - data);
+ m_bg_tilemap->set_scrollx(2, 0x100 - data);
+ m_bg_tilemap->set_scrollx(3, 0x100);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c
index 9f43aa8e8ef..f17c506cc6f 100644
--- a/src/mame/video/mystston.c
+++ b/src/mame/video/mystston.c
@@ -123,19 +123,18 @@ static void set_palette(running_machine &machine, mystston_state *state)
*
*************************************/
-WRITE8_HANDLER( mystston_video_control_w )
+WRITE8_MEMBER(mystston_state::mystston_video_control_w)
{
- mystston_state *state = space->machine().driver_data<mystston_state>();
- *state->m_video_control = data;
+ *m_video_control = data;
/* D0-D1 - foreground text color */
/* D2 - background page select */
/* D3 - unused */
/* D4-D5 - coin counters in flipped order */
- coin_counter_w(space->machine(), 0, data & 0x20);
- coin_counter_w(space->machine(), 1, data & 0x10);
+ coin_counter_w(machine(), 0, data & 0x20);
+ coin_counter_w(machine(), 1, data & 0x10);
/* D6 - unused */
/* D7 - screen flip */
diff --git a/src/mame/video/mystwarr.c b/src/mame/video/mystwarr.c
index 6064491ab01..1729adf2118 100644
--- a/src/mame/video/mystwarr.c
+++ b/src/mame/video/mystwarr.c
@@ -393,19 +393,17 @@ SCREEN_UPDATE_RGB32(martchmp)
-WRITE16_HANDLER(ddd_053936_enable_w)
+WRITE16_MEMBER(mystwarr_state::ddd_053936_enable_w)
{
- mystwarr_state *state = space->machine().driver_data<mystwarr_state>();
if (ACCESSING_BITS_8_15)
{
- state->m_roz_enable = data & 0x0100;
- state->m_roz_rombank = (data & 0xc000)>>14;
+ m_roz_enable = data & 0x0100;
+ m_roz_rombank = (data & 0xc000)>>14;
}
}
-WRITE16_HANDLER(ddd_053936_clip_w)
+WRITE16_MEMBER(mystwarr_state::ddd_053936_clip_w)
{
- mystwarr_state *state = space->machine().driver_data<mystwarr_state>();
int old, clip_x, clip_y, size_x, size_y;
int minx, maxx, miny, maxy;
@@ -415,14 +413,14 @@ WRITE16_HANDLER(ddd_053936_clip_w)
}
else
{
- old = state->m_clip;
- COMBINE_DATA(&state->m_clip);
- if (state->m_clip != old)
+ old = m_clip;
+ COMBINE_DATA(&m_clip);
+ if (m_clip != old)
{
- clip_x = (state->m_clip & 0x003f) >> 0;
- clip_y = (state->m_clip & 0x0fc0) >> 6;
- size_x = (state->m_clip & 0x3000) >> 12;
- size_y = (state->m_clip & 0xc000) >> 14;
+ clip_x = (m_clip & 0x003f) >> 0;
+ clip_y = (m_clip & 0x0fc0) >> 6;
+ size_x = (m_clip & 0x3000) >> 12;
+ size_y = (m_clip & 0xc000) >> 14;
switch (size_x)
{
@@ -449,10 +447,10 @@ WRITE16_HANDLER(ddd_053936_clip_w)
}
// reference: 223e5c in gaiapolis (ROMs 34j and 36m)
-READ16_HANDLER(gai_053936_tilerom_0_r)
+READ16_MEMBER(mystwarr_state::gai_053936_tilerom_0_r)
{
- UINT8 *ROM1 = (UINT8 *)space->machine().region("gfx4")->base();
- UINT8 *ROM2 = (UINT8 *)space->machine().region("gfx4")->base();
+ UINT8 *ROM1 = (UINT8 *)machine().region("gfx4")->base();
+ UINT8 *ROM2 = (UINT8 *)machine().region("gfx4")->base();
ROM1 += 0x20000;
ROM2 += 0x20000+0x40000;
@@ -460,10 +458,10 @@ READ16_HANDLER(gai_053936_tilerom_0_r)
return ((ROM1[offset]<<8) | ROM2[offset]);
}
-READ16_HANDLER(ddd_053936_tilerom_0_r)
+READ16_MEMBER(mystwarr_state::ddd_053936_tilerom_0_r)
{
- UINT8 *ROM1 = (UINT8 *)space->machine().region("gfx4")->base();
- UINT8 *ROM2 = (UINT8 *)space->machine().region("gfx4")->base();
+ UINT8 *ROM1 = (UINT8 *)machine().region("gfx4")->base();
+ UINT8 *ROM2 = (UINT8 *)machine().region("gfx4")->base();
ROM2 += 0x40000;
@@ -471,30 +469,28 @@ READ16_HANDLER(ddd_053936_tilerom_0_r)
}
// reference: 223e1a in gaiapolis (ROM 36j)
-READ16_HANDLER(ddd_053936_tilerom_1_r)
+READ16_MEMBER(mystwarr_state::ddd_053936_tilerom_1_r)
{
- UINT8 *ROM = (UINT8 *)space->machine().region("gfx4")->base();
+ UINT8 *ROM = (UINT8 *)machine().region("gfx4")->base();
return ROM[offset/2];
}
// reference: 223db0 in gaiapolis (ROMs 32n, 29n, 26n)
-READ16_HANDLER(gai_053936_tilerom_2_r)
+READ16_MEMBER(mystwarr_state::gai_053936_tilerom_2_r)
{
- mystwarr_state *state = space->machine().driver_data<mystwarr_state>();
- UINT8 *ROM = (UINT8 *)space->machine().region("gfx3")->base();
+ UINT8 *ROM = (UINT8 *)machine().region("gfx3")->base();
- offset += (state->m_roz_rombank * 0x100000);
+ offset += (m_roz_rombank * 0x100000);
return ROM[offset/2]<<8;
}
-READ16_HANDLER(ddd_053936_tilerom_2_r)
+READ16_MEMBER(mystwarr_state::ddd_053936_tilerom_2_r)
{
- mystwarr_state *state = space->machine().driver_data<mystwarr_state>();
- UINT8 *ROM = (UINT8 *)space->machine().region("gfx3")->base();
+ UINT8 *ROM = (UINT8 *)machine().region("gfx3")->base();
- offset += (state->m_roz_rombank * 0x100000);
+ offset += (m_roz_rombank * 0x100000);
return ROM[offset]<<8;
}
diff --git a/src/mame/video/n8080.c b/src/mame/video/n8080.c
index 73c3a160485..67491ad8556 100644
--- a/src/mame/video/n8080.c
+++ b/src/mame/video/n8080.c
@@ -8,13 +8,12 @@
#include "includes/n8080.h"
-WRITE8_HANDLER( n8080_video_control_w )
+WRITE8_MEMBER(n8080_state::n8080_video_control_w)
{
- n8080_state *state = space->machine().driver_data<n8080_state>();
- state->m_sheriff_color_mode = (data >> 3) & 3;
- state->m_sheriff_color_data = (data >> 0) & 7;
- flip_screen_set_no_update(space->machine(), data & 0x20);
+ m_sheriff_color_mode = (data >> 3) & 3;
+ m_sheriff_color_data = (data >> 0) & 7;
+ flip_screen_set_no_update(machine(), data & 0x20);
}
diff --git a/src/mame/video/namcofl.c b/src/mame/video/namcofl.c
index db18a8d7774..7b26a53e49b 100644
--- a/src/mame/video/namcofl.c
+++ b/src/mame/video/namcofl.c
@@ -104,10 +104,9 @@ SCREEN_UPDATE_IND16( namcofl )
// groups of sprites. I am unsure how to differentiate those groups
// at this time however.
-WRITE32_HANDLER(namcofl_spritebank_w)
+WRITE32_MEMBER(namcofl_state::namcofl_spritebank_w)
{
- namcofl_state *state = space->machine().driver_data<namcofl_state>();
- COMBINE_DATA(&state->m_sprbank);
+ COMBINE_DATA(&m_sprbank);
}
static int FLobjcode2tile( running_machine &machine, int code )
diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c
index 977f79cc7e3..7d4c58d8d81 100644
--- a/src/mame/video/namcona1.c
+++ b/src/mame/video/namcona1.c
@@ -136,25 +136,23 @@ static TILE_GET_INFO( roz_get_info )
/*************************************************************************/
-WRITE16_HANDLER( namcona1_videoram_w )
+WRITE16_MEMBER(namcona1_state::namcona1_videoram_w)
{
- namcona1_state *state = space->machine().driver_data<namcona1_state>();
- UINT16 *videoram = state->m_videoram;
+ UINT16 *videoram = m_videoram;
COMBINE_DATA( &videoram[offset] );
if( offset<0x8000/2 )
{
- state->m_bg_tilemap[offset/0x1000]->mark_tile_dirty(offset&0xfff );
+ m_bg_tilemap[offset/0x1000]->mark_tile_dirty(offset&0xfff );
}
else if( offset<0xa000/2 )
{
- state->m_roz_tilemap ->mark_all_dirty();
+ m_roz_tilemap ->mark_all_dirty();
}
} /* namcona1_videoram_w */
-READ16_HANDLER( namcona1_videoram_r )
+READ16_MEMBER(namcona1_state::namcona1_videoram_r)
{
- namcona1_state *state = space->machine().driver_data<namcona1_state>();
- UINT16 *videoram = state->m_videoram;
+ UINT16 *videoram = m_videoram;
return videoram[offset];
} /* namcona1_videoram_r */
@@ -179,23 +177,21 @@ UpdatePalette(running_machine &machine, int offset )
palette_set_color_rgb( machine, offset, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0));
} /* namcona1_paletteram_w */
-READ16_HANDLER( namcona1_paletteram_r )
+READ16_MEMBER(namcona1_state::namcona1_paletteram_r)
{
- namcona1_state *state = space->machine().driver_data<namcona1_state>();
- return state->m_generic_paletteram_16[offset];
+ return m_generic_paletteram_16[offset];
} /* namcona1_paletteram_r */
-WRITE16_HANDLER( namcona1_paletteram_w )
+WRITE16_MEMBER(namcona1_state::namcona1_paletteram_w)
{
- namcona1_state *state = space->machine().driver_data<namcona1_state>();
- COMBINE_DATA( &state->m_generic_paletteram_16[offset] );
- if( state->m_vreg[0x8e/2] )
+ COMBINE_DATA( &m_generic_paletteram_16[offset] );
+ if( m_vreg[0x8e/2] )
{ /* graphics enabled; update palette immediately */
- UpdatePalette(space->machine(), offset );
+ UpdatePalette(machine(), offset );
}
else
{
- state->m_palette_is_dirty = 1;
+ m_palette_is_dirty = 1;
}
}
@@ -236,48 +232,46 @@ static const gfx_layout cg_layout_4bpp =
64*8
}; /* cg_layout_4bpp */
-READ16_HANDLER( namcona1_gfxram_r )
+READ16_MEMBER(namcona1_state::namcona1_gfxram_r)
{
- namcona1_state *state = space->machine().driver_data<namcona1_state>();
- UINT16 type = state->m_vreg[0x0c/2];
+ UINT16 type = m_vreg[0x0c/2];
if( type == 0x03 )
{
if( offset<0x4000 )
{
- return state->m_shaperam[offset];
+ return m_shaperam[offset];
}
}
else if( type == 0x02 )
{
- return state->m_cgram[offset];
+ return m_cgram[offset];
}
return 0x0000;
} /* namcona1_gfxram_r */
-WRITE16_HANDLER( namcona1_gfxram_w )
+WRITE16_MEMBER(namcona1_state::namcona1_gfxram_w)
{
- namcona1_state *state = space->machine().driver_data<namcona1_state>();
- UINT16 type = state->m_vreg[0x0c/2];
+ UINT16 type = m_vreg[0x0c/2];
UINT16 old_word;
if( type == 0x03 )
{
if( offset<0x4000 )
{
- old_word = state->m_shaperam[offset];
- COMBINE_DATA( &state->m_shaperam[offset] );
- if( state->m_shaperam[offset]!=old_word )
- gfx_element_mark_dirty(space->machine().gfx[2], offset/4);
+ old_word = m_shaperam[offset];
+ COMBINE_DATA( &m_shaperam[offset] );
+ if( m_shaperam[offset]!=old_word )
+ gfx_element_mark_dirty(machine().gfx[2], offset/4);
}
}
else if( type == 0x02 )
{
- old_word = state->m_cgram[offset];
- COMBINE_DATA( &state->m_cgram[offset] );
- if( state->m_cgram[offset]!=old_word )
+ old_word = m_cgram[offset];
+ COMBINE_DATA( &m_cgram[offset] );
+ if( m_cgram[offset]!=old_word )
{
- gfx_element_mark_dirty(space->machine().gfx[0], offset/0x20);
- gfx_element_mark_dirty(space->machine().gfx[1], offset/0x20);
+ gfx_element_mark_dirty(machine().gfx[0], offset/0x20);
+ gfx_element_mark_dirty(machine().gfx[1], offset/0x20);
}
}
} /* namcona1_gfxram_w */
diff --git a/src/mame/video/namcos21.c b/src/mame/video/namcos21.c
index 15e586f48c2..7574117c01e 100644
--- a/src/mame/video/namcos21.c
+++ b/src/mame/video/namcos21.c
@@ -13,34 +13,29 @@ Namco System 21 Video Hardware
#define FRAMEBUFFER_SIZE_IN_BYTES (sizeof(UINT16)*NAMCOS21_POLY_FRAME_WIDTH*NAMCOS21_POLY_FRAME_HEIGHT)
-READ16_HANDLER(winrun_gpu_color_r)
+READ16_MEMBER(namcos21_state::winrun_gpu_color_r)
{
- namcos21_state *state = space->machine().driver_data<namcos21_state>();
- return state->m_winrun_color;
+ return m_winrun_color;
}
-WRITE16_HANDLER(winrun_gpu_color_w)
+WRITE16_MEMBER(namcos21_state::winrun_gpu_color_w)
{
- namcos21_state *state = space->machine().driver_data<namcos21_state>();
- COMBINE_DATA( &state->m_winrun_color );
+ COMBINE_DATA( &m_winrun_color );
}
-READ16_HANDLER(winrun_gpu_register_r)
+READ16_MEMBER(namcos21_state::winrun_gpu_register_r)
{
- namcos21_state *state = space->machine().driver_data<namcos21_state>();
- return state->m_winrun_gpu_register[offset];
+ return m_winrun_gpu_register[offset];
}
-WRITE16_HANDLER(winrun_gpu_register_w)
+WRITE16_MEMBER(namcos21_state::winrun_gpu_register_w)
{
- namcos21_state *state = space->machine().driver_data<namcos21_state>();
- COMBINE_DATA( &state->m_winrun_gpu_register[offset] );
+ COMBINE_DATA( &m_winrun_gpu_register[offset] );
}
-WRITE16_HANDLER( winrun_gpu_videoram_w)
+WRITE16_MEMBER(namcos21_state::winrun_gpu_videoram_w)
{
- namcos21_state *state = space->machine().driver_data<namcos21_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
int color = data>>8;
int mask = data&0xff;
int i;
@@ -53,10 +48,9 @@ WRITE16_HANDLER( winrun_gpu_videoram_w)
}
} /* winrun_gpu_videoram_w */
-READ16_HANDLER( winrun_gpu_videoram_r )
+READ16_MEMBER(namcos21_state::winrun_gpu_videoram_r)
{
- namcos21_state *state = space->machine().driver_data<namcos21_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
return videoram[offset]<<8;
} /* winrun_gpu_videoram_r */
diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c
index a8563d77621..8f57ca28477 100644
--- a/src/mame/video/namcos22.c
+++ b/src/mame/video/namcos22.c
@@ -268,16 +268,14 @@ UpdateVideoMixer( running_machine &machine )
}
}
-READ32_HANDLER( namcos22_gamma_r )
+READ32_MEMBER(namcos22_state::namcos22_gamma_r)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- return state->m_gamma[offset];
+ return m_gamma[offset];
}
-WRITE32_HANDLER( namcos22_gamma_w )
+WRITE32_MEMBER(namcos22_state::namcos22_gamma_w)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- COMBINE_DATA( &state->m_gamma[offset] );
+ COMBINE_DATA( &m_gamma[offset] );
}
static struct
@@ -1230,24 +1228,22 @@ namcos22_point_rom_r( running_machine &machine, offs_t offs )
}
-WRITE32_HANDLER( namcos22s_czram_w )
+WRITE32_MEMBER(namcos22_state::namcos22s_czram_w)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- int bank = nthword(state->m_czattr,0xa/2)&3;
- UINT16 *czram = state->m_banked_czram[bank];
+ int bank = nthword(m_czattr,0xa/2)&3;
+ UINT16 *czram = m_banked_czram[bank];
UINT32 dat = (czram[offset*2]<<16)|czram[offset*2+1];
UINT32 prev = dat;
COMBINE_DATA( &dat );
czram[offset*2] = dat>>16;
czram[offset*2+1] = dat&0xffff;
- state->m_cz_was_written[bank] |= (prev^dat);
+ m_cz_was_written[bank] |= (prev^dat);
}
-READ32_HANDLER( namcos22s_czram_r )
+READ32_MEMBER(namcos22_state::namcos22s_czram_r)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- int bank = nthword(state->m_czattr,0xa/2)&3;
- const UINT16 *czram = state->m_banked_czram[bank];
+ int bank = nthword(m_czattr,0xa/2)&3;
+ const UINT16 *czram = m_banked_czram[bank];
return (czram[offset*2]<<16)|czram[offset*2+1];
}
@@ -1745,10 +1741,9 @@ DrawSprites( running_machine &machine, bitmap_rgb32 &bitmap, const rectangle &cl
}
} /* DrawSprites */
-READ32_HANDLER( namcos22s_vics_control_r )
+READ32_MEMBER(namcos22_state::namcos22s_vics_control_r)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- UINT32 ret = state->m_vics_control[offset];
+ UINT32 ret = m_vics_control[offset];
switch (offset*4)
{
@@ -1770,10 +1765,9 @@ READ32_HANDLER( namcos22s_vics_control_r )
return ret;
}
-WRITE32_HANDLER( namcos22s_vics_control_w )
+WRITE32_MEMBER(namcos22_state::namcos22s_vics_control_w)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- COMBINE_DATA(&state->m_vics_control[offset]);
+ COMBINE_DATA(&m_vics_control[offset]);
}
@@ -1811,33 +1805,30 @@ static TILE_GET_INFO( TextTilemapGetInfo )
SET_TILE_INFO( GFX_CHAR,data&0x03ff,data>>12,TILE_FLIPYX((data&0x0c00)>>10) );
}
-READ32_HANDLER( namcos22_textram_r )
+READ32_MEMBER(namcos22_state::namcos22_textram_r)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- return state->m_textram[offset];
+ return m_textram[offset];
}
-WRITE32_HANDLER( namcos22_textram_w )
+WRITE32_MEMBER(namcos22_state::namcos22_textram_w)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- COMBINE_DATA( &state->m_textram[offset] );
- state->m_bgtilemap->mark_tile_dirty(offset*2 );
- state->m_bgtilemap->mark_tile_dirty(offset*2+1 );
+ COMBINE_DATA( &m_textram[offset] );
+ m_bgtilemap->mark_tile_dirty(offset*2 );
+ m_bgtilemap->mark_tile_dirty(offset*2+1 );
}
-READ32_HANDLER( namcos22_tilemapattr_r )
+READ32_MEMBER(namcos22_state::namcos22_tilemapattr_r)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
switch (offset)
{
case 2:
{
- UINT16 lo,hi = (state->m_tilemapattr[offset] & 0xffff0000) >> 16;
+ UINT16 lo,hi = (m_tilemapattr[offset] & 0xffff0000) >> 16;
// assume current scanline, 0x1ff if in vblank (used in alpinesa)
// or maybe relative to posirq?
- if (space->machine().primary_screen->vblank()) lo = 0x1ff;
- else lo = space->machine().primary_screen->vpos() >> 1;
+ if (machine().primary_screen->vblank()) lo = 0x1ff;
+ else lo = machine().primary_screen->vpos() >> 1;
// dirtdash has slowdowns if high bit is clear, why??
return hi<<16 | lo | 0x8000;
}
@@ -1851,10 +1842,10 @@ READ32_HANDLER( namcos22_tilemapattr_r )
break;
}
- return state->m_tilemapattr[offset];
+ return m_tilemapattr[offset];
}
-WRITE32_HANDLER( namcos22_tilemapattr_w )
+WRITE32_MEMBER(namcos22_state::namcos22_tilemapattr_w)
{
/*
0.hiword R/W x offset
@@ -1866,9 +1857,8 @@ WRITE32_HANDLER( namcos22_tilemapattr_w )
3.hiword ? unused?
3.loword R ???
*/
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- COMBINE_DATA( &state->m_tilemapattr[offset] );
-// popmessage("%08x\n%08x\n%08x\n%08x\n",state->m_tilemapattr[0],state->m_tilemapattr[1],state->m_tilemapattr[2],state->m_tilemapattr[3]);
+ COMBINE_DATA( &m_tilemapattr[offset] );
+// popmessage("%08x\n%08x\n%08x\n%08x\n",m_tilemapattr[0],m_tilemapattr[1],m_tilemapattr[2],m_tilemapattr[3]);
}
@@ -1902,40 +1892,38 @@ low byte of each word:
*/
-READ32_HANDLER( namcos22s_spotram_r )
+READ32_MEMBER(namcos22_state::namcos22s_spotram_r)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
if (offset == 1)
{
// read
- if (state->m_spot_read_address >= SPOTRAM_SIZE)
+ if (m_spot_read_address >= SPOTRAM_SIZE)
{
- state->m_spot_read_address = 0;
+ m_spot_read_address = 0;
}
- return state->m_spotram[state->m_spot_read_address++] << 16;
+ return m_spotram[m_spot_read_address++] << 16;
}
return 0;
}
-WRITE32_HANDLER( namcos22s_spotram_w )
+WRITE32_MEMBER(namcos22_state::namcos22s_spotram_w)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
if (offset == 0)
{
if (ACCESSING_BITS_16_31)
{
// set address
- state->m_spot_read_address = data>>(16+1);
- state->m_spot_write_address = data>>(16+1);
+ m_spot_read_address = data>>(16+1);
+ m_spot_write_address = data>>(16+1);
}
else
{
// write
- if (state->m_spot_write_address >= SPOTRAM_SIZE)
+ if (m_spot_write_address >= SPOTRAM_SIZE)
{
- state->m_spot_write_address = 0;
+ m_spot_write_address = 0;
}
- state->m_spotram[state->m_spot_write_address++] = data;
+ m_spotram[m_spot_write_address++] = data;
}
}
else
@@ -1943,7 +1931,7 @@ WRITE32_HANDLER( namcos22s_spotram_w )
if (ACCESSING_BITS_0_15)
{
// enable
- state->m_spot_enable = data & 1;
+ m_spot_enable = data & 1;
}
}
}
@@ -2438,15 +2426,13 @@ BlitPolyObject( running_machine &machine, bitmap_rgb32 &bitmap, int code, float
/*******************************************************************************/
-READ32_HANDLER( namcos22_dspram_r )
+READ32_MEMBER(namcos22_state::namcos22_dspram_r)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- return state->m_polygonram[offset] | 0xff000000; // only d0-23 are connected
+ return m_polygonram[offset] | 0xff000000; // only d0-23 are connected
}
-WRITE32_HANDLER( namcos22_dspram_w )
+WRITE32_MEMBER(namcos22_state::namcos22_dspram_w)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
if (mem_mask & 0x00ff0000)
{
// sign extend or crop
@@ -2457,7 +2443,7 @@ WRITE32_HANDLER( namcos22_dspram_w )
data &= 0xffffff;
}
- COMBINE_DATA( &state->m_polygonram[offset] );
+ COMBINE_DATA( &m_polygonram[offset] );
}
/*******************************************************************************/
@@ -2706,30 +2692,26 @@ namcos22_enable_slave_simulation( running_machine &machine, int enable )
/*********************************************************************************************/
-READ32_HANDLER( namcos22_cgram_r )
+READ32_MEMBER(namcos22_state::namcos22_cgram_r)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- return state->m_cgram[offset];
+ return m_cgram[offset];
}
-WRITE32_HANDLER( namcos22_cgram_w )
+WRITE32_MEMBER(namcos22_state::namcos22_cgram_w)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- COMBINE_DATA( &state->m_cgram[offset] );
- gfx_element_mark_dirty(space->machine().gfx[GFX_CHAR],offset/32);
+ COMBINE_DATA( &m_cgram[offset] );
+ gfx_element_mark_dirty(machine().gfx[GFX_CHAR],offset/32);
}
-READ32_HANDLER( namcos22_paletteram_r )
+READ32_MEMBER(namcos22_state::namcos22_paletteram_r)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- return state->m_generic_paletteram_32[offset];
+ return m_generic_paletteram_32[offset];
}
-WRITE32_HANDLER( namcos22_paletteram_w )
+WRITE32_MEMBER(namcos22_state::namcos22_paletteram_w)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- COMBINE_DATA( &state->m_generic_paletteram_32[offset] );
- state->m_dirtypal[offset&(0x7fff/4)] = 1;
+ COMBINE_DATA( &m_generic_paletteram_32[offset] );
+ m_dirtypal[offset&(0x7fff/4)] = 1;
}
static void namcos22_reset(running_machine &machine)
@@ -2919,17 +2901,15 @@ SCREEN_UPDATE_RGB32( namcos22 )
return 0;
}
-WRITE16_HANDLER( namcos22_dspram16_bank_w )
+WRITE16_MEMBER(namcos22_state::namcos22_dspram16_bank_w)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- COMBINE_DATA( &state->m_dspram_bank );
+ COMBINE_DATA( &m_dspram_bank );
}
-READ16_HANDLER( namcos22_dspram16_r )
+READ16_MEMBER(namcos22_state::namcos22_dspram16_r)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- UINT32 value = state->m_polygonram[offset];
- switch( state->m_dspram_bank )
+ UINT32 value = m_polygonram[offset];
+ switch( m_dspram_bank )
{
case 0:
value &= 0xffff;
@@ -2940,7 +2920,7 @@ READ16_HANDLER( namcos22_dspram16_r )
break;
case 2:
- state->m_mUpperWordLatch = value>>16;
+ m_mUpperWordLatch = value>>16;
value &= 0xffff;
break;
@@ -2950,13 +2930,12 @@ READ16_HANDLER( namcos22_dspram16_r )
return (UINT16)value;
} /* namcos22_dspram16_r */
-WRITE16_HANDLER( namcos22_dspram16_w )
+WRITE16_MEMBER(namcos22_state::namcos22_dspram16_w)
{
- namcos22_state *state = space->machine().driver_data<namcos22_state>();
- UINT32 value = state->m_polygonram[offset];
+ UINT32 value = m_polygonram[offset];
UINT16 lo = value&0xffff;
UINT16 hi = value>>16;
- switch( state->m_dspram_bank )
+ switch( m_dspram_bank )
{
case 0:
COMBINE_DATA( &lo );
@@ -2968,11 +2947,11 @@ WRITE16_HANDLER( namcos22_dspram16_w )
case 2:
COMBINE_DATA( &lo );
- hi = state->m_mUpperWordLatch;
+ hi = m_mUpperWordLatch;
break;
default:
break;
}
- state->m_polygonram[offset] = (hi<<16)|lo;
+ m_polygonram[offset] = (hi<<16)|lo;
} /* namcos22_dspram16_w */
diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c
index 69a4f2aab21..1f64c6268a9 100644
--- a/src/mame/video/namcos86.c
+++ b/src/mame/video/namcos86.c
@@ -159,41 +159,36 @@ VIDEO_START( namcos86 )
***************************************************************************/
-READ8_HANDLER( rthunder_videoram1_r )
+READ8_MEMBER(namcos86_state::rthunder_videoram1_r)
{
- namcos86_state *state = space->machine().driver_data<namcos86_state>();
- return state->m_rthunder_videoram1[offset];
+ return m_rthunder_videoram1[offset];
}
-WRITE8_HANDLER( rthunder_videoram1_w )
+WRITE8_MEMBER(namcos86_state::rthunder_videoram1_w)
{
- namcos86_state *state = space->machine().driver_data<namcos86_state>();
- state->m_rthunder_videoram1[offset] = data;
- state->m_bg_tilemap[offset/0x1000]->mark_tile_dirty((offset & 0xfff)/2);
+ m_rthunder_videoram1[offset] = data;
+ m_bg_tilemap[offset/0x1000]->mark_tile_dirty((offset & 0xfff)/2);
}
-READ8_HANDLER( rthunder_videoram2_r )
+READ8_MEMBER(namcos86_state::rthunder_videoram2_r)
{
- namcos86_state *state = space->machine().driver_data<namcos86_state>();
- return state->m_rthunder_videoram2[offset];
+ return m_rthunder_videoram2[offset];
}
-WRITE8_HANDLER( rthunder_videoram2_w )
+WRITE8_MEMBER(namcos86_state::rthunder_videoram2_w)
{
- namcos86_state *state = space->machine().driver_data<namcos86_state>();
- state->m_rthunder_videoram2[offset] = data;
- state->m_bg_tilemap[2+offset/0x1000]->mark_tile_dirty((offset & 0xfff)/2);
+ m_rthunder_videoram2[offset] = data;
+ m_bg_tilemap[2+offset/0x1000]->mark_tile_dirty((offset & 0xfff)/2);
}
-WRITE8_HANDLER( rthunder_tilebank_select_w )
+WRITE8_MEMBER(namcos86_state::rthunder_tilebank_select_w)
{
- namcos86_state *state = space->machine().driver_data<namcos86_state>();
int bit = BIT(offset,10);
- if (state->m_tilebank != bit)
+ if (m_tilebank != bit)
{
- state->m_tilebank = bit;
- state->m_bg_tilemap[0]->mark_all_dirty();
- state->m_bg_tilemap[1]->mark_all_dirty();
+ m_tilebank = bit;
+ m_bg_tilemap[0]->mark_all_dirty();
+ m_bg_tilemap[1]->mark_all_dirty();
}
}
@@ -214,45 +209,42 @@ static void scroll_w(address_space *space, int offset, int data, int layer)
}
}
-WRITE8_HANDLER( rthunder_scroll0_w )
+WRITE8_MEMBER(namcos86_state::rthunder_scroll0_w)
{
- scroll_w(space,offset,data,0);
+ scroll_w(&space,offset,data,0);
}
-WRITE8_HANDLER( rthunder_scroll1_w )
+WRITE8_MEMBER(namcos86_state::rthunder_scroll1_w)
{
- scroll_w(space,offset,data,1);
+ scroll_w(&space,offset,data,1);
}
-WRITE8_HANDLER( rthunder_scroll2_w )
+WRITE8_MEMBER(namcos86_state::rthunder_scroll2_w)
{
- scroll_w(space,offset,data,2);
+ scroll_w(&space,offset,data,2);
}
-WRITE8_HANDLER( rthunder_scroll3_w )
+WRITE8_MEMBER(namcos86_state::rthunder_scroll3_w)
{
- scroll_w(space,offset,data,3);
+ scroll_w(&space,offset,data,3);
}
-WRITE8_HANDLER( rthunder_backcolor_w )
+WRITE8_MEMBER(namcos86_state::rthunder_backcolor_w)
{
- namcos86_state *state = space->machine().driver_data<namcos86_state>();
- state->m_backcolor = data;
+ m_backcolor = data;
}
-READ8_HANDLER( rthunder_spriteram_r )
+READ8_MEMBER(namcos86_state::rthunder_spriteram_r)
{
- namcos86_state *state = space->machine().driver_data<namcos86_state>();
- return state->m_rthunder_spriteram[offset];
+ return m_rthunder_spriteram[offset];
}
-WRITE8_HANDLER( rthunder_spriteram_w )
+WRITE8_MEMBER(namcos86_state::rthunder_spriteram_w)
{
- namcos86_state *state = space->machine().driver_data<namcos86_state>();
- state->m_rthunder_spriteram[offset] = data;
+ m_rthunder_spriteram[offset] = data;
/* a write to this offset tells the sprite chip to buffer the sprite list */
if (offset == 0x1ff2)
- state->m_copy_sprites = 1;
+ m_copy_sprites = 1;
}
diff --git a/src/mame/video/naughtyb.c b/src/mame/video/naughtyb.c
index 957429fd251..1ad816b05dd 100644
--- a/src/mame/video/naughtyb.c
+++ b/src/mame/video/naughtyb.c
@@ -110,30 +110,28 @@ VIDEO_START( naughtyb )
-WRITE8_HANDLER( naughtyb_videoreg_w )
+WRITE8_MEMBER(naughtyb_state::naughtyb_videoreg_w)
{
- naughtyb_state *state = space->machine().driver_data<naughtyb_state>();
// bits 4+5 control the sound circuit
- pleiads_sound_control_c_w(space->machine().device("cust"),offset,data);
+ pleiads_sound_control_c_w(machine().device("cust"),offset,data);
- state->m_cocktail =
- ( ( input_port_read(space->machine(), "DSW0") & 0x80 ) && // cabinet == cocktail
+ m_cocktail =
+ ( ( input_port_read(machine(), "DSW0") & 0x80 ) && // cabinet == cocktail
( data & 0x01 ) ); // handling player 2
- state->m_palreg = (data >> 1) & 0x03; // palette sel is bit 1 & 2
- state->m_bankreg = (data >> 2) & 0x01; // banksel is just bit 2
+ m_palreg = (data >> 1) & 0x03; // palette sel is bit 1 & 2
+ m_bankreg = (data >> 2) & 0x01; // banksel is just bit 2
}
-WRITE8_HANDLER( popflame_videoreg_w )
+WRITE8_MEMBER(naughtyb_state::popflame_videoreg_w)
{
- naughtyb_state *state = space->machine().driver_data<naughtyb_state>();
// bits 4+5 control the sound circuit
- pleiads_sound_control_c_w(space->machine().device("cust"),offset,data);
+ pleiads_sound_control_c_w(machine().device("cust"),offset,data);
- state->m_cocktail =
- ( ( input_port_read(space->machine(), "DSW0") & 0x80 ) && // cabinet == cocktail
+ m_cocktail =
+ ( ( input_port_read(machine(), "DSW0") & 0x80 ) && // cabinet == cocktail
( data & 0x01 ) ); // handling player 2
- state->m_palreg = (data >> 1) & 0x03; // palette sel is bit 1 & 2
- state->m_bankreg = (data >> 3) & 0x01; // banksel is just bit 3
+ m_palreg = (data >> 1) & 0x03; // palette sel is bit 1 & 2
+ m_bankreg = (data >> 3) & 0x01; // banksel is just bit 3
}
diff --git a/src/mame/video/nbmj8688.c b/src/mame/video/nbmj8688.c
index 9435b903689..2734062d31f 100644
--- a/src/mame/video/nbmj8688.c
+++ b/src/mame/video/nbmj8688.c
@@ -11,7 +11,6 @@
#include "includes/nbmj8688.h"
-static void mjsikaku_vramflip(nbmj8688_state *state);
static void mbmj8688_gfxdraw(running_machine &machine, int gfxtype);
@@ -103,10 +102,9 @@ PALETTE_INIT( mbmj8688_16bit )
-WRITE8_HANDLER( nbmj8688_clut_w )
+WRITE8_MEMBER(nbmj8688_state::nbmj8688_clut_w)
{
- nbmj8688_state *state = space->machine().driver_data<nbmj8688_state>();
- state->m_clut[offset] = (data ^ 0xff);
+ m_clut[offset] = (data ^ 0xff);
}
/******************************************************************************
@@ -114,118 +112,110 @@ WRITE8_HANDLER( nbmj8688_clut_w )
******************************************************************************/
-WRITE8_HANDLER( nbmj8688_blitter_w )
+WRITE8_MEMBER(nbmj8688_state::nbmj8688_blitter_w)
{
- nbmj8688_state *state = space->machine().driver_data<nbmj8688_state>();
switch (offset)
{
- case 0x00: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0xff00) | data; break;
- case 0x01: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0x00ff) | (data << 8); break;
- case 0x02: state->m_blitter_destx = data; break;
- case 0x03: state->m_blitter_desty = data; break;
- case 0x04: state->m_blitter_sizex = data; break;
- case 0x05: state->m_blitter_sizey = data;
+ case 0x00: m_blitter_src_addr = (m_blitter_src_addr & 0xff00) | data; break;
+ case 0x01: m_blitter_src_addr = (m_blitter_src_addr & 0x00ff) | (data << 8); break;
+ case 0x02: m_blitter_destx = data; break;
+ case 0x03: m_blitter_desty = data; break;
+ case 0x04: m_blitter_sizex = data; break;
+ case 0x05: m_blitter_sizey = data;
/* writing here also starts the blit */
- mbmj8688_gfxdraw(space->machine(), state->m_mjsikaku_gfxmode);
+ mbmj8688_gfxdraw(machine(), m_mjsikaku_gfxmode);
break;
- case 0x06: state->m_blitter_direction_x = (data & 0x01) ? 1 : 0;
- state->m_blitter_direction_y = (data & 0x02) ? 1 : 0;
- state->m_mjsikaku_flipscreen = (data & 0x04) ? 0 : 1;
- state->m_mjsikaku_dispflag = (data & 0x08) ? 0 : 1;
- mjsikaku_vramflip(state);
+ case 0x06: m_blitter_direction_x = (data & 0x01) ? 1 : 0;
+ m_blitter_direction_y = (data & 0x02) ? 1 : 0;
+ m_mjsikaku_flipscreen = (data & 0x04) ? 0 : 1;
+ m_mjsikaku_dispflag = (data & 0x08) ? 0 : 1;
+ mjsikaku_vramflip();
break;
case 0x07: break;
}
}
-WRITE8_HANDLER( mjsikaku_gfxflag2_w )
+WRITE8_MEMBER(nbmj8688_state::mjsikaku_gfxflag2_w)
{
- nbmj8688_state *state = space->machine().driver_data<nbmj8688_state>();
- state->m_mjsikaku_gfxflag2 = data;
+ m_mjsikaku_gfxflag2 = data;
if (nb1413m3_type == NB1413M3_SEIHAM
|| nb1413m3_type == NB1413M3_KORINAI
|| nb1413m3_type == NB1413M3_KORINAIM
|| nb1413m3_type == NB1413M3_LIVEGAL)
- state->m_mjsikaku_gfxflag2 ^= 0x20;
+ m_mjsikaku_gfxflag2 ^= 0x20;
if (nb1413m3_type == NB1413M3_OJOUSANM
|| nb1413m3_type == NB1413M3_RYUUHA)
- state->m_mjsikaku_gfxflag2 |= 0x20;
+ m_mjsikaku_gfxflag2 |= 0x20;
}
-static WRITE8_HANDLER( mjsikaku_gfxflag3_w )
+WRITE8_MEMBER(nbmj8688_state::mjsikaku_gfxflag3_w)
{
- nbmj8688_state *state = space->machine().driver_data<nbmj8688_state>();
- state->m_mjsikaku_gfxflag3 = (data & 0xe0);
+ m_mjsikaku_gfxflag3 = (data & 0xe0);
}
-WRITE8_HANDLER( mjsikaku_scrolly_w )
+WRITE8_MEMBER(nbmj8688_state::mjsikaku_scrolly_w)
{
- nbmj8688_state *state = space->machine().driver_data<nbmj8688_state>();
- state->m_mjsikaku_scrolly = data;
+ m_mjsikaku_scrolly = data;
}
-WRITE8_HANDLER( mjsikaku_romsel_w )
+WRITE8_MEMBER(nbmj8688_state::mjsikaku_romsel_w)
{
- nbmj8688_state *state = space->machine().driver_data<nbmj8688_state>();
- int gfxlen = space->machine().region("gfx1")->bytes();
- state->m_mjsikaku_gfxrom = (data & 0x0f);
+ int gfxlen = machine().region("gfx1")->bytes();
+ m_mjsikaku_gfxrom = (data & 0x0f);
- if ((state->m_mjsikaku_gfxrom << 17) > (gfxlen - 1))
+ if ((m_mjsikaku_gfxrom << 17) > (gfxlen - 1))
{
#ifdef MAME_DEBUG
popmessage("GFXROM BANK OVER!!");
#endif
- state->m_mjsikaku_gfxrom &= (gfxlen / 0x20000 - 1);
+ m_mjsikaku_gfxrom &= (gfxlen / 0x20000 - 1);
}
}
-WRITE8_HANDLER( secolove_romsel_w )
+WRITE8_MEMBER(nbmj8688_state::secolove_romsel_w)
{
- nbmj8688_state *state = space->machine().driver_data<nbmj8688_state>();
- int gfxlen = space->machine().region("gfx1")->bytes();
- state->m_mjsikaku_gfxrom = ((data & 0xc0) >> 4) + (data & 0x03);
+ int gfxlen = machine().region("gfx1")->bytes();
+ m_mjsikaku_gfxrom = ((data & 0xc0) >> 4) + (data & 0x03);
mjsikaku_gfxflag2_w(space, 0, data);
- if ((state->m_mjsikaku_gfxrom << 17) > (gfxlen - 1))
+ if ((m_mjsikaku_gfxrom << 17) > (gfxlen - 1))
{
#ifdef MAME_DEBUG
popmessage("GFXROM BANK OVER!!");
#endif
- state->m_mjsikaku_gfxrom &= (gfxlen / 0x20000 - 1);
+ m_mjsikaku_gfxrom &= (gfxlen / 0x20000 - 1);
}
}
-WRITE8_HANDLER( crystalg_romsel_w )
+WRITE8_MEMBER(nbmj8688_state::crystalg_romsel_w)
{
- nbmj8688_state *state = space->machine().driver_data<nbmj8688_state>();
- int gfxlen = space->machine().region("gfx1")->bytes();
- state->m_mjsikaku_gfxrom = (data & 0x03);
+ int gfxlen = machine().region("gfx1")->bytes();
+ m_mjsikaku_gfxrom = (data & 0x03);
mjsikaku_gfxflag2_w(space, 0, data);
- if ((state->m_mjsikaku_gfxrom << 17) > (gfxlen - 1))
+ if ((m_mjsikaku_gfxrom << 17) > (gfxlen - 1))
{
#ifdef MAME_DEBUG
popmessage("GFXROM BANK OVER!!");
#endif
- state->m_mjsikaku_gfxrom &= (gfxlen / 0x20000 - 1);
+ m_mjsikaku_gfxrom &= (gfxlen / 0x20000 - 1);
}
}
-WRITE8_HANDLER( seiha_romsel_w )
+WRITE8_MEMBER(nbmj8688_state::seiha_romsel_w)
{
- nbmj8688_state *state = space->machine().driver_data<nbmj8688_state>();
- int gfxlen = space->machine().region("gfx1")->bytes();
- state->m_mjsikaku_gfxrom = (data & 0x1f);
+ int gfxlen = machine().region("gfx1")->bytes();
+ m_mjsikaku_gfxrom = (data & 0x1f);
mjsikaku_gfxflag3_w(space, 0, data);
- if ((state->m_mjsikaku_gfxrom << 17) > (gfxlen - 1))
+ if ((m_mjsikaku_gfxrom << 17) > (gfxlen - 1))
{
#ifdef MAME_DEBUG
popmessage("GFXROM BANK OVER!!");
#endif
- state->m_mjsikaku_gfxrom &= (gfxlen / 0x20000 - 1);
+ m_mjsikaku_gfxrom &= (gfxlen / 0x20000 - 1);
}
}
@@ -233,26 +223,26 @@ WRITE8_HANDLER( seiha_romsel_w )
******************************************************************************/
-void mjsikaku_vramflip(nbmj8688_state *state)
+void nbmj8688_state::mjsikaku_vramflip()
{
int x, y;
UINT16 color1, color2;
- if (state->m_mjsikaku_flipscreen == state->m_mjsikaku_flipscreen_old) return;
+ if (m_mjsikaku_flipscreen == m_mjsikaku_flipscreen_old) return;
for (y = 0; y < (256 / 2); y++)
{
for (x = 0; x < 512; x++)
{
- color1 = state->m_mjsikaku_videoram[(y * 512) + x];
- color2 = state->m_mjsikaku_videoram[((y ^ 0xff) * 512) + (x ^ 0x1ff)];
- state->m_mjsikaku_videoram[(y * 512) + x] = color2;
- state->m_mjsikaku_videoram[((y ^ 0xff) * 512) + (x ^ 0x1ff)] = color1;
+ color1 = m_mjsikaku_videoram[(y * 512) + x];
+ color2 = m_mjsikaku_videoram[((y ^ 0xff) * 512) + (x ^ 0x1ff)];
+ m_mjsikaku_videoram[(y * 512) + x] = color2;
+ m_mjsikaku_videoram[((y ^ 0xff) * 512) + (x ^ 0x1ff)] = color1;
}
}
- state->m_mjsikaku_flipscreen_old = state->m_mjsikaku_flipscreen;
- state->m_mjsikaku_screen_refresh = 1;
+ m_mjsikaku_flipscreen_old = m_mjsikaku_flipscreen;
+ m_mjsikaku_screen_refresh = 1;
}
@@ -636,36 +626,36 @@ logerror("HD61830B unsupported instruction %02x %02x\n",state->m_HD61830B_instr[
}
}
-WRITE8_HANDLER( nbmj8688_HD61830B_0_instr_w )
+WRITE8_MEMBER(nbmj8688_state::nbmj8688_HD61830B_0_instr_w)
{
- nbmj8688_HD61830B_instr_w(space,offset,data,0);
+ nbmj8688_HD61830B_instr_w(&space,offset,data,0);
}
-WRITE8_HANDLER( nbmj8688_HD61830B_1_instr_w )
+WRITE8_MEMBER(nbmj8688_state::nbmj8688_HD61830B_1_instr_w)
{
- nbmj8688_HD61830B_instr_w(space,offset,data,1);
+ nbmj8688_HD61830B_instr_w(&space,offset,data,1);
}
-WRITE8_HANDLER( nbmj8688_HD61830B_both_instr_w )
+WRITE8_MEMBER(nbmj8688_state::nbmj8688_HD61830B_both_instr_w)
{
- nbmj8688_HD61830B_instr_w(space,offset,data,0);
- nbmj8688_HD61830B_instr_w(space,offset,data,1);
+ nbmj8688_HD61830B_instr_w(&space,offset,data,0);
+ nbmj8688_HD61830B_instr_w(&space,offset,data,1);
}
-WRITE8_HANDLER( nbmj8688_HD61830B_0_data_w )
+WRITE8_MEMBER(nbmj8688_state::nbmj8688_HD61830B_0_data_w)
{
- nbmj8688_HD61830B_data_w(space,offset,data,0);
+ nbmj8688_HD61830B_data_w(&space,offset,data,0);
}
-WRITE8_HANDLER( nbmj8688_HD61830B_1_data_w )
+WRITE8_MEMBER(nbmj8688_state::nbmj8688_HD61830B_1_data_w)
{
- nbmj8688_HD61830B_data_w(space,offset,data,1);
+ nbmj8688_HD61830B_data_w(&space,offset,data,1);
}
-WRITE8_HANDLER( nbmj8688_HD61830B_both_data_w )
+WRITE8_MEMBER(nbmj8688_state::nbmj8688_HD61830B_both_data_w)
{
- nbmj8688_HD61830B_data_w(space,offset,data,0);
- nbmj8688_HD61830B_data_w(space,offset,data,1);
+ nbmj8688_HD61830B_data_w(&space,offset,data,0);
+ nbmj8688_HD61830B_data_w(&space,offset,data,1);
}
diff --git a/src/mame/video/nbmj8891.c b/src/mame/video/nbmj8891.c
index 6af4d2d0e33..c00ab917a84 100644
--- a/src/mame/video/nbmj8891.c
+++ b/src/mame/video/nbmj8891.c
@@ -19,179 +19,166 @@ static void nbmj8891_gfxdraw(running_machine &machine);
******************************************************************************/
-READ8_HANDLER( nbmj8891_palette_type1_r )
+READ8_MEMBER(nbmj8891_state::nbmj8891_palette_type1_r)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
- return state->m_palette[offset];
+ return m_palette[offset];
}
-WRITE8_HANDLER( nbmj8891_palette_type1_w )
+WRITE8_MEMBER(nbmj8891_state::nbmj8891_palette_type1_w)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
int r, g, b;
- state->m_palette[offset] = data;
+ m_palette[offset] = data;
if (!(offset & 1)) return;
offset &= 0x1fe;
- r = ((state->m_palette[offset + 0] & 0x0f) >> 0);
- g = ((state->m_palette[offset + 1] & 0xf0) >> 4);
- b = ((state->m_palette[offset + 1] & 0x0f) >> 0);
+ r = ((m_palette[offset + 0] & 0x0f) >> 0);
+ g = ((m_palette[offset + 1] & 0xf0) >> 4);
+ b = ((m_palette[offset + 1] & 0x0f) >> 0);
- palette_set_color_rgb(space->machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
+ palette_set_color_rgb(machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
}
-READ8_HANDLER( nbmj8891_palette_type2_r )
+READ8_MEMBER(nbmj8891_state::nbmj8891_palette_type2_r)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
- return state->m_palette[offset];
+ return m_palette[offset];
}
-WRITE8_HANDLER( nbmj8891_palette_type2_w )
+WRITE8_MEMBER(nbmj8891_state::nbmj8891_palette_type2_w)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
int r, g, b;
- state->m_palette[offset] = data;
+ m_palette[offset] = data;
if (!(offset & 0x100)) return;
offset &= 0x0ff;
- r = ((state->m_palette[offset + 0x000] & 0x0f) >> 0);
- g = ((state->m_palette[offset + 0x000] & 0xf0) >> 4);
- b = ((state->m_palette[offset + 0x100] & 0x0f) >> 0);
+ r = ((m_palette[offset + 0x000] & 0x0f) >> 0);
+ g = ((m_palette[offset + 0x000] & 0xf0) >> 4);
+ b = ((m_palette[offset + 0x100] & 0x0f) >> 0);
- palette_set_color_rgb(space->machine(), (offset & 0x0ff), pal4bit(r), pal4bit(g), pal4bit(b));
+ palette_set_color_rgb(machine(), (offset & 0x0ff), pal4bit(r), pal4bit(g), pal4bit(b));
}
-READ8_HANDLER( nbmj8891_palette_type3_r )
+READ8_MEMBER(nbmj8891_state::nbmj8891_palette_type3_r)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
- return state->m_palette[offset];
+ return m_palette[offset];
}
-WRITE8_HANDLER( nbmj8891_palette_type3_w )
+WRITE8_MEMBER(nbmj8891_state::nbmj8891_palette_type3_w)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
int r, g, b;
- state->m_palette[offset] = data;
+ m_palette[offset] = data;
if (!(offset & 1)) return;
offset &= 0x1fe;
- r = ((state->m_palette[offset + 1] & 0x0f) >> 0);
- g = ((state->m_palette[offset + 0] & 0xf0) >> 4);
- b = ((state->m_palette[offset + 0] & 0x0f) >> 0);
+ r = ((m_palette[offset + 1] & 0x0f) >> 0);
+ g = ((m_palette[offset + 0] & 0xf0) >> 4);
+ b = ((m_palette[offset + 0] & 0x0f) >> 0);
- palette_set_color_rgb(space->machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
+ palette_set_color_rgb(machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
}
-WRITE8_HANDLER( nbmj8891_clutsel_w )
+WRITE8_MEMBER(nbmj8891_state::nbmj8891_clutsel_w)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
- state->m_clutsel = data;
+ m_clutsel = data;
}
-READ8_HANDLER( nbmj8891_clut_r )
+READ8_MEMBER(nbmj8891_state::nbmj8891_clut_r)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
- return state->m_clut[offset];
+ return m_clut[offset];
}
-WRITE8_HANDLER( nbmj8891_clut_w )
+WRITE8_MEMBER(nbmj8891_state::nbmj8891_clut_w)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
- state->m_clut[((state->m_clutsel & 0x7f) * 0x10) + (offset & 0x0f)] = data;
+ m_clut[((m_clutsel & 0x7f) * 0x10) + (offset & 0x0f)] = data;
}
/******************************************************************************
******************************************************************************/
-WRITE8_HANDLER( nbmj8891_blitter_w )
+WRITE8_MEMBER(nbmj8891_state::nbmj8891_blitter_w)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
switch (offset)
{
- case 0x00: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0xff00) | data; break;
- case 0x01: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0x00ff) | (data << 8); break;
- case 0x02: state->m_blitter_destx = data; break;
- case 0x03: state->m_blitter_desty = data; break;
- case 0x04: state->m_blitter_sizex = data; break;
- case 0x05: state->m_blitter_sizey = data;
+ case 0x00: m_blitter_src_addr = (m_blitter_src_addr & 0xff00) | data; break;
+ case 0x01: m_blitter_src_addr = (m_blitter_src_addr & 0x00ff) | (data << 8); break;
+ case 0x02: m_blitter_destx = data; break;
+ case 0x03: m_blitter_desty = data; break;
+ case 0x04: m_blitter_sizex = data; break;
+ case 0x05: m_blitter_sizey = data;
/* writing here also starts the blit */
- nbmj8891_gfxdraw(space->machine());
+ nbmj8891_gfxdraw(machine());
break;
- case 0x06: state->m_blitter_direction_x = (data & 0x01) ? 1 : 0;
- state->m_blitter_direction_y = (data & 0x02) ? 1 : 0;
- state->m_flipscreen = (data & 0x04) ? 1 : 0;
- state->m_dispflag = (data & 0x08) ? 0 : 1;
- if (state->m_gfxdraw_mode) nbmj8891_vramflip(space->machine(), 1);
- nbmj8891_vramflip(space->machine(), 0);
+ case 0x06: m_blitter_direction_x = (data & 0x01) ? 1 : 0;
+ m_blitter_direction_y = (data & 0x02) ? 1 : 0;
+ m_flipscreen = (data & 0x04) ? 1 : 0;
+ m_dispflag = (data & 0x08) ? 0 : 1;
+ if (m_gfxdraw_mode) nbmj8891_vramflip(machine(), 1);
+ nbmj8891_vramflip(machine(), 0);
break;
case 0x07: break;
}
}
-WRITE8_HANDLER( nbmj8891_taiwanmb_blitter_w )
+WRITE8_MEMBER(nbmj8891_state::nbmj8891_taiwanmb_blitter_w)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
switch (offset)
{
- case 0: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0xff00) | data; break;
- case 1: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0x00ff) | (data << 8); break;
- case 2: state->m_blitter_destx = data; break;
- case 3: state->m_blitter_desty = data; break;
- case 4: state->m_blitter_sizex = (data - 1) & 0xff; break;
- case 5: state->m_blitter_sizey = (data - 1) & 0xff; break;
+ case 0: m_blitter_src_addr = (m_blitter_src_addr & 0xff00) | data; break;
+ case 1: m_blitter_src_addr = (m_blitter_src_addr & 0x00ff) | (data << 8); break;
+ case 2: m_blitter_destx = data; break;
+ case 3: m_blitter_desty = data; break;
+ case 4: m_blitter_sizex = (data - 1) & 0xff; break;
+ case 5: m_blitter_sizey = (data - 1) & 0xff; break;
}
}
-WRITE8_HANDLER( nbmj8891_taiwanmb_gfxdraw_w )
+WRITE8_MEMBER(nbmj8891_state::nbmj8891_taiwanmb_gfxdraw_w)
{
-// nbmj8891_gfxdraw(space->machine());
+// nbmj8891_gfxdraw(machine());
}
-WRITE8_HANDLER( nbmj8891_taiwanmb_gfxflag_w )
+WRITE8_MEMBER(nbmj8891_state::nbmj8891_taiwanmb_gfxflag_w)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
- state->m_flipscreen = (data & 0x04) ? 1 : 0;
+ m_flipscreen = (data & 0x04) ? 1 : 0;
- nbmj8891_vramflip(space->machine(), 0);
+ nbmj8891_vramflip(machine(), 0);
}
-WRITE8_HANDLER( nbmj8891_taiwanmb_mcu_w )
+WRITE8_MEMBER(nbmj8891_state::nbmj8891_taiwanmb_mcu_w)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
- state->m_param_old[state->m_param_cnt & 0x0f] = data;
+ m_param_old[m_param_cnt & 0x0f] = data;
if (data == 0x00)
{
- state->m_blitter_direction_x = 0;
- state->m_blitter_direction_y = 0;
- state->m_blitter_destx = 0;
- state->m_blitter_desty = 0;
- state->m_blitter_sizex = 0;
- state->m_blitter_sizey = 0;
- state->m_dispflag = 0;
+ m_blitter_direction_x = 0;
+ m_blitter_direction_y = 0;
+ m_blitter_destx = 0;
+ m_blitter_desty = 0;
+ m_blitter_sizex = 0;
+ m_blitter_sizey = 0;
+ m_dispflag = 0;
}
/*
if (data == 0x02)
{
- if (state->m_param_old[(state->m_param_cnt - 1) & 0x0f] == 0x18)
+ if (m_param_old[(m_param_cnt - 1) & 0x0f] == 0x18)
{
- state->m_dispflag = 1;
+ m_dispflag = 1;
}
- else if (state->m_param_old[(state->m_param_cnt - 1) & 0x0f] == 0x1a)
+ else if (m_param_old[(m_param_cnt - 1) & 0x0f] == 0x1a)
{
- state->m_dispflag = 0;
+ m_dispflag = 0;
}
}
*/
@@ -203,80 +190,77 @@ WRITE8_HANDLER( nbmj8891_taiwanmb_mcu_w )
if (data == 0x12)
{
- if (state->m_param_old[(state->m_param_cnt - 1) & 0x0f] == 0x08)
+ if (m_param_old[(m_param_cnt - 1) & 0x0f] == 0x08)
{
- state->m_blitter_direction_x = 1;
- state->m_blitter_direction_y = 0;
- state->m_blitter_destx += state->m_blitter_sizex + 1;
- state->m_blitter_desty += 0;
- state->m_blitter_sizex ^= 0xff;
- state->m_blitter_sizey ^= 0x00;
+ m_blitter_direction_x = 1;
+ m_blitter_direction_y = 0;
+ m_blitter_destx += m_blitter_sizex + 1;
+ m_blitter_desty += 0;
+ m_blitter_sizex ^= 0xff;
+ m_blitter_sizey ^= 0x00;
}
- else if (state->m_param_old[(state->m_param_cnt - 1) & 0x0f] == 0x0a)
+ else if (m_param_old[(m_param_cnt - 1) & 0x0f] == 0x0a)
{
- state->m_blitter_direction_x = 0;
- state->m_blitter_direction_y = 1;
- state->m_blitter_destx += 0;
- state->m_blitter_desty += state->m_blitter_sizey + 1;
- state->m_blitter_sizex ^= 0x00;
- state->m_blitter_sizey ^= 0xff;
+ m_blitter_direction_x = 0;
+ m_blitter_direction_y = 1;
+ m_blitter_destx += 0;
+ m_blitter_desty += m_blitter_sizey + 1;
+ m_blitter_sizex ^= 0x00;
+ m_blitter_sizey ^= 0xff;
}
- else if (state->m_param_old[(state->m_param_cnt - 1) & 0x0f] == 0x0c)
+ else if (m_param_old[(m_param_cnt - 1) & 0x0f] == 0x0c)
{
- state->m_blitter_direction_x = 1;
- state->m_blitter_direction_y = 1;
- state->m_blitter_destx += state->m_blitter_sizex + 1;
- state->m_blitter_desty += state->m_blitter_sizey + 1;
- state->m_blitter_sizex ^= 0xff;
- state->m_blitter_sizey ^= 0xff;
+ m_blitter_direction_x = 1;
+ m_blitter_direction_y = 1;
+ m_blitter_destx += m_blitter_sizex + 1;
+ m_blitter_desty += m_blitter_sizey + 1;
+ m_blitter_sizex ^= 0xff;
+ m_blitter_sizey ^= 0xff;
}
- else if (state->m_param_old[(state->m_param_cnt - 1) & 0x0f] == 0x0e)
+ else if (m_param_old[(m_param_cnt - 1) & 0x0f] == 0x0e)
{
- state->m_blitter_direction_x = 0;
- state->m_blitter_direction_y = 0;
- state->m_blitter_destx += 0;
- state->m_blitter_desty += 0;
- state->m_blitter_sizex ^= 0x00;
- state->m_blitter_sizey ^= 0x00;
+ m_blitter_direction_x = 0;
+ m_blitter_direction_y = 0;
+ m_blitter_destx += 0;
+ m_blitter_desty += 0;
+ m_blitter_sizex ^= 0x00;
+ m_blitter_sizey ^= 0x00;
}
- nbmj8891_gfxdraw(space->machine());
+ nbmj8891_gfxdraw(machine());
}
-// state->m_blitter_direction_x = 0; // for debug
-// state->m_blitter_direction_y = 0; // for debug
- state->m_dispflag = 1; // for debug
+// m_blitter_direction_x = 0; // for debug
+// m_blitter_direction_y = 0; // for debug
+ m_dispflag = 1; // for debug
- state->m_param_cnt++;
+ m_param_cnt++;
}
-WRITE8_HANDLER( nbmj8891_scrolly_w )
+WRITE8_MEMBER(nbmj8891_state::nbmj8891_scrolly_w)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
- state->m_scrolly = data;
+ m_scrolly = data;
}
-WRITE8_HANDLER( nbmj8891_vramsel_w )
+WRITE8_MEMBER(nbmj8891_state::nbmj8891_vramsel_w)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
/* protection - not sure about this */
nb1413m3_sndromrgntag = (data & 0x20) ? "protection" : "voice";
- state->m_vram = data;
+ m_vram = data;
}
-WRITE8_HANDLER( nbmj8891_romsel_w )
+WRITE8_MEMBER(nbmj8891_state::nbmj8891_romsel_w)
{
- nbmj8891_state *state = space->machine().driver_data<nbmj8891_state>();
- int gfxlen = space->machine().region("gfx1")->bytes();
- state->m_gfxrom = (data & 0x0f);
+ int gfxlen = machine().region("gfx1")->bytes();
+ m_gfxrom = (data & 0x0f);
- if ((0x20000 * state->m_gfxrom) > (gfxlen - 1))
+ if ((0x20000 * m_gfxrom) > (gfxlen - 1))
{
#ifdef MAME_DEBUG
popmessage("GFXROM BANK OVER!!");
#endif
- state->m_gfxrom &= (gfxlen / 0x20000 - 1);
+ m_gfxrom &= (gfxlen / 0x20000 - 1);
}
}
diff --git a/src/mame/video/nbmj8900.c b/src/mame/video/nbmj8900.c
index bc6c28974fa..21f9a0436c1 100644
--- a/src/mame/video/nbmj8900.c
+++ b/src/mame/video/nbmj8900.c
@@ -19,153 +19,140 @@ static void nbmj8900_gfxdraw(running_machine &machine);
******************************************************************************/
-READ8_HANDLER( nbmj8900_palette_type1_r )
+READ8_MEMBER(nbmj8900_state::nbmj8900_palette_type1_r)
{
- nbmj8900_state *state = space->machine().driver_data<nbmj8900_state>();
- return state->m_palette[offset];
+ return m_palette[offset];
}
-WRITE8_HANDLER( nbmj8900_palette_type1_w )
+WRITE8_MEMBER(nbmj8900_state::nbmj8900_palette_type1_w)
{
- nbmj8900_state *state = space->machine().driver_data<nbmj8900_state>();
int r, g, b;
- state->m_palette[offset] = data;
+ m_palette[offset] = data;
if (!(offset & 1)) return;
offset &= 0x1fe;
- r = ((state->m_palette[offset + 0] & 0x0f) >> 0);
- g = ((state->m_palette[offset + 1] & 0xf0) >> 4);
- b = ((state->m_palette[offset + 1] & 0x0f) >> 0);
+ r = ((m_palette[offset + 0] & 0x0f) >> 0);
+ g = ((m_palette[offset + 1] & 0xf0) >> 4);
+ b = ((m_palette[offset + 1] & 0x0f) >> 0);
- palette_set_color_rgb(space->machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
+ palette_set_color_rgb(machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
}
#ifdef UNUSED_FUNCTION
-READ8_HANDLER( nbmj8900_palette_type2_r )
+READ8_MEMBER(nbmj8900_state::nbmj8900_palette_type2_r)
{
- nbmj8900_state *state = space->machine().driver_data<nbmj8900_state>();
- return state->m_palette[offset];
+ return m_palette[offset];
}
-WRITE8_HANDLER( nbmj8900_palette_type2_w )
+WRITE8_MEMBER(nbmj8900_state::nbmj8900_palette_type2_w)
{
- nbmj8900_state *state = space->machine().driver_data<nbmj8900_state>();
int r, g, b;
- state->m_palette[offset] = data;
+ m_palette[offset] = data;
if (!(offset & 0x100)) return;
offset &= 0x0ff;
- r = ((state->m_palette[offset + 0x000] & 0x0f) >> 0);
- g = ((state->m_palette[offset + 0x000] & 0xf0) >> 4);
- b = ((state->m_palette[offset + 0x100] & 0x0f) >> 0);
+ r = ((m_palette[offset + 0x000] & 0x0f) >> 0);
+ g = ((m_palette[offset + 0x000] & 0xf0) >> 4);
+ b = ((m_palette[offset + 0x100] & 0x0f) >> 0);
- palette_set_color_rgb(space->machine(), (offset & 0x0ff), pal4bit(r), pal4bit(g), pal4bit(b));
+ palette_set_color_rgb(machine(), (offset & 0x0ff), pal4bit(r), pal4bit(g), pal4bit(b));
}
-READ8_HANDLER( nbmj8900_palette_type3_r )
+READ8_MEMBER(nbmj8900_state::nbmj8900_palette_type3_r)
{
- nbmj8900_state *state = space->machine().driver_data<nbmj8900_state>();
- return state->m_palette[offset];
+ return m_palette[offset];
}
-WRITE8_HANDLER( nbmj8900_palette_type3_w )
+WRITE8_MEMBER(nbmj8900_state::nbmj8900_palette_type3_w)
{
- nbmj8900_state *state = space->machine().driver_data<nbmj8900_state>();
int r, g, b;
- state->m_palette[offset] = data;
+ m_palette[offset] = data;
if (!(offset & 1)) return;
offset &= 0x1fe;
- r = ((state->m_palette[offset + 1] & 0x0f) >> 0);
- g = ((state->m_palette[offset + 0] & 0xf0) >> 4);
- b = ((state->m_palette[offset + 0] & 0x0f) >> 0);
+ r = ((m_palette[offset + 1] & 0x0f) >> 0);
+ g = ((m_palette[offset + 0] & 0xf0) >> 4);
+ b = ((m_palette[offset + 0] & 0x0f) >> 0);
- palette_set_color_rgb(space->machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
+ palette_set_color_rgb(machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
}
#endif
-WRITE8_HANDLER( nbmj8900_clutsel_w )
+WRITE8_MEMBER(nbmj8900_state::nbmj8900_clutsel_w)
{
- nbmj8900_state *state = space->machine().driver_data<nbmj8900_state>();
- state->m_clutsel = data;
+ m_clutsel = data;
}
-READ8_HANDLER( nbmj8900_clut_r )
+READ8_MEMBER(nbmj8900_state::nbmj8900_clut_r)
{
- nbmj8900_state *state = space->machine().driver_data<nbmj8900_state>();
- return state->m_clut[offset];
+ return m_clut[offset];
}
-WRITE8_HANDLER( nbmj8900_clut_w )
+WRITE8_MEMBER(nbmj8900_state::nbmj8900_clut_w)
{
- nbmj8900_state *state = space->machine().driver_data<nbmj8900_state>();
- state->m_clut[((state->m_clutsel & 0x7f) * 0x10) + (offset & 0x0f)] = data;
+ m_clut[((m_clutsel & 0x7f) * 0x10) + (offset & 0x0f)] = data;
}
/******************************************************************************
******************************************************************************/
-WRITE8_HANDLER( nbmj8900_blitter_w )
+WRITE8_MEMBER(nbmj8900_state::nbmj8900_blitter_w)
{
- nbmj8900_state *state = space->machine().driver_data<nbmj8900_state>();
switch (offset)
{
- case 0x00: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0xff00) | data; break;
- case 0x01: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0x00ff) | (data << 8); break;
- case 0x02: state->m_blitter_destx = data; break;
- case 0x03: state->m_blitter_desty = data; break;
- case 0x04: state->m_blitter_sizex = data; break;
- case 0x05: state->m_blitter_sizey = data;
+ case 0x00: m_blitter_src_addr = (m_blitter_src_addr & 0xff00) | data; break;
+ case 0x01: m_blitter_src_addr = (m_blitter_src_addr & 0x00ff) | (data << 8); break;
+ case 0x02: m_blitter_destx = data; break;
+ case 0x03: m_blitter_desty = data; break;
+ case 0x04: m_blitter_sizex = data; break;
+ case 0x05: m_blitter_sizey = data;
/* writing here also starts the blit */
- nbmj8900_gfxdraw(space->machine());
+ nbmj8900_gfxdraw(machine());
break;
- case 0x06: state->m_blitter_direction_x = (data & 0x01) ? 1 : 0;
- state->m_blitter_direction_y = (data & 0x02) ? 1 : 0;
- state->m_flipscreen = (data & 0x04) ? 1 : 0;
- state->m_dispflag = (data & 0x08) ? 0 : 1;
- if (state->m_gfxdraw_mode) nbmj8900_vramflip(space->machine(), 1);
- nbmj8900_vramflip(space->machine(), 0);
+ case 0x06: m_blitter_direction_x = (data & 0x01) ? 1 : 0;
+ m_blitter_direction_y = (data & 0x02) ? 1 : 0;
+ m_flipscreen = (data & 0x04) ? 1 : 0;
+ m_dispflag = (data & 0x08) ? 0 : 1;
+ if (m_gfxdraw_mode) nbmj8900_vramflip(machine(), 1);
+ nbmj8900_vramflip(machine(), 0);
break;
case 0x07: break;
}
}
-WRITE8_HANDLER( nbmj8900_scrolly_w )
+WRITE8_MEMBER(nbmj8900_state::nbmj8900_scrolly_w)
{
- nbmj8900_state *state = space->machine().driver_data<nbmj8900_state>();
- state->m_scrolly = data;
+ m_scrolly = data;
}
-WRITE8_HANDLER( nbmj8900_vramsel_w )
+WRITE8_MEMBER(nbmj8900_state::nbmj8900_vramsel_w)
{
- nbmj8900_state *state = space->machine().driver_data<nbmj8900_state>();
/* protection - not sure about this */
nb1413m3_sndromrgntag = (data & 0x20) ? "protdata" : "voice";
- state->m_vram = data;
+ m_vram = data;
}
-WRITE8_HANDLER( nbmj8900_romsel_w )
+WRITE8_MEMBER(nbmj8900_state::nbmj8900_romsel_w)
{
- nbmj8900_state *state = space->machine().driver_data<nbmj8900_state>();
- state->m_gfxrom = (data & 0x0f);
+ m_gfxrom = (data & 0x0f);
- if ((0x20000 * state->m_gfxrom) > (space->machine().region("gfx")->bytes() - 1))
+ if ((0x20000 * m_gfxrom) > (machine().region("gfx")->bytes() - 1))
{
#ifdef MAME_DEBUG
popmessage("GFXROM BANK OVER!!");
#endif
- state->m_gfxrom &= (space->machine().region("gfx")->bytes() / 0x20000 - 1);
+ m_gfxrom &= (machine().region("gfx")->bytes() / 0x20000 - 1);
}
}
diff --git a/src/mame/video/nbmj8991.c b/src/mame/video/nbmj8991.c
index af35904613f..ff37a4f152b 100644
--- a/src/mame/video/nbmj8991.c
+++ b/src/mame/video/nbmj8991.c
@@ -21,119 +21,113 @@ static void update_pixel(running_machine &machine, int x, int y);
******************************************************************************/
-WRITE8_HANDLER( nbmj8991_palette_type1_w )
+WRITE8_MEMBER(nbmj8991_state::nbmj8991_palette_type1_w)
{
int r, g, b;
- nbmj8991_state *state = space->machine().driver_data<nbmj8991_state>();
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
if (!(offset & 1)) return;
offset &= 0x1fe;
- r = ((state->m_generic_paletteram_8[offset + 0] & 0x0f) >> 0);
- g = ((state->m_generic_paletteram_8[offset + 1] & 0xf0) >> 4);
- b = ((state->m_generic_paletteram_8[offset + 1] & 0x0f) >> 0);
+ r = ((m_generic_paletteram_8[offset + 0] & 0x0f) >> 0);
+ g = ((m_generic_paletteram_8[offset + 1] & 0xf0) >> 4);
+ b = ((m_generic_paletteram_8[offset + 1] & 0x0f) >> 0);
- palette_set_color_rgb(space->machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
+ palette_set_color_rgb(machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
}
-WRITE8_HANDLER( nbmj8991_palette_type2_w )
+WRITE8_MEMBER(nbmj8991_state::nbmj8991_palette_type2_w)
{
int r, g, b;
- nbmj8991_state *state = space->machine().driver_data<nbmj8991_state>();
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
if (!(offset & 1)) return;
offset &= 0x1fe;
- r = ((state->m_generic_paletteram_8[offset + 0] & 0x7c) >> 2);
- g = (((state->m_generic_paletteram_8[offset + 0] & 0x03) << 3) | ((state->m_generic_paletteram_8[offset + 1] & 0xe0) >> 5));
- b = ((state->m_generic_paletteram_8[offset + 1] & 0x1f) >> 0);
+ r = ((m_generic_paletteram_8[offset + 0] & 0x7c) >> 2);
+ g = (((m_generic_paletteram_8[offset + 0] & 0x03) << 3) | ((m_generic_paletteram_8[offset + 1] & 0xe0) >> 5));
+ b = ((m_generic_paletteram_8[offset + 1] & 0x1f) >> 0);
- palette_set_color_rgb(space->machine(), (offset / 2), pal5bit(r), pal5bit(g), pal5bit(b));
+ palette_set_color_rgb(machine(), (offset / 2), pal5bit(r), pal5bit(g), pal5bit(b));
}
-WRITE8_HANDLER( nbmj8991_palette_type3_w )
+WRITE8_MEMBER(nbmj8991_state::nbmj8991_palette_type3_w)
{
int r, g, b;
- nbmj8991_state *state = space->machine().driver_data<nbmj8991_state>();
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
if (!(offset & 1)) return;
offset &= 0x1fe;
- r = ((state->m_generic_paletteram_8[offset + 1] & 0x0f) >> 0);
- g = ((state->m_generic_paletteram_8[offset + 0] & 0xf0) >> 4);
- b = ((state->m_generic_paletteram_8[offset + 0] & 0x0f) >> 0);
+ r = ((m_generic_paletteram_8[offset + 1] & 0x0f) >> 0);
+ g = ((m_generic_paletteram_8[offset + 0] & 0xf0) >> 4);
+ b = ((m_generic_paletteram_8[offset + 0] & 0x0f) >> 0);
- palette_set_color_rgb(space->machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
+ palette_set_color_rgb(machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
}
/******************************************************************************
******************************************************************************/
-WRITE8_HANDLER( nbmj8991_blitter_w )
+WRITE8_MEMBER(nbmj8991_state::nbmj8991_blitter_w)
{
- nbmj8991_state *state = space->machine().driver_data<nbmj8991_state>();
- int gfxlen = space->machine().region("gfx1")->bytes();
+ int gfxlen = machine().region("gfx1")->bytes();
switch (offset)
{
- case 0x00: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0xff00) | data; break;
- case 0x01: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0x00ff) | (data << 8); break;
+ case 0x00: m_blitter_src_addr = (m_blitter_src_addr & 0xff00) | data; break;
+ case 0x01: m_blitter_src_addr = (m_blitter_src_addr & 0x00ff) | (data << 8); break;
case 0x02: break;
case 0x03: break;
- case 0x04: state->m_blitter_sizex = data; break;
- case 0x05: state->m_blitter_sizey = data;
+ case 0x04: m_blitter_sizex = data; break;
+ case 0x05: m_blitter_sizey = data;
/* writing here also starts the blit */
- nbmj8991_gfxdraw(space->machine());
+ nbmj8991_gfxdraw(machine());
break;
- case 0x06: state->m_blitter_direction_x = (data & 0x01) ? 1 : 0;
- state->m_blitter_direction_y = (data & 0x02) ? 1 : 0;
- state->m_flipscreen = (data & 0x04) ? 0 : 1;
- state->m_dispflag = (data & 0x10) ? 0 : 1;
- nbmj8991_vramflip(space->machine());
+ case 0x06: m_blitter_direction_x = (data & 0x01) ? 1 : 0;
+ m_blitter_direction_y = (data & 0x02) ? 1 : 0;
+ m_flipscreen = (data & 0x04) ? 0 : 1;
+ m_dispflag = (data & 0x10) ? 0 : 1;
+ nbmj8991_vramflip(machine());
break;
case 0x07: break;
- case 0x10: state->m_blitter_destx = (state->m_blitter_destx & 0xff00) | data; break;
- case 0x20: state->m_blitter_desty = (state->m_blitter_desty & 0xff00) | data; break;
- case 0x30: state->m_scrollx = (state->m_scrollx & 0xff00) | data; break;
- case 0x40: state->m_scrolly = (state->m_scrolly & 0xff00) | data; break;
- case 0x50: state->m_blitter_destx = (state->m_blitter_destx & 0x00ff) | ((data & 0x01) << 8);
- state->m_blitter_desty = (state->m_blitter_desty & 0x00ff) | ((data & 0x02) << 7);
- state->m_scrollx = (state->m_scrollx & 0x00ff) | ((data & 0x04) << 6);
- state->m_scrolly = (state->m_scrolly & 0x00ff) | ((data & 0x08) << 5);
+ case 0x10: m_blitter_destx = (m_blitter_destx & 0xff00) | data; break;
+ case 0x20: m_blitter_desty = (m_blitter_desty & 0xff00) | data; break;
+ case 0x30: m_scrollx = (m_scrollx & 0xff00) | data; break;
+ case 0x40: m_scrolly = (m_scrolly & 0xff00) | data; break;
+ case 0x50: m_blitter_destx = (m_blitter_destx & 0x00ff) | ((data & 0x01) << 8);
+ m_blitter_desty = (m_blitter_desty & 0x00ff) | ((data & 0x02) << 7);
+ m_scrollx = (m_scrollx & 0x00ff) | ((data & 0x04) << 6);
+ m_scrolly = (m_scrolly & 0x00ff) | ((data & 0x08) << 5);
break;
- case 0x60: state->m_gfxrom = data; break;
- case 0x70: state->m_clutsel = data; break;
+ case 0x60: m_gfxrom = data; break;
+ case 0x70: m_clutsel = data; break;
}
- if ((0x20000 * state->m_gfxrom) > (gfxlen - 1))
+ if ((0x20000 * m_gfxrom) > (gfxlen - 1))
{
#ifdef MAME_DEBUG
popmessage("GFXROM BANK OVER!!");
#endif
- state->m_gfxrom &= (gfxlen / 0x20000 - 1);
+ m_gfxrom &= (gfxlen / 0x20000 - 1);
}
}
-READ8_HANDLER( nbmj8991_clut_r )
+READ8_MEMBER(nbmj8991_state::nbmj8991_clut_r)
{
- nbmj8991_state *state = space->machine().driver_data<nbmj8991_state>();
- return state->m_clut[offset];
+ return m_clut[offset];
}
-WRITE8_HANDLER( nbmj8991_clut_w )
+WRITE8_MEMBER(nbmj8991_state::nbmj8991_clut_w)
{
- nbmj8991_state *state = space->machine().driver_data<nbmj8991_state>();
- state->m_clut[((state->m_clutsel & 0x7f) * 0x10) + (offset & 0x0f)] = data;
+ m_clut[((m_clutsel & 0x7f) * 0x10) + (offset & 0x0f)] = data;
}
/******************************************************************************
diff --git a/src/mame/video/nbmj9195.c b/src/mame/video/nbmj9195.c
index 1c58e9327d2..982a35f0bf7 100644
--- a/src/mame/video/nbmj9195.c
+++ b/src/mame/video/nbmj9195.c
@@ -19,53 +19,49 @@ static void nbmj9195_gfxdraw(running_machine &machine, int vram);
******************************************************************************/
-READ8_HANDLER( nbmj9195_palette_r )
+READ8_MEMBER(nbmj9195_state::nbmj9195_palette_r)
{
- nbmj9195_state *state = space->machine().driver_data<nbmj9195_state>();
- return state->m_palette[offset];
+ return m_palette[offset];
}
-WRITE8_HANDLER( nbmj9195_palette_w )
+WRITE8_MEMBER(nbmj9195_state::nbmj9195_palette_w)
{
- nbmj9195_state *state = space->machine().driver_data<nbmj9195_state>();
int r, g, b;
- state->m_palette[offset] = data;
+ m_palette[offset] = data;
if (offset & 1)
{
offset &= 0x1fe;
- r = ((state->m_palette[offset + 0] & 0x0f) >> 0);
- g = ((state->m_palette[offset + 0] & 0xf0) >> 4);
- b = ((state->m_palette[offset + 1] & 0x0f) >> 0);
+ r = ((m_palette[offset + 0] & 0x0f) >> 0);
+ g = ((m_palette[offset + 0] & 0xf0) >> 4);
+ b = ((m_palette[offset + 1] & 0x0f) >> 0);
- palette_set_color_rgb(space->machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
+ palette_set_color_rgb(machine(), (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
}
}
-READ8_HANDLER( nbmj9195_nb22090_palette_r )
+READ8_MEMBER(nbmj9195_state::nbmj9195_nb22090_palette_r)
{
- nbmj9195_state *state = space->machine().driver_data<nbmj9195_state>();
- return state->m_nb22090_palette[offset];
+ return m_nb22090_palette[offset];
}
-WRITE8_HANDLER( nbmj9195_nb22090_palette_w )
+WRITE8_MEMBER(nbmj9195_state::nbmj9195_nb22090_palette_w)
{
- nbmj9195_state *state = space->machine().driver_data<nbmj9195_state>();
int r, g, b;
int offs_h, offs_l;
- state->m_nb22090_palette[offset] = data;
+ m_nb22090_palette[offset] = data;
offs_h = (offset / 0x0300);
offs_l = (offset & 0x00ff);
- r = state->m_nb22090_palette[(0x000 + (offs_h * 0x300) + offs_l)];
- g = state->m_nb22090_palette[(0x100 + (offs_h * 0x300) + offs_l)];
- b = state->m_nb22090_palette[(0x200 + (offs_h * 0x300) + offs_l)];
+ r = m_nb22090_palette[(0x000 + (offs_h * 0x300) + offs_l)];
+ g = m_nb22090_palette[(0x100 + (offs_h * 0x300) + offs_l)];
+ b = m_nb22090_palette[(0x200 + (offs_h * 0x300) + offs_l)];
- palette_set_color(space->machine(), ((offs_h * 0x100) + offs_l), MAKE_RGB(r, g, b));
+ palette_set_color(machine(), ((offs_h * 0x100) + offs_l), MAKE_RGB(r, g, b));
}
/******************************************************************************
@@ -375,14 +371,14 @@ static void nbmj9195_gfxdraw(running_machine &machine, int vram)
******************************************************************************/
-WRITE8_HANDLER( nbmj9195_blitter_0_w ) { nbmj9195_blitter_w(space, offset, data, 0); }
-WRITE8_HANDLER( nbmj9195_blitter_1_w ) { nbmj9195_blitter_w(space, offset, data, 1); }
+WRITE8_MEMBER(nbmj9195_state::nbmj9195_blitter_0_w){ nbmj9195_blitter_w(&space, offset, data, 0); }
+WRITE8_MEMBER(nbmj9195_state::nbmj9195_blitter_1_w){ nbmj9195_blitter_w(&space, offset, data, 1); }
-READ8_HANDLER( nbmj9195_blitter_0_r ) { return nbmj9195_blitter_r(space, offset, 0); }
-READ8_HANDLER( nbmj9195_blitter_1_r ) { return nbmj9195_blitter_r(space, offset, 1); }
+READ8_MEMBER(nbmj9195_state::nbmj9195_blitter_0_r){ return nbmj9195_blitter_r(&space, offset, 0); }
+READ8_MEMBER(nbmj9195_state::nbmj9195_blitter_1_r){ return nbmj9195_blitter_r(&space, offset, 1); }
-WRITE8_HANDLER( nbmj9195_clut_0_w ) { nbmj9195_clut_w(space, offset, data, 0); }
-WRITE8_HANDLER( nbmj9195_clut_1_w ) { nbmj9195_clut_w(space, offset, data, 1); }
+WRITE8_MEMBER(nbmj9195_state::nbmj9195_clut_0_w){ nbmj9195_clut_w(&space, offset, data, 0); }
+WRITE8_MEMBER(nbmj9195_state::nbmj9195_clut_1_w){ nbmj9195_clut_w(&space, offset, data, 1); }
/******************************************************************************
diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c
index 4c4e447f07c..5a73de62ace 100644
--- a/src/mame/video/nemesis.c
+++ b/src/mame/video/nemesis.c
@@ -94,93 +94,89 @@ static TILE_GET_INFO( get_fg_tile_info )
}
-WRITE16_HANDLER( nemesis_gfx_flipx_word_w )
+WRITE16_MEMBER(nemesis_state::nemesis_gfx_flipx_word_w)
{
- nemesis_state *state = space->machine().driver_data<nemesis_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_flipscreen = data & 0x01;
+ m_flipscreen = data & 0x01;
if (data & 0x01)
- state->m_tilemap_flip |= TILEMAP_FLIPX;
+ m_tilemap_flip |= TILEMAP_FLIPX;
else
- state->m_tilemap_flip &= ~TILEMAP_FLIPX;
+ m_tilemap_flip &= ~TILEMAP_FLIPX;
- space->machine().tilemap().set_flip_all(state->m_tilemap_flip);
+ machine().tilemap().set_flip_all(m_tilemap_flip);
}
if (ACCESSING_BITS_8_15)
{
if (data & 0x0100)
- device_set_input_line_and_vector(state->m_audiocpu, 0, HOLD_LINE, 0xff);
+ device_set_input_line_and_vector(m_audiocpu, 0, HOLD_LINE, 0xff);
}
}
-WRITE16_HANDLER( nemesis_gfx_flipy_word_w )
+WRITE16_MEMBER(nemesis_state::nemesis_gfx_flipy_word_w)
{
- nemesis_state *state = space->machine().driver_data<nemesis_state>();
if (ACCESSING_BITS_0_7)
{
if (data & 0x01)
- state->m_tilemap_flip |= TILEMAP_FLIPY;
+ m_tilemap_flip |= TILEMAP_FLIPY;
else
- state->m_tilemap_flip &= ~TILEMAP_FLIPY;
+ m_tilemap_flip &= ~TILEMAP_FLIPY;
- space->machine().tilemap().set_flip_all(state->m_tilemap_flip);
+ machine().tilemap().set_flip_all(m_tilemap_flip);
}
}
-WRITE16_HANDLER( salamand_control_port_word_w )
+WRITE16_MEMBER(nemesis_state::salamand_control_port_word_w)
{
- nemesis_state *state = space->machine().driver_data<nemesis_state>();
if (ACCESSING_BITS_0_7)
{
- UINT8 accessing_bits = data ^ state->m_irq_port_last;
+ UINT8 accessing_bits = data ^ m_irq_port_last;
- state->m_irq_on = data & 0x01;
- state->m_irq2_on = data & 0x02;
- state->m_flipscreen = data & 0x04;
+ m_irq_on = data & 0x01;
+ m_irq2_on = data & 0x02;
+ m_flipscreen = data & 0x04;
if (data & 0x04)
- state->m_tilemap_flip |= TILEMAP_FLIPX;
+ m_tilemap_flip |= TILEMAP_FLIPX;
else
- state->m_tilemap_flip &= ~TILEMAP_FLIPX;
+ m_tilemap_flip &= ~TILEMAP_FLIPX;
if (data & 0x08)
- state->m_tilemap_flip |= TILEMAP_FLIPY;
+ m_tilemap_flip |= TILEMAP_FLIPY;
else
- state->m_tilemap_flip &= ~TILEMAP_FLIPY;
+ m_tilemap_flip &= ~TILEMAP_FLIPY;
if (accessing_bits & 0x0c)
- space->machine().tilemap().set_flip_all(state->m_tilemap_flip);
+ machine().tilemap().set_flip_all(m_tilemap_flip);
- state->m_irq_port_last = data;
+ m_irq_port_last = data;
}
if (ACCESSING_BITS_8_15)
{
- coin_lockout_w(space->machine(), 0, data & 0x0200);
- coin_lockout_w(space->machine(), 1, data & 0x0400);
+ coin_lockout_w(machine(), 0, data & 0x0200);
+ coin_lockout_w(machine(), 1, data & 0x0400);
if (data & 0x0800)
- device_set_input_line(state->m_audiocpu, 0, HOLD_LINE);
+ device_set_input_line(m_audiocpu, 0, HOLD_LINE);
- state->m_selected_ip = (~data & 0x1000) >> 12; /* citybomb steering & accel */
+ m_selected_ip = (~data & 0x1000) >> 12; /* citybomb steering & accel */
}
}
-WRITE16_HANDLER( nemesis_palette_word_w )
+WRITE16_MEMBER(nemesis_state::nemesis_palette_word_w)
{
- nemesis_state *state = space->machine().driver_data<nemesis_state>();
int r, g, b, bit1, bit2, bit3, bit4, bit5;
- COMBINE_DATA(state->m_paletteram + offset);
- data = state->m_paletteram[offset];
+ COMBINE_DATA(m_paletteram + offset);
+ data = m_paletteram[offset];
/* Mish, 30/11/99 - Schematics show the resistor values are:
300 Ohms
@@ -213,62 +209,56 @@ WRITE16_HANDLER( nemesis_palette_word_w )
bit5 = BIT(data, 14);
b = MULTIPLIER;
- palette_set_color(space->machine(), offset, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), offset, MAKE_RGB(r, g, b));
}
-WRITE16_HANDLER( salamander_palette_word_w )
+WRITE16_MEMBER(nemesis_state::salamander_palette_word_w)
{
- nemesis_state *state = space->machine().driver_data<nemesis_state>();
- COMBINE_DATA(state->m_paletteram + offset);
+ COMBINE_DATA(m_paletteram + offset);
offset &= ~1;
- data = ((state->m_paletteram[offset] << 8) & 0xff00) | (state->m_paletteram[offset + 1] & 0xff);
- palette_set_color_rgb(space->machine(), offset / 2, pal5bit(data >> 0), pal5bit(data >> 5), pal5bit(data >> 10));
+ data = ((m_paletteram[offset] << 8) & 0xff00) | (m_paletteram[offset + 1] & 0xff);
+ palette_set_color_rgb(machine(), offset / 2, pal5bit(data >> 0), pal5bit(data >> 5), pal5bit(data >> 10));
}
-WRITE16_HANDLER( nemesis_videoram1_word_w )
+WRITE16_MEMBER(nemesis_state::nemesis_videoram1_word_w)
{
- nemesis_state *state = space->machine().driver_data<nemesis_state>();
- COMBINE_DATA(state->m_videoram1 + offset);
- state->m_foreground->mark_tile_dirty(offset);
+ COMBINE_DATA(m_videoram1 + offset);
+ m_foreground->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( nemesis_videoram2_word_w )
+WRITE16_MEMBER(nemesis_state::nemesis_videoram2_word_w)
{
- nemesis_state *state = space->machine().driver_data<nemesis_state>();
- COMBINE_DATA(state->m_videoram2 + offset);
- state->m_background->mark_tile_dirty(offset);
+ COMBINE_DATA(m_videoram2 + offset);
+ m_background->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( nemesis_colorram1_word_w )
+WRITE16_MEMBER(nemesis_state::nemesis_colorram1_word_w)
{
- nemesis_state *state = space->machine().driver_data<nemesis_state>();
- COMBINE_DATA(state->m_colorram1 + offset);
- state->m_foreground->mark_tile_dirty(offset);
+ COMBINE_DATA(m_colorram1 + offset);
+ m_foreground->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( nemesis_colorram2_word_w )
+WRITE16_MEMBER(nemesis_state::nemesis_colorram2_word_w)
{
- nemesis_state *state = space->machine().driver_data<nemesis_state>();
- COMBINE_DATA(state->m_colorram2 + offset);
- state->m_background->mark_tile_dirty(offset);
+ COMBINE_DATA(m_colorram2 + offset);
+ m_background->mark_tile_dirty(offset);
}
/* we have to straighten out the 16-bit word into bytes for gfxdecode() to work */
-WRITE16_HANDLER( nemesis_charram_word_w )
+WRITE16_MEMBER(nemesis_state::nemesis_charram_word_w)
{
- nemesis_state *state = space->machine().driver_data<nemesis_state>();
- UINT16 oldword = state->m_charram[offset];
+ UINT16 oldword = m_charram[offset];
- COMBINE_DATA(state->m_charram + offset);
- data = state->m_charram[offset];
+ COMBINE_DATA(m_charram + offset);
+ data = m_charram[offset];
if (oldword != data)
{
@@ -277,7 +267,7 @@ WRITE16_HANDLER( nemesis_charram_word_w )
{
int w = sprite_data[i].width;
int h = sprite_data[i].height;
- gfx_element_mark_dirty(space->machine().gfx[sprite_data[i].char_type], offset * 4 / (w * h));
+ gfx_element_mark_dirty(machine().gfx[sprite_data[i].char_type], offset * 4 / (w * h));
}
}
}
diff --git a/src/mame/video/neogeo.c b/src/mame/video/neogeo.c
index f2300d97094..2d28d2765c1 100644
--- a/src/mame/video/neogeo.c
+++ b/src/mame/video/neogeo.c
@@ -179,21 +179,19 @@ void neogeo_set_screen_dark( running_machine &machine, UINT8 data )
}
-READ16_HANDLER( neogeo_paletteram_r )
+READ16_MEMBER(neogeo_state::neogeo_paletteram_r)
{
- neogeo_state *state = space->machine().driver_data<neogeo_state>();
- return state->m_palettes[state->m_palette_bank][offset];
+ return m_palettes[m_palette_bank][offset];
}
-WRITE16_HANDLER( neogeo_paletteram_w )
+WRITE16_MEMBER(neogeo_state::neogeo_paletteram_w)
{
- neogeo_state *state = space->machine().driver_data<neogeo_state>();
- UINT16 *addr = &state->m_palettes[state->m_palette_bank][offset];
+ UINT16 *addr = &m_palettes[m_palette_bank][offset];
COMBINE_DATA(addr);
- state->m_pens[offset] = get_pen(space->machine(), *addr);
+ m_pens[offset] = get_pen(machine(), *addr);
}
@@ -793,23 +791,22 @@ static void set_video_control( running_machine &machine, UINT16 data )
}
-READ16_HANDLER( neogeo_video_register_r )
+READ16_MEMBER(neogeo_state::neogeo_video_register_r)
{
- neogeo_state *state = space->machine().driver_data<neogeo_state>();
UINT16 ret;
/* accessing the LSB only is not mapped */
if (mem_mask == 0x00ff)
- ret = state->neogeo_unmapped_r(*space, 0, 0xffff) & 0x00ff;
+ ret = neogeo_unmapped_r(space, 0, 0xffff) & 0x00ff;
else
{
switch (offset)
{
default:
case 0x00:
- case 0x01: ret = get_videoram_data(space->machine()); break;
- case 0x02: ret = get_videoram_modulo(space->machine()); break;
- case 0x03: ret = get_video_control(space->machine()); break;
+ case 0x01: ret = get_videoram_data(machine()); break;
+ case 0x02: ret = get_videoram_modulo(machine()); break;
+ case 0x03: ret = get_video_control(machine()); break;
}
}
@@ -817,7 +814,7 @@ READ16_HANDLER( neogeo_video_register_r )
}
-WRITE16_HANDLER( neogeo_video_register_w )
+WRITE16_MEMBER(neogeo_state::neogeo_video_register_w)
{
/* accessing the LSB only is not mapped */
if (mem_mask != 0x00ff)
@@ -828,13 +825,13 @@ WRITE16_HANDLER( neogeo_video_register_w )
switch (offset)
{
- case 0x00: set_videoram_offset(space->machine(), data); break;
- case 0x01: set_videoram_data(space->machine(), data); break;
- case 0x02: set_videoram_modulo(space->machine(), data); break;
- case 0x03: set_video_control(space->machine(), data); break;
- case 0x04: neogeo_set_display_counter_msb(space, data); break;
- case 0x05: neogeo_set_display_counter_lsb(space, data); break;
- case 0x06: neogeo_acknowledge_interrupt(space->machine(), data); break;
+ case 0x00: set_videoram_offset(machine(), data); break;
+ case 0x01: set_videoram_data(machine(), data); break;
+ case 0x02: set_videoram_modulo(machine(), data); break;
+ case 0x03: set_video_control(machine(), data); break;
+ case 0x04: neogeo_set_display_counter_msb(&space, data); break;
+ case 0x05: neogeo_set_display_counter_lsb(&space, data); break;
+ case 0x06: neogeo_acknowledge_interrupt(machine(), data); break;
case 0x07: break; /* unknown, see get_video_control */
}
}
diff --git a/src/mame/video/news.c b/src/mame/video/news.c
index 965426c3767..ec962199ef7 100644
--- a/src/mame/video/news.c
+++ b/src/mame/video/news.c
@@ -62,30 +62,27 @@ VIDEO_START( news )
***************************************************************************/
-WRITE8_HANDLER( news_fgram_w )
+WRITE8_MEMBER(news_state::news_fgram_w)
{
- news_state *state = space->machine().driver_data<news_state>();
- state->m_fgram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset / 2);
+ m_fgram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( news_bgram_w )
+WRITE8_MEMBER(news_state::news_bgram_w)
{
- news_state *state = space->machine().driver_data<news_state>();
- state->m_bgram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bgram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( news_bgpic_w )
+WRITE8_MEMBER(news_state::news_bgpic_w)
{
- news_state *state = space->machine().driver_data<news_state>();
- if (state->m_bgpic != data)
+ if (m_bgpic != data)
{
- state->m_bgpic = data;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bgpic = data;
+ m_bg_tilemap->mark_all_dirty();
}
}
diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c
index 8e0f9fe02ce..6542a7ebbce 100644
--- a/src/mame/video/ninjakd2.c
+++ b/src/mame/video/ninjakd2.c
@@ -221,83 +221,72 @@ VIDEO_START( omegaf )
*
*************************************/
-WRITE8_HANDLER( ninjakd2_bgvideoram_w )
+WRITE8_MEMBER(ninjakd2_state::ninjakd2_bgvideoram_w)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset >> 1);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset >> 1);
}
-WRITE8_HANDLER( ninjakd2_fgvideoram_w )
+WRITE8_MEMBER(ninjakd2_state::ninjakd2_fgvideoram_w)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- state->m_fg_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset >> 1);
+ m_fg_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset >> 1);
}
-WRITE8_HANDLER( robokid_bg0_bank_w )
+WRITE8_MEMBER(ninjakd2_state::robokid_bg0_bank_w)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- state->m_robokid_bg0_bank = data & state->m_bank_mask;
+ m_robokid_bg0_bank = data & m_bank_mask;
}
-WRITE8_HANDLER( robokid_bg1_bank_w )
+WRITE8_MEMBER(ninjakd2_state::robokid_bg1_bank_w)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- state->m_robokid_bg1_bank = data & state->m_bank_mask;
+ m_robokid_bg1_bank = data & m_bank_mask;
}
-WRITE8_HANDLER( robokid_bg2_bank_w )
+WRITE8_MEMBER(ninjakd2_state::robokid_bg2_bank_w)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- state->m_robokid_bg2_bank = data & state->m_bank_mask;
+ m_robokid_bg2_bank = data & m_bank_mask;
}
-READ8_HANDLER( robokid_bg0_videoram_r )
+READ8_MEMBER(ninjakd2_state::robokid_bg0_videoram_r)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- return state->m_robokid_bg0_videoram[(state->m_robokid_bg0_bank << 10) | offset];
+ return m_robokid_bg0_videoram[(m_robokid_bg0_bank << 10) | offset];
}
-READ8_HANDLER( robokid_bg1_videoram_r )
+READ8_MEMBER(ninjakd2_state::robokid_bg1_videoram_r)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- return state->m_robokid_bg1_videoram[(state->m_robokid_bg1_bank << 10) | offset];
+ return m_robokid_bg1_videoram[(m_robokid_bg1_bank << 10) | offset];
}
-READ8_HANDLER( robokid_bg2_videoram_r )
+READ8_MEMBER(ninjakd2_state::robokid_bg2_videoram_r)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- return state->m_robokid_bg2_videoram[(state->m_robokid_bg2_bank << 10) | offset];
+ return m_robokid_bg2_videoram[(m_robokid_bg2_bank << 10) | offset];
}
-WRITE8_HANDLER( robokid_bg0_videoram_w )
+WRITE8_MEMBER(ninjakd2_state::robokid_bg0_videoram_w)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- int const address = (state->m_robokid_bg0_bank << 10 ) | offset;
+ int const address = (m_robokid_bg0_bank << 10 ) | offset;
- state->m_robokid_bg0_videoram[address] = data;
- state->m_bg0_tilemap->mark_tile_dirty(address >> 1);
+ m_robokid_bg0_videoram[address] = data;
+ m_bg0_tilemap->mark_tile_dirty(address >> 1);
}
-WRITE8_HANDLER( robokid_bg1_videoram_w )
+WRITE8_MEMBER(ninjakd2_state::robokid_bg1_videoram_w)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- int const address = (state->m_robokid_bg1_bank << 10 ) | offset;
+ int const address = (m_robokid_bg1_bank << 10 ) | offset;
- state->m_robokid_bg1_videoram[address] = data;
- state->m_bg1_tilemap->mark_tile_dirty(address >> 1);
+ m_robokid_bg1_videoram[address] = data;
+ m_bg1_tilemap->mark_tile_dirty(address >> 1);
}
-WRITE8_HANDLER( robokid_bg2_videoram_w )
+WRITE8_MEMBER(ninjakd2_state::robokid_bg2_videoram_w)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- int const address = (state->m_robokid_bg2_bank << 10 ) | offset;
+ int const address = (m_robokid_bg2_bank << 10 ) | offset;
- state->m_robokid_bg2_videoram[address] = data;
- state->m_bg2_tilemap->mark_tile_dirty(address >> 1);
+ m_robokid_bg2_videoram[address] = data;
+ m_bg2_tilemap->mark_tile_dirty(address >> 1);
}
@@ -320,36 +309,31 @@ static void bg_ctrl(int offset, int data, tilemap_t* tilemap)
tilemap->set_scrolly(0, scrolly);
}
-WRITE8_HANDLER( ninjakd2_bg_ctrl_w )
+WRITE8_MEMBER(ninjakd2_state::ninjakd2_bg_ctrl_w)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- bg_ctrl(offset, data, state->m_bg_tilemap);
+ bg_ctrl(offset, data, m_bg_tilemap);
}
-WRITE8_HANDLER( robokid_bg0_ctrl_w )
+WRITE8_MEMBER(ninjakd2_state::robokid_bg0_ctrl_w)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- bg_ctrl(offset, data, state->m_bg0_tilemap);
+ bg_ctrl(offset, data, m_bg0_tilemap);
}
-WRITE8_HANDLER( robokid_bg1_ctrl_w )
+WRITE8_MEMBER(ninjakd2_state::robokid_bg1_ctrl_w)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- bg_ctrl(offset, data, state->m_bg1_tilemap);
+ bg_ctrl(offset, data, m_bg1_tilemap);
}
-WRITE8_HANDLER( robokid_bg2_ctrl_w )
+WRITE8_MEMBER(ninjakd2_state::robokid_bg2_ctrl_w)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- bg_ctrl(offset, data, state->m_bg2_tilemap);
+ bg_ctrl(offset, data, m_bg2_tilemap);
}
-WRITE8_HANDLER( ninjakd2_sprite_overdraw_w )
+WRITE8_MEMBER(ninjakd2_state::ninjakd2_sprite_overdraw_w)
{
- ninjakd2_state *state = space->machine().driver_data<ninjakd2_state>();
- state->m_next_sprite_overdraw_enabled = data & 1;
+ m_next_sprite_overdraw_enabled = data & 1;
}
diff --git a/src/mame/video/nitedrvr.c b/src/mame/video/nitedrvr.c
index b945082fc11..87feaeee4d6 100644
--- a/src/mame/video/nitedrvr.c
+++ b/src/mame/video/nitedrvr.c
@@ -7,22 +7,20 @@
#include "emu.h"
#include "includes/nitedrvr.h"
-WRITE8_HANDLER( nitedrvr_videoram_w )
+WRITE8_MEMBER(nitedrvr_state::nitedrvr_videoram_w)
{
- nitedrvr_state *state = space->machine().driver_data<nitedrvr_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( nitedrvr_hvc_w )
+WRITE8_MEMBER(nitedrvr_state::nitedrvr_hvc_w)
{
- nitedrvr_state *state = space->machine().driver_data<nitedrvr_state>();
- state->m_hvc[offset & 0x3f] = data;
+ m_hvc[offset & 0x3f] = data;
if ((offset & 0x30) == 0x30)
- state->watchdog_reset_w(*space, 0, 0);
+ watchdog_reset_w(space, 0, 0);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/niyanpai.c b/src/mame/video/niyanpai.c
index 3e37e901a56..884f88b8ba3 100644
--- a/src/mame/video/niyanpai.c
+++ b/src/mame/video/niyanpai.c
@@ -18,22 +18,20 @@ static void niyanpai_gfxdraw(running_machine &machine, int vram);
******************************************************************************/
-READ16_HANDLER( niyanpai_palette_r )
+READ16_MEMBER(niyanpai_state::niyanpai_palette_r)
{
- niyanpai_state *state = space->machine().driver_data<niyanpai_state>();
- return state->m_palette[offset];
+ return m_palette[offset];
}
-WRITE16_HANDLER( niyanpai_palette_w )
+WRITE16_MEMBER(niyanpai_state::niyanpai_palette_w)
{
- niyanpai_state *state = space->machine().driver_data<niyanpai_state>();
int r, g, b;
int offs_h, offs_l;
- UINT16 oldword = state->m_palette[offset];
+ UINT16 oldword = m_palette[offset];
UINT16 newword;
- COMBINE_DATA(&state->m_palette[offset]);
- newword = state->m_palette[offset];
+ COMBINE_DATA(&m_palette[offset]);
+ newword = m_palette[offset];
if (oldword != newword)
{
@@ -42,20 +40,20 @@ WRITE16_HANDLER( niyanpai_palette_w )
if (ACCESSING_BITS_8_15)
{
- r = ((state->m_palette[(0x000 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
- g = ((state->m_palette[(0x080 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
- b = ((state->m_palette[(0x100 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
+ r = ((m_palette[(0x000 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
+ g = ((m_palette[(0x080 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
+ b = ((m_palette[(0x100 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
- palette_set_color(space->machine(), ((offs_h << 8) + (offs_l << 1) + 0), MAKE_RGB(r, g, b));
+ palette_set_color(machine(), ((offs_h << 8) + (offs_l << 1) + 0), MAKE_RGB(r, g, b));
}
if (ACCESSING_BITS_0_7)
{
- r = ((state->m_palette[(0x000 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
- g = ((state->m_palette[(0x080 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
- b = ((state->m_palette[(0x100 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
+ r = ((m_palette[(0x000 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
+ g = ((m_palette[(0x080 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
+ b = ((m_palette[(0x100 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
- palette_set_color(space->machine(), ((offs_h << 8) + (offs_l << 1) + 1), MAKE_RGB(r, g, b));
+ palette_set_color(machine(), ((offs_h << 8) + (offs_l << 1) + 1), MAKE_RGB(r, g, b));
}
}
}
@@ -339,21 +337,21 @@ static void niyanpai_gfxdraw(running_machine &machine, int vram)
******************************************************************************/
-WRITE16_HANDLER( niyanpai_blitter_0_w ) { niyanpai_blitter_w(space->machine(), 0, offset, data); }
-WRITE16_HANDLER( niyanpai_blitter_1_w ) { niyanpai_blitter_w(space->machine(), 1, offset, data); }
-WRITE16_HANDLER( niyanpai_blitter_2_w ) { niyanpai_blitter_w(space->machine(), 2, offset, data); }
+WRITE16_MEMBER(niyanpai_state::niyanpai_blitter_0_w){ niyanpai_blitter_w(machine(), 0, offset, data); }
+WRITE16_MEMBER(niyanpai_state::niyanpai_blitter_1_w){ niyanpai_blitter_w(machine(), 1, offset, data); }
+WRITE16_MEMBER(niyanpai_state::niyanpai_blitter_2_w){ niyanpai_blitter_w(machine(), 2, offset, data); }
-READ16_HANDLER( niyanpai_blitter_0_r ) { return niyanpai_blitter_r(space->machine(), 0, offset); }
-READ16_HANDLER( niyanpai_blitter_1_r ) { return niyanpai_blitter_r(space->machine(), 1, offset); }
-READ16_HANDLER( niyanpai_blitter_2_r ) { return niyanpai_blitter_r(space->machine(), 2, offset); }
+READ16_MEMBER(niyanpai_state::niyanpai_blitter_0_r){ return niyanpai_blitter_r(machine(), 0, offset); }
+READ16_MEMBER(niyanpai_state::niyanpai_blitter_1_r){ return niyanpai_blitter_r(machine(), 1, offset); }
+READ16_MEMBER(niyanpai_state::niyanpai_blitter_2_r){ return niyanpai_blitter_r(machine(), 2, offset); }
-WRITE16_HANDLER( niyanpai_clut_0_w ) { niyanpai_clut_w(space->machine(), 0, offset, data); }
-WRITE16_HANDLER( niyanpai_clut_1_w ) { niyanpai_clut_w(space->machine(), 1, offset, data); }
-WRITE16_HANDLER( niyanpai_clut_2_w ) { niyanpai_clut_w(space->machine(), 2, offset, data); }
+WRITE16_MEMBER(niyanpai_state::niyanpai_clut_0_w){ niyanpai_clut_w(machine(), 0, offset, data); }
+WRITE16_MEMBER(niyanpai_state::niyanpai_clut_1_w){ niyanpai_clut_w(machine(), 1, offset, data); }
+WRITE16_MEMBER(niyanpai_state::niyanpai_clut_2_w){ niyanpai_clut_w(machine(), 2, offset, data); }
-WRITE16_HANDLER( niyanpai_clutsel_0_w ) { niyanpai_clutsel_w(space->machine(), 0, data); }
-WRITE16_HANDLER( niyanpai_clutsel_1_w ) { niyanpai_clutsel_w(space->machine(), 1, data); }
-WRITE16_HANDLER( niyanpai_clutsel_2_w ) { niyanpai_clutsel_w(space->machine(), 2, data); }
+WRITE16_MEMBER(niyanpai_state::niyanpai_clutsel_0_w){ niyanpai_clutsel_w(machine(), 0, data); }
+WRITE16_MEMBER(niyanpai_state::niyanpai_clutsel_1_w){ niyanpai_clutsel_w(machine(), 1, data); }
+WRITE16_MEMBER(niyanpai_state::niyanpai_clutsel_2_w){ niyanpai_clutsel_w(machine(), 2, data); }
/******************************************************************************
diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c
index 5fa1977d0eb..3962f6aa238 100644
--- a/src/mame/video/nmk16.c
+++ b/src/mame/video/nmk16.c
@@ -225,62 +225,55 @@ VIDEO_START( bjtwin )
***************************************************************************/
-WRITE16_HANDLER( nmk_bgvideoram0_w )
+WRITE16_MEMBER(nmk16_state::nmk_bgvideoram0_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
- COMBINE_DATA(&state->m_nmk_bgvideoram0[offset]);
- state->m_bg_tilemap0->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_nmk_bgvideoram0[offset]);
+ m_bg_tilemap0->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( nmk_bgvideoram1_w )
+WRITE16_MEMBER(nmk16_state::nmk_bgvideoram1_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
- COMBINE_DATA(&state->m_nmk_bgvideoram1[offset]);
- state->m_bg_tilemap1->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_nmk_bgvideoram1[offset]);
+ m_bg_tilemap1->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( nmk_bgvideoram2_w )
+WRITE16_MEMBER(nmk16_state::nmk_bgvideoram2_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
- COMBINE_DATA(&state->m_nmk_bgvideoram2[offset]);
- state->m_bg_tilemap2->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_nmk_bgvideoram2[offset]);
+ m_bg_tilemap2->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( nmk_bgvideoram3_w )
+WRITE16_MEMBER(nmk16_state::nmk_bgvideoram3_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
- COMBINE_DATA(&state->m_nmk_bgvideoram3[offset]);
- state->m_bg_tilemap3->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_nmk_bgvideoram3[offset]);
+ m_bg_tilemap3->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( nmk_fgvideoram_w )
+WRITE16_MEMBER(nmk16_state::nmk_fgvideoram_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
- COMBINE_DATA(&state->m_nmk_fgvideoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_nmk_fgvideoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( nmk_txvideoram_w )
+WRITE16_MEMBER(nmk16_state::nmk_txvideoram_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
- COMBINE_DATA(&state->m_nmk_txvideoram[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_nmk_txvideoram[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( mustang_scroll_w )
+WRITE16_MEMBER(nmk16_state::mustang_scroll_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
// mame_printf_debug("mustang %04x %04x %04x\n",offset,data,mem_mask);
switch (data & 0xff00)
{
case 0x0000:
- state->m_mustang_bg_xscroll = (state->m_mustang_bg_xscroll & 0x00ff) | ((data & 0x00ff)<<8);
+ m_mustang_bg_xscroll = (m_mustang_bg_xscroll & 0x00ff) | ((data & 0x00ff)<<8);
break;
case 0x0100:
- state->m_mustang_bg_xscroll = (state->m_mustang_bg_xscroll & 0xff00) | (data & 0x00ff);
+ m_mustang_bg_xscroll = (m_mustang_bg_xscroll & 0xff00) | (data & 0x00ff);
break;
case 0x0200:
@@ -293,124 +286,115 @@ WRITE16_HANDLER( mustang_scroll_w )
break;
}
- state->m_bg_tilemap0->set_scrollx(0,state->m_mustang_bg_xscroll - state->m_videoshift);
+ m_bg_tilemap0->set_scrollx(0,m_mustang_bg_xscroll - m_videoshift);
}
-WRITE16_HANDLER( bioshipbg_scroll_w )
+WRITE16_MEMBER(nmk16_state::bioshipbg_scroll_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
if (ACCESSING_BITS_8_15)
{
- state->m_scroll[offset] = (data >> 8) & 0xff;
+ m_scroll[offset] = (data >> 8) & 0xff;
if (offset & 2)
- state->m_bg_tilemap0->set_scrolly(0,state->m_scroll[2] * 256 + state->m_scroll[3]);
+ m_bg_tilemap0->set_scrolly(0,m_scroll[2] * 256 + m_scroll[3]);
else
- state->m_bg_tilemap0->set_scrollx(0,state->m_scroll[0] * 256 + state->m_scroll[1] - state->m_videoshift);
+ m_bg_tilemap0->set_scrollx(0,m_scroll[0] * 256 + m_scroll[1] - m_videoshift);
}
}
-WRITE16_HANDLER( nmk_scroll_w )
+WRITE16_MEMBER(nmk16_state::nmk_scroll_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_scroll[offset] = data & 0xff;
+ m_scroll[offset] = data & 0xff;
if (offset & 2)
- state->m_bg_tilemap0->set_scrolly(0,state->m_scroll[2] * 256 + state->m_scroll[3]);
+ m_bg_tilemap0->set_scrolly(0,m_scroll[2] * 256 + m_scroll[3]);
else
- state->m_bg_tilemap0->set_scrollx(0,state->m_scroll[0] * 256 + state->m_scroll[1] - state->m_videoshift);
+ m_bg_tilemap0->set_scrollx(0,m_scroll[0] * 256 + m_scroll[1] - m_videoshift);
}
}
-WRITE16_HANDLER( nmk_scroll_2_w )
+WRITE16_MEMBER(nmk16_state::nmk_scroll_2_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_scroll_2[offset] = data & 0xff;
+ m_scroll_2[offset] = data & 0xff;
if (offset & 2)
- state->m_fg_tilemap->set_scrolly(0,state->m_scroll_2[2] * 256 + state->m_scroll_2[3]);
+ m_fg_tilemap->set_scrolly(0,m_scroll_2[2] * 256 + m_scroll_2[3]);
else
- state->m_fg_tilemap->set_scrollx(0,state->m_scroll_2[0] * 256 + state->m_scroll_2[1] - state->m_videoshift);
+ m_fg_tilemap->set_scrollx(0,m_scroll_2[0] * 256 + m_scroll_2[1] - m_videoshift);
}
}
-WRITE16_HANDLER( vandyke_scroll_w )
+WRITE16_MEMBER(nmk16_state::vandyke_scroll_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
- state->m_vscroll[offset] = data;
+ m_vscroll[offset] = data;
- state->m_bg_tilemap0->set_scrollx(0,state->m_vscroll[0] * 256 + (state->m_vscroll[1] >> 8));
- state->m_bg_tilemap0->set_scrolly(0,state->m_vscroll[2] * 256 + (state->m_vscroll[3] >> 8));
+ m_bg_tilemap0->set_scrollx(0,m_vscroll[0] * 256 + (m_vscroll[1] >> 8));
+ m_bg_tilemap0->set_scrolly(0,m_vscroll[2] * 256 + (m_vscroll[3] >> 8));
}
-WRITE16_HANDLER( vandykeb_scroll_w )
+WRITE16_MEMBER(nmk16_state::vandykeb_scroll_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
switch (offset)
{
- case 0: COMBINE_DATA(&state->m_vscroll[3]); break;
- case 1: COMBINE_DATA(&state->m_vscroll[2]); break;
- case 5: COMBINE_DATA(&state->m_vscroll[1]); break;
- case 6: COMBINE_DATA(&state->m_vscroll[0]); break;
+ case 0: COMBINE_DATA(&m_vscroll[3]); break;
+ case 1: COMBINE_DATA(&m_vscroll[2]); break;
+ case 5: COMBINE_DATA(&m_vscroll[1]); break;
+ case 6: COMBINE_DATA(&m_vscroll[0]); break;
}
- state->m_bg_tilemap0->set_scrollx(0,state->m_vscroll[0] * 256 + (state->m_vscroll[1] >> 8));
- state->m_bg_tilemap0->set_scrolly(0,state->m_vscroll[2] * 256 + (state->m_vscroll[3] >> 8));
+ m_bg_tilemap0->set_scrollx(0,m_vscroll[0] * 256 + (m_vscroll[1] >> 8));
+ m_bg_tilemap0->set_scrolly(0,m_vscroll[2] * 256 + (m_vscroll[3] >> 8));
}
-WRITE16_HANDLER( manybloc_scroll_w )
+WRITE16_MEMBER(nmk16_state::manybloc_scroll_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
- COMBINE_DATA(&state->m_gunnail_scrollram[offset]);
+ COMBINE_DATA(&m_gunnail_scrollram[offset]);
- state->m_bg_tilemap0->set_scrollx(0,state->m_gunnail_scrollram[0x82/2]-state->m_videoshift);
- state->m_bg_tilemap0->set_scrolly(0,state->m_gunnail_scrollram[0xc2/2]);
+ m_bg_tilemap0->set_scrollx(0,m_gunnail_scrollram[0x82/2]-m_videoshift);
+ m_bg_tilemap0->set_scrolly(0,m_gunnail_scrollram[0xc2/2]);
}
-WRITE16_HANDLER( nmk_flipscreen_w )
+WRITE16_MEMBER(nmk16_state::nmk_flipscreen_w)
{
if (ACCESSING_BITS_0_7)
- flip_screen_set(space->machine(), data & 0x01);
+ flip_screen_set(machine(), data & 0x01);
}
-WRITE16_HANDLER( nmk_tilebank_w )
+WRITE16_MEMBER(nmk16_state::nmk_tilebank_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
if (ACCESSING_BITS_0_7)
{
- if (state->m_bgbank != (data & 0xff))
+ if (m_bgbank != (data & 0xff))
{
- state->m_bgbank = data & 0xff;
- state->m_bg_tilemap0->mark_all_dirty();
+ m_bgbank = data & 0xff;
+ m_bg_tilemap0->mark_all_dirty();
}
}
}
-WRITE16_HANDLER( bioship_scroll_w )
+WRITE16_MEMBER(nmk16_state::bioship_scroll_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
if (ACCESSING_BITS_8_15)
- state->m_bioship_scroll[offset]=data>>8;
+ m_bioship_scroll[offset]=data>>8;
}
-WRITE16_HANDLER( bioship_bank_w )
+WRITE16_MEMBER(nmk16_state::bioship_bank_w)
{
- nmk16_state *state = space->machine().driver_data<nmk16_state>();
if (ACCESSING_BITS_0_7)
{
- if (state->m_bioship_background_bank != data)
+ if (m_bioship_background_bank != data)
{
- state->m_bioship_background_bank = data;
- state->m_redraw_bitmap=1;
+ m_bioship_background_bank = data;
+ m_redraw_bitmap=1;
}
}
}
diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c
index 600d0514374..5939aad155d 100644
--- a/src/mame/video/nova2001.c
+++ b/src/mame/video/nova2001.c
@@ -47,23 +47,22 @@ PALETTE_INIT( nova2001 )
}
}
-WRITE8_HANDLER( ninjakun_paletteram_w )
+WRITE8_MEMBER(nova2001_state::ninjakun_paletteram_w)
{
int i;
- nova2001_state *state = space->machine().driver_data<nova2001_state>();
- state->paletteram_BBGGRRII_w(*space,offset,data);
+ paletteram_BBGGRRII_w(space,offset,data);
// expand the sprite palette to full length
if (offset < 16)
{
- state->paletteram_BBGGRRII_w(*space, 0x200 + offset * 16 + 1, data);
+ paletteram_BBGGRRII_w(space, 0x200 + offset * 16 + 1, data);
if (offset != 1)
{
for (i = 0; i < 16; i++)
{
- state->paletteram_BBGGRRII_w(*space, 0x200 + offset + i * 16, data);
+ paletteram_BBGGRRII_w(space, 0x200 + offset + i * 16, data);
}
}
}
@@ -201,66 +200,60 @@ VIDEO_START( raiders5 )
*
*************************************/
-WRITE8_HANDLER( nova2001_fg_videoram_w )
+WRITE8_MEMBER(nova2001_state::nova2001_fg_videoram_w)
{
- nova2001_state *state = space->machine().driver_data<nova2001_state>();
- state->m_fg_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fg_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( nova2001_bg_videoram_w )
+WRITE8_MEMBER(nova2001_state::nova2001_bg_videoram_w)
{
- nova2001_state *state = space->machine().driver_data<nova2001_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( ninjakun_bg_videoram_w )
+WRITE8_MEMBER(nova2001_state::ninjakun_bg_videoram_w)
{
- nova2001_state *state = space->machine().driver_data<nova2001_state>();
- int x = state->m_bg_tilemap->scrollx(0) >> 3;
- int y = state->m_bg_tilemap->scrolly(0) >> 3;
+ int x = m_bg_tilemap->scrollx(0) >> 3;
+ int y = m_bg_tilemap->scrolly(0) >> 3;
// add scroll registers to address
offset = ((offset + x + (y << 5)) & 0x3ff) + (offset & 0x400);
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-READ8_HANDLER( ninjakun_bg_videoram_r )
+READ8_MEMBER(nova2001_state::ninjakun_bg_videoram_r)
{
- nova2001_state *state = space->machine().driver_data<nova2001_state>();
- int x = state->m_bg_tilemap->scrollx(0) >> 3;
- int y = state->m_bg_tilemap->scrolly(0) >> 3;
+ int x = m_bg_tilemap->scrollx(0) >> 3;
+ int y = m_bg_tilemap->scrolly(0) >> 3;
// add scroll registers to address
offset = ((offset + x + (y << 5)) & 0x3ff) + (offset & 0x400);
- return state->m_bg_videoram[offset];
+ return m_bg_videoram[offset];
}
-WRITE8_HANDLER( nova2001_scroll_x_w )
+WRITE8_MEMBER(nova2001_state::nova2001_scroll_x_w)
{
- nova2001_state *state = space->machine().driver_data<nova2001_state>();
- state->m_bg_tilemap->set_scrollx(0, data);
+ m_bg_tilemap->set_scrollx(0, data);
}
-WRITE8_HANDLER( nova2001_scroll_y_w )
+WRITE8_MEMBER(nova2001_state::nova2001_scroll_y_w)
{
- nova2001_state *state = space->machine().driver_data<nova2001_state>();
- state->m_bg_tilemap->set_scrolly(0, data);
+ m_bg_tilemap->set_scrolly(0, data);
}
-WRITE8_HANDLER( nova2001_flipscreen_w )
+WRITE8_MEMBER(nova2001_state::nova2001_flipscreen_w)
{
// inverted
- flip_screen_set(space->machine(), ~data & 1);
+ flip_screen_set(machine(), ~data & 1);
}
-WRITE8_HANDLER( pkunwar_flipscreen_w )
+WRITE8_MEMBER(nova2001_state::pkunwar_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 1);
+ flip_screen_set(machine(), data & 1);
}
diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c
index 0d4ee4c3238..9efea4acd95 100644
--- a/src/mame/video/nycaptor.c
+++ b/src/mame/video/nycaptor.c
@@ -25,16 +25,14 @@ static int nycaptor_spot( running_machine &machine )
return 0;
}
-WRITE8_HANDLER(nycaptor_spriteram_w)
+WRITE8_MEMBER(nycaptor_state::nycaptor_spriteram_w)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- state->m_spriteram[offset] = data;
+ m_spriteram[offset] = data;
}
-READ8_HANDLER(nycaptor_spriteram_r)
+READ8_MEMBER(nycaptor_state::nycaptor_spriteram_r)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- return state->m_spriteram[offset];
+ return m_spriteram[offset];
}
static TILE_GET_INFO( get_tile_info )
@@ -91,78 +89,70 @@ VIDEO_START( nycaptor )
state->save_pointer(NAME(state->m_spriteram), 160);
}
-WRITE8_HANDLER( nycaptor_videoram_w )
+WRITE8_MEMBER(nycaptor_state::nycaptor_videoram_w)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset >> 1);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset >> 1);
}
-READ8_HANDLER( nycaptor_videoram_r )
+READ8_MEMBER(nycaptor_state::nycaptor_videoram_r)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- return state->m_videoram[offset];
+ return m_videoram[offset];
}
-WRITE8_HANDLER( nycaptor_palette_w )
+WRITE8_MEMBER(nycaptor_state::nycaptor_palette_w)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- if (state->m_gametype == 2) //colt
+ if (m_gametype == 2) //colt
return;
if (offset & 0x100)
- state->paletteram_xxxxBBBBGGGGRRRR_split2_w(*space, (offset & 0xff) + (state->m_palette_bank << 8), data);
+ paletteram_xxxxBBBBGGGGRRRR_split2_w(space, (offset & 0xff) + (m_palette_bank << 8), data);
else
- state->paletteram_xxxxBBBBGGGGRRRR_split1_w(*space, (offset & 0xff) + (state->m_palette_bank << 8), data);
+ paletteram_xxxxBBBBGGGGRRRR_split1_w(space, (offset & 0xff) + (m_palette_bank << 8), data);
}
-READ8_HANDLER( nycaptor_palette_r )
+READ8_MEMBER(nycaptor_state::nycaptor_palette_r)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
if (offset & 0x100)
- return state->m_generic_paletteram2_8[(offset & 0xff) + (state->m_palette_bank << 8)];
+ return m_generic_paletteram2_8[(offset & 0xff) + (m_palette_bank << 8)];
else
- return state->m_generic_paletteram_8 [(offset & 0xff) + (state->m_palette_bank << 8)];
+ return m_generic_paletteram_8 [(offset & 0xff) + (m_palette_bank << 8)];
}
-WRITE8_HANDLER( nycaptor_gfxctrl_w )
+WRITE8_MEMBER(nycaptor_state::nycaptor_gfxctrl_w)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- if (state->m_gfxctrl == data)
+ if (m_gfxctrl == data)
return;
- state->m_gfxctrl = data;
+ m_gfxctrl = data;
- if (state->m_char_bank != ((data & 0x18) >> 3))
+ if (m_char_bank != ((data & 0x18) >> 3))
{
- state->m_char_bank = ((data & 0x18) >> 3);
- state->m_bg_tilemap->mark_all_dirty();
+ m_char_bank = ((data & 0x18) >> 3);
+ m_bg_tilemap->mark_all_dirty();
}
- state->m_palette_bank = BIT(data, 5);
+ m_palette_bank = BIT(data, 5);
}
-READ8_HANDLER( nycaptor_gfxctrl_r )
+READ8_MEMBER(nycaptor_state::nycaptor_gfxctrl_r)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- return state->m_gfxctrl;
+ return m_gfxctrl;
}
-READ8_HANDLER( nycaptor_scrlram_r )
+READ8_MEMBER(nycaptor_state::nycaptor_scrlram_r)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- return state->m_scrlram[offset];
+ return m_scrlram[offset];
}
-WRITE8_HANDLER( nycaptor_scrlram_w )
+WRITE8_MEMBER(nycaptor_state::nycaptor_scrlram_w)
{
- nycaptor_state *state = space->machine().driver_data<nycaptor_state>();
- state->m_scrlram[offset] = data;
- state->m_bg_tilemap->set_scrolly(offset, data);
+ m_scrlram[offset] = data;
+ m_bg_tilemap->set_scrolly(offset, data);
}
static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri )
diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c
index 9f4d9e4d7e9..e4de504f6cb 100644
--- a/src/mame/video/ohmygod.c
+++ b/src/mame/video/ohmygod.c
@@ -41,32 +41,28 @@ VIDEO_START( ohmygod )
***************************************************************************/
-WRITE16_HANDLER( ohmygod_videoram_w )
+WRITE16_MEMBER(ohmygod_state::ohmygod_videoram_w)
{
- ohmygod_state *state = space->machine().driver_data<ohmygod_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( ohmygod_spritebank_w )
+WRITE16_MEMBER(ohmygod_state::ohmygod_spritebank_w)
{
- ohmygod_state *state = space->machine().driver_data<ohmygod_state>();
if (ACCESSING_BITS_8_15)
- state->m_spritebank = data & 0x8000;
+ m_spritebank = data & 0x8000;
}
-WRITE16_HANDLER( ohmygod_scrollx_w )
+WRITE16_MEMBER(ohmygod_state::ohmygod_scrollx_w)
{
- ohmygod_state *state = space->machine().driver_data<ohmygod_state>();
- COMBINE_DATA(&state->m_scrollx);
- state->m_bg_tilemap->set_scrollx(0, state->m_scrollx - 0x81ec);
+ COMBINE_DATA(&m_scrollx);
+ m_bg_tilemap->set_scrollx(0, m_scrollx - 0x81ec);
}
-WRITE16_HANDLER( ohmygod_scrolly_w )
+WRITE16_MEMBER(ohmygod_state::ohmygod_scrolly_w)
{
- ohmygod_state *state = space->machine().driver_data<ohmygod_state>();
- COMBINE_DATA(&state->m_scrolly);
- state->m_bg_tilemap->set_scrolly(0, state->m_scrolly - 0x81ef);
+ COMBINE_DATA(&m_scrolly);
+ m_bg_tilemap->set_scrolly(0, m_scrolly - 0x81ef);
}
diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c
index 96521322f46..a2bc5036653 100644
--- a/src/mame/video/ojankohs.c
+++ b/src/mame/video/ojankohs.c
@@ -48,59 +48,56 @@ PALETTE_INIT( ojankoy )
}
}
-WRITE8_HANDLER( ojankohs_palette_w )
+WRITE8_MEMBER(ojankohs_state::ojankohs_palette_w)
{
- ojankohs_state *state = space->machine().driver_data<ojankohs_state>();
int r, g, b;
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
offset &= 0x7fe;
- r = (state->m_paletteram[offset + 0] & 0x7c) >> 2;
- g = ((state->m_paletteram[offset + 0] & 0x03) << 3) | ((state->m_paletteram[offset + 1] & 0xe0) >> 5);
- b = (state->m_paletteram[offset + 1] & 0x1f) >> 0;
+ r = (m_paletteram[offset + 0] & 0x7c) >> 2;
+ g = ((m_paletteram[offset + 0] & 0x03) << 3) | ((m_paletteram[offset + 1] & 0xe0) >> 5);
+ b = (m_paletteram[offset + 1] & 0x1f) >> 0;
- palette_set_color_rgb(space->machine(), offset >> 1, pal5bit(r), pal5bit(g), pal5bit(b));
+ palette_set_color_rgb(machine(), offset >> 1, pal5bit(r), pal5bit(g), pal5bit(b));
}
-WRITE8_HANDLER( ccasino_palette_w )
+WRITE8_MEMBER(ojankohs_state::ccasino_palette_w)
{
- ojankohs_state *state = space->machine().driver_data<ojankohs_state>();
int r, g, b;
/* get top 8 bits of the I/O port address */
- offset = (offset << 8) | (cpu_get_reg(&space->device(), Z80_BC) >> 8);
+ offset = (offset << 8) | (cpu_get_reg(&space.device(), Z80_BC) >> 8);
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
offset &= 0x7fe;
- r = (state->m_paletteram[offset + 0] & 0x7c) >> 2;
- g = ((state->m_paletteram[offset + 0] & 0x03) << 3) | ((state->m_paletteram[offset + 1] & 0xe0) >> 5);
- b = (state->m_paletteram[offset + 1] & 0x1f) >> 0;
+ r = (m_paletteram[offset + 0] & 0x7c) >> 2;
+ g = ((m_paletteram[offset + 0] & 0x03) << 3) | ((m_paletteram[offset + 1] & 0xe0) >> 5);
+ b = (m_paletteram[offset + 1] & 0x1f) >> 0;
- palette_set_color_rgb(space->machine(), offset >> 1, pal5bit(r), pal5bit(g), pal5bit(b));
+ palette_set_color_rgb(machine(), offset >> 1, pal5bit(r), pal5bit(g), pal5bit(b));
}
-WRITE8_HANDLER( ojankoc_palette_w )
+WRITE8_MEMBER(ojankohs_state::ojankoc_palette_w)
{
- ojankohs_state *state = space->machine().driver_data<ojankohs_state>();
int r, g, b, color;
- if (state->m_paletteram[offset] == data)
+ if (m_paletteram[offset] == data)
return;
- state->m_paletteram[offset] = data;
- state->m_screen_refresh = 1;
+ m_paletteram[offset] = data;
+ m_screen_refresh = 1;
- color = (state->m_paletteram[offset & 0x1e] << 8) | state->m_paletteram[offset | 0x01];
+ color = (m_paletteram[offset & 0x1e] << 8) | m_paletteram[offset | 0x01];
r = (color >> 10) & 0x1f;
g = (color >> 5) & 0x1f;
b = (color >> 0) & 0x1f;
- palette_set_color_rgb(space->machine(), offset >> 1, pal5bit(r), pal5bit(g), pal5bit(b));
+ palette_set_color_rgb(machine(), offset >> 1, pal5bit(r), pal5bit(g), pal5bit(b));
}
@@ -110,51 +107,47 @@ WRITE8_HANDLER( ojankoc_palette_w )
******************************************************************************/
-WRITE8_HANDLER( ojankohs_videoram_w )
+WRITE8_MEMBER(ojankohs_state::ojankohs_videoram_w)
{
- ojankohs_state *state = space->machine().driver_data<ojankohs_state>();
- state->m_videoram[offset] = data;
- state->m_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( ojankohs_colorram_w )
+WRITE8_MEMBER(ojankohs_state::ojankohs_colorram_w)
{
- ojankohs_state *state = space->machine().driver_data<ojankohs_state>();
- state->m_colorram[offset] = data;
- state->m_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( ojankohs_gfxreg_w )
+WRITE8_MEMBER(ojankohs_state::ojankohs_gfxreg_w)
{
- ojankohs_state *state = space->machine().driver_data<ojankohs_state>();
- if (state->m_gfxreg != data)
+ if (m_gfxreg != data)
{
- state->m_gfxreg = data;
- state->m_tilemap->mark_all_dirty();
+ m_gfxreg = data;
+ m_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( ojankohs_flipscreen_w )
+WRITE8_MEMBER(ojankohs_state::ojankohs_flipscreen_w)
{
- ojankohs_state *state = space->machine().driver_data<ojankohs_state>();
- if (state->m_flipscreen != BIT(data, 0))
+ if (m_flipscreen != BIT(data, 0))
{
- state->m_flipscreen = BIT(data, 0);
+ m_flipscreen = BIT(data, 0);
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
- if (state->m_flipscreen)
+ if (m_flipscreen)
{
- state->m_scrollx = -0xe0;
- state->m_scrolly = -0x20;
+ m_scrollx = -0xe0;
+ m_scrolly = -0x20;
}
else
{
- state->m_scrollx = 0;
- state->m_scrolly = 0;
+ m_scrollx = 0;
+ m_scrolly = 0;
}
}
}
@@ -209,36 +202,35 @@ void ojankoc_flipscreen( address_space *space, int data )
{
color1 = state->m_videoram[0x0000 + ((y * 256) + x)];
color2 = state->m_videoram[0x3fff - ((y * 256) + x)];
- ojankoc_videoram_w(space, 0x0000 + ((y * 256) + x), color2);
- ojankoc_videoram_w(space, 0x3fff - ((y * 256) + x), color1);
+ state->ojankoc_videoram_w(*space, 0x0000 + ((y * 256) + x), color2);
+ state->ojankoc_videoram_w(*space, 0x3fff - ((y * 256) + x), color1);
color1 = state->m_videoram[0x4000 + ((y * 256) + x)];
color2 = state->m_videoram[0x7fff - ((y * 256) + x)];
- ojankoc_videoram_w(space, 0x4000 + ((y * 256) + x), color2);
- ojankoc_videoram_w(space, 0x7fff - ((y * 256) + x), color1);
+ state->ojankoc_videoram_w(*space, 0x4000 + ((y * 256) + x), color2);
+ state->ojankoc_videoram_w(*space, 0x7fff - ((y * 256) + x), color1);
}
}
state->m_flipscreen_old = state->m_flipscreen;
}
-WRITE8_HANDLER( ojankoc_videoram_w )
+WRITE8_MEMBER(ojankohs_state::ojankoc_videoram_w)
{
- ojankohs_state *state = space->machine().driver_data<ojankohs_state>();
int i;
UINT8 x, y, xx, px, py ;
UINT8 color, color1, color2;
- state->m_videoram[offset] = data;
+ m_videoram[offset] = data;
- color1 = state->m_videoram[offset & 0x3fff];
- color2 = state->m_videoram[offset | 0x4000];
+ color1 = m_videoram[offset & 0x3fff];
+ color2 = m_videoram[offset | 0x4000];
y = offset >> 6;
x = (offset & 0x3f) << 2;
xx = 0;
- if (state->m_flipscreen)
+ if (m_flipscreen)
{
x = 0xfc - x;
y = 0xff - y;
@@ -252,7 +244,7 @@ WRITE8_HANDLER( ojankoc_videoram_w )
px = x + (i ^ xx);
py = y;
- state->m_tmpbitmap.pix16(py, px) = color;
+ m_tmpbitmap.pix16(py, px) = color;
color1 >>= 1;
color2 >>= 1;
@@ -335,7 +327,7 @@ SCREEN_UPDATE_IND16( ojankoc )
/* redraw bitmap */
for (offs = 0; offs < 0x8000; offs++)
{
- ojankoc_videoram_w(space, offs, state->m_videoram[offs]);
+ state->ojankoc_videoram_w(*space, offs, state->m_videoram[offs]);
}
state->m_screen_refresh = 0;
}
diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c
index bc4c2a01c2b..85e75c47675 100644
--- a/src/mame/video/oneshot.c
+++ b/src/mame/video/oneshot.c
@@ -13,11 +13,10 @@ static TILE_GET_INFO( get_oneshot_bg_tile_info )
SET_TILE_INFO(0, tileno, 0, 0);
}
-WRITE16_HANDLER( oneshot_bg_videoram_w )
+WRITE16_MEMBER(oneshot_state::oneshot_bg_videoram_w)
{
- oneshot_state *state = space->machine().driver_data<oneshot_state>();
- COMBINE_DATA(&state->m_bg_videoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_bg_videoram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
/* mid tilemap */
@@ -29,11 +28,10 @@ static TILE_GET_INFO( get_oneshot_mid_tile_info )
SET_TILE_INFO(0, tileno, 2, 0);
}
-WRITE16_HANDLER( oneshot_mid_videoram_w )
+WRITE16_MEMBER(oneshot_state::oneshot_mid_videoram_w)
{
- oneshot_state *state = space->machine().driver_data<oneshot_state>();
- COMBINE_DATA(&state->m_mid_videoram[offset]);
- state->m_mid_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_mid_videoram[offset]);
+ m_mid_tilemap->mark_tile_dirty(offset / 2);
}
@@ -46,11 +44,10 @@ static TILE_GET_INFO( get_oneshot_fg_tile_info )
SET_TILE_INFO(0, tileno, 3, 0);
}
-WRITE16_HANDLER( oneshot_fg_videoram_w )
+WRITE16_MEMBER(oneshot_state::oneshot_fg_videoram_w)
{
- oneshot_state *state = space->machine().driver_data<oneshot_state>();
- COMBINE_DATA(&state->m_fg_videoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_fg_videoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset / 2);
}
VIDEO_START( oneshot )
diff --git a/src/mame/video/opwolf.c b/src/mame/video/opwolf.c
index 4f565702064..c1d816f338f 100644
--- a/src/mame/video/opwolf.c
+++ b/src/mame/video/opwolf.c
@@ -10,9 +10,8 @@
#include "includes/opwolf.h"
-WRITE16_HANDLER( opwolf_spritectrl_w )
+WRITE16_MEMBER(opwolf_state::opwolf_spritectrl_w)
{
- opwolf_state *state = space->machine().driver_data<opwolf_state>();
if (offset == 0)
{
@@ -20,7 +19,7 @@ WRITE16_HANDLER( opwolf_spritectrl_w )
/* bits 5-7 are the sprite palette bank */
/* other bits unknown */
- pc090oj_set_sprite_ctrl(state->m_pc090oj, (data & 0xe0) >> 5);
+ pc090oj_set_sprite_ctrl(m_pc090oj, (data & 0xe0) >> 5);
/* If data = 4, the Piston Motor is off, otherwise it's on. */
if (data == 4)
diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c
index 1d51e1fc75a..3f072596928 100644
--- a/src/mame/video/orbit.c
+++ b/src/mame/video/orbit.c
@@ -7,11 +7,10 @@ Atari Orbit video emulation
#include "emu.h"
#include "includes/orbit.h"
-WRITE8_HANDLER( orbit_playfield_w )
+WRITE8_MEMBER(orbit_state::orbit_playfield_w)
{
- orbit_state *state = space->machine().driver_data<orbit_state>();
- state->m_playfield_ram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_playfield_ram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/othldrby.c b/src/mame/video/othldrby.c
index 88cf76ba1b2..807cf5b82ca 100644
--- a/src/mame/video/othldrby.c
+++ b/src/mame/video/othldrby.c
@@ -79,53 +79,48 @@ VIDEO_START( othldrby )
***************************************************************************/
-WRITE16_HANDLER( othldrby_videoram_addr_w )
+WRITE16_MEMBER(othldrby_state::othldrby_videoram_addr_w)
{
- othldrby_state *state = space->machine().driver_data<othldrby_state>();
- state->m_vram_addr = data;
+ m_vram_addr = data;
}
-READ16_HANDLER( othldrby_videoram_r )
+READ16_MEMBER(othldrby_state::othldrby_videoram_r)
{
- othldrby_state *state = space->machine().driver_data<othldrby_state>();
- if (state->m_vram_addr < VIDEORAM_SIZE)
- return state->m_vram[state->m_vram_addr++];
+ if (m_vram_addr < VIDEORAM_SIZE)
+ return m_vram[m_vram_addr++];
else
{
- popmessage("GFXRAM OUT OF BOUNDS %04x", state->m_vram_addr);
+ popmessage("GFXRAM OUT OF BOUNDS %04x", m_vram_addr);
return 0;
}
}
-WRITE16_HANDLER( othldrby_videoram_w )
+WRITE16_MEMBER(othldrby_state::othldrby_videoram_w)
{
- othldrby_state *state = space->machine().driver_data<othldrby_state>();
- if (state->m_vram_addr < VIDEORAM_SIZE)
+ if (m_vram_addr < VIDEORAM_SIZE)
{
- if (state->m_vram_addr < SPRITERAM_START)
- state->m_bg_tilemap[state->m_vram_addr / 0x800]->mark_tile_dirty((state->m_vram_addr & 0x7ff) / 2);
- state->m_vram[state->m_vram_addr++] = data;
+ if (m_vram_addr < SPRITERAM_START)
+ m_bg_tilemap[m_vram_addr / 0x800]->mark_tile_dirty((m_vram_addr & 0x7ff) / 2);
+ m_vram[m_vram_addr++] = data;
}
else
- popmessage("GFXRAM OUT OF BOUNDS %04x", state->m_vram_addr);
+ popmessage("GFXRAM OUT OF BOUNDS %04x", m_vram_addr);
}
-WRITE16_HANDLER( othldrby_vreg_addr_w )
+WRITE16_MEMBER(othldrby_state::othldrby_vreg_addr_w)
{
- othldrby_state *state = space->machine().driver_data<othldrby_state>();
- state->m_vreg_addr = data & 0x7f; /* bit 7 is set when screen is flipped */
+ m_vreg_addr = data & 0x7f; /* bit 7 is set when screen is flipped */
}
-WRITE16_HANDLER( othldrby_vreg_w )
+WRITE16_MEMBER(othldrby_state::othldrby_vreg_w)
{
- othldrby_state *state = space->machine().driver_data<othldrby_state>();
- if (state->m_vreg_addr < OTHLDRBY_VREG_SIZE)
- state->m_vreg[state->m_vreg_addr++] = data;
+ if (m_vreg_addr < OTHLDRBY_VREG_SIZE)
+ m_vreg[m_vreg_addr++] = data;
else
- popmessage("%06x: VREG OUT OF BOUNDS %04x", cpu_get_pc(&space->device()), state->m_vreg_addr);
+ popmessage("%06x: VREG OUT OF BOUNDS %04x", cpu_get_pc(&space.device()), m_vreg_addr);
}
diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c
index e580949cc9a..a28a98e80b7 100644
--- a/src/mame/video/pacland.c
+++ b/src/mame/video/pacland.c
@@ -227,47 +227,42 @@ VIDEO_START( pacland )
***************************************************************************/
-WRITE8_HANDLER( pacland_videoram_w )
+WRITE8_MEMBER(pacland_state::pacland_videoram_w)
{
- pacland_state *state = space->machine().driver_data<pacland_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( pacland_videoram2_w )
+WRITE8_MEMBER(pacland_state::pacland_videoram2_w)
{
- pacland_state *state = space->machine().driver_data<pacland_state>();
- state->m_videoram2[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram2[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( pacland_scroll0_w )
+WRITE8_MEMBER(pacland_state::pacland_scroll0_w)
{
- pacland_state *state = space->machine().driver_data<pacland_state>();
- state->m_scroll0 = data + 256 * offset;
+ m_scroll0 = data + 256 * offset;
}
-WRITE8_HANDLER( pacland_scroll1_w )
+WRITE8_MEMBER(pacland_state::pacland_scroll1_w)
{
- pacland_state *state = space->machine().driver_data<pacland_state>();
- state->m_scroll1 = data + 256 * offset;
+ m_scroll1 = data + 256 * offset;
}
-WRITE8_HANDLER( pacland_bankswitch_w )
+WRITE8_MEMBER(pacland_state::pacland_bankswitch_w)
{
- pacland_state *state = space->machine().driver_data<pacland_state>();
int bankaddress;
- UINT8 *RAM = space->machine().region("maincpu")->base();
+ UINT8 *RAM = machine().region("maincpu")->base();
bankaddress = 0x10000 + ((data & 0x07) << 13);
- memory_set_bankptr(space->machine(), "bank1",&RAM[bankaddress]);
+ memory_set_bankptr(machine(), "bank1",&RAM[bankaddress]);
// pbc = data & 0x20;
- if (state->m_palette_bank != ((data & 0x18) >> 3))
+ if (m_palette_bank != ((data & 0x18) >> 3))
{
- state->m_palette_bank = (data & 0x18) >> 3;
- switch_palette(space->machine());
+ m_palette_bank = (data & 0x18) >> 3;
+ switch_palette(machine());
}
}
diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c
index eb289ce3d5a..7b18ee6b73d 100644
--- a/src/mame/video/pacman.c
+++ b/src/mame/video/pacman.c
@@ -191,25 +191,22 @@ VIDEO_START( birdiy )
state->m_inv_spr = 1; // sprites are mirrored in X-axis compared to normal behaviour
}
-WRITE8_HANDLER( pacman_videoram_w )
+WRITE8_MEMBER(pacman_state::pacman_videoram_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset );
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset );
}
-WRITE8_HANDLER( pacman_colorram_w )
+WRITE8_MEMBER(pacman_state::pacman_colorram_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset );
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset );
}
-WRITE8_HANDLER( pacman_flipscreen_w )
+WRITE8_MEMBER(pacman_state::pacman_flipscreen_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
- state->m_flipscreen = data & 1;
- state->m_bg_tilemap->set_flip(state->m_flipscreen * ( TILEMAP_FLIPX + TILEMAP_FLIPY ) );
+ m_flipscreen = data & 1;
+ m_bg_tilemap->set_flip(m_flipscreen * ( TILEMAP_FLIPX + TILEMAP_FLIPY ) );
}
@@ -341,34 +338,31 @@ VIDEO_START( pengo )
state->m_bg_tilemap->set_scrolldy(0, 264 - 224 );
}
-WRITE8_HANDLER( pengo_palettebank_w )
+WRITE8_MEMBER(pacman_state::pengo_palettebank_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
- if (state->m_palettebank != data)
+ if (m_palettebank != data)
{
- state->m_palettebank = data;
- state->m_bg_tilemap ->mark_all_dirty();
+ m_palettebank = data;
+ m_bg_tilemap ->mark_all_dirty();
}
}
-WRITE8_HANDLER( pengo_colortablebank_w )
+WRITE8_MEMBER(pacman_state::pengo_colortablebank_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
- if (state->m_colortablebank != data)
+ if (m_colortablebank != data)
{
- state->m_colortablebank = data;
- state->m_bg_tilemap ->mark_all_dirty();
+ m_colortablebank = data;
+ m_bg_tilemap ->mark_all_dirty();
}
}
-WRITE8_HANDLER( pengo_gfxbank_w )
+WRITE8_MEMBER(pacman_state::pengo_gfxbank_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
- if (state->m_charbank != (data & 1))
+ if (m_charbank != (data & 1))
{
- state->m_spritebank = data & 1;
- state->m_charbank = data & 1;
- state->m_bg_tilemap ->mark_all_dirty();
+ m_spritebank = data & 1;
+ m_charbank = data & 1;
+ m_bg_tilemap ->mark_all_dirty();
}
}
@@ -461,33 +455,29 @@ SCREEN_UPDATE_IND16( s2650games )
return 0;
}
-WRITE8_HANDLER( s2650games_videoram_w )
+WRITE8_MEMBER(pacman_state::s2650games_videoram_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( s2650games_colorram_w )
+WRITE8_MEMBER(pacman_state::s2650games_colorram_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
int i;
- state->m_colorram[offset & 0x1f] = data;
+ m_colorram[offset & 0x1f] = data;
for (i = offset; i < 0x0400; i += 32)
- state->m_bg_tilemap->mark_tile_dirty(i);
+ m_bg_tilemap->mark_tile_dirty(i);
}
-WRITE8_HANDLER( s2650games_scroll_w )
+WRITE8_MEMBER(pacman_state::s2650games_scroll_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
- state->m_bg_tilemap->set_scrolly(offset, data);
+ m_bg_tilemap->set_scrolly(offset, data);
}
-WRITE8_HANDLER( s2650games_tilesbank_w )
+WRITE8_MEMBER(pacman_state::s2650games_tilesbank_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
- state->m_s2650games_tileram[offset] = data;
- state->m_bg_tilemap->mark_all_dirty();
+ m_s2650games_tileram[offset] = data;
+ m_bg_tilemap->mark_all_dirty();
}
@@ -593,41 +583,36 @@ VIDEO_START( jrpacman )
state->m_bg_tilemap->set_scroll_cols(36 );
}
-WRITE8_HANDLER( jrpacman_videoram_w )
+WRITE8_MEMBER(pacman_state::jrpacman_videoram_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
- state->m_videoram[offset] = data;
- jrpacman_mark_tile_dirty(space->machine(), offset);
+ m_videoram[offset] = data;
+ jrpacman_mark_tile_dirty(machine(), offset);
}
-WRITE8_HANDLER( jrpacman_charbank_w )
+WRITE8_MEMBER(pacman_state::jrpacman_charbank_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
- if (state->m_charbank != (data & 1))
+ if (m_charbank != (data & 1))
{
- state->m_charbank = data & 1;
- state->m_bg_tilemap->mark_all_dirty();
+ m_charbank = data & 1;
+ m_bg_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( jrpacman_spritebank_w )
+WRITE8_MEMBER(pacman_state::jrpacman_spritebank_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
- state->m_spritebank = (data & 1);
+ m_spritebank = (data & 1);
}
-WRITE8_HANDLER( jrpacman_scroll_w )
+WRITE8_MEMBER(pacman_state::jrpacman_scroll_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
int i;
for( i = 2; i < 34; i++ )
{
- state->m_bg_tilemap->set_scrolly(i, data );
+ m_bg_tilemap->set_scrolly(i, data );
}
}
-WRITE8_HANDLER( jrpacman_bgpriority_w )
+WRITE8_MEMBER(pacman_state::jrpacman_bgpriority_w)
{
- pacman_state *state = space->machine().driver_data<pacman_state>();
- state->m_bgpriority = (data & 1);
+ m_bgpriority = (data & 1);
}
diff --git a/src/mame/video/pandoras.c b/src/mame/video/pandoras.c
index e0a9186f0dd..f52f82fafae 100644
--- a/src/mame/video/pandoras.c
+++ b/src/mame/video/pandoras.c
@@ -119,35 +119,31 @@ VIDEO_START( pandoras )
***************************************************************************/
-WRITE8_HANDLER( pandoras_vram_w )
+WRITE8_MEMBER(pandoras_state::pandoras_vram_w)
{
- pandoras_state *state = space->machine().driver_data<pandoras_state>();
- state->m_layer0->mark_tile_dirty(offset);
- state->m_videoram[offset] = data;
+ m_layer0->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
}
-WRITE8_HANDLER( pandoras_cram_w )
+WRITE8_MEMBER(pandoras_state::pandoras_cram_w)
{
- pandoras_state *state = space->machine().driver_data<pandoras_state>();
- state->m_layer0->mark_tile_dirty(offset);
- state->m_colorram[offset] = data;
+ m_layer0->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
}
-WRITE8_HANDLER( pandoras_scrolly_w )
+WRITE8_MEMBER(pandoras_state::pandoras_scrolly_w)
{
- pandoras_state *state = space->machine().driver_data<pandoras_state>();
- state->m_layer0->set_scrolly(0, data);
+ m_layer0->set_scrolly(0, data);
}
-WRITE8_HANDLER( pandoras_flipscreen_w )
+WRITE8_MEMBER(pandoras_state::pandoras_flipscreen_w)
{
- pandoras_state *state = space->machine().driver_data<pandoras_state>();
- state->m_flipscreen = data;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen = data;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
/***************************************************************************
diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c
index 0d79249ce87..936796302fc 100644
--- a/src/mame/video/paradise.c
+++ b/src/mame/video/paradise.c
@@ -28,14 +28,14 @@ Note: if MAME_DEBUG is defined, pressing Z with:
#include "emu.h"
#include "includes/paradise.h"
-WRITE8_HANDLER( paradise_flipscreen_w )
+WRITE8_MEMBER(paradise_state::paradise_flipscreen_w)
{
- flip_screen_set(space->machine(), data ? 0 : 1);
+ flip_screen_set(machine(), data ? 0 : 1);
}
-WRITE8_HANDLER( tgtball_flipscreen_w )
+WRITE8_MEMBER(paradise_state::tgtball_flipscreen_w)
{
- flip_screen_set(space->machine(), data ? 1 : 0);
+ flip_screen_set(machine(), data ? 1 : 0);
}
/* Note: Penky updates pixel palette bank register BEFORE actually writing to the paletteram. */
@@ -50,15 +50,14 @@ static void update_pix_palbank(running_machine &machine)
}
/* 800 bytes for red, followed by 800 bytes for green & 800 bytes for blue */
-WRITE8_HANDLER( paradise_palette_w )
+WRITE8_MEMBER(paradise_state::paradise_palette_w)
{
- paradise_state *state = space->machine().driver_data<paradise_state>();
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
offset %= 0x800;
- palette_set_color_rgb(space->machine(), offset, state->m_paletteram[offset + 0x800 * 0], state->m_paletteram[offset + 0x800 * 1],
- state->m_paletteram[offset + 0x800 * 2]);
+ palette_set_color_rgb(machine(), offset, m_paletteram[offset + 0x800 * 0], m_paletteram[offset + 0x800 * 1],
+ m_paletteram[offset + 0x800 * 2]);
- update_pix_palbank(space->machine());
+ update_pix_palbank(machine());
}
/***************************************************************************
@@ -73,28 +72,26 @@ WRITE8_HANDLER( paradise_palette_w )
***************************************************************************/
/* Background */
-WRITE8_HANDLER( paradise_vram_0_w )
+WRITE8_MEMBER(paradise_state::paradise_vram_0_w)
{
- paradise_state *state = space->machine().driver_data<paradise_state>();
- state->m_vram_0[offset] = data;
- state->m_tilemap_0->mark_tile_dirty(offset % 0x400);
+ m_vram_0[offset] = data;
+ m_tilemap_0->mark_tile_dirty(offset % 0x400);
}
/* 16 color tiles with paradise_palbank as color code */
-WRITE8_HANDLER( paradise_palbank_w )
+WRITE8_MEMBER(paradise_state::paradise_palbank_w)
{
- paradise_state *state = space->machine().driver_data<paradise_state>();
int bank1 = (data & 0x0e) | 1;
int bank2 = (data & 0xf0);
- state->m_pixbank = bank2;
+ m_pixbank = bank2;
- update_pix_palbank(space->machine());
+ update_pix_palbank(machine());
- if (state->m_palbank != bank1)
+ if (m_palbank != bank1)
{
- state->m_palbank = bank1;
- state->m_tilemap_0->mark_all_dirty();
+ m_palbank = bank1;
+ m_tilemap_0->mark_all_dirty();
}
}
@@ -107,11 +104,10 @@ static TILE_GET_INFO( get_tile_info_0 )
/* Midground */
-WRITE8_HANDLER( paradise_vram_1_w )
+WRITE8_MEMBER(paradise_state::paradise_vram_1_w)
{
- paradise_state *state = space->machine().driver_data<paradise_state>();
- state->m_vram_1[offset] = data;
- state->m_tilemap_1->mark_tile_dirty(offset % 0x400);
+ m_vram_1[offset] = data;
+ m_tilemap_1->mark_tile_dirty(offset % 0x400);
}
static TILE_GET_INFO( get_tile_info_1 )
@@ -123,11 +119,10 @@ static TILE_GET_INFO( get_tile_info_1 )
/* Foreground */
-WRITE8_HANDLER( paradise_vram_2_w )
+WRITE8_MEMBER(paradise_state::paradise_vram_2_w)
{
- paradise_state *state = space->machine().driver_data<paradise_state>();
- state->m_vram_2[offset] = data;
- state->m_tilemap_2->mark_tile_dirty(offset % 0x400);
+ m_vram_2[offset] = data;
+ m_tilemap_2->mark_tile_dirty(offset % 0x400);
}
static TILE_GET_INFO( get_tile_info_2 )
@@ -139,18 +134,17 @@ static TILE_GET_INFO( get_tile_info_2 )
/* 256 x 256 bitmap. 4 bits per pixel so every byte encodes 2 pixels */
-WRITE8_HANDLER( paradise_pixmap_w )
+WRITE8_MEMBER(paradise_state::paradise_pixmap_w)
{
- paradise_state *state = space->machine().driver_data<paradise_state>();
int x, y;
- state->m_videoram[offset] = data;
+ m_videoram[offset] = data;
x = (offset & 0x7f) << 1;
y = (offset >> 7);
- state->m_tmpbitmap.pix16(y, x + 0) = 0x80f - (data >> 4);
- state->m_tmpbitmap.pix16(y, x + 1) = 0x80f - (data & 0x0f);
+ m_tmpbitmap.pix16(y, x + 0) = 0x80f - (data >> 4);
+ m_tmpbitmap.pix16(y, x + 1) = 0x80f - (data & 0x0f);
}
@@ -186,10 +180,9 @@ VIDEO_START( paradise )
***************************************************************************/
/* Sprites / Layers priority */
-WRITE8_HANDLER( paradise_priority_w )
+WRITE8_MEMBER(paradise_state::paradise_priority_w)
{
- paradise_state *state = space->machine().driver_data<paradise_state>();
- state->m_priority = data;
+ m_priority = data;
}
static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect )
diff --git a/src/mame/video/pass.c b/src/mame/video/pass.c
index 0f41e36f928..ad898f3b09c 100644
--- a/src/mame/video/pass.c
+++ b/src/mame/video/pass.c
@@ -16,12 +16,11 @@ static TILE_GET_INFO( get_pass_bg_tile_info )
}
-WRITE16_HANDLER( pass_bg_videoram_w )
+WRITE16_MEMBER(pass_state::pass_bg_videoram_w)
{
- pass_state *state = space->machine().driver_data<pass_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
/* foreground 'sprites' tilemap stuff */
@@ -38,11 +37,10 @@ static TILE_GET_INFO( get_pass_fg_tile_info )
}
-WRITE16_HANDLER( pass_fg_videoram_w )
+WRITE16_MEMBER(pass_state::pass_fg_videoram_w)
{
- pass_state *state = space->machine().driver_data<pass_state>();
- state->m_fg_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
/* video update / start */
diff --git a/src/mame/video/pastelg.c b/src/mame/video/pastelg.c
index 588a1352c0b..78c8b257f47 100644
--- a/src/mame/video/pastelg.c
+++ b/src/mame/video/pastelg.c
@@ -47,10 +47,9 @@ PALETTE_INIT( pastelg )
}
}
-WRITE8_HANDLER( pastelg_clut_w )
+WRITE8_MEMBER(pastelg_state::pastelg_clut_w)
{
- pastelg_state *state = space->machine().driver_data<pastelg_state>();
- state->m_clut[offset] = data;
+ m_clut[offset] = data;
}
/******************************************************************************
@@ -63,67 +62,62 @@ int pastelg_blitter_src_addr_r(address_space *space)
return state->m_blitter_src_addr;
}
-WRITE8_HANDLER( pastelg_blitter_w )
+WRITE8_MEMBER(pastelg_state::pastelg_blitter_w)
{
- pastelg_state *state = space->machine().driver_data<pastelg_state>();
switch (offset)
{
- case 0: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0xff00) | data; break;
- case 1: state->m_blitter_src_addr = (state->m_blitter_src_addr & 0x00ff) | (data << 8); break;
- case 2: state->m_blitter_destx = data; break;
- case 3: state->m_blitter_desty = data; break;
- case 4: state->m_blitter_sizex = data; break;
- case 5: state->m_blitter_sizey = data;
+ case 0: m_blitter_src_addr = (m_blitter_src_addr & 0xff00) | data; break;
+ case 1: m_blitter_src_addr = (m_blitter_src_addr & 0x00ff) | (data << 8); break;
+ case 2: m_blitter_destx = data; break;
+ case 3: m_blitter_desty = data; break;
+ case 4: m_blitter_sizex = data; break;
+ case 5: m_blitter_sizey = data;
/* writing here also starts the blit */
- pastelg_gfxdraw(space->machine());
+ pastelg_gfxdraw(machine());
break;
- case 6: state->m_blitter_direction_x = (data & 0x01) ? 1 : 0;
- state->m_blitter_direction_y = (data & 0x02) ? 1 : 0;
- state->m_flipscreen = (data & 0x04) ? 0 : 1;
- state->m_dispflag = (data & 0x08) ? 0 : 1;
- pastelg_vramflip(space->machine());
+ case 6: m_blitter_direction_x = (data & 0x01) ? 1 : 0;
+ m_blitter_direction_y = (data & 0x02) ? 1 : 0;
+ m_flipscreen = (data & 0x04) ? 0 : 1;
+ m_dispflag = (data & 0x08) ? 0 : 1;
+ pastelg_vramflip(machine());
break;
}
}
-WRITE8_HANDLER( threeds_romsel_w )
+WRITE8_MEMBER(pastelg_state::threeds_romsel_w)
{
- pastelg_state *state = space->machine().driver_data<pastelg_state>();
if (data&0xfc) printf("%02x\n",data);
- state->m_gfxrom = (data & 0x3);
+ m_gfxrom = (data & 0x3);
}
-WRITE8_HANDLER( threeds_output_w )
+WRITE8_MEMBER(pastelg_state::threeds_output_w)
{
- pastelg_state *state = space->machine().driver_data<pastelg_state>();
- state->m_palbank = ((data & 0x10) >> 4);
+ m_palbank = ((data & 0x10) >> 4);
}
-READ8_HANDLER( threeds_rom_readback_r )
+READ8_MEMBER(pastelg_state::threeds_rom_readback_r)
{
- pastelg_state *state = space->machine().driver_data<pastelg_state>();
- UINT8 *GFX = space->machine().region("gfx1")->base();
+ UINT8 *GFX = machine().region("gfx1")->base();
- return GFX[(state->m_blitter_src_addr | (state->m_gfxrom << 16)) & 0x3ffff];
+ return GFX[(m_blitter_src_addr | (m_gfxrom << 16)) & 0x3ffff];
}
-WRITE8_HANDLER( pastelg_romsel_w )
+WRITE8_MEMBER(pastelg_state::pastelg_romsel_w)
{
- pastelg_state *state = space->machine().driver_data<pastelg_state>();
- int gfxlen = space->machine().region("gfx1")->bytes();
- state->m_gfxrom = ((data & 0xc0) >> 6);
- state->m_palbank = ((data & 0x10) >> 4);
- nb1413m3_sndrombank1_w(space, 0, data);
+ int gfxlen = machine().region("gfx1")->bytes();
+ m_gfxrom = ((data & 0xc0) >> 6);
+ m_palbank = ((data & 0x10) >> 4);
+ nb1413m3_sndrombank1_w(&space, 0, data);
- if ((state->m_gfxrom << 16) > (gfxlen - 1))
+ if ((m_gfxrom << 16) > (gfxlen - 1))
{
#ifdef MAME_DEBUG
popmessage("GFXROM BANK OVER!!");
#endif
- state->m_gfxrom &= (gfxlen / 0x20000 - 1);
+ m_gfxrom &= (gfxlen / 0x20000 - 1);
}
}
diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c
index 62227d5f5b2..35e7ace334c 100644
--- a/src/mame/video/pbaction.c
+++ b/src/mame/video/pbaction.c
@@ -9,48 +9,43 @@
#include "emu.h"
#include "includes/pbaction.h"
-WRITE8_HANDLER( pbaction_videoram_w )
+WRITE8_MEMBER(pbaction_state::pbaction_videoram_w)
{
- pbaction_state *state = space->machine().driver_data<pbaction_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( pbaction_colorram_w )
+WRITE8_MEMBER(pbaction_state::pbaction_colorram_w)
{
- pbaction_state *state = space->machine().driver_data<pbaction_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( pbaction_videoram2_w )
+WRITE8_MEMBER(pbaction_state::pbaction_videoram2_w)
{
- pbaction_state *state = space->machine().driver_data<pbaction_state>();
- state->m_videoram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( pbaction_colorram2_w )
+WRITE8_MEMBER(pbaction_state::pbaction_colorram2_w)
{
- pbaction_state *state = space->machine().driver_data<pbaction_state>();
- state->m_colorram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( pbaction_scroll_w )
+WRITE8_MEMBER(pbaction_state::pbaction_scroll_w)
{
- pbaction_state *state = space->machine().driver_data<pbaction_state>();
- state->m_scroll = data - 3;
- if (flip_screen_get(space->machine()))
- state->m_scroll = -state->m_scroll;
+ m_scroll = data - 3;
+ if (flip_screen_get(machine()))
+ m_scroll = -m_scroll;
- state->m_bg_tilemap->set_scrollx(0, state->m_scroll);
- state->m_fg_tilemap->set_scrollx(0, state->m_scroll);
+ m_bg_tilemap->set_scrollx(0, m_scroll);
+ m_fg_tilemap->set_scrollx(0, m_scroll);
}
-WRITE8_HANDLER( pbaction_flipscreen_w )
+WRITE8_MEMBER(pbaction_state::pbaction_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 0x01);
+ flip_screen_set(machine(), data & 0x01);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/pgm.c b/src/mame/video/pgm.c
index 0860b016734..89fa01163ad 100644
--- a/src/mame/video/pgm.c
+++ b/src/mame/video/pgm.c
@@ -555,11 +555,10 @@ static void draw_sprites( pgm_state *state, running_machine &machine, bitmap_ind
}
/* TX Layer */
-WRITE16_HANDLER( pgm_tx_videoram_w )
+WRITE16_MEMBER(pgm_state::pgm_tx_videoram_w)
{
- pgm_state *state = space->machine().driver_data<pgm_state>();
- state->m_tx_videoram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset / 2);
+ m_tx_videoram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset / 2);
}
static TILE_GET_INFO( get_pgm_tx_tilemap_tile_info )
@@ -591,11 +590,10 @@ static TILE_GET_INFO( get_pgm_tx_tilemap_tile_info )
/* BG Layer */
-WRITE16_HANDLER( pgm_bg_videoram_w )
+WRITE16_MEMBER(pgm_state::pgm_bg_videoram_w)
{
- pgm_state *state = space->machine().driver_data<pgm_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
static TILE_GET_INFO( get_pgm_bg_tilemap_tile_info )
diff --git a/src/mame/video/phoenix.c b/src/mame/video/phoenix.c
index da767953300..5cb86963f74 100644
--- a/src/mame/video/phoenix.c
+++ b/src/mame/video/phoenix.c
@@ -221,19 +221,18 @@ VIDEO_START( phoenix )
***************************************************************************/
-WRITE8_HANDLER( phoenix_videoram_w )
+WRITE8_MEMBER(phoenix_state::phoenix_videoram_w)
{
- phoenix_state *state = space->machine().driver_data<phoenix_state>();
- UINT8 *rom = space->machine().region("maincpu")->base();
+ UINT8 *rom = machine().region("maincpu")->base();
- state->m_videoram_pg[state->m_videoram_pg_index][offset] = data;
+ m_videoram_pg[m_videoram_pg_index][offset] = data;
if ((offset & 0x7ff) < 0x340)
{
if (offset & 0x800)
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
else
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
/* as part of the protecion, Survival executes code from $43a4 */
@@ -241,43 +240,41 @@ WRITE8_HANDLER( phoenix_videoram_w )
}
-WRITE8_HANDLER( phoenix_videoreg_w )
+WRITE8_MEMBER(phoenix_state::phoenix_videoreg_w)
{
- phoenix_state *state = space->machine().driver_data<phoenix_state>();
- if (state->m_videoram_pg_index != (data & 1))
+ if (m_videoram_pg_index != (data & 1))
{
/* set memory bank */
- state->m_videoram_pg_index = data & 1;
- memory_set_bank(space->machine(), "bank1", state->m_videoram_pg_index);
+ m_videoram_pg_index = data & 1;
+ memory_set_bank(machine(), "bank1", m_videoram_pg_index);
- state->m_cocktail_mode = state->m_videoram_pg_index && (input_port_read(space->machine(), "CAB") & 0x01);
+ m_cocktail_mode = m_videoram_pg_index && (input_port_read(machine(), "CAB") & 0x01);
- space->machine().tilemap().set_flip_all(state->m_cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
- space->machine().tilemap().mark_all_dirty();
+ machine().tilemap().set_flip_all(m_cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ machine().tilemap().mark_all_dirty();
}
/* Phoenix has only one palette select effecting both layers */
- if (state->m_palette_bank != ((data >> 1) & 1))
+ if (m_palette_bank != ((data >> 1) & 1))
{
- state->m_palette_bank = (data >> 1) & 1;
+ m_palette_bank = (data >> 1) & 1;
- space->machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( pleiads_videoreg_w )
+WRITE8_MEMBER(phoenix_state::pleiads_videoreg_w)
{
- phoenix_state *state = space->machine().driver_data<phoenix_state>();
- if (state->m_videoram_pg_index != (data & 1))
+ if (m_videoram_pg_index != (data & 1))
{
/* set memory bank */
- state->m_videoram_pg_index = data & 1;
- memory_set_bank(space->machine(), "bank1", state->m_videoram_pg_index);
+ m_videoram_pg_index = data & 1;
+ memory_set_bank(machine(), "bank1", m_videoram_pg_index);
- state->m_cocktail_mode = state->m_videoram_pg_index && (input_port_read(space->machine(), "CAB") & 0x01);
+ m_cocktail_mode = m_videoram_pg_index && (input_port_read(machine(), "CAB") & 0x01);
- space->machine().tilemap().set_flip_all(state->m_cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
- space->machine().tilemap().mark_all_dirty();
+ machine().tilemap().set_flip_all(m_cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ machine().tilemap().mark_all_dirty();
}
@@ -285,26 +282,25 @@ WRITE8_HANDLER( pleiads_videoreg_w )
Four palette changes by level. The palette selection is
wrong, but the same paletter is used for both layers. */
- if (state->m_palette_bank != ((data >> 1) & 3))
+ if (m_palette_bank != ((data >> 1) & 3))
{
- state->m_palette_bank = ((data >> 1) & 3);
+ m_palette_bank = ((data >> 1) & 3);
- space->machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
logerror("Palette: %02X\n", (data & 0x06) >> 1);
}
- state->m_pleiads_protection_question = data & 0xfc;
+ m_pleiads_protection_question = data & 0xfc;
/* send two bits to sound control C (not sure if they are there) */
- pleiads_sound_control_c_w(space->machine().device("cust"), offset, data);
+ pleiads_sound_control_c_w(machine().device("cust"), offset, data);
}
-WRITE8_HANDLER( phoenix_scroll_w )
+WRITE8_MEMBER(phoenix_state::phoenix_scroll_w)
{
- phoenix_state *state = space->machine().driver_data<phoenix_state>();
- state->m_bg_tilemap->set_scrollx(0,data);
+ m_bg_tilemap->set_scrollx(0,data);
}
@@ -366,23 +362,22 @@ CUSTOM_INPUT( pleiads_protection_r )
*/
#define REMAP_JS(js) ((ret & 0xf) | ( (js & 0xf) << 4))
-READ8_HANDLER( survival_input_port_0_r )
+READ8_MEMBER(phoenix_state::survival_input_port_0_r)
{
- phoenix_state *state = space->machine().driver_data<phoenix_state>();
- UINT8 ret = ~input_port_read(space->machine(), "IN0");
+ UINT8 ret = ~input_port_read(machine(), "IN0");
- if( state->m_survival_input_readc++ == 2 )
+ if( m_survival_input_readc++ == 2 )
{
- state->m_survival_input_readc = 0;
- state->m_survival_protection_value = 0;
+ m_survival_input_readc = 0;
+ m_survival_protection_value = 0;
return ~ret;
}
// Any value that remaps the joystick input to 0,2,4 must clear bit 0
// on the AY8910 port B. All other remaps must set bit 0.
- state->m_survival_protection_value = 0xff;
- state->m_survival_sid_value = 0;
+ m_survival_protection_value = 0xff;
+ m_survival_sid_value = 0;
switch( ( ret >> 4) & 0xf )
{
@@ -393,42 +388,42 @@ READ8_HANDLER( survival_input_port_0_r )
ret = REMAP_JS( 8 );
break;
case 2: // js_e = 0 + 0
- state->m_survival_sid_value = 0x80;
- state->m_survival_protection_value = 0xfe;
+ m_survival_sid_value = 0x80;
+ m_survival_protection_value = 0xfe;
ret = REMAP_JS( 2 );
break;
case 3: // js_ne = 0 + 1;
- state->m_survival_sid_value = 0x80;
+ m_survival_sid_value = 0x80;
ret = REMAP_JS( 0xa );
break;
case 4: // js_w = 4 + 0
- state->m_survival_sid_value = 0x80;
- state->m_survival_protection_value = 0xfe;
+ m_survival_sid_value = 0x80;
+ m_survival_protection_value = 0xfe;
ret = REMAP_JS( 4 );
break;
case 5: // js_nw = 2 + 1
- state->m_survival_sid_value = 0x80;
+ m_survival_sid_value = 0x80;
ret = REMAP_JS( 0xc );
break;
case 8: // js_s = 5 + 1
ret = REMAP_JS( 1 );
break;
case 0xa: // js_se = 6 + 1
- state->m_survival_sid_value = 0x80;
+ m_survival_sid_value = 0x80;
ret = REMAP_JS( 3 );
break;
case 0xc: // js_sw = 4 + 1
- state->m_survival_sid_value = 0x80;
+ m_survival_sid_value = 0x80;
ret = REMAP_JS( 5 );
break;
default:
break;
}
- state->m_survival_input_latches[0] = state->m_survival_input_latches[1];
- state->m_survival_input_latches[1] = ~ret;
+ m_survival_input_latches[0] = m_survival_input_latches[1];
+ m_survival_input_latches[1] = ~ret;
- return state->m_survival_input_latches[0];
+ return m_survival_input_latches[0];
}
READ8_DEVICE_HANDLER( survival_protection_r )
diff --git a/src/mame/video/pingpong.c b/src/mame/video/pingpong.c
index b4e559d0ef7..9376a43099a 100644
--- a/src/mame/video/pingpong.c
+++ b/src/mame/video/pingpong.c
@@ -82,18 +82,16 @@ PALETTE_INIT( pingpong )
}
}
-WRITE8_HANDLER( pingpong_videoram_w )
+WRITE8_MEMBER(pingpong_state::pingpong_videoram_w)
{
- pingpong_state *state = space->machine().driver_data<pingpong_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( pingpong_colorram_w )
+WRITE8_MEMBER(pingpong_state::pingpong_colorram_w)
{
- pingpong_state *state = space->machine().driver_data<pingpong_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/pirates.c b/src/mame/video/pirates.c
index 781134970e7..035d3aaaa69 100644
--- a/src/mame/video/pirates.c
+++ b/src/mame/video/pirates.c
@@ -51,25 +51,22 @@ VIDEO_START(pirates)
-WRITE16_HANDLER( pirates_tx_tileram_w )
+WRITE16_MEMBER(pirates_state::pirates_tx_tileram_w)
{
- pirates_state *state = space->machine().driver_data<pirates_state>();
- COMBINE_DATA(state->m_tx_tileram+offset);
- state->m_tx_tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(m_tx_tileram+offset);
+ m_tx_tilemap->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( pirates_fg_tileram_w )
+WRITE16_MEMBER(pirates_state::pirates_fg_tileram_w)
{
- pirates_state *state = space->machine().driver_data<pirates_state>();
- COMBINE_DATA(state->m_fg_tileram+offset);
- state->m_fg_tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(m_fg_tileram+offset);
+ m_fg_tilemap->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( pirates_bg_tileram_w )
+WRITE16_MEMBER(pirates_state::pirates_bg_tileram_w)
{
- pirates_state *state = space->machine().driver_data<pirates_state>();
- COMBINE_DATA(state->m_bg_tileram+offset);
- state->m_bg_tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(m_bg_tileram+offset);
+ m_bg_tilemap->mark_tile_dirty(offset/2);
}
diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c
index a5e293203d1..43c0fdee6cb 100644
--- a/src/mame/video/pitnrun.c
+++ b/src/mame/video/pitnrun.c
@@ -46,62 +46,54 @@ static TILE_GET_INFO( get_tile_info2 )
0);
}
-WRITE8_HANDLER( pitnrun_videoram_w )
+WRITE8_MEMBER(pitnrun_state::pitnrun_videoram_w)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_fg ->mark_all_dirty();
+ m_fg ->mark_all_dirty();
}
-WRITE8_HANDLER( pitnrun_videoram2_w )
+WRITE8_MEMBER(pitnrun_state::pitnrun_videoram2_w)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
- state->m_videoram2[offset] = data;
- state->m_bg ->mark_all_dirty();
+ m_videoram2[offset] = data;
+ m_bg ->mark_all_dirty();
}
-WRITE8_HANDLER( pitnrun_char_bank_select )
+WRITE8_MEMBER(pitnrun_state::pitnrun_char_bank_select)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
- if(state->m_char_bank!=data)
+ if(m_char_bank!=data)
{
- state->m_bg ->mark_all_dirty();
- state->m_char_bank=data;
+ m_bg ->mark_all_dirty();
+ m_char_bank=data;
}
}
-WRITE8_HANDLER( pitnrun_scroll_w )
+WRITE8_MEMBER(pitnrun_state::pitnrun_scroll_w)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
- state->m_scroll = (state->m_scroll & (0xff<<((offset)?0:8))) |( data<<((offset)?8:0));
- state->m_bg->set_scrollx(0, state->m_scroll);
+ m_scroll = (m_scroll & (0xff<<((offset)?0:8))) |( data<<((offset)?8:0));
+ m_bg->set_scrollx(0, m_scroll);
}
-WRITE8_HANDLER(pitnrun_ha_w)
+WRITE8_MEMBER(pitnrun_state::pitnrun_ha_w)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
- state->m_ha=data;
+ m_ha=data;
}
-WRITE8_HANDLER(pitnrun_h_heed_w)
+WRITE8_MEMBER(pitnrun_state::pitnrun_h_heed_w)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
- state->m_h_heed=data;
+ m_h_heed=data;
}
-WRITE8_HANDLER(pitnrun_v_heed_w)
+WRITE8_MEMBER(pitnrun_state::pitnrun_v_heed_w)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
- state->m_v_heed=data;
+ m_v_heed=data;
}
-WRITE8_HANDLER(pitnrun_color_select_w)
+WRITE8_MEMBER(pitnrun_state::pitnrun_color_select_w)
{
- pitnrun_state *state = space->machine().driver_data<pitnrun_state>();
- state->m_color_select=data;
- space->machine().tilemap().mark_all_dirty();
+ m_color_select=data;
+ machine().tilemap().mark_all_dirty();
}
static void pitnrun_spotlights(running_machine &machine)
diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c
index be243d77e32..bdea51567e3 100644
--- a/src/mame/video/playch10.c
+++ b/src/mame/video/playch10.c
@@ -4,14 +4,13 @@
-WRITE8_HANDLER( playch10_videoram_w )
+WRITE8_MEMBER(playch10_state::playch10_videoram_w)
{
- playch10_state *state = space->machine().driver_data<playch10_state>();
- UINT8 *videoram = state->m_videoram;
- if (state->m_pc10_sdcs)
+ UINT8 *videoram = m_videoram;
+ if (m_pc10_sdcs)
{
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
}
diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c
index d61984b5a10..5f6fb3a43d1 100644
--- a/src/mame/video/playmark.c
+++ b/src/mame/video/playmark.c
@@ -247,63 +247,56 @@ VIDEO_START( hrdtimes )
***************************************************************************/
-WRITE16_HANDLER( wbeachvl_txvideoram_w )
+WRITE16_MEMBER(playmark_state::wbeachvl_txvideoram_w)
{
- playmark_state *state = space->machine().driver_data<playmark_state>();
- COMBINE_DATA(&state->m_videoram1[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_videoram1[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( wbeachvl_fgvideoram_w )
+WRITE16_MEMBER(playmark_state::wbeachvl_fgvideoram_w)
{
- playmark_state *state = space->machine().driver_data<playmark_state>();
- COMBINE_DATA(&state->m_videoram2[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_videoram2[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( wbeachvl_bgvideoram_w )
+WRITE16_MEMBER(playmark_state::wbeachvl_bgvideoram_w)
{
- playmark_state *state = space->machine().driver_data<playmark_state>();
- COMBINE_DATA(&state->m_videoram3[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_videoram3[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( hrdtimes_txvideoram_w )
+WRITE16_MEMBER(playmark_state::hrdtimes_txvideoram_w)
{
- playmark_state *state = space->machine().driver_data<playmark_state>();
- COMBINE_DATA(&state->m_videoram1[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_videoram1[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( hrdtimes_fgvideoram_w )
+WRITE16_MEMBER(playmark_state::hrdtimes_fgvideoram_w)
{
- playmark_state *state = space->machine().driver_data<playmark_state>();
- COMBINE_DATA(&state->m_videoram2[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_videoram2[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( hrdtimes_bgvideoram_w )
+WRITE16_MEMBER(playmark_state::hrdtimes_bgvideoram_w)
{
- playmark_state *state = space->machine().driver_data<playmark_state>();
- COMBINE_DATA(&state->m_videoram3[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_videoram3[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( bigtwin_paletteram_w )
+WRITE16_MEMBER(playmark_state::bigtwin_paletteram_w)
{
int r, g, b, val;
- playmark_state *state = space->machine().driver_data<playmark_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
- val = state->m_generic_paletteram_16[offset];
+ val = m_generic_paletteram_16[offset];
r = (val >> 11) & 0x1e;
g = (val >> 7) & 0x1e;
b = (val >> 3) & 0x1e;
@@ -312,82 +305,78 @@ WRITE16_HANDLER( bigtwin_paletteram_w )
g |= ((val & 0x04) >> 2);
b |= ((val & 0x02) >> 1);
- palette_set_color_rgb(space->machine(), offset, pal5bit(r), pal5bit(g), pal5bit(b));
+ palette_set_color_rgb(machine(), offset, pal5bit(r), pal5bit(g), pal5bit(b));
}
-WRITE16_HANDLER( bigtwin_scroll_w )
+WRITE16_MEMBER(playmark_state::bigtwin_scroll_w)
{
- playmark_state *state = space->machine().driver_data<playmark_state>();
- data = COMBINE_DATA(&state->m_scroll[offset]);
+ data = COMBINE_DATA(&m_scroll[offset]);
switch (offset)
{
- case 0: state->m_tx_tilemap->set_scrollx(0, data + 2); break;
- case 1: state->m_tx_tilemap->set_scrolly(0, data); break;
- case 2: state->m_bgscrollx = -(data + 4); break;
- case 3: state->m_bgscrolly = (-data) & 0x1ff;
- state->m_bg_enable = data & 0x0200;
- state->m_bg_full_size = data & 0x0400;
+ case 0: m_tx_tilemap->set_scrollx(0, data + 2); break;
+ case 1: m_tx_tilemap->set_scrolly(0, data); break;
+ case 2: m_bgscrollx = -(data + 4); break;
+ case 3: m_bgscrolly = (-data) & 0x1ff;
+ m_bg_enable = data & 0x0200;
+ m_bg_full_size = data & 0x0400;
break;
- case 4: state->m_fg_tilemap->set_scrollx(0, data + 6); break;
- case 5: state->m_fg_tilemap->set_scrolly(0, data); break;
+ case 4: m_fg_tilemap->set_scrollx(0, data + 6); break;
+ case 5: m_fg_tilemap->set_scrolly(0, data); break;
}
}
-WRITE16_HANDLER( wbeachvl_scroll_w )
+WRITE16_MEMBER(playmark_state::wbeachvl_scroll_w)
{
- playmark_state *state = space->machine().driver_data<playmark_state>();
- data = COMBINE_DATA(&state->m_scroll[offset]);
+ data = COMBINE_DATA(&m_scroll[offset]);
switch (offset)
{
- case 0: state->m_tx_tilemap->set_scrollx(0, data + 2); break;
- case 1: state->m_tx_tilemap->set_scrolly(0, data); break;
- case 2: state->m_fgscrollx = data + 4;break;
- case 3: state->m_fg_tilemap->set_scrolly(0, data & 0x3ff);
- state->m_fg_rowscroll_enable = data & 0x0800;
+ case 0: m_tx_tilemap->set_scrollx(0, data + 2); break;
+ case 1: m_tx_tilemap->set_scrolly(0, data); break;
+ case 2: m_fgscrollx = data + 4;break;
+ case 3: m_fg_tilemap->set_scrolly(0, data & 0x3ff);
+ m_fg_rowscroll_enable = data & 0x0800;
break;
- case 4: state->m_bg_tilemap->set_scrollx(0, data + 6); break;
- case 5: state->m_bg_tilemap->set_scrolly(0, data); break;
+ case 4: m_bg_tilemap->set_scrollx(0, data + 6); break;
+ case 5: m_bg_tilemap->set_scrolly(0, data); break;
}
}
-WRITE16_HANDLER( excelsr_scroll_w )
+WRITE16_MEMBER(playmark_state::excelsr_scroll_w)
{
- playmark_state *state = space->machine().driver_data<playmark_state>();
- data = COMBINE_DATA(&state->m_scroll[offset]);
+ data = COMBINE_DATA(&m_scroll[offset]);
switch (offset)
{
- case 0: state->m_tx_tilemap->set_scrollx(0, data + 2); break;
- case 1: state->m_tx_tilemap->set_scrolly(0, data); break;
- case 2: state->m_bgscrollx = -data; break;
- case 3: state->m_bgscrolly = (-data + 2)& 0x1ff;
- state->m_bg_enable = data & 0x0200;
- state->m_bg_full_size = data & 0x0400;
+ case 0: m_tx_tilemap->set_scrollx(0, data + 2); break;
+ case 1: m_tx_tilemap->set_scrolly(0, data); break;
+ case 2: m_bgscrollx = -data; break;
+ case 3: m_bgscrolly = (-data + 2)& 0x1ff;
+ m_bg_enable = data & 0x0200;
+ m_bg_full_size = data & 0x0400;
break;
- case 4: state->m_fg_tilemap->set_scrollx(0, data + 6); break;
- case 5: state->m_fg_tilemap->set_scrolly(0, data); break;
+ case 4: m_fg_tilemap->set_scrollx(0, data + 6); break;
+ case 5: m_fg_tilemap->set_scrolly(0, data); break;
}
}
-WRITE16_HANDLER( hrdtimes_scroll_w )
+WRITE16_MEMBER(playmark_state::hrdtimes_scroll_w)
{
- playmark_state *state = space->machine().driver_data<playmark_state>();
- data = COMBINE_DATA(&state->m_scroll[offset]);
+ data = COMBINE_DATA(&m_scroll[offset]);
switch (offset)
{
- case 0: state->m_tx_tilemap->set_scrollx(0, data); break;
- case 1: state->m_tx_tilemap->set_scrolly(0, data); break;
- case 2: state->m_fg_tilemap->set_scrollx(0, data); break;
- case 3: state->m_fg_tilemap->set_scrolly(0, data); break;
- case 4: state->m_bg_tilemap->set_scrollx(0, data); break;
- case 5: state->m_bg_tilemap->set_scrolly(0, data); break;
+ case 0: m_tx_tilemap->set_scrollx(0, data); break;
+ case 1: m_tx_tilemap->set_scrolly(0, data); break;
+ case 2: m_fg_tilemap->set_scrollx(0, data); break;
+ case 3: m_fg_tilemap->set_scrolly(0, data); break;
+ case 4: m_bg_tilemap->set_scrollx(0, data); break;
+ case 5: m_bg_tilemap->set_scrolly(0, data); break;
}
}
diff --git a/src/mame/video/plygonet.c b/src/mame/video/plygonet.c
index f95b66976bd..bb05aef189b 100644
--- a/src/mame/video/plygonet.c
+++ b/src/mame/video/plygonet.c
@@ -36,42 +36,38 @@ static TILE_GET_INFO( roz_get_tile_info )
SET_TILE_INFO(0, code, attr, 0);
}
-READ32_HANDLER( polygonet_ttl_ram_r )
+READ32_MEMBER(polygonet_state::polygonet_ttl_ram_r)
{
- polygonet_state *state = space->machine().driver_data<polygonet_state>();
- UINT32 *vram = (UINT32 *)state->m_ttl_vram;
+ UINT32 *vram = (UINT32 *)m_ttl_vram;
return vram[offset];
}
-WRITE32_HANDLER( polygonet_ttl_ram_w )
+WRITE32_MEMBER(polygonet_state::polygonet_ttl_ram_w)
{
- polygonet_state *state = space->machine().driver_data<polygonet_state>();
- UINT32 *vram = (UINT32 *)state->m_ttl_vram;
+ UINT32 *vram = (UINT32 *)m_ttl_vram;
COMBINE_DATA(&vram[offset]);
- state->m_ttl_tilemap->mark_tile_dirty(offset*2);
- state->m_ttl_tilemap->mark_tile_dirty(offset*2+1);
+ m_ttl_tilemap->mark_tile_dirty(offset*2);
+ m_ttl_tilemap->mark_tile_dirty(offset*2+1);
}
-READ32_HANDLER( polygonet_roz_ram_r )
+READ32_MEMBER(polygonet_state::polygonet_roz_ram_r)
{
- polygonet_state *state = space->machine().driver_data<polygonet_state>();
- UINT32 *vram = (UINT32 *)state->m_roz_vram;
+ UINT32 *vram = (UINT32 *)m_roz_vram;
return vram[offset];
}
-WRITE32_HANDLER( polygonet_roz_ram_w )
+WRITE32_MEMBER(polygonet_state::polygonet_roz_ram_w)
{
- polygonet_state *state = space->machine().driver_data<polygonet_state>();
- UINT32 *vram = (UINT32 *)state->m_roz_vram;
+ UINT32 *vram = (UINT32 *)m_roz_vram;
COMBINE_DATA(&vram[offset]);
- state->m_roz_tilemap->mark_tile_dirty(offset*2);
- state->m_roz_tilemap->mark_tile_dirty(offset*2+1);
+ m_roz_tilemap->mark_tile_dirty(offset*2);
+ m_roz_tilemap->mark_tile_dirty(offset*2+1);
}
static TILEMAP_MAPPER( plygonet_scan )
diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c
index 34c12bd43a3..11df21fd958 100644
--- a/src/mame/video/pokechmp.c
+++ b/src/mame/video/pokechmp.c
@@ -4,20 +4,19 @@
#include "includes/pokechmp.h"
-WRITE8_HANDLER( pokechmp_videoram_w )
+WRITE8_MEMBER(pokechmp_state::pokechmp_videoram_w)
{
- pokechmp_state *state = space->machine().driver_data<pokechmp_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( pokechmp_flipscreen_w )
+WRITE8_MEMBER(pokechmp_state::pokechmp_flipscreen_w)
{
- if (flip_screen_get(space->machine()) != (data & 0x80))
+ if (flip_screen_get(machine()) != (data & 0x80))
{
- flip_screen_set(space->machine(), data & 0x80);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x80);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/polepos.c b/src/mame/video/polepos.c
index fc6a19efa77..a940766c12e 100644
--- a/src/mame/video/polepos.c
+++ b/src/mame/video/polepos.c
@@ -208,28 +208,24 @@ VIDEO_START( polepos )
***************************************************************************/
-READ16_HANDLER( polepos_sprite16_r )
+READ16_MEMBER(polepos_state::polepos_sprite16_r)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- return state->m_sprite16_memory[offset];
+ return m_sprite16_memory[offset];
}
-WRITE16_HANDLER( polepos_sprite16_w )
+WRITE16_MEMBER(polepos_state::polepos_sprite16_w)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- COMBINE_DATA(&state->m_sprite16_memory[offset]);
+ COMBINE_DATA(&m_sprite16_memory[offset]);
}
-READ8_HANDLER( polepos_sprite_r )
+READ8_MEMBER(polepos_state::polepos_sprite_r)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- return state->m_sprite16_memory[offset] & 0xff;
+ return m_sprite16_memory[offset] & 0xff;
}
-WRITE8_HANDLER( polepos_sprite_w )
+WRITE8_MEMBER(polepos_state::polepos_sprite_w)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- state->m_sprite16_memory[offset] = (state->m_sprite16_memory[offset] & 0xff00) | data;
+ m_sprite16_memory[offset] = (m_sprite16_memory[offset] & 0xff00) | data;
}
@@ -239,34 +235,29 @@ WRITE8_HANDLER( polepos_sprite_w )
***************************************************************************/
-READ16_HANDLER( polepos_road16_r )
+READ16_MEMBER(polepos_state::polepos_road16_r)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- return state->m_road16_memory[offset];
+ return m_road16_memory[offset];
}
-WRITE16_HANDLER( polepos_road16_w )
+WRITE16_MEMBER(polepos_state::polepos_road16_w)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- COMBINE_DATA(&state->m_road16_memory[offset]);
+ COMBINE_DATA(&m_road16_memory[offset]);
}
-READ8_HANDLER( polepos_road_r )
+READ8_MEMBER(polepos_state::polepos_road_r)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- return state->m_road16_memory[offset] & 0xff;
+ return m_road16_memory[offset] & 0xff;
}
-WRITE8_HANDLER( polepos_road_w )
+WRITE8_MEMBER(polepos_state::polepos_road_w)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- state->m_road16_memory[offset] = (state->m_road16_memory[offset] & 0xff00) | data;
+ m_road16_memory[offset] = (m_road16_memory[offset] & 0xff00) | data;
}
-WRITE16_HANDLER( polepos_road16_vscroll_w )
+WRITE16_MEMBER(polepos_state::polepos_road16_vscroll_w)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- COMBINE_DATA(&state->m_road16_vscroll);
+ COMBINE_DATA(&m_road16_vscroll);
}
@@ -276,49 +267,43 @@ WRITE16_HANDLER( polepos_road16_vscroll_w )
***************************************************************************/
-READ16_HANDLER( polepos_view16_r )
+READ16_MEMBER(polepos_state::polepos_view16_r)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- return state->m_view16_memory[offset];
+ return m_view16_memory[offset];
}
-WRITE16_HANDLER( polepos_view16_w )
+WRITE16_MEMBER(polepos_state::polepos_view16_w)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- COMBINE_DATA(&state->m_view16_memory[offset]);
+ COMBINE_DATA(&m_view16_memory[offset]);
if (offset < 0x400)
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-READ8_HANDLER( polepos_view_r )
+READ8_MEMBER(polepos_state::polepos_view_r)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- return state->m_view16_memory[offset] & 0xff;
+ return m_view16_memory[offset] & 0xff;
}
-WRITE8_HANDLER( polepos_view_w )
+WRITE8_MEMBER(polepos_state::polepos_view_w)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- state->m_view16_memory[offset] = (state->m_view16_memory[offset] & 0xff00) | data;
+ m_view16_memory[offset] = (m_view16_memory[offset] & 0xff00) | data;
if (offset < 0x400)
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( polepos_view16_hscroll_w )
+WRITE16_MEMBER(polepos_state::polepos_view16_hscroll_w)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- COMBINE_DATA(&state->m_scroll);
- state->m_bg_tilemap->set_scrollx(0,state->m_scroll);
+ COMBINE_DATA(&m_scroll);
+ m_bg_tilemap->set_scrollx(0,m_scroll);
}
-WRITE8_HANDLER( polepos_chacl_w )
+WRITE8_MEMBER(polepos_state::polepos_chacl_w)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- if (state->m_chacl != (data & 1))
+ if (m_chacl != (data & 1))
{
- state->m_chacl = data & 1;
- state->m_tx_tilemap->mark_all_dirty();
+ m_chacl = data & 1;
+ m_tx_tilemap->mark_all_dirty();
}
}
@@ -329,30 +314,26 @@ WRITE8_HANDLER( polepos_chacl_w )
***************************************************************************/
-READ16_HANDLER( polepos_alpha16_r )
+READ16_MEMBER(polepos_state::polepos_alpha16_r)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- return state->m_alpha16_memory[offset];
+ return m_alpha16_memory[offset];
}
-WRITE16_HANDLER( polepos_alpha16_w )
+WRITE16_MEMBER(polepos_state::polepos_alpha16_w)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- COMBINE_DATA(&state->m_alpha16_memory[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_alpha16_memory[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-READ8_HANDLER( polepos_alpha_r )
+READ8_MEMBER(polepos_state::polepos_alpha_r)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- return state->m_alpha16_memory[offset] & 0xff;
+ return m_alpha16_memory[offset] & 0xff;
}
-WRITE8_HANDLER( polepos_alpha_w )
+WRITE8_MEMBER(polepos_state::polepos_alpha_w)
{
- polepos_state *state = space->machine().driver_data<polepos_state>();
- state->m_alpha16_memory[offset] = (state->m_alpha16_memory[offset] & 0xff00) | data;
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ m_alpha16_memory[offset] = (m_alpha16_memory[offset] & 0xff00) | data;
+ m_tx_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/policetr.c b/src/mame/video/policetr.c
index 7a99df30feb..69f91013b30 100644
--- a/src/mame/video/policetr.c
+++ b/src/mame/video/policetr.c
@@ -139,62 +139,61 @@ static void render_display_list(running_machine &machine, offs_t offset)
*
*************************************/
-WRITE32_HANDLER( policetr_video_w )
+WRITE32_MEMBER(policetr_state::policetr_video_w)
{
- policetr_state *state = space->machine().driver_data<policetr_state>();
/* we assume 4-byte accesses */
if (mem_mask)
- logerror("%08X: policetr_video_w access with mask %08X\n", cpu_get_previouspc(&space->device()), mem_mask);
+ logerror("%08X: policetr_video_w access with mask %08X\n", cpu_get_previouspc(&space.device()), mem_mask);
/* 4 offsets */
switch (offset)
{
/* offset 0 specifies the start address of a display list */
case 0:
- render_display_list(space->machine(), data);
+ render_display_list(machine(), data);
break;
/* offset 1 specifies a latch value in the upper 8 bits */
case 1:
- state->m_video_latch = data >> 24;
+ m_video_latch = data >> 24;
break;
/* offset 2 has various meanings based on the latch */
case 2:
{
- switch (state->m_video_latch)
+ switch (m_video_latch)
{
/* latch 0x04 specifies the source X offset for a source bitmap pixel read */
case 0x04:
- state->m_src_xoffs = data >> 16;
+ m_src_xoffs = data >> 16;
break;
/* latch 0x14 specifies the source Y offset for a source bitmap pixel read */
case 0x14:
- state->m_src_yoffs = data >> 16;
+ m_src_yoffs = data >> 16;
break;
/* latch 0x20 specifies the top/left corners of the render cliprect */
case 0x20:
- state->m_render_clip.min_y = (data >> 12) & 0xfff;
- state->m_render_clip.min_x = data & 0xfff;
+ m_render_clip.min_y = (data >> 12) & 0xfff;
+ m_render_clip.min_x = data & 0xfff;
break;
/* latch 0x30 specifies the bottom/right corners of the render cliprect */
case 0x30:
- state->m_render_clip.max_y = (data >> 12) & 0xfff;
- state->m_render_clip.max_x = data & 0xfff;
+ m_render_clip.max_y = (data >> 12) & 0xfff;
+ m_render_clip.max_x = data & 0xfff;
break;
/* latch 0x50 allows a direct write to the destination bitmap */
case 0x50:
- if (ACCESSING_BITS_24_31 && state->m_dst_xoffs < DSTBITMAP_WIDTH && state->m_dst_yoffs < DSTBITMAP_HEIGHT)
- state->m_dstbitmap[state->m_dst_yoffs * DSTBITMAP_WIDTH + state->m_dst_xoffs] = data >> 24;
+ if (ACCESSING_BITS_24_31 && m_dst_xoffs < DSTBITMAP_WIDTH && m_dst_yoffs < DSTBITMAP_HEIGHT)
+ m_dstbitmap[m_dst_yoffs * DSTBITMAP_WIDTH + m_dst_xoffs] = data >> 24;
break;
/* log anything else */
default:
- logerror("%08X: policetr_video_w(2) = %08X & %08X with latch %02X\n", cpu_get_previouspc(&space->device()), data, mem_mask, state->m_video_latch);
+ logerror("%08X: policetr_video_w(2) = %08X & %08X with latch %02X\n", cpu_get_previouspc(&space.device()), data, mem_mask, m_video_latch);
break;
}
break;
@@ -203,45 +202,45 @@ WRITE32_HANDLER( policetr_video_w )
/* offset 3 has various meanings based on the latch */
case 3:
{
- switch (state->m_video_latch)
+ switch (m_video_latch)
{
/* latch 0x00 is unknown; 0, 1, and 2 get written into the upper 12 bits before rendering */
case 0x00:
if (data != (0 << 20) && data != (1 << 20) && data != (2 << 20))
- logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", cpu_get_previouspc(&space->device()), data, mem_mask, state->m_video_latch);
+ logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", cpu_get_previouspc(&space.device()), data, mem_mask, m_video_latch);
break;
/* latch 0x10 specifies destination bitmap X and Y offsets */
case 0x10:
- state->m_dst_yoffs = (data >> 12) & 0xfff;
- state->m_dst_xoffs = data & 0xfff;
+ m_dst_yoffs = (data >> 12) & 0xfff;
+ m_dst_xoffs = data & 0xfff;
break;
/* latch 0x20 is unknown; either 0xef or 0x100 is written every IRQ4 */
case 0x20:
if (data != (0x100 << 12) && data != (0xef << 12))
- logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", cpu_get_previouspc(&space->device()), data, mem_mask, state->m_video_latch);
+ logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", cpu_get_previouspc(&space.device()), data, mem_mask, m_video_latch);
break;
/* latch 0x40 is unknown; a 0 is written every IRQ4 */
case 0x40:
if (data != 0)
- logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", cpu_get_previouspc(&space->device()), data, mem_mask, state->m_video_latch);
+ logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", cpu_get_previouspc(&space.device()), data, mem_mask, m_video_latch);
break;
/* latch 0x50 clears IRQ4 */
case 0x50:
- cputag_set_input_line(space->machine(), "maincpu", R3000_IRQ4, CLEAR_LINE);
+ cputag_set_input_line(machine(), "maincpu", R3000_IRQ4, CLEAR_LINE);
break;
/* latch 0x60 clears IRQ5 */
case 0x60:
- cputag_set_input_line(space->machine(), "maincpu", R3000_IRQ5, CLEAR_LINE);
+ cputag_set_input_line(machine(), "maincpu", R3000_IRQ5, CLEAR_LINE);
break;
/* log anything else */
default:
- logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", cpu_get_previouspc(&space->device()), data, mem_mask, state->m_video_latch);
+ logerror("%08X: policetr_video_w(3) = %08X & %08X with latch %02X\n", cpu_get_previouspc(&space.device()), data, mem_mask, m_video_latch);
break;
}
break;
@@ -257,43 +256,42 @@ WRITE32_HANDLER( policetr_video_w )
*
*************************************/
-READ32_HANDLER( policetr_video_r )
+READ32_MEMBER(policetr_state::policetr_video_r)
{
- policetr_state *state = space->machine().driver_data<policetr_state>();
int inputval;
- int width = space->machine().primary_screen->width();
- int height = space->machine().primary_screen->height();
+ int width = machine().primary_screen->width();
+ int height = machine().primary_screen->height();
/* the value read is based on the latch */
- switch (state->m_video_latch)
+ switch (m_video_latch)
{
/* latch 0x00 is player 1's gun X coordinate */
case 0x00:
- inputval = ((input_port_read(space->machine(), "GUNX1") & 0xff) * width) >> 8;
+ inputval = ((input_port_read(machine(), "GUNX1") & 0xff) * width) >> 8;
inputval += 0x50;
return (inputval << 20) | 0x20000000;
/* latch 0x01 is player 1's gun Y coordinate */
case 0x01:
- inputval = ((input_port_read(space->machine(), "GUNY1") & 0xff) * height) >> 8;
+ inputval = ((input_port_read(machine(), "GUNY1") & 0xff) * height) >> 8;
inputval += 0x17;
return (inputval << 20);
/* latch 0x02 is player 2's gun X coordinate */
case 0x02:
- inputval = ((input_port_read(space->machine(), "GUNX2") & 0xff) * width) >> 8;
+ inputval = ((input_port_read(machine(), "GUNX2") & 0xff) * width) >> 8;
inputval += 0x50;
return (inputval << 20) | 0x20000000;
/* latch 0x03 is player 2's gun Y coordinate */
case 0x03:
- inputval = ((input_port_read(space->machine(), "GUNY2") & 0xff) * height) >> 8;
+ inputval = ((input_port_read(machine(), "GUNY2") & 0xff) * height) >> 8;
inputval += 0x17;
return (inputval << 20);
/* latch 0x04 is the pixel value in the ROM at the specified address */
case 0x04:
- return state->m_srcbitmap[(state->m_src_yoffs & state->m_srcbitmap_height_mask) * SRCBITMAP_WIDTH + state->m_src_xoffs % SRCBITMAP_WIDTH] << 24;
+ return m_srcbitmap[(m_src_yoffs & m_srcbitmap_height_mask) * SRCBITMAP_WIDTH + m_src_xoffs % SRCBITMAP_WIDTH] << 24;
/* latch 0x50 is read at IRQ 4; the top 2 bits are checked. If they're not 0,
they skip the rest of the interrupt processing */
@@ -302,7 +300,7 @@ READ32_HANDLER( policetr_video_r )
}
/* log anything else */
- logerror("%08X: policetr_video_r with latch %02X\n", cpu_get_previouspc(&space->device()), state->m_video_latch);
+ logerror("%08X: policetr_video_r with latch %02X\n", cpu_get_previouspc(&space.device()), m_video_latch);
return 0;
}
@@ -315,27 +313,25 @@ READ32_HANDLER( policetr_video_r )
*
*************************************/
-WRITE32_HANDLER( policetr_palette_offset_w )
+WRITE32_MEMBER(policetr_state::policetr_palette_offset_w)
{
- policetr_state *state = space->machine().driver_data<policetr_state>();
if (ACCESSING_BITS_16_23)
{
- state->m_palette_offset = (data >> 16) & 0xff;
- state->m_palette_index = 0;
+ m_palette_offset = (data >> 16) & 0xff;
+ m_palette_index = 0;
}
}
-WRITE32_HANDLER( policetr_palette_data_w )
+WRITE32_MEMBER(policetr_state::policetr_palette_data_w)
{
- policetr_state *state = space->machine().driver_data<policetr_state>();
if (ACCESSING_BITS_16_23)
{
- state->m_palette_data[state->m_palette_index] = (data >> 16) & 0xff;
- if (++state->m_palette_index == 3)
+ m_palette_data[m_palette_index] = (data >> 16) & 0xff;
+ if (++m_palette_index == 3)
{
- palette_set_color(space->machine(), state->m_palette_offset, MAKE_RGB(state->m_palette_data[0], state->m_palette_data[1], state->m_palette_data[2]));
- state->m_palette_index = 0;
+ palette_set_color(machine(), m_palette_offset, MAKE_RGB(m_palette_data[0], m_palette_data[1], m_palette_data[2]));
+ m_palette_index = 0;
}
}
}
diff --git a/src/mame/video/polyplay.c b/src/mame/video/polyplay.c
index 2e6b28cb0f0..6ede798012a 100644
--- a/src/mame/video/polyplay.c
+++ b/src/mame/video/polyplay.c
@@ -29,14 +29,13 @@ PALETTE_INIT( polyplay )
}
-WRITE8_HANDLER( polyplay_characterram_w )
+WRITE8_MEMBER(polyplay_state::polyplay_characterram_w)
{
- polyplay_state *state = space->machine().driver_data<polyplay_state>();
- if (state->m_characterram[offset] != data)
+ if (m_characterram[offset] != data)
{
- gfx_element_mark_dirty(space->machine().gfx[1], (offset >> 3) & 0x7f);
+ gfx_element_mark_dirty(machine().gfx[1], (offset >> 3) & 0x7f);
- state->m_characterram[offset] = data;
+ m_characterram[offset] = data;
}
}
diff --git a/src/mame/video/pooyan.c b/src/mame/video/pooyan.c
index 83c4f837bfc..b720ed1adc2 100644
--- a/src/mame/video/pooyan.c
+++ b/src/mame/video/pooyan.c
@@ -128,25 +128,23 @@ VIDEO_START( pooyan )
*
*************************************/
-WRITE8_HANDLER( pooyan_videoram_w )
+WRITE8_MEMBER(pooyan_state::pooyan_videoram_w)
{
- pooyan_state *state = space->machine().driver_data<pooyan_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( pooyan_colorram_w )
+WRITE8_MEMBER(pooyan_state::pooyan_colorram_w)
{
- pooyan_state *state = space->machine().driver_data<pooyan_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( pooyan_flipscreen_w )
+WRITE8_MEMBER(pooyan_state::pooyan_flipscreen_w)
{
- flip_screen_set(space->machine(), ~data & 0x01);
+ flip_screen_set(machine(), ~data & 0x01);
}
diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c
index 714a3c7a30d..6ad244f462a 100644
--- a/src/mame/video/popeye.c
+++ b/src/mame/video/popeye.c
@@ -168,33 +168,30 @@ static void set_background_palette(running_machine &machine,int bank)
}
}
-WRITE8_HANDLER( popeye_videoram_w )
+WRITE8_MEMBER(popeye_state::popeye_videoram_w)
{
- popeye_state *state = space->machine().driver_data<popeye_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( popeye_colorram_w )
+WRITE8_MEMBER(popeye_state::popeye_colorram_w)
{
- popeye_state *state = space->machine().driver_data<popeye_state>();
- state->m_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( popeye_bitmap_w )
+WRITE8_MEMBER(popeye_state::popeye_bitmap_w)
{
- popeye_state *state = space->machine().driver_data<popeye_state>();
int sx,sy,x,y,colour;
- state->m_bitmapram[offset] = data;
+ m_bitmapram[offset] = data;
- if (state->m_bitmap_type == TYPE_SKYSKIPR)
+ if (m_bitmap_type == TYPE_SKYSKIPR)
{
sx = 8 * (offset % 128);
sy = 8 * (offset / 128);
- if (flip_screen_get(space->machine()))
+ if (flip_screen_get(machine()))
sy = 512-8 - sy;
colour = data & 0x0f;
@@ -202,7 +199,7 @@ WRITE8_HANDLER( popeye_bitmap_w )
{
for (x = 0; x < 8; x++)
{
- state->m_tmpbitmap2->pix16(sy+y, sx+x) = colour;
+ m_tmpbitmap2->pix16(sy+y, sx+x) = colour;
}
}
}
@@ -211,7 +208,7 @@ WRITE8_HANDLER( popeye_bitmap_w )
sx = 8 * (offset % 64);
sy = 4 * (offset / 64);
- if (flip_screen_get(space->machine()))
+ if (flip_screen_get(machine()))
sy = 512-4 - sy;
colour = data & 0x0f;
@@ -219,13 +216,13 @@ WRITE8_HANDLER( popeye_bitmap_w )
{
for (x = 0; x < 8; x++)
{
- state->m_tmpbitmap2->pix16(sy+y, sx+x) = colour;
+ m_tmpbitmap2->pix16(sy+y, sx+x) = colour;
}
}
}
}
-WRITE8_HANDLER( skyskipr_bitmap_w )
+WRITE8_MEMBER(popeye_state::skyskipr_bitmap_w)
{
offset = ((offset & 0xfc0) << 1) | (offset & 0x03f);
if (data & 0x80)
@@ -288,7 +285,7 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons
if (state->m_lastflip != flip_screen_get(machine))
{
for (offs = 0;offs < popeye_bitmapram_size;offs++)
- popeye_bitmap_w(space,offs,state->m_bitmapram[offs]);
+ state->popeye_bitmap_w(*space,offs,state->m_bitmapram[offs]);
state->m_lastflip = flip_screen_get(machine);
}
diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c
index 03ad074194b..758e16bec04 100644
--- a/src/mame/video/popper.c
+++ b/src/mame/video/popper.c
@@ -54,69 +54,62 @@ PALETTE_INIT( popper )
auto_free(machine, rgb);
}
-WRITE8_HANDLER( popper_ol_videoram_w )
+WRITE8_MEMBER(popper_state::popper_ol_videoram_w)
{
- popper_state *state = space->machine().driver_data<popper_state>();
- state->m_ol_videoram[offset] = data;
- state->m_ol_p123_tilemap->mark_tile_dirty(offset);
- state->m_ol_p0_tilemap->mark_tile_dirty(offset);
+ m_ol_videoram[offset] = data;
+ m_ol_p123_tilemap->mark_tile_dirty(offset);
+ m_ol_p0_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( popper_videoram_w )
+WRITE8_MEMBER(popper_state::popper_videoram_w)
{
- popper_state *state = space->machine().driver_data<popper_state>();
- state->m_videoram[offset] = data;
- state->m_p123_tilemap->mark_tile_dirty(offset);
- state->m_p0_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_p123_tilemap->mark_tile_dirty(offset);
+ m_p0_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( popper_ol_attribram_w )
+WRITE8_MEMBER(popper_state::popper_ol_attribram_w)
{
- popper_state *state = space->machine().driver_data<popper_state>();
- state->m_ol_attribram[offset] = data;
- state->m_ol_p123_tilemap->mark_tile_dirty(offset);
- state->m_ol_p0_tilemap->mark_tile_dirty(offset);
+ m_ol_attribram[offset] = data;
+ m_ol_p123_tilemap->mark_tile_dirty(offset);
+ m_ol_p0_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( popper_attribram_w )
+WRITE8_MEMBER(popper_state::popper_attribram_w)
{
- popper_state *state = space->machine().driver_data<popper_state>();
- state->m_attribram[offset] = data;
- state->m_p123_tilemap->mark_tile_dirty(offset);
- state->m_p0_tilemap->mark_tile_dirty(offset);
+ m_attribram[offset] = data;
+ m_p123_tilemap->mark_tile_dirty(offset);
+ m_p0_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( popper_flipscreen_w )
+WRITE8_MEMBER(popper_state::popper_flipscreen_w)
{
- popper_state *state = space->machine().driver_data<popper_state>();
- state->m_flipscreen = data;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ m_flipscreen = data;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
- if (state->m_flipscreen)
- state->m_tilemap_clip.min_x = state->m_tilemap_clip.max_x - 15;
+ if (m_flipscreen)
+ m_tilemap_clip.min_x = m_tilemap_clip.max_x - 15;
else
- state->m_tilemap_clip.max_x = 15;
+ m_tilemap_clip.max_x = 15;
}
-WRITE8_HANDLER( popper_e002_w )
+WRITE8_MEMBER(popper_state::popper_e002_w)
{
- popper_state *state = space->machine().driver_data<popper_state>();
- state->m_e002 = data;
+ m_e002 = data;
}
-WRITE8_HANDLER( popper_gfx_bank_w )
+WRITE8_MEMBER(popper_state::popper_gfx_bank_w)
{
- popper_state *state = space->machine().driver_data<popper_state>();
- if (state->m_gfx_bank != data)
+ if (m_gfx_bank != data)
{
- state->m_gfx_bank = data;
- space->machine().tilemap().mark_all_dirty();
+ m_gfx_bank = data;
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/portrait.c b/src/mame/video/portrait.c
index 23a63892674..7081204c22d 100644
--- a/src/mame/video/portrait.c
+++ b/src/mame/video/portrait.c
@@ -9,18 +9,16 @@
#include "includes/portrait.h"
-WRITE8_HANDLER( portrait_bgvideo_write )
+WRITE8_MEMBER(portrait_state::portrait_bgvideo_write)
{
- portrait_state *state = space->machine().driver_data<portrait_state>();
- state->m_background->mark_tile_dirty(offset/2);
- state->m_bgvideoram[offset] = data;
+ m_background->mark_tile_dirty(offset/2);
+ m_bgvideoram[offset] = data;
}
-WRITE8_HANDLER( portrait_fgvideo_write )
+WRITE8_MEMBER(portrait_state::portrait_fgvideo_write)
{
- portrait_state *state = space->machine().driver_data<portrait_state>();
- state->m_foreground->mark_tile_dirty(offset/2);
- state->m_fgvideoram[offset] = data;
+ m_foreground->mark_tile_dirty(offset/2);
+ m_fgvideoram[offset] = data;
}
INLINE void get_tile_info( running_machine &machine, tile_data &tileinfo, int tile_index, const UINT8 *source )
diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c
index e77de63a8e5..2083f36feca 100644
--- a/src/mame/video/powerins.c
+++ b/src/mame/video/powerins.c
@@ -48,20 +48,19 @@ Note: if MAME_DEBUG is defined, pressing Z with:
***************************************************************************/
-WRITE16_HANDLER( powerins_flipscreen_w )
+WRITE16_MEMBER(powerins_state::powerins_flipscreen_w)
{
- if (ACCESSING_BITS_0_7) flip_screen_set(space->machine(), data & 1 );
+ if (ACCESSING_BITS_0_7) flip_screen_set(machine(), data & 1 );
}
-WRITE16_HANDLER( powerins_tilebank_w )
+WRITE16_MEMBER(powerins_state::powerins_tilebank_w)
{
- powerins_state *state = space->machine().driver_data<powerins_state>();
if (ACCESSING_BITS_0_7)
{
- if (data != state->m_tile_bank)
+ if (data != m_tile_bank)
{
- state->m_tile_bank = data; // Tiles Bank (VRAM 0)
- state->m_tilemap_0->mark_all_dirty();
+ m_tile_bank = data; // Tiles Bank (VRAM 0)
+ m_tilemap_0->mark_all_dirty();
}
}
}
@@ -75,20 +74,19 @@ WRITE16_HANDLER( powerins_tilebank_w )
***************************************************************************/
-WRITE16_HANDLER( powerins_paletteram16_w )
+WRITE16_MEMBER(powerins_state::powerins_paletteram16_w)
{
/* byte 0 byte 1 */
/* RRRR GGGG BBBB RGBx */
/* 4321 4321 4321 000x */
- powerins_state *state = space->machine().driver_data<powerins_state>();
- UINT16 newword = COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
+ UINT16 newword = COMBINE_DATA(&m_generic_paletteram_16[offset]);
int r = ((newword >> 11) & 0x1E ) | ((newword >> 3) & 0x01);
int g = ((newword >> 7) & 0x1E ) | ((newword >> 2) & 0x01);
int b = ((newword >> 3) & 0x1E ) | ((newword >> 1) & 0x01);
- palette_set_color_rgb( space->machine(),offset, pal5bit(r),pal5bit(g),pal5bit(b) );
+ palette_set_color_rgb( machine(),offset, pal5bit(r),pal5bit(g),pal5bit(b) );
}
@@ -131,11 +129,10 @@ static TILE_GET_INFO( get_tile_info_0 )
0);
}
-WRITE16_HANDLER( powerins_vram_0_w )
+WRITE16_MEMBER(powerins_state::powerins_vram_0_w)
{
- powerins_state *state = space->machine().driver_data<powerins_state>();
- COMBINE_DATA(&state->m_vram_0[offset]);
- state->m_tilemap_0->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_vram_0[offset]);
+ m_tilemap_0->mark_tile_dirty(offset);
}
static TILEMAP_MAPPER( powerins_get_memory_offset_0 )
@@ -173,11 +170,10 @@ static TILE_GET_INFO( get_tile_info_1 )
0);
}
-WRITE16_HANDLER( powerins_vram_1_w )
+WRITE16_MEMBER(powerins_state::powerins_vram_1_w)
{
- powerins_state *state = space->machine().driver_data<powerins_state>();
- COMBINE_DATA(&state->m_vram_1[offset]);
- state->m_tilemap_1->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_vram_1[offset]);
+ m_tilemap_1->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c
index 38c90d73068..b4d8e142b63 100644
--- a/src/mame/video/prehisle.c
+++ b/src/mame/video/prehisle.c
@@ -10,54 +10,50 @@
#include "includes/prehisle.h"
-WRITE16_HANDLER( prehisle_bg_videoram16_w )
+WRITE16_MEMBER(prehisle_state::prehisle_bg_videoram16_w)
{
- prehisle_state *state = space->machine().driver_data<prehisle_state>();
- COMBINE_DATA(&state->m_bg_videoram16[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bg_videoram16[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( prehisle_fg_videoram16_w )
+WRITE16_MEMBER(prehisle_state::prehisle_fg_videoram16_w)
{
- prehisle_state *state = space->machine().driver_data<prehisle_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-READ16_HANDLER( prehisle_control16_r )
+READ16_MEMBER(prehisle_state::prehisle_control16_r)
{
- prehisle_state *state = space->machine().driver_data<prehisle_state>();
switch (offset)
{
- case 0x08: return input_port_read(space->machine(), "P2"); // Player 2
- case 0x10: return input_port_read(space->machine(), "COIN"); // Coins, Tilt, Service
- case 0x20: return input_port_read(space->machine(), "P1") ^ state->m_invert_controls; // Player 1
- case 0x21: return input_port_read(space->machine(), "DSW0"); // DIPs
- case 0x22: return input_port_read(space->machine(), "DSW1"); // DIPs + VBLANK
+ case 0x08: return input_port_read(machine(), "P2"); // Player 2
+ case 0x10: return input_port_read(machine(), "COIN"); // Coins, Tilt, Service
+ case 0x20: return input_port_read(machine(), "P1") ^ m_invert_controls; // Player 1
+ case 0x21: return input_port_read(machine(), "DSW0"); // DIPs
+ case 0x22: return input_port_read(machine(), "DSW1"); // DIPs + VBLANK
default: return 0;
}
}
-WRITE16_HANDLER( prehisle_control16_w )
+WRITE16_MEMBER(prehisle_state::prehisle_control16_w)
{
- prehisle_state *state = space->machine().driver_data<prehisle_state>();
int scroll = 0;
COMBINE_DATA(&scroll);
switch (offset)
{
- case 0x00: state->m_bg_tilemap->set_scrolly(0, scroll); break;
- case 0x08: state->m_bg_tilemap->set_scrollx(0, scroll); break;
- case 0x10: state->m_bg2_tilemap->set_scrolly(0, scroll); break;
- case 0x18: state->m_bg2_tilemap->set_scrollx(0, scroll); break;
- case 0x23: state->m_invert_controls = data ? 0x00ff : 0x0000; break;
- case 0x28: coin_counter_w(space->machine(), 0, data & 1); break;
- case 0x29: coin_counter_w(space->machine(), 1, data & 1); break;
- case 0x30: flip_screen_set(space->machine(), data & 0x01); break;
+ case 0x00: m_bg_tilemap->set_scrolly(0, scroll); break;
+ case 0x08: m_bg_tilemap->set_scrollx(0, scroll); break;
+ case 0x10: m_bg2_tilemap->set_scrolly(0, scroll); break;
+ case 0x18: m_bg2_tilemap->set_scrollx(0, scroll); break;
+ case 0x23: m_invert_controls = data ? 0x00ff : 0x0000; break;
+ case 0x28: coin_counter_w(machine(), 0, data & 1); break;
+ case 0x29: coin_counter_w(machine(), 1, data & 1); break;
+ case 0x30: flip_screen_set(machine(), data & 0x01); break;
}
}
diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c
index 03fe5f48c0a..51363999fb4 100644
--- a/src/mame/video/psikyo.c
+++ b/src/mame/video/psikyo.c
@@ -94,47 +94,45 @@ static TILE_GET_INFO( get_tile_info_1 )
}
-WRITE32_HANDLER( psikyo_vram_0_w )
+WRITE32_MEMBER(psikyo_state::psikyo_vram_0_w)
{
- psikyo_state *state = space->machine().driver_data<psikyo_state>();
- COMBINE_DATA(&state->m_vram_0[offset]);
+ COMBINE_DATA(&m_vram_0[offset]);
if (ACCESSING_BITS_16_31)
{
- state->m_tilemap_0_size0->mark_tile_dirty(offset * 2);
- state->m_tilemap_0_size1->mark_tile_dirty(offset * 2);
- state->m_tilemap_0_size2->mark_tile_dirty(offset * 2);
- state->m_tilemap_0_size3->mark_tile_dirty(offset * 2);
+ m_tilemap_0_size0->mark_tile_dirty(offset * 2);
+ m_tilemap_0_size1->mark_tile_dirty(offset * 2);
+ m_tilemap_0_size2->mark_tile_dirty(offset * 2);
+ m_tilemap_0_size3->mark_tile_dirty(offset * 2);
}
if (ACCESSING_BITS_0_15)
{
- state->m_tilemap_0_size0->mark_tile_dirty(offset * 2 + 1);
- state->m_tilemap_0_size1->mark_tile_dirty(offset * 2 + 1);
- state->m_tilemap_0_size2->mark_tile_dirty(offset * 2 + 1);
- state->m_tilemap_0_size3->mark_tile_dirty(offset * 2 + 1);
+ m_tilemap_0_size0->mark_tile_dirty(offset * 2 + 1);
+ m_tilemap_0_size1->mark_tile_dirty(offset * 2 + 1);
+ m_tilemap_0_size2->mark_tile_dirty(offset * 2 + 1);
+ m_tilemap_0_size3->mark_tile_dirty(offset * 2 + 1);
}
}
-WRITE32_HANDLER( psikyo_vram_1_w )
+WRITE32_MEMBER(psikyo_state::psikyo_vram_1_w)
{
- psikyo_state *state = space->machine().driver_data<psikyo_state>();
- COMBINE_DATA(&state->m_vram_1[offset]);
+ COMBINE_DATA(&m_vram_1[offset]);
if (ACCESSING_BITS_16_31)
{
- state->m_tilemap_1_size0->mark_tile_dirty(offset * 2);
- state->m_tilemap_1_size1->mark_tile_dirty(offset * 2);
- state->m_tilemap_1_size2->mark_tile_dirty(offset * 2);
- state->m_tilemap_1_size3->mark_tile_dirty(offset * 2);
+ m_tilemap_1_size0->mark_tile_dirty(offset * 2);
+ m_tilemap_1_size1->mark_tile_dirty(offset * 2);
+ m_tilemap_1_size2->mark_tile_dirty(offset * 2);
+ m_tilemap_1_size3->mark_tile_dirty(offset * 2);
}
if (ACCESSING_BITS_0_15)
{
- state->m_tilemap_1_size0->mark_tile_dirty(offset * 2 + 1);
- state->m_tilemap_1_size1->mark_tile_dirty(offset * 2 + 1);
- state->m_tilemap_1_size2->mark_tile_dirty(offset * 2 + 1);
- state->m_tilemap_1_size3->mark_tile_dirty(offset * 2 + 1);
+ m_tilemap_1_size0->mark_tile_dirty(offset * 2 + 1);
+ m_tilemap_1_size1->mark_tile_dirty(offset * 2 + 1);
+ m_tilemap_1_size2->mark_tile_dirty(offset * 2 + 1);
+ m_tilemap_1_size3->mark_tile_dirty(offset * 2 + 1);
}
}
diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c
index bf51c422b29..4f46e4f6859 100644
--- a/src/mame/video/psychic5.c
+++ b/src/mame/video/psychic5.c
@@ -89,115 +89,108 @@ static void set_background_palette_intensity(running_machine &machine)
Memory handler
***************************************************************************/
-READ8_HANDLER( psychic5_vram_page_select_r )
+READ8_MEMBER(psychic5_state::psychic5_vram_page_select_r)
{
- psychic5_state *state = space->machine().driver_data<psychic5_state>();
- return state->m_ps5_vram_page;
+ return m_ps5_vram_page;
}
-WRITE8_HANDLER( psychic5_vram_page_select_w )
+WRITE8_MEMBER(psychic5_state::psychic5_vram_page_select_w)
{
- psychic5_state *state = space->machine().driver_data<psychic5_state>();
- state->m_ps5_vram_page = data & 1;
+ m_ps5_vram_page = data & 1;
}
-WRITE8_HANDLER( psychic5_title_screen_w )
+WRITE8_MEMBER(psychic5_state::psychic5_title_screen_w)
{
- psychic5_state *state = space->machine().driver_data<psychic5_state>();
- state->m_title_screen = data;
+ m_title_screen = data;
}
-READ8_HANDLER( psychic5_paged_ram_r )
+READ8_MEMBER(psychic5_state::psychic5_paged_ram_r)
{
- psychic5_state *state = space->machine().driver_data<psychic5_state>();
- if (state->m_ps5_vram_page == 1)
+ if (m_ps5_vram_page == 1)
{
switch (offset)
{
- case 0x00: return input_port_read(space->machine(), "SYSTEM");
- case 0x01: return input_port_read(space->machine(), "P1");
- case 0x02: return input_port_read(space->machine(), "P2");
- case 0x03: return input_port_read(space->machine(), "DSW1");
- case 0x04: return input_port_read(space->machine(), "DSW2");
+ case 0x00: return input_port_read(machine(), "SYSTEM");
+ case 0x01: return input_port_read(machine(), "P1");
+ case 0x02: return input_port_read(machine(), "P2");
+ case 0x03: return input_port_read(machine(), "DSW1");
+ case 0x04: return input_port_read(machine(), "DSW2");
}
}
- return state->m_ps5_pagedram[state->m_ps5_vram_page][offset];
+ return m_ps5_pagedram[m_ps5_vram_page][offset];
}
-WRITE8_HANDLER( psychic5_paged_ram_w )
+WRITE8_MEMBER(psychic5_state::psychic5_paged_ram_w)
{
- psychic5_state *state = space->machine().driver_data<psychic5_state>();
- state->m_ps5_pagedram[state->m_ps5_vram_page][offset] = data;
+ m_ps5_pagedram[m_ps5_vram_page][offset] = data;
- if (state->m_ps5_vram_page == 0)
+ if (m_ps5_vram_page == 0)
{
if (offset <= 0xfff)
- state->m_bg_tilemap->mark_tile_dirty(offset >> 1);
+ m_bg_tilemap->mark_tile_dirty(offset >> 1);
}
else
{
if (offset == BG_SCROLLX_LSB || offset == BG_SCROLLX_MSB)
{
- UINT16 bg_scrollx = state->m_ps5_io_ram[BG_SCROLLX_LSB] | (state->m_ps5_io_ram[BG_SCROLLX_MSB] << 8);
- state->m_bg_tilemap->set_scrollx(0, bg_scrollx);
+ UINT16 bg_scrollx = m_ps5_io_ram[BG_SCROLLX_LSB] | (m_ps5_io_ram[BG_SCROLLX_MSB] << 8);
+ m_bg_tilemap->set_scrollx(0, bg_scrollx);
}
else if (offset == BG_SCROLLY_LSB || offset == BG_SCROLLY_MSB)
{
- UINT16 bg_scrolly = state->m_ps5_io_ram[BG_SCROLLY_LSB] | (state->m_ps5_io_ram[BG_SCROLLY_MSB] << 8);
- state->m_bg_tilemap->set_scrolly(0, bg_scrolly);
+ UINT16 bg_scrolly = m_ps5_io_ram[BG_SCROLLY_LSB] | (m_ps5_io_ram[BG_SCROLLY_MSB] << 8);
+ m_bg_tilemap->set_scrolly(0, bg_scrolly);
}
else if (offset == BG_SCREEN_MODE)
{
- state->m_bg_status = state->m_ps5_io_ram[BG_SCREEN_MODE];
+ m_bg_status = m_ps5_io_ram[BG_SCREEN_MODE];
}
else if (offset >= 0x400 && offset <= 0x5ff) /* Sprite color */
- psychic5_change_palette(space->machine(),((offset >> 1) & 0xff)+0x000,offset-0x400);
+ psychic5_change_palette(machine(),((offset >> 1) & 0xff)+0x000,offset-0x400);
else if (offset >= 0x800 && offset <= 0x9ff) /* BG color */
- psychic5_change_palette(space->machine(),((offset >> 1) & 0xff)+0x100,offset-0x400);
+ psychic5_change_palette(machine(),((offset >> 1) & 0xff)+0x100,offset-0x400);
else if (offset >= 0xa00 && offset <= 0xbff) /* Text color */
- psychic5_change_palette(space->machine(),((offset >> 1) & 0xff)+0x200,offset-0x400);
+ psychic5_change_palette(machine(),((offset >> 1) & 0xff)+0x200,offset-0x400);
else if (offset >= 0x1000)
- state->m_fg_tilemap->mark_tile_dirty((offset-0x1000) >> 1);
+ m_fg_tilemap->mark_tile_dirty((offset-0x1000) >> 1);
}
}
-WRITE8_HANDLER( bombsa_paged_ram_w )
+WRITE8_MEMBER(psychic5_state::bombsa_paged_ram_w)
{
- psychic5_state *state = space->machine().driver_data<psychic5_state>();
- state->m_ps5_pagedram[state->m_ps5_vram_page][offset] = data;
+ m_ps5_pagedram[m_ps5_vram_page][offset] = data;
- if (state->m_ps5_vram_page == 0)
+ if (m_ps5_vram_page == 0)
{
- state->m_bg_tilemap->mark_tile_dirty(offset >> 1);
+ m_bg_tilemap->mark_tile_dirty(offset >> 1);
}
else
{
if (offset == BG_SCROLLX_LSB || offset == BG_SCROLLX_MSB)
{
- UINT16 bg_scrollx = state->m_ps5_io_ram[BG_SCROLLX_LSB] | (state->m_ps5_io_ram[BG_SCROLLX_MSB] << 8);
- state->m_bg_tilemap->set_scrollx(0, bg_scrollx);
+ UINT16 bg_scrollx = m_ps5_io_ram[BG_SCROLLX_LSB] | (m_ps5_io_ram[BG_SCROLLX_MSB] << 8);
+ m_bg_tilemap->set_scrollx(0, bg_scrollx);
}
else if (offset == BG_SCROLLY_LSB || offset == BG_SCROLLY_MSB)
{
- UINT16 bg_scrolly = state->m_ps5_io_ram[BG_SCROLLY_LSB] | (state->m_ps5_io_ram[BG_SCROLLY_MSB] << 8);
- state->m_bg_tilemap->set_scrolly(0, bg_scrolly);
+ UINT16 bg_scrolly = m_ps5_io_ram[BG_SCROLLY_LSB] | (m_ps5_io_ram[BG_SCROLLY_MSB] << 8);
+ m_bg_tilemap->set_scrolly(0, bg_scrolly);
}
else if (offset == BG_SCREEN_MODE)
{
- state->m_bg_status = state->m_ps5_io_ram[BG_SCREEN_MODE];
+ m_bg_status = m_ps5_io_ram[BG_SCREEN_MODE];
}
else if (offset >= 0x0800 && offset <= 0x0fff)
- state->m_fg_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
+ m_fg_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
else if (offset >= 0x1000 && offset <= 0x15ff)
- psychic5_change_palette(space->machine(), (offset >> 1) & 0x3ff, offset-0x1000);
+ psychic5_change_palette(machine(), (offset >> 1) & 0x3ff, offset-0x1000);
}
}
-WRITE8_HANDLER( bombsa_unknown_w )
+WRITE8_MEMBER(psychic5_state::bombsa_unknown_w)
{
- psychic5_state *state = space->machine().driver_data<psychic5_state>();
- state->m_bombsa_unknown = data;
+ m_bombsa_unknown = data;
}
diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c
index c1b8386d4f4..cb662f657cf 100644
--- a/src/mame/video/punchout.c
+++ b/src/mame/video/punchout.c
@@ -166,41 +166,36 @@ VIDEO_START( armwrest )
-WRITE8_HANDLER( punchout_bg_top_videoram_w )
+WRITE8_MEMBER(punchout_state::punchout_bg_top_videoram_w)
{
- punchout_state *state = space->machine().driver_data<punchout_state>();
- state->m_bg_top_videoram[offset] = data;
- state->m_bg_top_tilemap->mark_tile_dirty(offset/2);
+ m_bg_top_videoram[offset] = data;
+ m_bg_top_tilemap->mark_tile_dirty(offset/2);
}
-WRITE8_HANDLER( punchout_bg_bot_videoram_w )
+WRITE8_MEMBER(punchout_state::punchout_bg_bot_videoram_w)
{
- punchout_state *state = space->machine().driver_data<punchout_state>();
- state->m_bg_bot_videoram[offset] = data;
- state->m_bg_bot_tilemap->mark_tile_dirty(offset/2);
+ m_bg_bot_videoram[offset] = data;
+ m_bg_bot_tilemap->mark_tile_dirty(offset/2);
}
-WRITE8_HANDLER( armwrest_fg_videoram_w )
+WRITE8_MEMBER(punchout_state::armwrest_fg_videoram_w)
{
- punchout_state *state = space->machine().driver_data<punchout_state>();
- state->m_armwrest_fg_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset/2);
+ m_armwrest_fg_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset/2);
}
-WRITE8_HANDLER( punchout_spr1_videoram_w )
+WRITE8_MEMBER(punchout_state::punchout_spr1_videoram_w)
{
- punchout_state *state = space->machine().driver_data<punchout_state>();
- state->m_spr1_videoram[offset] = data;
- state->m_spr1_tilemap->mark_tile_dirty(offset/4);
- if (state->m_spr1_tilemap_flipx)
- state->m_spr1_tilemap_flipx->mark_tile_dirty(offset/4);
+ m_spr1_videoram[offset] = data;
+ m_spr1_tilemap->mark_tile_dirty(offset/4);
+ if (m_spr1_tilemap_flipx)
+ m_spr1_tilemap_flipx->mark_tile_dirty(offset/4);
}
-WRITE8_HANDLER( punchout_spr2_videoram_w )
+WRITE8_MEMBER(punchout_state::punchout_spr2_videoram_w)
{
- punchout_state *state = space->machine().driver_data<punchout_state>();
- state->m_spr2_videoram[offset] = data;
- state->m_spr2_tilemap->mark_tile_dirty(offset/4);
+ m_spr2_videoram[offset] = data;
+ m_spr2_tilemap->mark_tile_dirty(offset/4);
}
diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c
index 612a2fea317..cb1b996e14d 100644
--- a/src/mame/video/pushman.c
+++ b/src/mame/video/pushman.c
@@ -64,17 +64,15 @@ VIDEO_START( pushman )
***************************************************************************/
-WRITE16_HANDLER( pushman_scroll_w )
+WRITE16_MEMBER(pushman_state::pushman_scroll_w)
{
- pushman_state *state = space->machine().driver_data<pushman_state>();
- COMBINE_DATA(&state->m_control[offset]);
+ COMBINE_DATA(&m_control[offset]);
}
-WRITE16_HANDLER( pushman_videoram_w )
+WRITE16_MEMBER(pushman_state::pushman_videoram_w)
{
- pushman_state *state = space->machine().driver_data<pushman_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c
index fb452c25f75..0391f3a4648 100644
--- a/src/mame/video/qix.c
+++ b/src/mame/video/qix.c
@@ -110,45 +110,42 @@ WRITE8_DEVICE_HANDLER( qix_flip_screen_w )
*
*************************************/
-static READ8_HANDLER( qix_videoram_r )
+READ8_MEMBER(qix_state::qix_videoram_r)
{
- qix_state *state = space->machine().driver_data<qix_state>();
/* add in the upper bit of the address latch */
- offset += (state->m_videoram_address[0] & 0x80) << 8;
- return state->m_videoram[offset];
+ offset += (m_videoram_address[0] & 0x80) << 8;
+ return m_videoram[offset];
}
-static WRITE8_HANDLER( qix_videoram_w )
+WRITE8_MEMBER(qix_state::qix_videoram_w)
{
- qix_state *state = space->machine().driver_data<qix_state>();
/* update the screen in case the game is writing "behind" the beam -
Zookeeper likes to do this */
- space->machine().primary_screen->update_now();
+ machine().primary_screen->update_now();
/* add in the upper bit of the address latch */
- offset += (state->m_videoram_address[0] & 0x80) << 8;
+ offset += (m_videoram_address[0] & 0x80) << 8;
/* write the data */
- state->m_videoram[offset] = data;
+ m_videoram[offset] = data;
}
-static WRITE8_HANDLER( slither_videoram_w )
+WRITE8_MEMBER(qix_state::slither_videoram_w)
{
- qix_state *state = space->machine().driver_data<qix_state>();
/* update the screen in case the game is writing "behind" the beam -
Zookeeper likes to do this */
- space->machine().primary_screen->update_now();
+ machine().primary_screen->update_now();
/* add in the upper bit of the address latch */
- offset += (state->m_videoram_address[0] & 0x80) << 8;
+ offset += (m_videoram_address[0] & 0x80) << 8;
/* blend the data */
- state->m_videoram[offset] = (state->m_videoram[offset] & ~*state->m_videoram_mask) | (data & *state->m_videoram_mask);
+ m_videoram[offset] = (m_videoram[offset] & ~*m_videoram_mask) | (data & *m_videoram_mask);
}
@@ -168,43 +165,40 @@ static WRITE8_HANDLER( slither_videoram_w )
*
*************************************/
-static READ8_HANDLER( qix_addresslatch_r )
+READ8_MEMBER(qix_state::qix_addresslatch_r)
{
- qix_state *state = space->machine().driver_data<qix_state>();
/* compute the value at the address latch */
- offset = (state->m_videoram_address[0] << 8) | state->m_videoram_address[1];
- return state->m_videoram[offset];
+ offset = (m_videoram_address[0] << 8) | m_videoram_address[1];
+ return m_videoram[offset];
}
-static WRITE8_HANDLER( qix_addresslatch_w )
+WRITE8_MEMBER(qix_state::qix_addresslatch_w)
{
- qix_state *state = space->machine().driver_data<qix_state>();
/* update the screen in case the game is writing "behind" the beam */
- space->machine().primary_screen->update_now();
+ machine().primary_screen->update_now();
/* compute the value at the address latch */
- offset = (state->m_videoram_address[0] << 8) | state->m_videoram_address[1];
+ offset = (m_videoram_address[0] << 8) | m_videoram_address[1];
/* write the data */
- state->m_videoram[offset] = data;
+ m_videoram[offset] = data;
}
-static WRITE8_HANDLER( slither_addresslatch_w )
+WRITE8_MEMBER(qix_state::slither_addresslatch_w)
{
- qix_state *state = space->machine().driver_data<qix_state>();
/* update the screen in case the game is writing "behind" the beam */
- space->machine().primary_screen->update_now();
+ machine().primary_screen->update_now();
/* compute the value at the address latch */
- offset = (state->m_videoram_address[0] << 8) | state->m_videoram_address[1];
+ offset = (m_videoram_address[0] << 8) | m_videoram_address[1];
/* blend the data */
- state->m_videoram[offset] = (state->m_videoram[offset] & ~*state->m_videoram_mask) | (data & *state->m_videoram_mask);
+ m_videoram[offset] = (m_videoram[offset] & ~*m_videoram_mask) | (data & *m_videoram_mask);
}
@@ -216,35 +210,33 @@ static WRITE8_HANDLER( slither_addresslatch_w )
*************************************/
-static WRITE8_HANDLER( qix_paletteram_w )
+WRITE8_MEMBER(qix_state::qix_paletteram_w)
{
- qix_state *state = space->machine().driver_data<qix_state>();
- UINT8 old_data = state->m_paletteram[offset];
+ UINT8 old_data = m_paletteram[offset];
/* set the palette RAM value */
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
/* trigger an update if a currently visible pen has changed */
- if (((offset >> 8) == state->m_palette_bank) &&
+ if (((offset >> 8) == m_palette_bank) &&
(old_data != data))
- space->machine().primary_screen->update_now();
+ machine().primary_screen->update_now();
}
-WRITE8_HANDLER( qix_palettebank_w )
+WRITE8_MEMBER(qix_state::qix_palettebank_w)
{
- qix_state *state = space->machine().driver_data<qix_state>();
/* set the bank value */
- if (state->m_palette_bank != (data & 3))
+ if (m_palette_bank != (data & 3))
{
- space->machine().primary_screen->update_now();
- state->m_palette_bank = data & 3;
+ machine().primary_screen->update_now();
+ m_palette_bank = data & 3;
}
/* LEDs are in the upper 6 bits */
- state->m_leds = ~data & 0xfc;
+ m_leds = ~data & 0xfc;
}
@@ -345,14 +337,14 @@ static MC6845_UPDATE_ROW( update_row )
*************************************/
static ADDRESS_MAP_START( qix_video_map, AS_PROGRAM, 8, qix_state )
- AM_RANGE(0x0000, 0x7fff) AM_READWRITE_LEGACY(qix_videoram_r, qix_videoram_w)
+ AM_RANGE(0x0000, 0x7fff) AM_READWRITE(qix_videoram_r, qix_videoram_w)
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x8400, 0x87ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03ff) AM_WRITE_LEGACY(qix_palettebank_w)
- AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x03fe) AM_READWRITE_LEGACY(qix_data_firq_r, qix_data_firq_w)
- AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x03fe) AM_READWRITE_LEGACY(qix_video_firq_ack_r, qix_video_firq_ack_w)
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(qix_paletteram_w) AM_BASE(m_paletteram)
- AM_RANGE(0x9400, 0x9400) AM_MIRROR(0x03fc) AM_READWRITE_LEGACY(qix_addresslatch_r, qix_addresslatch_w)
+ AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03ff) AM_WRITE(qix_palettebank_w)
+ AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x03fe) AM_READWRITE(qix_data_firq_r, qix_data_firq_w)
+ AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x03fe) AM_READWRITE(qix_video_firq_ack_r, qix_video_firq_ack_w)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(qix_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x9400, 0x9400) AM_MIRROR(0x03fc) AM_READWRITE(qix_addresslatch_r, qix_addresslatch_w)
AM_RANGE(0x9402, 0x9403) AM_MIRROR(0x03fc) AM_WRITEONLY AM_BASE(m_videoram_address)
AM_RANGE(0x9800, 0x9800) AM_MIRROR(0x03ff) AM_READONLY AM_BASE(m_scanline_latch)
AM_RANGE(0x9c00, 0x9c00) AM_MIRROR(0x03fe) AM_DEVWRITE("vid_u18", mc6845_device, address_w)
@@ -362,15 +354,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( zookeep_video_map, AS_PROGRAM, 8, qix_state )
- AM_RANGE(0x0000, 0x7fff) AM_READWRITE_LEGACY(qix_videoram_r, qix_videoram_w)
+ AM_RANGE(0x0000, 0x7fff) AM_READWRITE(qix_videoram_r, qix_videoram_w)
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x8400, 0x87ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03fe) AM_WRITE_LEGACY(qix_palettebank_w)
- AM_RANGE(0x8801, 0x8801) AM_MIRROR(0x03fe) AM_WRITE_LEGACY(zookeep_bankswitch_w)
- AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x03fe) AM_READWRITE_LEGACY(qix_data_firq_r, qix_data_firq_w)
- AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x03fe) AM_READWRITE_LEGACY(qix_video_firq_ack_r, qix_video_firq_ack_w)
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(qix_paletteram_w) AM_BASE(m_paletteram)
- AM_RANGE(0x9400, 0x9400) AM_MIRROR(0x03fc) AM_READWRITE_LEGACY(qix_addresslatch_r, qix_addresslatch_w)
+ AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03fe) AM_WRITE(qix_palettebank_w)
+ AM_RANGE(0x8801, 0x8801) AM_MIRROR(0x03fe) AM_WRITE(zookeep_bankswitch_w)
+ AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x03fe) AM_READWRITE(qix_data_firq_r, qix_data_firq_w)
+ AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x03fe) AM_READWRITE(qix_video_firq_ack_r, qix_video_firq_ack_w)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(qix_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x9400, 0x9400) AM_MIRROR(0x03fc) AM_READWRITE(qix_addresslatch_r, qix_addresslatch_w)
AM_RANGE(0x9402, 0x9403) AM_MIRROR(0x03fc) AM_WRITEONLY AM_BASE(m_videoram_address)
AM_RANGE(0x9800, 0x9800) AM_MIRROR(0x03ff) AM_READONLY AM_BASE(m_scanline_latch)
AM_RANGE(0x9c00, 0x9c00) AM_MIRROR(0x03fe) AM_DEVWRITE("vid_u18", mc6845_device, address_w)
@@ -381,14 +373,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( slither_video_map, AS_PROGRAM, 8, qix_state )
- AM_RANGE(0x0000, 0x7fff) AM_READWRITE_LEGACY(qix_videoram_r, slither_videoram_w)
+ AM_RANGE(0x0000, 0x7fff) AM_READWRITE(qix_videoram_r, slither_videoram_w)
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x8400, 0x87ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03ff) AM_WRITE_LEGACY(qix_palettebank_w)
- AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x03fe) AM_READWRITE_LEGACY(qix_data_firq_r, qix_data_firq_w)
- AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x03fe) AM_READWRITE_LEGACY(qix_video_firq_ack_r, qix_video_firq_ack_w)
- AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE_LEGACY(qix_paletteram_w) AM_BASE(m_paletteram)
- AM_RANGE(0x9400, 0x9400) AM_MIRROR(0x03fc) AM_READWRITE_LEGACY(qix_addresslatch_r, slither_addresslatch_w)
+ AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03ff) AM_WRITE(qix_palettebank_w)
+ AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x03fe) AM_READWRITE(qix_data_firq_r, qix_data_firq_w)
+ AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x03fe) AM_READWRITE(qix_video_firq_ack_r, qix_video_firq_ack_w)
+ AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(qix_paletteram_w) AM_BASE(m_paletteram)
+ AM_RANGE(0x9400, 0x9400) AM_MIRROR(0x03fc) AM_READWRITE(qix_addresslatch_r, slither_addresslatch_w)
AM_RANGE(0x9401, 0x9401) AM_MIRROR(0x03fc) AM_WRITEONLY AM_BASE(m_videoram_mask)
AM_RANGE(0x9402, 0x9403) AM_MIRROR(0x03fc) AM_WRITEONLY AM_BASE(m_videoram_address)
AM_RANGE(0x9800, 0x9800) AM_MIRROR(0x03ff) AM_READONLY AM_BASE(m_scanline_latch)
diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c
index 83ba2369df4..f9bf8103e6b 100644
--- a/src/mame/video/quizdna.c
+++ b/src/mame/video/quizdna.c
@@ -63,80 +63,74 @@ VIDEO_START( quizdna )
state->m_fg_tilemap->set_transparent_pen(0 );
}
-WRITE8_HANDLER( quizdna_bg_ram_w )
+WRITE8_MEMBER(quizdna_state::quizdna_bg_ram_w)
{
- quizdna_state *state = space->machine().driver_data<quizdna_state>();
- UINT8 *RAM = space->machine().region("maincpu")->base();
- state->m_bg_ram[offset] = data;
+ UINT8 *RAM = machine().region("maincpu")->base();
+ m_bg_ram[offset] = data;
RAM[0x12000+offset] = data;
- state->m_bg_tilemap->mark_tile_dirty((offset & 0xfff) / 2 );
+ m_bg_tilemap->mark_tile_dirty((offset & 0xfff) / 2 );
}
-WRITE8_HANDLER( quizdna_fg_ram_w )
+WRITE8_MEMBER(quizdna_state::quizdna_fg_ram_w)
{
- quizdna_state *state = space->machine().driver_data<quizdna_state>();
int i;
int offs = offset & 0xfff;
- UINT8 *RAM = space->machine().region("maincpu")->base();
+ UINT8 *RAM = machine().region("maincpu")->base();
RAM[0x10000+offs] = data;
RAM[0x11000+offs] = data; /* mirror */
- state->m_fg_ram[offs] = data;
+ m_fg_ram[offs] = data;
for (i=0; i<32; i++)
- state->m_fg_tilemap->mark_tile_dirty(((offs/2) & 0x1f) + i*0x20 );
+ m_fg_tilemap->mark_tile_dirty(((offs/2) & 0x1f) + i*0x20 );
}
-WRITE8_HANDLER( quizdna_bg_yscroll_w )
+WRITE8_MEMBER(quizdna_state::quizdna_bg_yscroll_w)
{
- quizdna_state *state = space->machine().driver_data<quizdna_state>();
- state->m_bg_tilemap->set_scrolldy(255-data, 255-data+1 );
+ m_bg_tilemap->set_scrolldy(255-data, 255-data+1 );
}
-WRITE8_HANDLER( quizdna_bg_xscroll_w )
+WRITE8_MEMBER(quizdna_state::quizdna_bg_xscroll_w)
{
- quizdna_state *state = space->machine().driver_data<quizdna_state>();
int x;
- state->m_bg_xscroll[offset] = data;
- x = ~(state->m_bg_xscroll[0] + state->m_bg_xscroll[1]*0x100) & 0x1ff;
+ m_bg_xscroll[offset] = data;
+ x = ~(m_bg_xscroll[0] + m_bg_xscroll[1]*0x100) & 0x1ff;
- state->m_bg_tilemap->set_scrolldx(x+64, x-64+10 );
+ m_bg_tilemap->set_scrolldx(x+64, x-64+10 );
}
-WRITE8_HANDLER( quizdna_screen_ctrl_w )
+WRITE8_MEMBER(quizdna_state::quizdna_screen_ctrl_w)
{
- quizdna_state *state = space->machine().driver_data<quizdna_state>();
int tmp = (data & 0x10) >> 4;
- state->m_video_enable = data & 0x20;
+ m_video_enable = data & 0x20;
- coin_counter_w(space->machine(), 0, data & 1);
+ coin_counter_w(machine(), 0, data & 1);
- if (state->m_flipscreen == tmp)
+ if (m_flipscreen == tmp)
return;
- state->m_flipscreen = tmp;
+ m_flipscreen = tmp;
- flip_screen_set(space->machine(), tmp);
- state->m_fg_tilemap->set_scrolldx(64, -64 +16);
+ flip_screen_set(machine(), tmp);
+ m_fg_tilemap->set_scrolldx(64, -64 +16);
}
-WRITE8_HANDLER( paletteram_xBGR_RRRR_GGGG_BBBB_w )
+WRITE8_MEMBER(quizdna_state::paletteram_xBGR_RRRR_GGGG_BBBB_w)
{
int r,g,b,d0,d1;
int offs = offset & ~1;
- quizdna_state *state = space->machine().driver_data<quizdna_state>();
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
- d0 = state->m_generic_paletteram_8[offs];
- d1 = state->m_generic_paletteram_8[offs+1];
+ d0 = m_generic_paletteram_8[offs];
+ d1 = m_generic_paletteram_8[offs+1];
r = ((d1 << 1) & 0x1e) | ((d1 >> 4) & 1);
g = ((d0 >> 3) & 0x1e) | ((d1 >> 5) & 1);
b = ((d0 << 1) & 0x1e) | ((d1 >> 6) & 1);
- palette_set_color_rgb(space->machine(),offs/2,pal5bit(r),pal5bit(g),pal5bit(b));
+ palette_set_color_rgb(machine(),offs/2,pal5bit(r),pal5bit(g),pal5bit(b));
}
static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/video/quizpani.c b/src/mame/video/quizpani.c
index 6978832caf2..4adc4c58d7e 100644
--- a/src/mame/video/quizpani.c
+++ b/src/mame/video/quizpani.c
@@ -38,35 +38,32 @@ static TILE_GET_INFO( txt_tile_info )
0);
}
-WRITE16_HANDLER( quizpani_bg_videoram_w )
+WRITE16_MEMBER(quizpani_state::quizpani_bg_videoram_w)
{
- quizpani_state *state = space->machine().driver_data<quizpani_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( quizpani_txt_videoram_w )
+WRITE16_MEMBER(quizpani_state::quizpani_txt_videoram_w)
{
- quizpani_state *state = space->machine().driver_data<quizpani_state>();
- state->m_txt_videoram[offset] = data;
- state->m_txt_tilemap->mark_tile_dirty(offset);
+ m_txt_videoram[offset] = data;
+ m_txt_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( quizpani_tilesbank_w )
+WRITE16_MEMBER(quizpani_state::quizpani_tilesbank_w)
{
- quizpani_state *state = space->machine().driver_data<quizpani_state>();
if (ACCESSING_BITS_0_7)
{
- if(state->m_txtbank != (data & 0x30)>>4)
+ if(m_txtbank != (data & 0x30)>>4)
{
- state->m_txtbank = (data & 0x30)>>4;
- state->m_txt_tilemap->mark_all_dirty();
+ m_txtbank = (data & 0x30)>>4;
+ m_txt_tilemap->mark_all_dirty();
}
- if(state->m_bgbank != (data & 3))
+ if(m_bgbank != (data & 3))
{
- state->m_bgbank = data & 3;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bgbank = data & 3;
+ m_bg_tilemap->mark_all_dirty();
}
}
}
diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c
index cd4c795ccb2..f062e96e4b5 100644
--- a/src/mame/video/raiden.c
+++ b/src/mame/video/raiden.c
@@ -4,26 +4,23 @@
/******************************************************************************/
-WRITE16_HANDLER( raiden_background_w )
+WRITE16_MEMBER(raiden_state::raiden_background_w)
{
- raiden_state *state = space->machine().driver_data<raiden_state>();
- COMBINE_DATA(&state->m_back_data[offset]);
- state->m_bg_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_back_data[offset]);
+ m_bg_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( raiden_foreground_w )
+WRITE16_MEMBER(raiden_state::raiden_foreground_w)
{
- raiden_state *state = space->machine().driver_data<raiden_state>();
- COMBINE_DATA(&state->m_fore_data[offset]);
- state->m_fg_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_fore_data[offset]);
+ m_fg_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( raiden_text_w )
+WRITE16_MEMBER(raiden_state::raiden_text_w)
{
- raiden_state *state = space->machine().driver_data<raiden_state>();
- UINT16 *videoram = state->m_videoram;
+ UINT16 *videoram = m_videoram;
COMBINE_DATA(&videoram[offset]);
- state->m_tx_layer->mark_tile_dirty(offset);
+ m_tx_layer->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_back_tile_info )
@@ -95,27 +92,25 @@ VIDEO_START( raidena )
state->m_tx_layer->set_transparent_pen(15);
}
-WRITE16_HANDLER( raiden_control_w )
+WRITE16_MEMBER(raiden_state::raiden_control_w)
{
- raiden_state *state = space->machine().driver_data<raiden_state>();
/* All other bits unknown - could be playfield enables */
/* Flipscreen */
if (offset==3 && ACCESSING_BITS_0_7) {
- state->m_flipscreen=data&0x2;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen=data&0x2;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
}
-WRITE16_HANDLER( raidena_control_w )
+WRITE16_MEMBER(raiden_state::raidena_control_w)
{
- raiden_state *state = space->machine().driver_data<raiden_state>();
/* raidena uses 0x40 instead of 0x02 */
/* Flipscreen */
if (offset==3 && ACCESSING_BITS_0_7) {
- state->m_flipscreen=data&0x40;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen=data&0x40;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
}
diff --git a/src/mame/video/rainbow.c b/src/mame/video/rainbow.c
index 288abf35b99..fe61973d552 100644
--- a/src/mame/video/rainbow.c
+++ b/src/mame/video/rainbow.c
@@ -12,9 +12,8 @@
/***************************************************************************/
-WRITE16_HANDLER( rbisland_spritectrl_w )
+WRITE16_MEMBER(rbisland_state::rbisland_spritectrl_w)
{
- rbisland_state *state = space->machine().driver_data<rbisland_state>();
if (offset == 0)
{
@@ -22,13 +21,12 @@ WRITE16_HANDLER( rbisland_spritectrl_w )
/* bits 5-7 are the sprite palette bank */
/* other bits unknown */
- pc090oj_set_sprite_ctrl(state->m_pc090oj, (data & 0xe0) >> 5);
+ pc090oj_set_sprite_ctrl(m_pc090oj, (data & 0xe0) >> 5);
}
}
-WRITE16_HANDLER( jumping_spritectrl_w )
+WRITE16_MEMBER(rbisland_state::jumping_spritectrl_w)
{
- rbisland_state *state = space->machine().driver_data<rbisland_state>();
if (offset == 0)
{
@@ -36,7 +34,7 @@ WRITE16_HANDLER( jumping_spritectrl_w )
/* bits 5-7 are the sprite palette bank */
/* other bits unknown */
- state->m_sprite_ctrl = data;
+ m_sprite_ctrl = data;
}
}
diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c
index 6d0af18fbfd..39c2e5eaa47 100644
--- a/src/mame/video/rallyx.c
+++ b/src/mame/video/rallyx.c
@@ -416,33 +416,29 @@ VIDEO_START( commsega )
***************************************************************************/
-WRITE8_HANDLER( rallyx_videoram_w )
+WRITE8_MEMBER(rallyx_state::rallyx_videoram_w)
{
- rallyx_state *state = space->machine().driver_data<rallyx_state>();
- state->m_videoram[offset] = data;
+ m_videoram[offset] = data;
if (offset & 0x400)
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
else
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( rallyx_scrollx_w )
+WRITE8_MEMBER(rallyx_state::rallyx_scrollx_w)
{
- rallyx_state *state = space->machine().driver_data<rallyx_state>();
- state->m_bg_tilemap->set_scrollx(0, data);
+ m_bg_tilemap->set_scrollx(0, data);
}
-WRITE8_HANDLER( rallyx_scrolly_w )
+WRITE8_MEMBER(rallyx_state::rallyx_scrolly_w)
{
- rallyx_state *state = space->machine().driver_data<rallyx_state>();
- state->m_bg_tilemap->set_scrolly(0, data);
+ m_bg_tilemap->set_scrolly(0, data);
}
-WRITE8_HANDLER( tactcian_starson_w )
+WRITE8_MEMBER(rallyx_state::tactcian_starson_w)
{
- rallyx_state *state = space->machine().driver_data<rallyx_state>();
- state->m_stars_enable = data & 1;
+ m_stars_enable = data & 1;
}
diff --git a/src/mame/video/rastan.c b/src/mame/video/rastan.c
index 31b3b6d6bac..c7371f5afff 100644
--- a/src/mame/video/rastan.c
+++ b/src/mame/video/rastan.c
@@ -11,22 +11,21 @@
/***************************************************************************/
-WRITE16_HANDLER( rastan_spritectrl_w )
+WRITE16_MEMBER(rastan_state::rastan_spritectrl_w)
{
- rastan_state *state = space->machine().driver_data<rastan_state>();
/* bits 5-7 are the sprite palette bank */
- pc090oj_set_sprite_ctrl(state->m_pc090oj, (data & 0xe0) >> 5);
+ pc090oj_set_sprite_ctrl(m_pc090oj, (data & 0xe0) >> 5);
/* bit 4 unused */
/* bits 0 and 1 are coin lockout */
- coin_lockout_w(space->machine(), 1, ~data & 0x01);
- coin_lockout_w(space->machine(), 0, ~data & 0x02);
+ coin_lockout_w(machine(), 1, ~data & 0x01);
+ coin_lockout_w(machine(), 0, ~data & 0x02);
/* bits 2 and 3 are the coin counters */
- coin_counter_w(space->machine(), 1, data & 0x04);
- coin_counter_w(space->machine(), 0, data & 0x08);
+ coin_counter_w(machine(), 1, data & 0x04);
+ coin_counter_w(machine(), 0, data & 0x08);
}
/***************************************************************************/
diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c
index d9a4e8a4506..a8a503ef4fc 100644
--- a/src/mame/video/realbrk.c
+++ b/src/mame/video/realbrk.c
@@ -23,27 +23,25 @@
#include "includes/realbrk.h"
-WRITE16_HANDLER( realbrk_flipscreen_w )
+WRITE16_MEMBER(realbrk_state::realbrk_flipscreen_w)
{
- realbrk_state *state = space->machine().driver_data<realbrk_state>();
if (ACCESSING_BITS_0_7)
{
- coin_counter_w(space->machine(), 0, data & 0x0001);
- coin_counter_w(space->machine(), 1, data & 0x0004);
+ coin_counter_w(machine(), 0, data & 0x0001);
+ coin_counter_w(machine(), 1, data & 0x0004);
- flip_screen_set(space->machine(), data & 0x0080);
+ flip_screen_set(machine(), data & 0x0080);
}
if (ACCESSING_BITS_8_15)
{
- state->m_disable_video = data & 0x8000;
+ m_disable_video = data & 0x8000;
}
}
-WRITE16_HANDLER( dai2kaku_flipscreen_w )
+WRITE16_MEMBER(realbrk_state::dai2kaku_flipscreen_w)
{
- realbrk_state *state = space->machine().driver_data<realbrk_state>();
- state->m_disable_video = 0;
+ m_disable_video = 0;
}
/***************************************************************************
@@ -94,18 +92,16 @@ static TILE_GET_INFO( get_tile_info_1 )
TILE_FLIPYX( attr >> 14 ));
}
-WRITE16_HANDLER( realbrk_vram_0_w )
+WRITE16_MEMBER(realbrk_state::realbrk_vram_0_w)
{
- realbrk_state *state = space->machine().driver_data<realbrk_state>();
- COMBINE_DATA(&state->m_vram_0[offset]);
- state->m_tilemap_0->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_vram_0[offset]);
+ m_tilemap_0->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( realbrk_vram_1_w )
+WRITE16_MEMBER(realbrk_state::realbrk_vram_1_w)
{
- realbrk_state *state = space->machine().driver_data<realbrk_state>();
- COMBINE_DATA(&state->m_vram_1[offset]);
- state->m_tilemap_1->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_vram_1[offset]);
+ m_tilemap_1->mark_tile_dirty(offset/2);
}
/***************************************************************************
@@ -133,11 +129,10 @@ static TILE_GET_INFO( get_tile_info_2 )
0);
}
-WRITE16_HANDLER( realbrk_vram_2_w )
+WRITE16_MEMBER(realbrk_state::realbrk_vram_2_w)
{
- realbrk_state *state = space->machine().driver_data<realbrk_state>();
- COMBINE_DATA(&state->m_vram_2[offset]);
- state->m_tilemap_2->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_vram_2[offset]);
+ m_tilemap_2->mark_tile_dirty(offset);
}
@@ -481,15 +476,14 @@ static void dai2kaku_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap
***************************************************************************/
-WRITE16_HANDLER( realbrk_vregs_w )
+WRITE16_MEMBER(realbrk_state::realbrk_vregs_w)
{
- realbrk_state *state = space->machine().driver_data<realbrk_state>();
- UINT16 old_data = state->m_vregs[offset];
- UINT16 new_data = COMBINE_DATA(&state->m_vregs[offset]);
+ UINT16 old_data = m_vregs[offset];
+ UINT16 new_data = COMBINE_DATA(&m_vregs[offset]);
if (new_data != old_data)
{
if (offset == 0xa/2)
- state->m_tilemap_0->mark_all_dirty();
+ m_tilemap_0->mark_all_dirty();
}
}
diff --git a/src/mame/video/redalert.c b/src/mame/video/redalert.c
index 9b4a5bcd788..0feea399722 100644
--- a/src/mame/video/redalert.c
+++ b/src/mame/video/redalert.c
@@ -22,11 +22,10 @@
*
*************************************/
-WRITE8_HANDLER( redalert_bitmap_videoram_w )
+WRITE8_MEMBER(redalert_state::redalert_bitmap_videoram_w)
{
- redalert_state *state = space->machine().driver_data<redalert_state>();
- state->m_bitmap_videoram[offset ] = data;
- state->m_bitmap_colorram[offset >> 3] = *state->m_bitmap_color & 0x07;
+ m_bitmap_videoram[offset ] = data;
+ m_bitmap_colorram[offset >> 3] = *m_bitmap_color & 0x07;
}
diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c
index 1bdc5f32727..59ad4fcd76b 100644
--- a/src/mame/video/renegade.c
+++ b/src/mame/video/renegade.c
@@ -8,38 +8,34 @@
#include "includes/renegade.h"
-WRITE8_HANDLER( renegade_videoram_w )
+WRITE8_MEMBER(renegade_state::renegade_videoram_w)
{
- renegade_state *state = space->machine().driver_data<renegade_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
offset = offset % (64 * 16);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( renegade_videoram2_w )
+WRITE8_MEMBER(renegade_state::renegade_videoram2_w)
{
- renegade_state *state = space->machine().driver_data<renegade_state>();
- state->m_videoram2[offset] = data;
+ m_videoram2[offset] = data;
offset = offset % (32 * 32);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( renegade_flipscreen_w )
+WRITE8_MEMBER(renegade_state::renegade_flipscreen_w)
{
- flip_screen_set(space->machine(), ~data & 0x01);
+ flip_screen_set(machine(), ~data & 0x01);
}
-WRITE8_HANDLER( renegade_scroll0_w )
+WRITE8_MEMBER(renegade_state::renegade_scroll0_w)
{
- renegade_state *state = space->machine().driver_data<renegade_state>();
- state->m_scrollx = (state->m_scrollx & 0xff00) | data;
+ m_scrollx = (m_scrollx & 0xff00) | data;
}
-WRITE8_HANDLER( renegade_scroll1_w )
+WRITE8_MEMBER(renegade_state::renegade_scroll1_w)
{
- renegade_state *state = space->machine().driver_data<renegade_state>();
- state->m_scrollx = (state->m_scrollx & 0xff) | (data << 8);
+ m_scrollx = (m_scrollx & 0xff) | (data << 8);
}
static TILE_GET_INFO( get_bg_tilemap_info )
diff --git a/src/mame/video/retofinv.c b/src/mame/video/retofinv.c
index 66b6066f6a5..0dde390e6be 100644
--- a/src/mame/video/retofinv.c
+++ b/src/mame/video/retofinv.c
@@ -120,42 +120,39 @@ VIDEO_START( retofinv )
***************************************************************************/
-WRITE8_HANDLER( retofinv_bg_videoram_w )
+WRITE8_MEMBER(retofinv_state::retofinv_bg_videoram_w)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( retofinv_fg_videoram_w )
+WRITE8_MEMBER(retofinv_state::retofinv_fg_videoram_w)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
- state->m_fg_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fg_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( retofinv_gfx_ctrl_w )
+WRITE8_MEMBER(retofinv_state::retofinv_gfx_ctrl_w)
{
- retofinv_state *state = space->machine().driver_data<retofinv_state>();
switch (offset)
{
case 0:
- flip_screen_set(space->machine(), data & 1);
+ flip_screen_set(machine(), data & 1);
break;
case 1:
- if (state->m_fg_bank != (data & 1))
+ if (m_fg_bank != (data & 1))
{
- state->m_fg_bank = data & 1;
- state->m_fg_tilemap->mark_all_dirty();
+ m_fg_bank = data & 1;
+ m_fg_tilemap->mark_all_dirty();
}
break;
case 2:
- if (state->m_bg_bank != (data & 1))
+ if (m_bg_bank != (data & 1))
{
- state->m_bg_bank = data & 1;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_bank = data & 1;
+ m_bg_tilemap->mark_all_dirty();
}
break;
}
diff --git a/src/mame/video/rltennis.c b/src/mame/video/rltennis.c
index fe33c5f0047..4f7d37627f2 100644
--- a/src/mame/video/rltennis.c
+++ b/src/mame/video/rltennis.c
@@ -110,49 +110,48 @@ enum
#define SRC_SHIFT 8
-WRITE16_HANDLER(rlt_blitter_w)
+WRITE16_MEMBER(rltennis_state::rlt_blitter_w)
{
- rltennis_state *state = space->machine().driver_data<rltennis_state>();
- int old_data=state->m_blitter[offset];
- COMBINE_DATA(&state->m_blitter[offset]);
- int new_data=state->m_blitter[offset];
+ int old_data=m_blitter[offset];
+ COMBINE_DATA(&m_blitter[offset]);
+ int new_data=m_blitter[offset];
if(offset==BLT_FLAGS && ((new_data^old_data) & BLTFLAG_DISPLAY_UD) ) /* visible page flip and clear */
{
if(new_data & BLTFLAG_DISPLAY_UD)
{
- copybitmap(*state->m_tmp_bitmap[BITMAP_FG_DISPLAY], *state->m_tmp_bitmap[BITMAP_FG_1], 0, 0, 0, 0, state->m_tmp_bitmap[BITMAP_FG_DISPLAY]->cliprect());
- state->m_tmp_bitmap[BITMAP_FG_1]->fill(0);
+ copybitmap(*m_tmp_bitmap[BITMAP_FG_DISPLAY], *m_tmp_bitmap[BITMAP_FG_1], 0, 0, 0, 0, m_tmp_bitmap[BITMAP_FG_DISPLAY]->cliprect());
+ m_tmp_bitmap[BITMAP_FG_1]->fill(0);
}
else
{
- copybitmap(*state->m_tmp_bitmap[BITMAP_FG_DISPLAY], *state->m_tmp_bitmap[BITMAP_FG_2], 0, 0, 0, 0, state->m_tmp_bitmap[BITMAP_FG_DISPLAY]->cliprect());
- state->m_tmp_bitmap[BITMAP_FG_2]->fill(0);
+ copybitmap(*m_tmp_bitmap[BITMAP_FG_DISPLAY], *m_tmp_bitmap[BITMAP_FG_2], 0, 0, 0, 0, m_tmp_bitmap[BITMAP_FG_DISPLAY]->cliprect());
+ m_tmp_bitmap[BITMAP_FG_2]->fill(0);
}
}
if(offset == BLT_START && (((new_data ^ old_data ) & new_data) & BLTSTRT_TRIGGER)) /* blit strobe 0->1 */
{
- device_set_input_line(state->m_maincpu, 1, HOLD_LINE);
+ device_set_input_line(m_maincpu, 1, HOLD_LINE);
- int src_x0=(state->m_blitter[BLT_X_START]>>SRC_SHIFT)+((state->m_blitter[BLT_FLAGS] & BLTFLAG_SRC_LR)?256:0);
- int src_y0=(state->m_blitter[BLT_Y_START]>>SRC_SHIFT)+((state->m_blitter[BLT_FLAGS]>>3)&0xff00)+(((state->m_blitter[BLT_START]) & BLTSTRT_ROM_MSB)?(1<<0xd):0);
+ int src_x0=(m_blitter[BLT_X_START]>>SRC_SHIFT)+((m_blitter[BLT_FLAGS] & BLTFLAG_SRC_LR)?256:0);
+ int src_y0=(m_blitter[BLT_Y_START]>>SRC_SHIFT)+((m_blitter[BLT_FLAGS]>>3)&0xff00)+(((m_blitter[BLT_START]) & BLTSTRT_ROM_MSB)?(1<<0xd):0);
- int dst_x0=(state->m_blitter[BLT_X_START]&0xff);
- int dst_y0=(state->m_blitter[BLT_Y_START]&0xff);
+ int dst_x0=(m_blitter[BLT_X_START]&0xff);
+ int dst_y0=(m_blitter[BLT_Y_START]&0xff);
- int dst_x1=(state->m_blitter[BLT_X_END]&0xff);
- int dst_y1=(state->m_blitter[BLT_Y_END]&0xff);
+ int dst_x1=(m_blitter[BLT_X_END]&0xff);
+ int dst_y1=(m_blitter[BLT_Y_END]&0xff);
- int src_x1=((state->m_blitter[BLT_X_END]>>SRC_SHIFT)&0xff)+((state->m_blitter[BLT_FLAGS] & BLTFLAG_SRC_LR)?256:0);
- int src_y1=((state->m_blitter[BLT_Y_END]>>SRC_SHIFT)&0xff)+((state->m_blitter[BLT_FLAGS]>>3)&0xff00)+(((state->m_blitter[BLT_START]) & BLTSTRT_ROM_MSB)?(1<<0xd):0);
+ int src_x1=((m_blitter[BLT_X_END]>>SRC_SHIFT)&0xff)+((m_blitter[BLT_FLAGS] & BLTFLAG_SRC_LR)?256:0);
+ int src_y1=((m_blitter[BLT_Y_END]>>SRC_SHIFT)&0xff)+((m_blitter[BLT_FLAGS]>>3)&0xff00)+(((m_blitter[BLT_START]) & BLTSTRT_ROM_MSB)?(1<<0xd):0);
- int x_dst_step=(state->m_blitter[BLT_FLAGS] & BLTFLAG_DST_X_DIR)?1:-1;
- int y_dst_step=(state->m_blitter[BLT_FLAGS] & BLTFLAG_DST_Y_DIR)?1:-1;
+ int x_dst_step=(m_blitter[BLT_FLAGS] & BLTFLAG_DST_X_DIR)?1:-1;
+ int y_dst_step=(m_blitter[BLT_FLAGS] & BLTFLAG_DST_Y_DIR)?1:-1;
- int x_src_step=(state->m_blitter[BLT_FLAGS] & BLTFLAG_SRC_X_DIR)?1:-1;
- int y_src_step=(state->m_blitter[BLT_FLAGS] & BLTFLAG_SRC_Y_DIR)?1:-1;
+ int x_src_step=(m_blitter[BLT_FLAGS] & BLTFLAG_SRC_X_DIR)?1:-1;
+ int y_src_step=(m_blitter[BLT_FLAGS] & BLTFLAG_SRC_Y_DIR)?1:-1;
int x,y;
@@ -176,11 +175,11 @@ WRITE16_HANDLER(rlt_blitter_w)
if(blit_h1<blit_h) blit_h1=blit_h;
}
- int layer=(state->m_blitter[BLT_START] & BLTSTRT_LAYER )?BITMAP_BG:BITMAP_FG_1;
+ int layer=(m_blitter[BLT_START] & BLTSTRT_LAYER )?BITMAP_BG:BITMAP_FG_1;
if(layer==BITMAP_FG_1)
{
- if(state->m_blitter[BLT_FLAGS] & BLTFLAG_DST_UD )
+ if(m_blitter[BLT_FLAGS] & BLTFLAG_DST_UD )
{
layer=BITMAP_FG_2;
}
@@ -209,12 +208,12 @@ WRITE16_HANDLER(rlt_blitter_w)
int address=yy*512+xx;
- int pix = state->m_gfx[ address & 0x0ffffff ];
- int screen_x=(x&0xff)+((state->m_blitter[BLT_FLAGS] & BLTFLAG_DST_LR )?256:0);
+ int pix = m_gfx[ address & 0x0ffffff ];
+ int screen_x=(x&0xff)+((m_blitter[BLT_FLAGS] & BLTFLAG_DST_LR )?256:0);
if((pix || force_blit)&& screen_x >0 && y >0 && screen_x < 512 && y < 256 )
{
- state->m_tmp_bitmap[layer]->pix16(y , screen_x ) = pix;
+ m_tmp_bitmap[layer]->pix16(y , screen_x ) = pix;
}
}
}
diff --git a/src/mame/video/rockrage.c b/src/mame/video/rockrage.c
index b394e0ea86e..8f80a7e2021 100644
--- a/src/mame/video/rockrage.c
+++ b/src/mame/video/rockrage.c
@@ -76,18 +76,17 @@ void rockrage_sprite_callback( running_machine &machine, int *code, int *color )
}
-WRITE8_HANDLER( rockrage_vreg_w )
+WRITE8_MEMBER(rockrage_state::rockrage_vreg_w)
{
/* bits 4-7: unused */
/* bit 3: bit 4 of bank # (layer 0) */
/* bit 2: bit 1 of bank # (layer 0) */
/* bits 0-1: sprite bank select */
- rockrage_state *state = space->machine().driver_data<rockrage_state>();
- if ((data & 0x0c) != (state->m_vreg & 0x0c))
- space->machine().tilemap().mark_all_dirty();
+ if ((data & 0x0c) != (m_vreg & 0x0c))
+ machine().tilemap().mark_all_dirty();
- state->m_vreg = data;
+ m_vreg = data;
}
/***************************************************************************
diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c
index 9b50b6b5414..2c02d44abad 100644
--- a/src/mame/video/rocnrope.c
+++ b/src/mame/video/rocnrope.c
@@ -82,26 +82,24 @@ PALETTE_INIT( rocnrope )
}
}
-WRITE8_HANDLER( rocnrope_videoram_w )
+WRITE8_MEMBER(rocnrope_state::rocnrope_videoram_w)
{
- rocnrope_state *state = space->machine().driver_data<rocnrope_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( rocnrope_colorram_w )
+WRITE8_MEMBER(rocnrope_state::rocnrope_colorram_w)
{
- rocnrope_state *state = space->machine().driver_data<rocnrope_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( rocnrope_flipscreen_w )
+WRITE8_MEMBER(rocnrope_state::rocnrope_flipscreen_w)
{
- if (flip_screen_get(space->machine()) != (~data & 0x01))
+ if (flip_screen_get(machine()) != (~data & 0x01))
{
- flip_screen_set(space->machine(), ~data & 0x01);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), ~data & 0x01);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/rohga.c b/src/mame/video/rohga.c
index 948c6365b1f..2fedc274594 100644
--- a/src/mame/video/rohga.c
+++ b/src/mame/video/rohga.c
@@ -9,12 +9,11 @@
#include "video/deco16ic.h"
#include "video/decospr.h"
-WRITE16_HANDLER( rohga_buffer_spriteram16_w )
+WRITE16_MEMBER(rohga_state::rohga_buffer_spriteram16_w)
{
// Spriteram seems to be triple buffered (no sprite lag on real pcb, but there
// is on driver with only double buffering)
- rohga_state *state = space->machine().driver_data<rohga_state>();
- state->m_spriteram->copy();
+ m_spriteram->copy();
}
VIDEO_START( rohga )
diff --git a/src/mame/video/rollrace.c b/src/mame/video/rollrace.c
index 240427d5b35..4ec825f0b5b 100644
--- a/src/mame/video/rollrace.c
+++ b/src/mame/video/rollrace.c
@@ -52,53 +52,46 @@ PALETTE_INIT( rollrace )
}
}
-WRITE8_HANDLER( rollrace_charbank_w)
+WRITE8_MEMBER(rollrace_state::rollrace_charbank_w)
{
- rollrace_state *state = space->machine().driver_data<rollrace_state>();
- state->m_ra_charbank[offset&1] = data;
- state->m_ra_chrbank = state->m_ra_charbank[0] | (state->m_ra_charbank[1] << 1) ;
+ m_ra_charbank[offset&1] = data;
+ m_ra_chrbank = m_ra_charbank[0] | (m_ra_charbank[1] << 1) ;
}
-WRITE8_HANDLER( rollrace_bkgpen_w)
+WRITE8_MEMBER(rollrace_state::rollrace_bkgpen_w)
{
- rollrace_state *state = space->machine().driver_data<rollrace_state>();
- state->m_ra_bkgpen = data;
+ m_ra_bkgpen = data;
}
-WRITE8_HANDLER(rollrace_spritebank_w)
+WRITE8_MEMBER(rollrace_state::rollrace_spritebank_w)
{
- rollrace_state *state = space->machine().driver_data<rollrace_state>();
- state->m_ra_spritebank = data;
+ m_ra_spritebank = data;
}
-WRITE8_HANDLER(rollrace_backgroundpage_w)
+WRITE8_MEMBER(rollrace_state::rollrace_backgroundpage_w)
{
- rollrace_state *state = space->machine().driver_data<rollrace_state>();
- state->m_ra_bkgpage = data & 0x1f;
- state->m_ra_bkgflip = ( data & 0x80 ) >> 7;
+ m_ra_bkgpage = data & 0x1f;
+ m_ra_bkgflip = ( data & 0x80 ) >> 7;
/* 0x80 flip vertical */
}
-WRITE8_HANDLER( rollrace_backgroundcolor_w )
+WRITE8_MEMBER(rollrace_state::rollrace_backgroundcolor_w)
{
- rollrace_state *state = space->machine().driver_data<rollrace_state>();
- state->m_ra_bkgcol = data;
+ m_ra_bkgcol = data;
}
-WRITE8_HANDLER( rollrace_flipy_w )
+WRITE8_MEMBER(rollrace_state::rollrace_flipy_w)
{
- rollrace_state *state = space->machine().driver_data<rollrace_state>();
- state->m_ra_flipy = data & 0x01;
+ m_ra_flipy = data & 0x01;
}
-WRITE8_HANDLER( rollrace_flipx_w )
+WRITE8_MEMBER(rollrace_state::rollrace_flipx_w)
{
- rollrace_state *state = space->machine().driver_data<rollrace_state>();
- state->m_ra_flipx = data & 0x01;
+ m_ra_flipx = data & 0x01;
}
SCREEN_UPDATE_IND16( rollrace )
diff --git a/src/mame/video/route16.c b/src/mame/video/route16.c
index c93b7e0c5c9..7b3d147aef5 100644
--- a/src/mame/video/route16.c
+++ b/src/mame/video/route16.c
@@ -17,21 +17,19 @@
*
*************************************/
-WRITE8_HANDLER( route16_out0_w )
+WRITE8_MEMBER(route16_state::route16_out0_w)
{
- route16_state *state = space->machine().driver_data<route16_state>();
- state->m_palette_1 = data & 0x1f;
+ m_palette_1 = data & 0x1f;
- coin_counter_w(space->machine(), 0, (data >> 5) & 0x01);
+ coin_counter_w(machine(), 0, (data >> 5) & 0x01);
}
-WRITE8_HANDLER( route16_out1_w )
+WRITE8_MEMBER(route16_state::route16_out1_w)
{
- route16_state *state = space->machine().driver_data<route16_state>();
- state->m_palette_2 = data & 0x1f;
+ m_palette_2 = data & 0x1f;
- state->m_flipscreen = (data >> 5) & 0x01;
+ m_flipscreen = (data >> 5) & 0x01;
}
diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c
index 81fc687c925..406648971b3 100644
--- a/src/mame/video/rpunch.c
+++ b/src/mame/video/rpunch.c
@@ -94,101 +94,95 @@ VIDEO_START( rpunch )
*
*************************************/
-WRITE16_HANDLER( rpunch_videoram_w )
+WRITE16_MEMBER(rpunch_state::rpunch_videoram_w)
{
- rpunch_state *state = space->machine().driver_data<rpunch_state>();
- UINT16 *videoram = state->m_videoram;
+ UINT16 *videoram = m_videoram;
int tmap = offset >> 12;
int tile_index = offset & 0xfff;
COMBINE_DATA(&videoram[offset]);
- state->m_background[tmap]->mark_tile_dirty(tile_index);
+ m_background[tmap]->mark_tile_dirty(tile_index);
}
-WRITE16_HANDLER( rpunch_videoreg_w )
+WRITE16_MEMBER(rpunch_state::rpunch_videoreg_w)
{
- rpunch_state *state = space->machine().driver_data<rpunch_state>();
- int oldword = state->m_videoflags;
- COMBINE_DATA(&state->m_videoflags);
+ int oldword = m_videoflags;
+ COMBINE_DATA(&m_videoflags);
- if (state->m_videoflags != oldword)
+ if (m_videoflags != oldword)
{
/* invalidate tilemaps */
- if ((oldword ^ state->m_videoflags) & 0x0410)
- state->m_background[0]->mark_all_dirty();
- if ((oldword ^ state->m_videoflags) & 0x0820)
- state->m_background[1]->mark_all_dirty();
+ if ((oldword ^ m_videoflags) & 0x0410)
+ m_background[0]->mark_all_dirty();
+ if ((oldword ^ m_videoflags) & 0x0820)
+ m_background[1]->mark_all_dirty();
}
}
-WRITE16_HANDLER( rpunch_scrollreg_w )
+WRITE16_MEMBER(rpunch_state::rpunch_scrollreg_w)
{
- rpunch_state *state = space->machine().driver_data<rpunch_state>();
if (ACCESSING_BITS_0_7 && ACCESSING_BITS_8_15)
switch (offset)
{
case 0:
- state->m_background[0]->set_scrolly(0, data & 0x1ff);
+ m_background[0]->set_scrolly(0, data & 0x1ff);
break;
case 1:
- state->m_background[0]->set_scrollx(0, data & 0x1ff);
+ m_background[0]->set_scrollx(0, data & 0x1ff);
break;
case 2:
- state->m_background[1]->set_scrolly(0, data & 0x1ff);
+ m_background[1]->set_scrolly(0, data & 0x1ff);
break;
case 3:
- state->m_background[1]->set_scrollx(0, data & 0x1ff);
+ m_background[1]->set_scrollx(0, data & 0x1ff);
break;
}
}
-WRITE16_HANDLER( rpunch_crtc_data_w )
+WRITE16_MEMBER(rpunch_state::rpunch_crtc_data_w)
{
- rpunch_state *state = space->machine().driver_data<rpunch_state>();
if (ACCESSING_BITS_0_7)
{
data &= 0xff;
- switch (state->m_crtc_register)
+ switch (m_crtc_register)
{
/* only register we know about.... */
case 0x0b:
- state->m_crtc_timer->adjust(space->machine().primary_screen->time_until_vblank_start(), (data == 0xc0) ? 2 : 1);
+ m_crtc_timer->adjust(machine().primary_screen->time_until_vblank_start(), (data == 0xc0) ? 2 : 1);
break;
default:
- logerror("CRTC register %02X = %02X\n", state->m_crtc_register, data & 0xff);
+ logerror("CRTC register %02X = %02X\n", m_crtc_register, data & 0xff);
break;
}
}
}
-WRITE16_HANDLER( rpunch_crtc_register_w )
+WRITE16_MEMBER(rpunch_state::rpunch_crtc_register_w)
{
- rpunch_state *state = space->machine().driver_data<rpunch_state>();
if (ACCESSING_BITS_0_7)
- state->m_crtc_register = data & 0xff;
+ m_crtc_register = data & 0xff;
}
-WRITE16_HANDLER( rpunch_ins_w )
+WRITE16_MEMBER(rpunch_state::rpunch_ins_w)
{
- rpunch_state *state = space->machine().driver_data<rpunch_state>();
if (ACCESSING_BITS_0_7)
{
if (offset == 0)
{
- state->m_gins = data & 0x3f;
+ m_gins = data & 0x3f;
logerror("GINS = %02X\n", data & 0x3f);
}
else
{
- state->m_bins = data & 0x3f;
+ m_bins = data & 0x3f;
logerror("BINS = %02X\n", data & 0x3f);
}
}
diff --git a/src/mame/video/runaway.c b/src/mame/video/runaway.c
index de12e91a811..f2ea994496c 100644
--- a/src/mame/video/runaway.c
+++ b/src/mame/video/runaway.c
@@ -8,7 +8,7 @@
#include "includes/runaway.h"
-WRITE8_HANDLER( runaway_paletteram_w )
+WRITE8_MEMBER(runaway_state::runaway_paletteram_w)
{
int R =
0x21 * ((~data >> 2) & 1) +
@@ -25,29 +25,27 @@ WRITE8_HANDLER( runaway_paletteram_w )
0x47 * ((~data >> 0) & 1) +
0x97 * ((~data >> 1) & 1);
- palette_set_color(space->machine(), offset, MAKE_RGB(R, G, B));
+ palette_set_color(machine(), offset, MAKE_RGB(R, G, B));
}
-WRITE8_HANDLER( runaway_video_ram_w )
+WRITE8_MEMBER(runaway_state::runaway_video_ram_w)
{
- runaway_state *state = space->machine().driver_data<runaway_state>();
- state->m_video_ram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_video_ram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( runaway_tile_bank_w )
+WRITE8_MEMBER(runaway_state::runaway_tile_bank_w)
{
- runaway_state *state = space->machine().driver_data<runaway_state>();
- if ((data & 1) != state->m_tile_bank)
+ if ((data & 1) != m_tile_bank)
{
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_tilemap->mark_all_dirty();
}
- state->m_tile_bank = data & 1;
+ m_tile_bank = data & 1;
}
diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c
index 7544ac57da4..ee7764148f1 100644
--- a/src/mame/video/rungun.c
+++ b/src/mame/video/rungun.c
@@ -32,24 +32,21 @@ void rng_sprite_callback( running_machine &machine, int *code, int *color, int *
*color = state->m_sprite_colorbase | (*color & 0x001f);
}
-READ16_HANDLER( rng_ttl_ram_r )
+READ16_MEMBER(rungun_state::rng_ttl_ram_r)
{
- rungun_state *state = space->machine().driver_data<rungun_state>();
- return state->m_ttl_vram[offset];
+ return m_ttl_vram[offset];
}
-WRITE16_HANDLER( rng_ttl_ram_w )
+WRITE16_MEMBER(rungun_state::rng_ttl_ram_w)
{
- rungun_state *state = space->machine().driver_data<rungun_state>();
- COMBINE_DATA(&state->m_ttl_vram[offset]);
+ COMBINE_DATA(&m_ttl_vram[offset]);
}
/* 53936 (PSAC2) rotation/zoom plane */
-WRITE16_HANDLER(rng_936_videoram_w)
+WRITE16_MEMBER(rungun_state::rng_936_videoram_w)
{
- rungun_state *state = space->machine().driver_data<rungun_state>();
- COMBINE_DATA(&state->m_936_videoram[offset]);
- state->m_936_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_936_videoram[offset]);
+ m_936_tilemap->mark_tile_dirty(offset / 2);
}
static TILE_GET_INFO( get_rng_936_tile_info )
diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c
index cc32fd9a455..34f606fb9c5 100644
--- a/src/mame/video/sauro.c
+++ b/src/mame/video/sauro.c
@@ -11,43 +11,38 @@
/* General */
-WRITE8_HANDLER( tecfri_videoram_w )
+WRITE8_MEMBER(sauro_state::tecfri_videoram_w)
{
- sauro_state *state = space->machine().driver_data<sauro_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( tecfri_colorram_w )
+WRITE8_MEMBER(sauro_state::tecfri_colorram_w)
{
- sauro_state *state = space->machine().driver_data<sauro_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( tecfri_videoram2_w )
+WRITE8_MEMBER(sauro_state::tecfri_videoram2_w)
{
- sauro_state *state = space->machine().driver_data<sauro_state>();
- state->m_videoram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( tecfri_colorram2_w )
+WRITE8_MEMBER(sauro_state::tecfri_colorram2_w)
{
- sauro_state *state = space->machine().driver_data<sauro_state>();
- state->m_colorram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( tecfri_scroll_bg_w )
+WRITE8_MEMBER(sauro_state::tecfri_scroll_bg_w)
{
- sauro_state *state = space->machine().driver_data<sauro_state>();
- state->m_bg_tilemap->set_scrollx(0, data);
+ m_bg_tilemap->set_scrollx(0, data);
}
static TILE_GET_INFO( get_tile_info_bg )
@@ -75,21 +70,19 @@ static TILE_GET_INFO( get_tile_info_fg )
static const int scroll2_map[8] = {2, 1, 4, 3, 6, 5, 0, 7};
static const int scroll2_map_flip[8] = {0, 7, 2, 1, 4, 3, 6, 5};
-WRITE8_HANDLER( sauro_palette_bank_w )
+WRITE8_MEMBER(sauro_state::sauro_palette_bank_w)
{
- sauro_state *state = space->machine().driver_data<sauro_state>();
- state->m_palette_bank = (data & 0x03) << 4;
- space->machine().tilemap().mark_all_dirty();
+ m_palette_bank = (data & 0x03) << 4;
+ machine().tilemap().mark_all_dirty();
}
-WRITE8_HANDLER( sauro_scroll_fg_w )
+WRITE8_MEMBER(sauro_state::sauro_scroll_fg_w)
{
- sauro_state *state = space->machine().driver_data<sauro_state>();
- const int *map = (flip_screen_get(space->machine()) ? scroll2_map_flip : scroll2_map);
+ const int *map = (flip_screen_get(machine()) ? scroll2_map_flip : scroll2_map);
int scroll = (data & 0xf8) | map[data & 7];
- state->m_fg_tilemap->set_scrollx(0, scroll);
+ m_fg_tilemap->set_scrollx(0, scroll);
}
VIDEO_START( sauro )
diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c
index 912cce08ee1..0d82dc01d5c 100644
--- a/src/mame/video/sbasketb.c
+++ b/src/mame/video/sbasketb.c
@@ -94,26 +94,24 @@ PALETTE_INIT( sbasketb )
}
}
-WRITE8_HANDLER( sbasketb_videoram_w )
+WRITE8_MEMBER(sbasketb_state::sbasketb_videoram_w)
{
- sbasketb_state *state = space->machine().driver_data<sbasketb_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( sbasketb_colorram_w )
+WRITE8_MEMBER(sbasketb_state::sbasketb_colorram_w)
{
- sbasketb_state *state = space->machine().driver_data<sbasketb_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( sbasketb_flipscreen_w )
+WRITE8_MEMBER(sbasketb_state::sbasketb_flipscreen_w)
{
- if (flip_screen_get(space->machine()) != data)
+ if (flip_screen_get(machine()) != data)
{
- flip_screen_set(space->machine(), data);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/sbugger.c b/src/mame/video/sbugger.c
index 51db266f063..bffa67eed82 100644
--- a/src/mame/video/sbugger.c
+++ b/src/mame/video/sbugger.c
@@ -14,20 +14,18 @@ static TILE_GET_INFO( get_sbugger_tile_info )
SET_TILE_INFO(0,tileno,color,0);
}
-WRITE8_HANDLER( sbugger_videoram_w )
+WRITE8_MEMBER(sbugger_state::sbugger_videoram_w)
{
- sbugger_state *state = space->machine().driver_data<sbugger_state>();
- state->m_videoram[offset] = data;
- state->m_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( sbugger_videoram_attr_w )
+WRITE8_MEMBER(sbugger_state::sbugger_videoram_attr_w)
{
- sbugger_state *state = space->machine().driver_data<sbugger_state>();
- state->m_videoram_attr[offset] = data;
- state->m_tilemap->mark_tile_dirty(offset);
+ m_videoram_attr[offset] = data;
+ m_tilemap->mark_tile_dirty(offset);
}
VIDEO_START(sbugger)
diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c
index 443795704d8..f122165909e 100644
--- a/src/mame/video/scotrsht.c
+++ b/src/mame/video/scotrsht.c
@@ -36,47 +36,43 @@ PALETTE_INIT( scotrsht )
}
}
-WRITE8_HANDLER( scotrsht_videoram_w )
+WRITE8_MEMBER(scotrsht_state::scotrsht_videoram_w)
{
- scotrsht_state *state = space->machine().driver_data<scotrsht_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( scotrsht_colorram_w )
+WRITE8_MEMBER(scotrsht_state::scotrsht_colorram_w)
{
- scotrsht_state *state = space->machine().driver_data<scotrsht_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( scotrsht_charbank_w )
+WRITE8_MEMBER(scotrsht_state::scotrsht_charbank_w)
{
- scotrsht_state *state = space->machine().driver_data<scotrsht_state>();
- if (state->m_charbank != (data & 0x01))
+ if (m_charbank != (data & 0x01))
{
- state->m_charbank = data & 0x01;
- state->m_bg_tilemap->mark_all_dirty();
+ m_charbank = data & 0x01;
+ m_bg_tilemap->mark_all_dirty();
}
/* other bits unknown */
}
-WRITE8_HANDLER( scotrsht_palettebank_w )
+WRITE8_MEMBER(scotrsht_state::scotrsht_palettebank_w)
{
- scotrsht_state *state = space->machine().driver_data<scotrsht_state>();
- if (state->m_palette_bank != ((data & 0x70) >> 4))
+ if (m_palette_bank != ((data & 0x70) >> 4))
{
- state->m_palette_bank = ((data & 0x70) >> 4);
- state->m_bg_tilemap->mark_all_dirty();
+ m_palette_bank = ((data & 0x70) >> 4);
+ m_bg_tilemap->mark_all_dirty();
}
- coin_counter_w(space->machine(), 0, data & 1);
- coin_counter_w(space->machine(), 1, data & 2);
+ coin_counter_w(machine(), 0, data & 1);
+ coin_counter_w(machine(), 1, data & 2);
// data & 4 unknown
}
diff --git a/src/mame/video/sderby.c b/src/mame/video/sderby.c
index 9233d8f4bb7..708688fd217 100644
--- a/src/mame/video/sderby.c
+++ b/src/mame/video/sderby.c
@@ -14,12 +14,11 @@ static TILE_GET_INFO( get_sderby_tile_info )
SET_TILE_INFO(1,tileno,colour,0);
}
-WRITE16_HANDLER( sderby_videoram_w )
+WRITE16_MEMBER(sderby_state::sderby_videoram_w)
{
- sderby_state *state = space->machine().driver_data<sderby_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_tilemap->mark_tile_dirty(offset/2);
}
/* MD Layer */
@@ -35,12 +34,11 @@ static TILE_GET_INFO( get_sderby_md_tile_info )
SET_TILE_INFO(1,tileno,colour+16,0);
}
-WRITE16_HANDLER( sderby_md_videoram_w )
+WRITE16_MEMBER(sderby_state::sderby_md_videoram_w)
{
- sderby_state *state = space->machine().driver_data<sderby_state>();
- COMBINE_DATA(&state->m_md_videoram[offset]);
- state->m_md_tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_md_videoram[offset]);
+ m_md_tilemap->mark_tile_dirty(offset/2);
}
/* FG Layer */
@@ -56,12 +54,11 @@ static TILE_GET_INFO( get_sderby_fg_tile_info )
SET_TILE_INFO(0,tileno,colour+32,0);
}
-WRITE16_HANDLER( sderby_fg_videoram_w )
+WRITE16_MEMBER(sderby_state::sderby_fg_videoram_w)
{
- sderby_state *state = space->machine().driver_data<sderby_state>();
- COMBINE_DATA(&state->m_fg_videoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_fg_videoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset/2);
}
@@ -131,19 +128,18 @@ SCREEN_UPDATE_IND16( pmroulet )
}
-WRITE16_HANDLER( sderby_scroll_w )
+WRITE16_MEMBER(sderby_state::sderby_scroll_w)
{
- sderby_state *state = space->machine().driver_data<sderby_state>();
- data = COMBINE_DATA(&state->m_scroll[offset]);
+ data = COMBINE_DATA(&m_scroll[offset]);
switch (offset)
{
- case 0: state->m_fg_tilemap->set_scrollx(0,data+2);break;
- case 1: state->m_fg_tilemap->set_scrolly(0,data-8);break;
- case 2: state->m_md_tilemap->set_scrollx(0,data+4);break;
- case 3: state->m_md_tilemap->set_scrolly(0,data-8);break;
- case 4: state->m_tilemap->set_scrollx(0,data+6); break;
- case 5: state->m_tilemap->set_scrolly(0,data-8); break;
+ case 0: m_fg_tilemap->set_scrollx(0,data+2);break;
+ case 1: m_fg_tilemap->set_scrolly(0,data-8);break;
+ case 2: m_md_tilemap->set_scrollx(0,data+4);break;
+ case 3: m_md_tilemap->set_scrolly(0,data-8);break;
+ case 4: m_tilemap->set_scrollx(0,data+6); break;
+ case 5: m_tilemap->set_scrolly(0,data-8); break;
}
}
diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c
index 2207662be55..c299d72e6f9 100644
--- a/src/mame/video/segag80r.c
+++ b/src/mame/video/segag80r.c
@@ -253,16 +253,15 @@ VIDEO_START( segag80r )
*
*************************************/
-WRITE8_HANDLER( segag80r_videoram_w )
+WRITE8_MEMBER(segag80r_state::segag80r_videoram_w)
{
- segag80r_state *state = space->machine().driver_data<segag80r_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
/* accesses to the upper half of VRAM go to paletteram if selected */
- if ((offset & 0x1000) && (state->m_video_control & 0x02))
+ if ((offset & 0x1000) && (m_video_control & 0x02))
{
offset &= 0x3f;
- state->m_generic_paletteram_8[offset] = data;
- g80_set_palette_entry(space->machine(), offset, data);
+ m_generic_paletteram_8[offset] = data;
+ g80_set_palette_entry(machine(), offset, data);
return;
}
@@ -271,7 +270,7 @@ WRITE8_HANDLER( segag80r_videoram_w )
/* track which characters are dirty */
if (offset & 0x800)
- gfx_element_mark_dirty(space->machine().gfx[0], (offset & 0x7ff) / 8);
+ gfx_element_mark_dirty(machine().gfx[0], (offset & 0x7ff) / 8);
}
@@ -282,12 +281,11 @@ WRITE8_HANDLER( segag80r_videoram_w )
*
*************************************/
-READ8_HANDLER( segag80r_video_port_r )
+READ8_MEMBER(segag80r_state::segag80r_video_port_r)
{
- segag80r_state *state = space->machine().driver_data<segag80r_state>();
if (offset == 0)
{
- logerror("%04X:segag80r_video_port_r(%d)\n", cpu_get_pc(&space->device()), offset);
+ logerror("%04X:segag80r_video_port_r(%d)\n", cpu_get_pc(&space.device()), offset);
return 0xff;
}
else
@@ -298,17 +296,16 @@ READ8_HANDLER( segag80r_video_port_r )
D2 = interrupt enable state
D3 = n/c
*/
- return (state->m_vblank_latch << 0) | (state->m_video_flip << 1) | (state->m_video_control & 0x04) | 0xf8;
+ return (m_vblank_latch << 0) | (m_video_flip << 1) | (m_video_control & 0x04) | 0xf8;
}
}
-WRITE8_HANDLER( segag80r_video_port_w )
+WRITE8_MEMBER(segag80r_state::segag80r_video_port_w)
{
- segag80r_state *state = space->machine().driver_data<segag80r_state>();
if (offset == 0)
{
- logerror("%04X:segag80r_video_port_w(%d) = %02X\n", cpu_get_pc(&space->device()), offset, data);
+ logerror("%04X:segag80r_video_port_w(%d) = %02X\n", cpu_get_pc(&space.device()), offset, data);
}
else
{
@@ -319,7 +316,7 @@ WRITE8_HANDLER( segag80r_video_port_w )
D2 = interrupt enable
D3 = n/c (used as flip by many background boards)
*/
- state->m_video_control = data;
+ m_video_control = data;
}
}
@@ -332,18 +329,16 @@ WRITE8_HANDLER( segag80r_video_port_w )
*
*************************************/
-READ8_HANDLER( spaceod_back_port_r )
+READ8_MEMBER(segag80r_state::spaceod_back_port_r)
{
- segag80r_state *state = space->machine().driver_data<segag80r_state>();
/* force an update to get the current detection value */
- space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos());
- return 0xfe | state->m_spaceod_bg_detect;
+ machine().primary_screen->update_partial(machine().primary_screen->vpos());
+ return 0xfe | m_spaceod_bg_detect;
}
-WRITE8_HANDLER( spaceod_back_port_w )
+WRITE8_MEMBER(segag80r_state::spaceod_back_port_w)
{
- segag80r_state *state = space->machine().driver_data<segag80r_state>();
switch (offset & 7)
{
/* port 0: latches D0-D7 into LS377 at U39 (SH4)
@@ -355,54 +350,54 @@ WRITE8_HANDLER( spaceod_back_port_w )
d7 = background ROM select 1
*/
case 0:
- if ((state->m_spaceod_bg_control ^ data) & 0xc4)
+ if ((m_spaceod_bg_control ^ data) & 0xc4)
{
- state->m_spaceod_bg_htilemap->mark_all_dirty();
- state->m_spaceod_bg_vtilemap->mark_all_dirty();
+ m_spaceod_bg_htilemap->mark_all_dirty();
+ m_spaceod_bg_vtilemap->mark_all_dirty();
}
- state->m_spaceod_bg_control = data;
+ m_spaceod_bg_control = data;
break;
/* port 1: loads both H and V counters with 0 */
case 1:
- state->m_spaceod_hcounter = 0;
- state->m_spaceod_vcounter = 0;
+ m_spaceod_hcounter = 0;
+ m_spaceod_vcounter = 0;
break;
/* port 2: clocks either the H or V counters (based on port 0:d1) */
/* either up or down (based on port 0:d0) */
case 2:
- if (!(state->m_spaceod_bg_control & 0x02))
+ if (!(m_spaceod_bg_control & 0x02))
{
- if (!(state->m_spaceod_bg_control & 0x01))
- state->m_spaceod_hcounter++;
+ if (!(m_spaceod_bg_control & 0x01))
+ m_spaceod_hcounter++;
else
- state->m_spaceod_hcounter--;
+ m_spaceod_hcounter--;
}
else
{
- if (!(state->m_spaceod_bg_control & 0x01))
- state->m_spaceod_vcounter++;
+ if (!(m_spaceod_bg_control & 0x01))
+ m_spaceod_vcounter++;
else
- state->m_spaceod_vcounter--;
+ m_spaceod_vcounter--;
}
break;
/* port 3: clears the background detection flag */
case 3:
- space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos());
- state->m_spaceod_bg_detect = 0;
+ machine().primary_screen->update_partial(machine().primary_screen->vpos());
+ m_spaceod_bg_detect = 0;
break;
/* port 4: enables (0)/disables (1) the background */
case 4:
- state->m_bg_enable = data & 1;
+ m_bg_enable = data & 1;
break;
/* port 5: specifies fixed background color */
/* top two bits are not connected */
case 5:
- state->m_spaceod_fixed_color = data & 0x3f;
+ m_spaceod_fixed_color = data & 0x3f;
break;
/* port 6: latches D0-D7 into LS377 at U37 -> CN1-11/12/13/14/15/16/17/18 */
@@ -422,16 +417,15 @@ WRITE8_HANDLER( spaceod_back_port_w )
*
*************************************/
-WRITE8_HANDLER( monsterb_videoram_w )
+WRITE8_MEMBER(segag80r_state::monsterb_videoram_w)
{
- segag80r_state *state = space->machine().driver_data<segag80r_state>();
/* accesses to the the area $f040-$f07f go to background palette if */
/* the palette access enable bit is set */
- if ((offset & 0x1fc0) == 0x1040 && (state->m_video_control & 0x40))
+ if ((offset & 0x1fc0) == 0x1040 && (m_video_control & 0x40))
{
offs_t paloffs = offset & 0x3f;
- state->m_generic_paletteram_8[paloffs | 0x40] = data;
- g80_set_palette_entry(space->machine(), paloffs | 0x40, data);
+ m_generic_paletteram_8[paloffs | 0x40] = data;
+ g80_set_palette_entry(machine(), paloffs | 0x40, data);
/* note that since the background board is not integrated with the main board */
/* writes here also write through to regular videoram */
}
@@ -441,9 +435,8 @@ WRITE8_HANDLER( monsterb_videoram_w )
}
-WRITE8_HANDLER( monsterb_back_port_w )
+WRITE8_MEMBER(segag80r_state::monsterb_back_port_w)
{
- segag80r_state *state = space->machine().driver_data<segag80r_state>();
switch (offset & 7)
{
/* port 0: not used (looks like latches for C7-C10 = background color) */
@@ -472,11 +465,11 @@ WRITE8_HANDLER( monsterb_back_port_w )
d7 = BKGEN - background enable
*/
case 4:
- if ((state->m_bg_char_bank ^ data) & 0x0f)
- state->m_bg_tilemap->mark_all_dirty();
- state->m_bg_char_bank = data & 0x0f;
- state->m_bg_scrolly = (data << 4) & 0x700;
- state->m_bg_enable = data & 0x80;
+ if ((m_bg_char_bank ^ data) & 0x0f)
+ m_bg_tilemap->mark_all_dirty();
+ m_bg_char_bank = data & 0x0f;
+ m_bg_scrolly = (data << 4) & 0x700;
+ m_bg_enable = data & 0x80;
break;
/* port 5: not connected */
@@ -494,16 +487,15 @@ WRITE8_HANDLER( monsterb_back_port_w )
*
*************************************/
-WRITE8_HANDLER( pignewt_videoram_w )
+WRITE8_MEMBER(segag80r_state::pignewt_videoram_w)
{
- segag80r_state *state = space->machine().driver_data<segag80r_state>();
/* accesses to the the area $f040-$f07f go to background palette if */
/* the palette access enable bit is set */
- if ((offset & 0x1fc0) == 0x1040 && (state->m_video_control & 0x02))
+ if ((offset & 0x1fc0) == 0x1040 && (m_video_control & 0x02))
{
offs_t paloffs = offset & 0x3f;
- state->m_generic_paletteram_8[paloffs | 0x40] = data;
- g80_set_palette_entry(space->machine(), paloffs | 0x40, data);
+ m_generic_paletteram_8[paloffs | 0x40] = data;
+ g80_set_palette_entry(machine(), paloffs | 0x40, data);
return;
}
@@ -512,41 +504,39 @@ WRITE8_HANDLER( pignewt_videoram_w )
}
-WRITE8_HANDLER( pignewt_back_color_w )
+WRITE8_MEMBER(segag80r_state::pignewt_back_color_w)
{
- segag80r_state *state = space->machine().driver_data<segag80r_state>();
/* it is not really known what this does */
if (offset == 0)
- state->m_pignewt_bg_color_offset = data;
+ m_pignewt_bg_color_offset = data;
else
- logerror("pignewt_back_color_w(%d) = %02X\n", state->m_pignewt_bg_color_offset, data);
+ logerror("pignewt_back_color_w(%d) = %02X\n", m_pignewt_bg_color_offset, data);
}
-WRITE8_HANDLER( pignewt_back_port_w )
+WRITE8_MEMBER(segag80r_state::pignewt_back_port_w)
{
- segag80r_state *state = space->machine().driver_data<segag80r_state>();
switch (offset & 7)
{
/* port 0: scroll offset low */
case 0:
- state->m_bg_scrollx = (state->m_bg_scrollx & 0x300) | data;
+ m_bg_scrollx = (m_bg_scrollx & 0x300) | data;
break;
/* port 1: scroll offset high */
case 1:
- state->m_bg_scrollx = (state->m_bg_scrollx & 0x0ff) | ((data << 8) & 0x300);
- state->m_bg_enable = data & 0x80;
+ m_bg_scrollx = (m_bg_scrollx & 0x0ff) | ((data << 8) & 0x300);
+ m_bg_enable = data & 0x80;
break;
/* port 2: scroll offset low */
case 2:
- state->m_bg_scrolly = (state->m_bg_scrolly & 0x300) | data;
+ m_bg_scrolly = (m_bg_scrolly & 0x300) | data;
break;
/* port 3: scroll offset high */
case 3:
- state->m_bg_scrolly = (state->m_bg_scrolly & 0x0ff) | ((data << 8) & 0x300);
+ m_bg_scrolly = (m_bg_scrolly & 0x0ff) | ((data << 8) & 0x300);
break;
/* port 4: background character bank control
@@ -561,9 +551,9 @@ WRITE8_HANDLER( pignewt_back_port_w )
*/
case 4:
data = (data & 0x09) | ((data >> 2) & 0x02) | ((data << 2) & 0x04);
- if ((state->m_bg_char_bank ^ data) & 0x0f)
- state->m_bg_tilemap->mark_all_dirty();
- state->m_bg_char_bank = data & 0x0f;
+ if ((m_bg_char_bank ^ data) & 0x0f)
+ m_bg_tilemap->mark_all_dirty();
+ m_bg_char_bank = data & 0x0f;
break;
/* port 5: not connected? */
@@ -580,16 +570,15 @@ WRITE8_HANDLER( pignewt_back_port_w )
*
*************************************/
-WRITE8_HANDLER( sindbadm_videoram_w )
+WRITE8_MEMBER(segag80r_state::sindbadm_videoram_w)
{
- segag80r_state *state = space->machine().driver_data<segag80r_state>();
/* accesses to the the area $f000-$f03f go to background palette if */
/* the palette access enable bit is set */
- if ((offset & 0x1fc0) == 0x1000 && (state->m_video_control & 0x02))
+ if ((offset & 0x1fc0) == 0x1000 && (m_video_control & 0x02))
{
offs_t paloffs = offset & 0x3f;
- state->m_generic_paletteram_8[paloffs | 0x40] = data;
- g80_set_palette_entry(space->machine(), paloffs | 0x40, data);
+ m_generic_paletteram_8[paloffs | 0x40] = data;
+ g80_set_palette_entry(machine(), paloffs | 0x40, data);
return;
}
@@ -598,14 +587,13 @@ WRITE8_HANDLER( sindbadm_videoram_w )
}
-WRITE8_HANDLER( sindbadm_back_port_w )
+WRITE8_MEMBER(segag80r_state::sindbadm_back_port_w)
{
- segag80r_state *state = space->machine().driver_data<segag80r_state>();
switch (offset & 3)
{
/* port 0: irq ack */
case 0:
- cputag_set_input_line(space->machine(), "maincpu", 0, CLEAR_LINE);
+ cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
break;
/* port 1: background control
@@ -620,12 +608,12 @@ WRITE8_HANDLER( sindbadm_back_port_w )
d7 = BG enable
*/
case 1:
- state->m_bg_enable = data & 0x80;
- state->m_bg_scrollx = (data << 6) & 0x300;
- state->m_bg_scrolly = (data << 4) & 0x700;
- if ((state->m_bg_char_bank ^ data) & 0x03)
- state->m_bg_tilemap->mark_all_dirty();
- state->m_bg_char_bank = data & 0x03;
+ m_bg_enable = data & 0x80;
+ m_bg_scrollx = (data << 6) & 0x300;
+ m_bg_scrolly = (data << 4) & 0x700;
+ if ((m_bg_char_bank ^ data) & 0x03)
+ m_bg_tilemap->mark_all_dirty();
+ m_bg_char_bank = data & 0x03;
break;
}
}
diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c
index 1a6b4650e76..1e567c9f8f2 100644
--- a/src/mame/video/segas32.c
+++ b/src/mame/video/segas32.c
@@ -433,47 +433,47 @@ static void common_paletteram_w(address_space *space, int which, offs_t offset,
*
*************************************/
-READ16_HANDLER( system32_paletteram_r )
+READ16_MEMBER(segas32_state::system32_paletteram_r)
{
- return common_paletteram_r(space, 0, offset);
+ return common_paletteram_r(&space, 0, offset);
}
-WRITE16_HANDLER( system32_paletteram_w )
+WRITE16_MEMBER(segas32_state::system32_paletteram_w)
{
- common_paletteram_w(space, 0, offset, data, mem_mask);
+ common_paletteram_w(&space, 0, offset, data, mem_mask);
}
-READ32_HANDLER( multi32_paletteram_0_r )
+READ32_MEMBER(segas32_state::multi32_paletteram_0_r)
{
- return common_paletteram_r(space, 0, offset*2+0) |
- (common_paletteram_r(space, 0, offset*2+1) << 16);
+ return common_paletteram_r(&space, 0, offset*2+0) |
+ (common_paletteram_r(&space, 0, offset*2+1) << 16);
}
-WRITE32_HANDLER( multi32_paletteram_0_w )
+WRITE32_MEMBER(segas32_state::multi32_paletteram_0_w)
{
if (ACCESSING_BITS_0_15)
- common_paletteram_w(space, 0, offset*2+0, data, mem_mask);
+ common_paletteram_w(&space, 0, offset*2+0, data, mem_mask);
if (ACCESSING_BITS_16_31)
- common_paletteram_w(space, 0, offset*2+1, data >> 16, mem_mask >> 16);
+ common_paletteram_w(&space, 0, offset*2+1, data >> 16, mem_mask >> 16);
}
-READ32_HANDLER( multi32_paletteram_1_r )
+READ32_MEMBER(segas32_state::multi32_paletteram_1_r)
{
- return common_paletteram_r(space, 1, offset*2+0) |
- (common_paletteram_r(space, 1, offset*2+1) << 16);
+ return common_paletteram_r(&space, 1, offset*2+0) |
+ (common_paletteram_r(&space, 1, offset*2+1) << 16);
}
-WRITE32_HANDLER( multi32_paletteram_1_w )
+WRITE32_MEMBER(segas32_state::multi32_paletteram_1_w)
{
if (ACCESSING_BITS_0_15)
- common_paletteram_w(space, 1, offset*2+0, data, mem_mask);
+ common_paletteram_w(&space, 1, offset*2+0, data, mem_mask);
if (ACCESSING_BITS_16_31)
- common_paletteram_w(space, 1, offset*2+1, data >> 16, mem_mask >> 16);
+ common_paletteram_w(&space, 1, offset*2+1, data >> 16, mem_mask >> 16);
}
@@ -484,17 +484,15 @@ WRITE32_HANDLER( multi32_paletteram_1_w )
*
*************************************/
-READ16_HANDLER( system32_videoram_r )
+READ16_MEMBER(segas32_state::system32_videoram_r)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
- return state->m_system32_videoram[offset];
+ return m_system32_videoram[offset];
}
-WRITE16_HANDLER( system32_videoram_w )
+WRITE16_MEMBER(segas32_state::system32_videoram_w)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
- COMBINE_DATA(&state->m_system32_videoram[offset]);
+ COMBINE_DATA(&m_system32_videoram[offset]);
/* if we are not in the control area, just update any affected tilemaps */
if (offset < 0x1ff00/2)
@@ -504,22 +502,21 @@ WRITE16_HANDLER( system32_videoram_w )
offset %= 0x200;
/* scan the cache for a matching pages */
- for (entry = state->m_cache_head; entry != NULL; entry = entry->next)
+ for (entry = m_cache_head; entry != NULL; entry = entry->next)
if (entry->page == page)
entry->tmap->mark_tile_dirty(offset);
}
}
-READ32_HANDLER( multi32_videoram_r )
+READ32_MEMBER(segas32_state::multi32_videoram_r)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
- return state->m_system32_videoram[offset*2+0] |
- (state->m_system32_videoram[offset*2+1] << 16);
+ return m_system32_videoram[offset*2+0] |
+ (m_system32_videoram[offset*2+1] << 16);
}
-WRITE32_HANDLER( multi32_videoram_w )
+WRITE32_MEMBER(segas32_state::multi32_videoram_w)
{
if (ACCESSING_BITS_0_15)
system32_videoram_w(space, offset*2+0, data, mem_mask);
@@ -535,16 +532,15 @@ WRITE32_HANDLER( multi32_videoram_w )
*
*************************************/
-READ16_HANDLER( system32_sprite_control_r )
+READ16_MEMBER(segas32_state::system32_sprite_control_r)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
switch (offset)
{
case 0:
/* D1 : Seems to be '1' only during an erase in progress, this
occurs very briefly though.
D0 : Selected frame buffer (0= A, 1= B) */
- return 0xfffc | (int)(&state->m_layer_data[MIXER_LAYER_SPRITES].bitmap < &state->m_layer_data[MIXER_LAYER_SPRITES_2].bitmap);
+ return 0xfffc | (int)(&m_layer_data[MIXER_LAYER_SPRITES].bitmap < &m_layer_data[MIXER_LAYER_SPRITES_2].bitmap);
case 1:
/* D1 : ?
@@ -563,27 +559,27 @@ READ16_HANDLER( system32_sprite_control_r )
case 2:
/* D1 : 1= Vertical flip, 0= Normal orientation
D0 : 1= Horizontal flip, 0= Normal orientation */
- return 0xfffc | state->m_sprite_control_latched[2];
+ return 0xfffc | m_sprite_control_latched[2];
case 3:
/* D1 : 1= Manual mode, 0= Automatic mode
D0 : 1= 30 Hz update, 0= 60 Hz update (automatic mode only) */
- return 0xfffc | state->m_sprite_control_latched[3];
+ return 0xfffc | m_sprite_control_latched[3];
case 4:
/* D1 : ?
D0 : ? */
- return 0xfffc | state->m_sprite_control_latched[4];
+ return 0xfffc | m_sprite_control_latched[4];
case 5:
/* D1 : ?
D0 : ? */
- return 0xfffc | state->m_sprite_control_latched[5];
+ return 0xfffc | m_sprite_control_latched[5];
case 6:
/* D0 : 1= 416 pixels
0= 320 pixels */
- return 0xfffc | (state->m_sprite_control_latched[6] & 1);
+ return 0xfffc | (m_sprite_control_latched[6] & 1);
case 7:
/* D1 : ?
@@ -594,22 +590,21 @@ READ16_HANDLER( system32_sprite_control_r )
}
-WRITE16_HANDLER( system32_sprite_control_w )
+WRITE16_MEMBER(segas32_state::system32_sprite_control_w)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
if (ACCESSING_BITS_0_7)
- state->m_sprite_control[offset & 7] = data;
+ m_sprite_control[offset & 7] = data;
}
-READ32_HANDLER( multi32_sprite_control_r )
+READ32_MEMBER(segas32_state::multi32_sprite_control_r)
{
return system32_sprite_control_r(space, offset*2+0, mem_mask) |
(system32_sprite_control_r(space, offset*2+1, mem_mask >> 16) << 16);
}
-WRITE32_HANDLER( multi32_sprite_control_w )
+WRITE32_MEMBER(segas32_state::multi32_sprite_control_w)
{
if (ACCESSING_BITS_0_15)
system32_sprite_control_w(space, offset*2+0, data, mem_mask);
@@ -625,44 +620,40 @@ WRITE32_HANDLER( multi32_sprite_control_w )
*
*************************************/
-READ16_HANDLER( system32_spriteram_r )
+READ16_MEMBER(segas32_state::system32_spriteram_r)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
- return state->m_system32_spriteram[offset];
+ return m_system32_spriteram[offset];
}
-WRITE16_HANDLER( system32_spriteram_w )
+WRITE16_MEMBER(segas32_state::system32_spriteram_w)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
- COMBINE_DATA(&state->m_system32_spriteram[offset]);
- state->m_spriteram_32bit[offset/2] =
- ((state->m_system32_spriteram[offset | 1] >> 8 ) & 0x000000ff) |
- ((state->m_system32_spriteram[offset | 1] << 8 ) & 0x0000ff00) |
- ((state->m_system32_spriteram[offset & ~1] << 8 ) & 0x00ff0000) |
- ((state->m_system32_spriteram[offset & ~1] << 24) & 0xff000000);
+ COMBINE_DATA(&m_system32_spriteram[offset]);
+ m_spriteram_32bit[offset/2] =
+ ((m_system32_spriteram[offset | 1] >> 8 ) & 0x000000ff) |
+ ((m_system32_spriteram[offset | 1] << 8 ) & 0x0000ff00) |
+ ((m_system32_spriteram[offset & ~1] << 8 ) & 0x00ff0000) |
+ ((m_system32_spriteram[offset & ~1] << 24) & 0xff000000);
}
-READ32_HANDLER( multi32_spriteram_r )
+READ32_MEMBER(segas32_state::multi32_spriteram_r)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
- return state->m_system32_spriteram[offset*2+0] |
- (state->m_system32_spriteram[offset*2+1] << 16);
+ return m_system32_spriteram[offset*2+0] |
+ (m_system32_spriteram[offset*2+1] << 16);
}
-WRITE32_HANDLER( multi32_spriteram_w )
+WRITE32_MEMBER(segas32_state::multi32_spriteram_w)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
data = SWAP_HALVES(data);
mem_mask = SWAP_HALVES(mem_mask);
- COMBINE_DATA((UINT32 *)&state->m_system32_spriteram[offset*2]);
- state->m_spriteram_32bit[offset/2] =
- ((state->m_system32_spriteram[offset | 1] >> 8 ) & 0x000000ff) |
- ((state->m_system32_spriteram[offset | 1] << 8 ) & 0x0000ff00) |
- ((state->m_system32_spriteram[offset & ~1] << 8 ) & 0x00ff0000) |
- ((state->m_system32_spriteram[offset & ~1] << 24) & 0xff000000);
+ COMBINE_DATA((UINT32 *)&m_system32_spriteram[offset*2]);
+ m_spriteram_32bit[offset/2] =
+ ((m_system32_spriteram[offset | 1] >> 8 ) & 0x000000ff) |
+ ((m_system32_spriteram[offset | 1] << 8 ) & 0x0000ff00) |
+ ((m_system32_spriteram[offset & ~1] << 8 ) & 0x00ff0000) |
+ ((m_system32_spriteram[offset & ~1] << 24) & 0xff000000);
}
@@ -673,34 +664,30 @@ WRITE32_HANDLER( multi32_spriteram_w )
*
*************************************/
-READ16_HANDLER( system32_mixer_r )
+READ16_MEMBER(segas32_state::system32_mixer_r)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
- return state->m_mixer_control[0][offset];
+ return m_mixer_control[0][offset];
}
-WRITE16_HANDLER( system32_mixer_w )
+WRITE16_MEMBER(segas32_state::system32_mixer_w)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
- COMBINE_DATA(&state->m_mixer_control[0][offset]);
+ COMBINE_DATA(&m_mixer_control[0][offset]);
}
-WRITE32_HANDLER( multi32_mixer_0_w )
+WRITE32_MEMBER(segas32_state::multi32_mixer_0_w)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
data = SWAP_HALVES(data);
mem_mask = SWAP_HALVES(mem_mask);
- COMBINE_DATA((UINT32 *)&state->m_mixer_control[0][offset*2]);
+ COMBINE_DATA((UINT32 *)&m_mixer_control[0][offset*2]);
}
-WRITE32_HANDLER( multi32_mixer_1_w )
+WRITE32_MEMBER(segas32_state::multi32_mixer_1_w)
{
- segas32_state *state = space->machine().driver_data<segas32_state>();
data = SWAP_HALVES(data);
mem_mask = SWAP_HALVES(mem_mask);
- COMBINE_DATA((UINT32 *)&state->m_mixer_control[1][offset*2]);
+ COMBINE_DATA((UINT32 *)&m_mixer_control[1][offset*2]);
}
diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c
index 0f1cb31a46c..571206a226b 100644
--- a/src/mame/video/seibuspi.c
+++ b/src/mame/video/seibuspi.c
@@ -2,26 +2,24 @@
#include "includes/seibuspi.h"
-READ32_HANDLER( spi_layer_bank_r )
+READ32_MEMBER(seibuspi_state::spi_layer_bank_r)
{
- seibuspi_state *state = space->machine().driver_data<seibuspi_state>();
- return state->m_layer_bank;
+ return m_layer_bank;
}
-WRITE32_HANDLER( spi_layer_bank_w )
+WRITE32_MEMBER(seibuspi_state::spi_layer_bank_w)
{
- seibuspi_state *state = space->machine().driver_data<seibuspi_state>();
- COMBINE_DATA( &state->m_layer_bank );
+ COMBINE_DATA( &m_layer_bank );
- if (state->m_layer_bank & 0x80000000) {
- state->m_fore_layer_offset = 0x1000 / 4;
- state->m_mid_layer_offset = 0x2000 / 4;
- state->m_text_layer_offset = 0x3000 / 4;
+ if (m_layer_bank & 0x80000000) {
+ m_fore_layer_offset = 0x1000 / 4;
+ m_mid_layer_offset = 0x2000 / 4;
+ m_text_layer_offset = 0x3000 / 4;
}
else {
- state->m_fore_layer_offset = 0x800 / 4;
- state->m_mid_layer_offset = 0x1000 / 4;
- state->m_text_layer_offset = 0x1800 / 4;
+ m_fore_layer_offset = 0x800 / 4;
+ m_mid_layer_offset = 0x1000 / 4;
+ m_text_layer_offset = 0x1800 / 4;
}
}
@@ -48,84 +46,81 @@ void rf2_set_layer_banks(running_machine &machine, int banks)
}
#ifdef UNUSED_FUNCTION
-READ32_HANDLER( spi_layer_enable_r )
+READ32_MEMBER(seibuspi_state::spi_layer_enable_r)
{
- seibuspi_state *state = space->machine().driver_data<seibuspi_state>();
- return state->m_layer_enable;
+ return m_layer_enable;
}
#endif
-WRITE32_HANDLER( spi_layer_enable_w )
+WRITE32_MEMBER(seibuspi_state::spi_layer_enable_w)
{
- seibuspi_state *state = space->machine().driver_data<seibuspi_state>();
- COMBINE_DATA( &state->m_layer_enable );
- state->m_back_layer->enable((state->m_layer_enable & 0x1) ^ 0x1);
- state->m_mid_layer->enable(((state->m_layer_enable >> 1) & 0x1) ^ 0x1);
- state->m_fore_layer->enable(((state->m_layer_enable >> 2) & 0x1) ^ 0x1);
+ COMBINE_DATA( &m_layer_enable );
+ m_back_layer->enable((m_layer_enable & 0x1) ^ 0x1);
+ m_mid_layer->enable(((m_layer_enable >> 1) & 0x1) ^ 0x1);
+ m_fore_layer->enable(((m_layer_enable >> 2) & 0x1) ^ 0x1);
}
-WRITE32_HANDLER( tilemap_dma_start_w )
+WRITE32_MEMBER(seibuspi_state::tilemap_dma_start_w)
{
- seibuspi_state *state = space->machine().driver_data<seibuspi_state>();
- if (state->m_video_dma_address != 0)
+ if (m_video_dma_address != 0)
{
int i;
- int index = (state->m_video_dma_address / 4) - 0x200;
+ int index = (m_video_dma_address / 4) - 0x200;
- if (state->m_layer_bank & 0x80000000)
+ if (m_layer_bank & 0x80000000)
{
/* back layer */
for (i=0; i < 0x800/4; i++) {
- UINT32 tile = state->m_spimainram[index];
- if (state->m_tilemap_ram[i] != tile) {
- state->m_tilemap_ram[i] = tile;
- state->m_back_layer->mark_tile_dirty((i * 2) );
- state->m_back_layer->mark_tile_dirty((i * 2) + 1 );
+ UINT32 tile = m_spimainram[index];
+ if (m_tilemap_ram[i] != tile) {
+ m_tilemap_ram[i] = tile;
+ m_back_layer->mark_tile_dirty((i * 2) );
+ m_back_layer->mark_tile_dirty((i * 2) + 1 );
}
index++;
}
/* back layer row scroll */
- memcpy(&state->m_tilemap_ram[0x800/4], &state->m_spimainram[index], 0x800/4);
+ memcpy(&m_tilemap_ram[0x800/4], &m_spimainram[index], 0x800/4);
index += 0x800/4;
/* fore layer */
for (i=0; i < 0x800/4; i++) {
- UINT32 tile = state->m_spimainram[index];
- if (state->m_tilemap_ram[i+state->m_fore_layer_offset] != tile) {
- state->m_tilemap_ram[i+state->m_fore_layer_offset] = tile;
- state->m_fore_layer->mark_tile_dirty((i * 2) );
- state->m_fore_layer->mark_tile_dirty((i * 2) + 1 );
+ UINT32 tile = m_spimainram[index];
+ if (m_tilemap_ram[i+m_fore_layer_offset] != tile) {
+ m_tilemap_ram[i+m_fore_layer_offset] = tile;
+ m_fore_layer->mark_tile_dirty((i * 2) );
+ m_fore_layer->mark_tile_dirty((i * 2) + 1 );
}
index++;
}
/* fore layer row scroll */
- memcpy(&state->m_tilemap_ram[0x1800/4], &state->m_spimainram[index], 0x800/4);
+ memcpy(&m_tilemap_ram[0x1800/4], &m_spimainram[index], 0x800/4);
index += 0x800/4;
/* mid layer */
for (i=0; i < 0x800/4; i++) {
- UINT32 tile = state->m_spimainram[index];
- if (state->m_tilemap_ram[i+state->m_mid_layer_offset] != tile) {
- state->m_tilemap_ram[i+state->m_mid_layer_offset] = tile;
- state->m_mid_layer->mark_tile_dirty((i * 2) );
- state->m_mid_layer->mark_tile_dirty((i * 2) + 1 );
+ UINT32 tile = m_spimainram[index];
+ if (m_tilemap_ram[i+m_mid_layer_offset] != tile) {
+ m_tilemap_ram[i+m_mid_layer_offset] = tile;
+ m_mid_layer->mark_tile_dirty((i * 2) );
+ m_mid_layer->mark_tile_dirty((i * 2) + 1 );
}
index++;
}
/* mid layer row scroll */
- memcpy(&state->m_tilemap_ram[0x1800/4], &state->m_spimainram[index], 0x800/4);
+ memcpy(&m_tilemap_ram[0x1800/4], &m_spimainram[index], 0x800/4);
index += 0x800/4;
/* text layer */
for (i=0; i < 0x1000/4; i++) {
- UINT32 tile = state->m_spimainram[index];
- if (state->m_tilemap_ram[i+state->m_text_layer_offset] != tile) {
- state->m_tilemap_ram[i+state->m_text_layer_offset] = tile;
- state->m_text_layer->mark_tile_dirty((i * 2) );
- state->m_text_layer->mark_tile_dirty((i * 2) + 1 );
+ UINT32 tile = m_spimainram[index];
+ if (m_tilemap_ram[i+m_text_layer_offset] != tile) {
+ m_tilemap_ram[i+m_text_layer_offset] = tile;
+ m_text_layer->mark_tile_dirty((i * 2) );
+ m_text_layer->mark_tile_dirty((i * 2) + 1 );
}
index++;
}
@@ -134,44 +129,44 @@ WRITE32_HANDLER( tilemap_dma_start_w )
{
/* back layer */
for (i=0; i < 0x800/4; i++) {
- UINT32 tile = state->m_spimainram[index];
- if (state->m_tilemap_ram[i] != tile) {
- state->m_tilemap_ram[i] = tile;
- state->m_back_layer->mark_tile_dirty((i * 2) );
- state->m_back_layer->mark_tile_dirty((i * 2) + 1 );
+ UINT32 tile = m_spimainram[index];
+ if (m_tilemap_ram[i] != tile) {
+ m_tilemap_ram[i] = tile;
+ m_back_layer->mark_tile_dirty((i * 2) );
+ m_back_layer->mark_tile_dirty((i * 2) + 1 );
}
index++;
}
/* fore layer */
for (i=0; i < 0x800/4; i++) {
- UINT32 tile = state->m_spimainram[index];
- if (state->m_tilemap_ram[i+state->m_fore_layer_offset] != tile) {
- state->m_tilemap_ram[i+state->m_fore_layer_offset] = tile;
- state->m_fore_layer->mark_tile_dirty((i * 2) );
- state->m_fore_layer->mark_tile_dirty((i * 2) + 1 );
+ UINT32 tile = m_spimainram[index];
+ if (m_tilemap_ram[i+m_fore_layer_offset] != tile) {
+ m_tilemap_ram[i+m_fore_layer_offset] = tile;
+ m_fore_layer->mark_tile_dirty((i * 2) );
+ m_fore_layer->mark_tile_dirty((i * 2) + 1 );
}
index++;
}
/* mid layer */
for (i=0; i < 0x800/4; i++) {
- UINT32 tile = state->m_spimainram[index];
- if (state->m_tilemap_ram[i+state->m_mid_layer_offset] != tile) {
- state->m_tilemap_ram[i+state->m_mid_layer_offset] = tile;
- state->m_mid_layer->mark_tile_dirty((i * 2) );
- state->m_mid_layer->mark_tile_dirty((i * 2) + 1 );
+ UINT32 tile = m_spimainram[index];
+ if (m_tilemap_ram[i+m_mid_layer_offset] != tile) {
+ m_tilemap_ram[i+m_mid_layer_offset] = tile;
+ m_mid_layer->mark_tile_dirty((i * 2) );
+ m_mid_layer->mark_tile_dirty((i * 2) + 1 );
}
index++;
}
/* text layer */
for (i=0; i < 0x1000/4; i++) {
- UINT32 tile = state->m_spimainram[index];
- if (state->m_tilemap_ram[i+state->m_text_layer_offset] != tile) {
- state->m_tilemap_ram[i+state->m_text_layer_offset] = tile;
- state->m_text_layer->mark_tile_dirty((i * 2) );
- state->m_text_layer->mark_tile_dirty((i * 2) + 1 );
+ UINT32 tile = m_spimainram[index];
+ if (m_tilemap_ram[i+m_text_layer_offset] != tile) {
+ m_tilemap_ram[i+m_text_layer_offset] = tile;
+ m_text_layer->mark_tile_dirty((i * 2) );
+ m_text_layer->mark_tile_dirty((i * 2) + 1 );
}
index++;
}
@@ -179,43 +174,39 @@ WRITE32_HANDLER( tilemap_dma_start_w )
}
}
-WRITE32_HANDLER( palette_dma_start_w )
+WRITE32_MEMBER(seibuspi_state::palette_dma_start_w)
{
- seibuspi_state *state = space->machine().driver_data<seibuspi_state>();
- if (state->m_video_dma_address != 0)
+ if (m_video_dma_address != 0)
{
int i;
- for (i=0; i < ((state->m_video_dma_length+1) * 2) / 4; i++)
+ for (i=0; i < ((m_video_dma_length+1) * 2) / 4; i++)
{
- UINT32 color = state->m_spimainram[(state->m_video_dma_address / 4) + i - 0x200];
- if (state->m_palette_ram[i] != color) {
- state->m_palette_ram[i] = color;
- palette_set_color_rgb( space->machine(), (i * 2), pal5bit(state->m_palette_ram[i] >> 0), pal5bit(state->m_palette_ram[i] >> 5), pal5bit(state->m_palette_ram[i] >> 10) );
- palette_set_color_rgb( space->machine(), (i * 2) + 1, pal5bit(state->m_palette_ram[i] >> 16), pal5bit(state->m_palette_ram[i] >> 21), pal5bit(state->m_palette_ram[i] >> 26) );
+ UINT32 color = m_spimainram[(m_video_dma_address / 4) + i - 0x200];
+ if (m_palette_ram[i] != color) {
+ m_palette_ram[i] = color;
+ palette_set_color_rgb( machine(), (i * 2), pal5bit(m_palette_ram[i] >> 0), pal5bit(m_palette_ram[i] >> 5), pal5bit(m_palette_ram[i] >> 10) );
+ palette_set_color_rgb( machine(), (i * 2) + 1, pal5bit(m_palette_ram[i] >> 16), pal5bit(m_palette_ram[i] >> 21), pal5bit(m_palette_ram[i] >> 26) );
}
}
}
}
-WRITE32_HANDLER( sprite_dma_start_w )
+WRITE32_MEMBER(seibuspi_state::sprite_dma_start_w)
{
- seibuspi_state *state = space->machine().driver_data<seibuspi_state>();
- if (state->m_video_dma_address != 0)
+ if (m_video_dma_address != 0)
{
- memcpy( state->m_sprite_ram, &state->m_spimainram[(state->m_video_dma_address / 4) - 0x200], state->m_sprite_dma_length);
+ memcpy( m_sprite_ram, &m_spimainram[(m_video_dma_address / 4) - 0x200], m_sprite_dma_length);
}
}
-WRITE32_HANDLER( video_dma_length_w )
+WRITE32_MEMBER(seibuspi_state::video_dma_length_w)
{
- seibuspi_state *state = space->machine().driver_data<seibuspi_state>();
- COMBINE_DATA( &state->m_video_dma_length );
+ COMBINE_DATA( &m_video_dma_length );
}
-WRITE32_HANDLER( video_dma_address_w )
+WRITE32_MEMBER(seibuspi_state::video_dma_address_w)
{
- seibuspi_state *state = space->machine().driver_data<seibuspi_state>();
- COMBINE_DATA( &state->m_video_dma_address );
+ COMBINE_DATA( &m_video_dma_address );
}
static void drawgfx_blend(bitmap_rgb32 &bitmap, const rectangle &cliprect, const gfx_element *gfx, UINT32 code, UINT32 color, int flipx, int flipy, int sx, int sy)
diff --git a/src/mame/video/seicross.c b/src/mame/video/seicross.c
index a8b962cefe8..5057e2bfbb7 100644
--- a/src/mame/video/seicross.c
+++ b/src/mame/video/seicross.c
@@ -53,28 +53,26 @@ PALETTE_INIT( seicross )
}
}
-WRITE8_HANDLER( seicross_videoram_w )
+WRITE8_MEMBER(seicross_state::seicross_videoram_w)
{
- seicross_state *state = space->machine().driver_data<seicross_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( seicross_colorram_w )
+WRITE8_MEMBER(seicross_state::seicross_colorram_w)
{
/* bit 5 of the address is not used for color memory. There is just */
/* 512k of memory; every two consecutive rows share the same memory */
/* region. */
- seicross_state *state = space->machine().driver_data<seicross_state>();
offset &= 0xffdf;
- state->m_colorram[offset] = data;
- state->m_colorram[offset + 0x20] = data;
+ m_colorram[offset] = data;
+ m_colorram[offset + 0x20] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
- state->m_bg_tilemap->mark_tile_dirty(offset + 0x20);
+ m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset + 0x20);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c
index 2f6c52509ff..620eb6edc2b 100644
--- a/src/mame/video/senjyo.c
+++ b/src/mame/video/senjyo.c
@@ -126,47 +126,41 @@ VIDEO_START( senjyo )
***************************************************************************/
-WRITE8_HANDLER( senjyo_fgvideoram_w )
+WRITE8_MEMBER(senjyo_state::senjyo_fgvideoram_w)
{
- senjyo_state *state = space->machine().driver_data<senjyo_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( senjyo_fgcolorram_w )
+WRITE8_MEMBER(senjyo_state::senjyo_fgcolorram_w)
{
- senjyo_state *state = space->machine().driver_data<senjyo_state>();
- state->m_fgcolorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fgcolorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( senjyo_bg1videoram_w )
+WRITE8_MEMBER(senjyo_state::senjyo_bg1videoram_w)
{
- senjyo_state *state = space->machine().driver_data<senjyo_state>();
- state->m_bg1videoram[offset] = data;
- state->m_bg1_tilemap->mark_tile_dirty(offset);
+ m_bg1videoram[offset] = data;
+ m_bg1_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( senjyo_bg2videoram_w )
+WRITE8_MEMBER(senjyo_state::senjyo_bg2videoram_w)
{
- senjyo_state *state = space->machine().driver_data<senjyo_state>();
- state->m_bg2videoram[offset] = data;
- state->m_bg2_tilemap->mark_tile_dirty(offset);
+ m_bg2videoram[offset] = data;
+ m_bg2_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( senjyo_bg3videoram_w )
+WRITE8_MEMBER(senjyo_state::senjyo_bg3videoram_w)
{
- senjyo_state *state = space->machine().driver_data<senjyo_state>();
- state->m_bg3videoram[offset] = data;
- state->m_bg3_tilemap->mark_tile_dirty(offset);
+ m_bg3videoram[offset] = data;
+ m_bg3_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( senjyo_bgstripes_w )
+WRITE8_MEMBER(senjyo_state::senjyo_bgstripes_w)
{
- senjyo_state *state = space->machine().driver_data<senjyo_state>();
- *state->m_bgstripesram = data;
+ *m_bgstripesram = data;
}
/***************************************************************************
diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c
index ba918cf1098..814bfe4ef90 100644
--- a/src/mame/video/seta.c
+++ b/src/mame/video/seta.c
@@ -246,10 +246,9 @@ void seta_coin_lockout_w(running_machine &machine, int data)
}
-WRITE16_HANDLER( seta_vregs_w )
+WRITE16_MEMBER(seta_state::seta_vregs_w)
{
- seta_state *state = space->machine().driver_data<seta_state>();
- COMBINE_DATA(&state->m_vregs[offset]);
+ COMBINE_DATA(&m_vregs[offset]);
switch (offset)
{
case 0/2:
@@ -264,12 +263,12 @@ WRITE16_HANDLER( seta_vregs_w )
---- ---- ---- ---0 Coin #0 Counter */
if (ACCESSING_BITS_0_7)
{
- device_t *x1_010 = space->machine().device("x1snd");
- seta_coin_lockout_w (space->machine(), data & 0x0f);
+ device_t *x1_010 = machine().device("x1snd");
+ seta_coin_lockout_w (machine(), data & 0x0f);
if (x1_010 != NULL)
seta_sound_enable_w (x1_010, data & 0x20);
- coin_counter_w(space->machine(), 0,data & 0x01);
- coin_counter_w(space->machine(), 1,data & 0x02);
+ coin_counter_w(machine(), 0,data & 0x01);
+ coin_counter_w(machine(), 1,data & 0x02);
}
break;
@@ -289,13 +288,13 @@ WRITE16_HANDLER( seta_vregs_w )
new_bank = (data >> 3) & 0x7;
- if (new_bank != state->m_samples_bank)
+ if (new_bank != m_samples_bank)
{
- UINT8 *rom = space->machine().region("x1snd")->base();
- int samples_len = space->machine().region("x1snd")->bytes();
+ UINT8 *rom = machine().region("x1snd")->base();
+ int samples_len = machine().region("x1snd")->bytes();
int addr;
- state->m_samples_bank = new_bank;
+ m_samples_bank = new_bank;
if (samples_len == 0x240000) /* blandia, eightfrc */
{
@@ -305,7 +304,7 @@ WRITE16_HANDLER( seta_vregs_w )
if ( (samples_len > 0x100000) && ((addr+0x40000) <= samples_len) )
memcpy(&rom[0xc0000],&rom[addr],0x40000);
else
- logerror("PC %06X - Invalid samples bank %02X !\n", cpu_get_pc(&space->device()), new_bank);
+ logerror("PC %06X - Invalid samples bank %02X !\n", cpu_get_pc(&space.device()), new_bank);
}
else if (samples_len == 0x480000) /* zombraid */
{
@@ -402,38 +401,35 @@ static TILE_GET_INFO( get_tile_info_2 ) { get_tile_info( machine, tileinfo, tile
static TILE_GET_INFO( get_tile_info_3 ) { get_tile_info( machine, tileinfo, tile_index, 1, 0x1000 ); }
-WRITE16_HANDLER( seta_vram_0_w )
+WRITE16_MEMBER(seta_state::seta_vram_0_w)
{
- seta_state *state = space->machine().driver_data<seta_state>();
- COMBINE_DATA(&state->m_vram_0[offset]);
+ COMBINE_DATA(&m_vram_0[offset]);
if (offset & 0x1000)
- state->m_tilemap_1->mark_tile_dirty(offset & 0x7ff);
+ m_tilemap_1->mark_tile_dirty(offset & 0x7ff);
else
- state->m_tilemap_0->mark_tile_dirty(offset & 0x7ff);
+ m_tilemap_0->mark_tile_dirty(offset & 0x7ff);
}
-WRITE16_HANDLER( seta_vram_2_w )
+WRITE16_MEMBER(seta_state::seta_vram_2_w)
{
- seta_state *state = space->machine().driver_data<seta_state>();
- COMBINE_DATA(&state->m_vram_2[offset]);
+ COMBINE_DATA(&m_vram_2[offset]);
if (offset & 0x1000)
- state->m_tilemap_3->mark_tile_dirty(offset & 0x7ff);
+ m_tilemap_3->mark_tile_dirty(offset & 0x7ff);
else
- state->m_tilemap_2->mark_tile_dirty(offset & 0x7ff);
+ m_tilemap_2->mark_tile_dirty(offset & 0x7ff);
}
-WRITE16_HANDLER( twineagl_tilebank_w )
+WRITE16_MEMBER(seta_state::twineagl_tilebank_w)
{
if (ACCESSING_BITS_0_7)
{
- seta_state *state = space->machine().driver_data<seta_state>();
data &= 0xff;
- if (state->m_twineagl_tilebank[offset] != data)
+ if (m_twineagl_tilebank[offset] != data)
{
- state->m_twineagl_tilebank[offset] = data;
- space->machine().tilemap().mark_all_dirty();
+ m_twineagl_tilebank[offset] = data;
+ machine().tilemap().mark_all_dirty();
}
}
}
diff --git a/src/mame/video/seta2.c b/src/mame/video/seta2.c
index 27914c25eab..12957753ba3 100644
--- a/src/mame/video/seta2.c
+++ b/src/mame/video/seta2.c
@@ -108,7 +108,7 @@
***************************************************************************/
-WRITE16_HANDLER( seta2_vregs_w )
+WRITE16_MEMBER(seta2_state::seta2_vregs_w)
{
/* 02/04 = horizontal display start/end
mj4simai = 0065/01E5 (0180 visible area)
@@ -124,30 +124,29 @@ WRITE16_HANDLER( seta2_vregs_w )
grdians = 019a
*/
- seta2_state *state = space->machine().driver_data<seta2_state>();
- UINT16 olddata = state->m_vregs[offset];
+ UINT16 olddata = m_vregs[offset];
- COMBINE_DATA(&state->m_vregs[offset]);
- if ( state->m_vregs[offset] != olddata )
- logerror("CPU #0 PC %06X: Video Reg %02X <- %04X\n",cpu_get_pc(&space->device()),offset*2,data);
+ COMBINE_DATA(&m_vregs[offset]);
+ if ( m_vregs[offset] != olddata )
+ logerror("CPU #0 PC %06X: Video Reg %02X <- %04X\n",cpu_get_pc(&space.device()),offset*2,data);
switch( offset*2 )
{
case 0x1c: // FLIP SCREEN (myangel) <- this is actually zoom
- flip_screen_set(space->machine(), data & 1 );
- if (data & ~1) logerror("CPU #0 PC %06X: flip screen unknown bits %04X\n",cpu_get_pc(&space->device()),data);
+ flip_screen_set(machine(), data & 1 );
+ if (data & ~1) logerror("CPU #0 PC %06X: flip screen unknown bits %04X\n",cpu_get_pc(&space.device()),data);
break;
case 0x2a: // FLIP X (pzlbowl)
- flip_screen_x_set(space->machine(), data & 1 );
- if (data & ~1) logerror("CPU #0 PC %06X: flipx unknown bits %04X\n",cpu_get_pc(&space->device()),data);
+ flip_screen_x_set(machine(), data & 1 );
+ if (data & ~1) logerror("CPU #0 PC %06X: flipx unknown bits %04X\n",cpu_get_pc(&space.device()),data);
break;
case 0x2c: // FLIP Y (pzlbowl)
- flip_screen_y_set(space->machine(), data & 1 );
- if (data & ~1) logerror("CPU #0 PC %06X: flipy unknown bits %04X\n",cpu_get_pc(&space->device()),data);
+ flip_screen_y_set(machine(), data & 1 );
+ if (data & ~1) logerror("CPU #0 PC %06X: flipy unknown bits %04X\n",cpu_get_pc(&space.device()),data);
break;
case 0x30: // BLANK SCREEN (pzlbowl, myangel)
- if (data & ~1) logerror("CPU #0 PC %06X: blank unknown bits %04X\n",cpu_get_pc(&space->device()),data);
+ if (data & ~1) logerror("CPU #0 PC %06X: blank unknown bits %04X\n",cpu_get_pc(&space.device()),data);
break;
}
}
diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c
index d6af20ed115..d5ffc428de1 100644
--- a/src/mame/video/sf.c
+++ b/src/mame/video/sf.c
@@ -72,28 +72,25 @@ VIDEO_START( sf )
***************************************************************************/
-WRITE16_HANDLER( sf_videoram_w )
+WRITE16_MEMBER(sf_state::sf_videoram_w)
{
- sf_state *state = space->machine().driver_data<sf_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( sf_bg_scroll_w )
+WRITE16_MEMBER(sf_state::sf_bg_scroll_w)
{
- sf_state *state = space->machine().driver_data<sf_state>();
- COMBINE_DATA(&state->m_bgscroll);
- state->m_bg_tilemap->set_scrollx(0, state->m_bgscroll);
+ COMBINE_DATA(&m_bgscroll);
+ m_bg_tilemap->set_scrollx(0, m_bgscroll);
}
-WRITE16_HANDLER( sf_fg_scroll_w )
+WRITE16_MEMBER(sf_state::sf_fg_scroll_w)
{
- sf_state *state = space->machine().driver_data<sf_state>();
- COMBINE_DATA(&state->m_fgscroll);
- state->m_fg_tilemap->set_scrollx(0, state->m_fgscroll);
+ COMBINE_DATA(&m_fgscroll);
+ m_fg_tilemap->set_scrollx(0, m_fgscroll);
}
-WRITE16_HANDLER( sf_gfxctrl_w )
+WRITE16_MEMBER(sf_state::sf_gfxctrl_w)
{
/* b0 = reset, or maybe "set anyway" */
/* b1 = pulsed when control6.b6==0 until it's 1 */
@@ -104,14 +101,13 @@ WRITE16_HANDLER( sf_gfxctrl_w )
/* b6 = active middle plane */
/* b7 = active sprites */
- sf_state *state = space->machine().driver_data<sf_state>();
if (ACCESSING_BITS_0_7)
{
- state->m_sf_active = data & 0xff;
- flip_screen_set(space->machine(), data & 0x04);
- state->m_tx_tilemap->enable(data & 0x08);
- state->m_bg_tilemap->enable(data & 0x20);
- state->m_fg_tilemap->enable(data & 0x40);
+ m_sf_active = data & 0xff;
+ flip_screen_set(machine(), data & 0x04);
+ m_tx_tilemap->enable(data & 0x08);
+ m_bg_tilemap->enable(data & 0x20);
+ m_fg_tilemap->enable(data & 0x40);
}
}
diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c
index 7ccde454a0c..4308bcfb655 100644
--- a/src/mame/video/shadfrce.c
+++ b/src/mame/video/shadfrce.c
@@ -14,12 +14,11 @@ static TILE_GET_INFO( get_shadfrce_fgtile_info )
SET_TILE_INFO(0,tileno,colour*4,0);
}
-WRITE16_HANDLER( shadfrce_fgvideoram_w )
+WRITE16_MEMBER(shadfrce_state::shadfrce_fgvideoram_w)
{
- shadfrce_state *state = space->machine().driver_data<shadfrce_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fgtilemap->mark_tile_dirty(offset/2);
+ m_fgvideoram[offset] = data;
+ m_fgtilemap->mark_tile_dirty(offset/2);
}
static TILE_GET_INFO( get_shadfrce_bg0tile_info )
@@ -37,12 +36,11 @@ static TILE_GET_INFO( get_shadfrce_bg0tile_info )
SET_TILE_INFO(2,tileno,colour,TILE_FLIPYX(fyx));
}
-WRITE16_HANDLER( shadfrce_bg0videoram_w )
+WRITE16_MEMBER(shadfrce_state::shadfrce_bg0videoram_w)
{
- shadfrce_state *state = space->machine().driver_data<shadfrce_state>();
- state->m_bg0videoram[offset] = data;
- state->m_bg0tilemap->mark_tile_dirty(offset/2);
+ m_bg0videoram[offset] = data;
+ m_bg0tilemap->mark_tile_dirty(offset/2);
}
static TILE_GET_INFO( get_shadfrce_bg1tile_info )
@@ -56,12 +54,11 @@ static TILE_GET_INFO( get_shadfrce_bg1tile_info )
SET_TILE_INFO(2,tileno,colour+64,0);
}
-WRITE16_HANDLER( shadfrce_bg1videoram_w )
+WRITE16_MEMBER(shadfrce_state::shadfrce_bg1videoram_w)
{
- shadfrce_state *state = space->machine().driver_data<shadfrce_state>();
- state->m_bg1videoram[offset] = data;
- state->m_bg1tilemap->mark_tile_dirty(offset);
+ m_bg1videoram[offset] = data;
+ m_bg1tilemap->mark_tile_dirty(offset);
}
@@ -82,32 +79,28 @@ VIDEO_START( shadfrce )
state->m_spvideoram_old = auto_alloc_array(machine, UINT16, state->m_spvideoram_size/2);
}
-WRITE16_HANDLER ( shadfrce_bg0scrollx_w )
+WRITE16_MEMBER(shadfrce_state::shadfrce_bg0scrollx_w)
{
- shadfrce_state *state = space->machine().driver_data<shadfrce_state>();
- state->m_bg0tilemap->set_scrollx(0, data & 0x1ff );
+ m_bg0tilemap->set_scrollx(0, data & 0x1ff );
}
-WRITE16_HANDLER ( shadfrce_bg0scrolly_w )
+WRITE16_MEMBER(shadfrce_state::shadfrce_bg0scrolly_w)
{
- shadfrce_state *state = space->machine().driver_data<shadfrce_state>();
- state->m_bg0tilemap->set_scrolly(0, data & 0x1ff );
+ m_bg0tilemap->set_scrolly(0, data & 0x1ff );
}
-WRITE16_HANDLER ( shadfrce_bg1scrollx_w )
+WRITE16_MEMBER(shadfrce_state::shadfrce_bg1scrollx_w)
{
- shadfrce_state *state = space->machine().driver_data<shadfrce_state>();
- state->m_bg1tilemap->set_scrollx(0, data & 0x1ff );
+ m_bg1tilemap->set_scrollx(0, data & 0x1ff );
}
-WRITE16_HANDLER ( shadfrce_bg1scrolly_w )
+WRITE16_MEMBER(shadfrce_state::shadfrce_bg1scrolly_w)
{
- shadfrce_state *state = space->machine().driver_data<shadfrce_state>();
- state->m_bg1tilemap->set_scrolly(0, data & 0x1ff );
+ m_bg1tilemap->set_scrolly(0, data & 0x1ff );
}
diff --git a/src/mame/video/shangha3.c b/src/mame/video/shangha3.c
index 9dfa65947df..a17a3a4074e 100644
--- a/src/mame/video/shangha3.c
+++ b/src/mame/video/shangha3.c
@@ -85,37 +85,35 @@ VIDEO_START( shangha3 )
-WRITE16_HANDLER( shangha3_flipscreen_w )
+WRITE16_MEMBER(shangha3_state::shangha3_flipscreen_w)
{
if (ACCESSING_BITS_0_7)
{
/* bit 7 flips screen, the rest seems to always be set to 0x7e */
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
if ((data & 0x7f) != 0x7e) popmessage("flipscreen_w %02x",data);
}
}
-WRITE16_HANDLER( shangha3_gfxlist_addr_w )
+WRITE16_MEMBER(shangha3_state::shangha3_gfxlist_addr_w)
{
- shangha3_state *state = space->machine().driver_data<shangha3_state>();
- COMBINE_DATA(&state->m_gfxlist_addr);
+ COMBINE_DATA(&m_gfxlist_addr);
}
-WRITE16_HANDLER( shangha3_blitter_go_w )
+WRITE16_MEMBER(shangha3_state::shangha3_blitter_go_w)
{
- shangha3_state *state = space->machine().driver_data<shangha3_state>();
- UINT16 *shangha3_ram = state->m_ram;
- bitmap_ind16 &rawbitmap = state->m_rawbitmap;
- UINT8 *drawmode_table = state->m_drawmode_table;
+ UINT16 *shangha3_ram = m_ram;
+ bitmap_ind16 &rawbitmap = m_rawbitmap;
+ UINT8 *drawmode_table = m_drawmode_table;
int offs;
g_profiler.start(PROFILER_VIDEO);
- for (offs = state->m_gfxlist_addr << 3; offs < state->m_ram_size/2; offs += 16)
+ for (offs = m_gfxlist_addr << 3; offs < m_ram_size/2; offs += 16)
{
int sx,sy,x,y,code,color,flipx,flipy,sizex,sizey,zoomx,zoomy;
@@ -133,7 +131,7 @@ WRITE16_HANDLER( shangha3_blitter_go_w )
zoomx = shangha3_ram[offs+10];
zoomy = shangha3_ram[offs+13];
- if (flip_screen_get(space->machine()))
+ if (flip_screen_get(machine()))
{
sx = 383 - sx - sizex;
sy = 255 - sy - sizey;
@@ -209,7 +207,7 @@ WRITE16_HANDLER( shangha3_blitter_go_w )
if (flipy) dy = sy + sizey-15 - dy;
else dy = sy + dy;
- drawgfx_transpen(rawbitmap,myclip,space->machine().gfx[0],
+ drawgfx_transpen(rawbitmap,myclip,machine().gfx[0],
(tile & 0x0fff) | (code & 0xf000),
(tile >> 12) | (color & 0x70),
flipx,flipy,
@@ -222,26 +220,26 @@ WRITE16_HANDLER( shangha3_blitter_go_w )
int w;
if (zoomx <= 1 && zoomy <= 1)
- drawgfxzoom_transtable(rawbitmap,myclip,space->machine().gfx[0],
+ drawgfxzoom_transtable(rawbitmap,myclip,machine().gfx[0],
code,
color,
flipx,flipy,
sx,sy,
0x1000000,0x1000000,
- drawmode_table,space->machine().shadow_table);
+ drawmode_table,machine().shadow_table);
else
{
w = (sizex+15)/16;
for (x = 0;x < w;x++)
{
- drawgfxzoom_transtable(rawbitmap,myclip,space->machine().gfx[0],
+ drawgfxzoom_transtable(rawbitmap,myclip,machine().gfx[0],
code,
color,
flipx,flipy,
sx + 16*x,sy,
(0x200-zoomx)*0x100,(0x200-zoomy)*0x100,
- drawmode_table,space->machine().shadow_table);
+ drawmode_table,machine().shadow_table);
if ((code & 0x000f) == 0x0f)
code = (code + 0x100) & 0xfff0;
diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c
index f05b919511f..a4d507a0703 100644
--- a/src/mame/video/shangkid.c
+++ b/src/mame/video/shangkid.c
@@ -52,12 +52,11 @@ VIDEO_START( shangkid )
state->m_background = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,64,32);
}
-WRITE8_HANDLER( shangkid_videoram_w )
+WRITE8_MEMBER(shangkid_state::shangkid_videoram_w)
{
- shangkid_state *state = space->machine().driver_data<shangkid_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_background->mark_tile_dirty(offset&0x7ff );
+ m_background->mark_tile_dirty(offset&0x7ff );
}
static void draw_sprite(running_machine &machine, const UINT8 *source, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c
index 798c5a724a4..f5720fe5ec2 100644
--- a/src/mame/video/shaolins.c
+++ b/src/mame/video/shaolins.c
@@ -88,52 +88,47 @@ PALETTE_INIT( shaolins )
}
}
-WRITE8_HANDLER( shaolins_videoram_w )
+WRITE8_MEMBER(shaolins_state::shaolins_videoram_w)
{
- shaolins_state *state = space->machine().driver_data<shaolins_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( shaolins_colorram_w )
+WRITE8_MEMBER(shaolins_state::shaolins_colorram_w)
{
- shaolins_state *state = space->machine().driver_data<shaolins_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( shaolins_palettebank_w )
+WRITE8_MEMBER(shaolins_state::shaolins_palettebank_w)
{
- shaolins_state *state = space->machine().driver_data<shaolins_state>();
- if (state->m_palettebank != (data & 0x07))
+ if (m_palettebank != (data & 0x07))
{
- state->m_palettebank = data & 0x07;
- space->machine().tilemap().mark_all_dirty();
+ m_palettebank = data & 0x07;
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( shaolins_scroll_w )
+WRITE8_MEMBER(shaolins_state::shaolins_scroll_w)
{
- shaolins_state *state = space->machine().driver_data<shaolins_state>();
int col;
for (col = 4; col < 32; col++)
- state->m_bg_tilemap->set_scrolly(col, data + 1);
+ m_bg_tilemap->set_scrolly(col, data + 1);
}
-WRITE8_HANDLER( shaolins_nmi_w )
+WRITE8_MEMBER(shaolins_state::shaolins_nmi_w)
{
- shaolins_state *state = space->machine().driver_data<shaolins_state>();
- state->m_nmi_enable = data;
+ m_nmi_enable = data;
- if (flip_screen_get(space->machine()) != (data & 0x01))
+ if (flip_screen_get(machine()) != (data & 0x01))
{
- flip_screen_set(space->machine(), data & 0x01);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x01);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c
index b7f363081f6..50e9e64e167 100644
--- a/src/mame/video/shisen.c
+++ b/src/mame/video/shisen.c
@@ -1,47 +1,44 @@
#include "emu.h"
#include "includes/shisen.h"
-WRITE8_HANDLER( sichuan2_videoram_w )
+WRITE8_MEMBER(shisen_state::sichuan2_videoram_w)
{
- shisen_state *state = space->machine().driver_data<shisen_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( sichuan2_bankswitch_w )
+WRITE8_MEMBER(shisen_state::sichuan2_bankswitch_w)
{
- shisen_state *state = space->machine().driver_data<shisen_state>();
int bankaddress;
int bank;
- UINT8 *RAM = space->machine().region("maincpu")->base();
+ UINT8 *RAM = machine().region("maincpu")->base();
if (data & 0xc0) logerror("bank switch %02x\n",data);
/* bits 0-2 select ROM bank */
bankaddress = 0x10000 + (data & 0x07) * 0x4000;
- memory_set_bankptr(space->machine(), "bank1", &RAM[bankaddress]);
+ memory_set_bankptr(machine(), "bank1", &RAM[bankaddress]);
/* bits 3-5 select gfx bank */
bank = (data & 0x38) >> 3;
- if (state->m_gfxbank != bank)
+ if (m_gfxbank != bank)
{
- state->m_gfxbank = bank;
- space->machine().tilemap().mark_all_dirty();
+ m_gfxbank = bank;
+ machine().tilemap().mark_all_dirty();
}
/* bits 6-7 unknown */
}
-WRITE8_HANDLER( sichuan2_paletteram_w )
+WRITE8_MEMBER(shisen_state::sichuan2_paletteram_w)
{
- shisen_state *state = space->machine().driver_data<shisen_state>();
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
offset &= 0xff;
- palette_set_color_rgb(space->machine(), offset, pal5bit(state->m_paletteram[offset + 0x000]), pal5bit(state->m_paletteram[offset + 0x100]), pal5bit(state->m_paletteram[offset + 0x200]));
+ palette_set_color_rgb(machine(), offset, pal5bit(m_paletteram[offset + 0x000]), pal5bit(m_paletteram[offset + 0x100]), pal5bit(m_paletteram[offset + 0x200]));
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c
index bab7a7f7e9f..9bc9c0a9e46 100644
--- a/src/mame/video/shootout.c
+++ b/src/mame/video/shootout.c
@@ -66,20 +66,18 @@ static TILE_GET_INFO( get_fg_tile_info )
0);
}
-WRITE8_HANDLER( shootout_videoram_w )
+WRITE8_MEMBER(shootout_state::shootout_videoram_w)
{
- shootout_state *state = space->machine().driver_data<shootout_state>();
- state->m_videoram[offset] = data;
- state->m_background->mark_tile_dirty(offset&0x3ff );
+ m_videoram[offset] = data;
+ m_background->mark_tile_dirty(offset&0x3ff );
}
-WRITE8_HANDLER( shootout_textram_w )
+WRITE8_MEMBER(shootout_state::shootout_textram_w)
{
- shootout_state *state = space->machine().driver_data<shootout_state>();
- state->m_textram[offset] = data;
- state->m_foreground->mark_tile_dirty(offset&0x3ff );
+ m_textram[offset] = data;
+ m_foreground->mark_tile_dirty(offset&0x3ff );
}
VIDEO_START( shootout )
diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c
index da39e4c2572..8d86f22c3e2 100644
--- a/src/mame/video/sidearms.c
+++ b/src/mame/video/sidearms.c
@@ -9,93 +9,87 @@
#include "emu.h"
#include "includes/sidearms.h"
-WRITE8_HANDLER( sidearms_videoram_w )
+WRITE8_MEMBER(sidearms_state::sidearms_videoram_w)
{
- sidearms_state *state = space->machine().driver_data<sidearms_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( sidearms_colorram_w )
+WRITE8_MEMBER(sidearms_state::sidearms_colorram_w)
{
- sidearms_state *state = space->machine().driver_data<sidearms_state>();
- state->m_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( sidearms_c804_w )
+WRITE8_MEMBER(sidearms_state::sidearms_c804_w)
{
- sidearms_state *state = space->machine().driver_data<sidearms_state>();
/* bits 0 and 1 are coin counters */
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02);
/* bit 2 and 3 lock the coin chutes */
- if (!state->m_gameid || state->m_gameid==3)
+ if (!m_gameid || m_gameid==3)
{
- coin_lockout_w(space->machine(), 0, !(data & 0x04));
- coin_lockout_w(space->machine(), 1, !(data & 0x08));
+ coin_lockout_w(machine(), 0, !(data & 0x04));
+ coin_lockout_w(machine(), 1, !(data & 0x08));
}
else
{
- coin_lockout_w(space->machine(), 0, data & 0x04);
- coin_lockout_w(space->machine(), 1, data & 0x08);
+ coin_lockout_w(machine(), 0, data & 0x04);
+ coin_lockout_w(machine(), 1, data & 0x08);
}
/* bit 4 resets the sound CPU */
if (data & 0x10)
{
- cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_RESET, PULSE_LINE);
+ cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_RESET, PULSE_LINE);
}
/* bit 5 enables starfield */
- if (state->m_staron != (data & 0x20))
+ if (m_staron != (data & 0x20))
{
- state->m_staron = data & 0x20;
- state->m_hflop_74a_n = 1;
- state->m_hcount_191 = state->m_vcount_191 = 0;
+ m_staron = data & 0x20;
+ m_hflop_74a_n = 1;
+ m_hcount_191 = m_vcount_191 = 0;
}
/* bit 6 enables char layer */
- state->m_charon = data & 0x40;
+ m_charon = data & 0x40;
/* bit 7 flips screen */
- if (state->m_flipon != (data & 0x80))
+ if (m_flipon != (data & 0x80))
{
- state->m_flipon = data & 0x80;
- flip_screen_set(space->machine(), state->m_flipon);
- space->machine().tilemap().mark_all_dirty();
+ m_flipon = data & 0x80;
+ flip_screen_set(machine(), m_flipon);
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( sidearms_gfxctrl_w )
+WRITE8_MEMBER(sidearms_state::sidearms_gfxctrl_w)
{
- sidearms_state *state = space->machine().driver_data<sidearms_state>();
- state->m_objon = data & 0x01;
- state->m_bgon = data & 0x02;
+ m_objon = data & 0x01;
+ m_bgon = data & 0x02;
}
-WRITE8_HANDLER( sidearms_star_scrollx_w )
+WRITE8_MEMBER(sidearms_state::sidearms_star_scrollx_w)
{
- sidearms_state *state = space->machine().driver_data<sidearms_state>();
- UINT32 last_state = state->m_hcount_191;
+ UINT32 last_state = m_hcount_191;
- state->m_hcount_191++;
- state->m_hcount_191 &= 0x1ff;
+ m_hcount_191++;
+ m_hcount_191 &= 0x1ff;
// invert 74LS74A(flipflop) output on 74LS191(hscan counter) carry's rising edge
- if (state->m_hcount_191 & ~last_state & 0x100)
- state->m_hflop_74a_n ^= 1;
+ if (m_hcount_191 & ~last_state & 0x100)
+ m_hflop_74a_n ^= 1;
}
-WRITE8_HANDLER( sidearms_star_scrolly_w )
+WRITE8_MEMBER(sidearms_state::sidearms_star_scrolly_w)
{
- sidearms_state *state = space->machine().driver_data<sidearms_state>();
- state->m_vcount_191++;
- state->m_vcount_191 &= 0xff;
+ m_vcount_191++;
+ m_vcount_191 &= 0xff;
}
diff --git a/src/mame/video/sidepckt.c b/src/mame/video/sidepckt.c
index 93fb49216dc..4ba0dec5c6e 100644
--- a/src/mame/video/sidepckt.c
+++ b/src/mame/video/sidepckt.c
@@ -80,24 +80,22 @@ VIDEO_START( sidepckt )
***************************************************************************/
-WRITE8_HANDLER( sidepckt_videoram_w )
+WRITE8_MEMBER(sidepckt_state::sidepckt_videoram_w)
{
- sidepckt_state *state = space->machine().driver_data<sidepckt_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( sidepckt_colorram_w )
+WRITE8_MEMBER(sidepckt_state::sidepckt_colorram_w)
{
- sidepckt_state *state = space->machine().driver_data<sidepckt_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( sidepckt_flipscreen_w )
+WRITE8_MEMBER(sidepckt_state::sidepckt_flipscreen_w)
{
int flipscreen = data;
- space->machine().tilemap().set_flip_all(flipscreen ? TILEMAP_FLIPY : TILEMAP_FLIPX);
+ machine().tilemap().set_flip_all(flipscreen ? TILEMAP_FLIPY : TILEMAP_FLIPX);
}
diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c
index 2ff3b3d5341..e1fcb1933da 100644
--- a/src/mame/video/silkroad.c
+++ b/src/mame/video/silkroad.c
@@ -73,12 +73,11 @@ static TILE_GET_INFO( get_fg_tile_info )
-WRITE32_HANDLER( silkroad_fgram_w )
+WRITE32_MEMBER(silkroad_state::silkroad_fgram_w)
{
- silkroad_state *state = space->machine().driver_data<silkroad_state>();
- COMBINE_DATA(&state->m_vidram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_vidram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_fg2_tile_info )
@@ -97,12 +96,11 @@ static TILE_GET_INFO( get_fg2_tile_info )
-WRITE32_HANDLER( silkroad_fgram2_w )
+WRITE32_MEMBER(silkroad_state::silkroad_fgram2_w)
{
- silkroad_state *state = space->machine().driver_data<silkroad_state>();
- COMBINE_DATA(&state->m_vidram2[offset]);
- state->m_fg2_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_vidram2[offset]);
+ m_fg2_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_fg3_tile_info )
@@ -121,12 +119,11 @@ static TILE_GET_INFO( get_fg3_tile_info )
-WRITE32_HANDLER( silkroad_fgram3_w )
+WRITE32_MEMBER(silkroad_state::silkroad_fgram3_w)
{
- silkroad_state *state = space->machine().driver_data<silkroad_state>();
- COMBINE_DATA(&state->m_vidram3[offset]);
- state->m_fg3_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_vidram3[offset]);
+ m_fg3_tilemap->mark_tile_dirty(offset);
}
VIDEO_START(silkroad)
diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c
index 81d4f6575d4..e64222f9d9b 100644
--- a/src/mame/video/simpsons.c
+++ b/src/mame/video/simpsons.c
@@ -46,21 +46,18 @@ void simpsons_sprite_callback( running_machine &machine, int *code, int *color,
***************************************************************************/
-static READ8_HANDLER( simpsons_k052109_r )
+READ8_MEMBER(simpsons_state::simpsons_k052109_r)
{
- simpsons_state *state = space->machine().driver_data<simpsons_state>();
- return k052109_r(state->m_k052109, offset + 0x2000);
+ return k052109_r(m_k052109, offset + 0x2000);
}
-static WRITE8_HANDLER( simpsons_k052109_w )
+WRITE8_MEMBER(simpsons_state::simpsons_k052109_w)
{
- simpsons_state *state = space->machine().driver_data<simpsons_state>();
- k052109_w(state->m_k052109, offset + 0x2000, data);
+ k052109_w(m_k052109, offset + 0x2000, data);
}
-static READ8_HANDLER( simpsons_k053247_r )
+READ8_MEMBER(simpsons_state::simpsons_k053247_r)
{
- simpsons_state *state = space->machine().driver_data<simpsons_state>();
int offs;
if (offset < 0x1000)
@@ -68,22 +65,21 @@ static READ8_HANDLER( simpsons_k053247_r )
offs = offset >> 1;
if (offset & 1)
- return(state->m_spriteram[offs] & 0xff);
+ return(m_spriteram[offs] & 0xff);
else
- return(state->m_spriteram[offs] >> 8);
+ return(m_spriteram[offs] >> 8);
}
else
- return state->m_xtraram[offset - 0x1000];
+ return m_xtraram[offset - 0x1000];
}
-static WRITE8_HANDLER( simpsons_k053247_w )
+WRITE8_MEMBER(simpsons_state::simpsons_k053247_w)
{
- simpsons_state *state = space->machine().driver_data<simpsons_state>();
int offs;
if (offset < 0x1000)
{
- UINT16 *spriteram = state->m_spriteram;
+ UINT16 *spriteram = m_spriteram;
offs = offset >> 1;
if (offset & 1)
@@ -91,7 +87,7 @@ static WRITE8_HANDLER( simpsons_k053247_w )
else
spriteram[offs] = (spriteram[offs] & 0x00ff) | (data << 8);
}
- else state->m_xtraram[offset - 0x1000] = data;
+ else m_xtraram[offset - 0x1000] = data;
}
void simpsons_video_banking( running_machine &machine, int bank )
@@ -109,9 +105,9 @@ void simpsons_video_banking( running_machine &machine, int bank )
space->install_legacy_readwrite_handler(*state->m_k052109, 0x0000, 0x0fff, FUNC(k052109_r), FUNC(k052109_w));
if (bank & 2)
- space->install_legacy_readwrite_handler(0x2000, 0x3fff, FUNC(simpsons_k053247_r), FUNC(simpsons_k053247_w));
+ space->install_readwrite_handler(0x2000, 0x3fff, read8_delegate(FUNC(simpsons_state::simpsons_k053247_r),state), write8_delegate(FUNC(simpsons_state::simpsons_k053247_w),state));
else
- space->install_legacy_readwrite_handler(0x2000, 0x3fff, FUNC(simpsons_k052109_r), FUNC(simpsons_k052109_w));
+ space->install_readwrite_handler(0x2000, 0x3fff, read8_delegate(FUNC(simpsons_state::simpsons_k052109_r),state), write8_delegate(FUNC(simpsons_state::simpsons_k052109_w),state));
}
diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c
index a8db94976ec..0ec72e4b066 100644
--- a/src/mame/video/skydiver.c
+++ b/src/mame/video/skydiver.c
@@ -11,21 +11,22 @@
MACHINE_RESET( skydiver )
{
+ skydiver_state *state = machine.driver_data<skydiver_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* reset all latches */
- skydiver_start_lamp_1_w(space, 0, 0);
- skydiver_start_lamp_2_w(space, 0, 0);
- skydiver_lamp_s_w(space, 0, 0);
- skydiver_lamp_k_w(space, 0, 0);
- skydiver_lamp_y_w(space, 0, 0);
- skydiver_lamp_d_w(space, 0, 0);
+ state->skydiver_start_lamp_1_w(*space, 0, 0);
+ state->skydiver_start_lamp_2_w(*space, 0, 0);
+ state->skydiver_lamp_s_w(*space, 0, 0);
+ state->skydiver_lamp_k_w(*space, 0, 0);
+ state->skydiver_lamp_y_w(*space, 0, 0);
+ state->skydiver_lamp_d_w(*space, 0, 0);
output_set_value("lampi", 0);
output_set_value("lampv", 0);
output_set_value("lampe", 0);
output_set_value("lampr", 0);
- skydiver_width_w(space, 0, 0);
- skydiver_coin_lockout_w(space, 0, 0);
+ state->skydiver_width_w(*space, 0, 0);
+ state->skydiver_coin_lockout_w(*space, 0, 0);
}
@@ -63,78 +64,73 @@ VIDEO_START( skydiver )
*
*************************************/
-WRITE8_HANDLER( skydiver_videoram_w )
+WRITE8_MEMBER(skydiver_state::skydiver_videoram_w)
{
- skydiver_state *state = space->machine().driver_data<skydiver_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-READ8_HANDLER( skydiver_wram_r )
+READ8_MEMBER(skydiver_state::skydiver_wram_r)
{
- skydiver_state *state = space->machine().driver_data<skydiver_state>();
- return state->m_videoram[offset | 0x380];
+ return m_videoram[offset | 0x380];
}
-WRITE8_HANDLER( skydiver_wram_w )
+WRITE8_MEMBER(skydiver_state::skydiver_wram_w)
{
- skydiver_state *state = space->machine().driver_data<skydiver_state>();
- state->m_videoram[offset | 0x0380] = data;
+ m_videoram[offset | 0x0380] = data;
}
-WRITE8_HANDLER( skydiver_width_w )
+WRITE8_MEMBER(skydiver_state::skydiver_width_w)
{
- skydiver_state *state = space->machine().driver_data<skydiver_state>();
- state->m_width = offset;
+ m_width = offset;
}
-WRITE8_HANDLER( skydiver_coin_lockout_w )
+WRITE8_MEMBER(skydiver_state::skydiver_coin_lockout_w)
{
- coin_lockout_global_w(space->machine(), !offset);
+ coin_lockout_global_w(machine(), !offset);
}
-WRITE8_HANDLER( skydiver_start_lamp_1_w )
+WRITE8_MEMBER(skydiver_state::skydiver_start_lamp_1_w)
{
- set_led_status(space->machine(), 0, offset);
+ set_led_status(machine(), 0, offset);
}
-WRITE8_HANDLER( skydiver_start_lamp_2_w )
+WRITE8_MEMBER(skydiver_state::skydiver_start_lamp_2_w)
{
- set_led_status(space->machine(), 1, offset);
+ set_led_status(machine(), 1, offset);
}
-WRITE8_HANDLER( skydiver_lamp_s_w )
+WRITE8_MEMBER(skydiver_state::skydiver_lamp_s_w)
{
output_set_value("lamps", offset);
}
-WRITE8_HANDLER( skydiver_lamp_k_w )
+WRITE8_MEMBER(skydiver_state::skydiver_lamp_k_w)
{
output_set_value("lampk", offset);
}
-WRITE8_HANDLER( skydiver_lamp_y_w )
+WRITE8_MEMBER(skydiver_state::skydiver_lamp_y_w)
{
output_set_value("lampy", offset);
}
-WRITE8_HANDLER( skydiver_lamp_d_w )
+WRITE8_MEMBER(skydiver_state::skydiver_lamp_d_w)
{
output_set_value("lampd", offset);
}
-WRITE8_HANDLER( skydiver_2000_201F_w )
+WRITE8_MEMBER(skydiver_state::skydiver_2000_201F_w)
{
- skydiver_state *state = space->machine().driver_data<skydiver_state>();
- device_t *discrete = space->machine().device("discrete");
+ device_t *discrete = machine().device("discrete");
int bit = offset & 0x01;
- state->watchdog_reset_w(*space,0,0);
+ watchdog_reset_w(space,0,0);
switch (offset & 0x0e)
{
diff --git a/src/mame/video/skyfox.c b/src/mame/video/skyfox.c
index 443ea0ec37a..3ddcc223ad8 100644
--- a/src/mame/video/skyfox.c
+++ b/src/mame/video/skyfox.c
@@ -46,23 +46,21 @@
***************************************************************************/
#ifdef UNUSED_FUNCTION
-READ8_HANDLER( skyfox_vregs_r ) // for debug
+READ8_MEMBER(skyfox_state::skyfox_vregs_r)// for debug
{
- skyfox_state *state = space->machine().driver_data<skyfox_state>();
- return state->m_vreg[offset];
+ return m_vreg[offset];
}
#endif
-WRITE8_HANDLER( skyfox_vregs_w )
+WRITE8_MEMBER(skyfox_state::skyfox_vregs_w)
{
- skyfox_state *state = space->machine().driver_data<skyfox_state>();
- state->m_vreg[offset] = data;
+ m_vreg[offset] = data;
switch (offset)
{
- case 0: state->m_bg_ctrl = data; break;
- case 1: state->soundlatch_w(*space, 0, data); break;
+ case 0: m_bg_ctrl = data; break;
+ case 1: soundlatch_w(space, 0, data); break;
case 2: break;
case 3: break;
case 4: break;
diff --git a/src/mame/video/skykid.c b/src/mame/video/skykid.c
index 2821c9b702c..79933a8f91d 100644
--- a/src/mame/video/skykid.c
+++ b/src/mame/video/skykid.c
@@ -131,49 +131,42 @@ VIDEO_START( skykid )
***************************************************************************/
-READ8_HANDLER( skykid_videoram_r )
+READ8_MEMBER(skykid_state::skykid_videoram_r)
{
- skykid_state *state = space->machine().driver_data<skykid_state>();
- return state->m_videoram[offset];
+ return m_videoram[offset];
}
-WRITE8_HANDLER( skykid_videoram_w )
+WRITE8_MEMBER(skykid_state::skykid_videoram_w)
{
- skykid_state *state = space->machine().driver_data<skykid_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-READ8_HANDLER( skykid_textram_r )
+READ8_MEMBER(skykid_state::skykid_textram_r)
{
- skykid_state *state = space->machine().driver_data<skykid_state>();
- return state->m_textram[offset];
+ return m_textram[offset];
}
-WRITE8_HANDLER( skykid_textram_w )
+WRITE8_MEMBER(skykid_state::skykid_textram_w)
{
- skykid_state *state = space->machine().driver_data<skykid_state>();
- state->m_textram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_textram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( skykid_scroll_x_w )
+WRITE8_MEMBER(skykid_state::skykid_scroll_x_w)
{
- skykid_state *state = space->machine().driver_data<skykid_state>();
- state->m_scroll_x = offset;
+ m_scroll_x = offset;
}
-WRITE8_HANDLER( skykid_scroll_y_w )
+WRITE8_MEMBER(skykid_state::skykid_scroll_y_w)
{
- skykid_state *state = space->machine().driver_data<skykid_state>();
- state->m_scroll_y = offset;
+ m_scroll_y = offset;
}
-WRITE8_HANDLER( skykid_flipscreen_priority_w )
+WRITE8_MEMBER(skykid_state::skykid_flipscreen_priority_w)
{
- skykid_state *state = space->machine().driver_data<skykid_state>();
- state->m_priority = data;
- flip_screen_set(space->machine(), offset & 1);
+ m_priority = data;
+ flip_screen_set(machine(), offset & 1);
}
diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c
index 9cd3c9c03e9..f7c3dad3d49 100644
--- a/src/mame/video/slapfght.c
+++ b/src/mame/video/slapfght.c
@@ -91,46 +91,40 @@ VIDEO_START( slapfight )
***************************************************************************/
-WRITE8_HANDLER( slapfight_videoram_w )
+WRITE8_MEMBER(slapfght_state::slapfight_videoram_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_slapfight_videoram[offset]=data;
- state->m_pf1_tilemap->mark_tile_dirty(offset);
+ m_slapfight_videoram[offset]=data;
+ m_pf1_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( slapfight_colorram_w )
+WRITE8_MEMBER(slapfght_state::slapfight_colorram_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_slapfight_colorram[offset]=data;
- state->m_pf1_tilemap->mark_tile_dirty(offset);
+ m_slapfight_colorram[offset]=data;
+ m_pf1_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( slapfight_fixram_w )
+WRITE8_MEMBER(slapfght_state::slapfight_fixram_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_slapfight_fixvideoram[offset]=data;
- state->m_fix_tilemap->mark_tile_dirty(offset);
+ m_slapfight_fixvideoram[offset]=data;
+ m_fix_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( slapfight_fixcol_w )
+WRITE8_MEMBER(slapfght_state::slapfight_fixcol_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_slapfight_fixcolorram[offset]=data;
- state->m_fix_tilemap->mark_tile_dirty(offset);
+ m_slapfight_fixcolorram[offset]=data;
+ m_fix_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( slapfight_flipscreen_w )
+WRITE8_MEMBER(slapfght_state::slapfight_flipscreen_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
logerror("Writing %02x to flipscreen\n",offset);
- if (offset==0) state->m_flipscreen=1; /* Port 0x2 is flipscreen */
- else state->m_flipscreen=0; /* Port 0x3 is normal */
+ if (offset==0) m_flipscreen=1; /* Port 0x2 is flipscreen */
+ else m_flipscreen=0; /* Port 0x3 is normal */
}
-WRITE8_HANDLER( slapfight_palette_bank_w )
+WRITE8_MEMBER(slapfght_state::slapfight_palette_bank_w)
{
- slapfght_state *state = space->machine().driver_data<slapfght_state>();
- state->m_slapfight_palette_bank = offset;
+ m_slapfight_palette_bank = offset;
}
static void slapfght_log_vram(running_machine &machine)
diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c
index 139cef0743f..8fb7af976c0 100644
--- a/src/mame/video/snk.c
+++ b/src/mame/video/snk.c
@@ -396,173 +396,154 @@ VIDEO_START( tdfever )
/**************************************************************************************/
-WRITE8_HANDLER( snk_tx_videoram_w )
+WRITE8_MEMBER(snk_state::snk_tx_videoram_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_tx_videoram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ m_tx_videoram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( marvins_fg_videoram_w )
+WRITE8_MEMBER(snk_state::marvins_fg_videoram_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_fg_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( marvins_bg_videoram_w )
+WRITE8_MEMBER(snk_state::marvins_bg_videoram_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( snk_bg_videoram_w )
+WRITE8_MEMBER(snk_state::snk_bg_videoram_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset >> 1);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset >> 1);
}
-WRITE8_HANDLER( snk_fg_scrollx_w )
+WRITE8_MEMBER(snk_state::snk_fg_scrollx_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_fg_scrollx = (state->m_fg_scrollx & ~0xff) | data;
+ m_fg_scrollx = (m_fg_scrollx & ~0xff) | data;
}
-WRITE8_HANDLER( snk_fg_scrolly_w )
+WRITE8_MEMBER(snk_state::snk_fg_scrolly_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_fg_scrolly = (state->m_fg_scrolly & ~0xff) | data;
+ m_fg_scrolly = (m_fg_scrolly & ~0xff) | data;
}
-WRITE8_HANDLER( snk_bg_scrollx_w )
+WRITE8_MEMBER(snk_state::snk_bg_scrollx_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_bg_scrollx = (state->m_bg_scrollx & ~0xff) | data;
+ m_bg_scrollx = (m_bg_scrollx & ~0xff) | data;
}
-WRITE8_HANDLER( snk_bg_scrolly_w )
+WRITE8_MEMBER(snk_state::snk_bg_scrolly_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_bg_scrolly = (state->m_bg_scrolly & ~0xff) | data;
+ m_bg_scrolly = (m_bg_scrolly & ~0xff) | data;
}
-WRITE8_HANDLER( snk_sp16_scrollx_w )
+WRITE8_MEMBER(snk_state::snk_sp16_scrollx_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_sp16_scrollx = (state->m_sp16_scrollx & ~0xff) | data;
+ m_sp16_scrollx = (m_sp16_scrollx & ~0xff) | data;
}
-WRITE8_HANDLER( snk_sp16_scrolly_w )
+WRITE8_MEMBER(snk_state::snk_sp16_scrolly_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_sp16_scrolly = (state->m_sp16_scrolly & ~0xff) | data;
+ m_sp16_scrolly = (m_sp16_scrolly & ~0xff) | data;
}
-WRITE8_HANDLER( snk_sp32_scrollx_w )
+WRITE8_MEMBER(snk_state::snk_sp32_scrollx_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_sp32_scrollx = (state->m_sp32_scrollx & ~0xff) | data;
+ m_sp32_scrollx = (m_sp32_scrollx & ~0xff) | data;
}
-WRITE8_HANDLER( snk_sp32_scrolly_w )
+WRITE8_MEMBER(snk_state::snk_sp32_scrolly_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_sp32_scrolly = (state->m_sp32_scrolly & ~0xff) | data;
+ m_sp32_scrolly = (m_sp32_scrolly & ~0xff) | data;
}
-WRITE8_HANDLER( snk_sprite_split_point_w )
+WRITE8_MEMBER(snk_state::snk_sprite_split_point_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_sprite_split_point = data;
+ m_sprite_split_point = data;
}
-WRITE8_HANDLER( marvins_palette_bank_w )
+WRITE8_MEMBER(snk_state::marvins_palette_bank_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_bg_tilemap->set_palette_offset(data & 0x70);
- state->m_fg_tilemap->set_palette_offset((data & 0x07) << 4);
+ m_bg_tilemap->set_palette_offset(data & 0x70);
+ m_fg_tilemap->set_palette_offset((data & 0x07) << 4);
}
-WRITE8_HANDLER( marvins_flipscreen_w )
+WRITE8_MEMBER(snk_state::marvins_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
// other bits unknown
}
-WRITE8_HANDLER( sgladiat_flipscreen_w )
+WRITE8_MEMBER(snk_state::sgladiat_flipscreen_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
- state->m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4);
+ m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4);
// other bits unknown
}
-WRITE8_HANDLER( hal21_flipscreen_w )
+WRITE8_MEMBER(snk_state::hal21_flipscreen_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
- state->m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4);
- if (state->m_bg_tile_offset != ((data & 0x20) << 3))
+ m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4);
+ if (m_bg_tile_offset != ((data & 0x20) << 3))
{
- state->m_bg_tile_offset = (data & 0x20) << 3;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_tile_offset = (data & 0x20) << 3;
+ m_bg_tilemap->mark_all_dirty();
}
// other bits unknown
}
-WRITE8_HANDLER( marvins_scroll_msb_w )
+WRITE8_MEMBER(snk_state::marvins_scroll_msb_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_bg_scrollx = (state->m_bg_scrollx & 0xff) | ((data & 0x04) << 6);
- state->m_fg_scrollx = (state->m_fg_scrollx & 0xff) | ((data & 0x02) << 7);
- state->m_sp16_scrollx = (state->m_sp16_scrollx & 0xff) | ((data & 0x01) << 8);
+ m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x04) << 6);
+ m_fg_scrollx = (m_fg_scrollx & 0xff) | ((data & 0x02) << 7);
+ m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x01) << 8);
}
-WRITE8_HANDLER( jcross_scroll_msb_w )
+WRITE8_MEMBER(snk_state::jcross_scroll_msb_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_bg_scrolly = (state->m_bg_scrolly & 0xff) | ((data & 0x10) << 4);
- state->m_sp16_scrolly = (state->m_sp16_scrolly & 0xff) | ((data & 0x08) << 5);
- state->m_bg_scrollx = (state->m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
- state->m_sp16_scrollx = (state->m_sp16_scrollx & 0xff) | ((data & 0x01) << 8);
+ m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x10) << 4);
+ m_sp16_scrolly = (m_sp16_scrolly & 0xff) | ((data & 0x08) << 5);
+ m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
+ m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x01) << 8);
}
-WRITE8_HANDLER( sgladiat_scroll_msb_w )
+WRITE8_MEMBER(snk_state::sgladiat_scroll_msb_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_bg_scrollx = (state->m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
- state->m_sp16_scrollx = (state->m_sp16_scrollx & 0xff) | ((data & 0x01) << 8);
+ m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
+ m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x01) << 8);
}
-WRITE8_HANDLER( aso_videoattrs_w )
+WRITE8_MEMBER(snk_state::aso_videoattrs_w)
{
/*
video attributes:
@@ -576,17 +557,16 @@ WRITE8_HANDLER( aso_videoattrs_w )
-------X scrollx MSB (sprites)
*/
- snk_state *state = space->machine().driver_data<snk_state>();
- flip_screen_set(space->machine(), data & 0x20);
+ flip_screen_set(machine(), data & 0x20);
- state->m_bg_scrolly = (state->m_bg_scrolly & 0xff) | ((data & 0x10) << 4);
- state->m_sp16_scrolly = (state->m_sp16_scrolly & 0xff) | ((data & 0x08) << 5);
- state->m_bg_scrollx = (state->m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
- state->m_sp16_scrollx = (state->m_sp16_scrollx & 0xff) | ((data & 0x01) << 8);
+ m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x10) << 4);
+ m_sp16_scrolly = (m_sp16_scrolly & 0xff) | ((data & 0x08) << 5);
+ m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
+ m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x01) << 8);
}
-WRITE8_HANDLER( tnk3_videoattrs_w )
+WRITE8_MEMBER(snk_state::tnk3_videoattrs_w)
{
/*
video attributes:
@@ -600,53 +580,49 @@ WRITE8_HANDLER( tnk3_videoattrs_w )
-------X scrollx MSB (sprites)
*/
- snk_state *state = space->machine().driver_data<snk_state>();
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
- if (state->m_tx_tile_offset != ((data & 0x40) << 2))
+ if (m_tx_tile_offset != ((data & 0x40) << 2))
{
- state->m_tx_tile_offset = (data & 0x40) << 2;
- state->m_tx_tilemap->mark_all_dirty();
+ m_tx_tile_offset = (data & 0x40) << 2;
+ m_tx_tilemap->mark_all_dirty();
}
- state->m_bg_scrolly = (state->m_bg_scrolly & 0xff) | ((data & 0x10) << 4);
- state->m_sp16_scrolly = (state->m_sp16_scrolly & 0xff) | ((data & 0x08) << 5);
- state->m_bg_scrollx = (state->m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
- state->m_sp16_scrollx = (state->m_sp16_scrollx & 0xff) | ((data & 0x01) << 8);
+ m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x10) << 4);
+ m_sp16_scrolly = (m_sp16_scrolly & 0xff) | ((data & 0x08) << 5);
+ m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
+ m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x01) << 8);
}
-WRITE8_HANDLER( aso_bg_bank_w )
+WRITE8_MEMBER(snk_state::aso_bg_bank_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4);
- if (state->m_bg_tile_offset != ((data & 0x30) << 4))
+ m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4);
+ if (m_bg_tile_offset != ((data & 0x30) << 4))
{
- state->m_bg_tile_offset = (data & 0x30) << 4;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_tile_offset = (data & 0x30) << 4;
+ m_bg_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( ikari_bg_scroll_msb_w )
+WRITE8_MEMBER(snk_state::ikari_bg_scroll_msb_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_bg_scrollx = (state->m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
- state->m_bg_scrolly = (state->m_bg_scrolly & 0xff) | ((data & 0x01) << 8);
+ m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
+ m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x01) << 8);
}
-WRITE8_HANDLER( ikari_sp_scroll_msb_w )
+WRITE8_MEMBER(snk_state::ikari_sp_scroll_msb_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_sp32_scrollx = (state->m_sp32_scrollx & 0xff) | ((data & 0x20) << 3);
- state->m_sp16_scrollx = (state->m_sp16_scrollx & 0xff) | ((data & 0x10) << 4);
- state->m_sp32_scrolly = (state->m_sp32_scrolly & 0xff) | ((data & 0x08) << 5);
- state->m_sp16_scrolly = (state->m_sp16_scrolly & 0xff) | ((data & 0x04) << 6);
+ m_sp32_scrollx = (m_sp32_scrollx & 0xff) | ((data & 0x20) << 3);
+ m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x10) << 4);
+ m_sp32_scrolly = (m_sp32_scrolly & 0xff) | ((data & 0x08) << 5);
+ m_sp16_scrolly = (m_sp16_scrolly & 0xff) | ((data & 0x04) << 6);
}
-WRITE8_HANDLER( ikari_unknown_video_w )
+WRITE8_MEMBER(snk_state::ikari_unknown_video_w)
{
/* meaning of 0xc980 uncertain.
Normally 0x20, ikaria/ikarijp sets it to 0x31 during test mode.
@@ -654,92 +630,85 @@ WRITE8_HANDLER( ikari_unknown_video_w )
hard flags test and the test grid.
Changing palette bank is necessary to fix colors in test mode. */
- snk_state *state = space->machine().driver_data<snk_state>();
if (data != 0x20 && // normal
data != 0x31 && // ikari test
data != 0xaa) // victroad spurious during boot
popmessage("attrs %02x contact MAMEDEV", data);
- state->m_tx_tilemap->set_palette_offset((data & 0x01) << 4);
- if (state->m_tx_tile_offset != ((data & 0x10) << 4))
+ m_tx_tilemap->set_palette_offset((data & 0x01) << 4);
+ if (m_tx_tile_offset != ((data & 0x10) << 4))
{
- state->m_tx_tile_offset = (data & 0x10) << 4;
- state->m_tx_tilemap->mark_all_dirty();
+ m_tx_tile_offset = (data & 0x10) << 4;
+ m_tx_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( gwar_tx_bank_w )
+WRITE8_MEMBER(snk_state::gwar_tx_bank_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_tx_tilemap->set_palette_offset((data & 0xf) << 4);
- if (state->m_tx_tile_offset != ((data & 0x30) << 4))
+ m_tx_tilemap->set_palette_offset((data & 0xf) << 4);
+ if (m_tx_tile_offset != ((data & 0x30) << 4))
{
- state->m_tx_tile_offset = (data & 0x30) << 4;
- state->m_tx_tilemap->mark_all_dirty();
+ m_tx_tile_offset = (data & 0x30) << 4;
+ m_tx_tilemap->mark_all_dirty();
}
- if (state->m_is_psychos)
- state->m_bg_tilemap->set_palette_offset((data & 0x80));
+ if (m_is_psychos)
+ m_bg_tilemap->set_palette_offset((data & 0x80));
}
-WRITE8_HANDLER( gwar_videoattrs_w )
+WRITE8_MEMBER(snk_state::gwar_videoattrs_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- flip_screen_set(space->machine(), data & 0x04);
+ flip_screen_set(machine(), data & 0x04);
- state->m_sp32_scrollx = (state->m_sp32_scrollx & 0xff) | ((data & 0x80) << 1);
- state->m_sp16_scrollx = (state->m_sp16_scrollx & 0xff) | ((data & 0x40) << 2);
- state->m_sp32_scrolly = (state->m_sp32_scrolly & 0xff) | ((data & 0x20) << 3);
- state->m_sp16_scrolly = (state->m_sp16_scrolly & 0xff) | ((data & 0x10) << 4);
- state->m_bg_scrollx = (state->m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
- state->m_bg_scrolly = (state->m_bg_scrolly & 0xff) | ((data & 0x01) << 8);
+ m_sp32_scrollx = (m_sp32_scrollx & 0xff) | ((data & 0x80) << 1);
+ m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x40) << 2);
+ m_sp32_scrolly = (m_sp32_scrolly & 0xff) | ((data & 0x20) << 3);
+ m_sp16_scrolly = (m_sp16_scrolly & 0xff) | ((data & 0x10) << 4);
+ m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
+ m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x01) << 8);
}
-WRITE8_HANDLER( gwara_videoattrs_w )
+WRITE8_MEMBER(snk_state::gwara_videoattrs_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- flip_screen_set(space->machine(), data & 0x10);
+ flip_screen_set(machine(), data & 0x10);
- state->m_bg_scrollx = (state->m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
- state->m_bg_scrolly = (state->m_bg_scrolly & 0xff) | ((data & 0x01) << 8);
+ m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
+ m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x01) << 8);
}
-WRITE8_HANDLER( gwara_sp_scroll_msb_w )
+WRITE8_MEMBER(snk_state::gwara_sp_scroll_msb_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_sp32_scrollx = (state->m_sp32_scrollx & 0xff) | ((data & 0x20) << 3);
- state->m_sp16_scrollx = (state->m_sp16_scrollx & 0xff) | ((data & 0x10) << 4);
- state->m_sp32_scrolly = (state->m_sp32_scrolly & 0xff) | ((data & 0x08) << 5);
- state->m_sp16_scrolly = (state->m_sp16_scrolly & 0xff) | ((data & 0x04) << 6);
+ m_sp32_scrollx = (m_sp32_scrollx & 0xff) | ((data & 0x20) << 3);
+ m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x10) << 4);
+ m_sp32_scrolly = (m_sp32_scrolly & 0xff) | ((data & 0x08) << 5);
+ m_sp16_scrolly = (m_sp16_scrolly & 0xff) | ((data & 0x04) << 6);
}
-WRITE8_HANDLER( tdfever_sp_scroll_msb_w )
+WRITE8_MEMBER(snk_state::tdfever_sp_scroll_msb_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
- state->m_sp32_scrolly = (state->m_sp32_scrolly & 0xff) | ((data & 0x80) << 1);
- state->m_sp32_scrollx = (state->m_sp32_scrollx & 0xff) | ((data & 0x40) << 2);
+ m_sp32_scrolly = (m_sp32_scrolly & 0xff) | ((data & 0x80) << 1);
+ m_sp32_scrollx = (m_sp32_scrollx & 0xff) | ((data & 0x40) << 2);
}
-WRITE8_HANDLER( tdfever_spriteram_w )
+WRITE8_MEMBER(snk_state::tdfever_spriteram_w)
{
- snk_state *state = space->machine().driver_data<snk_state>();
/* partial updates avoid flickers in the fsoccer radar. */
- if (offset < 0x80 && state->m_spriteram[offset] != data)
+ if (offset < 0x80 && m_spriteram[offset] != data)
{
- int vpos = space->machine().primary_screen->vpos();
+ int vpos = machine().primary_screen->vpos();
if (vpos > 0)
- space->machine().primary_screen->update_partial(vpos - 1);
+ machine().primary_screen->update_partial(vpos - 1);
}
- state->m_spriteram[offset] = data;
+ m_spriteram[offset] = data;
}
/**************************************************************************************/
diff --git a/src/mame/video/snk6502.c b/src/mame/video/snk6502.c
index 8dcbff35aa6..b11f0bad8a1 100644
--- a/src/mame/video/snk6502.c
+++ b/src/mame/video/snk6502.c
@@ -74,91 +74,84 @@ PALETTE_INIT( snk6502 )
}
}
-WRITE8_HANDLER( snk6502_videoram_w )
+WRITE8_MEMBER(snk6502_state::snk6502_videoram_w)
{
- snk6502_state *state = space->machine().driver_data<snk6502_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( snk6502_videoram2_w )
+WRITE8_MEMBER(snk6502_state::snk6502_videoram2_w)
{
- snk6502_state *state = space->machine().driver_data<snk6502_state>();
- state->m_videoram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( snk6502_colorram_w )
+WRITE8_MEMBER(snk6502_state::snk6502_colorram_w)
{
- snk6502_state *state = space->machine().driver_data<snk6502_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( snk6502_charram_w )
+WRITE8_MEMBER(snk6502_state::snk6502_charram_w)
{
- snk6502_state *state = space->machine().driver_data<snk6502_state>();
- if (state->m_charram[offset] != data)
+ if (m_charram[offset] != data)
{
- state->m_charram[offset] = data;
- gfx_element_mark_dirty(space->machine().gfx[0], (offset/8) % 256);
+ m_charram[offset] = data;
+ gfx_element_mark_dirty(machine().gfx[0], (offset/8) % 256);
}
}
-WRITE8_HANDLER( snk6502_flipscreen_w )
+WRITE8_MEMBER(snk6502_state::snk6502_flipscreen_w)
{
- snk6502_state *state = space->machine().driver_data<snk6502_state>();
int bank;
/* bits 0-2 select background color */
- if (state->m_backcolor != (data & 7))
+ if (m_backcolor != (data & 7))
{
int i;
- state->m_backcolor = data & 7;
+ m_backcolor = data & 7;
for (i = 0;i < 32;i += 4)
- palette_set_color(space->machine(), COLOR(space->machine(), 1, i), state->m_palette[4 * state->m_backcolor + 0x20]);
+ palette_set_color(machine(), COLOR(machine(), 1, i), m_palette[4 * m_backcolor + 0x20]);
}
/* bit 3 selects char bank */
bank = (~data & 0x08) >> 3;
- if (state->m_charbank != bank)
+ if (m_charbank != bank)
{
- state->m_charbank = bank;
- space->machine().tilemap().mark_all_dirty();
+ m_charbank = bank;
+ machine().tilemap().mark_all_dirty();
}
/* bit 7 flips screen */
- if (flip_screen_get(space->machine()) != (data & 0x80))
+ if (flip_screen_get(machine()) != (data & 0x80))
{
- flip_screen_set(space->machine(), data & 0x80);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x80);
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( snk6502_scrollx_w )
+WRITE8_MEMBER(snk6502_state::snk6502_scrollx_w)
{
- snk6502_state *state = space->machine().driver_data<snk6502_state>();
- state->m_bg_tilemap->set_scrollx(0, data);
+ m_bg_tilemap->set_scrollx(0, data);
}
-WRITE8_HANDLER( snk6502_scrolly_w )
+WRITE8_MEMBER(snk6502_state::snk6502_scrolly_w)
{
- snk6502_state *state = space->machine().driver_data<snk6502_state>();
- state->m_bg_tilemap->set_scrolly(0, data);
+ m_bg_tilemap->set_scrolly(0, data);
}
@@ -266,37 +259,35 @@ PALETTE_INIT( satansat )
}
}
-WRITE8_HANDLER( satansat_b002_w )
+WRITE8_MEMBER(snk6502_state::satansat_b002_w)
{
- snk6502_state *state = space->machine().driver_data<snk6502_state>();
/* bit 0 flips screen */
- if (flip_screen_get(space->machine()) != (data & 0x01))
+ if (flip_screen_get(machine()) != (data & 0x01))
{
- flip_screen_set(space->machine(), data & 0x01);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x01);
+ machine().tilemap().mark_all_dirty();
}
/* bit 1 enables interrupts */
- state->m_irq_mask = data & 2;
+ m_irq_mask = data & 2;
/* other bits unused */
}
-WRITE8_HANDLER( satansat_backcolor_w )
+WRITE8_MEMBER(snk6502_state::satansat_backcolor_w)
{
- snk6502_state *state = space->machine().driver_data<snk6502_state>();
/* bits 0-1 select background color. Other bits unused. */
- if (state->m_backcolor != (data & 0x03))
+ if (m_backcolor != (data & 0x03))
{
int i;
- state->m_backcolor = data & 0x03;
+ m_backcolor = data & 0x03;
for (i = 0; i < 16; i += 4)
- palette_set_color(space->machine(), COLOR(space->machine(), 1, i), state->m_palette[state->m_backcolor + 0x10]);
+ palette_set_color(machine(), COLOR(machine(), 1, i), m_palette[m_backcolor + 0x10]);
}
}
diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c
index 6871d5f767e..130d58c0e1b 100644
--- a/src/mame/video/snk68.c
+++ b/src/mame/video/snk68.c
@@ -85,22 +85,20 @@ VIDEO_START( searchar )
***************************************************************************/
-READ16_HANDLER( pow_spriteram_r )
+READ16_MEMBER(snk68_state::pow_spriteram_r)
{
- snk68_state *state = space->machine().driver_data<snk68_state>();
// streetsj expects the MSB of every 32-bit word to be FF. Presumably RAM
// exists only for 3 bytes out of 4 and the fourth is unmapped.
if (!(offset & 1))
- return state->m_spriteram[offset] | 0xff00;
+ return m_spriteram[offset] | 0xff00;
else
- return state->m_spriteram[offset];
+ return m_spriteram[offset];
}
-WRITE16_HANDLER( pow_spriteram_w )
+WRITE16_MEMBER(snk68_state::pow_spriteram_w)
{
- snk68_state *state = space->machine().driver_data<snk68_state>();
- UINT16 *spriteram16 = state->m_spriteram;
+ UINT16 *spriteram16 = m_spriteram;
UINT16 newword = spriteram16[offset];
if (!(offset & 1))
@@ -110,86 +108,80 @@ WRITE16_HANDLER( pow_spriteram_w )
if (spriteram16[offset] != newword)
{
- int vpos = space->machine().primary_screen->vpos();
+ int vpos = machine().primary_screen->vpos();
if (vpos > 0)
- space->machine().primary_screen->update_partial(vpos - 1);
+ machine().primary_screen->update_partial(vpos - 1);
spriteram16[offset] = newword;
}
}
-READ16_HANDLER( pow_fg_videoram_r )
+READ16_MEMBER(snk68_state::pow_fg_videoram_r)
{
- snk68_state *state = space->machine().driver_data<snk68_state>();
// RAM is only 8-bit
- return state->m_pow_fg_videoram[offset] | 0xff00;
+ return m_pow_fg_videoram[offset] | 0xff00;
}
-WRITE16_HANDLER( pow_fg_videoram_w )
+WRITE16_MEMBER(snk68_state::pow_fg_videoram_w)
{
- snk68_state *state = space->machine().driver_data<snk68_state>();
data |= 0xff00;
- COMBINE_DATA(&state->m_pow_fg_videoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset >> 1);
+ COMBINE_DATA(&m_pow_fg_videoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset >> 1);
}
-WRITE16_HANDLER( searchar_fg_videoram_w )
+WRITE16_MEMBER(snk68_state::searchar_fg_videoram_w)
{
- snk68_state *state = space->machine().driver_data<snk68_state>();
// RAM is full 16-bit, though only half of it is used by the hardware
- COMBINE_DATA(&state->m_pow_fg_videoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset >> 1);
+ COMBINE_DATA(&m_pow_fg_videoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset >> 1);
}
-WRITE16_HANDLER( pow_flipscreen16_w )
+WRITE16_MEMBER(snk68_state::pow_flipscreen16_w)
{
if (ACCESSING_BITS_0_7)
{
- snk68_state *state = space->machine().driver_data<snk68_state>();
- state->m_flipscreen = data & 0x08;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ m_flipscreen = data & 0x08;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
- state->m_sprite_flip_axis = data & 0x04; // for streetsm? though might not be present on this board
+ m_sprite_flip_axis = data & 0x04; // for streetsm? though might not be present on this board
- if (state->m_fg_tile_offset != ((data & 0x70) << 4))
+ if (m_fg_tile_offset != ((data & 0x70) << 4))
{
- state->m_fg_tile_offset = (data & 0x70) << 4;
- state->m_fg_tilemap->mark_all_dirty();
+ m_fg_tile_offset = (data & 0x70) << 4;
+ m_fg_tilemap->mark_all_dirty();
}
}
}
-WRITE16_HANDLER( searchar_flipscreen16_w )
+WRITE16_MEMBER(snk68_state::searchar_flipscreen16_w)
{
if (ACCESSING_BITS_0_7)
{
- snk68_state *state = space->machine().driver_data<snk68_state>();
- state->m_flipscreen = data & 0x08;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ m_flipscreen = data & 0x08;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
- state->m_sprite_flip_axis = data & 0x04;
+ m_sprite_flip_axis = data & 0x04;
}
}
-WRITE16_HANDLER( pow_paletteram16_word_w )
+WRITE16_MEMBER(snk68_state::pow_paletteram16_word_w)
{
- snk68_state *state = space->machine().driver_data<snk68_state>();
UINT16 newword;
int r,g,b;
- COMBINE_DATA(&state->m_paletteram[offset]);
- newword = state->m_paletteram[offset];
+ COMBINE_DATA(&m_paletteram[offset]);
+ newword = m_paletteram[offset];
r = ((newword >> 7) & 0x1e) | ((newword >> 14) & 0x01);
g = ((newword >> 3) & 0x1e) | ((newword >> 13) & 0x01) ;
b = ((newword << 1) & 0x1e) | ((newword >> 12) & 0x01) ;
- palette_set_color_rgb(space->machine(),offset,pal5bit(r),pal5bit(g),pal5bit(b));
+ palette_set_color_rgb(machine(),offset,pal5bit(r),pal5bit(g),pal5bit(b));
}
diff --git a/src/mame/video/snookr10.c b/src/mame/video/snookr10.c
index b4b8bbd7d0c..7f1030840dd 100644
--- a/src/mame/video/snookr10.c
+++ b/src/mame/video/snookr10.c
@@ -42,18 +42,16 @@
#include "includes/snookr10.h"
-WRITE8_HANDLER( snookr10_videoram_w )
+WRITE8_MEMBER(snookr10_state::snookr10_videoram_w)
{
- snookr10_state *state = space->machine().driver_data<snookr10_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( snookr10_colorram_w )
+WRITE8_MEMBER(snookr10_state::snookr10_colorram_w)
{
- snookr10_state *state = space->machine().driver_data<snookr10_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c
index 3ae8603701e..260025b03ba 100644
--- a/src/mame/video/solomon.c
+++ b/src/mame/video/solomon.c
@@ -1,44 +1,40 @@
#include "emu.h"
#include "includes/solomon.h"
-WRITE8_HANDLER( solomon_videoram_w )
+WRITE8_MEMBER(solomon_state::solomon_videoram_w)
{
- solomon_state *state = space->machine().driver_data<solomon_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( solomon_colorram_w )
+WRITE8_MEMBER(solomon_state::solomon_colorram_w)
{
- solomon_state *state = space->machine().driver_data<solomon_state>();
- state->m_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( solomon_videoram2_w )
+WRITE8_MEMBER(solomon_state::solomon_videoram2_w)
{
- solomon_state *state = space->machine().driver_data<solomon_state>();
- state->m_videoram2[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( solomon_colorram2_w )
+WRITE8_MEMBER(solomon_state::solomon_colorram2_w)
{
- solomon_state *state = space->machine().driver_data<solomon_state>();
- state->m_colorram2[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram2[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( solomon_flipscreen_w )
+WRITE8_MEMBER(solomon_state::solomon_flipscreen_w)
{
- if (flip_screen_get(space->machine()) != (data & 0x01))
+ if (flip_screen_get(machine()) != (data & 0x01))
{
- flip_screen_set(space->machine(), data & 0x01);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x01);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c
index 1b60106c4b3..6313bc80e15 100644
--- a/src/mame/video/sonson.c
+++ b/src/mame/video/sonson.c
@@ -94,32 +94,29 @@ PALETTE_INIT( sonson )
}
}
-WRITE8_HANDLER( sonson_videoram_w )
+WRITE8_MEMBER(sonson_state::sonson_videoram_w)
{
- sonson_state *state = space->machine().driver_data<sonson_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( sonson_colorram_w )
+WRITE8_MEMBER(sonson_state::sonson_colorram_w)
{
- sonson_state *state = space->machine().driver_data<sonson_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( sonson_scrollx_w )
+WRITE8_MEMBER(sonson_state::sonson_scrollx_w)
{
- sonson_state *state = space->machine().driver_data<sonson_state>();
int row;
for (row = 5; row < 32; row++)
- state->m_bg_tilemap->set_scrollx(row, data);
+ m_bg_tilemap->set_scrollx(row, data);
}
-WRITE8_HANDLER( sonson_flipscreen_w )
+WRITE8_MEMBER(sonson_state::sonson_flipscreen_w)
{
- flip_screen_set(space->machine(), ~data & 0x01);
+ flip_screen_set(machine(), ~data & 0x01);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/spacefb.c b/src/mame/video/spacefb.c
index e4661e47a9e..09095d19de5 100644
--- a/src/mame/video/spacefb.c
+++ b/src/mame/video/spacefb.c
@@ -15,19 +15,17 @@
*
*************************************/
-WRITE8_HANDLER( spacefb_port_0_w )
+WRITE8_MEMBER(spacefb_state::spacefb_port_0_w)
{
- spacefb_state *state = space->machine().driver_data<spacefb_state>();
- space->machine().primary_screen->update_now();
- state->m_port_0 = data;
+ machine().primary_screen->update_now();
+ m_port_0 = data;
}
-WRITE8_HANDLER( spacefb_port_2_w )
+WRITE8_MEMBER(spacefb_state::spacefb_port_2_w)
{
- spacefb_state *state = space->machine().driver_data<spacefb_state>();
- space->machine().primary_screen->update_now();
- state->m_port_2 = data;
+ machine().primary_screen->update_now();
+ m_port_2 = data;
}
diff --git a/src/mame/video/spcforce.c b/src/mame/video/spcforce.c
index 3ce1c598dee..7bc4a3d331d 100644
--- a/src/mame/video/spcforce.c
+++ b/src/mame/video/spcforce.c
@@ -10,9 +10,9 @@
#include "includes/spcforce.h"
-WRITE8_HANDLER( spcforce_flip_screen_w )
+WRITE8_MEMBER(spcforce_state::spcforce_flip_screen_w)
{
- flip_screen_set(space->machine(), ~data & 0x01);
+ flip_screen_set(machine(), ~data & 0x01);
}
diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c
index 3b4d1bfe407..2196e645c4c 100644
--- a/src/mame/video/spdodgeb.c
+++ b/src/mame/video/spdodgeb.c
@@ -100,42 +100,39 @@ TIMER_DEVICE_CALLBACK( spdodgeb_interrupt )
}
}
-WRITE8_HANDLER( spdodgeb_scrollx_lo_w )
+WRITE8_MEMBER(spdodgeb_state::spdodgeb_scrollx_lo_w)
{
- spdodgeb_state *state = space->machine().driver_data<spdodgeb_state>();
- state->m_lastscroll = (state->m_lastscroll & 0x100) | data;
+ m_lastscroll = (m_lastscroll & 0x100) | data;
}
-WRITE8_HANDLER( spdodgeb_ctrl_w )
+WRITE8_MEMBER(spdodgeb_state::spdodgeb_ctrl_w)
{
- spdodgeb_state *state = space->machine().driver_data<spdodgeb_state>();
- UINT8 *rom = space->machine().region("maincpu")->base();
+ UINT8 *rom = machine().region("maincpu")->base();
/* bit 0 = flip screen */
- flip_screen_set(space->machine(), data & 0x01);
+ flip_screen_set(machine(), data & 0x01);
/* bit 1 = ROM bank switch */
- memory_set_bankptr(space->machine(), "bank1",rom + 0x10000 + 0x4000 * ((~data & 0x02) >> 1));
+ memory_set_bankptr(machine(), "bank1",rom + 0x10000 + 0x4000 * ((~data & 0x02) >> 1));
/* bit 2 = scroll high bit */
- state->m_lastscroll = (state->m_lastscroll & 0x0ff) | ((data & 0x04) << 6);
+ m_lastscroll = (m_lastscroll & 0x0ff) | ((data & 0x04) << 6);
/* bit 3 = to mcu?? */
/* bits 4-7 = palette bank select */
- if (state->m_tile_palbank != ((data & 0x30) >> 4))
+ if (m_tile_palbank != ((data & 0x30) >> 4))
{
- state->m_tile_palbank = ((data & 0x30) >> 4);
- state->m_bg_tilemap->mark_all_dirty();
+ m_tile_palbank = ((data & 0x30) >> 4);
+ m_bg_tilemap->mark_all_dirty();
}
- state->m_sprite_palbank = (data & 0xc0) >> 6;
+ m_sprite_palbank = (data & 0xc0) >> 6;
}
-WRITE8_HANDLER( spdodgeb_videoram_w )
+WRITE8_MEMBER(spdodgeb_state::spdodgeb_videoram_w)
{
- spdodgeb_state *state = space->machine().driver_data<spdodgeb_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
diff --git a/src/mame/video/speedatk.c b/src/mame/video/speedatk.c
index fdd62c9f6e8..5b6ee6a9152 100644
--- a/src/mame/video/speedatk.c
+++ b/src/mame/video/speedatk.c
@@ -52,18 +52,16 @@ PALETTE_INIT( speedatk )
}
}
-WRITE8_HANDLER( speedatk_videoram_w )
+WRITE8_MEMBER(speedatk_state::speedatk_videoram_w)
{
- speedatk_state *state = space->machine().driver_data<speedatk_state>();
- state->m_videoram[offset] = data;
+ m_videoram[offset] = data;
}
-WRITE8_HANDLER( speedatk_colorram_w )
+WRITE8_MEMBER(speedatk_state::speedatk_colorram_w)
{
- speedatk_state *state = space->machine().driver_data<speedatk_state>();
- state->m_colorram[offset] = data;
+ m_colorram[offset] = data;
}
VIDEO_START( speedatk )
@@ -71,19 +69,18 @@ VIDEO_START( speedatk )
}
-WRITE8_HANDLER( speedatk_6845_w )
+WRITE8_MEMBER(speedatk_state::speedatk_6845_w)
{
- speedatk_state *state = space->machine().driver_data<speedatk_state>();
if(offset == 0)
{
- state->m_crtc_index = data;
- space->machine().device<mc6845_device>("crtc")->address_w(*space,0,data);
+ m_crtc_index = data;
+ machine().device<mc6845_device>("crtc")->address_w(space,0,data);
}
else
{
- state->m_crtc_vreg[state->m_crtc_index] = data;
- space->machine().device<mc6845_device>("crtc")->register_w(*space,0,data);
+ m_crtc_vreg[m_crtc_index] = data;
+ machine().device<mc6845_device>("crtc")->register_w(space,0,data);
}
}
diff --git a/src/mame/video/speedbal.c b/src/mame/video/speedbal.c
index f5c4b9f65d4..26fe19838f9 100644
--- a/src/mame/video/speedbal.c
+++ b/src/mame/video/speedbal.c
@@ -57,11 +57,10 @@ VIDEO_START( speedbal )
* *
*************************************/
-WRITE8_HANDLER( speedbal_foreground_videoram_w )
+WRITE8_MEMBER(speedbal_state::speedbal_foreground_videoram_w)
{
- speedbal_state *state = space->machine().driver_data<speedbal_state>();
- state->m_foreground_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset>>1);
+ m_foreground_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset>>1);
}
/*************************************
@@ -70,11 +69,10 @@ WRITE8_HANDLER( speedbal_foreground_videoram_w )
* *
*************************************/
-WRITE8_HANDLER( speedbal_background_videoram_w )
+WRITE8_MEMBER(speedbal_state::speedbal_background_videoram_w)
{
- speedbal_state *state = space->machine().driver_data<speedbal_state>();
- state->m_background_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset>>1);
+ m_background_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset>>1);
}
diff --git a/src/mame/video/speedspn.c b/src/mame/video/speedspn.c
index fbea2d487b4..6410c4b24b5 100644
--- a/src/mame/video/speedspn.c
+++ b/src/mame/video/speedspn.c
@@ -20,42 +20,37 @@ VIDEO_START(speedspn)
state->m_tilemap = tilemap_create(machine, get_speedspn_tile_info,tilemap_scan_cols, 8, 8,64,32);
}
-WRITE8_HANDLER( speedspn_vidram_w )
+WRITE8_MEMBER(speedspn_state::speedspn_vidram_w)
{
- speedspn_state *state = space->machine().driver_data<speedspn_state>();
- state->m_vidram[offset + state->m_bank_vidram] = data;
+ m_vidram[offset + m_bank_vidram] = data;
- if (state->m_bank_vidram == 0)
- state->m_tilemap->mark_tile_dirty(offset/2);
+ if (m_bank_vidram == 0)
+ m_tilemap->mark_tile_dirty(offset/2);
}
-WRITE8_HANDLER( speedspn_attram_w )
+WRITE8_MEMBER(speedspn_state::speedspn_attram_w)
{
- speedspn_state *state = space->machine().driver_data<speedspn_state>();
- state->m_attram[offset] = data;
+ m_attram[offset] = data;
- state->m_tilemap->mark_tile_dirty(offset^0x400);
+ m_tilemap->mark_tile_dirty(offset^0x400);
}
-READ8_HANDLER( speedspn_vidram_r )
+READ8_MEMBER(speedspn_state::speedspn_vidram_r)
{
- speedspn_state *state = space->machine().driver_data<speedspn_state>();
- return state->m_vidram[offset + state->m_bank_vidram];
+ return m_vidram[offset + m_bank_vidram];
}
-WRITE8_HANDLER(speedspn_banked_vidram_change)
+WRITE8_MEMBER(speedspn_state::speedspn_banked_vidram_change)
{
- speedspn_state *state = space->machine().driver_data<speedspn_state>();
// logerror("VidRam Bank: %04x\n", data);
- state->m_bank_vidram = data & 1;
- state->m_bank_vidram *= 0x1000;
+ m_bank_vidram = data & 1;
+ m_bank_vidram *= 0x1000;
}
-WRITE8_HANDLER(speedspn_global_display_w)
+WRITE8_MEMBER(speedspn_state::speedspn_global_display_w)
{
- speedspn_state *state = space->machine().driver_data<speedspn_state>();
// logerror("Global display: %u\n", data);
- state->m_display_disable = data & 1;
+ m_display_disable = data & 1;
}
diff --git a/src/mame/video/splash.c b/src/mame/video/splash.c
index ecc9c914f79..e9a1afbc71e 100644
--- a/src/mame/video/splash.c
+++ b/src/mame/video/splash.c
@@ -72,12 +72,11 @@ static TILE_GET_INFO( get_tile_info_splash_tilemap1 )
***************************************************************************/
-WRITE16_HANDLER( splash_vram_w )
+WRITE16_MEMBER(splash_state::splash_vram_w)
{
- splash_state *state = space->machine().driver_data<splash_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_bg_tilemap[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 1);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_bg_tilemap[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 1);
}
static void draw_bitmap(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/video/sprcros2.c b/src/mame/video/sprcros2.c
index 8cf0369c929..dc8a5f811e2 100644
--- a/src/mame/video/sprcros2.c
+++ b/src/mame/video/sprcros2.c
@@ -59,37 +59,33 @@ PALETTE_INIT( sprcros2 )
}
}
-WRITE8_HANDLER( sprcros2_fgvideoram_w )
+WRITE8_MEMBER(sprcros2_state::sprcros2_fgvideoram_w)
{
- sprcros2_state *state = space->machine().driver_data<sprcros2_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fgtilemap->mark_tile_dirty(offset&0x3ff);
+ m_fgvideoram[offset] = data;
+ m_fgtilemap->mark_tile_dirty(offset&0x3ff);
}
-WRITE8_HANDLER( sprcros2_bgvideoram_w )
+WRITE8_MEMBER(sprcros2_state::sprcros2_bgvideoram_w)
{
- sprcros2_state *state = space->machine().driver_data<sprcros2_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bgtilemap->mark_tile_dirty(offset&0x3ff);
+ m_bgvideoram[offset] = data;
+ m_bgtilemap->mark_tile_dirty(offset&0x3ff);
}
-WRITE8_HANDLER( sprcros2_bgscrollx_w )
+WRITE8_MEMBER(sprcros2_state::sprcros2_bgscrollx_w)
{
- sprcros2_state *state = space->machine().driver_data<sprcros2_state>();
- if(state->m_port7&0x02)
- state->m_bgtilemap->set_scrollx(0, 0x100-data);
+ if(m_port7&0x02)
+ m_bgtilemap->set_scrollx(0, 0x100-data);
else
- state->m_bgtilemap->set_scrollx(0, data);
+ m_bgtilemap->set_scrollx(0, data);
}
-WRITE8_HANDLER( sprcros2_bgscrolly_w )
+WRITE8_MEMBER(sprcros2_state::sprcros2_bgscrolly_w)
{
- sprcros2_state *state = space->machine().driver_data<sprcros2_state>();
- state->m_bgtilemap->set_scrolly(0, data);
+ m_bgtilemap->set_scrolly(0, data);
}
static TILE_GET_INFO( get_sprcros2_bgtile_info )
diff --git a/src/mame/video/sprint2.c b/src/mame/video/sprint2.c
index 17f8b8b2d68..5317dd53f15 100644
--- a/src/mame/video/sprint2.c
+++ b/src/mame/video/sprint2.c
@@ -52,35 +52,30 @@ VIDEO_START( sprint2 )
}
-READ8_HANDLER( sprint2_collision1_r )
+READ8_MEMBER(sprint2_state::sprint2_collision1_r)
{
- sprint2_state *state = space->machine().driver_data<sprint2_state>();
- return state->m_collision[0];
+ return m_collision[0];
}
-READ8_HANDLER( sprint2_collision2_r )
+READ8_MEMBER(sprint2_state::sprint2_collision2_r)
{
- sprint2_state *state = space->machine().driver_data<sprint2_state>();
- return state->m_collision[1];
+ return m_collision[1];
}
-WRITE8_HANDLER( sprint2_collision_reset1_w )
+WRITE8_MEMBER(sprint2_state::sprint2_collision_reset1_w)
{
- sprint2_state *state = space->machine().driver_data<sprint2_state>();
- state->m_collision[0] = 0;
+ m_collision[0] = 0;
}
-WRITE8_HANDLER( sprint2_collision_reset2_w )
+WRITE8_MEMBER(sprint2_state::sprint2_collision_reset2_w)
{
- sprint2_state *state = space->machine().driver_data<sprint2_state>();
- state->m_collision[1] = 0;
+ m_collision[1] = 0;
}
-WRITE8_HANDLER( sprint2_video_ram_w )
+WRITE8_MEMBER(sprint2_state::sprint2_video_ram_w)
{
- sprint2_state *state = space->machine().driver_data<sprint2_state>();
- state->m_video_ram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_video_ram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/sprint4.c b/src/mame/video/sprint4.c
index 2216528a374..c012c47436f 100644
--- a/src/mame/video/sprint4.c
+++ b/src/mame/video/sprint4.c
@@ -149,10 +149,9 @@ SCREEN_VBLANK( sprint4 )
}
-WRITE8_HANDLER( sprint4_video_ram_w )
+WRITE8_MEMBER(sprint4_state::sprint4_video_ram_w)
{
- sprint4_state *state = space->machine().driver_data<sprint4_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_playfield->mark_tile_dirty(offset);
+ m_playfield->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/sprint8.c b/src/mame/video/sprint8.c
index 2c31a3c90da..35b0a6bbde1 100644
--- a/src/mame/video/sprint8.c
+++ b/src/mame/video/sprint8.c
@@ -105,12 +105,11 @@ static TILE_GET_INFO( get_tile_info2 )
}
-WRITE8_HANDLER( sprint8_video_ram_w )
+WRITE8_MEMBER(sprint8_state::sprint8_video_ram_w)
{
- sprint8_state *state = space->machine().driver_data<sprint8_state>();
- state->m_video_ram[offset] = data;
- state->m_tilemap1->mark_tile_dirty(offset);
- state->m_tilemap2->mark_tile_dirty(offset);
+ m_video_ram[offset] = data;
+ m_tilemap1->mark_tile_dirty(offset);
+ m_tilemap2->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c
index 955f4b4a0aa..d6ab48d1d97 100644
--- a/src/mame/video/srumbler.c
+++ b/src/mame/video/srumbler.c
@@ -67,42 +67,39 @@ VIDEO_START( srumbler )
***************************************************************************/
-WRITE8_HANDLER( srumbler_foreground_w )
+WRITE8_MEMBER(srumbler_state::srumbler_foreground_w)
{
- srumbler_state *state = space->machine().driver_data<srumbler_state>();
- state->m_foregroundram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset/2);
+ m_foregroundram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset/2);
}
-WRITE8_HANDLER( srumbler_background_w )
+WRITE8_MEMBER(srumbler_state::srumbler_background_w)
{
- srumbler_state *state = space->machine().driver_data<srumbler_state>();
- state->m_backgroundram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset/2);
+ m_backgroundram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset/2);
}
-WRITE8_HANDLER( srumbler_4009_w )
+WRITE8_MEMBER(srumbler_state::srumbler_4009_w)
{
/* bit 0 flips screen */
- flip_screen_set(space->machine(), data & 1);
+ flip_screen_set(machine(), data & 1);
/* bits 4-5 used during attract mode, unknown */
/* bits 6-7 coin counters */
- coin_counter_w(space->machine(), 0,data & 0x40);
- coin_counter_w(space->machine(), 1,data & 0x80);
+ coin_counter_w(machine(), 0,data & 0x40);
+ coin_counter_w(machine(), 1,data & 0x80);
}
-WRITE8_HANDLER( srumbler_scroll_w )
+WRITE8_MEMBER(srumbler_state::srumbler_scroll_w)
{
- srumbler_state *state = space->machine().driver_data<srumbler_state>();
- state->m_scroll[offset] = data;
+ m_scroll[offset] = data;
- state->m_bg_tilemap->set_scrollx(0,state->m_scroll[0] | (state->m_scroll[1] << 8));
- state->m_bg_tilemap->set_scrolly(0,state->m_scroll[2] | (state->m_scroll[3] << 8));
+ m_bg_tilemap->set_scrollx(0,m_scroll[0] | (m_scroll[1] << 8));
+ m_bg_tilemap->set_scrolly(0,m_scroll[2] | (m_scroll[3] << 8));
}
diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c
index e81b13f20d8..9e653809643 100644
--- a/src/mame/video/sshangha.c
+++ b/src/mame/video/sshangha.c
@@ -11,11 +11,10 @@
/******************************************************************************/
-WRITE16_HANDLER (sshangha_video_w)
+WRITE16_MEMBER(sshangha_state::sshangha_video_w)
{
- sshangha_state *state = space->machine().driver_data<sshangha_state>();
/* 0x4: Special video mode, other bits unknown */
- state->m_video_control=data;
+ m_video_control=data;
// popmessage("%04x",data);
}
diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c
index d77d5c0522c..fbfb9da6443 100644
--- a/src/mame/video/sslam.c
+++ b/src/mame/video/sslam.c
@@ -4,14 +4,13 @@
#include "includes/sslam.h"
-WRITE16_HANDLER( sslam_paletteram_w )
+WRITE16_MEMBER(sslam_state::sslam_paletteram_w)
{
int r, g, b, val;
- sslam_state *state = space->machine().driver_data<sslam_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
- val = state->m_generic_paletteram_16[offset];
+ val = m_generic_paletteram_16[offset];
r = (val >> 11) & 0x1e;
g = (val >> 7) & 0x1e;
b = (val >> 3) & 0x1e;
@@ -20,7 +19,7 @@ WRITE16_HANDLER( sslam_paletteram_w )
g |= ((val & 0x04) >> 2);
b |= ((val & 0x02) >> 1);
- palette_set_color_rgb(space->machine(), offset, pal5bit(r), pal5bit(g), pal5bit(b));
+ palette_set_color_rgb(machine(), offset, pal5bit(r), pal5bit(g), pal5bit(b));
}
static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect)
@@ -101,12 +100,11 @@ static TILE_GET_INFO( get_sslam_tx_tile_info )
SET_TILE_INFO(3,code+0xc000 ,colr >> 12,0);
}
-WRITE16_HANDLER( sslam_tx_tileram_w )
+WRITE16_MEMBER(sslam_state::sslam_tx_tileram_w)
{
- sslam_state *state = space->machine().driver_data<sslam_state>();
- COMBINE_DATA(&state->m_tx_tileram[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_tx_tileram[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset);
}
/* Middle Layer */
@@ -120,12 +118,11 @@ static TILE_GET_INFO( get_sslam_md_tile_info )
SET_TILE_INFO(2,code+0x2000 ,colr >> 12,0);
}
-WRITE16_HANDLER( sslam_md_tileram_w )
+WRITE16_MEMBER(sslam_state::sslam_md_tileram_w)
{
- sslam_state *state = space->machine().driver_data<sslam_state>();
- COMBINE_DATA(&state->m_md_tileram[offset]);
- state->m_md_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_md_tileram[offset]);
+ m_md_tilemap->mark_tile_dirty(offset);
}
/* Background Layer */
@@ -139,12 +136,11 @@ static TILE_GET_INFO( get_sslam_bg_tile_info )
SET_TILE_INFO(1,code ,colr >> 13,0);
}
-WRITE16_HANDLER( sslam_bg_tileram_w )
+WRITE16_MEMBER(sslam_state::sslam_bg_tileram_w)
{
- sslam_state *state = space->machine().driver_data<sslam_state>();
- COMBINE_DATA(&state->m_bg_tileram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bg_tileram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_powerbls_bg_tile_info )
@@ -159,12 +155,11 @@ static TILE_GET_INFO( get_powerbls_bg_tile_info )
SET_TILE_INFO(1,code,colr,0);
}
-WRITE16_HANDLER( powerbls_bg_tileram_w )
+WRITE16_MEMBER(sslam_state::powerbls_bg_tileram_w)
{
- sslam_state *state = space->machine().driver_data<sslam_state>();
- COMBINE_DATA(&state->m_bg_tileram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset>>1);
+ COMBINE_DATA(&m_bg_tileram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset>>1);
}
VIDEO_START(sslam)
diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c
index 6dbbff59ce6..0e2786dc2c9 100644
--- a/src/mame/video/ssozumo.c
+++ b/src/mame/video/ssozumo.c
@@ -40,82 +40,76 @@ PALETTE_INIT( ssozumo )
}
}
-WRITE8_HANDLER( ssozumo_videoram_w )
+WRITE8_MEMBER(ssozumo_state::ssozumo_videoram_w)
{
- ssozumo_state *state = space->machine().driver_data<ssozumo_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( ssozumo_colorram_w )
+WRITE8_MEMBER(ssozumo_state::ssozumo_colorram_w)
{
- ssozumo_state *state = space->machine().driver_data<ssozumo_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( ssozumo_videoram2_w )
+WRITE8_MEMBER(ssozumo_state::ssozumo_videoram2_w)
{
- ssozumo_state *state = space->machine().driver_data<ssozumo_state>();
- state->m_videoram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( ssozumo_colorram2_w )
+WRITE8_MEMBER(ssozumo_state::ssozumo_colorram2_w)
{
- ssozumo_state *state = space->machine().driver_data<ssozumo_state>();
- state->m_colorram2[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram2[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( ssozumo_paletteram_w )
+WRITE8_MEMBER(ssozumo_state::ssozumo_paletteram_w)
{
- ssozumo_state *state = space->machine().driver_data<ssozumo_state>();
int bit0, bit1, bit2, bit3, val;
int r, g, b;
int offs2;
- state->m_paletteram[offset] = data;
+ m_paletteram[offset] = data;
offs2 = offset & 0x0f;
- val = state->m_paletteram[offs2];
+ val = m_paletteram[offs2];
bit0 = (val >> 0) & 0x01;
bit1 = (val >> 1) & 0x01;
bit2 = (val >> 2) & 0x01;
bit3 = (val >> 3) & 0x01;
r = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
- val = state->m_paletteram[offs2 | 0x10];
+ val = m_paletteram[offs2 | 0x10];
bit0 = (val >> 0) & 0x01;
bit1 = (val >> 1) & 0x01;
bit2 = (val >> 2) & 0x01;
bit3 = (val >> 3) & 0x01;
g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
- val = state->m_paletteram[offs2 | 0x20];
+ val = m_paletteram[offs2 | 0x20];
bit0 = (val >> 0) & 0x01;
bit1 = (val >> 1) & 0x01;
bit2 = (val >> 2) & 0x01;
bit3 = (val >> 3) & 0x01;
b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
- palette_set_color(space->machine(), offs2 + 64, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), offs2 + 64, MAKE_RGB(r, g, b));
}
-WRITE8_HANDLER( ssozumo_scroll_w )
+WRITE8_MEMBER(ssozumo_state::ssozumo_scroll_w)
{
- ssozumo_state *state = space->machine().driver_data<ssozumo_state>();
- state->m_bg_tilemap->set_scrolly(0, data);
+ m_bg_tilemap->set_scrolly(0, data);
}
-WRITE8_HANDLER( ssozumo_flipscreen_w )
+WRITE8_MEMBER(ssozumo_state::ssozumo_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/sspeedr.c b/src/mame/video/sspeedr.c
index 8b559592807..0318917ec27 100644
--- a/src/mame/video/sspeedr.c
+++ b/src/mame/video/sspeedr.c
@@ -8,87 +8,75 @@ Taito Super Speed Race video emulation
#include "includes/sspeedr.h"
-WRITE8_HANDLER( sspeedr_driver_horz_w )
+WRITE8_MEMBER(sspeedr_state::sspeedr_driver_horz_w)
{
- sspeedr_state *state = space->machine().driver_data<sspeedr_state>();
- state->m_driver_horz = (state->m_driver_horz & 0x100) | data;
+ m_driver_horz = (m_driver_horz & 0x100) | data;
}
-WRITE8_HANDLER( sspeedr_driver_horz_2_w )
+WRITE8_MEMBER(sspeedr_state::sspeedr_driver_horz_2_w)
{
- sspeedr_state *state = space->machine().driver_data<sspeedr_state>();
- state->m_driver_horz = (state->m_driver_horz & 0xff) | ((data & 1) << 8);
+ m_driver_horz = (m_driver_horz & 0xff) | ((data & 1) << 8);
}
-WRITE8_HANDLER( sspeedr_driver_vert_w )
+WRITE8_MEMBER(sspeedr_state::sspeedr_driver_vert_w)
{
- sspeedr_state *state = space->machine().driver_data<sspeedr_state>();
- state->m_driver_vert = data;
+ m_driver_vert = data;
}
-WRITE8_HANDLER( sspeedr_driver_pic_w )
+WRITE8_MEMBER(sspeedr_state::sspeedr_driver_pic_w)
{
- sspeedr_state *state = space->machine().driver_data<sspeedr_state>();
- state->m_driver_pic = data & 0x1f;
+ m_driver_pic = data & 0x1f;
}
-WRITE8_HANDLER( sspeedr_drones_horz_w )
+WRITE8_MEMBER(sspeedr_state::sspeedr_drones_horz_w)
{
- sspeedr_state *state = space->machine().driver_data<sspeedr_state>();
- state->m_drones_horz = (state->m_drones_horz & 0x100) | data;
+ m_drones_horz = (m_drones_horz & 0x100) | data;
}
-WRITE8_HANDLER( sspeedr_drones_horz_2_w )
+WRITE8_MEMBER(sspeedr_state::sspeedr_drones_horz_2_w)
{
- sspeedr_state *state = space->machine().driver_data<sspeedr_state>();
- state->m_drones_horz = (state->m_drones_horz & 0xff) | ((data & 1) << 8);
+ m_drones_horz = (m_drones_horz & 0xff) | ((data & 1) << 8);
}
-WRITE8_HANDLER( sspeedr_drones_mask_w )
+WRITE8_MEMBER(sspeedr_state::sspeedr_drones_mask_w)
{
- sspeedr_state *state = space->machine().driver_data<sspeedr_state>();
- state->m_drones_mask = data & 0x3f;
+ m_drones_mask = data & 0x3f;
}
-WRITE8_HANDLER( sspeedr_drones_vert_w )
+WRITE8_MEMBER(sspeedr_state::sspeedr_drones_vert_w)
{
- sspeedr_state *state = space->machine().driver_data<sspeedr_state>();
- state->m_drones_vert[offset] = data;
+ m_drones_vert[offset] = data;
}
-WRITE8_HANDLER( sspeedr_track_horz_w )
+WRITE8_MEMBER(sspeedr_state::sspeedr_track_horz_w)
{
- sspeedr_state *state = space->machine().driver_data<sspeedr_state>();
- state->m_track_horz = (state->m_track_horz & 0x100) | data;
+ m_track_horz = (m_track_horz & 0x100) | data;
}
-WRITE8_HANDLER( sspeedr_track_horz_2_w )
+WRITE8_MEMBER(sspeedr_state::sspeedr_track_horz_2_w)
{
- sspeedr_state *state = space->machine().driver_data<sspeedr_state>();
- state->m_track_horz = (state->m_track_horz & 0xff) | ((data & 1) << 8);
+ m_track_horz = (m_track_horz & 0xff) | ((data & 1) << 8);
}
-WRITE8_HANDLER( sspeedr_track_vert_w )
+WRITE8_MEMBER(sspeedr_state::sspeedr_track_vert_w)
{
- sspeedr_state *state = space->machine().driver_data<sspeedr_state>();
- state->m_track_vert[offset] = data & 0x7f;
+ m_track_vert[offset] = data & 0x7f;
}
-WRITE8_HANDLER( sspeedr_track_ice_w )
+WRITE8_MEMBER(sspeedr_state::sspeedr_track_ice_w)
{
- sspeedr_state *state = space->machine().driver_data<sspeedr_state>();
- state->m_track_ice = data & 0x07;
+ m_track_ice = data & 0x07;
}
diff --git a/src/mame/video/ssrj.c b/src/mame/video/ssrj.c
index e11ad1b820a..8af8744de29 100644
--- a/src/mame/video/ssrj.c
+++ b/src/mame/video/ssrj.c
@@ -3,12 +3,11 @@
/* tilemap 1 */
-WRITE8_HANDLER(ssrj_vram1_w)
+WRITE8_MEMBER(ssrj_state::ssrj_vram1_w)
{
- ssrj_state *state = space->machine().driver_data<ssrj_state>();
- state->m_vram1[offset] = data;
- state->m_tilemap1->mark_tile_dirty(offset>>1);
+ m_vram1[offset] = data;
+ m_tilemap1->mark_tile_dirty(offset>>1);
}
static TILE_GET_INFO( get_tile_info1 )
@@ -25,12 +24,11 @@ static TILE_GET_INFO( get_tile_info1 )
/* tilemap 2 */
-WRITE8_HANDLER(ssrj_vram2_w)
+WRITE8_MEMBER(ssrj_state::ssrj_vram2_w)
{
- ssrj_state *state = space->machine().driver_data<ssrj_state>();
- state->m_vram2[offset] = data;
- state->m_tilemap2->mark_tile_dirty(offset>>1);
+ m_vram2[offset] = data;
+ m_tilemap2->mark_tile_dirty(offset>>1);
}
static TILE_GET_INFO( get_tile_info2 )
@@ -47,12 +45,11 @@ static TILE_GET_INFO( get_tile_info2 )
/* tilemap 4 */
-WRITE8_HANDLER(ssrj_vram4_w)
+WRITE8_MEMBER(ssrj_state::ssrj_vram4_w)
{
- ssrj_state *state = space->machine().driver_data<ssrj_state>();
- state->m_vram4[offset] = data;
- state->m_tilemap4->mark_tile_dirty(offset>>1);
+ m_vram4[offset] = data;
+ m_tilemap4->mark_tile_dirty(offset>>1);
}
static TILE_GET_INFO( get_tile_info4 )
diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c
index 69e7fb8e16c..5a6d438a0c9 100644
--- a/src/mame/video/ssv.c
+++ b/src/mame/video/ssv.c
@@ -216,12 +216,11 @@ static TILE_GET_INFO( get_tile_info_0 )
SET_TILE_INFO(3, tile, 0, TILE_FLIPXY( tile >> 14 ));
}
-WRITE16_HANDLER( gdfs_tmapram_w )
+WRITE16_MEMBER(ssv_state::gdfs_tmapram_w)
{
- ssv_state *state = space->machine().driver_data<ssv_state>();
- COMBINE_DATA(&state->m_gdfs_tmapram[offset]);
- state->m_gdfs_tmap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_gdfs_tmapram[offset]);
+ m_gdfs_tmap->mark_tile_dirty(offset);
}
VIDEO_START( gdfs )
@@ -380,42 +379,40 @@ VIDEO_START( gdfs )
***************************************************************************/
-READ16_HANDLER( ssv_vblank_r )
+READ16_MEMBER(ssv_state::ssv_vblank_r)
{
- if (space->machine().primary_screen->vblank())
+ if (machine().primary_screen->vblank())
return 0x2000 | 0x1000;
else
return 0x0000;
}
-WRITE16_HANDLER( ssv_scroll_w )
+WRITE16_MEMBER(ssv_state::ssv_scroll_w)
{
- ssv_state *state = space->machine().driver_data<ssv_state>();
- COMBINE_DATA(state->m_scroll + offset);
+ COMBINE_DATA(m_scroll + offset);
/* offsets 60-7f: CRT Controller */
}
-WRITE16_HANDLER( paletteram16_xrgb_swap_word_w )
+WRITE16_MEMBER(ssv_state::paletteram16_xrgb_swap_word_w)
{
- ssv_state *state = space->machine().driver_data<ssv_state>();
int r, g, b;
UINT16 data0, data1;
- COMBINE_DATA(state->m_paletteram + offset);
+ COMBINE_DATA(m_paletteram + offset);
offset &= ~1;
- data0 = state->m_paletteram[offset + 1];
- data1 = state->m_paletteram[offset];
+ data0 = m_paletteram[offset + 1];
+ data1 = m_paletteram[offset];
r = data0 & 0xff;
g = data1 >> 8;
b = data1 & 0xff;
- palette_set_color(space->machine(), offset>>1, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), offset>>1, MAKE_RGB(r, g, b));
}
/***************************************************************************
diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c
index 9460c891751..ad7e72d96e2 100644
--- a/src/mame/video/st0016.c
+++ b/src/mame/video/st0016.c
@@ -30,7 +30,7 @@ static const gfx_layout charlayout =
8*8*4
};
-WRITE8_HANDLER(st0016_sprite_bank_w)
+WRITE8_MEMBER(st0016_state::st0016_sprite_bank_w)
{
/*
76543210
@@ -41,7 +41,7 @@ WRITE8_HANDLER(st0016_sprite_bank_w)
st0016_spr2_bank=(data>>4)&ST0016_SPR_BANK_MASK;
}
-WRITE8_HANDLER(st0016_palette_bank_w)
+WRITE8_MEMBER(st0016_state::st0016_palette_bank_w)
{
/*
76543210
@@ -51,7 +51,7 @@ WRITE8_HANDLER(st0016_palette_bank_w)
st0016_pal_bank=data&ST0016_PAL_BANK_MASK;
}
-WRITE8_HANDLER(st0016_character_bank_w)
+WRITE8_MEMBER(st0016_state::st0016_character_bank_w)
{
/*
fedcba9876543210
@@ -67,55 +67,55 @@ WRITE8_HANDLER(st0016_character_bank_w)
}
-READ8_HANDLER (st0016_sprite_ram_r)
+READ8_MEMBER(st0016_state::st0016_sprite_ram_r)
{
return st0016_spriteram[ST0016_SPR_BANK_SIZE*st0016_spr_bank+offset];
}
-WRITE8_HANDLER (st0016_sprite_ram_w)
+WRITE8_MEMBER(st0016_state::st0016_sprite_ram_w)
{
st0016_spriteram[ST0016_SPR_BANK_SIZE*st0016_spr_bank+offset]=data;
}
-READ8_HANDLER (st0016_sprite2_ram_r)
+READ8_MEMBER(st0016_state::st0016_sprite2_ram_r)
{
return st0016_spriteram[ST0016_SPR_BANK_SIZE*st0016_spr2_bank+offset];
}
-WRITE8_HANDLER (st0016_sprite2_ram_w)
+WRITE8_MEMBER(st0016_state::st0016_sprite2_ram_w)
{
st0016_spriteram[ST0016_SPR_BANK_SIZE*st0016_spr2_bank+offset]=data;
}
-READ8_HANDLER (st0016_palette_ram_r)
+READ8_MEMBER(st0016_state::st0016_palette_ram_r)
{
return st0016_paletteram[ST0016_PAL_BANK_SIZE*st0016_pal_bank+offset];
}
-WRITE8_HANDLER (st0016_palette_ram_w)
+WRITE8_MEMBER(st0016_state::st0016_palette_ram_w)
{
int color=(ST0016_PAL_BANK_SIZE*st0016_pal_bank+offset)/2;
int val;
st0016_paletteram[ST0016_PAL_BANK_SIZE*st0016_pal_bank+offset]=data;
val=st0016_paletteram[color*2]+(st0016_paletteram[color*2+1]<<8);
if(!color)
- palette_set_color_rgb(space->machine(),UNUSED_PEN,pal5bit(val >> 0),pal5bit(val >> 5),pal5bit(val >> 10)); /* same as color 0 - bg ? */
- palette_set_color_rgb(space->machine(),color,pal5bit(val >> 0),pal5bit(val >> 5),pal5bit(val >> 10));
+ palette_set_color_rgb(machine(),UNUSED_PEN,pal5bit(val >> 0),pal5bit(val >> 5),pal5bit(val >> 10)); /* same as color 0 - bg ? */
+ palette_set_color_rgb(machine(),color,pal5bit(val >> 0),pal5bit(val >> 5),pal5bit(val >> 10));
}
-READ8_HANDLER(st0016_character_ram_r)
+READ8_MEMBER(st0016_state::st0016_character_ram_r)
{
return st0016_charram[ST0016_CHAR_BANK_SIZE*st0016_char_bank+offset];
}
-WRITE8_HANDLER(st0016_character_ram_w)
+WRITE8_MEMBER(st0016_state::st0016_character_ram_w)
{
st0016_charram[ST0016_CHAR_BANK_SIZE*st0016_char_bank+offset]=data;
- gfx_element_mark_dirty(space->machine().gfx[st0016_ramgfx], st0016_char_bank);
+ gfx_element_mark_dirty(machine().gfx[st0016_ramgfx], st0016_char_bank);
}
-READ8_HANDLER(st0016_vregs_r)
+READ8_MEMBER(st0016_state::st0016_vregs_r)
{
/*
$0, $1 = max scanline(including vblank)/timer? ($3e7)
@@ -139,13 +139,13 @@ READ8_HANDLER(st0016_vregs_r)
{
case 0:
case 1:
- return space->machine().rand();
+ return machine().rand();
}
return st0016_vregs[offset];
}
-READ8_HANDLER(st0016_dma_r)
+READ8_MEMBER(st0016_state::st0016_dma_r)
{
/* bits 0 and 1 = 0 -> DMA transfer complete */
if(ISMACS)
@@ -155,7 +155,7 @@ READ8_HANDLER(st0016_dma_r)
}
-WRITE8_HANDLER(st0016_vregs_w)
+WRITE8_MEMBER(st0016_state::st0016_vregs_w)
{
/*
@@ -186,8 +186,8 @@ WRITE8_HANDLER(st0016_vregs_w)
UINT32 srcadr=(st0016_vregs[0xa0]|(st0016_vregs[0xa1]<<8)|(st0016_vregs[0xa2]<<16))<<1;
UINT32 dstadr=(st0016_vregs[0xa3]|(st0016_vregs[0xa4]<<8)|(st0016_vregs[0xa5]<<16))<<1;
UINT32 length=((st0016_vregs[0xa6]|(st0016_vregs[0xa7]<<8)|((st0016_vregs[0xa8]&0x1f)<<16))+1)<<1;
- UINT32 srclen = (space->machine().region("maincpu")->bytes()-0x10000);
- UINT8 *mem = space->machine().region("maincpu")->base();
+ UINT32 srclen = (machine().region("maincpu")->bytes()-0x10000);
+ UINT8 *mem = machine().region("maincpu")->base();
srcadr += macs_cart_slot*0x400000;
@@ -205,7 +205,7 @@ WRITE8_HANDLER(st0016_vregs_w)
{
/* samples ? sound dma ? */
// speaglsht: unknown DMA copy : src - 2B6740, dst - 4400, len - 1E400
- logerror("unknown DMA copy : src - %X, dst - %X, len - %X, PC - %X\n",srcadr,dstadr,length,cpu_get_previouspc(&space->device()));
+ logerror("unknown DMA copy : src - %X, dst - %X, len - %X, PC - %X\n",srcadr,dstadr,length,cpu_get_previouspc(&space.device()));
break;
}
}
diff --git a/src/mame/video/stactics.c b/src/mame/video/stactics.c
index fba25af01fa..561c17ab39c 100644
--- a/src/mame/video/stactics.c
+++ b/src/mame/video/stactics.c
@@ -89,17 +89,16 @@ static PALETTE_INIT( stactics )
*
*************************************/
-WRITE8_HANDLER( stactics_scroll_ram_w )
+WRITE8_MEMBER(stactics_state::stactics_scroll_ram_w)
{
- stactics_state *state = space->machine().driver_data<stactics_state>();
if (data & 0x01)
{
switch (offset >> 8)
{
- case 4: state->m_y_scroll_d = offset & 0xff; break;
- case 5: state->m_y_scroll_e = offset & 0xff; break;
- case 6: state->m_y_scroll_f = offset & 0xff; break;
+ case 4: m_y_scroll_d = offset & 0xff; break;
+ case 5: m_y_scroll_e = offset & 0xff; break;
+ case 6: m_y_scroll_f = offset & 0xff; break;
}
}
}
@@ -127,9 +126,8 @@ CUSTOM_INPUT( stactics_get_frame_count_d3 )
*
*************************************/
-WRITE8_HANDLER( stactics_speed_latch_w )
+WRITE8_MEMBER(stactics_state::stactics_speed_latch_w)
{
- stactics_state *state = space->machine().driver_data<stactics_state>();
/* This writes to a shift register which is clocked by */
/* a 555 oscillator. This value determines the speed of */
@@ -150,23 +148,21 @@ WRITE8_HANDLER( stactics_speed_latch_w )
num_rising_edges++;
}
- state->m_beam_states_per_frame = num_rising_edges*19/8;
+ m_beam_states_per_frame = num_rising_edges*19/8;
}
-WRITE8_HANDLER( stactics_shot_trigger_w )
+WRITE8_MEMBER(stactics_state::stactics_shot_trigger_w)
{
- stactics_state *state = space->machine().driver_data<stactics_state>();
- state->m_shot_standby = 0;
+ m_shot_standby = 0;
}
-WRITE8_HANDLER( stactics_shot_flag_clear_w )
+WRITE8_MEMBER(stactics_state::stactics_shot_flag_clear_w)
{
- stactics_state *state = space->machine().driver_data<stactics_state>();
- state->m_shot_arrive = 0;
+ m_shot_arrive = 0;
}
diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c
index cacb8eec643..8a5c004a71e 100644
--- a/src/mame/video/stadhero.c
+++ b/src/mame/video/stadhero.c
@@ -33,11 +33,10 @@ SCREEN_UPDATE_IND16( stadhero )
/******************************************************************************/
-WRITE16_HANDLER( stadhero_pf1_data_w )
+WRITE16_MEMBER(stadhero_state::stadhero_pf1_data_w)
{
- stadhero_state *state = space->machine().driver_data<stadhero_state>();
- COMBINE_DATA(&state->m_pf1_data[offset]);
- state->m_pf1_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_pf1_data[offset]);
+ m_pf1_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/starcrus.c b/src/mame/video/starcrus.c
index 90e716f7855..95387baa09b 100644
--- a/src/mame/video/starcrus.c
+++ b/src/mame/video/starcrus.c
@@ -8,14 +8,14 @@
/* The collision detection techniques use in this driver
are well explained in the comments in the sprint2 driver */
-WRITE8_HANDLER( starcrus_s1_x_w ) { space->machine().driver_data<starcrus_state>()->m_s1_x = data^0xff; }
-WRITE8_HANDLER( starcrus_s1_y_w ) { space->machine().driver_data<starcrus_state>()->m_s1_y = data^0xff; }
-WRITE8_HANDLER( starcrus_s2_x_w ) { space->machine().driver_data<starcrus_state>()->m_s2_x = data^0xff; }
-WRITE8_HANDLER( starcrus_s2_y_w ) { space->machine().driver_data<starcrus_state>()->m_s2_y = data^0xff; }
-WRITE8_HANDLER( starcrus_p1_x_w ) { space->machine().driver_data<starcrus_state>()->m_p1_x = data^0xff; }
-WRITE8_HANDLER( starcrus_p1_y_w ) { space->machine().driver_data<starcrus_state>()->m_p1_y = data^0xff; }
-WRITE8_HANDLER( starcrus_p2_x_w ) { space->machine().driver_data<starcrus_state>()->m_p2_x = data^0xff; }
-WRITE8_HANDLER( starcrus_p2_y_w ) { space->machine().driver_data<starcrus_state>()->m_p2_y = data^0xff; }
+WRITE8_MEMBER(starcrus_state::starcrus_s1_x_w){ m_s1_x = data^0xff; }
+WRITE8_MEMBER(starcrus_state::starcrus_s1_y_w){ m_s1_y = data^0xff; }
+WRITE8_MEMBER(starcrus_state::starcrus_s2_x_w){ m_s2_x = data^0xff; }
+WRITE8_MEMBER(starcrus_state::starcrus_s2_y_w){ m_s2_y = data^0xff; }
+WRITE8_MEMBER(starcrus_state::starcrus_p1_x_w){ m_p1_x = data^0xff; }
+WRITE8_MEMBER(starcrus_state::starcrus_p1_y_w){ m_p1_y = data^0xff; }
+WRITE8_MEMBER(starcrus_state::starcrus_p2_x_w){ m_p2_x = data^0xff; }
+WRITE8_MEMBER(starcrus_state::starcrus_p2_y_w){ m_p2_y = data^0xff; }
VIDEO_START( starcrus )
{
@@ -27,138 +27,134 @@ VIDEO_START( starcrus )
state->m_proj2_vid = auto_bitmap_ind16_alloc(machine, 16, 16);
}
-WRITE8_HANDLER( starcrus_ship_parm_1_w )
+WRITE8_MEMBER(starcrus_state::starcrus_ship_parm_1_w)
{
- starcrus_state *state = space->machine().driver_data<starcrus_state>();
- samples_device *samples = space->machine().device<samples_device>("samples");
+ samples_device *samples = machine().device<samples_device>("samples");
- state->m_s1_sprite = data&0x1f;
- state->m_engine1_on = ((data&0x20)>>5)^0x01;
+ m_s1_sprite = data&0x1f;
+ m_engine1_on = ((data&0x20)>>5)^0x01;
- if (state->m_engine1_on || state->m_engine2_on)
+ if (m_engine1_on || m_engine2_on)
{
- if (state->m_engine_sound_playing == 0)
+ if (m_engine_sound_playing == 0)
{
- state->m_engine_sound_playing = 1;
+ m_engine_sound_playing = 1;
samples->start(0, 0, true); /* engine sample */
}
}
else
{
- if (state->m_engine_sound_playing == 1)
+ if (m_engine_sound_playing == 1)
{
- state->m_engine_sound_playing = 0;
+ m_engine_sound_playing = 0;
samples->stop(0);
}
}
}
-WRITE8_HANDLER( starcrus_ship_parm_2_w )
+WRITE8_MEMBER(starcrus_state::starcrus_ship_parm_2_w)
{
- starcrus_state *state = space->machine().driver_data<starcrus_state>();
- samples_device *samples = space->machine().device<samples_device>("samples");
+ samples_device *samples = machine().device<samples_device>("samples");
- state->m_s2_sprite = data&0x1f;
- set_led_status(space->machine(), 2,~data & 0x80); /* game over lamp */
- coin_counter_w(space->machine(), 0, ((data&0x40)>>6)^0x01); /* coin counter */
- state->m_engine2_on = ((data&0x20)>>5)^0x01;
+ m_s2_sprite = data&0x1f;
+ set_led_status(machine(), 2,~data & 0x80); /* game over lamp */
+ coin_counter_w(machine(), 0, ((data&0x40)>>6)^0x01); /* coin counter */
+ m_engine2_on = ((data&0x20)>>5)^0x01;
- if (state->m_engine1_on || state->m_engine2_on)
+ if (m_engine1_on || m_engine2_on)
{
- if (state->m_engine_sound_playing == 0)
+ if (m_engine_sound_playing == 0)
{
- state->m_engine_sound_playing = 1;
+ m_engine_sound_playing = 1;
samples->start(0, 0, true); /* engine sample */
}
}
else
{
- if (state->m_engine_sound_playing == 1)
+ if (m_engine_sound_playing == 1)
{
- state->m_engine_sound_playing = 0;
+ m_engine_sound_playing = 0;
samples->stop(0);
}
}
}
-WRITE8_HANDLER( starcrus_proj_parm_1_w )
+WRITE8_MEMBER(starcrus_state::starcrus_proj_parm_1_w)
{
- starcrus_state *state = space->machine().driver_data<starcrus_state>();
- samples_device *samples = space->machine().device<samples_device>("samples");
+ samples_device *samples = machine().device<samples_device>("samples");
- state->m_p1_sprite = data&0x0f;
- state->m_launch1_on = ((data&0x20)>>5)^0x01;
- state->m_explode1_on = ((data&0x10)>>4)^0x01;
+ m_p1_sprite = data&0x0f;
+ m_launch1_on = ((data&0x20)>>5)^0x01;
+ m_explode1_on = ((data&0x10)>>4)^0x01;
- if (state->m_explode1_on || state->m_explode2_on)
+ if (m_explode1_on || m_explode2_on)
{
- if (state->m_explode_sound_playing == 0)
+ if (m_explode_sound_playing == 0)
{
- state->m_explode_sound_playing = 1;
+ m_explode_sound_playing = 1;
samples->start(1,1, true); /* explosion initial sample */
}
}
else
{
- if (state->m_explode_sound_playing == 1)
+ if (m_explode_sound_playing == 1)
{
- state->m_explode_sound_playing = 0;
+ m_explode_sound_playing = 0;
samples->start(1,2); /* explosion ending sample */
}
}
- if (state->m_launch1_on)
+ if (m_launch1_on)
{
- if (state->m_launch1_sound_playing == 0)
+ if (m_launch1_sound_playing == 0)
{
- state->m_launch1_sound_playing = 1;
+ m_launch1_sound_playing = 1;
samples->start(2,3); /* launch sample */
}
}
else
{
- state->m_launch1_sound_playing = 0;
+ m_launch1_sound_playing = 0;
}
}
-WRITE8_HANDLER( starcrus_proj_parm_2_w )
+WRITE8_MEMBER(starcrus_state::starcrus_proj_parm_2_w)
{
- starcrus_state *state = space->machine().driver_data<starcrus_state>();
- samples_device *samples = space->machine().device<samples_device>("samples");
+ samples_device *samples = machine().device<samples_device>("samples");
- state->m_p2_sprite = data&0x0f;
- state->m_launch2_on = ((data&0x20)>>5)^0x01;
- state->m_explode2_on = ((data&0x10)>>4)^0x01;
+ m_p2_sprite = data&0x0f;
+ m_launch2_on = ((data&0x20)>>5)^0x01;
+ m_explode2_on = ((data&0x10)>>4)^0x01;
- if (state->m_explode1_on || state->m_explode2_on)
+ if (m_explode1_on || m_explode2_on)
{
- if (state->m_explode_sound_playing == 0)
+ if (m_explode_sound_playing == 0)
{
- state->m_explode_sound_playing = 1;
+ m_explode_sound_playing = 1;
samples->start(1,1, true); /* explosion initial sample */
}
}
else
{
- if (state->m_explode_sound_playing == 1)
+ if (m_explode_sound_playing == 1)
{
- state->m_explode_sound_playing = 0;
+ m_explode_sound_playing = 0;
samples->start(1,2); /* explosion ending sample */
}
}
- if (state->m_launch2_on)
+ if (m_launch2_on)
{
- if (state->m_launch2_sound_playing == 0)
+ if (m_launch2_sound_playing == 0)
{
- state->m_launch2_sound_playing = 1;
+ m_launch2_sound_playing = 1;
samples->start(3,3); /* launch sample */
}
}
else
{
- state->m_launch2_sound_playing = 0;
+ m_launch2_sound_playing = 0;
}
}
@@ -482,9 +478,8 @@ SCREEN_UPDATE_IND16( starcrus )
return 0;
}
-READ8_HANDLER( starcrus_coll_det_r )
+READ8_MEMBER(starcrus_state::starcrus_coll_det_r)
{
- starcrus_state *state = space->machine().driver_data<starcrus_state>();
- return state->m_collision_reg ^ 0xff;
+ return m_collision_reg ^ 0xff;
}
diff --git a/src/mame/video/starfire.c b/src/mame/video/starfire.c
index 0133d28f2fb..70f80ee2f69 100644
--- a/src/mame/video/starfire.c
+++ b/src/mame/video/starfire.c
@@ -37,9 +37,8 @@ VIDEO_START( starfire )
*
*************************************/
-WRITE8_HANDLER( starfire_colorram_w )
+WRITE8_MEMBER(starfire_state::starfire_colorram_w)
{
- starfire_state *state = space->machine().driver_data<starfire_state>();
/* handle writes to the pseudo-color RAM */
if ((offset & 0xe0) == 0)
@@ -47,19 +46,19 @@ WRITE8_HANDLER( starfire_colorram_w )
int palette_index = (offset & 0x1f) | ((offset & 0x200) >> 4);
/* set RAM regardless */
- int cl = (state->m_starfire_vidctrl1 & 0x80) ? state->m_starfire_color : (data & 0x1f);
+ int cl = (m_starfire_vidctrl1 & 0x80) ? m_starfire_color : (data & 0x1f);
int cr = (data >> 5) | ((offset & 0x100) >> 5);
- cr |= (state->m_starfire_vidctrl1 & 0x80) ? (state->m_starfire_color & 0x10) : (data & 0x10);
+ cr |= (m_starfire_vidctrl1 & 0x80) ? (m_starfire_color & 0x10) : (data & 0x10);
- state->m_starfire_colorram[offset & ~0x100] = cl;
- state->m_starfire_colorram[offset | 0x100] = cr;
+ m_starfire_colorram[offset & ~0x100] = cl;
+ m_starfire_colorram[offset | 0x100] = cr;
- state->m_starfire_color = cl;
+ m_starfire_color = cl;
/* don't modify the palette unless the TRANS bit is set */
- if (state->m_starfire_vidctrl1 & 0x40)
+ if (m_starfire_vidctrl1 & 0x40)
{
- state->m_starfire_colors[palette_index] = ((cl & 0x3) << 7) | ((cr & 0xf) << 3) | ((cl & 0x1c) >> 2);
+ m_starfire_colors[palette_index] = ((cl & 0x3) << 7) | ((cr & 0xf) << 3) | ((cl & 0x1c) >> 2);
}
}
@@ -67,32 +66,31 @@ WRITE8_HANDLER( starfire_colorram_w )
else
{
/* set RAM based on CDRM */
- state->m_starfire_colorram[offset] = (state->m_starfire_vidctrl1 & 0x80) ? state->m_starfire_color : (data & 0x1f);
- state->m_starfire_color = (state->m_starfire_vidctrl1 & 0x80) ? state->m_starfire_color : (data & 0x1f);
+ m_starfire_colorram[offset] = (m_starfire_vidctrl1 & 0x80) ? m_starfire_color : (data & 0x1f);
+ m_starfire_color = (m_starfire_vidctrl1 & 0x80) ? m_starfire_color : (data & 0x1f);
}
}
-READ8_HANDLER( starfire_colorram_r )
+READ8_MEMBER(starfire_state::starfire_colorram_r)
{
- starfire_state *state = space->machine().driver_data<starfire_state>();
/* handle writes to the pseudo-color RAM, which also happen on reads */
if ((offset & 0xe0) == 0)
{
int palette_index = (offset & 0x1f) | ((offset & 0x200) >> 4);
- int cl = state->m_starfire_colorram[offset & ~0x100];
- int cr = state->m_starfire_colorram[offset | 0x100];
+ int cl = m_starfire_colorram[offset & ~0x100];
+ int cr = m_starfire_colorram[offset | 0x100];
/* don't modify the palette unless the TRANS bit is set */
- if (state->m_starfire_vidctrl1 & 0x40)
+ if (m_starfire_vidctrl1 & 0x40)
{
- state->m_starfire_colors[palette_index] = ((cl & 0x3) << 7) | ((cr & 0xf) << 3) | ((cl & 0x1c) >> 2);
+ m_starfire_colors[palette_index] = ((cl & 0x3) << 7) | ((cr & 0xf) << 3) | ((cl & 0x1c) >> 2);
}
return cl | ((cr & 0x7) << 5);
}
- return state->m_starfire_colorram[offset];
+ return m_starfire_colorram[offset];
}
/*************************************
@@ -101,27 +99,26 @@ READ8_HANDLER( starfire_colorram_r )
*
*************************************/
-WRITE8_HANDLER( starfire_videoram_w )
+WRITE8_MEMBER(starfire_state::starfire_videoram_w)
{
int sh, lr, dm, ds, mask, d0, dalu;
int offset1 = offset & 0x1fff;
int offset2 = (offset + 0x100) & 0x1fff;
- starfire_state *state = space->machine().driver_data<starfire_state>();
/* PROT */
- if (!(offset & 0xe0) && !(state->m_starfire_vidctrl1 & 0x20))
+ if (!(offset & 0xe0) && !(m_starfire_vidctrl1 & 0x20))
return;
/* selector 6A */
if (offset & 0x2000)
{
- sh = (state->m_starfire_vidctrl >> 1) & 0x07;
- lr = state->m_starfire_vidctrl & 0x01;
+ sh = (m_starfire_vidctrl >> 1) & 0x07;
+ lr = m_starfire_vidctrl & 0x01;
}
else
{
- sh = (state->m_starfire_vidctrl >> 5) & 0x07;
- lr = (state->m_starfire_vidctrl >> 4) & 0x01;
+ sh = (m_starfire_vidctrl >> 5) & 0x07;
+ lr = (m_starfire_vidctrl >> 4) & 0x01;
}
/* mirror bits 5B/5C/5D/5E */
@@ -137,18 +134,18 @@ WRITE8_HANDLER( starfire_videoram_w )
/* ROLL */
if ((offset & 0x1f00) == 0x1f00)
{
- if (state->m_starfire_vidctrl1 & 0x10)
+ if (m_starfire_vidctrl1 & 0x10)
mask &= 0x00ff;
else
mask &= 0xff00;
}
/* ALU 8B/8D */
- d0 = (state->m_starfire_videoram[offset1] << 8) | state->m_starfire_videoram[offset2];
+ d0 = (m_starfire_videoram[offset1] << 8) | m_starfire_videoram[offset2];
dalu = d0 & ~mask;
d0 &= mask;
ds &= mask;
- switch (~state->m_starfire_vidctrl1 & 15)
+ switch (~m_starfire_vidctrl1 & 15)
{
case 0: dalu |= ds ^ mask; break;
case 1: dalu |= (ds | d0) ^ mask; break;
@@ -169,31 +166,30 @@ WRITE8_HANDLER( starfire_videoram_w )
}
/* final output */
- state->m_starfire_videoram[offset1] = dalu >> 8;
- state->m_starfire_videoram[offset2] = dalu;
+ m_starfire_videoram[offset1] = dalu >> 8;
+ m_starfire_videoram[offset2] = dalu;
/* color output */
- if (!(offset & 0x2000) && !(state->m_starfire_vidctrl1 & 0x80))
+ if (!(offset & 0x2000) && !(m_starfire_vidctrl1 & 0x80))
{
if (mask & 0xff00)
- state->m_starfire_colorram[offset1] = state->m_starfire_color;
+ m_starfire_colorram[offset1] = m_starfire_color;
if (mask & 0x00ff)
- state->m_starfire_colorram[offset2] = state->m_starfire_color;
+ m_starfire_colorram[offset2] = m_starfire_color;
}
}
-READ8_HANDLER( starfire_videoram_r )
+READ8_MEMBER(starfire_state::starfire_videoram_r)
{
int sh, mask, d0;
int offset1 = offset & 0x1fff;
int offset2 = (offset + 0x100) & 0x1fff;
- starfire_state *state = space->machine().driver_data<starfire_state>();
/* selector 6A */
if (offset & 0x2000)
- sh = (state->m_starfire_vidctrl >> 1) & 0x07;
+ sh = (m_starfire_vidctrl >> 1) & 0x07;
else
- sh = (state->m_starfire_vidctrl >> 5) & 0x07;
+ sh = (m_starfire_vidctrl >> 5) & 0x07;
/* shifters 6D/6E */
mask = 0xff00 >> sh;
@@ -201,14 +197,14 @@ READ8_HANDLER( starfire_videoram_r )
/* ROLL */
if ((offset & 0x1f00) == 0x1f00)
{
- if (state->m_starfire_vidctrl1 & 0x10)
+ if (m_starfire_vidctrl1 & 0x10)
mask &= 0x00ff;
else
mask &= 0xff00;
}
/* munge the results */
- d0 = (state->m_starfire_videoram[offset1] & (mask >> 8)) | (state->m_starfire_videoram[offset2] & mask);
+ d0 = (m_starfire_videoram[offset1] & (mask >> 8)) | (m_starfire_videoram[offset2] & mask);
d0 = (d0 << sh) | (d0 >> (8 - sh));
return d0 & 0xff;
}
diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c
index 3826f34ee25..d93d9763517 100644
--- a/src/mame/video/starshp1.c
+++ b/src/mame/video/starshp1.c
@@ -85,13 +85,12 @@ VIDEO_START( starshp1 )
}
-READ8_HANDLER( starshp1_rng_r )
+READ8_MEMBER(starshp1_state::starshp1_rng_r)
{
- starshp1_state *state = space->machine().driver_data<starshp1_state>();
- int width = space->machine().primary_screen->width();
- int height = space->machine().primary_screen->height();
- int x = space->machine().primary_screen->hpos();
- int y = space->machine().primary_screen->vpos();
+ int width = machine().primary_screen->width();
+ int height = machine().primary_screen->height();
+ int x = machine().primary_screen->hpos();
+ int y = machine().primary_screen->vpos();
/* the LFSR is only running in the non-blank region
of the screen, so this is not quite right */
@@ -100,30 +99,28 @@ READ8_HANDLER( starshp1_rng_r )
if (y > height - 1)
y = height - 1;
- return state->m_LSFR[x + (UINT16) (512 * y)];
+ return m_LSFR[x + (UINT16) (512 * y)];
}
-WRITE8_HANDLER( starshp1_ssadd_w )
+WRITE8_MEMBER(starshp1_state::starshp1_ssadd_w)
{
- starshp1_state *state = space->machine().driver_data<starshp1_state>();
/*
* The range of sprite position values doesn't suffice to
- * move the zoomed spaceship sprite over the top and left
+ * move the zoomed &spaceship sprite over the top and left
* edges of the screen. These additional values are used
* to compensate for this. Technically, they cut off the
- * first columns and rows of the spaceship sprite, but in
+ * first columns and rows of the &spaceship sprite, but in
* practice they work like offsets in zoomed pixels.
*/
- state->m_ship_voffset = ((offset & 0xf0) >> 4);
- state->m_ship_hoffset = ((offset & 0x0f) << 2) | (data & 3);
+ m_ship_voffset = ((offset & 0xf0) >> 4);
+ m_ship_hoffset = ((offset & 0x0f) << 2) | (data & 3);
}
-WRITE8_HANDLER( starshp1_sspic_w )
+WRITE8_MEMBER(starshp1_state::starshp1_sspic_w)
{
- starshp1_state *state = space->machine().driver_data<starshp1_state>();
/*
* Some mysterious game code at address $2CCE is causing
* erratic images in the target explosion sequence. The
@@ -131,18 +128,17 @@ WRITE8_HANDLER( starshp1_sspic_w )
*/
if (data != 0x87)
- state->m_ship_picture = data;
+ m_ship_picture = data;
}
-WRITE8_HANDLER( starshp1_playfield_w )
+WRITE8_MEMBER(starshp1_state::starshp1_playfield_w)
{
- starshp1_state *state = space->machine().driver_data<starshp1_state>();
- if (state->m_mux != 0)
+ if (m_mux != 0)
{
offset ^= 0x1f;
- state->m_playfield_ram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_playfield_ram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
}
diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c
index aa7447b2f06..5908d0ef31c 100644
--- a/src/mame/video/stfight.c
+++ b/src/mame/video/stfight.c
@@ -174,67 +174,63 @@ VIDEO_START( stfight )
***************************************************************************/
-WRITE8_HANDLER( stfight_text_char_w )
+WRITE8_MEMBER(stfight_state::stfight_text_char_w)
{
- stfight_state *state = space->machine().driver_data<stfight_state>();
- state->m_text_char_ram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ m_text_char_ram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( stfight_text_attr_w )
+WRITE8_MEMBER(stfight_state::stfight_text_attr_w)
{
- stfight_state *state = space->machine().driver_data<stfight_state>();
- state->m_text_attr_ram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ m_text_attr_ram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( stfight_sprite_bank_w )
+WRITE8_MEMBER(stfight_state::stfight_sprite_bank_w)
{
- stfight_state *state = space->machine().driver_data<stfight_state>();
- state->m_sprite_base = ( ( data & 0x04 ) << 7 ) |
+ m_sprite_base = ( ( data & 0x04 ) << 7 ) |
( ( data & 0x01 ) << 8 );
}
-WRITE8_HANDLER( stfight_vh_latch_w )
+WRITE8_MEMBER(stfight_state::stfight_vh_latch_w)
{
- stfight_state *state = space->machine().driver_data<stfight_state>();
int scroll;
- state->m_vh_latch_ram[offset] = data;
+ m_vh_latch_ram[offset] = data;
switch( offset )
{
case 0x00:
case 0x01:
- scroll = (state->m_vh_latch_ram[1] << 8) | state->m_vh_latch_ram[0];
- state->m_fg_tilemap->set_scrollx(0,scroll);
+ scroll = (m_vh_latch_ram[1] << 8) | m_vh_latch_ram[0];
+ m_fg_tilemap->set_scrollx(0,scroll);
break;
case 0x02:
case 0x03:
- scroll = (state->m_vh_latch_ram[3] << 8) | state->m_vh_latch_ram[2];
- state->m_fg_tilemap->set_scrolly(0,scroll);
+ scroll = (m_vh_latch_ram[3] << 8) | m_vh_latch_ram[2];
+ m_fg_tilemap->set_scrolly(0,scroll);
break;
case 0x04:
case 0x05:
- scroll = (state->m_vh_latch_ram[5] << 8) | state->m_vh_latch_ram[4];
- state->m_bg_tilemap->set_scrollx(0,scroll);
+ scroll = (m_vh_latch_ram[5] << 8) | m_vh_latch_ram[4];
+ m_bg_tilemap->set_scrollx(0,scroll);
break;
case 0x06:
case 0x08:
- scroll = (state->m_vh_latch_ram[8] << 8) | state->m_vh_latch_ram[6];
- state->m_bg_tilemap->set_scrolly(0,scroll);
+ scroll = (m_vh_latch_ram[8] << 8) | m_vh_latch_ram[6];
+ m_bg_tilemap->set_scrolly(0,scroll);
break;
case 0x07:
- state->m_tx_tilemap->enable(data & 0x80);
+ m_tx_tilemap->enable(data & 0x80);
/* 0x40 = sprites */
- state->m_bg_tilemap->enable(data & 0x20);
- state->m_fg_tilemap->enable(data & 0x10);
- flip_screen_set(space->machine(), data & 0x01);
+ m_bg_tilemap->enable(data & 0x20);
+ m_fg_tilemap->enable(data & 0x10);
+ flip_screen_set(machine(), data & 0x01);
break;
}
}
diff --git a/src/mame/video/stlforce.c b/src/mame/video/stlforce.c
index 7c60bfc3c4a..f248dc694be 100644
--- a/src/mame/video/stlforce.c
+++ b/src/mame/video/stlforce.c
@@ -16,12 +16,11 @@ static TILE_GET_INFO( get_stlforce_bg_tile_info )
SET_TILE_INFO(0,tileno,colour,0);
}
-WRITE16_HANDLER( stlforce_bg_videoram_w )
+WRITE16_MEMBER(stlforce_state::stlforce_bg_videoram_w)
{
- stlforce_state *state = space->machine().driver_data<stlforce_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
/* middle layer, low */
@@ -40,12 +39,11 @@ static TILE_GET_INFO( get_stlforce_mlow_tile_info )
SET_TILE_INFO(0,tileno,colour,0);
}
-WRITE16_HANDLER( stlforce_mlow_videoram_w )
+WRITE16_MEMBER(stlforce_state::stlforce_mlow_videoram_w)
{
- stlforce_state *state = space->machine().driver_data<stlforce_state>();
- state->m_mlow_videoram[offset] = data;
- state->m_mlow_tilemap->mark_tile_dirty(offset);
+ m_mlow_videoram[offset] = data;
+ m_mlow_tilemap->mark_tile_dirty(offset);
}
/* middle layer, high */
@@ -64,12 +62,11 @@ static TILE_GET_INFO( get_stlforce_mhigh_tile_info )
SET_TILE_INFO(0,tileno,colour,0);
}
-WRITE16_HANDLER( stlforce_mhigh_videoram_w )
+WRITE16_MEMBER(stlforce_state::stlforce_mhigh_videoram_w)
{
- stlforce_state *state = space->machine().driver_data<stlforce_state>();
- state->m_mhigh_videoram[offset] = data;
- state->m_mhigh_tilemap->mark_tile_dirty(offset);
+ m_mhigh_videoram[offset] = data;
+ m_mhigh_tilemap->mark_tile_dirty(offset);
}
/* text layer, appears to be the top layer */
@@ -89,12 +86,11 @@ static TILE_GET_INFO( get_stlforce_tx_tile_info )
SET_TILE_INFO(1,tileno,colour,0);
}
-WRITE16_HANDLER( stlforce_tx_videoram_w )
+WRITE16_MEMBER(stlforce_state::stlforce_tx_videoram_w)
{
- stlforce_state *state = space->machine().driver_data<stlforce_state>();
- state->m_tx_videoram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ m_tx_videoram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset);
}
/* sprites - quite a bit still needs doing .. */
diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c
index 793c79363db..56a26988371 100644
--- a/src/mame/video/strnskil.c
+++ b/src/mame/video/strnskil.c
@@ -41,23 +41,21 @@ PALETTE_INIT( strnskil )
}
-WRITE8_HANDLER( strnskil_videoram_w )
+WRITE8_MEMBER(strnskil_state::strnskil_videoram_w)
{
- strnskil_state *state = space->machine().driver_data<strnskil_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( strnskil_scrl_ctrl_w )
+WRITE8_MEMBER(strnskil_state::strnskil_scrl_ctrl_w)
{
- strnskil_state *state = space->machine().driver_data<strnskil_state>();
- state->m_scrl_ctrl = data >> 5;
+ m_scrl_ctrl = data >> 5;
- if (flip_screen_get(space->machine()) != (data & 0x08))
+ if (flip_screen_get(machine()) != (data & 0x08))
{
- flip_screen_set(space->machine(), data & 0x08);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x08);
+ machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/subs.c b/src/mame/video/subs.c
index 768046fbdd6..e1271f3e428 100644
--- a/src/mame/video/subs.c
+++ b/src/mame/video/subs.c
@@ -8,31 +8,31 @@
#include "includes/subs.h"
#include "sound/discrete.h"
-WRITE8_HANDLER( subs_invert1_w )
+WRITE8_MEMBER(subs_state::subs_invert1_w)
{
if ((offset & 0x01) == 1)
{
- palette_set_color(space->machine(), 0, MAKE_RGB(0x00, 0x00, 0x00));
- palette_set_color(space->machine(), 1, MAKE_RGB(0xFF, 0xFF, 0xFF));
+ palette_set_color(machine(), 0, MAKE_RGB(0x00, 0x00, 0x00));
+ palette_set_color(machine(), 1, MAKE_RGB(0xFF, 0xFF, 0xFF));
}
else
{
- palette_set_color(space->machine(), 1, MAKE_RGB(0x00, 0x00, 0x00));
- palette_set_color(space->machine(), 0, MAKE_RGB(0xFF, 0xFF, 0xFF));
+ palette_set_color(machine(), 1, MAKE_RGB(0x00, 0x00, 0x00));
+ palette_set_color(machine(), 0, MAKE_RGB(0xFF, 0xFF, 0xFF));
}
}
-WRITE8_HANDLER( subs_invert2_w )
+WRITE8_MEMBER(subs_state::subs_invert2_w)
{
if ((offset & 0x01) == 1)
{
- palette_set_color(space->machine(), 2, MAKE_RGB(0x00, 0x00, 0x00));
- palette_set_color(space->machine(), 3, MAKE_RGB(0xFF, 0xFF, 0xFF));
+ palette_set_color(machine(), 2, MAKE_RGB(0x00, 0x00, 0x00));
+ palette_set_color(machine(), 3, MAKE_RGB(0xFF, 0xFF, 0xFF));
}
else
{
- palette_set_color(space->machine(), 3, MAKE_RGB(0x00, 0x00, 0x00));
- palette_set_color(space->machine(), 2, MAKE_RGB(0xFF, 0xFF, 0xFF));
+ palette_set_color(machine(), 3, MAKE_RGB(0x00, 0x00, 0x00));
+ palette_set_color(machine(), 2, MAKE_RGB(0xFF, 0xFF, 0xFF));
}
}
diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c
index a7176210aaf..92ce0f8be02 100644
--- a/src/mame/video/suna16.c
+++ b/src/mame/video/suna16.c
@@ -60,25 +60,24 @@
#include "emu.h"
#include "includes/suna16.h"
-WRITE16_HANDLER( suna16_flipscreen_w )
+WRITE16_MEMBER(suna16_state::suna16_flipscreen_w)
{
if (ACCESSING_BITS_0_7)
{
- suna16_state *state = space->machine().driver_data<suna16_state>();
- flip_screen_set(space->machine(), data & 1 );
- state->m_color_bank = ( data & 4 ) >> 2;
+ flip_screen_set(machine(), data & 1 );
+ m_color_bank = ( data & 4 ) >> 2;
}
- if (data & ~(1|4)) logerror("CPU#0 PC %06X - Flip screen unknown bits: %04X\n", cpu_get_pc(&space->device()), data);
+ if (data & ~(1|4)) logerror("CPU#0 PC %06X - Flip screen unknown bits: %04X\n", cpu_get_pc(&space.device()), data);
}
-WRITE16_HANDLER( bestbest_flipscreen_w )
+WRITE16_MEMBER(suna16_state::bestbest_flipscreen_w)
{
if (ACCESSING_BITS_0_7)
{
- flip_screen_set(space->machine(), data & 0x10 );
- //state->m_color_bank = ( data & 0x07 );
+ flip_screen_set(machine(), data & 0x10 );
+ //m_color_bank = ( data & 0x07 );
}
- if (data & ~(0x10)) logerror("CPU#0 PC %06X - Flip screen unknown bits: %04X\n", cpu_get_pc(&space->device()), data);
+ if (data & ~(0x10)) logerror("CPU#0 PC %06X - Flip screen unknown bits: %04X\n", cpu_get_pc(&space.device()), data);
}
@@ -97,20 +96,18 @@ VIDEO_START( suna16 )
state->m_paletteram = auto_alloc_array(machine, UINT16, machine.total_colors());
}
-READ16_HANDLER( suna16_paletteram16_r )
+READ16_MEMBER(suna16_state::suna16_paletteram16_r)
{
- suna16_state *state = space->machine().driver_data<suna16_state>();
- return state->m_paletteram[offset + state->m_color_bank * 256];
+ return m_paletteram[offset + m_color_bank * 256];
}
-WRITE16_HANDLER( suna16_paletteram16_w )
+WRITE16_MEMBER(suna16_state::suna16_paletteram16_w)
{
- suna16_state *state = space->machine().driver_data<suna16_state>();
- offset += state->m_color_bank * 256;
- data = COMBINE_DATA(&state->m_paletteram[offset]);
- palette_set_color_rgb( space->machine(), offset, pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10));
+ offset += m_color_bank * 256;
+ data = COMBINE_DATA(&m_paletteram[offset]);
+ palette_set_color_rgb( machine(), offset, pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10));
}
diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c
index d6566c06948..8aaa375992f 100644
--- a/src/mame/video/suna8.c
+++ b/src/mame/video/suna8.c
@@ -107,32 +107,29 @@ READ8_MEMBER( suna8_state::banked_paletteram_r )
return m_generic_paletteram_8[offset];
}
-READ8_HANDLER( suna8_banked_spriteram_r )
+READ8_MEMBER(suna8_state::suna8_banked_spriteram_r)
{
- suna8_state *state = space->machine().driver_data<suna8_state>();
- offset += state->m_spritebank * 0x2000;
- return state->m_spriteram[offset];
+ offset += m_spritebank * 0x2000;
+ return m_spriteram[offset];
}
-WRITE8_HANDLER( suna8_spriteram_w )
+WRITE8_MEMBER(suna8_state::suna8_spriteram_w)
{
- suna8_state *state = space->machine().driver_data<suna8_state>();
- state->m_spriteram[offset] = data;
+ m_spriteram[offset] = data;
#if TILEMAPS
- state->m_bg_tilemap->mark_tile_dirty(offset/2);
+ m_bg_tilemap->mark_tile_dirty(offset/2);
#endif
}
-WRITE8_HANDLER( suna8_banked_spriteram_w )
+WRITE8_MEMBER(suna8_state::suna8_banked_spriteram_w)
{
- suna8_state *state = space->machine().driver_data<suna8_state>();
- offset += state->m_spritebank * 0x2000;
- state->m_spriteram[offset] = data;
+ offset += m_spritebank * 0x2000;
+ m_spriteram[offset] = data;
#if TILEMAPS
- state->m_bg_tilemap->mark_tile_dirty(offset/2);
+ m_bg_tilemap->mark_tile_dirty(offset/2);
#endif
}
diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c
index 2fa0795ac39..5adb09f19ec 100644
--- a/src/mame/video/superqix.c
+++ b/src/mame/video/superqix.c
@@ -79,46 +79,42 @@ VIDEO_START( superqix )
***************************************************************************/
-WRITE8_HANDLER( superqix_videoram_w )
+WRITE8_MEMBER(superqix_state::superqix_videoram_w)
{
- superqix_state *state = space->machine().driver_data<superqix_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( superqix_bitmapram_w )
+WRITE8_MEMBER(superqix_state::superqix_bitmapram_w)
{
- superqix_state *state = space->machine().driver_data<superqix_state>();
- if (state->m_bitmapram[offset] != data)
+ if (m_bitmapram[offset] != data)
{
int x = 2 * (offset % 128);
int y = offset / 128 + 16;
- state->m_bitmapram[offset] = data;
+ m_bitmapram[offset] = data;
- state->m_fg_bitmap[0]->pix16(y, x) = data >> 4;
- state->m_fg_bitmap[0]->pix16(y, x + 1) = data & 0x0f;
+ m_fg_bitmap[0]->pix16(y, x) = data >> 4;
+ m_fg_bitmap[0]->pix16(y, x + 1) = data & 0x0f;
}
}
-WRITE8_HANDLER( superqix_bitmapram2_w )
+WRITE8_MEMBER(superqix_state::superqix_bitmapram2_w)
{
- superqix_state *state = space->machine().driver_data<superqix_state>();
- if (data != state->m_bitmapram2[offset])
+ if (data != m_bitmapram2[offset])
{
int x = 2 * (offset % 128);
int y = offset / 128 + 16;
- state->m_bitmapram2[offset] = data;
+ m_bitmapram2[offset] = data;
- state->m_fg_bitmap[1]->pix16(y, x) = data >> 4;
- state->m_fg_bitmap[1]->pix16(y, x + 1) = data & 0x0f;
+ m_fg_bitmap[1]->pix16(y, x) = data >> 4;
+ m_fg_bitmap[1]->pix16(y, x + 1) = data & 0x0f;
}
}
-WRITE8_HANDLER( pbillian_0410_w )
+WRITE8_MEMBER(superqix_state::pbillian_0410_w)
{
- superqix_state *state = space->machine().driver_data<superqix_state>();
/*
-------0 ? [not used]
------1- coin counter 1
@@ -128,33 +124,32 @@ WRITE8_HANDLER( pbillian_0410_w )
--5----- flip screen
*/
- coin_counter_w(space->machine(), 0,data & 0x02);
- coin_counter_w(space->machine(), 1,data & 0x04);
+ coin_counter_w(machine(), 0,data & 0x02);
+ coin_counter_w(machine(), 1,data & 0x04);
- memory_set_bank(space->machine(), "bank1", (data & 0x08) >> 3);
+ memory_set_bank(machine(), "bank1", (data & 0x08) >> 3);
- state->m_nmi_mask = data & 0x10;
- flip_screen_set(space->machine(), data & 0x20);
+ m_nmi_mask = data & 0x10;
+ flip_screen_set(machine(), data & 0x20);
}
-WRITE8_HANDLER( superqix_0410_w )
+WRITE8_MEMBER(superqix_state::superqix_0410_w)
{
- superqix_state *state = space->machine().driver_data<superqix_state>();
/* bits 0-1 select the tile bank */
- if (state->m_gfxbank != (data & 0x03))
+ if (m_gfxbank != (data & 0x03))
{
- state->m_gfxbank = data & 0x03;
- state->m_bg_tilemap->mark_all_dirty();
+ m_gfxbank = data & 0x03;
+ m_bg_tilemap->mark_all_dirty();
}
/* bit 2 selects which of the two bitmaps to display (for 2 players game) */
- state->m_show_bitmap = (data & 0x04) >> 2;
+ m_show_bitmap = (data & 0x04) >> 2;
/* bit 3 enables NMI */
- state->m_nmi_mask = data & 0x08;
+ m_nmi_mask = data & 0x08;
/* bits 4-5 control ROM bank */
- memory_set_bank(space->machine(), "bank1", (data & 0x30) >> 4);
+ memory_set_bank(machine(), "bank1", (data & 0x30) >> 4);
}
diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c
index 9a292c9cd81..97a5c6a281b 100644
--- a/src/mame/video/suprloco.c
+++ b/src/mame/video/suprloco.c
@@ -110,25 +110,22 @@ VIDEO_START( suprloco )
***************************************************************************/
-WRITE8_HANDLER( suprloco_videoram_w )
+WRITE8_MEMBER(suprloco_state::suprloco_videoram_w)
{
- suprloco_state *state = space->machine().driver_data<suprloco_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset/2);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset/2);
}
-WRITE8_HANDLER( suprloco_scrollram_w )
+WRITE8_MEMBER(suprloco_state::suprloco_scrollram_w)
{
- suprloco_state *state = space->machine().driver_data<suprloco_state>();
- int adj = flip_screen_get(space->machine()) ? -8 : 8;
+ int adj = flip_screen_get(machine()) ? -8 : 8;
- state->m_scrollram[offset] = data;
- state->m_bg_tilemap->set_scrollx(offset, data - adj);
+ m_scrollram[offset] = data;
+ m_bg_tilemap->set_scrollx(offset, data - adj);
}
-WRITE8_HANDLER( suprloco_control_w )
+WRITE8_MEMBER(suprloco_state::suprloco_control_w)
{
- suprloco_state *state = space->machine().driver_data<suprloco_state>();
/* There is probably a palette select in here */
/* Bit 0 - coin counter A */
@@ -139,24 +136,23 @@ WRITE8_HANDLER( suprloco_control_w )
/* Bit 6 - probably unused */
/* Bit 7 - flip screen */
- if ((state->m_control & 0x10) != (data & 0x10))
+ if ((m_control & 0x10) != (data & 0x10))
{
/*logerror("Bit 4 = %d\n", (data >> 4) & 1); */
}
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02);
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
- state->m_control = data;
+ m_control = data;
}
-READ8_HANDLER( suprloco_control_r )
+READ8_MEMBER(suprloco_state::suprloco_control_r)
{
- suprloco_state *state = space->machine().driver_data<suprloco_state>();
- return state->m_control;
+ return m_control;
}
diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c
index d1839e6a423..2aca99d7717 100644
--- a/src/mame/video/suprnova.c
+++ b/src/mame/video/suprnova.c
@@ -88,48 +88,47 @@ static void suprnova_draw_roz(bitmap_ind16 &bitmap, bitmap_ind8& bitmapflags, co
}
-WRITE32_HANDLER ( skns_pal_regs_w )
+WRITE32_MEMBER(skns_state::skns_pal_regs_w)
{
- skns_state *state = space->machine().driver_data<skns_state>();
- COMBINE_DATA(&state->m_pal_regs[offset]);
- state->m_palette_updated =1;
+ COMBINE_DATA(&m_pal_regs[offset]);
+ m_palette_updated =1;
switch ( offset )
{
/* RWRA regs are for SPRITES */
case (0x00/4): // RWRA0
- if( state->m_use_spc_bright != (data&1) ) {
- state->m_use_spc_bright = data&1;
- state->m_spc_changed = 1;
+ if( m_use_spc_bright != (data&1) ) {
+ m_use_spc_bright = data&1;
+ m_spc_changed = 1;
}
- state->m_alt_enable_sprites = (data>>8)&1;
+ m_alt_enable_sprites = (data>>8)&1;
break;
case (0x04/4): // RWRA1
- if( state->m_bright_spc_g != (data&0xff) ) {
- state->m_bright_spc_g = data&0xff;
- state->m_spc_changed = 1;
+ if( m_bright_spc_g != (data&0xff) ) {
+ m_bright_spc_g = data&0xff;
+ m_spc_changed = 1;
}
- state->m_bright_spc_g_trans = (data>>8) &0xff;
+ m_bright_spc_g_trans = (data>>8) &0xff;
break;
case (0x08/4): // RWRA2
- if( state->m_bright_spc_r != (data&0xff) ) {
- state->m_bright_spc_r = data&0xff;
- state->m_spc_changed = 1;
+ if( m_bright_spc_r != (data&0xff) ) {
+ m_bright_spc_r = data&0xff;
+ m_spc_changed = 1;
}
- state->m_bright_spc_r_trans = (data>>8) &0xff;
+ m_bright_spc_r_trans = (data>>8) &0xff;
break;
case (0x0C/4): // RWRA3
- if( state->m_bright_spc_b != (data&0xff) ) {
- state->m_bright_spc_b = data&0xff;
- state->m_spc_changed = 1;
+ if( m_bright_spc_b != (data&0xff) ) {
+ m_bright_spc_b = data&0xff;
+ m_spc_changed = 1;
}
- state->m_bright_spc_b_trans = (data>>8)&0xff;
+ m_bright_spc_b_trans = (data>>8)&0xff;
break;
@@ -137,70 +136,69 @@ WRITE32_HANDLER ( skns_pal_regs_w )
/* RWRB regs are for BACKGROUND */
case (0x10/4): // RWRB0
- if( state->m_use_v3_bright != (data&1) ) {
- state->m_use_v3_bright = data&1;
- state->m_v3_changed = 1;
+ if( m_use_v3_bright != (data&1) ) {
+ m_use_v3_bright = data&1;
+ m_v3_changed = 1;
}
- state->m_alt_enable_background = (data>>8)&1;
+ m_alt_enable_background = (data>>8)&1;
break;
case (0x14/4): // RWRB1
- if( state->m_bright_v3_g != (data&0xff) ) {
- state->m_bright_v3_g = data&0xff;
- state->m_v3_changed = 1;
+ if( m_bright_v3_g != (data&0xff) ) {
+ m_bright_v3_g = data&0xff;
+ m_v3_changed = 1;
}
- state->m_bright_v3_g_trans = (data>>8)&0xff;
+ m_bright_v3_g_trans = (data>>8)&0xff;
break;
case (0x18/4): // RWRB2
- if( state->m_bright_v3_r != (data&0xff) ) {
- state->m_bright_v3_r = data&0xff;
- state->m_v3_changed = 1;
+ if( m_bright_v3_r != (data&0xff) ) {
+ m_bright_v3_r = data&0xff;
+ m_v3_changed = 1;
}
- state->m_bright_v3_r_trans = (data>>8)&0xff;
+ m_bright_v3_r_trans = (data>>8)&0xff;
break;
case (0x1C/4): // RWRB3
- if( state->m_bright_v3_b != (data&0xff) ) {
- state->m_bright_v3_b = data&0xff;
- state->m_v3_changed = 1;
+ if( m_bright_v3_b != (data&0xff) ) {
+ m_bright_v3_b = data&0xff;
+ m_v3_changed = 1;
}
- state->m_bright_v3_b_trans = (data>>8)&0xff;
+ m_bright_v3_b_trans = (data>>8)&0xff;
break;
}
}
-WRITE32_HANDLER ( skns_palette_ram_w )
+WRITE32_MEMBER(skns_state::skns_palette_ram_w)
{
- skns_state *state = space->machine().driver_data<skns_state>();
int r,g,b;
int brightness_r, brightness_g, brightness_b/*, alpha*/;
int use_bright;
- COMBINE_DATA(&state->m_palette_ram[offset]);
+ COMBINE_DATA(&m_palette_ram[offset]);
- b = ((state->m_palette_ram[offset] >> 0 ) & 0x1f);
- g = ((state->m_palette_ram[offset] >> 5 ) & 0x1f);
- r = ((state->m_palette_ram[offset] >> 10 ) & 0x1f);
+ b = ((m_palette_ram[offset] >> 0 ) & 0x1f);
+ g = ((m_palette_ram[offset] >> 5 ) & 0x1f);
+ r = ((m_palette_ram[offset] >> 10 ) & 0x1f);
- //alpha = ((state->m_palette_ram[offset] >> 15 ) & 0x1);
+ //alpha = ((m_palette_ram[offset] >> 15 ) & 0x1);
if(offset<(0x40*256)) { // 1st half is for Sprites
- use_bright = state->m_use_spc_bright;
- brightness_b = state->m_bright_spc_b;
- brightness_g = state->m_bright_spc_g;
- brightness_r = state->m_bright_spc_r;
+ use_bright = m_use_spc_bright;
+ brightness_b = m_bright_spc_b;
+ brightness_g = m_bright_spc_g;
+ brightness_r = m_bright_spc_r;
} else { // V3 bg's
- use_bright = state->m_use_v3_bright;
- brightness_b = state->m_bright_v3_b;
- brightness_g = state->m_bright_v3_g;
- brightness_r = state->m_bright_v3_r;
+ use_bright = m_use_v3_bright;
+ brightness_b = m_bright_v3_b;
+ brightness_g = m_bright_v3_g;
+ brightness_r = m_bright_v3_r;
}
if(use_bright) {
@@ -216,7 +214,7 @@ WRITE32_HANDLER ( skns_palette_ram_w )
r <<= 3;
}
- palette_set_color(space->machine(),offset,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),offset,MAKE_RGB(r,g,b));
}
@@ -296,11 +294,10 @@ static TILE_GET_INFO( get_tilemap_A_tile_info )
//if (pri) popmessage("pri A!! %02x\n", pri);
}
-WRITE32_HANDLER ( skns_tilemapA_w )
+WRITE32_MEMBER(skns_state::skns_tilemapA_w)
{
- skns_state *state = space->machine().driver_data<skns_state>();
- COMBINE_DATA(&state->m_tilemapA_ram[offset]);
- state->m_tilemap_A->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_tilemapA_ram[offset]);
+ m_tilemap_A->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_tilemap_B_tile_info )
@@ -325,29 +322,27 @@ static TILE_GET_INFO( get_tilemap_B_tile_info )
//if (pri) popmessage("pri B!! %02x\n", pri); // 02 on cyvern
}
-WRITE32_HANDLER ( skns_tilemapB_w )
+WRITE32_MEMBER(skns_state::skns_tilemapB_w)
{
- skns_state *state = space->machine().driver_data<skns_state>();
- COMBINE_DATA(&state->m_tilemapB_ram[offset]);
- state->m_tilemap_B->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_tilemapB_ram[offset]);
+ m_tilemap_B->mark_tile_dirty(offset);
}
-WRITE32_HANDLER ( skns_v3_regs_w )
+WRITE32_MEMBER(skns_state::skns_v3_regs_w)
{
- skns_state *state = space->machine().driver_data<skns_state>();
- COMBINE_DATA(&state->m_v3_regs[offset]);
+ COMBINE_DATA(&m_v3_regs[offset]);
/* if the depth changes we need to dirty the tilemap */
if (offset == 0x0c/4)
{
- int old_depthA = state->m_depthA;
- int old_depthB = state->m_depthB;
+ int old_depthA = m_depthA;
+ int old_depthB = m_depthB;
- state->m_depthA = (state->m_v3_regs[0x0c/4] & 0x0001) << 1;
- state->m_depthB = (state->m_v3_regs[0x0c/4] & 0x0100) >> 7;
+ m_depthA = (m_v3_regs[0x0c/4] & 0x0001) << 1;
+ m_depthB = (m_v3_regs[0x0c/4] & 0x0100) >> 7;
- if (old_depthA != state->m_depthA) state->m_tilemap_A->mark_all_dirty();
- if (old_depthB != state->m_depthB) state->m_tilemap_B->mark_all_dirty();
+ if (old_depthA != m_depthA) m_tilemap_A->mark_all_dirty();
+ if (old_depthB != m_depthB) m_tilemap_B->mark_all_dirty();
}
}
diff --git a/src/mame/video/suprridr.c b/src/mame/video/suprridr.c
index 6801397cbb7..105377d6ddb 100644
--- a/src/mame/video/suprridr.c
+++ b/src/mame/video/suprridr.c
@@ -91,40 +91,35 @@ PALETTE_INIT( suprridr )
*
*************************************/
-WRITE8_HANDLER( suprridr_flipx_w )
+WRITE8_MEMBER(suprridr_state::suprridr_flipx_w)
{
- suprridr_state *state = space->machine().driver_data<suprridr_state>();
- state->m_flipx = data & 1;
- space->machine().tilemap().set_flip_all((state->m_flipx ? TILEMAP_FLIPX : 0) | (state->m_flipy ? TILEMAP_FLIPY : 0));
+ m_flipx = data & 1;
+ machine().tilemap().set_flip_all((m_flipx ? TILEMAP_FLIPX : 0) | (m_flipy ? TILEMAP_FLIPY : 0));
}
-WRITE8_HANDLER( suprridr_flipy_w )
+WRITE8_MEMBER(suprridr_state::suprridr_flipy_w)
{
- suprridr_state *state = space->machine().driver_data<suprridr_state>();
- state->m_flipy = data & 1;
- space->machine().tilemap().set_flip_all((state->m_flipx ? TILEMAP_FLIPX : 0) | (state->m_flipy ? TILEMAP_FLIPY : 0));
+ m_flipy = data & 1;
+ machine().tilemap().set_flip_all((m_flipx ? TILEMAP_FLIPX : 0) | (m_flipy ? TILEMAP_FLIPY : 0));
}
-WRITE8_HANDLER( suprridr_fgdisable_w )
+WRITE8_MEMBER(suprridr_state::suprridr_fgdisable_w)
{
- suprridr_state *state = space->machine().driver_data<suprridr_state>();
- state->m_fg_tilemap->enable(~data & 1);
+ m_fg_tilemap->enable(~data & 1);
}
-WRITE8_HANDLER( suprridr_fgscrolly_w )
+WRITE8_MEMBER(suprridr_state::suprridr_fgscrolly_w)
{
- suprridr_state *state = space->machine().driver_data<suprridr_state>();
- state->m_fg_tilemap->set_scrolly(0, data);
+ m_fg_tilemap->set_scrolly(0, data);
}
-WRITE8_HANDLER( suprridr_bgscrolly_w )
+WRITE8_MEMBER(suprridr_state::suprridr_bgscrolly_w)
{
- suprridr_state *state = space->machine().driver_data<suprridr_state>();
- state->m_bg_tilemap->set_scrolly(0, data);
+ m_bg_tilemap->set_scrolly(0, data);
}
@@ -142,20 +137,18 @@ int suprridr_is_screen_flipped(running_machine &machine)
*
*************************************/
-WRITE8_HANDLER( suprridr_bgram_w )
+WRITE8_MEMBER(suprridr_state::suprridr_bgram_w)
{
- suprridr_state *state = space->machine().driver_data<suprridr_state>();
- state->m_bgram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
- state->m_bg_tilemap_noscroll->mark_tile_dirty(offset);
+ m_bgram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap_noscroll->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( suprridr_fgram_w )
+WRITE8_MEMBER(suprridr_state::suprridr_fgram_w)
{
- suprridr_state *state = space->machine().driver_data<suprridr_state>();
- state->m_fgram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fgram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/suprslam.c b/src/mame/video/suprslam.c
index 965469c1dea..42e6d896025 100644
--- a/src/mame/video/suprslam.c
+++ b/src/mame/video/suprslam.c
@@ -97,12 +97,11 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
/* FG 'SCREEN' LAYER */
-WRITE16_HANDLER( suprslam_screen_videoram_w )
+WRITE16_MEMBER(suprslam_state::suprslam_screen_videoram_w)
{
- suprslam_state *state = space->machine().driver_data<suprslam_state>();
- state->m_screen_videoram[offset] = data;
- state->m_screen_tilemap->mark_tile_dirty(offset);
+ m_screen_videoram[offset] = data;
+ m_screen_tilemap->mark_tile_dirty(offset);
}
@@ -120,12 +119,11 @@ static TILE_GET_INFO( get_suprslam_tile_info )
/* BG LAYER */
-WRITE16_HANDLER( suprslam_bg_videoram_w )
+WRITE16_MEMBER(suprslam_state::suprslam_bg_videoram_w)
{
- suprslam_state *state = space->machine().driver_data<suprslam_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
@@ -167,18 +165,17 @@ SCREEN_UPDATE_IND16( suprslam )
return 0;
}
-WRITE16_HANDLER (suprslam_bank_w)
+WRITE16_MEMBER(suprslam_state::suprslam_bank_w)
{
- suprslam_state *state = space->machine().driver_data<suprslam_state>();
UINT16 old_screen_bank, old_bg_bank;
- old_screen_bank = state->m_screen_bank;
- old_bg_bank = state->m_bg_bank;
+ old_screen_bank = m_screen_bank;
+ old_bg_bank = m_bg_bank;
- state->m_screen_bank = data & 0xf000;
- state->m_bg_bank = (data & 0x0f00) << 4;
+ m_screen_bank = data & 0xf000;
+ m_bg_bank = (data & 0x0f00) << 4;
- if (state->m_screen_bank != old_screen_bank)
- state->m_screen_tilemap->mark_all_dirty();
- if (state->m_bg_bank != old_bg_bank)
- state->m_bg_tilemap->mark_all_dirty();
+ if (m_screen_bank != old_screen_bank)
+ m_screen_tilemap->mark_all_dirty();
+ if (m_bg_bank != old_bg_bank)
+ m_bg_tilemap->mark_all_dirty();
}
diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c
index 0817506ea8a..a964839cf5e 100644
--- a/src/mame/video/system1.c
+++ b/src/mame/video/system1.c
@@ -167,16 +167,15 @@ VIDEO_START( system2 )
*
*************************************/
-WRITE8_HANDLER( system1_videomode_w )
+WRITE8_MEMBER(system1_state::system1_videomode_w)
{
- system1_state *state = space->machine().driver_data<system1_state>();
if (data & 0x6e) logerror("videomode = %02x\n",data);
/* bit 4 is screen blank */
- state->m_video_mode = data;
+ m_video_mode = data;
/* bit 7 is flip screen */
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
}
@@ -187,25 +186,22 @@ WRITE8_HANDLER( system1_videomode_w )
*
*************************************/
-READ8_HANDLER( system1_mixer_collision_r )
+READ8_MEMBER(system1_state::system1_mixer_collision_r)
{
- system1_state *state = space->machine().driver_data<system1_state>();
- space->machine().primary_screen->update_now();
- return state->m_mix_collide[offset & 0x3f] | 0x7e | (state->m_mix_collide_summary << 7);
+ machine().primary_screen->update_now();
+ return m_mix_collide[offset & 0x3f] | 0x7e | (m_mix_collide_summary << 7);
}
-WRITE8_HANDLER( system1_mixer_collision_w )
+WRITE8_MEMBER(system1_state::system1_mixer_collision_w)
{
- system1_state *state = space->machine().driver_data<system1_state>();
- space->machine().primary_screen->update_now();
- state->m_mix_collide[offset & 0x3f] = 0;
+ machine().primary_screen->update_now();
+ m_mix_collide[offset & 0x3f] = 0;
}
-WRITE8_HANDLER( system1_mixer_collision_reset_w )
+WRITE8_MEMBER(system1_state::system1_mixer_collision_reset_w)
{
- system1_state *state = space->machine().driver_data<system1_state>();
- space->machine().primary_screen->update_now();
- state->m_mix_collide_summary = 0;
+ machine().primary_screen->update_now();
+ m_mix_collide_summary = 0;
}
@@ -216,25 +212,22 @@ WRITE8_HANDLER( system1_mixer_collision_reset_w )
*
*************************************/
-READ8_HANDLER( system1_sprite_collision_r )
+READ8_MEMBER(system1_state::system1_sprite_collision_r)
{
- system1_state *state = space->machine().driver_data<system1_state>();
- space->machine().primary_screen->update_now();
- return state->m_sprite_collide[offset & 0x3ff] | 0x7e | (state->m_sprite_collide_summary << 7);
+ machine().primary_screen->update_now();
+ return m_sprite_collide[offset & 0x3ff] | 0x7e | (m_sprite_collide_summary << 7);
}
-WRITE8_HANDLER( system1_sprite_collision_w )
+WRITE8_MEMBER(system1_state::system1_sprite_collision_w)
{
- system1_state *state = space->machine().driver_data<system1_state>();
- space->machine().primary_screen->update_now();
- state->m_sprite_collide[offset & 0x3ff] = 0;
+ machine().primary_screen->update_now();
+ m_sprite_collide[offset & 0x3ff] = 0;
}
-WRITE8_HANDLER( system1_sprite_collision_reset_w )
+WRITE8_MEMBER(system1_state::system1_sprite_collision_reset_w)
{
- system1_state *state = space->machine().driver_data<system1_state>();
- space->machine().primary_screen->update_now();
- state->m_sprite_collide_summary = 0;
+ machine().primary_screen->update_now();
+ m_sprite_collide_summary = 0;
}
@@ -260,28 +253,26 @@ INLINE void videoram_wait_states(cpu_device *cpu)
device_adjust_icount(cpu, -cycles_until_next_fixst);
}
-READ8_HANDLER( system1_videoram_r )
+READ8_MEMBER(system1_state::system1_videoram_r)
{
- system1_state *state = space->machine().driver_data<system1_state>();
- UINT8 *videoram = state->m_videoram;
- videoram_wait_states(space->machine().firstcpu);
- offset |= 0x1000 * ((state->m_videoram_bank >> 1) % (state->m_tilemap_pages / 2));
+ UINT8 *videoram = m_videoram;
+ videoram_wait_states(machine().firstcpu);
+ offset |= 0x1000 * ((m_videoram_bank >> 1) % (m_tilemap_pages / 2));
return videoram[offset];
}
-WRITE8_HANDLER( system1_videoram_w )
+WRITE8_MEMBER(system1_state::system1_videoram_w)
{
- system1_state *state = space->machine().driver_data<system1_state>();
- UINT8 *videoram = state->m_videoram;
- videoram_wait_states(space->machine().firstcpu);
- offset |= 0x1000 * ((state->m_videoram_bank >> 1) % (state->m_tilemap_pages / 2));
+ UINT8 *videoram = m_videoram;
+ videoram_wait_states(machine().firstcpu);
+ offset |= 0x1000 * ((m_videoram_bank >> 1) % (m_tilemap_pages / 2));
videoram[offset] = data;
- state->m_tilemap_page[offset / 0x800]->mark_tile_dirty((offset % 0x800) / 2);
+ m_tilemap_page[offset / 0x800]->mark_tile_dirty((offset % 0x800) / 2);
/* force a partial update if the page is changing */
- if (state->m_tilemap_pages > 2 && offset >= 0x740 && offset < 0x748 && offset % 2 == 0)
- space->machine().primary_screen->update_now();
+ if (m_tilemap_pages > 2 && offset >= 0x740 && offset < 0x748 && offset % 2 == 0)
+ machine().primary_screen->update_now();
}
WRITE8_DEVICE_HANDLER( system1_videoram_bank_w )
@@ -298,9 +289,9 @@ WRITE8_DEVICE_HANDLER( system1_videoram_bank_w )
*
*************************************/
-WRITE8_HANDLER( system1_paletteram_w )
+WRITE8_MEMBER(system1_state::system1_paletteram_w)
{
- const UINT8 *color_prom = space->machine().region("palette")->base();
+ const UINT8 *color_prom = machine().region("palette")->base();
int val,r,g,b;
/*
@@ -324,8 +315,7 @@ WRITE8_HANDLER( system1_paletteram_w )
accurate to +/- .003K ohms.
*/
- system1_state *state = space->machine().driver_data<system1_state>();
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
if (color_prom != NULL)
{
@@ -359,7 +349,7 @@ WRITE8_HANDLER( system1_paletteram_w )
b = pal2bit(data >> 6);
}
- palette_set_color(space->machine(),offset,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),offset,MAKE_RGB(r,g,b));
}
diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c
index 5c31db4790f..9013e097c51 100644
--- a/src/mame/video/system16.c
+++ b/src/mame/video/system16.c
@@ -110,13 +110,12 @@ static const int resistances_normal[6] = {3900, 2000, 1000, 1000/2, 1000/4, 0};
static const int resistances_sh[6] = {3900, 2000, 1000, 1000/2, 1000/4, 470};
#ifdef UNUSED_CODE
-WRITE16_HANDLER( sys16_paletteram_w )
+WRITE16_MEMBER(segas1x_bootleg_state::sys16_paletteram_w)
{
- segas1x_bootleg_state *state = space->machine().driver_data<segas1x_bootleg_state>();
UINT16 newword;
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- newword = state->m_generic_paletteram_16[offset];
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ newword = m_generic_paletteram_16[offset];
/* sBGR BBBB GGGG RRRR */
/* x000 4321 4321 4321 */
@@ -139,23 +138,23 @@ WRITE16_HANDLER( sys16_paletteram_w )
int b4 = (newword >> 11) & 1;
/* Normal colors */
- r = combine_6_weights(state->m_weights[0][0], r0, r1, r2, r3, r4, 0);
- g = combine_6_weights(state->m_weights[0][1], g0, g1, g2, g3, g4, 0);
- b = combine_6_weights(state->m_weights[0][2], b0, b1, b2, b3, b4, 0);
+ r = combine_6_weights(m_weights[0][0], r0, r1, r2, r3, r4, 0);
+ g = combine_6_weights(m_weights[0][1], g0, g1, g2, g3, g4, 0);
+ b = combine_6_weights(m_weights[0][2], b0, b1, b2, b3, b4, 0);
/* Shadow colors */
- rs = combine_6_weights(state->m_weights[1][0], r0, r1, r2, r3, r4, 0);
- gs = combine_6_weights(state->m_weights[1][1], g0, g1, g2, g3, g4, 0);
- bs = combine_6_weights(state->m_weights[1][2], b0, b1, b2, b3, b4, 0);
+ rs = combine_6_weights(m_weights[1][0], r0, r1, r2, r3, r4, 0);
+ gs = combine_6_weights(m_weights[1][1], g0, g1, g2, g3, g4, 0);
+ bs = combine_6_weights(m_weights[1][2], b0, b1, b2, b3, b4, 0);
/* Highlight colors */
- //rh = combine_6_weights(state->m_weights[1][0], r0, r1, r2, r3, r4, 1);
- //gh = combine_6_weights(state->m_weights[1][1], g0, g1, g2, g3, g4, 1);
- //bh = combine_6_weights(state->m_weights[1][2], b0, b1, b2, b3, b4, 1);
+ //rh = combine_6_weights(m_weights[1][0], r0, r1, r2, r3, r4, 1);
+ //gh = combine_6_weights(m_weights[1][1], g0, g1, g2, g3, g4, 1);
+ //bh = combine_6_weights(m_weights[1][2], b0, b1, b2, b3, b4, 1);
- palette_set_color(space->machine(), offset, MAKE_RGB(r, g, b) );
+ palette_set_color(machine(), offset, MAKE_RGB(r, g, b) );
- palette_set_color(space->machine(), offset + space->machine().total_colors()/2, MAKE_RGB(rs,gs,bs));
+ palette_set_color(machine(), offset + machine().total_colors()/2, MAKE_RGB(rs,gs,bs));
}
}
#endif
@@ -292,39 +291,38 @@ static TILE_GET_INFO( get_fg2_tile_info )
0);
}
-WRITE16_HANDLER( sys16_tileram_w )
+WRITE16_MEMBER(segas1x_bootleg_state::sys16_tileram_w)
{
- segas1x_bootleg_state *state = space->machine().driver_data<segas1x_bootleg_state>();
- UINT16 oldword = state->m_tileram[offset];
+ UINT16 oldword = m_tileram[offset];
- COMBINE_DATA(&state->m_tileram[offset]);
+ COMBINE_DATA(&m_tileram[offset]);
- if (oldword != state->m_tileram[offset])
+ if (oldword != m_tileram[offset])
{
int page = offset / (64 * 32);
offset = offset % (64 * 32);
- if (state->m_bg_page[0] == page) state->m_background->mark_tile_dirty(offset + 64 * 32 * 0);
- if (state->m_bg_page[1] == page) state->m_background->mark_tile_dirty(offset + 64 * 32 * 1);
- if (state->m_bg_page[2] == page) state->m_background->mark_tile_dirty(offset + 64 * 32 * 2);
- if (state->m_bg_page[3] == page) state->m_background->mark_tile_dirty(offset + 64 * 32 * 3);
+ if (m_bg_page[0] == page) m_background->mark_tile_dirty(offset + 64 * 32 * 0);
+ if (m_bg_page[1] == page) m_background->mark_tile_dirty(offset + 64 * 32 * 1);
+ if (m_bg_page[2] == page) m_background->mark_tile_dirty(offset + 64 * 32 * 2);
+ if (m_bg_page[3] == page) m_background->mark_tile_dirty(offset + 64 * 32 * 3);
- if (state->m_fg_page[0] == page) state->m_foreground->mark_tile_dirty(offset + 64 * 32 * 0);
- if (state->m_fg_page[1] == page) state->m_foreground->mark_tile_dirty(offset + 64 * 32 * 1);
- if (state->m_fg_page[2] == page) state->m_foreground->mark_tile_dirty(offset + 64 * 32 * 2);
- if (state->m_fg_page[3] == page) state->m_foreground->mark_tile_dirty(offset + 64 * 32 * 3);
+ if (m_fg_page[0] == page) m_foreground->mark_tile_dirty(offset + 64 * 32 * 0);
+ if (m_fg_page[1] == page) m_foreground->mark_tile_dirty(offset + 64 * 32 * 1);
+ if (m_fg_page[2] == page) m_foreground->mark_tile_dirty(offset + 64 * 32 * 2);
+ if (m_fg_page[3] == page) m_foreground->mark_tile_dirty(offset + 64 * 32 * 3);
- if (state->m_system18)
+ if (m_system18)
{
- if (state->m_bg2_page[0] == page) state->m_background2->mark_tile_dirty(offset + 64 * 32 * 0);
- if (state->m_bg2_page[1] == page) state->m_background2->mark_tile_dirty(offset + 64 * 32 * 1);
- if (state->m_bg2_page[2] == page) state->m_background2->mark_tile_dirty(offset + 64 * 32 * 2);
- if (state->m_bg2_page[3] == page) state->m_background2->mark_tile_dirty(offset + 64 * 32 * 3);
-
- if (state->m_fg2_page[0] == page) state->m_foreground2->mark_tile_dirty(offset + 64 * 32 * 0);
- if (state->m_fg2_page[1] == page) state->m_foreground2->mark_tile_dirty(offset + 64 * 32 * 1);
- if (state->m_fg2_page[2] == page) state->m_foreground2->mark_tile_dirty(offset + 64 * 32 * 2);
- if (state->m_fg2_page[3] == page) state->m_foreground2->mark_tile_dirty(offset + 64 * 32 * 3);
+ if (m_bg2_page[0] == page) m_background2->mark_tile_dirty(offset + 64 * 32 * 0);
+ if (m_bg2_page[1] == page) m_background2->mark_tile_dirty(offset + 64 * 32 * 1);
+ if (m_bg2_page[2] == page) m_background2->mark_tile_dirty(offset + 64 * 32 * 2);
+ if (m_bg2_page[3] == page) m_background2->mark_tile_dirty(offset + 64 * 32 * 3);
+
+ if (m_fg2_page[0] == page) m_foreground2->mark_tile_dirty(offset + 64 * 32 * 0);
+ if (m_fg2_page[1] == page) m_foreground2->mark_tile_dirty(offset + 64 * 32 * 1);
+ if (m_fg2_page[2] == page) m_foreground2->mark_tile_dirty(offset + 64 * 32 * 2);
+ if (m_fg2_page[3] == page) m_foreground2->mark_tile_dirty(offset + 64 * 32 * 3);
}
}
}
@@ -361,12 +359,11 @@ static TILE_GET_INFO( get_text_tile_info )
tileinfo.category = 0;
}
-WRITE16_HANDLER( sys16_textram_w )
+WRITE16_MEMBER(segas1x_bootleg_state::sys16_textram_w)
{
- segas1x_bootleg_state *state = space->machine().driver_data<segas1x_bootleg_state>();
- COMBINE_DATA(&state->m_textram[offset]);
- state->m_text_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_textram[offset]);
+ m_text_layer->mark_tile_dirty(offset);
}
/***************************************************************************/
@@ -543,36 +540,31 @@ static TILE_GET_INFO( get_s16a_bootleg_tile_info1 )
0);
}
-WRITE16_HANDLER( s16a_bootleg_bgscrolly_w )
+WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_bgscrolly_w)
{
- segas1x_bootleg_state *state = space->machine().driver_data<segas1x_bootleg_state>();
- state->m_bg_scrolly = data;
+ m_bg_scrolly = data;
}
-WRITE16_HANDLER( s16a_bootleg_bgscrollx_w )
+WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_bgscrollx_w)
{
- segas1x_bootleg_state *state = space->machine().driver_data<segas1x_bootleg_state>();
- state->m_bg_scrollx = data;
+ m_bg_scrollx = data;
}
-WRITE16_HANDLER( s16a_bootleg_fgscrolly_w )
+WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_fgscrolly_w)
{
- segas1x_bootleg_state *state = space->machine().driver_data<segas1x_bootleg_state>();
- state->m_fg_scrolly = data;
+ m_fg_scrolly = data;
}
-WRITE16_HANDLER( s16a_bootleg_fgscrollx_w )
+WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_fgscrollx_w)
{
- segas1x_bootleg_state *state = space->machine().driver_data<segas1x_bootleg_state>();
- state->m_fg_scrollx = data;
+ m_fg_scrollx = data;
}
-WRITE16_HANDLER( s16a_bootleg_tilemapselect_w )
+WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w)
{
- segas1x_bootleg_state *state = space->machine().driver_data<segas1x_bootleg_state>();
- COMBINE_DATA(&state->m_tilemapselect);
- //printf("system16 bootleg tilemapselect %04x\n", state->m_tilemapselect);
+ COMBINE_DATA(&m_tilemapselect);
+ //printf("system16 bootleg tilemapselect %04x\n", m_tilemapselect);
}
diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c
index ea6506f78a4..8b9a17c490a 100644
--- a/src/mame/video/tagteam.c
+++ b/src/mame/video/tagteam.c
@@ -42,23 +42,20 @@ PALETTE_INIT( tagteam )
}
-WRITE8_HANDLER( tagteam_videoram_w )
+WRITE8_MEMBER(tagteam_state::tagteam_videoram_w)
{
- tagteam_state *state = space->machine().driver_data<tagteam_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( tagteam_colorram_w )
+WRITE8_MEMBER(tagteam_state::tagteam_colorram_w)
{
- tagteam_state *state = space->machine().driver_data<tagteam_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-READ8_HANDLER( tagteam_mirrorvideoram_r )
+READ8_MEMBER(tagteam_state::tagteam_mirrorvideoram_r)
{
- tagteam_state *state = space->machine().driver_data<tagteam_state>();
int x,y;
/* swap x and y coordinates */
@@ -66,12 +63,11 @@ READ8_HANDLER( tagteam_mirrorvideoram_r )
y = offset % 32;
offset = 32 * y + x;
- return state->m_videoram[offset];
+ return m_videoram[offset];
}
-READ8_HANDLER( tagteam_mirrorcolorram_r )
+READ8_MEMBER(tagteam_state::tagteam_mirrorcolorram_r)
{
- tagteam_state *state = space->machine().driver_data<tagteam_state>();
int x,y;
/* swap x and y coordinates */
@@ -79,10 +75,10 @@ READ8_HANDLER( tagteam_mirrorcolorram_r )
y = offset % 32;
offset = 32 * y + x;
- return state->m_colorram[offset];
+ return m_colorram[offset];
}
-WRITE8_HANDLER( tagteam_mirrorvideoram_w )
+WRITE8_MEMBER(tagteam_state::tagteam_mirrorvideoram_w)
{
int x,y;
@@ -94,7 +90,7 @@ WRITE8_HANDLER( tagteam_mirrorvideoram_w )
tagteam_videoram_w(space,offset,data);
}
-WRITE8_HANDLER( tagteam_mirrorcolorram_w )
+WRITE8_MEMBER(tagteam_state::tagteam_mirrorcolorram_w)
{
int x,y;
@@ -106,29 +102,28 @@ WRITE8_HANDLER( tagteam_mirrorcolorram_w )
tagteam_colorram_w(space,offset,data);
}
-WRITE8_HANDLER( tagteam_control_w )
+WRITE8_MEMBER(tagteam_state::tagteam_control_w)
{
- tagteam_state *state = space->machine().driver_data<tagteam_state>();
// d0-3: color for blank screen, applies to h/v borders too
// (not implemented yet, and tagteam doesn't have a global screen on/off bit)
// d7: palette bank
- state->m_palettebank = (data & 0x80) >> 7;
+ m_palettebank = (data & 0x80) >> 7;
}
-WRITE8_HANDLER( tagteam_flipscreen_w )
+WRITE8_MEMBER(tagteam_state::tagteam_flipscreen_w)
{
// d0: flip screen
- if (flip_screen_get(space->machine()) != (data &0x01))
+ if (flip_screen_get(machine()) != (data &0x01))
{
- flip_screen_set(space->machine(), data & 0x01);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x01);
+ machine().tilemap().mark_all_dirty();
}
// d6/7: coin counters
- coin_counter_w(space->machine(), 0, data & 0x80);
- coin_counter_w(space->machine(), 1, data & 0x40);
+ coin_counter_w(machine(), 0, data & 0x80);
+ coin_counter_w(machine(), 1, data & 0x40);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c
index 984423cda00..9f08cece643 100644
--- a/src/mame/video/tail2nos.c
+++ b/src/mame/video/tail2nos.c
@@ -76,33 +76,29 @@ VIDEO_START( tail2nos )
***************************************************************************/
-WRITE16_HANDLER( tail2nos_bgvideoram_w )
+WRITE16_MEMBER(tail2nos_state::tail2nos_bgvideoram_w)
{
- tail2nos_state *state = space->machine().driver_data<tail2nos_state>();
- COMBINE_DATA(&state->m_bgvideoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bgvideoram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-READ16_HANDLER( tail2nos_zoomdata_r )
+READ16_MEMBER(tail2nos_state::tail2nos_zoomdata_r)
{
- tail2nos_state *state = space->machine().driver_data<tail2nos_state>();
- return state->m_zoomdata[offset];
+ return m_zoomdata[offset];
}
-WRITE16_HANDLER( tail2nos_zoomdata_w )
+WRITE16_MEMBER(tail2nos_state::tail2nos_zoomdata_w)
{
- tail2nos_state *state = space->machine().driver_data<tail2nos_state>();
- int oldword = state->m_zoomdata[offset];
+ int oldword = m_zoomdata[offset];
- COMBINE_DATA(&state->m_zoomdata[offset]);
- if (oldword != state->m_zoomdata[offset])
- gfx_element_mark_dirty(space->machine().gfx[2], offset / 64);
+ COMBINE_DATA(&m_zoomdata[offset]);
+ if (oldword != m_zoomdata[offset])
+ gfx_element_mark_dirty(machine().gfx[2], offset / 64);
}
-WRITE16_HANDLER( tail2nos_gfxbank_w )
+WRITE16_MEMBER(tail2nos_state::tail2nos_gfxbank_w)
{
- tail2nos_state *state = space->machine().driver_data<tail2nos_state>();
if (ACCESSING_BITS_0_7)
{
@@ -116,10 +112,10 @@ WRITE16_HANDLER( tail2nos_gfxbank_w )
else
bank = 0;
- if (state->m_charbank != bank)
+ if (m_charbank != bank)
{
- state->m_charbank = bank;
- state->m_bg_tilemap->mark_all_dirty();
+ m_charbank = bank;
+ m_bg_tilemap->mark_all_dirty();
}
/* bit 5 seems to select palette bank (used on startup) */
@@ -128,14 +124,14 @@ WRITE16_HANDLER( tail2nos_gfxbank_w )
else
bank = 3;
- if (state->m_charpalette != bank)
+ if (m_charpalette != bank)
{
- state->m_charpalette = bank;
- state->m_bg_tilemap->mark_all_dirty();
+ m_charpalette = bank;
+ m_bg_tilemap->mark_all_dirty();
}
/* bit 4 seems to be video enable */
- state->m_video_enable = data & 0x10;
+ m_video_enable = data & 0x10;
}
}
diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c
index 528b5aadb96..676904f92db 100644
--- a/src/mame/video/taito_b.c
+++ b/src/mame/video/taito_b.c
@@ -3,41 +3,39 @@
#include "video/taitoic.h"
#include "includes/taito_b.h"
-WRITE16_HANDLER( hitice_pixelram_w )
+WRITE16_MEMBER(taitob_state::hitice_pixelram_w)
{
- taitob_state *state = space->machine().driver_data<taitob_state>();
int sy = offset >> 9;
int sx = offset & 0x1ff;
- COMBINE_DATA(&state->m_pixelram[offset]);
+ COMBINE_DATA(&m_pixelram[offset]);
if (ACCESSING_BITS_0_7)
{
/* bit 15 of pixel_scroll[0] is probably flip screen */
- state->m_pixel_bitmap->pix16(sy, 2 * sx + 0) = state->m_b_fg_color_base * 16 + (data & 0xff);
- state->m_pixel_bitmap->pix16(sy, 2 * sx + 1) = state->m_b_fg_color_base * 16 + (data & 0xff);
+ m_pixel_bitmap->pix16(sy, 2 * sx + 0) = m_b_fg_color_base * 16 + (data & 0xff);
+ m_pixel_bitmap->pix16(sy, 2 * sx + 1) = m_b_fg_color_base * 16 + (data & 0xff);
}
}
-WRITE16_HANDLER( hitice_pixel_scroll_w )
+WRITE16_MEMBER(taitob_state::hitice_pixel_scroll_w)
{
- taitob_state *state = space->machine().driver_data<taitob_state>();
- COMBINE_DATA(&state->m_pixel_scroll[offset]);
+ COMBINE_DATA(&m_pixel_scroll[offset]);
}
static void hitice_clear_pixel_bitmap( running_machine &machine )
{
int i;
+ taitob_state *state = machine.driver_data<taitob_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
for (i = 0; i < 0x40000; i++)
- hitice_pixelram_w(space, i, 0, 0xffff);
+ state->hitice_pixelram_w(*space, i, 0, 0xffff);
}
-WRITE16_HANDLER( realpunc_video_ctrl_w )
+WRITE16_MEMBER(taitob_state::realpunc_video_ctrl_w)
{
- taitob_state *state = space->machine().driver_data<taitob_state>();
- COMBINE_DATA(&state->m_realpunc_video_ctrl);
+ COMBINE_DATA(&m_realpunc_video_ctrl);
}
static VIDEO_START( taitob_core )
@@ -118,25 +116,23 @@ VIDEO_START( realpunc )
}
-READ16_HANDLER( tc0180vcu_framebuffer_word_r )
+READ16_MEMBER(taitob_state::tc0180vcu_framebuffer_word_r)
{
- taitob_state *state = space->machine().driver_data<taitob_state>();
int sy = offset >> 8;
int sx = 2 * (offset & 0xff);
- return (state->m_framebuffer[sy >> 8]->pix16(sy & 0xff, sx + 0) << 8) | state->m_framebuffer[sy >> 8]->pix16(sy & 0xff, sx + 1);
+ return (m_framebuffer[sy >> 8]->pix16(sy & 0xff, sx + 0) << 8) | m_framebuffer[sy >> 8]->pix16(sy & 0xff, sx + 1);
}
-WRITE16_HANDLER( tc0180vcu_framebuffer_word_w )
+WRITE16_MEMBER(taitob_state::tc0180vcu_framebuffer_word_w)
{
- taitob_state *state = space->machine().driver_data<taitob_state>();
int sy = offset >> 8;
int sx = 2 * (offset & 0xff);
if (ACCESSING_BITS_8_15)
- state->m_framebuffer[sy >> 8]->pix16(sy & 0xff, sx + 0) = data >> 8;
+ m_framebuffer[sy >> 8]->pix16(sy & 0xff, sx + 0) = data >> 8;
if (ACCESSING_BITS_0_7)
- state->m_framebuffer[sy >> 8]->pix16(sy & 0xff, sx + 1) = data & 0xff;
+ m_framebuffer[sy >> 8]->pix16(sy & 0xff, sx + 1) = data & 0xff;
}
diff --git a/src/mame/video/taito_f2.c b/src/mame/video/taito_f2.c
index 1e7eb543dc0..2757ed3e78e 100644
--- a/src/mame/video/taito_f2.c
+++ b/src/mame/video/taito_f2.c
@@ -230,21 +230,19 @@ might be for Footchmp. That seems to be the only game
altering spritebanks of sprites while they're on screen.
********************************************************/
-WRITE16_HANDLER( taitof2_sprite_extension_w )
+WRITE16_MEMBER(taitof2_state::taitof2_sprite_extension_w)
{
/* areas above 0x1000 cleared in some games, but not used */
- taitof2_state *state = space->machine().driver_data<taitof2_state>();
if (offset < 0x800)
{
- COMBINE_DATA(&state->m_sprite_extension[offset]);
+ COMBINE_DATA(&m_sprite_extension[offset]);
}
}
-WRITE16_HANDLER( taitof2_spritebank_w )
+WRITE16_MEMBER(taitof2_state::taitof2_spritebank_w)
{
- taitof2_state *state = space->machine().driver_data<taitof2_state>();
int i = 0;
int j = 0;
@@ -255,8 +253,8 @@ WRITE16_HANDLER( taitof2_spritebank_w )
{
j = (offset & 1) << 1; /* either set pair 0&1 or 2&3 */
i = data << 11;
- state->m_spritebank_buffered[j] = i;
- state->m_spritebank_buffered[j + 1] = (i + 0x400);
+ m_spritebank_buffered[j] = i;
+ m_spritebank_buffered[j + 1] = (i + 0x400);
//logerror("bank %d, set to: %04x\n", j, i);
//logerror("bank %d, paired so: %04x\n", j + 1, i + 0x400);
@@ -265,25 +263,24 @@ WRITE16_HANDLER( taitof2_spritebank_w )
else /* last 4 are individual banks */
{
i = data << 10;
- state->m_spritebank_buffered[offset] = i;
+ m_spritebank_buffered[offset] = i;
//logerror("bank %d, new value: %04x\n", offset, i);
}
}
-WRITE16_HANDLER( koshien_spritebank_w )
+WRITE16_MEMBER(taitof2_state::koshien_spritebank_w)
{
- taitof2_state *state = space->machine().driver_data<taitof2_state>();
- state->m_spritebank_buffered[0] = 0x0000; /* never changes */
- state->m_spritebank_buffered[1] = 0x0400;
-
- state->m_spritebank_buffered[2] = ((data & 0x00f) + 1) * 0x800;
- state->m_spritebank_buffered[4] = (((data & 0x0f0) >> 4) + 1) * 0x800;
- state->m_spritebank_buffered[6] = (((data & 0xf00) >> 8) + 1) * 0x800;
- state->m_spritebank_buffered[3] = state->m_spritebank_buffered[2] + 0x400;
- state->m_spritebank_buffered[5] = state->m_spritebank_buffered[4] + 0x400;
- state->m_spritebank_buffered[7] = state->m_spritebank_buffered[6] + 0x400;
+ m_spritebank_buffered[0] = 0x0000; /* never changes */
+ m_spritebank_buffered[1] = 0x0400;
+
+ m_spritebank_buffered[2] = ((data & 0x00f) + 1) * 0x800;
+ m_spritebank_buffered[4] = (((data & 0x0f0) >> 4) + 1) * 0x800;
+ m_spritebank_buffered[6] = (((data & 0xf00) >> 8) + 1) * 0x800;
+ m_spritebank_buffered[3] = m_spritebank_buffered[2] + 0x400;
+ m_spritebank_buffered[5] = m_spritebank_buffered[4] + 0x400;
+ m_spritebank_buffered[7] = m_spritebank_buffered[6] + 0x400;
}
static void taito_f2_tc360_spritemixdraw( running_machine &machine, bitmap_ind16 &dest_bmp, const rectangle &clip, const gfx_element *gfx,
diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c
index c582772284a..67120eb8cdf 100644
--- a/src/mame/video/taito_f3.c
+++ b/src/mame/video/taito_f3.c
@@ -736,185 +736,170 @@ VIDEO_START( f3 )
/******************************************************************************/
-READ16_HANDLER( f3_pf_data_r )
+READ16_MEMBER(taito_f3_state::f3_pf_data_r)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
- return state->m_f3_pf_data[offset];
+ return m_f3_pf_data[offset];
}
-WRITE16_HANDLER( f3_pf_data_w )
+WRITE16_MEMBER(taito_f3_state::f3_pf_data_w)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
- COMBINE_DATA(&state->m_f3_pf_data[offset]);
+ COMBINE_DATA(&m_f3_pf_data[offset]);
- if (state->m_f3_game_config->extend) {
- if (offset<0x1000) state->m_pf1_tilemap->mark_tile_dirty((offset & 0xfff) >> 1);
- else if (offset<0x2000) state->m_pf2_tilemap->mark_tile_dirty((offset & 0xfff) >> 1);
- else if (offset<0x3000) state->m_pf3_tilemap->mark_tile_dirty((offset & 0xfff) >> 1);
- else if (offset<0x4000) state->m_pf4_tilemap->mark_tile_dirty((offset & 0xfff) >> 1);
+ if (m_f3_game_config->extend) {
+ if (offset<0x1000) m_pf1_tilemap->mark_tile_dirty((offset & 0xfff) >> 1);
+ else if (offset<0x2000) m_pf2_tilemap->mark_tile_dirty((offset & 0xfff) >> 1);
+ else if (offset<0x3000) m_pf3_tilemap->mark_tile_dirty((offset & 0xfff) >> 1);
+ else if (offset<0x4000) m_pf4_tilemap->mark_tile_dirty((offset & 0xfff) >> 1);
} else {
- if (offset<0x0800) state->m_pf1_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
- else if (offset<0x1000) state->m_pf2_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
- else if (offset<0x1800) state->m_pf3_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
- else if (offset<0x2000) state->m_pf4_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
- else if (offset<0x2800) state->m_pf5_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
- else if (offset<0x3000) state->m_pf6_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
- else if (offset<0x3800) state->m_pf7_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
- else if (offset<0x4000) state->m_pf8_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
+ if (offset<0x0800) m_pf1_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
+ else if (offset<0x1000) m_pf2_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
+ else if (offset<0x1800) m_pf3_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
+ else if (offset<0x2000) m_pf4_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
+ else if (offset<0x2800) m_pf5_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
+ else if (offset<0x3000) m_pf6_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
+ else if (offset<0x3800) m_pf7_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
+ else if (offset<0x4000) m_pf8_tilemap->mark_tile_dirty((offset & 0x7ff) >> 1);
}
}
-WRITE16_HANDLER( f3_control_0_w )
+WRITE16_MEMBER(taito_f3_state::f3_control_0_w)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
- COMBINE_DATA(&state->m_f3_control_0[offset]);
+ COMBINE_DATA(&m_f3_control_0[offset]);
}
-WRITE16_HANDLER( f3_control_1_w )
+WRITE16_MEMBER(taito_f3_state::f3_control_1_w)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
- COMBINE_DATA(&state->m_f3_control_1[offset]);
+ COMBINE_DATA(&m_f3_control_1[offset]);
}
-READ16_HANDLER( f3_spriteram_r )
+READ16_MEMBER(taito_f3_state::f3_spriteram_r)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
- return state->m_spriteram[offset];
+ return m_spriteram[offset];
}
-WRITE16_HANDLER( f3_spriteram_w )
+WRITE16_MEMBER(taito_f3_state::f3_spriteram_w)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
- COMBINE_DATA(&state->m_spriteram[offset]);
+ COMBINE_DATA(&m_spriteram[offset]);
}
-READ16_HANDLER( f3_videoram_r )
+READ16_MEMBER(taito_f3_state::f3_videoram_r)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
- return state->m_videoram[offset];
+ return m_videoram[offset];
}
-WRITE16_HANDLER( f3_videoram_w )
+WRITE16_MEMBER(taito_f3_state::f3_videoram_w)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
int tile,col_off;
- COMBINE_DATA(&state->m_videoram[offset]);
+ COMBINE_DATA(&m_videoram[offset]);
- state->m_vram_layer->mark_tile_dirty(offset);
- //state->m_vram_layer->mark_tile_dirty(offset+1);
+ m_vram_layer->mark_tile_dirty(offset);
+ //m_vram_layer->mark_tile_dirty(offset+1);
if (offset>0x7ff) offset-=0x800;
tile=offset;
col_off=((tile&0x3f)*32)+((tile&0xfc0)>>6);
- state->m_pixel_layer->mark_tile_dirty(col_off);
- //state->m_pixel_layer->mark_tile_dirty(col_off+32);
+ m_pixel_layer->mark_tile_dirty(col_off);
+ //m_pixel_layer->mark_tile_dirty(col_off+32);
}
-READ16_HANDLER( f3_vram_r )
+READ16_MEMBER(taito_f3_state::f3_vram_r)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
- return state->m_f3_vram[offset];
+ return m_f3_vram[offset];
}
-WRITE16_HANDLER( f3_vram_w )
+WRITE16_MEMBER(taito_f3_state::f3_vram_w)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
- COMBINE_DATA(&state->m_f3_vram[offset]);
- gfx_element_mark_dirty(space->machine().gfx[0], offset/16);
+ COMBINE_DATA(&m_f3_vram[offset]);
+ gfx_element_mark_dirty(machine().gfx[0], offset/16);
}
-READ16_HANDLER( f3_pivot_r )
+READ16_MEMBER(taito_f3_state::f3_pivot_r)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
- return state->m_f3_pivot_ram[offset];
+ return m_f3_pivot_ram[offset];
}
-WRITE16_HANDLER( f3_pivot_w )
+WRITE16_MEMBER(taito_f3_state::f3_pivot_w)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
- COMBINE_DATA(&state->m_f3_pivot_ram[offset]);
- gfx_element_mark_dirty(space->machine().gfx[3], offset/16);
+ COMBINE_DATA(&m_f3_pivot_ram[offset]);
+ gfx_element_mark_dirty(machine().gfx[3], offset/16);
}
-READ16_HANDLER( f3_lineram_r )
+READ16_MEMBER(taito_f3_state::f3_lineram_r)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
- return state->m_f3_line_ram[offset];
+ return m_f3_line_ram[offset];
}
-WRITE16_HANDLER( f3_lineram_w )
+WRITE16_MEMBER(taito_f3_state::f3_lineram_w)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
/* DariusGX has an interesting bug at the start of Round D - the clearing of lineram
(0xa000->0x0xa7ff) overflows into priority RAM (0xb000) and creates garbage priority
values. I'm not sure what the real machine would do with these values, and this
emulation certainly doesn't like it, so I've chosen to catch the bug here, and prevent
the trashing of priority ram. If anyone has information on what the real machine does,
please let me know! */
- if (state->m_f3_game==DARIUSG) {
- if (state->m_f3_skip_this_frame)
+ if (m_f3_game==DARIUSG) {
+ if (m_f3_skip_this_frame)
return;
if (offset==0xb000/2 && data==0x003f) {
- state->m_f3_skip_this_frame=1;
+ m_f3_skip_this_frame=1;
return;
}
}
- COMBINE_DATA(&state->m_f3_line_ram[offset]);
+ COMBINE_DATA(&m_f3_line_ram[offset]);
}
-WRITE32_HANDLER( f3_palette_24bit_w )
+WRITE32_MEMBER(taito_f3_state::f3_palette_24bit_w)
{
- taito_f3_state *state = space->machine().driver_data<taito_f3_state>();
int r,g,b;
- COMBINE_DATA(&state->m_generic_paletteram_32[offset]);
+ COMBINE_DATA(&m_generic_paletteram_32[offset]);
/* 12 bit palette games - there has to be a palette select bit somewhere */
- if (state->m_f3_game==SPCINVDX || state->m_f3_game==RIDINGF || state->m_f3_game==ARABIANM || state->m_f3_game==RINGRAGE) {
- b = 15 * ((state->m_generic_paletteram_32[offset] >> 4) & 0xf);
- g = 15 * ((state->m_generic_paletteram_32[offset] >> 8) & 0xf);
- r = 15 * ((state->m_generic_paletteram_32[offset] >> 12) & 0xf);
+ if (m_f3_game==SPCINVDX || m_f3_game==RIDINGF || m_f3_game==ARABIANM || m_f3_game==RINGRAGE) {
+ b = 15 * ((m_generic_paletteram_32[offset] >> 4) & 0xf);
+ g = 15 * ((m_generic_paletteram_32[offset] >> 8) & 0xf);
+ r = 15 * ((m_generic_paletteram_32[offset] >> 12) & 0xf);
}
/* This is weird - why are only the sprites and VRAM palettes 21 bit? */
- else if (state->m_f3_game==CLEOPATR) {
+ else if (m_f3_game==CLEOPATR) {
if (offset<0x100 || offset>0x1000) {
- r = ((state->m_generic_paletteram_32[offset] >>16) & 0x7f)<<1;
- g = ((state->m_generic_paletteram_32[offset] >> 8) & 0x7f)<<1;
- b = ((state->m_generic_paletteram_32[offset] >> 0) & 0x7f)<<1;
+ r = ((m_generic_paletteram_32[offset] >>16) & 0x7f)<<1;
+ g = ((m_generic_paletteram_32[offset] >> 8) & 0x7f)<<1;
+ b = ((m_generic_paletteram_32[offset] >> 0) & 0x7f)<<1;
} else {
- r = (state->m_generic_paletteram_32[offset] >>16) & 0xff;
- g = (state->m_generic_paletteram_32[offset] >> 8) & 0xff;
- b = (state->m_generic_paletteram_32[offset] >> 0) & 0xff;
+ r = (m_generic_paletteram_32[offset] >>16) & 0xff;
+ g = (m_generic_paletteram_32[offset] >> 8) & 0xff;
+ b = (m_generic_paletteram_32[offset] >> 0) & 0xff;
}
}
/* Another weird couple - perhaps this is alpha blending related? */
- else if (state->m_f3_game==TWINQIX || state->m_f3_game==RECALH) {
+ else if (m_f3_game==TWINQIX || m_f3_game==RECALH) {
if (offset>0x1c00) {
- r = ((state->m_generic_paletteram_32[offset] >>16) & 0x7f)<<1;
- g = ((state->m_generic_paletteram_32[offset] >> 8) & 0x7f)<<1;
- b = ((state->m_generic_paletteram_32[offset] >> 0) & 0x7f)<<1;
+ r = ((m_generic_paletteram_32[offset] >>16) & 0x7f)<<1;
+ g = ((m_generic_paletteram_32[offset] >> 8) & 0x7f)<<1;
+ b = ((m_generic_paletteram_32[offset] >> 0) & 0x7f)<<1;
} else {
- r = (state->m_generic_paletteram_32[offset] >>16) & 0xff;
- g = (state->m_generic_paletteram_32[offset] >> 8) & 0xff;
- b = (state->m_generic_paletteram_32[offset] >> 0) & 0xff;
+ r = (m_generic_paletteram_32[offset] >>16) & 0xff;
+ g = (m_generic_paletteram_32[offset] >> 8) & 0xff;
+ b = (m_generic_paletteram_32[offset] >> 0) & 0xff;
}
}
/* All other games - standard 24 bit palette */
else {
- r = (state->m_generic_paletteram_32[offset] >>16) & 0xff;
- g = (state->m_generic_paletteram_32[offset] >> 8) & 0xff;
- b = (state->m_generic_paletteram_32[offset] >> 0) & 0xff;
+ r = (m_generic_paletteram_32[offset] >>16) & 0xff;
+ g = (m_generic_paletteram_32[offset] >> 8) & 0xff;
+ b = (m_generic_paletteram_32[offset] >> 0) & 0xff;
}
- palette_set_color(space->machine(),offset,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),offset,MAKE_RGB(r,g,b));
}
/******************************************************************************/
diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c
index 61d35c9d8c6..b3fb9cd46c8 100644
--- a/src/mame/video/taito_l.c
+++ b/src/mame/video/taito_l.c
@@ -88,47 +88,43 @@ VIDEO_START( taitol )
***************************************************************************/
-WRITE8_HANDLER( horshoes_bankg_w )
+WRITE8_MEMBER(taitol_state::horshoes_bankg_w)
{
- taitol_state *state = space->machine().driver_data<taitol_state>();
- if (state->m_horshoes_gfxbank != data)
+ if (m_horshoes_gfxbank != data)
{
- state->m_horshoes_gfxbank = data;
+ m_horshoes_gfxbank = data;
- state->m_bg18_tilemap->mark_all_dirty();
- state->m_bg19_tilemap->mark_all_dirty();
+ m_bg18_tilemap->mark_all_dirty();
+ m_bg19_tilemap->mark_all_dirty();
}
}
-WRITE8_HANDLER( taitol_bankc_w )
+WRITE8_MEMBER(taitol_state::taitol_bankc_w)
{
- taitol_state *state = space->machine().driver_data<taitol_state>();
- if (state->m_bankc[offset] != data)
+ if (m_bankc[offset] != data)
{
- state->m_bankc[offset] = data;
-// logerror("Bankc %d, %02x (%04x)\n", offset, data, cpu_get_pc(&space->device()));
+ m_bankc[offset] = data;
+// logerror("Bankc %d, %02x (%04x)\n", offset, data, cpu_get_pc(&space.device()));
- state->m_bg18_tilemap->mark_all_dirty();
- state->m_bg19_tilemap->mark_all_dirty();
+ m_bg18_tilemap->mark_all_dirty();
+ m_bg19_tilemap->mark_all_dirty();
}
}
-READ8_HANDLER( taitol_bankc_r )
+READ8_MEMBER(taitol_state::taitol_bankc_r)
{
- taitol_state *state = space->machine().driver_data<taitol_state>();
- return state->m_bankc[offset];
+ return m_bankc[offset];
}
-WRITE8_HANDLER( taitol_control_w )
+WRITE8_MEMBER(taitol_state::taitol_control_w)
{
- taitol_state *state = space->machine().driver_data<taitol_state>();
-// logerror("Control Write %02x (%04x)\n", data, cpu_get_pc(&space->device()));
+// logerror("Control Write %02x (%04x)\n", data, cpu_get_pc(&space.device()));
- state->m_cur_ctrl = data;
+ m_cur_ctrl = data;
//popmessage("%02x",data);
/* bit 0 unknown */
@@ -138,18 +134,17 @@ WRITE8_HANDLER( taitol_control_w )
/* bit 3 controls sprite/tile priority - handled in vh_screenrefresh() */
/* bit 4 flip screen */
- state->m_flipscreen = data & 0x10;
- space->machine().tilemap().set_flip_all(state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ m_flipscreen = data & 0x10;
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
/* bit 5 display enable - handled in vh_screenrefresh() */
}
-READ8_HANDLER( taitol_control_r )
+READ8_MEMBER(taitol_state::taitol_control_r)
{
- taitol_state *state = space->machine().driver_data<taitol_state>();
-// logerror("Control Read %02x (%04x)\n", cur_ctrl, cpu_get_pc(&space->device()));
- return state->m_cur_ctrl;
+// logerror("Control Read %02x (%04x)\n", cur_ctrl, cpu_get_pc(&space.device()));
+ return m_cur_ctrl;
}
void taitol_chardef14_m( running_machine &machine, int offset )
diff --git a/src/mame/video/taito_z.c b/src/mame/video/taito_z.c
index 7049007ffd5..15293c8b137 100644
--- a/src/mame/video/taito_z.c
+++ b/src/mame/video/taito_z.c
@@ -19,16 +19,14 @@ VIDEO_START( taitoz )
********************************************************/
-READ16_HANDLER( sci_spriteframe_r )
+READ16_MEMBER(taitoz_state::sci_spriteframe_r)
{
- taitoz_state *state = space->machine().driver_data<taitoz_state>();
- return (state->m_sci_spriteframe << 8);
+ return (m_sci_spriteframe << 8);
}
-WRITE16_HANDLER( sci_spriteframe_w )
+WRITE16_MEMBER(taitoz_state::sci_spriteframe_w)
{
- taitoz_state *state = space->machine().driver_data<taitoz_state>();
- state->m_sci_spriteframe = (data >> 8) & 0xff;
+ m_sci_spriteframe = (data >> 8) & 0xff;
}
@@ -821,14 +819,13 @@ static void spacegun_draw_sprites_16x8(running_machine &machine, bitmap_ind16 &b
SCREEN REFRESH
**************************************************************/
-WRITE16_HANDLER( contcirc_out_w )
+WRITE16_MEMBER(taitoz_state::contcirc_out_w)
{
- taitoz_state *state = space->machine().driver_data<taitoz_state>();
if (ACCESSING_BITS_0_7)
{
/* bit 0 = reset sub CPU */
- device_set_input_line(state->m_audiocpu, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
+ device_set_input_line(m_audiocpu, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
/* bits 1-3 n.c. */
@@ -837,7 +834,7 @@ WRITE16_HANDLER( contcirc_out_w )
/* bit 5 = SCP */
/* bits 6 and 7 select the road palette bank */
- state->m_road_palbank = (data & 0xc0) >> 6;
+ m_road_palbank = (data & 0xc0) >> 6;
}
}
diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c
index 64f89e5eaf3..262dba41fad 100644
--- a/src/mame/video/taitoair.c
+++ b/src/mame/video/taitoair.c
@@ -355,94 +355,88 @@ static void fill_poly( bitmap_ind16 &bitmap, const rectangle &cliprect, const st
TODO: still don't know how this works. It calls three values (0x1fff-0x5fff-0xdfff), for two or three offsets.
In theory this should fit into framebuffer draw, display, clear and swap in some way.
*/
-WRITE16_HANDLER( dsp_flags_w )
+WRITE16_MEMBER(taitoair_state::dsp_flags_w)
{
- taitoair_state *state = space->machine().driver_data<taitoair_state>();
rectangle cliprect;
/* printf("%04x -> %d\n",data,offset); */
cliprect.min_x = 0;
cliprect.min_y = 3*16;
- cliprect.max_x = space->machine().primary_screen->width() - 1;
- cliprect.max_y = space->machine().primary_screen->height() - 1;
+ cliprect.max_x = machine().primary_screen->width() - 1;
+ cliprect.max_y = machine().primary_screen->height() - 1;
{
/* clear and copy operation if offset is 0x3001 */
if(offset == 1)
{
/* clear screen fb */
- state->m_framebuffer[1]->fill(0, cliprect);
+ m_framebuffer[1]->fill(0, cliprect);
/* copy buffer fb into screen fb (at this stage we are ready to draw) */
- copybitmap_trans(*state->m_framebuffer[1], *state->m_framebuffer[0], 0, 0, 0, 0, cliprect, 0);
+ copybitmap_trans(*m_framebuffer[1], *m_framebuffer[0], 0, 0, 0, 0, cliprect, 0);
/* now clear buffer fb */
- state->m_framebuffer[0]->fill(0, cliprect);
+ m_framebuffer[0]->fill(0, cliprect);
}
/* if offset 0x3001 OR 0x3002 we put data in the buffer fb */
if(offset)
{
- if (state->m_line_ram[0x3fff])
+ if (m_line_ram[0x3fff])
{
int adr = 0x3fff;
// struct taitoair_poly q;
- while (adr >= 0 && state->m_line_ram[adr] && state->m_line_ram[adr] != 0x4000)
+ while (adr >= 0 && m_line_ram[adr] && m_line_ram[adr] != 0x4000)
{
int pcount;
- if (!(state->m_line_ram[adr] & 0x8000) || adr < 10)
+ if (!(m_line_ram[adr] & 0x8000) || adr < 10)
{
- logerror("quad: unknown value %04x at %04x\n", state->m_line_ram[adr], adr);
+ logerror("quad: unknown value %04x at %04x\n", m_line_ram[adr], adr);
break;
}
- state->m_q.col = ((state->m_line_ram[adr] & 0x007f) * 0x80) + 0x2040;
+ m_q.col = ((m_line_ram[adr] & 0x007f) * 0x80) + 0x2040;
adr--;
pcount = 0;
- while (pcount < TAITOAIR_POLY_MAX_PT && adr >= 1 && !(state->m_line_ram[adr] & 0xc000))
+ while (pcount < TAITOAIR_POLY_MAX_PT && adr >= 1 && !(m_line_ram[adr] & 0xc000))
{
- state->m_q.p[pcount].y = state->m_line_ram[adr] + 3 * 16;
- state->m_q.p[pcount].x = state->m_line_ram[adr - 1];
+ m_q.p[pcount].y = m_line_ram[adr] + 3 * 16;
+ m_q.p[pcount].x = m_line_ram[adr - 1];
pcount++;
adr -= 2;
}
adr--;
- state->m_q.pcount = pcount;
- fill_poly(*state->m_framebuffer[0], cliprect, &state->m_q);
+ m_q.pcount = pcount;
+ fill_poly(*m_framebuffer[0], cliprect, &m_q);
}
}
}
}
}
-WRITE16_HANDLER( dsp_x_eyecoord_w )
+WRITE16_MEMBER(taitoair_state::dsp_x_eyecoord_w)
{
- taitoair_state *state = space->machine().driver_data<taitoair_state>();
- state->m_eyecoordBuffer[0] = data;
+ m_eyecoordBuffer[0] = data;
}
-WRITE16_HANDLER( dsp_y_eyecoord_w )
+WRITE16_MEMBER(taitoair_state::dsp_y_eyecoord_w)
{
- taitoair_state *state = space->machine().driver_data<taitoair_state>();
- state->m_eyecoordBuffer[1] = data;
+ m_eyecoordBuffer[1] = data;
}
-WRITE16_HANDLER( dsp_z_eyecoord_w )
+WRITE16_MEMBER(taitoair_state::dsp_z_eyecoord_w)
{
- taitoair_state *state = space->machine().driver_data<taitoair_state>();
- state->m_eyecoordBuffer[2] = data;
+ m_eyecoordBuffer[2] = data;
}
-WRITE16_HANDLER( dsp_frustum_left_w )
+WRITE16_MEMBER(taitoair_state::dsp_frustum_left_w)
{
/* Strange. It comes in as it it were the right side of the screen */
- taitoair_state *state = space->machine().driver_data<taitoair_state>();
- state->m_frustumLeft = -data;
+ m_frustumLeft = -data;
}
-WRITE16_HANDLER( dsp_frustum_bottom_w )
+WRITE16_MEMBER(taitoair_state::dsp_frustum_bottom_w)
{
- taitoair_state *state = space->machine().driver_data<taitoair_state>();
- state->m_frustumBottom = data;
+ m_frustumBottom = data;
}
@@ -513,22 +507,21 @@ void airInfernoFrustum(const INT16 leftExtent, const INT16 bottomExtent, float*
#undef M
}
-WRITE16_HANDLER( dsp_rasterize_w )
+WRITE16_MEMBER(taitoair_state::dsp_rasterize_w)
{
}
-READ16_HANDLER( dsp_x_return_r )
+READ16_MEMBER(taitoair_state::dsp_x_return_r)
{
- taitoair_state *state = space->machine().driver_data<taitoair_state>();
/* Construct a frustum from the system's most recently set left and bottom extents */
float m[16];
- airInfernoFrustum(state->m_frustumLeft, state->m_frustumBottom, m);
+ airInfernoFrustum(m_frustumLeft, m_frustumBottom, m);
int res;
res = projectEyeCoordToScreen(m,
32*16, /* x max screen size */
- state->m_eyecoordBuffer,0);
+ m_eyecoordBuffer,0);
// Extremely poor man's clipping :-P
if (res == -10000) return -32*8;
@@ -538,18 +531,17 @@ READ16_HANDLER( dsp_x_return_r )
return res;
}
-READ16_HANDLER( dsp_y_return_r )
+READ16_MEMBER(taitoair_state::dsp_y_return_r)
{
- taitoair_state *state = space->machine().driver_data<taitoair_state>();
/* Construct a frustum from the system's most recently set left and bottom extents */
float m[16];
- airInfernoFrustum(state->m_frustumLeft, state->m_frustumBottom, m);
+ airInfernoFrustum(m_frustumLeft, m_frustumBottom, m);
int res;
res = projectEyeCoordToScreen(m,
28*16, /* y max screen size */
- state->m_eyecoordBuffer, 1);
+ m_eyecoordBuffer, 1);
// Extremely poor man's clipping :-P
if (res == -10000) return 28*7;
diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c
index 5b3fbc4b497..fd74215632f 100644
--- a/src/mame/video/taitojc.c
+++ b/src/mame/video/taitojc.c
@@ -39,34 +39,30 @@ static TILE_GET_INFO( taitojc_tile_info )
SET_TILE_INFO(state->m_gfx_index, tile, color, 0);
}
-READ32_HANDLER(taitojc_tile_r)
+READ32_MEMBER(taitojc_state::taitojc_tile_r)
{
- taitojc_state *state = space->machine().driver_data<taitojc_state>();
- return state->m_tile_ram[offset];
+ return m_tile_ram[offset];
}
-READ32_HANDLER(taitojc_char_r)
+READ32_MEMBER(taitojc_state::taitojc_char_r)
{
- taitojc_state *state = space->machine().driver_data<taitojc_state>();
- return state->m_char_ram[offset];
+ return m_char_ram[offset];
}
-WRITE32_HANDLER(taitojc_tile_w)
+WRITE32_MEMBER(taitojc_state::taitojc_tile_w)
{
- taitojc_state *state = space->machine().driver_data<taitojc_state>();
- COMBINE_DATA(state->m_tile_ram + offset);
- state->m_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(m_tile_ram + offset);
+ m_tilemap->mark_tile_dirty(offset);
}
-WRITE32_HANDLER(taitojc_char_w)
+WRITE32_MEMBER(taitojc_state::taitojc_char_w)
{
- taitojc_state *state = space->machine().driver_data<taitojc_state>();
- COMBINE_DATA(state->m_char_ram + offset);
- gfx_element_mark_dirty(space->machine().gfx[state->m_gfx_index], offset/32);
+ COMBINE_DATA(m_char_ram + offset);
+ gfx_element_mark_dirty(machine().gfx[m_gfx_index], offset/32);
}
// Object data format:
diff --git a/src/mame/video/taitosj.c b/src/mame/video/taitosj.c
index 0d284da287a..c594844b991 100644
--- a/src/mame/video/taitosj.c
+++ b/src/mame/video/taitosj.c
@@ -197,61 +197,58 @@ VIDEO_START( taitosj )
-READ8_HANDLER( taitosj_gfxrom_r )
+READ8_MEMBER(taitosj_state::taitosj_gfxrom_r)
{
- taitosj_state *state = space->machine().driver_data<taitosj_state>();
UINT8 ret;
- offs_t offs = state->m_gfxpointer[0] | (state->m_gfxpointer[1] << 8);
+ offs_t offs = m_gfxpointer[0] | (m_gfxpointer[1] << 8);
if (offs < 0x8000)
- ret = space->machine().region("gfx1")->base()[offs];
+ ret = machine().region("gfx1")->base()[offs];
else
ret = 0;
offs = offs + 1;
- state->m_gfxpointer[0] = offs & 0xff;
- state->m_gfxpointer[1] = offs >> 8;
+ m_gfxpointer[0] = offs & 0xff;
+ m_gfxpointer[1] = offs >> 8;
return ret;
}
-WRITE8_HANDLER( taitosj_characterram_w )
+WRITE8_MEMBER(taitosj_state::taitosj_characterram_w)
{
- taitosj_state *state = space->machine().driver_data<taitosj_state>();
- if (state->m_characterram[offset] != data)
+ if (m_characterram[offset] != data)
{
if (offset < 0x1800)
{
- gfx_element_mark_dirty(space->machine().gfx[0], (offset / 8) & 0xff);
- gfx_element_mark_dirty(space->machine().gfx[1], (offset / 32) & 0x3f);
+ gfx_element_mark_dirty(machine().gfx[0], (offset / 8) & 0xff);
+ gfx_element_mark_dirty(machine().gfx[1], (offset / 32) & 0x3f);
}
else
{
- gfx_element_mark_dirty(space->machine().gfx[2], (offset / 8) & 0xff);
- gfx_element_mark_dirty(space->machine().gfx[3], (offset / 32) & 0x3f);
+ gfx_element_mark_dirty(machine().gfx[2], (offset / 8) & 0xff);
+ gfx_element_mark_dirty(machine().gfx[3], (offset / 32) & 0x3f);
}
- state->m_characterram[offset] = data;
+ m_characterram[offset] = data;
}
}
-WRITE8_HANDLER( junglhbr_characterram_w )
+WRITE8_MEMBER(taitosj_state::junglhbr_characterram_w)
{
taitosj_characterram_w(space, offset, data ^ 0xfc);
}
-WRITE8_HANDLER( taitosj_collision_reg_clear_w )
+WRITE8_MEMBER(taitosj_state::taitosj_collision_reg_clear_w)
{
- taitosj_state *state = space->machine().driver_data<taitosj_state>();
- state->m_collision_reg[0] = 0;
- state->m_collision_reg[1] = 0;
- state->m_collision_reg[2] = 0;
- state->m_collision_reg[3] = 0;
+ m_collision_reg[0] = 0;
+ m_collision_reg[1] = 0;
+ m_collision_reg[2] = 0;
+ m_collision_reg[3] = 0;
}
diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c
index 156f2a0c245..668c7e12bd8 100644
--- a/src/mame/video/tank8.c
+++ b/src/mame/video/tank8.c
@@ -61,11 +61,10 @@ static void set_pens(tank8_state *state, colortable_t *colortable)
}
-WRITE8_HANDLER( tank8_video_ram_w )
+WRITE8_MEMBER(tank8_state::tank8_video_ram_w)
{
- tank8_state *state = space->machine().driver_data<tank8_state>();
- state->m_video_ram[offset] = data;
- state->m_tilemap->mark_tile_dirty(offset);
+ m_video_ram[offset] = data;
+ m_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/tankbatt.c b/src/mame/video/tankbatt.c
index 3ea99938a08..954842c6dec 100644
--- a/src/mame/video/tankbatt.c
+++ b/src/mame/video/tankbatt.c
@@ -58,12 +58,11 @@ PALETTE_INIT( tankbatt )
}
}
-WRITE8_HANDLER( tankbatt_videoram_w )
+WRITE8_MEMBER(tankbatt_state::tankbatt_videoram_w)
{
- tankbatt_state *state = space->machine().driver_data<tankbatt_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c
index 0bcaad4767e..7daea9e4274 100644
--- a/src/mame/video/tankbust.c
+++ b/src/mame/video/tankbust.c
@@ -96,74 +96,66 @@ VIDEO_START( tankbust )
***************************************************************************/
-WRITE8_HANDLER( tankbust_background_videoram_w )
+WRITE8_MEMBER(tankbust_state::tankbust_background_videoram_w)
{
- tankbust_state *state = space->machine().driver_data<tankbust_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-READ8_HANDLER( tankbust_background_videoram_r )
+READ8_MEMBER(tankbust_state::tankbust_background_videoram_r)
{
- tankbust_state *state = space->machine().driver_data<tankbust_state>();
- return state->m_videoram[offset];
+ return m_videoram[offset];
}
-WRITE8_HANDLER( tankbust_background_colorram_w )
+WRITE8_MEMBER(tankbust_state::tankbust_background_colorram_w)
{
- tankbust_state *state = space->machine().driver_data<tankbust_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-READ8_HANDLER( tankbust_background_colorram_r )
+READ8_MEMBER(tankbust_state::tankbust_background_colorram_r)
{
- tankbust_state *state = space->machine().driver_data<tankbust_state>();
- return state->m_colorram[offset];
+ return m_colorram[offset];
}
-WRITE8_HANDLER( tankbust_txtram_w )
+WRITE8_MEMBER(tankbust_state::tankbust_txtram_w)
{
- tankbust_state *state = space->machine().driver_data<tankbust_state>();
- state->m_txtram[offset] = data;
- state->m_txt_tilemap->mark_tile_dirty(offset);
+ m_txtram[offset] = data;
+ m_txt_tilemap->mark_tile_dirty(offset);
}
-READ8_HANDLER( tankbust_txtram_r )
+READ8_MEMBER(tankbust_state::tankbust_txtram_r)
{
- tankbust_state *state = space->machine().driver_data<tankbust_state>();
- return state->m_txtram[offset];
+ return m_txtram[offset];
}
-WRITE8_HANDLER( tankbust_xscroll_w )
+WRITE8_MEMBER(tankbust_state::tankbust_xscroll_w)
{
- tankbust_state *state = space->machine().driver_data<tankbust_state>();
- if( state->m_xscroll[offset] != data )
+ if( m_xscroll[offset] != data )
{
int x;
- state->m_xscroll[offset] = data;
+ m_xscroll[offset] = data;
- x = state->m_xscroll[0] + 256 * (state->m_xscroll[1]&1);
+ x = m_xscroll[0] + 256 * (m_xscroll[1]&1);
if (x>=0x100) x-=0x200;
- state->m_bg_tilemap->set_scrollx(0, x );
+ m_bg_tilemap->set_scrollx(0, x );
}
-//popmessage("x=%02x %02x", state->m_xscroll[0], state->m_xscroll[1]);
+//popmessage("x=%02x %02x", m_xscroll[0], m_xscroll[1]);
}
-WRITE8_HANDLER( tankbust_yscroll_w )
+WRITE8_MEMBER(tankbust_state::tankbust_yscroll_w)
{
- tankbust_state *state = space->machine().driver_data<tankbust_state>();
- if( state->m_yscroll[offset] != data )
+ if( m_yscroll[offset] != data )
{
int y;
- state->m_yscroll[offset] = data;
- y = state->m_yscroll[0];
+ m_yscroll[offset] = data;
+ y = m_yscroll[0];
if (y>=0x80) y-=0x100;
- state->m_bg_tilemap->set_scrolly(0, y );
+ m_bg_tilemap->set_scrolly(0, y );
}
-//popmessage("y=%02x %02x", state->m_yscroll[0], state->m_yscroll[1]);
+//popmessage("y=%02x %02x", m_yscroll[0], m_yscroll[1]);
}
/***************************************************************************
diff --git a/src/mame/video/taotaido.c b/src/mame/video/taotaido.c
index 68fb1279f9e..f46ba787d61 100644
--- a/src/mame/video/taotaido.c
+++ b/src/mame/video/taotaido.c
@@ -13,13 +13,12 @@ zooming might be wrong (only used on title logo?)
/* sprite tile codes 0x4000 - 0x7fff get remapped according to the content of these registers */
-WRITE16_HANDLER( taotaido_sprite_character_bank_select_w )
+WRITE16_MEMBER(taotaido_state::taotaido_sprite_character_bank_select_w)
{
- taotaido_state *state = space->machine().driver_data<taotaido_state>();
if(ACCESSING_BITS_8_15)
- state->m_sprite_character_bank_select[offset*2] = data >> 8;
+ m_sprite_character_bank_select[offset*2] = data >> 8;
if(ACCESSING_BITS_0_7)
- state->m_sprite_character_bank_select[offset*2+1] = data &0xff;
+ m_sprite_character_bank_select[offset*2+1] = data &0xff;
}
/* sprites are like the other video system / psikyo games, we can merge this with aerofgt and plenty of other
@@ -129,9 +128,8 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
/* the tilemap */
-WRITE16_HANDLER( taotaido_tileregs_w )
+WRITE16_MEMBER(taotaido_state::taotaido_tileregs_w)
{
- taotaido_state *state = space->machine().driver_data<taotaido_state>();
switch (offset)
{
case 0: // would normally be x scroll?
@@ -147,19 +145,18 @@ WRITE16_HANDLER( taotaido_tileregs_w )
case 6:
case 7:
if(ACCESSING_BITS_8_15)
- state->m_video_bank_select[(offset-4)*2] = data >> 8;
+ m_video_bank_select[(offset-4)*2] = data >> 8;
if(ACCESSING_BITS_0_7)
- state->m_video_bank_select[(offset-4)*2+1] = data &0xff;
- state->m_bg_tilemap->mark_all_dirty();
+ m_video_bank_select[(offset-4)*2+1] = data &0xff;
+ m_bg_tilemap->mark_all_dirty();
break;
}
}
-WRITE16_HANDLER( taotaido_bgvideoram_w )
+WRITE16_MEMBER(taotaido_state::taotaido_bgvideoram_w)
{
- taotaido_state *state = space->machine().driver_data<taotaido_state>();
- COMBINE_DATA(&state->m_bgram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bgram[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( taotaido_bg_tile_info )
diff --git a/src/mame/video/targeth.c b/src/mame/video/targeth.c
index 27902fc8f06..c27832e323c 100644
--- a/src/mame/video/targeth.c
+++ b/src/mame/video/targeth.c
@@ -58,11 +58,10 @@ static TILE_GET_INFO( get_tile_info_targeth_screen1 )
***************************************************************************/
-WRITE16_HANDLER( targeth_vram_w )
+WRITE16_MEMBER(targeth_state::targeth_vram_w)
{
- targeth_state *state = space->machine().driver_data<targeth_state>();
- state->m_videoram[offset] = data;
- state->m_pant[(offset & 0x1fff) >> 12]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2);
+ m_videoram[offset] = data;
+ m_pant[(offset & 0x1fff) >> 12]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2);
}
diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c
index ccf456833b6..41873a119a7 100644
--- a/src/mame/video/tatsumi.c
+++ b/src/mame/video/tatsumi.c
@@ -4,61 +4,55 @@
/******************************************************************************/
-WRITE16_HANDLER(tatsumi_sprite_control_w)
+WRITE16_MEMBER(tatsumi_state::tatsumi_sprite_control_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- COMBINE_DATA(&state->m_sprite_control_ram[offset]);
+ COMBINE_DATA(&m_sprite_control_ram[offset]);
/* 0xe0 is bank switch, others unknown */
// if ((offset==0xe0 && data&0xefff) || offset!=0xe0)
-// logerror("%08x: Tatsumi TZB215 sprite control %04x %08x\n", cpu_get_pc(&space->device()), offset, data);
+// logerror("%08x: Tatsumi TZB215 sprite control %04x %08x\n", cpu_get_pc(&space.device()), offset, data);
}
/******************************************************************************/
-WRITE16_HANDLER( apache3_road_z_w )
+WRITE16_MEMBER(tatsumi_state::apache3_road_z_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- state->m_apache3_road_z = data & 0xff;
+ m_apache3_road_z = data & 0xff;
}
-WRITE8_HANDLER( apache3_road_x_w )
+WRITE8_MEMBER(tatsumi_state::apache3_road_x_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
// Note: Double buffered. Yes, this is correct :)
- state->m_apache3_road_x_ram[data] = offset;
+ m_apache3_road_x_ram[data] = offset;
}
-READ16_HANDLER( roundup5_vram_r )
+READ16_MEMBER(tatsumi_state::roundup5_vram_r)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- offset+=((state->m_control_word&0x0c00)>>10) * 0xc000;
- return state->m_roundup5_vram[offset];
+ offset+=((m_control_word&0x0c00)>>10) * 0xc000;
+ return m_roundup5_vram[offset];
}
-WRITE16_HANDLER( roundup5_vram_w )
+WRITE16_MEMBER(tatsumi_state::roundup5_vram_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- offset+=((state->m_control_word&0x0c00)>>10) * 0xc000;
+ offset+=((m_control_word&0x0c00)>>10) * 0xc000;
// if (offset>=0x30000)
-// logerror("effective write to vram %06x %02x (control %04x)\n",offset,data,state->m_control_word);
+// logerror("effective write to vram %06x %02x (control %04x)\n",offset,data,m_control_word);
- COMBINE_DATA(&state->m_roundup5_vram[offset]);
+ COMBINE_DATA(&m_roundup5_vram[offset]);
offset=offset%0xc000;
- gfx_element_mark_dirty(space->machine().gfx[1],offset/0x10);
+ gfx_element_mark_dirty(machine().gfx[1],offset/0x10);
}
-WRITE16_HANDLER( roundup5_palette_w )
+WRITE16_MEMBER(tatsumi_state::roundup5_palette_w)
{
// static int hack=0;
int word;
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
// if (offset==0xbfe)
// hack++;
@@ -80,17 +74,16 @@ bit 0: 3.9kOhm resistor
// logerror("PAL: %04x %02x\n",offset,data);
offset&=~1;
- word = ((state->m_generic_paletteram_16[offset] & 0xff)<<8) | (state->m_generic_paletteram_16[offset+1] & 0xff);
- palette_set_color_rgb(space->machine(),offset/2,pal5bit(word >> 10),pal5bit(word >> 5),pal5bit(word >> 0));
+ word = ((m_generic_paletteram_16[offset] & 0xff)<<8) | (m_generic_paletteram_16[offset+1] & 0xff);
+ palette_set_color_rgb(machine(),offset/2,pal5bit(word >> 10),pal5bit(word >> 5),pal5bit(word >> 0));
}
-WRITE16_HANDLER( apache3_palette_w )
+WRITE16_MEMBER(tatsumi_state::apache3_palette_w)
{
// static int hack=0;
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
// if (offset==0xbfe)
// hack++;
@@ -111,62 +104,56 @@ bit 0: 3.9kOhm resistor
// logerror("PAL: %04x %02x\n",offset,data);
- data = state->m_generic_paletteram_16[offset];
- palette_set_color_rgb(space->machine(),offset,pal5bit(data >> 10),pal5bit(data >> 5),pal5bit(data >> 0));
+ data = m_generic_paletteram_16[offset];
+ palette_set_color_rgb(machine(),offset,pal5bit(data >> 10),pal5bit(data >> 5),pal5bit(data >> 0));
}
-WRITE16_HANDLER( roundup5_text_w )
+WRITE16_MEMBER(tatsumi_state::roundup5_text_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- UINT16 *videoram = state->m_videoram;
+ UINT16 *videoram = m_videoram;
COMBINE_DATA(&videoram[offset]);
- state->m_tx_layer->mark_tile_dirty(offset);
+ m_tx_layer->mark_tile_dirty(offset);
}
-READ16_HANDLER( cyclwarr_videoram0_r )
+READ16_MEMBER(tatsumi_state::cyclwarr_videoram0_r)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- return state->m_cyclwarr_videoram0[offset];
+ return m_cyclwarr_videoram0[offset];
}
-READ16_HANDLER( cyclwarr_videoram1_r )
+READ16_MEMBER(tatsumi_state::cyclwarr_videoram1_r)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- return state->m_cyclwarr_videoram1[offset];
+ return m_cyclwarr_videoram1[offset];
}
-WRITE16_HANDLER( cyclwarr_videoram0_w )
+WRITE16_MEMBER(tatsumi_state::cyclwarr_videoram0_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- COMBINE_DATA(&state->m_cyclwarr_videoram0[offset]);
+ COMBINE_DATA(&m_cyclwarr_videoram0[offset]);
if (offset>=0x400)
{
- state->m_layer0->mark_tile_dirty(offset-0x400);
- state->m_layer1->mark_tile_dirty(offset-0x400);
+ m_layer0->mark_tile_dirty(offset-0x400);
+ m_layer1->mark_tile_dirty(offset-0x400);
}
}
-WRITE16_HANDLER( cyclwarr_videoram1_w )
+WRITE16_MEMBER(tatsumi_state::cyclwarr_videoram1_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
- COMBINE_DATA(&state->m_cyclwarr_videoram1[offset]);
+ COMBINE_DATA(&m_cyclwarr_videoram1[offset]);
if (offset>=0x400)
{
- state->m_layer2->mark_tile_dirty(offset-0x400);
- state->m_layer3->mark_tile_dirty(offset-0x400);
+ m_layer2->mark_tile_dirty(offset-0x400);
+ m_layer3->mark_tile_dirty(offset-0x400);
}
}
-WRITE16_HANDLER( roundup5_crt_w )
+WRITE16_MEMBER(tatsumi_state::roundup5_crt_w)
{
- tatsumi_state *state = space->machine().driver_data<tatsumi_state>();
if (offset==0 && ACCESSING_BITS_0_7)
- state->m_roundupt_crt_selected_reg=data&0x3f;
+ m_roundupt_crt_selected_reg=data&0x3f;
if (offset==1 && ACCESSING_BITS_0_7) {
- state->m_roundupt_crt_reg[state->m_roundupt_crt_selected_reg]=data;
-// if (state->m_roundupt_crt_selected_reg!=0xa && state->m_roundupt_crt_selected_reg!=0xb && state->m_roundupt_crt_selected_reg!=29)
-// logerror("%08x: Crt write %02x %02x\n",cpu_get_pc(&space->device()),state->m_roundupt_crt_selected_reg,data);
+ m_roundupt_crt_reg[m_roundupt_crt_selected_reg]=data;
+// if (m_roundupt_crt_selected_reg!=0xa && m_roundupt_crt_selected_reg!=0xb && m_roundupt_crt_selected_reg!=29)
+// logerror("%08x: Crt write %02x %02x\n",cpu_get_pc(&space.device()),m_roundupt_crt_selected_reg,data);
}
}
diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c
index b7294cdaa63..8af8195a1aa 100644
--- a/src/mame/video/tbowl.c
+++ b/src/mame/video/tbowl.c
@@ -20,11 +20,10 @@ static TILE_GET_INFO( get_tx_tile_info )
SET_TILE_INFO(0,tileno,col,0);
}
-WRITE8_HANDLER( tbowl_txvideoram_w )
+WRITE8_MEMBER(tbowl_state::tbowl_txvideoram_w)
{
- tbowl_state *state = space->machine().driver_data<tbowl_state>();
- state->m_txvideoram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_txvideoram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset & 0x7ff);
}
/* Bottom BG Layer (bg) Tilemap */
@@ -41,35 +40,30 @@ static TILE_GET_INFO( get_bg_tile_info )
SET_TILE_INFO(1,tileno,col,0);
}
-WRITE8_HANDLER( tbowl_bg2videoram_w )
+WRITE8_MEMBER(tbowl_state::tbowl_bg2videoram_w)
{
- tbowl_state *state = space->machine().driver_data<tbowl_state>();
- state->m_bg2videoram[offset] = data;
- state->m_bg2_tilemap->mark_tile_dirty(offset & 0xfff);
+ m_bg2videoram[offset] = data;
+ m_bg2_tilemap->mark_tile_dirty(offset & 0xfff);
}
-WRITE8_HANDLER (tbowl_bgxscroll_lo)
+WRITE8_MEMBER(tbowl_state::tbowl_bgxscroll_lo)
{
- tbowl_state *state = space->machine().driver_data<tbowl_state>();
- state->m_xscroll = (state->m_xscroll & 0xff00) | data;
+ m_xscroll = (m_xscroll & 0xff00) | data;
}
-WRITE8_HANDLER (tbowl_bgxscroll_hi)
+WRITE8_MEMBER(tbowl_state::tbowl_bgxscroll_hi)
{
- tbowl_state *state = space->machine().driver_data<tbowl_state>();
- state->m_xscroll = (state->m_xscroll & 0x00ff) | (data << 8);
+ m_xscroll = (m_xscroll & 0x00ff) | (data << 8);
}
-WRITE8_HANDLER (tbowl_bgyscroll_lo)
+WRITE8_MEMBER(tbowl_state::tbowl_bgyscroll_lo)
{
- tbowl_state *state = space->machine().driver_data<tbowl_state>();
- state->m_yscroll = (state->m_yscroll & 0xff00) | data;
+ m_yscroll = (m_yscroll & 0xff00) | data;
}
-WRITE8_HANDLER (tbowl_bgyscroll_hi)
+WRITE8_MEMBER(tbowl_state::tbowl_bgyscroll_hi)
{
- tbowl_state *state = space->machine().driver_data<tbowl_state>();
- state->m_yscroll = (state->m_yscroll & 0x00ff) | (data << 8);
+ m_yscroll = (m_yscroll & 0x00ff) | (data << 8);
}
/* Middle BG Layer (bg2) Tilemaps */
@@ -87,35 +81,30 @@ static TILE_GET_INFO( get_bg2_tile_info )
SET_TILE_INFO(2,tileno,col,0);
}
-WRITE8_HANDLER( tbowl_bgvideoram_w )
+WRITE8_MEMBER(tbowl_state::tbowl_bgvideoram_w)
{
- tbowl_state *state = space->machine().driver_data<tbowl_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0xfff);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0xfff);
}
-WRITE8_HANDLER (tbowl_bg2xscroll_lo)
+WRITE8_MEMBER(tbowl_state::tbowl_bg2xscroll_lo)
{
- tbowl_state *state = space->machine().driver_data<tbowl_state>();
- state->m_bg2xscroll = (state->m_bg2xscroll & 0xff00) | data;
+ m_bg2xscroll = (m_bg2xscroll & 0xff00) | data;
}
-WRITE8_HANDLER (tbowl_bg2xscroll_hi)
+WRITE8_MEMBER(tbowl_state::tbowl_bg2xscroll_hi)
{
- tbowl_state *state = space->machine().driver_data<tbowl_state>();
- state->m_bg2xscroll = (state->m_bg2xscroll & 0x00ff) | (data << 8);
+ m_bg2xscroll = (m_bg2xscroll & 0x00ff) | (data << 8);
}
-WRITE8_HANDLER (tbowl_bg2yscroll_lo)
+WRITE8_MEMBER(tbowl_state::tbowl_bg2yscroll_lo)
{
- tbowl_state *state = space->machine().driver_data<tbowl_state>();
- state->m_bg2yscroll = (state->m_bg2yscroll & 0xff00) | data;
+ m_bg2yscroll = (m_bg2yscroll & 0xff00) | data;
}
-WRITE8_HANDLER (tbowl_bg2yscroll_hi)
+WRITE8_MEMBER(tbowl_state::tbowl_bg2yscroll_hi)
{
- tbowl_state *state = space->machine().driver_data<tbowl_state>();
- state->m_bg2yscroll = (state->m_bg2yscroll & 0x00ff) | (data << 8);
+ m_bg2yscroll = (m_bg2yscroll & 0x00ff) | (data << 8);
}
static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect, int xscroll)
diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c
index ad46557de11..4ba14dbb5b1 100644
--- a/src/mame/video/tceptor.c
+++ b/src/mame/video/tceptor.c
@@ -115,7 +115,7 @@ static TILE_GET_INFO( get_tx_tile_info )
SET_TILE_INFO(0, code, color, 0);
}
-static void tile_mark_dirty(tceptor_state *state, int offset)
+void tceptor_state::tile_mark_dirty(int offset)
{
int x = -1;
int y = -1;
@@ -138,27 +138,25 @@ static void tile_mark_dirty(tceptor_state *state, int offset)
}
if (x >= 0)
- state->m_tx_tilemap->mark_tile_dirty(x * 28 + y);
+ m_tx_tilemap->mark_tile_dirty(x * 28 + y);
}
-WRITE8_HANDLER( tceptor_tile_ram_w )
+WRITE8_MEMBER(tceptor_state::tceptor_tile_ram_w)
{
- tceptor_state *state = space->machine().driver_data<tceptor_state>();
- if (state->m_tile_ram[offset] != data)
+ if (m_tile_ram[offset] != data)
{
- state->m_tile_ram[offset] = data;
- tile_mark_dirty(state, offset);
+ m_tile_ram[offset] = data;
+ tile_mark_dirty(offset);
}
}
-WRITE8_HANDLER( tceptor_tile_attr_w )
+WRITE8_MEMBER(tceptor_state::tceptor_tile_attr_w)
{
- tceptor_state *state = space->machine().driver_data<tceptor_state>();
- if (state->m_tile_attr[offset] != data)
+ if (m_tile_attr[offset] != data)
{
- state->m_tile_attr[offset] = data;
- tile_mark_dirty(state, offset);
+ m_tile_attr[offset] = data;
+ tile_mark_dirty(offset);
}
}
@@ -185,45 +183,43 @@ static TILE_GET_INFO( get_bg2_tile_info )
SET_TILE_INFO(state->m_bg, code, color, 0);
}
-WRITE8_HANDLER( tceptor_bg_ram_w )
+WRITE8_MEMBER(tceptor_state::tceptor_bg_ram_w)
{
- tceptor_state *state = space->machine().driver_data<tceptor_state>();
- state->m_bg_ram[offset] = data;
+ m_bg_ram[offset] = data;
offset /= 2;
if (offset < 0x800)
- state->m_bg1_tilemap->mark_tile_dirty(offset);
+ m_bg1_tilemap->mark_tile_dirty(offset);
else
- state->m_bg2_tilemap->mark_tile_dirty(offset - 0x800);
+ m_bg2_tilemap->mark_tile_dirty(offset - 0x800);
}
-WRITE8_HANDLER( tceptor_bg_scroll_w )
+WRITE8_MEMBER(tceptor_state::tceptor_bg_scroll_w)
{
- tceptor_state *state = space->machine().driver_data<tceptor_state>();
switch (offset)
{
case 0:
- state->m_bg1_scroll_x &= 0xff;
- state->m_bg1_scroll_x |= data << 8;
+ m_bg1_scroll_x &= 0xff;
+ m_bg1_scroll_x |= data << 8;
break;
case 1:
- state->m_bg1_scroll_x &= 0xff00;
- state->m_bg1_scroll_x |= data;
+ m_bg1_scroll_x &= 0xff00;
+ m_bg1_scroll_x |= data;
break;
case 2:
- state->m_bg1_scroll_y = data;
+ m_bg1_scroll_y = data;
break;
case 4:
- state->m_bg2_scroll_x &= 0xff;
- state->m_bg2_scroll_x |= data << 8;
+ m_bg2_scroll_x &= 0xff;
+ m_bg2_scroll_x |= data << 8;
break;
case 5:
- state->m_bg2_scroll_x &= 0xff00;
- state->m_bg2_scroll_x |= data;
+ m_bg2_scroll_x &= 0xff00;
+ m_bg2_scroll_x |= data;
break;
case 6:
- state->m_bg2_scroll_y = data;
+ m_bg2_scroll_y = data;
break;
}
}
diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c
index 321a73c6e34..0d46cb3dbfd 100644
--- a/src/mame/video/tecmo.c
+++ b/src/mame/video/tecmo.c
@@ -115,50 +115,45 @@ VIDEO_START( tecmo )
***************************************************************************/
-WRITE8_HANDLER( tecmo_txvideoram_w )
+WRITE8_MEMBER(tecmo_state::tecmo_txvideoram_w)
{
- tecmo_state *state = space->machine().driver_data<tecmo_state>();
- state->m_txvideoram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_txvideoram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( tecmo_fgvideoram_w )
+WRITE8_MEMBER(tecmo_state::tecmo_fgvideoram_w)
{
- tecmo_state *state = space->machine().driver_data<tecmo_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x1ff);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x1ff);
}
-WRITE8_HANDLER( tecmo_bgvideoram_w )
+WRITE8_MEMBER(tecmo_state::tecmo_bgvideoram_w)
{
- tecmo_state *state = space->machine().driver_data<tecmo_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x1ff);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x1ff);
}
-WRITE8_HANDLER( tecmo_fgscroll_w )
+WRITE8_MEMBER(tecmo_state::tecmo_fgscroll_w)
{
- tecmo_state *state = space->machine().driver_data<tecmo_state>();
- state->m_fgscroll[offset] = data;
+ m_fgscroll[offset] = data;
- state->m_fg_tilemap->set_scrollx(0, state->m_fgscroll[0] + 256 * state->m_fgscroll[1]);
- state->m_fg_tilemap->set_scrolly(0, state->m_fgscroll[2]);
+ m_fg_tilemap->set_scrollx(0, m_fgscroll[0] + 256 * m_fgscroll[1]);
+ m_fg_tilemap->set_scrolly(0, m_fgscroll[2]);
}
-WRITE8_HANDLER( tecmo_bgscroll_w )
+WRITE8_MEMBER(tecmo_state::tecmo_bgscroll_w)
{
- tecmo_state *state = space->machine().driver_data<tecmo_state>();
- state->m_bgscroll[offset] = data;
+ m_bgscroll[offset] = data;
- state->m_bg_tilemap->set_scrollx(0, state->m_bgscroll[0] + 256 * state->m_bgscroll[1]);
- state->m_bg_tilemap->set_scrolly(0, state->m_bgscroll[2]);
+ m_bg_tilemap->set_scrollx(0, m_bgscroll[0] + 256 * m_bgscroll[1]);
+ m_bg_tilemap->set_scrolly(0, m_bgscroll[2]);
}
-WRITE8_HANDLER( tecmo_flipscreen_w )
+WRITE8_MEMBER(tecmo_state::tecmo_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 1);
+ flip_screen_set(machine(), data & 1);
}
diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c
index 1d82908dd80..54c657e9ca6 100644
--- a/src/mame/video/tecmo16.c
+++ b/src/mame/video/tecmo16.c
@@ -127,91 +127,79 @@ VIDEO_START( riot )
/******************************************************************************/
-WRITE16_HANDLER( tecmo16_videoram_w )
+WRITE16_MEMBER(tecmo16_state::tecmo16_videoram_w)
{
- tecmo16_state *state = space->machine().driver_data<tecmo16_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( tecmo16_colorram_w )
+WRITE16_MEMBER(tecmo16_state::tecmo16_colorram_w)
{
- tecmo16_state *state = space->machine().driver_data<tecmo16_state>();
- COMBINE_DATA(&state->m_colorram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_colorram[offset]);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( tecmo16_videoram2_w )
+WRITE16_MEMBER(tecmo16_state::tecmo16_videoram2_w)
{
- tecmo16_state *state = space->machine().driver_data<tecmo16_state>();
- COMBINE_DATA(&state->m_videoram2[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_videoram2[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( tecmo16_colorram2_w )
+WRITE16_MEMBER(tecmo16_state::tecmo16_colorram2_w)
{
- tecmo16_state *state = space->machine().driver_data<tecmo16_state>();
- COMBINE_DATA(&state->m_colorram2[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_colorram2[offset]);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( tecmo16_charram_w )
+WRITE16_MEMBER(tecmo16_state::tecmo16_charram_w)
{
- tecmo16_state *state = space->machine().driver_data<tecmo16_state>();
- COMBINE_DATA(&state->m_charram[offset]);
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_charram[offset]);
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( tecmo16_flipscreen_w )
+WRITE16_MEMBER(tecmo16_state::tecmo16_flipscreen_w)
{
- tecmo16_state *state = space->machine().driver_data<tecmo16_state>();
- state->m_flipscreen = data & 0x01;
- flip_screen_set(space->machine(), state->m_flipscreen);
+ m_flipscreen = data & 0x01;
+ flip_screen_set(machine(), m_flipscreen);
}
/******************************************************************************/
-WRITE16_HANDLER( tecmo16_scroll_x_w )
+WRITE16_MEMBER(tecmo16_state::tecmo16_scroll_x_w)
{
- tecmo16_state *state = space->machine().driver_data<tecmo16_state>();
- COMBINE_DATA(&state->m_scroll_x_w);
- state->m_fg_tilemap->set_scrollx(0,state->m_scroll_x_w);
+ COMBINE_DATA(&m_scroll_x_w);
+ m_fg_tilemap->set_scrollx(0,m_scroll_x_w);
}
-WRITE16_HANDLER( tecmo16_scroll_y_w )
+WRITE16_MEMBER(tecmo16_state::tecmo16_scroll_y_w)
{
- tecmo16_state *state = space->machine().driver_data<tecmo16_state>();
- COMBINE_DATA(&state->m_scroll_y_w);
- state->m_fg_tilemap->set_scrolly(0,state->m_scroll_y_w);
+ COMBINE_DATA(&m_scroll_y_w);
+ m_fg_tilemap->set_scrolly(0,m_scroll_y_w);
}
-WRITE16_HANDLER( tecmo16_scroll2_x_w )
+WRITE16_MEMBER(tecmo16_state::tecmo16_scroll2_x_w)
{
- tecmo16_state *state = space->machine().driver_data<tecmo16_state>();
- COMBINE_DATA(&state->m_scroll2_x_w);
- state->m_bg_tilemap->set_scrollx(0,state->m_scroll2_x_w);
+ COMBINE_DATA(&m_scroll2_x_w);
+ m_bg_tilemap->set_scrollx(0,m_scroll2_x_w);
}
-WRITE16_HANDLER( tecmo16_scroll2_y_w )
+WRITE16_MEMBER(tecmo16_state::tecmo16_scroll2_y_w)
{
- tecmo16_state *state = space->machine().driver_data<tecmo16_state>();
- COMBINE_DATA(&state->m_scroll2_y_w);
- state->m_bg_tilemap->set_scrolly(0,state->m_scroll2_y_w);
+ COMBINE_DATA(&m_scroll2_y_w);
+ m_bg_tilemap->set_scrolly(0,m_scroll2_y_w);
}
-WRITE16_HANDLER( tecmo16_scroll_char_x_w )
+WRITE16_MEMBER(tecmo16_state::tecmo16_scroll_char_x_w)
{
- tecmo16_state *state = space->machine().driver_data<tecmo16_state>();
- COMBINE_DATA(&state->m_scroll_char_x_w);
- state->m_tx_tilemap->set_scrollx(0,state->m_scroll_char_x_w);
+ COMBINE_DATA(&m_scroll_char_x_w);
+ m_tx_tilemap->set_scrollx(0,m_scroll_char_x_w);
}
-WRITE16_HANDLER( tecmo16_scroll_char_y_w )
+WRITE16_MEMBER(tecmo16_state::tecmo16_scroll_char_y_w)
{
- tecmo16_state *state = space->machine().driver_data<tecmo16_state>();
- COMBINE_DATA(&state->m_scroll_char_y_w);
- state->m_tx_tilemap->set_scrolly(0,state->m_scroll_char_y_w-16);
+ COMBINE_DATA(&m_scroll_char_y_w);
+ m_tx_tilemap->set_scrolly(0,m_scroll_char_y_w-16);
}
/******************************************************************************/
diff --git a/src/mame/video/tecmosys.c b/src/mame/video/tecmosys.c
index df667ac6ffb..057cdeeac96 100644
--- a/src/mame/video/tecmosys.c
+++ b/src/mame/video/tecmosys.c
@@ -53,65 +53,57 @@ static TILE_GET_INFO( get_fg_tile_info )
}
-WRITE16_HANDLER( bg0_tilemap_w )
+WRITE16_MEMBER(tecmosys_state::bg0_tilemap_w)
{
- tecmosys_state *state = space->machine().driver_data<tecmosys_state>();
- COMBINE_DATA(&state->m_bg0tilemap_ram[offset]);
- state->m_bg0tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_bg0tilemap_ram[offset]);
+ m_bg0tilemap->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( bg1_tilemap_w )
+WRITE16_MEMBER(tecmosys_state::bg1_tilemap_w)
{
- tecmosys_state *state = space->machine().driver_data<tecmosys_state>();
- COMBINE_DATA(&state->m_bg1tilemap_ram[offset]);
- state->m_bg1tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_bg1tilemap_ram[offset]);
+ m_bg1tilemap->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( bg2_tilemap_w )
+WRITE16_MEMBER(tecmosys_state::bg2_tilemap_w)
{
- tecmosys_state *state = space->machine().driver_data<tecmosys_state>();
- COMBINE_DATA(&state->m_bg2tilemap_ram[offset]);
- state->m_bg2tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_bg2tilemap_ram[offset]);
+ m_bg2tilemap->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( fg_tilemap_w )
+WRITE16_MEMBER(tecmosys_state::fg_tilemap_w)
{
- tecmosys_state *state = space->machine().driver_data<tecmosys_state>();
- COMBINE_DATA(&state->m_fgtilemap_ram[offset]);
- state->m_txt_tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_fgtilemap_ram[offset]);
+ m_txt_tilemap->mark_tile_dirty(offset/2);
}
-INLINE void set_color_555(running_machine &machine, pen_t color, int rshift, int gshift, int bshift, UINT16 data)
+INLINE void set_color_555_tecmo(running_machine &machine, pen_t color, int rshift, int gshift, int bshift, UINT16 data)
{
palette_set_color_rgb(machine, color, pal5bit(data >> rshift), pal5bit(data >> gshift), pal5bit(data >> bshift));
}
-WRITE16_HANDLER( tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w )
+WRITE16_MEMBER(tecmosys_state::tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w)
{
- tecmosys_state *state = space->machine().driver_data<tecmosys_state>();
- COMBINE_DATA(&state->m_tilemap_paletteram16[offset]);
- set_color_555(space->machine(), offset+0x4000, 5, 10, 0, state->m_tilemap_paletteram16[offset]);
+ COMBINE_DATA(&m_tilemap_paletteram16[offset]);
+ set_color_555_tecmo(machine(), offset+0x4000, 5, 10, 0, m_tilemap_paletteram16[offset]);
}
-WRITE16_HANDLER( bg0_tilemap_lineram_w )
+WRITE16_MEMBER(tecmosys_state::bg0_tilemap_lineram_w)
{
- tecmosys_state *state = space->machine().driver_data<tecmosys_state>();
- COMBINE_DATA(&state->m_bg0tilemap_lineram[offset]);
+ COMBINE_DATA(&m_bg0tilemap_lineram[offset]);
if (data!=0x0000) popmessage("non 0 write to bg0 lineram %04x %04x",offset,data);
}
-WRITE16_HANDLER( bg1_tilemap_lineram_w )
+WRITE16_MEMBER(tecmosys_state::bg1_tilemap_lineram_w)
{
- tecmosys_state *state = space->machine().driver_data<tecmosys_state>();
- COMBINE_DATA(&state->m_bg1tilemap_lineram[offset]);
+ COMBINE_DATA(&m_bg1tilemap_lineram[offset]);
if (data!=0x0000) popmessage("non 0 write to bg1 lineram %04x %04x",offset,data);
}
-WRITE16_HANDLER( bg2_tilemap_lineram_w )
+WRITE16_MEMBER(tecmosys_state::bg2_tilemap_lineram_w)
{
- tecmosys_state *state = space->machine().driver_data<tecmosys_state>();
- COMBINE_DATA(&state->m_bg2tilemap_lineram[offset]);
+ COMBINE_DATA(&m_bg2tilemap_lineram[offset]);
if (data!=0x0000) popmessage("non 0 write to bg2 lineram %04x %04x",offset,data);
}
diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c
index aaf2b07955b..06cf3d369ed 100644
--- a/src/mame/video/tehkanwc.c
+++ b/src/mame/video/tehkanwc.c
@@ -15,58 +15,51 @@ robbiex@rocketmail.com
#include "includes/tehkanwc.h"
-WRITE8_HANDLER( tehkanwc_videoram_w )
+WRITE8_MEMBER(tehkanwc_state::tehkanwc_videoram_w)
{
- tehkanwc_state *state = space->machine().driver_data<tehkanwc_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( tehkanwc_colorram_w )
+WRITE8_MEMBER(tehkanwc_state::tehkanwc_colorram_w)
{
- tehkanwc_state *state = space->machine().driver_data<tehkanwc_state>();
- state->m_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( tehkanwc_videoram2_w )
+WRITE8_MEMBER(tehkanwc_state::tehkanwc_videoram2_w)
{
- tehkanwc_state *state = space->machine().driver_data<tehkanwc_state>();
- state->m_videoram2[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram2[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( tehkanwc_scroll_x_w )
+WRITE8_MEMBER(tehkanwc_state::tehkanwc_scroll_x_w)
{
- tehkanwc_state *state = space->machine().driver_data<tehkanwc_state>();
- state->m_scroll_x[offset] = data;
+ m_scroll_x[offset] = data;
}
-WRITE8_HANDLER( tehkanwc_scroll_y_w )
+WRITE8_MEMBER(tehkanwc_state::tehkanwc_scroll_y_w)
{
- tehkanwc_state *state = space->machine().driver_data<tehkanwc_state>();
- state->m_bg_tilemap->set_scrolly(0, data);
+ m_bg_tilemap->set_scrolly(0, data);
}
-WRITE8_HANDLER( tehkanwc_flipscreen_x_w )
+WRITE8_MEMBER(tehkanwc_state::tehkanwc_flipscreen_x_w)
{
- flip_screen_x_set(space->machine(), data & 0x40);
+ flip_screen_x_set(machine(), data & 0x40);
}
-WRITE8_HANDLER( tehkanwc_flipscreen_y_w )
+WRITE8_MEMBER(tehkanwc_state::tehkanwc_flipscreen_y_w)
{
- flip_screen_y_set(space->machine(), data & 0x40);
+ flip_screen_y_set(machine(), data & 0x40);
}
-WRITE8_HANDLER( gridiron_led0_w )
+WRITE8_MEMBER(tehkanwc_state::gridiron_led0_w)
{
- tehkanwc_state *state = space->machine().driver_data<tehkanwc_state>();
- state->m_led0 = data;
+ m_led0 = data;
}
-WRITE8_HANDLER( gridiron_led1_w )
+WRITE8_MEMBER(tehkanwc_state::gridiron_led1_w)
{
- tehkanwc_state *state = space->machine().driver_data<tehkanwc_state>();
- state->m_led1 = data;
+ m_led1 = data;
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c
index 4ead2d9eb57..836edfced3f 100644
--- a/src/mame/video/terracre.c
+++ b/src/mame/video/terracre.c
@@ -151,43 +151,39 @@ PALETTE_INIT( amazon )
}
}
-WRITE16_HANDLER( amazon_background_w )
+WRITE16_MEMBER(terracre_state::amazon_background_w)
{
- terracre_state *state = space->machine().driver_data<terracre_state>();
- COMBINE_DATA( &state->m_amazon_videoram[offset] );
- state->m_background->mark_tile_dirty(offset );
+ COMBINE_DATA( &m_amazon_videoram[offset] );
+ m_background->mark_tile_dirty(offset );
}
-WRITE16_HANDLER( amazon_foreground_w )
+WRITE16_MEMBER(terracre_state::amazon_foreground_w)
{
- terracre_state *state = space->machine().driver_data<terracre_state>();
- UINT16 *videoram = state->m_videoram;
+ UINT16 *videoram = m_videoram;
COMBINE_DATA( &videoram[offset] );
- state->m_foreground->mark_tile_dirty(offset );
+ m_foreground->mark_tile_dirty(offset );
}
-WRITE16_HANDLER( amazon_flipscreen_w )
+WRITE16_MEMBER(terracre_state::amazon_flipscreen_w)
{
if( ACCESSING_BITS_0_7 )
{
- coin_counter_w( space->machine(), 0, data&0x01 );
- coin_counter_w( space->machine(), 1, (data&0x02)>>1 );
- flip_screen_set(space->machine(), data&0x04);
+ coin_counter_w( machine(), 0, data&0x01 );
+ coin_counter_w( machine(), 1, (data&0x02)>>1 );
+ flip_screen_set(machine(), data&0x04);
}
}
-WRITE16_HANDLER( amazon_scrolly_w )
+WRITE16_MEMBER(terracre_state::amazon_scrolly_w)
{
- terracre_state *state = space->machine().driver_data<terracre_state>();
- COMBINE_DATA(&state->m_yscroll);
- state->m_background->set_scrolly(0,state->m_yscroll);
+ COMBINE_DATA(&m_yscroll);
+ m_background->set_scrolly(0,m_yscroll);
}
-WRITE16_HANDLER( amazon_scrollx_w )
+WRITE16_MEMBER(terracre_state::amazon_scrollx_w)
{
- terracre_state *state = space->machine().driver_data<terracre_state>();
- COMBINE_DATA(&state->m_xscroll);
- state->m_background->set_scrollx(0,state->m_xscroll);
+ COMBINE_DATA(&m_xscroll);
+ m_background->set_scrollx(0,m_xscroll);
}
VIDEO_START( amazon )
diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c
index b5d3bf8dbaa..a92cb0a3e20 100644
--- a/src/mame/video/tetrisp2.c
+++ b/src/mame/video/tetrisp2.c
@@ -44,20 +44,18 @@ To Do:
***************************************************************************/
/* BBBBBGGGGGRRRRRx xxxxxxxxxxxxxxxx */
-WRITE16_HANDLER( tetrisp2_palette_w )
+WRITE16_MEMBER(tetrisp2_state::tetrisp2_palette_w)
{
- tetrisp2_state *state = space->machine().driver_data<tetrisp2_state>();
- data = COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
+ data = COMBINE_DATA(&m_generic_paletteram_16[offset]);
if ((offset & 1) == 0)
- palette_set_color_rgb(space->machine(),offset/2,pal5bit(data >> 1),pal5bit(data >> 6),pal5bit(data >> 11));
+ palette_set_color_rgb(machine(),offset/2,pal5bit(data >> 1),pal5bit(data >> 6),pal5bit(data >> 11));
}
-WRITE16_HANDLER( rocknms_sub_palette_w )
+WRITE16_MEMBER(tetrisp2_state::rocknms_sub_palette_w)
{
- tetrisp2_state *state = space->machine().driver_data<tetrisp2_state>();
- data = COMBINE_DATA(&state->m_generic_paletteram2_16[offset]);
+ data = COMBINE_DATA(&m_generic_paletteram2_16[offset]);
if ((offset & 1) == 0)
- palette_set_color_rgb(space->machine(),(0x8000 + (offset/2)),pal5bit(data >> 1),pal5bit(data >> 6),pal5bit(data >> 11));
+ palette_set_color_rgb(machine(),(0x8000 + (offset/2)),pal5bit(data >> 1),pal5bit(data >> 6),pal5bit(data >> 11));
}
@@ -70,45 +68,40 @@ WRITE16_HANDLER( rocknms_sub_palette_w )
***************************************************************************/
-WRITE8_HANDLER( tetrisp2_priority_w )
+WRITE8_MEMBER(tetrisp2_state::tetrisp2_priority_w)
{
- tetrisp2_state *state = space->machine().driver_data<tetrisp2_state>();
//if (ACCESSING_BITS_8_15)
{
data |= ((data & 0xff00) >> 8);
- state->m_priority[offset] = data;
+ m_priority[offset] = data;
}
}
-WRITE8_HANDLER( rockn_priority_w )
+WRITE8_MEMBER(tetrisp2_state::rockn_priority_w)
{
- tetrisp2_state *state = space->machine().driver_data<tetrisp2_state>();
//if (ACCESSING_BITS_8_15)
{
- state->m_priority[offset] = data;
+ m_priority[offset] = data;
}
}
-WRITE16_HANDLER( rocknms_sub_priority_w )
+WRITE16_MEMBER(tetrisp2_state::rocknms_sub_priority_w)
{
- tetrisp2_state *state = space->machine().driver_data<tetrisp2_state>();
if (ACCESSING_BITS_8_15)
{
- state->m_rocknms_sub_priority[offset] = data;
+ m_rocknms_sub_priority[offset] = data;
}
}
-READ16_HANDLER( nndmseal_priority_r )
+READ16_MEMBER(tetrisp2_state::nndmseal_priority_r)
{
- tetrisp2_state *state = space->machine().driver_data<tetrisp2_state>();
- return state->m_priority[offset] | 0xff00;
+ return m_priority[offset] | 0xff00;
}
-READ8_HANDLER( tetrisp2_priority_r )
+READ8_MEMBER(tetrisp2_state::tetrisp2_priority_r)
{
- tetrisp2_state *state = space->machine().driver_data<tetrisp2_state>();
- return state->m_priority[offset];
+ return m_priority[offset];
}
/***************************************************************************
@@ -142,11 +135,10 @@ static TILE_GET_INFO( get_tile_info_bg )
0);
}
-WRITE16_HANDLER( tetrisp2_vram_bg_w )
+WRITE16_MEMBER(tetrisp2_state::tetrisp2_vram_bg_w)
{
- tetrisp2_state *state = space->machine().driver_data<tetrisp2_state>();
- COMBINE_DATA(&state->m_vram_bg[offset]);
- state->m_tilemap_bg->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_vram_bg[offset]);
+ m_tilemap_bg->mark_tile_dirty(offset/2);
}
@@ -166,11 +158,10 @@ static TILE_GET_INFO( get_tile_info_fg )
0);
}
-WRITE16_HANDLER( tetrisp2_vram_fg_w )
+WRITE16_MEMBER(tetrisp2_state::tetrisp2_vram_fg_w)
{
- tetrisp2_state *state = space->machine().driver_data<tetrisp2_state>();
- COMBINE_DATA(&state->m_vram_fg[offset]);
- state->m_tilemap_fg->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_vram_fg[offset]);
+ m_tilemap_fg->mark_tile_dirty(offset/2);
}
@@ -186,11 +177,10 @@ static TILE_GET_INFO( get_tile_info_rot )
0);
}
-WRITE16_HANDLER( tetrisp2_vram_rot_w )
+WRITE16_MEMBER(tetrisp2_state::tetrisp2_vram_rot_w)
{
- tetrisp2_state *state = space->machine().driver_data<tetrisp2_state>();
- COMBINE_DATA(&state->m_vram_rot[offset]);
- state->m_tilemap_rot->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_vram_rot[offset]);
+ m_tilemap_rot->mark_tile_dirty(offset/2);
}
static TILE_GET_INFO( get_tile_info_rocknms_sub_bg )
@@ -205,11 +195,10 @@ static TILE_GET_INFO( get_tile_info_rocknms_sub_bg )
0);
}
-WRITE16_HANDLER( rocknms_sub_vram_bg_w )
+WRITE16_MEMBER(tetrisp2_state::rocknms_sub_vram_bg_w)
{
- tetrisp2_state *state = space->machine().driver_data<tetrisp2_state>();
- COMBINE_DATA(&state->m_rocknms_sub_vram_bg[offset]);
- state->m_tilemap_sub_bg->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_rocknms_sub_vram_bg[offset]);
+ m_tilemap_sub_bg->mark_tile_dirty(offset/2);
}
@@ -225,11 +214,10 @@ static TILE_GET_INFO( get_tile_info_rocknms_sub_fg )
0);
}
-WRITE16_HANDLER( rocknms_sub_vram_fg_w )
+WRITE16_MEMBER(tetrisp2_state::rocknms_sub_vram_fg_w)
{
- tetrisp2_state *state = space->machine().driver_data<tetrisp2_state>();
- COMBINE_DATA(&state->m_rocknms_sub_vram_fg[offset]);
- state->m_tilemap_sub_fg->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_rocknms_sub_vram_fg[offset]);
+ m_tilemap_sub_fg->mark_tile_dirty(offset/2);
}
@@ -245,11 +233,10 @@ static TILE_GET_INFO( get_tile_info_rocknms_sub_rot )
0);
}
-WRITE16_HANDLER( rocknms_sub_vram_rot_w )
+WRITE16_MEMBER(tetrisp2_state::rocknms_sub_vram_rot_w)
{
- tetrisp2_state *state = space->machine().driver_data<tetrisp2_state>();
- COMBINE_DATA(&state->m_rocknms_sub_vram_rot[offset]);
- state->m_tilemap_sub_rot->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_rocknms_sub_vram_rot[offset]);
+ m_tilemap_sub_rot->mark_tile_dirty(offset/2);
}
diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c
index da228454532..7e3e598ad03 100644
--- a/src/mame/video/thedeep.c
+++ b/src/mame/video/thedeep.c
@@ -67,18 +67,16 @@ static TILE_GET_INFO( get_tile_info_1 )
0);
}
-WRITE8_HANDLER( thedeep_vram_0_w )
+WRITE8_MEMBER(thedeep_state::thedeep_vram_0_w)
{
- thedeep_state *state = space->machine().driver_data<thedeep_state>();
- state->m_vram_0[offset] = data;
- state->m_tilemap_0->mark_tile_dirty(offset / 2);
+ m_vram_0[offset] = data;
+ m_tilemap_0->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( thedeep_vram_1_w )
+WRITE8_MEMBER(thedeep_state::thedeep_vram_1_w)
{
- thedeep_state *state = space->machine().driver_data<thedeep_state>();
- state->m_vram_1[offset] = data;
- state->m_tilemap_1->mark_tile_dirty(offset / 2);
+ m_vram_1[offset] = data;
+ m_tilemap_1->mark_tile_dirty(offset / 2);
}
diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c
index 9efd11aecfc..0ffb93e1725 100644
--- a/src/mame/video/thepit.c
+++ b/src/mame/video/thepit.c
@@ -144,81 +144,75 @@ VIDEO_START( thepit )
*
*************************************/
-WRITE8_HANDLER( thepit_videoram_w )
+WRITE8_MEMBER(thepit_state::thepit_videoram_w)
{
- thepit_state *state = space->machine().driver_data<thepit_state>();
- state->m_videoram[offset] = data;
- state->m_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( thepit_colorram_w )
+WRITE8_MEMBER(thepit_state::thepit_colorram_w)
{
- thepit_state *state = space->machine().driver_data<thepit_state>();
- state->m_colorram[offset] = data;
- state->m_tilemap->mark_tile_dirty(offset);
- state->m_solid_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_tilemap->mark_tile_dirty(offset);
+ m_solid_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( thepit_flip_screen_x_w )
+WRITE8_MEMBER(thepit_state::thepit_flip_screen_x_w)
{
- thepit_state *state = space->machine().driver_data<thepit_state>();
int flip;
- state->m_flip_screen_x = data & 0x01;
+ m_flip_screen_x = data & 0x01;
- flip = state->m_flip_screen_x ? TILEMAP_FLIPX : 0;
- if (state->m_flip_screen_y)
+ flip = m_flip_screen_x ? TILEMAP_FLIPX : 0;
+ if (m_flip_screen_y)
flip |= TILEMAP_FLIPY ;
- state->m_tilemap->set_flip(flip);
- state->m_solid_tilemap->set_flip(flip);
+ m_tilemap->set_flip(flip);
+ m_solid_tilemap->set_flip(flip);
}
-WRITE8_HANDLER( thepit_flip_screen_y_w )
+WRITE8_MEMBER(thepit_state::thepit_flip_screen_y_w)
{
- thepit_state *state = space->machine().driver_data<thepit_state>();
int flip;
- state->m_flip_screen_y = data & 0x01;
+ m_flip_screen_y = data & 0x01;
- flip = state->m_flip_screen_x ? TILEMAP_FLIPX : 0;
- if (state->m_flip_screen_y)
+ flip = m_flip_screen_x ? TILEMAP_FLIPX : 0;
+ if (m_flip_screen_y)
flip |= TILEMAP_FLIPY ;
- state->m_tilemap->set_flip(flip);
- state->m_solid_tilemap->set_flip(flip);
+ m_tilemap->set_flip(flip);
+ m_solid_tilemap->set_flip(flip);
}
-WRITE8_HANDLER( intrepid_graphics_bank_w )
+WRITE8_MEMBER(thepit_state::intrepid_graphics_bank_w)
{
- thepit_state *state = space->machine().driver_data<thepit_state>();
- if (state->m_graphics_bank != (data & 0x01))
+ if (m_graphics_bank != (data & 0x01))
{
- state->m_graphics_bank = data & 0x01;
+ m_graphics_bank = data & 0x01;
- state->m_tilemap->mark_all_dirty();
+ m_tilemap->mark_all_dirty();
}
}
-READ8_HANDLER( thepit_input_port_0_r )
+READ8_MEMBER(thepit_state::thepit_input_port_0_r)
{
- thepit_state *state = space->machine().driver_data<thepit_state>();
/* Read either the real or the fake input ports depending on the
horizontal flip switch. (This is how the real PCB does it) */
- if (state->m_flip_screen_x)
+ if (m_flip_screen_x)
{
- return input_port_read(space->machine(), "IN2");
+ return input_port_read(machine(), "IN2");
}
else
{
- return input_port_read(space->machine(), "IN0");
+ return input_port_read(machine(), "IN0");
}
}
diff --git a/src/mame/video/thief.c b/src/mame/video/thief.c
index 95b3d0beba2..e419f11619b 100644
--- a/src/mame/video/thief.c
+++ b/src/mame/video/thief.c
@@ -21,26 +21,22 @@ enum {
/***************************************************************************/
-READ8_HANDLER( thief_context_ram_r ){
- thief_state *state = space->machine().driver_data<thief_state>();
- return state->m_coprocessor.context_ram[0x40*state->m_coprocessor.bank+offset];
+READ8_MEMBER(thief_state::thief_context_ram_r){
+ return m_coprocessor.context_ram[0x40*m_coprocessor.bank+offset];
}
-WRITE8_HANDLER( thief_context_ram_w ){
- thief_state *state = space->machine().driver_data<thief_state>();
- state->m_coprocessor.context_ram[0x40*state->m_coprocessor.bank+offset] = data;
+WRITE8_MEMBER(thief_state::thief_context_ram_w){
+ m_coprocessor.context_ram[0x40*m_coprocessor.bank+offset] = data;
}
-WRITE8_HANDLER( thief_context_bank_w ){
- thief_state *state = space->machine().driver_data<thief_state>();
- state->m_coprocessor.bank = data&0xf;
+WRITE8_MEMBER(thief_state::thief_context_bank_w){
+ m_coprocessor.bank = data&0xf;
}
/***************************************************************************/
-WRITE8_HANDLER( thief_video_control_w ){
- thief_state *state = space->machine().driver_data<thief_state>();
- state->m_video_control = data;
+WRITE8_MEMBER(thief_state::thief_video_control_w){
+ m_video_control = data;
/*
bit 0: screen flip
bit 1: working page
@@ -50,7 +46,7 @@ WRITE8_HANDLER( thief_video_control_w ){
*/
}
-WRITE8_HANDLER( thief_color_map_w ){
+WRITE8_MEMBER(thief_state::thief_color_map_w){
/*
--xx---- blue
----xx-- green
@@ -60,39 +56,36 @@ WRITE8_HANDLER( thief_color_map_w ){
int r = intensity[(data & 0x03) >> 0];
int g = intensity[(data & 0x0C) >> 2];
int b = intensity[(data & 0x30) >> 4];
- palette_set_color( space->machine(),offset,MAKE_RGB(r,g,b) );
+ palette_set_color( machine(),offset,MAKE_RGB(r,g,b) );
}
/***************************************************************************/
-WRITE8_HANDLER( thief_color_plane_w ){
- thief_state *state = space->machine().driver_data<thief_state>();
+WRITE8_MEMBER(thief_state::thief_color_plane_w){
/*
--xx---- selects bitplane to read from (0..3)
----xxxx selects bitplane(s) to write to (0x0 = none, 0xf = all)
*/
- state->m_write_mask = data&0xf;
- state->m_read_mask = (data>>4)&3;
+ m_write_mask = data&0xf;
+ m_read_mask = (data>>4)&3;
}
-READ8_HANDLER( thief_videoram_r ){
- thief_state *state = space->machine().driver_data<thief_state>();
- UINT8 *videoram = state->m_videoram;
+READ8_MEMBER(thief_state::thief_videoram_r){
+ UINT8 *videoram = m_videoram;
UINT8 *source = &videoram[offset];
- if( state->m_video_control&0x02 ) source+=0x2000*4; /* foreground/background */
- return source[state->m_read_mask*0x2000];
+ if( m_video_control&0x02 ) source+=0x2000*4; /* foreground/background */
+ return source[m_read_mask*0x2000];
}
-WRITE8_HANDLER( thief_videoram_w ){
- thief_state *state = space->machine().driver_data<thief_state>();
- UINT8 *videoram = state->m_videoram;
+WRITE8_MEMBER(thief_state::thief_videoram_w){
+ UINT8 *videoram = m_videoram;
UINT8 *dest = &videoram[offset];
- if( state->m_video_control&0x02 )
+ if( m_video_control&0x02 )
dest+=0x2000*4; /* foreground/background */
- if( state->m_write_mask&0x1 ) dest[0x2000*0] = data;
- if( state->m_write_mask&0x2 ) dest[0x2000*1] = data;
- if( state->m_write_mask&0x4 ) dest[0x2000*2] = data;
- if( state->m_write_mask&0x8 ) dest[0x2000*3] = data;
+ if( m_write_mask&0x1 ) dest[0x2000*0] = data;
+ if( m_write_mask&0x2 ) dest[0x2000*1] = data;
+ if( m_write_mask&0x4 ) dest[0x2000*2] = data;
+ if( m_write_mask&0x8 ) dest[0x2000*3] = data;
}
/***************************************************************************/
@@ -165,11 +158,10 @@ static UINT16 fetch_image_addr( coprocessor_t &thief_coprocessor ){
return addr;
}
-WRITE8_HANDLER( thief_blit_w ){
- thief_state *state = space->machine().driver_data<thief_state>();
- coprocessor_t &thief_coprocessor = state->m_coprocessor;
+WRITE8_MEMBER(thief_state::thief_blit_w){
+ coprocessor_t &thief_coprocessor = m_coprocessor;
int i, offs, xoffset, dy;
- UINT8 *gfx_rom = space->machine().region( "gfx1" )->base();
+ UINT8 *gfx_rom = machine().region( "gfx1" )->base();
UINT8 x = thief_coprocessor.param[SCREEN_XPOS];
UINT8 y = thief_coprocessor.param[SCREEN_YPOS];
UINT8 width = thief_coprocessor.param[BLIT_WIDTH];
@@ -203,22 +195,22 @@ WRITE8_HANDLER( thief_blit_w ){
if( addr<0x2000*3 ) data = gfx_rom[addr];
}
offs = (y*32+x/8+i)&0x1fff;
- old_data = thief_videoram_r( space,offs );
+ old_data = thief_videoram_r(space,offs );
if( xor_blit ){
- thief_videoram_w( space,offs, old_data^(data>>xoffset) );
+ thief_videoram_w(space,offs, old_data^(data>>xoffset) );
}
else {
- thief_videoram_w( space,offs,
+ thief_videoram_w(space,offs,
(old_data&(0xff00>>xoffset)) | (data>>xoffset)
);
}
offs = (offs+1)&0x1fff;
- old_data = thief_videoram_r( space,offs );
+ old_data = thief_videoram_r(space,offs );
if( xor_blit ){
- thief_videoram_w( space,offs, old_data^((data<<(8-xoffset))&0xff) );
+ thief_videoram_w(space,offs, old_data^((data<<(8-xoffset))&0xff) );
}
else {
- thief_videoram_w( space,offs,
+ thief_videoram_w(space,offs,
(old_data&(0xff>>xoffset)) | ((data<<(8-xoffset))&0xff)
);
}
@@ -227,9 +219,8 @@ WRITE8_HANDLER( thief_blit_w ){
}
}
-READ8_HANDLER( thief_coprocessor_r ){
- thief_state *state = space->machine().driver_data<thief_state>();
- coprocessor_t &thief_coprocessor = state->m_coprocessor;
+READ8_MEMBER(thief_state::thief_coprocessor_r){
+ coprocessor_t &thief_coprocessor = m_coprocessor;
switch( offset ){
case SCREEN_XPOS: /* xpos */
case SCREEN_YPOS: /* ypos */
@@ -248,7 +239,7 @@ READ8_HANDLER( thief_coprocessor_r ){
return thief_coprocessor.image_ram[addr];
}
else {
- UINT8 *gfx_rom = space->machine().region( "gfx1" )->base();
+ UINT8 *gfx_rom = machine().region( "gfx1" )->base();
addr -= 0x2000;
if( addr<0x6000 ) return gfx_rom[addr];
}
@@ -272,9 +263,8 @@ READ8_HANDLER( thief_coprocessor_r ){
return thief_coprocessor.param[offset];
}
-WRITE8_HANDLER( thief_coprocessor_w ){
- thief_state *state = space->machine().driver_data<thief_state>();
- coprocessor_t &thief_coprocessor = state->m_coprocessor;
+WRITE8_MEMBER(thief_state::thief_coprocessor_w){
+ coprocessor_t &thief_coprocessor = m_coprocessor;
switch( offset ){
case GFX_PORT:
{
diff --git a/src/mame/video/thoop2.c b/src/mame/video/thoop2.c
index 9d7d8856e0c..ec4767dceb5 100644
--- a/src/mame/video/thoop2.c
+++ b/src/mame/video/thoop2.c
@@ -67,11 +67,10 @@ static TILE_GET_INFO( get_tile_info_thoop2_screen1 )
***************************************************************************/
-WRITE16_HANDLER( thoop2_vram_w )
+WRITE16_MEMBER(thoop2_state::thoop2_vram_w)
{
- thoop2_state *state = space->machine().driver_data<thoop2_state>();
- COMBINE_DATA(&state->m_videoram[offset]);
- state->m_pant[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 2);
+ COMBINE_DATA(&m_videoram[offset]);
+ m_pant[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 2);
}
/***************************************************************************
diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c
index cfdb199c905..fcd5226b06a 100644
--- a/src/mame/video/tiamc1.c
+++ b/src/mame/video/tiamc1.c
@@ -11,79 +11,70 @@
#include "includes/tiamc1.h"
-WRITE8_HANDLER( tiamc1_videoram_w )
+WRITE8_MEMBER(tiamc1_state::tiamc1_videoram_w)
{
- tiamc1_state *state = space->machine().driver_data<tiamc1_state>();
- if(!(state->m_layers_ctrl & 2))
- state->m_charram[offset + 0x0000] = data;
- if(!(state->m_layers_ctrl & 4))
- state->m_charram[offset + 0x0800] = data;
- if(!(state->m_layers_ctrl & 8))
- state->m_charram[offset + 0x1000] = data;
- if(!(state->m_layers_ctrl & 16))
- state->m_charram[offset + 0x1800] = data;
-
- if ((state->m_layers_ctrl & (16|8|4|2)) != (16|8|4|2))
- gfx_element_mark_dirty(space->machine().gfx[0], (offset / 8) & 0xff);
-
- if(!(state->m_layers_ctrl & 1)) {
- state->m_tileram[offset] = data;
+ if(!(m_layers_ctrl & 2))
+ m_charram[offset + 0x0000] = data;
+ if(!(m_layers_ctrl & 4))
+ m_charram[offset + 0x0800] = data;
+ if(!(m_layers_ctrl & 8))
+ m_charram[offset + 0x1000] = data;
+ if(!(m_layers_ctrl & 16))
+ m_charram[offset + 0x1800] = data;
+
+ if ((m_layers_ctrl & (16|8|4|2)) != (16|8|4|2))
+ gfx_element_mark_dirty(machine().gfx[0], (offset / 8) & 0xff);
+
+ if(!(m_layers_ctrl & 1)) {
+ m_tileram[offset] = data;
if (offset < 1024)
- state->m_bg_tilemap1->mark_tile_dirty(offset & 0x3ff);
+ m_bg_tilemap1->mark_tile_dirty(offset & 0x3ff);
else
- state->m_bg_tilemap2->mark_tile_dirty(offset & 0x3ff);
+ m_bg_tilemap2->mark_tile_dirty(offset & 0x3ff);
}
}
-WRITE8_HANDLER( tiamc1_bankswitch_w )
+WRITE8_MEMBER(tiamc1_state::tiamc1_bankswitch_w)
{
- tiamc1_state *state = space->machine().driver_data<tiamc1_state>();
- if ((data & 128) != (state->m_layers_ctrl & 128))
- space->machine().tilemap().mark_all_dirty();
+ if ((data & 128) != (m_layers_ctrl & 128))
+ machine().tilemap().mark_all_dirty();
- state->m_layers_ctrl = data;
+ m_layers_ctrl = data;
}
-WRITE8_HANDLER( tiamc1_sprite_x_w )
+WRITE8_MEMBER(tiamc1_state::tiamc1_sprite_x_w)
{
- tiamc1_state *state = space->machine().driver_data<tiamc1_state>();
- state->m_spriteram_x[offset] = data;
+ m_spriteram_x[offset] = data;
}
-WRITE8_HANDLER( tiamc1_sprite_y_w )
+WRITE8_MEMBER(tiamc1_state::tiamc1_sprite_y_w)
{
- tiamc1_state *state = space->machine().driver_data<tiamc1_state>();
- state->m_spriteram_y[offset] = data;
+ m_spriteram_y[offset] = data;
}
-WRITE8_HANDLER( tiamc1_sprite_a_w )
+WRITE8_MEMBER(tiamc1_state::tiamc1_sprite_a_w)
{
- tiamc1_state *state = space->machine().driver_data<tiamc1_state>();
- state->m_spriteram_a[offset] = data;
+ m_spriteram_a[offset] = data;
}
-WRITE8_HANDLER( tiamc1_sprite_n_w )
+WRITE8_MEMBER(tiamc1_state::tiamc1_sprite_n_w)
{
- tiamc1_state *state = space->machine().driver_data<tiamc1_state>();
- state->m_spriteram_n[offset] = data;
+ m_spriteram_n[offset] = data;
}
-WRITE8_HANDLER( tiamc1_bg_vshift_w )
+WRITE8_MEMBER(tiamc1_state::tiamc1_bg_vshift_w)
{
- tiamc1_state *state = space->machine().driver_data<tiamc1_state>();
- state->m_bg_vshift = data;
+ m_bg_vshift = data;
}
-WRITE8_HANDLER( tiamc1_bg_hshift_w )
+WRITE8_MEMBER(tiamc1_state::tiamc1_bg_hshift_w)
{
- tiamc1_state *state = space->machine().driver_data<tiamc1_state>();
- state->m_bg_hshift = data;
+ m_bg_hshift = data;
}
-WRITE8_HANDLER( tiamc1_palette_w )
+WRITE8_MEMBER(tiamc1_state::tiamc1_palette_w)
{
- tiamc1_state *state = space->machine().driver_data<tiamc1_state>();
- palette_set_color(space->machine(), offset, state->m_palette[data]);
+ palette_set_color(machine(), offset, m_palette[data]);
}
PALETTE_INIT( tiamc1 )
diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c
index bc7e52b07da..49f750ed039 100644
--- a/src/mame/video/tigeroad.c
+++ b/src/mame/video/tigeroad.c
@@ -2,17 +2,15 @@
#include "includes/tigeroad.h"
-WRITE16_HANDLER( tigeroad_videoram_w )
+WRITE16_MEMBER(tigeroad_state::tigeroad_videoram_w)
{
- tigeroad_state *state = space->machine().driver_data<tigeroad_state>();
- UINT16 *videoram = state->m_videoram;
+ UINT16 *videoram = m_videoram;
COMBINE_DATA(&videoram[offset]);
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( tigeroad_videoctrl_w )
+WRITE16_MEMBER(tigeroad_state::tigeroad_videoctrl_w)
{
- tigeroad_state *state = space->machine().driver_data<tigeroad_state>();
int bank;
if (ACCESSING_BITS_8_15)
@@ -21,37 +19,36 @@ WRITE16_HANDLER( tigeroad_videoctrl_w )
/* bit 1 flips screen */
- if (flip_screen_get(space->machine()) != (data & 0x02))
+ if (flip_screen_get(machine()) != (data & 0x02))
{
- flip_screen_set(space->machine(), data & 0x02);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x02);
+ machine().tilemap().mark_all_dirty();
}
/* bit 2 selects bg char bank */
bank = (data & 0x04) >> 2;
- if (state->m_bgcharbank != bank)
+ if (m_bgcharbank != bank)
{
- state->m_bgcharbank = bank;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bgcharbank = bank;
+ m_bg_tilemap->mark_all_dirty();
}
/* bits 4-5 are coin lockouts */
- coin_lockout_w(space->machine(), 0, !(data & 0x10));
- coin_lockout_w(space->machine(), 1, !(data & 0x20));
+ coin_lockout_w(machine(), 0, !(data & 0x10));
+ coin_lockout_w(machine(), 1, !(data & 0x20));
/* bits 6-7 are coin counters */
- coin_counter_w(space->machine(), 0, data & 0x40);
- coin_counter_w(space->machine(), 1, data & 0x80);
+ coin_counter_w(machine(), 0, data & 0x40);
+ coin_counter_w(machine(), 1, data & 0x80);
}
}
-WRITE16_HANDLER( tigeroad_scroll_w )
+WRITE16_MEMBER(tigeroad_state::tigeroad_scroll_w)
{
- tigeroad_state *state = space->machine().driver_data<tigeroad_state>();
int scroll = 0;
COMBINE_DATA(&scroll);
@@ -59,10 +56,10 @@ WRITE16_HANDLER( tigeroad_scroll_w )
switch (offset)
{
case 0:
- state->m_bg_tilemap->set_scrollx(0, scroll);
+ m_bg_tilemap->set_scrollx(0, scroll);
break;
case 1:
- state->m_bg_tilemap->set_scrolly(0, -scroll - 32 * 8);
+ m_bg_tilemap->set_scrolly(0, -scroll - 32 * 8);
break;
}
}
diff --git a/src/mame/video/timelimt.c b/src/mame/video/timelimt.c
index eddc5b1fb1a..cf61a363a2f 100644
--- a/src/mame/video/timelimt.c
+++ b/src/mame/video/timelimt.c
@@ -80,39 +80,34 @@ VIDEO_START( timelimt )
/***************************************************************************/
-WRITE8_HANDLER( timelimt_videoram_w )
+WRITE8_MEMBER(timelimt_state::timelimt_videoram_w)
{
- timelimt_state *state = space->machine().driver_data<timelimt_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( timelimt_bg_videoram_w )
+WRITE8_MEMBER(timelimt_state::timelimt_bg_videoram_w)
{
- timelimt_state *state = space->machine().driver_data<timelimt_state>();
- state->m_bg_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( timelimt_scroll_x_lsb_w )
+WRITE8_MEMBER(timelimt_state::timelimt_scroll_x_lsb_w)
{
- timelimt_state *state = space->machine().driver_data<timelimt_state>();
- state->m_scrollx &= 0x100;
- state->m_scrollx |= data & 0xff;
+ m_scrollx &= 0x100;
+ m_scrollx |= data & 0xff;
}
-WRITE8_HANDLER( timelimt_scroll_x_msb_w )
+WRITE8_MEMBER(timelimt_state::timelimt_scroll_x_msb_w)
{
- timelimt_state *state = space->machine().driver_data<timelimt_state>();
- state->m_scrollx &= 0xff;
- state->m_scrollx |= ( data & 1 ) << 8;
+ m_scrollx &= 0xff;
+ m_scrollx |= ( data & 1 ) << 8;
}
-WRITE8_HANDLER( timelimt_scroll_y_w )
+WRITE8_MEMBER(timelimt_state::timelimt_scroll_y_w)
{
- timelimt_state *state = space->machine().driver_data<timelimt_state>();
- state->m_scrolly = data;
+ m_scrolly = data;
}
diff --git a/src/mame/video/timeplt.c b/src/mame/video/timeplt.c
index 62367c9e29c..90f1cbb92c6 100644
--- a/src/mame/video/timeplt.c
+++ b/src/mame/video/timeplt.c
@@ -141,31 +141,29 @@ VIDEO_START( chkun )
*
*************************************/
-WRITE8_HANDLER( timeplt_videoram_w )
+WRITE8_MEMBER(timeplt_state::timeplt_videoram_w)
{
- timeplt_state *state = space->machine().driver_data<timeplt_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( timeplt_colorram_w )
+WRITE8_MEMBER(timeplt_state::timeplt_colorram_w)
{
- timeplt_state *state = space->machine().driver_data<timeplt_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( timeplt_flipscreen_w )
+WRITE8_MEMBER(timeplt_state::timeplt_flipscreen_w)
{
- flip_screen_set(space->machine(), ~data & 1);
+ flip_screen_set(machine(), ~data & 1);
}
-READ8_HANDLER( timeplt_scanline_r )
+READ8_MEMBER(timeplt_state::timeplt_scanline_r)
{
- return space->machine().primary_screen->vpos();
+ return machine().primary_screen->vpos();
}
diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c
index 4465fcce0e9..9ce5784683b 100644
--- a/src/mame/video/tmnt.c
+++ b/src/mame/video/tmnt.c
@@ -313,103 +313,98 @@ VIDEO_START( blswhstl )
***************************************************************************/
-WRITE16_HANDLER( tmnt_paletteram_word_w )
+WRITE16_MEMBER(tmnt_state::tmnt_paletteram_word_w)
{
- tmnt_state *state = space->machine().driver_data<tmnt_state>();
- COMBINE_DATA(state->m_generic_paletteram_16 + offset);
+ COMBINE_DATA(m_generic_paletteram_16 + offset);
offset &= ~1;
- data = (state->m_generic_paletteram_16[offset] << 8) | state->m_generic_paletteram_16[offset + 1];
- palette_set_color_rgb(space->machine(), offset / 2, pal5bit(data >> 0), pal5bit(data >> 5), pal5bit(data >> 10));
+ data = (m_generic_paletteram_16[offset] << 8) | m_generic_paletteram_16[offset + 1];
+ palette_set_color_rgb(machine(), offset / 2, pal5bit(data >> 0), pal5bit(data >> 5), pal5bit(data >> 10));
}
-WRITE16_HANDLER( tmnt_0a0000_w )
+WRITE16_MEMBER(tmnt_state::tmnt_0a0000_w)
{
- tmnt_state *state = space->machine().driver_data<tmnt_state>();
if (ACCESSING_BITS_0_7)
{
/* bit 0/1 = coin counters */
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02); /* 2 players version */
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02); /* 2 players version */
/* bit 3 high then low triggers irq on sound CPU */
- if (state->m_last == 0x08 && (data & 0x08) == 0)
- device_set_input_line_and_vector(state->m_audiocpu, 0, HOLD_LINE, 0xff);
+ if (m_last == 0x08 && (data & 0x08) == 0)
+ device_set_input_line_and_vector(m_audiocpu, 0, HOLD_LINE, 0xff);
- state->m_last = data & 0x08;
+ m_last = data & 0x08;
/* bit 5 = irq enable */
- state->m_irq5_mask = data & 0x20;
+ m_irq5_mask = data & 0x20;
/* bit 7 = enable char ROM reading through the video RAM */
- k052109_set_rmrd_line(state->m_k052109, (data & 0x80) ? ASSERT_LINE : CLEAR_LINE);
+ k052109_set_rmrd_line(m_k052109, (data & 0x80) ? ASSERT_LINE : CLEAR_LINE);
/* other bits unused */
}
}
-WRITE16_HANDLER( punkshot_0a0020_w )
+WRITE16_MEMBER(tmnt_state::punkshot_0a0020_w)
{
- tmnt_state *state = space->machine().driver_data<tmnt_state>();
if (ACCESSING_BITS_0_7)
{
/* bit 0 = coin counter */
- coin_counter_w(space->machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 0, data & 0x01);
/* bit 2 = trigger irq on sound CPU */
- if (state->m_last == 0x04 && (data & 0x04) == 0)
- device_set_input_line_and_vector(state->m_audiocpu, 0, HOLD_LINE, 0xff);
+ if (m_last == 0x04 && (data & 0x04) == 0)
+ device_set_input_line_and_vector(m_audiocpu, 0, HOLD_LINE, 0xff);
- state->m_last = data & 0x04;
+ m_last = data & 0x04;
/* bit 3 = enable char ROM reading through the video RAM */
- k052109_set_rmrd_line(state->m_k052109, (data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
+ k052109_set_rmrd_line(m_k052109, (data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
}
}
-WRITE16_HANDLER( lgtnfght_0a0018_w )
+WRITE16_MEMBER(tmnt_state::lgtnfght_0a0018_w)
{
- tmnt_state *state = space->machine().driver_data<tmnt_state>();
if (ACCESSING_BITS_0_7)
{
/* bit 0,1 = coin counter */
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02);
/* bit 2 = trigger irq on sound CPU */
- if (state->m_last == 0x00 && (data & 0x04) == 0x04)
- device_set_input_line_and_vector(state->m_audiocpu, 0, HOLD_LINE, 0xff);
+ if (m_last == 0x00 && (data & 0x04) == 0x04)
+ device_set_input_line_and_vector(m_audiocpu, 0, HOLD_LINE, 0xff);
- state->m_last = data & 0x04;
+ m_last = data & 0x04;
/* bit 3 = enable char ROM reading through the video RAM */
- k052109_set_rmrd_line(state->m_k052109, (data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
+ k052109_set_rmrd_line(m_k052109, (data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
}
}
-WRITE16_HANDLER( blswhstl_700300_w )
+WRITE16_MEMBER(tmnt_state::blswhstl_700300_w)
{
- tmnt_state *state = space->machine().driver_data<tmnt_state>();
if (ACCESSING_BITS_0_7)
{
/* bit 0,1 = coin counter */
- coin_counter_w(space->machine(), 0,data & 0x01);
- coin_counter_w(space->machine(), 1,data & 0x02);
+ coin_counter_w(machine(), 0,data & 0x01);
+ coin_counter_w(machine(), 1,data & 0x02);
/* bit 3 = enable char ROM reading through the video RAM */
- k052109_set_rmrd_line(state->m_k052109, (data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
+ k052109_set_rmrd_line(m_k052109, (data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
/* bit 7 = select char ROM bank */
- if (state->m_blswhstl_rombank != ((data & 0x80) >> 7))
+ if (m_blswhstl_rombank != ((data & 0x80) >> 7))
{
- state->m_blswhstl_rombank = (data & 0x80) >> 7;
- space->machine().tilemap().mark_all_dirty();
+ m_blswhstl_rombank = (data & 0x80) >> 7;
+ machine().tilemap().mark_all_dirty();
}
/* other bits unknown */
@@ -417,133 +412,126 @@ WRITE16_HANDLER( blswhstl_700300_w )
}
-READ16_HANDLER( glfgreat_rom_r )
+READ16_MEMBER(tmnt_state::glfgreat_rom_r)
{
- tmnt_state *state = space->machine().driver_data<tmnt_state>();
- if (state->m_glfgreat_roz_rom_mode)
- return space->machine().region("gfx3")->base()[state->m_glfgreat_roz_char_bank * 0x80000 + offset];
+ if (m_glfgreat_roz_rom_mode)
+ return machine().region("gfx3")->base()[m_glfgreat_roz_char_bank * 0x80000 + offset];
else if (offset < 0x40000)
{
- UINT8 *usr = space->machine().region("user1")->base();
- return usr[offset + 0x80000 + state->m_glfgreat_roz_rom_bank * 0x40000] + 256 * usr[offset + state->m_glfgreat_roz_rom_bank * 0x40000];
+ UINT8 *usr = machine().region("user1")->base();
+ return usr[offset + 0x80000 + m_glfgreat_roz_rom_bank * 0x40000] + 256 * usr[offset + m_glfgreat_roz_rom_bank * 0x40000];
}
else
- return space->machine().region("user1")->base()[((offset & 0x3ffff) >> 2) + 0x100000 + state->m_glfgreat_roz_rom_bank * 0x10000];
+ return machine().region("user1")->base()[((offset & 0x3ffff) >> 2) + 0x100000 + m_glfgreat_roz_rom_bank * 0x10000];
}
-WRITE16_HANDLER( glfgreat_122000_w )
+WRITE16_MEMBER(tmnt_state::glfgreat_122000_w)
{
- tmnt_state *state = space->machine().driver_data<tmnt_state>();
if (ACCESSING_BITS_0_7)
{
/* bit 0,1 = coin counter */
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02);
/* bit 4 = enable char ROM reading through the video RAM */
- k052109_set_rmrd_line(state->m_k052109, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
+ k052109_set_rmrd_line(m_k052109, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
/* bit 5 = 53596 tile rom bank selection */
- if (state->m_glfgreat_roz_rom_bank != (data & 0x20) >> 5)
+ if (m_glfgreat_roz_rom_bank != (data & 0x20) >> 5)
{
- state->m_glfgreat_roz_rom_bank = (data & 0x20) >> 5;
- state->m_roz_tilemap->mark_all_dirty();
+ m_glfgreat_roz_rom_bank = (data & 0x20) >> 5;
+ m_roz_tilemap->mark_all_dirty();
}
/* bit 6,7 = 53596 char bank selection for ROM test */
- state->m_glfgreat_roz_char_bank = (data & 0xc0) >> 6;
+ m_glfgreat_roz_char_bank = (data & 0xc0) >> 6;
/* other bits unknown */
}
if (ACCESSING_BITS_8_15)
{
/* bit 8 = 53596 char/rom selection for ROM test */
- state->m_glfgreat_roz_rom_mode = data & 0x100;
+ m_glfgreat_roz_rom_mode = data & 0x100;
}
}
-WRITE16_HANDLER( ssriders_eeprom_w )
+WRITE16_MEMBER(tmnt_state::ssriders_eeprom_w)
{
- tmnt_state *state = space->machine().driver_data<tmnt_state>();
if (ACCESSING_BITS_0_7)
{
/* bit 0 is data */
/* bit 1 is cs (active low) */
/* bit 2 is clock (active high) */
- input_port_write(space->machine(), "EEPROMOUT", data, 0xff);
+ input_port_write(machine(), "EEPROMOUT", data, 0xff);
/* bits 3-4 control palette dimming */
/* 4 = DIMPOL = when set, negate SHAD */
/* 3 = DIMMOD = when set, or BRIT with [negated] SHAD */
- state->m_dim_c = data & 0x18;
+ m_dim_c = data & 0x18;
/* bit 5 selects sprite ROM for testing in TMNT2 (bits 5-7, actually, according to the schematics) */
- k053244_bankselect(state->m_k053245, ((data & 0x20) >> 5) << 2);
+ k053244_bankselect(m_k053245, ((data & 0x20) >> 5) << 2);
}
}
-WRITE16_HANDLER( ssriders_1c0300_w )
+WRITE16_MEMBER(tmnt_state::ssriders_1c0300_w)
{
- tmnt_state *state = space->machine().driver_data<tmnt_state>();
if (ACCESSING_BITS_0_7)
{
/* bit 0,1 = coin counter */
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02);
/* bit 3 = enable char ROM reading through the video RAM */
- k052109_set_rmrd_line(state->m_k052109, (data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
+ k052109_set_rmrd_line(m_k052109, (data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
/* bits 4-6 control palette dimming (DIM0-DIM2) */
- state->m_dim_v = (data & 0x70) >> 4;
+ m_dim_v = (data & 0x70) >> 4;
}
}
-WRITE16_HANDLER( prmrsocr_122000_w )
+WRITE16_MEMBER(tmnt_state::prmrsocr_122000_w)
{
- tmnt_state *state = space->machine().driver_data<tmnt_state>();
if (ACCESSING_BITS_0_7)
{
/* bit 0,1 = coin counter */
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02);
/* bit 4 = enable char ROM reading through the video RAM */
- k052109_set_rmrd_line(state->m_k052109, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
+ k052109_set_rmrd_line(m_k052109, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
/* bit 6 = sprite ROM bank */
- state->m_prmrsocr_sprite_bank = (data & 0x40) >> 6;
- k053244_bankselect(state->m_k053245, state->m_prmrsocr_sprite_bank << 2);
+ m_prmrsocr_sprite_bank = (data & 0x40) >> 6;
+ k053244_bankselect(m_k053245, m_prmrsocr_sprite_bank << 2);
/* bit 7 = 53596 region selector for ROM test */
- state->m_glfgreat_roz_char_bank = (data & 0x80) >> 7;
+ m_glfgreat_roz_char_bank = (data & 0x80) >> 7;
/* other bits unknown (unused?) */
}
}
-READ16_HANDLER( prmrsocr_rom_r )
+READ16_MEMBER(tmnt_state::prmrsocr_rom_r)
{
- tmnt_state *state = space->machine().driver_data<tmnt_state>();
- if(state->m_glfgreat_roz_char_bank)
- return space->machine().region("gfx3")->base()[offset];
+ if(m_glfgreat_roz_char_bank)
+ return machine().region("gfx3")->base()[offset];
else
{
- UINT8 *usr = space->machine().region("user1")->base();
+ UINT8 *usr = machine().region("user1")->base();
return 256 * usr[offset] + usr[offset + 0x020000];
}
}
-WRITE16_HANDLER( tmnt_priority_w )
+WRITE16_MEMBER(tmnt_state::tmnt_priority_w)
{
- tmnt_state *state = space->machine().driver_data<tmnt_state>();
if (ACCESSING_BITS_0_7)
{
@@ -565,7 +553,7 @@ WRITE16_HANDLER( tmnt_priority_w )
are 0) is taken from the *foreground* palette, not the background
one as would be more intuitive.
*/
- state->m_tmnt_priorityflag = (data & 0x0c) >> 2;
+ m_tmnt_priorityflag = (data & 0x0c) >> 2;
}
}
@@ -671,18 +659,17 @@ SCREEN_UPDATE_IND16( lgtnfght )
}
-READ16_HANDLER( glfgreat_ball_r )
+READ16_MEMBER(tmnt_state::glfgreat_ball_r)
{
- tmnt_state *state = space->machine().driver_data<tmnt_state>();
#ifdef MAME_DEBUG
-popmessage("%04x", state->m_glfgreat_pixel);
+popmessage("%04x", m_glfgreat_pixel);
#endif
/* if out of the ROZ layer palette range, it's in the water - return 0 */
- if (state->m_glfgreat_pixel < 0x400 || state->m_glfgreat_pixel >= 0x500)
+ if (m_glfgreat_pixel < 0x400 || m_glfgreat_pixel >= 0x500)
return 0;
else
- return state->m_glfgreat_pixel & 0xff;
+ return m_glfgreat_pixel & 0xff;
}
SCREEN_UPDATE_IND16( glfgreat )
diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c
index d05e6f91ba4..e6e3c947207 100644
--- a/src/mame/video/toaplan1.c
+++ b/src/mame/video/toaplan1.c
@@ -295,7 +295,7 @@ static void rallybik_flipscreen(running_machine &machine)
toaplan1_state *state = machine.driver_data<toaplan1_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- rallybik_bcu_flipscreen_w(space, 0, state->m_bcu_flipscreen, 0xffff);
+ state->rallybik_bcu_flipscreen_w(*space, 0, state->m_bcu_flipscreen, 0xffff);
}
static void toaplan1_flipscreen(running_machine &machine)
@@ -303,7 +303,7 @@ static void toaplan1_flipscreen(running_machine &machine)
toaplan1_state *state = machine.driver_data<toaplan1_state>();
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- toaplan1_bcu_flipscreen_w(space, 0, state->m_bcu_flipscreen, 0xffff);
+ state->toaplan1_bcu_flipscreen_w(*space, 0, state->m_bcu_flipscreen, 0xffff);
}
static void register_common(running_machine &machine)
@@ -393,201 +393,186 @@ VIDEO_START( toaplan1 )
***************************************************************************/
-READ16_HANDLER( toaplan1_frame_done_r )
+READ16_MEMBER(toaplan1_state::toaplan1_frame_done_r)
{
- return space->machine().primary_screen->vblank();
+ return machine().primary_screen->vblank();
}
-WRITE16_HANDLER( toaplan1_tile_offsets_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_tile_offsets_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
if ( offset == 0 )
{
- COMBINE_DATA(&state->m_tiles_offsetx);
- logerror("Tiles_offsetx now = %08x\n", state->m_tiles_offsetx);
+ COMBINE_DATA(&m_tiles_offsetx);
+ logerror("Tiles_offsetx now = %08x\n", m_tiles_offsetx);
}
else
{
- COMBINE_DATA(&state->m_tiles_offsety);
- logerror("Tiles_offsety now = %08x\n", state->m_tiles_offsety);
+ COMBINE_DATA(&m_tiles_offsety);
+ logerror("Tiles_offsety now = %08x\n", m_tiles_offsety);
}
- state->m_reset = 1;
- toaplan1_set_scrolls(space->machine());
+ m_reset = 1;
+ toaplan1_set_scrolls(machine());
}
-WRITE16_HANDLER( rallybik_bcu_flipscreen_w )
+WRITE16_MEMBER(toaplan1_state::rallybik_bcu_flipscreen_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- if (ACCESSING_BITS_0_7 && (data != state->m_bcu_flipscreen))
+ if (ACCESSING_BITS_0_7 && (data != m_bcu_flipscreen))
{
logerror("Setting BCU controller flipscreen port to %04x\n",data);
- state->m_bcu_flipscreen = data & 0x01; /* 0x0001 = flip, 0x0000 = no flip */
- space->machine().tilemap().set_flip_all((data ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0));
- if (state->m_bcu_flipscreen)
+ m_bcu_flipscreen = data & 0x01; /* 0x0001 = flip, 0x0000 = no flip */
+ machine().tilemap().set_flip_all((data ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0));
+ if (m_bcu_flipscreen)
{
- state->m_scrollx_offs1 = 0x1c0 - 6;
- state->m_scrollx_offs2 = 0x1c0 - 4;
- state->m_scrollx_offs3 = 0x1c0 - 2;
- state->m_scrollx_offs4 = 0x1c0 - 0;
- state->m_scrolly_offs = 0x0e8;
+ m_scrollx_offs1 = 0x1c0 - 6;
+ m_scrollx_offs2 = 0x1c0 - 4;
+ m_scrollx_offs3 = 0x1c0 - 2;
+ m_scrollx_offs4 = 0x1c0 - 0;
+ m_scrolly_offs = 0x0e8;
}
else
{
- state->m_scrollx_offs1 = 0x00d + 6;
- state->m_scrollx_offs2 = 0x00d + 4;
- state->m_scrollx_offs3 = 0x00d + 2;
- state->m_scrollx_offs4 = 0x00d + 0;
- state->m_scrolly_offs = 0x111;
+ m_scrollx_offs1 = 0x00d + 6;
+ m_scrollx_offs2 = 0x00d + 4;
+ m_scrollx_offs3 = 0x00d + 2;
+ m_scrollx_offs4 = 0x00d + 0;
+ m_scrolly_offs = 0x111;
}
- toaplan1_set_scrolls(space->machine());
+ toaplan1_set_scrolls(machine());
}
}
-WRITE16_HANDLER( toaplan1_bcu_flipscreen_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_bcu_flipscreen_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- if (ACCESSING_BITS_0_7 && (data != state->m_bcu_flipscreen))
+ if (ACCESSING_BITS_0_7 && (data != m_bcu_flipscreen))
{
logerror("Setting BCU controller flipscreen port to %04x\n",data);
- state->m_bcu_flipscreen = data & 0x01; /* 0x0001 = flip, 0x0000 = no flip */
- space->machine().tilemap().set_flip_all((data ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0));
- if (state->m_bcu_flipscreen)
+ m_bcu_flipscreen = data & 0x01; /* 0x0001 = flip, 0x0000 = no flip */
+ machine().tilemap().set_flip_all((data ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0));
+ if (m_bcu_flipscreen)
{
- const rectangle &visarea = space->machine().primary_screen->visible_area();
-
- state->m_scrollx_offs1 = 0x151 - 6;
- state->m_scrollx_offs2 = 0x151 - 4;
- state->m_scrollx_offs3 = 0x151 - 2;
- state->m_scrollx_offs4 = 0x151 - 0;
- state->m_scrolly_offs = 0x1ef;
- state->m_scrolly_offs += ((visarea.max_y + 1) - ((visarea.max_y + 1) - visarea.min_y)) * 2; /* Horizontal games are offset so adjust by +0x20 */
+ const rectangle &visarea = machine().primary_screen->visible_area();
+
+ m_scrollx_offs1 = 0x151 - 6;
+ m_scrollx_offs2 = 0x151 - 4;
+ m_scrollx_offs3 = 0x151 - 2;
+ m_scrollx_offs4 = 0x151 - 0;
+ m_scrolly_offs = 0x1ef;
+ m_scrolly_offs += ((visarea.max_y + 1) - ((visarea.max_y + 1) - visarea.min_y)) * 2; /* Horizontal games are offset so adjust by +0x20 */
}
else
{
- state->m_scrollx_offs1 = 0x1ef + 6;
- state->m_scrollx_offs2 = 0x1ef + 4;
- state->m_scrollx_offs3 = 0x1ef + 2;
- state->m_scrollx_offs4 = 0x1ef + 0;
- state->m_scrolly_offs = 0x101;
+ m_scrollx_offs1 = 0x1ef + 6;
+ m_scrollx_offs2 = 0x1ef + 4;
+ m_scrollx_offs3 = 0x1ef + 2;
+ m_scrollx_offs4 = 0x1ef + 0;
+ m_scrolly_offs = 0x101;
}
- toaplan1_set_scrolls(space->machine());
+ toaplan1_set_scrolls(machine());
}
}
-WRITE16_HANDLER( toaplan1_fcu_flipscreen_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_fcu_flipscreen_w)
{
if (ACCESSING_BITS_8_15)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
logerror("Setting FCU controller flipscreen port to %04x\n",data);
- state->m_fcu_flipscreen = data & 0x8000; /* 0x8000 = flip, 0x0000 = no flip */
+ m_fcu_flipscreen = data & 0x8000; /* 0x8000 = flip, 0x0000 = no flip */
}
}
-READ16_HANDLER( toaplan1_spriteram_offs_r ) /// this aint really needed ?
+READ16_MEMBER(toaplan1_state::toaplan1_spriteram_offs_r)/// this aint really needed ?
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- return state->m_spriteram_offs;
+ return m_spriteram_offs;
}
-WRITE16_HANDLER( toaplan1_spriteram_offs_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_spriteram_offs_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- COMBINE_DATA(&state->m_spriteram_offs);
+ COMBINE_DATA(&m_spriteram_offs);
}
/* tile palette */
-READ16_HANDLER( toaplan1_colorram1_r )
+READ16_MEMBER(toaplan1_state::toaplan1_colorram1_r)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- return state->m_colorram1[offset];
+ return m_colorram1[offset];
}
-WRITE16_HANDLER( toaplan1_colorram1_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_colorram1_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- COMBINE_DATA(&state->m_colorram1[offset]);
- state->paletteram16_xBBBBBGGGGGRRRRR_word_w(*space, offset, data, mem_mask);
+ COMBINE_DATA(&m_colorram1[offset]);
+ paletteram16_xBBBBBGGGGGRRRRR_word_w(space, offset, data, mem_mask);
}
/* sprite palette */
-READ16_HANDLER( toaplan1_colorram2_r )
+READ16_MEMBER(toaplan1_state::toaplan1_colorram2_r)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- return state->m_colorram2[offset];
+ return m_colorram2[offset];
}
-WRITE16_HANDLER( toaplan1_colorram2_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_colorram2_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- COMBINE_DATA(&state->m_colorram2[offset]);
- state->paletteram16_xBBBBBGGGGGRRRRR_word_w(*space, offset+(state->m_colorram1_size/2), data, mem_mask);
+ COMBINE_DATA(&m_colorram2[offset]);
+ paletteram16_xBBBBBGGGGGRRRRR_word_w(space, offset+(m_colorram1_size/2), data, mem_mask);
}
-READ16_HANDLER( toaplan1_spriteram16_r )
+READ16_MEMBER(toaplan1_state::toaplan1_spriteram16_r)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- return state->m_spriteram[state->m_spriteram_offs & ((TOAPLAN1_SPRITERAM_SIZE/2)-1)];
+ return m_spriteram[m_spriteram_offs & ((TOAPLAN1_SPRITERAM_SIZE/2)-1)];
}
-WRITE16_HANDLER( toaplan1_spriteram16_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_spriteram16_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- COMBINE_DATA(&state->m_spriteram[state->m_spriteram_offs & ((TOAPLAN1_SPRITERAM_SIZE/2)-1)]);
+ COMBINE_DATA(&m_spriteram[m_spriteram_offs & ((TOAPLAN1_SPRITERAM_SIZE/2)-1)]);
#ifdef MAME_DEBUG
- if (state->m_spriteram_offs >= (TOAPLAN1_SPRITERAM_SIZE/2))
+ if (m_spriteram_offs >= (TOAPLAN1_SPRITERAM_SIZE/2))
{
- logerror("Sprite_RAM_word_w, %08x out of range !\n", state->m_spriteram_offs);
+ logerror("Sprite_RAM_word_w, %08x out of range !\n", m_spriteram_offs);
return;
}
#endif
- state->m_spriteram_offs++;
+ m_spriteram_offs++;
}
-READ16_HANDLER( toaplan1_spritesizeram16_r )
+READ16_MEMBER(toaplan1_state::toaplan1_spritesizeram16_r)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- return state->m_spritesizeram16[state->m_spriteram_offs & ((TOAPLAN1_SPRITESIZERAM_SIZE/2)-1)];
+ return m_spritesizeram16[m_spriteram_offs & ((TOAPLAN1_SPRITESIZERAM_SIZE/2)-1)];
}
-WRITE16_HANDLER( toaplan1_spritesizeram16_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_spritesizeram16_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- COMBINE_DATA(&state->m_spritesizeram16[state->m_spriteram_offs & ((TOAPLAN1_SPRITESIZERAM_SIZE/2)-1)]);
+ COMBINE_DATA(&m_spritesizeram16[m_spriteram_offs & ((TOAPLAN1_SPRITESIZERAM_SIZE/2)-1)]);
#ifdef MAME_DEBUG
- if (state->m_spriteram_offs >= (TOAPLAN1_SPRITESIZERAM_SIZE/2))
+ if (m_spriteram_offs >= (TOAPLAN1_SPRITESIZERAM_SIZE/2))
{
- logerror("Sprite_Size_RAM_word_w, %08x out of range !\n", state->m_spriteram_offs);
+ logerror("Sprite_Size_RAM_word_w, %08x out of range !\n", m_spriteram_offs);
return;
}
#endif
- state->m_spriteram_offs++; /// really ? shouldn't happen on the sizeram
+ m_spriteram_offs++; /// really ? shouldn't happen on the sizeram
}
-WRITE16_HANDLER( toaplan1_bcu_control_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_bcu_control_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
logerror("BCU tile controller register:%02x now = %04x\n",offset,data);
@@ -595,63 +580,60 @@ WRITE16_HANDLER( toaplan1_bcu_control_w )
/*** soft resets. These two games don't have a sound reset port, */
/*** unlike the other games */
- if (state->m_unk_reset_port && state->m_reset)
+ if (m_unk_reset_port && m_reset)
{
- state->m_reset = 0;
+ m_reset = 0;
toaplan1_reset_sound(space,0,0,0);
}
}
-READ16_HANDLER( toaplan1_tileram_offs_r )
+READ16_MEMBER(toaplan1_state::toaplan1_tileram_offs_r)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
- return state->m_pf_voffs;
+ return m_pf_voffs;
}
-WRITE16_HANDLER( toaplan1_tileram_offs_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_tileram_offs_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
if (data >= 0x4000)
logerror("Hmmm, unknown video layer being selected (%08x)\n",data);
- COMBINE_DATA(&state->m_pf_voffs);
+ COMBINE_DATA(&m_pf_voffs);
}
-READ16_HANDLER( toaplan1_tileram16_r )
+READ16_MEMBER(toaplan1_state::toaplan1_tileram16_r)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
offs_t vram_offset;
UINT16 video_data = 0;
- switch (state->m_pf_voffs & 0xf000) /* Locate Layer (PlayField) */
+ switch (m_pf_voffs & 0xf000) /* Locate Layer (PlayField) */
{
case 0x0000:
- vram_offset = ((state->m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
- video_data = state->m_pf1_tilevram16[vram_offset];
+ vram_offset = ((m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
+ video_data = m_pf1_tilevram16[vram_offset];
break;
case 0x1000:
- vram_offset = ((state->m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
- video_data = state->m_pf2_tilevram16[vram_offset];
+ vram_offset = ((m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
+ video_data = m_pf2_tilevram16[vram_offset];
break;
case 0x2000:
- vram_offset = ((state->m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
- video_data = state->m_pf3_tilevram16[vram_offset];
+ vram_offset = ((m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
+ video_data = m_pf3_tilevram16[vram_offset];
break;
case 0x3000:
- vram_offset = ((state->m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
- video_data = state->m_pf4_tilevram16[vram_offset];
+ vram_offset = ((m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
+ video_data = m_pf4_tilevram16[vram_offset];
break;
default:
- logerror("Hmmm, reading %04x from unknown playfield layer address %06x Offset:%01x !!!\n", video_data, state->m_pf_voffs, offset);
+ logerror("Hmmm, reading %04x from unknown playfield layer address %06x Offset:%01x !!!\n", video_data, m_pf_voffs, offset);
break;
}
return video_data;
}
-READ16_HANDLER( rallybik_tileram16_r )
+READ16_MEMBER(toaplan1_state::rallybik_tileram16_r)
{
UINT16 data = toaplan1_tileram16_r(space, offset, mem_mask);
@@ -663,56 +645,54 @@ READ16_HANDLER( rallybik_tileram16_r )
return data;
}
-WRITE16_HANDLER( toaplan1_tileram16_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_tileram16_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
offs_t vram_offset;
- switch (state->m_pf_voffs & 0xf000) /* Locate Layer (PlayField) */
+ switch (m_pf_voffs & 0xf000) /* Locate Layer (PlayField) */
{
case 0x0000:
- vram_offset = ((state->m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
- COMBINE_DATA(&state->m_pf1_tilevram16[vram_offset]);
- state->m_pf1_tilemap->mark_tile_dirty(vram_offset/2);
+ vram_offset = ((m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
+ COMBINE_DATA(&m_pf1_tilevram16[vram_offset]);
+ m_pf1_tilemap->mark_tile_dirty(vram_offset/2);
break;
case 0x1000:
- vram_offset = ((state->m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
- COMBINE_DATA(&state->m_pf2_tilevram16[vram_offset]);
- state->m_pf2_tilemap->mark_tile_dirty(vram_offset/2);
+ vram_offset = ((m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
+ COMBINE_DATA(&m_pf2_tilevram16[vram_offset]);
+ m_pf2_tilemap->mark_tile_dirty(vram_offset/2);
break;
case 0x2000:
- vram_offset = ((state->m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
- COMBINE_DATA(&state->m_pf3_tilevram16[vram_offset]);
- state->m_pf3_tilemap->mark_tile_dirty(vram_offset/2);
+ vram_offset = ((m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
+ COMBINE_DATA(&m_pf3_tilevram16[vram_offset]);
+ m_pf3_tilemap->mark_tile_dirty(vram_offset/2);
break;
case 0x3000:
- vram_offset = ((state->m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
- COMBINE_DATA(&state->m_pf4_tilevram16[vram_offset]);
- state->m_pf4_tilemap->mark_tile_dirty(vram_offset/2);
+ vram_offset = ((m_pf_voffs * 2) + offset) & ((TOAPLAN1_TILEVRAM_SIZE/2)-1);
+ COMBINE_DATA(&m_pf4_tilevram16[vram_offset]);
+ m_pf4_tilemap->mark_tile_dirty(vram_offset/2);
break;
default:
- logerror("Hmmm, writing %04x to unknown playfield layer address %06x Offset:%01x\n", data, state->m_pf_voffs, offset);
+ logerror("Hmmm, writing %04x to unknown playfield layer address %06x Offset:%01x\n", data, m_pf_voffs, offset);
break;
}
}
-READ16_HANDLER( toaplan1_scroll_regs_r )
+READ16_MEMBER(toaplan1_state::toaplan1_scroll_regs_r)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
UINT16 scroll = 0;
switch(offset)
{
- case 00: scroll = state->m_pf1_scrollx; break;
- case 01: scroll = state->m_pf1_scrolly; break;
- case 02: scroll = state->m_pf2_scrollx; break;
- case 03: scroll = state->m_pf2_scrolly; break;
- case 04: scroll = state->m_pf3_scrollx; break;
- case 05: scroll = state->m_pf3_scrolly; break;
- case 06: scroll = state->m_pf4_scrollx; break;
- case 07: scroll = state->m_pf4_scrolly; break;
+ case 00: scroll = m_pf1_scrollx; break;
+ case 01: scroll = m_pf1_scrolly; break;
+ case 02: scroll = m_pf2_scrollx; break;
+ case 03: scroll = m_pf2_scrolly; break;
+ case 04: scroll = m_pf3_scrollx; break;
+ case 05: scroll = m_pf3_scrolly; break;
+ case 06: scroll = m_pf4_scrollx; break;
+ case 07: scroll = m_pf4_scrolly; break;
default: logerror("Hmmm, reading unknown video scroll register (%08x) !!!\n",offset);
break;
}
@@ -720,35 +700,34 @@ READ16_HANDLER( toaplan1_scroll_regs_r )
}
-WRITE16_HANDLER( toaplan1_scroll_regs_w )
+WRITE16_MEMBER(toaplan1_state::toaplan1_scroll_regs_w)
{
- toaplan1_state *state = space->machine().driver_data<toaplan1_state>();
switch(offset)
{
- case 00: COMBINE_DATA(&state->m_pf1_scrollx); /* 1D3h */
- state->m_pf1_tilemap->set_scrollx(0, (state->m_pf1_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs1));
+ case 00: COMBINE_DATA(&m_pf1_scrollx); /* 1D3h */
+ m_pf1_tilemap->set_scrollx(0, (m_pf1_scrollx >> 7) - (m_tiles_offsetx - m_scrollx_offs1));
break;
- case 01: COMBINE_DATA(&state->m_pf1_scrolly); /* 1EBh */
- state->m_pf1_tilemap->set_scrolly(0, (state->m_pf1_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs));
+ case 01: COMBINE_DATA(&m_pf1_scrolly); /* 1EBh */
+ m_pf1_tilemap->set_scrolly(0, (m_pf1_scrolly >> 7) - (m_tiles_offsety - m_scrolly_offs));
break;
- case 02: COMBINE_DATA(&state->m_pf2_scrollx); /* 1D5h */
- state->m_pf2_tilemap->set_scrollx(0, (state->m_pf2_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs2));
+ case 02: COMBINE_DATA(&m_pf2_scrollx); /* 1D5h */
+ m_pf2_tilemap->set_scrollx(0, (m_pf2_scrollx >> 7) - (m_tiles_offsetx - m_scrollx_offs2));
break;
- case 03: COMBINE_DATA(&state->m_pf2_scrolly); /* 1EBh */
- state->m_pf2_tilemap->set_scrolly(0, (state->m_pf2_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs));
+ case 03: COMBINE_DATA(&m_pf2_scrolly); /* 1EBh */
+ m_pf2_tilemap->set_scrolly(0, (m_pf2_scrolly >> 7) - (m_tiles_offsety - m_scrolly_offs));
break;
- case 04: COMBINE_DATA(&state->m_pf3_scrollx); /* 1D7h */
- state->m_pf3_tilemap->set_scrollx(0, (state->m_pf3_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs3));
+ case 04: COMBINE_DATA(&m_pf3_scrollx); /* 1D7h */
+ m_pf3_tilemap->set_scrollx(0, (m_pf3_scrollx >> 7) - (m_tiles_offsetx - m_scrollx_offs3));
break;
- case 05: COMBINE_DATA(&state->m_pf3_scrolly); /* 1EBh */
- state->m_pf3_tilemap->set_scrolly(0, (state->m_pf3_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs));
+ case 05: COMBINE_DATA(&m_pf3_scrolly); /* 1EBh */
+ m_pf3_tilemap->set_scrolly(0, (m_pf3_scrolly >> 7) - (m_tiles_offsety - m_scrolly_offs));
break;
- case 06: COMBINE_DATA(&state->m_pf4_scrollx); /* 1D9h */
- state->m_pf4_tilemap->set_scrollx(0, (state->m_pf4_scrollx >> 7) - (state->m_tiles_offsetx - state->m_scrollx_offs4));
+ case 06: COMBINE_DATA(&m_pf4_scrollx); /* 1D9h */
+ m_pf4_tilemap->set_scrollx(0, (m_pf4_scrollx >> 7) - (m_tiles_offsetx - m_scrollx_offs4));
break;
- case 07: COMBINE_DATA(&state->m_pf4_scrolly); /* 1EBh */
- state->m_pf4_tilemap->set_scrolly(0, (state->m_pf4_scrolly >> 7) - (state->m_tiles_offsety - state->m_scrolly_offs));
+ case 07: COMBINE_DATA(&m_pf4_scrolly); /* 1EBh */
+ m_pf4_tilemap->set_scrolly(0, (m_pf4_scrolly >> 7) - (m_tiles_offsety - m_scrolly_offs));
break;
default: logerror("Hmmm, writing %08x to unknown video scroll register (%08x) !!!\n",data ,offset);
break;
diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c
index 6b0bd82b934..a305c2c6cd5 100644
--- a/src/mame/video/toaplan2.c
+++ b/src/mame/video/toaplan2.c
@@ -188,22 +188,20 @@ VIDEO_START( batrider )
state->m_vdp0->gp9001_gfxrom_is_banked = 1;
}
-WRITE16_HANDLER( toaplan2_txvideoram16_w )
+WRITE16_MEMBER(toaplan2_state::toaplan2_txvideoram16_w)
{
- toaplan2_state *state = space->machine().driver_data<toaplan2_state>();
- COMBINE_DATA(&state->m_txvideoram16[offset]);
- if (offset < (state->m_tx_vram_size/4))
- state->m_tx_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_txvideoram16[offset]);
+ if (offset < (m_tx_vram_size/4))
+ m_tx_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( toaplan2_txvideoram16_offs_w )
+WRITE16_MEMBER(toaplan2_state::toaplan2_txvideoram16_offs_w)
{
// FIXME: implement line select and per-line flipping for all games
// see SCREEN_UPDATE_IND16( batrider )
- toaplan2_state *state = space->machine().driver_data<toaplan2_state>();
- UINT16 oldword = state->m_txvideoram16_offs[offset];
+ UINT16 oldword = m_txvideoram16_offs[offset];
if (oldword != data)
{
@@ -211,90 +209,86 @@ WRITE16_HANDLER( toaplan2_txvideoram16_offs_w )
{
if (data & 0x8000) /* Flip off */
{
- state->m_tx_flip = 0;
- state->m_tx_tilemap->set_flip(state->m_tx_flip);
- state->m_tx_tilemap->set_scrolly(0, 0);
+ m_tx_flip = 0;
+ m_tx_tilemap->set_flip(m_tx_flip);
+ m_tx_tilemap->set_scrolly(0, 0);
}
else /* Flip on */
{
- state->m_tx_flip = (TILEMAP_FLIPY | TILEMAP_FLIPX);
- state->m_tx_tilemap->set_flip(state->m_tx_flip);
- state->m_tx_tilemap->set_scrolly(0, -16);
+ m_tx_flip = (TILEMAP_FLIPY | TILEMAP_FLIPX);
+ m_tx_tilemap->set_flip(m_tx_flip);
+ m_tx_tilemap->set_scrolly(0, -16);
}
}
- COMBINE_DATA(&state->m_txvideoram16_offs[offset]);
+ COMBINE_DATA(&m_txvideoram16_offs[offset]);
}
// logerror("Writing %04x to text offs RAM offset %04x\n",data,offset);
}
-WRITE16_HANDLER( toaplan2_txscrollram16_w )
+WRITE16_MEMBER(toaplan2_state::toaplan2_txscrollram16_w)
{
/*** Line-Scroll RAM for Text Layer ***/
- toaplan2_state *state = space->machine().driver_data<toaplan2_state>();
int data_tx = data;
- state->m_tx_tilemap->set_scrollx(offset, data_tx);
+ m_tx_tilemap->set_scrollx(offset, data_tx);
// logerror("Writing %04x to text scroll RAM offset %04x\n",data,offset);
- COMBINE_DATA(&state->m_txscrollram16[offset]);
+ COMBINE_DATA(&m_txscrollram16[offset]);
}
-WRITE16_HANDLER( toaplan2_tx_gfxram16_w )
+WRITE16_MEMBER(toaplan2_state::toaplan2_tx_gfxram16_w)
{
/*** Dynamic GFX decoding for Truxton 2 / FixEight ***/
- toaplan2_state *state = space->machine().driver_data<toaplan2_state>();
- UINT16 oldword = state->m_tx_gfxram16[offset];
+ UINT16 oldword = m_tx_gfxram16[offset];
if (oldword != data)
{
int code = offset/32;
- COMBINE_DATA(&state->m_tx_gfxram16[offset]);
- gfx_element_mark_dirty(space->machine().gfx[2], code);
+ COMBINE_DATA(&m_tx_gfxram16[offset]);
+ gfx_element_mark_dirty(machine().gfx[2], code);
}
}
-WRITE16_HANDLER( batrider_textdata_dma_w )
+WRITE16_MEMBER(toaplan2_state::batrider_textdata_dma_w)
{
/*** Dynamic Text GFX decoding for Batrider ***/
/*** Only done once during start-up ***/
- toaplan2_state *state = space->machine().driver_data<toaplan2_state>();
- UINT16 *dest = state->m_tx_gfxram16;
+ UINT16 *dest = m_tx_gfxram16;
- memcpy(dest, state->m_txvideoram16, state->m_tx_vram_size);
- dest += (state->m_tx_vram_size/2);
- memcpy(dest, state->m_generic_paletteram_16, state->m_paletteram_size);
- dest += (state->m_paletteram_size/2);
- memcpy(dest, state->m_txvideoram16_offs, state->m_tx_offs_vram_size);
- dest += (state->m_tx_offs_vram_size/2);
- memcpy(dest, state->m_txscrollram16, state->m_tx_scroll_vram_size);
- dest += (state->m_tx_scroll_vram_size/2);
- memcpy(dest, state->m_mainram16, state->m_mainram_overlap_size);
+ memcpy(dest, m_txvideoram16, m_tx_vram_size);
+ dest += (m_tx_vram_size/2);
+ memcpy(dest, m_generic_paletteram_16, m_paletteram_size);
+ dest += (m_paletteram_size/2);
+ memcpy(dest, m_txvideoram16_offs, m_tx_offs_vram_size);
+ dest += (m_tx_offs_vram_size/2);
+ memcpy(dest, m_txscrollram16, m_tx_scroll_vram_size);
+ dest += (m_tx_scroll_vram_size/2);
+ memcpy(dest, m_mainram16, m_mainram_overlap_size);
for (int i = 0; i < 1024; i++)
- gfx_element_mark_dirty(space->machine().gfx[2], i);
+ gfx_element_mark_dirty(machine().gfx[2], i);
}
-WRITE16_HANDLER( batrider_unknown_dma_w )
+WRITE16_MEMBER(toaplan2_state::batrider_unknown_dma_w)
{
// FIXME: In batrider and bbakraid, the text layer and palette RAM
// are probably DMA'd from main RAM by writing here at every vblank,
// rather than being directly accessible to the 68K like the other games
}
-WRITE16_HANDLER( batrider_objectbank_w )
+WRITE16_MEMBER(toaplan2_state::batrider_objectbank_w)
{
- toaplan2_state *state = space->machine().driver_data<toaplan2_state>();
if (ACCESSING_BITS_0_7)
{
data &= 0xf;
- if (state->m_vdp0->gp9001_gfxrom_bank[offset] != data)
+ if (m_vdp0->gp9001_gfxrom_bank[offset] != data)
{
- state->m_vdp0->gp9001_gfxrom_bank[offset] = data;
- state->m_vdp0->gp9001_gfxrom_bank_dirty = 1;
+ m_vdp0->gp9001_gfxrom_bank[offset] = data;
+ m_vdp0->gp9001_gfxrom_bank_dirty = 1;
}
}
}
diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c
index 0d349b0790e..535adc31272 100644
--- a/src/mame/video/toki.c
+++ b/src/mame/video/toki.c
@@ -26,11 +26,10 @@ remove all the code writing the $a0000 area.)
*************************************************************************/
-WRITE16_HANDLER( toki_control_w )
+WRITE16_MEMBER(toki_state::toki_control_w)
{
- toki_state *state = space->machine().driver_data<toki_state>();
- space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos() - 1);
- COMBINE_DATA(&state->m_scrollram16[offset]);
+ machine().primary_screen->update_partial(machine().primary_screen->vpos() - 1);
+ COMBINE_DATA(&m_scrollram16[offset]);
}
static TILE_GET_INFO( get_text_tile_info )
@@ -100,26 +99,23 @@ VIDEO_START( toki )
/*************************************/
-WRITE16_HANDLER( toki_foreground_videoram16_w )
+WRITE16_MEMBER(toki_state::toki_foreground_videoram16_w)
{
- toki_state *state = space->machine().driver_data<toki_state>();
- UINT16 *videoram = state->m_videoram;
+ UINT16 *videoram = m_videoram;
COMBINE_DATA(&videoram[offset]);
- state->m_text_layer->mark_tile_dirty(offset);
+ m_text_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( toki_background1_videoram16_w )
+WRITE16_MEMBER(toki_state::toki_background1_videoram16_w)
{
- toki_state *state = space->machine().driver_data<toki_state>();
- COMBINE_DATA(&state->m_background1_videoram16[offset]);
- state->m_background_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_background1_videoram16[offset]);
+ m_background_layer->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( toki_background2_videoram16_w )
+WRITE16_MEMBER(toki_state::toki_background2_videoram16_w)
{
- toki_state *state = space->machine().driver_data<toki_state>();
- COMBINE_DATA(&state->m_background2_videoram16[offset]);
- state->m_foreground_layer->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_background2_videoram16[offset]);
+ m_foreground_layer->mark_tile_dirty(offset);
}
/***************************************************************************
diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c
index 672a4ffca51..1988c6276ae 100644
--- a/src/mame/video/toypop.c
+++ b/src/mame/video/toypop.c
@@ -126,50 +126,45 @@ VIDEO_START( toypop )
***************************************************************************/
-WRITE8_HANDLER( toypop_videoram_w )
+WRITE8_MEMBER(toypop_state::toypop_videoram_w)
{
- toypop_state *state = space->machine().driver_data<toypop_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( toypop_palettebank_w )
+WRITE8_MEMBER(toypop_state::toypop_palettebank_w)
{
- toypop_state *state = space->machine().driver_data<toypop_state>();
- if (state->m_palettebank != (offset & 1))
+ if (m_palettebank != (offset & 1))
{
- state->m_palettebank = offset & 1;
- space->machine().tilemap().mark_all_dirty();
+ m_palettebank = offset & 1;
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE16_HANDLER( toypop_flipscreen_w )
+WRITE16_MEMBER(toypop_state::toypop_flipscreen_w)
{
- toypop_state *state = space->machine().driver_data<toypop_state>();
- state->m_bitmapflip = offset & 1;
+ m_bitmapflip = offset & 1;
}
-READ16_HANDLER( toypop_merged_background_r )
+READ16_MEMBER(toypop_state::toypop_merged_background_r)
{
- toypop_state *state = space->machine().driver_data<toypop_state>();
int data1, data2;
// 0x0a0b0c0d is read as 0xabcd
- data1 = state->m_bg_image[2*offset];
- data2 = state->m_bg_image[2*offset + 1];
+ data1 = m_bg_image[2*offset];
+ data2 = m_bg_image[2*offset + 1];
return ((data1 & 0xf00) << 4) | ((data1 & 0xf) << 8) | ((data2 & 0xf00) >> 4) | (data2 & 0xf);
}
-WRITE16_HANDLER( toypop_merged_background_w )
+WRITE16_MEMBER(toypop_state::toypop_merged_background_w)
{
- toypop_state *state = space->machine().driver_data<toypop_state>();
// 0xabcd is written as 0x0a0b0c0d in the background image
if (ACCESSING_BITS_8_15)
- state->m_bg_image[2*offset] = ((data & 0xf00) >> 8) | ((data & 0xf000) >> 4);
+ m_bg_image[2*offset] = ((data & 0xf00) >> 8) | ((data & 0xf000) >> 4);
if (ACCESSING_BITS_0_7)
- state->m_bg_image[2*offset+1] = (data & 0xf) | ((data & 0xf0) << 4);
+ m_bg_image[2*offset+1] = (data & 0xf) | ((data & 0xf0) << 4);
}
static void draw_background(running_machine &machine, bitmap_ind16 &bitmap)
diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c
index 622793b97fd..cb8dbbba15e 100644
--- a/src/mame/video/tp84.c
+++ b/src/mame/video/tp84.c
@@ -103,19 +103,18 @@ PALETTE_INIT( tp84 )
}
-WRITE8_HANDLER( tp84_spriteram_w )
+WRITE8_MEMBER(tp84_state::tp84_spriteram_w)
{
- tp84_state *state = space->machine().driver_data<tp84_state>();
/* the game multiplexes the sprites, so update now */
- space->machine().primary_screen->update_now();
- state->m_spriteram[offset] = data;
+ machine().primary_screen->update_now();
+ m_spriteram[offset] = data;
}
-READ8_HANDLER( tp84_scanline_r )
+READ8_MEMBER(tp84_state::tp84_scanline_r)
{
/* reads 1V - 128V */
- return space->machine().primary_screen->vpos();
+ return machine().primary_screen->vpos();
}
diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c
index 852e5846a2b..2c336a661a4 100644
--- a/src/mame/video/trackfld.c
+++ b/src/mame/video/trackfld.c
@@ -89,74 +89,71 @@ PALETTE_INIT( trackfld )
}
}
-WRITE8_HANDLER( trackfld_videoram_w )
+WRITE8_MEMBER(trackfld_state::trackfld_videoram_w)
{
- trackfld_state *state = space->machine().driver_data<trackfld_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( trackfld_colorram_w )
+WRITE8_MEMBER(trackfld_state::trackfld_colorram_w)
{
- trackfld_state *state = space->machine().driver_data<trackfld_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( trackfld_flipscreen_w )
+WRITE8_MEMBER(trackfld_state::trackfld_flipscreen_w)
{
- if (flip_screen_get(space->machine()) != data)
+ if (flip_screen_get(machine()) != data)
{
- flip_screen_set(space->machine(), data);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data);
+ machine().tilemap().mark_all_dirty();
}
}
-WRITE8_HANDLER( atlantol_gfxbank_w )
+WRITE8_MEMBER(trackfld_state::atlantol_gfxbank_w)
{
- trackfld_state *state = space->machine().driver_data<trackfld_state>();
if (data & 1)
{
/* male / female sprites switch */
- if ((state->m_old_gfx_bank == 1 && (data & 1) == 1) || (state->m_old_gfx_bank == 0 && (data & 1) == 1))
- state->m_sprite_bank2 = 0x200;
+ if ((m_old_gfx_bank == 1 && (data & 1) == 1) || (m_old_gfx_bank == 0 && (data & 1) == 1))
+ m_sprite_bank2 = 0x200;
else
- state->m_sprite_bank2 = 0;
+ m_sprite_bank2 = 0;
- state->m_sprite_bank1 = 0;
- state->m_old_gfx_bank = data & 1;
+ m_sprite_bank1 = 0;
+ m_old_gfx_bank = data & 1;
}
else
{
/* male / female sprites switch */
- if ((state->m_old_gfx_bank == 0 && (data & 1) == 0) || (state->m_old_gfx_bank == 1 && (data & 1) == 0))
- state->m_sprite_bank2 = 0;
+ if ((m_old_gfx_bank == 0 && (data & 1) == 0) || (m_old_gfx_bank == 1 && (data & 1) == 0))
+ m_sprite_bank2 = 0;
else
- state->m_sprite_bank2 = 0x200;
+ m_sprite_bank2 = 0x200;
- state->m_sprite_bank1 = 0;
- state->m_old_gfx_bank = data & 1;
+ m_sprite_bank1 = 0;
+ m_old_gfx_bank = data & 1;
}
if ((data & 3) == 3)
{
- if (state->m_sprite_bank2)
- state->m_sprite_bank1 = 0x500;
+ if (m_sprite_bank2)
+ m_sprite_bank1 = 0x500;
else
- state->m_sprite_bank1 = 0x300;
+ m_sprite_bank1 = 0x300;
}
else if ((data & 3) == 2)
{
- if (state->m_sprite_bank2)
- state->m_sprite_bank1 = 0x300;
+ if (m_sprite_bank2)
+ m_sprite_bank1 = 0x300;
else
- state->m_sprite_bank1 = 0x100;
+ m_sprite_bank1 = 0x100;
}
- if (state->m_bg_bank != (data & 0x8))
+ if (m_bg_bank != (data & 0x8))
{
- state->m_bg_bank = data & 0x8;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bg_bank = data & 0x8;
+ m_bg_tilemap->mark_all_dirty();
}
}
diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c
index 7ad51869553..54ad82225a5 100644
--- a/src/mame/video/travrusa.c
+++ b/src/mame/video/travrusa.c
@@ -240,11 +240,10 @@ VIDEO_START( travrusa )
***************************************************************************/
-WRITE8_HANDLER( travrusa_videoram_w )
+WRITE8_MEMBER(travrusa_state::travrusa_videoram_w)
{
- travrusa_state *state = space->machine().driver_data<travrusa_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
@@ -259,30 +258,28 @@ static void set_scroll( running_machine &machine )
state->m_bg_tilemap->set_scrollx(3, 0);
}
-WRITE8_HANDLER( travrusa_scroll_x_low_w )
+WRITE8_MEMBER(travrusa_state::travrusa_scroll_x_low_w)
{
- travrusa_state *state = space->machine().driver_data<travrusa_state>();
- state->m_scrollx[0] = data;
- set_scroll(space->machine());
+ m_scrollx[0] = data;
+ set_scroll(machine());
}
-WRITE8_HANDLER( travrusa_scroll_x_high_w )
+WRITE8_MEMBER(travrusa_state::travrusa_scroll_x_high_w)
{
- travrusa_state *state = space->machine().driver_data<travrusa_state>();
- state->m_scrollx[1] = data;
- set_scroll(space->machine());
+ m_scrollx[1] = data;
+ set_scroll(machine());
}
-WRITE8_HANDLER( travrusa_flipscreen_w )
+WRITE8_MEMBER(travrusa_state::travrusa_flipscreen_w)
{
/* screen flip is handled both by software and hardware */
- data ^= ~input_port_read(space->machine(), "DSW2") & 1;
+ data ^= ~input_port_read(machine(), "DSW2") & 1;
- flip_screen_set(space->machine(), data & 1);
+ flip_screen_set(machine(), data & 1);
- coin_counter_w(space->machine(), 0, data & 0x02);
- coin_counter_w(space->machine(), 1, data & 0x20);
+ coin_counter_w(machine(), 0, data & 0x02);
+ coin_counter_w(machine(), 1, data & 0x20);
}
diff --git a/src/mame/video/trucocl.c b/src/mame/video/trucocl.c
index 20dd8cb6d09..771d6666b72 100644
--- a/src/mame/video/trucocl.c
+++ b/src/mame/video/trucocl.c
@@ -44,18 +44,16 @@ PALETTE_INIT( trucocl )
palette_set_color_rgb(machine,i,pal4bit(color_prom[i] >> 0),pal4bit(color_prom[i+32] >> 0),pal4bit(color_prom[i+32] >> 4));
}
-WRITE8_HANDLER( trucocl_videoram_w )
+WRITE8_MEMBER(trucocl_state::trucocl_videoram_w)
{
- trucocl_state *state = space->machine().driver_data<trucocl_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( trucocl_colorram_w )
+WRITE8_MEMBER(trucocl_state::trucocl_colorram_w)
{
- trucocl_state *state = space->machine().driver_data<trucocl_state>();
- state->m_colorram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c
index 0c3a541b2db..69d15711c2c 100644
--- a/src/mame/video/tryout.c
+++ b/src/mame/video/tryout.c
@@ -57,23 +57,20 @@ static TILE_GET_INFO( get_bg_tile_info )
SET_TILE_INFO(2, state->m_vram[tile_index] & 0x7f, 2, 0);
}
-READ8_HANDLER( tryout_vram_r )
+READ8_MEMBER(tryout_state::tryout_vram_r)
{
- tryout_state *state = space->machine().driver_data<tryout_state>();
- return state->m_vram[offset]; // debug only
+ return m_vram[offset]; // debug only
}
-WRITE8_HANDLER( tryout_videoram_w )
+WRITE8_MEMBER(tryout_state::tryout_videoram_w)
{
- tryout_state *state = space->machine().driver_data<tryout_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( tryout_vram_w )
+WRITE8_MEMBER(tryout_state::tryout_vram_w)
{
- tryout_state *state = space->machine().driver_data<tryout_state>();
/* There are eight banks of vram - in bank 0 the first 0x400 bytes
is reserved for the tilemap. In banks 2, 4 and 6 the game never
writes to the first 0x400 bytes - I suspect it's either
@@ -87,14 +84,14 @@ WRITE8_HANDLER( tryout_vram_w )
gfx data and then set high from that point onwards.
*/
- const UINT8 bank=(state->m_vram_bank>>1)&0x7;
+ const UINT8 bank=(m_vram_bank>>1)&0x7;
if ((bank==0 || bank==2 || bank==4 || bank==6) && (offset&0x7ff)<0x400) {
int newoff=offset&0x3ff;
- state->m_vram[newoff]=data;
- state->m_bg_tilemap->mark_tile_dirty(newoff);
+ m_vram[newoff]=data;
+ m_bg_tilemap->mark_tile_dirty(newoff);
return;
}
@@ -108,47 +105,46 @@ WRITE8_HANDLER( tryout_vram_w )
*/
offset=(offset&0x7ff) | (bank<<11);
- state->m_vram[offset]=data;
+ m_vram[offset]=data;
switch (offset&0x1c00) {
case 0x0400:
- state->m_vram_gfx[(offset&0x3ff) + 0x0000 + ((offset&0x2000)>>1)]=(~data&0xf);
- state->m_vram_gfx[(offset&0x3ff) + 0x2000 + ((offset&0x2000)>>1)]=(~data&0xf0)>>4;
+ m_vram_gfx[(offset&0x3ff) + 0x0000 + ((offset&0x2000)>>1)]=(~data&0xf);
+ m_vram_gfx[(offset&0x3ff) + 0x2000 + ((offset&0x2000)>>1)]=(~data&0xf0)>>4;
break;
case 0x0800:
- state->m_vram_gfx[(offset&0x3ff) + 0x4000 + ((offset&0x2000)>>1)]=(~data&0xf);
- state->m_vram_gfx[(offset&0x3ff) + 0x4400 + ((offset&0x2000)>>1)]=(~data&0xf0)>>4;
+ m_vram_gfx[(offset&0x3ff) + 0x4000 + ((offset&0x2000)>>1)]=(~data&0xf);
+ m_vram_gfx[(offset&0x3ff) + 0x4400 + ((offset&0x2000)>>1)]=(~data&0xf0)>>4;
break;
case 0x0c00:
- state->m_vram_gfx[(offset&0x3ff) + 0x0400 + ((offset&0x2000)>>1)]=(~data&0xf);
- state->m_vram_gfx[(offset&0x3ff) + 0x2400 + ((offset&0x2000)>>1)]=(~data&0xf0)>>4;
+ m_vram_gfx[(offset&0x3ff) + 0x0400 + ((offset&0x2000)>>1)]=(~data&0xf);
+ m_vram_gfx[(offset&0x3ff) + 0x2400 + ((offset&0x2000)>>1)]=(~data&0xf0)>>4;
break;
case 0x1400:
- state->m_vram_gfx[(offset&0x3ff) + 0x0800 + ((offset&0x2000)>>1)]=(~data&0xf);
- state->m_vram_gfx[(offset&0x3ff) + 0x2800 + ((offset&0x2000)>>1)]=(~data&0xf0)>>4;
+ m_vram_gfx[(offset&0x3ff) + 0x0800 + ((offset&0x2000)>>1)]=(~data&0xf);
+ m_vram_gfx[(offset&0x3ff) + 0x2800 + ((offset&0x2000)>>1)]=(~data&0xf0)>>4;
break;
case 0x1800:
- state->m_vram_gfx[(offset&0x3ff) + 0x4800 + ((offset&0x2000)>>1)]=(~data&0xf);
- state->m_vram_gfx[(offset&0x3ff) + 0x4c00 + ((offset&0x2000)>>1)]=(~data&0xf0)>>4;
+ m_vram_gfx[(offset&0x3ff) + 0x4800 + ((offset&0x2000)>>1)]=(~data&0xf);
+ m_vram_gfx[(offset&0x3ff) + 0x4c00 + ((offset&0x2000)>>1)]=(~data&0xf0)>>4;
break;
case 0x1c00:
- state->m_vram_gfx[(offset&0x3ff) + 0x0c00 + ((offset&0x2000)>>1)]=(~data&0xf);
- state->m_vram_gfx[(offset&0x3ff) + 0x2c00 + ((offset&0x2000)>>1)]=(~data&0xf0)>>4;
+ m_vram_gfx[(offset&0x3ff) + 0x0c00 + ((offset&0x2000)>>1)]=(~data&0xf);
+ m_vram_gfx[(offset&0x3ff) + 0x2c00 + ((offset&0x2000)>>1)]=(~data&0xf0)>>4;
break;
}
- gfx_element_mark_dirty(space->machine().gfx[2], (offset-0x400/64)&0x7f);
+ gfx_element_mark_dirty(machine().gfx[2], (offset-0x400/64)&0x7f);
}
-WRITE8_HANDLER( tryout_vram_bankswitch_w )
+WRITE8_MEMBER(tryout_state::tryout_vram_bankswitch_w)
{
- tryout_state *state = space->machine().driver_data<tryout_state>();
- state->m_vram_bank = data;
+ m_vram_bank = data;
}
-WRITE8_HANDLER( tryout_flipscreen_w )
+WRITE8_MEMBER(tryout_state::tryout_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 1);
+ flip_screen_set(machine(), data & 1);
}
static TILEMAP_MAPPER( get_fg_memory_offset )
diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c
index 8cf059be273..44cd7bad608 100644
--- a/src/mame/video/tsamurai.c
+++ b/src/mame/video/tsamurai.c
@@ -63,69 +63,61 @@ VIDEO_START( tsamurai )
***************************************************************************/
-WRITE8_HANDLER( tsamurai_scrolly_w )
+WRITE8_MEMBER(tsamurai_state::tsamurai_scrolly_w)
{
- tsamurai_state *state = space->machine().driver_data<tsamurai_state>();
- state->m_background->set_scrolly(0, data );
+ m_background->set_scrolly(0, data );
}
-WRITE8_HANDLER( tsamurai_scrollx_w )
+WRITE8_MEMBER(tsamurai_state::tsamurai_scrollx_w)
{
- tsamurai_state *state = space->machine().driver_data<tsamurai_state>();
- state->m_background->set_scrollx(0, data );
+ m_background->set_scrollx(0, data );
}
-WRITE8_HANDLER( tsamurai_bgcolor_w )
+WRITE8_MEMBER(tsamurai_state::tsamurai_bgcolor_w)
{
- tsamurai_state *state = space->machine().driver_data<tsamurai_state>();
- state->m_bgcolor = data;
+ m_bgcolor = data;
}
-WRITE8_HANDLER( tsamurai_textbank1_w )
+WRITE8_MEMBER(tsamurai_state::tsamurai_textbank1_w)
{
- tsamurai_state *state = space->machine().driver_data<tsamurai_state>();
- if( state->m_textbank1!=data )
+ if( m_textbank1!=data )
{
- state->m_textbank1 = data;
- state->m_foreground ->mark_all_dirty();
+ m_textbank1 = data;
+ m_foreground ->mark_all_dirty();
}
}
-WRITE8_HANDLER( tsamurai_textbank2_w )
+WRITE8_MEMBER(tsamurai_state::tsamurai_textbank2_w)
{
- tsamurai_state *state = space->machine().driver_data<tsamurai_state>();
- if( state->m_textbank2!=data )
+ if( m_textbank2!=data )
{
- state->m_textbank2 = data;
- state->m_foreground ->mark_all_dirty();
+ m_textbank2 = data;
+ m_foreground ->mark_all_dirty();
}
}
-WRITE8_HANDLER( tsamurai_bg_videoram_w )
+WRITE8_MEMBER(tsamurai_state::tsamurai_bg_videoram_w)
{
- tsamurai_state *state = space->machine().driver_data<tsamurai_state>();
- state->m_bg_videoram[offset]=data;
+ m_bg_videoram[offset]=data;
offset = offset/2;
- state->m_background->mark_tile_dirty(offset);
+ m_background->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( tsamurai_fg_videoram_w )
+WRITE8_MEMBER(tsamurai_state::tsamurai_fg_videoram_w)
{
- tsamurai_state *state = space->machine().driver_data<tsamurai_state>();
- state->m_videoram[offset]=data;
- state->m_foreground->mark_tile_dirty(offset);
+ m_videoram[offset]=data;
+ m_foreground->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( tsamurai_fg_colorram_w )
+WRITE8_MEMBER(tsamurai_state::tsamurai_fg_colorram_w)
{
- tsamurai_state *state = space->machine().driver_data<tsamurai_state>();
- if( state->m_colorram[offset]!=data )
+ if( m_colorram[offset]!=data )
{
- state->m_colorram[offset]=data;
+ m_colorram[offset]=data;
if (offset & 1)
{
int col = offset/2;
int row;
for (row = 0;row < 32;row++)
- state->m_foreground->mark_tile_dirty(32*row+col);
+ m_foreground->mark_tile_dirty(32*row+col);
}
}
}
@@ -232,13 +224,12 @@ VS Gong Fight runs on older hardware
***************************************************************************/
-WRITE8_HANDLER( vsgongf_color_w )
+WRITE8_MEMBER(tsamurai_state::vsgongf_color_w)
{
- tsamurai_state *state = space->machine().driver_data<tsamurai_state>();
- if( state->m_vsgongf_color != data )
+ if( m_vsgongf_color != data )
{
- state->m_vsgongf_color = data;
- state->m_foreground ->mark_all_dirty();
+ m_vsgongf_color = data;
+ m_foreground ->mark_all_dirty();
}
}
diff --git a/src/mame/video/tubep.c b/src/mame/video/tubep.c
index 09a291e625d..6f3ab53d595 100644
--- a/src/mame/video/tubep.c
+++ b/src/mame/video/tubep.c
@@ -395,38 +395,33 @@ VIDEO_RESET( tubep )
}
-WRITE8_HANDLER( tubep_textram_w )
+WRITE8_MEMBER(tubep_state::tubep_textram_w)
{
- tubep_state *state = space->machine().driver_data<tubep_state>();
- state->m_textram[offset] = data;
+ m_textram[offset] = data;
}
-WRITE8_HANDLER( tubep_background_romselect_w )
+WRITE8_MEMBER(tubep_state::tubep_background_romselect_w)
{
- tubep_state *state = space->machine().driver_data<tubep_state>();
- state->m_background_romsel = data & 1;
+ m_background_romsel = data & 1;
}
-WRITE8_HANDLER( tubep_colorproms_A4_line_w )
+WRITE8_MEMBER(tubep_state::tubep_colorproms_A4_line_w)
{
- tubep_state *state = space->machine().driver_data<tubep_state>();
- state->m_color_A4 = (data & 1)<<4;
+ m_color_A4 = (data & 1)<<4;
}
-WRITE8_HANDLER( tubep_background_a000_w )
+WRITE8_MEMBER(tubep_state::tubep_background_a000_w)
{
- tubep_state *state = space->machine().driver_data<tubep_state>();
- state->m_ls175_b7 = ((data & 0x0f) ^ 0x0f) | 0xf0;
+ m_ls175_b7 = ((data & 0x0f) ^ 0x0f) | 0xf0;
}
-WRITE8_HANDLER( tubep_background_c000_w )
+WRITE8_MEMBER(tubep_state::tubep_background_c000_w)
{
- tubep_state *state = space->machine().driver_data<tubep_state>();
- state->m_ls175_e8 = ((data & 0x0f) ^ 0x0f);
+ m_ls175_e8 = ((data & 0x0f) ^ 0x0f);
}
@@ -506,70 +501,69 @@ static void draw_sprite(running_machine &machine)
}
-WRITE8_HANDLER( tubep_sprite_control_w )
+WRITE8_MEMBER(tubep_state::tubep_sprite_control_w)
{
- tubep_state *state = space->machine().driver_data<tubep_state>();
if (offset < 10)
{
/*graph_ctrl[offset] = data;*/
switch(offset)
{
case 0: /*a*/
- state->m_romEF_addr = (0x010 | (data & 0x0f))<<7; /*roms @F13, @E13 have A11 lines connected to +5V directly */
- state->m_HINV = (data & 0x10) ? 0xff: 0x00;
- state->m_VINV = (data & 0x20) ? 0xff: 0x00;
+ m_romEF_addr = (0x010 | (data & 0x0f))<<7; /*roms @F13, @E13 have A11 lines connected to +5V directly */
+ m_HINV = (data & 0x10) ? 0xff: 0x00;
+ m_VINV = (data & 0x20) ? 0xff: 0x00;
break;
case 1: /*b: XSize-1 */
- state->m_XSize = data & 0x7f;
- state->m_mark_2 = (data&0x80)<<1;
+ m_XSize = data & 0x7f;
+ m_mark_2 = (data&0x80)<<1;
break;
case 2: /*c: YSize-1 */
- state->m_YSize = data & 0x7f;
- state->m_mark_1 = (data&0x80)<<1;
+ m_YSize = data & 0x7f;
+ m_mark_1 = (data&0x80)<<1;
break;
case 3: /*d*/
- state->m_ls273_g6 = (data & 0xff);
+ m_ls273_g6 = (data & 0xff);
break;
case 4: /*e*/
- state->m_ls273_j6 = (data & 0xff);
+ m_ls273_j6 = (data & 0xff);
break;
case 5: /*f*/
- state->m_romHI_addr_mid = (data & 0x0f)<<7;
- state->m_romHI_addr_msb = (data & 0x30)<<7;
+ m_romHI_addr_mid = (data & 0x0f)<<7;
+ m_romHI_addr_msb = (data & 0x30)<<7;
break;
case 6: /*g*/
- state->m_romD_addr = (data & 0x3f)<<7;
+ m_romD_addr = (data & 0x3f)<<7;
break;
case 7: /*h: adder input LSB*/
- state->m_E16_add_b = ((data & 0xff) << 0) | (state->m_E16_add_b & 0xff00);
+ m_E16_add_b = ((data & 0xff) << 0) | (m_E16_add_b & 0xff00);
break;
case 8: /*J: adder input MSB*/
- state->m_E16_add_b = ((data & 0xff) << 8) | (state->m_E16_add_b & 0x00ff);
+ m_E16_add_b = ((data & 0xff) << 8) | (m_E16_add_b & 0x00ff);
break;
case 9: /*K*/
/*write to: LS174 @J3 to set color bank (hi address lines to 2114 colorram @J1 ) */
- state->m_colorram_addr_hi = (data & 0x3f) << 4;
+ m_colorram_addr_hi = (data & 0x3f) << 4;
/*write to: LS74 @D13 to clear the interrupt line /SINT
- /SINT line will be reasserted in state->m_XSize * state->m_YSize cycles (RH0 signal cycles)
+ /SINT line will be reasserted in m_XSize * m_YSize cycles (RH0 signal cycles)
*/
/* 1.clear the /SINT interrupt line */
- cputag_set_input_line(space->machine(), "mcu", 0, CLEAR_LINE);
+ cputag_set_input_line(machine(), "mcu", 0, CLEAR_LINE);
/* 2.assert /SINT again after this time */
- space->machine().scheduler().timer_set( attotime::from_hz(19968000/8) * ((state->m_XSize+1)*(state->m_YSize+1)), FUNC(sprite_timer_callback));
+ machine().scheduler().timer_set( attotime::from_hz(19968000/8) * ((m_XSize+1)*(m_YSize+1)), FUNC(sprite_timer_callback));
/* 3.clear of /SINT starts sprite drawing circuit */
- draw_sprite(space->machine());
+ draw_sprite(machine());
break;
}
}
@@ -729,17 +723,15 @@ PALETTE_INIT( rjammer )
}
-WRITE8_HANDLER( rjammer_background_LS377_w )
+WRITE8_MEMBER(tubep_state::rjammer_background_LS377_w)
{
- tubep_state *state = space->machine().driver_data<tubep_state>();
- state->m_ls377_data = data & 0xff;
+ m_ls377_data = data & 0xff;
}
-WRITE8_HANDLER( rjammer_background_page_w )
+WRITE8_MEMBER(tubep_state::rjammer_background_page_w)
{
- tubep_state *state = space->machine().driver_data<tubep_state>();
- state->m_page = (data & 1) * 0x200;
+ m_page = (data & 1) * 0x200;
}
diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c
index 1586bb88fe5..682b67cb192 100644
--- a/src/mame/video/tumbleb.c
+++ b/src/mame/video/tumbleb.c
@@ -23,111 +23,100 @@ to switch between 8*8 tiles and 16*16 tiles.
/******************************************************************************/
-WRITE16_HANDLER( bcstory_tilebank_w )
+WRITE16_MEMBER(tumbleb_state::bcstory_tilebank_w)
{
- tumbleb_state *state = space->machine().driver_data<tumbleb_state>();
- state->m_tilebank = data;
- state->m_pf1_tilemap->mark_all_dirty();
- state->m_pf1_alt_tilemap->mark_all_dirty();
- state->m_pf2_tilemap->mark_all_dirty();
+ m_tilebank = data;
+ m_pf1_tilemap->mark_all_dirty();
+ m_pf1_alt_tilemap->mark_all_dirty();
+ m_pf2_tilemap->mark_all_dirty();
}
-WRITE16_HANDLER( chokchok_tilebank_w )
+WRITE16_MEMBER(tumbleb_state::chokchok_tilebank_w)
{
- tumbleb_state *state = space->machine().driver_data<tumbleb_state>();
- state->m_tilebank = data << 1;
- state->m_pf1_tilemap->mark_all_dirty();
- state->m_pf1_alt_tilemap->mark_all_dirty();
- state->m_pf2_tilemap->mark_all_dirty();
+ m_tilebank = data << 1;
+ m_pf1_tilemap->mark_all_dirty();
+ m_pf1_alt_tilemap->mark_all_dirty();
+ m_pf2_tilemap->mark_all_dirty();
}
-WRITE16_HANDLER( wlstar_tilebank_w )
+WRITE16_MEMBER(tumbleb_state::wlstar_tilebank_w)
{
- tumbleb_state *state = space->machine().driver_data<tumbleb_state>();
/* it just writes 0000 or ffff */
- state->m_tilebank = data & 0x4000;
- state->m_pf1_tilemap->mark_all_dirty();
- state->m_pf1_alt_tilemap->mark_all_dirty();
- state->m_pf2_tilemap->mark_all_dirty();
+ m_tilebank = data & 0x4000;
+ m_pf1_tilemap->mark_all_dirty();
+ m_pf1_alt_tilemap->mark_all_dirty();
+ m_pf2_tilemap->mark_all_dirty();
}
-WRITE16_HANDLER( suprtrio_tilebank_w )
+WRITE16_MEMBER(tumbleb_state::suprtrio_tilebank_w)
{
- tumbleb_state *state = space->machine().driver_data<tumbleb_state>();
- state->m_tilebank = data << 14; // shift it here, makes using bcstory_tilebank easier
- state->m_pf1_tilemap->mark_all_dirty();
- state->m_pf1_alt_tilemap->mark_all_dirty();
- state->m_pf2_tilemap->mark_all_dirty();
+ m_tilebank = data << 14; // shift it here, makes using bcstory_tilebank easier
+ m_pf1_tilemap->mark_all_dirty();
+ m_pf1_alt_tilemap->mark_all_dirty();
+ m_pf2_tilemap->mark_all_dirty();
}
-WRITE16_HANDLER( tumblepb_pf1_data_w )
+WRITE16_MEMBER(tumbleb_state::tumblepb_pf1_data_w)
{
- tumbleb_state *state = space->machine().driver_data<tumbleb_state>();
- COMBINE_DATA(&state->m_pf1_data[offset]);
- state->m_pf1_tilemap->mark_tile_dirty(offset);
- state->m_pf1_alt_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_pf1_data[offset]);
+ m_pf1_tilemap->mark_tile_dirty(offset);
+ m_pf1_alt_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( tumblepb_pf2_data_w )
+WRITE16_MEMBER(tumbleb_state::tumblepb_pf2_data_w)
{
- tumbleb_state *state = space->machine().driver_data<tumbleb_state>();
- COMBINE_DATA(&state->m_pf2_data[offset]);
- state->m_pf2_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_pf2_data[offset]);
+ m_pf2_tilemap->mark_tile_dirty(offset);
- if (state->m_pf2_alt_tilemap)
- state->m_pf2_alt_tilemap->mark_tile_dirty(offset);
+ if (m_pf2_alt_tilemap)
+ m_pf2_alt_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( fncywld_pf1_data_w )
+WRITE16_MEMBER(tumbleb_state::fncywld_pf1_data_w)
{
- tumbleb_state *state = space->machine().driver_data<tumbleb_state>();
- COMBINE_DATA(&state->m_pf1_data[offset]);
- state->m_pf1_tilemap->mark_tile_dirty(offset / 2);
- state->m_pf1_alt_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_pf1_data[offset]);
+ m_pf1_tilemap->mark_tile_dirty(offset / 2);
+ m_pf1_alt_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( fncywld_pf2_data_w )
+WRITE16_MEMBER(tumbleb_state::fncywld_pf2_data_w)
{
- tumbleb_state *state = space->machine().driver_data<tumbleb_state>();
- COMBINE_DATA(&state->m_pf2_data[offset]);
- state->m_pf2_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_pf2_data[offset]);
+ m_pf2_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( tumblepb_control_0_w )
+WRITE16_MEMBER(tumbleb_state::tumblepb_control_0_w)
{
- tumbleb_state *state = space->machine().driver_data<tumbleb_state>();
- COMBINE_DATA(&state->m_control_0[offset]);
+ COMBINE_DATA(&m_control_0[offset]);
}
-WRITE16_HANDLER( pangpang_pf1_data_w )
+WRITE16_MEMBER(tumbleb_state::pangpang_pf1_data_w)
{
- tumbleb_state *state = space->machine().driver_data<tumbleb_state>();
- COMBINE_DATA(&state->m_pf1_data[offset]);
- state->m_pf1_tilemap->mark_tile_dirty(offset / 2);
- state->m_pf1_alt_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_pf1_data[offset]);
+ m_pf1_tilemap->mark_tile_dirty(offset / 2);
+ m_pf1_alt_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( pangpang_pf2_data_w )
+WRITE16_MEMBER(tumbleb_state::pangpang_pf2_data_w)
{
- tumbleb_state *state = space->machine().driver_data<tumbleb_state>();
- COMBINE_DATA(&state->m_pf2_data[offset]);
- state->m_pf2_tilemap->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_pf2_data[offset]);
+ m_pf2_tilemap->mark_tile_dirty(offset / 2);
- if (state->m_pf2_alt_tilemap)
- state->m_pf2_alt_tilemap->mark_tile_dirty(offset / 2);
+ if (m_pf2_alt_tilemap)
+ m_pf2_alt_tilemap->mark_tile_dirty(offset / 2);
}
/******************************************************************************/
diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c
index f0d3cfb32be..7d08d6dce42 100644
--- a/src/mame/video/tunhunt.c
+++ b/src/mame/video/tunhunt.c
@@ -48,12 +48,11 @@
/****************************************************************************************/
-WRITE8_HANDLER( tunhunt_videoram_w )
+WRITE8_MEMBER(tunhunt_state::tunhunt_videoram_w)
{
- tunhunt_state *state = space->machine().driver_data<tunhunt_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
static TILE_GET_INFO( get_fg_tile_info )
diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c
index eb461626204..12bd3bcf756 100644
--- a/src/mame/video/turbo.c
+++ b/src/mame/video/turbo.c
@@ -202,22 +202,20 @@ VIDEO_START( buckrog )
*
*************************************/
-WRITE8_HANDLER( turbo_videoram_w )
+WRITE8_MEMBER(turbo_state::turbo_videoram_w)
{
- turbo_state *state = space->machine().driver_data<turbo_state>();
- state->m_videoram[offset] = data;
+ m_videoram[offset] = data;
if (offset < 0x400)
{
- space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos());
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ machine().primary_screen->update_partial(machine().primary_screen->vpos());
+ m_fg_tilemap->mark_tile_dirty(offset);
}
}
-WRITE8_HANDLER( buckrog_bitmap_w )
+WRITE8_MEMBER(turbo_state::buckrog_bitmap_w)
{
- turbo_state *state = space->machine().driver_data<turbo_state>();
- state->m_buckrog_bitmap_ram[offset] = data & 1;
+ m_buckrog_bitmap_ram[offset] = data & 1;
}
diff --git a/src/mame/video/tutankhm.c b/src/mame/video/tutankhm.c
index db7f2bf7e91..a6e5be58ee7 100644
--- a/src/mame/video/tutankhm.c
+++ b/src/mame/video/tutankhm.c
@@ -19,17 +19,15 @@
*
*************************************/
-WRITE8_HANDLER( tutankhm_flip_screen_x_w )
+WRITE8_MEMBER(tutankhm_state::tutankhm_flip_screen_x_w)
{
- tutankhm_state *state = space->machine().driver_data<tutankhm_state>();
- state->m_flip_x = data & 0x01;
+ m_flip_x = data & 0x01;
}
-WRITE8_HANDLER( tutankhm_flip_screen_y_w )
+WRITE8_MEMBER(tutankhm_state::tutankhm_flip_screen_y_w)
{
- tutankhm_state *state = space->machine().driver_data<tutankhm_state>();
- state->m_flip_y = data & 0x01;
+ m_flip_y = data & 0x01;
}
diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c
index 5f83bff2b44..901ede8a871 100644
--- a/src/mame/video/twin16.c
+++ b/src/mame/video/twin16.c
@@ -40,48 +40,44 @@ enum
};
-WRITE16_HANDLER( twin16_text_ram_w )
+WRITE16_MEMBER(twin16_state::twin16_text_ram_w)
{
- twin16_state *state = space->machine().driver_data<twin16_state>();
- COMBINE_DATA(&state->m_text_ram[offset]);
- state->m_text_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_text_ram[offset]);
+ m_text_tilemap->mark_tile_dirty(offset);
}
-WRITE16_HANDLER( twin16_paletteram_word_w )
+WRITE16_MEMBER(twin16_state::twin16_paletteram_word_w)
{ // identical to tmnt_paletteram_w
- twin16_state *state = space->machine().driver_data<twin16_state>();
- COMBINE_DATA(state->m_generic_paletteram_16 + offset);
+ COMBINE_DATA(m_generic_paletteram_16 + offset);
offset &= ~1;
- data = ((state->m_generic_paletteram_16[offset] & 0xff) << 8) | (state->m_generic_paletteram_16[offset + 1] & 0xff);
- palette_set_color_rgb(space->machine(), offset / 2, pal5bit(data >> 0), pal5bit(data >> 5), pal5bit(data >> 10));
+ data = ((m_generic_paletteram_16[offset] & 0xff) << 8) | (m_generic_paletteram_16[offset + 1] & 0xff);
+ palette_set_color_rgb(machine(), offset / 2, pal5bit(data >> 0), pal5bit(data >> 5), pal5bit(data >> 10));
}
-WRITE16_HANDLER( fround_gfx_bank_w )
+WRITE16_MEMBER(twin16_state::fround_gfx_bank_w)
{
- twin16_state *state = space->machine().driver_data<twin16_state>();
- COMBINE_DATA(&state->m_gfx_bank);
+ COMBINE_DATA(&m_gfx_bank);
}
-WRITE16_HANDLER( twin16_video_register_w )
+WRITE16_MEMBER(twin16_state::twin16_video_register_w)
{
- twin16_state *state = space->machine().driver_data<twin16_state>();
switch (offset)
{
case 0:
- COMBINE_DATA( &state->m_video_register );
+ COMBINE_DATA( &m_video_register );
- flip_screen_x_set(space->machine(), state->m_video_register & TWIN16_SCREEN_FLIPX);
- flip_screen_y_set(space->machine(), state->m_video_register & TWIN16_SCREEN_FLIPY);
+ flip_screen_x_set(machine(), m_video_register & TWIN16_SCREEN_FLIPX);
+ flip_screen_y_set(machine(), m_video_register & TWIN16_SCREEN_FLIPY);
break;
- case 1: COMBINE_DATA( &state->m_scrollx[0] ); break;
- case 2: COMBINE_DATA( &state->m_scrolly[0] ); break;
- case 3: COMBINE_DATA( &state->m_scrollx[1] ); break;
- case 4: COMBINE_DATA( &state->m_scrolly[1] ); break;
- case 5: COMBINE_DATA( &state->m_scrollx[2] ); break;
- case 6: COMBINE_DATA( &state->m_scrolly[2] ); break;
+ case 1: COMBINE_DATA( &m_scrollx[0] ); break;
+ case 2: COMBINE_DATA( &m_scrolly[0] ); break;
+ case 3: COMBINE_DATA( &m_scrollx[1] ); break;
+ case 4: COMBINE_DATA( &m_scrolly[1] ); break;
+ case 5: COMBINE_DATA( &m_scrollx[2] ); break;
+ case 6: COMBINE_DATA( &m_scrolly[2] ); break;
default:
logerror("unknown video_register write:%d", data );
@@ -135,11 +131,10 @@ WRITE16_HANDLER( twin16_video_register_w )
* 3 | ------------xxxx | color
*/
-READ16_HANDLER( twin16_sprite_status_r )
+READ16_MEMBER(twin16_state::twin16_sprite_status_r)
{
- twin16_state *state = space->machine().driver_data<twin16_state>();
// bit 0: busy, other bits: dunno
- return state->m_sprite_busy;
+ return m_sprite_busy;
}
static TIMER_CALLBACK( twin16_sprite_tick )
diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c
index 6894c43d19e..c76574550b3 100644
--- a/src/mame/video/twincobr.c
+++ b/src/mame/video/twincobr.c
@@ -181,156 +181,144 @@ void twincobr_flipscreen(running_machine &machine, int flip)
}
-WRITE16_HANDLER( twincobr_txoffs_w )
+WRITE16_MEMBER(twincobr_state::twincobr_txoffs_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
- COMBINE_DATA(&state->m_txoffs);
- state->m_txoffs %= state->m_txvideoram_size;
+ COMBINE_DATA(&m_txoffs);
+ m_txoffs %= m_txvideoram_size;
}
-READ16_HANDLER( twincobr_txram_r )
+READ16_MEMBER(twincobr_state::twincobr_txram_r)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
- return state->m_txvideoram16[state->m_txoffs];
+ return m_txvideoram16[m_txoffs];
}
-WRITE16_HANDLER( twincobr_txram_w )
+WRITE16_MEMBER(twincobr_state::twincobr_txram_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
- COMBINE_DATA(&state->m_txvideoram16[state->m_txoffs]);
- state->m_tx_tilemap->mark_tile_dirty(state->m_txoffs);
+ COMBINE_DATA(&m_txvideoram16[m_txoffs]);
+ m_tx_tilemap->mark_tile_dirty(m_txoffs);
}
-WRITE16_HANDLER( twincobr_bgoffs_w )
+WRITE16_MEMBER(twincobr_state::twincobr_bgoffs_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
- COMBINE_DATA(&state->m_bgoffs);
- state->m_bgoffs %= (state->m_bgvideoram_size >> 1);
+ COMBINE_DATA(&m_bgoffs);
+ m_bgoffs %= (m_bgvideoram_size >> 1);
}
-READ16_HANDLER( twincobr_bgram_r )
+READ16_MEMBER(twincobr_state::twincobr_bgram_r)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
- return state->m_bgvideoram16[state->m_bgoffs+state->m_bg_ram_bank];
+ return m_bgvideoram16[m_bgoffs+m_bg_ram_bank];
}
-WRITE16_HANDLER( twincobr_bgram_w )
+WRITE16_MEMBER(twincobr_state::twincobr_bgram_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
- COMBINE_DATA(&state->m_bgvideoram16[state->m_bgoffs+state->m_bg_ram_bank]);
- state->m_bg_tilemap->mark_tile_dirty((state->m_bgoffs+state->m_bg_ram_bank));
+ COMBINE_DATA(&m_bgvideoram16[m_bgoffs+m_bg_ram_bank]);
+ m_bg_tilemap->mark_tile_dirty((m_bgoffs+m_bg_ram_bank));
}
-WRITE16_HANDLER( twincobr_fgoffs_w )
+WRITE16_MEMBER(twincobr_state::twincobr_fgoffs_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
- COMBINE_DATA(&state->m_fgoffs);
- state->m_fgoffs %= state->m_fgvideoram_size;
+ COMBINE_DATA(&m_fgoffs);
+ m_fgoffs %= m_fgvideoram_size;
}
-READ16_HANDLER( twincobr_fgram_r )
+READ16_MEMBER(twincobr_state::twincobr_fgram_r)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
- return state->m_fgvideoram16[state->m_fgoffs];
+ return m_fgvideoram16[m_fgoffs];
}
-WRITE16_HANDLER( twincobr_fgram_w )
+WRITE16_MEMBER(twincobr_state::twincobr_fgram_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
- COMBINE_DATA(&state->m_fgvideoram16[state->m_fgoffs]);
- state->m_fg_tilemap->mark_tile_dirty(state->m_fgoffs);
+ COMBINE_DATA(&m_fgvideoram16[m_fgoffs]);
+ m_fg_tilemap->mark_tile_dirty(m_fgoffs);
}
-WRITE16_HANDLER( twincobr_txscroll_w )
+WRITE16_MEMBER(twincobr_state::twincobr_txscroll_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
if (offset == 0) {
- COMBINE_DATA(&state->m_txscrollx);
- state->m_tx_tilemap->set_scrollx(0,(state->m_txscrollx+state->m_scroll_x) & 0x1ff);
+ COMBINE_DATA(&m_txscrollx);
+ m_tx_tilemap->set_scrollx(0,(m_txscrollx+m_scroll_x) & 0x1ff);
}
else {
- COMBINE_DATA(&state->m_txscrolly);
- state->m_tx_tilemap->set_scrolly(0,(state->m_txscrolly+state->m_scroll_y) & 0x1ff);
+ COMBINE_DATA(&m_txscrolly);
+ m_tx_tilemap->set_scrolly(0,(m_txscrolly+m_scroll_y) & 0x1ff);
}
}
-WRITE16_HANDLER( twincobr_bgscroll_w )
+WRITE16_MEMBER(twincobr_state::twincobr_bgscroll_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
if (offset == 0) {
- COMBINE_DATA(&state->m_bgscrollx);
- state->m_bg_tilemap->set_scrollx(0,(state->m_bgscrollx+state->m_scroll_x) & 0x1ff);
+ COMBINE_DATA(&m_bgscrollx);
+ m_bg_tilemap->set_scrollx(0,(m_bgscrollx+m_scroll_x) & 0x1ff);
}
else {
- COMBINE_DATA(&state->m_bgscrolly);
- state->m_bg_tilemap->set_scrolly(0,(state->m_bgscrolly+state->m_scroll_y) & 0x1ff);
+ COMBINE_DATA(&m_bgscrolly);
+ m_bg_tilemap->set_scrolly(0,(m_bgscrolly+m_scroll_y) & 0x1ff);
}
}
-WRITE16_HANDLER( twincobr_fgscroll_w )
+WRITE16_MEMBER(twincobr_state::twincobr_fgscroll_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
if (offset == 0) {
- COMBINE_DATA(&state->m_fgscrollx);
- state->m_fg_tilemap->set_scrollx(0,(state->m_fgscrollx+state->m_scroll_x) & 0x1ff);
+ COMBINE_DATA(&m_fgscrollx);
+ m_fg_tilemap->set_scrollx(0,(m_fgscrollx+m_scroll_x) & 0x1ff);
}
else {
- COMBINE_DATA(&state->m_fgscrolly);
- state->m_fg_tilemap->set_scrolly(0,(state->m_fgscrolly+state->m_scroll_y) & 0x1ff);
+ COMBINE_DATA(&m_fgscrolly);
+ m_fg_tilemap->set_scrolly(0,(m_fgscrolly+m_scroll_y) & 0x1ff);
}
}
-WRITE16_HANDLER( twincobr_exscroll_w ) /* Extra unused video layer */
+WRITE16_MEMBER(twincobr_state::twincobr_exscroll_w)/* Extra unused video layer */
{
if (offset == 0) logerror("PC - write %04x to unknown video scroll Y register\n",data);
else logerror("PC - write %04x to unknown video scroll X register\n",data);
}
/******************** Wardner interface to this hardware ********************/
-WRITE8_HANDLER( wardner_txlayer_w )
+WRITE8_MEMBER(twincobr_state::wardner_txlayer_w)
{
int shift = 8 * (offset & 1);
twincobr_txoffs_w(space, offset / 2, data << shift, 0xff << shift);
}
-WRITE8_HANDLER( wardner_bglayer_w )
+WRITE8_MEMBER(twincobr_state::wardner_bglayer_w)
{
int shift = 8 * (offset & 1);
twincobr_bgoffs_w(space, offset / 2, data << shift, 0xff << shift);
}
-WRITE8_HANDLER( wardner_fglayer_w )
+WRITE8_MEMBER(twincobr_state::wardner_fglayer_w)
{
int shift = 8 * (offset & 1);
twincobr_fgoffs_w(space, offset / 2, data << shift, 0xff << shift);
}
-WRITE8_HANDLER( wardner_txscroll_w )
+WRITE8_MEMBER(twincobr_state::wardner_txscroll_w)
{
int shift = 8 * (offset & 1);
twincobr_txscroll_w(space, offset / 2, data << shift, 0xff << shift);
}
-WRITE8_HANDLER( wardner_bgscroll_w )
+WRITE8_MEMBER(twincobr_state::wardner_bgscroll_w)
{
int shift = 8 * (offset & 1);
twincobr_bgscroll_w(space, offset / 2, data << shift, 0xff << shift);
}
-WRITE8_HANDLER( wardner_fgscroll_w )
+WRITE8_MEMBER(twincobr_state::wardner_fgscroll_w)
{
int shift = 8 * (offset & 1);
twincobr_fgscroll_w(space, offset / 2, data << shift, 0xff << shift);
}
-WRITE8_HANDLER( wardner_exscroll_w ) /* Extra unused video layer */
+WRITE8_MEMBER(twincobr_state::wardner_exscroll_w)/* Extra unused video layer */
{
switch (offset)
{
@@ -341,7 +329,7 @@ WRITE8_HANDLER( wardner_exscroll_w ) /* Extra unused video layer */
}
}
-READ8_HANDLER( wardner_videoram_r )
+READ8_MEMBER(twincobr_state::wardner_videoram_r)
{
int shift = 8 * (offset & 1);
switch (offset/2) {
@@ -352,7 +340,7 @@ READ8_HANDLER( wardner_videoram_r )
return 0;
}
-WRITE8_HANDLER( wardner_videoram_w )
+WRITE8_MEMBER(twincobr_state::wardner_videoram_w)
{
int shift = 8 * (offset & 1);
switch (offset/2) {
@@ -362,17 +350,15 @@ WRITE8_HANDLER( wardner_videoram_w )
}
}
-READ8_HANDLER( wardner_sprite_r )
+READ8_MEMBER(twincobr_state::wardner_sprite_r)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
int shift = (offset & 1) * 8;
- return state->m_spriteram->live()[offset/2] >> shift;
+ return m_spriteram->live()[offset/2] >> shift;
}
-WRITE8_HANDLER( wardner_sprite_w )
+WRITE8_MEMBER(twincobr_state::wardner_sprite_w)
{
- twincobr_state *state = space->machine().driver_data<twincobr_state>();
- UINT16 *spriteram16 = state->m_spriteram->live();
+ UINT16 *spriteram16 = m_spriteram->live();
if (offset & 1)
spriteram16[offset/2] = (spriteram16[offset/2] & 0x00ff) | (data << 8);
else
diff --git a/src/mame/video/tx1.c b/src/mame/video/tx1.c
index a95e9a80c3a..5f0bfca863e 100644
--- a/src/mame/video/tx1.c
+++ b/src/mame/video/tx1.c
@@ -39,12 +39,12 @@ static TIMER_CALLBACK( interrupt_callback )
}
-READ16_HANDLER( tx1_crtc_r )
+READ16_MEMBER(tx1_state::tx1_crtc_r)
{
return 0xffff;
}
-WRITE16_HANDLER( tx1_crtc_w )
+WRITE16_MEMBER(tx1_state::tx1_crtc_w)
{
if (PRINT_CRTC_DATA)
{
@@ -143,10 +143,9 @@ PALETTE_INIT( tx1 )
*
*************************************/
-WRITE16_HANDLER( tx1_bankcs_w )
+WRITE16_MEMBER(tx1_state::tx1_bankcs_w)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- vregs_t &tx1_vregs = state->m_vregs;
+ vregs_t &tx1_vregs = m_vregs;
// AAB2 = /BASET0
// AAB3 = /BASET
@@ -197,31 +196,27 @@ WRITE16_HANDLER( tx1_bankcs_w )
}
}
-WRITE16_HANDLER( tx1_slincs_w )
+WRITE16_MEMBER(tx1_state::tx1_slincs_w)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
if (offset == 1)
- state->m_vregs.slin_inc = data;
+ m_vregs.slin_inc = data;
else
- state->m_vregs.slin_inc = state->m_vregs.slin_val = 0;
+ m_vregs.slin_inc = m_vregs.slin_val = 0;
}
-WRITE16_HANDLER( tx1_slock_w )
+WRITE16_MEMBER(tx1_state::tx1_slock_w)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- state->m_vregs.slock = data & 1;
+ m_vregs.slock = data & 1;
}
-WRITE16_HANDLER( tx1_scolst_w )
+WRITE16_MEMBER(tx1_state::tx1_scolst_w)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- state->m_vregs.scol = data & 0x0707;
+ m_vregs.scol = data & 0x0707;
}
-WRITE16_HANDLER( tx1_flgcs_w )
+WRITE16_MEMBER(tx1_state::tx1_flgcs_w)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- state->m_vregs.flags = data & 0xff;
+ m_vregs.flags = data & 0xff;
}
@@ -2841,10 +2836,9 @@ static void buggyboy_draw_objs(running_machine &machine, UINT8 *bitmap, int wide
/WASET = 24A0-F, 24B0-F
/FLAGS = 24E0-F, 24F0-F
*/
-WRITE16_HANDLER( buggyboy_gas_w )
+WRITE16_MEMBER(tx1_state::buggyboy_gas_w)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- vregs_t &vregs = state->m_vregs;
+ vregs_t &vregs = m_vregs;
offset <<= 1;
switch (offset & 0xe0)
@@ -2905,7 +2899,7 @@ WRITE16_HANDLER( buggyboy_gas_w )
}
case 0xe0:
{
- cputag_set_input_line(space->machine(), "math_cpu", INPUT_LINE_TEST, CLEAR_LINE);
+ cputag_set_input_line(machine(), "math_cpu", INPUT_LINE_TEST, CLEAR_LINE);
vregs.flags = data;
break;
}
@@ -2915,16 +2909,14 @@ WRITE16_HANDLER( buggyboy_gas_w )
vregs.gas = data;
}
-WRITE16_HANDLER( buggyboy_sky_w )
+WRITE16_MEMBER(tx1_state::buggyboy_sky_w)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- state->m_vregs.sky = data;
+ m_vregs.sky = data;
}
-WRITE16_HANDLER( buggyboy_scolst_w )
+WRITE16_MEMBER(tx1_state::buggyboy_scolst_w)
{
- tx1_state *state = space->machine().driver_data<tx1_state>();
- state->m_vregs.scol = data;
+ m_vregs.scol = data;
}
diff --git a/src/mame/video/ultraman.c b/src/mame/video/ultraman.c
index 496cb5c9bfc..986cda5c945 100644
--- a/src/mame/video/ultraman.c
+++ b/src/mame/video/ultraman.c
@@ -70,9 +70,8 @@ VIDEO_START( ultraman )
***************************************************************************/
-WRITE16_HANDLER( ultraman_gfxctrl_w )
+WRITE16_MEMBER(ultraman_state::ultraman_gfxctrl_w)
{
- ultraman_state *state = space->machine().driver_data<ultraman_state>();
if (ACCESSING_BITS_0_7)
{
@@ -85,32 +84,32 @@ WRITE16_HANDLER( ultraman_gfxctrl_w )
bit 6: coin counter 1
bit 7: coin counter 2 */
- k051316_wraparound_enable(state->m_k051316_1, data & 0x01);
+ k051316_wraparound_enable(m_k051316_1, data & 0x01);
- if (state->m_bank0 != ((data & 0x02) >> 1))
+ if (m_bank0 != ((data & 0x02) >> 1))
{
- state->m_bank0 = (data & 0x02) >> 1;
- space->machine().tilemap().mark_all_dirty(); /* should mark only zoom0 */
+ m_bank0 = (data & 0x02) >> 1;
+ machine().tilemap().mark_all_dirty(); /* should mark only zoom0 */
}
- k051316_wraparound_enable(state->m_k051316_2, data & 0x04);
+ k051316_wraparound_enable(m_k051316_2, data & 0x04);
- if (state->m_bank1 != ((data & 0x08) >> 3))
+ if (m_bank1 != ((data & 0x08) >> 3))
{
- state->m_bank1 = (data & 0x08) >> 3;
- space->machine().tilemap().mark_all_dirty(); /* should mark only zoom1 */
+ m_bank1 = (data & 0x08) >> 3;
+ machine().tilemap().mark_all_dirty(); /* should mark only zoom1 */
}
- k051316_wraparound_enable(state->m_k051316_3, data & 0x10);
+ k051316_wraparound_enable(m_k051316_3, data & 0x10);
- if (state->m_bank2 != ((data & 0x20) >> 5))
+ if (m_bank2 != ((data & 0x20) >> 5))
{
- state->m_bank2 = (data & 0x20) >> 5;
- space->machine().tilemap().mark_all_dirty(); /* should mark only zoom2 */
+ m_bank2 = (data & 0x20) >> 5;
+ machine().tilemap().mark_all_dirty(); /* should mark only zoom2 */
}
- coin_counter_w(space->machine(), 0, data & 0x40);
- coin_counter_w(space->machine(), 1, data & 0x80);
+ coin_counter_w(machine(), 0, data & 0x40);
+ coin_counter_w(machine(), 1, data & 0x80);
}
}
diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c
index 40c0690a9b1..a2a5a055b4f 100644
--- a/src/mame/video/ultratnk.c
+++ b/src/mame/video/ultratnk.c
@@ -149,10 +149,9 @@ SCREEN_VBLANK( ultratnk )
}
-WRITE8_HANDLER( ultratnk_video_ram_w )
+WRITE8_MEMBER(ultratnk_state::ultratnk_video_ram_w)
{
- ultratnk_state *state = space->machine().driver_data<ultratnk_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_playfield->mark_tile_dirty(offset);
+ m_playfield->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c
index 237c7fa2278..ca512bbfbf3 100644
--- a/src/mame/video/unico.c
+++ b/src/mame/video/unico.c
@@ -51,24 +51,22 @@ Note: if MAME_DEBUG is defined, pressing Z with:
***************************************************************************/
-WRITE16_HANDLER( unico_palette_w )
+WRITE16_MEMBER(unico_state::unico_palette_w)
{
- unico_state *state = space->machine().driver_data<unico_state>();
UINT16 data1, data2;
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- data1 = state->m_generic_paletteram_16[offset & ~1];
- data2 = state->m_generic_paletteram_16[offset | 1];
- palette_set_color_rgb( space->machine(),offset/2,
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ data1 = m_generic_paletteram_16[offset & ~1];
+ data2 = m_generic_paletteram_16[offset | 1];
+ palette_set_color_rgb( machine(),offset/2,
(data1 >> 8) & 0xFC,
(data1 >> 0) & 0xFC,
(data2 >> 8) & 0xFC );
}
-WRITE32_HANDLER( unico_palette32_w )
+WRITE32_MEMBER(unico_state::unico_palette32_w)
{
- unico_state *state = space->machine().driver_data<unico_state>();
- UINT32 rgb0 = COMBINE_DATA(&state->m_generic_paletteram_32[offset]);
- palette_set_color_rgb( space->machine(),offset,
+ UINT32 rgb0 = COMBINE_DATA(&m_generic_paletteram_32[offset]);
+ palette_set_color_rgb( machine(),offset,
(rgb0 >> 24) & 0xFC,
(rgb0 >> 16) & 0xFC,
(rgb0 >> 8) & 0xFC );
@@ -106,22 +104,20 @@ static TILE_GET_INFO( get_tile_info32 )
SET_TILE_INFO(1, code, attr & 0x1f, TILE_FLIPYX( attr >> 5 ));
}
-WRITE16_HANDLER( unico_vram_w )
+WRITE16_MEMBER(unico_state::unico_vram_w)
{
- unico_state *state = space->machine().driver_data<unico_state>();
- UINT16 *vram = state->m_vram;
+ UINT16 *vram = m_vram;
int tile = ((offset / 0x2000) + 1) % 3;
COMBINE_DATA(&vram[offset]);
- state->m_tilemap[tile]->mark_tile_dirty((offset & 0x3fff)/2);
+ m_tilemap[tile]->mark_tile_dirty((offset & 0x3fff)/2);
}
-WRITE32_HANDLER( unico_vram32_w )
+WRITE32_MEMBER(unico_state::unico_vram32_w)
{
- unico_state *state = space->machine().driver_data<unico_state>();
- UINT32 *vram = state->m_vram32;
+ UINT32 *vram = m_vram32;
int tile = ((offset / 0x1000) + 1) % 3;
COMBINE_DATA(&vram[offset]);
- state->m_tilemap[tile]->mark_tile_dirty((offset & 0x3fff));
+ m_tilemap[tile]->mark_tile_dirty((offset & 0x3fff));
}
diff --git a/src/mame/video/usgames.c b/src/mame/video/usgames.c
index b9546f21ac6..13674222d26 100644
--- a/src/mame/video/usgames.c
+++ b/src/mame/video/usgames.c
@@ -50,18 +50,16 @@ VIDEO_START(usgames)
}
-WRITE8_HANDLER( usgames_videoram_w )
+WRITE8_MEMBER(usgames_state::usgames_videoram_w)
{
- usgames_state *state = space->machine().driver_data<usgames_state>();
- state->m_videoram[offset] = data;
- state->m_tilemap->mark_tile_dirty(offset/2);
+ m_videoram[offset] = data;
+ m_tilemap->mark_tile_dirty(offset/2);
}
-WRITE8_HANDLER( usgames_charram_w )
+WRITE8_MEMBER(usgames_state::usgames_charram_w)
{
- usgames_state *state = space->machine().driver_data<usgames_state>();
- state->m_charram[offset] = data;
- gfx_element_mark_dirty(space->machine().gfx[0], offset/8);
+ m_charram[offset] = data;
+ gfx_element_mark_dirty(machine().gfx[0], offset/8);
}
diff --git a/src/mame/video/vaportra.c b/src/mame/video/vaportra.c
index a978a9c5650..a23ff24217b 100644
--- a/src/mame/video/vaportra.c
+++ b/src/mame/video/vaportra.c
@@ -16,10 +16,9 @@
/******************************************************************************/
-WRITE16_HANDLER( vaportra_priority_w )
+WRITE16_MEMBER(vaportra_state::vaportra_priority_w)
{
- vaportra_state *state = space->machine().driver_data<vaportra_state>();
- COMBINE_DATA(&state->m_priority[offset]);
+ COMBINE_DATA(&m_priority[offset]);
}
/******************************************************************************/
@@ -36,18 +35,16 @@ static void update_24bitcol( running_machine &machine, int offset )
palette_set_color(machine, offset, MAKE_RGB(r,g,b));
}
-WRITE16_HANDLER( vaportra_palette_24bit_rg_w )
+WRITE16_MEMBER(vaportra_state::vaportra_palette_24bit_rg_w)
{
- vaportra_state *state = space->machine().driver_data<vaportra_state>();
- COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
- update_24bitcol(space->machine(), offset);
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ update_24bitcol(machine(), offset);
}
-WRITE16_HANDLER( vaportra_palette_24bit_b_w )
+WRITE16_MEMBER(vaportra_state::vaportra_palette_24bit_b_w)
{
- vaportra_state *state = space->machine().driver_data<vaportra_state>();
- COMBINE_DATA(&state->m_generic_paletteram2_16[offset]);
- update_24bitcol(space->machine(), offset);
+ COMBINE_DATA(&m_generic_paletteram2_16[offset]);
+ update_24bitcol(machine(), offset);
}
/******************************************************************************/
diff --git a/src/mame/video/vastar.c b/src/mame/video/vastar.c
index 4645186fbdb..69f2302440c 100644
--- a/src/mame/video/vastar.c
+++ b/src/mame/video/vastar.c
@@ -91,43 +91,38 @@ VIDEO_START( vastar )
***************************************************************************/
-WRITE8_HANDLER( vastar_fgvideoram_w )
+WRITE8_MEMBER(vastar_state::vastar_fgvideoram_w)
{
- vastar_state *state = space->machine().driver_data<vastar_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( vastar_bg1videoram_w )
+WRITE8_MEMBER(vastar_state::vastar_bg1videoram_w)
{
- vastar_state *state = space->machine().driver_data<vastar_state>();
- state->m_bg1videoram[offset] = data;
- state->m_bg1_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bg1videoram[offset] = data;
+ m_bg1_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( vastar_bg2videoram_w )
+WRITE8_MEMBER(vastar_state::vastar_bg2videoram_w)
{
- vastar_state *state = space->machine().driver_data<vastar_state>();
- state->m_bg2videoram[offset] = data;
- state->m_bg2_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bg2videoram[offset] = data;
+ m_bg2_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-READ8_HANDLER( vastar_bg1videoram_r )
+READ8_MEMBER(vastar_state::vastar_bg1videoram_r)
{
- vastar_state *state = space->machine().driver_data<vastar_state>();
- return state->m_bg1videoram[offset];
+ return m_bg1videoram[offset];
}
-READ8_HANDLER( vastar_bg2videoram_r )
+READ8_MEMBER(vastar_state::vastar_bg2videoram_r)
{
- vastar_state *state = space->machine().driver_data<vastar_state>();
- return state->m_bg2videoram[offset];
+ return m_bg2videoram[offset];
}
diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c
index ca87769ec92..a5429806df6 100644
--- a/src/mame/video/vball.c
+++ b/src/mame/video/vball.c
@@ -49,26 +49,23 @@ VIDEO_START( vb )
state->m_vb_spprombank=0xff;
}
-WRITE8_HANDLER( vb_videoram_w )
+WRITE8_MEMBER(vball_state::vb_videoram_w)
{
- vball_state *state = space->machine().driver_data<vball_state>();
- state->m_vb_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_vb_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
#ifdef UNUSED_FUNCTION
-READ8_HANDLER( vb_attrib_r )
+READ8_MEMBER(vball_state::vb_attrib_r)
{
- vball_state *state = space->machine().driver_data<vball_state>();
- return state->m_vb_attribram[offset];
+ return m_vb_attribram[offset];
}
#endif
-WRITE8_HANDLER( vb_attrib_w )
+WRITE8_MEMBER(vball_state::vb_attrib_w)
{
- vball_state *state = space->machine().driver_data<vball_state>();
- state->m_vb_attribram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_vb_attribram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
void vb_bgprombank_w( running_machine &machine, int bank )
diff --git a/src/mame/video/vectrex.c b/src/mame/video/vectrex.c
index 56361166f47..46cb8a4608f 100644
--- a/src/mame/video/vectrex.c
+++ b/src/mame/video/vectrex.c
@@ -107,39 +107,38 @@ static TIMER_CALLBACK(lightpen_trigger)
*********************************************************************/
-READ8_HANDLER(vectrex_via_r)
+READ8_MEMBER(vectrex_state::vectrex_via_r)
{
- via6522_device *via = space->machine().device<via6522_device>("via6522_0");
- return via->read(*space, offset);
+ via6522_device *via = machine().device<via6522_device>("via6522_0");
+ return via->read(space, offset);
}
-WRITE8_HANDLER(vectrex_via_w)
+WRITE8_MEMBER(vectrex_state::vectrex_via_w)
{
- vectrex_state *state = space->machine().driver_data<vectrex_state>();
- via6522_device *via = space->machine().device<via6522_device>("via6522_0");
+ via6522_device *via = machine().device<via6522_device>("via6522_0");
attotime period;
switch (offset)
{
case 8:
- state->m_via_timer2 = (state->m_via_timer2 & 0xff00) | data;
+ m_via_timer2 = (m_via_timer2 & 0xff00) | data;
break;
case 9:
- state->m_via_timer2 = (state->m_via_timer2 & 0x00ff) | (data << 8);
+ m_via_timer2 = (m_via_timer2 & 0x00ff) | (data << 8);
- period = (attotime::from_hz(space->machine().device("maincpu")->unscaled_clock()) * state->m_via_timer2);
+ period = (attotime::from_hz(machine().device("maincpu")->unscaled_clock()) * m_via_timer2);
- if (state->m_reset_refresh)
- state->m_refresh->adjust(period, 0, period);
+ if (m_reset_refresh)
+ m_refresh->adjust(period, 0, period);
else
- state->m_refresh->adjust(
- min(period, state->m_refresh->remaining()),
+ m_refresh->adjust(
+ min(period, m_refresh->remaining()),
0,
period);
break;
}
- via->write(*space, offset, data);
+ via->write(space, offset, data);
}
@@ -470,7 +469,7 @@ const via6522_interface spectrum1_via6522_interface =
};
-WRITE8_HANDLER(raaspec_led_w)
+WRITE8_MEMBER(vectrex_state::raaspec_led_w)
{
logerror("Spectrum I+ LED: %i%i%i%i%i%i%i%i\n",
(data>>7)&0x1, (data>>6)&0x1, (data>>5)&0x1, (data>>4)&0x1,
diff --git a/src/mame/video/vicdual.c b/src/mame/video/vicdual.c
index cc79fca8a88..af39a7d50c0 100644
--- a/src/mame/video/vicdual.c
+++ b/src/mame/video/vicdual.c
@@ -21,11 +21,10 @@ static const pen_t pens_from_color_prom[] =
};
-WRITE8_HANDLER( vicdual_palette_bank_w )
+WRITE8_MEMBER(vicdual_state::vicdual_palette_bank_w)
{
- vicdual_state *state = space->machine().driver_data<vicdual_state>();
- space->machine().primary_screen->update_partial(space->machine().primary_screen->vpos());
- state->m_palette_bank = data & 3;
+ machine().primary_screen->update_partial(machine().primary_screen->vpos());
+ m_palette_bank = data & 3;
}
diff --git a/src/mame/video/victory.c b/src/mame/video/victory.c
index 6d3c01a2f52..7acf151b09f 100644
--- a/src/mame/video/victory.c
+++ b/src/mame/video/victory.c
@@ -97,10 +97,9 @@ INTERRUPT_GEN( victory_vblank_interrupt )
*
*************************************/
-WRITE8_HANDLER( victory_paletteram_w )
+WRITE8_MEMBER(victory_state::victory_paletteram_w)
{
- victory_state *state = space->machine().driver_data<victory_state>();
- state->m_paletteram[offset & 0x3f] = ((offset & 0x80) << 1) | data;
+ m_paletteram[offset & 0x3f] = ((offset & 0x80) << 1) | data;
}
@@ -125,41 +124,40 @@ static void set_palette(running_machine &machine)
*
*************************************/
-READ8_HANDLER( victory_video_control_r )
+READ8_MEMBER(victory_state::victory_video_control_r)
{
- victory_state *state = space->machine().driver_data<victory_state>();
int result = 0;
switch (offset)
{
case 0x00: /* 5XFIQ */
- result = state->m_fgcollx;
- if (LOG_COLLISION) logerror("%04X:5XFIQ read = %02X\n", cpu_get_previouspc(&space->device()), result);
+ result = m_fgcollx;
+ if (LOG_COLLISION) logerror("%04X:5XFIQ read = %02X\n", cpu_get_previouspc(&space.device()), result);
return result;
case 0x01: /* 5CLFIQ */
- result = state->m_fgcolly;
- if (state->m_fgcoll)
+ result = m_fgcolly;
+ if (m_fgcoll)
{
- state->m_fgcoll = 0;
- victory_update_irq(space->machine());
+ m_fgcoll = 0;
+ victory_update_irq(machine());
}
- if (LOG_COLLISION) logerror("%04X:5CLFIQ read = %02X\n", cpu_get_previouspc(&space->device()), result);
+ if (LOG_COLLISION) logerror("%04X:5CLFIQ read = %02X\n", cpu_get_previouspc(&space.device()), result);
return result;
case 0x02: /* 5BACKX */
- result = state->m_bgcollx & 0xfc;
- if (LOG_COLLISION) logerror("%04X:5BACKX read = %02X\n", cpu_get_previouspc(&space->device()), result);
+ result = m_bgcollx & 0xfc;
+ if (LOG_COLLISION) logerror("%04X:5BACKX read = %02X\n", cpu_get_previouspc(&space.device()), result);
return result;
case 0x03: /* 5BACKY */
- result = state->m_bgcolly;
- if (state->m_bgcoll)
+ result = m_bgcolly;
+ if (m_bgcoll)
{
- state->m_bgcoll = 0;
- victory_update_irq(space->machine());
+ m_bgcoll = 0;
+ victory_update_irq(machine());
}
- if (LOG_COLLISION) logerror("%04X:5BACKY read = %02X\n", cpu_get_previouspc(&space->device()), result);
+ if (LOG_COLLISION) logerror("%04X:5BACKY read = %02X\n", cpu_get_previouspc(&space.device()), result);
return result;
case 0x04: /* 5STAT */
@@ -168,17 +166,17 @@ READ8_HANDLER( victory_video_control_r )
// D5 = 5VIRQ
// D4 = 5BCIRQ (3B1)
// D3 = SL256
- if (state->m_micro.timer_active && state->m_micro.timer->elapsed() < state->m_micro.endtime)
+ if (m_micro.timer_active && m_micro.timer->elapsed() < m_micro.endtime)
result |= 0x80;
- result |= (~state->m_fgcoll & 1) << 6;
- result |= (~state->m_vblank_irq & 1) << 5;
- result |= (~state->m_bgcoll & 1) << 4;
- result |= (space->machine().primary_screen->vpos() & 0x100) >> 5;
- if (LOG_COLLISION) logerror("%04X:5STAT read = %02X\n", cpu_get_previouspc(&space->device()), result);
+ result |= (~m_fgcoll & 1) << 6;
+ result |= (~m_vblank_irq & 1) << 5;
+ result |= (~m_bgcoll & 1) << 4;
+ result |= (machine().primary_screen->vpos() & 0x100) >> 5;
+ if (LOG_COLLISION) logerror("%04X:5STAT read = %02X\n", cpu_get_previouspc(&space.device()), result);
return result;
default:
- logerror("%04X:victory_video_control_r(%02X)\n", cpu_get_previouspc(&space->device()), offset);
+ logerror("%04X:victory_video_control_r(%02X)\n", cpu_get_previouspc(&space.device()), offset);
break;
}
return 0;
@@ -192,29 +190,28 @@ READ8_HANDLER( victory_video_control_r )
*
*************************************/
-WRITE8_HANDLER( victory_video_control_w )
+WRITE8_MEMBER(victory_state::victory_video_control_w)
{
- victory_state *state = space->machine().driver_data<victory_state>();
- struct micro_t &micro = state->m_micro;
+ struct micro_t &micro = m_micro;
switch (offset)
{
case 0x00: /* LOAD IL */
- if (LOG_MICROCODE) logerror("%04X:IL=%02X\n", cpu_get_previouspc(&space->device()), data);
+ if (LOG_MICROCODE) logerror("%04X:IL=%02X\n", cpu_get_previouspc(&space.device()), data);
micro.i = (micro.i & 0xff00) | (data & 0x00ff);
break;
case 0x01: /* LOAD IH */
- if (LOG_MICROCODE) logerror("%04X:IH=%02X\n", cpu_get_previouspc(&space->device()), data);
+ if (LOG_MICROCODE) logerror("%04X:IH=%02X\n", cpu_get_previouspc(&space.device()), data);
micro.i = (micro.i & 0x00ff) | ((data << 8) & 0xff00);
if (micro.cmdlo == 5)
{
if (LOG_MICROCODE) logerror(" Command 5 triggered by write to IH\n");
- command5(space->machine());
+ command5(machine());
}
break;
case 0x02: /* LOAD CMD */
- if (LOG_MICROCODE) logerror("%04X:CMD=%02X\n", cpu_get_previouspc(&space->device()), data);
+ if (LOG_MICROCODE) logerror("%04X:CMD=%02X\n", cpu_get_previouspc(&space.device()), data);
micro.cmd = data;
micro.cmdlo = data & 7;
if (micro.cmdlo == 0)
@@ -224,63 +221,63 @@ WRITE8_HANDLER( victory_video_control_w )
else if (micro.cmdlo == 6)
{
if (LOG_MICROCODE) logerror(" Command 6 triggered\n");
- command6(space->machine());
+ command6(machine());
}
break;
case 0x03: /* LOAD G */
- if (LOG_MICROCODE) logerror("%04X:G=%02X\n", cpu_get_previouspc(&space->device()), data);
+ if (LOG_MICROCODE) logerror("%04X:G=%02X\n", cpu_get_previouspc(&space.device()), data);
micro.g = data;
break;
case 0x04: /* LOAD X */
- if (LOG_MICROCODE) logerror("%04X:X=%02X\n", cpu_get_previouspc(&space->device()), data);
+ if (LOG_MICROCODE) logerror("%04X:X=%02X\n", cpu_get_previouspc(&space.device()), data);
micro.xp = data;
if (micro.cmdlo == 3)
{
if (LOG_MICROCODE) logerror(" Command 3 triggered by write to X\n");
- command3(space->machine());
+ command3(machine());
}
break;
case 0x05: /* LOAD Y */
- if (LOG_MICROCODE) logerror("%04X:Y=%02X\n", cpu_get_previouspc(&space->device()), data);
+ if (LOG_MICROCODE) logerror("%04X:Y=%02X\n", cpu_get_previouspc(&space.device()), data);
micro.yp = data;
if (micro.cmdlo == 4)
{
if (LOG_MICROCODE) logerror(" Command 4 triggered by write to Y\n");
- command4(space->machine());
+ command4(machine());
}
break;
case 0x06: /* LOAD R */
- if (LOG_MICROCODE) logerror("%04X:R=%02X\n", cpu_get_previouspc(&space->device()), data);
+ if (LOG_MICROCODE) logerror("%04X:R=%02X\n", cpu_get_previouspc(&space.device()), data);
micro.r = data;
break;
case 0x07: /* LOAD B */
- if (LOG_MICROCODE) logerror("%04X:B=%02X\n", cpu_get_previouspc(&space->device()), data);
+ if (LOG_MICROCODE) logerror("%04X:B=%02X\n", cpu_get_previouspc(&space.device()), data);
micro.b = data;
if (micro.cmdlo == 2)
{
if (LOG_MICROCODE) logerror(" Command 2 triggered by write to B\n");
- command2(space->machine());
+ command2(machine());
}
else if (micro.cmdlo == 7)
{
if (LOG_MICROCODE) logerror(" Command 7 triggered by write to B\n");
- command7(space->machine());
+ command7(machine());
}
break;
case 0x08: /* SCROLLX */
- if (LOG_MICROCODE) logerror("%04X:SCROLLX write = %02X\n", cpu_get_previouspc(&space->device()), data);
- state->m_scrollx = data;
+ if (LOG_MICROCODE) logerror("%04X:SCROLLX write = %02X\n", cpu_get_previouspc(&space.device()), data);
+ m_scrollx = data;
break;
case 0x09: /* SCROLLY */
- if (LOG_MICROCODE) logerror("%04X:SCROLLY write = %02X\n", cpu_get_previouspc(&space->device()), data);
- state->m_scrolly = data;
+ if (LOG_MICROCODE) logerror("%04X:SCROLLY write = %02X\n", cpu_get_previouspc(&space.device()), data);
+ m_scrolly = data;
break;
case 0x0a: /* CONTROL */
@@ -291,18 +288,18 @@ WRITE8_HANDLER( victory_video_control_w )
// D3 = SINVERT
// D2 = BIR12
// D1 = SELOVER
- if (LOG_MICROCODE) logerror("%04X:CONTROL write = %02X\n", cpu_get_previouspc(&space->device()), data);
- state->m_video_control = data;
+ if (LOG_MICROCODE) logerror("%04X:CONTROL write = %02X\n", cpu_get_previouspc(&space.device()), data);
+ m_video_control = data;
break;
case 0x0b: /* CLRVIRQ */
- if (LOG_MICROCODE) logerror("%04X:CLRVIRQ write = %02X\n", cpu_get_previouspc(&space->device()), data);
- state->m_vblank_irq = 0;
- victory_update_irq(space->machine());
+ if (LOG_MICROCODE) logerror("%04X:CLRVIRQ write = %02X\n", cpu_get_previouspc(&space.device()), data);
+ m_vblank_irq = 0;
+ victory_update_irq(machine());
break;
default:
- if (LOG_MICROCODE) logerror("%04X:victory_video_control_w(%02X) = %02X\n", cpu_get_previouspc(&space->device()), offset, data);
+ if (LOG_MICROCODE) logerror("%04X:victory_video_control_w(%02X) = %02X\n", cpu_get_previouspc(&space.device()), offset, data);
break;
}
}
diff --git a/src/mame/video/videopin.c b/src/mame/video/videopin.c
index 42d2952121f..f73e746381b 100644
--- a/src/mame/video/videopin.c
+++ b/src/mame/video/videopin.c
@@ -87,17 +87,15 @@ SCREEN_UPDATE_IND16( videopin )
}
-WRITE8_HANDLER( videopin_ball_w )
+WRITE8_MEMBER(videopin_state::videopin_ball_w)
{
- videopin_state *state = space->machine().driver_data<videopin_state>();
- state->m_ball_x = data & 15;
- state->m_ball_y = data >> 4;
+ m_ball_x = data & 15;
+ m_ball_y = data >> 4;
}
-WRITE8_HANDLER( videopin_video_ram_w )
+WRITE8_MEMBER(videopin_state::videopin_video_ram_w)
{
- videopin_state *state = space->machine().driver_data<videopin_state>();
- state->m_video_ram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_video_ram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/vigilant.c b/src/mame/video/vigilant.c
index e7d241d104e..f4d33de7025 100644
--- a/src/mame/video/vigilant.c
+++ b/src/mame/video/vigilant.c
@@ -91,22 +91,21 @@ static void update_background(running_machine &machine)
These are used to index a color triplet of RGB. The triplet is read
from RAM, and output to R0-R4, G0-G4, and B0-B4.
**************************************************************************/
-WRITE8_HANDLER( vigilant_paletteram_w )
+WRITE8_MEMBER(vigilant_state::vigilant_paletteram_w)
{
int bank,r,g,b;
- vigilant_state *state = space->machine().driver_data<vigilant_state>();
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
bank = offset & 0x400;
offset &= 0xff;
- r = (state->m_generic_paletteram_8[bank + offset + 0x000] << 3) & 0xFF;
- g = (state->m_generic_paletteram_8[bank + offset + 0x100] << 3) & 0xFF;
- b = (state->m_generic_paletteram_8[bank + offset + 0x200] << 3) & 0xFF;
+ r = (m_generic_paletteram_8[bank + offset + 0x000] << 3) & 0xFF;
+ g = (m_generic_paletteram_8[bank + offset + 0x100] << 3) & 0xFF;
+ b = (m_generic_paletteram_8[bank + offset + 0x200] << 3) & 0xFF;
- palette_set_color(space->machine(), (bank >> 2) + offset,MAKE_RGB(r,g,b));
+ palette_set_color(machine(), (bank >> 2) + offset,MAKE_RGB(r,g,b));
}
@@ -117,13 +116,12 @@ WRITE8_HANDLER( vigilant_paletteram_w )
horiz_scroll_low = HSPL, an 8-bit register
horiz_scroll_high = HSPH, a 1-bit register
**************************************************************************/
-WRITE8_HANDLER( vigilant_horiz_scroll_w )
+WRITE8_MEMBER(vigilant_state::vigilant_horiz_scroll_w)
{
- vigilant_state *state = space->machine().driver_data<vigilant_state>();
if (offset==0)
- state->m_horiz_scroll_low = data;
+ m_horiz_scroll_low = data;
else
- state->m_horiz_scroll_high = (data & 0x01) * 256;
+ m_horiz_scroll_high = (data & 0x01) * 256;
}
/***************************************************************************
@@ -132,13 +130,12 @@ WRITE8_HANDLER( vigilant_horiz_scroll_w )
rear_horiz_scroll_low = RHSPL, an 8-bit register
rear_horiz_scroll_high = RHSPH, an 8-bit register but only 3 bits are saved
***************************************************************************/
-WRITE8_HANDLER( vigilant_rear_horiz_scroll_w )
+WRITE8_MEMBER(vigilant_state::vigilant_rear_horiz_scroll_w)
{
- vigilant_state *state = space->machine().driver_data<vigilant_state>();
if (offset==0)
- state->m_rear_horiz_scroll_low = data;
+ m_rear_horiz_scroll_low = data;
else
- state->m_rear_horiz_scroll_high = (data & 0x07) * 256;
+ m_rear_horiz_scroll_high = (data & 0x07) * 256;
}
/***************************************************************************
@@ -156,11 +153,10 @@ WRITE8_HANDLER( vigilant_rear_horiz_scroll_w )
palette. However, the top four bits of the palette inputs are labelled:
"RCC3", "RCC2", "V256E", "RCC0". Methinks there's a typo.
**************************************************************************/
-WRITE8_HANDLER( vigilant_rear_color_w )
+WRITE8_MEMBER(vigilant_state::vigilant_rear_color_w)
{
- vigilant_state *state = space->machine().driver_data<vigilant_state>();
- state->m_rear_disable = data & 0x40;
- state->m_rear_color = (data & 0x0d);
+ m_rear_disable = data & 0x40;
+ m_rear_color = (data & 0x0d);
}
/***************************************************************************
diff --git a/src/mame/video/volfied.c b/src/mame/video/volfied.c
index 69390de0c70..483452f28dc 100644
--- a/src/mame/video/volfied.c
+++ b/src/mame/video/volfied.c
@@ -24,28 +24,25 @@ VIDEO_START( volfied )
READ AND WRITE HANDLERS
*******************************************************/
-READ16_HANDLER( volfied_video_ram_r )
+READ16_MEMBER(volfied_state::volfied_video_ram_r)
{
- volfied_state *state = space->machine().driver_data<volfied_state>();
- return state->m_video_ram[offset];
+ return m_video_ram[offset];
}
-WRITE16_HANDLER( volfied_video_ram_w )
+WRITE16_MEMBER(volfied_state::volfied_video_ram_w)
{
- volfied_state *state = space->machine().driver_data<volfied_state>();
- mem_mask &= state->m_video_mask;
+ mem_mask &= m_video_mask;
- COMBINE_DATA(&state->m_video_ram[offset]);
+ COMBINE_DATA(&m_video_ram[offset]);
}
-WRITE16_HANDLER( volfied_video_ctrl_w )
+WRITE16_MEMBER(volfied_state::volfied_video_ctrl_w)
{
- volfied_state *state = space->machine().driver_data<volfied_state>();
- COMBINE_DATA(&state->m_video_ctrl);
+ COMBINE_DATA(&m_video_ctrl);
}
-READ16_HANDLER( volfied_video_ctrl_r )
+READ16_MEMBER(volfied_state::volfied_video_ctrl_r)
{
/* Could this be some kind of hardware collision detection? If bit 6 is
set the game will check for collisions with the large enemy, whereas
@@ -56,16 +53,14 @@ READ16_HANDLER( volfied_video_ctrl_r )
return 0x60;
}
-WRITE16_HANDLER( volfied_video_mask_w )
+WRITE16_MEMBER(volfied_state::volfied_video_mask_w)
{
- volfied_state *state = space->machine().driver_data<volfied_state>();
- COMBINE_DATA(&state->m_video_mask);
+ COMBINE_DATA(&m_video_mask);
}
-WRITE16_HANDLER( volfied_sprite_ctrl_w )
+WRITE16_MEMBER(volfied_state::volfied_sprite_ctrl_w)
{
- volfied_state *state = space->machine().driver_data<volfied_state>();
- pc090oj_set_sprite_ctrl(state->m_pc090oj, (data & 0x3c) >> 2);
+ pc090oj_set_sprite_ctrl(m_pc090oj, (data & 0x3c) >> 2);
}
diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c
index a8d20ed8fa9..f48627cfbff 100644
--- a/src/mame/video/vulgus.c
+++ b/src/mame/video/vulgus.c
@@ -128,39 +128,36 @@ VIDEO_START( vulgus )
***************************************************************************/
-WRITE8_HANDLER( vulgus_fgvideoram_w )
+WRITE8_MEMBER(vulgus_state::vulgus_fgvideoram_w)
{
- vulgus_state *state = space->machine().driver_data<vulgus_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( vulgus_bgvideoram_w )
+WRITE8_MEMBER(vulgus_state::vulgus_bgvideoram_w)
{
- vulgus_state *state = space->machine().driver_data<vulgus_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( vulgus_c804_w )
+WRITE8_MEMBER(vulgus_state::vulgus_c804_w)
{
/* bits 0 and 1 are coin counters */
- coin_counter_w(space->machine(), 0, data & 0x01);
- coin_counter_w(space->machine(), 1, data & 0x02);
+ coin_counter_w(machine(), 0, data & 0x01);
+ coin_counter_w(machine(), 1, data & 0x02);
/* bit 7 flips screen */
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
}
-WRITE8_HANDLER( vulgus_palette_bank_w )
+WRITE8_MEMBER(vulgus_state::vulgus_palette_bank_w)
{
- vulgus_state *state = space->machine().driver_data<vulgus_state>();
- if (state->m_palette_bank != (data & 3))
+ if (m_palette_bank != (data & 3))
{
- state->m_palette_bank = data & 3;
- state->m_bg_tilemap->mark_all_dirty();
+ m_palette_bank = data & 3;
+ m_bg_tilemap->mark_all_dirty();
}
}
diff --git a/src/mame/video/warpwarp.c b/src/mame/video/warpwarp.c
index 579ce02ee3b..999390744b8 100644
--- a/src/mame/video/warpwarp.c
+++ b/src/mame/video/warpwarp.c
@@ -193,18 +193,16 @@ VIDEO_START( warpwarp )
***************************************************************************/
-WRITE8_HANDLER( geebee_videoram_w )
+WRITE8_MEMBER(warpwarp_state::geebee_videoram_w)
{
- warpwarp_state *state = space->machine().driver_data<warpwarp_state>();
- state->m_geebee_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_geebee_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( warpwarp_videoram_w )
+WRITE8_MEMBER(warpwarp_state::warpwarp_videoram_w)
{
- warpwarp_state *state = space->machine().driver_data<warpwarp_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c
index a72b78c537f..15c997045eb 100644
--- a/src/mame/video/wc90.c
+++ b/src/mame/video/wc90.c
@@ -106,25 +106,22 @@ VIDEO_START( wc90t )
***************************************************************************/
-WRITE8_HANDLER( wc90_bgvideoram_w )
+WRITE8_MEMBER(wc90_state::wc90_bgvideoram_w)
{
- wc90_state *state = space->machine().driver_data<wc90_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-WRITE8_HANDLER( wc90_fgvideoram_w )
+WRITE8_MEMBER(wc90_state::wc90_fgvideoram_w)
{
- wc90_state *state = space->machine().driver_data<wc90_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-WRITE8_HANDLER( wc90_txvideoram_w )
+WRITE8_MEMBER(wc90_state::wc90_txvideoram_w)
{
- wc90_state *state = space->machine().driver_data<wc90_state>();
- state->m_txvideoram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_txvideoram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset & 0x7ff);
}
diff --git a/src/mame/video/wc90b.c b/src/mame/video/wc90b.c
index 927db801797..f246cc2df87 100644
--- a/src/mame/video/wc90b.c
+++ b/src/mame/video/wc90b.c
@@ -69,25 +69,22 @@ VIDEO_START( wc90b )
***************************************************************************/
-WRITE8_HANDLER( wc90b_bgvideoram_w )
+WRITE8_MEMBER(wc90b_state::wc90b_bgvideoram_w)
{
- wc90b_state *state = space->machine().driver_data<wc90b_state>();
- state->m_bgvideoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_bgvideoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-WRITE8_HANDLER( wc90b_fgvideoram_w )
+WRITE8_MEMBER(wc90b_state::wc90b_fgvideoram_w)
{
- wc90b_state *state = space->machine().driver_data<wc90b_state>();
- state->m_fgvideoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x7ff);
}
-WRITE8_HANDLER( wc90b_txvideoram_w )
+WRITE8_MEMBER(wc90b_state::wc90b_txvideoram_w)
{
- wc90b_state *state = space->machine().driver_data<wc90b_state>();
- state->m_txvideoram[offset] = data;
- state->m_tx_tilemap->mark_tile_dirty(offset & 0x7ff);
+ m_txvideoram[offset] = data;
+ m_tx_tilemap->mark_tile_dirty(offset & 0x7ff);
}
diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c
index fd3c0a5a150..c15ebf0baba 100644
--- a/src/mame/video/wecleman.c
+++ b/src/mame/video/wecleman.c
@@ -424,11 +424,10 @@ static TILE_GET_INFO( wecleman_get_txt_tile_info )
SET_TILE_INFO(PAGE_GFX, code&0xfff, (code>>5&0x78)+(code>>12), 0);
}
-WRITE16_HANDLER( wecleman_txtram_w )
+WRITE16_MEMBER(wecleman_state::wecleman_txtram_w)
{
- wecleman_state *state = space->machine().driver_data<wecleman_state>();
- UINT16 old_data = state->m_txtram[offset];
- UINT16 new_data = COMBINE_DATA(&state->m_txtram[offset]);
+ UINT16 old_data = m_txtram[offset];
+ UINT16 new_data = COMBINE_DATA(&m_txtram[offset]);
if ( old_data != new_data )
{
@@ -437,27 +436,27 @@ WRITE16_HANDLER( wecleman_txtram_w )
/* pages selector for the background */
if (offset == 0xEFE/2)
{
- state->m_bgpage[0] = (new_data >> 0x4) & 3;
- state->m_bgpage[1] = (new_data >> 0x0) & 3;
- state->m_bgpage[2] = (new_data >> 0xc) & 3;
- state->m_bgpage[3] = (new_data >> 0x8) & 3;
- state->m_bg_tilemap->mark_all_dirty();
+ m_bgpage[0] = (new_data >> 0x4) & 3;
+ m_bgpage[1] = (new_data >> 0x0) & 3;
+ m_bgpage[2] = (new_data >> 0xc) & 3;
+ m_bgpage[3] = (new_data >> 0x8) & 3;
+ m_bg_tilemap->mark_all_dirty();
}
/* pages selector for the foreground */
if (offset == 0xEFC/2)
{
- state->m_fgpage[0] = (new_data >> 0x4) & 3;
- state->m_fgpage[1] = (new_data >> 0x0) & 3;
- state->m_fgpage[2] = (new_data >> 0xc) & 3;
- state->m_fgpage[3] = (new_data >> 0x8) & 3;
- state->m_fg_tilemap->mark_all_dirty();
+ m_fgpage[0] = (new_data >> 0x4) & 3;
+ m_fgpage[1] = (new_data >> 0x0) & 3;
+ m_fgpage[2] = (new_data >> 0xc) & 3;
+ m_fgpage[3] = (new_data >> 0x8) & 3;
+ m_fg_tilemap->mark_all_dirty();
}
/* Parallactic horizontal scroll registers follow */
}
else
- state->m_txt_tilemap->mark_tile_dirty(offset);
+ m_txt_tilemap->mark_tile_dirty(offset);
}
}
@@ -493,10 +492,9 @@ static TILE_GET_INFO( wecleman_get_fg_tile_info )
------------------------------------------------------------------------*/
/* Pages that compose both the background and the foreground */
-WRITE16_HANDLER( wecleman_pageram_w )
+WRITE16_MEMBER(wecleman_state::wecleman_pageram_w)
{
- wecleman_state *state = space->machine().driver_data<wecleman_state>();
- COMBINE_DATA(&state->m_pageram[offset]);
+ COMBINE_DATA(&m_pageram[offset]);
{
int page,col,row;
@@ -506,16 +504,16 @@ WRITE16_HANDLER( wecleman_pageram_w )
row = ( offset / PAGE_NX ) % PAGE_NY;
/* background */
- if (state->m_bgpage[0] == page) state->m_bg_tilemap->mark_tile_dirty((col+PAGE_NX*0) + (row+PAGE_NY*0)*PAGE_NX*2 );
- if (state->m_bgpage[1] == page) state->m_bg_tilemap->mark_tile_dirty((col+PAGE_NX*1) + (row+PAGE_NY*0)*PAGE_NX*2 );
- if (state->m_bgpage[2] == page) state->m_bg_tilemap->mark_tile_dirty((col+PAGE_NX*0) + (row+PAGE_NY*1)*PAGE_NX*2 );
- if (state->m_bgpage[3] == page) state->m_bg_tilemap->mark_tile_dirty((col+PAGE_NX*1) + (row+PAGE_NY*1)*PAGE_NX*2 );
+ if (m_bgpage[0] == page) m_bg_tilemap->mark_tile_dirty((col+PAGE_NX*0) + (row+PAGE_NY*0)*PAGE_NX*2 );
+ if (m_bgpage[1] == page) m_bg_tilemap->mark_tile_dirty((col+PAGE_NX*1) + (row+PAGE_NY*0)*PAGE_NX*2 );
+ if (m_bgpage[2] == page) m_bg_tilemap->mark_tile_dirty((col+PAGE_NX*0) + (row+PAGE_NY*1)*PAGE_NX*2 );
+ if (m_bgpage[3] == page) m_bg_tilemap->mark_tile_dirty((col+PAGE_NX*1) + (row+PAGE_NY*1)*PAGE_NX*2 );
/* foreground */
- if (state->m_fgpage[0] == page) state->m_fg_tilemap->mark_tile_dirty((col+PAGE_NX*0) + (row+PAGE_NY*0)*PAGE_NX*2 );
- if (state->m_fgpage[1] == page) state->m_fg_tilemap->mark_tile_dirty((col+PAGE_NX*1) + (row+PAGE_NY*0)*PAGE_NX*2 );
- if (state->m_fgpage[2] == page) state->m_fg_tilemap->mark_tile_dirty((col+PAGE_NX*0) + (row+PAGE_NY*1)*PAGE_NX*2 );
- if (state->m_fgpage[3] == page) state->m_fg_tilemap->mark_tile_dirty((col+PAGE_NX*1) + (row+PAGE_NY*1)*PAGE_NX*2 );
+ if (m_fgpage[0] == page) m_fg_tilemap->mark_tile_dirty((col+PAGE_NX*0) + (row+PAGE_NY*0)*PAGE_NX*2 );
+ if (m_fgpage[1] == page) m_fg_tilemap->mark_tile_dirty((col+PAGE_NX*1) + (row+PAGE_NY*0)*PAGE_NX*2 );
+ if (m_fgpage[2] == page) m_fg_tilemap->mark_tile_dirty((col+PAGE_NX*0) + (row+PAGE_NY*1)*PAGE_NX*2 );
+ if (m_fgpage[3] == page) m_fg_tilemap->mark_tile_dirty((col+PAGE_NX*1) + (row+PAGE_NY*1)*PAGE_NX*2 );
}
}
@@ -834,51 +832,48 @@ static void hotchase_draw_road(running_machine &machine, bitmap_ind16 &bitmap, c
***************************************************************************/
// new video and palette code
-WRITE16_HANDLER( wecleman_videostatus_w )
+WRITE16_MEMBER(wecleman_state::wecleman_videostatus_w)
{
- wecleman_state *state = space->machine().driver_data<wecleman_state>();
- COMBINE_DATA(state->m_videostatus);
+ COMBINE_DATA(m_videostatus);
// bit0-6: background transition, 0=off, 1=on
// bit7: palette being changed, 0=no, 1=yes
if (ACCESSING_BITS_0_7)
{
- if ((data & 0x7f) == 0 && !state->m_cloud_ds)
- state->m_cloud_ds = BLEND_INC;
+ if ((data & 0x7f) == 0 && !m_cloud_ds)
+ m_cloud_ds = BLEND_INC;
else
- if ((data & 0x7f) == 1 && !state->m_cloud_visible)
+ if ((data & 0x7f) == 1 && !m_cloud_visible)
{
data ^= 1;
- state->m_cloud_ds = BLEND_DEC;
- state->m_cloud_visible = 1;
+ m_cloud_ds = BLEND_DEC;
+ m_cloud_visible = 1;
}
}
}
-WRITE16_HANDLER( hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w )
+WRITE16_MEMBER(wecleman_state::hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w)
{
int newword, r, g, b;
- wecleman_state *state = space->machine().driver_data<wecleman_state>();
- newword = COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
+ newword = COMBINE_DATA(&m_generic_paletteram_16[offset]);
r = ((newword << 1) & 0x1E ) | ((newword >> 12) & 0x01);
g = ((newword >> 3) & 0x1E ) | ((newword >> 13) & 0x01);
b = ((newword >> 7) & 0x1E ) | ((newword >> 14) & 0x01);
- palette_set_color_rgb(space->machine(), offset, pal5bit(r), pal5bit(g), pal5bit(b));
+ palette_set_color_rgb(machine(), offset, pal5bit(r), pal5bit(g), pal5bit(b));
r>>=1; g>>=1; b>>=1;
- palette_set_color_rgb(space->machine(), offset+0x800, pal5bit(r)/2, pal5bit(g)/2, pal5bit(b)/2);
+ palette_set_color_rgb(machine(), offset+0x800, pal5bit(r)/2, pal5bit(g)/2, pal5bit(b)/2);
}
-WRITE16_HANDLER( wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w )
+WRITE16_MEMBER(wecleman_state::wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w)
{
- wecleman_state *state = space->machine().driver_data<wecleman_state>();
- int newword = COMBINE_DATA(&state->m_generic_paletteram_16[offset]);
+ int newword = COMBINE_DATA(&m_generic_paletteram_16[offset]);
// the highest nibble has some unknown functions
// if (newword & 0xf000) logerror("MSN set on color %03x: %1x\n", offset, newword>>12);
- palette_set_color_rgb(space->machine(), offset, pal4bit(newword >> 0), pal4bit(newword >> 4), pal4bit(newword >> 8));
+ palette_set_color_rgb(machine(), offset, pal4bit(newword >> 0), pal4bit(newword >> 4), pal4bit(newword >> 8));
}
diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c
index cc8a1783f07..c6d30d91d30 100644
--- a/src/mame/video/welltris.c
+++ b/src/mame/video/welltris.c
@@ -5,25 +5,24 @@
#ifdef UNUSED_FUNCTION
-READ16_HANDLER( welltris_spriteram_r )
+READ16_MEMBER(welltris_state::welltris_spriteram_r)
{
return welltris_spriteram[offset];
}
#endif
-WRITE16_HANDLER( welltris_spriteram_w )
+WRITE16_MEMBER(welltris_state::welltris_spriteram_w)
{
- welltris_state *state = space->machine().driver_data<welltris_state>();
int offs;
- COMBINE_DATA(&state->m_spriteram[offset]);
+ COMBINE_DATA(&m_spriteram[offset]);
/* hack... sprite doesn't work otherwise (quiz18kn) */
if ((offset == 0x1fe) &&
- (state->m_spriteram[0x01fc] == 0x0000) &&
- (state->m_spriteram[0x01fd] == 0x0000) &&
- (state->m_spriteram[0x01ff] == 0x0000)) {
- for (offs = 0; offs < 0x1fc; offs++) state->m_spriteram[offs] = 0x0000;
+ (m_spriteram[0x01fc] == 0x0000) &&
+ (m_spriteram[0x01fd] == 0x0000) &&
+ (m_spriteram[0x01ff] == 0x0000)) {
+ for (offs = 0; offs < 0x1fc; offs++) m_spriteram[offs] = 0x0000;
}
}
@@ -143,55 +142,52 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
}
}
-static void setbank(welltris_state *state, int num, int bank)
+void welltris_state::setbank(int num, int bank)
{
- if (state->m_gfxbank[num] != bank)
+ if (m_gfxbank[num] != bank)
{
- state->m_gfxbank[num] = bank;
- state->m_char_tilemap->mark_all_dirty();
+ m_gfxbank[num] = bank;
+ m_char_tilemap->mark_all_dirty();
}
}
/* Not really enough evidence here */
-WRITE16_HANDLER( welltris_palette_bank_w )
+WRITE16_MEMBER(welltris_state::welltris_palette_bank_w)
{
if (ACCESSING_BITS_0_7)
{
- welltris_state *state = space->machine().driver_data<welltris_state>();
- if (state->m_charpalettebank != (data & 0x03))
+ if (m_charpalettebank != (data & 0x03))
{
- state->m_charpalettebank = (data & 0x03);
- state->m_char_tilemap->mark_all_dirty();
+ m_charpalettebank = (data & 0x03);
+ m_char_tilemap->mark_all_dirty();
}
- flip_screen_set(space->machine(), data & 0x80);
+ flip_screen_set(machine(), data & 0x80);
- state->m_spritepalettebank = (data & 0x20) >> 5;
- state->m_pixelpalettebank = (data & 0x08) >> 3;
+ m_spritepalettebank = (data & 0x20) >> 5;
+ m_pixelpalettebank = (data & 0x08) >> 3;
}
}
-WRITE16_HANDLER( welltris_gfxbank_w )
+WRITE16_MEMBER(welltris_state::welltris_gfxbank_w)
{
if (ACCESSING_BITS_0_7)
{
- welltris_state *state = space->machine().driver_data<welltris_state>();
- setbank(state, 0, (data & 0xf0) >> 4);
- setbank(state, 1, data & 0x0f);
+ setbank(0, (data & 0xf0) >> 4);
+ setbank(1, data & 0x0f);
}
}
-WRITE16_HANDLER( welltris_scrollreg_w )
+WRITE16_MEMBER(welltris_state::welltris_scrollreg_w)
{
- welltris_state *state = space->machine().driver_data<welltris_state>();
switch (offset) {
- case 0: state->m_scrollx = data - 14; break;
- case 1: state->m_scrolly = data + 0; break;
+ case 0: m_scrollx = data - 14; break;
+ case 1: m_scrolly = data + 0; break;
}
}
@@ -208,12 +204,11 @@ static TILE_GET_INFO( get_welltris_tile_info )
0);
}
-WRITE16_HANDLER( welltris_charvideoram_w )
+WRITE16_MEMBER(welltris_state::welltris_charvideoram_w)
{
- welltris_state *state = space->machine().driver_data<welltris_state>();
- COMBINE_DATA(&state->m_charvideoram[offset]);
- state->m_char_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_charvideoram[offset]);
+ m_char_tilemap->mark_tile_dirty(offset);
}
VIDEO_START( welltris )
diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c
index 83dd5c81cb1..a1122a99b0f 100644
--- a/src/mame/video/wgp.c
+++ b/src/mame/video/wgp.c
@@ -122,21 +122,19 @@ custom chip capable of four rather than three tilemaps.)
*******************************************************************/
-READ16_HANDLER( wgp_pivram_word_r )
+READ16_MEMBER(wgp_state::wgp_pivram_word_r)
{
- wgp_state *state = space->machine().driver_data<wgp_state>();
- return state->m_pivram[offset];
+ return m_pivram[offset];
}
-WRITE16_HANDLER( wgp_pivram_word_w )
+WRITE16_MEMBER(wgp_state::wgp_pivram_word_w)
{
- wgp_state *state = space->machine().driver_data<wgp_state>();
- COMBINE_DATA(&state->m_pivram[offset]);
+ COMBINE_DATA(&m_pivram[offset]);
if (offset < 0x3000)
{
- state->m_piv_tilemap[(offset / 0x1000)]->mark_tile_dirty((offset % 0x1000));
+ m_piv_tilemap[(offset / 0x1000)]->mark_tile_dirty((offset % 0x1000));
}
else if ((offset >= 0x3400) && (offset < 0x4000))
{
@@ -144,54 +142,52 @@ WRITE16_HANDLER( wgp_pivram_word_w )
}
else if ((offset >= 0x8000) && (offset < 0xb000))
{
- state->m_piv_tilemap[((offset - 0x8000)/ 0x1000)]->mark_tile_dirty((offset % 0x1000));
+ m_piv_tilemap[((offset - 0x8000)/ 0x1000)]->mark_tile_dirty((offset % 0x1000));
}
}
-READ16_HANDLER( wgp_piv_ctrl_word_r )
+READ16_MEMBER(wgp_state::wgp_piv_ctrl_word_r)
{
- wgp_state *state = space->machine().driver_data<wgp_state>();
- return state->m_piv_ctrlram[offset];
+ return m_piv_ctrlram[offset];
}
-WRITE16_HANDLER( wgp_piv_ctrl_word_w )
+WRITE16_MEMBER(wgp_state::wgp_piv_ctrl_word_w)
{
- wgp_state *state = space->machine().driver_data<wgp_state>();
UINT16 a, b;
- COMBINE_DATA(&state->m_piv_ctrlram[offset]);
- data = state->m_piv_ctrlram[offset];
+ COMBINE_DATA(&m_piv_ctrlram[offset]);
+ data = m_piv_ctrlram[offset];
switch (offset)
{
case 0x00:
a = -data;
b = (a & 0xffe0) >> 1; /* kill bit 4 */
- state->m_piv_scrollx[0] = (a & 0xf) | b;
+ m_piv_scrollx[0] = (a & 0xf) | b;
break;
case 0x01:
a = -data;
b = (a & 0xffe0) >> 1;
- state->m_piv_scrollx[1] = (a & 0xf) | b;
+ m_piv_scrollx[1] = (a & 0xf) | b;
break;
case 0x02:
a = -data;
b = (a & 0xffe0) >> 1;
- state->m_piv_scrollx[2] = (a & 0xf) | b;
+ m_piv_scrollx[2] = (a & 0xf) | b;
break;
case 0x03:
- state->m_piv_scrolly[0] = data;
+ m_piv_scrolly[0] = data;
break;
case 0x04:
- state->m_piv_scrolly[1] = data;
+ m_piv_scrolly[1] = data;
break;
case 0x05:
- state->m_piv_scrolly[2] = data;
+ m_piv_scrolly[2] = data;
break;
case 0x06:
@@ -201,24 +197,24 @@ WRITE16_HANDLER( wgp_piv_ctrl_word_w )
seen on Wgp stages 4,5,7 in which piv 2 used
for cloud or scenery wandering up screen */
- state->m_piv_ctrl_reg = data;
+ m_piv_ctrl_reg = data;
break;
case 0x08:
/* piv 0 y zoom (0x7f = normal, not seen others) */
- state->m_piv_zoom[0] = data;
+ m_piv_zoom[0] = data;
break;
case 0x09:
/* piv 1 y zoom (0x7f = normal, values 0 &
0xff7f-ffbc in Wgp2) */
- state->m_piv_zoom[1] = data;
+ m_piv_zoom[1] = data;
break;
case 0x0a:
/* piv 2 y zoom (0x7f = normal, values 0 &
0xff7f-ffbc in Wgp2, 0-0x98 in Wgp round 4/5) */
- state->m_piv_zoom[2] = data;
+ m_piv_zoom[2] = data;
break;
}
}
diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c
index 17222ed83f6..d819d9bf988 100644
--- a/src/mame/video/williams.c
+++ b/src/mame/video/williams.c
@@ -312,7 +312,7 @@ static void create_palette_lookup(running_machine &machine)
}
-WRITE8_HANDLER( williams2_paletteram_w )
+WRITE8_MEMBER(williams_state::williams2_paletteram_w)
{
static const UINT8 ztable[16] =
{
@@ -322,26 +322,24 @@ WRITE8_HANDLER( williams2_paletteram_w )
UINT8 entry_lo, entry_hi, i, r, g, b;
/* set the new value */
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_generic_paletteram_8[offset] = data;
+ m_generic_paletteram_8[offset] = data;
/* pull the associated low/high bytes */
- entry_lo = state->m_generic_paletteram_8[offset & ~1];
- entry_hi = state->m_generic_paletteram_8[offset | 1];
+ entry_lo = m_generic_paletteram_8[offset & ~1];
+ entry_hi = m_generic_paletteram_8[offset | 1];
/* update the palette entry */
i = ztable[(entry_hi >> 4) & 15];
b = ((entry_hi >> 0) & 15) * i;
g = ((entry_lo >> 4) & 15) * i;
r = ((entry_lo >> 0) & 15) * i;
- palette_set_color(space->machine(), offset / 2, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), offset / 2, MAKE_RGB(r, g, b));
}
-WRITE8_HANDLER( williams2_fg_select_w )
+WRITE8_MEMBER(williams_state::williams2_fg_select_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_williams2_fg_color = data & 0x3f;
+ m_williams2_fg_color = data & 0x3f;
}
@@ -352,15 +350,15 @@ WRITE8_HANDLER( williams2_fg_select_w )
*
*************************************/
-READ8_HANDLER( williams_video_counter_r )
+READ8_MEMBER(williams_state::williams_video_counter_r)
{
- return space->machine().primary_screen->vpos() & 0xfc;
+ return machine().primary_screen->vpos() & 0xfc;
}
-READ8_HANDLER( williams2_video_counter_r )
+READ8_MEMBER(williams_state::williams2_video_counter_r)
{
- return space->machine().primary_screen->vpos();
+ return machine().primary_screen->vpos();
}
@@ -406,12 +404,11 @@ static TILE_GET_INFO( get_tile_info )
}
-WRITE8_HANDLER( williams2_bg_select_w )
+WRITE8_MEMBER(williams_state::williams2_bg_select_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
/* based on the tilemap config, only certain bits are used */
/* the rest are determined by other factors */
- switch (state->m_williams2_tilemap_config)
+ switch (m_williams2_tilemap_config)
{
case WILLIAMS_TILEMAP_MYSTICM:
/* IC79 is a 74LS85 comparator that controls the low bit */
@@ -428,31 +425,28 @@ WRITE8_HANDLER( williams2_bg_select_w )
data &= 0x3f;
break;
}
- state->m_bg_tilemap->set_palette_offset(data * 16);
+ m_bg_tilemap->set_palette_offset(data * 16);
}
-WRITE8_HANDLER( williams2_tileram_w )
+WRITE8_MEMBER(williams_state::williams2_tileram_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_williams2_tileram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_williams2_tileram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( williams2_xscroll_low_w )
+WRITE8_MEMBER(williams_state::williams2_xscroll_low_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_tilemap_xscroll = (state->m_tilemap_xscroll & ~0x00f) | ((data & 0x80) >> 4) | (data & 0x07);
- state->m_bg_tilemap->set_scrollx(0, (state->m_tilemap_xscroll & 7) + ((state->m_tilemap_xscroll >> 3) * 6));
+ m_tilemap_xscroll = (m_tilemap_xscroll & ~0x00f) | ((data & 0x80) >> 4) | (data & 0x07);
+ m_bg_tilemap->set_scrollx(0, (m_tilemap_xscroll & 7) + ((m_tilemap_xscroll >> 3) * 6));
}
-WRITE8_HANDLER( williams2_xscroll_high_w )
+WRITE8_MEMBER(williams_state::williams2_xscroll_high_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_tilemap_xscroll = (state->m_tilemap_xscroll & 0x00f) | (data << 4);
- state->m_bg_tilemap->set_scrollx(0, (state->m_tilemap_xscroll & 7) + ((state->m_tilemap_xscroll >> 3) * 6));
+ m_tilemap_xscroll = (m_tilemap_xscroll & 0x00f) | (data << 4);
+ m_bg_tilemap->set_scrollx(0, (m_tilemap_xscroll & 7) + ((m_tilemap_xscroll >> 3) * 6));
}
@@ -463,18 +457,16 @@ WRITE8_HANDLER( williams2_xscroll_high_w )
*
*************************************/
-WRITE8_HANDLER( blaster_remap_select_w )
+WRITE8_MEMBER(williams_state::blaster_remap_select_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_blitter_remap_index = data;
- state->m_blitter_remap = state->m_blitter_remap_lookup + data * 256;
+ m_blitter_remap_index = data;
+ m_blitter_remap = m_blitter_remap_lookup + data * 256;
}
-WRITE8_HANDLER( blaster_video_control_w )
+WRITE8_MEMBER(williams_state::blaster_video_control_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_blaster_video_control = data;
+ m_blaster_video_control = data;
}
@@ -510,26 +502,25 @@ static void blitter_init(running_machine &machine, int blitter_config, const UIN
}
-WRITE8_HANDLER( williams_blitter_w )
+WRITE8_MEMBER(williams_state::williams_blitter_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
int sstart, dstart, w, h, accesses;
int estimated_clocks_at_4MHz;
/* store the data */
- state->m_blitterram[offset] = data;
+ m_blitterram[offset] = data;
/* only writes to location 0 trigger the blit */
if (offset != 0)
return;
/* compute the starting locations */
- sstart = (state->m_blitterram[2] << 8) + state->m_blitterram[3];
- dstart = (state->m_blitterram[4] << 8) + state->m_blitterram[5];
+ sstart = (m_blitterram[2] << 8) + m_blitterram[3];
+ dstart = (m_blitterram[4] << 8) + m_blitterram[5];
/* compute the width and height */
- w = state->m_blitterram[6] ^ state->m_blitter_xor;
- h = state->m_blitterram[7] ^ state->m_blitter_xor;
+ w = m_blitterram[6] ^ m_blitter_xor;
+ h = m_blitterram[7] ^ m_blitter_xor;
/* adjust the width and height */
if (w == 0) w = 1;
@@ -538,28 +529,27 @@ WRITE8_HANDLER( williams_blitter_w )
if (h == 255) h = 256;
/* do the actual blit */
- accesses = blitter_core(space, sstart, dstart, w, h, data);
+ accesses = blitter_core(&space, sstart, dstart, w, h, data);
/* based on the number of memory accesses needed to do the blit, compute how long the blit will take */
/* this is just a guess */
estimated_clocks_at_4MHz = 20 + ((data & 4) ? 4 : 2) * accesses;
- device_adjust_icount(&space->device(), -((estimated_clocks_at_4MHz + 3) / 4));
+ device_adjust_icount(&space.device(), -((estimated_clocks_at_4MHz + 3) / 4));
/* Log blits */
logerror("%04X:Blit @ %3d : %02X%02X -> %02X%02X, %3dx%3d, mask=%02X, flags=%02X, icount=%d, win=%d\n",
- cpu_get_pc(&space->device()), space->machine().primary_screen->vpos(),
- state->m_blitterram[2], state->m_blitterram[3],
- state->m_blitterram[4], state->m_blitterram[5],
- state->m_blitterram[6], state->m_blitterram[7],
- state->m_blitterram[1], state->m_blitterram[0],
- ((estimated_clocks_at_4MHz + 3) / 4), state->m_blitter_window_enable);
+ cpu_get_pc(&space.device()), machine().primary_screen->vpos(),
+ m_blitterram[2], m_blitterram[3],
+ m_blitterram[4], m_blitterram[5],
+ m_blitterram[6], m_blitterram[7],
+ m_blitterram[1], m_blitterram[0],
+ ((estimated_clocks_at_4MHz + 3) / 4), m_blitter_window_enable);
}
-WRITE8_HANDLER( williams2_blit_window_enable_w )
+WRITE8_MEMBER(williams_state::williams2_blit_window_enable_w)
{
- williams_state *state = space->machine().driver_data<williams_state>();
- state->m_blitter_window_enable = data & 0x01;
+ m_blitter_window_enable = data & 0x01;
}
diff --git a/src/mame/video/wiping.c b/src/mame/video/wiping.c
index 8a07aadc4f9..d1b862ad47a 100644
--- a/src/mame/video/wiping.c
+++ b/src/mame/video/wiping.c
@@ -79,10 +79,9 @@ PALETTE_INIT( wiping )
-WRITE8_HANDLER( wiping_flipscreen_w )
+WRITE8_MEMBER(wiping_state::wiping_flipscreen_w)
{
- wiping_state *state = space->machine().driver_data<wiping_state>();
- state->m_flipscreen = (data & 1);
+ m_flipscreen = (data & 1);
}
diff --git a/src/mame/video/wiz.c b/src/mame/video/wiz.c
index af3394c167e..4bd703541c6 100644
--- a/src/mame/video/wiz.c
+++ b/src/mame/video/wiz.c
@@ -65,36 +65,31 @@ PALETTE_INIT( wiz )
}
}
-WRITE8_HANDLER( wiz_palettebank_w )
+WRITE8_MEMBER(wiz_state::wiz_palettebank_w)
{
- wiz_state *state = space->machine().driver_data<wiz_state>();
- state->m_palbank[offset] = data & 1;
- state->m_palette_bank = state->m_palbank[0] + 2 * state->m_palbank[1];
+ m_palbank[offset] = data & 1;
+ m_palette_bank = m_palbank[0] + 2 * m_palbank[1];
}
-WRITE8_HANDLER( wiz_bgcolor_w )
+WRITE8_MEMBER(wiz_state::wiz_bgcolor_w)
{
- wiz_state *state = space->machine().driver_data<wiz_state>();
- state->m_bgpen = data;
+ m_bgpen = data;
}
-WRITE8_HANDLER( wiz_char_bank_select_w )
+WRITE8_MEMBER(wiz_state::wiz_char_bank_select_w)
{
- wiz_state *state = space->machine().driver_data<wiz_state>();
- state->m_char_bank[offset] = data & 1;
+ m_char_bank[offset] = data & 1;
}
-WRITE8_HANDLER( wiz_flipx_w )
+WRITE8_MEMBER(wiz_state::wiz_flipx_w)
{
- wiz_state *state = space->machine().driver_data<wiz_state>();
- state->m_flipx = data;
+ m_flipx = data;
}
-WRITE8_HANDLER( wiz_flipy_w )
+WRITE8_MEMBER(wiz_state::wiz_flipy_w)
{
- wiz_state *state = space->machine().driver_data<wiz_state>();
- state->m_flipy = data;
+ m_flipy = data;
}
static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int bank, int colortype)
diff --git a/src/mame/video/wolfpack.c b/src/mame/video/wolfpack.c
index bcb71faff19..9a783603f34 100644
--- a/src/mame/video/wolfpack.c
+++ b/src/mame/video/wolfpack.c
@@ -45,65 +45,53 @@ PALETTE_INIT( wolfpack )
}
-WRITE8_HANDLER( wolfpack_ship_size_w )
+WRITE8_MEMBER(wolfpack_state::wolfpack_ship_size_w)
{
- wolfpack_state *state = space->machine().driver_data<wolfpack_state>();
- state->m_ship_size = data;
+ m_ship_size = data;
}
-WRITE8_HANDLER( wolfpack_video_invert_w )
+WRITE8_MEMBER(wolfpack_state::wolfpack_video_invert_w)
{
- wolfpack_state *state = space->machine().driver_data<wolfpack_state>();
- state->m_video_invert = data & 1;
+ m_video_invert = data & 1;
}
-WRITE8_HANDLER( wolfpack_ship_reflect_w )
+WRITE8_MEMBER(wolfpack_state::wolfpack_ship_reflect_w)
{
- wolfpack_state *state = space->machine().driver_data<wolfpack_state>();
- state->m_ship_reflect = data & 1;
+ m_ship_reflect = data & 1;
}
-WRITE8_HANDLER( wolfpack_pt_pos_select_w )
+WRITE8_MEMBER(wolfpack_state::wolfpack_pt_pos_select_w)
{
- wolfpack_state *state = space->machine().driver_data<wolfpack_state>();
- state->m_pt_pos_select = data & 1;
+ m_pt_pos_select = data & 1;
}
-WRITE8_HANDLER( wolfpack_pt_horz_w )
+WRITE8_MEMBER(wolfpack_state::wolfpack_pt_horz_w)
{
- wolfpack_state *state = space->machine().driver_data<wolfpack_state>();
- state->m_pt_horz = data;
+ m_pt_horz = data;
}
-WRITE8_HANDLER( wolfpack_pt_pic_w )
+WRITE8_MEMBER(wolfpack_state::wolfpack_pt_pic_w)
{
- wolfpack_state *state = space->machine().driver_data<wolfpack_state>();
- state->m_pt_pic = data & 0x3f;
+ m_pt_pic = data & 0x3f;
}
-WRITE8_HANDLER( wolfpack_ship_h_w )
+WRITE8_MEMBER(wolfpack_state::wolfpack_ship_h_w)
{
- wolfpack_state *state = space->machine().driver_data<wolfpack_state>();
- state->m_ship_h = data;
+ m_ship_h = data;
}
-WRITE8_HANDLER( wolfpack_torpedo_pic_w )
+WRITE8_MEMBER(wolfpack_state::wolfpack_torpedo_pic_w)
{
- wolfpack_state *state = space->machine().driver_data<wolfpack_state>();
- state->m_torpedo_pic = data;
+ m_torpedo_pic = data;
}
-WRITE8_HANDLER( wolfpack_ship_h_precess_w )
+WRITE8_MEMBER(wolfpack_state::wolfpack_ship_h_precess_w)
{
- wolfpack_state *state = space->machine().driver_data<wolfpack_state>();
- state->m_ship_h_precess = data & 0x3f;
+ m_ship_h_precess = data & 0x3f;
}
-WRITE8_HANDLER( wolfpack_ship_pic_w )
+WRITE8_MEMBER(wolfpack_state::wolfpack_ship_pic_w)
{
- wolfpack_state *state = space->machine().driver_data<wolfpack_state>();
- state->m_ship_pic = data & 0x0f;
+ m_ship_pic = data & 0x0f;
}
-WRITE8_HANDLER( wolfpack_torpedo_h_w )
+WRITE8_MEMBER(wolfpack_state::wolfpack_torpedo_h_w)
{
- wolfpack_state *state = space->machine().driver_data<wolfpack_state>();
- state->m_torpedo_h = data;
+ m_torpedo_h = data;
}
-WRITE8_HANDLER( wolfpack_torpedo_v_w )
+WRITE8_MEMBER(wolfpack_state::wolfpack_torpedo_v_w)
{
- wolfpack_state *state = space->machine().driver_data<wolfpack_state>();
- state->m_torpedo_v = data;
+ m_torpedo_v = data;
}
diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c
index 5aea265cf11..90e8362bca4 100644
--- a/src/mame/video/wwfsstar.c
+++ b/src/mame/video/wwfsstar.c
@@ -15,20 +15,18 @@
for writes to Video Ram
*******************************************************************************/
-WRITE16_HANDLER( wwfsstar_fg0_videoram_w )
+WRITE16_MEMBER(wwfsstar_state::wwfsstar_fg0_videoram_w)
{
- wwfsstar_state *state = space->machine().driver_data<wwfsstar_state>();
- COMBINE_DATA(&state->m_fg0_videoram[offset]);
- state->m_fg0_tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_fg0_videoram[offset]);
+ m_fg0_tilemap->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( wwfsstar_bg0_videoram_w )
+WRITE16_MEMBER(wwfsstar_state::wwfsstar_bg0_videoram_w)
{
- wwfsstar_state *state = space->machine().driver_data<wwfsstar_state>();
- COMBINE_DATA(&state->m_bg0_videoram[offset]);
- state->m_bg0_tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_bg0_videoram[offset]);
+ m_bg0_tilemap->mark_tile_dirty(offset/2);
}
/*******************************************************************************
diff --git a/src/mame/video/wwfwfest.c b/src/mame/video/wwfwfest.c
index 5a8c7552c6a..181f0f9adbd 100644
--- a/src/mame/video/wwfwfest.c
+++ b/src/mame/video/wwfwfest.c
@@ -16,33 +16,30 @@
for writes to Video Ram
*******************************************************************************/
-WRITE16_HANDLER( wwfwfest_fg0_videoram_w )
+WRITE16_MEMBER(wwfwfest_state::wwfwfest_fg0_videoram_w)
{
- wwfwfest_state *state = space->machine().driver_data<wwfwfest_state>();
/* Videoram is 8 bit, upper & lower byte writes end up in the same place */
if (ACCESSING_BITS_8_15 && ACCESSING_BITS_0_7) {
- COMBINE_DATA(&state->m_fg0_videoram[offset]);
+ COMBINE_DATA(&m_fg0_videoram[offset]);
} else if (ACCESSING_BITS_8_15) {
- state->m_fg0_videoram[offset]=(data>>8)&0xff;
+ m_fg0_videoram[offset]=(data>>8)&0xff;
} else {
- state->m_fg0_videoram[offset]=data&0xff;
+ m_fg0_videoram[offset]=data&0xff;
}
- state->m_fg0_tilemap->mark_tile_dirty(offset/2);
+ m_fg0_tilemap->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( wwfwfest_bg0_videoram_w )
+WRITE16_MEMBER(wwfwfest_state::wwfwfest_bg0_videoram_w)
{
- wwfwfest_state *state = space->machine().driver_data<wwfwfest_state>();
- COMBINE_DATA(&state->m_bg0_videoram[offset]);
- state->m_bg0_tilemap->mark_tile_dirty(offset/2);
+ COMBINE_DATA(&m_bg0_videoram[offset]);
+ m_bg0_tilemap->mark_tile_dirty(offset/2);
}
-WRITE16_HANDLER( wwfwfest_bg1_videoram_w )
+WRITE16_MEMBER(wwfwfest_state::wwfwfest_bg1_videoram_w)
{
- wwfwfest_state *state = space->machine().driver_data<wwfwfest_state>();
- COMBINE_DATA(&state->m_bg1_videoram[offset]);
- state->m_bg1_tilemap->mark_tile_dirty(offset);
+ COMBINE_DATA(&m_bg1_videoram[offset]);
+ m_bg1_tilemap->mark_tile_dirty(offset);
}
/*******************************************************************************
diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c
index fe4815fe5c5..9523059c73c 100644
--- a/src/mame/video/xain.c
+++ b/src/mame/video/xain.c
@@ -106,63 +106,56 @@ VIDEO_START( xain )
***************************************************************************/
-WRITE8_HANDLER( xain_bgram0_w )
+WRITE8_MEMBER(xain_state::xain_bgram0_w)
{
- xain_state *state = space->machine().driver_data<xain_state>();
- state->m_bgram0[offset] = data;
- state->m_bgram0_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bgram0[offset] = data;
+ m_bgram0_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( xain_bgram1_w )
+WRITE8_MEMBER(xain_state::xain_bgram1_w)
{
- xain_state *state = space->machine().driver_data<xain_state>();
- state->m_bgram1[offset] = data;
- state->m_bgram1_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_bgram1[offset] = data;
+ m_bgram1_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( xain_charram_w )
+WRITE8_MEMBER(xain_state::xain_charram_w)
{
- xain_state *state = space->machine().driver_data<xain_state>();
- state->m_charram[offset] = data;
- state->m_char_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_charram[offset] = data;
+ m_char_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( xain_scrollxP0_w )
+WRITE8_MEMBER(xain_state::xain_scrollxP0_w)
{
- xain_state *state = space->machine().driver_data<xain_state>();
- state->m_scrollxP0[offset] = data;
- state->m_bgram0_tilemap->set_scrollx(0, state->m_scrollxP0[0]|(state->m_scrollxP0[1]<<8));
+ m_scrollxP0[offset] = data;
+ m_bgram0_tilemap->set_scrollx(0, m_scrollxP0[0]|(m_scrollxP0[1]<<8));
}
-WRITE8_HANDLER( xain_scrollyP0_w )
+WRITE8_MEMBER(xain_state::xain_scrollyP0_w)
{
- xain_state *state = space->machine().driver_data<xain_state>();
- state->m_scrollyP0[offset] = data;
- state->m_bgram0_tilemap->set_scrolly(0, state->m_scrollyP0[0]|(state->m_scrollyP0[1]<<8));
+ m_scrollyP0[offset] = data;
+ m_bgram0_tilemap->set_scrolly(0, m_scrollyP0[0]|(m_scrollyP0[1]<<8));
}
-WRITE8_HANDLER( xain_scrollxP1_w )
+WRITE8_MEMBER(xain_state::xain_scrollxP1_w)
{
- xain_state *state = space->machine().driver_data<xain_state>();
- state->m_scrollxP1[offset] = data;
- state->m_bgram1_tilemap->set_scrollx(0, state->m_scrollxP1[0]|(state->m_scrollxP1[1]<<8));
+ m_scrollxP1[offset] = data;
+ m_bgram1_tilemap->set_scrollx(0, m_scrollxP1[0]|(m_scrollxP1[1]<<8));
}
-WRITE8_HANDLER( xain_scrollyP1_w )
+WRITE8_MEMBER(xain_state::xain_scrollyP1_w)
{
- xain_state *state = space->machine().driver_data<xain_state>();
- state->m_scrollyP1[offset] = data;
- state->m_bgram1_tilemap->set_scrolly(0, state->m_scrollyP1[0]|(state->m_scrollyP1[1]<<8));
+ m_scrollyP1[offset] = data;
+ m_bgram1_tilemap->set_scrolly(0, m_scrollyP1[0]|(m_scrollyP1[1]<<8));
}
-WRITE8_HANDLER( xain_flipscreen_w )
+WRITE8_MEMBER(xain_state::xain_flipscreen_w)
{
- flip_screen_set(space->machine(), data & 1);
+ flip_screen_set(machine(), data & 1);
}
diff --git a/src/mame/video/xorworld.c b/src/mame/video/xorworld.c
index 4940db3c421..1c6e6c46320 100644
--- a/src/mame/video/xorworld.c
+++ b/src/mame/video/xorworld.c
@@ -48,12 +48,11 @@ PALETTE_INIT( xorworld )
}
}
-WRITE16_HANDLER( xorworld_videoram16_w )
+WRITE16_MEMBER(xorworld_state::xorworld_videoram16_w)
{
- xorworld_state *state = space->machine().driver_data<xorworld_state>();
- UINT16 *videoram = state->m_videoram;
+ UINT16 *videoram = m_videoram;
COMBINE_DATA(&videoram[offset]);
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
/*
diff --git a/src/mame/video/xxmissio.c b/src/mame/video/xxmissio.c
index 4d01b510a63..b9def6f9b13 100644
--- a/src/mame/video/xxmissio.c
+++ b/src/mame/video/xxmissio.c
@@ -23,33 +23,29 @@ WRITE8_DEVICE_HANDLER( xxmissio_scroll_y_w )
state->m_yscroll = data;
}
-WRITE8_HANDLER( xxmissio_flipscreen_w )
+WRITE8_MEMBER(xxmissio_state::xxmissio_flipscreen_w)
{
- xxmissio_state *state = space->machine().driver_data<xxmissio_state>();
- state->m_flipscreen = data & 0x01;
+ m_flipscreen = data & 0x01;
}
-WRITE8_HANDLER( xxmissio_bgram_w )
+WRITE8_MEMBER(xxmissio_state::xxmissio_bgram_w)
{
- xxmissio_state *state = space->machine().driver_data<xxmissio_state>();
- int x = (offset + (state->m_xscroll >> 3)) & 0x1f;
+ int x = (offset + (m_xscroll >> 3)) & 0x1f;
offset = (offset & 0x7e0) | x;
- state->m_bgram[offset] = data;
+ m_bgram[offset] = data;
}
-READ8_HANDLER( xxmissio_bgram_r )
+READ8_MEMBER(xxmissio_state::xxmissio_bgram_r)
{
- xxmissio_state *state = space->machine().driver_data<xxmissio_state>();
- int x = (offset + (state->m_xscroll >> 3)) & 0x1f;
+ int x = (offset + (m_xscroll >> 3)) & 0x1f;
offset = (offset & 0x7e0) | x;
- return state->m_bgram[offset];
+ return m_bgram[offset];
}
-WRITE8_HANDLER( xxmissio_paletteram_w )
+WRITE8_MEMBER(xxmissio_state::xxmissio_paletteram_w)
{
- xxmissio_state *state = space->machine().driver_data<xxmissio_state>();
- state->paletteram_BBGGRRII_w(*space,offset,data);
+ paletteram_BBGGRRII_w(space,offset,data);
}
/****************************************************************************/
diff --git a/src/mame/video/xyonix.c b/src/mame/video/xyonix.c
index b1a591d7108..cb4eec4522c 100644
--- a/src/mame/video/xyonix.c
+++ b/src/mame/video/xyonix.c
@@ -41,12 +41,11 @@ static TILE_GET_INFO( get_xyonix_tile_info )
SET_TILE_INFO(0,tileno,attr >> 4,0);
}
-WRITE8_HANDLER( xyonix_vidram_w )
+WRITE8_MEMBER(xyonix_state::xyonix_vidram_w)
{
- xyonix_state *state = space->machine().driver_data<xyonix_state>();
- state->m_vidram[offset] = data;
- state->m_tilemap->mark_tile_dirty((offset-1)&0x0fff);
+ m_vidram[offset] = data;
+ m_tilemap->mark_tile_dirty((offset-1)&0x0fff);
}
VIDEO_START(xyonix)
diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c
index 10381709a62..045627a66da 100644
--- a/src/mame/video/yiear.c
+++ b/src/mame/video/yiear.c
@@ -59,32 +59,30 @@ PALETTE_INIT( yiear )
}
}
-WRITE8_HANDLER( yiear_videoram_w )
+WRITE8_MEMBER(yiear_state::yiear_videoram_w)
{
- yiear_state *state = space->machine().driver_data<yiear_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset / 2);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset / 2);
}
-WRITE8_HANDLER( yiear_control_w )
+WRITE8_MEMBER(yiear_state::yiear_control_w)
{
- yiear_state *state = space->machine().driver_data<yiear_state>();
/* bit 0 flips screen */
- if (flip_screen_get(space->machine()) != (data & 0x01))
+ if (flip_screen_get(machine()) != (data & 0x01))
{
- flip_screen_set(space->machine(), data & 0x01);
- space->machine().tilemap().mark_all_dirty();
+ flip_screen_set(machine(), data & 0x01);
+ machine().tilemap().mark_all_dirty();
}
/* bit 1 is NMI enable */
- state->m_yiear_nmi_enable = data & 0x02;
+ m_yiear_nmi_enable = data & 0x02;
/* bit 2 is IRQ enable */
- state->m_yiear_irq_enable = data & 0x04;
+ m_yiear_irq_enable = data & 0x04;
/* bits 3 and 4 are coin counters */
- coin_counter_w(space->machine(), 0, data & 0x08);
- coin_counter_w(space->machine(), 1, data & 0x10);
+ coin_counter_w(machine(), 0, data & 0x08);
+ coin_counter_w(machine(), 1, data & 0x10);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c
index 158a7bc6d48..2d4225e33a0 100644
--- a/src/mame/video/yunsun16.c
+++ b/src/mame/video/yunsun16.c
@@ -71,20 +71,18 @@ static TILE_GET_INFO( get_tile_info_1 )
(attr & 0x20) ? TILE_FLIPX : 0);
}
-WRITE16_HANDLER( yunsun16_vram_0_w )
+WRITE16_MEMBER(yunsun16_state::yunsun16_vram_0_w)
{
- yunsun16_state *state = space->machine().driver_data<yunsun16_state>();
- COMBINE_DATA(&state->m_vram_0[offset]);
- state->m_tilemap_0->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_vram_0[offset]);
+ m_tilemap_0->mark_tile_dirty(offset / 2);
}
-WRITE16_HANDLER( yunsun16_vram_1_w )
+WRITE16_MEMBER(yunsun16_state::yunsun16_vram_1_w)
{
- yunsun16_state *state = space->machine().driver_data<yunsun16_state>();
- COMBINE_DATA(&state->m_vram_1[offset]);
- state->m_tilemap_1->mark_tile_dirty(offset / 2);
+ COMBINE_DATA(&m_vram_1[offset]);
+ m_tilemap_1->mark_tile_dirty(offset / 2);
}
diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c
index 8d7d57e71e8..9d38233167b 100644
--- a/src/mame/video/yunsung8.c
+++ b/src/mame/video/yunsung8.c
@@ -37,58 +37,55 @@ Note: if MAME_DEBUG is defined, pressing Z with:
***************************************************************************/
-WRITE8_HANDLER( yunsung8_videobank_w )
+WRITE8_MEMBER(yunsung8_state::yunsung8_videobank_w)
{
- yunsung8_state *state = space->machine().driver_data<yunsung8_state>();
- state->m_videobank = data;
+ m_videobank = data;
}
-READ8_HANDLER( yunsung8_videoram_r )
+READ8_MEMBER(yunsung8_state::yunsung8_videoram_r)
{
- yunsung8_state *state = space->machine().driver_data<yunsung8_state>();
int bank;
/* Bit 1 of the bankswitching register contols the c000-c7ff
area (Palette). Bit 0 controls the c800-dfff area (Tiles) */
if (offset < 0x0800)
- bank = state->m_videobank & 2;
+ bank = m_videobank & 2;
else
- bank = state->m_videobank & 1;
+ bank = m_videobank & 1;
if (bank)
- return state->m_videoram_0[offset];
+ return m_videoram_0[offset];
else
- return state->m_videoram_1[offset];
+ return m_videoram_1[offset];
}
-WRITE8_HANDLER( yunsung8_videoram_w )
+WRITE8_MEMBER(yunsung8_state::yunsung8_videoram_w)
{
- yunsung8_state *state = space->machine().driver_data<yunsung8_state>();
if (offset < 0x0800) // c000-c7ff Banked Palette RAM
{
- int bank = state->m_videobank & 2;
+ int bank = m_videobank & 2;
UINT8 *RAM;
int color;
if (bank)
- RAM = state->m_videoram_0;
+ RAM = m_videoram_0;
else
- RAM = state->m_videoram_1;
+ RAM = m_videoram_1;
RAM[offset] = data;
color = RAM[offset & ~1] | (RAM[offset | 1] << 8);
/* BBBBBGGGGGRRRRRx */
- palette_set_color_rgb(space->machine(), offset / 2 + (bank ? 0x400 : 0), pal5bit(color >> 0), pal5bit(color >> 5), pal5bit(color >> 10));
+ palette_set_color_rgb(machine(), offset / 2 + (bank ? 0x400 : 0), pal5bit(color >> 0), pal5bit(color >> 5), pal5bit(color >> 10));
}
else
{
int tile;
- int bank = state->m_videobank & 1;
+ int bank = m_videobank & 1;
if (offset < 0x1000)
tile = (offset - 0x0800); // c800-cfff: Banked Color RAM
@@ -97,21 +94,21 @@ WRITE8_HANDLER( yunsung8_videoram_w )
if (bank)
{
- state->m_videoram_0[offset] = data;
- state->m_tilemap_0->mark_tile_dirty(tile);
+ m_videoram_0[offset] = data;
+ m_tilemap_0->mark_tile_dirty(tile);
}
else
{
- state->m_videoram_1[offset] = data;
- state->m_tilemap_1->mark_tile_dirty(tile);
+ m_videoram_1[offset] = data;
+ m_tilemap_1->mark_tile_dirty(tile);
}
}
}
-WRITE8_HANDLER( yunsung8_flipscreen_w )
+WRITE8_MEMBER(yunsung8_state::yunsung8_flipscreen_w)
{
- space->machine().tilemap().set_flip_all((data & 1) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ machine().tilemap().set_flip_all((data & 1) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
}
diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c
index 085743392f4..38b865cbb9a 100644
--- a/src/mame/video/zac2650.c
+++ b/src/mame/video/zac2650.c
@@ -15,37 +15,33 @@
/* once it's workings are fully understood. */
/**************************************************************/
-WRITE8_HANDLER( tinvader_videoram_w )
+WRITE8_MEMBER(zac2650_state::tinvader_videoram_w)
{
- zac2650_state *state = space->machine().driver_data<zac2650_state>();
- UINT8 *videoram = state->m_videoram;
+ UINT8 *videoram = m_videoram;
videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset);
+ m_bg_tilemap->mark_tile_dirty(offset);
}
-READ8_HANDLER( zac_s2636_r )
+READ8_MEMBER(zac2650_state::zac_s2636_r)
{
- zac2650_state *state = space->machine().driver_data<zac2650_state>();
- if(offset!=0xCB) return state->m_s2636_0_ram[offset];
- else return state->m_CollisionSprite;
+ if(offset!=0xCB) return m_s2636_0_ram[offset];
+ else return m_CollisionSprite;
}
-WRITE8_HANDLER( zac_s2636_w )
+WRITE8_MEMBER(zac2650_state::zac_s2636_w)
{
- zac2650_state *state = space->machine().driver_data<zac2650_state>();
- state->m_s2636_0_ram[offset] = data;
- gfx_element_mark_dirty(space->machine().gfx[1], offset/8);
- gfx_element_mark_dirty(space->machine().gfx[2], offset/8);
+ m_s2636_0_ram[offset] = data;
+ gfx_element_mark_dirty(machine().gfx[1], offset/8);
+ gfx_element_mark_dirty(machine().gfx[2], offset/8);
if (offset == 0xc7)
{
- s2636_soundport_w(space->machine().device("s2636snd"), 0, data);
+ s2636_soundport_w(machine().device("s2636snd"), 0, data);
}
}
-READ8_HANDLER( tinvader_port_0_r )
+READ8_MEMBER(zac2650_state::tinvader_port_0_r)
{
- zac2650_state *state = space->machine().driver_data<zac2650_state>();
- return input_port_read(space->machine(), "1E80") - state->m_CollisionBackground;
+ return input_port_read(machine(), "1E80") - m_CollisionBackground;
}
/*****************************************/
diff --git a/src/mame/video/zaccaria.c b/src/mame/video/zaccaria.c
index 5701bf1cbe7..1a8e303723f 100644
--- a/src/mame/video/zaccaria.c
+++ b/src/mame/video/zaccaria.c
@@ -147,40 +147,38 @@ VIDEO_START( zaccaria )
***************************************************************************/
-WRITE8_HANDLER( zaccaria_videoram_w )
+WRITE8_MEMBER(zaccaria_state::zaccaria_videoram_w)
{
- zaccaria_state *state = space->machine().driver_data<zaccaria_state>();
- state->m_videoram[offset] = data;
- state->m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
+ m_videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x3ff);
}
-WRITE8_HANDLER( zaccaria_attributes_w )
+WRITE8_MEMBER(zaccaria_state::zaccaria_attributes_w)
{
- zaccaria_state *state = space->machine().driver_data<zaccaria_state>();
if (offset & 1)
{
- if (state->m_attributesram[offset] != data)
+ if (m_attributesram[offset] != data)
{
int i;
for (i = offset / 2;i < 0x400;i += 32)
- state->m_bg_tilemap->mark_tile_dirty(i);
+ m_bg_tilemap->mark_tile_dirty(i);
}
}
else
- state->m_bg_tilemap->set_scrolly(offset / 2,data);
+ m_bg_tilemap->set_scrolly(offset / 2,data);
- state->m_attributesram[offset] = data;
+ m_attributesram[offset] = data;
}
-WRITE8_HANDLER( zaccaria_flip_screen_x_w )
+WRITE8_MEMBER(zaccaria_state::zaccaria_flip_screen_x_w)
{
- flip_screen_x_set(space->machine(), data & 1);
+ flip_screen_x_set(machine(), data & 1);
}
-WRITE8_HANDLER( zaccaria_flip_screen_y_w )
+WRITE8_MEMBER(zaccaria_state::zaccaria_flip_screen_y_w)
{
- flip_screen_y_set(space->machine(), data & 1);
+ flip_screen_y_set(machine(), data & 1);
}
diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c
index 0f8f3d474ae..2987eb329ab 100644
--- a/src/mame/video/zaxxon.c
+++ b/src/mame/video/zaxxon.c
@@ -183,73 +183,66 @@ VIDEO_START( congo )
*
*************************************/
-WRITE8_HANDLER( zaxxon_flipscreen_w )
+WRITE8_MEMBER(zaxxon_state::zaxxon_flipscreen_w)
{
- zaxxon_state *state = space->machine().driver_data<zaxxon_state>();
/* low bit controls flip; background and sprite flip are handled at render time */
- flip_screen_set_no_update(space->machine(), ~data & 1);
- state->m_fg_tilemap->set_flip(flip_screen_get(space->machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ flip_screen_set_no_update(machine(), ~data & 1);
+ m_fg_tilemap->set_flip(flip_screen_get(machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
}
-WRITE8_HANDLER( zaxxon_fg_color_w )
+WRITE8_MEMBER(zaxxon_state::zaxxon_fg_color_w)
{
- zaxxon_state *state = space->machine().driver_data<zaxxon_state>();
/* low bit selects high color palette index */
- state->m_fg_color = (data & 1) * 0x80;
- state->m_fg_tilemap->set_palette_offset(state->m_fg_color + (state->m_congo_color_bank << 8));
+ m_fg_color = (data & 1) * 0x80;
+ m_fg_tilemap->set_palette_offset(m_fg_color + (m_congo_color_bank << 8));
}
-WRITE8_HANDLER( zaxxon_bg_position_w )
+WRITE8_MEMBER(zaxxon_state::zaxxon_bg_position_w)
{
- zaxxon_state *state = space->machine().driver_data<zaxxon_state>();
/* 11 bits of scroll position are stored */
if (offset == 0)
- state->m_bg_position = (state->m_bg_position & 0x700) | ((data << 0) & 0x0ff);
+ m_bg_position = (m_bg_position & 0x700) | ((data << 0) & 0x0ff);
else
- state->m_bg_position = (state->m_bg_position & 0x0ff) | ((data << 8) & 0x700);
+ m_bg_position = (m_bg_position & 0x0ff) | ((data << 8) & 0x700);
}
-WRITE8_HANDLER( zaxxon_bg_color_w )
+WRITE8_MEMBER(zaxxon_state::zaxxon_bg_color_w)
{
- zaxxon_state *state = space->machine().driver_data<zaxxon_state>();
/* low bit selects high color palette index */
- state->m_bg_color = (data & 1) * 0x80;
+ m_bg_color = (data & 1) * 0x80;
}
-WRITE8_HANDLER( zaxxon_bg_enable_w )
+WRITE8_MEMBER(zaxxon_state::zaxxon_bg_enable_w)
{
- zaxxon_state *state = space->machine().driver_data<zaxxon_state>();
/* low bit enables/disables the background layer */
- state->m_bg_enable = data & 1;
+ m_bg_enable = data & 1;
}
-WRITE8_HANDLER( congo_fg_bank_w )
+WRITE8_MEMBER(zaxxon_state::congo_fg_bank_w)
{
- zaxxon_state *state = space->machine().driver_data<zaxxon_state>();
/* low bit controls the topmost character bit */
- state->m_congo_fg_bank = data & 1;
- state->m_fg_tilemap->mark_all_dirty();
+ m_congo_fg_bank = data & 1;
+ m_fg_tilemap->mark_all_dirty();
}
-WRITE8_HANDLER( congo_color_bank_w )
+WRITE8_MEMBER(zaxxon_state::congo_color_bank_w)
{
- zaxxon_state *state = space->machine().driver_data<zaxxon_state>();
/* low bit controls the topmost bit into the color PROM */
- state->m_congo_color_bank = data & 1;
- state->m_fg_tilemap->set_palette_offset(state->m_fg_color + (state->m_congo_color_bank << 8));
+ m_congo_color_bank = data & 1;
+ m_fg_tilemap->set_palette_offset(m_fg_color + (m_congo_color_bank << 8));
}
@@ -260,21 +253,19 @@ WRITE8_HANDLER( congo_color_bank_w )
*
*************************************/
-WRITE8_HANDLER( zaxxon_videoram_w )
+WRITE8_MEMBER(zaxxon_state::zaxxon_videoram_w)
{
- zaxxon_state *state = space->machine().driver_data<zaxxon_state>();
- state->m_videoram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_videoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_HANDLER( congo_colorram_w )
+WRITE8_MEMBER(zaxxon_state::congo_colorram_w)
{
- zaxxon_state *state = space->machine().driver_data<zaxxon_state>();
- state->m_colorram[offset] = data;
- state->m_fg_tilemap->mark_tile_dirty(offset);
+ m_colorram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset);
}
@@ -285,30 +276,29 @@ WRITE8_HANDLER( congo_colorram_w )
*
*************************************/
-WRITE8_HANDLER( congo_sprite_custom_w )
+WRITE8_MEMBER(zaxxon_state::congo_sprite_custom_w)
{
- zaxxon_state *state = space->machine().driver_data<zaxxon_state>();
- UINT8 *spriteram = state->m_spriteram;
+ UINT8 *spriteram = m_spriteram;
- state->m_congo_custom[offset] = data;
+ m_congo_custom[offset] = data;
/* seems to trigger on a write of 1 to the 4th byte */
if (offset == 3 && data == 0x01)
{
- UINT16 saddr = state->m_congo_custom[0] | (state->m_congo_custom[1] << 8);
- int count = state->m_congo_custom[2];
+ UINT16 saddr = m_congo_custom[0] | (m_congo_custom[1] << 8);
+ int count = m_congo_custom[2];
/* count cycles (just a guess) */
- device_adjust_icount(&space->device(), -count * 5);
+ device_adjust_icount(&space.device(), -count * 5);
/* this is just a guess; the chip is hardwired to the spriteram */
while (count-- >= 0)
{
- UINT8 daddr = space->read_byte(saddr + 0) * 4;
- spriteram[(daddr + 0) & 0xff] = space->read_byte(saddr + 1);
- spriteram[(daddr + 1) & 0xff] = space->read_byte(saddr + 2);
- spriteram[(daddr + 2) & 0xff] = space->read_byte(saddr + 3);
- spriteram[(daddr + 3) & 0xff] = space->read_byte(saddr + 4);
+ UINT8 daddr = space.read_byte(saddr + 0) * 4;
+ spriteram[(daddr + 0) & 0xff] = space.read_byte(saddr + 1);
+ spriteram[(daddr + 1) & 0xff] = space.read_byte(saddr + 2);
+ spriteram[(daddr + 2) & 0xff] = space.read_byte(saddr + 3);
+ spriteram[(daddr + 3) & 0xff] = space.read_byte(saddr + 4);
saddr += 0x20;
}
}